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

equal deleted inserted replaced

-:efcdf31684ca
+:10c914738f22
 ----------because someone is too lazy
 ----------to read about tables properly
 ------------------ "Oh well, they probably have the memory"
 local gameStarted = false
+local gameOver = false
 local captureLimit = 3
 --------------------------
 -- hog and team tracking variales
 --------------------------
 -------------------
 -- flag variables
 -------------------
-local fPlaced = {} -- has the flag been placed TRUE/FALSE
 local fGear = {}	-- pointer to the visual gears that represent the flag
 local fGearX = {}
 local fGearY = {}
 local fThief = {}	-- pointer to the hogs who stole the flags
+local fThiefFlag = {}   -- contains the stolen flag type of fThief
 local fIsMissing = {}	-- have the flags been destroyed or captured
 local fNeedsRespawn = {}	-- do the flags need to be respawned
 local fCaptures = {}	-- the team "scores" how many captures
 local fSpawnX = {}		-- spawn X for flags
 local fSpawnY = {}		-- spawn Y for flags
 ------------------------
 function CheckScore(clanID)
 	if fCaptures[clanID] == captureLimit then
+		gameOver = true
 		-- Capture limit reached! We have a winner!
 		for i = 0, (numhhs-1) do
 			if hhs[i] ~= nil then
 				-- Kill all losers
 				if GetHogClan(hhs[i]) ~= clanID then
 		end
 	end
 end
-function DoFlagStuff(gear)
+function DoFlagStuff(flag, flagClan)
-	local wtf, bbq
+	if not CurrentHedgehog then
-	if (gear == fGear[0]) then
+		return
-		wtf = 0
+	end
-		bbq = 1
+	local wtf = flagClan
-	elseif (gear == fGear[1]) then
-		wtf = 1
+	local thiefClan
-		bbq = 0
+	for i=0, ClansCount - 1 do
+		if CurrentHedgehog == fThief[i] then
+			thiefClan = i
+		end
 	end
 	-- player has successfully captured the enemy flag
-	if (GetHogClan(CurrentHedgehog) == wtf) and (CurrentHedgehog == fThief[bbq]) and (fIsMissing[wtf] == false) then
+	if (GetHogClan(CurrentHedgehog) == flagClan) and (thiefClan ~= nil) and (fIsMissing[flagClan] == false) then
-		DeleteVisualGear(fGear[wtf])
+		DeleteVisualGear(fGear[flagClan])
-		fGear[wtf] = nil -- the flag has now disappeared
+		fGear[flagClan] = nil -- the flag has now disappeared
-		fIsMissing[wtf] = false
+		fIsMissing[flagClan] = false
-		fNeedsRespawn[wtf] = true
+		fNeedsRespawn[flagClan] = true
-		fIsMissing[bbq] = false
+		fIsMissing[thiefClan] = false
-		fNeedsRespawn[bbq] = true
+		fNeedsRespawn[thiefClan] = true
-		fCaptures[wtf] = fCaptures[wtf] +1
+		fCaptures[flagClan] = fCaptures[flagClan] +1
 		AddCaption(string.format(loc("%s has scored!"), GetHogName(CurrentHedgehog)), 0xFFFFFFFF, capgrpGameState)
 		updateScores()
 		PlaySound(sndHomerun)
-		fThief[bbq] = nil -- player no longer has the enemy flag
+		fThief[thiefClan] = nil -- player no longer has the enemy flag
-		CheckScore(wtf)
+		fThiefFlag[flagClan] = nil
+		CheckScore(flagClan)
 	--if the player is returning the flag
-	elseif (GetHogClan(CurrentHedgehog) == wtf) and (fIsMissing[wtf] == true) then
+	elseif (GetHogClan(CurrentHedgehog) == flagClan) and (fIsMissing[flagClan] == true) then
-		DeleteVisualGear(fGear[wtf])
+		DeleteVisualGear(fGear[flagClan])
-		fGear[wtf] = nil -- the flag has now disappeared
+		fGear[flagClan] = nil -- the flag has now disappeared
-		fNeedsRespawn[wtf] = true
+		fNeedsRespawn[flagClan] = true
-		HandleRespawns() -- this will set fIsMissing[wtf] to false :)
+		HandleRespawns() -- this will set fIsMissing[flagClan] to false :)
 		AddCaption(loc("Flag returned!"), 0xFFFFFFFF, capgrpMessage2)
-	--if the player is taking the enemy flag
+	--if the player is taking the enemy flag (not possible if already holding a flag)
-	elseif GetHogClan(CurrentHedgehog) == bbq then
+	elseif GetHogClan(CurrentHedgehog) ~= flagClan and (thiefClan == nil) then
-		DeleteVisualGear(fGear[wtf])
+		DeleteVisualGear(fGear[flagClan])
-		fGear[wtf] = nil -- the flag has now disappeared
+		fGear[flagClan] = nil -- the flag has now disappeared
-		fIsMissing[wtf] = true
+		fIsMissing[flagClan] = true
 		for i = 0,numhhs-1 do
 			if CurrentHedgehog ~= nil then
 				if CurrentHedgehog == hhs[i] then
-					fThief[wtf] = hhs[i]
+					fThief[flagClan] = hhs[i]
+					fThiefFlag[flagClan] = flagClan
 				end
 			end
 		end
 		AddCaption(loc("Flag captured!"), 0xFFFFFFFF, capgrpMessage2)
 end
 function CheckFlagProximity()
-	for i = 0, 1 do
+	for i = 0, ClansCount-1 do
 		if fGear[i] ~= nil then
 			local g1X = fGearX[i]
 			local g1Y = fGearY[i]
 			local q = g1X - g2X
 			local w = g1Y - g2Y
 			local dist = (q*q) + (w*w)
-			if dist < 500 then --1600
+			if dist < 500 then
-				DoFlagStuff(fGear[i])
+				DoFlagStuff(fGear[i], i)
 			end
 		end
 	end
 end
 function HandleRespawns()
-	for i = 0, 1 do
+	for i = 0, ClansCount-1 do
 		if fNeedsRespawn[i] == true then
 			fGear[i] = AddVisualGear(fSpawnX[i],fSpawnY[i],vgtCircle,0,true)
 			fGearX[i] = fSpawnX[i]
 			fGearY[i] = fSpawnY[i]
 end
 function FlagThiefDead(gear)
-	local wtf, bbq
+	local thiefClan
-	if (gear == fThief[0]) then
+	local stolenFlagClan
-		wtf = 0
+	for i=0, ClansCount-1 do
-		bbq = 1
+		if (gear == fThief[i]) then
-	elseif (gear == fThief[1]) then
+			thiefClan = i
-		wtf = 1
+			stolenFlagClan = fThiefFlag[i]
-		bbq = 0
+			break
-	end
+		end
+	end
-	if fThief[wtf] ~= nil then
+	if stolenFlagClan ~= nil then
 		-- falls into water
-		if (LAND_HEIGHT - fThiefY[wtf]) < 15 then
+		if (LAND_HEIGHT - fThiefY[thiefClan]) < 15 then
-			fIsMissing[wtf] = true
+			fIsMissing[stolenFlagClan] = true
-			fNeedsRespawn[wtf] = true
+			fNeedsRespawn[stolenFlagClan] = true
 			HandleRespawns()
 		else	--normally
-			fGearX[wtf]  =  fThiefX[wtf]
+			fGearX[stolenFlagClan] = fThiefX[thiefClan]
-			fGearY[wtf]  =  fThiefY[wtf]
+			fGearY[stolenFlagClan] = fThiefY[thiefClan]
-			fGear[wtf] = AddVisualGear(fGearX[wtf],fGearY[wtf],vgtCircle,0,true)
+			fGear[stolenFlagClan] = AddVisualGear(fGearX[stolenFlagClan], fGearY[stolenFlagClan], vgtCircle, 0, true)
 		end
-		AddVisualGear(fThiefX[wtf], fThiefY[wtf], vgtBigExplosion, 0, false)
+		AddVisualGear(fThiefX[thiefClan], fThiefY[thiefClan], vgtBigExplosion, 0, false)
-		fThief[wtf] = nil
+		fThief[thiefClan] = nil
 	end
 end
 function HandleCircles()
 		if fGearRad > fGearRadMax then
 			fGearRad = fGearRadMin
 		end
 	end
-	for i = 0, 1 do
+	for i = 0, ClansCount-1 do
 		if fIsMissing[i] == false then -- draw a flag marker at the flag's spawning place
 			SetVisualGearValues(fCirc[i], fSpawnX[i],fSpawnY[i], 20, 20, 0, 10, 0, 33, 3, fCol[i])
 			if fGear[i] ~= nil then -- draw the flag gear itself
 				SetVisualGearValues(fGear[i], fSpawnX[i],fSpawnY[i], 20, 200, 0, 0, 100, fGearRad, 2, fCol[i])
 function StartTheGame()
 	gameStarted = true
 	AddCaption(loc("Game Started!"), 0xFFFFFFFF, capgrpGameState)
-	for i = 0, 1 do
+	for i = 0, ClansCount-1 do
 		fGear[i] = AddVisualGear(fSpawnX[i],fSpawnY[i],vgtCircle,0,true)
 		fCirc[i] = AddVisualGear(fSpawnX[i],fSpawnY[i],vgtCircle,0,true)
 		fSpawnC[i] = AddVisualGear(fSpawnX[i],fSpawnY[i],vgtCircle,0,true)
 function updateScores()
 	for i=0, TeamsCount-1 do
 		local team = GetTeamName(i)
 		local clan = GetTeamClan(team)
-		if clan <= 1 then
+		SetTeamLabel(team, tostring(fCaptures[clan]))
-			SetTeamLabel(team, tostring(fCaptures[clan]))
-		end
 	end
 end
 function onGameStart()
 	showCTFMission()
 	RebuildTeamInfo()
-	for i=0, 1 do
+	for i=0, ClansCount-1 do
-		fPlaced[i] = false
 		fCaptures[i] = 0
 	end
 	for h=1, numhhs do
 		-- Hogs are resurrected for free, so this is pointless
 	if gameStarted == true then
 		HandleRespawns()
 	end
-	for i=0, 1 do
+	local flagsPlaced = 0
+	for i=0, ClansCount-1 do
 		if fSpawnX[i] and fSpawnY[i] then
-			fPlaced[i] = true
+			flagsPlaced = flagsPlaced + 1
 		end
 	end
-	if not gameStarted and fPlaced[0] and fPlaced[1] then
+	if not gameStarted and flagsPlaced == ClansCount then
 		StartTheGame()
 	end
 end
 function onEndTurn()
 	 -- if the game hasn't started yet, keep track of where we are gonna put the flags on turn end
 	if not gameStarted and CurrentHedgehog ~= nil then
 		local clan = GetHogClan(CurrentHedgehog)
-		if clan <= 1 and GetX(CurrentHedgehog) and not fSpawnX[clan] then
+		if GetX(CurrentHedgehog) and not fSpawnX[clan] then
 			fSpawnX[clan] = GetX(CurrentHedgehog)
 			fSpawnY[clan] = GetY(CurrentHedgehog)
 		end
 	end
 end
 function onGameTick()
-	for i = 0,1 do
+	for i = 0, ClansCount-1 do
 		if fThief[i] ~= nil then
 			fThiefX[i] = GetX(fThief[i])
 			fThiefY[i] = GetY(fThief[i])
 		end
 	end
-	if gameStarted == true then
+	if gameStarted == true and not gameOver then
 		HandleCircles()
 		if CurrentHedgehog ~= nil then
 			CheckFlagProximity()
 		end
 	end
 function onGearResurrect(gear)
 	if GetGearType(gear) == gtHedgehog then
 		-- mark the flag thief as dead if he needed a respawn
-		for i = 0,1 do
+		for i = 0, ClansCount-1 do
 			if gear == fThief[i] then
 				FlagThiefDead(gear)
 			end
 		end
 		AddVisualGear(GetX(gear), GetY(gear), vgtBigExplosion, 0, false)
 end
 function InABetterPlaceNow(gear)
 	for h = 0, (numhhs-1) do
 		if gear == hhs[h] then
-			for i = 0,1 do
+			for i = 0, ClansCount-1 do
 				if gear == fThief[i] then
 					FlagThiefDead(gear)
 				end
 			end
 			hhs[h] = nil
 		hhs[numhhs] = gear
 		numhhs = numhhs + 1
 		SetEffect(gear, heResurrectable, 1)
 	elseif GetGearType(gear) == gtPiano then
-		for i = 0, 1 do
+		for i = 0, ClansCount-1 do
 			if CurrentHedgehog == fThief[i] then
 				FlagThiefDead(CurrentHedgehog)
 			end
 		end

changeset 13111	10c914738f22
parent 13110	efcdf31684ca
child 13112	714f6e5b89fd