--- a/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Maps/CTF_Blizzard/map.lua Fri Feb 09 07:38:14 2018 +0100
@@ -538,21 +538,21 @@
r = GetRandom(8)
if r == 0 then
- SpawnUtilityCrate(0,0,amSwitch)
+ SpawnSupplyCrate(0,0,amSwitch)
elseif r == 1 then
- SpawnUtilityCrate(0,0,amTeleport)
+ SpawnSupplyCrate(0,0,amTeleport)
elseif r == 2 then
- SpawnUtilityCrate(0,0,amJetpack)
+ SpawnSupplyCrate(0,0,amJetpack)
elseif r == 3 then
- SpawnUtilityCrate(0,0,amExtraTime)
+ SpawnSupplyCrate(0,0,amExtraTime)
elseif r == 4 then
- SpawnUtilityCrate(0,0,amGirder)
+ SpawnSupplyCrate(0,0,amGirder)
elseif r == 5 then
- SpawnAmmoCrate(0,0,amDynamite)
+ SpawnSupplyCrate(0,0,amDynamite)
elseif r == 6 then
- SpawnAmmoCrate(0,0,amFlamethrower)
+ SpawnSupplyCrate(0,0,amFlamethrower)
elseif r == 7 then
- SpawnUtilityCrate(0,0,amPortalGun)
+ SpawnSupplyCrate(0,0,amPortalGun)
end
end
@@ -618,8 +618,8 @@
--spawn starting ufos and or super weapons
- SpawnAmmoCrate(2048,1858,amJetpack)
- --SpawnUtilityCrate(2048,1858,amExtraTime)
+ SpawnSupplyCrate(2048,1858,amJetpack)
+ --SpawnSupplyCrate(2048,1858,amExtraTime)
--set flag spawn points and spawn the flags
fSpawnX[0] = 957
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Fri Feb 09 07:38:14 2018 +0100
@@ -617,12 +617,12 @@
end
function SpawnPlatformCrates()
- SpawnAmmoCrate(2494, 1262, amMine)
- SpawnAmmoCrate(2574, 1279, amSMine)
- SpawnAmmoCrate(2575, 1267, amMine)
- SpawnAmmoCrate(2617, 1259, amSMine)
- SpawnAmmoCrate(2579, 1254, amMine)
- SpawnAmmoCrate(2478, 1243, amMine)
+ SpawnSupplyCrate(2494, 1262, amMine)
+ SpawnSupplyCrate(2574, 1279, amSMine)
+ SpawnSupplyCrate(2575, 1267, amMine)
+ SpawnSupplyCrate(2617, 1259, amSMine)
+ SpawnSupplyCrate(2579, 1254, amMine)
+ SpawnSupplyCrate(2478, 1243, amMine)
end
function AfterWave2DeadAnim()
@@ -847,21 +847,21 @@
-----------------------------Misc--------------------------------------
function SpawnCrates()
- SpawnAmmoCrate(0, 0, amDrill)
- SpawnAmmoCrate(0, 0, amGrenade)
- SpawnAmmoCrate(0, 0, amBazooka)
- SpawnAmmoCrate(0, 0, amDynamite)
- SpawnAmmoCrate(0, 0, amGrenade)
- SpawnAmmoCrate(0, 0, amMine)
- SpawnAmmoCrate(0, 0, amShotgun)
- SpawnAmmoCrate(0, 0, amFlamethrower)
- SpawnAmmoCrate(0, 0, amMolotov)
- SpawnAmmoCrate(0, 0, amSMine)
- SpawnAmmoCrate(0, 0, amMortar)
- SpawnUtilityCrate(0, 0, amRope)
- SpawnUtilityCrate(0, 0, amRope)
- SpawnUtilityCrate(0, 0, amParachute)
- SpawnUtilityCrate(0, 0, amParachute)
+ SpawnSupplyCrate(0, 0, amDrill)
+ SpawnSupplyCrate(0, 0, amGrenade)
+ SpawnSupplyCrate(0, 0, amBazooka)
+ SpawnSupplyCrate(0, 0, amDynamite)
+ SpawnSupplyCrate(0, 0, amGrenade)
+ SpawnSupplyCrate(0, 0, amMine)
+ SpawnSupplyCrate(0, 0, amShotgun)
+ SpawnSupplyCrate(0, 0, amFlamethrower)
+ SpawnSupplyCrate(0, 0, amMolotov)
+ SpawnSupplyCrate(0, 0, amSMine)
+ SpawnSupplyCrate(0, 0, amMortar)
+ SpawnSupplyCrate(0, 0, amRope)
+ SpawnSupplyCrate(0, 0, amRope)
+ SpawnSupplyCrate(0, 0, amParachute)
+ SpawnSupplyCrate(0, 0, amParachute)
SetHealth(SpawnHealthCrate(0, 0), 25)
SetHealth(SpawnHealthCrate(0, 0), 25)
SetHealth(SpawnHealthCrate(0, 0), 25)
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua Fri Feb 09 07:38:14 2018 +0100
@@ -346,9 +346,9 @@
function SpawnCrateByID(id)
if cratePos[id][2] == true then
- crates[id] = SpawnUtilityCrate(unpack(cratePos[id][1]))
+ crates[id] = SpawnSupplyCrate(unpack(cratePos[id][1]))
else
- crates[id] = SpawnAmmoCrate(unpack(cratePos[id][1]))
+ crates[id] = SpawnSupplyCrate(unpack(cratePos[id][1]))
end
return crates[id]
end
@@ -398,8 +398,8 @@
HideHedge(cyborg)
TurnTimeLeft = TurnTime
SetGearMessage(native, 0)
- SpawnUtilityCrate(1184, 399, amPortalGun, 100)
- SpawnUtilityCrate(2259, 755, amTeleport, 2)
+ SpawnSupplyCrate(1184, 399, amPortalGun, 100)
+ SpawnSupplyCrate(2259, 755, amTeleport, 2)
SpawnHealthCrate(secondPos[1][1] + 50, secondPos[1][2] - 20)
ShowMission(loc("Dragon's Lair"), loc("The what?!"), loc("Use the portal gun to get to the next crate, then use the new gun to get to the final destination!|")..
loc("Portal hint: One goes to the destination, the other one is the entrance.|")..
@@ -563,7 +563,7 @@
end
end
HideHedge(cyborg)
- jetCrate = SpawnUtilityCrate(3915, 1723, amJetpack)
+ jetCrate = SpawnSupplyCrate(3915, 1723, amJetpack)
--[[ Block the left entrance.
Otherwise the player could rope out of the map and
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/enemy.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/enemy.lua Fri Feb 09 07:38:14 2018 +0100
@@ -314,21 +314,21 @@
end
function PutWeaponCrates()
- SpawnAmmoCrate(2399, 622, amNapalm, 2)
- SpawnAmmoCrate(2199, -18, amBee, 2)
- SpawnAmmoCrate(2088, 430, amBee, 2)
- SpawnAmmoCrate(237, 20, amMortar, 4)
- SpawnAmmoCrate(312, 1107, amMolotov, 3)
- SpawnAmmoCrate(531, 1123, amWatermelon, 2)
- SpawnAmmoCrate(1253, 1444, amFlamethrower, 5)
- SpawnAmmoCrate(994, 1364, amBaseballBat, 3)
- SpawnAmmoCrate(1104, 1553, amMine, 6)
- SpawnAmmoCrate(2277, 803, amDynamite, 2)
- SpawnAmmoCrate(1106, 184, amRCPlane, 3)
- SpawnAmmoCrate(1333, 28, amSMine, 4)
- SpawnAmmoCrate(90, 279, amAirAttack, 2)
- SpawnAmmoCrate(288, 269, amBee, 2)
- SpawnAmmoCrate(818, 1633, amBaseballBat, 2)
+ SpawnSupplyCrate(2399, 622, amNapalm, 2)
+ SpawnSupplyCrate(2199, -18, amBee, 2)
+ SpawnSupplyCrate(2088, 430, amBee, 2)
+ SpawnSupplyCrate(237, 20, amMortar, 4)
+ SpawnSupplyCrate(312, 1107, amMolotov, 3)
+ SpawnSupplyCrate(531, 1123, amWatermelon, 2)
+ SpawnSupplyCrate(1253, 1444, amFlamethrower, 5)
+ SpawnSupplyCrate(994, 1364, amBaseballBat, 3)
+ SpawnSupplyCrate(1104, 1553, amMine, 6)
+ SpawnSupplyCrate(2277, 803, amDynamite, 2)
+ SpawnSupplyCrate(1106, 184, amRCPlane, 3)
+ SpawnSupplyCrate(1333, 28, amSMine, 4)
+ SpawnSupplyCrate(90, 279, amAirAttack, 2)
+ SpawnSupplyCrate(288, 269, amBee, 2)
+ SpawnSupplyCrate(818, 1633, amBaseballBat, 2)
end
-----------------------------Events------------------------------------
function CheckNativesDead()
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua Fri Feb 09 07:38:14 2018 +0100
@@ -235,13 +235,13 @@
end
function SetupPlace3()
- SpawnUtilityCrate(2086, 1887, amRope, 1)
- SpawnAmmoCrate(2147, 728, amBlowTorch, 2)
- SpawnAmmoCrate(2778, 1372, amPickHammer, 3)
- SpawnAmmoCrate(2579, 1886, amPickHammer, 3)
- SpawnUtilityCrate(2622, 1893, amGirder, 1)
- SpawnUtilityCrate(2671, 1883, amPortalGun, 3)
- SpawnUtilityCrate(2831, 1384, amGirder, 3)
+ SpawnSupplyCrate(2086, 1887, amRope, 1)
+ SpawnSupplyCrate(2147, 728, amBlowTorch, 2)
+ SpawnSupplyCrate(2778, 1372, amPickHammer, 3)
+ SpawnSupplyCrate(2579, 1886, amPickHammer, 3)
+ SpawnSupplyCrate(2622, 1893, amGirder, 1)
+ SpawnSupplyCrate(2671, 1883, amPortalGun, 3)
+ SpawnSupplyCrate(2831, 1384, amGirder, 3)
SetTimer(AddGear(2725, 1387, gtMine, 0, 0, 0, 0), 5000)
SetTimer(AddGear(2760, 1351, gtMine, 0, 0, 0, 0), 5000)
@@ -299,17 +299,17 @@
PlaceGirder(648, 1427, 5)
PlaceGirder(2110, 980, 0)
- SpawnAmmoCrate(814, 407, amBazooka, 4)
- clusterCrate = SpawnAmmoCrate(862, 494, amClusterBomb, 4)
- SpawnAmmoCrate(855, 486, amBee, 3)
- grenadeCrate1 = SpawnAmmoCrate(849, 459, amGrenade, 4)
- SpawnAmmoCrate(2077, 847, amWatermelon, 3)
- grenadeCrate2 = SpawnAmmoCrate(2122, 847, amGrenade, 3)
+ SpawnSupplyCrate(814, 407, amBazooka, 4)
+ clusterCrate = SpawnSupplyCrate(862, 494, amClusterBomb, 4)
+ SpawnSupplyCrate(855, 486, amBee, 3)
+ grenadeCrate1 = SpawnSupplyCrate(849, 459, amGrenade, 4)
+ SpawnSupplyCrate(2077, 847, amWatermelon, 3)
+ grenadeCrate2 = SpawnSupplyCrate(2122, 847, amGrenade, 3)
- SpawnAmmoCrate(747, 1577, amPickHammer, 1)
- SpawnUtilityCrate(496, 1757, amGirder, 2)
- SpawnUtilityCrate(1809, 1880, amGirder, 1)
- SpawnUtilityCrate(530, 1747, amPortalGun, 1)
+ SpawnSupplyCrate(747, 1577, amPickHammer, 1)
+ SpawnSupplyCrate(496, 1757, amGirder, 2)
+ SpawnSupplyCrate(1809, 1880, amGirder, 1)
+ SpawnSupplyCrate(530, 1747, amPortalGun, 1)
end
-----------------------------Events------------------------------------
@@ -353,17 +353,17 @@
return
end
if index == 1 then
- SpawnAmmoCrate(1700, 407, amBazooka, 3)
+ SpawnSupplyCrate(1700, 407, amBazooka, 3)
elseif index == 2 then
- SpawnAmmoCrate(1862, 494, amClusterBomb, 3)
+ SpawnSupplyCrate(1862, 494, amClusterBomb, 3)
elseif index == 3 then
- SpawnAmmoCrate(1855, 486, amBee, 1)
+ SpawnSupplyCrate(1855, 486, amBee, 1)
elseif index == 4 then
- SpawnAmmoCrate(1849, 459, amGrenade, 3)
+ SpawnSupplyCrate(1849, 459, amGrenade, 3)
elseif index == 5 then
- SpawnAmmoCrate(2122, 847, amGrenade, 3)
+ SpawnSupplyCrate(2122, 847, amGrenade, 3)
elseif index == 6 then
- SpawnAmmoCrate(2077, 847, amWatermelon, 1)
+ SpawnSupplyCrate(2077, 847, amWatermelon, 1)
end
end
@@ -403,14 +403,14 @@
if (GetX(natives[1]) == nil) then
return
end
- clusterCrate = SpawnAmmoCrate(GetX(natives[1]) - 50, GetY(natives[1]) - 50, amClusterBomb, 3)
+ clusterCrate = SpawnSupplyCrate(GetX(natives[1]) - 50, GetY(natives[1]) - 50, amClusterBomb, 3)
end
function DoOutOfGrenade()
if (GetX(natives[1]) == nil) then
return
end
- grenadeCrate2 = SpawnAmmoCrate(GetX(natives[1]) - 50, GetY(natives[1]) - 50, amGrenade, 3)
+ grenadeCrate2 = SpawnSupplyCrate(GetX(natives[1]) - 50, GetY(natives[1]) - 50, amGrenade, 3)
end
function CheckNeedToHide()
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Fri Feb 09 07:38:14 2018 +0100
@@ -418,7 +418,7 @@
end
function DoOnShroom()
- ropeCrate1 = SpawnUtilityCrate(2751, 1194, amRope, 100)
+ ropeCrate1 = SpawnSupplyCrate(2751, 1194, amRope, 100)
SetGearMessage(CurrentHedgehog, 0)
AddAnim(onShroomAnim)
AddEvent(CheckOnFlower, {}, DoOnFlower, {}, 0)
@@ -430,7 +430,7 @@
function DoOnFlower()
AddAmmo(youngh, amRope, 100)
- paraCrate = SpawnUtilityCrate(3245, 1758, amParachute, 100)
+ paraCrate = SpawnSupplyCrate(3245, 1758, amParachute, 100)
SetGearMessage(CurrentHedgehog, 0)
AddAnim(onFlowerAnim)
AddEvent(CheckTookParaCrate, {}, DoTookParaCrate, {}, 0)
@@ -462,7 +462,7 @@
function DoPastMoleHead()
-- Initiate parachute challenge
RemoveEventFunc(CheckOnMoleHead)
- ropeCrate2 = SpawnUtilityCrate(2782, 1720, amRope, 100)
+ ropeCrate2 = SpawnSupplyCrate(2782, 1720, amRope, 100)
rope2InProgress = true
AddAmmo(youngh, amRope, 0)
SetGearMessage(CurrentHedgehog, 0)
@@ -475,7 +475,7 @@
function DoOnMoleHead()
-- Initiate parachute challenge
RemoveEventFunc(CheckPastMoleHead)
- ropeCrate2 = SpawnUtilityCrate(2782, 1720, amRope, 100)
+ ropeCrate2 = SpawnSupplyCrate(2782, 1720, amRope, 100)
rope2InProgress = true
AddAmmo(youngh, amRope, 0)
SetGearMessage(CurrentHedgehog, 0)
@@ -493,7 +493,7 @@
AddAmmo(youngh, amRope, 100)
SetGearMessage(CurrentHedgehog, 0)
AddAnim(tookRope2Anim)
- punchCrate = SpawnAmmoCrate(2460, 1321, amFirePunch, 100)
+ punchCrate = SpawnSupplyCrate(2460, 1321, amFirePunch, 100)
AddEvent(CheckTookPunch, {}, DoTookPunch, {})
end
@@ -524,7 +524,7 @@
AddAnim(challengeAnim)
targetsDestroyed = 0
AddFunction({func = SetChoice, args = {}})
- ropeCrate3 = SpawnUtilityCrate(2000, 1200, amRope, 100)
+ ropeCrate3 = SpawnSupplyCrate(2000, 1200, amRope, 100)
AddEvent(CheckTookRope3, {}, AddAmmo, {youngh, amRope, 100}, 0)
AddEvent(CheckCratesColled, {}, DoCratesColled, {}, 0)
AddEvent(CheckChallengeWon, {}, DoChallengeWon, {}, 0)
@@ -555,7 +555,7 @@
end
function DoChallengeWon()
- desertCrate = SpawnAmmoCrate(1240, 1212, amDEagle, 100)
+ desertCrate = SpawnSupplyCrate(1240, 1212, amDEagle, 100)
SetGearMessage(CurrentHedgehog, 0)
AddAnim(challengeCompletedAnim)
AddEvent(CheckDesertColled, {}, DoDesertColled, {}, 0)
@@ -633,9 +633,9 @@
function DoCloseToCannibal()
SetGearMessage(CurrentHedgehog, 0)
AddAnim(closeCannim)
- AddFunction({func = SpawnAmmoCrate, args = {targetPosX[1][1], targetPosY[1][1], amWhip}})
- AddFunction({func = SpawnAmmoCrate, args = {targetPosX[1][2], targetPosY[1][2], amBaseballBat}})
- AddFunction({func = SpawnAmmoCrate, args = {targetPosX[1][3], targetPosY[1][3], amHammer}})
+ AddFunction({func = SpawnSupplyCrate, args = {targetPosX[1][1], targetPosY[1][1], amWhip}})
+ AddFunction({func = SpawnSupplyCrate, args = {targetPosX[1][2], targetPosY[1][2], amBaseballBat}})
+ AddFunction({func = SpawnSupplyCrate, args = {targetPosX[1][3], targetPosY[1][3], amHammer}})
end
function CheckCannibalKilled()
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Fri Feb 09 07:38:14 2018 +0100
@@ -274,12 +274,12 @@
end
function PlaceCratesDuo()
- SpawnAmmoCrate(3090, 827, amBaseballBat)
- girderCrate1 = SpawnUtilityCrate(2466, 1814, amGirder)
- girderCrate2 = SpawnUtilityCrate(2630, 1278, amGirder)
- SpawnUtilityCrate(2422, 1810, amParachute)
- SpawnUtilityCrate(3157, 1009, amLowGravity)
- sniperCrate = SpawnAmmoCrate(784, 1715, amSniperRifle)
+ SpawnSupplyCrate(3090, 827, amBaseballBat)
+ girderCrate1 = SpawnSupplyCrate(2466, 1814, amGirder)
+ girderCrate2 = SpawnSupplyCrate(2630, 1278, amGirder)
+ SpawnSupplyCrate(2422, 1810, amParachute)
+ SpawnSupplyCrate(3157, 1009, amLowGravity)
+ sniperCrate = SpawnSupplyCrate(784, 1715, amSniperRifle)
end
function PlaceMinesDuo()
@@ -408,11 +408,11 @@
PlaceGirder(1033, 649, 0)
PlaceGirder(952, 650, 0)
- fireCrate = SpawnAmmoCrate(1846, 1100, amFirePunch)
- SpawnAmmoCrate(1900, 1100, amPickHammer)
- SpawnAmmoCrate(950, 674, amDynamite)
- SpawnUtilityCrate(994, 825, amRope)
- SpawnUtilityCrate(570, 1357, amLowGravity)
+ fireCrate = SpawnSupplyCrate(1846, 1100, amFirePunch)
+ SpawnSupplyCrate(1900, 1100, amPickHammer)
+ SpawnSupplyCrate(950, 674, amDynamite)
+ SpawnSupplyCrate(994, 825, amRope)
+ SpawnSupplyCrate(570, 1357, amLowGravity)
end
local trackedGears = {}
@@ -721,14 +721,14 @@
function SetupPlaceAlone()
------ AMMO CRATE LIST ------
- SpawnAmmoCrate(3124, 952, amBaseballBat)
- SpawnAmmoCrate(2508, 1110, amFirePunch)
+ SpawnSupplyCrate(3124, 952, amBaseballBat)
+ SpawnSupplyCrate(2508, 1110, amFirePunch)
------ UTILITY CRATE LIST ------
- blowCrate = SpawnAmmoCrate(3675, 1480, amBlowTorch)
- gravityCrate = SpawnUtilityCrate(3448, 1349, amLowGravity)
- SpawnUtilityCrate(3212, 1256, amGirder)
- SpawnUtilityCrate(3113, 911, amParachute)
- sniperCrate = SpawnAmmoCrate(784, 1715, amSniperRifle)
+ blowCrate = SpawnSupplyCrate(3675, 1480, amBlowTorch)
+ gravityCrate = SpawnSupplyCrate(3448, 1349, amLowGravity)
+ SpawnSupplyCrate(3212, 1256, amGirder)
+ SpawnSupplyCrate(3113, 911, amParachute)
+ sniperCrate = SpawnSupplyCrate(784, 1715, amSniperRifle)
------ MINE LIST ------
AddGear(3328, 1399, gtMine, 0, 0, 0, 0)
AddGear(3028, 1262, gtMine, 0, 0, 0, 0)
@@ -836,12 +836,12 @@
PlaceGirder(1135, 775, 1)
------ UTILITY CRATE LIST ------
- SpawnUtilityCrate(1590, 628, amParachute)
- SpawnAmmoCrate(1540, 100, amDynamite)
- SpawnUtilityCrate(2175, 1815, amLowGravity)
- SpawnAmmoCrate(2210, 1499, amFirePunch)
- girderCrate = SpawnUtilityCrate(2300, 1663, amGirder)
- SpawnAmmoCrate(610, 1394, amPickHammer)
+ SpawnSupplyCrate(1590, 628, amParachute)
+ SpawnSupplyCrate(1540, 100, amDynamite)
+ SpawnSupplyCrate(2175, 1815, amLowGravity)
+ SpawnSupplyCrate(2210, 1499, amFirePunch)
+ girderCrate = SpawnSupplyCrate(2300, 1663, amGirder)
+ SpawnSupplyCrate(610, 1394, amPickHammer)
------ BARREL LIST ------
SetHealth(AddGear(1148, 736, gtExplosives, 0, 0, 0, 0), 20)
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua Fri Feb 09 07:38:14 2018 +0100
@@ -491,7 +491,7 @@
SetHealth(SpawnHealthCrate(2207, 44), 25)
SetHealth(SpawnHealthCrate(519, 1519), 25)
SetHealth(SpawnHealthCrate(826, 895), 25)
- SpawnUtilityCrate(701, 1046, amGirder, 3)
+ SpawnSupplyCrate(701, 1046, amGirder, 3)
TurnTimeLeft = TurnTime
end
@@ -688,18 +688,18 @@
end
end
- SpawnAmmoCrate(34, 410, amBee, 2)
- SpawnAmmoCrate(33, 374, amRCPlane, 1)
- SpawnAmmoCrate(74, 410, amAirAttack, 3)
- SpawnAmmoCrate(1313, 1481, amBazooka, 8)
- SpawnAmmoCrate(80, 360, amSniperRifle, 4)
- SpawnAmmoCrate(1037, 1508, amShotgun, 7)
- SpawnAmmoCrate(1037, 1472, amMolotov, 3)
- SpawnAmmoCrate(1146, 1576, amMortar, 8)
+ SpawnSupplyCrate(34, 410, amBee, 2)
+ SpawnSupplyCrate(33, 374, amRCPlane, 1)
+ SpawnSupplyCrate(74, 410, amAirAttack, 3)
+ SpawnSupplyCrate(1313, 1481, amBazooka, 8)
+ SpawnSupplyCrate(80, 360, amSniperRifle, 4)
+ SpawnSupplyCrate(1037, 1508, amShotgun, 7)
+ SpawnSupplyCrate(1037, 1472, amMolotov, 3)
+ SpawnSupplyCrate(1146, 1576, amMortar, 8)
- SpawnUtilityCrate(1147, 1431, amPortalGun, 2)
- SpawnUtilityCrate(1219, 1542, amRope, 5)
- SpawnUtilityCrate(1259, 1501, amJetpack, 2)
+ SpawnSupplyCrate(1147, 1431, amPortalGun, 2)
+ SpawnSupplyCrate(1219, 1542, amRope, 5)
+ SpawnSupplyCrate(1259, 1501, amJetpack, 2)
if not nativeAwaitingDeletion then
AfterSetupPlace()
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Fri Feb 09 07:38:14 2018 +0100
@@ -150,10 +150,10 @@
if stage == loseStage then
return
end
- SpawnUtilityCrate(2045, 1575, amSwitch)
- SpawnAmmoCrate(2365, 1495, amShotgun)
- SpawnAmmoCrate(2495, 1519, amGrenade)
- SpawnUtilityCrate(2620, 1524, amRope)
+ SpawnSupplyCrate(2045, 1575, amSwitch)
+ SpawnSupplyCrate(2365, 1495, amShotgun)
+ SpawnSupplyCrate(2495, 1519, amGrenade)
+ SpawnSupplyCrate(2620, 1524, amRope)
ShowMission(loc("The Shadow Falls"), loc("The Showdown"), loc("Save Leaks A Lot!|Hint: The switch hedgehog utility might be of help to you."), 1, 6000)
RemoveEventFunc(CheckDenseDead)
AddEvent(CheckStronglingsDead, {}, DoStronglingsDeadRefused, {}, 0)
@@ -293,8 +293,8 @@
return
end
stage = acceptedReturnStage
- SpawnUtilityCrate(1370, 810, amGirder)
- SpawnUtilityCrate(1300, 810, amParachute)
+ SpawnSupplyCrate(1370, 810, amGirder)
+ SpawnSupplyCrate(1300, 810, amParachute)
ShowMission(loc("The Shadow Falls"), loc("The walk of Fame"), loc("Return to Leaks A Lot!"), 1, 6000)
AddEvent(CheckReadyForStronglings, {}, DoReadyForStronglings, {}, 0)
AddEvent(CheckNeedGirder, {}, DoNeedGirder, {}, 0)
@@ -348,10 +348,10 @@
if denseDead == false then
DeleteGear(dense)
end
- SpawnAmmoCrate(2551, 994, amGrenade)
- SpawnAmmoCrate(3551, 994, amGrenade)
- SpawnAmmoCrate(3392, 1101, amShotgun)
- SpawnAmmoCrate(3192, 1101, amShotgun)
+ SpawnSupplyCrate(2551, 994, amGrenade)
+ SpawnSupplyCrate(3551, 994, amGrenade)
+ SpawnSupplyCrate(3392, 1101, amShotgun)
+ SpawnSupplyCrate(3192, 1101, amShotgun)
AnimSetGearPosition(cyborg, unpack(cyborgPos))
SetState(cyborg, gstInvisible)
AnimSwitchHog(leaks)
@@ -362,10 +362,10 @@
-----------------------------Animations--------------------------------
function SpawnCrates()
- SpawnAmmoCrate(2551, 994, amGrenade)
- SpawnAmmoCrate(3551, 994, amGrenade)
- SpawnAmmoCrate(3392, 1101, amShotgun)
- SpawnAmmoCrate(3192, 1101, amShotgun)
+ SpawnSupplyCrate(2551, 994, amGrenade)
+ SpawnSupplyCrate(3551, 994, amGrenade)
+ SpawnSupplyCrate(3392, 1101, amShotgun)
+ SpawnSupplyCrate(3192, 1101, amShotgun)
return true
end
@@ -863,8 +863,8 @@
if stage == loseStage then
return
end
- grenadeCrate = SpawnAmmoCrate(2550, 800, amGrenade)
- shotgunCrate = SpawnAmmoCrate(2610, 850, amShotgun)
+ grenadeCrate = SpawnSupplyCrate(2550, 800, amGrenade)
+ shotgunCrate = SpawnSupplyCrate(2610, 850, amShotgun)
AddCaption(loc("A little gift from the cyborgs"))
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Fri Feb 09 07:38:14 2018 +0100
@@ -379,20 +379,20 @@
function SpawnCrates(index)
if index == 1 then
- SpawnAmmoCrate(1943, 408, amBazooka)
- SpawnAmmoCrate(1981, 464, amGrenade)
- SpawnAmmoCrate(1957, 459, amShotgun)
- SpawnAmmoCrate(1902, 450, amDynamite)
- SpawnAmmoCrate(1982, 405, amPickHammer)
- SpawnUtilityCrate(2028, 455, amRope)
- SpawnUtilityCrate(2025, 464, amTeleport)
+ SpawnSupplyCrate(1943, 408, amBazooka)
+ SpawnSupplyCrate(1981, 464, amGrenade)
+ SpawnSupplyCrate(1957, 459, amShotgun)
+ SpawnSupplyCrate(1902, 450, amDynamite)
+ SpawnSupplyCrate(1982, 405, amPickHammer)
+ SpawnSupplyCrate(2028, 455, amRope)
+ SpawnSupplyCrate(2025, 464, amTeleport)
else
- SpawnAmmoCrate(1982, 405, amBlowTorch)
- SpawnAmmoCrate(2171, 428, amMolotov)
- SpawnAmmoCrate(2364, 346, amFlamethrower)
- SpawnAmmoCrate(2521, 303, amBazooka)
- SpawnAmmoCrate(2223, 967, amGrenade)
- SpawnAmmoCrate(1437, 371, amShotgun)
+ SpawnSupplyCrate(1982, 405, amBlowTorch)
+ SpawnSupplyCrate(2171, 428, amMolotov)
+ SpawnSupplyCrate(2364, 346, amFlamethrower)
+ SpawnSupplyCrate(2521, 303, amBazooka)
+ SpawnSupplyCrate(2223, 967, amGrenade)
+ SpawnSupplyCrate(1437, 371, amShotgun)
end
cratesSpawned[index] = true
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Fri Feb 09 07:38:14 2018 +0100
@@ -199,7 +199,7 @@
AddAmmo(hero.gear, amRope, 1)
AddAmmo(guard1.gear, amDEagle, 100)
AddAmmo(guard2.gear, amDEagle, 100)
- SpawnUtilityCrate(saucerX, saucerY, amJetpack)
+ SpawnSupplyCrate(saucerX, saucerY, amJetpack)
-- EVENT HANDLERS
AddEvent(onHeroBeforeTreePosition, {hero.gear}, heroBeforeTreePosition, {hero.gear}, 0)
AddEvent(onHeroAcquiredSaucer, {hero.gear}, heroAcquiredSaucer, {hero.gear}, 1)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Fri Feb 09 07:38:14 2018 +0100
@@ -145,14 +145,14 @@
AddEvent(onEnemiesDeath, {hero.gear}, enemiesDeath, {hero.gear}, 0)
-- add crates
- 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)
- SpawnUtilityCrate(ropeCrate.x, ropeCrate.y, amRope)
- SpawnAmmoCrate(pickHammerCrate.x, pickHammerCrate.y, amPickHammer)
+ SpawnSupplyCrate(teleportCrate.x, teleportCrate.y, amTeleport)
+ SpawnSupplyCrate(drillCrate.x, drillCrate.y, amTeleport)
+ SpawnSupplyCrate(drillCrate.x, drillCrate.y, amDrill)
+ SpawnSupplyCrate(batCrate.x, batCrate.y, amBaseballBat)
+ SpawnSupplyCrate(blowtorchCrate.x, blowtorchCrate.y, amBlowTorch)
+ SpawnSupplyCrate(cakeCrate.x, cakeCrate.y, amCake)
+ SpawnSupplyCrate(ropeCrate.x, ropeCrate.y, amRope)
+ SpawnSupplyCrate(pickHammerCrate.x, pickHammerCrate.y, amPickHammer)
SpawnHealthCrate(cakeCrate.x + 40, cakeCrate.y)
SpawnHealthCrate(blowtorchCrate.x + 40, blowtorchCrate.y)
-- add explosives
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Fri Feb 09 07:38:14 2018 +0100
@@ -142,16 +142,16 @@
AddAmmo(smuggler3.gear, amRope, 2)
-- spawn crates
- SpawnAmmoCrate(btorch3X, btorch3Y, amBlowTorch)
- SpawnUtilityCrate(rope1X, rope1Y, amRope)
- SpawnUtilityCrate(rope2X, rope2Y, amRope)
- SpawnUtilityCrate(rope3X, rope3Y, amRope)
- SpawnUtilityCrate(portalX, portalY, amPortalGun)
+ SpawnSupplyCrate(btorch3X, btorch3Y, amBlowTorch)
+ SpawnSupplyCrate(rope1X, rope1Y, amRope)
+ SpawnSupplyCrate(rope2X, rope2Y, amRope)
+ SpawnSupplyCrate(rope3X, rope3Y, amRope)
+ SpawnSupplyCrate(portalX, portalY, amPortalGun)
SpawnHealthCrate(3300, 970)
-- the win crates, collect both to win
- btorch2.gear = SpawnAmmoCrate(btorch2X, btorch2Y, amBlowTorch)
- girder.gear = SpawnUtilityCrate(girderX, girderY, amGirder)
+ btorch2.gear = SpawnSupplyCrate(btorch2X, btorch2Y, amBlowTorch)
+ girder.gear = SpawnSupplyCrate(girderX, girderY, amGirder)
-- adding mines - BOOM!
AddGear(1280, 460, gtMine, 0, 0, 0, 0)
@@ -186,7 +186,7 @@
AddEvent(onHeroAtBattlePoint1, {hero.gear}, heroAtBattlePoint1, {hero.gear}, 0)
AddEvent(onHeroAtBattlePoint2, {hero.gear}, heroAtBattlePoint2, {hero.gear}, 0)
-- crates
- SpawnAmmoCrate(btorch1X, btorch1Y, amBlowTorch)
+ SpawnSupplyCrate(btorch1X, btorch1Y, amBlowTorch)
SpawnHealthCrate(680, 460)
-- hero ammo
AddAmmo(hero.gear, amRope, 2)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua Fri Feb 09 07:38:14 2018 +0100
@@ -91,7 +91,7 @@
AddEvent(onLose, {hero.gear}, lose, {hero.gear}, 0)
-- original crates and targets
- SpawnAmmoCrate(rcCrates[1].x, rcCrates[1].y, amRCPlane)
+ SpawnSupplyCrate(rcCrates[1].x, rcCrates[1].y, amRCPlane)
targets[1].gear = AddGear(targets[1].x, targets[1].y, gtTarget, 0, 0, 0, 0)
-- hero ammo
@@ -207,13 +207,13 @@
function setTargets(ct)
if ct == 2 then
- SpawnAmmoCrate(rcCrates[2].x, rcCrates[2].y, amRCPlane)
+ SpawnSupplyCrate(rcCrates[2].x, rcCrates[2].y, amRCPlane)
for i=2,3 do
targets[i].gear = AddGear(targets[i].x, targets[i].y, gtTarget, 0, 0, 0, 0)
end
elseif ct == 3 then
SpawnUtilityCrate(rcCrates[4].x, rcCrates[4].y, amNothing)
- SpawnAmmoCrate(rcCrates[3].x, rcCrates[3].y, amRCPlane, 2)
+ SpawnSupplyCrate(rcCrates[3].x, rcCrates[3].y, amRCPlane, 2)
for i=4,13 do
targets[i].gear = AddGear(targets[i].x, targets[i].y, gtTarget, 0, 0, 0, 0)
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Fri Feb 09 07:38:14 2018 +0100
@@ -81,9 +81,9 @@
-- health crate
SpawnHealthCrate(910, 5)
-- ammo crates
- SpawnAmmoCrate(930, 1000, amRCPlane)
- SpawnUtilityCrate(1260, 652, amGirder)
- SpawnAmmoCrate(1220, 652, amPickHammer)
+ SpawnSupplyCrate(930, 1000, amRCPlane)
+ SpawnSupplyCrate(1260, 652, amGirder)
+ SpawnSupplyCrate(1220, 652, amPickHammer)
-- ammo
AddAmmo(hero.gear, amPortalGun, 1)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Fri Feb 09 07:38:14 2018 +0100
@@ -197,7 +197,7 @@
-- crates
SpawnHealthCrate(health1X, health1Y)
- SpawnAmmoCrate(crateWMX, crateWMY, amWatermelon)
+ SpawnSupplyCrate(crateWMX, crateWMY, amWatermelon)
AddAnim(dialog01)
SendHealthStatsOff()
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Fri Feb 09 07:38:14 2018 +0100
@@ -180,17 +180,17 @@
end
-- place crates
- SpawnUtilityCrate(girderCrate.x, girderCrate.y, girderCrate.name)
- SpawnAmmoCrate(eagleCrate.x, eagleCrate.y, eagleCrate.name)
+ SpawnSupplyCrate(girderCrate.x, girderCrate.y, girderCrate.name)
+ SpawnSupplyCrate(eagleCrate.x, eagleCrate.y, eagleCrate.name)
deviceCrate.gear = SpawnFakeUtilityCrate(deviceCrate.x, deviceCrate.y, false, false) -- anti-gravity device
-- Rope crate is placed after device crate has been collected.
-- This is done so it is impossible the player can rope before getting
-- the device part.
if tookPartInBattle then
- SpawnAmmoCrate(weaponCrate.x, weaponCrate.y, amWatermelon)
+ SpawnSupplyCrate(weaponCrate.x, weaponCrate.y, amWatermelon)
else
- SpawnAmmoCrate(weaponCrate.x, weaponCrate.y, amSniperRifle)
+ SpawnSupplyCrate(weaponCrate.x, weaponCrate.y, amSniperRifle)
end
SendHealthStatsOff()
@@ -255,7 +255,7 @@
deviceCrate.collected = true
deviceCrate.collector = CurrentHedgehog
-- Spawn rope crate
- SpawnUtilityCrate(ropeCrate.x, ropeCrate.y, ropeCrate.name)
+ SpawnSupplyCrate(ropeCrate.x, ropeCrate.y, ropeCrate.name)
end
end
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Fri Feb 09 07:38:14 2018 +0100
@@ -212,7 +212,7 @@
if checkPointReached == 1 then
AddAmmo(hero.gear, amBazooka, 1)
- SpawnAmmoCrate(icegunX, icegunY, amIceGun)
+ SpawnSupplyCrate(icegunX, icegunY, amIceGun)
AddEvent(onColumnCheckPoint, {hero.gear}, columnCheckPoint, {hero.gear}, 0)
AddEvent(onHeroAtIceGun, {hero.gear}, heroAtIceGun, {hero.gear}, 0)
AddAnim(dialog01)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Fri Feb 09 07:38:14 2018 +0100
@@ -196,10 +196,10 @@
if checkPointReached == 1 then
AddAmmo(hero.gear, amRope, 2)
AddAmmo(hero.gear, amSkip, 0)
- SpawnAmmoCrate(bazookaX, weaponsY, amBazooka)
- SpawnUtilityCrate(parachuteX, weaponsY, amParachute)
- SpawnAmmoCrate(grenadeX, weaponsY, amGrenade)
- SpawnAmmoCrate(deserteagleX, weaponsY, amDEagle)
+ SpawnSupplyCrate(bazookaX, weaponsY, amBazooka)
+ SpawnSupplyCrate(parachuteX, weaponsY, amParachute)
+ SpawnSupplyCrate(grenadeX, weaponsY, amGrenade)
+ SpawnSupplyCrate(deserteagleX, weaponsY, amDEagle)
AddEvent(onWeaponsPlatform, {hero.gear}, weaponsPlatform, {hero.gear}, 0)
EndTurn(true)
AddAnim(dialog01)
--- a/share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua Fri Feb 09 07:38:14 2018 +0100
@@ -78,8 +78,8 @@
HogTurnLeft(hh[0], false)
HogTurnLeft(hh[1], true)
- SpawnUtilityCrate(148,265,amLowGravity)
- SpawnUtilityCrate(2124,1516,amJetpack)
+ SpawnSupplyCrate(148,265,amLowGravity)
+ SpawnSupplyCrate(2124,1516,amJetpack)
end
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua Fri Feb 09 07:38:14 2018 +0100
@@ -38,11 +38,11 @@
ShowMission(loc("Bamboo Thicket"), loc("Scenario"), loc("Eliminate the enemy."), -amBazooka, 0)
- --WEAPON CRATE LIST. WCRATES: 2
- SpawnAmmoCrate(891,852,amBazooka)
- SpawnAmmoCrate(962,117,amBlowTorch)
- --UTILITY CRATE LIST. UCRATES: 1
- SpawnUtilityCrate(403,503,amParachute)
+ -- CRATE LIST.
+ SpawnSupplyCrate(891,852,amBazooka)
+ SpawnSupplyCrate(962,117,amBlowTorch)
+
+ SpawnSupplyCrate(403,503,amParachute)
AddAmmo(enemy, amGrenade, 100)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua Fri Feb 09 07:38:14 2018 +0100
@@ -49,8 +49,8 @@
function onGameStart()
- SpawnAmmoCrate(475,476,amRope)
- SpawnAmmoCrate(1729,476,amFirePunch)
+ SpawnSupplyCrate(475,476,amRope)
+ SpawnSupplyCrate(1729,476,amFirePunch)
FollowGear(player)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua Fri Feb 09 07:38:14 2018 +0100
@@ -42,10 +42,10 @@
function onGameStart()
- SpawnUtilityCrate(426,886,amJetpack)
- SpawnAmmoCrate(1544,690,amFirePunch)
- SpawnAmmoCrate(950,851,amBlowTorch)
- SpawnUtilityCrate(1032,853,amParachute)
+ SpawnSupplyCrate(426,886,amJetpack)
+ SpawnSupplyCrate(1544,690,amFirePunch)
+ SpawnSupplyCrate(950,851,amBlowTorch)
+ SpawnSupplyCrate(1032,853,amParachute)
AddGear(579, 296, gtMine, 0, 0, 0, 0)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua Fri Feb 09 07:38:14 2018 +0100
@@ -77,15 +77,15 @@
AddGear(1002,1461,gtSMine, 0, 0, 0, 0)
AddGear(1052,1438,gtSMine, 0, 0, 0, 0)
AddGear(1102,1464,gtSMine, 0, 0, 0, 0)
- --WEAPON CRATE LIST.
- SpawnAmmoCrate(1565,642,amSineGun)
- SpawnAmmoCrate(548,858,amBazooka)
- --UTILITY CRATE LIST.
- SpawnUtilityCrate(479,847,amJetpack)
- SpawnAmmoCrate(1550,1715,amBlowTorch)
- SpawnUtilityCrate(1227,1941,amJetpack)
- SpawnUtilityCrate(1070,1964,amInvulnerable)
- SpawnUtilityCrate(1070,1875,amTeleport)
+ -- CRATE LIST.
+ SpawnSupplyCrate(1565,642,amSineGun)
+ SpawnSupplyCrate(548,858,amBazooka)
+
+ SpawnSupplyCrate(479,847,amJetpack)
+ SpawnSupplyCrate(1550,1715,amBlowTorch)
+ SpawnSupplyCrate(1227,1941,amJetpack)
+ SpawnSupplyCrate(1070,1964,amInvulnerable)
+ SpawnSupplyCrate(1070,1875,amTeleport)
--HOG POSITION LIST.
if hhs[0] ~= nil then
SetGearPosition(hhs[0],397,865)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Nobody_Laugh.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Nobody_Laugh.lua Fri Feb 09 07:38:14 2018 +0100
@@ -82,17 +82,16 @@
PlaceGirder(1436, 538, 0)
PlaceGirder(1505, 468, 4)
- ------ AMMO CRATE LIST ------
- tempG = SpawnAmmoCrate(1242, 315, amBaseballBat)
- tempG = SpawnAmmoCrate(1309, 315, amAirAttack)
- tempG = SpawnAmmoCrate(144, 895, amAirAttack)
- tempG = SpawnAmmoCrate(664, 699, amIceGun)
- tempG = SpawnAmmoCrate(1572, 444, amFirePunch)
- tempG = SpawnAmmoCrate(1574, 382, amDynamite)
+ ------ CRATE LIST ------
+ tempG = SpawnSupplyCrate(1242, 315, amBaseballBat)
+ tempG = SpawnSupplyCrate(1309, 315, amAirAttack)
+ tempG = SpawnSupplyCrate(144, 895, amAirAttack)
+ tempG = SpawnSupplyCrate(664, 699, amIceGun)
+ tempG = SpawnSupplyCrate(1572, 444, amFirePunch)
+ tempG = SpawnSupplyCrate(1574, 382, amDynamite)
- ------ UTIL CRATE LIST ------
- tempG = SpawnUtilityCrate(654, 513, amParachute)
- tempG = SpawnUtilityCrate(1569, 413, amParachute)
+ tempG = SpawnSupplyCrate(654, 513, amParachute)
+ tempG = SpawnSupplyCrate(1569, 413, amParachute)
-- HOG AMMO
AddAmmo(hhs[1],amParachute,1)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua Fri Feb 09 07:38:14 2018 +0100
@@ -71,16 +71,16 @@
AddGear(640,412,gtMine, 0, 0, 0, 0)
-- crates crates and more crates
- SpawnAmmoCrate(1208,576,amBlowTorch)
- SpawnAmmoCrate(1467,376,amPickHammer)
- SpawnUtilityCrate(373,165,amGirder)
- SpawnUtilityCrate(704,623,amJetpack)
- SpawnUtilityCrate(1646,749,amLaserSight)
+ SpawnSupplyCrate(1208,576,amBlowTorch)
+ SpawnSupplyCrate(1467,376,amPickHammer)
+ SpawnSupplyCrate(373,165,amGirder)
+ SpawnSupplyCrate(704,623,amJetpack)
+ SpawnSupplyCrate(1646,749,amLaserSight)
- SpawnAmmoCrate(745,418,amShotgun) --shotgun1
- SpawnAmmoCrate(833,432,amFirePunch) --fire punch
- GirderCrate = SpawnAmmoCrate(1789,514,amShotgun) -- final shotgun
- SpawnAmmoCrate(1181,419,amBee)
+ SpawnSupplyCrate(745,418,amShotgun) --shotgun1
+ SpawnSupplyCrate(833,432,amFirePunch) --fire punch
+ GirderCrate = SpawnSupplyCrate(1789,514,amShotgun) -- final shotgun
+ SpawnSupplyCrate(1181,419,amBee)
ShowMission(loc("Spooky Tree"), loc("Scenario"),
loc("Eliminate the enemy before the time runs out.") .. "|" ..
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Fri Feb 09 07:38:14 2018 +0100
@@ -59,12 +59,12 @@
AddGear(1001,356,gtMine, 0, 0, 0, 0)
-- crates crates and more crates
- bCrate = SpawnAmmoCrate(1688,476,amBaseballBat)
- SpawnUtilityCrate(572,143,amGirder)
- SpawnAmmoCrate(1704,954,amPickHammer)
- SpawnAmmoCrate(704,623,amBlowTorch)
- SpawnUtilityCrate(1543,744,amJetpack)
- SpawnAmmoCrate(227,442,amDrill)
+ bCrate = SpawnSupplyCrate(1688,476,amBaseballBat)
+ SpawnSupplyCrate(572,143,amGirder)
+ SpawnSupplyCrate(1704,954,amPickHammer)
+ SpawnSupplyCrate(704,623,amBlowTorch)
+ SpawnSupplyCrate(1543,744,amJetpack)
+ SpawnSupplyCrate(227,442,amDrill)
ShowMission(loc("Teamwork"), loc("Scenario"), loc("Eliminate Unit 3378.") .. "|" .. loc("Both your hedgehogs must survive.") .. "|" .. loc("Mines time: 0 seconds"), 0, 0)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork_2.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork_2.lua Fri Feb 09 07:38:14 2018 +0100
@@ -39,13 +39,13 @@
end
function onGameStart()
- Pack = SpawnAmmoCrate(40, 888, amPickHammer)
- SpawnAmmoCrate(90, 888, amBaseballBat)
- SpawnAmmoCrate(822, 750, amBlowTorch)
- SpawnUtilityCrate(700, 580, amJetpack)
- SpawnUtilityCrate(1400, 425, amParachute)
- SpawnAmmoCrate(1900, 770, amDynamite)
- SpawnAmmoCrate(1794, 970, amDynamite)
+ Pack = SpawnSupplyCrate(40, 888, amPickHammer)
+ SpawnSupplyCrate(90, 888, amBaseballBat)
+ SpawnSupplyCrate(822, 750, amBlowTorch)
+ SpawnSupplyCrate(700, 580, amJetpack)
+ SpawnSupplyCrate(1400, 425, amParachute)
+ SpawnSupplyCrate(1900, 770, amDynamite)
+ SpawnSupplyCrate(1794, 970, amDynamite)
ShowMission(loc("Teamwork 2"), loc("Scenario"), loc("Eliminate WatchBot 4000.") .. "|" .. loc("Both your hedgehogs must survive.") .. "|" .. loc("Land mines explode instantly."), -amBaseballBat, 0)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_The_Great_Escape.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_The_Great_Escape.lua Fri Feb 09 07:38:14 2018 +0100
@@ -79,14 +79,13 @@
SetGearPosition(enemy,1512,158)
SetHealth(player, 1)
SetHealth(enemy, 1)
------- AMMO CRATE LIST ------
-SpawnAmmoCrate(1632,943,amShotgun)
-SpawnAmmoCrate(1723,888,amFirePunch)
-SpawnAmmoCrate(1915,599,amGrenade)
-SpawnAmmoCrate(1416,913,amBlowTorch)
-SpawnAmmoCrate(1227,640,amPickHammer)
------- UTILITY CRATE LIST ------
-SpawnUtilityCrate(1519,945,amParachute)
+------ CRATE LIST ------
+SpawnSupplyCrate(1632,943,amShotgun)
+SpawnSupplyCrate(1723,888,amFirePunch)
+SpawnSupplyCrate(1915,599,amGrenade)
+SpawnSupplyCrate(1416,913,amBlowTorch)
+SpawnSupplyCrate(1227,640,amPickHammer)
+SpawnSupplyCrate(1519,945,amParachute)
------ END LOADING DATA ------
end
--- a/share/hedgewars/Data/Missions/Scenario/portal.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/portal.lua Fri Feb 09 07:38:14 2018 +0100
@@ -125,30 +125,29 @@
end
--needed this MineArray cause timer didn't work, its was always 3sec, i wanna instant mines
- --UTILITY CRATE--
- parachute = SpawnUtilityCrate(1670, 1165, amParachute)
- girder = SpawnUtilityCrate(2101, 1297, amGirder)
- SpawnUtilityCrate(1375, 900, amTeleport)
- SpawnUtilityCrate(1660,1820, amLaserSight)
- SpawnUtilityCrate(4070,1840, amLaserSight)
- portalgun = SpawnUtilityCrate(505, 1943, amPortalGun, 1000)
- extratime = SpawnUtilityCrate(4020, 785, amExtraTime, 2)
+ --CRATES
+ parachute = SpawnSupplyCrate(1670, 1165, amParachute)
+ girder = SpawnSupplyCrate(2101, 1297, amGirder)
+ SpawnSupplyCrate(1375, 900, amTeleport)
+ SpawnSupplyCrate(1660,1820, amLaserSight)
+ SpawnSupplyCrate(4070,1840, amLaserSight)
+ portalgun = SpawnSupplyCrate(505, 1943, amPortalGun, 1000)
+ extratime = SpawnSupplyCrate(4020, 785, amExtraTime, 2)
- --AMMO CRATE--
- SpawnAmmoCrate(425, 613, amSnowball)
- SpawnAmmoCrate(861, 633, amHellishBomb)
- SpawnAmmoCrate(2510, 623, amSnowball)
- SpawnAmmoCrate(2900, 1600, amGrenade)
- SpawnAmmoCrate(2680, 320, amGrenade)
- SpawnAmmoCrate(2650, 80, amDEagle)
- SpawnAmmoCrate(3000, 100, amDEagle)
- SpawnAmmoCrate(2900, 1400, amRope)
- SpawnAmmoCrate(4025, 1117, amFirePunch)
- SpawnAmmoCrate(3965, 625, amBlowTorch)
- SpawnAmmoCrate(2249, 93, amBlowTorch)
- SpawnAmmoCrate(2181, 829, amBlowTorch)
- SpawnAmmoCrate(1820, 567, amBlowTorch)
- SpawnAmmoCrate(130, 600, amPickHammer)
+ SpawnSupplyCrate(425, 613, amSnowball)
+ SpawnSupplyCrate(861, 633, amHellishBomb)
+ SpawnSupplyCrate(2510, 623, amSnowball)
+ SpawnSupplyCrate(2900, 1600, amGrenade)
+ SpawnSupplyCrate(2680, 320, amGrenade)
+ SpawnSupplyCrate(2650, 80, amDEagle)
+ SpawnSupplyCrate(3000, 100, amDEagle)
+ SpawnSupplyCrate(2900, 1400, amRope)
+ SpawnSupplyCrate(4025, 1117, amFirePunch)
+ SpawnSupplyCrate(3965, 625, amBlowTorch)
+ SpawnSupplyCrate(2249, 93, amBlowTorch)
+ SpawnSupplyCrate(2181, 829, amBlowTorch)
+ SpawnSupplyCrate(1820, 567, amBlowTorch)
+ SpawnSupplyCrate(130, 600, amPickHammer)
--HEALTH CRATE--
SpawnHealthCrate(2000, 780)
--- a/share/hedgewars/Data/Scripts/Multiplayer/WxW.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Scripts/Multiplayer/WxW.lua Fri Feb 09 07:38:14 2018 +0100
@@ -859,7 +859,7 @@
toSpawn = maxCrates - cratesInGame
end
for i=1,toSpawn do
- SpawnAmmoCrate(0, 0, weapons[1+GetRandom(#weapons)] )
+ SpawnSupplyCrate(0, 0, weapons[1+GetRandom(#weapons)] )
end
rPingTimer = 0
rAlpha = 0
--- a/share/hedgewars/Data/Scripts/TechMaps.lua Fri Feb 09 06:03:01 2018 +0100
+++ b/share/hedgewars/Data/Scripts/TechMaps.lua Fri Feb 09 07:38:14 2018 +0100
@@ -1460,11 +1460,11 @@
LoadSprite(3514, 1750, sprAmGirder, 0)
------ AMMO CRATE LIST ------
- tempG = SpawnAmmoCrate(1707, 1755, amBazooka)
- tempG = SpawnAmmoCrate(3983, 1873, amBazooka)
- tempG = SpawnAmmoCrate(184, 1561, amBazooka)
- tempG = SpawnAmmoCrate(2644, 1378, amBazooka)
- tempG = SpawnAmmoCrate(2914, 865, amBazooka)
+ tempG = SpawnSupplyCrate(1707, 1755, amBazooka)
+ tempG = SpawnSupplyCrate(3983, 1873, amBazooka)
+ tempG = SpawnSupplyCrate(184, 1561, amBazooka)
+ tempG = SpawnSupplyCrate(2644, 1378, amBazooka)
+ tempG = SpawnSupplyCrate(2914, 865, amBazooka)
------ MINE LIST ------
SetTimer(AddGear(2340, 580, gtMine, 0, 0, 0, 0), 1)
@@ -1619,51 +1619,51 @@
AddWayPoint(2142, 1674)
------ AMMO CRATE LIST ------
- tempG = SpawnAmmoCrate(324, 613, amFirePunch)
+ tempG = SpawnSupplyCrate(324, 613, amFirePunch)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amFirePunch")
- tempG = SpawnAmmoCrate(2361, 1721, amBazooka)
+ tempG = SpawnSupplyCrate(2361, 1721, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(2430, 1721, amBazooka)
+ tempG = SpawnSupplyCrate(2430, 1721, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(2510, 1721, amBazooka)
+ tempG = SpawnSupplyCrate(2510, 1721, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(2581, 1721, amBazooka)
+ tempG = SpawnSupplyCrate(2581, 1721, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(405, 1839, amSineGun)
+ tempG = SpawnSupplyCrate(405, 1839, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amSineGun")
- tempG = SpawnAmmoCrate(481, 1839, amSineGun)
+ tempG = SpawnSupplyCrate(481, 1839, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amSineGun")
------ UTILITY CRATE LIST ------
- tempG = SpawnUtilityCrate(696, 611, amParachute)
+ tempG = SpawnSupplyCrate(696, 611, amParachute)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amParachute")
- tempG = SpawnUtilityCrate(825, 1664, amJetpack)
+ tempG = SpawnSupplyCrate(825, 1664, amJetpack)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amJetpack")
- tempG = SpawnUtilityCrate(919, 1657, amJetpack)
+ tempG = SpawnSupplyCrate(919, 1657, amJetpack)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amJetpack")
- tempG = SpawnUtilityCrate(1015, 1662, amJetpack)
+ tempG = SpawnSupplyCrate(1015, 1662, amJetpack)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amJetpack")
- tempG = SpawnUtilityCrate(1095, 1654, amJetpack)
+ tempG = SpawnSupplyCrate(1095, 1654, amJetpack)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amJetpack")
- tempG = SpawnUtilityCrate(1166, 1659, amJetpack)
+ tempG = SpawnSupplyCrate(1166, 1659, amJetpack)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amJetpack")
- tempG = SpawnUtilityCrate(1250, 1650, amJetpack)
+ tempG = SpawnSupplyCrate(1250, 1650, amJetpack)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amJetpack")
- tempG = SpawnUtilityCrate(1335, 1655, amJetpack)
+ tempG = SpawnSupplyCrate(1335, 1655, amJetpack)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amJetpack")
@@ -1754,22 +1754,22 @@
AddWayPoint(555, 864)
------ UTILITY CRATE LIST ------
- tempG = SpawnUtilityCrate(3801, 491, amJetpack)
+ tempG = SpawnSupplyCrate(3801, 491, amJetpack)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amJetpack")
- tempG = SpawnUtilityCrate(3803, 460, amJetpack)
+ tempG = SpawnSupplyCrate(3803, 460, amJetpack)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amJetpack")
- tempG = SpawnUtilityCrate(3799, 429, amJetpack)
+ tempG = SpawnSupplyCrate(3799, 429, amJetpack)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amJetpack")
- tempG = SpawnUtilityCrate(3846, 491, amJetpack)
+ tempG = SpawnSupplyCrate(3846, 491, amJetpack)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amJetpack")
- tempG = SpawnUtilityCrate(3845, 460, amJetpack)
+ tempG = SpawnSupplyCrate(3845, 460, amJetpack)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amJetpack")
- tempG = SpawnUtilityCrate(3845, 429, amJetpack)
+ tempG = SpawnSupplyCrate(3845, 429, amJetpack)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amJetpack")
@@ -2139,57 +2139,57 @@
AddWayPoint(2592, 1334)
------ AMMO CRATE LIST ------
- tempG = SpawnAmmoCrate(548, 1844, amBazooka)
+ tempG = SpawnSupplyCrate(548, 1844, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(595, 1844, amBazooka)
+ tempG = SpawnSupplyCrate(595, 1844, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(642, 1844, amBazooka)
+ tempG = SpawnSupplyCrate(642, 1844, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(1314, 1845, amBazooka)
+ tempG = SpawnSupplyCrate(1314, 1845, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(1362, 1845, amBazooka)
+ tempG = SpawnSupplyCrate(1362, 1845, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(1419, 1845, amBazooka)
+ tempG = SpawnSupplyCrate(1419, 1845, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(2208, 1853, amBazooka)
+ tempG = SpawnSupplyCrate(2208, 1853, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(2264, 1853, amBazooka)
+ tempG = SpawnSupplyCrate(2264, 1853, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(2318, 1853, amBazooka)
+ tempG = SpawnSupplyCrate(2318, 1853, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(3027, 1704, amBazooka)
+ tempG = SpawnSupplyCrate(3027, 1704, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(3072, 1704, amBazooka)
+ tempG = SpawnSupplyCrate(3072, 1704, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(1822, 1042, amBazooka)
+ tempG = SpawnSupplyCrate(1822, 1042, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
------ UTILITY CRATE LIST ------
- tempG = SpawnUtilityCrate(313, 535, amRope)
+ tempG = SpawnSupplyCrate(313, 535, amRope)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amRope")
- tempG = SpawnUtilityCrate(365, 535, amRope)
+ tempG = SpawnSupplyCrate(365, 535, amRope)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amRope")
- tempG = SpawnUtilityCrate(313, 504, amRope)
+ tempG = SpawnSupplyCrate(313, 504, amRope)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amRope")
- tempG = SpawnUtilityCrate(339, 478, amRope)
+ tempG = SpawnSupplyCrate(339, 478, amRope)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amRope")
- tempG = SpawnUtilityCrate(365, 504, amRope)
+ tempG = SpawnSupplyCrate(365, 504, amRope)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amRope")
@@ -2268,88 +2268,88 @@
AddWayPoint(3642, 1601)
------ AMMO CRATE LIST ------
- tempG = SpawnAmmoCrate(397, 1295, amSineGun)
+ tempG = SpawnSupplyCrate(397, 1295, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(461, 1295, amSineGun)
+ tempG = SpawnSupplyCrate(461, 1295, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(555, 1295, amSineGun)
+ tempG = SpawnSupplyCrate(555, 1295, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(621, 1295, amSineGun)
+ tempG = SpawnSupplyCrate(621, 1295, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(759, 1867, amSineGun)
+ tempG = SpawnSupplyCrate(759, 1867, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(1504, 1862, amSineGun)
+ tempG = SpawnSupplyCrate(1504, 1862, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(2521, 528, amSineGun)
+ tempG = SpawnSupplyCrate(2521, 528, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(3639, 474, amSineGun)
+ tempG = SpawnSupplyCrate(3639, 474, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(3078, 809, amSineGun)
+ tempG = SpawnSupplyCrate(3078, 809, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(1752, 1192, amSineGun)
+ tempG = SpawnSupplyCrate(1752, 1192, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(2349, 1183, amSineGun)
+ tempG = SpawnSupplyCrate(2349, 1183, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(1582, 349, amSineGun)
+ tempG = SpawnSupplyCrate(1582, 349, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(3560, 1647, amSineGun)
+ tempG = SpawnSupplyCrate(3560, 1647, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(3711, 1644, amSineGun)
+ tempG = SpawnSupplyCrate(3711, 1644, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(433, 560, amSineGun)
+ tempG = SpawnSupplyCrate(433, 560, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(568, 559, amSineGun)
+ tempG = SpawnSupplyCrate(568, 559, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(1935, 1677, amSineGun)
+ tempG = SpawnSupplyCrate(1935, 1677, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(2084, 1673, amSineGun)
+ tempG = SpawnSupplyCrate(2084, 1673, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(1018, 1752, amSineGun)
+ tempG = SpawnSupplyCrate(1018, 1752, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(1086, 1752, amSineGun)
+ tempG = SpawnSupplyCrate(1086, 1752, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(1176, 1751, amSineGun)
+ tempG = SpawnSupplyCrate(1176, 1751, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(1238, 1751, amSineGun)
+ tempG = SpawnSupplyCrate(1238, 1751, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(2009, 1668, amSineGun)
+ tempG = SpawnSupplyCrate(2009, 1668, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(3641, 1639, amSineGun)
+ tempG = SpawnSupplyCrate(3641, 1639, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(3580, 469, amSineGun)
+ tempG = SpawnSupplyCrate(3580, 469, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(3700, 467, amSineGun)
+ tempG = SpawnSupplyCrate(3700, 467, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(2458, 523, amSineGun)
+ tempG = SpawnSupplyCrate(2458, 523, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
- tempG = SpawnAmmoCrate(2595, 521, amSineGun)
+ tempG = SpawnSupplyCrate(2595, 521, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents","amSineGun")
@@ -2446,36 +2446,36 @@
------ HEALTH CRATE LIST ------
------ AMMO CRATE LIST ------
- tempG = SpawnAmmoCrate(1943, 1978, amBazooka)
+ tempG = SpawnSupplyCrate(1943, 1978, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(2002, 1952, amSineGun)
+ tempG = SpawnSupplyCrate(2002, 1952, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amSineGun")
- tempG = SpawnAmmoCrate(2002, 1890, amSineGun)
+ tempG = SpawnSupplyCrate(2002, 1890, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amSineGun")
- tempG = SpawnAmmoCrate(2002, 1921, amSineGun)
+ tempG = SpawnSupplyCrate(2002, 1921, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amSineGun")
- tempG = SpawnAmmoCrate(1998, 1859, amSineGun)
+ tempG = SpawnSupplyCrate(1998, 1859, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amSineGun")
------ UTILITY CRATE LIST ------
- tempG = SpawnUtilityCrate(368, 274, amPickHammer)
+ tempG = SpawnSupplyCrate(368, 274, amPickHammer)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amPickHammer")
- tempG = SpawnUtilityCrate(526, 568, amExtraTime)
+ tempG = SpawnSupplyCrate(526, 568, amExtraTime)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amExtraTime")
- tempG = SpawnUtilityCrate(474, 1014, amExtraTime)
+ tempG = SpawnSupplyCrate(474, 1014, amExtraTime)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amExtraTime")
- tempG = SpawnUtilityCrate(906, 1955, amRope)
+ tempG = SpawnSupplyCrate(906, 1955, amRope)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amRope")
- tempG = SpawnUtilityCrate(2127, 1529, amBlowTorch)
+ tempG = SpawnSupplyCrate(2127, 1529, amBlowTorch)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amBlowTorch")
@@ -2584,30 +2584,30 @@
AddWayPoint(892, 1119)
------ AMMO CRATE LIST ------
- tempG = SpawnAmmoCrate(1740, 1905, amBazooka)
+ tempG = SpawnSupplyCrate(1740, 1905, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(1780, 1905, amSineGun)
+ tempG = SpawnSupplyCrate(1780, 1905, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amSineGun")
- tempG = SpawnAmmoCrate(1782, 1874, amSineGun)
+ tempG = SpawnSupplyCrate(1782, 1874, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amSineGun")
- tempG = SpawnAmmoCrate(1782, 1843, amSineGun)
+ tempG = SpawnSupplyCrate(1782, 1843, amSineGun)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amSineGun")
------ UTILITY CRATE LIST ------
- tempG = SpawnUtilityCrate(368, 274, amPickHammer)
+ tempG = SpawnSupplyCrate(368, 274, amPickHammer)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amPickHammer")
- tempG = SpawnUtilityCrate(526, 568, amExtraTime)
+ tempG = SpawnSupplyCrate(526, 568, amExtraTime)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amExtraTime")
- tempG = SpawnUtilityCrate(474, 1014, amExtraTime)
+ tempG = SpawnSupplyCrate(474, 1014, amExtraTime)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amExtraTime")
- tempG = SpawnUtilityCrate(906, 1955, amRope)
+ tempG = SpawnSupplyCrate(906, 1955, amRope)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amRope")
@@ -2794,36 +2794,36 @@
AddWayPoint(1379, 1192)
------ AMMO CRATE LIST ------
- tempG = SpawnAmmoCrate(1757, 706, amBazooka)
+ tempG = SpawnSupplyCrate(1757, 706, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(1838, 706, amBazooka)
+ tempG = SpawnSupplyCrate(1838, 706, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(1319, 926, amBazooka)
+ tempG = SpawnSupplyCrate(1319, 926, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(1389, 926, amBazooka)
+ tempG = SpawnSupplyCrate(1389, 926, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(3184, 839, amBazooka)
+ tempG = SpawnSupplyCrate(3184, 839, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(3185, 808, amBazooka)
+ tempG = SpawnSupplyCrate(3185, 808, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
------ UTILITY CRATE LIST ------
- tempG = SpawnUtilityCrate(3677, 412, amJetpack)
+ tempG = SpawnSupplyCrate(3677, 412, amJetpack)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amJetpack")
- tempG = SpawnUtilityCrate(3079, 1007, amExtraTime)
+ tempG = SpawnSupplyCrate(3079, 1007, amExtraTime)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amExtraTime")
- tempG = SpawnUtilityCrate(3138, 1007, amExtraTime)
+ tempG = SpawnSupplyCrate(3138, 1007, amExtraTime)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amExtraTime")
- tempG = SpawnUtilityCrate(420, 929, amExtraTime)
+ tempG = SpawnSupplyCrate(420, 929, amExtraTime)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amExtraTime")
@@ -3445,36 +3445,36 @@
AddWayPoint(4075, 1887)
------ AMMO CRATE LIST ------
- tempG = SpawnAmmoCrate(889, 1126, amBaseballBat)
- tempG = SpawnAmmoCrate(1211, 975, amSineGun)
- tempG = SpawnAmmoCrate(3619, 451, amFirePunch)
+ tempG = SpawnSupplyCrate(889, 1126, amBaseballBat)
+ tempG = SpawnSupplyCrate(1211, 975, amSineGun)
+ tempG = SpawnSupplyCrate(3619, 451, amFirePunch)
------ UTILITY CRATE LIST ------
- tempG = SpawnUtilityCrate(304, 1594, amRope)
- tempG = SpawnUtilityCrate(1538, 1987, amJetpack)
- tempG = SpawnUtilityCrate(1958, 2000, amExtraTime)
- tempG = SpawnUtilityCrate(2744, 1923, amJetpack)
- tempG = SpawnUtilityCrate(3283, 1363, amParachute)
- tempG = SpawnUtilityCrate(2749, 1812, amRope)
- tempG = SpawnUtilityCrate(970, 779, amJetpack)
+ tempG = SpawnSupplyCrate(304, 1594, amRope)
+ tempG = SpawnSupplyCrate(1538, 1987, amJetpack)
+ tempG = SpawnSupplyCrate(1958, 2000, amExtraTime)
+ tempG = SpawnSupplyCrate(2744, 1923, amJetpack)
+ tempG = SpawnSupplyCrate(3283, 1363, amParachute)
+ tempG = SpawnSupplyCrate(2749, 1812, amRope)
+ tempG = SpawnSupplyCrate(970, 779, amJetpack)
- tempG = SpawnUtilityCrate(3284, 1332, amExtraTime)
- tempG = SpawnUtilityCrate(1082, 975, amBlowTorch)
- tempG = SpawnUtilityCrate(1547, 981, amJetpack)
- tempG = SpawnUtilityCrate(1707, 397, amRope)
- tempG = SpawnUtilityCrate(2309, 649, amExtraTime)
- tempG = SpawnUtilityCrate(1116, 867, amExtraTime)
+ tempG = SpawnSupplyCrate(3284, 1332, amExtraTime)
+ tempG = SpawnSupplyCrate(1082, 975, amBlowTorch)
+ tempG = SpawnSupplyCrate(1547, 981, amJetpack)
+ tempG = SpawnSupplyCrate(1707, 397, amRope)
+ tempG = SpawnSupplyCrate(2309, 649, amExtraTime)
+ tempG = SpawnSupplyCrate(1116, 867, amExtraTime)
------ AMMO CRATE LIST ------
- tempG = SpawnAmmoCrate(2559, 880, amBazooka)
- tempG = SpawnAmmoCrate(2630, 880, amBazooka)
- tempG = SpawnAmmoCrate(1951, 1406, amGrenade)
+ tempG = SpawnSupplyCrate(2559, 880, amBazooka)
+ tempG = SpawnSupplyCrate(2630, 880, amBazooka)
+ tempG = SpawnSupplyCrate(1951, 1406, amGrenade)
------ UTILITY CRATE LIST ------
- tempG = SpawnUtilityCrate(3536, 320, amBlowTorch)
- tempG = SpawnUtilityCrate(3582, 1994, amJetpack)
- tempG = SpawnUtilityCrate(682, 349, amExtraTime)
- tempG = SpawnUtilityCrate(2842, 633, amExtraTime)
+ tempG = SpawnSupplyCrate(3536, 320, amBlowTorch)
+ tempG = SpawnSupplyCrate(3582, 1994, amJetpack)
+ tempG = SpawnSupplyCrate(682, 349, amExtraTime)
+ tempG = SpawnSupplyCrate(2842, 633, amExtraTime)
------ BARREL LIST ------
SetHealth(AddGear(506, 1034, gtExplosives, 0, 0, 0, 0), 1)
@@ -3654,18 +3654,18 @@
SetHealth(SpawnHealthCrate(694, 553), 25)
------ AMMO CRATE LIST ------
- tempG = SpawnAmmoCrate(463, 461, amBazooka)
+ tempG = SpawnSupplyCrate(463, 461, amBazooka)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amBazooka")
- tempG = SpawnAmmoCrate(579, 461, amWatermelon)
+ tempG = SpawnSupplyCrate(579, 461, amWatermelon)
setGearValue(tempG,"caseType", "ammo")
setGearValue(tempG,"contents", "amWatermelon")
------ UTILITY CRATE LIST ------
- tempG = SpawnUtilityCrate(367, 500, amBlowTorch)
+ tempG = SpawnSupplyCrate(367, 500, amBlowTorch)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amBlowTorch")
- tempG = SpawnUtilityCrate(638, 493, amExtraTime)
+ tempG = SpawnSupplyCrate(638, 493, amExtraTime)
setGearValue(tempG,"caseType", "util")
setGearValue(tempG,"contents", "amExtraTime")
@@ -3712,24 +3712,24 @@
LoadSprite(3629, 413, sprAmGirder, 5, 4294967295, nil, nil, nil, lfNormal)
------ AMMO CRATE LIST ------
- tempG = SpawnAmmoCrate(3772, 446, amWatermelon)
- tempG = SpawnAmmoCrate(3769, 415, amWatermelon)
- tempG = SpawnAmmoCrate(3773, 384, amWatermelon)
- tempG = SpawnAmmoCrate(3771, 353, amWatermelon)
- tempG = SpawnAmmoCrate(3770, 322, amWatermelon)
- tempG = SpawnAmmoCrate(3775, 291, amWatermelon)
- tempG = SpawnAmmoCrate(3776, 260, amWatermelon)
- tempG = SpawnAmmoCrate(3775, 229, amWatermelon)
- tempG = SpawnAmmoCrate(3772, 198, amWatermelon)
- tempG = SpawnAmmoCrate(3776, 167, amWatermelon)
+ tempG = SpawnSupplyCrate(3772, 446, amWatermelon)
+ tempG = SpawnSupplyCrate(3769, 415, amWatermelon)
+ tempG = SpawnSupplyCrate(3773, 384, amWatermelon)
+ tempG = SpawnSupplyCrate(3771, 353, amWatermelon)
+ tempG = SpawnSupplyCrate(3770, 322, amWatermelon)
+ tempG = SpawnSupplyCrate(3775, 291, amWatermelon)
+ tempG = SpawnSupplyCrate(3776, 260, amWatermelon)
+ tempG = SpawnSupplyCrate(3775, 229, amWatermelon)
+ tempG = SpawnSupplyCrate(3772, 198, amWatermelon)
+ tempG = SpawnSupplyCrate(3776, 167, amWatermelon)
------ UTILITY CRATE LIST ------
- tempG = SpawnUtilityCrate(3723, 446, amJetpack)
- tempG = SpawnUtilityCrate(3725, 415, amJetpack)
- tempG = SpawnUtilityCrate(3814, 446, amJetpack)
- tempG = SpawnUtilityCrate(3814, 415, amJetpack)
- tempG = SpawnUtilityCrate(3815, 384, amJetpack)
- tempG = SpawnUtilityCrate(3728, 384, amJetpack)
+ tempG = SpawnSupplyCrate(3723, 446, amJetpack)
+ tempG = SpawnSupplyCrate(3725, 415, amJetpack)
+ tempG = SpawnSupplyCrate(3814, 446, amJetpack)
+ tempG = SpawnSupplyCrate(3814, 415, amJetpack)
+ tempG = SpawnSupplyCrate(3815, 384, amJetpack)
+ tempG = SpawnSupplyCrate(3728, 384, amJetpack)
------ AIR MINE LIST ------
SetTimer(AddGear(3489, 110, gtAirMine, 0, 0, 0, 0), 1)