# HG changeset patch # User Wuzzy # Date 1480038822 -3600 # Node ID ce3860c82c8bab2d61fea3302b2fbbd5f649af6d # Parent 543bc82e1e28b988d61345b8c30012435425bd06 Rewrite 2nd line of mission panel of most missions for consistency diff -r 543bc82e1e28 -r ce3860c82c8b share/hedgewars/Data/Maps/Basketball/map.lua --- a/share/hedgewars/Data/Maps/Basketball/map.lua Fri Nov 25 02:01:18 2016 +0100 +++ b/share/hedgewars/Data/Maps/Basketball/map.lua Fri Nov 25 02:53:42 2016 +0100 @@ -18,7 +18,7 @@ end function onGameStart() - ShowMission(loc("Hedgewars-Basketball"), loc("Not So Friendly Match"), loc("Bat your opponents through the|baskets and out of the map!"), -amBaseballBat, 0) + ShowMission(loc("Basketball"), loc("Not So Friendly Match"), loc("Bat your opponents through the|baskets and out of the map!"), -amBaseballBat, 0) started = true end @@ -50,7 +50,7 @@ end s = s .. " " .. score[0] for i = 1, ClansCount - 1 do s = s .. " - " .. score[i] end - ShowMission(loc("Hedgewars-Basketball"), loc("Not So Friendly Match"), s, -amBaseballBat, 0) + ShowMission(loc("Basketball"), loc("Not So Friendly Match"), s, -amBaseballBat, 0) end end end diff -r 543bc82e1e28 -r ce3860c82c8b share/hedgewars/Data/Maps/CTF_Blizzard/map.lua --- a/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua Fri Nov 25 02:01:18 2016 +0100 +++ b/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua Fri Nov 25 02:53:42 2016 +0100 @@ -583,7 +583,7 @@ function onGameStart() - ShowMission("CTF_BLIZZARD", "", loc(" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"), 0, 0) + ShowMission(loc("CTF_Blizzard"), loc("Capture The Flag"), loc(" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"), 0, 0) -- initialize teleporters diff -r 543bc82e1e28 -r ce3860c82c8b share/hedgewars/Data/Maps/ClimbHome/map.lua --- a/share/hedgewars/Data/Maps/ClimbHome/map.lua Fri Nov 25 02:01:18 2016 +0100 +++ b/share/hedgewars/Data/Maps/ClimbHome/map.lua Fri Nov 25 02:53:42 2016 +0100 @@ -107,7 +107,7 @@ --SetClanColor(ClansCount-1, 0x0000ffff) appears to be broken SendHealthStatsOff() ShowMission(loc("Climb Home"), - loc("Rope to safety"), + loc("Challenge"), loc("You are far from home, and the water is rising, climb up as high as you can!|Your score will be based on your height."), -amRope, 0) local x = 1818 diff -r 543bc82e1e28 -r ce3860c82c8b share/hedgewars/Data/Maps/Control/map.lua --- a/share/hedgewars/Data/Maps/Control/map.lua Fri Nov 25 02:01:18 2016 +0100 +++ b/share/hedgewars/Data/Maps/Control/map.lua Fri Nov 25 02:53:42 2016 +0100 @@ -369,8 +369,8 @@ --AddCaption(zz) -- number of times it took to work end - ShowMission(loc("CONTROL"), - "", + ShowMission(loc("Control"), + loc("Domination game"), loc("Control pillars to score points.") .. "|" .. loc("Goal") .. ": " .. pointLimit .. " " .. loc("points"), 0, 0) @@ -418,8 +418,9 @@ end end - ShowMission(loc("CONTROL"), - loc("Team Scores") .. ":", + ShowMission(loc("Control"), + loc("Domination game"), + loc("Team Scores") .. ":" .. "|" .. totalComment, 0, 1600) end diff -r 543bc82e1e28 -r ce3860c82c8b share/hedgewars/Data/Maps/Knockball/map.lua --- a/share/hedgewars/Data/Maps/Knockball/map.lua Fri Nov 25 02:01:18 2016 +0100 +++ b/share/hedgewars/Data/Maps/Knockball/map.lua Fri Nov 25 02:53:42 2016 +0100 @@ -19,7 +19,7 @@ end function onGameStart() - ShowMission(loc("Hedgewars-Knockball"), loc("Not So Friendly Match"), loc("Bat balls at your enemies and|push them into the sea!"), -amBaseballBat, 0) + ShowMission(loc("Knockball"), loc("Not So Friendly Match"), loc("Bat balls at your enemies and|push them into the sea!"), -amBaseballBat, 0) started = true end @@ -64,7 +64,7 @@ end s = s .. " " .. score[0] for i = 1, ClansCount - 1 do s = s .. " - " .. score[i] end - ShowMission(loc("Hedgewars-Knockball"), loc("Not So Friendly Match"), s, -amBaseballBat, 0) + ShowMission(loc("Knockball"), loc("Not So Friendly Match"), s, -amBaseballBat, 0) end end end diff -r 543bc82e1e28 -r ce3860c82c8b share/hedgewars/Data/Maps/TrophyRace/map.lua --- a/share/hedgewars/Data/Maps/TrophyRace/map.lua Fri Nov 25 02:01:18 2016 +0100 +++ b/share/hedgewars/Data/Maps/TrophyRace/map.lua Fri Nov 25 02:53:42 2016 +0100 @@ -57,7 +57,7 @@ end function onGameStart() - ShowMission(loc("TrophyRace"), "", loc("Use your rope to get from start to finish as fast as you can!"), -amRope, 0) + ShowMission(loc("TrophyRace"), loc("Race"), loc("Use your rope to get from start to finish as fast as you can!"), -amRope, 0) started = true p=1820 for i = 0, numhhs - 1 do @@ -174,7 +174,7 @@ hscore = hscore .. "|" .. string.format(loc("Team %d: "), i+1) .. tt end - ShowMission(loc("TrophyRace"), "", loc("You've reached the goal!| |Time: ") .. (ttime / 1000) .. " s" .. hscore, 0, 0) + ShowMission(loc("TrophyRace"), loc("Race"), loc("You've reached the goal!| |Time: ") .. (ttime / 1000) .. " s" .. hscore, 0, 0) TurnTimeLeft = 0 end end diff -r 543bc82e1e28 -r ce3860c82c8b share/hedgewars/Data/Missions/Challenge/User_Mission_-_RCPlane_Challenge.lua --- a/share/hedgewars/Data/Missions/Challenge/User_Mission_-_RCPlane_Challenge.lua Fri Nov 25 02:01:18 2016 +0100 +++ b/share/hedgewars/Data/Missions/Challenge/User_Mission_-_RCPlane_Challenge.lua Fri Nov 25 02:53:42 2016 +0100 @@ -41,8 +41,8 @@ SendHealthStatsOff() ShowMission ( - loc("RC PLANE TRAINING"), - loc("a Hedgewars challenge"), + loc("RC Plane Challenge"), + loc("Challenge"), loc("Collect or destroy all the health crates.") .. "|" .. loc("Compete to use as few planes as possible!") .. "|" .. diff -r 543bc82e1e28 -r ce3860c82c8b share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua Fri Nov 25 02:01:18 2016 +0100 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua Fri Nov 25 02:53:42 2016 +0100 @@ -34,7 +34,7 @@ function onGameStart() - ShowMission(loc("Bamboo Thicket"), loc("User Challenge"), loc("Eliminate the enemy before the time runs out"), -amBazooka, 0) + ShowMission(loc("Bamboo Thicket"), loc("Scenario"), loc("Eliminate the enemy before the time runs out"), -amBazooka, 0) --WEAPON CRATE LIST. WCRATES: 1 SpawnAmmoCrate(891,852,amBazooka) diff -r 543bc82e1e28 -r ce3860c82c8b share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua Fri Nov 25 02:01:18 2016 +0100 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua Fri Nov 25 02:53:42 2016 +0100 @@ -53,7 +53,7 @@ FollowGear(player) - ShowMission(loc("Dangerous Ducklings"), "", loc("Eliminate the Blue Team"), -amRope, 5000); + ShowMission(loc("Dangerous Ducklings"), loc("Scenario"), loc("Eliminate the Blue Team"), -amRope, 5000); end diff -r 543bc82e1e28 -r ce3860c82c8b share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua Fri Nov 25 02:01:18 2016 +0100 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua Fri Nov 25 02:53:42 2016 +0100 @@ -44,7 +44,7 @@ AddGear(579, 296, gtMine, 0, 0, 0, 0) - ShowMission(loc("Operation Diver"), "", loc("Eliminate Poison before the time runs out") .. loc("|- Mines Time:") .. " " .. 1 .. " " .. loc("sec"), -amFirePunch, 0); + ShowMission(loc("Operation Diver"), loc("Scenario"), loc("Eliminate Poison before the time runs out") .. loc("|- Mines Time:") .. " " .. 1 .. " " .. loc("sec"), -amFirePunch, 0); --SetTag(AddGear(0, 0, gtATSmoothWindCh, 0, 0, 0, 1), -70) SetWind(-100) diff -r 543bc82e1e28 -r ce3860c82c8b share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua Fri Nov 25 02:01:18 2016 +0100 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua Fri Nov 25 02:53:42 2016 +0100 @@ -92,7 +92,7 @@ SetGearPosition(hhs[1],561,1365) end - ShowMission(loc("Newton's Hammock"), loc("User Challenge"), loc("Eliminate the enemy before the time runs out"), -amParachute, 0) + ShowMission(loc("Newton and the Hammock"), loc("Scenario"), loc("Eliminate the enemy before the time runs out"), -amParachute, 0) end diff -r 543bc82e1e28 -r ce3860c82c8b share/hedgewars/Data/Missions/Scenario/User_Mission_-_Nobody_Laugh.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Nobody_Laugh.lua Fri Nov 25 02:01:18 2016 +0100 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Nobody_Laugh.lua Fri Nov 25 02:53:42 2016 +0100 @@ -51,7 +51,7 @@ AddAmmo(enemy, amAirAttack, 100) ShowMission( loc("Nobody Laugh"), - loc("User Challenge"), + loc("Scenario"), loc("Eliminate the enemy before the time runs out") , 0, 0 ) diff -r 543bc82e1e28 -r ce3860c82c8b share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua Fri Nov 25 02:01:18 2016 +0100 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua Fri Nov 25 02:53:42 2016 +0100 @@ -80,7 +80,7 @@ GirderCrate = SpawnAmmoCrate(1789,514,amShotgun) -- final shotgun SpawnAmmoCrate(1181,419,amBee) - ShowMission(loc("Spooky Tree"), "", loc("Eliminate all enemies") .. loc("|- Mines Time:") .. " " .. 0 .. " " .. loc("sec"), -amBee, 0) + ShowMission(loc("Spooky Tree"), loc("Scenario"), loc("Eliminate all enemies") .. loc("|- Mines Time:") .. " " .. 0 .. " " .. loc("sec"), -amBee, 0) SetWind(-75) diff -r 543bc82e1e28 -r ce3860c82c8b share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Fri Nov 25 02:01:18 2016 +0100 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Fri Nov 25 02:53:42 2016 +0100 @@ -65,7 +65,7 @@ SpawnUtilityCrate(1543,744,amJetpack) SpawnAmmoCrate(227,442,amDrill) - ShowMission(loc("Codename: Teamwork"), "", 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 .. " " .. loc("sec"), 0, 0) end diff -r 543bc82e1e28 -r ce3860c82c8b share/hedgewars/Data/Missions/Scenario/User_Mission_-_The_Great_Escape.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_The_Great_Escape.lua Fri Nov 25 02:01:18 2016 +0100 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_The_Great_Escape.lua Fri Nov 25 02:53:42 2016 +0100 @@ -26,7 +26,7 @@ function onGameStart() -ShowMission(loc("The Great Escape"), loc("Get out of there!"), loc("Elimate your captor."), -amGrenade, 0) +ShowMission(loc("The Great Escape"), loc("Scenario"), loc("Elimate your captor."), -amGrenade, 0) ------ GIRDER LIST ------ PlaceGirder(1042,564,0) diff -r 543bc82e1e28 -r ce3860c82c8b share/hedgewars/Data/Missions/Scenario/portal.lua --- a/share/hedgewars/Data/Missions/Scenario/portal.lua Fri Nov 25 02:01:18 2016 +0100 +++ b/share/hedgewars/Data/Missions/Scenario/portal.lua Fri Nov 25 02:53:42 2016 +0100 @@ -157,7 +157,7 @@ --GIRDER-- PlaceGirder(3363, 1323, 4) - ShowMission (loc("Portal Mind Challenge"), loc("Mission"), + ShowMission (loc("Portal Mind Challenge"), loc("Scenario"), loc("Defeat all enemies!") .. "|" .. loc("In this mission you have infinite time."), -amPortalGun, 5000) HogSay(player, loc("I should get myself a portal device, maybe this crate has one."), SAY_THINK)