NPC Improvements

1 files changed, 15 insertions, 13 deletions

diff --git a/npc/003-1/ishi.txt b/npc/003-1/ishi.txt
index 5f1dbb99f..797f0b424 100644
--- a/npc/003-1/ishi.txt
+++ b/npc/003-1/ishi.txt
@@ -3,8 +3,8 @@
 // Crazyfefe
 // Jesusalva
 //
-// Do not add void items to array.
-// note : the rare item system suck.
+// Do not add void items to the array.
+// note: the rare item system sucks.
 
 003-1,97,97,0	script	Ishi	NPC_PLAYER_ARGAES,{
 
@@ -14,8 +14,9 @@
         close;
     }
     if (BaseLevel < 10) {
-        dispbottom l("##1Bug abuser detected! Automatically banning!!");
-        atcommand "@ban 5mn "+strcharinfo(0);
+        // TODO: make jail stuff a function and replace this with the new function
+        dispbottom l("##1You abused a bug and will be jailed. If this was done in error, you have found a bug. Contact the nearest developer if this is the case.");
+        atcommand "@jailfor 5mn "+strcharinfo(0);
         end;
     }
 
@@ -37,8 +38,8 @@
     if (Mobpt < @mpq_cost)
     {
         mesn l("Ishi, the Rewards Master");
-        mesq l("Welcome! I see you have @@ Monster Points. But that isn't enough to get items at your current level, sorry!", Mobpt);
-        mesc l("I need at minimum @@ Monster Points to get items at current level.",@mpq_cost);
+        mesq l("Welcome! I see you have %d Monster Points. But that isn't enough to get items at your current level, sorry!", Mobpt);
+        mesc l("I need at minimum %d Monster Points to get items at current level.",@mpq_cost);
         close;
     }
 
@@ -99,10 +100,11 @@
     }
 
     mesn l("Ishi, the Rewards Master");
-    mesq l("Welcome! I see you have @@ Monster Points. Would you like to exchange some of those for items?", Mobpt);
+    // Highlight the amount of monster points in bold for better visibility since players will probably exchange monster points a lot
+    mesq l("Welcome! I see you have ##B%d Monster Points##b. Would you like to exchange some of those for items?", Mobpt);
     next;
     if (@mpq_cost > 0)
-        mesc l("You can get up to @@ items.", (Mobpt/@mpq_cost));
+        mesc l("You can get up to %d items.", (Mobpt/@mpq_cost));
 
     menuint
         rif(Mobpt >= @mpq_cost,     "1"), 1,
@@ -174,18 +176,18 @@ L_Items:
         if (.@lucked) {
             mes "";
             mes l("Wow!");
-            mes l("I can't believe.");
-            mes l("you got lucky and got a(n) @@!", getitemlink(.@reward));
+            mes l("I can't believe it.");
+            mes l("You got lucky and got a(n) %s!", getitemlink(.@reward));
             mes "";
         } else {
-            mesq l("You received one @@!", getitemlink(.@reward));
+            mesq l("You received one %s!", getitemlink(.@reward));
         }
 
     }
     close;
 
 L_Continue:
-    mesq l("You still have @@ Monster Points! Do you want more items?", Mobpt);
+    mesq l("You still have ##B%d Monster Points##b! Do you want more items?", Mobpt);
     select
         l("Yes"),
         l("No");
@@ -205,7 +207,7 @@ L_Give_all:
     .@var = Mobpt / @mpq_cost;
     if (.@var > 50) { // limit to avoid lag server. Probably a bad idea.
         .@var = 50;
-        mes l("You have too much points. I can't allow you to take all at once right now. I'll try to give you 50, and you come back later!");
+        mes l("You have too many points. I can't allow you to take all at once right now. I'll try to give you 50, and you can come back later!");
         next;
     }