summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/airports/airships.txt2
-rw-r--r--npc/cities/aldebaran.txt12
-rw-r--r--npc/custom/breeder.txt6
-rw-r--r--npc/custom/quests/bandit_beard.txt2
-rw-r--r--npc/custom/quests/elvenear.txt2
-rw-r--r--npc/custom/quests/event_6_new_hats.txt4
-rw-r--r--npc/custom/quests/may_hats.txt8
-rw-r--r--npc/custom/quests/thq/THQS_Quests.txt10
-rw-r--r--npc/dev/test.txt2
-rw-r--r--npc/events/christmas_2005.txt8
-rw-r--r--npc/events/gdevent_aru.txt2
-rw-r--r--npc/events/gdevent_sch.txt2
-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
-rw-r--r--npc/merchants/shops.txt24
-rw-r--r--npc/pre-re/jobs/1-1e/taekwon.txt4
-rw-r--r--npc/pre-re/quests/collection/quest_goat.txt4
-rw-r--r--npc/pre-re/scripts_jobs.conf2
-rw-r--r--npc/quests/cooking_quest.txt4
-rw-r--r--npc/quests/doomed_swords.txt16
-rw-r--r--npc/quests/doomed_swords_quest.txt4
-rw-r--r--npc/quests/first_class/tu_archer.txt4
-rw-r--r--npc/quests/guildrelay.txt18
-rw-r--r--npc/quests/kiel_hyre_quest.txt6
-rw-r--r--npc/quests/lvl4_weapon_quest.txt2
-rw-r--r--npc/quests/monstertamers.txt6
-rw-r--r--npc/quests/newgears/2004_headgears.txt24
-rw-r--r--npc/quests/newgears/2005_headgears.txt2
-rw-r--r--npc/quests/newgears/2006_headgears.txt4
-rw-r--r--npc/quests/newgears/2010_headgears.txt4
-rw-r--r--npc/quests/ninja_quests.txt4
-rw-r--r--npc/quests/partyrelay.txt20
-rw-r--r--npc/quests/quests_13_1.txt12
-rw-r--r--npc/quests/quests_13_2.txt17
-rw-r--r--npc/quests/quests_alberta.txt6
-rw-r--r--npc/quests/quests_aldebaran.txt4
-rw-r--r--npc/quests/quests_amatsu.txt14
-rw-r--r--npc/quests/quests_ayothaya.txt4
-rw-r--r--npc/quests/quests_lighthalzen.txt10
-rw-r--r--npc/quests/quests_louyang.txt4
-rw-r--r--npc/quests/quests_lutie.txt8
-rw-r--r--npc/quests/quests_morocc.txt14
-rw-r--r--npc/quests/quests_moscovia.txt14
-rw-r--r--npc/quests/quests_nameless.txt6
-rw-r--r--npc/quests/quests_prontera.txt2
-rw-r--r--npc/quests/quests_umbala.txt4
-rw-r--r--npc/quests/quests_veins.txt4
-rw-r--r--npc/quests/seals/sleipnir_seal.txt12
-rw-r--r--npc/quests/skills/hunter_skills.txt4
-rw-r--r--npc/quests/skills/knight_skills.txt1
-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
-rw-r--r--npc/quests/the_sign_quest.txt144
-rw-r--r--npc/re/events/halloween_2013.txt12
-rw-r--r--npc/re/instances/OldGlastHeim.txt84
-rw-r--r--npc/re/instances/ghost_palace.txt15
-rw-r--r--npc/re/jobs/3-1/ranger.txt2
-rw-r--r--npc/re/jobs/3-2/royal_guard.txt1
-rw-r--r--npc/re/jobs/novice/academy.txt14
-rw-r--r--npc/re/jobs/novice/novice.txt4
-rw-r--r--npc/re/merchants/coin_exchange.txt4
-rw-r--r--npc/re/merchants/enchan_mal.txt10
-rw-r--r--npc/re/merchants/flute.txt4
-rw-r--r--npc/re/merchants/shops.txt58
-rw-r--r--npc/re/quests/cupet.txt6
-rw-r--r--npc/re/quests/eden/26-40.txt6
-rw-r--r--npc/re/quests/eden/eden_iro.txt2
-rw-r--r--npc/re/quests/newgears/2012_headgears.txt24
-rw-r--r--npc/re/quests/quests_eclage.txt14
-rw-r--r--npc/re/quests/quests_mora.txt2
76 files changed, 401 insertions, 423 deletions
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index 9653b9394..7bac19e21 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -1452,6 +1452,8 @@ function script applegamble {
getitem Apple,.@amount;
end;
}
+ mes("Alright.");
+ mes("Let me cast the dice again.");
}
else {
mesf("^FF0000%s^000000, you got ^FF0000%d^000000 and the total is now ^FF0000%d^000000. "
diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt
index ecd6f8b6b..f2820b3b0 100644
--- a/npc/cities/aldebaran.txt
+++ b/npc/cities/aldebaran.txt
@@ -777,7 +777,7 @@ aldeba_in,84,166,4 script Kafra Service#alde 4_F_KAFRA1,{
mes "Due to a change in customer support policy, we no longer accept Kafra Passes. However, we are offering refunds for our customers who still possess these passes.";
next;
if (select("Sell Kafra Pass", "Alright, bye~") == 1) {
- if (countitem(Kapra's_Pass) == 0) {
+ if (countitem(Kapras_Pass) == 0) {
mes "[Kafra Pavianne]";
mes "I'm sorry,";
mes "but you don't";
@@ -787,27 +787,27 @@ aldeba_in,84,166,4 script Kafra Service#alde 4_F_KAFRA1,{
end;
}
else {
- .@kafrapassmoney = countitem(Kapra's_Pass)*2000;
+ .@kafrapassmoney = countitem(Kapras_Pass)*2000;
mes "[Kafra Pavianne]";
mes "Let's see...";
- if (countitem(Kapra's_Pass) == 1) {
+ if (countitem(Kapras_Pass) == 1) {
mes "You have 1 Kafra Pass.";
mes "You can sell that pass to us for 2000 zeny. Would you like to sell this Kafra Pass back to the Kafra Corporation?";
}
else {
- mes "You have "+ countitem(Kapra's_Pass) +" Kafra Passes.";
+ mes "You have "+ countitem(Kapras_Pass) +" Kafra Passes.";
mes "If you want to sell them to us, you will receive "+ .@kafrapassmoney +" zeny. Would you like to sell these back to the Kafra Corporation?";
}
next;
if (select("Yes", "No") == 1) {
- if (countitem(Kapra's_Pass) == 0) {
+ if (countitem(Kapras_Pass) == 0) {
mes "[Kafra Pavianne]";
mes "I'm sorry, but you don't have any Kafra Passes.";
close2;
cutin "",255;
end;
}
- delitem Kapra's_Pass,countitem(Kapra's_Pass);
+ delitem Kapras_Pass,countitem(Kapras_Pass);
Zeny += .@kafrapassmoney;
mes "[Kafra Pavianne]";
mes "Thank you.";
diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt
index c02122c3f..555fd4c93 100644
--- a/npc/custom/breeder.txt
+++ b/npc/custom/breeder.txt
@@ -16,16 +16,16 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{
if (hascashmount()) {
message strcharinfo(PC_NAME),"You must first remove your mount.";
end;
- } else if ((eaclass()&EAJ_THIRDMASK) == EAJ_RANGER && !countitem(Wolf's_Flute)) {
+ } else if ((eaclass()&EAJ_THIRDMASK) == EAJ_RANGER && !countitem(Wolfs_Flute)) {
if (!checkfalcon() && getskilllv(HT_FALCON) && !checkwug()) {
if (select(" ~ Falcon", " ~ Warg") == 1)
setfalcon;
else
- getitem Wolf's_Flute, 1;
+ getitem Wolfs_Flute, 1;
specialeffect2 EF_TEIHIT3;
close;
} else {
- getitem Wolf's_Flute,1;
+ getitem Wolfs_Flute,1;
}
} else if ((eaclass()&EAJ_THIRDMASK) == EAJ_MECHANIC && !checkcart() && getskilllv(MC_PUSHCART)) {
if (!checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) {
diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt
index fa1e61eac..9f9e509f4 100644
--- a/npc/custom/quests/bandit_beard.txt
+++ b/npc/custom/quests/bandit_beard.txt
@@ -70,7 +70,7 @@ L_MAKE:
mes "[Bearded Man]";
mes "Let's make you your beard!";
next;
- if(countitem(Flexible_String) < 1 || countitem(Animal's_Skin) < 1 || countitem(Black_Dyestuffs) < 1 || countitem(Granpa_Beard) < 1 ||
+ if(countitem(Flexible_String) < 1 || countitem(Animals_Skin) < 1 || countitem(Black_Dyestuffs) < 1 || countitem(Granpa_Beard) < 1 ||
countitem(Sticky_Mucus) < 100 || countitem(Counteragent) < 1 || countitem(Crystal_Jewel_) < 1) goto L_NOITEMS;
delitem 7200, 1;
delitem 919, 1;
diff --git a/npc/custom/quests/elvenear.txt b/npc/custom/quests/elvenear.txt
index dca4fdfd8..02e650e78 100644
--- a/npc/custom/quests/elvenear.txt
+++ b/npc/custom/quests/elvenear.txt
@@ -36,7 +36,7 @@ geffen,127,49,5 script Elven Ears Quest 4_M_02,{
mes "[Elven Ears quest]";
mes "Good good, let me just check";
next;
- if (countitem(Cat_Hairband)<1 || countitem(Elder_Pixie's_Beard)<20 || countitem(Animal's_Skin)<20) {
+ if (countitem(Cat_Hairband) < 1 || countitem(Elder_Pixies_Beard) < 20 || countitem(Animals_Skin) < 20) {
mes "[Elven Ears Quest]";
mes "You don't have the requirements.";
mes "Please come back another time...";
diff --git a/npc/custom/quests/event_6_new_hats.txt b/npc/custom/quests/event_6_new_hats.txt
index 593293a69..50110ff52 100644
--- a/npc/custom/quests/event_6_new_hats.txt
+++ b/npc/custom/quests/event_6_new_hats.txt
@@ -194,13 +194,13 @@ prt_in,53,56,5 script Jac 1_M_PAY_ELDER,{
mes "Oh, dear. You need 10 Steels...";
close;
}
- if (countitem(Bear's_Foot) < 200) {
+ if (countitem(Bears_Foot) < 200) {
mes "[Jac]";
mes "Oh, dear. You need 200 Bear Footskins...";
close;
}
delitem Steel,10;//Items: Steel,
- delitem Bear's_Foot,200; //Items: Bears Footskin,
+ delitem Bears_Foot,200; //Items: Bears Footskin,
mes "[Jac]";
mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Panda Hat for you right away. Please Wait a Moment.";
next;
diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt
index beea787a1..a1864f96f 100644
--- a/npc/custom/quests/may_hats.txt
+++ b/npc/custom/quests/may_hats.txt
@@ -62,10 +62,10 @@ gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{
next;
if (select("Yeah.", "Nay." != 1))
break;
- if(countitem(Tiger_Mask) < 1 || countitem(Tiger_Footskin) < 10 || countitem(Tiger's_Skin) < 30 || countitem(Tiger_Skin_Panties) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty,
+ if(countitem(Tiger_Mask) < 1 || countitem(Tiger_Footskin) < 10 || countitem(Tigers_Skin) < 30 || countitem(Tiger_Skin_Panties) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger_Footskin, Tiger_Panty,
delitem Tiger_Mask,1;//Items: Tiger_Mask,
- delitem Tiger_Footskin,10;//Items: Tiger's_Footskin,
- delitem Tiger's_Skin,30;//Items: Tiger_Skin,
+ delitem Tiger_Footskin,10;//Items: Tiger_Footskin,
+ delitem Tigers_Skin,30;//Items: Tiger_Skin,
delitem Tiger_Skin_Panties,300;//Items: Tiger_Panty,
getitem Lion_Mask,1;//Items: Lion_Mask,
mes "[Yakima]";
@@ -95,7 +95,7 @@ gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{
delitem Manteau_,2;//Items: Manteau_,
delitem Skul_Ring,3;//Items: Skull_Ring,
delitem Old_Manteau,10;//Items: Old_Manteau,
- getitem Skeleton's_Cape,1;//Items: Skeleton_Manteau,
+ getitem Skeletons_Cape,1;//Items: Skeleton_Manteau,
mes "[Yakima]";
mes "Thank you very very much!";
mes callfunc("F_Bye");
diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt
index bc81fb24b..c0eb1427a 100644
--- a/npc/custom/quests/thq/THQS_Quests.txt
+++ b/npc/custom/quests/thq/THQS_Quests.txt
@@ -228,7 +228,7 @@ N_QuestStart:
///////Job list 3///////
//3-1;
moc_fild04,208,322,6 script Clark 1_M_YOUNGKNIGHT,{
- if (three_qset == 1 && countitem(Elder_Pixie's_Beard) > 29) goto N_QuestComp;
+ if (three_qset == 1 && countitem(Elder_Pixies_Beard) > 29) goto N_QuestComp;
if (three_qset == 1) goto N_QuestStart;
mes "[Clark]";
mes "Love to chat, but I'm waiting for someone.";
@@ -456,7 +456,7 @@ N_QuestStart:
///////Job list 5///////
//5-1;
prt_maze01,18,184,6 script Lithin#01 4_M_CRU_OLD,{
- if (five_qset == 1 && countitem(Wild_Boar's_Mane) > 14) goto N_QuestComp;
+ if (five_qset == 1 && countitem(Wild_Boars_Mane) > 14) goto N_QuestComp;
if (five_qset == 1) goto N_QuestStart;
mes "[Lithin]";
mes "Well hello.";
@@ -975,7 +975,7 @@ N_QuestStart:
}
//10-2;
pay_fild10,145,252,6 script Man#02 2_M_DYEINGER,{
- if (ten_qset == 2 && countitem(Tiger's_Skin) > 0) goto N_QuestComp;
+ if (ten_qset == 2 && countitem(Tigers_Skin) > 0) goto N_QuestComp;
if (ten_qset == 2) goto N_QuestStart;
mes "[Man]";
mes "Sorry I'm waiting for someone, you will have to come back later";
@@ -995,12 +995,12 @@ N_QuestStart:
mes "[Man]";
mes "Tony the Tiger is on Crack! He must be stoped, KILL HIM!";
mes " ";
- mes "Bring me back 1 Tiger's_Skin!";
+ mes "Bring me back 1 Tiger's Skin!";
close;
}
//10-3;
cmd_fild08,328,349,4 script Caral 2_M_SWORDMASTER,{
- if (ten_qset == 3 && countitem(Thin_N'_Long_Tongue) > 0) goto N_QuestComp;
+ if (ten_qset == 3 && countitem(Thin_N_Long_Tongue) > 0) goto N_QuestComp;
if (ten_qset == 3) goto N_QuestStart;
mes "[Caral]";
mes "Sorry I'm waiting for someone, you will have to come back later.";
diff --git a/npc/dev/test.txt b/npc/dev/test.txt
index ee2bda259..b711a0a28 100644
--- a/npc/dev/test.txt
+++ b/npc/dev/test.txt
@@ -606,7 +606,7 @@ function script HerculesSelfTestHelper {
callsub(OnCheck, "'PORING' mob ID", PORING, 1002);
callsub(OnCheck, "'NV_BASIC' skill ID", NV_BASIC, 1);
callsub(OnCheck, "'Red_Potion' item ID", Red_Potion, 501);
- callsub(OnCheck, "'Monster's_Feed' item ID", Monster's_Feed, 528);
+ callsub(OnCheck, "'Monsters_Feed' item ID", Monsters_Feed, 528);
// setd/getd
diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt
index 795b50256..0a631cfb6 100644
--- a/npc/events/christmas_2005.txt
+++ b/npc/events/christmas_2005.txt
@@ -64,7 +64,7 @@ xmas_in,89,92,5 script Louise Kim#designer 4_F_06,{
mes "";
emotion e_lv;
next;
- if (countitem(Santa's_Hat) > 0) {
+ if (countitem(Santas_Hat) > 0) {
if (select("Here.", "It's ok.") == 1) {
mes "[Designer Louise Kim]";
mes "Nice choice!!";
@@ -160,11 +160,11 @@ xmas_in,89,92,5 script Louise Kim#designer 4_F_06,{
mes "~Who would be happier than~";
mes "~being with Louise.~";
emotion e_ho;
- delitem Santa's_Hat,1;
+ delitem Santas_Hat,1;
delitem Cactus_Needle,1;
delitem Holy_Water,10;
delitem Rosary,1;
- getitem Santa's_Hat_,1;
+ getitem Santas_Hat_,1;
close;
}
else {
@@ -1370,7 +1370,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{
emotion e_heh;
delitem Worn_Out_Page,1;
christ_carol05 = 3;
- getitem Santa's_Hat,1;
+ getitem Santas_Hat,1;
close;
}
}
diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt
index 898880d02..d192456aa 100644
--- a/npc/events/gdevent_aru.txt
+++ b/npc/events/gdevent_aru.txt
@@ -1333,7 +1333,7 @@ OnInit:
disablenpc "removepp_aru_gd";
end;
-OnTouch2:
+OnTouch:
.@paper_aru_gd = countitem(Glitering_PaperA);
.@spaper_aru_gd = countitem(Glitering_PaperB);
if ((.@paper_aru_gd > 0) || (.@spaper_aru_gd > 0)) {
diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt
index e04a28075..dcb529ebe 100644
--- a/npc/events/gdevent_sch.txt
+++ b/npc/events/gdevent_sch.txt
@@ -1330,7 +1330,7 @@ OnInit:
disablenpc "removepp_sch_gd";
end;
-OnTouch2:
+OnTouch:
.@paper_sch_gd = countitem(Glitering_PaperA);
.@spaper_sch_gd = countitem(Glitering_PaperB);
if ((.@paper_sch_gd > 0) || (.@spaper_sch_gd > 0)) {
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;
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index d4b623031..b215bd6d8 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -53,7 +53,7 @@
alberta_in,165,96,0 trader Item Collector#alb 1_F_MERCHANT_02,{
OnInit:
sellitem Scell;
- sellitem Monster's_Feed;
+ sellitem Monsters_Feed;
}
alberta_in,180,15,0 trader Armor Dealer#alb 4W_F_01,{
@@ -68,7 +68,7 @@ OnInit:
sellitem Manteau;
sellitem Glasses;
sellitem Sunglasses;
- sellitem Diver's_Goggles;
+ sellitem Divers_Goggles;
sellitem Cap;
sellitem Cotton_Shirt;
sellitem Leather_Jacket;
@@ -507,7 +507,7 @@ ein_in01,119,26,4 trader Weapon Dealer#ein 4_M_EINMAN,{
OnInit:
sellitem Kindling_Dagger;
sellitem Obsidian_Dagger;
- sellitem Fisherman's_Dagger;
+ sellitem Fishermans_Dagger;
sellitem Jujube_Dagger;
}
@@ -707,7 +707,7 @@ OnInit:
sellitem Blue_Gemstone;
sellitem Sunglasses;
sellitem Garlet;
- sellitem Monster's_Feed;
+ sellitem Monsters_Feed;
}
hu_in01,100,390,3 trader Bow Dealer#hu 4_M_04,{
@@ -1103,7 +1103,7 @@ OnInit:
sellitem Scell;
sellitem Garlet;
sellitem Zargon;
- sellitem Monster's_Feed;
+ sellitem Monsters_Feed;
}
//== Louyang ===============================================
@@ -1216,16 +1216,16 @@ OnInit:
moc_ruins,93,53,2 trader Item Collector#moc1 4_M_03,{
OnInit:
sellitem Scell;
- sellitem Monster's_Feed;
- sellitem Animal's_Skin;
+ sellitem Monsters_Feed;
+ sellitem Animals_Skin;
sellitem Bill_Of_Birds;
}
moc_ruins,81,113,0 trader Item Collector#moc2 4_M_03,{
OnInit:
sellitem Scell;
- sellitem Monster's_Feed;
- sellitem Animal's_Skin;
+ sellitem Monsters_Feed;
+ sellitem Animals_Skin;
sellitem Bill_Of_Birds;
}
@@ -1408,7 +1408,7 @@ OnInit:
sellitem Pumpkin;
sellitem Pumpkin_Head;
sellitem Tree_Root;
- sellitem Goat's_Horn;
+ sellitem Goats_Horn;
sellitem Pet_Food;
sellitem Poison_Powder;
sellitem Single_Cell;
@@ -1480,7 +1480,7 @@ OnInit:
prontera,64,125,0 trader Butcher#prt 4_M_BARBER,{
OnInit:
sellitem Meat;
- sellitem Monster's_Feed;
+ sellitem Monsters_Feed;
}
prontera,58,182,0 trader Flower Girl#prt 4W_KID,{
@@ -1701,7 +1701,7 @@ OnInit:
sellitem Sweet_Potato;
sellitem Banana;
sellitem Meat;
- sellitem Monster's_Feed;
+ sellitem Monsters_Feed;
sellitem Pet_Food;
sellitem Wing_Of_Fly;
sellitem Wing_Of_Butterfly;
diff --git a/npc/pre-re/jobs/1-1e/taekwon.txt b/npc/pre-re/jobs/1-1e/taekwon.txt
index 3e9814dee..e97cb204d 100644
--- a/npc/pre-re/jobs/1-1e/taekwon.txt
+++ b/npc/pre-re/jobs/1-1e/taekwon.txt
@@ -28,7 +28,7 @@
//================= Description ===========================================
//= Official TaeKwon Job Change Quest
//================= Current Version =======================================
-//= 1.0
+//= 1.0.1
//=========================================================================
-payon,157,141,5 duplicate(Pheonix) Phoenix#TKJobChangePRE 4_M_MONK
+payon,157,141,5 duplicate(TKJobChange) Phoenix#TKJobChangePRE 4_M_MONK
diff --git a/npc/pre-re/quests/collection/quest_goat.txt b/npc/pre-re/quests/collection/quest_goat.txt
index 9f2b7525e..e09fd90c0 100644
--- a/npc/pre-re/quests/collection/quest_goat.txt
+++ b/npc/pre-re/quests/collection/quest_goat.txt
@@ -188,11 +188,11 @@ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{
close;
}
*/
- if (countitem(Goat's_Horn) > 49) {
+ if (countitem(Goats_Horn) > 49) {
mes "[Vegetable Farmer]";
mes "Amazing, you did that with speed.";
mes "I am truly grateful.";
- delitem Goat's_Horn,50;
+ delitem Goats_Horn,50;
getexp 258489,155155;
//getitem White_Potion,10;
close;
diff --git a/npc/pre-re/scripts_jobs.conf b/npc/pre-re/scripts_jobs.conf
index 139f9de48..14dc97eee 100644
--- a/npc/pre-re/scripts_jobs.conf
+++ b/npc/pre-re/scripts_jobs.conf
@@ -36,6 +36,8 @@
"npc/pre-re/jobs/1-1/merchant.txt",
"npc/pre-re/jobs/1-1/swordman.txt",
"npc/pre-re/jobs/1-1/thief.txt",
+// - 1-1 Expanded
+"npc/pre-re/jobs/1-1e/taekwon.txt",
// - Novice
"npc/pre-re/jobs/novice/novice.txt",
diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt
index 83e7e2ea4..3b97f60ee 100644
--- a/npc/quests/cooking_quest.txt
+++ b/npc/quests/cooking_quest.txt
@@ -429,7 +429,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
goto L_End;
}
else if (cooking_q == 1) {
- if (countitem(Grasshopper's_Leg) > 4 && countitem(Old_Frying_Pan) > 0 && countitem(Cooking_Oil) > 0) {
+ if (countitem(Grasshoppers_Leg) > 4 && countitem(Old_Frying_Pan) > 0 && countitem(Cooking_Oil) > 0) {
cutin "orleans_4",0;
emotion e_an;
mes "[Charles Orleans]";
@@ -462,7 +462,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "know this recipe now. That's";
mes "all for today, so please go";
mes "and practice on your own now.";
- delitem Grasshopper's_Leg,5;
+ delitem Grasshoppers_Leg,5;
delitem Old_Frying_Pan,1;
delitem Cooking_Oil,1;
cooking_q = 7;
diff --git a/npc/quests/doomed_swords.txt b/npc/quests/doomed_swords.txt
index 63fdccf16..7b0911f37 100644
--- a/npc/quests/doomed_swords.txt
+++ b/npc/quests/doomed_swords.txt
@@ -723,7 +723,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{
mes "Mysteltainn twig used to kill Baldur. Hurry and bring it...";
close;
}
- if (countitem(Loki's_Whispers) < 1) {
+ if (countitem(Lokis_Whispers) < 1) {
mes "[Mysterious Blacksmith]";
mes "Hm. You forgot to bring";
mes "^0099FF1 Loki's Whispers^000000. We need";
@@ -732,7 +732,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{
mes "find that as quickly as you can! ";
close;
}
- if (countitem(Mother's_Nightmare) < 1) {
+ if (countitem(Mothers_Nightmare) < 1) {
mes "[Mysterious Blacksmith]";
mes "Hm, you still need to";
mes "bring ^0099FF1 Mother's Nightmare^000000";
@@ -758,7 +758,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{
mes "of wielding it. Bring ^0099FF1 Emperium^000000 and I will recognize your worth.";
close;
}
- if (countitem(Young_Twig) > 0 && countitem(Loki's_Whispers) > 0 && countitem(Mother's_Nightmare) > 0 && countitem(Foolishness_Of_Blind) > 0 && countitem(Emperium) > 0) {
+ if (countitem(Young_Twig) > 0 && countitem(Lokis_Whispers) > 0 && countitem(Mothers_Nightmare) > 0 && countitem(Foolishness_Of_Blind) > 0 && countitem(Emperium) > 0) {
mes "[Mysterious Blacksmith]";
mes "Well done, adventurer.";
mes "All seems to be in readiness.";
@@ -773,8 +773,8 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{
mes "quickly! I d-don't want";
mes "to touch it if I can avoid it.";
delitem Young_Twig,1;
- delitem Loki's_Whispers,1;
- delitem Mother's_Nightmare,1;
+ delitem Lokis_Whispers,1;
+ delitem Mothers_Nightmare,1;
delitem Foolishness_Of_Blind,1;
delitem Emperium,1;
getitem Mysteltainn_,1;
@@ -1058,7 +1058,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{
mes "prepared to wield that blade";
mes "with your own two hands...";
next;
- if (countitem(Executioner's_Mitten) < 2) {
+ if (countitem(Executioners_Mitten) < 2) {
mes "[Mysterious Blacksmith]";
mes "Hm. In order for me";
mes "to forge the Executioner,";
@@ -1105,7 +1105,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{
mes "if you bring ^0099FF1 Emperium^000000.";
close;
}
- if (countitem(Executioner's_Mitten) > 1 && countitem(Bloody_Edge) > 9 && countitem(Frozen_Heart) > 2 && countitem(Amulet) > 49 && countitem(Emperium) > 0) {
+ if (countitem(Executioners_Mitten) > 1 && countitem(Bloody_Edge) > 9 && countitem(Frozen_Heart) > 2 && countitem(Amulet) > 49 && countitem(Emperium) > 0) {
mes "[Mysterious Blacksmith]";
mes "Great, I see that you've";
mes "prepared everything that";
@@ -1120,7 +1120,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{
mes "terrifying sword. Now";
mes "take it! Be wary, and don't";
mes "let its bloodlust consume you!";
- delitem Executioner's_Mitten,2;
+ delitem Executioners_Mitten,2;
delitem Bloody_Edge,10;
delitem Frozen_Heart,3;
delitem Amulet,50;
diff --git a/npc/quests/doomed_swords_quest.txt b/npc/quests/doomed_swords_quest.txt
index 6b10b67fc..2f8ac43c1 100644
--- a/npc/quests/doomed_swords_quest.txt
+++ b/npc/quests/doomed_swords_quest.txt
@@ -896,7 +896,7 @@ morocc,248,159,4 script Young Man#magum1 4_M_04,{
close;
}
else if (dmdswrd_Q == 40) {
- if (countitem(Bloody_Edge) == 9 && countitem(Blade_Lost_In_Darkness) == 6 && countitem(Cardinal_Jewel) == 9 && countitem(Loki's_Whispers) == 1) {
+ if (countitem(Bloody_Edge) == 9 && countitem(Blade_Lost_In_Darkness) == 6 && countitem(Cardinal_Jewel) == 9 && countitem(Lokis_Whispers) == 1) {
mes "[Huey]";
mes "Oh, you're back. Did";
mes "you bring everything";
@@ -914,7 +914,7 @@ morocc,248,159,4 script Young Man#magum1 4_M_04,{
delitem Bloody_Edge,9;
delitem Blade_Lost_In_Darkness,6;
delitem Cardinal_Jewel,9;
- delitem Loki's_Whispers,1;
+ delitem Lokis_Whispers,1;
dmdswrd_Q = 41;
close;
}
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index 89af304ef..479e71e67 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -938,7 +938,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
tu_archer01 = 11;
close;
} else if(tu_archer01 == 11){
- if (RENEWAL && countitem(Grasshopper's_Leg) < 10) {
+ if (RENEWAL && countitem(Grasshoppers_Leg) < 10) {
mes "Hey...";
mes "You gotta bring";
mes "^3131FF10 Grasshopper's Leg^000000 to pass my midterm! Go back to the southwest area of Prontera and get them!";
@@ -965,7 +965,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
specialeffect2 EF_WIND;
tu_archer01 = 12;
if (RENEWAL)
- delitem Grasshopper's_Leg,10;
+ delitem Grasshoppers_Leg,10;
getexp 1000,1000;
getitem Great_Bow,1;
close;
diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt
index 7cb580130..87c72ef16 100644
--- a/npc/quests/guildrelay.txt
+++ b/npc/quests/guildrelay.txt
@@ -619,7 +619,7 @@
getitem Old_Violet_Box,1;
}
else if ((.@incen_item > 90) && (.@incen_item < 101)) {
- getitem Ear_Of_Angel's_Wing,1;
+ getitem Ear_Of_Angels_Wing,1;
}
next;
mes "[" + .@name$ + "]";
@@ -1330,7 +1330,7 @@
close;
}
}
- if ((countitem(Thin_N'_Long_Tongue) > 29) && (countitem(Shoulder_Protection) > 29) && (countitem(Black_Mask) > 29) && (guildrelay_q == 2)) {
+ if ((countitem(Thin_N_Long_Tongue) > 29) && (countitem(Shoulder_Protection) > 29) && (countitem(Black_Mask) > 29) && (guildrelay_q == 2)) {
mes "[" + .@name$ + "]";
mes "Huh. I didn't actually";
mes "expect that you'd collect";
@@ -1338,7 +1338,7 @@
mes "Now, take this and give it to";
mes "a Blacksmith or Mastersmith.";
mes "Your guild's pretty good...";
- delitem Thin_N'_Long_Tongue,30;
+ delitem Thin_N_Long_Tongue,30;
delitem Shoulder_Protection,30;
delitem Black_Mask,30;
guildrelay_q = 88;
@@ -1380,7 +1380,7 @@
mes "Don't forget this time.";
close;
}
- if ((countitem(Fright_Paper_Blade) > 29) && (countitem(Lizard_Scruff) > 29) && (countitem(Elder_Pixie's_Beard) > 29) && (guildrelay_q == 89)) {
+ if ((countitem(Fright_Paper_Blade) > 29) && (countitem(Lizard_Scruff) > 29) && (countitem(Elder_Pixies_Beard) > 29) && (guildrelay_q == 89)) {
mes "[" + .@name$ + "]";
mes "Huh. I didn't actually";
mes "expect that you'd collect";
@@ -1390,7 +1390,7 @@
mes "Your guild's pretty good...";
delitem Fright_Paper_Blade,30;
delitem Lizard_Scruff,30;
- delitem Elder_Pixie's_Beard,30;
+ delitem Elder_Pixies_Beard,30;
guildrelay_q = 88;
getitem Soul_Of_Courage,1;
close;
@@ -2019,7 +2019,7 @@
getitem Soul_Of_Harmony,1;
close;
}
- else if ((countitem(Heart_Of_Tree) > 29) && (countitem(Soft_Leaf) > 29) && (countitem(Poison_Toad's_Skin) > 29) && (guildrelay_q == 11)) {
+ else if ((countitem(Heart_Of_Tree) > 29) && (countitem(Soft_Leaf) > 29) && (countitem(Poison_Toads_Skin) > 29) && (guildrelay_q == 11)) {
mes "[" + .@name$ + "]";
mes "Oh, perfect! You brought";
mes "all the items. Well then,";
@@ -2029,7 +2029,7 @@
mes "^42426FAssassin Cross^000000. Thank you.";
delitem Heart_Of_Tree,30;
delitem Soft_Leaf,30;
- delitem Poison_Toad's_Skin,30;
+ delitem Poison_Toads_Skin,30;
if (BaseJob == Job_Dancer) {
guildrelay_q = 72;
}
@@ -2039,7 +2039,7 @@
getitem Soul_Of_Harmony,1;
close;
}
- else if ((countitem(Goat's_Horn) > 29) && (countitem(Honey_Jar) > 29) && (countitem(Porcupine_Spike) > 29) && (guildrelay_q == 80)) {
+ else if ((countitem(Goats_Horn) > 29) && (countitem(Honey_Jar) > 29) && (countitem(Porcupine_Spike) > 29) && (guildrelay_q == 80)) {
mes "[" + .@name$ + "]";
mes "Oh, perfect! You brought";
mes "all the items. Well then,";
@@ -2047,7 +2047,7 @@
mes "take this spirit now. Please";
mes "give it to an ^42426FAssassin^000000 or an";
mes "^42426FAssassin Cross^000000. Thank you.";
- delitem Goat's_Horn,30;
+ delitem Goats_Horn,30;
delitem Honey_Jar,30;
delitem Porcupine_Spike,30;
if (BaseJob == Job_Dancer) {
diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt
index 9468bbe38..3a21bbfa0 100644
--- a/npc/quests/kiel_hyre_quest.txt
+++ b/npc/quests/kiel_hyre_quest.txt
@@ -302,7 +302,6 @@ yuno_in01,35,179,4 script Pub Master#kh 1_ETC_01,5,5,{
close;
}
-//OnTouch2:
OnTouch:
if (KielHyreQuest < 1) {
mes "[Vandt]";
@@ -1987,7 +1986,6 @@ kh_vila,175,19,0 duplicate(BookKHQ1) Book#kh4 HIDDEN_NPC
//- Store room interior; Letter to Elly on the floor. -
kh_vila,179,11,0 script Letter#kh FAKE_NPC,1,1,{
-//OnTouch2:
OnTouch:
if (KielHyreQuest == 18) {
if (checkweight(Kyll_Hire_Letter,1) == 0) {
@@ -2369,7 +2367,6 @@ kh_vila,39,41,0 script Pool#khp1 HIDDEN_NPC,{
//- Cottage interior, upstairs; Vicious Dog -
kh_vila,181,178,4 script Vicious Dog#khp1 4_DOG01,7,3,{
-//OnTouch2:
OnTouch:
mes "*Grrr~*";
next;
@@ -3456,7 +3453,6 @@ kh_dun01,162,206,0 duplicate(KHKeyardReader) Mechanical Device HIDDEN_NPC
//- Kiel Hyre - OnTouch -
kh_dun01,224,233,0 script Factory B Area Door FAKE_NPC,5,5,{
-//OnTouch2:
OnTouch:
if (KielHyreQuest == 40) {
if (checkweight(Steel_Piece,1) == 0) {
@@ -4612,7 +4608,6 @@ kh_mansion,18,30,4 script Allysia 4_F_KHELLISIA,{
//- Abduction triggering NPC -
lighthalzen,188,200,0 script Abduction_trigger FAKE_NPC,3,1,{
-//OnTouch2:
OnTouch:
if (KielHyreQuest == 50) {
mes "^3355FFAs you walked out of";
@@ -4630,7 +4625,6 @@ OnTouch:
//- Mysterious Woman "Mitchell Layla" -
kh_mansion,25,79,4 script Mysterious Woman#kh 4_F_JOB_HUNTER,3,3,{
-//OnTouch2:
OnTouch:
if (KielHyreQuest == 50) {
mes "^3355FFYou awaken with your";
diff --git a/npc/quests/lvl4_weapon_quest.txt b/npc/quests/lvl4_weapon_quest.txt
index bbc75cd19..977071343 100644
--- a/npc/quests/lvl4_weapon_quest.txt
+++ b/npc/quests/lvl4_weapon_quest.txt
@@ -1778,7 +1778,7 @@ niflheim,240,193,3 script Kayron#lv4 4_M_NFDEADMAN2,{
}
else {
mes "this... Longinus's Spear!";
- getitem Longinus's_Spear,1;
+ getitem Longinuss_Spear,1;
}
lv4_weapon = 0;
next;
diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt
index 503fc23bd..8e55e54a3 100644
--- a/npc/quests/monstertamers.txt
+++ b/npc/quests/monstertamers.txt
@@ -593,7 +593,7 @@ aldeba_in,168,175,4 script Monster Tamer#alde 4_M_TELEPORTER,{
mes "Its name?";
mes "^3355FFOrc Trophy^000000!";
next;
- if ((countitem(Patriotism_Marks) > 0) && (countitem(Scorpion's_Tail) > 0)) {
+ if ((countitem(Patriotism_Marks) > 0) && (countitem(Scorpions_Tail) > 0)) {
mes "[Shogo]";
mes "Oh! You have all the items necessary to make an Orc Trophy! Good, good! With all my pride as a monster tamer, let me make one for you right away!";
next;
@@ -610,7 +610,7 @@ aldeba_in,168,175,4 script Monster Tamer#alde 4_M_TELEPORTER,{
mes "the cute monster";
mes "you are raising...";
mes "Orc Trophy!";
- delitem Scorpion's_Tail,1;
+ delitem Scorpions_Tail,1;
delitem Patriotism_Marks,1;
getitem Horror_Of_Tribe,1; // Horror_Of_Tribe
close;
@@ -641,7 +641,7 @@ aldeba_in,168,175,4 script Monster Tamer#alde 4_M_TELEPORTER,{
}
comodo,112,182,0 script Munak's Grandma 8_F_GRANDMOTHER,{
- if (countitem(Girl's_Diary) > 0) {
+ if (countitem(Girls_Diary) > 0) {
mes "[Munak's grandma]";
mes "Oh my...";
mes "Have you seen my granddaughter,";
diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt
index 6a8a295bf..722509fbc 100644
--- a/npc/quests/newgears/2004_headgears.txt
+++ b/npc/quests/newgears/2004_headgears.txt
@@ -414,7 +414,7 @@ prontera,165,232,3 script Nephia#1 4_F_ALCHE,{
mes "- you put some items into Kafra Storage. -";
close;
}
- if (countitem(Big_Sis'_Ribbon) > 0 && countitem(Ribbon_) > 0 && countitem(Silk_Ribbon) > 0) {
+ if (countitem(Big_Sis_Ribbon) > 0 && countitem(Ribbon_) > 0 && countitem(Silk_Ribbon) > 0) {
mes "[Nephia]";
mes "Oh...";
mes "You've brought all these ribbons! I can't wait to tie you a new ribbon to put on your ^FF66CCbeautiful hair!^000000";
@@ -430,7 +430,7 @@ prontera,165,232,3 script Nephia#1 4_F_ALCHE,{
next;
mes "[Nephia]";
mes "That's it~! We're done! Oh, I just know you're going to look precious wearing this.";
- delitem Big_Sis'_Ribbon,1;
+ delitem Big_Sis_Ribbon,1;
delitem Ribbon_,1;
delitem Silk_Ribbon,1;
getitem Red_Tailed_Ribbon,1;
@@ -719,7 +719,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{
delitem Angelic_Chain,1;
delitem Elven_Ears,1;
Zeny -= 20000;
- getitem Ear_Of_Angel's_Wing,1;
+ getitem Ear_Of_Angels_Wing,1;
next;
mes "[Hatbyr Mhore]";
mes "There's no doubt that you'll be the talk of the town sporting these fashionable things.";
@@ -774,7 +774,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{
delitem Satanic_Chain,1;
delitem Elven_Ears,1;
Zeny -= 20000;
- getitem Ear_Of_Devil's_Wing,1;
+ getitem Ear_Of_Devils_Wing,1;
next;
mes "[Hatbyr Mhore]";
mes "You'll be wowing everyone on the streets with your fashionable new look that says 'It feels so good to be so bad.' Glad to be of service~!";
@@ -844,7 +844,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{
delitem Satanic_Chain,1;
delitem Elven_Ears,1;
Zeny -= 20000;
- getitem Ear_Of_Devil's_Wing,1;
+ getitem Ear_Of_Devils_Wing,1;
next;
mes "[Hatbyr Mhore]";
mes "You'll be wowing everyone on the streets with your fashionable new look that says 'It feels so good to be so bad.' Glad to be of service~!";
@@ -898,7 +898,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{
delitem Angelic_Chain,1;
delitem Elven_Ears,1;
Zeny -= 20000;
- getitem Ear_Of_Angel's_Wing,1;
+ getitem Ear_Of_Angels_Wing,1;
next;
mes "[Hatbyr Mhore]";
mes "There's no doubt that you'll be the talk of the town sporting these fashionable things.";
@@ -1094,7 +1094,7 @@ xmas,175,156,3 script Fuzzy Fuzz#1 4_M_05,{
mes "- you put some items into Kafra Storage. -";
close;
}
- if (countitem(Panda_Cap) > 0 && countitem(Needle_Pouch) > 99 && countitem(Spool) > 99 && countitem(Black_Bear's_Skin) > 299) {
+ if (countitem(Panda_Cap) > 0 && countitem(Needle_Pouch) > 99 && countitem(Spool) > 99 && countitem(Black_Bears_Skin) > 299) {
if ((MaxWeight-Weight) < 2000) {
mes "[Fuzzy Fuzz]";
mes "You brought every material I need, but unfortunately you don't have enough space in your inventory. Try and place some of your items into Kafra Storage first.";
@@ -1120,7 +1120,7 @@ xmas,175,156,3 script Fuzzy Fuzz#1 4_M_05,{
delitem Panda_Cap,1;
delitem Needle_Pouch,100;
delitem Spool,100;
- delitem Black_Bear's_Skin,300;
+ delitem Black_Bears_Skin,300;
getitem Brown_Bear_Cap,1;
close;
}
@@ -1471,7 +1471,7 @@ xmas_in,35,30,3 script Hat Merchant#zero 4_M_NFLOSTMAN,{
next;
switch(select("Party Hat", "Straw Hat", "Cowboy Hat", "Sombrero", "Beanie")) {
case 1:
- if (countitem(Santa's_Hat) > 0 && countitem(Oil_Paper) > 99 && countitem(Smooth_Paper) > 99) {
+ if (countitem(Santas_Hat) > 0 && countitem(Oil_Paper) > 99 && countitem(Smooth_Paper) > 99) {
mes "[Mad Hatter]";
mes "Party Hat! It's a Santa Hat I've remade by adding colorful paper for a festive look. Celebrate good times with a Party Hat! Come on!";
next;
@@ -1494,7 +1494,7 @@ xmas_in,35,30,3 script Hat Merchant#zero 4_M_NFLOSTMAN,{
mes "^3355FF*Squick Squick Grind Grind*^000000";
mes "^3355FF*Swish Swish Rustle Rustle*^000000";
next;
- delitem Santa's_Hat,1;
+ delitem Santas_Hat,1;
delitem Oil_Paper,100;
delitem Smooth_Paper,100;
mes "[Mad Hatter]";
@@ -1809,7 +1809,7 @@ yuno_in03,20,18,6 script Nehris#1 4_F_JOB_BLACKSMITH,{
mes "[Nehris]";
mes "This crown is inspired by the the one worn by the 'Isis' monster. It has a elegant look fitting for ancient royalty.";
next;
- if (countitem(Queen's_Hair_Ornament) > 0 && countitem(Emperium) > 0 && countitem(Gold) > 2 && Zeny > 19999) {
+ if (countitem(Queens_Hair_Ornament) > 0 && countitem(Emperium) > 0 && countitem(Gold) > 2 && Zeny > 19999) {
mes "[Nehris]";
mes "Thank you for";
mes "bringing everything.";
@@ -1817,7 +1817,7 @@ yuno_in03,20,18,6 script Nehris#1 4_F_JOB_BLACKSMITH,{
next;
mes "^3355FF* Clang Clang! Scrape Scrape! Jingle Jingle! *^000000";
next;
- delitem Queen's_Hair_Ornament,1;
+ delitem Queens_Hair_Ornament,1;
delitem Emperium,1;
delitem Gold,3;
Zeny -= 20000;
diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt
index 8efebb27a..80cea9f6a 100644
--- a/npc/quests/newgears/2005_headgears.txt
+++ b/npc/quests/newgears/2005_headgears.txt
@@ -1650,7 +1650,7 @@ gl_prison1,97,104,1 script Phendark#LhzHat PHENDARK,{
countitem(Tail_) || countitem(Whip) || countitem(Whip_) ||
countitem(Lariat) || countitem(Rapture_Rose) || countitem(Chemeti) ||
countitem(Whip_Of_Red_Flame) || countitem(Whip_Of_Ice_Piece) || countitem(Whip_Of_Earth) ||
- countitem(Jump_Rope) || countitem(Bladed_Whip) || countitem(Queen's_Whip) ||
+ countitem(Jump_Rope) || countitem(Bladed_Whip) || countitem(Queens_Whip) ||
countitem(Electric_Wire)
))
close; // no whip equipped or in inventory
diff --git a/npc/quests/newgears/2006_headgears.txt b/npc/quests/newgears/2006_headgears.txt
index 9daf0f24c..0a90d3a0b 100644
--- a/npc/quests/newgears/2006_headgears.txt
+++ b/npc/quests/newgears/2006_headgears.txt
@@ -577,8 +577,8 @@ hugel,147,103,3 script Ghenirhemin 4_M_HUGRANFA,{
//== Hahoe Mask / Mythical Lion Mask / Bride Mask ==========
payon,135,320,3 script Chungwolmang 4W_M_01,{
if (moza_tal == 2) {
- if (countitem(Bookclip_In_Memory) > 19 && countitem(Cactus_Needle) > 99 && countitem(Wild_Boar's_Mane) > 99) {
- //Hahoe_Mask: Bookclip_In_Memory, Cactus_Needle, Wild_Boar's_Mane
+ if (countitem(Bookclip_In_Memory) > 19 && countitem(Cactus_Needle) > 99 && countitem(Wild_Boars_Mane) > 99) {
+ //Hahoe_Mask: Bookclip_In_Memory, Cactus_Needle, Wild_Boars_Mane
callsub S_MakeMask,5176,7015,20,952,100,1028,100,0,0;
}
if (countitem(Slender_Snake) > 499 && countitem(Tooth_Of_Ancient_Fish) > 1 && countitem(Orange_Dyestuffs) > 0) {
diff --git a/npc/quests/newgears/2010_headgears.txt b/npc/quests/newgears/2010_headgears.txt
index ec856c37f..7fb5178b8 100644
--- a/npc/quests/newgears/2010_headgears.txt
+++ b/npc/quests/newgears/2010_headgears.txt
@@ -368,8 +368,8 @@ comodo,236,164,0 script Hat Girl#Hair_Brush 1_F_04,{
//== 4. Making the new headgear Statue Of Baby Angel(5443) =
alberta,151,78,0 script Bebete#Baby_Angel_Status 4W_KID,{
- // Check if wearing Ear_Of_Angel's_Wing, Angelic_Chain, Flying_Angel
- if (!isequipped(Ear_Of_Angel's_Wing) && !isequipped(Angelic_Chain) && !isequipped(Flying_Angel)) {
+ // Check if wearing Ear_Of_Angels_Wing, Angelic_Chain, Flying_Angel
+ if (!isequipped(Ear_Of_Angels_Wing) && !isequipped(Angelic_Chain) && !isequipped(Flying_Angel)) {
mes "[Bebete]";
mes "A fake angel? Go away!!";
next;
diff --git a/npc/quests/ninja_quests.txt b/npc/quests/ninja_quests.txt
index b8322b4f5..78f21d38b 100644
--- a/npc/quests/ninja_quests.txt
+++ b/npc/quests/ninja_quests.txt
@@ -897,7 +897,7 @@ que_ng,72,34,3 script Craftsman Kaibara 4_M_EINOLD,{
mes "If you ever happen to gather all these materials one day, feel free to come back.";
close;
}else{
- if(countitem(Dragon_Scale) < 400 || countitem(Oridecon) < 5 || countitem(Dragon's_Skin) < 30){
+ if(countitem(Dragon_Scale) < 400 || countitem(Oridecon) < 5 || countitem(Dragons_Skin) < 30){
mes "[Kaibara]";
mes "It looks like there are not enough ingredients for me to make you a Gokurin.";
next;
@@ -1180,7 +1180,7 @@ que_ng,22,62,3 script Tetsu 4_M_SEAMAN,{
break;
}
- if(countitem(Steel)<50 || countitem(Harpy's_Feather)<20 || countitem(Oridecon)<5){
+ if (countitem(Steel) < 50 || countitem(Harpys_Feather) < 20 || countitem(Oridecon) < 5) {
mes "[Tetsu]";
mes "It looks like you haven't brought me enough materials to make you a Fuuma Shuriken Beneki.";
next;
diff --git a/npc/quests/partyrelay.txt b/npc/quests/partyrelay.txt
index f426106fc..c9d4e48f9 100644
--- a/npc/quests/partyrelay.txt
+++ b/npc/quests/partyrelay.txt
@@ -2015,7 +2015,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{
mes "you've already forgotten.";
close;
}
- if ((party_relay == 19) && (.@relaytime >= 14) && (.@relaytime < 17) && (countitem(Thin_N'_Long_Tongue) > 9) && (countitem(Leopard_Talon) > 9) && (countitem(Poison_Toad's_Skin) > 9)) {
+ if ((party_relay == 19) && (.@relaytime >= 14) && (.@relaytime < 17) && (countitem(Thin_N_Long_Tongue) > 9) && (countitem(Leopard_Talon) > 9) && (countitem(Poison_Toads_Skin) > 9)) {
mes "[Bafhail]";
mes "Well, it looks like you came";
mes "at the right time and brought";
@@ -2023,9 +2023,9 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{
mes "Please take your next ticket";
mes "and this small reward for you.";
next;
- delitem Thin_N'_Long_Tongue,10;
+ delitem Thin_N_Long_Tongue,10;
delitem Leopard_Talon,10;
- delitem Poison_Toad's_Skin,10;
+ delitem Poison_Toads_Skin,10;
party_relay = 20;
getitem Mission_Certificate7,1;
getitem Leaf_Of_Yggdrasil,2;
@@ -2039,7 +2039,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{
mes "I'll see you later, then.";
close;
}
- else if ((party_relay == 19) && (.@relaytime >= 18) && (.@relaytime < 21) && (countitem(Thin_N'_Long_Tongue) > 9) && (countitem(Leopard_Talon) > 9) && (countitem(Poison_Toad's_Skin) > 9)) {
+ else if ((party_relay == 19) && (.@relaytime >= 18) && (.@relaytime < 21) && (countitem(Thin_N_Long_Tongue) > 9) && (countitem(Leopard_Talon) > 9) && (countitem(Poison_Toads_Skin) > 9)) {
mes "[Bafhail]";
mes "Well, it looks like you came";
mes "at the right time and brought";
@@ -2047,9 +2047,9 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{
mes "Please take your next ticket";
mes "and this small reward for you.";
next;
- delitem Thin_N'_Long_Tongue,10;
+ delitem Thin_N_Long_Tongue,10;
delitem Leopard_Talon,10;
- delitem Poison_Toad's_Skin,10;
+ delitem Poison_Toads_Skin,10;
party_relay = 20;
getitem Mission_Certificate7,1;
getitem Leaf_Of_Yggdrasil,2;
@@ -2310,7 +2310,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{
mes "Standard Time. Don't forget!";
close;
}
- if ((party_relay == 7) && ((.@relaytime >= 8) && (.@relaytime < 11)) && (countitem(Porcupine_Spike) > 9) && (countitem(Elder_Pixie's_Beard) > 9) && (countitem(Fish_Tail) > 9)) {
+ if ((party_relay == 7) && ((.@relaytime >= 8) && (.@relaytime < 11)) && (countitem(Porcupine_Spike) > 9) && (countitem(Elder_Pixies_Beard) > 9) && (countitem(Fish_Tail) > 9)) {
mes "[Bafhail]";
mes "Well, it looks like you came";
mes "at the right time and brought";
@@ -2319,7 +2319,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{
mes "and this small reward for you.";
next;
delitem Porcupine_Spike,10;
- delitem Elder_Pixie's_Beard,10;
+ delitem Elder_Pixies_Beard,10;
delitem Fish_Tail,10;
party_relay = 9;
getitem Mission_Certificate3,1;
@@ -2332,7 +2332,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{
mes "Good luck on your travels~";
close;
}
- else if ((party_relay == 7) && ((.@relaytime >= 21) && (countitem(Porcupine_Spike) > 9) && (countitem(Elder_Pixie's_Beard) > 9) && (countitem(Fish_Tail) > 9))) {
+ else if ((party_relay == 7) && ((.@relaytime >= 21) && (countitem(Porcupine_Spike) > 9) && (countitem(Elder_Pixies_Beard) > 9) && (countitem(Fish_Tail) > 9))) {
mes "[Bafhail]";
mes "Well, it looks like you came";
mes "at the right time and brought";
@@ -2341,7 +2341,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{
mes "and this small reward for you.";
next;
delitem Porcupine_Spike,10;
- delitem Elder_Pixie's_Beard,10;
+ delitem Elder_Pixies_Beard,10;
delitem Fish_Tail,10;
party_relay = 9;
getitem Mission_Certificate3,1;
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 0f1481282..562609d31 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -7289,7 +7289,7 @@ mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{
}
}
else if (ep13_alba == 3) {
- if ((countitem(Monster's_Feed) > 19) && (countitem(Pet_Food) > 29)) {
+ if ((countitem(Monsters_Feed) > 19) && (countitem(Pet_Food) > 29)) {
mes "[Taab]";
mes "Oh, thanks!";
mes "You brought them their";
@@ -7305,7 +7305,7 @@ mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{
mes "material to give you.";
mes "How about a spiritual reward?";
next;
- delitem Monster's_Feed,20;
+ delitem Monsters_Feed,20;
delitem Pet_Food,30;
ep13_alba = 6;
if (RENEWAL_EXP) {
@@ -7470,7 +7470,6 @@ OnDisable:
disablenpc "Hillsrion#alba01";
end;
-//OnTouch2:
OnTouch:
mes "It is hissing in a low voice.";
mes "Sometimes it purrs, too.";
@@ -7487,7 +7486,6 @@ OnDisable:
disablenpc "Tatacho#alba02";
end;
-//OnTouch2:
OnTouch:
mes "[Taab]";
mes "Oh, please don't disturb";
@@ -7508,7 +7506,6 @@ OnDisable:
disablenpc "Cornus#alba03";
end;
-//OnTouch2:
OnTouch:
mes "[Taab]";
mes "Oh, please don't get";
@@ -8270,7 +8267,7 @@ spl_fild02,314,165,0 script School of Fish#1::Fishinghole CLEAR_NPC,{
specialeffect2 EF_BUBBLE;
specialeffect2 EF_INVENOM;
.@fcast = 15;
- if (isequipped(2550)) //Fisher's_Muffler
+ if (isequipped(2550)) //Fishers_Muffler
.@fcast -= 2;
if (isequipped(2443)) //Fish_Shoes
.@fcast -= 2;
@@ -11528,7 +11525,6 @@ OnInit:
}
mid_camp,205,312,0 script #moc2_talkevent01 FAKE_NPC,1,1,{
-//OnTouch2:
OnTouch:
if (mao_morocc2 == 11) {
mes "[Mr. Kidd]";
@@ -13394,7 +13390,6 @@ hu_fild04,235,103,0 script Heap of Earth#mao2_01 CLEAR_NPC,4,4,{
close;
}
-//OnTouch2:
OnTouch:
if (mao_morocc2 == 7) {
specialeffect EF_LEVEL99_4;
@@ -13731,7 +13726,6 @@ yuno_fild09,234,133,0 warp #moc2_fild09-que_dan02 1,1,que_dan02,13,10
que_dan02,13,6,0 warp #moc_que_dan02-fild09 1,1,yuno_fild09,234,129
que_dan02,21,37,0 script #moc2_b1_gate FAKE_NPC,1,1,{
-//OnTouch2:
OnTouch:
if (mao_morocc2 == 17) {
mes "- You find a side door that leads to the basement.";
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index 09ef6209e..0dfd16d23 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -458,7 +458,7 @@ spl_fild03,226,151,0 script School of Fish#5::FishingHole_spl3 CLEAR_NPC,{
specialeffect2 EF_BUBBLE;
specialeffect2 EF_INVENOM;
.@fcast = 15;
- if (isequipped(2550)) //Fisher's_Muffler
+ if (isequipped(2550)) //Fishers_Muffler
.@fcast -= 2;
if (isequipped(2443)) //Fish_Shoes
.@fcast -= 2;
@@ -4467,6 +4467,11 @@ function script jewel_13_2 {
mes "...What the heck am I doing now...";
close;
}
+ if (checkweight(Knife, 1) == 0) { // Custom check
+ mes "- It looks like you're carrying too many things. -";
+ mes "- Why not put some of your items in storage and come back? -";
+ close;
+ }
if (rand(1,4) == 2) {
mes "- You dug up a pile of earth -";
mes "- and pulled out the "+getarg(0)+" Gem -";
@@ -6495,7 +6500,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 4_M_ALCHE_D,{
ep13_2_bs2 = 1;
ep13_2_bs3 = 1;
ep13_2_bs4 = 1;
- getitem Bazett's_Order,1;
+ getitem Bazetts_Order,1;
changequest 11101,11102;
close;
}
@@ -6503,7 +6508,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 4_M_ALCHE_D,{
mes "[Bazett]";
mes "How's the search going?";
next;
- if (countitem(Bazett's_Order) < 1) {
+ if (countitem(Bazetts_Order) < 1) {
mes "[Bazett]";
mes "!!!!!!!";
mes "You lost the notes!!?";
@@ -6512,7 +6517,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 4_M_ALCHE_D,{
mes "[Bazett]";
mes "What's done has been done.";
mes "I'll give you a new one.";
- getitem Bazett's_Order,1;
+ getitem Bazetts_Order,1;
close;
}
else {
@@ -6527,7 +6532,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 4_M_ALCHE_D,{
next;
switch(select("Yes.", "Not yet...")) {
case 1:
- if (countitem(Bazett's_Order) < 1) {
+ if (countitem(Bazetts_Order) < 1) {
mes "[Bazett]";
mes "!!!!!!!";
mes "You lost the notes!!?";
@@ -6570,7 +6575,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 4_M_ALCHE_D,{
mes "[Bazett]";
mes "Ah... this isn't much, but it's a coin that the giants use.";
mes "Maybe you can buy something from them with this.";
- delitem Bazett's_Order,1;
+ delitem Bazetts_Order,1;
ep13_2_busut = 7;
if (ep13_2_bs1 == 3) getitem Manuk_Coin,1;
if (ep13_2_bs2 == 3) getitem Manuk_Coin,1;
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index f816efcdc..c2f726023 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -424,7 +424,7 @@ alberta_in,28,145,4 script Grampa 2_M_PHARMACIST,{
close;
case 2:
delitem Tiger_Footskin,10;
- getitem Boy's_Cap,1;
+ getitem Boys_Cap,1;
mes "[Grampa]";
mes "T... Thank you !!";
mes "With this I can revive my youthful splendor!! I must eat this thing right away !";
@@ -2650,7 +2650,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{
mes "I should stay at home.";
close;
}
- if ((ep13_2_hiki == 6) && (countitem(Monster's_Feed) > 0) && (countitem(Red_Potion) > 0)) {
+ if ((ep13_2_hiki == 6) && (countitem(Monsters_Feed) > 0) && (countitem(Red_Potion) > 0)) {
mes "[Iromo]";
mes "...Huh? This smell...";
mes "This is the one I like the most.";
@@ -2687,7 +2687,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{
mes "I like cats so I approached him.";
mes "Then suddenly he scratched and bit me.";
next;
- delitem Monster's_Feed,1;
+ delitem Monsters_Feed,1;
delitem Red_Potion,1;
ep13_2_hiki = 7;
changequest 10083,10084;
diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt
index 1b58726dd..e276622e9 100644
--- a/npc/quests/quests_aldebaran.txt
+++ b/npc/quests/quests_aldebaran.txt
@@ -79,8 +79,8 @@ aldeba_in,152,166,4 script Trader#01 4_M_04,{
close;
}
case 2:
- if ((countitem(Oldman's_Romance) > 0) && (countitem(Feather_Of_Birds) > 299) && (Zeny > 499)) {
- delitem Oldman's_Romance,1;
+ if ((countitem(Oldmans_Romance) > 0) && (countitem(Feather_Of_Birds) > 299) && (Zeny > 499)) {
+ delitem Oldmans_Romance,1;
delitem Feather_Of_Birds,300;
Zeny -= 500;
mes "[Trader]";
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index c2a20306b..31ebb517a 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -1484,7 +1484,7 @@ ama_in02,170,62,4 script Soldier#ama2 8_M_JPNSOLDIER,{
switch(select("Issue me a Transit Permit", "I want to live in Amatsu", "Nothing")) {
case 1:
if (event_amatsu == 6) {
- if (countitem(Lord's_Passable_Ticket) > 0) {
+ if (countitem(Lords_Passable_Ticket) > 0) {
mes "[Jiro]";
mes "You already have one...";
mes "You don't need to have two of them.";
@@ -1497,7 +1497,7 @@ ama_in02,170,62,4 script Soldier#ama2 8_M_JPNSOLDIER,{
next;
if (select("Issue one", "Talk to you later") == 1) {
Zeny -= 10000;
- getitem Lord's_Passable_Ticket,1;
+ getitem Lords_Passable_Ticket,1;
mes "[Jiro]";
mes "There you go.";
mes "Don't lose it this time.";
@@ -1678,7 +1678,7 @@ ama_in02,115,177,7 script Soldier#ama10 8_M_JPNSOLDIER,{
close;
}
if (event_amatsu == 6) {
- if (countitem(Lord's_Passable_Ticket) > 0) {
+ if (countitem(Lords_Passable_Ticket) > 0) {
mes "[Jyuro]";
mes "You have the ticket...";
mes "Do you want me to send you now, or do you need a little instruction?";
@@ -1734,7 +1734,7 @@ ama_in02,115,177,7 script Soldier#ama10 8_M_JPNSOLDIER,{
mes "A gate? On the top floor of the building??? Surely, you must been be mistaken.";
emotion e_swt;
next;
- if (countitem(Lord's_Passable_Ticket) > 0) {
+ if (countitem(Lords_Passable_Ticket) > 0) {
if (select("Show him the ticket", "Cancel") == 1) {
mes "[Jyuro]";
mes "What? That pass is...?";
@@ -1742,7 +1742,7 @@ ama_in02,115,177,7 script Soldier#ama10 8_M_JPNSOLDIER,{
mes "the lord but I guess it has";
mes "been issued to the wrong person.";
next;
- delitem Lord's_Passable_Ticket,1;
+ delitem Lords_Passable_Ticket,1;
mes "[Jyuro]";
mes "I will keep this ticket because";
mes "it was issued without permission.";
@@ -1885,7 +1885,7 @@ ama_in02,200,176,4 script Lord of Palace#ama 8_M_JPNMASTER,{
event_amatsu = 6;
completequest 8135;
delitem Fox_Tail,1;
- getitem Lord's_Passable_Ticket,1;
+ getitem Lords_Passable_Ticket,1;
mes "[Ishida Yoshinaga]";
mes "This isn't a big reward but";
mes "someday it will be useful for you.";
@@ -1943,7 +1943,7 @@ ama_in01,22,111,0 script Grandma#ama2 4_F_JPNOBA,{
mes "it won't harm me!! Yelp!^000000";
next;
select("Taaaah!!");
- if ((BaseJob == Job_Priest || BaseJob != Job_Acolyte && BaseJob != Job_Monk) || (countitem(Holy_Water) < 1 || countitem(Bear's_Foot) < 1 || countitem(Tiger's_Skin) < 1)) {
+ if ((BaseJob == Job_Priest || BaseJob != Job_Acolyte && BaseJob != Job_Monk) || (countitem(Holy_Water) < 1 || countitem(Bears_Foot) < 1 || countitem(Tigers_Skin) < 1)) {
if (rand(1,4) == 1)
.@fox_kill = 0;
else
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index f409782c8..dba9c5d14 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -859,7 +859,7 @@ ayothaya,253,99,3 script Fisherman 4_M_THAIONGBAK,{
next;
switch(select("Yes.", "No, thanks.")) {
case 1:
- if (countitem(Monster's_Feed) && Zeny > 49) {
+ if (countitem(Monsters_Feed) && Zeny > 49) {
mes "^3355FFYou cast your";
mes "fishing line";
mes "into the water.^000000";
@@ -871,7 +871,7 @@ ayothaya,253,99,3 script Fisherman 4_M_THAIONGBAK,{
next;
mes "^3355FFYou've hooked a Phen!^000000";
next;
- delitem Monster's_Feed,1;
+ delitem Monsters_Feed,1;
Zeny -= 50;
.@randfish = rand(1,100);
if (.@randfish > 0 && .@randfish < 40) {
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 480b696b3..0a80c25ae 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -2148,7 +2148,7 @@ lhz_in02,201,210,5 script Digotz 4_M_LGTMAN,{
mes "my fashionable street clothes?";
close;
}
- if ((friendship == 12 && countitem(Friend's_Diary) > 0)) {
+ if ((friendship == 12 && countitem(Friends_Diary) > 0)) {
mes "[Digotz]";
mes "Even if Benkaistein";
mes "did come back, I don't";
@@ -2555,7 +2555,7 @@ lighthalzen,337,232,3 script Maku 4_M_LGTPOOR,{
cutin "lhz_macu05",255;
end;
}
- if (friendship == 13 && countitem(Friend's_Diary) > 0) {
+ if (friendship == 13 && countitem(Friends_Diary) > 0) {
cutin "lhz_macu06",2;
mes "[Maku]";
mes "Hey, what is that? You want";
@@ -2703,7 +2703,7 @@ lighthalzen,337,232,3 script Maku 4_M_LGTPOOR,{
mes "that I'm grateful or anything.";
cutin "lhz_macu07",255;
next;
- delitem Friend's_Diary,1;
+ delitem Friends_Diary,1;
friendship = 14;
if (RENEWAL_EXP) {
if (BaseLevel > 90) getexp 70000,0;
@@ -3175,7 +3175,7 @@ yuno_in04,96,106,5 script Passionate Student 4_M_SAGE_A,{
mes "sure to let you know~";
close;
}
- if ((friendship == 11 && countitem(Friend's_Diary) > 0)) {
+ if ((friendship == 11 && countitem(Friends_Diary) > 0)) {
mes "[Benkaistein]";
mes "Aw nuts, this is";
mes "taking much longer";
@@ -3351,7 +3351,7 @@ yuno_in04,168,117,3 script Book#lhz HIDDEN_NPC,{
}
if (friendship == 10) {
friendship = 11;
- getitem Friend's_Diary,1;
+ getitem Friends_Diary,1;
mes "^3355FFThis book is labeled,";
mes "''Benkaistein's Journal";
mes "Vol. 6.'' This is probably";
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index d9c07c597..40fd7b38e 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -1433,7 +1433,7 @@ lou_in02,265,69,5 script Doctor#lyang 4_F_CHNDOCTOR,{
close;
}
else if (ch_par == 17) {
- if (countitem(Leopard_Talon) > 1 && countitem(Hard_Peach) > 9 && countitem(Poison_Toad's_Skin) > 4 && countitem(Browny_Root) > 19 && countitem(Germinating_Sprout) > 9 && countitem(Honey_Jar) > 4) {
+ if (countitem(Leopard_Talon) > 1 && countitem(Hard_Peach) > 9 && countitem(Poison_Toads_Skin) > 4 && countitem(Browny_Root) > 19 && countitem(Germinating_Sprout) > 9 && countitem(Honey_Jar) > 4) {
mes "[Hua Tuo]";
mes "Hm? Ah, you have returned.";
mes "Sorry, I was taking care of my other patients. Have you already gathered the medicines I'll need?";
@@ -1448,7 +1448,7 @@ lou_in02,265,69,5 script Doctor#lyang 4_F_CHNDOCTOR,{
mes "Please take this as a token of my appreciation. It's not much, but this medicine is an old family secret. I hope it will be helpful to you in dangerous situations.";
delitem Leopard_Talon,2;
delitem Hard_Peach,10;
- delitem Poison_Toad's_Skin,5;
+ delitem Poison_Toads_Skin,5;
delitem Browny_Root,20;
delitem Germinating_Sprout,10;
delitem Honey_Jar,5;
diff --git a/npc/quests/quests_lutie.txt b/npc/quests/quests_lutie.txt
index 3a74bdd26..4a1143c8f 100644
--- a/npc/quests/quests_lutie.txt
+++ b/npc/quests/quests_lutie.txt
@@ -204,12 +204,12 @@ xmas,115,297,4 script Vending Machine HIDDEN_NPC,{
}
break;
case 3:
- if ((countitem(Poison_Spore) > 849) && (countitem(Burn_Tree) > 299) && (countitem(Thin_N'_Long_Tongue) > 0)) {
+ if ((countitem(Poison_Spore) > 849) && (countitem(Burn_Tree) > 299) && (countitem(Thin_N_Long_Tongue) > 0)) {
mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000";
next;
delitem Poison_Spore,850;
delitem Burn_Tree,300;
- delitem Thin_N'_Long_Tongue,1;
+ delitem Thin_N_Long_Tongue,1;
emotion e_oh;
mes "^3355FF*Vroooooom~~*";
mes "*Bzzzzzt*";
@@ -268,10 +268,10 @@ xmas,115,297,4 script Vending Machine HIDDEN_NPC,{
}
break;
case 6:
- if (countitem(Alice's_Apron) > 99) {
+ if (countitem(Alices_Apron) > 99) {
mes "^3355FFYou gingerly place all 100 Aprons into the snowman's mouth.^000000";
next;
- delitem Alice's_Apron,100;
+ delitem(Alices_Apron, 100);
emotion e_oh;
mes "^3355FF*Vroooooom~~*";
mes "*Bzzzzzt*";
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 1b387be0c..0d509b2d4 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -1092,7 +1092,6 @@ moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 4_M_MOC_SOLDIER,3,
end;
}
-//OnTouch2:
OnTouch:
mes "[Continental Guard]";
mes "No commoners are allowed in the area beyond this point.";
@@ -2647,7 +2646,6 @@ yuno,333,210,5 script Library Master#garas 1_M_LIBRARYMASTER,{
}
yuno,336,203,0 script #garas_catch HIDDEN_WARP_NPC,3,3,{
-//OnTouch2:
OnTouch:
if (barmunt_crow == 2) {
mes "[Dog]";
@@ -2912,8 +2910,7 @@ yuno_in04,100,5,3 script Hot Bestseller Corner HIDDEN_NPC,{
}
yuno_in04,100,3,0 script #garas_path HIDDEN_WARP_NPC,1,1,{
-//OnTouch2:
-OnTouch2:
+OnTouch:
if (barmunt_crow == 6) {
mes "...................................";
next;
@@ -3572,7 +3569,6 @@ yuno_in04,167,120,3 script Worn-out Book#garas HIDDEN_NPC,{
}
que_ba,247,33,0 script #bpast_1_1 FAKE_NPC,1,1,{
-//OnTouch2:
OnTouch:
if (barmunt_crow < 4) {
warp "ama_dun03",119,110;
@@ -3640,7 +3636,6 @@ que_ba,183,25,0 warp #bpast_2to3_1 1,1,que_ba,72,25
que_ba,183,52,0 warp #bpast_2to3_2 1,1,que_ba,72,51
que_ba,102,56,0 script #3room_barmunt FAKE_NPC,3,3,{
-//OnTouch2:
OnTouch:
if (barmunt_crow < 4) {
warp "yuno_in04",100,3;
@@ -3712,7 +3707,6 @@ que_ba,99,51,7 script Grotesque Man#zid1 4_M_MUT1,{
}
que_ba,53,232,0 script #garas_f_yume HIDDEN_WARP_NPC,1,1,{
-//OnTouch2:
OnTouch:
if (barmunt_crow == 5) {
//GetHEALTHSTATE VAR_HEALTHSTATENORMAL 0
@@ -3757,7 +3751,6 @@ que_ba,48,227,7 script Grotesque Man#zid2 4_M_MUT1,{
}
que_ba,264,186,0 script #barmut_room1 HIDDEN_WARP_NPC,2,2,{
-//OnTouch2:
OnTouch:
if (barmunt_crow == 11) {
mes "^660000You wake up, and look around you. Somehow, you've now ended up in a huge mansion.^000000";
@@ -3797,7 +3790,6 @@ que_ba,270,181,3 script #barmunt_fire 4_M_SAGE_C,{
}
que_ba,270,270,0 script #barmunt_living HIDDEN_WARP_NPC,1,1,{
-//OnTouch2:
OnTouch:
mes "..................";
mes "..................";
@@ -3974,7 +3966,6 @@ cave,82,97,3 script Cave Settler#g1 4_M_CAVE1,3,3,{
close;
}
-//OnTouch2:
OnTouch:
if (barmunt_crow == 8) {
mes "[Cave Settler]";
@@ -6810,7 +6801,6 @@ prt_castle,368,312,4 script Prince#ern 4_M_2NDPRIN1,{
}
prt_castle,163,319,0 script #twonoble FAKE_NPC,3,3,{
-//OnTouch2:
OnTouch:
if (nkprince_eisen == 7) {
donpcevent "Young Noble#valter::OnEnable";
@@ -7723,7 +7713,6 @@ prt_castle,176,170,5 script Guard#princein 8W_SOLDIER,{
}
prt_castle,121,168,0 script #arm HIDDEN_NPC,4,4,{
-//OnTouch2:
OnTouch:
if (nk_prince == 8) {
mes "[" + strcharinfo(PC_NAME) + "]";
@@ -7744,7 +7733,6 @@ OnTouch:
}
prt_castle,316,313,0 script #arm1 HIDDEN_NPC,3,3,{
-//OnTouch2:
OnTouch:
if (nkprince_eisen > 14) {
mes "[" + strcharinfo(PC_NAME) + "]";
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index 3e3bb3414..4a9ab322b 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -1438,7 +1438,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{
mes "Oh... Did you get all the";
mes "materials?";
next;
- if (countitem(Log) > 29 && countitem(Tough_Vines) > 19 && countitem(Goat's_Horn) > 19 && countitem(Sea_Otter_Leather) > 9) {
+ if (countitem(Log) > 29 && countitem(Tough_Vines) > 19 && countitem(Goats_Horn) > 19 && countitem(Sea_Otter_Leather) > 9) {
mes "[Aged Stranger]";
mes "You found the right materials.";
mes "Okay, I will start to make the";
@@ -1446,7 +1446,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{
next;
delitem Log,30;
delitem Tough_Vines,20;
- delitem Goat's_Horn,20;
+ delitem Goats_Horn,20;
delitem Sea_Otter_Leather,10;
mos_whale_edq = 34;
mes "[Aged Stranger]";
@@ -4496,7 +4496,7 @@ mosk_in,215,46,5 script Baba Yaga, the Horrible 4_F_BABAYAGA,{
mes "Did you get";
mes "all of the items?";
next;
- setarray .@n, Grasshopper's_Leg,20,Spawn,5,Wing_Of_Red_Bat,20,Starsand_Of_Witch,10,Fine_Grit,10,Sticky_Mucus,10,Detonator,1,Boody_Red,5,Burning_Heart,10;
+ setarray .@n, Grasshoppers_Leg,20,Spawn,5,Wing_Of_Red_Bat,20,Starsand_Of_Witch,10,Fine_Grit,10,Sticky_Mucus,10,Detonator,1,Boody_Red,5,Burning_Heart,10;
for (.@i = 0; .@i < getarraysize(.@n); .@i += 2) {
if (countitem(.@n[.@i]) < .@n[.@i+1]) {
.@f = 1;
@@ -4591,7 +4591,7 @@ mosk_in,215,46,5 script Baba Yaga, the Horrible 4_F_BABAYAGA,{
mes "Did you get";
mes "all of them?";
next;
- setarray .@n, Grasshopper's_Leg,20,Spawn,5,Wing_Of_Red_Bat,20,Starsand_Of_Witch,10,Fine_Grit,10,Detonator,1,Boody_Red,5,Burning_Heart,10;
+ setarray .@n, Grasshoppers_Leg,20,Spawn,5,Wing_Of_Red_Bat,20,Starsand_Of_Witch,10,Fine_Grit,10,Detonator,1,Boody_Red,5,Burning_Heart,10;
for (.@i = 0; .@i < getarraysize(.@n); .@i += 2) {
if (countitem(.@n[.@i]) < .@n[.@i+1]) {
.@f = 1;
@@ -7350,15 +7350,15 @@ OnDisable:
end;
OnTimer3000:
- announce "Koshei, the Immortal : I will kill all who disturb me!! Cry in terror weak humans!!!",bc_map,0xCE3131;
+ mapannounce "mosk_dun01","Koshei, the Immortal : I will kill all who disturb me!! Cry in terror weak humans!!!",bc_map,0xCE3131;
end;
OnTimer63000:
- announce "Koshei, the Immortal : You worms, you mere monsters... I will curse all who are in my way!!",bc_map,0xCE3131;
+ mapannounce "mosk_dun01","Koshei, the Immortal : You worms, you mere monsters... I will curse all who are in my way!!",bc_map,0xCE3131;
end;
OnTimer150000:
- announce "Koshei, the Immortal : Mankind! Cry in terror!! Hahahahahahahhahahah!!!",bc_map,0xCE3131;
+ mapannounce "mosk_dun01","Koshei, the Immortal : Mankind! Cry in terror!! Hahahahahahahhahahah!!!",bc_map,0xCE3131;
end;
OnTimer300000:
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index 1371c93bf..0e0422530 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -2862,7 +2862,6 @@ que_temsky,99,100,6 script Pope#rachel2 4_F_ARUNA_POP,{
}
que_temsky,100,93,0 script #em_sky_s FAKE_NPC,5,2,{
-//OnTouch2:
OnTouch:
if (aru_em == 21) {
mes "^3355FFHigh Priest Zhed and High";
@@ -4252,7 +4251,6 @@ cmd_fild01,55,160,0 script Heap of Earth CLEAR_NPC,{
close;
}
-//OnTouch2:
OnTouch:
if (diamond_edq < 9) {
mes "[Dorian]";
@@ -5162,7 +5160,6 @@ moc_ruins,152,147,5 script Ibrahim 4_M_JOB_HUNTER,3,3,{
mes "kept it well hidden...";
close;
-//OnTouch2:
OnTouch:
if ((diamond_edq == 14) && (BaseLevel > 65)) {
mes "[Ibrahim]";
@@ -6861,7 +6858,6 @@ prt_in,168,18,1 script Valdes 1_M_YOUNGKNIGHT,2,2,{
mes "It's like my life is over...";
close;
-//OnTouch2:
OnTouch:
if (zdan_edq == 2) {
mes "[Valdes]";
@@ -8702,7 +8698,6 @@ OnInit:
$@mosnter = 0;
end;
-//OnTouch2:
OnTouch:
if (zdan_edq == 15) {
mes "^FF0000*Creak Creak*^000000";
@@ -11647,7 +11642,6 @@ OnTimer60000:
gef_fild08,182,182,0 script #CallGhost FAKE_NPC,2,2,{
end;
-//OnTouch2:
OnTouch:
if (jewel_nd == 21) {
if (countitem(Unlucky_Emerald) > 0) {
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index d443d5712..03b119456 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -186,7 +186,7 @@ prt_in,38,108,4 script Teacher 1_M_INNKEEPER,{
delitem Hinalle,1;
delitem Aloe,1;
delitem Ment,1;
- getitem 5012,1; //Ph.D_Hat
+ getitem(Ph_D_Hat, 1);
mes "[Teacher]";
mes "I really really appreciate you what you've done for me. I'm truly grateful. I will give my precious item to you as promised.";
next;
diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt
index c02caf857..6fc89a0cf 100644
--- a/npc/quests/quests_umbala.txt
+++ b/npc/quests/quests_umbala.txt
@@ -529,12 +529,12 @@ um_in,44,71,2 script Utan Shaman 4_F_UMOLDWOMAN,{
.@success = 993; //Yellow_Live
break;
case 2:
- .@consume = 946; //Snail's_Shell
+ .@consume = 946; //Snails_Shell
.@amount = 20;
.@success = 991; //Crystal_Blue
break;
case 3:
- .@consume = 904; //Scorpion's_Tail
+ .@consume = 904; //Scorpions_Tail
.@amount = 20;
.@success = 990; //Boody_Red
break;
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index d11563b8d..c6c95bc17 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -4516,7 +4516,7 @@ veins,115,59,5 script Saraman 4_M_EINOLD,{
close;
}
else if (rachel_camel == 8) {
- if ((countitem(Monster's_Feed) > 4) && (countitem(Yellow_Potion) > 0) && (countitem(Unripe_Apple) > 0) && (countitem(Empty_Bottle) > 0)) {
+ if ((countitem(Monsters_Feed) > 4) && (countitem(Yellow_Potion) > 0) && (countitem(Unripe_Apple) > 0) && (countitem(Empty_Bottle) > 0)) {
mes "[Camel Farm Owner Saraman]";
mes "Oh good, you're back.";
mes "Did you bring everything?";
@@ -4552,7 +4552,7 @@ veins,115,59,5 script Saraman 4_M_EINOLD,{
mes "ingredients. That's a good";
mes "amount to collect since that's";
mes "what Ms. Ivory usually orders.";
- delitem Monster's_Feed,5;
+ delitem Monsters_Feed,5;
delitem Yellow_Potion,1;
delitem Unripe_Apple,1;
delitem Empty_Bottle,1;
diff --git a/npc/quests/seals/sleipnir_seal.txt b/npc/quests/seals/sleipnir_seal.txt
index 5722d8e08..d3982699c 100644
--- a/npc/quests/seals/sleipnir_seal.txt
+++ b/npc/quests/seals/sleipnir_seal.txt
@@ -247,10 +247,10 @@ que_god01,98,98,4 script Manager#G 1_F_04,{
else if (.@god_treasure1 < 348) getitem Helm_,1;
else if (.@god_treasure1 < 400) getitem Gemmed_Sallet_,1;
else if (.@god_treasure1 < 448) getitem Circlet_,1;
- else if (.@god_treasure1 < 496) getitem Santa's_Hat,1;
- else if (.@god_treasure1 < 544) getitem Big_Sis'_Ribbon,1;
+ else if (.@god_treasure1 < 496) getitem Santas_Hat,1;
+ else if (.@god_treasure1 < 544) getitem Big_Sis_Ribbon,1;
else if (.@god_treasure1 < 592) getitem Sweet_Gents,1;
- else if (.@god_treasure1 < 640) getitem Oldman's_Romance,1;
+ else if (.@god_treasure1 < 640) getitem Oldmans_Romance,1;
else if (.@god_treasure1 < 688) getitem Western_Grace,1;
else if (.@god_treasure1 < 736) getitem Fillet,1;
else if (.@god_treasure1 < 784) getitem Holy_Bonnet,1;
@@ -287,7 +287,7 @@ que_god01,98,98,4 script Manager#G 1_F_04,{
else getitem Apple_Of_Archer,1;
}
else if (.@god_treasure < 501) {
- if (.@god_treasure1 < 80) getitem Adventurere's_Suit_,1;
+ if (.@god_treasure1 < 80) getitem Adventureres_Suit_,1;
else if (.@god_treasure1 < 160) getitem Mantle_,1;
else if (.@god_treasure1 < 240) getitem Coat_,1;
else if (.@god_treasure1 < 320) getitem Mink_Coat,1;
@@ -325,7 +325,7 @@ que_god01,98,98,4 script Manager#G 1_F_04,{
else if (.@god_treasure1 < 660) getitem Clip,1;
else if (.@god_treasure1 < 770) getitem Rosary,1;
else if (.@god_treasure1 < 880) getitem Mitten_Of_Presbyter,1;
- else getitem Matyr's_Flea_Guard,1;
+ else getitem Matyrs_Flea_Guard,1;
}
else {
if (.@god_treasure1 < 150) getitem Mr_Scream,1;
@@ -360,7 +360,7 @@ que_god01,98,98,4 script Manager#G 1_F_04,{
else if (.@god_treasure1 < 496) getitem Spinx_Helm,1;
else if (.@god_treasure1 < 544) getitem Corsair,1;
else if (.@god_treasure1 < 592) getitem Sweet_Gents,1;
- else if (.@god_treasure1 < 640) getitem Oldman's_Romance,1;
+ else if (.@god_treasure1 < 640) getitem Oldmans_Romance,1;
else if (.@god_treasure1 < 688) getitem Western_Grace,1;
else if (.@god_treasure1 < 736) getitem Spinx_Helm_,1;
else if (.@god_treasure1 < 784) getitem Holy_Bonnet_,1;
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/knight_skills.txt b/npc/quests/skills/knight_skills.txt
index 3e177243a..1230ecab9 100644
--- a/npc/quests/skills/knight_skills.txt
+++ b/npc/quests/skills/knight_skills.txt
@@ -332,7 +332,6 @@ prt_in,85,99,3 script Knight#kabuto 4_M_JOB_KNIGHT2,{
}
prontera,69,351,0 script #tour HIDDEN_NPC,5,5,{
-//OnTouch2:
OnTouch:
if (KNGT_SK > 2)
end;
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;
diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt
index 2ed7ad703..dd3750543 100644
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@@ -307,7 +307,7 @@ prt_in,227,45,0 script Archeologist#sign 1_M_SIGN1,{
mes "know right away. For now,";
mes "please hold on to these pieces.";
sign_q = 54;
- getitem Part_Of_Star's_Sob,1;
+ getitem Part_Of_Stars_Sob,1;
}
else if (sign_q == 54) {
if (rand(1,5) == 4) {
@@ -736,19 +736,19 @@ prt_in,227,45,0 script Archeologist#sign 1_M_SIGN1,{
mes "accept this as a token";
mes "of my gratitude. Good luck";
mes "on your travels, adventurer.";
- if (checkweight(Star's_Sob,1) == 0) {
+ if (checkweight(Stars_Sob,1) == 0) {
next;
mes "^3355FFWait a second! Right now,";
mes "you have too many items in your inventory. Please come back after you've freed up more inventory space.^000000";
close;
}
- delitem Star's_Sob,1;
+ delitem Stars_Sob,1;
sign_q = 202;
getexp RENEWAL_EXP?10000:100000,0;
getitem Old_Violet_Box,1;
}
else if (sign_q > 201) {
- if (countitem(Star's_Sob) == 1) {
+ if (countitem(Stars_Sob) == 1) {
mes "I'm sorry...";
mes "But I'm taking";
mes "back the Sobbing";
@@ -759,7 +759,7 @@ prt_in,227,45,0 script Archeologist#sign 1_M_SIGN1,{
mes "[Metz]";
mes "......";
mes "Farewell.";
- delitem Star's_Sob,1;
+ delitem Stars_Sob,1;
}
else {
mes "I guess I can't";
@@ -1305,8 +1305,8 @@ morocc_in,115,154,5 script Rogue#sign 1_M_SIGNROGUE,{
delitem Fluff,100;
if (countitem(Poison_Spore) > 49) {
delitem Poison_Spore,50;
- if (countitem(Scorpion's_Tail) > 29) {
- delitem Scorpion's_Tail,30;
+ if (countitem(Scorpions_Tail) > 29) {
+ delitem Scorpions_Tail,30;
if (countitem(Rotten_Bandage) > 19) {
delitem Rotten_Bandage,20;
if (countitem(Petite_DiablOfs_Horn) > 14) {
@@ -1335,8 +1335,8 @@ morocc_in,115,154,5 script Rogue#sign 1_M_SIGNROGUE,{
mes "...";
if (countitem(Poison_Spore) > 49) {
delitem Poison_Spore,50;
- if (countitem(Scorpion's_Tail) > 29) {
- delitem Scorpion's_Tail,30;
+ if (countitem(Scorpions_Tail) > 29) {
+ delitem Scorpions_Tail,30;
if (countitem(Rotten_Bandage) > 19) {
delitem Rotten_Bandage,20;
if (countitem(Petite_DiablOfs_Horn) > 14) {
@@ -1364,8 +1364,8 @@ morocc_in,115,154,5 script Rogue#sign 1_M_SIGNROGUE,{
case 6:
mes "[Arian]";
mes "...";
- if (countitem(Scorpion's_Tail) > 29) {
- delitem Scorpion's_Tail,30;
+ if (countitem(Scorpions_Tail) > 29) {
+ delitem Scorpions_Tail,30;
if (countitem(Rotten_Bandage) > 19) {
delitem Rotten_Bandage,20;
if (countitem(Petite_DiablOfs_Horn) > 14) {
@@ -1526,7 +1526,7 @@ morocc_in,115,154,5 script Rogue#sign 1_M_SIGNROGUE,{
else getexp 18000,0;
}
sign_q = 14;
- getitem Part_Of_Star's_Sob,1;
+ getitem Part_Of_Stars_Sob,1;
close;
case 14:
mes "[Arian]";
@@ -1910,7 +1910,7 @@ payon_in03,11,31,4 script Daewoon#sign 1_M_SIGNMONK2,{
mes "Come and drink with me~";
}
next;
- if (countitem(Part_Of_Star's_Sob) > 0) {
+ if (countitem(Part_Of_Stars_Sob) > 0) {
.@pay_point = 1;
mes "["+ strcharinfo(PC_NAME) +"]";
mes "Sure...";
@@ -2381,7 +2381,7 @@ payon_in03,11,31,4 script Daewoon#sign 1_M_SIGNMONK2,{
}
if (.@pay_point > 29) {
sign_q = 15;
- getitem Part_Of_Star's_Sob,1;
+ getitem Part_Of_Stars_Sob,1;
if (RENEWAL_EXP) {
if (BaseLevel < 60) getexp 300,0;
else if (BaseLevel < 70) getexp 750,0;
@@ -2425,7 +2425,7 @@ payon_in03,11,31,4 script Daewoon#sign 1_M_SIGNMONK2,{
}
else if ((.@pay_point > 26) && (.@pay_point < 30)) {
sign_q = 15;
- getitem Part_Of_Star's_Sob,1;
+ getitem Part_Of_Stars_Sob,1;
if (RENEWAL_EXP) {
if (BaseLevel < 60) getexp 300,0;
else if (BaseLevel < 70) getexp 750,0;
@@ -2826,7 +2826,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 1_M_SIGNALCHE,7,7,{
mes "relying on a rumor...";
next;
sign_q = 20;
- getitem Part_Of_Star's_Sob,1;
+ getitem Part_Of_Stars_Sob,1;
mes "[Sir Jore]";
mes "Thank you very much";
mes "for helping me. Now I can";
@@ -3680,7 +3680,7 @@ geffen_in,59,74,4 script Jesqurienne#sign 1_F_SIGNZISK,{
next;
mes "[Jesqurienne]";
sign_q = 25;
- getitem Part_Of_Star's_Sob,1;
+ getitem Part_Of_Stars_Sob,1;
mes "Here...";
mes "My old friend, Metz, told";
mes "me to give this to someone";
@@ -4746,7 +4746,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{
mes "go find someone named,";
mes "um, ''Bakerlan'' in Alberta.";
sign_q = 35;
- getitem Part_Of_Star's_Sob,1;
+ getitem Part_Of_Stars_Sob,1;
if (RENEWAL_EXP) {
if (BaseLevel < 60) getexp 300,0;
else if (BaseLevel < 70) getexp 700,0;
@@ -4783,7 +4783,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{
mes "go find someone named,";
mes "um, ''Bakerlan'' in Alberta.";
sign_q = 35;
- getitem Part_Of_Star's_Sob,1;
+ getitem Part_Of_Stars_Sob,1;
Zeny += 20000;
if (RENEWAL_EXP) {
if (BaseLevel < 60) getexp 300,0;
@@ -5165,8 +5165,8 @@ OnInit:
end;
OnEnable:
- specialeffect EF_SUMMONSLAVE;
enablenpc "s_dance#up";
+ specialeffect EF_SUMMONSLAVE;
end;
OnDisable:
@@ -5221,8 +5221,8 @@ OnInit:
end;
OnEnable:
- specialeffect EF_SUMMONSLAVE;
enablenpc "s_dance#down";
+ specialeffect EF_SUMMONSLAVE;
end;
OnDisable:
@@ -5298,8 +5298,8 @@ OnInit:
OnEnable:
- specialeffect EF_SUMMONSLAVE;
enablenpc "s_dance#left";
+ specialeffect EF_SUMMONSLAVE;
end;
OnDisable:
@@ -5366,8 +5366,8 @@ OnInit:
end;
OnEnable:
- specialeffect EF_SUMMONSLAVE;
enablenpc "s_dance#right";
+ specialeffect EF_SUMMONSLAVE;
end;
OnDisable:
@@ -5440,8 +5440,8 @@ OnInit:
end;
OnEnable:
- specialeffect EF_SUMMONSLAVE;
enablenpc "s_dance#cen";
+ specialeffect EF_SUMMONSLAVE;
end;
OnDisable:
@@ -5571,7 +5571,7 @@ alberta_in,125,101,5 script Wealthy-looking Merchant 1_M_SIGNMCNT,{
mes "my time is quite precious.";
close;
case 2:
- if (countitem(Part_Of_Star's_Sob) < 5) {
+ if (countitem(Part_Of_Stars_Sob) < 5) {
mes "[Bakerlan]";
mes "Hmm, I suppose you";
mes "still haven't completed";
@@ -5580,7 +5580,7 @@ alberta_in,125,101,5 script Wealthy-looking Merchant 1_M_SIGNMCNT,{
mes "Starlight, you know...";
close;
}
- else if (countitem(Part_Of_Star's_Sob) == 5) {
+ else if (countitem(Part_Of_Stars_Sob) == 5) {
mes "[Bakerlan]";
mes "Ah, now I see that";
mes "you speak the truth.";
@@ -5655,7 +5655,7 @@ alberta_in,125,101,5 script Wealthy-looking Merchant 1_M_SIGNMCNT,{
mes "Now bring all of the stone pieces to Metz.";
mes "He will tell you what you need to do next.";
sign_q = 53;
- getitem Part_Of_Star's_Sob,1;
+ getitem Part_Of_Stars_Sob,1;
if (RENEWAL_EXP) {
if (BaseLevel < 60) getexp 500,0;
else if (BaseLevel < 70) getexp 800,0;
@@ -6287,7 +6287,7 @@ alde_alche,169,162,7 script Alchemist#sign 4_M_ALCHE_B,{
mes "everything ready...";
next;
mes "[Melkaba]";
- if ((countitem(Royal_Jelly) < 10) || (countitem(Honey) < 20) || (countitem(Bear's_Foot) < 30) || (countitem(Leaflet_Of_Hinal) < 1) || (countitem(Ment) < 1) || (countitem(Empty_Bottle) < 1)) {
+ if ((countitem(Royal_Jelly) < 10) || (countitem(Honey) < 20) || (countitem(Bears_Foot) < 30) || (countitem(Leaflet_Of_Hinal) < 1) || (countitem(Ment) < 1) || (countitem(Empty_Bottle) < 1)) {
mes "Hmm, you're still";
mes "missing some of the";
mes "ingredients. Now, listen";
@@ -6358,7 +6358,7 @@ alde_alche,169,162,7 script Alchemist#sign 4_M_ALCHE_B,{
Zeny -= 10000;
delitem Royal_Jelly,10;
delitem Honey,20;
- delitem Bear's_Foot,30;
+ delitem Bears_Foot,30;
delitem Leaflet_Of_Hinal,1;
delitem Ment,1;
delitem Empty_Bottle,1;
@@ -6376,7 +6376,7 @@ alde_alche,169,162,7 script Alchemist#sign 4_M_ALCHE_B,{
specialeffect EF_PHARMACY_FAIL;
delitem Royal_Jelly,10;
delitem Honey,20;
- delitem Bear's_Foot,30;
+ delitem Bears_Foot,30;
delitem Leaflet_Of_Hinal,1;
delitem Ment,1;
delitem Empty_Bottle,1;
@@ -7279,7 +7279,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 4_M_03,{
mes "[Engel]";
mes "Right. Let me guide you to a shortcut to the exit of these mines, just in case you don't know your way out of here. Good luck~";
delitem Picture_Letter,1;
- delitem Part_Of_Star's_Sob,7;
+ delitem Part_Of_Stars_Sob,7;
sign_q = 57;
close2;
warp "mjo_dun02",371,344;
@@ -7386,7 +7386,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 4_M_03,{
mes "While you were gone, I managed to restore this Sobbing Starlight. Why don't you go ahead and take a look?";
next;
sign_q = 71;
- getitem Star's_Sob,1;
+ getitem Stars_Sob,1;
specialeffect2 EF_YUFITELHIT;
next;
mes "[Engel]";
@@ -7506,7 +7506,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 4_M_03,{
if (countitem(Golden_Anvil) > 0) delitem Golden_Anvil,1;
else if (countitem(Emperium_Anvil) > 0) delitem Emperium_Anvil,1;
sign_q = 71;
- getitem Star's_Sob,1;
+ getitem Stars_Sob,1;
specialeffect2 EF_YUFITELHIT;
close;
}
@@ -8636,7 +8636,7 @@ que_sign01,196,39,4 script Serin#serin 4_F_01,{
.@fail_s3 = rand(1,600);
.@fail_s4 = rand(1,500);
.@fail_s5 = rand(1,400);
- if (countitem(Serin's_Gold_Ring_) == 1) {
+ if (countitem(Serins_Gold_Ring_) == 1) {
if (((sign_sq == 0) && (.@fail_s3 == 356)) || ((sign_sq == 1) && (.@fail_s2 == 356)) || (.@fail_s1 == 356)) {
sign_q = 200;
mes "[Serin]";
@@ -8829,7 +8829,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{
}
}
else if (sign_q == 125) {
- if (countitem(Serin's_Gold_Ring_) ==1) {
+ if (countitem(Serins_Gold_Ring_) ==1) {
mes "[Serin]";
mes "If you think that";
mes "I can't summon Dark Lord";
@@ -8957,7 +8957,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{
mes "Farewell, now.";
mes "And good luck on";
mes "your travels, my friend...";
- delitem Witch's_Potion,1;
+ delitem Witchs_Potion,1;
sign_q = 127;
close;
}
@@ -8977,9 +8977,9 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{
.@fail_s3 = rand(1,800);
.@fail_s4 = rand(1,700);
.@fail_s5 = rand(1,600);
- if (countitem(Serin's_Gold_Ring_) == 1) {
+ if (countitem(Serins_Gold_Ring_) == 1) {
if (((sign_sq == 0) && (.@fail_s3 == 356)) || ((sign_sq == 1) && (.@fail_s2 == 356)) || (.@fail_s1 == 356)) {
- delitem Witch's_Potion,1;
+ delitem Witchs_Potion,1;
sign_q = 200;
mes "[Serin]";
mes "Even though you tried";
@@ -9026,7 +9026,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{
}
else {
if (((sign_sq == 0) && (.@fail_s5 == 356)) || ((sign_sq == 1) && (.@fail_s4 == 356)) || (.@fail_s3 == 356)) {
- delitem Witch's_Potion,1;
+ delitem Witchs_Potion,1;
sign_q = 200;
mes "[Serin]";
mes "Even though you tried";
@@ -9219,7 +9219,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{
mes "I want you to have this ring. It's the only way I can properly express my gratitude for your aid so far.";
sign_q = 85;
sign_sq = 0;
- getitem Serin's_Gold_Ring,1;
+ getitem Serins_Gold_Ring,1;
close;
}
else {
@@ -9271,7 +9271,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{
close;
}
else if (sign_q == 92) {
- if (countitem(Serin's_Gold_Ring) > 0) {
+ if (countitem(Serins_Gold_Ring) > 0) {
mes "[Serin]";
mes "Ah, "+strcharinfo(PC_NAME)+"~";
mes "How is everything?";
@@ -9530,7 +9530,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{
mes "...";
mes "......";
mes "..........";
- if (countitem(Serin's_Gold_Ring_) == 1) {
+ if (countitem(Serins_Gold_Ring_) == 1) {
next;
switch(select("Give Serin her ring.", "Keep the ring.")) {
case 1:
@@ -9563,7 +9563,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{
mes "to forget her sadness. The tears streaked across her cheeks and";
mes "the faint smile on her lips tell you that her memories of you";
mes "will always remain in her heart.^000000";
- delitem Serin's_Gold_Ring_,1;
+ delitem Serins_Gold_Ring_,1;
getexp RENEWAL_EXP?50000:500000,0;
close;
case 2:
@@ -9729,23 +9729,23 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{
mes "of her soul and memories that";
mes "you can still sense somehow.";
mes "What could have happened to her?^000000";
- if (countitem(Serin's_Gold_Ring) > 0) {
+ if (countitem(Serins_Gold_Ring) > 0) {
next;
mes "^33555FFSuddenly, Serin's";
mes "gold ring sparkled";
mes "with a soft glow and";
mes "faded away.^000000";
- delitem Serin's_Gold_Ring,1;
+ delitem Serins_Gold_Ring,1;
close;
}
close;
}
else {
- if (countitem(Serin's_Gold_Ring) > 0) {
+ if (countitem(Serins_Gold_Ring) > 0) {
mes "[Serin]";
mes "Thank you...";
emotion e_sob;
- delitem Serin's_Gold_Ring,1;
+ delitem Serins_Gold_Ring,1;
next;
mes "^3355FFYou returned";
mes "Serin's gold ring.^000000";
@@ -9809,7 +9809,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{
}
}
if (sign_q == 90) {
- if (countitem(Serin's_Gold_Ring) == 1) {
+ if (countitem(Serins_Gold_Ring) == 1) {
mes "That bastard stole";
mes "two spell books from me.";
mes "You've brought one of them";
@@ -9834,7 +9834,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{
}
}
else if (sign_q == 91) {
- if (countitem(Witch's_Spell_Book) > 0) {
+ if (countitem(Witchs_Spell_Book) > 0) {
mes "Once that fool stole my spell";
mes "books, he was cursed after he";
mes "cast those spells without my";
@@ -9912,7 +9912,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{
mes "that the Queen of the Dead";
mes "is searching for her lost mother, Angrboda. Now, if you could find where Angrboda has been";
mes "sealed away...";
- delitem Witch's_Spell_Book,1;
+ delitem Witchs_Spell_Book,1;
sign_q = 92;
close;
}
@@ -10023,12 +10023,12 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{
}
}
else if (sign_q == 119) {
- if (countitem(Serin's_Gold_Ring) > 0) {
+ if (countitem(Serins_Gold_Ring) > 0) {
mes "This is Serin's gold ring?";
mes "Excellent, this has been";
mes "strongly infused with her";
mes "vibes. It's really tough to find something like this that resonates so strongly with its owner.";
- delitem Serin's_Gold_Ring,1;
+ delitem Serins_Gold_Ring,1;
sign_q = 120;
close;
}
@@ -10205,8 +10205,8 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{
mes "of the vouchers I've";
mes "given you, alright?";
sign_q = 124;
- getitem Witch's_Potion,1;
- getitem Serin's_Gold_Ring_,1;
+ getitem Witchs_Potion,1;
+ getitem Serins_Gold_Ring_,1;
getitem Seal_Of_Witch,5;
close;
}
@@ -10241,7 +10241,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{
mes "the Witch's Medals that";
mes "I've lent to you, alright?";
sign_q = 124;
- getitem Witch's_Potion,1;
+ getitem Witchs_Potion,1;
getitem Seal_Of_Witch,5;
close;
}
@@ -10254,7 +10254,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{
mes "these preparations...";
close;
}
- if (countitem(Serin's_Gold_Ring_) == 1) {
+ if (countitem(Serins_Gold_Ring_) == 1) {
mes "You're finally";
mes "back. We might not";
mes "have enough time to";
@@ -10301,7 +10301,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{
}
}
else if ((sign_q == 127) || (sign_q == 128)) {
- if (countitem(Serin's_Gold_Ring_) == 1) {
+ if (countitem(Serins_Gold_Ring_) == 1) {
if (countitem(Seal_Of_Witch) < 5) {
mes "Hmmm...?";
mes "Where are all the";
@@ -10379,7 +10379,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{
mes "you so much for your";
mes "help. Once you finish here,";
mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason...";
- if (countitem(Serin's_Gold_Ring_) == 1) sign_q = 129;
+ if (countitem(Serins_Gold_Ring_) == 1) sign_q = 129;
else sign_q = 130;
getexp RENEWAL_EXP?30000:300000,0;
close;
@@ -10408,8 +10408,8 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{
mes "her for that. Though, it's";
mes "ironic that you failed your";
mes "ordeals for her sake...";
- if (countitem(Serin's_Gold_Ring) > 0) delitem Serin's_Gold_Ring,1;
- if (countitem(Witch's_Potion) > 0) delitem Witch's_Potion,1;
+ if (countitem(Serins_Gold_Ring) > 0) delitem Serins_Gold_Ring,1;
+ if (countitem(Witchs_Potion) > 0) delitem Witchs_Potion,1;
sign_q = 201;
getexp RENEWAL_EXP?20000:200000,0;
close;
@@ -10442,7 +10442,7 @@ OnTouch:
callfunc "F_UpdateSignVars";
if (sign_q == 83) {
if (sign_sq == 2) {
- if (countitem(Witch's_Spell_Book) > 0) {
+ if (countitem(Witchs_Spell_Book) > 0) {
mes "[Kirkena]";
mes "W-what's this?";
mes "Why is it that";
@@ -10480,7 +10480,7 @@ OnTouch:
mes "give you this. It will send";
mes "a living human back to one";
mes "of the towns in your realm.";
- delitem Witch's_Spell_Book,1;
+ delitem Witchs_Spell_Book,1;
sign_sq = 3;
getitem Wing_Of_Crow,1;
close;
@@ -10587,7 +10587,7 @@ OnTouch:
close;
}
else if (sign_q == 88) {
- if (countitem(Serin's_Gold_Ring) > 0) {
+ if (countitem(Serins_Gold_Ring) > 0) {
mes "[Kirkena]";
mes "As I expected,";
mes "there is something behind";
@@ -10865,7 +10865,7 @@ que_sign01,45,227,4 script Queen of the Dead 2_F_SIGN1,{
mes "Now, I shall show";
mes "you something truly";
mes "interesting...^000000";
- delitem Star's_Sob,1;
+ delitem Stars_Sob,1;
sign_q = 143;
close;
case 2:
@@ -10913,7 +10913,7 @@ que_sign01,45,227,4 script Queen of the Dead 2_F_SIGN1,{
mes "Sobbing Starlight.^000000";
next;
sign_q = 144;
- getitem Lucifer's_Lament,1;
+ getitem Lucifers_Lament,1;
mes "[Lady Hell]";
mes "^8C1717Although you may also know";
mes "this object as God's Tear Drop, keep in mind that history, as you humans know it, may actually be different than the truth.^000000";
@@ -10962,7 +10962,7 @@ niflheim,146,241,0 script Depressing Man 4_M_JOB_WIZARD,{
close;
}
else if (sign_q == 87) {
- if (countitem(Serin's_Gold_Ring) > 1) {
+ if (countitem(Serins_Gold_Ring) > 1) {
mes "[Gen]";
mes "You lookin' for";
mes "something? Crayu";
@@ -11736,12 +11736,12 @@ OnTouch:
if (sign_q == 83) {
if(sign_sq == 0) {
sign_sq = 1;
- getitem Witch's_Spell_Book,1;
+ getitem Witchs_Spell_Book,1;
}
}
else if (sign_q == 90) {
sign_q = 91;
- getitem Witch's_Spell_Book,1;
+ getitem Witchs_Spell_Book,1;
}
close;
}
@@ -11977,11 +11977,11 @@ function script F_SignSeal {
mes "more powerful to break the seal...^000000";
close;
}
- if (countitem(Girl's_Diary) || countitem(Rapture_Rose)) {
+ if (countitem(Girls_Diary) || countitem(Rapture_Rose)) {
if (getarg(0) < 980) F_SealFail; }
else if (countitem(Weeder_Knife) || countitem(Combat_Knife) || countitem(Princess_Knife) || countitem(Cursed_Dagger) || countitem(Lariat) || countitem(Kaiser_Knuckle)) {
if (getarg(0) < 960) F_SealFail; }
- else if (countitem(Bow_Of_Roguemaster) || countitem(Nagan) || countitem(Fire_Brand) || countitem(Forturn_Sword) || countitem(Mama's_Knife) || countitem(Bazerald) || countitem(Gungnir) || countitem(Berserk) || countitem(Counter_Dagger)) {
+ else if (countitem(Bow_Of_Roguemaster) || countitem(Nagan) || countitem(Fire_Brand) || countitem(Forturn_Sword) || countitem(Mamas_Knife) || countitem(Bazerald) || countitem(Gungnir) || countitem(Berserk) || countitem(Counter_Dagger)) {
if (getarg(0) < 940) F_SealFail; }
else if (countitem(Ice_Falchon) || countitem(House_Auger) || countitem(Assasin_Dagger)) {
if (getarg(0) < 920) F_SealFail; }
@@ -12003,7 +12003,7 @@ function script F_SignSeal {
if (getarg(0) < 760) F_SealFail; }
else if (countitem(Sabbath) || countitem(Right_Epsilon) || countitem(Wizardy_Staff)) {
if (getarg(0) < 740) F_SealFail; }
- else if (countitem(Slaughter) || countitem(Tomahawk) || countitem(Crescent_Scythe) || countitem(Longinus's_Spear)) {
+ else if (countitem(Slaughter) || countitem(Tomahawk) || countitem(Crescent_Scythe) || countitem(Longinuss_Spear)) {
if (getarg(0) < 720) F_SealFail; }
else if (countitem(Guillotine) || countitem(Brionac)) {
if (getarg(0) < 700) F_SealFail; }
@@ -12283,7 +12283,7 @@ OnTimer45000:
geffen,119,48,0 script Fountain#s HIDDEN_NPC,{
callfunc "F_UpdateSignVars";
- if (countitem(Lucifer's_Lament) > 0) {
+ if (countitem(Lucifers_Lament) > 0) {
mes "^3355FFAs you approach the fountain,";
mes "a strange light begins to emit from the Lucifer's Lament in your pocket and from something deep within";
mes "the fountain's water.^000000";
diff --git a/npc/re/events/halloween_2013.txt b/npc/re/events/halloween_2013.txt
index 6f16d437c..acfd60f9f 100644
--- a/npc/re/events/halloween_2013.txt
+++ b/npc/re/events/halloween_2013.txt
@@ -267,7 +267,7 @@ L_Explain:
niflheim,181,173,5 script Chef Candycon#2013HE 4_M_NFDEADSWDMAN,{
if (eve_bs == 1) {
- if (countitem(Organic_Pumpkin) * 3 + countitem(Inorganic_Pumpkin) >= 30) {
+ if (countitem(ORGANIC_PUMPKIN) * 3 + countitem(INORGANIC_PUMPKIN) >= 30) {
mes "[Chef Candycon]";
mes "Clang~Clang~!";
next;
@@ -400,16 +400,16 @@ L_GivePumpkin:
mes "Eeh~~ You have no use for those pumpkins~~";
close;
}
- if (countitem(Organic_Pumpkin) * 3 + countitem(Inorganic_Pumpkin) < 30) {
+ if (countitem(ORGANIC_PUMPKIN) * 3 + countitem(INORGANIC_PUMPKIN) < 30) {
mes "[Chef Candycon]";
mes "Ooops where is pumpkin? escaped again?";
mes "Oh, boy...no... you should go to get them again...";
close;
}
- if (countitem(Inorganic_Pumpkin))
- delitem Inorganic_Pumpkin,countitem(Inorganic_Pumpkin);
- if (countitem(Organic_Pumpkin))
- delitem Organic_Pumpkin,countitem(Organic_Pumpkin);
+ if (countitem(INORGANIC_PUMPKIN))
+ delitem INORGANIC_PUMPKIN, countitem(INORGANIC_PUMPKIN);
+ if (countitem(ORGANIC_PUMPKIN))
+ delitem ORGANIC_PUMPKIN, countitem(ORGANIC_PUMPKIN);
eve_bs = 2;
getitem HALLOWEEN_G_BOX,1;
erasequest 11378;
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index 0b21767f7..bf099cd2d 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -2226,7 +2226,7 @@ OnEnable:
end;
}
-// Merchant, and Trade NPC - Get Temporal Boots --> exchange to Temporal_STAT_Boots
+// Merchant, and Trade NPC - Get Temporal Boots --> exchange to Temporal_*_Boots
// Upon trade all refines got removed
// Uses Temporal_Crystal
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -2275,7 +2275,7 @@ glast_01,210,273,5 script Hugin's Butler 1_F_04,{
mes("You can trade ^0000FF1 Temporal Boots and 5 Temporal Crystals^000000 for 1 of the following items. ^FF0000Previous refine rate will not be retained with these new ones^000000.");
next;
setarray .@type$[0], "Strength", "Intelligence", "Agility", "Vitality", "Dexterity", "Luck";
- setarray .@equip_type[0], Temporal_STR_Boots, Temporal_INT_Boots, Temporal_AGI_Boots, Temporal_VIT_Boots, Temporal_DEX_Boots, Temporal_LUK_Boots;
+ setarray .@equip_type[0], Temporal_Str_Boots, Temporal_Int_Boots, Temporal_Agi_Boots, Temporal_Vit_Boots, Temporal_Dex_Boots, Temporal_Luk_Boots;
.@select = select("Cancel", "Str Boots", "Int Boots", "Agi Boots", "Vit Boots", "Dex Boots", "Luk Boots");
switch (.@select) {
case 1:
@@ -2296,7 +2296,7 @@ glast_01,210,273,5 script Hugin's Butler 1_F_04,{
mes("The boots has been upgraded as you want.");
delequip .@part;
delitem Temporal_Crystal, 5;
- getitem2 .@equip_type[.@select-2], 1, 1, 0, 0, 0, 0, 0, 0; // Temporal_STR_Boots, Temporal_INT_Boots, Temporal_AGI_Boots, Temporal_VIT_Boots, Temporal_DEX_Boots, Temporal_LUK_Boots
+ getitem2 .@equip_type[.@select-2], 1, 1, 0, 0, 0, 0, 0, 0; // Temporal_Str_Boots, Temporal_Int_Boots, Temporal_Agi_Boots, Temporal_Vit_Boots, Temporal_Dex_Boots, Temporal_Luk_Boots
close;
}
mes("[Hugin's Butler]");
@@ -2307,7 +2307,7 @@ glast_01,210,273,5 script Hugin's Butler 1_F_04,{
}
// Enchant NPC - Coagulated Spell to enchants on 4th slot. First one to pick --> upgraded --> additional random enchant on 3rd slot
-// Adding a socket on the Craftsman NPC will remove the 3rd and 4th slot enchants of the Temporal_STAT_Boots
+// Adding a socket on the Craftsman NPC will remove the 3rd and 4th slot enchants of the Temporal_*_Boots
// Enchanting can fail, the 3th slot random one is guaranteed
// Refine remains
// Item Used: Coagulated_Spell
@@ -2371,18 +2371,18 @@ glast_01,212,273,4 script Hugin's Magic Master 1_F_01,{ // Custom text due to of
setarray .@enchant_rate[0], 90, 80, 70, 50, 100; // Enchant Success Rate in %
.@random = rand(1, 100);
switch (.@equip_id) {
- case Temporal_STR_Boots:
- case Temporal_INT_Boots:
- case Temporal_AGI_Boots:
- case Temporal_VIT_Boots:
- case Temporal_DEX_Boots:
- case Temporal_LUK_Boots:
- case Temporal_STR_Boots_:
- case Temporal_INT_Boots_:
- case Temporal_AGI_Boots_:
- case Temporal_VIT_Boots_:
- case Temporal_DEX_Boots_:
- case Temporal_LUK_Boots_:
+ case Temporal_Str_Boots:
+ case Temporal_Int_Boots:
+ case Temporal_Agi_Boots:
+ case Temporal_Vit_Boots:
+ case Temporal_Dex_Boots:
+ case Temporal_Luk_Boots:
+ case Temporal_Str_Boots_:
+ case Temporal_Int_Boots_:
+ case Temporal_Agi_Boots_:
+ case Temporal_Vit_Boots_:
+ case Temporal_Dex_Boots_:
+ case Temporal_Luk_Boots_:
if (.@card3 == 0) { //4th slot 1st try enchanting
.@cost = .@enchant_cost[0];
.@scs = .@enchant_rate[0];
@@ -2450,7 +2450,7 @@ glast_01,212,273,4 script Hugin's Magic Master 1_F_01,{ // Custom text due to of
case MHP2:
case Attack_Delay_4:
case Luck6:
- .@enchant = callfunc("F_Rand", Bear's_Power, Runaway_Magic, Speed_Of_Light, Muscle_Fool, Hawkeye, Lucky_Day);
+ .@enchant = callfunc("F_Rand", Bears_Power, Runaway_Magic, Speed_Of_Light, Muscle_Fool, Hawkeye, Lucky_Day);
mes("[Hugin's Magic Master]"); // Custom text
mes("Seems you already completed the best upgrade option in your 4th slot. For that I can give a random bonus effect to your 3rd slot. And of course, with certain payment...");
next;
@@ -2566,9 +2566,9 @@ glast_01,212,273,4 script Hugin's Magic Master 1_F_01,{ // Custom text due to of
close;
}
-// Socket NPC - Contaminated_Magic or Temporal_Crystal to add card slot
+// Socket NPC - Corrupted_Charm or Temporal_Crystal to add card slot
// After the boots were slotted, you can still enchant, but slotting removes any enchants and refines applied before.
-// Item Used: Contaminated_Magic, Temporal_Crystal
+// Item Used: Corrupted_Charm, Temporal_Crystal
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{
disable_items;
@@ -2601,12 +2601,12 @@ glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{
}
.@equip_id = getequipid(.@part);
switch (.@equip_id) {
- case Temporal_STR_Boots:
- case Temporal_INT_Boots:
- case Temporal_AGI_Boots:
- case Temporal_VIT_Boots:
- case Temporal_DEX_Boots:
- case Temporal_LUK_Boots:
+ case Temporal_Str_Boots:
+ case Temporal_Int_Boots:
+ case Temporal_Agi_Boots:
+ case Temporal_Vit_Boots:
+ case Temporal_Dex_Boots:
+ case Temporal_Luk_Boots:
mes("[Hugin's Craftsman]");
mes("The ^FF0000Boots and all enchants or refines will be lost if you fail this.^000000\r"
"Still want to risk it?");
@@ -2629,7 +2629,7 @@ glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{
mes("Then my last question:\r"
"Which item are you gonna use to pay me?");
next;
- setarray .@slotpay[0], Temporal_Crystal, Contaminated_Magic;
+ setarray .@slotpay[0], Temporal_Crystal, Corrupted_Charm;
setarray .@slotcost[0], 10, 50;
setarray .@slotchance[0], 80, 65; // Custom rates
.@select = select("Cancel", "Temporal Crystal", "Contaminated Magic");
@@ -2664,18 +2664,18 @@ glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{
specialeffect2 EF_PHARMACY_OK;
delequip .@part;
// todo: read aegis name and attach "_" to worn constant
- if (.@equip_id == Temporal_STR_Boots) {
- getitem2 Temporal_STR_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
- } else if (.@equip_id == Temporal_INT_Boots) {
- getitem2 Temporal_INT_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
- } else if (.@equip_id == Temporal_AGI_Boots) {
- getitem2 Temporal_AGI_Boots_, 1, 1, 0, 0, 0, 0, .0, 0;
- } else if (.@equip_id == Temporal_VIT_Boots) {
- getitem2 Temporal_VIT_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
- } else if (.@equip_id == Temporal_DEX_Boots) {
- getitem2 Temporal_DEX_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
- } else if (.@equip_id == Temporal_LUK_Boots) {
- getitem2 Temporal_LUK_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
+ if (.@equip_id == Temporal_Str_Boots) {
+ getitem2 Temporal_Str_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
+ } else if (.@equip_id == Temporal_Int_Boots) {
+ getitem2 Temporal_Int_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
+ } else if (.@equip_id == Temporal_Agi_Boots) {
+ getitem2 Temporal_Agi_Boots_, 1, 1, 0, 0, 0, 0, .0, 0;
+ } else if (.@equip_id == Temporal_Vit_Boots) {
+ getitem2 Temporal_Vit_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
+ } else if (.@equip_id == Temporal_Dex_Boots) {
+ getitem2 Temporal_Dex_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
+ } else if (.@equip_id == Temporal_Luk_Boots) {
+ getitem2 Temporal_Luk_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
}
close;
default:
@@ -2699,7 +2699,7 @@ glast_01,188,273,5 script White Knight#1a 4_WHITEKNIGHT,{
mes("I exchange you a White Knight Card for ^0000FF3000 Coagulated Spell^000000 or ^FF000070 Contaminated Magic^000000.");
mes("<ITEMLINK>White Knight Card<INFO>4608</INFO></ITEMLINK>");
next;
- setarray .@item[0], Coagulated_Spell, Contaminated_Magic;
+ setarray .@item[0], Coagulated_Spell, Corrupted_Charm;
setarray .@cost[0], 3000, 70;
.@select = select("Cancel", "^0000FFUse Coagulated Spell^000000", "^FF0000Use Contaminated Magic^000000");
switch (.@select) {
@@ -2717,7 +2717,7 @@ glast_01,188,273,5 script White Knight#1a 4_WHITEKNIGHT,{
close;
}
delitem .@item, .@cost;
- getitem White_Knight_Card, 1;
+ getitem White_Knightage_Card, 1;
close;
}
}
@@ -2732,7 +2732,7 @@ glast_01,192,273,3 script Khalitzburg Knight#1a 4_F_KHALITZBURG,{
mes("I exchange you a Khalitzburg Knight Card for ^0000FF5000 Coagulated Spell^000000 or ^FF0000100 Contaminated Magic^000000.");
mes("<ITEMLINK>Khalitzburg Knight Card<INFO>4609</INFO></ITEMLINK>");
next;
- setarray .@item[0], Coagulated_Spell, Contaminated_Magic;
+ setarray .@item[0], Coagulated_Spell, Corrupted_Charm;
setarray .@cost[0], 5000, 100;
.@select = select("Cancel", "^0000FFUse Coagulated Spell^000000", "^FF0000Use Contaminated Magic^000000");
switch (.@select) {
@@ -2750,7 +2750,7 @@ glast_01,192,273,3 script Khalitzburg Knight#1a 4_F_KHALITZBURG,{
close;
}
delitem .@item, .@cost;
- getitem Khalitzburg_Knight_Card, 1;
+ getitem Khali_Knightage_Card, 1;
close;
}
}
diff --git a/npc/re/instances/ghost_palace.txt b/npc/re/instances/ghost_palace.txt
index 08fe3b71b..b1a8f3c10 100644
--- a/npc/re/instances/ghost_palace.txt
+++ b/npc/re/instances/ghost_palace.txt
@@ -318,9 +318,9 @@ OnInstanceInit:
"Everything will be vanished...");
close2();
if (first_time_gpmission)
- getitem Gray_Piece, 1;
+ getitem(Gray_Shard, 1);
if (!first_time_gpmission) {
- getitem Gray_Piece, 2;
+ getitem(Gray_Shard, 2);
getexp(900000, 500000);
++first_time_gpmission;
}
@@ -705,9 +705,10 @@ OnInstanceInit:
mes("The cursed knight...\r"
"Please help me save the soul of Sakray.");
next;
- setarray .@items_list, Thanatos_Sword, Thanatos_Great_Sword, Thanatos_Spear, Thanatos_Long_Spear, Thanatos_Staff, Thanatos_Two-Handed_Staff, Thanatos_Bow,
- Thanatos_Dagger, Thanatos_Katar, Thanatos_Knuckles, Thanatos_Hammer, Thanatos_Axe, Thanatos_Violin, Thanatos_Whip, Gray_Shield,
- Gray_Armor, Gray_Robe, Gray_Cloak, Boots_of_Gray, Gray_Helmet;
+ setarray(.@items_list,
+ Thanos_Sword, Thanos_Great_Sword, Thanos_Spear, Thanos_Long_Spear, Thanos_Staff, Thanos_Rod, Thanos_Bow,
+ Thanos_Dagger, Thanos_Katar, Thanos_Knuckle, Thanos_Hammer, Thanos_Axe, Thanos_Violin, Thanos_Whip, Shield_Of_Gray,
+ Armor_Of_Gray, Gray_Robe, Cloak_Of_Gray, Boots_Of_Gray, Gray_Helmet);
setarray .@cost, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 100, 100, 100, 100, 100, 100;
.@menulist$ = "";
@@ -734,7 +735,7 @@ OnInstanceInit:
break;
case 2:
next;
- if (countitem(Gray_Piece) < .@cost[.@choice]) {
+ if (countitem(Gray_Shard) < .@cost[.@choice]) {
mes("[King]");
mes("You don't have enough Gray Shards.");
mesf("I need %d Gray Shards to make a ^FF0000%s.^000000", .@cost[.@choice], getitemname(.@items_list[.@choice]));
@@ -755,7 +756,7 @@ OnInstanceInit:
mes("[King]");
mes("The power requires a sacrifice.\r"
"Please be careful...");
- delitem Gray_Piece, .@cost[.@choice];
+ delitem(Gray_Shard, .@cost[.@choice]);
getitem .@items_list[.@choice], 1;
close();
}
diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index 0308884fd..78e200843 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -1748,7 +1748,7 @@ job3_rang01,90,43,3 script Ranger Master#jr_29 4_M_REIDIN_KURS,{
jobchange roclass(eaclass()|EAJL_THIRD);
getitem Sniper_Goggle,1;
getitem Green_Apple_Ring,1;
- getitem Wolf's_Flute,1;
+ getitem Wolfs_Flute,1;
close;
}
mes "Hey, you look great.";
diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt
index 5cead2250..7fe7a1d2a 100644
--- a/npc/re/jobs/3-2/royal_guard.txt
+++ b/npc/re/jobs/3-2/royal_guard.txt
@@ -147,7 +147,6 @@ prt_castle,48,161,3 script Middle-aged Gentleman#rg 1_M_LIBRARYMASTER,{
}
mes "[Heinrich]";
if (job_royal == 1) {
- mes "[Heinrich]";
mes "You are persistent friend.";
mes "Do you have more things to talk to me about?";
next;
diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt
index 6164a0994..bee91f382 100644
--- a/npc/re/jobs/novice/academy.txt
+++ b/npc/re/jobs/novice/academy.txt
@@ -123,8 +123,8 @@ int_land,58,69,5 script Sailor#int_land 4W_SAILOR,{
mes("I'll let you know when we set sail~!");
close();
} else {
- if (countitem(Lumber) >= 2) {
- delitem(Lumber, countitem(Lumber));
+ if (countitem(Wood) >= 2) {
+ delitem(Wood, countitem(Wood));
completequest(21002);
mes("[Sailor]");
mes("Unbelievable, perfect! Any chance you want to join my crew?");
@@ -2646,8 +2646,8 @@ iz_ac01,100,39,5 script Academy Receptionist#1 4_F_01,{
getitem(Novice_Egg_Cap, 1); // Novice_Egg_Cap
getitem(Novice_Knife, 1); // Novice_Knife
getitem(Novice_Guard, 1); // Novice_Guard
- getitem(Criatura_Academy_Hat, 1); // Criatura_Academy_Hat
- getitem(Criatura_Hair_Coupon, 1); // Criatura_Hair_Coupon
+ getitem(Cryptura_Academy_Hat, 1);
+ getitem(Cryptura_Hair_Coupon, 1);
getitem(Novice_Potion, 300); // Novice_Potion
next();
mes("[Receptionist]");
@@ -5208,7 +5208,7 @@ new_1-3,99,169,3 script Friendly Poring#ac 4_PORING,{
cutin("", 255);
completequest(2295);
setquest(2296);
- getitem(Little_Unripe_Apple, 5); // Little_Unripe_Apple
+ getitem(Unripe_Apple2, 5);
close();
} else if (questprogress(2296) == 1) {
if (countitem(Novice_Poring_Egg) > 0) {
@@ -6111,7 +6111,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{
}
close();
case 2:
- if (!countitem(Criatura_Hair_Coupon)) {
+ if (!countitem(Cryptura_Hair_Coupon)) {
mes("[Otter Samssoon]");
mes("Come on.. Honey~");
mes("You should bring ^ff0000'Criatura Hair Coupon'^000000 for changing hair...");
@@ -6192,7 +6192,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{
mes("- Chikak, crack, crack.. -");
mes("- Snap, snap, snap.. Crack -");
next();
- delitem(Criatura_Hair_Coupon, 1); // Criatura_Hair_Coupon
+ delitem(Cryptura_Hair_Coupon, 1);
cutin("", 255);
mes("[Otter Samssoon]");
mes("Oh my! Oh my! Oh my!");
diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt
index 811593c81..6ac0d9935 100644
--- a/npc/re/jobs/novice/novice.txt
+++ b/npc/re/jobs/novice/novice.txt
@@ -445,7 +445,7 @@ new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 4_F_01
mes "You've come along fine this far.";
mes "This is not much, but take this as a reward.";
job_novice_q = 7;
- getitem N_Adventurer's_Suit,1;
+ getitem N_Adventurers_Suit,1;
completequest 7120;
close;
} else if (job_novice_q == 7) {
@@ -2609,7 +2609,7 @@ L_Supplies:
nov_3_swordman = 40;
getitem Cargo_Free_Ticket,20;
getitem Warp_Free_Ticket,30;
- getitem N_Adventurer's_Suit,1;
+ getitem N_Adventurers_Suit,1;
getitem N_Cutter,1;
next;
mes "[Hanson]";
diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt
index b714dd71d..be9f1dbee 100644
--- a/npc/re/merchants/coin_exchange.txt
+++ b/npc/re/merchants/coin_exchange.txt
@@ -1129,7 +1129,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{
Assassin_Mask_,
Elven_Ears,
Hahoe_Mask,
- Boy's_Cap;
+ Boys_Cap;
setarray .@costumes[0], C_Frog_Cap,
C_Centimental_Flower,
C_Magestic_Goat,
@@ -1139,7 +1139,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{
C_Assassin_Mask_,
C_Elven_Ears,
C_Hahoe_Mask,
- C_Boy's_Cap;
+ C_Boys_Cap;
if ((countitem(Splendide_Coin) >= 50) && (countitem(Crystal_Mirror) >= 4) && countitem(Angel_Magic_Power) && (countitem(Azure_Jewel) >= 10) && (countitem(Cardinal_Jewel) >= 10) && (countitem(Blue_Jewel) >= 10) && (countitem(Golden_Jewel) >= 10) && (countitem(Bluish_Green_Jewel) >= 10))
.@item_check =1;
diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt
index 7be4eaa6f..864505b85 100644
--- a/npc/re/merchants/enchan_mal.txt
+++ b/npc/re/merchants/enchan_mal.txt
@@ -93,7 +93,7 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{
case 1224: callsub L_Socket,1,2; //Sword_Breaker
case 1225: callsub L_Socket,1,2; //Mail_Breaker
case 1227: callsub L_Socket,1,2; //Weeder_Knife
- case 1229: callsub L_Socket,1,2; //Mama's_Knife
+ case 1229: callsub L_Socket,1,2; //Mamas_Knife
case 1232: callsub L_Socket,1,2; //Assasin_Dagger
case 1233: callsub L_Socket,1,2; //Exercise
case 1235: callsub L_Socket,1,2; //Azoth
@@ -212,7 +212,7 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{
case 1466: callsub L_Socket,1,2; //Crescent_Scythe
case 1467: callsub L_Socket,1,2; //Bill_Guisarme
case 1468: callsub L_Socket,1,2; //Zephyrus
- case 1469: callsub L_Socket,1,2; //Longinus's_Spear
+ case 1469: callsub L_Socket,1,2; //Longinuss_Spear
case 1470: callsub L_Socket,1,2; //Brionac
case 1471: callsub L_Socket,1,2; //Hell_Fire
case 1474: callsub L_Socket,1,2; //Gae_Bolg
@@ -264,7 +264,7 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{
case 15: // Books
switch(@mal_equip_id) {
case 1557: callsub L_Socket,1,2; //Book_Of_The_Apocalypse
- case 1558: callsub L_Socket,1,2; //Girl's_Diary
+ case 1558: callsub L_Socket,1,2; //Girls_Diary
case 1559: callsub L_Socket,1,2; //Legacy_Of_Dragon
case 1561: callsub L_Socket,1,2; //Hardback
case 1562: callsub L_Socket,1,2; //Bible_Of_Battlefield
@@ -311,11 +311,11 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{
case 1963: callsub L_Socket,1,2; //Rapture_Rose
case 1964: callsub L_Socket,1,2; //Chemeti
case 1969: callsub L_Socket,1,2; //Bladed_Whip
- case 1970: callsub L_Socket,1,2; //Queen's_Whip
+ case 1970: callsub L_Socket,1,2; //Queens_Whip
case 1972: callsub L_Socket,1,2; //Electric_Eel
case 1973: callsub L_Socket,1,2; //Sea_Witch_Foot
case 1974: callsub L_Socket,1,2; //Carrot_Whip
- case 1976: callsub L_Socket,1,2; //Queen's_Whip_
+ case 1976: callsub L_Socket,1,2; //Queens_Whip_
case 1979: callsub L_Socket,1,2; //Stem_Of_Nepenthes
case 1984: callsub L_Socket,2,2; //Stem_Whip
case 1985: callsub L_Socket,4,2; //Rosebine
diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt
index 6732035dc..98fd3789c 100644
--- a/npc/re/merchants/flute.txt
+++ b/npc/re/merchants/flute.txt
@@ -110,7 +110,7 @@ pay_arche,91,134,3 duplicate(fflute) Falcon Flute Trader#fft2 1_M_BARD
tur_dun01,89,170,5 script Expert Flute Crafter 1_M_ORIENT01,{
if (Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) {
- if (countitem(Wolf's_Flute)) {
+ if (countitem(Wolfs_Flute)) {
mes "[Expert Flute Crafter]";
mes "The Wolf Flute you have is crafted by myself, with wood.";
mes "You can come back here and find me if you lose your Wolf flute!";
@@ -137,7 +137,7 @@ tur_dun01,89,170,5 script Expert Flute Crafter 1_M_ORIENT01,{
mes "Hope you are ready to use it.";
delitem Bamboo_Cut,1;
Zeny -= 100000;
- getitem Wolf's_Flute,1;
+ getitem Wolfs_Flute,1;
close;
}
mes "[Expert Flute Crafter]";
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 54155e8c4..543d9cdc7 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -547,42 +547,42 @@ OnInit:
prontera,92,209,4 trader Rebellion Weapon Vending 2_VENDING_MACHINE1,{
OnInit:
- sellitem Heaven's_Feather_and_Hell's_Fire;
- sellitem Altea_and_Ares;
- sellitem Color_Scope;
+ sellitem H_FEATHER_H_FIRE;
+ sellitem ALTAIR_ARES;
+ sellitem COLORSCOPE;
sellitem RAG203;
- sellitem Death_Fire;
- sellitem Rolling_Thunder;
- sellitem Peace_Breaker;
- sellitem Mini_Mei;
- sellitem Tempest;
- sellitem End_Of_The_Horizon;
- sellitem South_Cross;
+ sellitem DEATHFIRE;
+ sellitem R_THUNDER;
+ sellitem P_BREAKER;
+ sellitem MINIMAY;
+ sellitem TEMPEST;
+ sellitem END_OF_HORIZON;
+ sellitem Southern_Cross_R;
}
prontera,96,209,4 trader Rebellion Prop Vending 2_VENDING_MACHINE1,{
OnInit:
- sellitem Slug_Ammunition_L;
- sellitem Slug_Ammunition_M;
- sellitem Slug_Ammunition_H;
- sellitem Full_Metal_Jacket;
- sellitem Projection_Landmines;
+ sellitem Slug_Bullet_1;
+ sellitem Slug_Bullet_2;
+ sellitem Slug_Bullet_3;
+ sellitem Fullmetal_Jacket_Bullet;
+ sellitem Mine_Projectile;
sellitem Dragon_Tail_Missile;
sellitem Special_Alloy_Trap;
sellitem Bullet;
sellitem Silver_Bullet_;
sellitem Shell_Of_Blood_;
- sellitem Armor_Piercing_Bullet;
- sellitem Blazing_Bullet;
+ sellitem AP_Ammo;
+ sellitem Blaze_Bullet;
sellitem Freezing_Bullet;
- sellitem Lightning_Bullet;
- sellitem Magic_Stone_Bullet;
- sellitem Purifying_Bullet;
- sellitem Incendiary_Grenade;
- sellitem Lightning_Grenade;
- sellitem Poison_Grenade;
- sellitem Flash_Grenade;
- sellitem Cyro_Grenade;
+ sellitem Electric_Shock_Bullet;
+ sellitem Magical_Stone_Bullet;
+ sellitem Sanctified_Bullet;
+ sellitem Flare_Sphere_;
+ sellitem Lighting_Sphere_;
+ sellitem Poison_Sphere_;
+ sellitem Blind_Sphere_;
+ sellitem Freezing_Sphere_;
}
//== Morroc ===============================================
@@ -712,16 +712,16 @@ OnInit:
morocc,171,103,4 trader Item Collector#moc3 4_M_03,{
OnInit:
sellitem Scell;
- sellitem Monster's_Feed;
- sellitem Animal's_Skin;
+ sellitem Monsters_Feed;
+ sellitem Animals_Skin;
sellitem Bill_Of_Birds;
}
morocc,205,247,2 trader Item Collector#moc4 4_M_03,{
OnInit:
sellitem Scell;
- sellitem Monster's_Feed;
- sellitem Animal's_Skin;
+ sellitem Monsters_Feed;
+ sellitem Animals_Skin;
sellitem Bill_Of_Birds;
}
diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt
index ac4a765fd..72e1bd6c9 100644
--- a/npc/re/quests/cupet.txt
+++ b/npc/re/quests/cupet.txt
@@ -38,7 +38,7 @@
setarray .@tame_id[0],Unripe_Apple,Orange_Juice,Rainbow_Carrot,Earthworm_The_Dude,Rotten_Fish,Sweet_Milk,Well_Dried_Bone,Singing_Flower,Dew_Laden_Moss;
setarray .@tame_amount[0],3,3,3,3,3,3,3,3,3;
- setarray .@hunt_id[0],Jellopy,Jellopy,Clover,Feather_Of_Birds,Shell,Animal's_Skin,Animal's_Skin,Grasshopper's_Leg,Mushroom_Spore;
+ setarray .@hunt_id[0],Jellopy,Jellopy,Clover,Feather_Of_Birds,Shell,Animals_Skin,Animals_Skin,Grasshoppers_Leg,Mushroom_Spore;
setarray .@hunt_amount[0],500,600,500,500,500,500,600,500,500;
setarray .@mob_id[0],1002,1113,1063,1049,1011,1167,1107,1052,1014;
.@tame_gets = 3;
@@ -95,9 +95,9 @@
setarray .@tame_id[0],Silver_Knife_Of_Chaste,Monster_Juice,Contracts_In_Shadow,Sway_Apron,Prohibition_Red_Candle,Book_Of_Devil;
setarray .@tame_amount[0],1,1,1,1,1,1;
- setarray .@hunt_id[0],Long_Hair,Solid_Shell,Petite_DiablOfs_Horn,Alice's_Apron,Queen's_Whip,Evil_Horn;
+ setarray .@hunt_id[0],Long_Hair,Solid_Shell,Petite_DiablOfs_Horn,Alices_Apron,Queens_Whip,Evil_Horn;
setarray .@hunt_amount[0],600,600,600,500,1,100;
- setarray .@hunt_id2[0],0,0,0,0,Executioner's_Mitten,0;
+ setarray .@hunt_id2[0],0,0,0,0,Executioners_Mitten,0;
setarray .@hunt_amount2[0],0,0,0,0,20,0;
setarray .@mob_id[0],1170,1035,1109,1275,1200,1101;
.@tame_gets = 1;
diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt
index 3a3068a5c..1c680d7ed 100644
--- a/npc/re/quests/eden/26-40.txt
+++ b/npc/re/quests/eden/26-40.txt
@@ -530,11 +530,11 @@ payon,179,66,3 script Dashia 4_M_RACHMAN1,{
break;
case 2:
callsub L_Quest,8275;
- if ((countitem(Bear's_Foot) > 9) && (countitem(Animal's_Skin) > 4)) {
+ if ((countitem(Bears_Foot) > 9) && (countitem(Animals_Skin) > 4)) {
callsub L_Reward;
getitem Novice_Potion,100;
- delitem Bear's_Foot,10;
- delitem Animal's_Skin,5;
+ delitem Bears_Foot,10;
+ delitem Animals_Skin,5;
getexp 1000,100;
erasequest 8275;
close;
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index 460960d72..2d72b3541 100644
--- a/npc/re/quests/eden/eden_iro.txt
+++ b/npc/re/quests/eden/eden_iro.txt
@@ -709,7 +709,7 @@ OnInit:
tradertype(NST_CASH);
sellitem Blue_Potion_Box,5;
sellitem F_Neuralizer_Box,400;
- sellitem FPr_Reset_Stone_Box,100;
+ sellitem FPremium_Reset_Stone_Box,100;
sellitem F_Abrasive_Box10,75;
sellitem F_G_O_I_Box10,25;
sellitem Greed_Scroll_Box_30,30;
diff --git a/npc/re/quests/newgears/2012_headgears.txt b/npc/re/quests/newgears/2012_headgears.txt
index 10566cb39..e243300d5 100644
--- a/npc/re/quests/newgears/2012_headgears.txt
+++ b/npc/re/quests/newgears/2012_headgears.txt
@@ -469,10 +469,10 @@ moc_para01,41,169,3 script Reno#2012hat 1_M_WIZARD,{
Assassin_Mask_, -1, 200, Improved_Assassin_Mask,
Welding_Mask, -1, 200, Improved_Welding_Mask,
Safety_Ring, -1, 200, Safety_Ring_,
- Angel's_Protection, 1, 100, Im_Angel's_Protection,
- Angel's_Safeguard, 1, 100, Impr_Angel's_Safeguard,
- Angel's_Arrival, 1, 100, Impr_Angel's_Arrival,
- Angel's_Warmth, 1, 100, Impr_Angel's_Warmth,
+ Angels_Protection, 1, 100, Im_Angels_Protection,
+ Angels_Safeguard, 1, 100, Impr_Angels_Safeguard,
+ Angels_Arrival, 1, 100, Impr_Angels_Arrival,
+ Angels_Warmth, 1, 100, Impr_Angels_Warmth,
Kiss_Of_Angel, 1, 100, Improved_Kiss_Of_Angel;
break;
case 4:
@@ -487,10 +487,10 @@ moc_para01,41,169,3 script Reno#2012hat 1_M_WIZARD,{
Variant_Shoes, -1, 300, Enhanced_Variant_Shoes,
Ring_Of_Flame_Lord,-1, 300, Good_Ring_Of_Flame_Lord,
Ring_Of_Resonance, -1, 300, Good_Ring_Of_Resonance,
- Angel's_Protection, 1, 20, Im_Angel's_Protection,
- Angel's_Safeguard, 1, 20, Impr_Angel's_Safeguard,
- Angel's_Arrival, 1, 20, Impr_Angel's_Arrival,
- Angel's_Warmth, 1, 20, Impr_Angel's_Warmth,
+ Angels_Protection, 1, 20, Im_Angels_Protection,
+ Angels_Safeguard, 1, 20, Impr_Angels_Safeguard,
+ Angels_Arrival, 1, 20, Impr_Angels_Arrival,
+ Angels_Warmth, 1, 20, Impr_Angels_Warmth,
Kiss_Of_Angel, 1, 20, Improved_Kiss_Of_Angel;
break;
}
@@ -680,10 +680,10 @@ moc_para01,41,169,3 script Reno#2012hat 1_M_WIZARD,{
else if (.@r <= 9) getitem Improved_Assassin_Mask,1;
else if (.@r <= 12) getitem Improved_Welding_Mask,1;
else if (.@r <= 13) getitem Safety_Ring_,1;
- else if (.@r <= 14) getitem Im_Angel's_Protection,1;
- else if (.@r <= 15) getitem Impr_Angel's_Safeguard,1;
- else if (.@r <= 16) getitem Impr_Angel's_Arrival,1;
- else if (.@r <= 17) getitem Impr_Angel's_Warmth,1;
+ else if (.@r <= 14) getitem Im_Angels_Protection,1;
+ else if (.@r <= 15) getitem Impr_Angels_Safeguard,1;
+ else if (.@r <= 16) getitem Impr_Angels_Arrival,1;
+ else if (.@r <= 17) getitem Impr_Angels_Warmth,1;
else getitem Improved_Kiss_Of_Angel,1;
break;
case 4:
diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt
index f1abf56aa..d669d0d46 100644
--- a/npc/re/quests/quests_eclage.txt
+++ b/npc/re/quests/quests_eclage.txt
@@ -2807,7 +2807,7 @@ ecl_in04,226,231,4 script Du Lian#ep14_2in2 4_M_REDMAN,{
emotion e_dots,0,"Alp Ocart#ep14_2in2";
cutin "bu_alp2",2;
ep14_2_oliver = 30;
- getitem C_Oliver_Wolf_Hood,1;
+ getitem(Oliver_Wolf_Hood, 1);
completequest 11337;
close2;
cutin "",255;
@@ -2949,7 +2949,7 @@ ecl_in04,224,234,4 script Mark Esha#ep14_2in2 4_M_BLUEMAN,{
emotion e_dots,0,"Alp Ocart#ep14_2in2";
cutin "bu_alp2",2;
ep14_2_oliver = 30;
- getitem C_Oliver_Wolf_Hood,1;
+ getitem(Oliver_Wolf_Hood, 1);
completequest 11337;
close2;
cutin "",255;
@@ -3094,7 +3094,7 @@ ecl_in04,223,234,4 script Maggi Steen#ep14_2in2 4_F_PINKWOMAN,{
emotion e_dots,0,"Alp Ocart#ep14_2in2";
cutin "bu_alp2",2;
ep14_2_oliver = 30;
- getitem C_Oliver_Wolf_Hood,1;
+ getitem(Oliver_Wolf_Hood, 1);
completequest 11337;
close2;
cutin "",255;
@@ -3230,7 +3230,7 @@ ecl_in04,223,230,4 script Alp Ocart#ep14_2in2 4_M_BLACKMAN,{
emotion e_dots;
cutin "bu_alp2",2;
ep14_2_oliver = 30;
- getitem C_Oliver_Wolf_Hood,1;
+ getitem(Oliver_Wolf_Hood, 1);
completequest 11337;
close2;
cutin "",255;
@@ -17592,7 +17592,7 @@ eclage,112,40,3 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{
}
}
else if (questprogress(7420) == 1) {
- if ((countitem(Pinguicula's_fruit_Jam) < 3) || (countitem(Luciola's_Honey_Jam) < 3)) {
+ if ((countitem(Pinguiculas_fruit_Jam) < 3) || (countitem(Luciolas_Honey_Jam) < 3)) {
mes "[Leo]";
mes "I need 3 jars of Pinguicula's pickled fruits and another 3 jars of Luciola's honey jam~";
mes "They are specialties of the base of Splendide.";
@@ -17611,8 +17611,8 @@ eclage,112,40,3 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{
mes "It seems like Mayor Jun has an eye for character.";
mes "So he is Mayor after all...";
next;
- delitem Pinguicula's_fruit_Jam,3; //Pinguicula's_fruit_Jam
- delitem Luciola's_Honey_Jam,3; //Luciola's_Honey_Jam
+ delitem Pinguiculas_fruit_Jam,3;
+ delitem Luciolas_Honey_Jam, 3;
completequest 7420;
getexp 200000,200000;
.@alltotal = questprogress(7420) + questprogress(7419) + questprogress(7418);
diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt
index 79615327d..39ca8649c 100644
--- a/npc/re/quests/quests_mora.txt
+++ b/npc/re/quests/quests_mora.txt
@@ -5148,7 +5148,7 @@ function script mora_remains {
1@mist,145,245,0 script Meshir's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12245,"Meshir",5,943,4; } //Solid_Shell
1@mist,196,276,0 script Noirit's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12246,"Noirit",6,549,3; } //Nice_Sweet_Potato
1@mist,304,327,0 script Pajama God's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12247,"Pajama God",5,945,18; } //Raccoon_Leaf
-1@mist,334,287,0 script Mendel's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12248,"Mendel",7,946,31; } //Snail's_Shell
+1@mist,334,287,0 script Mendel's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12248,"Mendel",7,946,31; } //Snails_Shell
1@mist,330,177,0 script Milebit's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12249,"Milebit",5,7008,17; } //Stiff_Horn
1@mist,284,84,0 script Kunmun's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12250,"Kunmun",4,6380,20; } //Mora_Coin
1@mist,170,54,0 script Tsaihokin's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12251,"Tsaihokin",2,929,5; } //Immortal_Heart