# HG changeset patch # User Wuzzy # Date 1531235491 -7200 # Node ID 4c47a480009b4a5f27ad5c4472ed8325ae621870 # Parent 854caa3c921263ea7ec614b0e1f2aeefe31fb284 Prevent manual hiding of some special mission panels diff -r 854caa3c9212 -r 4c47a480009b share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Tue Jul 10 16:44:13 2018 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Tue Jul 10 17:11:31 2018 +0200 @@ -152,7 +152,7 @@ goals = { [startDialogue] = {loc("First Blood"), loc("First Steps"), loc("Press [Left] or [Right] to move around, [Enter] to jump"), 1, 4000}, - [onShroomAnim] = {loc("First Blood"), loc("A leap in a leap"), loc("Go on top of the flower") .. "|" .. loc("Hint: Press [M] to review the mission texts."), 1, 7000}, + [onShroomAnim] = {loc("First Blood"), loc("A leap in a leap"), loc("Go on top of the flower") .. "|" .. loc("Hint: Hold down [M] to review the mission texts."), 1, 7000}, [onFlowerAnim] = {loc("First Blood"), loc("Hightime"), loc("Collect the crate on the right.|Hint: Select the rope, [Up] or [Down] to aim, [Space] to fire, directional keys to move.|Ropes can be fired again in the air!"), 1, 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 ([Space] while in air) to get the next crate"), 1, 4000}, @@ -674,7 +674,7 @@ loc("Press [Left] and [Right] to change the difficulty.") .. "| |" .. dstr .. "| |" .. loc("Press [Attack] to begin."), - 0, 9999000) + 0, 9999000, true) end function SetChoice() diff -r 854caa3c9212 -r 4c47a480009b share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Tue Jul 10 16:44:13 2018 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Tue Jul 10 17:11:31 2018 +0200 @@ -38,7 +38,7 @@ 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}, + loc("Flee: Press [Jump]"), 1, 9999000, true}, [dialog02] = {missionName, loc("Battle Starts Now!"), loc("You have chosen to fight!").."|"..loc("Lead the Green Bananas 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}, diff -r 854caa3c9212 -r 4c47a480009b share/hedgewars/Data/Missions/Training/Basic_Training_-_Movement.lua --- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Movement.lua Tue Jul 10 16:44:13 2018 +0200 +++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Movement.lua Tue Jul 10 17:11:31 2018 +0200 @@ -380,7 +380,7 @@ loc("Quit: [Esc]").."|".. loc("Pause: [P]").."| |".. loc("To begin with the training, hit the attack key!").."|".. - loc("Attack: [Space]"), 2, 900000) + loc("Attack: [Space]"), 2, 900000, true) -- TODO: This and other training missions are currently hardcoding control names. -- This should be fixed eventually. diff -r 854caa3c9212 -r 4c47a480009b share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua Tue Jul 10 16:44:13 2018 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua Tue Jul 10 17:11:31 2018 +0200 @@ -2535,7 +2535,7 @@ " " .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", -amGirder, 60000 + "", -amGirder, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2553,7 +2553,7 @@ " " .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", -amRubber, 60000 + "", -amRubber, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2568,7 +2568,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", 8, 60000 + "", 8, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2582,7 +2582,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", -amKnife, 60000 + "", -amKnife, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2596,7 +2596,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", 1, 60000 + "", 1, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2611,7 +2611,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", -amCMGearPlacementTool, 60000 + "", -amCMGearPlacementTool, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2626,7 +2626,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", -amMine, 60000 + "", -amMine, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2641,7 +2641,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", 9, 60000 + "", 9, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2656,7 +2656,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", -amSMine, 60000 + "", -amSMine, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2671,7 +2671,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", -amAirMine, 60000 + "", -amAirMine, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2686,7 +2686,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", 7, 60000 + "", 7, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2701,7 +2701,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", 5, 60000 + "", 5, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2716,7 +2716,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", 6, 60000 + "", 6, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2731,7 +2731,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", -amCMGearPlacementTool, 60000 + "", -amCMGearPlacementTool, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2752,7 +2752,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", 2, 60000 + "", 2, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2773,7 +2773,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", -amCMGearPlacementTool, 60000 + "", -amCMGearPlacementTool, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2788,7 +2788,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", 0, 60000 + "", 0, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false elseif cat[cIndex] == loc("Hog Identity Mode") then @@ -2802,7 +2802,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", 3, 60000 + "", 3, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2817,7 +2817,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", 3, 60000 + "", 3, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false @@ -2832,7 +2832,7 @@ loc("Change Placement Mode: [Up], [Down]") .. "|" .. loc("Toggle Help: [Precise]+[1]") .. "|" .. loc("Toggle Gear Information: [Precise]+[3]") .. "|" .. - "", 2, 60000 + "", 2, 60000, not helpDisabled ) hedgeEditorMissionPanelShown = false diff -r 854caa3c9212 -r 4c47a480009b share/hedgewars/Data/Scripts/Multiplayer/WxW.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/WxW.lua Tue Jul 10 16:44:13 2018 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/WxW.lua Tue Jul 10 17:11:31 2018 +0200 @@ -1550,7 +1550,7 @@ preMenuCfg.. missionComment .. postMenuCfg .. - "", 2, 9999000 + "", 2, 9999000, true ) menu[menuIndex].line = temp