diff options
| -rw-r--r-- | npc/011-4/chest.txt | 21 | ||||
| -rw-r--r-- | npc/017-1/fairy_collector.txt | 9 |
2 files changed, 20 insertions, 10 deletions
diff --git a/npc/011-4/chest.txt b/npc/011-4/chest.txt index 0d273f946..4db26ee45 100644 --- a/npc/011-4/chest.txt +++ b/npc/011-4/chest.txt @@ -19,14 +19,25 @@ switch (season()) { case SUMMER: .@item=any(CherryCocktail, CactusCocktail, AppleCocktail); .@prize=0; break; - case WINTER: .@item=any(Snowflake, CaramelCandy, GingerBreadMan, ChocolateBiscuit); .@prize=0; break; + case WINTER: .@item=any(Snowflake, CaramelCandy); .@prize=0; break; case SPRING: .@item=any(Rose, Tulip, Blueberries); .@prize=0; break; - case AUTUMN: .@item=any(Lawncandy, Saulcandy, Poocandy, Mashmallow); .@prize=0; break; + case AUTUMN: .@item=any(Lawncandy, Saulcandy, Poocandy); .@prize=Zambacutou; break; } mesc l("Maybe %s %s will do it.", fnum(1000), .@item); - next; - mesn l("Elli"); - mesq l("Not today, I still haven't decided the prize!"); + if (!.@prize) { + next; + mesn l("Elli"); + mesq l("Not today, I still haven't decided the prize!"); + close; + } + if (countitem(.@item) < 1000) close; + mesc l("Deliver the items to the Chest?"), 1; + if (askyesno() == ASK_NO) close; + delitem .@item, 1000; + getitem .@prize, 1; + setq SQuest_ElliChest, (getq(SQuest_ElliChest) | .@season); + mes ""; + mesc l("You found a(n) %s inside.", getitemlink(.@prize)); close; OnInit: diff --git a/npc/017-1/fairy_collector.txt b/npc/017-1/fairy_collector.txt index 1f4a24921..fca6c2cce 100644 --- a/npc/017-1/fairy_collector.txt +++ b/npc/017-1/fairy_collector.txt @@ -85,7 +85,7 @@ L_Main: rif(false && !(#COLLECTOR & COLLECT_GLOVES), l("Gloves")), rif(true && !(#COLLECTOR & COLLECT_SHIELDS), l("Shields")), rif(false && !(#COLLECTOR & COLLECT_1HSWORDS), l("1 Hand Swords")), - rif(false && !(#COLLECTOR & COLLECT_2HSWORDS), l("2 Hand Swords")), + rif(true && !(#COLLECTOR & COLLECT_2HSWORDS), l("2 Hand Swords")), rif(true && !(#COLLECTOR & COLLECT_BOWS), l("Bows")), rif(true && !(#COLLECTOR & COLLECT_FIREGUNS), l("Fire Staves")), rif(true && !(#COLLECTOR & COLLECT_WANDS), l("Wands")), @@ -254,7 +254,6 @@ L_Main: ///////////////////////////////////////////////////////////////////////// // 2H Swords case 12: - // FIXME: Zambacutou unreleased setarray .@items, Pickaxe, ThunderStaff, Scythe, MiereCleaver, Broadsword, Kanabo, BlacksmithAxe, PowerfulLightsaber, CentaurSpear, Zambacutou, CursedScythe, Halberd; .@power = 0; .@total = getarraysize(.@items); @@ -267,8 +266,8 @@ L_Main: freeloop(false); next; if (.@power == .@total) { - //#COLLECTOR = #COLLECTOR|COLLECT_2HSWORDS; - //getitembound SilverBell, 1, 1; + #COLLECTOR = #COLLECTOR|COLLECT_2HSWORDS; + getitembound SilverBell, 1, 1; mesc l("CONGRATULATIONS! You have obtained the %s.", getitemlink(SilverBell)), 3; } break; @@ -392,7 +391,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-11-01, a total of 6 stamps were available + // As of 2024-01-09, a total of 7 stamps were available sellitem SunnyCrystal, 12; sellitem LegendaryMouboo, 8; sellitem SupremeGift, 7; |