summaryrefslogtreecommitdiff
path: root/npc/jobs/2-1
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-1
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-1')
-rw-r--r--npc/jobs/2-1/blacksmith.txt2
-rw-r--r--npc/jobs/2-1/hunter.txt8
-rw-r--r--npc/jobs/2-1/knight.txt8
3 files changed, 9 insertions, 9 deletions
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index 5f971049f..8b1c9e9d3 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -589,7 +589,7 @@ ein_in01,201,27,3 script Guildsman#alberta 1_M_SMITH,{
case 3: setarray .@items[0], 1003,1, 935,2, 990,2, 1119,1, 6; changequest 2002,2005; break;
//Iron_Ore, Eye_Bandage, Blue_Gemstone, Arbalest
case 4: setarray .@items[0], 1002,1, 2212,1, 717,2, 1713,1, 7; changequest 2002,2006; break;
- //Iron, Green_Herb, Animal's_Skin, Ring_Pommel_Saber
+ //Iron, Green_Herb, Animals_Skin, Ring_Pommel_Saber
default: setarray .@items[0], 998,1, 511,1, 919,2, 1122,1, 8; changequest 2002,2007; break;
}
BSMITH_Q = .@items[8];
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index 609ea56de..76b3c4b39 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -495,13 +495,13 @@ hu_in01,382,382,4 script Guild Receptionist#hnt 4_M_JOB_HUNTER,{
case 1: setarray .@items[0], (RENEWAL?928:7030),5, 1019,5, 509,3, 3; changequest 4001,4002; break;
//Bill_Of_Birds, Skel_Bone, Green_Herb
case 2: setarray .@items[0], 925,3, 932,5, 511,3, 4; changequest 4001,4003; break;
- //Colorful_Shell/Posionous_Canine, Animal's_Skin, Red_Herb
+ //Colorful_Shell/Posionous_Canine, Animals_Skin, Red_Herb
case 3: setarray .@items[0], (RENEWAL?1013:937),3, 919,3, 507,5, 5; changequest 4001,4004; break;
//Horn/Dokkaebi_Horn, Poison_Spore/Piece_Of_Egg_Shell, Fluff
case 4: setarray .@items[0], (RENEWAL?947:1021),3, (RENEWAL?7033:7032),3, 914,10, 6; changequest 4001,4005; break;
//Shell, Worm_Peelings, Yellow_Herb
case 5: setarray .@items[0], 935,9, 955,9, 508,9, 7; changequest 4001,4006; break;
- //Tooth_Of_Bat, Sticky_Mucus, Bear's_Foot
+ //Tooth_Of_Bat, Sticky_Mucus, Bears_Foot
case 6: setarray .@items[0], 913,3, 938,1, 948,1, 8; changequest 4001,4007; break;
//Porcupine_Spike, Yoyo_Tail, Acorn
case 7: setarray .@items[0], 1027,2, 942,1, 1026,1, 9; changequest 4001,4008; break;
@@ -525,13 +525,13 @@ hu_in01,382,382,4 script Guild Receptionist#hnt 4_M_JOB_HUNTER,{
case 3: setarray .@items[0], (RENEWAL?928:7030),5, 1019,5, 509,3, 10; break;
//Bill_Of_Birds, Skel_Bone, Green_Herb
case 4: setarray .@items[0], 925,3, 932,5, 511,3, 10; break;
- //Colorful_Shell/Posionous_Canine, Animal's_Skin, Red_Herb
+ //Colorful_Shell/Posionous_Canine, Animals_Skin, Red_Herb
case 5: setarray .@items[0], (RENEWAL?1013:937),3, 919,3, 507,5, 10; break;
//Horn/Dokkaebi_Horn, Poison_Spore/Piece_Of_Egg_Shell, Fluff
case 6: setarray .@items[0], (RENEWAL?947:1021),3, (RENEWAL?7033:7032),3, 914,10, 10; break;
//Shell, Worm_Peelings, Yellow_Herb
case 7: setarray .@items[0], 935,9, 955,9, 508,9, 11; break;
- //Tooth_Of_Bat, Sticky_Mucus, Bear's_Foot
+ //Tooth_Of_Bat, Sticky_Mucus, Bears_Foot
case 8: setarray .@items[0], 913,3, 938,1, 948,1, 11; break;
//Porcupine_Spike, Yoyo_Tail, Acorn
case 9: setarray .@items[0], 1027,2, 942,1, 1026,1, 11; break;
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index b5afe995d..f75d0ea46 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -573,9 +573,9 @@ prt_in,75,107,4 script Sir Andrew#knt 1_M_YOUNGKNIGHT,{
next;
mes "[Sir Andrew]";
switch(rand(1,2)) {
- //Elder_Pixie's_Beard, Wing_Of_Red_Bat, Orcish_Voucher, Moth_Dust, Reptile_Tongue, Wild_Boar's_Mane
+ //Elder_Pixies_Beard, Wing_Of_Red_Bat, Orcish_Voucher, Moth_Dust, Reptile_Tongue, Wild_Boars_Mane
case 1: setarray .@items[0], 1040,5, 7006,5, 931,5, 1057,5, 903,5, 1028,5, 2; break;
- //Short_Leg, Heart_Of_Mermaid. Blossom_Of_Maneater, Flesh_Of_Clam, Old_Frying_Pan, Snail's_Shell
+ //Short_Leg, Heart_Of_Mermaid. Blossom_Of_Maneater, Flesh_Of_Clam, Old_Frying_Pan, Snails_Shell
case 2: setarray .@items[0], 1042,5, 950,5, 1032,5, 966,5, 7031,5, 946,5, 3; break;
}
KNIGHT_Q = .@items[12];
@@ -610,9 +610,9 @@ prt_in,75,107,4 script Sir Andrew#knt 1_M_YOUNGKNIGHT,{
mes "Let's check and see...";
next;
switch(KNIGHT_Q) {
- //Elder_Pixie's_Beard, Wing_Of_Red_Bat, Orcish_Voucher, Moth_Dust, Reptile_Tongue, Wild_Boar's_Mane
+ //Elder_Pixies_Beard, Wing_Of_Red_Bat, Orcish_Voucher, Moth_Dust, Reptile_Tongue, Wild_Boars_Mane
case 2: setarray .@items[0], 1040,5, 7006,5, 931,5, 1057,5, 903,5, 1028,5, 0; break;
- //Short_Leg, Heart_Of_Mermaid. Blossom_Of_Maneater, Flesh_Of_Clam, Old_Frying_Pan, Snail's_Shell
+ //Short_Leg, Heart_Of_Mermaid. Blossom_Of_Maneater, Flesh_Of_Clam, Old_Frying_Pan, Snails_Shell
case 3: setarray .@items[0], 1042,5, 950,5, 1032,5, 966,5, 7031,5, 946,5, 0; break;
}
if (countitem(.@items[0]) >= .@items[1] && countitem(.@items[2]) >= .@items[3] && countitem(.@items[4]) >= .@items[5] && countitem(.@items[6]) >= .@items[7] && countitem(.@items[8]) >= .@items[9] && countitem(.@items[10]) >= .@items[11]) {