summaryrefslogtreecommitdiff
path: root/npc/jobs/2-2
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/jobs/2-2
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/jobs/2-2')
-rw-r--r--npc/jobs/2-2/alchemist.txt4
-rw-r--r--npc/jobs/2-2/monk.txt4
-rw-r--r--npc/jobs/2-2/rogue.txt10
-rw-r--r--npc/jobs/2-2/sage.txt12
4 files changed, 15 insertions, 15 deletions
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index d5edd8bf2..634e0753b 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -715,7 +715,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{
getitemname(Buckler),
getitemname(Coat),
getitemname(Gas_Mask),
- getitemname(Big_Sis'_Ribbon),
+ getitemname(Big_Sis_Ribbon),
getitemname(Fillet),
getitemname(Sahkkat),
getitemname(Glasses));
@@ -1690,7 +1690,7 @@ alde_alche,79,19,5 script Experiment Expert#am 4_M_ALCHE_A,{
"a %s?",
getitemname(Mixture));
next;
- select(getitemname(Monster's_Feed),
+ select(getitemname(Monsters_Feed),
getitemname(Lip_Of_Ancient_Fish),
getitemname(Rotten_Bandage));
mes "[Van Helmont]";
diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index 442014649..631da5f7d 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -594,14 +594,14 @@ monk_in,99,58,1 script Sensei Moohae#mk 1_M_PASTOR,{
mes "[Sensei Moohae]";
mes "Hmm?";
next;
- if (countitem(Tooth_Of_Bat) > 9 && countitem(Bear's_Foot) > 4 && countitem(Poison_Spore) > 19) {
+ if (countitem(Tooth_Of_Bat) > 9 && countitem(Bears_Foot) > 4 && countitem(Poison_Spore) > 19) {
mes "[Sensei Moohae]";
mes "Excellent, all the items I asked for.";
mes "I will tell this to the elders.";
MONK_Q = 10;
changequest 3022,3024;
delitem Tooth_Of_Bat,10;
- delitem Bear's_Foot,5;
+ delitem Bears_Foot,5;
delitem Poison_Spore,20;
next;
mes "[Sensei Moohae]";
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 5c6fd13cd..311915097 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -674,8 +674,8 @@ in_rogue,376,23,1 script Mr. Smith#rg 1_M_LIBRARYMASTER,{
else if (ROGUE_Q == 5) callsub S_CheckItems,508,10,948,10,935,10,940,10;
else if (ROGUE_Q == 6) {
if (Zeny > 9999 && countitem(Chrysalis) > 4 && countitem(Empty_Bottle) > 4 && countitem(Iron_Ore) > 4 &&
- countitem(Stone_Heart) > 4 && countitem(Red_Herb) > 4 && countitem(Animal's_Skin) > 4 && countitem(Yellow_Gemstone) > 4 &&
- countitem(Tooth_Of_Bat) > 4 && countitem(Scorpion's_Tail) > 4 && countitem(Yoyo_Tail) > 4 && countitem(Monster's_Feed) > 4 &&
+ countitem(Stone_Heart) > 4 && countitem(Red_Herb) > 4 && countitem(Animals_Skin) > 4 && countitem(Yellow_Gemstone) > 4 &&
+ countitem(Tooth_Of_Bat) > 4 && countitem(Scorpions_Tail) > 4 && countitem(Yoyo_Tail) > 4 && countitem(Monsters_Feed) > 4 &&
countitem(Fluff) > 4 && countitem(Clover) > 4 && countitem(Feather_Of_Birds) > 4 && countitem(Talon) > 4 &&
countitem(Spawn) > 4 && countitem(Raccoon_Leaf) > 4) {
mes "[Mr. Smith]";
@@ -686,12 +686,12 @@ in_rogue,376,23,1 script Mr. Smith#rg 1_M_LIBRARYMASTER,{
delitem Iron_Ore,5;
delitem Stone_Heart,5;
delitem Red_Herb,5;
- delitem Animal's_Skin,5;
+ delitem Animals_Skin,5;
delitem Yellow_Gemstone,5;
delitem Tooth_Of_Bat,5;
- delitem Scorpion's_Tail,5;
+ delitem Scorpions_Tail,5;
delitem Yoyo_Tail,5;
- delitem Monster's_Feed,5;
+ delitem Monsters_Feed,5;
delitem Fluff,5;
delitem Clover,5;
delitem Feather_Of_Birds,5;
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 4c5424f9a..cb5492046 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -1494,9 +1494,9 @@ yuno_in03,62,176,2 script History Professor#sa 4_M_MANAGER,{
}
}
else if (SAGE_Q == 10) {
- if (countitem(Feather_Of_Birds) > 0 && countitem(Animal's_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) {
+ if (countitem(Feather_Of_Birds) > 0 && countitem(Animals_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) {
delitem Feather_Of_Birds,1;
- delitem Animal's_Skin,1;
+ delitem Animals_Skin,1;
delitem Wooden_Block,1;
delitem Chinese_Ink,1;
delitem Empty_Bottle,1;
@@ -2045,9 +2045,9 @@ yuno_in03,32,102,1 script Biology Professor#sa 4_M_SAGE_C,{
close;
}
else if (SAGE_Q == 12) {
- if (countitem(Feather_Of_Birds) > 0 && countitem(Animal's_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) {
+ if (countitem(Feather_Of_Birds) > 0 && countitem(Animals_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) {
delitem Feather_Of_Birds,1;
- delitem Animal's_Skin,1;
+ delitem Animals_Skin,1;
delitem Wooden_Block,1;
delitem Chinese_Ink,1;
delitem Empty_Bottle,1;
@@ -2368,9 +2368,9 @@ yuno_in03,244,31,3 script Physics Professor#sa 2_M_PHARMACIST,{
}
}
else if (SAGE_Q == 14) {
- if (countitem(Feather_Of_Birds) > 0 && countitem(Animal's_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) {
+ if (countitem(Feather_Of_Birds) > 0 && countitem(Animals_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) {
delitem Feather_Of_Birds,1;
- delitem Animal's_Skin,1;
+ delitem Animals_Skin,1;
delitem Wooden_Block,1;
delitem Chinese_Ink,1;
delitem Empty_Bottle,1;