Referral program is now always active, as we have GP reward.

2 files changed, 42 insertions, 45 deletions

diff --git a/npc/002-4/nard.txt b/npc/002-4/nard.txt
index 4b296021a..754ebb34b 100644
--- a/npc/002-4/nard.txt
+++ b/npc/002-4/nard.txt
@@ -17,57 +17,57 @@
 L_Checker:
     if (.@narrator) goto L_Travel;
     if (LOCATION$ != "") goto L_NotYet;
-        // if $EVENT$ is REFEER:
-    if ($EVENT$ == "Reefer") {
-        if (#REFERRAL_PROG == 0) {
-            mesn l("TMW2 Staff");
-            mesc l("Hello, and welcome to TMW2: Moubootaur Legends!"), 3;
-            mesc l("(Click next button to advance dialogs)"),9;
-            next;
-            mesn l("TMW2 Staff");
-            mesc l("Did you came here by someone advise? If yes, write their name here!"), 3;
-            mesc l("If this is not the case, just click on \"Send\"."), 3;
-            .@ref$="";
-            do
-            {
-                input .@ref$;
-                debugmes "Hercules is bugged: "+.@ref$;
-                mes "";
-                if (.@ref$ != "") {
-                    .@ref=gf_accid(strip(.@ref$));
-                    if (.@ref > 0) {
-                        if (.@ref == getcharid(3)) {
-                            mesn l("TMW2 Staff");
-                            mesc l("Hahah, silly, that's yourself!"), 3;
-                            mesc l("Try again!"), 3;
-                            next;
-                            .@ref$="";
-                        } else {
-                            #REFERRAL_PROG=.@ref;
-                            getitembound FriendGift, 1, 1;
-                            mesn l("TMW2 Staff");
-                            mesc l("Well, welcome to the game! If you have any doubt, shout on #world for help!"), 3;
-                            mesc l("Your friend also sent you a gift - open it when you get level 5!"), 3;
-                            next;
-                        }
-                    } else {
+
+    // Referral program
+    if (#REFERRAL_PROG == 0) {
+        mesn l("TMW2 Staff");
+        mesc l("Hello, and welcome to TMW2: Moubootaur Legends!"), 3;
+        mesc l("(Click next button to advance dialogs)"),9;
+        next;
+        mesn l("TMW2 Staff");
+        mesc l("Did you came here by someone advise? If yes, write their name here!"), 3;
+        mesc l("If this is not the case, just click on \"Send\"."), 3;
+        .@ref$="";
+        do
+        {
+            input .@ref$;
+            debugmes "Hercules is bugged: "+.@ref$;
+            mes "";
+            if (.@ref$ != "") {
+                .@ref=gf_accid(strip(.@ref$));
+                if (.@ref > 0) {
+                    if (.@ref == getcharid(3)) {
                         mesn l("TMW2 Staff");
-                        mesc l("Oops, there is nobody known as @@ on this game.", .@ref$), 3;
-                        mesc l("Could you try again? There could be a typo!"), 3;
+                        mesc l("Hahah, silly, that's yourself!"), 3;
+                        mesc l("Try again!"), 3;
                         next;
                         .@ref$="";
+                    } else {
+                        #REFERRAL_PROG=.@ref;
+                        getitembound FriendGift, 1, 1;
+                        mesn l("TMW2 Staff");
+                        mesc l("Well, welcome to the game! If you have any doubt, shout on #world for help!"), 3;
+                        mesc l("Your friend also sent you a gift - open it when you get level 5!"), 3;
+                        next;
                     }
                 } else {
-                    .@ref$="None";
                     mesn l("TMW2 Staff");
-                    mesc l("I see. Well, welcome to the game! If you have any doubt, shout on #world for help!"), 3;
+                    mesc l("Oops, there is nobody known as @@ on this game.", .@ref$), 3;
+                    mesc l("Could you try again? There could be a typo!"), 3;
                     next;
+                    .@ref$="";
                 }
-            } while (.@ref$ == "");
-            if (ClientVersion >= 24) close;
-        }
+            } else {
+                .@ref$="None";
+                mesn l("TMW2 Staff");
+                mesc l("I see. Well, welcome to the game! If you have any doubt, shout on #world for help!"), 3;
+                next;
+            }
+        } while (.@ref$ == "");
+        if (ClientVersion >= 24) close;
     }
 
+    // Introduction
     mesn;
     mesq l("Hello.");
     next;
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 1cec087b4..f8641f83b 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -81,8 +81,7 @@ function	script	GlobalEventMenu	{
         menu
             l("Disable event"), -,
             l("Enable Easter"), -,
-            l("Enable Worker's Day"), -,
-            l("Enable Refeer Program"), -;
+            l("Enable Worker's Day"), -;
 
         switch (@menu) {
             case 1: set $EVENT$, ""; logmes "Disabled events.", LOGMES_ATCOMMAND;
@@ -96,8 +95,6 @@ function	script	GlobalEventMenu	{
                 debugmes "Snakes are now dropping Pearls.";
                */
                 break;
-            case 4: $EVENT$="Refeer"; logmes "Enabled REFEER event.", LOGMES_ATCOMMAND;
-                break;
         }
 
         return;