# HG changeset patch # User Wuzzy # Date 1558191291 -7200 # Node ID 3ed1cbd31754360c3c341f3eda36625d1519c153 # Parent 1a05a1929e2ca3bbea98fd10fffb9ac13fc6081f Backed out changeset 4596357d002d (onPreciseLocal causes desyncs) diff -r 1a05a1929e2c -r 3ed1cbd31754 ChangeLog.txt --- a/ChangeLog.txt Sat May 18 16:38:03 2019 +0200 +++ b/ChangeLog.txt Sat May 18 16:54:51 2019 +0200 @@ -17,7 +17,6 @@ * Fix broken behaviour of airborne attacks when placed near bounce world edge * Deny placement of airborne attack in “impossible” places in maps with bounce world edge * Deny placement of piano beyond bounce world edge - * Fix cut scenes not being skipped when pressing precise in enemy turn * Fix laser sight not working properly when it starts out of map bounds * Fix parachute making hog stuck or fast when bumping into wall while looking other way * Add missing winner animation in single missions diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Sat May 18 16:54:51 2019 +0200 @@ -1226,7 +1226,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 2500 and AnimInProgress() then SetAnimSkip(true) return diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua Sat May 18 16:54:51 2019 +0200 @@ -753,7 +753,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 2500 and AnimInProgress() then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/enemy.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/enemy.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/enemy.lua Sat May 18 16:54:51 2019 +0200 @@ -714,7 +714,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 3000 and AnimInProgress() then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua Sat May 18 16:54:51 2019 +0200 @@ -492,7 +492,7 @@ SetTurnTimeLeft(MAX_TURN_TIME) end -function onPreciseLocal() +function onPrecise() if GameTime > 2500 then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua Sat May 18 16:54:51 2019 +0200 @@ -661,9 +661,14 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 2500 and AnimInProgress() then SetAnimSkip(true) return end +-- HideHedge(princess) +-- for i = 1, 5 do +-- DeleteGear(cyborgs[i]) +-- end +-- AddAmmo(natives[1], amTeleport, 100) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Sat May 18 16:54:51 2019 +0200 @@ -893,7 +893,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 2000 then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Sat May 18 16:54:51 2019 +0200 @@ -1210,7 +1210,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 2500 and AnimInProgress() then SetAnimSkip(true) return diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua Sat May 18 16:54:51 2019 +0200 @@ -852,7 +852,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 2500 and AnimInProgress() then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Sat May 18 16:54:51 2019 +0200 @@ -1142,7 +1142,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 2500 and AnimInProgress() then SetAnimSkip(true) return diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Sat May 18 16:54:51 2019 +0200 @@ -545,7 +545,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 2500 then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Sat May 18 16:54:51 2019 +0200 @@ -276,7 +276,7 @@ setFoundDeviceVisual() end -function onPreciseLocal() +function onPrecise() if GameTime > 3000 then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Sat May 18 16:54:51 2019 +0200 @@ -245,7 +245,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 3000 then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Sat May 18 16:54:51 2019 +0200 @@ -296,7 +296,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 3000 then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua Sat May 18 16:54:51 2019 +0200 @@ -160,7 +160,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 3000 then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua Sat May 18 16:54:51 2019 +0200 @@ -120,7 +120,7 @@ SetAmmo(amRCPlane, 0, 0, 0, 1) end -function onPreciseLocal() +function onPrecise() if GameTime > 3000 then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Sat May 18 16:54:51 2019 +0200 @@ -192,7 +192,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 3000 then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Sat May 18 16:54:51 2019 +0200 @@ -256,7 +256,7 @@ SetAmmo(amWatermelon, 0, 0, 0, 1) end -function onPreciseLocal() +function onPrecise() if GameTime > 3000 then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Sat May 18 16:54:51 2019 +0200 @@ -315,7 +315,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 3000 then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Sat May 18 16:54:51 2019 +0200 @@ -354,7 +354,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 3000 then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua Sat May 18 16:54:51 2019 +0200 @@ -216,7 +216,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 3000 then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Sat May 18 16:54:51 2019 +0200 @@ -264,7 +264,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 3000 then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua Sat May 18 16:54:51 2019 +0200 @@ -174,7 +174,7 @@ end end -function onPreciseLocal() +function onPrecise() if GameTime > 3000 then SetAnimSkip(true) end diff -r 1a05a1929e2c -r 3ed1cbd31754 share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua --- a/share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua Sat May 18 16:38:03 2019 +0200 +++ b/share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua Sat May 18 16:54:51 2019 +0200 @@ -29,7 +29,7 @@ end -- allow skipping of the intro via hitting precise key -function onPreciseLocal() +function onPrecise() if introStage < 100 then introStage = 110 genCounter = 0