Fix crate types in A Space Adventure and some user missions
authorWuzzy <almikes@aol.com>
Mon, 25 Sep 2017 17:06:35 +0200
changeset 12513 d90db45a0c4f
parent 12512 b1c2b0a8a43e
child 12514 d89dabfd07ce
Fix crate types in A Space Adventure and some user missions
share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua
share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua
share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua
share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua
share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua
share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua
share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua
share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua
share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork_2.lua
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua	Mon Sep 25 16:50:35 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua	Mon Sep 25 17:06:35 2017 +0200
@@ -172,7 +172,7 @@
 		AddAmmo(hero.gear, amRope, 1)
 		AddAmmo(guard1.gear, amDEagle, 2)
 		AddAmmo(guard2.gear, amDEagle, 2)
-		SpawnAmmoCrate(saucerX, saucerY, amJetpack)
+		SpawnUtilityCrate(saucerX, saucerY, amJetpack)
 		-- EVENT HANDLERS
 		AddEvent(onHeroBeforeTreePosition, {hero.gear}, heroBeforeTreePosition, {hero.gear}, 0)
 		AddEvent(onHeroAtSaucerPosition, {hero.gear}, heroAtSaucerPosition, {hero.gear}, 0)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua	Mon Sep 25 16:50:35 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua	Mon Sep 25 17:06:35 2017 +0200
@@ -144,13 +144,13 @@
 	AddEvent(onEnemiesDeath, {hero.gear}, enemiesDeath, {hero.gear}, 0)
 
 	-- add crates
-	SpawnAmmoCrate(teleportCrate.x, teleportCrate.y, amTeleport)
-	SpawnAmmoCrate(drillCrate.x, drillCrate.y, amTeleport)
+	SpawnUtilityCrate(teleportCrate.x, teleportCrate.y, amTeleport)
+	SpawnUtilityCrate(drillCrate.x, drillCrate.y, amTeleport)
 	SpawnAmmoCrate(drillCrate.x, drillCrate.y, amDrill)
 	SpawnAmmoCrate(batCrate.x, batCrate.y, amBaseballBat)
 	SpawnAmmoCrate(blowtorchCrate.x, blowtorchCrate.y, amBlowTorch)
 	SpawnAmmoCrate(cakeCrate.x, cakeCrate.y, amCake)
-	SpawnAmmoCrate(ropeCrate.x, ropeCrate.y, amRope)
+	SpawnUtilityCrate(ropeCrate.x, ropeCrate.y, amRope)
 	SpawnAmmoCrate(pickHammerCrate.x, pickHammerCrate.y, amPickHammer)
 	SpawnHealthCrate(cakeCrate.x + 40, cakeCrate.y)
 	SpawnHealthCrate(blowtorchCrate.x + 40, blowtorchCrate.y)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua	Mon Sep 25 16:50:35 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua	Mon Sep 25 17:06:35 2017 +0200
@@ -176,11 +176,11 @@
 	-- spawn crates
 	SpawnAmmoCrate(btorch2X, btorch2Y, amBlowTorch)
 	SpawnAmmoCrate(btorch3X, btorch3Y, amBlowTorch)
-	SpawnAmmoCrate(rope1X, rope1Y, amRope)
-	SpawnAmmoCrate(rope2X, rope2Y, amRope)
-	SpawnAmmoCrate(rope3X, rope3Y, amRope)
-	SpawnAmmoCrate(portalX, portalY, amPortalGun)
-	SpawnAmmoCrate(girderX, girderY, amGirder)
+	SpawnUtilityCrate(rope1X, rope1Y, amRope)
+	SpawnUtilityCrate(rope2X, rope2Y, amRope)
+	SpawnUtilityCrate(rope3X, rope3Y, amRope)
+	SpawnUtilityCrate(portalX, portalY, amPortalGun)
+	SpawnUtilityCrate(girderX, girderY, amGirder)
 
 	SpawnHealthCrate(3300, 970)
 
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua	Mon Sep 25 16:50:35 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua	Mon Sep 25 17:06:35 2017 +0200
@@ -218,7 +218,7 @@
 
 	-- place crates
 	if checkPointReached < 2 then
-		SpawnAmmoCrate(girderCrate.x, girderCrate.y, girderCrate.name)
+		SpawnUtilityCrate(girderCrate.x, girderCrate.y, girderCrate.name)
 	end
 	if checkPointReached < 5 then
 		SpawnAmmoCrate(eagleCrate.x, eagleCrate.y, eagleCrate.name)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua	Mon Sep 25 16:50:35 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua	Mon Sep 25 17:06:35 2017 +0200
@@ -190,7 +190,7 @@
 	if checkPointReached == 1 then
 		AddAmmo(hero.gear, amRope, 2)
 		SpawnAmmoCrate(bazookaX, weaponsY, amBazooka)
-		SpawnAmmoCrate(parachuteX, weaponsY, amParachute)
+		SpawnUtilityCrate(parachuteX, weaponsY, amParachute)
 		SpawnAmmoCrate(grenadeX, weaponsY, amGrenade)
 		SpawnAmmoCrate(deserteagleX, weaponsY, amDEagle)
 		AddEvent(onWeaponsPlatform, {hero.gear}, weaponsPlatform, {hero.gear}, 0)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua	Mon Sep 25 16:50:35 2017 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua	Mon Sep 25 17:06:35 2017 +0200
@@ -38,10 +38,10 @@
 
 	ShowMission(loc("Bamboo Thicket"), loc("Scenario"), loc("Eliminate the enemy."), -amBazooka, 0)
 
-	--WEAPON CRATE LIST. WCRATES: 1
+	--WEAPON CRATE LIST. WCRATES: 2
 	SpawnAmmoCrate(891,852,amBazooka)
-	--UTILITY CRATE LIST. UCRATES: 2
-	SpawnUtilityCrate(962,117,amBlowTorch)
+	SpawnAmmoCrate(962,117,amBlowTorch)
+	--UTILITY CRATE LIST. UCRATES: 1
 	SpawnUtilityCrate(403,503,amParachute)
 
 	AddAmmo(enemy, amGrenade, 100)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua	Mon Sep 25 16:50:35 2017 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua	Mon Sep 25 17:06:35 2017 +0200
@@ -42,10 +42,10 @@
 function onGameStart()
 
 
-	SpawnAmmoCrate(426,886,amJetpack)
+	SpawnUtilityCrate(426,886,amJetpack)
 	SpawnAmmoCrate(1544,690,amFirePunch)
 	SpawnAmmoCrate(950,851,amBlowTorch)
-	SpawnAmmoCrate(1032,853,amParachute)
+	SpawnUtilityCrate(1032,853,amParachute)
 
 	AddGear(579, 296, gtMine, 0, 0, 0, 0)
 
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua	Mon Sep 25 16:50:35 2017 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua	Mon Sep 25 17:06:35 2017 +0200
@@ -82,7 +82,7 @@
 	SpawnAmmoCrate(548,858,amBazooka)
 	--UTILITY CRATE LIST.
 	SpawnUtilityCrate(479,847,amJetpack)
-	SpawnUtilityCrate(1550,1715,amBlowTorch)
+	SpawnAmmoCrate(1550,1715,amBlowTorch)
 	SpawnUtilityCrate(1227,1941,amJetpack)
 	SpawnUtilityCrate(1070,1964,amInvulnerable)
 	SpawnUtilityCrate(1070,1875,amTeleport)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork_2.lua	Mon Sep 25 16:50:35 2017 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork_2.lua	Mon Sep 25 17:06:35 2017 +0200
@@ -42,8 +42,8 @@
 	Pack = SpawnAmmoCrate(40, 888, amPickHammer)
 	SpawnAmmoCrate(90, 888, amBaseballBat)
 	SpawnAmmoCrate(822, 750, amBlowTorch)
-	SpawnAmmoCrate(700, 580, amJetpack)
-	SpawnAmmoCrate(1400, 425, amParachute)
+	SpawnUtilityCrate(700, 580, amJetpack)
+	SpawnUtilityCrate(1400, 425, amParachute)
 	SpawnAmmoCrate(1900, 770, amDynamite)
 	SpawnAmmoCrate(1794, 970, amDynamite)