Playtested version

3 files changed, 21 insertions, 30 deletions

diff --git a/npc/003-1/neko.txt b/npc/003-1/neko.txt
index fd461a47d..ac91083ea 100644
--- a/npc/003-1/neko.txt
+++ b/npc/003-1/neko.txt
@@ -95,7 +95,7 @@ OnInit:
 OnClock1149:
     restoreshopitem SilkGloves, -1, 1;
     restoreshopitem LeatherTrousers, -1, 1;
-OnClock2359:
+OnClock0001:
     restoreshopitem EarthPowder, 12000, 1;
     restoreshopitem ShortTankTop, 8000, 1;
     restoreshopitem TrainingBow, 990, 2;
diff --git a/npc/003-1/shop.txt b/npc/003-1/shop.txt
index b74ba1baf..9b9948fe3 100644
--- a/npc/003-1/shop.txt
+++ b/npc/003-1/shop.txt
@@ -37,7 +37,7 @@ OnClock0621:
     restoreshopitem LeatherGloves, 1;
 OnClock1210:
 OnClock1757:
-OnClock0001:
+OnClock2359:
     restoreshopitem YellowDye, 2;
     restoreshopitem RoundLeatherShield, 2;
     restoreshopitem Knife, 5;
@@ -52,6 +52,11 @@ OnClock0001:
     restoreshopitem CroconutBox, rand(2800,3050), 6;
     restoreshopitem EmptyBottle, 3;
     restoreshopitem EmptyBox, 4;
+    // Fires of Steam Event special trigger
+    if ($EVENT$ == "Steam") {
+        $BAZAAR_TIMER = 0;
+        callfunc "BazaarToggle", true;
+    }
     end;
 
 // Pay your taxes!
@@ -107,6 +112,7 @@ function	script	BazaarFunds	{
 }
 
 // Function which handles Bazaar. May terminate script
+// BazaarPurchase( normal=True )
 function	script	BazaarPurchase	{
     // Merge both in case M+/MV get fixed/changed
     @price += @points;
@@ -129,7 +135,8 @@ function	script	BazaarPurchase	{
     // Pay your taxes!
     PurchaseTaxes();
     // Signal it may proceed
-	purchaseok();
+    if (getarg(0, true))
+    	purchaseok();
     return;
 }
 
@@ -145,7 +152,7 @@ function	script	BazaarToggle	{
         if (.@lof)
             unitwarp(.@gid, "017-1", 183, 168);
         else
-            unitwarp(.@gid, "003-1", 108, 109);
+            unitwarp(.@gid, "003-1", 108, 108);
         // Esperia Vendor
         enablenpc "Foreign Tiki";
         .@gid = getnpcid("Foreign Tiki");
@@ -223,7 +230,7 @@ function	script	BazaarToggle	{
 
 
 // Special Vendor
-003-1,108,109,0	script	Lydon	NPC_LYDON,{
+003-1,108,108,0	script	Lydon	NPC_LYDON,{
     function refreshRates;
     if ($GAME_STORYLINE < 4) goto L_NoDice;
     if (.cache < gettimeparam(GETTIME_DAYOFMONTH)) refreshRates();
@@ -245,24 +252,27 @@ function	script	BazaarToggle	{
     mes "";
     switch (@menu) {
     case 2:
+        mesc l("You have: %s", fnum(AETHYR_PTS));
         mes l("How many? (0-%s)", fnum(Zeny / (.apt-REBIRTH)));
         input .@c, 0, (Zeny / (.apt-REBIRTH));
         @price = .@c * (.apt-REBIRTH);
-        BazaarPurchase();
+        BazaarPurchase(false);
         AETHYR_PTS += .@c;
         break;
     case 3:
+        mesc l("You have: %s", fnum(Mobpt));
         mes l("How many? (0-%s)", fnum(Zeny / (.mpt-REBIRTH)));
         input .@c, 0, (Zeny / (.mpt-REBIRTH));
         @price = .@c * (.mpt-REBIRTH);
-        BazaarPurchase();
+        BazaarPurchase(false);
         Mobpt += .@c;
         break;
     case 4:
+        mesc l("You have: %s", fnum(MAGIC_RP));
         mes l("How many? (0-%s)", fnum(Zeny / (.rpt-REBIRTH)));
         input .@c, 0, (Zeny / (.rpt-REBIRTH));
         @price = .@c * (.rpt-REBIRTH);
-        BazaarPurchase();
+        BazaarPurchase(false);
         MAGIC_RP += .@c;
         break;
     default:
diff --git a/npc/029-0/event.txt b/npc/029-0/event.txt
index 2885c3763..f4bff0d38 100644
--- a/npc/029-0/event.txt
+++ b/npc/029-0/event.txt
@@ -13,18 +13,12 @@
         die(); end;
     }
 
-    // This NPC is now only active during TMW2 Anniversary
-    if ($EVENT$ != "Anniversary") {
-        mesn;
-        mesq l("Sorry, but I only deal with issues related to the Great Fire. You can, however, meet me during Moubootaur Legends Anniversary.");
-        close;
-    }
-
     mesn;
-    mesq l("Sooo, the police station of Moubootaur Legends went ablaze. Constable Perry is too busy to monitor illegal operation on this continent.");
+    mesq l("I'll someday explain you the history behind the Great Fire. But it won't be now.");
     next;
     mesn;
-    mesq l("Therefore... Are you perhaps interested in some... illicit goods? %%p");
+    mesq l("For now, I'll only tell you this:");
+    mesc l("In %d weeks, on Friday, the bi-monthly Bazaar will happen in %s.", BAZAARFREQ - ($BAZAAR_TIMER % BAZAARFREQ), ($BAZAAR_TIMER/BAZAARFREQ%2 ? l("Land of Fire Village") : l("Tulimshar")));
     close;
 
 OnRw:
@@ -84,20 +78,7 @@ function restoreshopitem2 {
         sellitem getarg(0), .@price, .@amount;
     return;
 }
-
-OnMinute02:
-    if ($EVENT$ != "Steam") end;
-    donpcevent "Neko::OnClock2359";
-    end;
-
-// NOTE: A current iteration of the event would require to begin the Bazaar
-// And keeping it active until the event ends. Something like
 */
-OnClock2359:
-    if ($EVENT$ != "Steam") end;
-    $BAZAAR_TIMER = 0;
-    callfunc "BazaarToggle", true;
-    end;
 }