# HG changeset patch # User Wuzzy # Date 1558879293 -7200 # Node ID c88201afcc7c6ac79d907a1f603b0cfe6c26fe03 # Parent 3e79818e21b1ddf35614aa6b931f562bd502a70d ACF5: Add appear animation for 3rd wave diff -r 3e79818e21b1 -r c88201afcc7c ChangeLog.txt --- a/ChangeLog.txt Sun May 26 15:49:39 2019 +0200 +++ b/ChangeLog.txt Sun May 26 16:01:33 2019 +0200 @@ -51,6 +51,7 @@ A Classic Fairytale: + Backstab: Disable utilities before traitor has been dealt with * Backstab: Prevent attacking the cannibals before making the choice + * Backstab: Fix/tweak behaviour in 3rd enemy wave * First blood: Fix Lua error when hitting Attack after failing the rope challenge * First blood: Fix a cut scene being played twice in row * The Shadow Falls: Fix Lua error when hog dies during choice phase diff -r 3e79818e21b1 -r c88201afcc7c share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Sun May 26 15:49:39 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Sun May 26 16:01:33 2019 +0200 @@ -658,7 +658,7 @@ function DoTurnsOver() stage = wave3Stage - RestoreWave(3) + RestoreWave(3, true) DeleteCircles() end @@ -902,12 +902,16 @@ end -function RestoreWave(index) +function RestoreWave(index, animate) for i = (index - 1) * 3 + 1, index * 3 do if cannibalHidden[i] == true then RestoreHog(cannibals[i]) - AnimSetGearPosition(cannibals[i], unpack(cannibalPos[i])) - FollowGear(cannibals[i]) + if animate then + AnimOutOfNowhere(cannibals[i], unpack(cannibalPos[i])) + else + AnimSetGearPosition(cannibals[i], unpack(cannibalPos[i])) + FollowGear(cannibals[i]) + end cannibalHidden[i] = false end end