diff options
| author | Fedja Beader <fedja@protonmail.ch> | 2025-02-14 19:27:57 +0100 |
|---|---|---|
| committer | Fedja Beader <fedja@protonmail.ch> | 2025-02-14 19:34:22 +0100 |
| commit | 5f53f8dbd590c466c52945cb2cae47badc169b2e (patch) | |
| tree | 73515539e8a2eac6e47162867158b64dd6c070e9 | |
| parent | bed5334f31f2fa7b422f00e2ee258bdfc975f205 (diff) | |
| download | classic-serverdata-blossom_petals_quest_quest.tar.gz classic-serverdata-blossom_petals_quest_quest.tar.bz2 classic-serverdata-blossom_petals_quest_quest.tar.xz classic-serverdata-blossom_petals_quest_quest.zip | |
Blossomg quest code style improvementsblossom_petals_quest_quest
| -rw-r--r-- | world/map/npc/012-1/shops.txt | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/world/map/npc/012-1/shops.txt b/world/map/npc/012-1/shops.txt index c7c01ee2..be566f8b 100644 --- a/world/map/npc/012-1/shops.txt +++ b/world/map/npc/012-1/shops.txt @@ -9,9 +9,14 @@ L_Start: set @shopopt$, ""; - if ( (HURNS1_STATE & BYTE_0_MASK) < PINK_PETAL_SHOP_ASKED_FOR_PETALS ) set @shopopt$, "Do you sell Pink Petals?"; - if ( (HURNS1_STATE & BYTE_0_MASK) >= PINK_PETAL_SHOP_ASKED_FOR_PETALS && (HURNS1_STATE & BYTE_0_MASK) < PINK_PETAL_SHOP_FOUND_FLOWER_SEEDS ) set @shopopt$, "How many Pink Flower Seeds do I need again?"; - if ( (HURNS1_STATE & BYTE_0_MASK) == PINK_PETAL_SHOP_FOUND_FLOWER_SEEDS ) set @shopopt$, "I want to deliver the Pink Flower Seeds."; + if ( (HURNS1_STATE & BYTE_0_MASK) < PINK_PETAL_SHOP_ASKED_FOR_PETALS ) + set @shopopt$, "Do you sell Pink Petals?"; + + if ( (HURNS1_STATE & BYTE_0_MASK) >= PINK_PETAL_SHOP_ASKED_FOR_PETALS && (HURNS1_STATE & BYTE_0_MASK) < PINK_PETAL_SHOP_FOUND_FLOWER_SEEDS ) + set @shopopt$, "How many Pink Flower Seeds do I need again?"; + + if ( (HURNS1_STATE & BYTE_0_MASK) == PINK_PETAL_SHOP_FOUND_FLOWER_SEEDS ) + set @shopopt$, "I want to deliver the Pink Flower Seeds."; mes "[Blossom]"; mes "\"Hello, would you like to buy some flowers?\""; @@ -31,8 +36,10 @@ L_ShopPetals: shop "#FlowerPetalShop"; L_Petals: - if ( (HURNS1_STATE & BYTE_0_MASK) >= PINK_PETAL_SHOP_ASKED_FOR_PETALS && (HURNS1_STATE & BYTE_0_MASK) < PINK_PETAL_SHOP_FOUND_FLOWER_SEEDS ) goto L_HowMany; - if ( (HURNS1_STATE & BYTE_0_MASK) == PINK_PETAL_SHOP_FOUND_FLOWER_SEEDS ) goto L_Deliver; + if ( (HURNS1_STATE & BYTE_0_MASK) >= PINK_PETAL_SHOP_ASKED_FOR_PETALS && (HURNS1_STATE & BYTE_0_MASK) < PINK_PETAL_SHOP_FOUND_FLOWER_SEEDS ) + goto L_HowMany; + if ( (HURNS1_STATE & BYTE_0_MASK) == PINK_PETAL_SHOP_FOUND_FLOWER_SEEDS ) + goto L_Deliver; set HURNS1_STATE, (HURNS1_STATE & ~BYTE_0_MASK) | PINK_PETAL_SHOP_ASKED_FOR_PETALS; @@ -46,7 +53,8 @@ L_HowMany: goto L_Close; L_Deliver: - if ( countitem(PinkFlowerSeed) < PINK_FLOWER_SEEDS_NEEDED ) goto L_HowMany; + if ( countitem(PinkFlowerSeed) < PINK_FLOWER_SEEDS_NEEDED ) + goto L_HowMany; set HURNS1_STATE, (HURNS1_STATE & ~BYTE_0_MASK) | PINK_PETAL_SHOP_DELIVERED_FLOWER_SEEDS; delitem PinkFlowerSeed, PINK_FLOWER_SEEDS_NEEDED; |