# HG changeset patch # User Wuzzy # Date 1506444875 -7200 # Node ID 952afc3d2df2f7b1b59523ac689ae7791d225a9d # Parent 66566cfe0a7e0b799e831d56bed5b40e83590d0e Show correct kill counts in all ASA missions (fixes #147) diff -r 66566cfe0a7e -r 952afc3d2df2 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Tue Sep 26 16:25:57 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Tue Sep 26 18:54:35 2017 +0200 @@ -407,7 +407,7 @@ SendStat(siGameResult, loc("This is the wrong way!")) SendStat(siCustomAchievement, loc("Collect the crate with the flying saucer!")) SendStat(siCustomAchievement, loc("Fly to the moon.")) - SendStat(siPlayerKills,'0',teamC.name) + sendSimpleTeamRankings({teamC.name}) EndGame() else if checkPointReached ~= 5 then @@ -654,7 +654,7 @@ if GetCampaignVar("Won") == "true" and GetCampaignVar("Mission1Won") ~= "true" then SendStat(siCustomAchievement, loc("Complete all main and side missions to complete the spacetrip mission.")) end - SendStat(siPlayerKills,'1',teamC.name) + sendSimpleTeamRankings({teamC.name}) EndGame() end @@ -663,6 +663,6 @@ SendStat(siCustomAchievement, loc("Your first destination is the moon in order to get more fuel.")) SendStat(siCustomAchievement, loc("You have to complete the main mission on moon in order to travel to other planets.")) SendStat(siCustomAchievement, loc("You have to be careful and must not die!")) - SendStat(siPlayerKills,'0',teamC.name) + sendSimpleTeamRankings({teamC.name}) EndGame() end diff -r 66566cfe0a7e -r 952afc3d2df2 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Tue Sep 26 16:25:57 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Tue Sep 26 18:54:35 2017 +0200 @@ -268,8 +268,7 @@ function heroDeath(gear) SendStat(siGameResult, loc("Hog Solo lost, try again!")) SendStat(siCustomAchievement, loc("To win the game you have to eliminate all your enemies.")) - SendStat(siPlayerKills,'1',teamC.name) - SendStat(siPlayerKills,'0',teamA.name) + sendSimpleTeamRankings({teamC.name, teamA.name}) EndGame() end @@ -280,8 +279,7 @@ SendStat(siCustomAchievement, loc("You have rescued H and Dr. Cornelius.")) SendStat(siCustomAchievement, loc("You have acquired the last device part.")) SendStat(siCustomAchievement, loc("Now go and play the menu mission to complete the campaign.")) - SendStat(siPlayerKills,'1',teamA.name) - SendStat(siPlayerKills,'0',teamC.name) + sendSimpleTeamRankings({teamA.name, teamC.name}) EndGame() end diff -r 66566cfe0a7e -r 952afc3d2df2 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua Tue Sep 26 16:25:57 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua Tue Sep 26 18:54:35 2017 +0200 @@ -186,8 +186,7 @@ SendStat(siGameResult, loc("Hog Solo lost, try again!")) SendStat(siCustomAchievement, loc("You have to eliminate all the enemies.")) SendStat(siCustomAchievement, loc("Read the challenge objectives from within the mission for more details.")) - SendStat(siPlayerKills,'1',teamB.name) - SendStat(siPlayerKills,'0',teamA.name) + sendSimpleTeamRankings({teamB.name, teamA.name}) EndGame() end @@ -206,7 +205,7 @@ end end SendStat(siCustomAchievement, loc("The next 4 times you play the \"The last encounter\" mission you'll get 20 more hit points and a laser sight.")) - SendStat(siPlayerKills,'1',teamA.name) + sendSimpleTeamRankings({teamA.name, teamB.name}) SaveCampaignVar("Mission11Won", "true") checkAllMissionsCompleted() EndGame() diff -r 66566cfe0a7e -r 952afc3d2df2 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Tue Sep 26 16:25:57 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Tue Sep 26 18:54:35 2017 +0200 @@ -490,8 +490,7 @@ PlaySound(sndVictory, hero.gear) SendStat(siGameResult, loc("Congratulations, you won!")) SendStat(siCustomAchievement, loc("To win the game you had to collect the 2 crates with no specific order.")) - SendStat(siPlayerKills,'1',teamC.name) - SendStat(siPlayerKills,'0',teamB.name) + sendSimpleTeamRankings({teamC.name, teamA.name, teamB.name}) EndGame() end end @@ -502,7 +501,6 @@ SendStat(siCustomAchievement, loc("You can avoid some battles.")) SendStat(siCustomAchievement, loc("Use your ammo wisely.")) SendStat(siCustomAchievement, loc("Don't destroy the device crate!")) - SendStat(siPlayerKills,'1',teamB.name) - SendStat(siPlayerKills,'0',teamC.name) + sendSimpleTeamRankings({teamB.name, teamC.name, teamA.name}) EndGame() end diff -r 66566cfe0a7e -r 952afc3d2df2 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua Tue Sep 26 16:25:57 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua Tue Sep 26 18:54:35 2017 +0200 @@ -215,7 +215,7 @@ SendStat(siCustomAchievement, loc("You have destroyed all the targets.")) SendStat(siCustomAchievement, loc("You are indeed the best PAotH pilot.")) SendStat(siCustomAchievement, loc("Next time you play \"Searching in the dust\" you'll have an RC plane available.")) - SendStat(siPlayerKills,'1',teamA.name) + SendStat(siPlayerKills,'0',teamA.name) SaveCampaignVar("Mission12Won", "true") checkAllMissionsCompleted() EndGame() diff -r 66566cfe0a7e -r 952afc3d2df2 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Tue Sep 26 16:25:57 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Tue Sep 26 18:54:35 2017 +0200 @@ -159,6 +159,6 @@ checkAllMissionsCompleted() SendStat(siGameResult, loc("Congratulations, you have saved Hogera!")) SendStat(siCustomAchievement, loc("Hogera is safe!")) - SendStat(siPlayerKills,'1',teamA.name) + SendStat(siPlayerKills,'0',teamA.name) EndGame() end diff -r 66566cfe0a7e -r 952afc3d2df2 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Tue Sep 26 16:25:57 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Tue Sep 26 18:54:35 2017 +0200 @@ -335,9 +335,7 @@ saveVariables() SendStat(siGameResult, loc("Green Bananas won!")) SendStat(siCustomAchievement, loc("You have eliminated all visible enemy hedgehogs!")) - SendStat(siPlayerKills,'1',teamA.name) - SendStat(siPlayerKills,'1',teamB.name) - SendStat(siPlayerKills,'0',teamC.name) + sendSimpleTeamRankings({teamA.name, teamD.name, teamB.name, teamC.name}) EndGame() end @@ -346,9 +344,7 @@ saveVariables() SendStat(siGameResult, loc("Hog Solo escaped successfully!")) SendStat(siCustomAchievement, loc("You have reached the take-off area successfully!")) - SendStat(siPlayerKills,'1',teamA.name) - SendStat(siPlayerKills,'0',teamB.name) - SendStat(siPlayerKills,'0',teamC.name) + sendSimpleTeamRankings({teamA.name, teamD.name, teamB.name, teamC.name}) EndGame() end @@ -460,9 +456,7 @@ SendStat(siCustomAchievement, loc("You will play every 3 turns.")) SendStat(siCustomAchievement, loc("Green hogs won't intentionally hurt you.")) end - SendStat(siPlayerKills,'1',teamC.name) - SendStat(siPlayerKills,'0',teamA.name) - SendStat(siPlayerKills,'0',teamB.name) + sendSimpleTeamRankings({teamC.name, teamA.name, teamD.name, teamB.name}) EndGame() end diff -r 66566cfe0a7e -r 952afc3d2df2 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Tue Sep 26 16:25:57 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Tue Sep 26 18:54:35 2017 +0200 @@ -345,11 +345,20 @@ SendStat(siCustomAchievement, loc("Do not destroy the crates!")) if tookPartInBattle then SendStat(siCustomAchievement, loc("You'll have to eliminate the Strawberry Assassins at the end.")) + if permitCaptainLimeDeath then + sendSimpleTeamRankings({teamC.name, teamA.name}) + else + sendSimpleTeamRankings({teamA.name}) + end else SendStat(siCustomAchievement, loc("You'll have to eliminate Captain Lime at the end.")) - SendStat(siCustomAchievement, loc("Don't eliminate Captain Lime before collecting the last crate!")) + SendStat(siCustomAchievement, loc("Don't eliminate Captain Lime before collecting the last crate!")) + if permitCaptainLimeDeath then + sendSimpleTeamRankings({teamB.name, teamA.name}) + else + sendSimpleTeamRankings({teamA.name}) + end end - SendStat(siPlayerKills,'0',teamA.name) EndGame() ended = true end @@ -399,8 +408,7 @@ SendStat(siGameResult, loc("Congratulations, you won!")) SendStat(siCustomAchievement, loc("You retrieved the lost part.")) SendStat(siCustomAchievement, loc("You defended yourself against Captain Lime.")) - SendStat(siPlayerKills,'1',teamA.name) - SendStat(siPlayerKills,'0',teamB.name) + sendSimpleTeamRankings({teamA.name, teamB.name}) EndGame() end @@ -410,8 +418,7 @@ SendStat(siGameResult, loc("Congratulations, you won!")) SendStat(siCustomAchievement, loc("You retrieved the lost part.")) SendStat(siCustomAchievement, loc("You defended yourself against the Strawberry Assassins.")) - SendStat(siPlayerKills,'1',teamA.name) - SendStat(siPlayerKills,'0',teamC.name) + sendSimpleTeamRankings({teamA.name, teamC.name}) EndGame() end diff -r 66566cfe0a7e -r 952afc3d2df2 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua Tue Sep 26 16:25:57 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua Tue Sep 26 18:54:35 2017 +0200 @@ -211,8 +211,7 @@ SendStat(siGameResult, loc("Hog Solo lost, try again!")) SendStat(siCustomAchievement, loc("You have to eliminate all the enemies.")) SendStat(siCustomAchievement, loc("Read the challenge objectives from within the mission for more details.")) - SendStat(siPlayerKills,'1',teamB.name) - SendStat(siPlayerKills,'0',teamA.name) + sendSimpleTeamRankings({teamB.name, teamC.name, teamA.name}) EndGame() end @@ -231,7 +230,7 @@ end end SendStat(siCustomAchievement, loc("You will gain some extra ammo from the crates the next time you play the \"Getting to the device\" mission.")) - SendStat(siPlayerKills,'1',teamA.name) + sendSimpleTeamRankings({teamA.name, teamB.name, teamC.name}) SaveCampaignVar("Mission10Won", "true") checkAllMissionsCompleted() EndGame() diff -r 66566cfe0a7e -r 952afc3d2df2 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Tue Sep 26 16:25:57 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Tue Sep 26 18:54:35 2017 +0200 @@ -442,8 +442,7 @@ SendStat(siCustomAchievement, loc("To win the game you have to stand next to Thanta.")) SendStat(siCustomAchievement, loc("Most of the time you'll be able to use the freezer only.")) SendStat(siCustomAchievement, loc("Use the bazooka and the flying saucer to get the freezer.")) - SendStat(siPlayerKills,'1',teamB.name) - SendStat(siPlayerKills,'0',teamC.name) + sendSimpleTeamRankings({teamB.name, teamC.name}) EndGame() end @@ -474,8 +473,7 @@ SendStat(siCustomAchievement, loc("To win the game you have to go next to Thanta.")) SendStat(siCustomAchievement, loc("Most of the time you'll be able to use the freezer only.")) SendStat(siCustomAchievement, loc("Use the bazooka and the flying saucer to get the freezer.")) - SendStat(siPlayerKills,'1',teamB.name) - SendStat(siPlayerKills,'0',teamC.name) + sendSimpleTeamRankings({teamB.name, teamC.name}) EndGame() end @@ -544,8 +542,7 @@ SendStat(siGameResult, loc("Congratulations, you acquired the device part!")) SendStat(siCustomAchievement, string.format(loc("At the end of the game your health was %d."), GetHealth(hero.gear))) -- maybe add number of tries for each part? - SendStat(siPlayerKills,'1',teamC.name) - SendStat(siPlayerKills,'0',teamB.name) + sendSimpleTeamRankings({teamC.name, teamB.name}) resetCheckpoint() -- reset this mission EndGame() end diff -r 66566cfe0a7e -r 952afc3d2df2 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua Tue Sep 26 16:25:57 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua Tue Sep 26 18:54:35 2017 +0200 @@ -249,14 +249,14 @@ SendStat(siCustomAchievement, loc("The time that you have left when you reach the blue hedgehog will be added to the next turn.")) SendStat(siCustomAchievement, loc("Each turn you'll have only one rope to use.")) SendStat(siCustomAchievement, loc("You'll lose if you die or if your time is up.")) - SendStat(siPlayerKills,'0',teamA.name) + sendSimpleTeamRankings({teamB.name, teamA.name}) EndGame() end function win() SendStat(siGameResult, loc("Congratulations, you are the fastest!")) -- siCustomAchievements were added earlier - SendStat(siPlayerKills,'0',teamA.name) + sendSimpleTeamRankings({teamA.name, teamB.name}) SaveCampaignVar("Mission13Won", "true") checkAllMissionsCompleted() EndGame()