hedgewars: comparison share/hedgewars/Data/Maps/Control/map.lua

equal deleted inserted replaced

-:980a948a5dff
+:89f6a1154f67
 function ZonesAreEmpty()
 	okay = true
 	for i = 0,(zCount-1) do
 		for k = 0, (numhhs-1) do
 			if (hhs[k] ~= nil) then
-			if (GearIsInZone(hhs[k],i)) == true then
+				if (GearIsInZone(hhs[k],i)) == true then
-				FindPlace(hhs[k], false, 0, LAND_WIDTH, true)
+					FindPlace(hhs[k], false, 0, LAND_WIDTH, true)
-				okay = false
+					okay = false
-			end
+				end
 			end
 		end
 	end
 	return(okay)
 	for i = 0,(zCount-1) do
 		SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], 0xffffffff)
 		cOwnerClan[i] = nil
 		for k = 0, (numhhs-1) do
 			if (hhs[k] ~= nil) then
-if (GearIsInZone(hhs[k],i)) == true then
+				if (GearIsInZone(hhs[k],i)) == true then
+					if cOwnerClan[i] ~= nil then
-if cOwnerClan[i] ~= nil then
+						if cOwnerClan[i] ~= GetHogClan(hhs[k]) then
-if cOwnerClan[i] ~= GetHogClan(hhs[k]) then
+							--if the hog now being compared is different to one that is also here and was previously compared
---if the hog now being compared is different to one that is also here and was previously compared
+							SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], 0xffffffff)
-SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], 0xffffffff)
+							cOwnerClan[i] = 10 -- this means conflicted
+						end
-cOwnerClan[i] = 10 -- this means conflicted
+					elseif cOwnerClan[i] == nil then
-end
+						cOwnerClan[i] = GetHogClan(hhs[k])
-elseif cOwnerClan[i] == nil then
+						SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], GetClanColor( GetHogClan(hhs[k])))
-cOwnerClan[i] = GetHogClan(hhs[k])
+					end
-SetVisualGearValues(vCirc[i], vCircX[i], vCircY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], GetClanColor( GetHogClan(hhs[k])))
+				end
-end
+			end
+		end
-end
-			end
-		end
 	end
 end
 function AwardPoints()
 	for i = 0,(zCount-1) do
 		-- give score to all players controlling points
 		-- only give score to the player currently in control
 		if CurrentHedgehog ~= nil then
 			if cOwnerClan[i] == GetHogClan(CurrentHedgehog) then
 				teamScore[cOwnerClan[i]] = teamScore[cOwnerClan[i]] + 1
 			end
 		end
 	end
 	-- i want to show all the tags at once as having the SAME score not 1,2,3,4 so alas, repeating the loop seems needed
 	for i = 0,(zCount-1) do
 		if CurrentHedgehog ~= nil then
 			if cOwnerClan[i] == GetHogClan(CurrentHedgehog) then
 				local g = AddVisualGear(vCircX[i], vCircY[i]-100, vgtHealthTag, 100, false)
 				SetVisualGearValues(g, vCircX[i], vCircY[i]-100, 0, 0, 0, 0, 0, teamScore[cOwnerClan[i]], 1500, GetClanColor(cOwnerClan[i]))
 			end
 		end
 	-- find out how many hogs per team, and the index of the first hog in hhs
 	for i = 0, (numTeams-1) do
 		SetTeamLabel(GetTeamName(i), "0")
 		for z = 0, (numhhs-1) do
 			if GetHogTeamName(hhs[z]) == teamNameArr[i] then
 				teamClan[i] = GetHogClan(hhs[z])
 				if teamSize[i] == 0 then
 					teamIndex[i] = z -- should give starting index
 				end
 				teamSize[i] = teamSize[i] + 1
 				--add a pointer so this hog appears at i in hhs
 function onAttack()
 	if CurrentHedgehog ~= nil then
 		if GetCurAmmoType() == amSkip then
 			z = (TurnTimeLeft / 2000) - (TurnTimeLeft / 2000)%2
 			for i = 0, z do
 				AwardPoints()
 			end
 		end
 	end
 end
 function onGameInit()
 	-- Things we don't modify here will use their default values.
 	EnableGameFlags(gfInfAttack, gfSolidLand)
 	DisableGameFlags(gfKing, gfAISurvival)
 	WaterRise = 0
 	HealthDecrease = 0
 	vCircX[1], vCircY[1] = 1088, 684
 	vCircX[2], vCircY[2] = 381, 1569
 	vCircX[3], vCircY[3] = 1942, 77
 	vCircX[4], vCircY[4] = 3883, 89
 	vCircX[5], vCircY[5] = 2739, 1378
 	for i = 0, 5 do
 		vCirc[i] = AddVisualGear(0,0,vgtCircle,0,true)
 		vCircMinA[i] = 20
 		vCircMaxA[i] = 255
 		vCircType[i] = 1
 		vCircPulse[i] = 10
 		pointLimit = pointLimit - 25
 	end
 	missionHelp = loc("Control pillars to score points.") .. "|" ..
 		string.format(loc("Score goal: %d"), pointLimit)
 	-- reposition hogs if they are on control points until they are not or sanity limit kicks in
 	reN = 0
 	while (reN < 10) do
 		if ZonesAreEmpty() == false then
 			reN = reN + 1
 		else
 			reN = 15
 		end
 	end
 	for h=1, numhhs do
 		-- Tardis screws up the game too much, teams might not get killed correctly after victory
 end
 function onNewTurn()
 	-- reset the time counter so that it will get set to TurnTimeLeft in onGameTick
 	TimeCounter = 0
 	if lastTeam ~= GetHogTeamName(CurrentHedgehog) then
 		lastTeam = GetHogTeamName(CurrentHedgehog)
 	end
 	if gameWon == false then
 		for i = 0, (numTeams-1) do
 			if teamScore[i] >= pointLimit then --150
 				gameWon = true
 				winnerClan = i
 			end
 		end
 		if gameWon == true then
 			for i = 0, (numhhs-1) do
 				if hhs[i] ~= nil then
 					if GetHogClan(hhs[i]) ~= winnerClan then
 						SetEffect(hhs[i], heResurrectable, 0)
 						SetHealth(hhs[i],0)
 					end
 				end
 			end
 			SetTurnTimeLeft(1)
 		end
 	end
 	vCircCount = vCircCount + 1
 	if (vCircCount >= 500) and (gameWon == false) then
 		vCircCount = 0
 		CheckZones()
 	end
 	-- set TimeCounter to starting time if it is uninitialised (from onNewTurn)
 	if (TimeCounter == 0) and (TurnTimeLeft > 0) then
 		TimeCounter = TurnTimeLeft
 	end
 	-- has it ACTUALLY been 2 seconds since we last did this?
 	if (TimeCounter - TurnTimeLeft) >= 2000 then
 		TimeCounter = TurnTimeLeft
 		if (gameWon == false) then
 			AwardPoints()
 		end
 	end
 end
 function InABetterPlaceNow(gear)
 	for i = 0, (numhhs-1) do
 		if gear == hhs[i] then

changeset 14983	89f6a1154f67
parent 14982	980a948a5dff
child 14984	6e17abf7b8ef