Fix Hasan and enable $@GM_OVERRIDE to override seasons, allowing playtest

1 files changed, 7 insertions, 5 deletions

diff --git a/npc/003-1/hasan.txt b/npc/003-1/hasan.txt
index 708fa4bd9..7f0401258 100644
--- a/npc/003-1/hasan.txt
+++ b/npc/003-1/hasan.txt
@@ -27,6 +27,9 @@
 //      Total money Hasan collected for Autumn event
 //  $HASAN_LT
 //      Previous collected money, for rewards calc
+//
+//  PS. $@GM_OVERRIDE will disable Season restrictions, but values from 20/09 and 21/12
+//  must be set manually.
 
 // Temporary sprite
 003-1,62,148,0	script	Hasan	NPC_ELVEN_MAN_RED,2,2,{
@@ -82,7 +85,7 @@ L_Complete:
     mesn;
     mesq l("I am collecting money for the Yearly Autumn Scorpion Hunter quest.");
     mesq l("You're, of course, invited. Thus far, the total prize money I've collected is @@ GP.", $HASAN_GP);
-    if (season() == AUTUMN) {
+    if (season() == AUTUMN || $@GM_OVERRIDE) {
         mesq l("You've killed @@ scorpions, and a total of @@ were killed this season.", getq2(SQuest_Autumn), $HASAN_ST);
         mesq l("If the event ended now, you would get @@ GP.", getq2(SQuest_Autumn)*$HASAN_GP/$HASAN_ST);
         menuint
@@ -97,7 +100,7 @@ L_Complete:
         }
     }
 
-    if (season() == WINTER && getq(SQuest_Autumn) == gettime(GETTIME_YEAR)) {
+    if ((season() == WINTER || $@GM_OVERRIDE) && getq(SQuest_Autumn) == gettime(GETTIME_YEAR)) {
         .@p=getq2(SQuest_Autumn)*$HASAN_LT/$HASAN_ST;
         mesn l("Summary");
         mes l("Scorpions killed: @@/@@ scorpions", getq2(SQuest_Autumn), $HASAN_ST);
@@ -144,21 +147,20 @@ OnInit:
     //npcwalkto(<x>, <y>);
     end;
 
-// Restart hasan status on 20/09
+// Restart hasan status on 20/09 (double-sure)
 OnDay0920:
     $HASAN_ST=0;
     end;
 
 // Once autumn is over (21/12) restart GP poll and send value to backup
 OnDay1221:
-    $HASAN_ST=0;
     $HASAN_LT=0+$HASAN_GP;
     $HASAN_GP=0;
     end;
 }
 
 function	script	SQuest_Hasan	{
-    if (season() != AUTUMN)
+    if (season() != AUTUMN && !$@GM_OVERRIDE)
         return;
     if (getq(SQuest_Autumn) != gettime(GETTIME_YEAR))
         setq SQuest_Autumn, gettime(GETTIME_YEAR), 0;