Add mobs to some more areas

2 files changed, 74 insertions, 10 deletions

diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index c2bdb6e15..f33892790 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -11559,6 +11559,57 @@ mob_db: (
 		Ele_All: 5000
 	}
 },
+{
+	Id: 1433
+	SpriteName: "ArmoredSkeleton"
+	Name: "Armored Skeleton"
+	Lv: 48
+	Hp: 5775
+	Sp: 0
+	Exp: 305
+	JExp: 2
+	AttackRange: 1
+	Attack: [294, 317]
+	Def: 47
+	Mdef: 8
+	Stats: {
+		Str: 17
+		Agi: 28
+		Vit: 33
+		Int: 11
+		Dex: 33
+		Luk: 19
+	}
+	ViewRange: 8
+	ChaseRange: 11
+	Race: 1
+	Element: (7, 1)
+	Mode: {
+		CanMove: true
+		CanAttack: true
+		Aggressive: true
+		Angry: true
+		ChangeTargetMelee: true
+		ChangeChase: true
+		CastSensorChase: true
+	}
+	MoveSpeed: 340
+	AttackDelay: 1800
+	AttackMotion: 672
+	DamageMotion: 200
+	Drops: {
+		IronArrow: 3500
+		Skull: 900
+		Bone: 800
+		Bone: 450
+		Bone: 200
+		Bone: 120
+		DarkCrystal: 110
+		SkullBloodyMug: 100
+		PileOfAsh: 95
+		CursedSkull: 1
+	}
+},
 // System
 {
 	Id: 1492
diff --git a/npc/029-0/mobs.txt b/npc/029-0/mobs.txt
index e8635c85b..73b1223ee 100644
--- a/npc/029-0/mobs.txt
+++ b/npc/029-0/mobs.txt
@@ -38,7 +38,7 @@ OnInit:
     end;
 
 function SFspawn {
-    .@am=($FIRESOFSTEAM > getarg(8) ? (getarg(6)*6/10) : getarg(6));
+    .@am=($FIRESOFSTEAM > getarg(8) && !$@GM_OVERRIDE ? (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,
@@ -78,22 +78,35 @@ function SFsetup2 {
 }
 
 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, DustGatling, 40, .e3$, 3);
+    SFspawn("029-3", 20, 20, 130, 100, Scar, 50, .e3$, 3);
+    SFspawn("029-3", 20, 20, 130, 100, Skeleton, 80, .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);
+    SFspawn("029-3", 20, 20, 48, 62, Troll, 25, .e3$, 3);
+    SFspawn("029-3", 20, 62, 53, 100, Michel, 30, .e3$, 3);
+    SFspawn("029-3", 47, 20, 72, 50, LavaSkullSlime, 25, .e3$, 3);
+    SFspawn("029-3", 72, 20, 130, 50, ShadowPixie, 18, .e3$, 3);
+    SFspawn("029-3", 67, 49, 130, 64, GoboBear, 25, .e3$, 3);
+    SFspawn("029-3", 67, 62, 99, 100, BlackMamba, 30, .e3$, 3);
+    SFspawn("029-3", 100, 62, 130, 100, JackO, 30, .e3$, 3);
     // MAP BOSS
     monster("029-3", 82, 89, "Level Boss", FallenKing2, 1, .e3$);
     return;
 }
 
 function SFsetup4 {
+    SFspawn("029-4", 20, 20, 130, 100, DustRifle, 40, .e4$, 4);
+    SFspawn("029-4", 20, 20, 130, 100, Skeleton, 60, .e4$, 4);
+    SFspawn("029-4", 20, 20, 130, 100, ArmoredSkeleton, 20, .e4$, 4);
+
+    SFspawn("029-4", 38, 22, 120, 28, FireSkull, 30, .e4$, 4);
+    SFspawn("029-4", 38, 30, 128, 44, GreenSkullSlime, 30, .e4$, 4);
+    SFspawn("029-4", 20, 22, 35, 68, BlackSkullSlime, 30, .e4$, 4);
+    SFspawn("029-4", 37, 44, 128, 60, Reaper, 24, .e4$, 4);
+    SFspawn("029-4", 88, 60, 128, 85, Jhon, 20, .e4$, 4);
+    SFspawn("029-4", 20, 69, 60, 101, Mandragora, 20, .e4$, 4);
+    SFspawn("029-4", 62, 61, 86, 92, JackO, 15, .e4$, 4); // BOSS
+    SFspawn("029-4", 60, 94, 128, 101, NulityPixie, 15, .e4$, 4);
     // MAP BOSS
     monster("029-4", 73, 77, "Level Boss", PsiConscience, 1, .e4$);
     return;