# HG changeset patch # User Wuzzy # Date 1538750201 -7200 # Node ID 297cf5c19172d084350b0a04b2b3db6f71332bdf # Parent 16ca23f8f6231520385df5c7de333805d285a155 Remove usage of creeper from all schemes and styles diff -r 16ca23f8f623 -r 297cf5c19172 QTfrontend/weapons.h --- a/QTfrontend/weapons.h Fri Oct 05 14:57:44 2018 +0200 +++ b/QTfrontend/weapons.h Fri Oct 05 16:36:41 2018 +0200 @@ -89,8 +89,8 @@ #define AMMOLINE_DEFAULT_DELAY "00000000000002055000000400070040000000002200000006000200000" #define AMMOLINE_DEFAULT_CRATE "13111103121111111231141111111111111112111111111111111111111" -#define AMMOLINE_CRAZY_QT "99999999999999999929999999999999992999999999999999929991999" -#define AMMOLINE_CRAZY_PROB "11111101111111111111111111111111111111111111111111111111111" +#define AMMOLINE_CRAZY_QT "99999999999999999929999999999999992999999999999999929991909" +#define AMMOLINE_CRAZY_PROB "11111101111111111111111111111111111111111111111111111111101" #define AMMOLINE_CRAZY_DELAY "00000000000000000000000000000000000000000000000000000000000" #define AMMOLINE_CRAZY_CRATE "13111103121111111231141111111111111112111111111111111111111" @@ -119,8 +119,8 @@ #define AMMOLINE_PORTALS_DELAY "00000000000002055000000400070040000000002000000006000200000" #define AMMOLINE_PORTALS_CRATE "13111103121111111231141111111111111112111111111111111111111" -#define AMMOLINE_ONEEVERY_QT "11111191111111111111111111111111111111111111111111111111111" -#define AMMOLINE_ONEEVERY_PROB "11111101111111111111111111111111111111111111111111111111111" +#define AMMOLINE_ONEEVERY_QT "11111191111111111111111111111111111111111111111111111111101" +#define AMMOLINE_ONEEVERY_PROB "11111101111111111111111111111111111111111111111111111111101" #define AMMOLINE_ONEEVERY_DELAY "00000000000000000000000000000000000000000000000000000000000" #define AMMOLINE_ONEEVERY_CRATE "11111101111111111111111111111111111111111111111111111111111" diff -r 16ca23f8f623 -r 297cf5c19172 share/hedgewars/Data/Missions/Scenario/Big_Armory.lua --- a/share/hedgewars/Data/Missions/Scenario/Big_Armory.lua Fri Oct 05 14:57:44 2018 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/Big_Armory.lua Fri Oct 05 16:36:41 2018 +0200 @@ -5,7 +5,7 @@ for a=0, amDuck do if a == amExtraTime then heroAmmo[a] = 2 - elseif a ~= amNothing then + elseif a ~= amNothing and a ~= amDuck then heroAmmo[a] = 100 end end diff -r 16ca23f8f623 -r 297cf5c19172 share/hedgewars/Data/Scripts/Multiplayer/Construction_Mode.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Construction_Mode.lua Fri Oct 05 14:57:44 2018 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Construction_Mode.lua Fri Oct 05 16:36:41 2018 +0200 @@ -153,7 +153,6 @@ {amMortar, 1*costFactor}, {amDrill, 3*costFactor}, {amSnowball, 3*costFactor}, - {amDuck, 2*costFactor}, {amGrenade, 2*costFactor}, {amClusterBomb, 3*costFactor}, diff -r 16ca23f8f623 -r 297cf5c19172 share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua Fri Oct 05 14:57:44 2018 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua Fri Oct 05 16:36:41 2018 +0200 @@ -314,7 +314,6 @@ {amMortar, "amMortar"}, {amDrill, "amDrill"}, {amSnowball, "amSnowball"}, - {amDuck, "amDuck"}, {amGrenade, "amGrenade"}, {amClusterBomb, "amClusterBomb"},