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

equal deleted inserted replaced

-:37b81c20358b
+:eafaada79157
 local strucHealth = {}
 local strucCirc = {}
 local strucCircCol = {}
 local strucCircRadius = {}
-local strucCircType = {}
 local strucAltDisplay = {}
 -- Clan stuff
 local clanPower = {} -- current power for each clan. Used to build stuff
 local clanPowerTag = nil -- visual gear ID of displayed clan power
 -1 means “do nothing”. ]]
 local checkForSpecialWeaponsIn = -1
 local lastWep = amNothing -- helper variable to track the previous hack
 -- Colors
-local colorRed = 0xff0000ff
+local colorClanTag = 0x00ff00ff
-local colorGreen = 0x00ff00ff
+local colorSupportStation = 0xFFFF00FF
+local colorConstructionStation = 0xFFFFFFFF
+local colorTeleportationNode = 0x0000FFFF
+local colorHealingStation = 0xFF808040 -- Just a slight glow
+local colorBioFilter = 0xFF0000FF
+local colorReflectorShield = 0xFFAE00FF
+local colorWeaponFilter =  0xA800FFFF
+local colorHealingStationParticle = 0x00FF00FF
+local colorMessage = 0xFFBA00FF
 -- Fake ammo types, for the overwritten weapons in Construction Mode
 local amCMStructurePlacer = amAirAttack
 local amCMCratePlacer = amNapalm
 local amCMObjectPlacer = amDrillStrike
 	local zoomL = 1.1
 	local xOffset = 45
 	local yOffset = 70
 	local tValue = clanPower[GetHogClan(CurrentHedgehog)]
-	local tCol = 0x00ff00ff
+	local tCol = colorClanTag
+	-- alternatively:  tCol = GetClanColor(GetHogClan(CurrentHedgehog))
 	DeleteVisualGear(clanPowerTag)
 	clanPowerTag = AddVisualGear(-div(ScreenWidth, 2) + xOffset, ScreenHeight - yOffset, vgtHealthTag, tValue, false)
 	SetVisualGearValues(
 		zoomL, 		-- zoom
 		1, 		-- ~= 0 means align to screen
 		nil, 		-- frameticks
 		nil, 		-- value (set above)
 		240000, 	-- timer
-		tCol		-- color.   -- GetClanColor( GetHogClan(CurrentHedgehog) )
+		tCol		-- color
 	)
 end
 function XYisInRect(px, py, psx, psy, pex, pey)
 	SetGearPosition(tempG, pX, pY)
 	setGearValue(tempG, "uniqueStructureID", uniqueStructureID)
 	local tempCirc = AddVisualGear(0,0,vgtCircle,0,true)
-	SetVisualGearValues(tempCirc, 0, 0, 100, 255, 1, 100, 0, 500, 1, 0xFFFFFF00)
+	if pType ~= "Respawner" and pType ~= "Generator" then
+		SetVisualGearValues(tempCirc, 0, 0, 100, 255, 1, 100, 0, 500, 1, 0xFFFFFF00)
+		table.insert(strucCirc, tempCirc)
+	else
+		table.insert(strucCirc, false)
+	end
 	table.insert(strucID, uniqueStructureID)
 	table.insert(strucType, pType)
 	table.insert(strucGear,tempG)
 	table.insert(strucClan,pClan)
 	else
 		table.insert(strucHealth,1)
 	end
-	table.insert(strucCirc,tempCirc)
-	table.insert(strucCircType, 1)
 	if pType == "Bio-Filter" then
-		table.insert(strucCircCol,colorRed)
+		table.insert(strucCircCol, colorBioFilter)
 		table.insert(strucCircRadius,1000)
 		frameID = 7
 	elseif pType == "Healing Station" then
-		table.insert(strucCircCol,0xFF00FF00)
+		table.insert(strucCircCol, colorHealingStation)
 		table.insert(strucCircRadius,500)
 		frameID = 3
 	elseif pType == "Respawner" then
-		table.insert(strucCircCol,0xFF00FF00)
+		table.insert(strucCircCol, 0)
-		table.insert(strucCircRadius,75)
+		table.insert(strucCircRadius,0)
 		runOnHogs(EnableHogResurrectionForThisClan)
 		frameID = 1
 	elseif pType == "Teleportation Node" then
-		table.insert(strucCircCol,0x0000FFFF)
+		table.insert(strucCircCol, colorTeleportationNode)
 		table.insert(strucCircRadius,350)
 		frameID = 6
 	elseif pType == "Generator" then
-		table.insert(strucCircCol,0xFFFF00FF)
+		table.insert(strucCircCol, 0)
-		table.insert(strucCircRadius,75)
+		table.insert(strucCircRadius,0)
 		setGearValue(tempG, "power", 0)
 		frameID = 2
 	elseif pType == "Support Station" then
-		table.insert(strucCircCol,0xFFFF00FF)
+		table.insert(strucCircCol, colorSupportStation)
 		table.insert(strucCircRadius,500)
 		frameID = 4
 	elseif pType == "Construction Station" then
-		table.insert(strucCircCol,0xFFFFFFFF)
+		table.insert(strucCircCol, colorConstructionStation)
 		table.insert(strucCircRadius,500)
 		frameID = 8
 	elseif pType == "Reflector Shield" then
-		table.insert(strucCircCol,0xffae00ff)
+		table.insert(strucCircCol, colorReflectorShield)
 		table.insert(strucCircRadius,750)
 		frameID = 9
 	elseif pType == "Weapon Filter" then
-		table.insert(strucCircCol,0xa800ffff)
+		table.insert(strucCircCol, colorWeaponFilter)
 		table.insert(strucCircRadius,750)
 		frameID = 5
 	end
 			DeleteVisualGear(strucCirc[i])
 			table.remove(strucCirc,i)
 			table.remove(strucCircCol,i)
 			table.remove(strucCircRadius,i)
-			table.remove(strucCircType,i)
 			if strucAltDisplay[i] ~= 1 then
 				DeleteVisualGear(strucAltDisplay[i])
 			end
 			table.remove(strucAltDisplay,i)
 		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 = (48/100*strucCircRadius[i])/2
-				NR = strucCircRadius[i]
-			else
-				NR = (48/100*strucCircRadius[i])/2
-			end
 			if dist <= NR*NR then
 				teleportOriginSuccessful = true
 			end
 			dist = GetDistFromXYtoXY(tX,tY,GetX(strucGear[i]), GetY(strucGear[i]))
-			if strucCircType[i] == 0 then
+			NR = (48/100*strucCircRadius[i])/2
-				NR = strucCircRadius[i]
-			else
-				NR = (48/100*strucCircRadius[i])/2
-			end
 			if dist <= NR*NR then
 				teleportDestinationSuccessful = true
 			end
 		end
 		return
 	end
 	-- calculate my real radius if I am an aura
 	local NR
-	if strucCircType[sID] == 0 then
+	NR = (48/100*strucCircRadius[sID])/2
-		NR = strucCircRadius[sID]
-	else
-		NR = (48/100*strucCircRadius[sID])/2
-	end
 	-- we're in business
 	if dist <= NR*NR then
 		-- heal clan hogs
 						end
 					end
 					-- change this to the med kit sprite health ++++s later
 					local tempE = AddVisualGear(GetX(strucGear[sID]), GetY(strucGear[sID]), vgtSmoke, 0, true)
-					SetVisualGearValues(tempE, nil, nil, nil, nil, nil, nil, nil, nil, nil, colorGreen)
+					SetVisualGearValues(tempE, nil, nil, nil, nil, nil, nil, nil, nil, nil, colorHealingStationParticle)
 				end
 			end
 		-- explode enemy clan hogs
 							AddVisualGear(GetX(gear), GetY(gear), vgtExplosion, 0, false)
 							PlaySound(sndExplosion)
 							strucHealth[sID] = strucHealth[sID] - gDmg
-							strucCircCol[sID] = strucCircCol[sID] - gDmg
+							if strucCirc[sID] then
+								strucCircCol[sID] = strucCircCol[sID] - gDmg
+							end
 							if strucHealth[sID] <= 0 then
 								AddVisualGear(GetX(strucGear[sID]), GetY(strucGear[sID]), vgtExplosion, 0, false)
 								DeleteGear(strucGear[sID])
 								PlaySound(sndExplosion)
 		end
 	end
 	for i = 1, #strucID do
-		SetVisualGearValues(strucCirc[i], GetX(strucGear[i]), GetY(strucGear[i]), nil, nil, nil, nil, nil, strucCircRadius[i], nil, strucCircCol[i])
+		if strucCirc[i] then
+			SetVisualGearValues(strucCirc[i], GetX(strucGear[i]), GetY(strucGear[i]), nil, nil, nil, nil, nil, strucCircRadius[i], nil, strucCircCol[i])
+		end
 		tempID_CheckProximity = i
 		SetVisualGearValues(strucAltDisplay[i], GetX(strucGear[i]), GetY(strucGear[i]), 0, 0, nil, nil, 800000, sprTarget)
 -- essentially called when user clicks the mouse
 -- with girders or an airattack
 function PlaceObject(x,y)
 	if (clanUsedExtraTime[GetHogClan(CurrentHedgehog)] == true) and (cat[cIndex] == "Utility Crate Placement Mode") and (utilArray[pIndex][1] == amExtraTime) then
-		AddCaption(loc("You may only place 1 Extra Time crate per turn."),0xffba00ff,capgrpVolume)
+		AddCaption(loc("You may only place 1 Extra Time crate per turn."),colorMessage,capgrpVolume)
 		PlaySound(sndDenied)
 	elseif (conf_cratesPerRound ~= "inf" and clanCratesSpawned[GetHogClan(CurrentHedgehog)] >= conf_cratesPerRound) and ( (cat[cIndex] == "Health Crate Placement Mode") or (cat[cIndex] == "Utility Crate Placement Mode") or (cat[cIndex] == "Weapon Crate Placement Mode")  )  then
-		AddCaption(string.format(loc("You may only place %d crates per round."), conf_cratesPerRound),0xffba00ff,capgrpVolume)
+		AddCaption(string.format(loc("You may only place %d crates per round."), conf_cratesPerRound),colorMessage,capgrpVolume)
 		PlaySound(sndDenied)
 	elseif (XYisInRect(x,y, clanBoundsSX[GetHogClan(CurrentHedgehog)],clanBoundsSY[GetHogClan(CurrentHedgehog)],clanBoundsEX[GetHogClan(CurrentHedgehog)],clanBoundsEY[GetHogClan(CurrentHedgehog)]) == true)
 	and (clanPower[GetHogClan(CurrentHedgehog)] >= placedExpense)
 	then
 		-- For checking if the actual placement succeeded
 		end
 		if placed then
 			clanPower[GetHogClan(CurrentHedgehog)] = clanPower[GetHogClan(CurrentHedgehog)] - placedExpense
 		else
-			AddCaption(loc("Invalid Placement"),0xffba00ff,capgrpVolume)
+			AddCaption(loc("Invalid Placement"),colorMessage,capgrpVolume)
 			PlaySound(sndDenied)
 		end
 	else
 		if (clanPower[GetHogClan(CurrentHedgehog)] >= placedExpense) then
-			AddCaption(loc("Invalid Placement"),0xffba00ff,capgrpVolume)
+			AddCaption(loc("Invalid Placement"),colorMessage,capgrpVolume)
 		else
-			AddCaption(loc("Insufficient Power"),0xffba00ff,capgrpVolume)
+			AddCaption(loc("Insufficient Power"),colorMessage,capgrpVolume)
 		end
 		PlaySound(sndDenied)
 	end
 end
 			updateCost()
 			updated = true
 		end
 		if updated then
-			AddCaption(loc(cat[cIndex]), 0xffba00ff, capgrpMessage)
+			AddCaption(loc(cat[cIndex]), colorMessage, capgrpMessage)
 			showModeMessage()
 			wallsVisible = true
 		else
 			wallsVisible = false
 		end
 		placedExpense = atkArray[pIndex][2]
 	elseif cat[cIndex] == "Utility Crate Placement Mode" then
 		placedExpense = utilArray[pIndex][2]
 	end
-	AddCaption(string.format(loc("Cost: %d"), placedExpense), 0xffba00ff, capgrpAmmostate)
+	AddCaption(string.format(loc("Cost: %d"), placedExpense), colorMessage, 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
 	or cat[cIndex] == "Sticky Mine Placement Mode" then
 		str = GetAmmoName(val)
 	else
 		str = tostring(val)
 	end
-	AddCaption(str, 0xffba00ff, capgrpMessage2)
+	AddCaption(str, colorMessage, capgrpMessage2)
 end
 function rotateMode(pDir)
 	curWep = GetCurAmmoType()
 	local foundMatch = false

changeset 12952	eafaada79157
parent 12951	37b81c20358b
child 12953	7ea62261c481