# HG changeset patch # User Wuzzy # Date 1506351035 -7200 # Node ID b1c2b0a8a43e54abd4bc28ea4eb3ee54ca22974a # Parent 15e9ef8be44fd21fead2d0f581ab854ab92e87c6 Fix crate types (weapon/utility) in A Classic Fairytale missions diff -r 15e9ef8be44f -r b1c2b0a8a43e share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Mon Sep 25 16:35:07 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Mon Sep 25 16:50:35 2017 +0200 @@ -569,8 +569,8 @@ SpawnAmmoCrate(2574, 1279, amSMine) SpawnAmmoCrate(2575, 1267, amMine) SpawnAmmoCrate(2617, 1259, amSMine) - SpawnUtilityCrate(2579, 1254, amMine) - SpawnUtilityCrate(2478, 1243, amMine) + SpawnAmmoCrate(2579, 1254, amMine) + SpawnAmmoCrate(2478, 1243, amMine) end function AfterWave2DeadAnim() diff -r 15e9ef8be44f -r b1c2b0a8a43e share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua Mon Sep 25 16:35:07 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua Mon Sep 25 16:50:35 2017 +0200 @@ -200,9 +200,9 @@ function SetupPlace3() SpawnUtilityCrate(2086, 1887, amRope, 1) - SpawnUtilityCrate(2147, 728, amBlowTorch, 2) - SpawnUtilityCrate(2778, 1372, amPickHammer, 3) - SpawnUtilityCrate(2579, 1886, amPickHammer, 3) + 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) @@ -269,7 +269,7 @@ SpawnAmmoCrate(2077, 847, amWatermelon, 3) grenadeCrate2 = SpawnAmmoCrate(2122, 847, amGrenade, 3) - SpawnUtilityCrate(747, 1577, amPickHammer, 1) + SpawnAmmoCrate(747, 1577, amPickHammer, 1) SpawnUtilityCrate(496, 1757, amGirder, 2) SpawnUtilityCrate(1809, 1880, amGirder, 1) SpawnUtilityCrate(530, 1747, amPortalGun, 1) diff -r 15e9ef8be44f -r b1c2b0a8a43e share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Mon Sep 25 16:35:07 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Mon Sep 25 16:50:35 2017 +0200 @@ -312,7 +312,7 @@ PlaceGirder(952, 650, 0) fireCrate = SpawnAmmoCrate(1846, 1100, amFirePunch) - SpawnUtilityCrate(1900, 1100, amPickHammer) + SpawnAmmoCrate(1900, 1100, amPickHammer) SpawnAmmoCrate(950, 674, amDynamite) SpawnUtilityCrate(994, 825, amRope) SpawnUtilityCrate(570, 1357, amLowGravity) @@ -608,7 +608,7 @@ SpawnAmmoCrate(3124, 952, amBaseballBat) SpawnAmmoCrate(2508, 1110, amFirePunch) ------ UTILITY CRATE LIST ------ - blowCrate = SpawnUtilityCrate(3675, 1480, amBlowTorch) + blowCrate = SpawnAmmoCrate(3675, 1480, amBlowTorch) gravityCrate = SpawnUtilityCrate(3448, 1349, amLowGravity) SpawnUtilityCrate(3212, 1256, amGirder) SpawnUtilityCrate(3113, 911, amParachute) @@ -723,9 +723,9 @@ SpawnUtilityCrate(1590, 628, amParachute) SpawnAmmoCrate(1540, 100, amDynamite) SpawnUtilityCrate(2175, 1815, amLowGravity) - SpawnUtilityCrate(2210, 1499, amFirePunch) + SpawnAmmoCrate(2210, 1499, amFirePunch) girderCrate = SpawnUtilityCrate(2300, 1663, amGirder) - SpawnUtilityCrate(610, 1394, amPickHammer) + SpawnAmmoCrate(610, 1394, amPickHammer) ------ BARREL LIST ------ SetHealth(AddGear(1148, 736, gtExplosives, 0, 0, 0, 0), 20) diff -r 15e9ef8be44f -r b1c2b0a8a43e share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Mon Sep 25 16:35:07 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Mon Sep 25 16:50:35 2017 +0200 @@ -86,8 +86,8 @@ --------------------------Anim skip functions-------------------------- function AfterRefusedAnim() SpawnUtilityCrate(2045, 1575, amSwitch) - SpawnUtilityCrate(2365, 1495, amShotgun) - SpawnUtilityCrate(2495, 1519, amGrenade) + SpawnAmmoCrate(2365, 1495, amShotgun) + SpawnAmmoCrate(2495, 1519, amGrenade) SpawnUtilityCrate(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) @@ -215,8 +215,8 @@ function AfterAcceptedAnim() stage = acceptedReturnStage - SpawnAmmoCrate(1370, 810, amGirder) - SpawnAmmoCrate(1300, 810, amParachute) + SpawnUtilityCrate(1370, 810, amGirder) + SpawnUtilityCrate(1300, 810, amParachute) ShowMission(loc("The Shadow Falls"), loc("The walk of Fame"), loc("Return to Leaks A Lot! If you get stuck, press [Precise] to try again!"), 1, 6000) AddEvent(CheckTookWeapons, {}, DoTookWeapons, {}, 0) AddEvent(CheckNeedGirder, {}, DoNeedGirder, {}, 0) diff -r 15e9ef8be44f -r b1c2b0a8a43e share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Mon Sep 25 16:35:07 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Mon Sep 25 16:50:35 2017 +0200 @@ -359,11 +359,11 @@ SpawnAmmoCrate(1981, 464, amGrenade) SpawnAmmoCrate(1957, 459, amShotgun) SpawnAmmoCrate(1902, 450, amDynamite) - SpawnUtilityCrate(1982, 405, amPickHammer) + SpawnAmmoCrate(1982, 405, amPickHammer) SpawnUtilityCrate(2028, 455, amRope) SpawnUtilityCrate(2025, 464, amTeleport) else - SpawnUtilityCrate(1982, 405, amBlowTorch) + SpawnAmmoCrate(1982, 405, amBlowTorch) SpawnAmmoCrate(2171, 428, amMolotov) SpawnAmmoCrate(2364, 346, amFlamethrower) SpawnAmmoCrate(2521, 303, amBazooka)