# HG changeset patch # User Wuzzy # Date 1506738400 -7200 # Node ID dd0fb5b1556767b4dacf75a8b4cf87c51735a8dc # Parent 12d4886de2b17156f1a82b1eb7e69d357c32cb9c ACF5: Spare traitor's life with skip instead of precise Since you can accidentally press precise diff -r 12d4886de2b1 -r dd0fb5b15567 ChangeLog.txt --- a/ChangeLog.txt Sat Sep 30 04:03:08 2017 +0200 +++ b/ChangeLog.txt Sat Sep 30 04:26:40 2017 +0200 @@ -177,6 +177,7 @@ A Classic Fairytale: + Mission 4: Add infinite skip + + Mission 5: Spare traitor's life with Skip instead of Precise + Mission 6: Add alternate dialogues when killing cyborgs before collecting the crates + All missions: Clarify mine timers * Mission 1: Leaf of faith: Hog was able to walk to the right and get stuck diff -r 12d4886de2b1 -r dd0fb5b15567 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Sat Sep 30 04:03:08 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Sat Sep 30 04:26:40 2017 +0200 @@ -615,7 +615,10 @@ AddEvent(CheckChoice, {}, DoChoice, {}, 0) AddEvent(CheckKilledOther, {}, DoKilledOther, {}, 0) AddEvent(CheckChoiceRefuse, {}, DoChoiceRefuse, {}, 0) - ShowMission(loc("Backstab"), loc("Judas"), loc("Kill the traitor...or spare his life!|Kill him or press [Precise]!"), 1, 8000) + 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) end -----------------------------Events------------------------------------ @@ -1106,7 +1109,10 @@ SetAnimSkip(true) return end - if stage == spyKillStage then +end + +function onHogAttack(ammoType) + if stage == spyKillStage and ammoType == amSkip then highJumped = true end end