summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-11-29 19:26:04 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-11-29 19:26:04 +0000
commit3615251a22fd8507e0ec88dbe337748cc109719f (patch)
treec9d4d3ad472a1c8f8350c88c02a682ccdb9ad5a3
parentdc3a1db4143291e5bdf98c6418888a415f3ba513 (diff)
parent67644682012b66ad91151cb037ada151fc5722f1 (diff)
downloadserverdata-3615251a22fd8507e0ec88dbe337748cc109719f.tar.gz
serverdata-3615251a22fd8507e0ec88dbe337748cc109719f.tar.bz2
serverdata-3615251a22fd8507e0ec88dbe337748cc109719f.tar.xz
serverdata-3615251a22fd8507e0ec88dbe337748cc109719f.zip
Merge branch 'petal_text' into 'master'
text improvment blossom See merge request legacy/serverdata!700
-rw-r--r--world/map/npc/012-1/shops.txt8
-rw-r--r--world/map/npc/mobs/mob_kill_handler.txt2
2 files changed, 5 insertions, 5 deletions
diff --git a/world/map/npc/012-1/shops.txt b/world/map/npc/012-1/shops.txt
index fe4a8ac5..c7c01ee2 100644
--- a/world/map/npc/012-1/shops.txt
+++ b/world/map/npc/012-1/shops.txt
@@ -37,7 +37,7 @@ L_Petals:
set HURNS1_STATE, (HURNS1_STATE & ~BYTE_0_MASK) | PINK_PETAL_SHOP_ASKED_FOR_PETALS;
mes "[Blossom]";
- mes "\"Not at the moment but I could grow some if you bring me " + PINK_FLOWER_SEEDS_NEEDED + " [@@"+ PinkFlowerSeed + "|Pink Flower Seeds@@].\"";
+ mes "\"Not at the moment, but I could grow some if you bring me " + PINK_FLOWER_SEEDS_NEEDED + " [@@"+ PinkFlowerSeed + "|Pink Flower Seeds@@].\"";
goto L_Close;
L_HowMany:
@@ -52,9 +52,9 @@ L_Deliver:
delitem PinkFlowerSeed, PINK_FLOWER_SEEDS_NEEDED;
mes "[Blossom]";
- mes "\"Wonderful you found all the [@@"+ PinkFlowerSeed + "|Pink Flower Seeds@@].";
- mes "I found some myself while you where away and so I already have some [@@" + PinkPetal +"|Pink Petals@@] on stock since that flowers grow real fast.";
- mes "But with all your seeds I can establish a liftime supply for you now.\"";
+ mes "\"Wonderful! You found all the [@@"+ PinkFlowerSeed + "|Pink Flower Seeds@@].";
+ mes "I found some myself while you where away, so I already have [@@" + PinkPetal +"|Pink Petals@@] in stock. These flowers grow really fast.";
+ mes "With all your seeds, I can now establish a lifetime supply for you.\"";
goto L_Close;
L_RoseHat:
diff --git a/world/map/npc/mobs/mob_kill_handler.txt b/world/map/npc/mobs/mob_kill_handler.txt
index ff5cd4de..83f64d3e 100644
--- a/world/map/npc/mobs/mob_kill_handler.txt
+++ b/world/map/npc/mobs/mob_kill_handler.txt
@@ -91,7 +91,7 @@ L_Pink_Flower_Seeds_Full:
goto L_Return;
L_Pink_Flower_Seeds_Inv_Full:
- 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
+ message strcharinfo(0), "Pink Flower : ##3Your inventory is full. You couldn’t pick up 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: