summaryrefslogtreecommitdiff
path: root/npc/quests/skills/merchant_skills.txt
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-11-18 07:13:21 +0100
committerHaru <haru@dotalux.com>2016-11-20 18:10:45 +0100
commite384a7f2166026dc1c8cdfe49fc2fc105197ea02 (patch)
tree45853183b6760e267e8783bc0a50cba1199f54c9 /npc/quests/skills/merchant_skills.txt
parent0a4fdb4404900fb03726b98ecbe379f2d5da6bd0 (diff)
downloadhercules-e384a7f2166026dc1c8cdfe49fc2fc105197ea02.tar.gz
hercules-e384a7f2166026dc1c8cdfe49fc2fc105197ea02.tar.bz2
hercules-e384a7f2166026dc1c8cdfe49fc2fc105197ea02.tar.xz
hercules-e384a7f2166026dc1c8cdfe49fc2fc105197ea02.zip
Replaced some unsupported symbols in AegisNames (step 2)
This removes the remaining unsupported symbols (despite they being official names) in AegisNames: The apostrophe (`'`) sign is suppressed. The full replacement rules (cumulative with the step 1 commit) are thus: - Any apostrophe is suppressed. - Any non-`[A-Za-z0-9_]` character is replaced with an underscore (`_`). - If the replaced symbol is at a word boundary (beginning or end of the string, or next to another underscore), it is suppressed instead. - If the replacement causes an AegisName conflict, underscores are appended appropriately. Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/quests/skills/merchant_skills.txt')
-rw-r--r--npc/quests/skills/merchant_skills.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt
index ee84bd837..bee16543f 100644
--- a/npc/quests/skills/merchant_skills.txt
+++ b/npc/quests/skills/merchant_skills.txt
@@ -238,7 +238,7 @@ alberta,119,221,6 script Charlron 1_M_PAY_ELDER,{
next;
switch (select("That's why I came here.", "What about my cart?", "Two pairs is pitiful?")) {
case 1:
- if ((countitem(Wooden_Block) > 49) && (countitem(Iron) > 9) && (countitem(Animal's_Skin) > 19)) {
+ if ((countitem(Wooden_Block) > 49) && (countitem(Iron) > 9) && (countitem(Animals_Skin) > 19)) {
mes "[Charlron]";
mes "Haha! Ok, ok!";
mes "With the things you brought";
@@ -246,7 +246,7 @@ alberta,119,221,6 script Charlron 1_M_PAY_ELDER,{
next;
delitem Wooden_Block,50;
delitem Iron,10;
- delitem Animal's_Skin,20;
+ delitem Animals_Skin,20;
skill "MC_CHANGECART",1,0;
mes "[Charlron]";
mes "Congratulations.";