# HG changeset patch # User Wuzzy # Date 1544425185 -3600 # Node ID 6c21bd8547dde6bac33b3351af0fcbfc7f7d7d3a # Parent 9c7d5f5958818edb2a395aef2dc189bdd771e41c Remove incorrectly used Delay parameter in many scripts diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Maps/Basketball/map.lua --- a/share/hedgewars/Data/Maps/Basketball/map.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Maps/Basketball/map.lua Mon Dec 10 07:59:45 2018 +0100 @@ -10,7 +10,6 @@ CaseFreq = 0 MinesNum = 0 Explosives = 0 - Delay = 500 Map = 'BasketballField' -- Disable Sudden Death WaterRise = 0 diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Maps/FlightJoust/map.lua --- a/share/hedgewars/Data/Maps/FlightJoust/map.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Maps/FlightJoust/map.lua Mon Dec 10 07:59:45 2018 +0100 @@ -31,7 +31,6 @@ CaseFreq = 0 MinesNum = 0 Explosives = 0 - Delay = 500 SuddenDeathTurns = 99999 -- "disable" sudden death Theme = Compost end diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Maps/Knockball/map.lua --- a/share/hedgewars/Data/Maps/Knockball/map.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Maps/Knockball/map.lua Mon Dec 10 07:59:45 2018 +0100 @@ -10,7 +10,6 @@ CaseFreq = 0 MinesNum = 0 Explosives = 0 - Delay = 500 -- Disable Sudden Death WaterRise = 0 HealthDecrease = 0 diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Mon Dec 10 07:59:45 2018 +0100 @@ -1016,7 +1016,6 @@ MinesNum = 0 MinesTime = 3000 Explosives = 0 - Delay = 10 Map = "Cave" Theme = "Nature" WaterRise = 0 diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/enemy.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/enemy.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/enemy.lua Mon Dec 10 07:59:45 2018 +0100 @@ -598,7 +598,6 @@ MinesNum = 0 MinesTime = 3000 Explosives = 0 - Delay = 10 Map = "Islands" Theme = "EarthRise" SuddenDeathTurns = 20 diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua Mon Dec 10 07:59:45 2018 +0100 @@ -395,7 +395,6 @@ MinesNum = 0 MinesTime = 3000 Explosives = 0 - Delay = 10 Map = "Hogville" Theme = "Nature" -- Disable Sudden Death diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua Mon Dec 10 07:59:45 2018 +0100 @@ -580,7 +580,6 @@ MinesNum = 0 MinesTime = 3000 Explosives = 0 - Delay = 10 MapGen = mgDrawn Theme = "Hell" SuddenDeathTurns = 35 diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Mon Dec 10 07:59:45 2018 +0100 @@ -743,7 +743,6 @@ MinesNum = 0 MinesTime = 3000 Explosives = 0 - Delay = 10 Map = "A_Classic_Fairytale_first_blood" Theme = "Nature" diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Mon Dec 10 07:59:45 2018 +0100 @@ -1080,7 +1080,6 @@ MinesTime = 5000 end Explosives = 0 - Delay = 5 Map = "A_Classic_Fairytale_journey" Theme = "Nature" diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua Mon Dec 10 07:59:45 2018 +0100 @@ -784,7 +784,6 @@ MinesNum = 0 MinesTime = 3000 Explosives = 0 - Delay = 10 MapGen = mgDrawn Theme = "Hell" SuddenDeathTurns = 20 diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Mon Dec 10 07:59:45 2018 +0100 @@ -1020,7 +1020,6 @@ MinesNum = 0 MinesTime = 3000 Explosives = 0 - Delay = 10 Map = "A_Classic_Fairytale_shadow" Theme = "Nature" -- Disable Sudden Death diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Mon Dec 10 07:59:45 2018 +0100 @@ -432,7 +432,6 @@ MinesNum = 0 MinesTime = 3000 Explosives = 2 - Delay = 10 Map = "Hogville" Theme = "Nature" -- Disable Sudden Death diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Mon Dec 10 07:59:45 2018 +0100 @@ -107,7 +107,6 @@ CaseFreq = 0 MinesNum = 0 Explosives = 0 - Delay = 5 -- Disable Sudden Death WaterRise = 0 HealthDecrease = 0 diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Mon Dec 10 07:59:45 2018 +0100 @@ -94,7 +94,6 @@ MinesNum = 3 MinesTime = 1500 Explosives = 2 - Delay = 3 HealthCaseAmount = 50 -- gfTagTeam makes it easier to skip the PAotH team GameFlags = gfTagTeam diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua Mon Dec 10 07:59:45 2018 +0100 @@ -66,7 +66,6 @@ Explosives = 0 Map = "death02_map" Theme = "Hell" - Delay = 600 -- this makes the messages between turns more readable -- Disable Sudden Death WaterRise = 0 HealthDecrease = 0 diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Mon Dec 10 07:59:45 2018 +0100 @@ -91,7 +91,6 @@ MinesNum = 0 MinesTime = 1 Explosives = 0 - Delay = 3 HealthCaseAmount = 30 -- Disable Sudden Death HealthDecrease = 0 diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua Mon Dec 10 07:59:45 2018 +0100 @@ -63,7 +63,6 @@ GameFlags = gfOneClanMode Seed = 1 TurnTime = 8000 - Delay = 2 CaseFreq = 0 HealthCaseAmount = 50 MinesNum = 500 diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Mon Dec 10 07:59:45 2018 +0100 @@ -112,7 +112,6 @@ MinesNum = 0 MinesTime = 1 Explosives = 0 - Delay = 3 -- Disable Sudden Death HealthDecrease = 0 WaterRise = 0 diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Mon Dec 10 07:59:45 2018 +0100 @@ -87,7 +87,6 @@ MinesNum = 0 MinesTime = 1 Explosives = 0 - Delay = 3 -- Disable Sudden Death HealthDecrease = 0 WaterRise = 0 diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Mon Dec 10 07:59:45 2018 +0100 @@ -88,7 +88,6 @@ MinesNum = 0 MinesTime = 1 Explosives = 0 - Delay = 3 Map = "ice01_map" Theme = "Snow" -- Disable Sudden Death diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Mon Dec 10 07:59:45 2018 +0100 @@ -109,7 +109,6 @@ Explosives = 0 HealthDecrease = 0 WaterRise = 0 - Delay = 5 Map = "moon01_map" Theme = "Cheese" -- Because ofc moon is made of cheese :) -- Hog Solo diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Challenge/Basic_Training_-_Sniper_Rifle.lua --- a/share/hedgewars/Data/Missions/Challenge/Basic_Training_-_Sniper_Rifle.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Challenge/Basic_Training_-_Sniper_Rifle.lua Mon Dec 10 07:59:45 2018 +0100 @@ -123,8 +123,6 @@ MinesNum = 0 -- The number of explosives being placed Explosives = 0 - -- The delay between each round - Delay = 0 -- The map to be played Map = "Ropes" -- The theme to be used diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Challenge/User_Mission_-_Rope_Knock_Challenge.lua --- a/share/hedgewars/Data/Missions/Challenge/User_Mission_-_Rope_Knock_Challenge.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Challenge/User_Mission_-_Rope_Knock_Challenge.lua Mon Dec 10 07:59:45 2018 +0100 @@ -154,7 +154,6 @@ GameFlags = gfBorder + gfSolidLand TurnTime = 180 * 1000 - Delay = 500 Map = "Ropes" Theme = "Eyes" diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua --- a/share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua Mon Dec 10 07:59:45 2018 +0100 @@ -36,7 +36,6 @@ MinesNum = 0 MinesTime = 3000 Explosives = 0 - Delay = 10 Map = "Islands" Theme = "City" SuddenDeathTurns = 1 diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua Mon Dec 10 07:59:45 2018 +0100 @@ -24,7 +24,6 @@ CaseFreq = 0 -- The frequency of crate drops MinesNum = 0 -- The number of mines being placed Explosives = 0 -- The number of explosives being placed - Delay = 0 -- The delay between each round Map = "Bath" -- The map to be played Theme = "Bath" -- The theme to be used -- Disable Sudden Death diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua Mon Dec 10 07:59:45 2018 +0100 @@ -19,7 +19,6 @@ MinesNum = 0 -- The number of mines being placed MinesTime = 1000 Explosives = 0 -- The number of explosives being placed - Delay = 10 -- The delay between each round Map = "Hydrant" -- The map to be played Theme = "City" -- The theme to be used diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua Mon Dec 10 07:59:45 2018 +0100 @@ -23,7 +23,6 @@ MinesNum = 0 -- The number of mines being placed MinesTime = 1 Explosives = 0 -- The number of explosives being placed - Delay = 10 -- The delay between each round Map = "Tree" -- The map to be played Theme = "Halloween" -- The theme to be used -- Disable Sudden Death diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Mon Dec 10 07:59:45 2018 +0100 @@ -17,7 +17,6 @@ MinesNum = 0 -- The number of mines being placed MinesTime = 1 Explosives = 0 -- The number of explosives being placed - Delay = 10 -- The delay between each round Map = "Mushrooms" -- The map to be played Theme = "Nature" -- The theme to be used -- Disable Sudden Death diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork_2.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork_2.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork_2.lua Mon Dec 10 07:59:45 2018 +0100 @@ -22,7 +22,6 @@ WaterRise = 0 Explosives = 0 - Delay = 10 Map = "CrazyMission" Theme = "CrazyMission" diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Missions/Scenario/portal.lua --- a/share/hedgewars/Data/Missions/Scenario/portal.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Missions/Scenario/portal.lua Mon Dec 10 07:59:45 2018 +0100 @@ -13,7 +13,6 @@ CaseFreq = 0 -- The frequency of crate drops MinesNum = 0 -- The number of mines being placed Explosives = 0 -- The number of explosives being placed - Delay = 10 -- The delay between each round Map = "portal" -- The map to be played Theme = "Hell" -- The theme to be used -- Disable Sudden Death diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Space_Invasion.lua Mon Dec 10 07:59:45 2018 +0100 @@ -1091,7 +1091,6 @@ end CaseFreq = 0 HealthCaseProb = 0 - Delay = 1000 SuddenDeathTurns = 50 WaterRise = 0 HealthDecrease = 0 diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Scripts/Multiplayer/The_Specialists.lua Mon Dec 10 07:59:45 2018 +0100 @@ -175,7 +175,6 @@ function onGameInit() ClearGameFlags() EnableGameFlags(gfRandomOrder, gfResetWeps, gfInfAttack, gfPlaceHog, gfPerHogAmmo, gfSwitchHog) - Delay = 10 HealthCaseProb = 100 end diff -r 9c7d5f595881 -r 6c21bd8547dd share/hedgewars/Data/Scripts/SpeedShoppa.lua --- a/share/hedgewars/Data/Scripts/SpeedShoppa.lua Mon Dec 10 07:35:29 2018 +0100 +++ b/share/hedgewars/Data/Scripts/SpeedShoppa.lua Mon Dec 10 07:59:45 2018 +0100 @@ -94,7 +94,6 @@ CaseFreq = 0 MinesNum = 0 Explosives = 0 - Delay = 10 Theme = params.theme Map = params.map -- Disable Sudden Death