summaryrefslogtreecommitdiff
path: root/npc/quests/newgears
diff options
context:
space:
mode:
Diffstat (limited to 'npc/quests/newgears')
-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
4 files changed, 17 insertions, 17 deletions
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;