This has now been tested (we did some DB mess, but whatever)

2 files changed, 15 insertions, 30 deletions

diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index 3f9c1b9..0b682f3 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -23,9 +23,18 @@ OnTouch:
         end;
     }
     // TODO: Check if you have a homeworld set
+    if (get_nibble(##00_INFO, 4) <= 1) {
+        mesc l(".:: ERROR ::."), 1;
+        mesc l("You must set a home world first. Then you will be able to use the Crossroads.");
+        next;
+        kick(getcharid(3), 5);
+        end;
+    }
+
 
     // Set your language (WIP?)
     asklanguage(LANG_ON_SEA);
+    clear;
 
 
     mesc l("Welcome to..."), 3;
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 6d29cdb..8be90b8 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -46,11 +46,10 @@ function	script	HUB_Login	{
         debugmes "VAULT LOGIN, GTO is %d MLP is %d", .@gto, .@mlp;
         */
         // Work only on new chars, or chars which cleared Tulimshar.
-        if (.@gto == WORLD_ID &&
-            ((!getq(General_Narrator) && BaseLevel < 5) ||
-            (getq(General_Narrator) && BaseLevel > 20)))
+        if (.@gto == WORLD_ID)
             {
             // Warp to the proper Mirror Lake
+            // TODO: FIXME Proper Mirror Lakes (the 12 portals)
             switch (.@mlp) {
             case 1: warp "018-7-1", 90, 47; LOCATION$ = "LoF"; break;
             default: warp "014-4", 28, 31; LOCATION$ = "LoF"; break;
@@ -59,19 +58,6 @@ function	script	HUB_Login	{
             // Send debug information
             debugmes("Vault User %d moved to lake %d.", getvaultid(), .@mlp);
 
-            // TODO: Handle new user (non-native) accounts
-            if (!getq(General_Narrator) && BaseLevel < 5) {
-                adddefaultskills();
-                getitembound MirrorLakeArmor, 1, 4;
-                equip(MirrorLakeArmor);
-                percentheal(100, 100);
-                TUTORIAL=true;
-                //BaseLevel = get_byte(##00_INFO, 0) + 1;
-                // TODO: Display quick tutorial
-                dispbottom l("Mirror Lake : Created temporary character; It'll be reset on logout.");
-                dispbottom l("Mirror Lake : Obtain help with %s.", b("@info"));
-            }
-
             // Unset the target lake/world
             set_byte(##00_INFO, 3, 0);
             set_nibble(##00_INFO, 5, 0);
@@ -241,10 +227,10 @@ function	script	HUB_Logout	{
         if (getvaultid()) {
             .@api$=json_encode("UID", ##VAULT,
                                "GID", getcharid(3),
-                               "VAR1N", "MLQUEST",
-                               "VAR1V", ##02_MLQUEST,
-                               "VAR2N", "MLWORLD",
-                               "VAR2V", ##02_MLWORLD,
+                               //"VAR1N", "CRQUEST",
+                               //"VAR1V", ##01_MLQUEST,
+                               //"VAR2N", "CRWORLD",
+                               //"VAR2V", ##01_MLWORLD,
                                "VEXP", ##VAULT_EXP,
                                "GOTO", ##VAULT_GOTO,
                                "MLTO", ##VAULT_MLTO);
@@ -252,16 +238,6 @@ function	script	HUB_Logout	{
             ##VAULT_GOTO=0;
             ##VAULT_MLTO=0;
             api_send(API_FLUSHVAULT, .@api$);
-            // Destroy temporary characters
-            if (countitem(MirrorLakeArmor)) {
-                delitem MirrorLakeArmor, countitem(MirrorLakeArmor);
-                //clearitem(); // Hm.
-                resetlvl(2);
-                resetstatus();
-                resetskill();
-                warp "000-0", 22, 24;
-                debugmes("Vault User %d reset!", getvaultid());
-            }
         }
     }