Add a new collection to the Fairy Collector.

1 files changed, 51 insertions, 5 deletions

diff --git a/npc/017-1/fairy_collector.txt b/npc/017-1/fairy_collector.txt
index 14e4b8068..1f4a24921 100644
--- a/npc/017-1/fairy_collector.txt
+++ b/npc/017-1/fairy_collector.txt
@@ -76,7 +76,7 @@ L_Main:
         l("Good bye!"),
         rif(false && !(#COLLECTOR & COLLECT_CHESTPLATE), l("Chestplates")),
         rif(false && !(#COLLECTOR & COLLECT_HEADGEAR), l("Headgear")),
-        rif(false && !(#COLLECTOR & COLLECT_PANTS), l("Pants")),
+        rif(true  && !(#COLLECTOR & COLLECT_PANTS), l("Pants")),
         rif(false && !(#COLLECTOR & COLLECT_SHOES), l("Shoes")),
         rif(false && !(#COLLECTOR & COLLECT_NECKLACES), l("Necklaces")),
         rif(false && !(#COLLECTOR & COLLECT_RINGS), l("Rings")),
@@ -127,13 +127,43 @@ L_Main:
         /////////////////////////////////////////////////////////////////////////
         // Pants
         case 3:
-        msObjective(countitem(CreasedShirt), "* "+getitemlink(CreasedShirt));
+        setarray .@items, CreasedShorts, RaidTrousers, AssassinPants, BromenalPants, JeansChaps, CottonShorts, MiniSkirt, CottonTrousers, SilkPants, CottonSkirt, TerranitePants, ChainmailSkirt, JeansShorts, LeatherTrousers, BanditPants, WarlordPants, SaviorPants, CandorShorts, PirateShorts, FarmerPants, LuffyxSummerShorts;
+        .@power = 0;
+        .@total = getarraysize(.@items);
+        freeloop(true);
+        for (.@i=0; .@i < .@total; .@i++) {
+            msObjective(countitem(.@items[.@i]), "* "+getitemlink(.@items[.@i]));
+            if (countitem(.@items[.@i]))
+                .@power += 1;
+        }
+        freeloop(false);
         next;
+        if (.@power == .@total) {
+                #COLLECTOR = #COLLECTOR|COLLECT_PANTS;
+                getitembound SilverBell, 1, 1;
+                mesc l("CONGRATULATIONS! You have obtained the %s.", getitemlink(SilverBell)), 3;
+        }
         break;
         /////////////////////////////////////////////////////////////////////////
         // Shoes
         case 4:
-        msObjective(countitem(CreasedShirt), "* "+getitemlink(CreasedShirt));
+        // FIXME: several unreleased (e.g. WizardMoccasins and TerraniteBoots)
+        setarray .@items, LousyMoccasins, AssassinBoots, DeepBlackBoots, CandorBoots, FurBoots, CottonBoots, Boots, LeatherBoots, RedStockings, BromenalBoots, WizardMoccasins, WitchBoots, HeliosBoots, TerraniteBoots, WarlordBoots, SaviorBoots, CreasedBoots, TulimsharGuardBoots, SquirrelBoots, Slippers;
+        .@power = 0;
+        .@total = getarraysize(.@items);
+        freeloop(true);
+        for (.@i=0; .@i < .@total; .@i++) {
+            msObjective(countitem(.@items[.@i]), "* "+getitemlink(.@items[.@i]));
+            if (countitem(.@items[.@i]))
+                .@power += 1;
+        }
+        freeloop(false);
+        next;
+        if (.@power == .@total) {
+                //#COLLECTOR = #COLLECTOR|COLLECT_SHOES;
+                //getitembound SilverBell, 1, 1;
+                mesc l("CONGRATULATIONS! You have obtained the %s.", getitemlink(SilverBell)), 3;
+        }
         next;
         break;
         /////////////////////////////////////////////////////////////////////////
@@ -163,7 +193,23 @@ L_Main:
         /////////////////////////////////////////////////////////////////////////
         // Gloves
         case 9:
-        msObjective(countitem(CreasedShirt), "* "+getitemlink(CreasedShirt));
+        // FIXME: several unreleased
+        setarray .@items, Armbands, CopperArmbands, IronArmbands, SarabArmlet, CreasedGloves, CottonGloves, MinerGloves, SilkGloves, LeatherGloves, ForestGloves, BromenalGloves, GoldenArmbands, WarlordGloves, ManaGloves, TerraniteGloves, AssassinGloves, CandorGloves, SaviorGloves;
+        .@power = 0;
+        .@total = getarraysize(.@items);
+        freeloop(true);
+        for (.@i=0; .@i < .@total; .@i++) {
+            msObjective(countitem(.@items[.@i]), "* "+getitemlink(.@items[.@i]));
+            if (countitem(.@items[.@i]))
+                .@power += 1;
+        }
+        freeloop(false);
+        next;
+        if (.@power == .@total) {
+                //#COLLECTOR = #COLLECTOR|COLLECT_GLOVES;
+                //getitembound SilverBell, 1, 1;
+                mesc l("CONGRATULATIONS! You have obtained the %s.", getitemlink(SilverBell)), 3;
+        }
         next;
         break;
         /////////////////////////////////////////////////////////////////////////
@@ -346,7 +392,7 @@ OnInit:
     // Pets → Strange Coin
     // You can get up to 18 stamps, but pets, hats and armor give 2x
     // Plan wisely and accordingly (21 stamps total)
-    // As of 2023-08-01, a total of 5 stamps were available
+    // As of 2023-11-01, a total of 6 stamps were available
 	sellitem SunnyCrystal, 12;
 	sellitem LegendaryMouboo, 8;
 	sellitem SupremeGift, 7;