Display mines timer in all missions with non-default timer
authorWuzzy <almikes@aol.com>
Tue, 11 Apr 2017 03:44:56 +0200
changeset 12231 3ec0261e01f0
parent 12230 93079fecbc77
child 12232 5afbffc6725d
Display mines timer in all missions with non-default timer
share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua
share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua
share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua
share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua
share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua
share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua
share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua
share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua
share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua
share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua
share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua
share/hedgewars/Data/Missions/Scenario/User_Mission_-_The_Great_Escape.lua
share/hedgewars/Data/Missions/Scenario/portal.lua
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua	Tue Apr 11 02:48:38 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua	Tue Apr 11 03:44:56 2017 +0200
@@ -300,7 +300,7 @@
                                                   loc("As the ammo is sparse, you might want to reuse ropes while mid-air.|") ..
                                                   loc("If you wish to restart the course, hold [Precise] while your turn ends (e.g with Skip)!|") ..
                                                   loc("The enemy can't move but it might be a good idea to stay out of sight!|") ..
-                                                  loc("You have ") .. SuddenDeathTurns .. loc(" turns until Sudden Death! Better hurry!"), 1, 0)
+                                                  string.format(loc("You have %d turns until Sudden Death! Better hurry!"), SuddenDeathTurns), 1, 0)
 end
 
 function SkipKillAnim()
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua	Tue Apr 11 02:48:38 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua	Tue Apr 11 03:44:56 2017 +0200
@@ -16,7 +16,7 @@
 local dialog01 = {}
 -- missions objectives
 local goals = {
-	[dialog01] = {missionName, loc("The final part"), loc("Defeat Professor Hogevil!"), 1, 4500},
+	[dialog01] = {missionName, loc("The final part"), loc("Defeat Professor Hogevil!") .. "|" .. loc("Mines time: 1.5 seconds"), 1, 4500},
 }
 -- crates
 local teleportCrate = {x = 1935, y = 1830}
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua	Tue Apr 11 02:48:38 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua	Tue Apr 11 03:44:56 2017 +0200
@@ -26,7 +26,7 @@
 -- mission objectives
 local goals = {
 	[dialog01] = {missionName, loc("Getting ready"), loc("The device part is hidden in one of the crates! Go and get it!").."|"..
-			loc("Most of the destructible terrain in marked with blue color"), 1, 4500},
+			loc("Most of the destructible terrain in marked with blue color").."|"..loc("Mines time: 0 seconds"), 1, 4500},
 }
 -- crates
 local btorch1Y = 60
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua	Tue Apr 11 02:48:38 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua	Tue Apr 11 03:44:56 2017 +0200
@@ -15,7 +15,7 @@
 local dialog01 = {}
 -- mission objectives
 local goals = {
-	[dialog01] = {missionName, loc("Getting ready"), loc("Use the rope to quickly get to the surface!"), 1, 4500},
+	[dialog01] = {missionName, loc("Getting ready"), loc("Use the rope to quickly get to the surface!" .. "|" .. loc("Mines time: 1 second")), 1, 4500},
 }
 -- health crates
 healthX = 565
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua	Tue Apr 11 02:48:38 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua	Tue Apr 11 03:44:56 2017 +0200
@@ -13,8 +13,9 @@
 -- globals
 local missionName = loc("The big bang")
 local challengeObjectives = loc("Find a way to detonate all the explosives and stay alive!").."|"..
-							loc("Red areas are indestructible").."|"..
-							loc("Green areas are portal-proof")
+							loc("Red areas are indestructible.").."|"..
+							loc("Green areas are portal-proof.").."|"..
+							loc("Mines time: 0 seconds")
 local explosives = {}
 local currentHealth = 1
 local currentDamage = 0
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua	Tue Apr 11 02:48:38 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua	Tue Apr 11 03:44:56 2017 +0200
@@ -21,11 +21,12 @@
 local dialog03 = {}
 local dialog04 = {}
 -- mission objectives
+local minesTimeText = loc("Mines time: 0 seconds")
 local goals = {
-	[dialog01] = {missionName, loc("Exploring the tunnel"), loc("Search for the device with the help of the other hedgehogs ").."|"..loc("Hog Solo has to reach the last crates"), 1, 4000},
-	[dialog02] = {missionName, loc("Exploring the tunnel"), loc("Explore the tunnel with the other hedgehogs and search for the device").."|"..loc("Hog Solo has to reach the last crates"), 1, 4000},
-	[dialog03] = {missionName, loc("Return to the Surface"), loc("Go to the surface!").."|"..loc("Attack Captain Lime before he attacks back"), 1, 4000},
-	[dialog04] = {missionName, loc("Return to the Surface"), loc("Go to the surface!").."|"..loc("Attack the assassins before they attack back"), 1, 4000},
+	[dialog01] = {missionName, loc("Exploring the tunnel"), loc("Search for the device with the help of the other hedgehogs ").."|"..loc("Hog Solo has to reach the last crates" .. "|" .. minesTimeText), 1, 4000},
+	[dialog02] = {missionName, loc("Exploring the tunnel"), loc("Explore the tunnel with the other hedgehogs and search for the device").."|"..loc("Hog Solo has to reach the last crates") .. "|" .. minesTimeText, 1, 4000},
+	[dialog03] = {missionName, loc("Return to the Surface"), loc("Go to the surface!").."|"..loc("Attack Captain Lime before he attacks back").."|"..minesTimeText, 1, 4000},
+	[dialog04] = {missionName, loc("Return to the Surface"), loc("Go to the surface!").."|"..loc("Attack the assassins before they attack back").."|"..minesTimeText, 1, 4000},
 }
 -- crates
 local eagleCrate = {name = amDEagle, x = 1680, y = 1650}
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua	Tue Apr 11 02:48:38 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua	Tue Apr 11 03:44:56 2017 +0200
@@ -23,7 +23,7 @@
 local dialog02 = {}
 -- mission objectives
 local goals = {
-	[dialog01] = {missionName, loc("Getting ready"), loc("Collect the icegun and get the device part from Thanta"), 1, 4500},
+	[dialog01] = {missionName, loc("Getting ready"), loc("Collect the icegun and get the device part from Thanta") .. loc("Mines time: 0 seconds"), 1, 4500},
 	[dialog02] = {missionName, loc("Win"), loc("Congratulations, you collected the device part!"), 1, 3500},
 }
 -- crates
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua	Tue Apr 11 02:48:38 2017 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua	Tue Apr 11 03:44:56 2017 +0200
@@ -47,7 +47,7 @@
 
 	AddGear(579, 296, gtMine, 0, 0, 0, 0)
 
-	ShowMission(loc("Operation Diver"), loc("Scenario"), loc("Eliminate the enemy before the time runs out.") .. loc("|- Mines Time:") .. " " .. 1 .. " " .. loc("sec"), -amFirePunch, 0);
+	ShowMission(loc("Operation Diver"), loc("Scenario"), loc("Eliminate the enemy before the time runs out.") .. "|" .. loc("Mines time: 1 second"), -amFirePunch, 0);
 	--SetTag(AddGear(0, 0, gtATSmoothWindCh, 0, 0, 0, 1), -70)
 
 	SetWind(-100)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua	Tue Apr 11 02:48:38 2017 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua	Tue Apr 11 03:44:56 2017 +0200
@@ -94,7 +94,7 @@
         	SetGearPosition(hhs[1],561,1365)
 	end
 
-	ShowMission(loc("Newton and the Hammock"), loc("Scenario"), loc("Eliminate the enemy."), -amParachute, 0)
+	ShowMission(loc("Newton and the Hammock"), loc("Scenario"), loc("Eliminate the enemy.") .. "|" .. loc("Mines time: 1 second"), -amParachute, 0)
 		
 end
 
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua	Tue Apr 11 02:48:38 2017 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua	Tue Apr 11 03:44:56 2017 +0200
@@ -82,7 +82,7 @@
 	GirderCrate = SpawnAmmoCrate(1789,514,amShotgun) -- final shotgun
 	SpawnAmmoCrate(1181,419,amBee)
 
-	ShowMission(loc("Spooky Tree"), loc("Scenario"), loc("Eliminate the enemy before the time runs out.") .. loc("|- Mines Time:") .. " " .. 0 .. " " .. loc("sec"), -amBee, 0)
+	ShowMission(loc("Spooky Tree"), loc("Scenario"), loc("Eliminate the enemy before the time runs out.") .. "|" .. loc("Mines time: 0 seconds"), -amBee, 0)
 
 	SetWind(-75)
 
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua	Tue Apr 11 02:48:38 2017 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua	Tue Apr 11 03:44:56 2017 +0200
@@ -67,7 +67,7 @@
 	SpawnUtilityCrate(1543,744,amJetpack)
 	SpawnAmmoCrate(227,442,amDrill)
 
-	ShowMission(loc("Codename: Teamwork"), loc("Scenario"), loc("- Eliminate Unit 3378 |- Feeble Resistance must survive") .. loc("|- Mines Time:") .. " " .. 0 .. " " .. loc("sec"), 0, 0)
+	ShowMission(loc("Codename: Teamwork"), loc("Scenario"), loc("- Eliminate Unit 3378 |- Feeble Resistance must survive") .. loc("|- Mines time: 0 seconds"), 0, 0)
 
 end
 
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_The_Great_Escape.lua	Tue Apr 11 02:48:38 2017 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_The_Great_Escape.lua	Tue Apr 11 03:44:56 2017 +0200
@@ -26,7 +26,7 @@
 
 function onGameStart()
 
-ShowMission(loc("The Great Escape"), loc("Scenario"), loc("Elimate your captor."), -amGrenade, 0)
+ShowMission(loc("The Great Escape"), loc("Scenario"), loc("Elimate your captor.") .. "|" .. loc("Mines time: 0 seconds"), -amGrenade, 0)
 
 ------ GIRDER LIST ------
 PlaceGirder(1042,564,0)
--- a/share/hedgewars/Data/Missions/Scenario/portal.lua	Tue Apr 11 02:48:38 2017 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/portal.lua	Tue Apr 11 03:44:56 2017 +0200
@@ -158,7 +158,9 @@
 	PlaceGirder(3363, 1323, 4)
 
 	ShowMission (loc("Portal Mind Challenge"), loc("Scenario"),
-		loc("Defeat all enemies!") .. "|" .. loc("In this mission you have infinite time."),
+		loc("Defeat all enemies!") .. "|" ..
+		loc("In this mission you have infinite time.") .. "|" ..
+		loc("Mines time: 0 seconds"),
 		-amPortalGun, 5000)
 	HogSay(player, loc("I should get myself a portal device, maybe this crate has one."), SAY_THINK)