For some reason

There are bugs with mobs

6 files changed, 61 insertions, 29 deletions

diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index cc5550e9c..fa6e908c2 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -9278,45 +9278,46 @@ mob_db: (
 	Id: 1235
 	SpriteName: "SiegeTower"
 	Name: "Siege Tower"
-	Lv: 1
+	Lv: 150
 	Hp: 30000
-	Sp: 0
+	Sp: 800
 	Exp: 1
 	JExp: 1
-	AttackRange: 8
-	Attack: [25, 30]
+	AttackRange: 11
+	Attack: [180, 300]
 	Def: 767
 	Mdef: 767
+	// FIXME: For some reason, it can't crit
+	// Even with 65535 luck o.o
 	Stats: {
-		Str: 15
-		Agi: 8
-		Vit: 2
+		Str: 1
+		Agi: 1
+		Vit: 1
 		Int: 1
 		Dex: 32767
-		Luk: 32767
+		Luk: 65535
 	}
-	ViewRange: 18
+	ViewRange: 12
 	ChaseRange: 18
 	Race: 2
 	Element: (0, 1)
 	Mode: {
 		CanMove: false
 		Aggressive: true
+		Angry: true
 		ChangeChase: true
 		CanAttack: true
+		ChangeTargetMelee: true
+		CastSensorChase: true
 	}
-	MoveSpeed: 1400
-	AttackDelay: 500
-	AttackMotion: 272
+	AttackDelay: 570
+	AttackMotion: 472
 	DamageMotion: 180
-	Drops: {
-		Coal: 200
-	}
 	WeaponAttacks: {
 		All: 5000
 	}
 	SkillAttacks: {
-		MG_FIREBALL: 50000
+		MG_FIREBALL: 30000
 		SO_FIREWALK: 15000
 	}
 },
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf
index f5736347c..e98fb6443 100644
--- a/db/re/mob_skill_db.conf
+++ b/db/re/mob_skill_db.conf
@@ -1635,6 +1635,25 @@ SKILL_COND2 = {
 			SkillTarget: "MST_TARGET"
 			CastCondition: "MSC_CLOSEDATTACKED"
 		}
+		NPC_BLINDATTACK: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 1
+			Rate: 3000
+			Delay: 300000
+			Cancelable: true
+			SkillTarget: "MST_TARGET"
+			CastCondition: "MSC_ALWAYS"
+		}
+		NPC_CURSEATTACK: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 1
+			Rate: 8000
+			CastTime: 1000
+			Delay: 20000
+			Cancelable: false
+			SkillTarget: "MST_TARGET"
+			CastCondition: "MSC_RUDEATTACKED"
+		}
 	}
 
 	/**********************************************************************/
diff --git a/npc/014-4/kamelot.txt b/npc/014-4/kamelot.txt
index b075ad165..8e0eef2b9 100644
--- a/npc/014-4/kamelot.txt
+++ b/npc/014-4/kamelot.txt
@@ -124,16 +124,16 @@ OnDebug:
         l("Abort"),
         l("Reset"),
         l("Reset & Destroy"),
-        l("Quest: Skip Weapons Room"),
-        l("Quest: Skip Krukan fight"),
+        l("Quest - Skip Weapons Room"),
+        l("Quest - Skip Krukan fight"),
         "",
         "",
         "",
         "",
-        l("Warp: Jump to Entrance"), // 10
-        l("Warp: Jump to Weapon Room"),
-        l("Warp: Jump to Basement"),
-        l("Warp: Jump to Jail");
+        l("Warp - Jump to Entrance"), // 10
+        l("Warp - Jump to Weapon Room"),
+        l("Warp - Jump to Basement"),
+        l("Warp - Jump to Jail");
     mes "";
     switch (@menu) {
         case 2:
diff --git a/npc/042-2/boss.txt b/npc/042-2/boss.txt
index a115641be..964bea2c9 100644
--- a/npc/042-2/boss.txt
+++ b/npc/042-2/boss.txt
@@ -68,7 +68,7 @@ OnTimer60000:
 
 OnTimer67000:
     .@m$=instance_mapname("042-2");
-    mapannounce .@m$, "??? : You require the key hidden in the caves, additionally you must overcome the magical seal.", 0;
+    mapannounce .@m$, b("??? : You require the key hidden in the caves, additionally you must overcome the magical seal."), 0;
     end;
 
 OnTimer74000:
@@ -78,7 +78,7 @@ OnTimer74000:
 
 OnTimer80000:
     .@m$=instance_mapname("042-2");
-    mapannounce .@m$, "General Krukan : Both is impossible for weaklings like you lot. Minions, ATTACK!", 0;
+    mapannounce .@m$, "General Krukan : ##1I am General Krukan the Strong. Minions, ATTACK!", 0;
     .@gcount=getd("$@GTEMP_PC_"+.@m$);
     kdoor0422Spawn(.@gcount*2, 20, 24, 59, 59);
     end;
@@ -100,7 +100,7 @@ OnTimer120000:
 OnTimer180000:
     .@m$=instance_mapname("042-2");
     .@n$=instance_npcname(.name$);
-    mapannounce .@m$, "General Krukan : Looks like if you want something done right you have to do it yourself. Charge!", 0;
+    mapannounce .@m$, "General Krukan : Looks like if you want something done right you have to do it yourself. ##1Charge!", 0;
     .@gcount=getd("$@GTEMP_PC_"+.@m$);
     .@avg=getd("$@GTEMP_MX_"+.@m$);
     kdoor0422Spawn(.@gcount*3, 20, 24, 59, 59);
diff --git a/npc/042-3/jail.txt b/npc/042-3/jail.txt
index 19c346a6c..199ab05a0 100644
--- a/npc/042-3/jail.txt
+++ b/npc/042-3/jail.txt
@@ -13,6 +13,10 @@
 
 OnKillSlime:
     .@label$=instance_npcname(.name$)+"::OnKillSlime";
+    if (!playerattached()) {
+        debugmes "[ERROR] Player not Attached on Slime Death D:";
+        debugmes "[ERROR] Cannot retrieve coordinates!!";
+    }
     if (@lockpicks)
         end;
     if (rand2(10000) > 1000) {
@@ -24,6 +28,10 @@ OnKillSlime:
     end;
 
 OnFirstSlime:
+    if (!playerattached()) {
+        debugmes "[ERROR] Player not Attached on Slime Spawn D:";
+        debugmes "[ERROR] Cannot retrieve coordinates!!";
+    }
     getmapxy(.@m$, .@x, .@y, 0);
     sleep2(1800);
     .@mob=monster(.@m$, .@x, .@y, strmobinfo(1, CopperSlime), CopperSlime, 1, .@label$);
@@ -34,11 +42,12 @@ OnFirstSlime:
 
 // Spawn Siege Towers
 OnInstanceInit:
-    .@m$=instance_mapname(.map$);
+    .@m$=instance_mapname("042-3");
+    debugmes "Kamelot Init: Original %s Target %s", .map$, .@m$; // Fun fact
     monster(.@m$, 89, 133, strmobinfo(1, SiegeTower), SiegeTower, 1);
     monster(.@m$, 67, 114, strmobinfo(1, SiegeTower), SiegeTower, 1);
     monster(.@m$, 30, 121, strmobinfo(1, SiegeTower), SiegeTower, 1);
-    monster(.@m$, 23, 136, strmobinfo(1, SiegeTower), SiegeTower, 1);
+    monster(.@m$, 23, 137, strmobinfo(1, SiegeTower), SiegeTower, 1);
     monster(.@m$, 29, 103, strmobinfo(1, SiegeTower), SiegeTower, 1);
     monster(.@m$, 61, 91, strmobinfo(1, SiegeTower), SiegeTower, 1);
     monster(.@m$, 75, 69, strmobinfo(1, SiegeTower), SiegeTower, 1);
@@ -125,7 +134,7 @@ OnKamelotSlide:
 
 OnTouch:
     .@g=getcharid(2);
-    warp "042-3@"+.@g, 41, 23;
+    warp "042-2@"+.@g, 41, 23;
     end;
 }
 
diff --git a/npc/commands/kami.txt b/npc/commands/kami.txt
index 4b62cfb17..71d71dc74 100644
--- a/npc/commands/kami.txt
+++ b/npc/commands/kami.txt
@@ -75,6 +75,9 @@ OnJustDoIt:
     //dispbottom l("STR: %d AGI %d VIT %d", readparam2(bStr), readparam2(bAgi), readparam2(bVit));
     //unitskilluseid(getcharid(3), GD_LEADERSHIP, 1, getcharid(3));
     // This is only for testing
+    $@GM_OVERRIDE=true;
+    atcommand("@speed 90");
+    warp "Save", 0, 0;
 
     // areasc(range, time, skill code, who targets, power, filter)
     //areasc(9, 20000, SC_MAGNIFICAT, BL_PC, 1, "filter_sameguild");
@@ -86,7 +89,7 @@ OnInit:
     bindatcmd "blessing", "@k::OnBuff", 99, 100, 1;
 
     bindatcmd "skry", "@k::OnSkry", 80, 80, 1;
-    bindatcmd "gdreco", "@k::OnJustDoIt", 80, 80, 1;
+    bindatcmd "gdreco", "@k::OnJustDoIt", 99, 99, 1;
 
     bindatcmd "instcheck", "@k::OnInstCheck", 99, 100, 1;
     bindatcmd "instdestr", "@k::OnInstDestroy", 99, 100, 1;