Semi-standardize usage of icons in many mission panels
* Question mark: Decision / user input
* Exclamation mark: Tutorial message / information
* Hedgehog: Mission introduction
* -amSkip: Mission failure
* Star: Mission success / end of game
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Tue May 28 00:48:17 2019 +0200
@@ -690,7 +690,7 @@
ShowMission(loc("Backstab"), loc("Judas"),
string.format(loc("Kill the traitor, %s, or spare his life!"), GetHogName(spyHog)) .. "|" ..
loc("Kill him or skip your turn."),
- 1, 8000)
+ 3, 8000)
end
-----------------------------Events------------------------------------
@@ -699,7 +699,7 @@
end
function DoDeployedDead()
- ShowMission(loc("Backstab"), loc("Brutus"), loc("You have failed to save the tribe!"), 0, 6000)
+ ShowMission(loc("Backstab"), loc("Brutus"), loc("You have failed to save the tribe!"), -amSkip, 6000)
DismissTeam(nativesTeamName)
DismissTeam(tribeTeamName)
DismissTeam(cyborgTeamName)
@@ -759,7 +759,7 @@
end
function DoKilledOther()
- ShowMission(loc("Backstab"), loc("Brutus"), loc("You have killed an innocent hedgehog!"), 0, 6000)
+ ShowMission(loc("Backstab"), loc("Brutus"), loc("You have killed an innocent hedgehog!"), -amSkip, 6000)
DismissTeam(nativesTeamName)
DismissTeam(tribeTeamName)
EndTurn(true)
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua Tue May 28 00:48:17 2019 +0200
@@ -710,7 +710,7 @@
SetupPlace()
AnimationSetup()
SetupEvents()
- ShowMission(loc("Dragon's Lair"), loc("Y Chwiliad"), loc("Find your tribe!|Cross the lake!"), 1, 0)
+ ShowMission(loc("Dragon's Lair"), loc("Y Chwiliad"), loc("Find your tribe!|Cross the lake!"), 10, 0)
end
function onGameTick()
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua Tue May 28 00:48:17 2019 +0200
@@ -129,7 +129,7 @@
ShowMission(loc("Epilogue"), loc("That's all, folks!"),
loc("You have successfully finished the campaign!").."|"..
loc("If you wish to replay, there are other possible endings, too!").."|"..
- loc("You can practice moving around and using utilities in this mission.|However, it will never end!"), 1, 0)
+ loc("You can practice moving around and using utilities in this mission.|However, it will never end!"), 4, 0)
SaveCampaignVar("Progress", "10")
SaveCampaignVar("Won", "true")
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Tue May 28 00:48:17 2019 +0200
@@ -162,17 +162,17 @@
end
goals = {
- [startDialogue] = {loc("First Blood"), loc("First Steps"), loc("Press [Left] or [Right] to move around, [Long Jump] to jump forwards.") .. "| |" .. ctrlJump, 1, 4000},
- [onShroomAnim] = {loc("First Blood"), loc("A leap in a leap"), loc("Go on top of the flower.") .. "|" .. ctrlMissionPanel, 1, 7000},
- [onFlowerAnim] = {loc("First Blood"), loc("Hightime"), loc("Collect the crate on the right.") .. "|" .. loc("Hint: Select the rope, [Up] or [Down] to aim, [Attack] to fire, directional keys to move.") .. "|" .. loc("Ropes can be fired again in the air!") .. "| |" .. ctrlAttack, 1, 7000},
+ [startDialogue] = {loc("First Blood"), loc("First Steps"), loc("Press [Left] or [Right] to move around, [Long Jump] to jump forwards.") .. "| |" .. ctrlJump, 2, 4000},
+ [onShroomAnim] = {loc("First Blood"), loc("A leap in a leap"), loc("Go on top of the flower.") .. "|" .. ctrlMissionPanel, 2, 7000},
+ [onFlowerAnim] = {loc("First Blood"), loc("Hightime"), loc("Collect the crate on the right.") .. "|" .. loc("Hint: Select the rope, [Up] or [Down] to aim, [Attack] to fire, directional keys to move.") .. "|" .. loc("Ropes can be fired again in the air!") .. "| |" .. ctrlAttack, 2, 7000},
[tookParaAnim] = {loc("First Blood"), loc("Omnivore"), loc("Get on the head of the mole."), 1, 4000},
- [onMoleHeadAnim] = {loc("First Blood"), loc("The Leap of Faith"), loc("Use the parachute to get the next crate.") .. "|" .. loc("Hint: Just select the parachute, it opens automatically when you fall."), 1, 4000},
- [pastMoleHeadAnim] = {loc("First Blood"), loc("The Leap of Faith"), loc("Get that crate!"), 1, 4000},
- [tookRope2Anim] = {loc("First Blood"), loc("The Rising"), loc("Get that crate!"), 1, 4000},
+ [onMoleHeadAnim] = {loc("First Blood"), loc("The Leap of Faith"), loc("Use the parachute to get the next crate.") .. "|" .. loc("Hint: Just select the parachute, it opens automatically when you fall."), 2, 4000},
+ [pastMoleHeadAnim] = {loc("First Blood"), loc("The Leap of Faith"), loc("Get that crate!"), 5, 4000},
+ [tookRope2Anim] = {loc("First Blood"), loc("The Rising"), loc("Get that crate!"), 7, 4000},
[tookPunchAnim] = {loc("First Blood"), loc("The Slaughter"), loc("Destroy the targets!") .. "|" .. loc("Hint: Select the Shoryuken and hit [Attack].|P.S.: You can use it mid-air.") .. "| |" .. ctrlAttack, 1, 5000},
- [challengeAnim] = {loc("First Blood"), loc("The Crate Frenzy"), loc("Collect the crates within the time limit!|If you fail, you'll have to try again."), 1, 5000},
- [challengeFailedAnim] = {loc("First Blood"), loc("The Crate Frenzy"), loc("Collect the crates within the time limit!|If you fail, you'll have to try again."), 1, 5000},
- [challengeCompletedAnim] = {loc("First Blood"), loc("The Ultimate Weapon"), loc("Get that crate!"), 1, 5000},
+ [challengeAnim] = {loc("First Blood"), loc("The Crate Frenzy"), loc("Collect the crates within the time limit!|If you fail, you'll have to try again."), 7, 5000},
+ [challengeFailedAnim] = {loc("First Blood"), loc("The Crate Frenzy"), loc("Collect the crates within the time limit!|If you fail, you'll have to try again."), 7, 5000},
+ [challengeCompletedAnim] = {loc("First Blood"), loc("The Ultimate Weapon"), loc("Get that crate!"), 7, 5000},
[beforeKillAnim] = {loc("First Blood"), loc("The First Blood"), loc("Kill the cannibal!"), 1, 5000},
[closeCannim] = {loc("First Blood"), loc("The First Blood"), loc("KILL IT!"), 1, 5000},
}
@@ -391,7 +391,7 @@
RemoveEventFunc(CheckDamage)
RemoveEventFunc(CheckDamagedOthers)
FinishThem()
- ShowMission(loc("First Blood"), loc("The wasted youth"), loc("Leaks A Lot gave his life for his tribe! He should have survived!"), 2, 4000)
+ ShowMission(loc("First Blood"), loc("The wasted youth"), loc("Leaks A Lot gave his life for his tribe! He should have survived!"), -amSkip, 4000)
end
function CheckDamagedOthers()
@@ -430,7 +430,7 @@
else
msg = msg .. loc("Backwards jump: Press [Backspace] twice")
end
- ShowMission(loc("First Blood"), loc("Step By Step"), msg, 10, 10000)
+ ShowMission(loc("First Blood"), loc("Step By Step"), msg, 2, 10000)
AddEvent(CheckOnShroom, {}, DoOnShroom, {}, 0)
end
@@ -627,7 +627,7 @@
PutTargets(1)
AddEvent(CheckTargetsKilled, {}, DoTargetsKilled, {}, 1)
AddEvent(CheckCannibalKilled, {}, DoCannibalKilledEarly, {}, 0)
- ShowMission(loc("First Blood"), loc("The Bull's Eye"), loc("Destroy the targets!") .. "| |" .. ctrlAttack, 1, 5000)
+ ShowMission(loc("First Blood"), loc("The Bull's Eye"), loc("Destroy the targets!"), 1, 5000)
end
function CheckTargetsKilled()
@@ -686,7 +686,7 @@
cratesCollected = 0
PutCrate(1)
SetTurnTimeLeft(time)
- ShowMission(loc("First Blood"), loc("The Crate Frenzy"), loc("Collect the crates within the time limit!|If you fail, you'll have to try again."), 1, 5000)
+ ShowMission(loc("First Blood"), loc("The Crate Frenzy"), loc("Collect the crates within the time limit!|If you fail, you'll have to try again."), 7, 5000)
end
function ChoiceDialog()
@@ -701,7 +701,7 @@
loc("Press [Left] and [Right] to change the difficulty.") .. "| |" ..
dstr .. "| |" ..
loc("Press [Attack] to begin."),
- 0, 9999000, true)
+ 3, 9999000, true)
end
function SetChoice()
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Tue May 28 00:48:17 2019 +0200
@@ -201,7 +201,7 @@
SetTurnTimeLeft(TurnTime)
ShowMission(loc("The Journey Back"), loc("Collateral Damage"),
loc("Save the princess by collecting the crate in under 12 turns!") .. "|" ..
- loc("Mines time: 3 seconds"), 0, 6000)
+ loc("Mines time: 3 seconds"), 7, 6000)
-----------------------///////////////------------
end
@@ -266,7 +266,7 @@
if m2DenseDead == 0 then
conds = loc("Your hogs must survive!")
end
- ShowMission(loc("The Journey Back"), loc("Adventurous"), goal .. "|" .. hint .. "|" .. stuck .. "|" .. conds, 0, 7000)
+ ShowMission(loc("The Journey Back"), loc("Adventurous"), goal .. "|" .. hint .. "|" .. stuck .. "|" .. conds, 1, 7000)
end
function SkipStartAnim()
@@ -322,7 +322,7 @@
ShowMission(loc("The Journey Back"), loc("The Savior"),
loc("Get Dense Cloud out of the pit!") .. "|" ..
loc("Your hogs must survive!") .. "|" ..
- loc("Beware of mines: They explode after 5 seconds."), 1, 5000)
+ loc("Beware of mines: They explode after 5 seconds."), 10, 5000)
end
function SkipPastFlowerAnim()
@@ -944,7 +944,7 @@
ShowMission(loc("The Journey Back"), loc("The Tunnel Maker"),
loc("Get past the flower.").."|"..
loc("Hint: Select the blow torch, aim and press [Fire]. Press [Fire] again to stop.").."|"..
- loc("Don't blow up the crate."), 0, 6000)
+ loc("Don't blow up the crate."), 2, 6000)
end
function CheckTookLowGravity()
@@ -955,7 +955,7 @@
ShowMission(loc("The Journey Back"), loc("The Moonwalk"),
loc("Hop on top of the next flower and advance to the left coast.").."|"..
loc("Hint: Select the low gravity and press [Fire].") .. "|" ..
- loc("Beware of mines: They explode after 3 seconds."), 0, 6000)
+ loc("Beware of mines: They explode after 3 seconds."), 2, 6000)
end
function CheckOnBridge()
@@ -980,7 +980,7 @@
ShowMission(loc("The Journey Back"), loc("Slippery"),
loc("Collect the weapon crate at the left coast!") .. "|" ..
loc("You'd better watch your steps...") .. "|" ..
- loc("Mines time: 3 seconds"), 0, 4000)
+ loc("Mines time: 3 seconds"), 7, 4000)
end
function CheckTookSniper()
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Tue May 28 00:48:17 2019 +0200
@@ -253,7 +253,7 @@
return
end
stage = cyborgStage
- ShowMission(loc("The Shadow Falls"), loc("The Dilemma"), loc("Choose your side! If you want to join the strange man, walk up to him.|Otherwise, walk away from him. If you decide to att...nevermind..."), 1, 8000)
+ ShowMission(loc("The Shadow Falls"), loc("The Dilemma"), loc("Choose your side! If you want to join the strange man, walk up to him.|Otherwise, walk away from him. If you decide to att...nevermind..."), 3, 8000)
AddEvent(CheckChoice, {}, DoChoice, {}, 0)
AddEvent(CheckRefuse, {}, DoRefuse, {}, 0)
AddEvent(CheckAccept, {}, DoAccept, {}, 0)
@@ -1078,7 +1078,7 @@
else
hint = "|" .. loc("Hint: Cinematics can be skipped with the [Precise] key.")
end
- ShowMission(loc("The Shadow Falls"), loc("The First Encounter"), loc("Survive!") .. hint, 1, 0)
+ ShowMission(loc("The Shadow Falls"), loc("The First Encounter"), loc("Survive!") .. hint, 10, 0)
end
function onGameTick()
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Tue May 28 00:48:17 2019 +0200
@@ -44,7 +44,7 @@
loc("Complete the remaining side missions to complete this mission.").."|"..
loc("One flower: Incomplete side missions").."|"..
loc("Two flowers: All missions complete"), 1, 8000},
- ["free"] = {missionName, loc("Spacetrip"), loc("Use the flying saucer to fly to the other planets."), 1, 5000}
+ ["free"] = {missionName, loc("Spacetrip"), loc("Use the flying saucer to fly to the other planets."), -amJetpack, 5000}
}
-- crates
local saucerX = 3270
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Tue May 28 00:48:17 2019 +0200
@@ -38,11 +38,11 @@
loc("Captain Lime offered his help if you assist him in battle.").."|"..
loc("What do you want to do?").."| |"..
loc("Fight: Press [Attack]").."|"..
- loc("Flee: Press [Jump]"), 1, 9999000, true},
+ loc("Flee: Press [Jump]"), 3, 9999000, true},
[dialog02] = {missionName, loc("Battle Starts Now!"), loc("You have chosen to fight!").."|"..loc("Lead your allies to battle and eliminate all the enemies!"), 1, 5000},
[dialog03] = {missionName, loc("Time to run!"), loc("You have chosen to flee.").."|"..loc("You have to reach the left-most place on the map."), 1, 5000},
- ["fight"] = {missionName, loc("Ready for Battle?"), loc("You have chosen to fight!"), 1, 2000},
- ["flee"] = {missionName, loc("Ready for Battle?"), loc("You have chosen to flee."), 1, 2000},
+ ["fight"] = {missionName, loc("Ready for Battle?"), loc("You have chosen to fight!"), 2, 2000},
+ ["flee"] = {missionName, loc("Coward"), loc("You have chosen to flee."), 2, 2000},
["flee_final"] = {missionName, loc("Time to run!"), loc("Knock off the enemies from the left-most place of the map!") .. "|" .. loc("Stay there to flee!"), 1, 6000},
}
-- crates
--- a/share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua Tue May 28 00:48:17 2019 +0200
@@ -25,7 +25,7 @@
recordInfo = getReadableChallengeRecord("Highscore")
end
ShowMission(loc("That Sinking Feeling"), loc("Challenge"), loc("Save as many hogs as possible!")
- .. "|" .. recordInfo, 4, 0)
+ .. "|" .. recordInfo, 10, 0)
end
-- allow skipping of the intro via hitting precise key
@@ -215,7 +215,7 @@
if genCounter == 2000 then
introStage = 110
FollowGear(CurrentHedgehog)
- ShowMission(loc("That Sinking Feeling"), loc("User Challenge"), loc("Save as many hogs as possible!"), 4, 0)
+ ShowMission(loc("That Sinking Feeling"), loc("User Challenge"), loc("Save as many hogs as possible!"), 10, 0)
SetInputMask(0xFFFFFFFF)
end
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Nobody_Laugh.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Nobody_Laugh.lua Tue May 28 00:48:17 2019 +0200
@@ -7,7 +7,7 @@
SimpleMission({
missionTitle = loc("Nobody Laugh"),
- missionIcon = 0,
+ missionIcon = -amHammer,
goalText =
loc("Eliminate the enemy.") .. "|" ..
loc("Unlimited Attacks: Attacks don't end your turn") .. "|"..
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Tue May 28 00:48:17 2019 +0200
@@ -66,7 +66,7 @@
SpawnSupplyCrate(1543,744,amJetpack)
SpawnSupplyCrate(227,442,amDrill)
- ShowMission(loc("Teamwork"), loc("Scenario"), loc("Eliminate Unit 3378.") .. "|" .. loc("Both your hedgehogs must survive.") .. "|" .. loc("Mines time: 0 seconds"), 0, 0)
+ ShowMission(loc("Teamwork"), loc("Scenario"), loc("Eliminate Unit 3378.") .. "|" .. loc("Both your hedgehogs must survive.") .. "|" .. loc("Mines time: 0 seconds"), 1, 0)
end
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua Tue May 28 00:48:17 2019 +0200
@@ -213,7 +213,7 @@
spawnTargets()
elseif gamePhase == 7 then
SaveMissionVar("Won", "true")
- ShowMission(loc("Basic Bazooka Training"), loc("Training complete!"), loc("Congratulations!"), 0, 0)
+ ShowMission(loc("Basic Bazooka Training"), loc("Training complete!"), loc("Congratulations!"), 4, 0)
SetInputMask(0)
AddAmmo(CurrentHedgehog, amBazooka, 0)
if shotsFired > maxTargets then
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua Tue May 28 00:48:17 2019 +0200
@@ -185,7 +185,7 @@
spawnTargets()
elseif gamePhase == 6 then
SaveMissionVar("Won", "true")
- ShowMission(loc("Basic Grenade Training"), loc("Training complete!"), loc("Congratulations!"), 0, 0)
+ ShowMission(loc("Basic Grenade Training"), loc("Training complete!"), loc("Congratulations!"), 4, 0)
SetInputMask(0)
AddAmmo(CurrentHedgehog, amGrenade, 0)
if shotsFired > maxTargets then
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Movement.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Movement.lua Tue May 28 00:48:17 2019 +0200
@@ -262,7 +262,7 @@
local function victory()
SaveMissionVar("Won", "true")
- ShowMission(loc("Basic Movement Training"), loc("Training complete!"),loc("Congratulations! You have completed the obstacle course!"), 0, 0)
+ ShowMission(loc("Basic Movement Training"), loc("Training complete!"),loc("Congratulations! You have completed the obstacle course!"), 4, 0)
SendStat(siGameResult, loc("You have completed the Basic Movement Training!"))
SendStat(siCustomAchievement, loc("Congratulations!"))
SendStat(siCustomAchievement, loc("Return to the training menu by pressing the “Go back” button."))
@@ -538,7 +538,7 @@
SetInputMask(0)
SetSoundMask(sndYesSir, true)
LoadGearData()
- ShowMission(loc("Basic Movement Training"), loc("Basic Training"), loc("Complete the obstacle course."), 1, 0)
+ ShowMission(loc("Basic Movement Training"), loc("Basic Training"), loc("Complete the obstacle course."), 10, 0)
FollowGear(hog_greenhorn)
end
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Rope.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Rope.lua Tue May 28 00:48:17 2019 +0200
@@ -368,7 +368,7 @@
elseif currentTarget == 7 then
SaveMissionVar("Won", "true")
ShowMission(loc("Basic Rope Training"), loc("Training complete!"),
- loc("Congratulations!"), 0, 0)
+ loc("Congratulations!"), 4, 0)
if flawless then
PlaySound(sndFlawless, hog)
else
--- a/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Racer.lua Tue May 28 00:48:17 2019 +0200
@@ -695,7 +695,7 @@
ShowMission(loc("Racer"),
loc("A Hedgewars mini-game"),
loc("Touch all waypoints as fast as you can!"),
- 2, 4000)
+ 1, 4000)
end
function onGameStart()
--- a/share/hedgewars/Data/Scripts/Multiplayer/WxW.lua Mon May 27 21:56:12 2019 +0200
+++ b/share/hedgewars/Data/Scripts/Multiplayer/WxW.lua Tue May 28 00:48:17 2019 +0200
@@ -1579,7 +1579,7 @@
preMenuCfg..
missionComment ..
postMenuCfg ..
- "", 2, 9999000, true
+ "", 3, 9999000, true
)
end