Enable CRQUEST on mirror lake (quests created by CR).

Clean up garbage

1 files changed, 6 insertions, 52 deletions

diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 8be90b8..c6cbb24 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -25,17 +25,6 @@ function	script	HUB_Login	{
 
     // Mirror Lake functionality
     if (getvaultid() && !getstatus(SC_JAILED)) {
-        // Christmas 2021
-        if ($EVENT$ == "Christmas") {
-            if (#XMAS2021 < ##01_TMWEXP) {
-                getexp (##01_TMWEXP-#XMAS2021) * 7 / 10, 0;
-                #XMAS2021 = ##01_TMWEXP;
-            } else if (#XMAS2021 > ##01_TMWEXP) {
-                // You leveled up?
-                getexp ##01_TMWEXP * 7 / 10, 0;
-                #XMAS2021 = ##01_TMWEXP;
-            }
-        }
 
         .@gto=get_byte(##00_INFO, 3);
         .@mlp=get_nibble(##00_INFO, 5);
@@ -51,8 +40,8 @@ function	script	HUB_Login	{
             // 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;
+            case 1:  warp "033-1",  72, 189; break;
+            default: warp "033-1", 122, 192; break;
             }
 
             // Send debug information
@@ -80,37 +69,8 @@ function	script	HUB_Logout	{
     getmapxy(.@mapa$, .@a,.@b, 0);
     .@zone$=getmapinfo(MAPINFO_ZONE, .@mapa$);
 
-    // Hardcore Server
-    if ($HARDCORE && .@dead) {
-        // Update Absolutions
-        if (ABSOLVE_DAY != gettimeparam(GETTIME_DAYOFMONTH)) {
-            ABSOLVE_DAY=gettimeparam(GETTIME_DAYOFMONTH);
-            ABSOLVE_CNT=0;
-        }
-
-        // Main Loop
-        if (@grace) {
-            // Grace is upon you (ie. script death)
-            @grace=false;
-        } else if (.@zone$ == "MMO" && ABSOLVE_CNT <= 3) {
-            // Absolve (limited attempts)
-            ABSOLVE_CNT+=1;
-            dispbottom l("This is a special map so your death is not counted.");
-            dispbottom b(l("You have %d non-counting deaths remaining today.", 3-ABSOLVE_CNT));
-            if (ABSOLVE_CNT == 3)
-                dispbottom col(l("WARNING: if you die again today in a special map it will be PERMANENT."), 1);
-        } else {
-            // Meet your final demise!
-            atcommand("@dropall");
-            makeitem CoinBag, Zeny/500, .@mapa$, .@a, .@b;
-            Zeny=0;
-            //resetlvl(2); // FIXME: Split the exp
-            // TODO: Warp back to Candor or it'll be unplayable
-            // TODO: It could be @jail, but it is buggy
-            atcommand("@jailfor 1d "+strcharinfo(0));
-        }
     // Vanished on Cindy Cave
-    } else if (.@mapa$ == "021-4" && strcharinfo(0) == $@CINDY_HERO$) {
+    if (.@mapa$ == "021-4" && strcharinfo(0) == $@CINDY_HERO$) {
         donpcevent("Cindy#Outside::OnReckless");
         recovery(getcharid(3));
         warp any("010-1", "010-2"), 0, 0;
@@ -124,12 +84,6 @@ function	script	HUB_Logout	{
         recovery(getcharid(3));
         warp "Save", 0, 0;
     }
-    // Logout while donating blood
-    if (getq(HurnscaldQuest_BloodDonor) == 2) {
-        slide 35, 28;
-        setpcblock(PCBLOCK_SOFT, false);
-        setq HurnscaldQuest_BloodDonor, 0, gettimetick(2)+3600; // one hour penalty
-    }
     // Logout on botcheck area
     if (compare(.@mapa$,"botcheck") && !.@dead) {
         if (!is_staff()) {
@@ -227,10 +181,10 @@ function	script	HUB_Logout	{
         if (getvaultid()) {
             .@api$=json_encode("UID", ##VAULT,
                                "GID", getcharid(3),
-                               //"VAR1N", "CRQUEST",
-                               //"VAR1V", ##01_MLQUEST,
+                               "VAR1N", "CRQUEST",
+                               "VAR1V", ##01_CRQUEST,
                                //"VAR2N", "CRWORLD",
-                               //"VAR2V", ##01_MLWORLD,
+                               //"VAR2V", ##01_CRWORLD,
                                "VEXP", ##VAULT_EXP,
                                "GOTO", ##VAULT_GOTO,
                                "MLTO", ##VAULT_MLTO);