summaryrefslogtreecommitdiff
path: root/npc/quests/skills
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
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')
-rw-r--r--npc/quests/skills/hunter_skills.txt4
-rw-r--r--npc/quests/skills/merchant_skills.txt4
-rw-r--r--npc/quests/skills/sage_skills.txt6
-rw-r--r--npc/quests/skills/thief_skills.txt8
4 files changed, 11 insertions, 11 deletions
diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt
index b22360ec6..2d8aaf691 100644
--- a/npc/quests/skills/hunter_skills.txt
+++ b/npc/quests/skills/hunter_skills.txt
@@ -102,7 +102,7 @@ pay_arche,109,169,3 script Arpesto 4_M_05,{
}
}
else if (qskill_hunter == 1) {
- if (countitem(Cardinal_Jewel_) > 4 && countitem(Harpy's_Feather) > 4 && countitem(Pet_Food) > 29) {
+ if (countitem(Cardinal_Jewel_) > 4 && countitem(Harpys_Feather) > 4 && countitem(Pet_Food) > 29) {
mes "[Arpesto]";
mes "Hm? You're back?";
mes "Oh, did you bring";
@@ -222,7 +222,7 @@ pay_arche,109,169,3 script Arpesto 4_M_05,{
mes "sure you make good use";
mes "of that new skill. Take care~";
delitem Cardinal_Jewel_,5;
- delitem Harpy's_Feather,5;
+ delitem Harpys_Feather,5;
delitem Pet_Food,30;
qskill_hunter = 100;
skill "HT_PHANTASMIC",1,0;
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.";
diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt
index 06f79fba3..420477f4f 100644
--- a/npc/quests/skills/sage_skills.txt
+++ b/npc/quests/skills/sage_skills.txt
@@ -266,7 +266,7 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
close;
}
else if(SAG_SK == 1) {
- if (countitem(Scorpion's_Tail) < 10 || countitem(Horn) < 7 || countitem(Colorful_Shell) < 12 || countitem(Snail's_Shell) < 10 || countitem(Scroll) < 4) {
+ if (countitem(Scorpions_Tail) < 10 || countitem(Horn) < 7 || countitem(Colorful_Shell) < 12 || countitem(Snails_Shell) < 10 || countitem(Scroll) < 4) {
mes "[Mishuna]";
mes "Hm, you still haven't";
mes "gathered all of the materials";
@@ -333,10 +333,10 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
mes "Creation skill by reviewing";
mes "your copy of Barmundt's scroll.^000000";
specialeffect2 EF_ABSORBSPIRITS;
- delitem Scorpion's_Tail,10; // Scorpion_Tail
+ delitem Scorpions_Tail,10;
delitem Horn,7; // Horn
delitem Colorful_Shell,12; // Rainbow_Shell
- delitem Snail's_Shell,10; // Snail's_Shell
+ delitem Snails_Shell,10;
delitem Scroll,4; // Blank_Scroll
SAG_SK = 2;
skill "SA_CREATECON",1,0;
diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt
index 6c56924f1..35cd38998 100644
--- a/npc/quests/skills/thief_skills.txt
+++ b/npc/quests/skills/thief_skills.txt
@@ -175,7 +175,7 @@ moc_prydb1,154,128,4 script Alcouskou 2_M_THIEFMASTER,{
close;
}
case 2:
- if ((countitem(Grasshopper's_Leg) > 19) && ((JobLevel > 34) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) {
+ if ((countitem(Grasshoppers_Leg) > 19) && ((JobLevel > 34) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) {
mes "[Alcouskou]";
mes "Okay! Let's practice!";
next;
@@ -192,7 +192,7 @@ moc_prydb1,154,128,4 script Alcouskou 2_M_THIEFMASTER,{
mes "Great! -At this level,";
mes "I am sure you can increase";
mes "your skill on your own.";
- delitem Grasshopper's_Leg,20;
+ delitem Grasshoppers_Leg,20;
skill "TF_BACKSLIDING",1,0;
close;
}
@@ -252,7 +252,7 @@ moc_prydb1,154,128,4 script Alcouskou 2_M_THIEFMASTER,{
mes "If not, I cannot teach you.";
close;
case 3:
- if ((countitem(Zargon) > 0) && (countitem(Bear's_Foot) > 0) && (countitem(Spawn) > 4) && ((JobLevel > 19) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) {
+ if ((countitem(Zargon) > 0) && (countitem(Bears_Foot) > 0) && (countitem(Spawn) > 4) && ((JobLevel > 19) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) {
mes "[Alcouskou]";
mes "Wow, you have already prepared?";
mes "Great, I see promise in you. -";
@@ -283,7 +283,7 @@ moc_prydb1,154,128,4 script Alcouskou 2_M_THIEFMASTER,{
mes "I hope it aids you in the future.";
mes ". . . . . Hope to see you soon";
delitem Zargon,1;
- delitem Bear's_Foot,1;
+ delitem Bears_Foot,1;
delitem Spawn,5;
skill "TF_PICKSTONE",1,0;
close;