hedgewars: comparison share/hedgewars/Data/Maps/CTF

equal deleted inserted replaced

-:64d84011a48e
+:3b7cd18c4a06
 --------------------------
 local numhhs = 0 -- store number of hedgehogs
 local hhs = {} -- store hedgehog gears
-local numTeams --  store the number of teams in the game
 local teamNameArr = {}	-- store the list of teams
 local teamSize = {}	-- store how many hogs per team
 local teamIndex = {} -- at what point in the hhs{} does each team begin
 local clanTeams = {} -- list of teams per clan
 local fSpawnX = {}		-- spawn X for flags
 local fSpawnY = {}		-- spawn Y for flags
 local fThiefX = {}
 local fThiefY = {}
-local FTTC = 0 -- flag thief tracker counter
---local fThiefsHealed = false
 local fSpawnC = {}
 local fCirc = {} -- flag/carrier marker circles
 local fCol = {} -- colour of the clans
 --zone and teleporter variables
 --------------------------------
 local redTel
 local orangeTel
---local areaArr = {} -- no longer used
 local zXMin = {}
 local zWidth = {}
 local zYMin = {}
 local zHeight = {}
 ------------------------
 -- see on gameTick also
 function ManageTeleporterEffects()
 	effectTimer = effectTimer + 1
-	if effectTimer > 50 then -- 100
+	if effectTimer > 50 then
 		effectTimer = 0
 		for i = 0,1 do
-			eX = 10 + zXMin[i] + GetRandom(zWidth[i]-10)
+			local eX = 10 + zXMin[i] + GetRandom(zWidth[i]-10)
-			eY = 50 + zYMin[i] + GetRandom(zHeight[i]-110)
+			local eY = 50 + zYMin[i] + GetRandom(zHeight[i]-110)
-	-- steam and smoke and DUST look good, smokering looks trippy
+			-- steam and smoke and DUST look good, smokering looks trippy
-	-- smoketrace and eviltrace are not effected by wind?
+			-- smoketrace and eviltrace are not effected by wind?
-	-- chunk is a LR falling gear
+			-- chunk is a LR falling gear
-			tempE = AddVisualGear(eX, eY, vgtDust, 0, false)
+			local tempE = AddVisualGear(eX, eY, vgtDust, 0, false)
 			if tempE ~= 0 then
-				g1, g2, g3, g4, g5, g6, g7, g8, g9, g10 = GetVisualGearValues(tempE)
+				SetVisualGearValues(tempE, eX, eY, nil, nil, nil, nil, nil, nil, nil, fCol[i])
-				SetVisualGearValues(tempE, eX, eY, g3, g4, g5, g6, g7, g8, g9, fCol[i])
 			end
 		end
 	end
 end
 --flag methods
 ------------------------
 function CheckScore(teamID)
+	local alt
 	if teamID == 0 then
 		alt = 1
 	elseif teamID == 1 then
 		alt = 0
 end
 function FlagDeleted(gear)
+	local wtf, bbq
 	PlaySound(sndShotgunReload)
 	if (gear == fGear[0]) then
 		wtf = 0
 		bbq = 1
 	elseif (gear == fGear[1]) then
 		wtf = 1
 		bbq = 0
 	end
-	--ShowMission("OH HAI!", "FlagDeleted was called", "Oh noes!", -amBazooka, 0)
 	if CurrentHedgehog ~= nil then
-		--ShowMission("GUESS WAT?", "I'm not nil", "Oh noes!", -amBazooka, 0)
 		--if the player picks up the flag
 		if CheckDistance(CurrentHedgehog, fGear[wtf]) < 1600 then
 			fGear[wtf] = nil -- the flag has now disappeared and we shouldnt be pointing to it
 			if (GetHogClan(CurrentHedgehog) == wtf) and (CurrentHedgehog == fThief[bbq]) and (fIsMissing[wtf] == false) then
 				fIsMissing[wtf] = false
 				fNeedsRespawn[wtf] = true
 				fIsMissing[bbq] = false
 				fNeedsRespawn[bbq] = true
-				fCaptures[wtf] = fCaptures[wtf] +1					--fCaptures[wtf]
+				fCaptures[wtf] = fCaptures[wtf] +1
 				AddCaption(string.format(loc("%s has scored!"), GetHogTeamName(CurrentHedgehog)), 0xFFFFFFFF, capgrpGameState)
 				for i=1, #clanTeams[wtf] do
 					SetTeamLabel(clanTeams[wtf][i], fCaptures[wtf])
 				end
 				PlaySound(sndHomerun)
-				--SetEffect(fThief[bbq], hePoisoned, false)
 				fThief[bbq] = nil -- player no longer has the enemy flag
 				CheckScore(wtf)
 			--if the player is returning the flag
 			elseif GetHogClan(CurrentHedgehog) == wtf then
 					AddCaption(loc("Flag returned!"))
 				elseif fIsMissing[wtf] == false then
 					AddCaption(loc("That was pointless. The flag will respawn next round."))
 				end
-				--fIsMissing[wtf] = false
-				--ShowMission("Flag returned!", "Hooray", "", -amBazooka, 0)
 			--if the player is taking the enemy flag
 			elseif GetHogClan(CurrentHedgehog) == bbq then
 				fIsMissing[wtf] = true
 				for i = 0,numhhs-1 do
 					if CurrentHedgehog == hhs[i] then
 						fThief[wtf] = hhs[i]
-						--SetEffect(fThief[wtf], hePoisoned, true)
 					end
 				end
 				AddCaption(loc("Flag captured!"))
 	-- if flag has been destroyed deep underwater and player is now nil
 	-- probably only gets called if the flag thief drowns himself
 	-- otherwise the above one will work fine
 	else
-		--ShowMission("NIL PLAYER!", "Oh snap", "Oh noes!", -amBazooka, 0)
 		fGear[wtf] = nil
 		fIsMissing[wtf] = true
 		fNeedsRespawn[wtf] = true
 		AddCaption(loc("The flag will respawn next round."))
 	end
 end
 function FlagThiefDead(gear)
+	local wtf, bbq
 	if (gear == fThief[0]) then
 		wtf = 0
 		bbq = 1
 	elseif (gear == fThief[1]) then
 		wtf = 1
 function HandleCircles()
 	for i = 0, 1 do
 		if fIsMissing[i] == false then -- draw a circle at the flag's spawning place
-			--SetVisualGearValues(fCirc[i], fSpawnX[i],fSpawnY[i], 20, 200, 0, 0, 100, 33, 2, fCol[i])
 			SetVisualGearValues(fCirc[i], fSpawnX[i],fSpawnY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], vCircCol[i])
 		elseif (fIsMissing[i] == true) and (fNeedsRespawn[i] == false) then
 			if fThief[i] ~= nil then -- draw circle round flag carrier
-				--SetVisualGearValues(fCirc[i], fThiefX[i], fThiefY[i], 20, 200, 0, 0, 100, 33, 2, fCol[i])
 				SetVisualGearValues(fCirc[i], fThiefX[i], fThiefY[i], vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], vCircCol[i])
 			elseif fThief[i] == nil then -- draw cirle round dropped flag
-				--SetVisualGearValues(fCirc[i], GetX(fGear[i]), GetY(fGear[i]), 20, 200, 0, 0, 100, 33, 2, fCol[i])
 				SetVisualGearValues(fCirc[i], GetX(fGear[i]),GetY(fGear[i]), vCircMinA[i], vCircMaxA[i], vCircType[i], vCircPulse[i], vCircFuckAll[i], vCircRadius[i], vCircWidth[i], vCircCol[i])
 			end
 		end
 		if fNeedsRespawn[i] == true then -- if the flag has been destroyed, no need for a circle
 -- general methods
 ------------------------
 function CheckDistance(gear1, gear2)
-	g1X, g1Y = GetGearPosition(gear1)
+	local g1X, g1Y = GetGearPosition(gear1)
-	g2X, g2Y = GetGearPosition(gear2)
+	local g2X, g2Y = GetGearPosition(gear2)
 	g1X = g1X - g2X
 	g1Y = g1Y - g2Y
-	z = (g1X*g1X) + (g1Y*g1Y)
+	local dist = (g1X*g1X) + (g1Y*g1Y)
-	--dist = math.sqrt(z)
-	dist = z
 	return dist
 end
 function CheckTeleporters()
-	teleportActive = false
+	local teleportActive = false
 	if (GearIsInZone(CurrentHedgehog, redTel) == true) and (GetHogClan(CurrentHedgehog) == 0) then
 		teleportActive = true
 		destinationX = 1402
 		destinationY = 321
 		teamNameArr[i] = GetTeamName(i)
 		teamSize[i] = 0
 		teamIndex[i] = 0
 		SetTeamLabel(teamNameArr[i], "0")
 	end
-	numTeams = TeamsCount
 	-- find out how many hogs per team, and the index of the first hog in hhs
-	for i = 0, numTeams-1 do
+	for i = 0, TeamsCount-1 do
 		for z = 0, numhhs-1 do
 			if GetHogTeamName(hhs[z]) == teamNameArr[i] then
 				if teamSize[i] == 0 then
 					teamIndex[i] = z -- should give starting index
 	TurnTime = 30000 -- (was 30) The time the player has to move each round (in ms)
 	CaseFreq = 0 -- The frequency of crate drops
 	MinesNum = 0 -- The number of mines being placed
 	MinesTime  = 2000
 	Explosives = 0 -- The number of explosives being placed
-	Delay = 10 -- The delay between each round
 	-- Disable Sudden Death
 	WaterRise = 0
 	HealthDecrease = 0
 	Map = "Blizzard" -- The map to be played
 	Theme = "Snow" -- The theme to be used "Nature"
 	orangeTel = CreateZone(3719,1330,45,449)	-- orange teleporter
 	--new improved placement schematics aw yeah
 	RebuildTeamInfo()
-	--ShowMission("Team Info Rebuilt", "Here you go:", "TeamCount: " .. TeamsCount .. "|" .. teamNameArr[0] .. ": " .. teamSize[0] .. " Hogs|" .. teamNameArr[1] .. ": " .. teamSize[1] .. " Hogs|" .. teamNameArr[2] .. ": " .. teamSize[2] .. " Hogs|", 0, 0)
+	local team1Placed = 0
-	team1Placed = 0
+	local team2Placed = 0
-	team2Placed = 0
 	for i = 0, (TeamsCount-1) do
 		for g = teamIndex[i], (teamIndex[i]+teamSize[i]-1) do
 			if GetHogClan(hhs[g]) == 0 then
 				SetGearPosition(hhs[g],1403+ ((team1Placed+1)*50),1570)
 				team1Placed = team1Placed +1
 	--spawn starting ufos and or super weapons
 	SpawnSupplyCrate(2048,1858,amJetpack)
-	--SpawnSupplyCrate(2048,1858,amExtraTime)
 	--set flag spawn points and spawn the flags
 	fSpawnX[0] = 957
 	fSpawnY[0] = 1747
 	fSpawnX[1] = 3123
 end
 function onNewTurn()
-	if lastTeam ~= GetHogTeamName(CurrentHedgehog) then
-		lastTeam = GetHogTeamName(CurrentHedgehog)
-	end
-	for i = 0, 1 do
-		if fThief[i] ~= nil then
-			--adjust = 5 + GetHealth(fThief[i])
-			--SetHealth(fThief[i], adjust)
-			--AddCaption('Helped out the flag poisoned flag thiefs')
-		end
-	end
-	--AddCaption("Handling respawns")
 	HandleRespawns()
 	HandleCrateDrops()
-	--myC = AddVisualGear(GetX(CurrentHedgehog),GetY(CurrentHedgehog),vgtCircle,0,true)
-	--SetVisualGearValues(myC, GetX(CurrentHedgehog),GetY(CurrentHedgehog), 20, 200, 0, 0, 100, 50, 3, GetClanColor(GetHogClan(CurrentHedgehog)))
 end
 function onGameTick()
 	-- onRessurect calls AFTER you have resurrected,
 	-- so keeping track of x,y a few milliseconds before
 	-- is useful
-	--FTTC = FTTC + 1
-	--if FTTC == 100 then
+	for i = 0,1 do
-	--	FTTC = 0
+		if fThief[i] ~= nil then
-		for i = 0,1 do
+			fThiefX[i] = GetX(fThief[i])
-			if fThief[i] ~= nil then
+			fThiefY[i] = GetY(fThief[i])
-				fThiefX[i] = GetX(fThief[i])
+		end
-				fThiefY[i] = GetY(fThief[i])
+	end
-			end
-		end
-	--end
 	-- things we wanna check often
 	if (CurrentHedgehog ~= nil) then
-		--AddCaption(GetX(CurrentHedgehog) .. "; " .. GetY(CurrentHedgehog))
-		--AddCaption("Checking Teleporters")
 		CheckTeleporters()
 	end
 	HandleCircles()
 	ManageTeleporterEffects()
 	SetAmmo(amMortar,9,0,0,0)
 	SetAmmo(amGrenade,9,0,0,0)
 	SetAmmo(amClusterBomb,4,0,0,0)
-	--SetAmmo(amDEagle, 4, 0, 0, 0)
 	SetAmmo(amShotgun, 9, 0, 0, 0)
 	SetAmmo(amFlamethrower, 1, 0, 0, 1)
 	SetAmmo(amFirePunch, 9, 0, 0, 0)
 	SetAmmo(amBaseballBat, 2, 0, 0, 0)
-	--SetAmmo(amKamikaze, 2, 0, 0, 0)
 	SetAmmo(amDynamite,2,0,0,1)
 	SetAmmo(amSMine,4,0,0,0)
 	SetAmmo(amBlowTorch, 9, 0, 0, 0)
 end
 function onGearResurrect(gear)
-	--AddCaption("A gear has been resurrected!")
 	-- mark the flag thief as dead if he needed a respawn
 	for i = 0,1 do
 		if gear == fThief[i] then
 			FlagThiefDead(gear)
 	elseif GetHogClan(gear) == 1 then
 		FindPlace(gear, false, 2048, LAND_WIDTH)
 	end
 	AddVisualGear(GetX(gear), GetY(gear), vgtBigExplosion, 0, false)
-end
-function onGearDamage(gear, damage)
-	-- >_< damn, occurs too fast, before the hog has finished moving / updated his health
-	--if GetGearType(gear) == gtHedgehog then
-	--	if damage > GetHealth(gear) then
-	--		AddVisualGear(GetX(gear), GetY(gear), vgtExplosion, 0, false)
-	--	end
-	--end
 end
 function onGearAdd(gear)

changeset 13116	3b7cd18c4a06
parent 13019	880662cf41ee
child 13117	cd1561b0337f