Fix Keshlam Swamps internal bugs

1 files changed, 31 insertions, 31 deletions

diff --git a/npc/099-7/boss.txt b/npc/099-7/boss.txt
index ffd76bf5..4c97904e 100644
--- a/npc/099-7/boss.txt
+++ b/npc/099-7/boss.txt
@@ -529,10 +529,10 @@ L_Off:
     close;
 }
 
-099-7,75,49,0	script	Engraving#Keshlam	NPC400,{
+099-7,95,64,0	script	Engraving#Keshlam	NPC400,{
     mes "There's an engraving on this tree.";
     next;
-    if (countitem("FlawedLens") < 1) goto L_Tools;
+    if (countitem(FlawedLens) < 1) goto L_Tools;
     mes "Thanks to the lens on your inventory, you can read this:";
     mes "";
     mes "\"Nu'rem perished here, after the fight with Jande, Tal and Di'Tal.";
@@ -586,9 +586,9 @@ OnTalkNearby:
     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", 20, 20, 140, 135, "", 1148, 10, "Keshlam::OnDeath8";
+    areamonster "099-7", 20, 20, 140, 135, "", 1149, 10, "Keshlam::OnDeath9";
+    monster "099-7", 40, 120, "Grim Reaper", 1068, 1, "Keshlam::OnBoss";
     end;
 
 OnDeath8:
@@ -620,17 +620,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", 20, 20, 140, 135, "", 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", 20, 20, 140, 135, "", 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, 120, "Grim Reaper", Reaper, 1, "Keshlam::OnBoss";
 
     // Done
     .@KeshlamMc = 0;
@@ -638,15 +638,15 @@ OnTimer150000:
     end;
 }
 
-099-7,18,110,0	script	Chest#keshlam	NPC111,{
+099-7,38,125,0	script	Chest#keshlam	NPC111,{
     if (FLAGS & FLAG_KESHLAM_RAREDROP) goto L_Finished;
     mes "[Chest]";
-    mes "Would you try to open it?";
-    mes "##1Cost: 1000 Treasure Keys##0";
+    mes l("Would you try to open it?");
+    mesc l("Cost: %s %ss", fnum(1000), getitemlink(TreasureKey)), 1;
     next;
     menu
-        "Yes.", L_Yes,
-        "No.", L_close;
+        l("Yes."), L_Yes,
+        l("No."),  L_close;
 
 L_Yes:
     if (ispcdead())
@@ -666,11 +666,11 @@ L_FlawedLens:
     getexp 20000000, 0;
     FLAGS = FLAGS | FLAG_KESHLAM_FLAWEDLENS;
     mes "[Chest]";
-    mes "You opened it and found...! Some flawed lens?! Meh.";
+    mes l("You opened it and found...! Some flawed lens?! Meh.");
     next;
     mes "[Chest]";
-    mes "You notice this chest has a hidden section with another lock.";
-    mes "You might want try that again later.";
+    mes l("You notice this chest has a hidden section with another lock.");
+    mes l("You might want try that again later.");
     close;
 
 L_Rare:
@@ -682,39 +682,39 @@ L_Rare:
 L_Amulet:
     getitem EnchantersAmulet, 1;
     mes "[Chest]";
-    mes "You opened it and found...! An Enchanter's Amulet! Lucky!";
+    mes l("You opened it and found...! An Enchanter's Amulet! Lucky!");
     close;
 
 L_Ring:
     getitem MageRing, 1;
     mes "[Chest]";
-    mes "You opened it and found...! A Mage Ring! Lucky!";
+    mes l("You opened it and found...! A Mage Ring! Lucky!");
     close;
 
 L_Not_Enough:
-    mes "It seems that this is not the right key...";
+    mes l("It seems that this is not the right key...");
     close;
 
 L_Finished:
     mes "[Chest]";
-    mes "You already opened this chest.";
+    mes l("You already opened this chest.");
     close;
 
 L_TooMany:
     mes "[Chest]";
-    mes "You don't have room for what ever is inside. Maybe you should try again later.";
+    mes l("You don't have room for what ever is inside. Maybe you should try again later.");
     close;
 
 L_close:
     close;
 }
 
-099-7,95,117,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.";
+099-7,115,132,0	script	Knowledgeable Tree	NPC400,{
+    mes l("If you kill every monster, this tree can warp you back.");
+    mes l("You will receive experience points for cleaning the map.");
     mes "";
-    mes "But be warned, monsters respawn on their own every five minutes.";
-    mes "The boss must also be defeated.";
+    mes l("But be warned, monsters respawn on their own every five minutes.");
+    mes l("The boss must also be defeated.");
     next;
     @KeshlamMc = mobcount("099-7", "Keshlam::OnDeath8");
     @KeshlamMc = @KeshlamMc+mobcount("099-7", "Keshlam::OnDeath9");
@@ -743,16 +743,16 @@ L_Done:
     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,35,0	script	#NoobKytty01	NPC400,0,0,{
+    warp "099-7", 92, 32;
     end;
 }
-099-7,73,17,0	script	#NoobKytty02	NPC400,0,0,{
-    warp "099-7", 72, 20;
+099-7,93,32,0	script	#NoobKytty02	NPC400,0,0,{
+    warp "099-7", 92, 35;
     end;
 }
 
-099-7,95,33,0	script	An Evil Obelisk	NPC185,{
+099-7,101,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) {