After clear, spawn 40% less mobs than original

3 files changed, 39 insertions, 20 deletions

diff --git a/maps/re/029-6.mcache b/maps/re/029-6.mcache
index 822ae8752..6f1cd42cb 100644
--- a/maps/re/029-6.mcache
+++ b/maps/re/029-6.mcache
diff --git a/npc/029-0/mobs.txt b/npc/029-0/mobs.txt
index 433666def..e8635c85b 100644
--- a/npc/029-0/mobs.txt
+++ b/npc/029-0/mobs.txt
@@ -37,38 +37,57 @@ OnInit:
     SFsetup8();
     end;
 
+function SFspawn {
+    .@am=($FIRESOFSTEAM > getarg(8) ? (getarg(6)*6/10) : getarg(6));
+    debugmes "Spawning %d/%d mobs on %s", .@am, getarg(6), getarg(0);
+    areamonster(getarg(0), getarg(1), getarg(2), getarg(3), getarg(4),
+                strmobinfo(1, getarg(5)), getarg(5), .@am,
+                getarg(7));
+    return;
+}
+
 function SFsetup1 {
-    areamonster("029-1", 15, 15, 77, 120, strmobinfo(1, Scar), Scar, 60, .e1$);
-    areamonster("029-1", 15, 15, 255, 255, strmobinfo(1, Crafty), Crafty, 320, .e1$);
-    areamonster("029-1", 15, 15, 255, 255, strmobinfo(1, GiantMutatedBat), GiantMutatedBat, 30, .e1$);
-    areamonster("029-1", 15, 15, 255, 255, strmobinfo(1, Scar), Scar, 100, .e1$);
-    areamonster("029-1", 195, 15, 290, 100, strmobinfo(1, Forain), Forain, 54, .e1$);
-    areamonster("029-1", 77, 15, 195, 75, strmobinfo(1, GreenDragon), GreenDragon, 45, .e1$);
-    areamonster("029-1", 75, 75, 205, 100, strmobinfo(1, EliteDuck), EliteDuck, 40, .e1$);
-    areamonster("029-1", 15, 90, 75, 280, strmobinfo(1, Terranite), Terranite, 90, .e1$);
-    areamonster("029-1", 177, 140, 280, 280, strmobinfo(1, JackO), JackO, 80, .e1$);
-    areamonster("029-1", 175, 75, 280, 200, strmobinfo(1, RedSkullSlime), RedSkullSlime, 60, .e1$);
-    areamonster("029-1", 75, 175, 185, 280, strmobinfo(1, Michel), Michel, 60, .e1$);
-    areamonster("029-1", 80, 100, 180, 160, strmobinfo(1, CopperSkullSlime), CopperSkullSlime, 60, .e1$);
+    SFspawn("029-1", 15, 15, 77, 120, Scar, 60, .e1$, 1);
+    SFspawn("029-1", 15, 15, 255, 255, Crafty, 320, .e1$, 1);
+    SFspawn("029-1", 15, 15, 255, 255, GiantMutatedBat, 30, .e1$, 1);
+    SFspawn("029-1", 15, 15, 255, 255, Scar, 100, .e1$, 1);
+    SFspawn("029-1", 195, 15, 290, 100, Forain, 54, .e1$, 1);
+    SFspawn("029-1", 77, 15, 195, 75, GreenDragon, 45, .e1$, 1);
+    SFspawn("029-1", 75, 75, 205, 100, EliteDuck, 40, .e1$, 1);
+    SFspawn("029-1", 15, 90, 75, 280, Terranite, 90, .e1$, 1);
+    SFspawn("029-1", 177, 140, 280, 280, JackO, 80, .e1$, 1);
+    SFspawn("029-1", 175, 75, 280, 200, RedSkullSlime, 60, .e1$, 1);
+    SFspawn("029-1", 75, 175, 185, 280, Michel, 60, .e1$, 1);
+    SFspawn("029-1", 80, 100, 180, 160, CopperSkullSlime, 60, .e1$, 1);
     // MAP BOSS
     monster("029-1", 147, 153, "Level Boss", MonsterGeneral, 1, .e1$);
     return;
 }
 
 function SFsetup2 {
-    areamonster("029-2", 20, 28, 51, 33, strmobinfo(1, BlackMamba), BlackMamba, 15, .e2$);
-    areamonster("029-2", 20, 34, 51, 42, strmobinfo(1, GreenSkullSlime), GreenSkullSlime, 20, .e2$);
-    areamonster("029-2", 20, 42, 32, 70, strmobinfo(1, Centaur), Centaur, 15, .e2$);
-    areamonster("029-2", 39, 42, 51, 70, strmobinfo(1, TerraniteProtector), TerraniteProtector, 15, .e2$);
-    areamonster("029-2", 32, 42, 40, 70, strmobinfo(1, GoboBear), GoboBear, 13, .e2$);
-    areamonster("029-2", 20, 20, 35, 70, strmobinfo(1, Moonshroom), Moonshroom, 5, .e2$);
-    areamonster("029-2", 20, 20, 35, 70, strmobinfo(1, RobinBandit), RobinBandit, 5, .e2$);
+    SFspawn("029-2", 20, 28, 51, 33, BlackMamba, 15, .e2$, 2);
+    SFspawn("029-2", 20, 34, 51, 42, GreenSkullSlime, 20, .e2$, 2);
+    SFspawn("029-2", 20, 42, 32, 70, Centaur, 15, .e2$, 2);
+    SFspawn("029-2", 39, 42, 51, 70, TerraniteProtector, 15, .e2$, 2);
+    SFspawn("029-2", 32, 42, 40, 70, GoboBear, 13, .e2$, 2);
+    SFspawn("029-2", 20, 20, 35, 70, Moonshroom, 5, .e2$, 2);
+    SFspawn("029-2", 20, 20, 35, 70, RobinBandit, 5, .e2$, 2);
     // MAP BOSS
     monster("029-2", 46, 68, "Level Boss", YetiKing, 1, .e2$);
     return;
 }
 
 function SFsetup3 {
+    SFspawn("029-3", 20, 20, 130, 100, DustGatling, 60, .e3$, 3);
+    SFspawn("029-3", 20, 20, 130, 100, Scar, 60, .e3$, 3);
+    SFspawn("029-3", 20, 20, 130, 100, GreenSkullSlime, 20, .e3$, 3);
+    SFspawn("029-3", 20, 20, 48, 62, Troll, 35, .e3$, 3);
+    SFspawn("029-3", 20, 62, 53, 100, Michel, 35, .e3$, 3);
+    SFspawn("029-3", 47, 20, 72, 50, LavaSkullSlime, 35, .e3$, 3);
+    SFspawn("029-3", 72, 20, 130, 50, ShadowPixie, 25, .e3$, 3);
+    SFspawn("029-3", 67, 49, 130, 64, GoboBear, 35, .e3$, 3);
+    SFspawn("029-3", 67, 62, 99, 100, BlackMamba, 35, .e3$, 3);
+    SFspawn("029-3", 100, 62, 130, 100, JackO, 35, .e3$, 3);
     // MAP BOSS
     monster("029-3", 82, 89, "Level Boss", FallenKing2, 1, .e3$);
     return;
diff --git a/npc/029-6/_warps.txt b/npc/029-6/_warps.txt
index 46fd08bdb..bf9abfa53 100644
--- a/npc/029-6/_warps.txt
+++ b/npc/029-6/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 029-6: Somewhere Strange warps
-029-6,134,30,0	warp	#029-6_134_30	0,0,029-5,70,26
+029-6,143,30,0	warp	#029-6_143_30	0,0,029-5,70,26