Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add minigun to scripts. Also add a few missing ammos to BRW and RW
authorWuzzy <Wuzzy2@mail.ru>
Sat, 10 Feb 2018 12:44:40 +0100
changeset 12956 89930daecaab
parent 12955 4fbe2d18df9c
child 12957 08f91e9e3d2c
Add minigun to scripts. Also add a few missing ammos to BRW and RW
share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.lua file | annotate | diff | comparison | revisions
share/hedgewars/Data/Scripts/Multiplayer/Construction_Mode.lua file | annotate | diff | comparison | revisions
share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua file | annotate | diff | comparison | revisions
share/hedgewars/Data/Scripts/Multiplayer/Highlander.lua file | annotate | diff | comparison | revisions
share/hedgewars/Data/Scripts/Multiplayer/Random_Weapon.lua file | annotate | diff | comparison | revisions 
--- a/share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.lua	Sat Feb 10 12:01:00 2018 +0100
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Balanced_Random_Weapon.lua	Sat Feb 10 12:44:40 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 }
+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 }
 
---                      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
-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}
+--                      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}
 
 local airweapons = { amAirAttack, amMineStrike, amNapalm, amDrillStrike }
 
--- a/share/hedgewars/Data/Scripts/Multiplayer/Construction_Mode.lua	Sat Feb 10 12:01:00 2018 +0100
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Construction_Mode.lua	Sat Feb 10 12:44:40 2018 +0100
@@ -162,6 +162,7 @@
 	{amMortar,	 1*costFactor},
 	{amDrill,	 3*costFactor},
 	{amSnowball,	 3*costFactor},
+	{amDuck,	 2*costFactor},
 
 	{amGrenade,	 2*costFactor},
 	{amClusterBomb,	 3*costFactor},
@@ -176,6 +177,7 @@
 	--{amSineGun,	 6*costFactor},
 	{amFlamethrower, 4*costFactor},
 	{amIceGun,	15*costFactor},
+	{amMinigun,	13*costFactor},
 
 	{amFirePunch,	 3*costFactor},
 	{amWhip,	 1*costFactor},
@@ -199,8 +201,6 @@
 	{amKnife,	 2*costFactor},
 
 	{amBirdy,	 7*costFactor},
-
-	{amDuck,	 2*costFactor}
 }
 
 -- UTILITY CRATES --
--- a/share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua	Sat Feb 10 12:01:00 2018 +0100
+++ b/share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua	Sat Feb 10 12:44:40 2018 +0100
@@ -311,6 +311,7 @@
 				{amMortar, 	"amMortar"},
 				{amDrill, 	"amDrill"},
 				{amSnowball, 	"amSnowball"},
+				{amDuck,	"amDuck"},
 
 				{amGrenade,	"amGrenade"},
 				{amClusterBomb,	"amClusterBomb"},
@@ -325,6 +326,7 @@
 				{amSineGun, 	"amSineGun"},
 				{amFlamethrower,"amFlamethrower"},
 				{amIceGun, 	"amIceGun"},
+				{amMinigun, 	"amMinigun"},
 
 				{amFirePunch, 	"amFirePunch"},
 				{amWhip,	"amWhip"},
@@ -352,7 +354,6 @@
 				{amKnife,	"amKnife"},
 
 				{amBirdy,	"amBirdy"},
-				{amDuck,	"amDuck"},
 
 				}
 
--- a/share/hedgewars/Data/Scripts/Multiplayer/Highlander.lua	Sat Feb 10 12:01:00 2018 +0100
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Highlander.lua	Sat Feb 10 12:44:40 2018 +0100
@@ -99,7 +99,7 @@
 					[amBazooka]=true, [amBee]=true, [amMortar]=true, [amDrill]=true, [amSnowball]=true,
                     [amGrenade]=true, [amClusterBomb]=true, [amMolotov]=true, [amWatermelon]=true,
                     [amHellishBomb]=true, [amGasBomb]=true, [amShotgun]=true, [amDEagle]=true,
-                    [amFlamethrower]=true, [amSniperRifle]=true, [amSineGun]=true, 
+                    [amFlamethrower]=true, [amSniperRifle]=true, [amSineGun]=true, [amMinigun]=true,
 					[amFirePunch]=true, [amWhip]=true, [amBaseballBat]=true, [amKamikaze]=true,
                     [amSeduction]=true, [amHammer]=true, [amMine]=true, [amDynamite]=true, [amCake]=true,
                     [amBallgun]=true, [amSMine]=true, [amRCPlane]=true, [amBirdy]=true, [amKnife]=true,
--- a/share/hedgewars/Data/Scripts/Multiplayer/Random_Weapon.lua	Sat Feb 10 12:01:00 2018 +0100
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Random_Weapon.lua	Sat Feb 10 12:44:40 2018 +0100
@@ -12,7 +12,8 @@
             amBaseballBat, amTeleport, amMortar, amCake, amSeduction,
             amWatermelon, amHellishBomb, amDrill, amBallgun, amRCPlane,
             amSniperRifle, amMolotov, amBirdy, amBlowTorch, amGasBomb,
-            amFlamethrower, amSMine, amHammer, amDuck }
+            amFlamethrower, amSMine, amHammer, amDuck, amMinigun, amSineGun,
+            amKnife, amAirMine }
 
 -- List of weapons that attack from the air
 local airweapons = { amAirAttack, amMineStrike, amNapalm, amDrillStrike }
hedgewars