# HG changeset patch # User Wuzzy # Date 1520855673 -3600 # Node ID 159004144897eee0ad4090db2ff75312f47afc05 # Parent 9f80c08cdae91a3dd01b90d521bb66b1f208559b Use onSkipTurn in scripts to detect turn skips diff -r 9f80c08cdae9 -r 159004144897 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Mon Mar 12 12:37:35 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Mon Mar 12 12:54:33 2018 +0100 @@ -1168,8 +1168,8 @@ end end -function onHogAttack(ammoType) - if stage == spyKillStage and ammoType == amSkip then +function onSkipTurn() + if stage == spyKillStage then highJumped = true end end diff -r 9f80c08cdae9 -r 159004144897 share/hedgewars/Data/Missions/Training/Basic_Training_-_Flying_Saucer.lua --- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Flying_Saucer.lua Mon Mar 12 12:37:35 2018 +0100 +++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Flying_Saucer.lua Mon Mar 12 12:54:33 2018 +0100 @@ -555,9 +555,7 @@ end end -function onHogAttack(ammoType) - if ammoType == amSkip then - AddCaption(loc("Try again!"), 0xFFFFFFFF, capgrpMessage2) - ResetCurrentTarget() - end +function onSkipTurn() + AddCaption(loc("Try again!"), 0xFFFFFFFF, capgrpMessage2) + ResetCurrentTarget() end diff -r 9f80c08cdae9 -r 159004144897 share/hedgewars/Data/Scripts/Multiplayer/Mutant.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Mutant.lua Mon Mar 12 12:37:35 2018 +0100 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Mutant.lua Mon Mar 12 12:54:33 2018 +0100 @@ -694,16 +694,14 @@ end end -function onHogAttack(ammoType) +function onSkipTurn() -- Record skips for achievement - if ammoType == amSkip then - local team = GetHogTeamName(CurrentHedgehog) - increaseTeamValue(team, "Skips") - if(getTeamValue(team, "Skips") > recordSkips) then - recordSkips = getTeamValue(team, "Skips") - recordSkipsHogName = getGearValue(CurrentHedgehog, "Name") - recordSkipsTeamName = team - end + local team = GetHogTeamName(CurrentHedgehog) + increaseTeamValue(team, "Skips") + if(getTeamValue(team, "Skips") > recordSkips) then + recordSkips = getTeamValue(team, "Skips") + recordSkipsHogName = getGearValue(CurrentHedgehog, "Name") + recordSkipsTeamName = team end end