# HG changeset patch # User Wuzzy # Date 1558986972 -7200 # Node ID d59da429d22c32064037b7aac96b7695ab6cda26 # Parent d75ce53d811eec4fc7d8d3d18ca5b30acd7b444c Add 2 mission panel icons: hedgehog and flags diff -r d75ce53d811e -r d59da429d22c ChangeLog.txt --- a/ChangeLog.txt Mon May 27 16:43:42 2019 +0200 +++ b/ChangeLog.txt Mon May 27 21:56:12 2019 +0200 @@ -162,6 +162,7 @@ + New return value: AddTeam/AddMissionTeam return , + SetClanColor: Now accepts negative color argument for user clan color, like in AddTeam + AddTeam: Append “_qau” to voicepack name to enable automatic selection of voicepack language + + ShowMission: Add new icons: hedgehog (10), flags (11) + Utils library: New calls: getReadableChallengeRecord, updateChallengeRecord, integerSqrt, integerHypotenuse + New callback: onGameResult(winningClan): Called when the game ends normally. winningClan = index of winning clan or -1 on draw + New callback: onCaseDrop(gear): Called at the point where a crate MIGHT be dropped between turns. Gear is the crate gear or nil diff -r d75ce53d811e -r d59da429d22c share/hedgewars/Data/Graphics/missions.png Binary file share/hedgewars/Data/Graphics/missions.png has changed diff -r d75ce53d811e -r d59da429d22c share/hedgewars/Data/Maps/CTF_Blizzard/map.lua --- a/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua Mon May 27 16:43:42 2019 +0200 +++ b/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua Mon May 27 21:56:12 2019 +0200 @@ -578,7 +578,7 @@ loc("- Hogs will drop the flag when killed") .."|".. loc("- Dropped flags may be returned or recaptured").."|".. loc("- Hogs will be revived") .."|".. - loc("- Touch the sparkles near your base to teleport"), 0, 0) + loc("- Touch the sparkles near your base to teleport"), 11, 0) -- initialize teleporters leftTel = CreateZone(342,1316,42,449) -- left teleporter (clan 0) diff -r d75ce53d811e -r d59da429d22c share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Mon May 27 16:43:42 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Mon May 27 21:56:12 2019 +0200 @@ -430,7 +430,7 @@ else msg = msg .. loc("Backwards jump: Press [Backspace] twice") end - ShowMission(loc("First Blood"), loc("Step By Step"), msg, -amSkip, 10000) + ShowMission(loc("First Blood"), loc("Step By Step"), msg, 10, 10000) AddEvent(CheckOnShroom, {}, DoOnShroom, {}, 0) end @@ -788,7 +788,7 @@ else 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) + ShowMission(loc("A Classic Fairytale"), loc("First Blood"), loc("Finish your training.") .. msgSkip, 10, 0) HideHog(cannibal) AddAnim(startDialogue) diff -r d75ce53d811e -r d59da429d22c share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Mon May 27 16:43:42 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Mon May 27 21:56:12 2019 +0200 @@ -64,7 +64,7 @@ function onGameStart() AnimWait(hero.gear, 3000) FollowGear(hero.gear) - ShowMission(missionName, loc("Challenge objectives"), challengeObjectives, -amSkip, 7500) + ShowMission(missionName, loc("Objectives"), challengeObjectives, 1, 7500) -- explosives x = 400 diff -r d75ce53d811e -r d59da429d22c share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Mon May 27 16:43:42 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Mon May 27 21:56:12 2019 +0200 @@ -176,7 +176,7 @@ FollowGear(hero.gear) ShowMission(campaignName, missionName, string.format(loc("%s has to refuel the saucer."), hero.name).. - "|"..loc("Rescue the imprisoned PAotH team and get the fuel!"), -amSkip, 0) + "|"..loc("Rescue the imprisoned PAotH team and get the fuel!"), 10, 0) AddAmmo(minion1.gear, amDEagle, 10) AddAmmo(minion2.gear, amDEagle, 10) diff -r d75ce53d811e -r d59da429d22c share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua Mon May 27 16:43:42 2019 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Capture_the_Flag.lua Mon May 27 21:56:12 2019 +0200 @@ -503,7 +503,7 @@ loc("- Dropped flags may be returned or recaptured").."|".. loc("- Hogs will be revived") - ShowMission(loc("Capture The Flag"), loc("A Hedgewars minigame"), rules, 0, 0) + ShowMission(loc("Capture The Flag"), loc("A Hedgewars minigame"), rules, 11, 0) end function updateScores()