Update the Monster King Random Warping Code

2 files changed, 21 insertions, 40 deletions

diff --git a/npc/002-1/arpan.txt b/npc/002-1/arpan.txt
index 4f33ded0d..f62184ba9 100644
--- a/npc/002-1/arpan.txt
+++ b/npc/002-1/arpan.txt
@@ -118,13 +118,25 @@ OnTalk:
         l("Yes, I want to find out who I am."),
         l("No, but what option do I have? I'm railroaded!");
 
+    if (@menu == 2) {
+        mesn;
+        mesq l("Yeye is not paying for your food and is not a sailor like us! You should start standing on your own feet.");
+        next;
+        mesn strcharinfo(0);
+        mesq l("Thanks for the honestity, I guess.");
+        next;
+    }
+
     mes "";
-    mesq lg("You were yaying sleeping for quite some time there. Our shipkeeper, Juliet, was here with you, and she did her best to heal your injuries.");
+    mesn;
+    mesq l("Anyway, our shipkeeper, Juliet, helped to heal your injuries way back.");
     next;
+    mesn;
     if (.@q_julia == 0)
         setq ShipQuests_Julia, 1;
-    mesq lg("Yaya, you should go see her! She'll be happy to see you.");
+    mesq lg("Yaya, you should go see her! She'll be happy to help you again.");
     next;
+    mesn;
     mesq lg("Also, we took your yayed clothes, as they were... Yeyeye... In a bad shape. Go check the chest near your bed, there are some other ones inside.");
     setcamnpc "Chest";
     goto L_Menu;
diff --git a/npc/functions/gmbot.txt b/npc/functions/gmbot.txt
index 39bf5b3d6..a3daad99b 100644
--- a/npc/functions/gmbot.txt
+++ b/npc/functions/gmbot.txt
@@ -61,44 +61,13 @@ OnTimer62000:
     if (.mp$ == "011-1")
         enablenpc "Mana Stone";
 
-    // Select a random map. Never shows up at Candor and cities, nor indoors. Not all caves either.
-    .@m=rand(1,30);
-    switch (.@m) {
-        // MPE
-        case  1: .mp$="001-1"; break;
-        case  2: .mp$="001-3"; break;
-        case  3: .mp$="001-4"; break;
-        case  4: .mp$="001-5"; break;
-        case  5: .mp$="001-6"; break;
-        case  6: .mp$="001-7"; break;
-        // Desert
-        case  7: .mp$="003-1"; break;
-        case  8: .mp$="003-1-3"; break;
-        case  9: .mp$="004-1"; break;
-        case 10: .mp$="004-2"; break;
-        case 11: .mp$="007-1"; break;
-        case 12: .mp$="010-1"; break;
-        case 13: .mp$="010-1-1"; break;
-        case 14: .mp$="010-2"; break;
-        case 15: .mp$="011-1"; break; // Special case
-
-        // Woodlands
-        case 16: .mp$="014-1"; break;
-        case 17: .mp$="014-2"; break;
-        case 18: .mp$="014-3"; break;
-        case 19: .mp$="014-4"; break;
-        case 20: .mp$="014-5"; break;
-        case 21: .mp$="015-1"; break;
-        case 22: .mp$="015-2"; break;
-        case 23: .mp$="015-3"; break;
-        case 24: .mp$="018-1-1"; break;
-        case 25: .mp$="018-2"; break;
-        case 26: .mp$="018-3"; break;
-        case 27: .mp$="018-4"; break;
-        case 28: .mp$="018-4-1"; break;
-        default: .mp$="boss"; break;
-
-    }
+    // Select a random map. Never shows up at Candor and cities, nor indoors. Not all maps either.
+    setarray .@m$,  "boss", "boss", "001-1", "001-3", "001-4", "001-5", "001-6", "001-7", "001-10",
+                    "003-1", "003-1-3", "004-1", "004-2", "007-1", "010-1", "010-1-1", "010-2", "011-1",
+                    "014-1", "014-2", "014-3", "014-4", "014-5", "015-1", "015-2", "015-3", "015-5",
+                    "018-1-1", "018-2", "018-3", "018-4", "018-4-1",
+                    "019-1", "019-2", "019-4", "021-1", "022-1", "023-1";
+    .mp$=any_of(.@m$);
 
     // Try to warp randomly, up to 30 attempts
     .@e=0; .@x=0; .@y=0;