ASA, Hard Flying: Show personal best at mission start
authorWuzzy <Wuzzy2@mail.ru>
Wed, 07 Feb 2018 01:13:17 +0100
changeset 12914 b5d3b79c90cf
parent 12913 9abb04174323
child 12915 383445810e42
ASA, Hard Flying: Show personal best at mission start
ChangeLog.txt
share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua
--- a/ChangeLog.txt	Wed Feb 07 00:36:04 2018 +0100
+++ b/ChangeLog.txt	Wed Feb 07 01:13:17 2018 +0100
@@ -7,6 +7,7 @@
 
 A Space Adventure:
  + Precise Shooting: Display collected ammo
+ + Hard Flying: Display personal best at mission start
 
 A Classic Fairytale:
  + Mission 3: Display number of turns left at timed parcours
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua	Wed Feb 07 00:36:04 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua	Wed Feb 07 01:13:17 2018 +0100
@@ -23,12 +23,9 @@
 	"|"..loc("You'll get extra time in case you need it when you pass a ring.").."|"..
 	loc("Every 2 rings, the ring color will be green and you'll get an extra flying saucer.").."|"..
 	loc("Use the attack key twice to change the flying saucer while floating in mid-air.")
+local timeRecord
 -- dialogs
 local dialog01 = {}
--- mission objectives
-local goals = {
-	["init"] = {missionName, loc("Getting ready"), challengeObjectives, 1, 25000},
-}
 -- hogs
 local hero = {}
 local ally = {}
@@ -94,16 +91,28 @@
 	AnimSetGearPosition(ally.gear, ally.x, ally.y)
 	HogTurnLeft(ally.gear, true)
 
+	timeRecord = tonumber(GetCampaignVar("IceStadiumBestTime"))
+
 	initCheckpoint("ice02")
 
 	AnimInit(true)
 	AnimationSetup()
 end
 
+function ShowGoals()
+	-- mission objectives
+	local goalStr = challengeObjectives
+	if timeRecord ~= nil then
+		local personalBestStr = string.format(loc("Personal best: %.3f seconds"), timeRecord/1000)
+		goalStr = goalStr .. "|" .. personalBestStr
+	end
+	ShowMission(missionName, loc("Getting ready"), goalStr, 1, 25000)
+end
+
 function onGameStart()
 	AnimWait(hero.gear, 3000)
 	FollowGear(hero.gear)
-	ShowMission(unpack(goals["init"]))
+	ShowGoals()
 	HideMission()
 
 	AddEvent(onHeroDeath, {hero.gear}, heroDeath, {hero.gear}, 0)
@@ -145,25 +154,25 @@
 			local saucersUsed = totalSaucers - saucersLeft
 			SendStat(siGameResult, loc("Hooray! You are a champion!"))
 			SendStat(siCustomAchievement, string.format(loc("You completed the mission in %.3f seconds."), totalTimePrinted))
-			local record = tonumber(GetCampaignVar("IceStadiumBestTime"))
-			if record ~= nil and totalTime >= record then
-				SendStat(siCustomAchievement, string.format(loc("Your personal best time so far: %.3f seconds"), record/1000))
+			if timeRecord ~= nil and totalTime >= timeRecord then
+				SendStat(siCustomAchievement, string.format(loc("Your personal best time so far: %.3f seconds"), timeRecord/1000))
 			end
-			if record == nil or totalTime < record then
+			if timeRecord == nil or totalTime < timeRecord then
 				SaveCampaignVar("IceStadiumBestTime", tostring(totalTime))
-				if record ~= nil then
+				if timeRecord ~= nil then
 					SendStat(siCustomAchievement, loc("This is a new personal best time, congratulations!"))
 				end
 			end
 			SendStat(siCustomAchievement, string.format(loc("You have used %d flying saucers."), saucersUsed))
 			SendStat(siCustomAchievement, string.format(loc("You had %d additional flying saucers left."), saucersLeft))
 
-			record = tonumber(GetCampaignVar("IceStadiumLeastSaucersUsed"))
-			if record == nil or saucersUsed < record then
+			local leastSaucersRecord = tonumber(GetCampaignVar("IceStadiumLeastSaucersUsed"))
+			if leastSaucersRecord == nil or saucersUsed < leastSaucersRecord then
 				SaveCampaignVar("IceStadiumLeastSaucersUsed", tostring(saucersUsed))
 			end
 
-			sendSimpleTeamRankings({teamA.name})
+			SendStat(siPointType, loc("milliseconds"))
+			SendStat(siPlayerKills, totalTime, GetHogTeamName(hero.gear))
 			SaveCampaignVar("Mission6Won", "true")
 			checkAllMissionsCompleted()
 			EndGame()
@@ -207,7 +216,7 @@
 -------------- ANIMATIONS ------------------
 
 function Skipanim(anim)
-	ShowMission(unpack(goals["init"]))
+	ShowGoals()
 	startFlying()
 end
 
@@ -221,7 +230,7 @@
 	table.insert(dialog01, {func = AnimSay, args = {ally.gear, loc("Now you have the chance to try and claim the place that you deserve among the best."), SAY_SAY, 6000}})
 	table.insert(dialog01, {func = AnimSay, args = {ally.gear, loc("Can you do it?"), SAY_SAY, 2000}})
 	table.insert(dialog01, {func = AnimWait, args = {hero.gear, 500}})
-	table.insert(dialog01, {func = ShowMission, args = goals["init"]})
+	table.insert(dialog01, {func = ShowGoals, args = {}})
 	table.insert(dialog01, {func = startFlying, args = {hero.gear}})
 end