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

equal deleted inserted replaced

-:a260d233cef3
+:37b81c20358b
 -----------------------
 -- CRATE DEFINITIONS --
 -----------------------
 -- format:
--- { ammoType, ammoTypeString, unused, cost }
+-- { ammoType, cost }
 local costFactor = 20
 -- WEAPON CRATES
 -- Weapons which shouldn't be aded:
 -- Air attack, napalm, drillstrike: Overwritten weapons for the Construction Mode tools
 local atkArray = {
-	{amBazooka, 		"amBazooka",		0, 2*costFactor},
+	{amBazooka,	 2*costFactor},
-	--{amBee, 		"amBee",		0, 4*costFactor},
+	--{amBee,	 4*costFactor},
-	{amMortar, 		"amMortar",		0, 1*costFactor},
+	{amMortar,	 1*costFactor},
-	{amDrill, 		"amDrill",		0, 3*costFactor},
+	{amDrill,	 3*costFactor},
-	{amSnowball, 		"amSnowball",		0, 3*costFactor},
+	{amSnowball,	 3*costFactor},
-	{amGrenade,		"amGrenade",		0, 2*costFactor},
+	{amGrenade,	 2*costFactor},
-	{amClusterBomb,		"amClusterBomb",	0, 3*costFactor},
+	{amClusterBomb,	 3*costFactor},
-	{amWatermelon, 		"amWatermelon",		0, 25*costFactor},
+	{amWatermelon,	25*costFactor},
-	{amHellishBomb,		"amHellishBomb",	0, 25*costFactor},
+	{amHellishBomb,	25*costFactor},
-	{amMolotov, 		"amMolotov",		0, 3*costFactor},
+	{amMolotov,	 3*costFactor},
-	{amGasBomb, 		"amGasBomb",		0, 3*costFactor},
+	{amGasBomb,	 3*costFactor},
-	{amShotgun,		"amShotgun",		0, 2*costFactor},
+	{amShotgun,	 2*costFactor},
-	{amDEagle,		"amDEagle",		0, 2*costFactor},
+	{amDEagle,	 2*costFactor},
-	{amSniperRifle,		"amSniperRifle",	0, 3*costFactor},
+	{amSniperRifle,	 3*costFactor},
-	--{amSineGun, 		"amSineGun",		0, 6*costFactor},
+	--{amSineGun,	 6*costFactor},
-	{amFlamethrower,	"amFlamethrower",	0, 4*costFactor},
+	{amFlamethrower, 4*costFactor},
-	{amIceGun, 		"amIceGun",		0, 15*costFactor},
+	{amIceGun,	15*costFactor},
-	{amFirePunch, 		"amFirePunch",		0, 3*costFactor},
+	{amFirePunch,	 3*costFactor},
-	{amWhip,		"amWhip",		0, 1*costFactor},
+	{amWhip,	 1*costFactor},
-	{amBaseballBat, 	"amBaseballBat",	0, 7*costFactor},
+	{amBaseballBat,	 7*costFactor},
-	--{amKamikaze, 		"amKamikaze",		0, 1*costFactor},
+	--{amKamikaze,	 1*costFactor},
-	{amSeduction, 		"amSeduction",		0, 1*costFactor},
+	{amSeduction,	 1*costFactor},
-	{amHammer,		"amHammer",		0, 1*costFactor},
+	{amHammer,	 1*costFactor},
-	{amMine, 		"amMine",		0, 1*costFactor},
+	{amMine,	 1*costFactor},
-	{amDynamite, 		"amDynamite",		0, 9*costFactor},
+	{amDynamite,	 9*costFactor},
-	{amCake, 		"amCake",		0, 25*costFactor},
+	{amCake,	25*costFactor},
-	{amBallgun, 		"amBallgun",		0, 40*costFactor},
+	{amBallgun,	40*costFactor},
-	--{amRCPlane,		"amRCPlane",		0, 25*costFactor},
+	--{amRCPlane,	25*costFactor},
-	{amSMine,		"amSMine",		0, 5*costFactor},
+	{amSMine,	 5*costFactor},
-	--{amMineStrike,	"amMineStrike",		0, 15*costFactor},
+	--{amMineStrike,15*costFactor},
-	--{amPiano,		"amPiano",		0, 40*costFactor},
+	--{amPiano,	40*costFactor},
-	{amPickHammer,		"amPickHammer",		0, 2*costFactor},
+	{amPickHammer,	 2*costFactor},
-	{amBlowTorch, 		"amBlowTorch",		0, 4*costFactor},
+	{amBlowTorch,	 4*costFactor},
-	{amKnife,		"amKnife",		0, 2*costFactor},
+	{amKnife,	 2*costFactor},
-	{amBirdy,		"amBirdy",		0, 7*costFactor},
+	{amBirdy,	 7*costFactor},
-	{amDuck,		"amDuck",		0, 2*costFactor}
+	{amDuck,	 2*costFactor}
 }
 -- UTILITY CRATES --
 -- Utilities which shouldn't be added:
 -- * Resurrector: We have the resurrector structure for this
 -- Utilities which might be weird for this mode:
 -- * Tardis: Randomly teleports hog, maybe even into enemy clan's area
 local utilArray = {
-	{amLandGun,		"amLandGun",		0, 5*costFactor},
+	{amLandGun,	 5*costFactor},
-	{amRope, 		"amRope",		0, 7*costFactor},
+	{amRope,	 7*costFactor},
-	{amParachute, 		"amParachute",		0, 2*costFactor},
+	{amParachute,	 2*costFactor},
-	{amJetpack,		"amJetpack",		0, 8*costFactor},
+	{amJetpack,	 8*costFactor},
-	{amPortalGun,		"amPortalGun",		0, 15*costFactor},
+	{amPortalGun,	 15*costFactor},
-	{amInvulnerable,	"amInvulnerable",	0, 5*costFactor},
+	{amInvulnerable, 5*costFactor},
-	{amLaserSight,		"amLaserSight",		0, 2*costFactor},
+	{amLaserSight,	 2*costFactor},
-	{amVampiric,		"amVampiric",		0, 6*costFactor},
+	{amVampiric,	 6*costFactor},
-	{amLowGravity, 		"amLowGravity",		0, 4*costFactor},
+	{amLowGravity,	 4*costFactor},
-	{amExtraDamage, 	"amExtraDamage",	0, 6*costFactor},
+	{amExtraDamage,	 6*costFactor},
-	{amExtraTime,		"amExtraTime",		0, 8*costFactor}
+	{amExtraTime,	 8*costFactor}
 }
 ----------------------------
 -- Placement stuff
 ----------------------------
 -- primary placement categories
 local cIndex = 1 -- category index
 local cat = {
-	"Girder Placement Mode",
+	loc_noop("Girder Placement Mode"),
-	"Rubber Placement Mode",
+	loc_noop("Rubber Placement Mode"),
-	"Mine Placement Mode",
+	loc_noop("Mine Placement Mode"),
-	"Sticky Mine Placement Mode",
+	loc_noop("Sticky Mine Placement Mode"),
-	"Barrel Placement Mode",
+	loc_noop("Barrel Placement Mode"),
-	"Weapon Crate Placement Mode",
+	loc_noop("Weapon Crate Placement Mode"),
-	"Utility Crate Placement Mode",
+	loc_noop("Utility Crate Placement Mode"),
-	"Health Crate Placement Mode",
+	loc_noop("Health Crate Placement Mode"),
-	"Structure Placement Mode"
+	loc_noop("Structure Placement Mode"),
 }
 local catReverse = {}
 for c=1, #cat do
 	catReverse[cat[c]] = c
 end
+-- Track girders in proximity of CurrentHedgehog
 local sProx = {
-	{loc("Girder Placement Mode"),false},
+	["Girder Placement Mode"] = false,
-	{loc("Rubber Placement Mode"),false},
+	["Rubber Placement Mode"] = false,
-	{loc("Mine Placement Mode"),false},
+	["Mine Placement Mode"] = false,
-	{loc("Sticky Mine Placement Mode"),false},
+	["Sticky Mine Placement Mode"] = false,
-	{loc("Barrel Placement Mode"),false},
+	["Barrel Placement Mode"] = false,
-	{loc("Weapon Crate Placement Mode"),false},
+	["Weapon Crate Placement Mode"] = false,
-	{loc("Utility Crate Placement Mode"),false},
+	["Utility Crate Placement Mode"] = false,
-	{loc("Health Crate Placement Mode"),false},
+	["Health Crate Placement Mode"] = false,
-	{loc("Structure Placement Mode"),false},
+	["Structure Placement Mode"] = false,
-	{loc("Teleportation Mode"),false},
+	["Teleportation Mode"] = false,
 }
 local pMode = {}	-- pMode contains custom subsets of the main categories
 local pIndex = 1
 local currentGirderRotation = 1 -- current girder rotation, we actually need this as HW remembers what rotation you last used
 	local frameID = 0
 	local visualSprite = sprTarget
 	local madness = AddVisualGear(GetX(tempG), GetY(tempG), vgtStraightShot, 1, true,1)
-	if pType == loc("Reflector Shield") then
+	if pType == "Reflector Shield" then
 		table.insert(strucHealth,255)
 	else
 		table.insert(strucHealth,1)
 	end
 	table.insert(strucCirc,tempCirc)
 	table.insert(strucCircType, 1)
-	if pType == loc("Bio-Filter") then
+	if pType == "Bio-Filter" then
 		table.insert(strucCircCol,colorRed)
 		table.insert(strucCircRadius,1000)
 		frameID = 7
-	elseif pType == loc("Healing Station") then
+	elseif pType == "Healing Station" then
 		table.insert(strucCircCol,0xFF00FF00)
 		table.insert(strucCircRadius,500)
 		frameID = 3
-	elseif pType == loc("Respawner") then
+	elseif pType == "Respawner" then
 		table.insert(strucCircCol,0xFF00FF00)
 		table.insert(strucCircRadius,75)
 		runOnHogs(EnableHogResurrectionForThisClan)
 		frameID = 1
-	elseif pType == loc("Teleportation Node") then
+	elseif pType == "Teleportation Node" then
 		table.insert(strucCircCol,0x0000FFFF)
 		table.insert(strucCircRadius,350)
 		frameID = 6
-	elseif pType == loc("Generator") then
+	elseif pType == "Generator" then
 		table.insert(strucCircCol,0xFFFF00FF)
 		table.insert(strucCircRadius,75)
 		setGearValue(tempG, "power", 0)
 		frameID = 2
-	elseif pType == loc("Support Station") then
+	elseif pType == "Support Station" then
 		table.insert(strucCircCol,0xFFFF00FF)
 		table.insert(strucCircRadius,500)
 		frameID = 4
-	elseif pType == loc("Construction Station") then
+	elseif pType == "Construction Station" then
 		table.insert(strucCircCol,0xFFFFFFFF)
 		table.insert(strucCircRadius,500)
 		frameID = 8
-	elseif pType == loc("Reflector Shield") then
+	elseif pType == "Reflector Shield" then
 		table.insert(strucCircCol,0xffae00ff)
 		table.insert(strucCircRadius,750)
 		frameID = 9
-	elseif pType == loc("Weapon Filter") then
+	elseif pType == "Weapon Filter" then
 		table.insert(strucCircCol,0xa800ffff)
 		table.insert(strucCircRadius,750)
 		frameID = 5
 	end
 	local respawnerDestroyed = false
 	for i = 1, #strucID do
 		if strucID[i] == getGearValue(gear,"uniqueStructureID") then
-			if strucType[i] == loc("Respawner") then
+			if strucType[i] == "Respawner" then
 				respawnerDestroyed = true
 			end
 			table.remove(strucID,i)
 			table.remove(strucGear,i)
 -- this is called when a respawner blows up
 function RecalibrateRespawn(gear)
 	local respawnerList = {}
 	for i = 1, #strucID do
-		if (strucType[i] == loc("Respawner")) and (strucClan[i] == GetHogClan(gear)) then
+		if (strucType[i] == "Respawner") and (strucClan[i] == GetHogClan(gear)) then
 			table.insert(respawnerList, i)
 		end
 	end
 	if #respawnerList >= 1 then
 --resposition dead hogs at a respawner if they own one
 function FindRespawner(gear)
 	local respawnerList = {}
 	for i = 1, #strucID do
-		if (strucType[i] == loc("Respawner")) and (strucClan[i] == GetHogClan(gear)) then
+		if (strucType[i] == "Respawner") and (strucClan[i] == GetHogClan(gear)) then
 			table.insert(respawnerList, i)
 		end
 	end
 	if #respawnerList >= 1 then
 	local teleportOriginSuccessful = false
 	local teleportDestinationSuccessful = false
 	for i = 1, #strucID do
-		if (strucType[i] == loc("Teleportation Node")) and (strucClan[i] == GetHogClan(CurrentHedgehog)) then
+		if (strucType[i] == "Teleportation Node") and (strucClan[i] == GetHogClan(CurrentHedgehog)) then
 			local dist = GetDistFromGearToXY(CurrentHedgehog,GetX(strucGear[i]), GetY(strucGear[i]))
 			local NR
 			if strucCircType[i] == 0 then
 				NR = strucCircRadius[i]
 	-- we're in business
 	if dist <= NR*NR then
 		-- heal clan hogs
-		if strucType[sID] == loc("Healing Station") then
+		if strucType[sID] == "Healing Station" then
 			if GetGearType(gear) == gtHedgehog then
 				if GetHogClan(gear) == strucClan[sID] then
 					local hogLife = GetHealth(gear)
 				end
 			end
 		-- explode enemy clan hogs
-		elseif strucType[sID] == loc("Bio-Filter") then
+		elseif strucType[sID] == "Bio-Filter" then
 			if GetGearType(gear) == gtHedgehog then
 				if (GetHogClan(gear) ~= strucClan[sID]) and (GetHealth(gear) > 0) then
 					AddGear(GetX(gear), GetY(gear), gtGrenade, 0, 0, 0, 1)
 				end
 			end
 		-- were those weapons in your pocket, or were you just happy to see me?
-		elseif strucType[sID] == loc("Weapon Filter") then
+		elseif strucType[sID] == "Weapon Filter" then
 			if GetGearType(gear) == gtHedgehog then
 				if (GetHogClan(gear) ~= strucClan[sID]) then
 					for wpnIndex = 1, #atkArray do
 				end
 			end
 		-- BOUNCE! POGO! POGO! POGO! POGO!
-		elseif strucType[sID] == loc("Reflector Shield") then
+		elseif strucType[sID] == "Reflector Shield" then
 			-- add check for whose projectile it is
 			if gearCanBeDeflected(gear) == true then
 				local gOwner = getGearValue(gear,"owner")
 					end
 				end
 			end
 		--mark as within range of a teleporter node
-		elseif strucType[sID] == loc("Teleportation Node") then
+		elseif strucType[sID] == "Teleportation Node" then
 			if GetGearType(gear) == gtHedgehog then
 				if GetHogClan(gear) == strucClan[sID] then
-					for i = 1, #sProx do
+					sProx["Teleportation Mode"] = true
-						if sProx[i][1] == loc("Teleportation Mode") then
-							sProx[i][2] = true
-						end
-					end
 				end
 			end
 		-- mark as within range of construction station
 		-- and thus allow menu access to placement modes
 		-- for girders, mines, sticky mines and barrels
-		elseif strucType[sID] == loc("Construction Station") then
+		elseif strucType[sID] == "Construction Station" then
 			if GetGearType(gear) == gtHedgehog then
 				if GetHogClan(gear) == strucClan[sID] then
 					AddVisualGear(GetX(strucGear[sID]), GetY(strucGear[sID]), vgtSmoke, 0, true)
-					for i = 1, #sProx do
+					sProx["Girder Placement Mode"] = true
-						if ((sProx[i][1] == loc("Girder Placement Mode"))
+					sProx["Rubber Placement Mode"] = true
-						or (sProx[i][1] == loc("Rubber Placement Mode"))
+					sProx["Mine Placement Mode"] = true
-						or (sProx[i][1] == loc("Mine Placement Mode"))
+					sProx["Sticky Mine Placement Mode"] = true
-						or (sProx[i][1] == loc("Sticky Mine Placement Mode"))
+					sProx["Barrel Placement Mode"] = true
-						or (sProx[i][1] == loc("Barrel Placement Mode")))
-						then
-							sProx[i][2] = true
-						end
-					end
 				end
 			end
 		-- mark as within stupport station range
 		-- and thus allow menu access to placement modes
 		-- for weapon, utility, and med crates
-		elseif strucType[sID] == loc("Support Station") then
+		elseif strucType[sID] == "Support Station" then
 			if GetGearType(gear) == gtHedgehog then
 				if GetHogClan(gear) == strucClan[sID] then
 					AddVisualGear(GetX(strucGear[sID]), GetY(strucGear[sID]), vgtSmoke, 0, true)
-					for i = 1, #sProx do
+					sProx["Health Crate Placement Mode"] = true
-						if ((sProx[i][1] == loc("Health Crate Placement Mode"))
+					sProx["Weapon Crate Placement Mode"] = true
-						or (sProx[i][1] == loc("Weapon Crate Placement Mode"))
+					sProx["Utility Crate Placement Mode"] = true
-						or (sProx[i][1] == loc("Utility Crate Placement Mode")))
-						then
-							sProx[i][2] = true
-						end
-					end
 				end
 			end
 		end
 end
 -- used to check if we need to run through all hogs or just currenthedgehog
 function isAStructureThatAppliesToMultipleGears(pID)
-	if 	strucType[pID] == loc("Healing Station") or
+	if 	strucType[pID] == "Healing Station" or
-		strucType[pID] == loc("Reflector Shield") or
+		strucType[pID] == "Reflector Shield" or
-		strucType[pID] == loc("Weapon Filter") or
+		strucType[pID] == "Weapon Filter" or
-		strucType[pID] == loc("Bio-Filter")
+		strucType[pID] == "Bio-Filter"
 	then
 		return(true)
 	else
 		return(false)
 	end
 end
 function HandleStructures()
 	if GameTime % 100 == 0 then
-		for i = 1, #sProx do
+		for k, _ in pairs(sProx) do
-			sProx[i][2] = false
+			if k ~= "Structure Placement Mode" then
+				sProx[k] = false
-			if sProx[i][1] == loc("Structure Placement Mode") then
+			end
-				sProx[i][2] = true
-			end
 		end
 	end
 	for i = 1, #strucID do
 				if CurrentHedgehog ~= nil then
 					CheckProximity(CurrentHedgehog)
 				end
 			end
-			if strucType[i] == loc("Generator") then
+			if strucType[i] == "Generator" then
 				for z = 0, ClansCount-1 do
 					if z == strucClan[i] then
 						increaseGearValue(strucGear[i],"power")
 						if getGearValue(strucGear[i],"power") == 10 then
 		end
 	end
+	-- Add and remove ammo based on structure proximity
-	-- this is kinda messy and gross (even more than usual), fix it up at some point
-	-- it just assumes that if you have access to girders, it works for rubbers
-	-- as that is what the struc implemenation means due to construction station
 	if GameTime % 100 == 0 and CurrentHedgehog ~= nil then
-		local anyUIProx = false
+		if sProx["Girder Placement Mode"] then
-		for i = 1, #sProx do
+			AddAmmo(CurrentHedgehog, amGirder, 100)
+		else
-			if sProx[i][1] == loc("Girder Placement Mode") then
+			AddAmmo(CurrentHedgehog, amGirder, 0)
-				if sProx[i][2] == true then
+		end
-					AddAmmo(CurrentHedgehog, amGirder, 100)
+		if sProx["Rubber Placement Mode"] then
-					AddAmmo(CurrentHedgehog, amRubber, 100)
+			AddAmmo(CurrentHedgehog, amRubber, 100)
-					AddAmmo(CurrentHedgehog, amCMObjectPlacer, 100)
+		else
-				else
+			AddAmmo(CurrentHedgehog, amRubber, 0)
-					AddAmmo(CurrentHedgehog, amGirder, 0)
+		end
-					AddAmmo(CurrentHedgehog, amRubber, 0)
+		if sProx["Mine Placement Mode"] or sProx["Sticky Mine Placement Mode"] or sProx["Barrel Placement Mode"] then
-					AddAmmo(CurrentHedgehog, amCMObjectPlacer, 0) -- new
+			AddAmmo(CurrentHedgehog, amCMObjectPlacer, 100)
-				end
+		else
-			elseif sProx[i][1] == loc("Teleportation Mode") then
+			AddAmmo(CurrentHedgehog, amCMObjectPlacer, 0)
-				if sProx[i][2] == true then
+		end
-					AddAmmo(CurrentHedgehog, amTeleport, 100)
+		if sProx["Teleportation Mode"] then
-				else
+			AddAmmo(CurrentHedgehog, amTeleport, 100)
-					AddAmmo(CurrentHedgehog, amTeleport, 0)
+		else
-				end
+			AddAmmo(CurrentHedgehog, amTeleport, 0)
-			elseif sProx[i][1] == loc("Weapon Crate Placement Mode") then
+		end
-				-- this is new stuff
+		if sProx["Weapon Crate Placement Mode"] or sProx["Utility Crate Placement Mode"] or sProx["Health Crate Placement Mode"] then
-				if sProx[i][2] == true then
+			AddAmmo(CurrentHedgehog, amCMCratePlacer, 100)
-					AddAmmo(CurrentHedgehog, amCMCratePlacer, 100)
+		else
-				else
+			AddAmmo(CurrentHedgehog, amCMCratePlacer, 0)
-					AddAmmo(CurrentHedgehog, amCMCratePlacer, 0)
-				end
-			end
-			if (sProx[i][2] == true) then
-				anyUIProx = true
-			end
 		end
 	end
 end
 		elseif cat[cIndex] == "Health Crate Placement Mode" then
 			gear = SpawnHealthCrate(x,y)
 			if gear ~= nil then
 				placed = true
 				SetHealth(gear, pMode[pIndex])
-				setGearValue(gear,"caseType","med")
 				clanCratesSpawned[GetHogClan(CurrentHedgehog)] = clanCratesSpawned[GetHogClan(CurrentHedgehog)] +1
 			end
 		elseif cat[cIndex] == "Weapon Crate Placement Mode" then
 			gear = SpawnAmmoCrate(x, y, atkArray[pIndex][1])
 			if gear ~= nil then
 				placed = true
-				setGearValue(gear,"caseType","ammo")
-				setGearValue(gear,"contents",atkArray[pIndex][2])
 				clanCratesSpawned[GetHogClan(CurrentHedgehog)] = clanCratesSpawned[GetHogClan(CurrentHedgehog)] +1
 			end
 		elseif cat[cIndex] == "Utility Crate Placement Mode" then
 			gear = SpawnUtilityCrate(x, y, utilArray[pIndex][1])
 			if gear ~= nil then
 				placed = true
-				setGearValue(gear,"caseType","util")
-				setGearValue(gear,"contents",utilArray[pIndex][2])
 				if utilArray[pIndex][1] == amExtraTime then
 					clanUsedExtraTime[GetHogClan(CurrentHedgehog)] = true
 				end
 				clanCratesSpawned[GetHogClan(CurrentHedgehog)] = clanCratesSpawned[GetHogClan(CurrentHedgehog)] +1
 			end
 	local team = GetHogTeamName(CurrentHedgehog)
 	if cat[cIndex] == "Girder Placement Mode" then
 		pIndex = currentGirderRotation
-		pMode = {loc("Girder")}
+		pMode = {amGirder}
 	elseif cat[cIndex] == "Rubber Placement Mode" then
 		pIndex = currentGirderRotation
-		pMode = {loc("Rubber")}
+		pMode = {amRubber}
 		placedExpense = 3
 	elseif cat[cIndex] == "Barrel Placement Mode" then
 		pMode = {60}
 		placedExpense = 10
 		teamLObjectMode[team] = cat[cIndex]
 		pMode = {HealthCaseAmount}
 		placedExpense = 5
 		teamLCrateMode[team] = cat[cIndex]
 	elseif cat[cIndex] == "Weapon Crate Placement Mode" then
 		for i = 1, #atkArray do
-			pMode[i] = GetAmmoName(atkArray[i][1])
+			pMode[i] = atkArray[i][1]
 		end
-		placedExpense = atkArray[pIndex][4]
+		placedExpense = atkArray[pIndex][2]
 		teamLCrateMode[team] = cat[cIndex]
 		pIndex = teamLWeapIndex[team]
 	elseif cat[cIndex] == "Utility Crate Placement Mode" then
 		for i = 1, #utilArray do
-			pMode[i] = GetAmmoName(utilArray[i][1])
+			pMode[i] = utilArray[i][1]
 		end
-		placedExpense = utilArray[pIndex][4]
+		placedExpense = utilArray[pIndex][2]
 		teamLCrateMode[team] = cat[cIndex]
 		pIndex = teamLUtilIndex[team]
 	elseif cat[cIndex] == "Mine Placement Mode" then
 		pMode = {0,1000,2000,3000,4000,5000}
 		placedExpense = 15
 		teamLObjectMode[team] = cat[cIndex]
 		pIndex = teamLMineIndex[team]
 	elseif cat[cIndex] == "Sticky Mine Placement Mode" then
-		pMode = {loc("Sticky Mine")}
+		pMode = {amSMine}
 		placedExpense = 20
 		teamLObjectMode[team] = cat[cIndex]
 	elseif cat[cIndex] == "Structure Placement Mode" then
 		pMode = {
-			loc("Support Station"),
+			loc_noop("Support Station"),
-			loc("Construction Station"),
+			loc_noop("Construction Station"),
-			loc("Healing Station"),
+			loc_noop("Healing Station"),
-			loc("Teleportation Node"),
+			loc_noop("Teleportation Node"),
-			loc("Weapon Filter"),
+			loc_noop("Weapon Filter"),
-			loc("Bio-Filter"),
+			loc_noop("Bio-Filter"),
-			loc("Reflector Shield"),
+			loc_noop("Reflector Shield"),
-			loc("Respawner"),
+			loc_noop("Respawner"),
-			loc("Generator"),
+			loc_noop("Generator"),
 		}
 		pIndex = teamLStructIndex[team]
 	end
 	return true
 function updateCost()
 	if CurrentHedgehog == nil or band(GetState(CurrentHedgehog), gstHHDriven) == 0 then return end
-	if pMode[pIndex] == loc("Healing Station") then
+	if pMode[pIndex] == "Healing Station" then
 		placedExpense = 50
-	elseif pMode[pIndex] == loc("Weapon Filter") then
+	elseif pMode[pIndex] == "Weapon Filter" then
 		placedExpense = 50
-	elseif pMode[pIndex] == loc("Bio-Filter") then
+	elseif pMode[pIndex] == "Bio-Filter" then
 		placedExpense = 100
-	elseif pMode[pIndex] == loc("Respawner") then
+	elseif pMode[pIndex] == "Respawner" then
 		placedExpense = 300
-	elseif pMode[pIndex] == loc("Teleportation Node") then
+	elseif pMode[pIndex] == "Teleportation Node" then
 		placedExpense = 30
-	elseif pMode[pIndex] == loc("Support Station") then
+	elseif pMode[pIndex] == "Support Station" then
 		placedExpense = 50
-	elseif pMode[pIndex] == loc("Construction Station") then
+	elseif pMode[pIndex] == "Construction Station" then
 		placedExpense = 50
-	elseif pMode[pIndex] == loc("Generator") then
+	elseif pMode[pIndex] == "Generator" then
-			placedExpense = 300
+		placedExpense = 300
-	elseif pMode[pIndex] == loc("Reflector Shield") then
+	elseif pMode[pIndex] == "Reflector Shield" then
-			placedExpense = 200
+		placedExpense = 200
 	elseif cat[cIndex] == "Weapon Crate Placement Mode" then
-		placedExpense = atkArray[pIndex][4]
+		placedExpense = atkArray[pIndex][2]
 	elseif cat[cIndex] == "Utility Crate Placement Mode" then
-		placedExpense = utilArray[pIndex][4]
+		placedExpense = utilArray[pIndex][2]
 	end
-	AddCaption(loc("Cost") .. ": " .. placedExpense,0xffba00ff,capgrpAmmostate)
+	AddCaption(string.format(loc("Cost: %d"), placedExpense), 0xffba00ff, capgrpAmmostate)
 end
 -- Should be called when the index of the mode was changed by the player.
 -- E.g. new weapon crate contents or structure type
 	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))
+	elseif cat[cIndex] == "Structure Placement Mode" then
+		str = loc(val)
 	elseif cat[cIndex] == "Girder Placement Mode" then
-		str = loc("Girder")
+		str = GetAmmoName(amGirder)
 	elseif cat[cIndex] == "Rubber Placement Mode" then
-		str = loc("Rubber")
+		str = GetAmmoName(amRubber)
+	elseif cat[cIndex] == "Weapon Crate Placement Mode"
+	or cat[cIndex] == "Utility Crate Placement Mode"
+	or cat[cIndex] == "Sticky Mine Placement Mode" then
+		str = GetAmmoName(val)
 	else
 		str = tostring(val)
 	end
-	AddCaption(str,0xffba00ff,capgrpMessage2)
+	AddCaption(str, 0xffba00ff, capgrpMessage2)
 end
 function rotateMode(pDir)
 	curWep = GetCurAmmoType()
 	local foundMatch = false
 		elseif cIndex > #cat then
 			cIndex = 3       -- we no longer hit girder by normal means
 		end
 		if (GetCurAmmoType() == amCMCratePlacer) then
-			if (sProx[cIndex][1] == loc("Health Crate Placement Mode")) or
+			if (cat[cIndex] == "Health Crate Placement Mode") or
-				(sProx[cIndex][1] == loc("Weapon Crate Placement Mode")) or
+				(cat[cIndex] == "Weapon Crate Placement Mode") or
-				(sProx[cIndex][1] == loc("Utility Crate Placement Mode")) then
+				(cat[cIndex] == "Utility Crate Placement Mode") then
 					foundMatch = true
 			end
 		elseif (GetCurAmmoType() == amCMObjectPlacer) then
-			if (sProx[cIndex][1] == loc("Mine Placement Mode")) or
+			if (cat[cIndex] == "Mine Placement Mode") or
-				(sProx[cIndex][1] == loc("Sticky Mine Placement Mode")) or
+				(cat[cIndex] == "Sticky Mine Placement Mode") or
-				(sProx[cIndex][1] == loc("Barrel Placement Mode")) then
+				(cat[cIndex] == "Barrel Placement Mode") then
 				foundMatch = true
 			end
 		elseif (GetCurAmmoType() == amCMStructurePlacer) then
-			if sProx[cIndex][1] == loc("Structure Placement Mode") then
+			if cat[cIndex] == "Structure Placement Mode" then
 				foundMatch = true
 			end
 		end
 	end

changeset 12951	37b81c20358b
parent 12950	a260d233cef3
child 12952	eafaada79157