# HG changeset patch # User Wuzzy # Date 1520879940 -3600 # Node ID 4d1cf0d76eb7ce7314c66254f6b7a6b1a22e828a # Parent 159004144897eee0ad4090db2ff75312f47afc05 Remove rubber duck from BRW, RW and most weapon schemes for now The duck is not liked by players. Rubber duck needs a lot of rework. Before that happens, better remove it from game modes for now. Players can always modify the weapon schemes, of course. diff -r 159004144897 -r 4d1cf0d76eb7 ChangeLog.txt --- a/ChangeLog.txt Mon Mar 12 12:54:33 2018 +0100 +++ b/ChangeLog.txt Mon Mar 12 19:39:00 2018 +0100 @@ -33,6 +33,7 @@ Styles and game modes: + Various styles: Add current score/time next to team bars (where applicable) + + Remove rubber duck from most weapon schemes and Random Weapon and Balanced Random Weapon + Construction Mode: Add a few shortcuts + Construction Mode: Show selected object at cursor and a crate preview icon + Construction Mode: Remember all selections diff -r 159004144897 -r 4d1cf0d76eb7 QTfrontend/weapons.h --- a/QTfrontend/weapons.h Mon Mar 12 12:54:33 2018 +0100 +++ b/QTfrontend/weapons.h Mon Mar 12 19:39:00 2018 +0100 @@ -84,8 +84,8 @@ amDuck-----------------------------------------------------------------------------------| amMinigun---------------------------------------------------------------------------------| */ -#define AMMOLINE_DEFAULT_QT "93919294221991210322351110012000000002111001010111110001020" -#define AMMOLINE_DEFAULT_PROB "04050405416006555465544647765766666661555101011154111111147" +#define AMMOLINE_DEFAULT_QT "93919294221991210322351110012000000002111001010111110001000" +#define AMMOLINE_DEFAULT_PROB "04050405416006555465544647765766666661555101011154111111107" #define AMMOLINE_DEFAULT_DELAY "00000000000002055000000400070040000000002200000006000200000" #define AMMOLINE_DEFAULT_CRATE "13111103121111111231141111111111111112111111111111111111111" @@ -100,12 +100,12 @@ #define AMMOLINE_PROMODE_CRATE "11111101111111111111111111111111111111111111111111111111111" #define AMMOLINE_SHOPPA_QT "00000099000000000000000000000000000000000000000000000000000" -#define AMMOLINE_SHOPPA_PROB "44444100442444022101121212224220000000020004000100110010111" +#define AMMOLINE_SHOPPA_PROB "44444100442444022101121212224220000000020004000100110010101" #define AMMOLINE_SHOPPA_DELAY "00000000000000000000000000000000000000000000000000000000000" #define AMMOLINE_SHOPPA_CRATE "11111101111111111111111111111111111111111111111111111111111" #define AMMOLINE_CLEAN_QT "10100090000100000110000000000000000000000000000010000000000" -#define AMMOLINE_CLEAN_PROB "04050405416006555465544647765766666661555101011154111211144" +#define AMMOLINE_CLEAN_PROB "04050405416006555465544647765766666661555101011154111211104" #define AMMOLINE_CLEAN_DELAY "00000000000000000000000000000000000000000000000000000200000" #define AMMOLINE_CLEAN_CRATE "13111103121111111231141111111111111112111111111111111111111" @@ -115,7 +115,7 @@ #define AMMOLINE_MINES_CRATE "11111101111111111111111111111111111111111111111111111111111" #define AMMOLINE_PORTALS_QT "90000090020000000021000000000000001100000900000000000000000" -#define AMMOLINE_PORTALS_PROB "04050405416006555465544647765766666661555101011154111211122" +#define AMMOLINE_PORTALS_PROB "04050405416006555465544647765766666661555101011154111211102" #define AMMOLINE_PORTALS_DELAY "00000000000002055000000400070040000000002000000006000200000" #define AMMOLINE_PORTALS_CRATE "13111103121111111231141111111111111112111111111111111111111" @@ -124,13 +124,13 @@ #define AMMOLINE_ONEEVERY_DELAY "00000000000000000000000000000000000000000000000000000000000" #define AMMOLINE_ONEEVERY_CRATE "11111101111111111111111111111111111111111111111111111111111" -#define AMMOLINE_HIGHLANDER_QT "11111191111111111111019111111111100101111101111001001011111" +#define AMMOLINE_HIGHLANDER_QT "11111191111111111111019111111111100101111101111001001011101" #define AMMOLINE_HIGHLANDER_PROB "00000000000000000000000000000000000000000000000000000000000" #define AMMOLINE_HIGHLANDER_DELAY "00000000000000000000000000000000000000000000000000000000000" #define AMMOLINE_HIGHLANDER_CRATE "00000000000000000090000000000000000000000000000000000000000" #define AMMOLINE_CONSTRUCTION_QT "11000190000000100100900000000000000000000000000000000000000" -#define AMMOLINE_CONSTRUCTION_PROB "11111101111111100100011111101111111111111101111100101110111" +#define AMMOLINE_CONSTRUCTION_PROB "11111101111111100100011111101111111111111101111100101110101" #define AMMOLINE_CONSTRUCTION_DELAY "00000000000000000000000000000000000000000000000000000000000" #define AMMOLINE_CONSTRUCTION_CRATE "11111101111111111111111111111111111111111111111111111111111" diff -r 159004144897 -r 4d1cf0d76eb7 share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.lua Mon Mar 12 12:54:33 2018 +0100 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.lua Mon Mar 12 19:39:00 2018 +0100 @@ -1,10 +1,10 @@ HedgewarsScriptLoad("/Scripts/Locale.lua") HedgewarsScriptLoad("/Scripts/Tracker.lua") -local weapons = { amGrenade, amClusterBomb, amBazooka, amBee, amShotgun, amMine, amDEagle, amDynamite, amFirePunch, amWhip, amPickHammer, amBaseballBat, amMortar, amCake, amSeduction, amWatermelon, amHellishBomb, amDrill, amBallgun, amRCPlane, amSniperRifle, amMolotov, amBirdy, amBlowTorch, amGasBomb, amFlamethrower, amSMine, amKamikaze, amDuck, amMinigun, amAirMine, amKnife } +local weapons = { amGrenade, amClusterBomb, amBazooka, amBee, amShotgun, amMine, amDEagle, amDynamite, amFirePunch, amWhip, amPickHammer, amBaseballBat, amMortar, amCake, amSeduction, amWatermelon, amHellishBomb, amDrill, amBallgun, amRCPlane, amSniperRifle, amMolotov, amBirdy, amBlowTorch, amGasBomb, amFlamethrower, amSMine, amKamikaze, amMinigun, amAirMine, amKnife } --- G,C,B,B,S,M,D,D,F,W,P,B,M,C,S,W,H,D,B,R,S,M,B,B,G,F,S,K,D,M,A,K -local weapons_values = {1,1,1,2,1,1,1,2,1,1,1,2,1,3,1,3,3,2,3,3,1,1,2,1,1,2,2,1,1,3,1,2} +-- G,C,B,B,S,M,D,D,F,W,P,B,M,C,S,W,H,D,B,R,S,M,B,B,G,F,S,K,M,A,K +local weapons_values = {1,1,1,2,1,1,1,2,1,1,1,2,1,3,1,3,3,2,3,3,1,1,2,1,1,2,2,1,3,1,2} local airweapons = { amAirAttack, amMineStrike, amNapalm, amDrillStrike } diff -r 159004144897 -r 4d1cf0d76eb7 share/hedgewars/Data/Scripts/Multiplayer/Random_Weapon.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Random_Weapon.lua Mon Mar 12 12:54:33 2018 +0100 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Random_Weapon.lua Mon Mar 12 19:39:00 2018 +0100 @@ -12,7 +12,7 @@ amBaseballBat, amTeleport, amMortar, amCake, amSeduction, amWatermelon, amHellishBomb, amDrill, amBallgun, amRCPlane, amSniperRifle, amMolotov, amBirdy, amBlowTorch, amGasBomb, - amFlamethrower, amSMine, amHammer, amDuck, amMinigun, amSineGun, + amFlamethrower, amSMine, amHammer, amMinigun, amSineGun, amKnife, amAirMine } -- List of weapons that attack from the air