Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make better re-use of some mission strings
authorWuzzy <Wuzzy2@mail.ru>
Sat, 08 Dec 2018 21:43:13 +0100
changeset 14393 cf49fac6e88a
parent 14391 35af3d1ccdfc
child 14394 07c9bdc45115
Make better re-use of some mission strings
share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua file | annotate | diff | comparison | revisions
share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua file | annotate | diff | comparison | revisions
share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua file | annotate | diff | comparison | revisions
share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua file | annotate | diff | comparison | revisions
share/hedgewars/Data/Missions/Training/Basic_Training_-_Movement.lua file | annotate | diff | comparison | revisions
share/hedgewars/Data/Missions/Training/Basic_Training_-_Rope.lua file | annotate | diff | comparison | revisions 
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua	Sat Dec 08 19:20:57 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua	Sat Dec 08 21:43:13 2018 +0100
@@ -156,9 +156,9 @@
     ctrlMissionPanel = loc("Hint: Pause the game to review the mission texts.")
     ctrlAttack = loc("Attack: Tap the [Bomb]")
 else
-    ctrlJump = loc("Long Jump: Enter")
+    ctrlJump = loc("Long Jump: [Enter]")
     ctrlMissionPanel = loc("Hint: Hold down [M] to review the mission texts.")
-    ctrlAttack = loc("Attack: Space")
+    ctrlAttack = loc("Attack: [Space]")
 end
 
 goals = {
@@ -777,7 +777,7 @@
     -- FIXME: Precise key is not available in Touch
     msgSkip = ""
   else
-    msgSkip = "|" .. loc("Hint: Animations can be skipped with the [Precise] key.")
+    msgSkip = "|" .. loc("Hint: Cinematics can be skipped with the [Precise] key.")
   end
   ShowMission(loc("A Classic Fairytale"), loc("First Blood"), loc("Finish your training.") .. msgSkip, -amSkip, 0)
   HideHog(cannibal)
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua	Sat Dec 08 19:20:57 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua	Sat Dec 08 21:43:13 2018 +0100
@@ -148,7 +148,7 @@
                     loc("Hold [Attack] pressed to throw with more power.")
 if INTERFACE == "touch" then
   grenadeHint = grenadeHint .. "|" ..
-                loc("Set timer: Tap the [Clock]") .. "|" ..
+                loc("Change detonation timer: Tap the [Clock]") .. "|" ..
                 loc("Attack: Tap the [Bomb]")
 else
   grenadeHint = grenadeHint .. "|" ..
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua	Sat Dec 08 19:20:57 2018 +0100
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua	Sat Dec 08 21:43:13 2018 +0100
@@ -137,7 +137,7 @@
 			ctrl = loc("Open ammo menu: [Right click]").."|"..
 			loc("Select weapon: [Left click]")
 		elseif INTERFACE == "touch" then
-			ctrl = loc("Open ammo menu: Tap the [suitcase]")
+			ctrl = loc("Open ammo menu: Tap the [Suitcase]")
 		end
 		ShowMission(loc("Basic Bazooka Training"), loc("Select Weapon"), loc("To begin with the training, select the bazooka from the ammo menu!").."|"..
 		ctrl, 2, 5000)
@@ -147,7 +147,7 @@
 			loc("Aim: [Up]/[Down]").."|"..
 			loc("Walk: [Left]/[Right]")
 		elseif INTERFACE == "touch" then
-			ctrl = loc("Attack: Tap the [bomb]").."|"..
+			ctrl = loc("Attack: Tap the [Bomb]").."|"..
 			loc("Aim: [Up]/[Down]").."|"..
 			loc("Walk: [Left]/[Right]")
 		end
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua	Sat Dec 08 19:20:57 2018 +0100
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua	Sat Dec 08 21:43:13 2018 +0100
@@ -127,7 +127,7 @@
 			ctrl = loc("Open ammo menu: [Right click]").."|"..
 			loc("Select weapon: [Left click]")
 		else
-			ctrl = loc("Open ammo menu: Tap the [suitcase]")
+			ctrl = loc("Open ammo menu: Tap the [Suitcase]")
 		end
 		ShowMission(loc("Basic Grenade Training"), loc("Select Weapon"), loc("To begin with the training, select the grenade from the ammo menu!").."|"..
 		ctrl, 2, 5000)
@@ -137,7 +137,7 @@
 			loc("Aim: [Up]/[Down]").."|"..
 			loc("Change direction: [Left]/[Right]")
 		elseif INTERFACE == "touch" then
-			ctrl = loc("Attack: Tap the [bomb]").."|"..
+			ctrl = loc("Attack: Tap the [Bomb]").."|"..
 			loc("Aim: [Up]/[Down]").."|"..
 			loc("Change direction: [Left]/[Right]")
 		end
@@ -151,7 +151,7 @@
 		if INTERFACE == "desktop" then
 			ctrl = loc("Set detonation timer: [1]-[5]")
 		elseif INTERFACE == "touch" then
-			ctrl = loc("Change detonation timer: Tap the [clock]")
+			ctrl = loc("Change detonation timer: Tap the [Clock]")
 		end
 		ShowMission(loc("Basic Grenade Training"), loc("Timer"),
 		loc("You can change the detonation timer of grenades.").."|"..
@@ -173,8 +173,8 @@
 			loc("Set bounciness: [Left Shift] + [1]-[5]")
 		elseif INTERFACE == "touch" then
 			-- FIXME: Bounciness can't be set in touch yet. :(
-			caption = loc("Well done!")
-			ctrl = loc("You're getting pretty good! Here are more targets for you.")
+			caption = loc("Well done.")
+			ctrl = loc("You're doing well! Here are more targets for you.")
 		end
 
 		ShowMission(loc("Basic Grenade Training"), caption, ctrl, 2, 20000)
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Movement.lua	Sat Dec 08 19:20:57 2018 +0100
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Movement.lua	Sat Dec 08 21:43:13 2018 +0100
@@ -304,8 +304,8 @@
 				ctrl = loc("Open ammo menu: [Right click]").."|"..
 				loc("Attack: [Space]")
 			elseif INTERFACE == "touch" then
-				ctrl = loc("Open ammo menu: Tap the [suitcase]").."|"..
-				loc("Attack: Tap the [bomb]")
+				ctrl = loc("Open ammo menu: Tap the [Suitcase]").."|"..
+				loc("Attack: Tap the [Bomb]")
 			end
 			ShowMission(loc("Basic Movement Training"), loc("Switch Hedgehog (Failed!)"),
 			loc("Oops! You have selected the wrong hedgehog! Just try again.").."|"..
@@ -318,7 +318,7 @@
 		if INTERFACE == "desktop" then
 			ctrl = loc("Long Jump: [Enter]")
 		elseif INTERFACE == "touch" then
-			ctrl = loc("Long Jump: Tap the [curvy arrow] for long")
+			ctrl = loc("Long Jump: Tap the [Curvy Arrow] button for long")
 		end
 		ShowMission(loc("Basic Movement Training"), loc("Jumping"),
 		loc("Get the next crate by jumping over the abyss.").."|"..
@@ -330,7 +330,7 @@
 		if INTERFACE == "desktop" then
 			ctrl = loc("High Jump: [Backspace]").."|"..loc("Back Jump: [Backspace] ×2")
 		elseif INTERFACE == "touch" then
-			ctrl = loc("High Jump: Tap the [curvy arrow] shortly").."|"..loc("Back Jump: Double-tap the [curvy arrow]")
+			ctrl = loc("High Jump: Tap the [Curvy Arrow] shortly").."|"..loc("Back Jump: Double-tap the [Curvy Arrow]")
 		end
 		ShowMission(loc("Basic Movement Training"), loc("Back Jumping (1/2)"),
 		loc("For the next crate, you have to do back jumps.") .. "|" ..
@@ -340,7 +340,7 @@
 		if INTERFACE == "desktop" then
 			ctrl = loc("High Jump: [Backspace]").."|"..loc("Back Jump: [Backspace] ×2")
 		elseif INTERFACE == "touch" then
-			ctrl = loc("High Jump: Tap the [curvy arrow] shortly").."|"..loc("Back Jump: Double-tap the [curvy arrow]")
+			ctrl = loc("High Jump: Tap the [Curvy Arrow] shortly").."|"..loc("Back Jump: Double-tap the [Curvy Arrow]")
 		end
 		ShowMission(loc("Basic Movement Training"), loc("Back Jumping (2/2)"),
 		loc("To get over the next obstacles, keep some distance from the wall before you back jump.").."|"..
@@ -371,8 +371,8 @@
 			ctrl = loc("Open ammo menu: [Right click]").."|"..
 			loc("Attack: [Space]")
 		elseif INTERFACE == "touch" then
-			ctrl = loc("Open ammo menu: Tap the [suitcase]").."|"..
-			loc("Attack: Tap the [bomb]")
+			ctrl = loc("Open ammo menu: Tap the [Suitcase]").."|"..
+			loc("Attack: Tap the [Bomb]")
 		end
 		ShowMission(loc("Basic Movement Training"), loc("Switch Hedgehog (1/3)"),
 		loc("You have collected the “Switch Hedgehog” utility!").."|"..
@@ -432,9 +432,9 @@
 		loc("Attack: [Space]")
 	elseif INTERFACE == "touch" then
 		ctrl = loc("IMPORTANT: To see the mission panel again, pause the game.").."| |"..
-		loc("Pause: Tap the [pause symbol]").."| |"..
+		loc("Pause: Tap the [Pause] button").."| |"..
 		loc("To begin with the training, tap the attack button!").."|"..
-		loc("Attack: Tap the [bomb]")
+		loc("Attack: Tap the [Bomb]")
 	end
 	ShowMission(loc("Basic Movement Training"), loc("Mission Panel"),
 	loc("This is the mission panel.").."|"..
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Rope.lua	Sat Dec 08 19:20:57 2018 +0100
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Rope.lua	Sat Dec 08 21:43:13 2018 +0100
@@ -199,7 +199,7 @@
 		if INTERFACE == "desktop" then
 			ctrl = loc("Open ammo menu: [Right click]")
 		elseif INTERFACE == "touch" then
-			ctrl = loc("Open ammo menu: Tap the [suitcase]")
+			ctrl = loc("Open ammo menu: Tap the [Suitcase]")
 		end
 		ShowMission(loc("Basic Rope Training"), loc("Select Rope"),
 		loc("Select the rope to begin!").."|"..
@@ -224,7 +224,7 @@
 			loc("Attack: [Space]")
 		elseif INTERFACE == "touch" then
 			ctrl = loc("Aim: [Up]/[Down]").."|"..
-			loc("Attack: Tap the [bomb]")
+			loc("Attack: Tap the [Bomb]")
 		end
 		ShowMission(loc("Basic Rope Training"), loc("Getting Started"),
 		loc("You can use the rope to reach new places.").."|"..
@@ -386,7 +386,7 @@
 				loc("Attack: [Space]")
 			elseif INTERFACE == "touch" then
 				ctrl = loc("Aim: [Up]/[Down]").."|"..
-				loc("Attack: Tap the [bomb]")
+				loc("Attack: Tap the [Bomb]")
 			end
 			ShowMission(loc("Basic Rope Training"), loc("How to Rope"),
 			loc("Go to the target.").."|"..
sheepy-clone