Rewrite Ishi to use AegisName instead of Name

1 files changed, 23 insertions, 23 deletions

diff --git a/npc/003-1/ishi.txt b/npc/003-1/ishi.txt
index 2283af685..0894f174d 100644
--- a/npc/003-1/ishi.txt
+++ b/npc/003-1/ishi.txt
@@ -34,19 +34,19 @@
     }
 
     if (BaseLevel < 25) {
-        setarray @Items$,   "Bread",
-                            "Candy","Orange","BugLeg",
-                            "CobaltHerb","GambogeHerb",
-                            "MauveHerb","MaggotSlime","ScorpionStinger","SilkCocoon",
-                            "RustyKnife","Coral","PiouLegs","Cheese","RoastedMaggot";
+        setarray @Items,   Bread,
+                            Candy,Orange,BugLeg,
+                            CobaltHerb,GambogeHerb,
+                            MauveHerb,MaggotSlime,ScorpionStinger,SilkCocoon,
+                            RustyKnife,Coral,PiouLegs,Cheese,RoastedMaggot;
     } else {
-        setarray @Items$,   "Bread", "Croconut","Plushroom",
-                            "RedApple","Beer","Candy","Orange","ChocolateBar","BugLeg","CoinBag",
-                            "Coal","SnakeSkin","CottonCloth","GrassSeeds","HardSpike","CobaltHerb","GambogeHerb",
-                            "MauveHerb","IronOre","MaggotSlime","RawLog","ScorpionStinger","SilkCocoon","TreasureKey",
-                            "WhiteFur","EmptyBottle","RustyKnife","Coral","PiouLegs","Cheese","SnakeEgg","RoastedMaggot","BlueDye";
+        setarray @Items,   Bread, Croconut,Plushroom,
+                            RedApple,Beer,Candy,Orange,ChocolateBar,BugLeg,CoinBag,
+                            Coal,SnakeSkin,CottonCloth,GrassSeeds,HardSpike,CobaltHerb,GambogeHerb,
+                            MauveHerb,IronOre,MaggotSlime,RawLog,ScorpionStinger,SilkCocoon,TreasureKey,
+                            WhiteFur,EmptyBottle,RustyKnife,Coral,PiouLegs,Cheese,SnakeEgg,RoastedMaggot,BlueDye;
     }
-    setarray @Rares$,   "BrimmedHat", 5, "IronIngot", 10, "BronzeGift", 10, "Grenade", 15;
+    setarray @Rares,   BrimmedHat, 5, IronIngot, 10, BronzeGift, 10, Grenade, 15;
 
     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);
@@ -135,7 +135,7 @@ L_Items:
     {
         //debugmes "Items: "+str(@var);
         .@lucked=0;
-        .@reward$="";
+        .@reward=0;
         getinventorylist;
         if (@inventorylist_count == 100)
             goto L_NoPlace;
@@ -143,32 +143,32 @@ L_Items:
         if (BaseLevel > 25) {
             //debugmes "Testing rares";
             @lucky = rand(10000) + 1;
-            for (.@b = 0; .@b < getarraysize(@Rares$); .@b=.@b+2) {
-                //debugmes "Checking "+@Rares$[.@b]+" - b is now "+.@b;
-                //debugmes l("Check @@ <= @@", @lucky, @Rares$[.@b+1]);
+            for (.@b = 0; .@b < getarraysize(@Rares); .@b=.@b+2) {
+                //debugmes "Checking "+@Rares[.@b]+" - b is now "+.@b;
+                //debugmes l("Check @@ <= @@", @lucky, @Rares[.@b+1]);
                 if (.@b == 0)
                     @control = 0;
-                if(@lucky >= (@control + 1) && @lucky <= @control + atoi(@Rares$[.@b+1]))
+                if(@lucky >= (@control + 1) && @lucky <= @control + atoi(@Rares[.@b+1]))
                 {
                     .@lucked=1;
-                    .@reward$ = @Rares$[.@b];
+                    .@reward = @Rares[.@b];
                 }
-                @control = @control + atoi(@Rares$[.@b+1]);
+                @control = @control + atoi(@Rares[.@b+1]);
             }
         }
 
         //debugmes "Setting reward"; // could be if (!.@lucked) but for sanity...
-        if (.@reward$ == "")
-            .@reward$=any_of(@Items$);
+        if (!.@reward)
+            .@reward=any_of(@Items);
 
         //debugmes "Check weight";
-        .@weight = checkweight(.@reward$,1);
+        .@weight = checkweight(.@reward,1);
         if (!.@weight)
             goto L_NoPlaceWeight;
 
         //debugmes "Processing...";
         Mobpt = Mobpt - @mpq_cost;
-        getitem .@reward$,1;
+        getitem .@reward,1;
 
         //debugmes "Printing...";
         if (.@lucked) {
@@ -203,7 +203,7 @@ L_Continue:
         }
         } while (@menu != 2);
 
-L_NoPlace :
+L_NoPlace:
     mesq l("You seem to run out of place, you should go to the storage.");
     close;