updats

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@484 54d463be-8e91-2dee-dedb-b68131a5f0ec

17 files changed, 1098 insertions, 1096 deletions

diff --git a/Changelog.txt b/Changelog.txt
index 638beb9f0..11ece3586 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,7 @@
 Date	Added
 12/6
+	* Fixed file props for new npcs [MouseJstr]
+	* Fixed weddings.txt as per Fress_Boy [MouseJstr]
 	* Added a case_sensitive to login [MouseJstr]
 	* Fixed follow crashing server when gm dies [MouseJstr]
 	* Fixed global message not working on txt [Wizputer]
diff --git a/npc/other/wedding.txt b/npc/other/wedding.txt
index 78bbbc1d8..20f760850 100644
--- a/npc/other/wedding.txt
+++ b/npc/other/wedding.txt
@@ -251,7 +251,7 @@ L_DisableSameSex:
 	mes "Same-Sex Weddings are disabled now!";
 	close;
 L_ResetVariables:
-	set $@progress,0;
+	set $progress,0;
 	set $groom$,"null";
 	set $bride$,"null";
 	set $name$,"null";
@@ -708,4 +708,4 @@ areaannounce "prt_church.gat",0,0,350,350,"The wedding has been cancelled.",0;
 	set @register,0;
 	set event_wedding,0;
 	set @get_ring,0;
-}
\ No newline at end of file
+}
diff --git a/npc/quests/newgears/arjen.txt b/npc/quests/newgears/arjen.txt
index 377a827e0..a0a543432 100644
--- a/npc/quests/newgears/arjen.txt
+++ b/npc/quests/newgears/arjen.txt
@@ -1,138 +1,138 @@
-//===== eAthena Script ======================================= 

-//= X-Shaped Hairpin, Bandage & Flower Hairpin Quests

-//===== By: ================================================== 

-//= Halca (1.0)

-//= Mass Zero (1.1)

-//===== Current Version: ===================================== 

-//= 1.1

-//===== Compatible With: ===================================== 

-//= Any eAthena Version.

-//===== Description: ========================================= 

-//= Seperate quests for these items.

-//===== Additional Comments: ================================= 

-//=

-//============================================================

-

-gef_tower.gat,128,148,6	script	Arjen	807,{

- mes "[Arjen]";

- mes "What item information do you require?";

-	next;

-	 menu "X-Shaped Hairpin.",M1,"Bandage",M2,"Flower Hairpin.",M3;

-M1:

- mes "[Arjen]";

- mes "Hyaaaaaaaa!";

-	next;

- mes "[Arjen]";

- mes "Ooops, sorry. I was practicing my balance.";

- mes "Good that I have my hairpin to stop my hair getting in my eyes.";

-	next;

- mes "[Arjen]";

- mes "Im not much of a craftsman, but If you bring me some items I can make you";

- mes "my ^660000X-Shaped Hairpin^000000.";

-	next;

-	 menu "Make me the hairpin.",-,"What are the requirements?",X_REQ,"No, thanks.",EXT;

-		If ((countitem(10011) < 1) || (countitem(7219) < 400)) GOTO X_NM;

- mes "[Arjen]";

- mes "Yes, that's just what I require!";

- mes "Nayayayaaaaaa!";

-	next;

-		delitem 10011,1;

-		delitem 7219,400;

- mes "[Arjen]";

- mes "Hmm... okay, thanks for the items.";

- mes "Let me make it for you.";

-	next;

-		getitem 5079,1;

- mes "[Arjen]";

- mes "Thanks very much, you look cool now.";

-	close;

-X_NM:

- mes "[Arjen]";

- mes "Come on man, gimme a break.";

- mes "This is hot property!";

-	next;

-	 GOTO X_REQ;

-X_REQ:

-	next;

- mes "[Arjen]";

- mes "Hmm, it's a very rare Item.";

- mes "I need 1 Stellar Hairpin for its spacial properties.";

- mes "And I need 400 Ectoiplasm to give it its special powers.";

-	next;

- mes "[Arjen]";

- mes "You need to have travelled well to get these items...";

-	close;

-M2:

- mes "[Arjen]";

- mes "Ouch, have you ever gotten an injury after doing too much exercise?";

- mes "It sucks, especially when you excercise so much.";

-	next;

- mes "[Arjen]";

- mes "What is that you say? you have just the problem?";

- mes "Well, I can make you a ^660000Bandage^000000 to heal your wounds!";

-	next;

-	 menu "Yes, please make me one!",-,"What are the requirements?",B_REQ,"No, thanks.",EXT;

-		If ((countitem(930) < 500) || (countitem(970) < 1)) GOTO B_NM;

- mes "[Arjen]";

- mes "Wow! You have the stuff I need! Thanks!";

- mes "Lemme do a swap, your stuff for the bandage";

-	next;

-		delitem 930,500;

-		delitem 970,1;

-		getitem 5070,1;

- mes "[Arjen]";

- mes "Thanks! Hope that cures your aches!";

-	close;

-B_NM:

- mes "[Arjen]";

- mes "Argh, please, If you want the item, bring me what I asked for.";

-	next;

-	 GOTO B_REQ;

-B_REQ:

- mes "[Arjen]";

- mes "I need 500 Rotten Bandages to make the actual cast.";

- mes "Then I need 1 Alcohol so I can get the stains out of the bandages.";

-	close;

-EXT:

- mes "[Arjen]";

- mes "Okay, have a nice day!";

-	close;

-M3:

- mes "[Arjen]";

- mes "Ahh, don't you love the romance in the air?";

- mes "Isn't it great to look good, and also, keep your girl or boy pretty?";

-	next;

-	 menu "Yes, of course!",-,"No, not quite.",EXT;

- mes "[Arjen]";

- mes "Well, I'm sure you would like me to make you a ^660000Flower Hairpin^000000.";

-	next;

-	 menu "Yes, please.",RL,"No, thanks.",EXT;

-RL:

- mes "[Arjen]";

- mes "Well, I need...";

- mes "1 Romantic Leaf, for the element of love,";

- mes "10 Steels for the pin part,";

- mes "And 20,000 Zeny for the forging costs.";

-	next;

- mes "[Arjen]";

- mes "Would you like to make this item?";

-	next;

-	 menu "Yes.",-,"No.",EXT;

-		If ((countitem(2269) < 1) || (countitem(999) < 10) || (Zeny < 20000)) GOTO FH_NM;

- mes "[Arjen]";

- mes "Thanks!";

-	next;

-		delitem 2269,1;

-		delitem 999,10;

-		set Zeny,Zeny-20000;

-		getitem 5061,1;

- mes "[Arjen]";

- mes "Enjoy!";

-	close;

-FH_NM:

- mes "[Arjen]";

- mes "Sorry, but you don't have the correct items.";

-	next;

-	 GOTO RL;

-End;

+//===== eAthena Script ======================================= 
+//= X-Shaped Hairpin, Bandage & Flower Hairpin Quests
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate quests for these items.
+//===== Additional Comments: ================================= 
+//=
+//============================================================
+
+gef_tower.gat,128,148,6	script	Arjen	807,{
+ mes "[Arjen]";
+ mes "What item information do you require?";
+	next;
+	 menu "X-Shaped Hairpin.",M1,"Bandage",M2,"Flower Hairpin.",M3;
+M1:
+ mes "[Arjen]";
+ mes "Hyaaaaaaaa!";
+	next;
+ mes "[Arjen]";
+ mes "Ooops, sorry. I was practicing my balance.";
+ mes "Good that I have my hairpin to stop my hair getting in my eyes.";
+	next;
+ mes "[Arjen]";
+ mes "Im not much of a craftsman, but If you bring me some items I can make you";
+ mes "my ^660000X-Shaped Hairpin^000000.";
+	next;
+	 menu "Make me the hairpin.",-,"What are the requirements?",X_REQ,"No, thanks.",EXT;
+		If ((countitem(10011) < 1) || (countitem(7219) < 400)) GOTO X_NM;
+ mes "[Arjen]";
+ mes "Yes, that's just what I require!";
+ mes "Nayayayaaaaaa!";
+	next;
+		delitem 10011,1;
+		delitem 7219,400;
+ mes "[Arjen]";
+ mes "Hmm... okay, thanks for the items.";
+ mes "Let me make it for you.";
+	next;
+		getitem 5079,1;
+ mes "[Arjen]";
+ mes "Thanks very much, you look cool now.";
+	close;
+X_NM:
+ mes "[Arjen]";
+ mes "Come on man, gimme a break.";
+ mes "This is hot property!";
+	next;
+	 GOTO X_REQ;
+X_REQ:
+	next;
+ mes "[Arjen]";
+ mes "Hmm, it's a very rare Item.";
+ mes "I need 1 Stellar Hairpin for its spacial properties.";
+ mes "And I need 400 Ectoiplasm to give it its special powers.";
+	next;
+ mes "[Arjen]";
+ mes "You need to have travelled well to get these items...";
+	close;
+M2:
+ mes "[Arjen]";
+ mes "Ouch, have you ever gotten an injury after doing too much exercise?";
+ mes "It sucks, especially when you excercise so much.";
+	next;
+ mes "[Arjen]";
+ mes "What is that you say? you have just the problem?";
+ mes "Well, I can make you a ^660000Bandage^000000 to heal your wounds!";
+	next;
+	 menu "Yes, please make me one!",-,"What are the requirements?",B_REQ,"No, thanks.",EXT;
+		If ((countitem(930) < 500) || (countitem(970) < 1)) GOTO B_NM;
+ mes "[Arjen]";
+ mes "Wow! You have the stuff I need! Thanks!";
+ mes "Lemme do a swap, your stuff for the bandage";
+	next;
+		delitem 930,500;
+		delitem 970,1;
+		getitem 5070,1;
+ mes "[Arjen]";
+ mes "Thanks! Hope that cures your aches!";
+	close;
+B_NM:
+ mes "[Arjen]";
+ mes "Argh, please, If you want the item, bring me what I asked for.";
+	next;
+	 GOTO B_REQ;
+B_REQ:
+ mes "[Arjen]";
+ mes "I need 500 Rotten Bandages to make the actual cast.";
+ mes "Then I need 1 Alcohol so I can get the stains out of the bandages.";
+	close;
+EXT:
+ mes "[Arjen]";
+ mes "Okay, have a nice day!";
+	close;
+M3:
+ mes "[Arjen]";
+ mes "Ahh, don't you love the romance in the air?";
+ mes "Isn't it great to look good, and also, keep your girl or boy pretty?";
+	next;
+	 menu "Yes, of course!",-,"No, not quite.",EXT;
+ mes "[Arjen]";
+ mes "Well, I'm sure you would like me to make you a ^660000Flower Hairpin^000000.";
+	next;
+	 menu "Yes, please.",RL,"No, thanks.",EXT;
+RL:
+ mes "[Arjen]";
+ mes "Well, I need...";
+ mes "1 Romantic Leaf, for the element of love,";
+ mes "10 Steels for the pin part,";
+ mes "And 20,000 Zeny for the forging costs.";
+	next;
+ mes "[Arjen]";
+ mes "Would you like to make this item?";
+	next;
+	 menu "Yes.",-,"No.",EXT;
+		If ((countitem(2269) < 1) || (countitem(999) < 10) || (Zeny < 20000)) GOTO FH_NM;
+ mes "[Arjen]";
+ mes "Thanks!";
+	next;
+		delitem 2269,1;
+		delitem 999,10;
+		set Zeny,Zeny-20000;
+		getitem 5061,1;
+ mes "[Arjen]";
+ mes "Enjoy!";
+	close;
+FH_NM:
+ mes "[Arjen]";
+ mes "Sorry, but you don't have the correct items.";
+	next;
+	 GOTO RL;
+End;
 }
\ No newline at end of file
diff --git a/npc/quests/newgears/back_ribbon.txt b/npc/quests/newgears/back_ribbon.txt
index 336a4b90c..13dceb938 100644
--- a/npc/quests/newgears/back_ribbon.txt
+++ b/npc/quests/newgears/back_ribbon.txt
@@ -1,58 +1,58 @@
-//===== eAthena Script ======================================= 

-//= Back Ribbon Quest

-//===== By: ================================================== 

-//= Halca (1.0)

-//= Mass Zero (1.1)

-//===== Current Version: ===================================== 

-//= 1.1

-//===== Compatible With: ===================================== 

-//= Any eAthena Version.

-//===== Description: ========================================= 

-//= Seperate Back Ribbon quest.

-//===== Additional Comments: ================================= 

-//=

-//============================================================

-

-prontera.gat,164,232,5	script	Netpia	815,{

- mes "[Netpia]";

- mes "Wheee! Don't you just love making youself look pretty!?";

- mes "I love glamourising myself with all the best accessories!";

-	next;

- mes "[Netpia]";

- mes "Ever heard of a ^560000Back Ribbon^000000?";

- mes "I can make you one, and you too can be fashionable!";

-	next;

-	 menu "Please make me a ^670000Back ribbon^000000.",-,"What are the requirements?",BR_REQ,"No, I dont want one.",EXT;

-		If ((countitem(2244) < 1) || (countitem(2209) < 1) || (countitem(10007) < 1)) GOTO BR_NM;

- mes "[Netpia]";

- mes "Wow, thank you! Let me just take your items.";

-	next;

-		delitem 2244,1;

-		delitem 2209,1;

-		delitem 10007,1;

-		getitem 5083,1;

- mes "[Netpia]";

- mes "Okay, now here is your item.";

-	next;

- mes "[Netpia]";

- mes "Enjoy being pretty!";

-	close;

-BR_NM:

- mes "[Netpia]";

- mes "Aww... sorry, but I cant make it If you don't bring me the materials.";

-	next;

-	 GOTO BR_REQ;

-BR_REQ:

- mes "[Netpia]";

- mes "Well, for me to make you my BEAUTIFUL Back Ribbon...";

- mes "I require these materials:";

- mes "1 big ribbon.";

- mes "1 ribbon (Slotted).";

- mes "1 silk ribbon.";

-	close;

-EXT:

- mes "[Netpia]";

- mes "Aww, well, okay then!";

- mes "Be pretty some other time";

-	close;

+//===== eAthena Script ======================================= 
+//= Back Ribbon Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Back Ribbon quest.
+//===== Additional Comments: ================================= 
+//=
+//============================================================
+
+prontera.gat,164,232,5	script	Netpia	815,{
+ mes "[Netpia]";
+ mes "Wheee! Don't you just love making youself look pretty!?";
+ mes "I love glamourising myself with all the best accessories!";
+	next;
+ mes "[Netpia]";
+ mes "Ever heard of a ^560000Back Ribbon^000000?";
+ mes "I can make you one, and you too can be fashionable!";
+	next;
+	 menu "Please make me a ^670000Back ribbon^000000.",-,"What are the requirements?",BR_REQ,"No, I dont want one.",EXT;
+		If ((countitem(2244) < 1) || (countitem(2209) < 1) || (countitem(10007) < 1)) GOTO BR_NM;
+ mes "[Netpia]";
+ mes "Wow, thank you! Let me just take your items.";
+	next;
+		delitem 2244,1;
+		delitem 2209,1;
+		delitem 10007,1;
+		getitem 5083,1;
+ mes "[Netpia]";
+ mes "Okay, now here is your item.";
+	next;
+ mes "[Netpia]";
+ mes "Enjoy being pretty!";
+	close;
+BR_NM:
+ mes "[Netpia]";
+ mes "Aww... sorry, but I cant make it If you don't bring me the materials.";
+	next;
+	 GOTO BR_REQ;
+BR_REQ:
+ mes "[Netpia]";
+ mes "Well, for me to make you my BEAUTIFUL Back Ribbon...";
+ mes "I require these materials:";
+ mes "1 big ribbon.";
+ mes "1 ribbon (Slotted).";
+ mes "1 silk ribbon.";
+	close;
+EXT:
+ mes "[Netpia]";
+ mes "Aww, well, okay then!";
+ mes "Be pretty some other time";
+	close;
 }
\ No newline at end of file
diff --git a/npc/quests/newgears/bear_hat.txt b/npc/quests/newgears/bear_hat.txt
index 540c706dd..5ad988887 100644
--- a/npc/quests/newgears/bear_hat.txt
+++ b/npc/quests/newgears/bear_hat.txt
@@ -1,62 +1,62 @@
-//===== eAthena Script ======================================= 

-//= Bear Hat Quest

-//===== By: ================================================== 

-//= Halca (1.0)

-//= Mass Zero (1.1)

-//===== Current Version: ===================================== 

-//= 1.1

-//===== Compatible With: ===================================== 

-//= Any eAthena Version.

-//===== Description: ========================================= 

-//= Seperate Bear hat quest.

-//===== Additional Comments: ================================= 

-//=

-//============================================================

-

-xmas.gat,156,152,3	script	Bora	826,{

- mes "[Bora]";

- mes "Don't bears have such a cute expression on their faces?";

- mes "And I bet you wouldn't mind one of those vute expressions yourself!";

-	next;

- mes "[Bora]";

- mes "Well, I can make you one!";

-	next;

-	 menu "Yes, make me one now!",NN,"What are the requirements?",REQ,"No, thanks.",EXT;

-MN:

- mes "[Bora]";

- mes "Yay! now I can make my famous Bear Hat!";

- mes "Now, give me your items!";

-	next;

-		delitem 5030,1;

-		delitem 7213,100;

-		delitem 7217,100;

-		delitem 7167,300;

- mes "[Bora]";

- mes "Now I will give you the hat!";

-	next;

-		getitem 5059,1;

- mes "[Bora]";

- mes "Thanks, and bye!";

-	close;

-REQ:

- mes "[Bora]";

- mes "Bring me...";

- mes "1 Panda Hat,";

- mes "100 Stabbing Needles,";

- mes "100 Spool of Thread";

- mes "300 Zippers.";

-	next;

- mes "[Bora]";

- mes "For the Stabbing Needles and Spool of Thread,";

- mes "Hyzoloists in Niflheim drop those, I believe.";

-	close;

-EX_NI:

- mes "[Bora]";

- mes "Sorry, I want all the items I asked.";

- mes "Please dont try to cheat me.";

-	close;

-EXT:

- mes "[Bora]";

- mes "Okay, well, byebye!";

-	close;

+//===== eAthena Script ======================================= 
+//= Bear Hat Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Bear hat quest.
+//===== Additional Comments: ================================= 
+//=
+//============================================================
+
+xmas.gat,156,152,3	script	Bora	826,{
+ mes "[Bora]";
+ mes "Don't bears have such a cute expression on their faces?";
+ mes "And I bet you wouldn't mind one of those vute expressions yourself!";
+	next;
+ mes "[Bora]";
+ mes "Well, I can make you one!";
+	next;
+	 menu "Yes, make me one now!",NN,"What are the requirements?",REQ,"No, thanks.",EXT;
+MN:
+ mes "[Bora]";
+ mes "Yay! now I can make my famous Bear Hat!";
+ mes "Now, give me your items!";
+	next;
+		delitem 5030,1;
+		delitem 7213,100;
+		delitem 7217,100;
+		delitem 7167,300;
+ mes "[Bora]";
+ mes "Now I will give you the hat!";
+	next;
+		getitem 5059,1;
+ mes "[Bora]";
+ mes "Thanks, and bye!";
+	close;
+REQ:
+ mes "[Bora]";
+ mes "Bring me...";
+ mes "1 Panda Hat,";
+ mes "100 Stabbing Needles,";
+ mes "100 Spool of Thread";
+ mes "300 Zippers.";
+	next;
+ mes "[Bora]";
+ mes "For the Stabbing Needles and Spool of Thread,";
+ mes "Hyzoloists in Niflheim drop those, I believe.";
+	close;
+EX_NI:
+ mes "[Bora]";
+ mes "Sorry, I want all the items I asked.";
+ mes "Please dont try to cheat me.";
+	close;
+EXT:
+ mes "[Bora]";
+ mes "Okay, well, byebye!";
+	close;
 }
\ No newline at end of file
diff --git a/npc/quests/newgears/burning_blood_bandana.txt b/npc/quests/newgears/burning_blood_bandana.txt
index 0b9b00b4f..0cb861c30 100644
--- a/npc/quests/newgears/burning_blood_bandana.txt
+++ b/npc/quests/newgears/burning_blood_bandana.txt
@@ -1,55 +1,55 @@
-//===== eAthena Script ======================================= 

-//= Burning Blood Bandana Quest

-//===== By: ================================================== 

-//= Halca (1.0)

-//= Mass Zero (1.1)

-//===== Current Version: ===================================== 

-//= 1.1

-//===== Compatible With: ===================================== 

-//= Any eAthena Version.

-//===== Description: ========================================= 

-//= Seperate Burning Blood Bandana quest.

-//===== Additional Comments: ================================= 

-//=

-//============================================================

-

-yuno.gat,301,188,6	Genbolt	826,{

- mes "[Genbolt]";

- mes "Why, don't you think looking badass is most important?";

- mes "After all, we all have to fend for ourselves in this world!";

-	next;

- mes "[Genbolt]";

- mes "I am the only one who can make you look the coolest,";

- mes "as I can craft a ^000090Burning Blood Bandana^000000.";

- mes "You can wear this, and you clench your fist without knowing";

- mes "because of the raw power you feel!";

-	next;

-	 menu "Wow! make me one!",-,"What do I need?",REQ,"Naw, bye",EXT;

-		if ((countitem(7216) < 300) || (countitem(7097) < 300) || (countitem(982) < 1) || (countitem(2211) < 1)) GOTO EX_NI;

- mes "[Genbolt]";

- mes "Very well, here you go.";

-	next;

-		delitem 7216,300;

-		delitem 7097,300;

-		delitem 982,1;

-		delitem 2211,1;

- mes "[Genbolt]";

- mes "Now I can make it...";

-	next;

-		getitem 5071,1;

- mes "[Genbolt]";

- mes "Enjoy.";

-	close;

-REQ:

- mes "[Genbolt]";

- mes "Bring me:";

- mes "300 Red Scarfs,";

- mes "300 Burning Hearts,";

- mes "1 White Dyestuff,";

- mes "and 1 Bandana.";

-	close;

-EXT:

- mes "[Genbolt]";

- mes "Bye then.";

-	close;

+//===== eAthena Script ======================================= 
+//= Burning Blood Bandana Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Burning Blood Bandana quest.
+//===== Additional Comments: ================================= 
+//=
+//============================================================
+
+yuno.gat,301,188,6	Genbolt	826,{
+ mes "[Genbolt]";
+ mes "Why, don't you think looking badass is most important?";
+ mes "After all, we all have to fend for ourselves in this world!";
+	next;
+ mes "[Genbolt]";
+ mes "I am the only one who can make you look the coolest,";
+ mes "as I can craft a ^000090Burning Blood Bandana^000000.";
+ mes "You can wear this, and you clench your fist without knowing";
+ mes "because of the raw power you feel!";
+	next;
+	 menu "Wow! make me one!",-,"What do I need?",REQ,"Naw, bye",EXT;
+		if ((countitem(7216) < 300) || (countitem(7097) < 300) || (countitem(982) < 1) || (countitem(2211) < 1)) GOTO EX_NI;
+ mes "[Genbolt]";
+ mes "Very well, here you go.";
+	next;
+		delitem 7216,300;
+		delitem 7097,300;
+		delitem 982,1;
+		delitem 2211,1;
+ mes "[Genbolt]";
+ mes "Now I can make it...";
+	next;
+		getitem 5071,1;
+ mes "[Genbolt]";
+ mes "Enjoy.";
+	close;
+REQ:
+ mes "[Genbolt]";
+ mes "Bring me:";
+ mes "300 Red Scarfs,";
+ mes "300 Burning Hearts,";
+ mes "1 White Dyestuff,";
+ mes "and 1 Bandana.";
+	close;
+EXT:
+ mes "[Genbolt]";
+ mes "Bye then.";
+	close;
 }
\ No newline at end of file
diff --git a/npc/quests/newgears/cat_hairband.txt b/npc/quests/newgears/cat_hairband.txt
index 16391790f..283b4f492 100644
--- a/npc/quests/newgears/cat_hairband.txt
+++ b/npc/quests/newgears/cat_hairband.txt
@@ -1,66 +1,66 @@
-//===== eAthena Script ======================================= 

-//= Cat Hairband Quest

-//===== By: ================================================== 

-//= Halca (1.0)

-//= Mass Zero (1.1)

-//===== Current Version: ===================================== 

-//= 1.1

-//===== Compatible With: ===================================== 

-//= Any eAthena Version.

-//===== Description: ========================================= 

-//= Seperate Cat Hairband quest.

-//===== Additional Comments: ================================= 

-//=

-//============================================================

-

-pay_cast01.gat,110,160,4	KoneKone	819,{

- mes "[KoneKone]";

- mes "Don't you just love cats? the way they have the pointy,";

- mes "sticky ears and stuff, they're just so cute!";

-	next;

- mes "[KoneKone]";

- mes "Hehe... well, I decided, I would make a Cat Hairband!";

- mes "It is modeled on my most favourite of cat... BLACK!";

- mes "Of course, I got the idea from Hwikebain!";

-	next;

- mes "[KoneKone]";

- mes "I can make it  for you, but it requires the correct materials.";

-	next;

- menu "Please make me this item.",-,"What are the materials needed?",BCM,"Bye.",EXT;

-		If ((countitem(2213) < 1) || (countitem(7063) < 200) || (countitem(983) < 1) || (Zeny < 10000)) GOTO CAT_NM;

- mes "[KoneKone]";

- mes "Wow! thankies! I will now take your items!";

-	next;

-		delitem 2213,1;

-		delitem 7063,200;

-		delitem 983,1;

-		set Zeny,Zeny-1000;

- mes "[KoneKone]";

- mes "Mew mew! thanks! Now for your ears!";

-	next;

-		getitem 5057,1;

- mes "[KoneKone]";

- mes "Mew! thanks! It was a pleasure to make them for you!";

-	close;

-CAT_NM:

- mes "[KoneKone]";

- mes "Sorry, but you dont have what I asked for...";

-	close;

-BCM:

- mes "[KoneKone]";

- mes "For the ^670000Cat Hairband^000000, the following items are needed:";

-	next;

- mes "[KoneKone]";

- mes "1 Kitty Band,";

- mes "200 Soft Feathers,";

- mes "Some Black Dye,";

- mes "And of course 10,000z for labour costs.";

-	next;

- mes "[KoneKone]";

- mes "Bring me these items and the money and I will make it for you.";

-	close;

-EXT:

- mes "[KoneKone]";

- mes "Okay, *meow* have a nice day!";

-	close;

+//===== eAthena Script ======================================= 
+//= Cat Hairband Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Cat Hairband quest.
+//===== Additional Comments: ================================= 
+//=
+//============================================================
+
+pay_cast01.gat,110,160,4	KoneKone	819,{
+ mes "[KoneKone]";
+ mes "Don't you just love cats? the way they have the pointy,";
+ mes "sticky ears and stuff, they're just so cute!";
+	next;
+ mes "[KoneKone]";
+ mes "Hehe... well, I decided, I would make a Cat Hairband!";
+ mes "It is modeled on my most favourite of cat... BLACK!";
+ mes "Of course, I got the idea from Hwikebain!";
+	next;
+ mes "[KoneKone]";
+ mes "I can make it  for you, but it requires the correct materials.";
+	next;
+ menu "Please make me this item.",-,"What are the materials needed?",BCM,"Bye.",EXT;
+		If ((countitem(2213) < 1) || (countitem(7063) < 200) || (countitem(983) < 1) || (Zeny < 10000)) GOTO CAT_NM;
+ mes "[KoneKone]";
+ mes "Wow! thankies! I will now take your items!";
+	next;
+		delitem 2213,1;
+		delitem 7063,200;
+		delitem 983,1;
+		set Zeny,Zeny-1000;
+ mes "[KoneKone]";
+ mes "Mew mew! thanks! Now for your ears!";
+	next;
+		getitem 5057,1;
+ mes "[KoneKone]";
+ mes "Mew! thanks! It was a pleasure to make them for you!";
+	close;
+CAT_NM:
+ mes "[KoneKone]";
+ mes "Sorry, but you dont have what I asked for...";
+	close;
+BCM:
+ mes "[KoneKone]";
+ mes "For the ^670000Cat Hairband^000000, the following items are needed:";
+	next;
+ mes "[KoneKone]";
+ mes "1 Kitty Band,";
+ mes "200 Soft Feathers,";
+ mes "Some Black Dye,";
+ mes "And of course 10,000z for labour costs.";
+	next;
+ mes "[KoneKone]";
+ mes "Bring me these items and the money and I will make it for you.";
+	close;
+EXT:
+ mes "[KoneKone]";
+ mes "Okay, *meow* have a nice day!";
+	close;
 }
\ No newline at end of file
diff --git a/npc/quests/newgears/hat_seller.txt b/npc/quests/newgears/hat_seller.txt
index 970c84eea..3039e50c5 100644
--- a/npc/quests/newgears/hat_seller.txt
+++ b/npc/quests/newgears/hat_seller.txt
@@ -1,128 +1,128 @@
-//===== eAthena Script ======================================= 

-//= Hat Seller (New Hat Quests)

-//===== By: ================================================== 

-//= Halca (1.0)

-//= Mass Zero (1.1)

-//===== Current Version: ===================================== 

-//= 1.1

-//===== Compatible With: ===================================== 

-//= Any eAthena Version.

-//===== Description: ========================================= 

-//= Seperate New Hat quests.

-//===== Additional Comments: ================================= 

-//=

-//============================================================

-

-xmas_in.gat,123,131,4	script	Hat Seller	806,{

- mes "[Hat Seller]";

- mes "What hat would you like information on?";

- mes "I can make all the hats I mention here";

-	next;

-	 menu "Pointy Cap",M1,"Straw Hat",M2,"Cowboy Hat",M3,"Sombrero",M4,"Furry Hat",M5;

-M1:

- mes "[Hat Seller]";

- mes "Okay well, for this item I require:";

- mes "1 Santa Hat,";

- mes "100 Waxed/Slick paper,";

- mes "100 Oily Paper.";

-	next;

- mes "[Hat Seller]";

- mes "You got these items?";

-	next;

-	 menu "Yes.",-,"No.",EXT;

-		if ((Countitem(2236) < 1) || (countitem(7111) < 100) || (countitem(7151) < 100)) GOTO EXT_NI;

-		delitem 2236,1;

-		delitem 7111,100;

-		delitem 7151,100;

-		getitem 5060,1;

- mes "[Hat Seller]";

- mes "Thanks! Bye.";

-	close;

-EX_NI:

- mes "[Hat Seller]";

- mes "Not enough items, bye.";

-	close;

-EXT:

- mes "[Hat Seller]";

- mes "Bye!";

-	close;

-M2:

- mes "[Hat Seller]";

- mes "For this item I require:";

- mes "1 Sakkat,";

- mes "300 Tough Branches,";

- mes "300 Bamboo Pieces.";

-	next;

- mes "[Hat Seller]";

- mes "Bring those, and we got a deal.";

- mes "You got them?";

-	next;

-	 menu "Yes.",-,"No.",EXT;

-		if ((countitem(2280) < 1) || (countitem(7203) < 300) || (countitem(7150) < 300)) GOTO EX_NI;

-		delitem 2280,1;

-		delitem 7203,300;

-		delitem 7150,300;

-		getitem 5062,1;

- mes "[Hat Seller]";

- mes "There you go... bye.";

-	close;

-M3:

- mes "[Hat Seller]";

- mes "For this item I require:";

- mes "1 Western Grace,";

- mes "108 Desert Wolf Claws,";

- mes "108 Soft Grass,";

- mes "and 4 Burning Horseshoes.";

-	next;

- mes "[Hat Seller]";

- mes "Bring those, and we got a deal.";

- mes "You got them?";

-	next;

-	 menu "Yes.",-,"No.",EXT;

-		if ((countitem(2248) < 1) || (countitem(7030) < 108) || (countitem(7194) < 108) || (countitem(7120) < 4)) GOTO EX_NI;

-		delitem 2248,1;

-		delitem 7030,108;

-		delitem 7194,108;

-		getitem 5075,1;

- mes "[Hat Seller]";

- mes "There you go... bye.";

-	close;

-M4:

- mes "[Hat Seller]";

- mes "For this item I require:";

- mes "1 Straw Hat,";

- mes "1 Guitar,";

- mes "50 Cactus Needle.";

-	next;

- mes "[Hat Seller]";

- mes "Bring those, and we got a deal.";

- mes "You got them?";

-	next;

-	 menu "Yes.",-,"No.",EXT;

-		if ((countitem(5062) < 1) || (countitem(1907) < 1) || (countitem(952) < 50)) GOTO EX_NI;

-		delitem 5062,1;

-		delitem 1907,1;

-		delitem 952,300;

-		getitem 5067,1;

- mes "[Hat Seller]";

- mes "There you go... bye.";

-	close;

-M5:

- mes "[Hat Seller]";

- mes "For this item I require:";

- mes "1 Cap,";

- mes "500 Bear Fur.";

-	next;

- mes "[Hat Seller]";

- mes "Bring those, and we got a deal.";

- mes "You got them?";

-	next;

-	 menu "Yes.",-,"No.",EXT;

-		if ((countitem(2227) < 1) || (countitem(7161) < 300)) GOTO EX_NI;

-		delitem 2227,1;

-		delitem 7161,300;

-		getitem 5076,1;

- mes "[Hat Seller]";

- mes "There you go... bye.";

-	close;

+//===== eAthena Script ======================================= 
+//= Hat Seller (New Hat Quests)
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate New Hat quests.
+//===== Additional Comments: ================================= 
+//=
+//============================================================
+
+xmas_in.gat,123,131,4	script	Hat Seller	806,{
+ mes "[Hat Seller]";
+ mes "What hat would you like information on?";
+ mes "I can make all the hats I mention here";
+	next;
+	 menu "Pointy Cap",M1,"Straw Hat",M2,"Cowboy Hat",M3,"Sombrero",M4,"Furry Hat",M5;
+M1:
+ mes "[Hat Seller]";
+ mes "Okay well, for this item I require:";
+ mes "1 Santa Hat,";
+ mes "100 Waxed/Slick paper,";
+ mes "100 Oily Paper.";
+	next;
+ mes "[Hat Seller]";
+ mes "You got these items?";
+	next;
+	 menu "Yes.",-,"No.",EXT;
+		if ((Countitem(2236) < 1) || (countitem(7111) < 100) || (countitem(7151) < 100)) GOTO EXT_NI;
+		delitem 2236,1;
+		delitem 7111,100;
+		delitem 7151,100;
+		getitem 5060,1;
+ mes "[Hat Seller]";
+ mes "Thanks! Bye.";
+	close;
+EX_NI:
+ mes "[Hat Seller]";
+ mes "Not enough items, bye.";
+	close;
+EXT:
+ mes "[Hat Seller]";
+ mes "Bye!";
+	close;
+M2:
+ mes "[Hat Seller]";
+ mes "For this item I require:";
+ mes "1 Sakkat,";
+ mes "300 Tough Branches,";
+ mes "300 Bamboo Pieces.";
+	next;
+ mes "[Hat Seller]";
+ mes "Bring those, and we got a deal.";
+ mes "You got them?";
+	next;
+	 menu "Yes.",-,"No.",EXT;
+		if ((countitem(2280) < 1) || (countitem(7203) < 300) || (countitem(7150) < 300)) GOTO EX_NI;
+		delitem 2280,1;
+		delitem 7203,300;
+		delitem 7150,300;
+		getitem 5062,1;
+ mes "[Hat Seller]";
+ mes "There you go... bye.";
+	close;
+M3:
+ mes "[Hat Seller]";
+ mes "For this item I require:";
+ mes "1 Western Grace,";
+ mes "108 Desert Wolf Claws,";
+ mes "108 Soft Grass,";
+ mes "and 4 Burning Horseshoes.";
+	next;
+ mes "[Hat Seller]";
+ mes "Bring those, and we got a deal.";
+ mes "You got them?";
+	next;
+	 menu "Yes.",-,"No.",EXT;
+		if ((countitem(2248) < 1) || (countitem(7030) < 108) || (countitem(7194) < 108) || (countitem(7120) < 4)) GOTO EX_NI;
+		delitem 2248,1;
+		delitem 7030,108;
+		delitem 7194,108;
+		getitem 5075,1;
+ mes "[Hat Seller]";
+ mes "There you go... bye.";
+	close;
+M4:
+ mes "[Hat Seller]";
+ mes "For this item I require:";
+ mes "1 Straw Hat,";
+ mes "1 Guitar,";
+ mes "50 Cactus Needle.";
+	next;
+ mes "[Hat Seller]";
+ mes "Bring those, and we got a deal.";
+ mes "You got them?";
+	next;
+	 menu "Yes.",-,"No.",EXT;
+		if ((countitem(5062) < 1) || (countitem(1907) < 1) || (countitem(952) < 50)) GOTO EX_NI;
+		delitem 5062,1;
+		delitem 1907,1;
+		delitem 952,300;
+		getitem 5067,1;
+ mes "[Hat Seller]";
+ mes "There you go... bye.";
+	close;
+M5:
+ mes "[Hat Seller]";
+ mes "For this item I require:";
+ mes "1 Cap,";
+ mes "500 Bear Fur.";
+	next;
+ mes "[Hat Seller]";
+ mes "Bring those, and we got a deal.";
+ mes "You got them?";
+	next;
+	 menu "Yes.",-,"No.",EXT;
+		if ((countitem(2227) < 1) || (countitem(7161) < 300)) GOTO EX_NI;
+		delitem 2227,1;
+		delitem 7161,300;
+		getitem 5076,1;
+ mes "[Hat Seller]";
+ mes "There you go... bye.";
+	close;
 }
\ No newline at end of file
diff --git a/npc/quests/newgears/indian_headband.txt b/npc/quests/newgears/indian_headband.txt
index 4b53cc9c0..2b7fe68e6 100644
--- a/npc/quests/newgears/indian_headband.txt
+++ b/npc/quests/newgears/indian_headband.txt
@@ -1,42 +1,42 @@
-//===== eAthena Script ======================================= 

-//= Indian Headband Quest

-//===== By: ================================================== 

-//= Halca (1.0)

-//= Mass Zero (1.1)

-//===== Current Version: ===================================== 

-//= 1.1

-//===== Compatible With: ===================================== 

-//= Any eAthena Version.

-//===== Description: ========================================= 

-//= Seperate Indian Headband quest.

-//===== Additional Comments: ================================= 

-//=

-//============================================================

-

-comodo.gat,238,217,5	script	Merunte	832,{

- mes "[Merunte]";

- mes "Well, umbaga umbumbaga.";

- mes "I like to do stuff like that!";

- mes "And I love Indian Headbands too!";

-	next;

- mes "[Merunte]";

- mes "Give me:";

- mes "100 Bill of Birds,";

- mes "and 10,000 Zeny.";

-	next;

- mes "[Merunte]";

- mes "Got these items?";

-	next;

-	 menu "Yep!",-,"Nope!",EXT;

-		if ((countitem(925) < 1) || (Zeny < 10000)) GOTO EXT;

-		delitem 925,1;

-		set Zeny,Zeny-10000;

-		getitem 5071,1;

- mes "[Merunte]";

- mes "Thanks! Bye.";

-	close;

-EXT:

- mes "[Merunte]";

- mes "Kay bye.";

-	close;

+//===== eAthena Script ======================================= 
+//= Indian Headband Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Indian Headband quest.
+//===== Additional Comments: ================================= 
+//=
+//============================================================
+
+comodo.gat,238,217,5	script	Merunte	832,{
+ mes "[Merunte]";
+ mes "Well, umbaga umbumbaga.";
+ mes "I like to do stuff like that!";
+ mes "And I love Indian Headbands too!";
+	next;
+ mes "[Merunte]";
+ mes "Give me:";
+ mes "100 Bill of Birds,";
+ mes "and 10,000 Zeny.";
+	next;
+ mes "[Merunte]";
+ mes "Got these items?";
+	next;
+	 menu "Yep!",-,"Nope!",EXT;
+		if ((countitem(925) < 1) || (Zeny < 10000)) GOTO EXT;
+		delitem 925,1;
+		set Zeny,Zeny-10000;
+		getitem 5071,1;
+ mes "[Merunte]";
+ mes "Thanks! Bye.";
+	close;
+EXT:
+ mes "[Merunte]";
+ mes "Kay bye.";
+	close;
 }
\ No newline at end of file
diff --git a/npc/quests/newgears/mask_of_alarm.txt b/npc/quests/newgears/mask_of_alarm.txt
index e79d3da63..4e54a6b6a 100644
--- a/npc/quests/newgears/mask_of_alarm.txt
+++ b/npc/quests/newgears/mask_of_alarm.txt
@@ -1,44 +1,44 @@
-//===== eAthena Script ======================================= 

-//= Mask of Alarm Quest

-//===== By: ================================================== 

-//= Halca (1.0)

-//= Mass Zero (1.1)

-//===== Current Version: ===================================== 

-//= 1.1

-//===== Compatible With: ===================================== 

-//= Any eAthena Version.

-//===== Description: ========================================= 

-//= Seperate Mask of Alarm quest.

-//===== Additional Comments: ================================= 

-//=

-//============================================================

-

-aldebaran.gat,87,181,3	script	Muslam	819,{

- mes "[Muslam]";

- mes "I love Alarms, so evil, just like me.";

- mes "Touch me and I will rip your arm off!";

-	next;

- mes "[Muslam]";

- mes "Anyways... If you want a Mask of an Alarm,";

- mes "bring me 3000 Zeny,";

- mes "and 1 Monster Oxygen Mask.";

-	next;

- mes "[Muslam]";

- mes "Got these?";

-	next;

-	 menu "Yep!",-,"Nope!",EXT;

-		if ((countitem(10002) < 1) || (Zeny < 300000)) GOTO EX_NR;

- mes "[Muslam]";

- mes "Great!";

-	next;

-		delitem 1002,1;

-		set Zeny,Zeny-300000;

-		getitem 5087,1;

- mes "[Muslam]";

- mes "Enjoy your item!";

-	close;

-EX_NR:

- mes "[Muslam]";

- mes "Kay! byeee.";

-	close;

+//===== eAthena Script ======================================= 
+//= Mask of Alarm Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Mask of Alarm quest.
+//===== Additional Comments: ================================= 
+//=
+//============================================================
+
+aldebaran.gat,87,181,3	script	Muslam	819,{
+ mes "[Muslam]";
+ mes "I love Alarms, so evil, just like me.";
+ mes "Touch me and I will rip your arm off!";
+	next;
+ mes "[Muslam]";
+ mes "Anyways... If you want a Mask of an Alarm,";
+ mes "bring me 3000 Zeny,";
+ mes "and 1 Monster Oxygen Mask.";
+	next;
+ mes "[Muslam]";
+ mes "Got these?";
+	next;
+	 menu "Yep!",-,"Nope!",EXT;
+		if ((countitem(10002) < 1) || (Zeny < 300000)) GOTO EX_NR;
+ mes "[Muslam]";
+ mes "Great!";
+	next;
+		delitem 1002,1;
+		set Zeny,Zeny-300000;
+		getitem 5087,1;
+ mes "[Muslam]";
+ mes "Enjoy your item!";
+	close;
+EX_NR:
+ mes "[Muslam]";
+ mes "Kay! byeee.";
+	close;
 }
\ No newline at end of file
diff --git a/npc/quests/newgears/mushroom_hairband.txt b/npc/quests/newgears/mushroom_hairband.txt
index 0f0ac3635..ba417c647 100644
--- a/npc/quests/newgears/mushroom_hairband.txt
+++ b/npc/quests/newgears/mushroom_hairband.txt
@@ -1,50 +1,50 @@
-//===== eAthena Script ======================================= 

-//= Mushroom Hairband Quest

-//===== By: ================================================== 

-//= Halca (1.0)

-//= Mass Zero (1.1)

-//===== Current Version: ===================================== 

-//= 1.1

-//===== Compatible With: ===================================== 

-//= Any eAthena Version.

-//===== Description: ========================================= 

-//= Seperate Mushroom Hairband quest.

-//===== Additional Comments: ================================= 

-//=

-//============================================================

-

-prontera.gat,66,87,6	script	Aipo	819,{

- mes "[Aipo]";

- mes "Heeeeee.";

-	next;

- mes "[Aipo]";

- mes "Have you ever wondered what you would look like with a ^000080Mushroom Hairband^000000?";

- mes "Well, I can make you one If you like, just give me 300 Mushroom Spores!";

-	next;

- mes "[Aipo]";

- mes "This wondrous item grew in the depths of a gave and needs the spores for the final";

- mes "materials neededm";

- mes "Want me to make it for you?";

-	next;

-	 menu "Yes! Now make me the item!",-,"No, thanks!",EXT;

-		if (countitem(921) < 300) GOTO NM_EXT;

- mes "[Aipo]";

- mes "Wow! Thanks! Lemme make the item then.";

-	next;

-		delitem 921,300;

- mes "[Aipo]";

- mes "Okay, thanks for the items, now yours in return!";

-	next;

-		getitem 5082,1;

- mes "[Aipo]";

- mes "Thanks again! Bye!";

-	close;

-NM_EXT:

- mes "[Aipo]";

- mes "You don't have enough Mushroom Spores... sorry!";

-	close;

-EXT:

- mes "[Aipo]";

- mes "Well, I'm always here If you change your mind!";

-	close;

+//===== eAthena Script ======================================= 
+//= Mushroom Hairband Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Mushroom Hairband quest.
+//===== Additional Comments: ================================= 
+//=
+//============================================================
+
+prontera.gat,66,87,6	script	Aipo	819,{
+ mes "[Aipo]";
+ mes "Heeeeee.";
+	next;
+ mes "[Aipo]";
+ mes "Have you ever wondered what you would look like with a ^000080Mushroom Hairband^000000?";
+ mes "Well, I can make you one If you like, just give me 300 Mushroom Spores!";
+	next;
+ mes "[Aipo]";
+ mes "This wondrous item grew in the depths of a gave and needs the spores for the final";
+ mes "materials neededm";
+ mes "Want me to make it for you?";
+	next;
+	 menu "Yes! Now make me the item!",-,"No, thanks!",EXT;
+		if (countitem(921) < 300) GOTO NM_EXT;
+ mes "[Aipo]";
+ mes "Wow! Thanks! Lemme make the item then.";
+	next;
+		delitem 921,300;
+ mes "[Aipo]";
+ mes "Okay, thanks for the items, now yours in return!";
+	next;
+		getitem 5082,1;
+ mes "[Aipo]";
+ mes "Thanks again! Bye!";
+	close;
+NM_EXT:
+ mes "[Aipo]";
+ mes "You don't have enough Mushroom Spores... sorry!";
+	close;
+EXT:
+ mes "[Aipo]";
+ mes "Well, I'm always here If you change your mind!";
+	close;
 }
\ No newline at end of file
diff --git a/npc/quests/newgears/neris.txt b/npc/quests/newgears/neris.txt
index bb10ba929..b94298de2 100644
--- a/npc/quests/newgears/neris.txt
+++ b/npc/quests/newgears/neris.txt
@@ -1,101 +1,101 @@
-//===== eAthena Script ======================================= 

-//= Neris (New Hat Quests)

-//===== By: ================================================== 

-//= Halca (1.0)

-//= Mass Zero (1.1)

-//===== Current Version: ===================================== 

-//= 1.1

-//===== Compatible With: ===================================== 

-//= Any eAthena Version.

-//===== Description: ========================================= 

-//= Seperate New Hat quests.

-//===== Additional Comments: ================================= 

-//=

-//============================================================

-

-yuno.gat,21,17,7	script	Neris	806,{

- mes "[Neris]";

- mes "So, whatcha want then?";

-	next;

-	 menu "Large Golden Bell.",LGB,"Crown of Mistress.",COM,"Crown of Ancient Queen.",COAQ;

-LGB:

- mes "[Neris]";

- mes "Hehe, so you are a fan of Sohee's eh?";

- mes "Yeah, I guess I like the bell they carry too!";

-	next;

- mes "[Neris]";

- mes "Looks pretty cute when you wear it.";

- mes "So... what can I do for you?";

-	 menu "Make me the golden bell!",-,"What do I need to make it?",REQL,"Nothing, thanks.",EXT;

-		if ((countitem(10016) < 1) || (countitem(714) < 1) || (countitem(969) < 3) || (Zeny < 1000)) GOTO EX_NR;

- mes "[Neris]";

- mes "Now, lets swap your items.";

-	next;

-		delitem 10016,1;

-		delitem 714,1;

-		delitem 969,3;

-		set Zeny,Zeny-1000;

-		getitem 5091,1;

- mes "[Neris]";

- mes "Thanks, and bye!";

-	close;

-REQL:

- mes "[Neris]";

- mes "Okay all these are gold related:";

- mes "1 Golden Bell,";

- mes "1 Emperium,";

- mes "3 Golds,";

- mes "1000 Zeny for the labor.";

-	close;

-COM:

- mes "[Neris]";

- mes "You like mistresses?";

-	next;

- mes "[Neris]";

- mes "So... what can I do for you?";

-	 menu "Make me the item.",-,"What do I need to make it?",REQC,"Nothing, thanks.",EXT;

-		if ((countitem(2249) < 1) || (countitem(714) < 1) || (countitem(969) < 3) || (Zeny < 1000)) GOTO EX_NR;

- mes "[Neris]";

- mes "Now, lets swap your items.";

-	next;

-		delitem 2249,1;

-		delitem 714,1;

-		delitem 969,3;

-		set Zeny,Zeny-1000;

-		getitem 5081,1;

- mes "[Neris]";

- mes "Thanks, and bye!";

-	close;

-REQC:

- mes "[Neris]";

- mes "Okay all these are gold related:";

- mes "1 Coronet,";

- mes "1 Emperium,";

- mes "3 Golds,";

- mes "1000 Zeny for the labor.";

-	close;

-COAQ:

- mes "[Neris]";

- mes "You like ancient queens?";

-	next;

- mes "[Neris]";

- mes "So.. what can I do for you?";

-	 menu "Make me the item.",-,"What do I need to make it?",REQC,"Nothing, thanks.",EXT;

-		if ((countitem(10006) < 1) || (countitem(714) < 1) || (countitem(969) < 3) || (Zeny < 1000)) GOTO EX_NR;

- mes "[Neris]";

- mes "Now, lets swap your items";

-	next;

-		delitem 10006,1;

-		delitem 714,1;

-		delitem 969,3;

-		set Zeny,Zeny-1000;

-		getitem 5080,1;

- mes "[Neris]";

- mes "Thanks, and bye!";

-	close;

-EX_NR:

- mes "[Neris]";

- mes "Don't take me for a fool!";

- mes "No items, no deal!";

-	close; 

+//===== eAthena Script ======================================= 
+//= Neris (New Hat Quests)
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate New Hat quests.
+//===== Additional Comments: ================================= 
+//=
+//============================================================
+
+yuno.gat,21,17,7	script	Neris	806,{
+ mes "[Neris]";
+ mes "So, whatcha want then?";
+	next;
+	 menu "Large Golden Bell.",LGB,"Crown of Mistress.",COM,"Crown of Ancient Queen.",COAQ;
+LGB:
+ mes "[Neris]";
+ mes "Hehe, so you are a fan of Sohee's eh?";
+ mes "Yeah, I guess I like the bell they carry too!";
+	next;
+ mes "[Neris]";
+ mes "Looks pretty cute when you wear it.";
+ mes "So... what can I do for you?";
+	 menu "Make me the golden bell!",-,"What do I need to make it?",REQL,"Nothing, thanks.",EXT;
+		if ((countitem(10016) < 1) || (countitem(714) < 1) || (countitem(969) < 3) || (Zeny < 1000)) GOTO EX_NR;
+ mes "[Neris]";
+ mes "Now, lets swap your items.";
+	next;
+		delitem 10016,1;
+		delitem 714,1;
+		delitem 969,3;
+		set Zeny,Zeny-1000;
+		getitem 5091,1;
+ mes "[Neris]";
+ mes "Thanks, and bye!";
+	close;
+REQL:
+ mes "[Neris]";
+ mes "Okay all these are gold related:";
+ mes "1 Golden Bell,";
+ mes "1 Emperium,";
+ mes "3 Golds,";
+ mes "1000 Zeny for the labor.";
+	close;
+COM:
+ mes "[Neris]";
+ mes "You like mistresses?";
+	next;
+ mes "[Neris]";
+ mes "So... what can I do for you?";
+	 menu "Make me the item.",-,"What do I need to make it?",REQC,"Nothing, thanks.",EXT;
+		if ((countitem(2249) < 1) || (countitem(714) < 1) || (countitem(969) < 3) || (Zeny < 1000)) GOTO EX_NR;
+ mes "[Neris]";
+ mes "Now, lets swap your items.";
+	next;
+		delitem 2249,1;
+		delitem 714,1;
+		delitem 969,3;
+		set Zeny,Zeny-1000;
+		getitem 5081,1;
+ mes "[Neris]";
+ mes "Thanks, and bye!";
+	close;
+REQC:
+ mes "[Neris]";
+ mes "Okay all these are gold related:";
+ mes "1 Coronet,";
+ mes "1 Emperium,";
+ mes "3 Golds,";
+ mes "1000 Zeny for the labor.";
+	close;
+COAQ:
+ mes "[Neris]";
+ mes "You like ancient queens?";
+	next;
+ mes "[Neris]";
+ mes "So.. what can I do for you?";
+	 menu "Make me the item.",-,"What do I need to make it?",REQC,"Nothing, thanks.",EXT;
+		if ((countitem(10006) < 1) || (countitem(714) < 1) || (countitem(969) < 3) || (Zeny < 1000)) GOTO EX_NR;
+ mes "[Neris]";
+ mes "Now, lets swap your items";
+	next;
+		delitem 10006,1;
+		delitem 714,1;
+		delitem 969,3;
+		set Zeny,Zeny-1000;
+		getitem 5080,1;
+ mes "[Neris]";
+ mes "Thanks, and bye!";
+	close;
+EX_NR:
+ mes "[Neris]";
+ mes "Don't take me for a fool!";
+ mes "No items, no deal!";
+	close; 
 }
\ No newline at end of file
diff --git a/npc/quests/newgears/old_blacksmith.txt b/npc/quests/newgears/old_blacksmith.txt
index 3f6184043..2ea20653b 100644
--- a/npc/quests/newgears/old_blacksmith.txt
+++ b/npc/quests/newgears/old_blacksmith.txt
@@ -1,91 +1,91 @@
-//===== eAthena Script ======================================= 

-//= Angel & Devil Ears Quests

-//===== By: ================================================== 

-//= Halca (1.0)

-//= Mass Zero (1.1)

-//===== Current Version: ===================================== 

-//= 1.1

-//===== Compatible With: ===================================== 

-//= Any eAthena Version.

-//===== Description: ========================================= 

-//= Seperate Angel & Devil Ears quests.

-//===== Additional Comments: ================================= 

-//=

-//============================================================

-

-yuno.gat,246,51,4	script	Old Blacksmith	813,{

- mes "[Old Blacksmith]";

- mes "Well then my good man!";

- mes "What can I do for you?";

-	next;

-	 menu "Give me the ears of a devil!",EOD,"Give me the ears of an angel!",EOA;

-EOD:

- mes "[Old Blacksmith]";

- mes "Well, this item sure makes you look like a evil bastard.";

- mes "It makes me crap in my pants when I see these.";

-	next;

-	 menu "Dont care, make me the Item!",-,"What are the requirements?",EODREQ,"Nothing",EXT;

-		if ((countitem(5038) < 1) || (countitem(2286) < 1) || (Zeny < 20000)) GOTO EX_REQ;

- mes "[Old Blacksmith]";

- mes "Wow, never thought a little fella like you could get tha.t";

- mes "Bwahaha, ok.";

-	next;

-		delitem 5038,1;

-		delitem 2286,1;

-		set Zeny,Zeny-20000;

-		getitem 5068,1;

- mes "[Old Blacksmith]";

- mes "Well, enjoy your item!";

-	close;

-EOA:

- mes "[Old Blacksmith]";

- mes "Well, this item sure makes you look like a holy bastard.";

-	next;

-	 menu "Dont care, make me the Item!",-,"What are the requirements?",EOAREQ,"Nothing",EXT;

-		if ((countitem(2286) < 1) || (countitem(2254) < 1) || (Zeny < 20000)) GOTO EX_REQ_A;

- mes "[Old Blacksmith]";

- mes "Well well well! Someone who has the spirit!";

- mes "Okay, gimme the items.";

-	next;

-		delitem 2286,1;

-		delitem 2254,1;

-		set Zeny,Zeny-20000;

- mes "[Old Blacksmith]";

- mes "Okay, and here you go.";

-	next;

-		getitem 5066,1;

- mes "[Old Blacksmith]";

- mes "Enjoy it!";

-	close;

-EAOREQ:

- mes "[Old Blacksmith]";

- mes "Well, this item is very holy, so I will need:";

- mes "1 Angel Wing/Angel Hheadband,";

- mes "1 Elven Ears for the ears,";

- mes "and 20,000z for the labour costs!";

-	close;

-EODREQ:

- mes "[Old Blacksmith]";

- mes "Well, let's see...";

- mes "I need something for the evil, that be a Deviruchi Cap,";

- mes "I also need the ears for the base of it, Elven Ears would be OK,";

- mes "Last of all, I need 20,000 Zeny for me troubles.";

-	next;

- mes "[Old Blacksmith]";

- mes "Hey, I have to make a living!";

-	close;

-EX_REQ:

- mes "[Old Blacksmith]";

- mes "Well sorry, but you dont have enough items!";

-	next;

-	 GOTO EODREQ;

-EX_REQ_A:

- mes "[Old Blacksmith]";

- mes "Well sorry, but you dont have enough items!";

-	next;

-	 GOTO EOAREQ;

-EXT:

- mes "[Old Blacksmith]";

- mes "Fair yee well!";

-	close;

+//===== eAthena Script ======================================= 
+//= Angel & Devil Ears Quests
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Angel & Devil Ears quests.
+//===== Additional Comments: ================================= 
+//=
+//============================================================
+
+yuno.gat,246,51,4	script	Old Blacksmith	813,{
+ mes "[Old Blacksmith]";
+ mes "Well then my good man!";
+ mes "What can I do for you?";
+	next;
+	 menu "Give me the ears of a devil!",EOD,"Give me the ears of an angel!",EOA;
+EOD:
+ mes "[Old Blacksmith]";
+ mes "Well, this item sure makes you look like a evil bastard.";
+ mes "It makes me crap in my pants when I see these.";
+	next;
+	 menu "Dont care, make me the Item!",-,"What are the requirements?",EODREQ,"Nothing",EXT;
+		if ((countitem(5038) < 1) || (countitem(2286) < 1) || (Zeny < 20000)) GOTO EX_REQ;
+ mes "[Old Blacksmith]";
+ mes "Wow, never thought a little fella like you could get tha.t";
+ mes "Bwahaha, ok.";
+	next;
+		delitem 5038,1;
+		delitem 2286,1;
+		set Zeny,Zeny-20000;
+		getitem 5068,1;
+ mes "[Old Blacksmith]";
+ mes "Well, enjoy your item!";
+	close;
+EOA:
+ mes "[Old Blacksmith]";
+ mes "Well, this item sure makes you look like a holy bastard.";
+	next;
+	 menu "Dont care, make me the Item!",-,"What are the requirements?",EOAREQ,"Nothing",EXT;
+		if ((countitem(2286) < 1) || (countitem(2254) < 1) || (Zeny < 20000)) GOTO EX_REQ_A;
+ mes "[Old Blacksmith]";
+ mes "Well well well! Someone who has the spirit!";
+ mes "Okay, gimme the items.";
+	next;
+		delitem 2286,1;
+		delitem 2254,1;
+		set Zeny,Zeny-20000;
+ mes "[Old Blacksmith]";
+ mes "Okay, and here you go.";
+	next;
+		getitem 5066,1;
+ mes "[Old Blacksmith]";
+ mes "Enjoy it!";
+	close;
+EAOREQ:
+ mes "[Old Blacksmith]";
+ mes "Well, this item is very holy, so I will need:";
+ mes "1 Angel Wing/Angel Hheadband,";
+ mes "1 Elven Ears for the ears,";
+ mes "and 20,000z for the labour costs!";
+	close;
+EODREQ:
+ mes "[Old Blacksmith]";
+ mes "Well, let's see...";
+ mes "I need something for the evil, that be a Deviruchi Cap,";
+ mes "I also need the ears for the base of it, Elven Ears would be OK,";
+ mes "Last of all, I need 20,000 Zeny for me troubles.";
+	next;
+ mes "[Old Blacksmith]";
+ mes "Hey, I have to make a living!";
+	close;
+EX_REQ:
+ mes "[Old Blacksmith]";
+ mes "Well sorry, but you dont have enough items!";
+	next;
+	 GOTO EODREQ;
+EX_REQ_A:
+ mes "[Old Blacksmith]";
+ mes "Well sorry, but you dont have enough items!";
+	next;
+	 GOTO EOAREQ;
+EXT:
+ mes "[Old Blacksmith]";
+ mes "Fair yee well!";
+	close;
 }
\ No newline at end of file
diff --git a/npc/quests/newgears/posture_fix_hat.txt b/npc/quests/newgears/posture_fix_hat.txt
index 85317e029..91d04f7f2 100644
--- a/npc/quests/newgears/posture_fix_hat.txt
+++ b/npc/quests/newgears/posture_fix_hat.txt
@@ -1,61 +1,61 @@
-//===== eAthena Script ======================================= 

-//= Posture Fix Hat Quest

-//===== By: ================================================== 

-//= Halca (1.0)

-//= Mass Zero (1.1)

-//===== Current Version: ===================================== 

-//= 1.1

-//===== Compatible With: ===================================== 

-//= Any eAthena Version.

-//===== Description: ========================================= 

-//= Seperate Posture Fix Hat quest.

-//===== Additional Comments: ================================= 

-//=

-//============================================================

-

-pay_in01.gat,171,142,5	script	Nan Hyang	814,{

-		If (getequipisequiped(5073)) GOTO GOOD;

-		If (Class == 0) GOTO EXT;

- mes "[Nan Hyang]";

- mes "Tut tut! you have terrible posture!";

- mes "You need to correct it immediately!";

-	next;

- mes "[Nan Hyang]";

- mes "I could correct it for you If you brought me";

- mes "some materials to make you a posture aid.";

-	next;

-	 menu "Can you please make me the aid.",-,"What do I need to bring?",AIT,"No thanks!",EXT;

-		If ((Countitem(1550) <1) || (Countitem(2285) < 1 )) GOTO A_NM;

- mes "[Nan Hyang]";

- mes "Ahh at last, someone who is serious!";

-	next;

-		delitem 1550,1;

-		delitem 2885,1;

-		getitem 5073,1;

- mes "[Nan Hyang]";

- mes "Hehe, well, maybe you will become more careful, or your sense will";

- mes "become balanced.";

-	close;

-AIT:

- mes "[Nan Hyang]";

- mes "What I require is very simple...";

-	next;

- mes "[Nan Hyang]";

- mes "1 Book.";

- mes "And 1 Apple o' Archer to balance on it.";

-	close;

-A_NM:

- mes "[Nan Hyang]";

- mes "At least be serious, you dont have enough items!";

- mes "Come back when you wish to learn posture.";

-	close;

-GOOD:

- mes "[Nan Hyang]";

- mes "Ah, that's it! good to see you are willing to learn!";

-	close;

-EXIT:

-	next;

- mes "[Nan Hyang]";

- mes "Good day to you.";

-	close;

+//===== eAthena Script ======================================= 
+//= Posture Fix Hat Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Posture Fix Hat quest.
+//===== Additional Comments: ================================= 
+//=
+//============================================================
+
+pay_in01.gat,171,142,5	script	Nan Hyang	814,{
+		If (getequipisequiped(5073)) GOTO GOOD;
+		If (Class == 0) GOTO EXT;
+ mes "[Nan Hyang]";
+ mes "Tut tut! you have terrible posture!";
+ mes "You need to correct it immediately!";
+	next;
+ mes "[Nan Hyang]";
+ mes "I could correct it for you If you brought me";
+ mes "some materials to make you a posture aid.";
+	next;
+	 menu "Can you please make me the aid.",-,"What do I need to bring?",AIT,"No thanks!",EXT;
+		If ((Countitem(1550) <1) || (Countitem(2285) < 1 )) GOTO A_NM;
+ mes "[Nan Hyang]";
+ mes "Ahh at last, someone who is serious!";
+	next;
+		delitem 1550,1;
+		delitem 2885,1;
+		getitem 5073,1;
+ mes "[Nan Hyang]";
+ mes "Hehe, well, maybe you will become more careful, or your sense will";
+ mes "become balanced.";
+	close;
+AIT:
+ mes "[Nan Hyang]";
+ mes "What I require is very simple...";
+	next;
+ mes "[Nan Hyang]";
+ mes "1 Book.";
+ mes "And 1 Apple o' Archer to balance on it.";
+	close;
+A_NM:
+ mes "[Nan Hyang]";
+ mes "At least be serious, you dont have enough items!";
+ mes "Come back when you wish to learn posture.";
+	close;
+GOOD:
+ mes "[Nan Hyang]";
+ mes "Ah, that's it! good to see you are willing to learn!";
+	close;
+EXIT:
+	next;
+ mes "[Nan Hyang]";
+ mes "Good day to you.";
+	close;
 }
\ No newline at end of file
diff --git a/npc/quests/newgears/sea_otter_hat.txt b/npc/quests/newgears/sea_otter_hat.txt
index 14ca85dbc..7ca272032 100644
--- a/npc/quests/newgears/sea_otter_hat.txt
+++ b/npc/quests/newgears/sea_otter_hat.txt
@@ -1,50 +1,50 @@
-//===== eAthena Script ======================================= 

-//= Sea Otter Hat Quest

-//===== By: ================================================== 

-//= Halca (1.0)

-//= Mass Zero (1.1)

-//===== Current Version: ===================================== 

-//= 1.1

-//===== Compatible With: ===================================== 

-//= Any eAthena Version.

-//===== Description: ========================================= 

-//= Seperate Seo Otter Hat quest.

-//===== Additional Comments: ================================= 

-//=

-//============================================================

-

-xmas.gat,184,267,4	script	Pretty Rency	818,{

- mes "[Pretty Rency]";

- mes "Wow! you heard of a Sea Otter Hat?";

-	next;

- mes "[Pretty Rency]";

- mes "The requirements for this item, are very simple:";

- mes "1 Raccoon Hat,";

- mes "1 Transform Leaf";

-	next;

- mes "[Pretty Rency]";

- mes "Do you have these items?";

-	next;

-	 menu "Yes.",-,"No.",EXT;

-		if ((countitem(5084) < 1) || (countitem(5064) < 1)) GOTO NM_EXT;

- mes "[Pretty Rency]";

- mes "Congratulations!";

-	next;

-		delitem 5084,1;

-		delitem 5064,1;

- mes "[Pretty Rency]";

- mes "Thanks for your items! Now I will make yours for you!";

-	next;

-		getitem 5078,1;

- mes "[Pretty Rency]";

- mes "Thanks! Byeeeeeee!";

-	close;

-NM_EXT:

- mes "[Pretty Rency]";

- mes "Sorry, not enough items.";

-	close;

-EXT:

- mes "[Pretty Rency]";

- mes "Byebye! Have a nice time in the world of Ragnarok!";

-	close;

+//===== eAthena Script ======================================= 
+//= Sea Otter Hat Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Seo Otter Hat quest.
+//===== Additional Comments: ================================= 
+//=
+//============================================================
+
+xmas.gat,184,267,4	script	Pretty Rency	818,{
+ mes "[Pretty Rency]";
+ mes "Wow! you heard of a Sea Otter Hat?";
+	next;
+ mes "[Pretty Rency]";
+ mes "The requirements for this item, are very simple:";
+ mes "1 Raccoon Hat,";
+ mes "1 Transform Leaf";
+	next;
+ mes "[Pretty Rency]";
+ mes "Do you have these items?";
+	next;
+	 menu "Yes.",-,"No.",EXT;
+		if ((countitem(5084) < 1) || (countitem(5064) < 1)) GOTO NM_EXT;
+ mes "[Pretty Rency]";
+ mes "Congratulations!";
+	next;
+		delitem 5084,1;
+		delitem 5064,1;
+ mes "[Pretty Rency]";
+ mes "Thanks for your items! Now I will make yours for you!";
+	next;
+		getitem 5078,1;
+ mes "[Pretty Rency]";
+ mes "Thanks! Byeeeeeee!";
+	close;
+NM_EXT:
+ mes "[Pretty Rency]";
+ mes "Sorry, not enough items.";
+	close;
+EXT:
+ mes "[Pretty Rency]";
+ mes "Byebye! Have a nice time in the world of Ragnarok!";
+	close;
 }
\ No newline at end of file
diff --git a/npc/quests/newgears/traveler.txt b/npc/quests/newgears/traveler.txt
index 293abe1e3..384835274 100644
--- a/npc/quests/newgears/traveler.txt
+++ b/npc/quests/newgears/traveler.txt
@@ -1,114 +1,114 @@
-//===== eAthena Script ======================================= 

-//= Traveler (New Hat Quests)

-//===== By: ================================================== 

-//= Halca (1.0)

-//= Mass Zero (1.1)

-//===== Current Version: ===================================== 

-//= 1.1

-//===== Compatible With: ===================================== 

-//= Any eAthena Version.

-//===== Description: ========================================= 

-//= Seperate New Hat quests.

-//===== Additional Comments: ================================= 

-//=

-//============================================================

-

-morroc.gat,234,77,6	script	Traveler	807,{

-		if (Class == 0) GOTO EXT;

- mes "[Traveler]";

- mes "What item do you want from me?";

-	next;

-	 menu "Annoyed Raccoon Dog Hat.",MN1,"Fresh Bluish Fish Hat",MN2,"Drooping Cat",MN3,"Transformation Leaf",MN4;

-MN1:

- mes "[Traveler]";

- mes "Gimme 1000 Acorns,";

- mes "100 Sea Otter Skins,";

- mes "and 10 Raccoon Dog's Leaf";

-	next;

- mes "[Traveler]";

- mes "Got these items?";

-	next;

-menu "Yep.",-,"No!",EXT;

-		if ((countitem(1026) < 1000) || (countitem(7065) < 100) || (countitem(945) < 10)) GOTO EX_NM;

- mes "[Traveler]";

- mes "Well, then here is your item";

-	next;

-		delitem 1026,1000;

-		delitem 7065,100;

-		delitem 945,10;

-		getitem 5084,1;

- mes "[Traveler]";

- mes "Enjoy.";

-	close;

-MN2:

- mes "[Traveler]";

- mes "Gimme 1 Rotten Fish,";

- mes "300 Rotten Scales,";

- mes "50 Sashimi,";

- mes "1 Tail of a Fish,";

- mes "and 100 Sticky Mucus";

-	next;

- mes "[Traveler]";

- mes "Got these items?";

-	 menu "Yes",-,"No.",EXT;

-		if ((countitem(624) < 1) || (countitem(959) < 300) || (countitem(1144) < 50) || (countitem(1023) < 1) || (countitem(938) < 100)) GOTO EX_NM; 

- mes "[Traveler]";

- mes "Okay, thanks.";

-	next;

-		delitem 624,1;

-		delitem 959,300;

-		delitem 1144,50;

-		delitem 1023,1;

-		delitem 938,100;

-		getitem 5065,1

- mes "[Traveler]";

- mes "Thanks. Bye.";

-	close;

-MN3:

- mes "[Traveler]";

- mes "Give me 1 Slotted Circlet,";

- mes "1 Black Dyestuff,";

- mes "and 300 Cat Dolls.";

- mes "Loli Ruri drops the last one.";

-	next;

- mes "[Traveler]";

- mes "Have you these items?";

-	next;

-menu "Yes",-,"No.",EXT;

-		if ((countitem(2233) < 1) || (countitem(7206) < 300)) GOTO EX_NM;

- mes "[Traveler]";

- mes "Okay, here you are.";

-	next;

-		delitem 2233,1;

-		delitem 7206,300;

-		getitem 5058,1;

- mes "[Traveler]";

- mes "Good luck.";

-	close;

-MN4:

- mes "[Traveler]";

- mes "Bring me 600 Raccoon Dog's Leaf (Raccoon Leaf)";

-	next;

- mes "[Traveler]";

- mes "You have these?";

-	next;

-menu "Yes!",-,"Nope.",EXT;

-		if (countitem(945) < 600) GOTO EX_NM;

- mes "[Traveler]";

- mes "Thanks. here's your leaf";

-	next;

-		delitem 945,600;

-		getitem 5064,1;

- mes "[Traveler]";

- mes "Enjoy your Item";

-	close;

-EX_NM:

- mes "[Traveler]";

- mes "No stuff, no item!";

- mes "When you have it, come back.";

-	close;

-EXT:

- mes "[Traveler]";

- mes "Bye.";

-	close;

+//===== eAthena Script ======================================= 
+//= Traveler (New Hat Quests)
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate New Hat quests.
+//===== Additional Comments: ================================= 
+//=
+//============================================================
+
+morroc.gat,234,77,6	script	Traveler	807,{
+		if (Class == 0) GOTO EXT;
+ mes "[Traveler]";
+ mes "What item do you want from me?";
+	next;
+	 menu "Annoyed Raccoon Dog Hat.",MN1,"Fresh Bluish Fish Hat",MN2,"Drooping Cat",MN3,"Transformation Leaf",MN4;
+MN1:
+ mes "[Traveler]";
+ mes "Gimme 1000 Acorns,";
+ mes "100 Sea Otter Skins,";
+ mes "and 10 Raccoon Dog's Leaf";
+	next;
+ mes "[Traveler]";
+ mes "Got these items?";
+	next;
+menu "Yep.",-,"No!",EXT;
+		if ((countitem(1026) < 1000) || (countitem(7065) < 100) || (countitem(945) < 10)) GOTO EX_NM;
+ mes "[Traveler]";
+ mes "Well, then here is your item";
+	next;
+		delitem 1026,1000;
+		delitem 7065,100;
+		delitem 945,10;
+		getitem 5084,1;
+ mes "[Traveler]";
+ mes "Enjoy.";
+	close;
+MN2:
+ mes "[Traveler]";
+ mes "Gimme 1 Rotten Fish,";
+ mes "300 Rotten Scales,";
+ mes "50 Sashimi,";
+ mes "1 Tail of a Fish,";
+ mes "and 100 Sticky Mucus";
+	next;
+ mes "[Traveler]";
+ mes "Got these items?";
+	 menu "Yes",-,"No.",EXT;
+		if ((countitem(624) < 1) || (countitem(959) < 300) || (countitem(1144) < 50) || (countitem(1023) < 1) || (countitem(938) < 100)) GOTO EX_NM; 
+ mes "[Traveler]";
+ mes "Okay, thanks.";
+	next;
+		delitem 624,1;
+		delitem 959,300;
+		delitem 1144,50;
+		delitem 1023,1;
+		delitem 938,100;
+		getitem 5065,1
+ mes "[Traveler]";
+ mes "Thanks. Bye.";
+	close;
+MN3:
+ mes "[Traveler]";
+ mes "Give me 1 Slotted Circlet,";
+ mes "1 Black Dyestuff,";
+ mes "and 300 Cat Dolls.";
+ mes "Loli Ruri drops the last one.";
+	next;
+ mes "[Traveler]";
+ mes "Have you these items?";
+	next;
+menu "Yes",-,"No.",EXT;
+		if ((countitem(2233) < 1) || (countitem(7206) < 300)) GOTO EX_NM;
+ mes "[Traveler]";
+ mes "Okay, here you are.";
+	next;
+		delitem 2233,1;
+		delitem 7206,300;
+		getitem 5058,1;
+ mes "[Traveler]";
+ mes "Good luck.";
+	close;
+MN4:
+ mes "[Traveler]";
+ mes "Bring me 600 Raccoon Dog's Leaf (Raccoon Leaf)";
+	next;
+ mes "[Traveler]";
+ mes "You have these?";
+	next;
+menu "Yes!",-,"Nope.",EXT;
+		if (countitem(945) < 600) GOTO EX_NM;
+ mes "[Traveler]";
+ mes "Thanks. here's your leaf";
+	next;
+		delitem 945,600;
+		getitem 5064,1;
+ mes "[Traveler]";
+ mes "Enjoy your Item";
+	close;
+EX_NM:
+ mes "[Traveler]";
+ mes "No stuff, no item!";
+ mes "When you have it, come back.";
+	close;
+EXT:
+ mes "[Traveler]";
+ mes "Bye.";
+	close;
 }
\ No newline at end of file
diff --git a/npc/quests/newgears/tulip_hairpin.txt b/npc/quests/newgears/tulip_hairpin.txt
index db2b5af4e..fc9c1cd5a 100644
--- a/npc/quests/newgears/tulip_hairpin.txt
+++ b/npc/quests/newgears/tulip_hairpin.txt
@@ -1,49 +1,49 @@
-//===== eAthena Script ======================================= 

-//= Tulip Hairpin Quest

-//===== By: ================================================== 

-//= Halca (1.0)

-//= Mass Zero (1.1)

-//===== Current Version: ===================================== 

-//= 1.1

-//===== Compatible With: ===================================== 

-//= Any eAthena Version.

-//===== Description: ========================================= 

-//= Seperate Tulip Hairpin quest.

-//===== Additional Comments: ================================= 

-//=

-//============================================================

-

-prontera.gat,84,189,6	script	Ses	815,{

- mes "[Ses]";

- mes "Woo, hello! Fruit fruit!";

- mes "Sorry, I just love flowers, fruits and everything that makes me";

- mes "look more FRUITY!";

-	next;

-	 menu "Shh, just make me the Tulip Hairpin!",-,"What do I need for the Tulip Hairpin?",TH_REQ,"Bye!",EXIT;

- mes "[Ses]";

- mes "You have the items?";

-	next;

-	menu "Yes!",-,"No!",EXIT;

-		If ((countitem(2278) < 1) || (countitem(975) < 1)) GOTO EX_NM;

- mes "[Ses]";

- mes "Yay! thanks! Pineapple!";

- mes "Here you go!";

-	next;

-		delitem 2278,1;

-		delitem 975,1;

-		getitem 5077,1;

- mes "[Ses]";

- mes "Enjoy being pretty!";

-	close;

-TH_REQ:

- mes "[Ses]";

- mes "Well, I need...";

- mes "1 Mr. Smile for the substance";

- mes "and 1 scarlet dyestuff!";

- mes "Bring these to me for your item!";

-	close;

-EXIT:

- mes "[Ses]";

- mes "Okay!";

- mes "Byeeeee!";

+//===== eAthena Script ======================================= 
+//= Tulip Hairpin Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Tulip Hairpin quest.
+//===== Additional Comments: ================================= 
+//=
+//============================================================
+
+prontera.gat,84,189,6	script	Ses	815,{
+ mes "[Ses]";
+ mes "Woo, hello! Fruit fruit!";
+ mes "Sorry, I just love flowers, fruits and everything that makes me";
+ mes "look more FRUITY!";
+	next;
+	 menu "Shh, just make me the Tulip Hairpin!",-,"What do I need for the Tulip Hairpin?",TH_REQ,"Bye!",EXIT;
+ mes "[Ses]";
+ mes "You have the items?";
+	next;
+	menu "Yes!",-,"No!",EXIT;
+		If ((countitem(2278) < 1) || (countitem(975) < 1)) GOTO EX_NM;
+ mes "[Ses]";
+ mes "Yay! thanks! Pineapple!";
+ mes "Here you go!";
+	next;
+		delitem 2278,1;
+		delitem 975,1;
+		getitem 5077,1;
+ mes "[Ses]";
+ mes "Enjoy being pretty!";
+	close;
+TH_REQ:
+ mes "[Ses]";
+ mes "Well, I need...";
+ mes "1 Mr. Smile for the substance";
+ mes "and 1 scarlet dyestuff!";
+ mes "Bring these to me for your item!";
+	close;
+EXIT:
+ mes "[Ses]";
+ mes "Okay!";
+ mes "Byeeeee!";
 }
\ No newline at end of file