hedgewars: comparison share/hedgewars/Data/Scripts/Multiplayer/Construction

equal deleted inserted replaced

-:6874644a2d00
+:660599c04bd8
 				{amDrill, 		"amDrill",			0, loc("Drill Rocket"), 	3*placeholder},
 				{amSnowball, 	"amSnowball",		0, loc("Mudball"), 			3*placeholder},
 				{amGrenade,		"amGrenade",		0, loc("Grenade"), 			2*placeholder},
 				{amClusterBomb,	"amClusterBomb",	0, loc("Cluster Bomb"), 	3*placeholder},
-				{amMolotov, 	"amMolotov",		0, loc("Molotov Cocktail"), 3*placeholder},
 				{amWatermelon, 	"amWatermelon",		0, loc("Watermelon Bomb"), 25*placeholder},
 				{amHellishBomb,	"amHellishBomb",	0, loc("Hellish hand-grenade"), 25*placeholder},
+				{amMolotov, 	"amMolotov",		0, loc("Molotov Cocktail"), 3*placeholder},
 				{amGasBomb, 	"amGasBomb",		0, loc("Old Limburger"), 		3*placeholder},
 				{amShotgun,		"amShotgun",		0, loc("Shotgun"), 			2*placeholder},
 				{amDEagle,		"amDEagle",			0, loc("Desert Eagle"), 	2*placeholder},
-				{amFlamethrower,"amFlamethrower",	0, loc("Flamethrower"), 	4*placeholder},
 				{amSniperRifle,	"amSniperRifle",	0, loc("Sniper Rifle"), 	3*placeholder},
 				--{amSineGun, 	"amSineGun",		0, loc("Sine Gun"), 			6*placeholder},
+				{amFlamethrower,"amFlamethrower",	0, loc("Flamethrower"), 	4*placeholder},
 				{amIceGun, 		"amIceGun",			0, loc("Freezer"), 			15*placeholder},
-				{amLandGun,		"amLandGun",		0, loc("Land Spray"), 	5*placeholder},
 				{amFirePunch, 	"amFirePunch",		0, loc("Shoryuken"), 		3*placeholder},
 				{amWhip,		"amWhip",			0, loc("Whip"), 			1*placeholder},
 				{amBaseballBat, "amBaseballBat",	0, loc("Baseball Bat"), 	7*placeholder},
 				--{amKamikaze, 	"amKamikaze",		0, loc("Kamikaze"),			1*placeholder},
 				--{amRCPlane,		"amRCPlane",		0, loc("RC Plane"), 	25*placeholder},
 				{amSMine,		"amSMine",			0, loc("Sticky Mine"), 		5*placeholder},
 				--{amAirAttack,	"amAirAttack",		0, loc("Air Attack"), 		10*placeholder},
 				--{amMineStrike,	"amMineStrike",		0, loc("Mine Strike"), 		15*placeholder},
-				--{amDrillStrike,	"amDrillStrike",	0, loc("Drill Strike"), 15*placeholder},
 				--{amNapalm, 		"amNapalm",			0, loc("Napalm"), 		15*placeholder},
 				--{amPiano,		"amPiano",			0, loc("Piano Strike"), 	40*placeholder},
+				--{amDrillStrike,	"amDrillStrike",	0, loc("Drill Strike"), 15*placeholder},
 				{amKnife,		"amKnife",			0, loc("Cleaver"), 			2*placeholder},
 				{amBirdy,		"amBirdy",			0, loc("Birdy"), 			7*placeholder}
 				}
 utilArray =
 				{
+				{amPickHammer,		"amPickHammer",		0, loc("Pick Hammer"), 		2*placeholder},
 				{amBlowTorch, 		"amBlowTorch",		0, loc("Blow Torch"), 		4*placeholder},
-				{amPickHammer,		"amPickHammer",		0, loc("Pick Hammer"), 		2*placeholder},
 				--{amGirder, 			"amGirder",			0, loc("Girder"), 		4*placeholder},
+				{amLandGun,		"amLandGun",		0, loc("Land Spray"), 	5*placeholder},
 				--{amRubber, 			"amRubber",			0, loc("Rubber"), 	5*placeholder},
-				{amPortalGun,		"amPortalGun",		0, loc("Portable Portal Device"), 15*placeholder},
 				{amRope, 			"amRope",			0, loc("Rope"), 			7*placeholder},
 				{amParachute, 		"amParachute",		0, loc("Parachute"), 		2*placeholder},
 				--{amTeleport,		"amTeleport",		0, loc("Teleport"), 		6*placeholder},
 				{amJetpack,			"amJetpack",		0, loc("Flying Saucer"), 	8*placeholder},
+				{amPortalGun,		"amPortalGun",		0, loc("Portable Portal Device"), 15*placeholder},
 				{amInvulnerable,	"amInvulnerable",	0, loc("Invulnerable"), 	5*placeholder},
 				{amLaserSight,		"amLaserSight",		0, loc("Laser Sight"), 		2*placeholder},
 				{amVampiric,		"amVampiric",		0, loc("Vampirism"), 		6*placeholder},
+				--{amResurrector, 	"amResurrector",	0, loc("Resurrector"), 		8*placeholder},
+				--{amTardis, 			"amTardis",			0, loc("Time Box"), 			2*placeholder},
+				--{amSwitch,			"amSwitch",			0, loc("Switch Hog"), 		4*placeholder}
 				{amLowGravity, 		"amLowGravity",		0, loc("Low Gravity"), 		4*placeholder},
 				{amExtraDamage, 	"amExtraDamage",	0, loc("Extra Damage"), 	6*placeholder},
 				{amExtraTime,		"amExtraTime",		0, loc("Extra Time"), 		8*placeholder}
-				--{amResurrector, 	"amResurrector",	0, loc("Resurrector"), 		8*placeholder},
-				--{amTardis, 			"amTardis",			0, loc("Time Box"), 			2*placeholder},
-				--{amSwitch,			"amSwitch",			0, loc("Switch Hog"), 		4*placeholder}
 				}
 ----------------------------
 -- placement shite
 ----------------------------
 				"Girder Placement Mode",
 				"Rubber Placement Mode",
 				"Mine Placement Mode",
 				"Sticky Mine Placement Mode",
 				"Barrel Placement Mode",
-				"Health Crate Placement Mode",
 				"Weapon Crate Placement Mode",
 				"Utility Crate Placement Mode",
+				"Health Crate Placement Mode",
 				"Structure Placement Mode"
 				}
 sProx = 	{
 				{loc("Girder Placement Mode"),false},
 				{loc("Rubber Placement Mode"),false},
 				{loc("Mine Placement Mode"),false},
 				{loc("Sticky Mine Placement Mode"),false},
 				{loc("Barrel Placement Mode"),false},
-				{loc("Health Crate Placement Mode"),false},
 				{loc("Weapon Crate Placement Mode"),false},
 				{loc("Utility Crate Placement Mode"),false},
+				{loc("Health Crate Placement Mode"),false},
 				{loc("Structure Placement Mode"),false},
 				{loc("Teleportation Mode"),false}
 				}
 				RedefineSubset()
 			end
 			-- update display selection criteria
-			if (curWep == amGirder) or (curWep == amAirAttack) or (curWep == amNapalm) or (curWep == amDrillStrike) or (curWep == amRubber) then
+			if ((curWep == amGirder) or (curWep == amAirAttack) or (curWep == amNapalm) or (curWep == amDrillStrike) or (curWep == amRubber))
+				and (CurrentHedgehog ~= nil or band(GetState(CurrentHedgehog), gstHHDriven) ~= 0) then
 				---------------hooolllllyyyy fucking shit this
 				-- code is a broken mess now
 				-- it was redesigned and compromised three times
 				-- so now it is a mess trying to do what it was
 --		contents of crates
 --		gears to reposition etc.
 ---------------------------------------------------------------
 function updateCost()
+	if CurrentHedgehog == nil or band(GetState(CurrentHedgehog), gstHHDriven) == 0 then return end
 	if pMode[pIndex] == loc("Healing Station") then
 		placedExpense = 50
 	elseif pMode[pIndex] == loc("Weapon Filter") then
 		placedExpense = 50
 	end
 end
 function showModeMessage()
-	if CurrentHedgehog == nil then return end
+	if CurrentHedgehog == nil or band(GetState(CurrentHedgehog), gstHHDriven) == 0 then return end
 	local val = pMode[pIndex]
 	local str
 	if cat[cIndex] == "Mine Placement Mode" then
 		-- timer in seconds
 		str = string.format(loc("%d sec"), div(val, 1000))
 --		health/weapon/utility crate, placement of gears
 ---------------------------------------------------------
 function onUp()
 	if ( (curWep == amNapalm) or (curWep == amDrillStrike) ) then
-		updatePlacementDisplay(-1)
+		if CurrentHedgehog ~= nil or band(GetState(CurrentHedgehog), gstHHDriven) ~= 0 then
+			updatePlacementDisplay(-1)
+		end
 	end
 end
 function onDown()
 	if ( (curWep == amNapalm) or (curWep == amDrillStrike) ) then
-		updatePlacementDisplay(1)
+		if CurrentHedgehog ~= nil or band(GetState(CurrentHedgehog), gstHHDriven) ~= 0 then
+			updatePlacementDisplay(1)
+		end
 	end
 end
 ----------------------------

changeset 11762	660599c04bd8
parent 11747	3182ee5be2b0
parent 11761	25c6188084c2
child 11881	34ede05e4d4f