Merge pull request #80 from wushin/patch-2014.4.16.01v2014.4.16.01

Server Side Patch

3 files changed, 17 insertions, 5 deletions

diff --git a/client-data b/client-data
-Subproject bfafaff17528e4f5689702c9620586b1e43725d
+Subproject ff56ccaec3dde8bbfe8420a64978e95f8cd5382
diff --git a/world/map/npc/027-4/monsters.txt b/world/map/npc/027-4/monsters.txt
index adc89a88..c575f056 100644
--- a/world/map/npc/027-4/monsters.txt
+++ b/world/map/npc/027-4/monsters.txt
@@ -1,11 +1,11 @@
 // 027-4 Graveyard zombies and fallens
 // they need to be in an extra file because of the crying child quest
 
-027-4.gat,39,84,38,22|monster|Fallen|1045,3,60000,8000,Mob027-4::On1045
-027-4.gat,27,57,15,22|monster|Zombie|1036,2,60000,8000,Mob027-4::On1036
-027-4.gat,108,77,39,14|monster|Fallen|1045,3,60000,8000,Mob027-4::On1045
-027-4.gat,61,37,38,30|monster|Zombie|1036,2,60000,8000,Mob027-4::On1036
-027-4.gat,101,36,38,30|monster|Zombie|1036,2,60000,8000,Mob027-4::On1036
+027-4.gat,39,84,38,22|monster|Fallen|1045,3,60000,8000,specialMob027-4::On1045
+027-4.gat,27,57,15,22|monster|Zombie|1036,2,60000,8000,specialMob027-4::On1036
+027-4.gat,108,77,39,14|monster|Fallen|1045,3,60000,8000,specialMob027-4::On1045
+027-4.gat,61,37,38,30|monster|Zombie|1036,2,60000,8000,specialMob027-4::On1036
+027-4.gat,101,36,38,30|monster|Zombie|1036,2,60000,8000,specialMob027-4::On1036
 
 027-4.gat,0,0,0|script|specialMob027-4|-1,
 {
diff --git a/world/map/npc/functions/undead_debug.txt b/world/map/npc/functions/undead_debug.txt
index 4f01a78c..4b2a015a 100644
--- a/world/map/npc/functions/undead_debug.txt
+++ b/world/map/npc/functions/undead_debug.txt
@@ -87,6 +87,10 @@ L_Close:
     set @undeaddebug, 3;
     callfunc "UndeadDebug";
     end;
+OnInit:
+    if (!debug)
+        disablenpc "UndeadDebug3";
+    end;
 }
 
 // Debug for Razha
@@ -95,6 +99,10 @@ L_Close:
     set @undeaddebug, 4;
     callfunc "UndeadDebug";
     end;
+OnInit:
+    if (!debug)
+        disablenpc "UndeadDebug4";
+    end;
 }
 
 // Debug for Terogan
@@ -103,4 +111,8 @@ L_Close:
     set @undeaddebug, 5;
     callfunc "UndeadDebug";
     end;
+OnInit:
+    if (!debug)
+        disablenpc "UndeadDebug5";
+    end;
 }