summaryrefslogtreecommitdiff
path: root/npc/jobs
diff options
context:
space:
mode:
Diffstat (limited to 'npc/jobs')
-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
-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
7 files changed, 24 insertions, 24 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]) {
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;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 01:49:22 +0000