hedgewars: comparison share/hedgewars/Data/Scripts/Multiplayer/Racer.lua

equal deleted inserted replaced

-:8d598aa498b0
+:d73317579ae4
 ------------------------------------------
--- RACER 0.4
+-- RACER 0.5
 -- map-independant racing script
 -- by mikade
 -----------------------------------------
 -----------------------------------
 -------
 -- update user feedback
 -- add more sounds
+-------
+-- 0.5
+-------
+-- fix ghost disappearing if hog falls in water or somehow dies
+-- lengthen ghost tracking interval to improve performance on slower machines
+-- increase waypoint limit to 8
+-- allow for persistent showmission information
 -----------------------------
 -- SCRIPT BEGINS
 -----------------------------
 loadfile(GetDataPath() .. "Scripts/Locale.lua")()
 local wpY = {}
 local wpCol = {}
 local wpActive = {}
 local wpRad = 450 --75
 local wpCount = 0
-local wpLimit = 5
+local wpLimit = 8
+local roundN
+local lastRound
+local RoundHasChanged
 -------------------
 -- general methods
 -------------------
 	end
 end
+function onNewRound()
+	roundNumber = roundNumber + 1
+	totalComment = ""
+	for i = 0, (TeamsCount-1) do
+			if teamNameArr[i] ~= " " then				-- teamScore[teamClan[i]]
+				teamComment[i] = teamNameArr[i] .. ": " .. (teamScore[i]/1000) .. loc("s|")
+				totalComment = totalComment .. teamComment[i]
+			elseif teamNameArr[i] == " " then
+				teamComment[i] = "|"
+			end
+	end
+	ShowMission(	loc("RACER"),
+					loc("STATUS UPDATE"),
+					loc("Rounds Complete: ") .. roundNumber .. "/" .. roundLimit .. "|" .. " " .. "|" ..
+					loc("Best Team Times: ") .. "|" .. totalComment, 0, 4000)
+	-- end game if its at round limit
+	if roundNumber == roundLimit then
+		for i = 0, (numhhs-1) do
+			if GetHogClan(hhs[i]) ~= bestClan then
+				SetEffect(hhs[i], heResurrectable, false)
+				SetHealth(hhs[i],0)
+			end
+		end
+		gameOver = true
+		TurnTimeLeft = 1
+	end
+end
 function CheckForNewRound()
-	if GetHogClan(CurrentHedgehog) == firstClan then
+	-------------
+	------ new
-		roundNumber = roundNumber + 1
+	-------------
-		totalComment = ""
+	--[[turnN = turnN + 1
-		for i = 0, (TeamsCount-1) do
+	if gameBegun == false then
-				if teamNameArr[i] ~= " " then				-- teamScore[teamClan[i]]
+		if turnN == 2 then
-					teamComment[i] = teamNameArr[i] .. ": " .. (teamScore[i]/1000) .. loc("s|")
-					totalComment = totalComment .. teamComment[i]
-				elseif teamNameArr[i] == " " then
-					teamComment[i] = "|"
-				end
-		end
-		ShowMission(	loc("RACER"),
-				loc("STATUS UPDATE"),
-				loc("Rounds Complete: ") .. roundNumber .. "/" .. roundLimit .. "|" .. " " .. "|" ..
-				loc("Best Team Times: ") .. "|" .. totalComment, 0, 4000)
-		-- end game if its at round limit
-		if roundNumber == roundLimit then
 			for i = 0, (numhhs-1) do
-				if GetHogClan(hhs[i]) ~= bestClan then
+				if hhs[i] ~= nil then
 					SetEffect(hhs[i], heResurrectable, false)
 					SetHealth(hhs[i],0)
 				end
 			end
 			gameOver = true
 			TurnTimeLeft = 1
 		end
+	else
+	end]]
+	--[[if roundBegun == true then
+		if RoundHasChanged == true then
+			roundN = roundN + 1
+			RoundHasChanged = false
+			onNewRound()
+		end
+		if lastRound ~= TotalRounds then -- new round, but not really
+			if RoundHasChanged == false then
+				RoundHasChanged = true
+			end
+		end
+		AddCaption("RoundN:" .. roundN .. "; " .. "TR: " .. TotalRounds)
+		lastRound = TotalRounds
+	end]]
+	------------
+	----- old
+	------------
+	if GetHogClan(CurrentHedgehog) == firstClan then
+		onNewRound()
 	end
 end
 function DisableTumbler()
 	WaterRise = 0
 end
 function onGameStart()
+	roundN = 0
+	lastRound = TotalRounds
+	RoundHasChanged = false -- true
 	RebuildTeamInfo()
 	ShowMission	(
 				loc("RACER"),
 				loc("a Hedgewars mini-game"),
 				loc("Build a track and race.") .. "|" ..
 				loc("Round Limit:") .. " " .. roundLimit .. "|" ..
 				"", 4, 4000
 				)
 end
 function PlaceWayPoint(x,y)
 	if (wpCount < wpLimit) then -- seems to not work with a hedgehog nil chek
 function onGameTick()
 	-- airstrike detected, convert this into a potential waypoint spot
 	if cGear ~= nil then
 		x,y = GetGearTarget(cGear)
 		DeleteGear(cGear)
 		if TestRectForObstacle(x-20, y-20, x+20, y+20, true) then
 			AddCaption(loc("Please place the way-point in the open, within the map boundaries."))
 			PlaySound(sndDenied)
 				trackTime = 0
 				SetGearPosition(CurrentHedgehog, wpX[0], wpY[0])
 				AddGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), gtGrenade, 0, 0, 0, 1)
 				FollowGear(CurrentHedgehog)
-				ShowMission("...", "...", "...", 2, 1)
+				HideMission()
 			else
 				-- still in placement mode
 			end
 		-- if the RACE has started, show tracktimes and keep tabs on waypoints
 		if (racerActive == true) and (gameBegun == true) then
 			--ghost
 			gTimer = gTimer + 1
-			if gTimer == 15 then
+			if gTimer == 40 then
 				gTimer = 0
 				HandleGhost()
 			end
 			trackTime = trackTime + 1
 end
 function onGearResurrect(gear)
 	AddVisualGear(GetX(gear), GetY(gear), vgtBigExplosion, 0, false)
+	if gear == CurrentHedgehog then
+		DisableTumbler()
+	end
 	-- if the player stops and "dies" or flies into water, stop him racing
 	--[[if gear == CurrentHedgehog then
 		DisableTumbler()
 		ShowMission(loc("RACER"),

changeset 6253	d73317579ae4
parent 5923	ae8cfd039ab2
child 7139	a47fd17ba463