Update the scripts to use !242

4 files changed, 12 insertions, 15 deletions

diff --git a/npc/000-0-1/narrator.txt b/npc/000-0-1/narrator.txt
index d3123644..47ca0e1c 100644
--- a/npc/000-0-1/narrator.txt
+++ b/npc/000-0-1/narrator.txt
@@ -23,7 +23,7 @@
     // Legacy accounts are excluded
     // Only one referral per vault account
     validacc();
-    if (!LEGACY && !getv("REFERRAL_PROG")) referralSystem();
+    if (!islegacyaccount() && !getvaultvar(REFERRAL_PROG)) referralSystem();
 
     narrator S_LAST_NEXT,
         l("There are a lot of things you must be wondering about."),
@@ -80,7 +80,7 @@ function referralSystem {
                     sleep2(200);
                 // Case 2: Valid Invite
                 } else {
-                    setv("REFERRAL_PROG", .@ref);
+                    setvaultvar(REFERRAL_PROG, .@ref);
                     //getitembound FriendGift, 1, 1;
                     mesc l("Ah yes, our trusty friend, %s.", .@ref$);
                     mesc l("They probably miss me. I mean, I probably have been away for a long time...");
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index 9e82bed9..0a6d5f0e 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -53,17 +53,14 @@ OnTouch:
 
     asklanguage(LANG_ON_SEA);
 
-    // TODO: This is gumi's code, I have no idea if it works or not
-    // Besides, is it lv 90, 95, 99, 100, or...?
-    // I believe Micksha said level 90 was plenty, but.
-    /*** FIXME ***
-    if ((LEGACY[1] & 0x7FFFFF00) >> 8) > 90)
-        REBIRTH=1;
-    *** FIXME ***/
-
     // Players coming from TMW Legacy didn't got a chance to do this yet.
     // So allow them now.
-    if (LEGACY) {
+    if (islegacyaccount()) {
+        // Rebirth system
+        if (getlegacylevel() > 90)
+            REBIRTH=1;
+
+        // Race selection
         BarberChangeRace();
     }
 
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 8c06ce48..5dfec2a1 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -158,7 +158,7 @@ L_Menu:
         l("Who are you?"), L_Who,
         rif(getq(ShipQuests_ArpanMoney) == 1, lg("Do you know what happened to the gold I had when you guys saved me?")), L_WhereMoney,
         rif(getq(ShipQuests_ArpanMoney) < 2, l("Where are my old clothes?")), L_WhereOldClothes,
-        rif(getq(ShipQuests_ArpanMoney) == 2 && LEGACY, l("About my my old clothes...")), L_LegacyClothes,
+        rif(getq(ShipQuests_ArpanMoney) == 2 && islegacyaccount(), l("About my my old clothes...")), L_LegacyClothes,
         rif(!.@equipped, lg("What should I do after taking these clothes?")), L_WhatCloth,
         rif(!.@equipped, l("Thank you, I'll take them and put them on.")), -,
         l("Nothing, sorry."), -;
@@ -211,13 +211,13 @@ L_WhereOldClothes:
     Zeny += 10;
     message strcharinfo(0), l("You receive @@ E!", 10);
 
-    if (LEGACY)
+    if (islegacyaccount())
         goto L_LegacyClothes;
 
     goto L_BeforeMenu;
 
 L_LegacyClothes:
-    if (LEGACY) {
+    if (islegacyaccount()) {
         mesn strcharinfo(0);
         select
             lg("But... I remember that my clothes were very dear to me..."),
diff --git a/npc/012-2-2/sorfina.txt b/npc/012-2-2/sorfina.txt
index 9f389b81..03811cf9 100644
--- a/npc/012-2-2/sorfina.txt
+++ b/npc/012-2-2/sorfina.txt
@@ -10,7 +10,7 @@
         lg("Welcome, adventurer."),
         l("I will never know why people barge in others' houses and get away with it."),
         l("Ah, no, I'm not telling you to go away. Visits are always welcome, it gets lonely over time. But I don't have anything to offer you otherwise.");
-    if (LEGACY && countitem(ClothesPack)) goto L_Legacy;
+    if (islegacyaccount() && countitem(ClothesPack)) goto L_Legacy;
     close;
 
 L_Legacy: