diff options
| author | Led Mitz <smoothshifter@tuta.io> | 2023-11-29 02:56:50 +0000 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2023-11-29 02:56:50 +0000 |
| commit | 628a43f9c9476fa4d317b2435ea6afd09b03a272 (patch) | |
| tree | 67ffd816128f3a1df45e64472caf25b2c9cfb4c7 | |
| parent | 7c771802031799fffac9731402ba636865bb8c4d (diff) | |
| parent | 6382b1b0d92ec67668f4cfbc5c0109fd1b228013 (diff) | |
| download | serverdata-628a43f9c9476fa4d317b2435ea6afd09b03a272.tar.gz serverdata-628a43f9c9476fa4d317b2435ea6afd09b03a272.tar.bz2 serverdata-628a43f9c9476fa4d317b2435ea6afd09b03a272.tar.xz serverdata-628a43f9c9476fa4d317b2435ea6afd09b03a272.zip | |
Merge branch 'petal_message' into 'master'
message strcharinfo(0) [@@|@@] fix
See merge request legacy/serverdata!698
| -rw-r--r-- | world/map/npc/mobs/mob_kill_handler.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/world/map/npc/mobs/mob_kill_handler.txt b/world/map/npc/mobs/mob_kill_handler.txt index 069c01f4..ff5cd4de 100644 --- a/world/map/npc/mobs/mob_kill_handler.txt +++ b/world/map/npc/mobs/mob_kill_handler.txt @@ -66,7 +66,7 @@ L_Terranite: L_Pink_Flower: if ( @mobID != PinkFlower ) goto L_Return; // next mob label here - if ( ((HURNS1_STATE & BYTE_0_MASK) < PINK_PETAL_SHOP_ASKED_FOR_PETALS) || ((HURNS1_STATE & BYTE_0_MASK) >= PINK_PETAL_SHOP_FOUND_FLOWER_SEEDS) ) + 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_Return; if (rand(PINK_FLOWER_SEEDS_CHANCE) < 1) goto L_Get_Seed; @@ -75,7 +75,7 @@ L_Pink_Flower: L_Get_Seed: getinventorylist; set .@free_slots, (100 - @inventorylist_count); - if (countitem(PinkFlowerSeed) >= 1 && countitem(PinkFlowerSeed) < 30000 ) + if (countitem(PinkFlowerSeed) >= 1 && countitem(PinkFlowerSeed) < 30000) set .@free_slots, .@free_slots + 1; if (.@free_slots < 1 || checkweight(PinkFlowerSeed, 1) == 0) goto L_Pink_Flower_Seeds_Inv_Full; @@ -87,11 +87,11 @@ L_Get_Seed: goto L_Return; L_Pink_Flower_Seeds_Full: - message strcharinfo(0), "Pink Flower : ##3You found enough [@@"+ PinkFlowerSeed + "|Pink Flower Seeds@@] for Blossom."; + message strcharinfo(0), "Pink Flower : ##3You found enough [@@" + PinkFlowerSeed + "|Pink Flower Seeds@@] for Blossom."; goto L_Return; L_Pink_Flower_Seeds_Inv_Full: - message strcharinfo(0), "Pink Flower : ##3Your Inventory is full you can't pickup the [@@"+ PinkFlowerSeed + "|@@]."; + message strcharinfo(0), "Pink Flower : ##3Your inventory is full. You can't pickup the [@@" + PinkFlowerSeed + "|Pink Flower Seed@@] and a bird came flying by and snatched it."; // to show the line correctly over head it needs something after the | but thats not needed for mes goto L_Return; L_Return: |