Modified missions to be compatible with the merge
authorbelphegorr <szabibibi@gmail.com>
Wed, 22 Aug 2012 19:13:13 +0300
changeset 7512 cc3f036121fe
parent 7510 a7601ce08b5d
child 7514 8699d501a01e
Modified missions to be compatible with the merge Removed empty functions
share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/backstab.lua
share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/dragon.lua
share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/enemy.lua
share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/epil.lua
share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/family.lua
share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/first_blood.lua
share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/journey.lua
share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/queen.lua
share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/shadow.lua
share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/united.lua
--- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/backstab.lua	Sun Aug 19 23:26:12 2012 +0300
+++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/backstab.lua	Wed Aug 22 19:13:13 2012 +0300
@@ -882,9 +882,6 @@
   startNativesNum = nativesNum
 end
 
-function SetupEvents()
-end
-
 function SetupAmmo()
   AddAmmo(natives[girlNum], amSwitch, 0)
 end
@@ -963,7 +960,6 @@
   SetupAmmo()
   SetupPlace()
   AnimationSetup()
-  SetupEvents()
   AddAnim(startAnim)
   AddFunction({func = AfterStartAnim, args = {}})
 end
@@ -1005,9 +1001,6 @@
   end
 end
 
-function onGearAdd(gear)
-end
-
 function onAmmoStoreInit()
   SetAmmo(amDEagle, 9, 0, 0, 0)
   SetAmmo(amSniperRifle, 4, 0, 0, 0)
@@ -1089,9 +1082,6 @@
   end
 end
 
-function onGearDamage(gear, damage)
-end
-
 function onPrecise()
   if GameTime > 2500 and AnimInProgress() then
     SetAnimSkip(true)
--- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/dragon.lua	Sun Aug 19 23:26:12 2012 +0300
+++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/dragon.lua	Wed Aug 22 19:13:13 2012 +0300
@@ -589,9 +589,6 @@
   end
 end
 
-function onGearAdd(gear)
-end
-
 function onAmmoStoreInit()
   SetAmmo(amFirePunch, 3, 0, 0, 0)
   SetAmmo(amBaseballBat, 2, 0, 0, 0)
@@ -628,9 +625,6 @@
   end
 end
 
-function onGearDamage(gear, damage)
-end
-
 function onPrecise()
   if GameTime > 2500 and AnimInProgress() then
     SetAnimSkip(true)
--- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/enemy.lua	Sun Aug 19 23:26:12 2012 +0300
+++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/enemy.lua	Wed Aug 22 19:13:13 2012 +0300
@@ -620,9 +620,6 @@
   end
 end
 
-function onGearAdd(gear)
-end
-
 function onAmmoStoreInit()
   SetAmmo(amSkip, 9, 0, 0, 0)
   SetAmmo(amSwitch, 9, 0, 0, 0)
@@ -659,9 +656,6 @@
   end
 end
 
-function onGearDamage(gear, damage)
-end
-
 function onPrecise()
   if GameTime > 3000 and AnimInProgress() then
     SetAnimSkip(true)
--- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/epil.lua	Sun Aug 19 23:26:12 2012 +0300
+++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/epil.lua	Wed Aug 22 19:13:13 2012 +0300
@@ -377,9 +377,6 @@
   gearDead[gear] = true
 end
 
-function onGearAdd(gear)
-end
-
 function onAmmoStoreInit()
   SetAmmo(amAirStrike, 9, 0, 0, 0)
   SetAmmo(amBaseballBat, 9, 0, 0, 0)
@@ -429,9 +426,6 @@
   end
 end
 
-function onGearDamage(gear, damage)
-end
-
 function onPrecise()
   if GameTime > 2500 then
     SetAnimSkip(true)
--- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/family.lua	Sun Aug 19 23:26:12 2012 +0300
+++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/family.lua	Wed Aug 22 19:13:13 2012 +0300
@@ -396,9 +396,6 @@
   HideHedge(cyborg)
 end
 
-function SetupEvents()
-end
-
 function SetupAmmo()
   AddAmmo(cyborgs[1], amBazooka, 100)
   AddAmmo(cyborgs[1], amGrenade, 100)
@@ -482,7 +479,6 @@
   SetupAmmo()
   SetupPlace()
   AnimationSetup()
-  SetupEvents()
   AddAnim(startAnim)
   AddFunction({func = AfterStartAnim, args = {}})
 end
@@ -505,9 +501,6 @@
   end
 end
 
-function onGearAdd(gear)
-end
-
 function onAmmoStoreInit()
   SetAmmo(amSkip, 9, 0, 0, 0)
   SetAmmo(amSwitch, 9, 0, 0, 0)
@@ -545,9 +538,6 @@
   end
 end
 
-function onGearDamage(gear, damage)
-end
-
 function onPrecise()
   if GameTime > 2500 and AnimInProgress() then
     SetAnimSkip(true)
--- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/first_blood.lua	Sun Aug 19 23:26:12 2012 +0300
+++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/first_blood.lua	Wed Aug 22 19:13:13 2012 +0300
@@ -604,6 +604,8 @@
 	Explosives = 0
 	Delay = 10 
 	MapGen = 0
+  TemplateFilter = 6
+  TemplateNumber = 33
 	Theme = "Nature"
 
 
@@ -688,9 +690,6 @@
   end
 end
 
-function onGearAdd(gear)
-end
-
 function onAmmoStoreInit()
   SetAmmo(amWhip, 0, 0, 0, 8)
   SetAmmo(amBaseballBat, 0, 0, 0, 8)
--- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/journey.lua	Sun Aug 19 23:26:12 2012 +0300
+++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/journey.lua	Wed Aug 22 19:13:13 2012 +0300
@@ -910,7 +910,6 @@
 
 function onGameInit()
 	Seed = 0
-  TemplateFilter = 3
 	GameFlags = gfSolidLand + gfDisableWind
 	TurnTime = 40000 
 	CaseFreq = 0
@@ -919,6 +918,8 @@
 	Explosives = 0
 	Delay = 5
 	MapGen = 0
+  TemplateFilter = 6
+  TemplateNumber = 27
 	Theme = "Nature"
   SuddenDeathTurns = 3000
 
@@ -999,9 +1000,6 @@
   end
 end
 
-function onGearAdd(gear)
-end
-
 function onAmmoStoreInit()
   SetAmmo(amBlowTorch, 0, 0, 0, 1)
   SetAmmo(amParachute, 0, 0, 0, 1)
@@ -1043,9 +1041,6 @@
   end
 end
 
-function onGearDamage(gear, damage)
-end
-
 function onPrecise()
   if GameTime > 2500 and AnimInProgress() then
     SetAnimSkip(true)
--- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/queen.lua	Sun Aug 19 23:26:12 2012 +0300
+++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/queen.lua	Wed Aug 22 19:13:13 2012 +0300
@@ -789,9 +789,6 @@
   end
 end
 
-function onGearAdd(gear)
-end
-
 function onAmmoStoreInit()
   SetAmmo(amBaseballBat, 9, 0, 0, 0)
   SetAmmo(amFirePunch, 9, 0, 0, 0)
@@ -815,9 +812,6 @@
   end
 end
 
-function onGearDamage(gear, damage)
-end
-
 function onPrecise()
   if GameTime > 2500 and AnimInProgress() then
     SetAnimSkip(true)
--- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/shadow.lua	Sun Aug 19 23:26:12 2012 +0300
+++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/shadow.lua	Wed Aug 22 19:13:13 2012 +0300
@@ -803,7 +803,6 @@
 
 function onGameInit()
 	Seed = 334 
-  TemplateFilter = 3
 	GameFlags = gfSolidLand + gfDisableWind + gfPerHogAmmo
 	TurnTime = 50000 
 	CaseFreq = 0
@@ -812,6 +811,8 @@
 	Explosives = 0
 	Delay = 10 
 	MapGen = 0
+  TemplateFilter = 6
+  TemplateNumber = 22
 	Theme = "Nature"
   SuddenDeathTurns = 3000
 
--- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/united.lua	Sun Aug 19 23:26:12 2012 +0300
+++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/united.lua	Wed Aug 22 19:13:13 2012 +0300
@@ -473,9 +473,6 @@
   end
 end
 
-function onGearAdd(gear)
-end
-
 function onAmmoStoreInit()
   SetAmmo(amDEagle, 9, 0, 0, 0)
   SetAmmo(amSniperRifle, 4, 0, 0, 0)
@@ -516,9 +513,6 @@
   end
 end
 
-function onGearDamage(gear, damage)
-end
-
 function onPrecise()
   if GameTime > 2500 then
     SetAnimSkip(true)