Beef up Night Dragon, remove Pixies.

3 files changed, 14 insertions, 13 deletions

diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 959a35571..bf56a30a7 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -9091,12 +9091,12 @@ mob_db: (
 	SpriteName: "NightDragon"
 	Name: "Night Dragon"
 	Lv: 75
-	Hp: 32000
+	Hp: 37000
 	Sp: 3248
 	Exp: 7015
 	JExp: 150
 	AttackRange: 3
-	Attack: [500, 600]
+	Attack: [700, 800]
 	Def: 80
 	Mdef: 105
 	WalkMask: "WALK_AIR"
@@ -9105,7 +9105,7 @@ mob_db: (
 		Agi: 30
 		Vit: 80
 		Int: 120
-		Dex: 200
+		Dex: 215
 		Luk: 90
 	}
 	ViewRange: 15
@@ -9121,7 +9121,7 @@ mob_db: (
 		ChangeChase: true
 	}
 	MoveSpeed: 440
-	AttackDelay: 2100
+	AttackDelay: 1772
 	AttackMotion: 472
 	DamageMotion: 380
 	Drops: {
@@ -9138,7 +9138,7 @@ mob_db: (
 	}
 	// Good defense against all type of weapons
 	WeaponAttacks: {
-		All: 7500
+		All: 7000
 	}
 	// Most powerful attack skills are almost entirely nullified
 	EleResist: {
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf
index 75587c9e1..083d73471 100644
--- a/db/re/mob_skill_db.conf
+++ b/db/re/mob_skill_db.conf
@@ -1519,7 +1519,7 @@ SKILL_COND2 = {
 			SkillState: "MSS_BERSERK"
 			SkillLevel: 2
 			Rate: 6000
-			CastTime: 800
+			CastTime: 600
 			Delay: 20000
 			Cancelable: false
 			SkillTarget: "MST_TARGET"
@@ -1529,7 +1529,7 @@ SKILL_COND2 = {
 			SkillState: "MSS_BERSERK"
 			SkillLevel: 1
 			Rate: 4000
-			CastTime: 2000
+			CastTime: 1800
 			Delay: 20000
 			Cancelable: false
 			SkillTarget: "MST_TARGET"
@@ -1539,7 +1539,7 @@ SKILL_COND2 = {
 			SkillState: "MSS_BERSERK"
 			SkillLevel: 3
 			Rate: 4800
-			CastTime: 2500
+			CastTime: 2200
 			Delay: 60000
 			Cancelable: false
 			SkillTarget: "MST_TARGET"
@@ -1550,7 +1550,7 @@ SKILL_COND2 = {
 			SkillState: "MSS_ANYTARGET"
 			SkillLevel: 4
 			Rate: 7000
-			CastTime: 500
+			CastTime: 600
 			Delay: 60000
 			Cancelable: true
 			SkillTarget: "MST_SELF"
diff --git a/npc/018-6-3/main.txt b/npc/018-6-3/main.txt
index 7930090ef..b5e239f7d 100644
--- a/npc/018-6-3/main.txt
+++ b/npc/018-6-3/main.txt
@@ -103,8 +103,9 @@ function BossRoom {
     // True: Must spawn boss, False: Allow to use warps
     if (01863_RelevanceCheck(.@id)) {
         mapannounce getmap(), l("BOSS FIGHT!"), bc_map|bc_pc;
-        // Spawn a boss. Aggressive chance: 33%
-        AreaMonsterBoss(getmap(), .@x1, .@y1, .@x2, .@y2, any(HolyPixie, NulityPixie, VanityPixie, TerraniteProtector, GoboBear, Centaur), .@id);
+        // Spawn a boss. Passive chance: 17%
+        // Removed: HolyPixie, NulityPixie, VanityPixie
+        AreaMonsterBoss(getmap(), .@x1, .@y1, .@x2, .@y2, any(CopperSkullSlime, LavaSkullSlime, BlackSlimeMother, TerraniteProtector, GoboBear, Centaur), .@id);
 
         // BIG ROOM: 6~12 support units
         // SMALL ROOM: 5~10 support units
@@ -212,8 +213,8 @@ OnFinalRoom:
     @boss=monster(getmap(), 90, 89, strmobinfo(1, .@mi), .@mi, 1, instance_npcname(.name$)+"::OnKillBoss");
 
     // Spawn reinforcements based on difficulty
-    AreaMonsterB(getmap(), .@x1, .@y1, .@x2, .@y2, MagicGoblin, (@difficulty_modulus ? 4 : 2));
-    AreaMonsterB(getmap(), .@x1, .@y1, .@x2, .@y2, DeathCat, (@difficulty_modulus ? 2 : 0));
+    AreaMonsterB(getmap(), .@x1, .@y1, .@x2, .@y2, MagicGoblin, (@difficulty_modulus ? 5 : 3));
+    AreaMonsterB(getmap(), .@x1, .@y1, .@x2, .@y2, DeathCat, (@difficulty_modulus ? 3 : 1));
     end;
 
 // Kill boss will use setq3 and also erase any remaining monster