Sketch very poor about Liberation Day

2 files changed, 35 insertions, 27 deletions

diff --git a/npc/003-1/ship.txt b/npc/003-1/ship.txt
index 958a821e5..67882168c 100644
--- a/npc/003-1/ship.txt
+++ b/npc/003-1/ship.txt
@@ -23,6 +23,18 @@ OnTouch:
     goto L_Warp;
 
 L_Warp:
+    /* Is Hurnscald already liberated? Precendence. */
+    if (!$HURNS_LIBDATE) {
+        if (is_gm())
+            dispbottom l("GMs are NOT allowed on Hurnscald Liberation day.");
+        else
+        dispbottom l("Please right click me to join the Liberation Force on Hurnscald.");
+        //query_sql("is Saulc GM online?", <array variable>);
+        dispbottom l("The ship is locked, probably unable to leave port.");
+
+    end;
+    }
+
     warp "016-1@"+LOCATION$, 21, 26;
     closedialog;
     close;
diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index acbaa2713..a12e5d69a 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -6,17 +6,13 @@
 
 012-1,71,24,0	script	Lieutenant Paul	NPC_PLAYER,{
     // The Monster King guild have a special menu
+    if (!$HURNS_LIBDATE && is_admin()) goto L_Admus;
     if (strcharinfo(2) == "Monster King") goto L_MKControl;
     mesn;
-    mesq l("Sorry, the path to Hurnscald has been locked due to monsters.");
-    next;
-    mesn;
-    mesq l("Andrei Sakar is on the other side of this gate, killing monsters, as we speak.");
-    next;
-    mesn;
-    mesq l("The path will be open when it's safe again for heavily armed travellers.");
-    if (GHQUEST)
-        GHQ_Assign(Snake, "Hurnscald", "250.000 GP");
+    mesq l("We are @@ since the last great attack from the Monster King.", FuzzyTime($HURNS_LIBDATE,1,2);
+    close;
+
+L_Admus:
     end;
 
 L_MKControl:
@@ -33,7 +29,7 @@ L_MKSmall:
     addmapmask "012-1", 2;
     changemusic "012-1", "mythica.ogg";
     disablenpc("Mana Stone");
-    $@SIEGE_HALI=0; // factor zero
+    $@SIEGE_HURNS=0; // factor zero
     pvpon("012-1");
     pvpon("010-2");
     announce(l("##1WARNING! WARNING! Siege starting at Hurnscald!!"), bc_all);
@@ -45,7 +41,7 @@ L_MKMedium:
     addmapmask "012-1", 2;
     changemusic "012-1", "eric matyas - ghoulish fun.ogg";
     disablenpc("Mana Stone");
-    $@SIEGE_HALI=1; // factor one
+    $@SIEGE_HURNS=1; // factor one
     pvpon("012-1");
     pvpon("010-2");
     announce(l("##1WARNING! WARNING! Siege starting at Hurnscald!!"), bc_all);
@@ -57,7 +53,7 @@ L_MKHuge:
     addmapmask "012-1", 2;
     changemusic "012-1", "misuse.ogg";
     disablenpc("Mana Stone");
-    $@SIEGE_HALI=5; // factor five
+    $@SIEGE_HURNS=5; // factor five
     pvpon("012-1");
     pvpon("010-2");
     announce(l("##1WARNING! WARNING! Siege starting at Hurnscald!!"), bc_all);
@@ -67,31 +63,31 @@ L_MKHuge:
 
 OnBlackScorpionDeath:
     areamonster("010-2", 0, 0, 79, 81, l("Black Scorpion"), 1074, 1, "Lieutenant Jacob::OnBlackScorpionDeath");
-    if (rand(10000) <= 90+($@SIEGE_HALI*10))
+    if (rand(10000) <= 90+($@SIEGE_HURNS*10))
         getitem StrangeCoin, 1;
     end;
 
 OnBlackScorpion2Death:
     areamonster("012-1", 0, 0, 120, 155, l("Black Scorpion"), 1074, 1, "Lieutenant Jacob::OnBlackScorpion2Death");
-    if (rand(10000) <= 850+($@SIEGE_HALI*100))
+    if (rand(10000) <= 850+($@SIEGE_HURNS*100))
         getitem StrangeCoin, 1;
     end;
 
 OnGreenSlimeDeath:
     areamonster("012-1", 0, 0, 120, 155, l("Green Slime"), 1085, 1, "Lieutenant Jacob::OnGreenSlimeDeath");
-    if (rand(10000) <= 200+($@SIEGE_HALI*100))
+    if (rand(10000) <= 200+($@SIEGE_HURNS*100))
         getitem StrangeCoin, 1;
     end;
 
 OnCandiedSlimeDeath:
     areamonster("012-1", 0, 0, 120, 155, l("Candied Slime"), 1089, 1, "Lieutenant Jacob::OnCandiedSlimeDeath");
-    if (rand(10000) <= 150+($@SIEGE_HALI*100))
+    if (rand(10000) <= 150+($@SIEGE_HURNS*100))
         getitem StrangeCoin, 1;
     end;
 
 OnManaGhostDeath:
     areamonster("012-1", 0, 0, 120, 155, l("Mana Ghost"), 1068, 1, "Lieutenant Jacob::OnManaGhostDeath");
-    if (rand(10000) <= 900+($@SIEGE_HALI*100))
+    if (rand(10000) <= 900+($@SIEGE_HURNS*100))
         getitem StrangeCoin, 1;
     end;
 
@@ -109,8 +105,8 @@ OnColonelDeath:
     end;
 
 OnTimer5000:
-    areamonster("010-2", 0, 0, 79, 81, "Black Scorpion", 1074, 5+$@SIEGE_HALI, "Lieutenant Jacob::OnBlackScorpionDeath");
-    areamonster("012-1", 0, 0, 120, 155, "Black Scorpion", 1074, 5+$@SIEGE_HALI, "Lieutenant Jacob::OnBlackScorpion2Death");
+    areamonster("010-2", 0, 0, 79, 81, "Black Scorpion", 1074, 5+$@SIEGE_HURNS, "Lieutenant Jacob::OnBlackScorpionDeath");
+    areamonster("012-1", 0, 0, 120, 155, "Black Scorpion", 1074, 5+$@SIEGE_HURNS, "Lieutenant Jacob::OnBlackScorpion2Death");
     mapannounce("012-1", "##2Message to all Hurnscald NPCs: Take shelter!", bc_map);
     disablenpc "Lynn The Traveler";
     end;
@@ -121,17 +117,17 @@ OnTimer15000:
     end;
 
 OnTimer60000:
-    if ($@SIEGE_HALI == 1) {
+    if ($@SIEGE_HURNS == 1) {
         mapannounce("012-1", "##1The Monster Lieutenant arrived!", bc_map);
         areamonster("012-1", 0, 0, 120, 155, ("Monster Lieutenant"), 1077, 1, "Lieutenant Jacob::OnLieutenantDeath");
     }
     areamonster("012-1", 0, 0, 120, 155, ("Black Scorpion"), 1074, 3, "Lieutenant Jacob::OnBlackScorpion2Death");
-    areamonster("012-1", 0, 0, 120, 155, ("Green Slime"), 1085, 10+$@SIEGE_HALI, "Lieutenant Jacob::OnGreenSlimeDeath");
-    areamonster("012-1", 0, 0, 120, 155, ("Candied Slime"), 1089, 1+$@SIEGE_HALI, "Lieutenant Jacob::OnCandiedSlimeDeath");
+    areamonster("012-1", 0, 0, 120, 155, ("Green Slime"), 1085, 10+$@SIEGE_HURNS, "Lieutenant Jacob::OnGreenSlimeDeath");
+    areamonster("012-1", 0, 0, 120, 155, ("Candied Slime"), 1089, 1+$@SIEGE_HURNS, "Lieutenant Jacob::OnCandiedSlimeDeath");
     end;
 
 OnTimer120000:
-    if ($@SIEGE_HALI == 5) {
+    if ($@SIEGE_HURNS == 5) {
         mapannounce("012-1", "##1The Monster Colonel arrived!", bc_map);
         areamonster("012-1", 0, 0, 120, 155, ("Monster Colonel"), 1036, 1, "Lieutenant Jacob::OnColonelDeath");
     }
@@ -163,13 +159,13 @@ OnTimer300000:
 OnTimer360000:
 OnTimer420000:
 OnTimer480000:
-    areamonster("012-1", 0, 0, 120, 155, ("Slime Blast"), 1090, 5+$@SIEGE_HALI);
-    areamonster("012-1", 0, 0, 120, 155, ("Red Slime"), 1092, 1+$@SIEGE_HALI);
+    areamonster("012-1", 0, 0, 120, 155, ("Slime Blast"), 1090, 5+$@SIEGE_HURNS);
+    areamonster("012-1", 0, 0, 120, 155, ("Red Slime"), 1092, 1+$@SIEGE_HURNS);
     end;
 
 OnTimer540000:
     mapannounce("012-1", "##1The Monster Army is getting tired of resistance!", bc_map);
-    areamonster("012-1", 0, 0, 120, 155, ("Slime Blast"), 1090, 5+$@SIEGE_HALI);
+    areamonster("012-1", 0, 0, 120, 155, ("Slime Blast"), 1090, 5+$@SIEGE_HURNS);
     areamonster("012-1", 0, 0, 120, 155, ("Mana Ghost"), 1068, 1, "Lieutenant Jacob::OnManaGhostDeath");
     end;
 
@@ -181,7 +177,7 @@ OnTimer630000:
     removemapmask "012-1", 2;
     changemusic "012-1", "dragon_and_toast.ogg"; // Restore to default
     enablenpc("Mana Stone");
-    $@SIEGE_HALI$=0;
+    $@SIEGE_HURNS$=0;
     killmonsterall("012-1", 0);
     killmonsterall("010-2", 0);
     pvpoff("012-1");