map_099-7 moved warps and npcsmap_099-7

3 files changed, 19 insertions, 41 deletions

diff --git a/npc/099-7/boss.txt b/npc/099-7/boss.txt
index 6afbf37c..93398de8 100644
--- a/npc/099-7/boss.txt
+++ b/npc/099-7/boss.txt
@@ -59,8 +59,6 @@ L_Off:
     close;
 }
 
-
-
 027-3,105,88,0	script	#KeshlamClue705	NPC400,{
     if (!#CRYPT_PASSWORD) end;
     if (#CRYPT_PASSWORD & 4) goto L_On;
@@ -89,9 +87,6 @@ L_Off:
     close;
 }
 
-
-
-
 027-3,105,83,0	script	#KeshlamClue707	NPC400,{
     if (!#CRYPT_PASSWORD) end;
     if (#CRYPT_PASSWORD & 4) goto L_On;
@@ -120,8 +115,6 @@ L_Off:
     close;
 }
 
-
-
 027-3,105,78,0	script	#KeshlamClue709	NPC400,{
     if (!#CRYPT_PASSWORD) end;
     if (#CRYPT_PASSWORD & 8) goto L_On;
@@ -150,8 +143,6 @@ L_Off:
     close;
 }
 
-
-
 027-3,105,73,0	script	#KeshlamClue711	NPC400,{
     if (!#CRYPT_PASSWORD) end;
     if (#CRYPT_PASSWORD & 8) goto L_On;
@@ -180,8 +171,6 @@ L_Off:
     close;
 }
 
-
-
 027-3,106,59,0	script	#KeshlamClue713	NPC400,{
     if (!#CRYPT_PASSWORD) end;
     if (#CRYPT_PASSWORD & 16) goto L_On;
@@ -210,8 +199,6 @@ L_Off:
     close;
 }
 
-
-
 027-3,106,54,0	script	#KeshlamClue715	NPC400,{
     if (!#CRYPT_PASSWORD) end;
     if (#CRYPT_PASSWORD & 32) goto L_On;
@@ -300,8 +287,6 @@ L_Off:
     close;
 }
 
-
-
 027-3,118,88,0	script	#KeshlamClue754	NPC400,{
     if (!#CRYPT_PASSWORD) end;
     if (#CRYPT_PASSWORD & 256) goto L_On;
@@ -330,8 +315,6 @@ L_Off:
     close;
 }
 
-
-
 027-3,118,83,0	script	#KeshlamClue756	NPC400,{
     if (!#CRYPT_PASSWORD) end;
     if (#CRYPT_PASSWORD & 256) goto L_On;
@@ -360,8 +343,6 @@ L_Off:
     close;
 }
 
-
-
 027-3,118,78,0	script	#KeshlamClue758	NPC400,{
     if (!#CRYPT_PASSWORD) end;
     if (#CRYPT_PASSWORD & 512) goto L_On;
@@ -390,8 +371,6 @@ L_Off:
     close;
 }
 
-
-
 027-3,118,73,0	script	#KeshlamClue760	NPC400,{
     if (!#CRYPT_PASSWORD) end;
     if (#CRYPT_PASSWORD & 512) goto L_On;
@@ -420,8 +399,6 @@ L_Off:
     close;
 }
 
-
-
 027-3,117,59,0	script	#KeshlamClue762	NPC400,{
     if (!#CRYPT_PASSWORD) end;
     if (#CRYPT_PASSWORD & 1024) goto L_On;
@@ -450,8 +427,6 @@ L_Off:
     close;
 }
 
-
-
 027-3,117,54,0	script	#KeshlamClue764	NPC400,{
     if (!#CRYPT_PASSWORD) end;
     if (#CRYPT_PASSWORD & 2048) goto L_On;
@@ -529,7 +504,7 @@ L_Off:
     close;
 }
 
-099-7,75,49,0	script	Engraving#Keshlam	NPC400,{
+099-7,95,65,0	script	Engraving#Keshlam	NPC400,{
     mes "There's an engraving on this tree.";
     next;
     if (countitem("FlawedLens") < 1) goto L_Tools;
@@ -556,9 +531,9 @@ L_Tools:
     close;
 
 OnInit:
-    areamonster "099-7", 20, 20, 120, 120, "", 1148, 10, "Keshlam::OnDeath8";
-    areamonster "099-7", 20, 20, 120, 120, "", 1149, 10, "Keshlam::OnDeath9";
-    monster "099-7", 20, 105, "Grim Reaper", 1068, 1, "Keshlam::OnBoss";
+    areamonster "099-7", 37, 36, 142, 140, "", 1148, 10, "Keshlam::OnDeath8";
+    areamonster "099-7", 37, 36, 142, 140, "", 1149, 10, "Keshlam::OnDeath9";
+    monster "099-7", 40, 121, "Grim Reaper", 1068, 1, "Keshlam::OnBoss";
     end;
 
 OnDeath8:
@@ -590,17 +565,17 @@ OnTimer150000:
     // 1148
     .@KeshlamMc = mobcount("099-7", "Keshlam::OnDeath8");
     if (.@KeshlamMc < 10)
-        areamonster "099-7", 20, 20, 120, 120, "", 1148, 10-.@KeshlamMc, "Keshlam::OnDeath8";
+        areamonster "099-7", 37, 36, 142, 140, "", 1148, 10-.@KeshlamMc, "Keshlam::OnDeath8";
 
     // 1149
     .@KeshlamMc = mobcount("099-7", "Keshlam::OnDeath9");
     if (.@KeshlamMc < 10)
-        areamonster "099-7", 20, 20, 120, 120, "", 1149, 10-.@KeshlamMc, "Keshlam::OnDeath9";
+        areamonster "099-7", 37, 36, 142, 140, "", 1149, 10-.@KeshlamMc, "Keshlam::OnDeath9";
 
     // Boss (TODO maybe give boss their own timer with 5 minutes)
     .@KeshlamMc = mobcount("099-7", "Keshlam::OnBoss");
     if (.@KeshlamMc < 1)
-        monster "099-7", 20, 105, "Grim Reaper", 1068, 1, "Keshlam::OnBoss";
+        monster "099-7", 40, 121, "Grim Reaper", 1068, 1, "Keshlam::OnBoss";
 
     // Done
     .@KeshlamMc = 0;
@@ -608,7 +583,7 @@ OnTimer150000:
     end;
 }
 
-099-7,18,110,0	script	Chest#keshlam	NPC111,{
+099-7,38,126,0	script	Chest#keshlam	NPC111,{
     if (FLAGS & FLAG_KESHLAM_RAREDROP) goto L_Finished;
     mes "[Chest]";
     mes "Would you try to open it?";
@@ -679,7 +654,7 @@ L_close:
     close;
 }
 
-099-7,95,117,0	script	Knowledgeable Tree	NPC400,{
+099-7,115,133,0	script	Knowledgeable Tree	NPC400,{
     mes "If you kill every monster, this tree can warp you back.";
     mes "You will receive experience points for cleaning the map.";
     mes "";
@@ -708,21 +683,24 @@ L_Done:
     mes "(The memorial is at right, behind the column.)";
     close;
 }
+
 027-4,109,61,0	script	#NoobJesusalva02	NPC400,{
     if (!#CRYPT_PASSWORD) end;
     mes "(The memorial is at left, behind the column.)";
     close;
 }
-099-7,73,20,0	script	#NoobKytty01	NPC400,0,0,{
-    warp "099-7", 72, 17;
+
+099-7,93,36,0	script	#NoobKytty01	NPC400,0,0,{
+    warp "099-7", 94, 33;
     end;
 }
-099-7,73,17,0	script	#NoobKytty02	NPC400,0,0,{
-    warp "099-7", 72, 20;
+
+099-7,93,33,0	script	#NoobKytty02	NPC400,0,0,{
+    warp "099-7", 92, 36;
     end;
 }
 
-099-7,95,33,0	script	An Evil Obelisk	NPC185,{
+099-7,100,30,0	script	An Evil Obelisk	NPC185,{
     mes l("An evil obelisk. Totally not suspcious. At all.");
     // 1 = Assigned; 2 = Warped; 3 = Obelisk
     if (getq(Quest_Reapercry) == 2) {
diff --git a/npc/099-7/cronos.txt b/npc/099-7/cronos.txt
index f259efe5..e38d46bc 100644
--- a/npc/099-7/cronos.txt
+++ b/npc/099-7/cronos.txt
@@ -1,7 +1,7 @@
 // Cronos, the lord of time and apparently a shopkeeper
 // There's also Father Time in the GM stuff
 
-099-7,99,30,0	script	Chronos	NPC313,{
+099-7,89,28,0	script	Chronos	NPC313,{
     mesn;
     mesq l("I'm Chronos, lord of time, the immortal, the head editor of the Almanach, the... Alright, let's forget that.");
     if (BOSS_POINTS < .price)
diff --git a/npc/magic/level0-reapercry.txt b/npc/magic/level0-reapercry.txt
index 1b6f07d5..633f9a05 100644
--- a/npc/magic/level0-reapercry.txt
+++ b/npc/magic/level0-reapercry.txt
@@ -223,6 +223,6 @@ L_Exec5:
     @reapercry = 0;
     getexp 100000, 0;
     misceffect FX_MAGIC_TELEPORT, strcharinfo(0);
-    warp "099-7", 75, 36;
+    warp "099-7", 95, 52;
     end;
 }