Mercurial Mercurial > hedgewars-draft / 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.
merge
authornemo
Tue, 07 Jul 2015 19:19:43 -0400
changeset 10999 4fcb54a0a777
parent 10997 af84b2411f27 (diff)
parent 10998 de064d541002 (current diff)
child 11000 b1c8027cc8f7
merge
--- a/share/hedgewars/Data/Scripts/Multiplayer/Highlander.lua	Sat Jul 04 21:48:02 2015 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Highlander.lua	Tue Jul 07 19:19:43 2015 -0400
@@ -102,7 +102,7 @@
 					[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,
-                    [amAirAttack]=true, [amMineStrike]=true, [amNapalm]=true, [amDrillStrike]=true, [amPiano]=true
+                    [amAirAttack]=true, [amMineStrike]=true, [amNapalm]=true, [amDrillStrike]=true, [amPiano]=true, [amAirMine] = true,
 					}
 
 local utilWeps =  {
@@ -129,7 +129,7 @@
 local probability = {1,2,5,10,20,50,200,500,1000000};
 local atktot = 0
 local utiltot = 0
-local maxWep = 56 -- game crashes if you exceed supported #
+local maxWep = 57 -- game crashes if you exceed supported #
 
 local someHog = nil -- just for looking up the weps
hedgewars-draft