# HG changeset patch # User Wuzzy # Date 1545429546 -3600 # Node ID dbf704b007628e3d5ad3db3c437d190027dc4b2c # Parent c20cc536f3daf8beedf6d9056bc863dbf6d262f9 Simplify some mission strings diff -r c20cc536f3da -r dbf704b00762 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Fri Dec 21 22:25:57 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Fri Dec 21 22:59:06 2018 +0100 @@ -593,7 +593,7 @@ SetGearMessage(speakerHog, 0) SetState(speakerHog, 0) SetTurnTimeLeft(MAX_TURN_TIME) - ShowMission(loc("Backstab"), loc("The food bites back"), loc("Defeat the cannibals"), 1, 4000) + ShowMission(loc("Backstab"), loc("The food bites back"), loc("Defeat the cannibals!"), 1, 4000) SpawnCrates() end diff -r c20cc536f3da -r dbf704b00762 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Fri Dec 21 22:25:57 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Fri Dec 21 22:59:06 2018 +0100 @@ -147,18 +147,6 @@ cannibalDead = {} isHidden = {} -local grenadeHint = loc("Grenade hint: Set timer with the [Timer] controls, aim with [Up]/[Down].") .. "|" .. - loc("Hold [Attack] pressed to throw with more power.") -if INTERFACE == "touch" then - grenadeHint = grenadeHint .. "|" .. - loc("Change detonation timer: Tap the [Clock]") .. "|" .. - loc("Attack: Tap the [Bomb]") -else - grenadeHint = grenadeHint .. "|" .. - loc("Set detonation timer: [1]-[5]") .. "|" .. - loc("Attack: [Space]") -end - --------------------------Anim skip functions-------------------------- function AfterRefusedAnim() if stage == loseStage then @@ -330,7 +318,7 @@ return end stage = aloneStage - ShowMission(loc("The Shadow Falls"), loc("The Individualist"), loc("Defeat the cannibals!") .. "|" .. grenadeHint, 1, 12000) + ShowMission(loc("The Shadow Falls"), loc("The Individualist"), loc("Defeat the cannibals!"), 1, 12000) AddAmmo(cannibals[6], amGrenade, 1) AddAmmo(cannibals[6], amFirePunch, 0) AddAmmo(cannibals[6], amBaseballBat, 0) @@ -895,7 +883,7 @@ return end - ShowMission(loc("The Shadow Falls"), loc("The guardian"), loc("Defeat the cannibals!") .."|".. loc("Leaks A Lot must survive!") .. "|" .. grenadeHint, 1, 12000) + ShowMission(loc("The Shadow Falls"), loc("The guardian"), loc("Defeat the cannibals!") .."|".. loc("Leaks A Lot must survive!"), 1, 12000) AddAmmo(dense, amSkip, 100) AddAmmo(dense, amSwitch, 100) AddAmmo(leaks, amSkip, 100) diff -r c20cc536f3da -r dbf704b00762 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Fri Dec 21 22:25:57 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Fri Dec 21 22:59:06 2018 +0100 @@ -74,10 +74,10 @@ end function AfterStartAnim() - local goal = loc("Defeat the cannibals!|") + local goal = loc("Defeat the cannibals!") local chiefgoal = loc("Try to protect the chief! You won't lose if he dies, but it is advised that he survives.") SetTurnTimeLeft(TurnTime) - ShowMission(loc("United We Stand"), loc("Invasion"), goal .. chiefgoal, 1, 6000) + ShowMission(loc("United We Stand"), loc("Invasion"), goal .. "|" .. chiefgoal, 1, 6000) end function SkipStartAnim() diff -r c20cc536f3da -r dbf704b00762 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Fri Dec 21 22:25:57 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Fri Dec 21 22:59:06 2018 +0100 @@ -474,7 +474,7 @@ saveCompletedStatus(3) SendStat(siGameResult, loc("Congratulations, you won!")) SendStat(siCustomAchievement, loc("You retrieved the lost part.")) - SendStat(siCustomAchievement, loc("You defended yourself against the Fruit Assassins.")) + SendStat(siCustomAchievement, string.format(loc("You defended yourself against %s."), teamC.name)) sendSimpleTeamRankings({teamA.name, teamC.name}) EndGame() end