37 files changed, 1756 insertions, 444 deletions

diff --git a/npc/quests/all_quest.txt b/npc/quests/all_quest.txt
index a6a6e3264..73a47c6e7 100644
--- a/npc/quests/all_quest.txt
+++ b/npc/quests/all_quest.txt
@@ -501,7 +501,7 @@ LCancel6:
 Headset:
 	mes "[Quest Assistant]";
 	mes "These are Articles needed for my Grandfather's masterpiece.";
-	mes "^3355FF100 Steel^000000";
+	mes "^3355FF40 Steel^000000";
 	mes "^3355FF1 Oridecon^000000";
 	mes "^3355FF1 Alchol^000000";
 	mes "^3355FF1 Coal^000000";
diff --git a/npc/quests/bunnyband.txt b/npc/quests/bunnyband.txt
index 81ff319c5..2f459da80 100644
--- a/npc/quests/bunnyband.txt
+++ b/npc/quests/bunnyband.txt
@@ -16,8 +16,7 @@
 
 
 // Prontera ------------------------------------------------------------------------------------------------------------------------------------------
-prontera.gat,146,87,6	script	Kafra Corp. Rep.#1::KCRep	83,
-{
+prontera.gat,146,87,6	script	Kafra Corp. Rep.#1::KCRep	83,{
 	mes "[Kafra Corp. Rep.]";
 	if (BUNYBND == 1) goto L_Check;
 	mes "^529DFFSpecial Event, ^FF0000Bunny Band ^529DFFQuest!!^000000";
diff --git a/npc/quests/custom/event_32_new_hats.txt b/npc/quests/custom/event_32_new_hats.txt
index 52056d437..5ad0c66f4 100644
--- a/npc/quests/custom/event_32_new_hats.txt
+++ b/npc/quests/custom/event_32_new_hats.txt
@@ -699,7 +699,7 @@ L1_19:
 	mes "Let me check the items you have brought here.";
 	next;
 	if((countitem(10007) < 1)) goto L_ITEM_1b;
-	if((countitem(10008) < 1)) goto L_ITEM_2b;
+	if((countitem(10009) < 1)) goto L_ITEM_2b;
 	mes "[Jac]";
 	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Kafra Band for you right away. Please Wait a Moment.";
    	next;
diff --git a/npc/quests/custom/event_6_new_hats.txt b/npc/quests/custom/event_6_new_hats.txt
index 583f190b9..ab4413138 100644
--- a/npc/quests/custom/event_6_new_hats.txt
+++ b/npc/quests/custom/event_6_new_hats.txt
@@ -1,366 +1,366 @@
-//===== eAthena Script =======================================

-//= Custom Quest For New Headgears

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

-//= RedxSwordxHero, Lupus

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

-//= 1.2

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

-//= eAthena 1.0

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

-//= 4 brothers give you quests to get 6 new hats (missing

-//= 	from official quests)

-//= Use this custom quest instead of event_32_new_hats.txt

-//= -Bongun Hat

-//= -Poring Hat, Sphinx Hat

-//= -Kafra Band, Panda Hat

-//= -Crescent Hairpin

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

-//= Event New Hats by RedxSwordxHero 

-//= Ported and improved with timers [Lupus]

-//= Thanks to x[tsk],fixed all item requirments to iRO specs exept

-//= for hats which cannot be made on the real server. [Lupus]

-//= 1.2 removed already existing official hat quests [Lupus]

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

-

-

-prontera.gat,140,172,5	script	Zac	704,{

-	mes "[Zac]";

-	mes "I am the oldest and strongest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat, so I can make them.";

-	next;

-	mes "[Zac]";

-	mes "I provide 8 hats and my brothers provides the other 24.";

-	next;

-	menu "Join",L1,"Information",L2,"Cancel",L3;

-L1:	

-	mes "[Zac]";

-	mes "What hat do you want me to make?";

-	next;

-	menu "Bongun Hat",L1_4;

-L1_4:

-	mes "[Zac]";

-	mes "Let me check the items you have brought here.";

-	next;

-	if((countitem(609) < 10)) goto L_ITEM_1c;//Items: Amulet,

-	if((countitem(978) < 1)) goto L_ITEM_2c;//Items: Cobaltblue Dyestuff,

-	if((countitem(2264) < 1)) goto L_ITEM_3c;//Items: Munak Hat,

-	mes "[Zac]";

-	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Bongun Hat for you right away. Please Wait a Moment.";

-   	next;

-	delitem 609,100;//Items: Amulet,

-	delitem 978,1;//Items: Cobaltblue Dyestuff,

-	delitem 2264,1;	//Items: Munak Hat,

-	mes "[Zac]";

-	mes "Tah Dah! ^FF0000Bongun Hat^000000...! Please Take it!";

-	getitem 5046,1;//Items: Bongun Hat,

-	next;

-	mes "[Zac]";

-	mes "I liked that, I look forward to making more. Thank you.";

-	close;

-L_ITEM_1c:

-	mes "[Zac]";

-	mes "Oh, dear. You need 10 Amulets...";

-	close;

-L_ITEM_2c:

-	mes "[Zac]";

-	mes "Oh, dear. You need 1 Cobaltblue Dyestuff...";

-	close;

-L_ITEM_3c:

-	mes "[Zac]";

-	mes "Oh, dear. You need 1 Munak Hat...";

-	close;

-L2:	

-	mes "[Zac]";

-	mes "Which hat materials do you wish to know?";

-	next;

-	menu "Bongun Hat",L2_4;

-L2_4:

-	mes "[Zac]";

-	mes "You need 10 Amulets, 1 Cobaltblue Dyestuff and 1 Munak Hat for Bongun Hat.";

-	close;

-L3:

-	mes "[Zac]";

-	mes "Stop by some other time with the right materials, so I can make the hats for you.";

-	close;

-}

-

-prontera.gat,143,172,5	script	Blac	732,{

-	mes "[Blac]";

-	mes "I am the youngest and sexiest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat, so I can make them.";

-	next;

-	mes "[Blac]";

-	mes "I provide 8 hats and my brothers provides the other 24.";

-	next;

-	menu "Join",L1,"Information",L2,"Cancel",L3;

-L1:	

-	mes "[Blac]";

-	mes "What hat do you want me to make?";

-	next;

-	menu "Crescent Hairpin",L1_9;

-L1_9:

-	mes "[Blac]";

-	mes "Let me check the items you have brought here.";

-	next;

-	if((countitem(5041) < 1)) goto L_ITEM_1;//Items: Heart Hairpin,

-	if((countitem(999) < 10)) goto L_ITEM_2;//Items: Steel,

-	mes "[Blac]";

-	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Crescent Hairpin for you right away. Please Wait a Moment.";

-   	next;

-	delitem 5041,1;//Items: Heart Hairpin,

-	delitem 999,10;	//Items: Steel,

-	mes "[Blac]";

-	mes "Tah Dah! ^FF0000Crescent Hairpin^000000...! Please Take it!";

-	getitem 5048,1;//Items: Cresent Hairpin,

-	next;

-	mes "[Blac]";

-	mes "I liked that, I look forward to making more. Thank you.";

-	close;

-L_ITEM_1:

-	mes "[Blac]";

-	mes "Oh, dear. You need 1 Heart Hairpin...";

-	close;

-L_ITEM_2:

-	mes "[Blac]";

-	mes "Oh, dear. You need 10 Steels...";

-	close;

-L2:	

-	mes "[Blac]";

-	mes "Which hat materials do you wish to know?";

-	next;

-	menu "Crescent Hairpin",L2_9;

-L2_9:

-	mes "[Blac]";

-	mes "You need 1 Heart Hairpin and 10 Steels for Crescent Hairpin.";

-	close;

-L3:

-	mes "[Blac]";

-	mes "Stop by some other time with the right materials, so I can make the hats for you.";

-	close;

-}

-

-prontera.gat,141,172,5	script	Jac	107,{

-	mes "[Jac]";

-	mes "I am the 2nd oldest and calmest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat, so I can make them.";

-	next;

-	mes "[Jac]";

-	mes "I provide 8 hats and my brothers provides the other 24.";

-	next;

-	menu "Join",L1,"Information",L2,"Cancel",L3;

-L1:	

-	mes "[Jac]";

-	mes "What hat do you want me to make?";

-	next;

-	menu "Kafra Band",L1_19,"Panda Hat",L1_24;

-L1_19:

-	mes "[Jac]";

-	mes "Let me check the items you have brought here.";

-	next;

-	if((countitem(10007) < 1)) goto L_ITEM_1b;//Items: Silk Ribbon,

-	if((countitem(10008) < 1)) goto L_ITEM_2b;//Items: Punisher,

-	mes "[Jac]";

-	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Kafra Band for you right away. Please Wait a Moment.";

-   	next;

-	delitem 10007,1;//Items: Silk Ribbon,

-	delitem 10009,1;	//Items: Wild Flower,

-	mes "[Jac]";

-	mes "Tah Dah! ^FF0000Kafra Band^000000...! Please Take it!";

-	getitem 5020,1;//Items: Kafra's Band,

-	next;

-	mes "[Jac]";

-	mes "I liked that, I look forward to making more. Thank you.";

-	close;

-L_ITEM_1b:

-	mes "[Jac]";

-	mes "Oh, dear. You need 1 Silk Ribbon...";

-	close;

-L_ITEM_2b:

-	mes "[Jac]";

-	mes "Oh, dear. You need 1 Wild Flower...";

-	close;

-L1_24:

-	mes "[Jac]";

-	mes "Let me check the items you have brought here.";

-	next;

-	if((countitem(999) < 10)) goto L_ITEM_1g;//Items: Steel,

-	if((countitem(948) < 200)) goto L_ITEM_2g;//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;

-	delitem 999,10;//Items: Steel,

-	delitem 948,200;	//Items: Bears Footskin,

-	mes "[Jac]";

-	mes "Tah Dah! ^FF0000Panda Hat^000000...! Please Take it!";

-	getitem 5030,1;//Items: Panda Hat,

-	next;

-	mes "[Jac]";

-	mes "I liked that, I look forward to making more. Thank you.";

-	close;

-L_ITEM_1g:

-	mes "[Jac]";

-	mes "Oh, dear. You need 10 Steels...";

-	close;

-L_ITEM_2g:

-	mes "[Jac]";

-	mes "Oh, dear. You need 200 Bear Footskins...";

-	close;	

-L2:	

-	mes "[Jac]";

-	mes "Which hat materials do you wish to know?";

-	next;

-	menu "Kafra Band",L2_19,"Panda Hat",L2_24;

-L2_19:

-	mes "[Jac]";

-	mes "You need 1 Silk Ribbon and 1 Wild Flower for Kafra Band.";

-	close;

-L2_24:

-	mes "[Jac]";

-	mes "You need 10 Steels and 200 Bear Footskins for Panda Hat.";

-	close;		

-L3:

-	mes "[Jac]";

-	mes "Stop by some other time with the right materials, so I can make the hats for you.";

-	close;

-}

-

-prontera.gat,142,172,5	script	Pac	705,{

-	mes "[Pac]";

-	mes "I am 3rd oldest and wisest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat so I can make them.";

-	next;

-	mes "[Pac]";

-	mes "I provide 8 hats and my brothers provides the other 24.";

-	next;

-	menu "Join",L1,"Information",L2,"Cancel",L3;

-L1:	

-	mes "[Pac]";

-	mes "What hat do you want me to make?";

-	next;

-	menu "Poring Hat",L1_26,"Sphinx Hat",L1_29;

-L1_26:

-	mes "[Pac]";

-	mes "Let me check the items you have brought here.";

-	next;

-	if((countitem(741) < 1)) goto L_ITEM_1a;//Items: Poring Doll,

-	if((countitem(909) < 300)) goto L_ITEM_2a;//Items: Jellopy,

-	mes "[Pac]";

-	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Poring Hat for you right away. Please Wait a Moment.";

-   	next;

-	delitem 741,1;//Items: Poring Doll,

-	delitem 909,300;//Items: Jellopy,

-	mes "[Pac]";

-	mes "Tah Dah! ^FF0000Poring Hat^000000...! Please Take it!";

-	getitem 5035,1;//Items: Poring Hat,

-	next;

-	mes "[Pac]";

-	mes "I liked that, I look forward to making more. Thank you.";

-	close;

-L_ITEM_1a:

-	mes "[Pac]";

-	mes "Oh, dear. You need 1 Poring Doll...";

-	close;

-L_ITEM_2a:

-	mes "[Pac]";

-	mes "Oh, dear. You need 300 Jellopys...";

-	close;

-L1_29:

-	mes "[Pac]";

-	mes "Let me check the items you have brought here.";

-	next;

-	if((countitem(999) < 25)) goto L_ITEM_1d;//Items: Steel,

-	if((countitem(979) < 1)) goto L_ITEM_2d;//Items: Darkgreen Dyestuff,

-	if((countitem(976) < 1)) goto L_ITEM_3d;//Items: Lemon Dyestuffs,

-	if((countitem(1059) < 150)) goto L_ITEM_4d;//Items: Fabric,

-	if((countitem(969) < 2)) goto L_ITEM_5d;//Items: Gold,

-	mes "[Pac]";

-	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Sphinx Hat for you right away. Please Wait a Moment.";

-   	next;

-	delitem 999,1;//Items: Steel,

-	delitem 979,1;//Items: Darkgreen Dyestuff,

-	delitem 976,1;//Items: Lemon Dyestuffs,

-	delitem 1059,150;//Items: Fabric,

-	delitem 969,2; 	//Items: Gold,

-	mes "[Pac]";

-	mes "Tah Dah! ^FF0000Sphinx Hat^000000...! Please Take it!";

-	getitem 5053,1;//Items: Sphinx Hat,

-	next;

-	mes "[Pac]";

-	mes "I liked that, I look forward to making more. Thank you.";

-	close;

-L_ITEM_1d:

-	mes "[Pac]";

-	mes "Oh, dear. You need 25 Steels...";

-	close;

-L_ITEM_2d:

-	mes "[Pac]";

-	mes "Oh, dear. You need 1 DarkGreen Dyestuff...";

-	close;

-L_ITEM_3d:

-	mes "[Pac]";

-	mes "Oh, dear. You need 1 Lemon Dyestuff...";

-	close;

-L_ITEM_4d:

-	mes "[Pac]";

-	mes "Oh, dear. You need 150 Fabric...";

-	close;

-L_ITEM_5d:

-	mes "[Pac]";

-	mes "Oh, dear. You need 2 Gold Bar's...";

-	close;

-L2:	

-	mes "[Pac]";

-	mes "Which hat materials do you wish to know?";

-	next;

-	menu "Poring Hat",L2_26,"Sphinx Hat",L2_29;

-L2_26:

-	mes "[Pac]";

-	mes "You need 1 Poring Doll and 300 Jellopys for Poring Hat.";

-	close;

-L2_29:

-	mes "[Pac]";

-	mes "You need 25 Steels, 1 DarkGreen Dyestuff, 1 Lemon Dyestuff, 150 Fabric and 2 Gold Bar's for Sphinx Hat.";

-	close;

-L3:

-	mes "[Pac]";

-	mes "Stop by some other time with the right materials, so I can make the hats for you.";

-	close;

-}

-

-

-//these scripts make our brothers to appear and disappear in order

--	script	EDZac	-1,{

-OnInit:

-OnMinute15:

-	disablenpc "Zac";

-	end;

-OnMinute01:

-	enablenpc "Zac";

-	end;

-}

-

--	script	EDJac	-1,{

-OnInit:

-OnMinute30:

-	disablenpc "Jac";

-	end;

-OnMinute16:

-	enablenpc "Jac";

-	end;

-}

-

--	script	EDPac	-1,{

-OnInit:

-OnMinute45:

-	disablenpc "Pac";

-	end;

-OnMinute31:

-	enablenpc "Pac";

-	end;

-}

-

--	script	EDBlac	-1,{

-OnInit:

-OnMinute00:

-	disablenpc "Blac";

-	end;

-OnMinute46:

-	enablenpc "Blac";

-	end;

-}

+//===== eAthena Script =======================================
+//= Custom Quest For New Headgears
+//===== By: ==================================================
+//= RedxSwordxHero, Lupus
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= eAthena 1.0
+//===== Description: =========================================
+//= 4 brothers give you quests to get 6 new hats (missing
+//= 	from official quests)
+//= Use this custom quest instead of event_32_new_hats.txt
+//= -Bongun Hat
+//= -Poring Hat, Sphinx Hat
+//= -Kafra Band, Panda Hat
+//= -Crescent Hairpin
+//===== Additional Comments: =================================
+//= Event New Hats by RedxSwordxHero 
+//= Ported and improved with timers [Lupus]
+//= Thanks to x[tsk],fixed all item requirments to iRO specs exept
+//= for hats which cannot be made on the real server. [Lupus]
+//= 1.2 removed already existing official hat quests [Lupus]
+//============================================================
+
+
+prontera.gat,140,172,5	script	Zac	704,{
+	mes "[Zac]";
+	mes "I am the oldest and strongest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat, so I can make them.";
+	next;
+	mes "[Zac]";
+	mes "I provide 8 hats and my brothers provides the other 24.";
+	next;
+	menu "Join",L1,"Information",L2,"Cancel",L3;
+L1:	
+	mes "[Zac]";
+	mes "What hat do you want me to make?";
+	next;
+	menu "Bongun Hat",L1_4;
+L1_4:
+	mes "[Zac]";
+	mes "Let me check the items you have brought here.";
+	next;
+	if((countitem(609) < 10)) goto L_ITEM_1c;//Items: Amulet,
+	if((countitem(978) < 1)) goto L_ITEM_2c;//Items: Cobaltblue Dyestuff,
+	if((countitem(2264) < 1)) goto L_ITEM_3c;//Items: Munak Hat,
+	mes "[Zac]";
+	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Bongun Hat for you right away. Please Wait a Moment.";
+   	next;
+	delitem 609,100;//Items: Amulet,
+	delitem 978,1;//Items: Cobaltblue Dyestuff,
+	delitem 2264,1;	//Items: Munak Hat,
+	mes "[Zac]";
+	mes "Tah Dah! ^FF0000Bongun Hat^000000...! Please Take it!";
+	getitem 5046,1;//Items: Bongun Hat,
+	next;
+	mes "[Zac]";
+	mes "I liked that, I look forward to making more. Thank you.";
+	close;
+L_ITEM_1c:
+	mes "[Zac]";
+	mes "Oh, dear. You need 10 Amulets...";
+	close;
+L_ITEM_2c:
+	mes "[Zac]";
+	mes "Oh, dear. You need 1 Cobaltblue Dyestuff...";
+	close;
+L_ITEM_3c:
+	mes "[Zac]";
+	mes "Oh, dear. You need 1 Munak Hat...";
+	close;
+L2:	
+	mes "[Zac]";
+	mes "Which hat materials do you wish to know?";
+	next;
+	menu "Bongun Hat",L2_4;
+L2_4:
+	mes "[Zac]";
+	mes "You need 10 Amulets, 1 Cobaltblue Dyestuff and 1 Munak Hat for Bongun Hat.";
+	close;
+L3:
+	mes "[Zac]";
+	mes "Stop by some other time with the right materials, so I can make the hats for you.";
+	close;
+}
+
+prontera.gat,143,172,5	script	Blac	732,{
+	mes "[Blac]";
+	mes "I am the youngest and sexiest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat, so I can make them.";
+	next;
+	mes "[Blac]";
+	mes "I provide 8 hats and my brothers provides the other 24.";
+	next;
+	menu "Join",L1,"Information",L2,"Cancel",L3;
+L1:	
+	mes "[Blac]";
+	mes "What hat do you want me to make?";
+	next;
+	menu "Crescent Hairpin",L1_9;
+L1_9:
+	mes "[Blac]";
+	mes "Let me check the items you have brought here.";
+	next;
+	if((countitem(5041) < 1)) goto L_ITEM_1;//Items: Heart Hairpin,
+	if((countitem(999) < 10)) goto L_ITEM_2;//Items: Steel,
+	mes "[Blac]";
+	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Crescent Hairpin for you right away. Please Wait a Moment.";
+   	next;
+	delitem 5041,1;//Items: Heart Hairpin,
+	delitem 999,10;	//Items: Steel,
+	mes "[Blac]";
+	mes "Tah Dah! ^FF0000Crescent Hairpin^000000...! Please Take it!";
+	getitem 5048,1;//Items: Cresent Hairpin,
+	next;
+	mes "[Blac]";
+	mes "I liked that, I look forward to making more. Thank you.";
+	close;
+L_ITEM_1:
+	mes "[Blac]";
+	mes "Oh, dear. You need 1 Heart Hairpin...";
+	close;
+L_ITEM_2:
+	mes "[Blac]";
+	mes "Oh, dear. You need 10 Steels...";
+	close;
+L2:	
+	mes "[Blac]";
+	mes "Which hat materials do you wish to know?";
+	next;
+	menu "Crescent Hairpin",L2_9;
+L2_9:
+	mes "[Blac]";
+	mes "You need 1 Heart Hairpin and 10 Steels for Crescent Hairpin.";
+	close;
+L3:
+	mes "[Blac]";
+	mes "Stop by some other time with the right materials, so I can make the hats for you.";
+	close;
+}
+
+prontera.gat,141,172,5	script	Jac	107,{
+	mes "[Jac]";
+	mes "I am the 2nd oldest and calmest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat, so I can make them.";
+	next;
+	mes "[Jac]";
+	mes "I provide 8 hats and my brothers provides the other 24.";
+	next;
+	menu "Join",L1,"Information",L2,"Cancel",L3;
+L1:	
+	mes "[Jac]";
+	mes "What hat do you want me to make?";
+	next;
+	menu "Kafra Band",L1_19,"Panda Hat",L1_24;
+L1_19:
+	mes "[Jac]";
+	mes "Let me check the items you have brought here.";
+	next;
+	if((countitem(10007) < 1)) goto L_ITEM_1b;//Items: Silk Ribbon,
+	if((countitem(10008) < 1)) goto L_ITEM_2b;//Items: Punisher,
+	mes "[Jac]";
+	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Kafra Band for you right away. Please Wait a Moment.";
+   	next;
+	delitem 10007,1;//Items: Silk Ribbon,
+	delitem 10009,1;	//Items: Wild Flower,
+	mes "[Jac]";
+	mes "Tah Dah! ^FF0000Kafra Band^000000...! Please Take it!";
+	getitem 5020,1;//Items: Kafra's Band,
+	next;
+	mes "[Jac]";
+	mes "I liked that, I look forward to making more. Thank you.";
+	close;
+L_ITEM_1b:
+	mes "[Jac]";
+	mes "Oh, dear. You need 1 Silk Ribbon...";
+	close;
+L_ITEM_2b:
+	mes "[Jac]";
+	mes "Oh, dear. You need 1 Wild Flower...";
+	close;
+L1_24:
+	mes "[Jac]";
+	mes "Let me check the items you have brought here.";
+	next;
+	if((countitem(999) < 10)) goto L_ITEM_1g;//Items: Steel,
+	if((countitem(948) < 200)) goto L_ITEM_2g;//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;
+	delitem 999,10;//Items: Steel,
+	delitem 948,200;	//Items: Bears Footskin,
+	mes "[Jac]";
+	mes "Tah Dah! ^FF0000Panda Hat^000000...! Please Take it!";
+	getitem 5030,1;//Items: Panda Hat,
+	next;
+	mes "[Jac]";
+	mes "I liked that, I look forward to making more. Thank you.";
+	close;
+L_ITEM_1g:
+	mes "[Jac]";
+	mes "Oh, dear. You need 10 Steels...";
+	close;
+L_ITEM_2g:
+	mes "[Jac]";
+	mes "Oh, dear. You need 200 Bear Footskins...";
+	close;	
+L2:	
+	mes "[Jac]";
+	mes "Which hat materials do you wish to know?";
+	next;
+	menu "Kafra Band",L2_19,"Panda Hat",L2_24;
+L2_19:
+	mes "[Jac]";
+	mes "You need 1 Silk Ribbon and 1 Wild Flower for Kafra Band.";
+	close;
+L2_24:
+	mes "[Jac]";
+	mes "You need 10 Steels and 200 Bear Footskins for Panda Hat.";
+	close;		
+L3:
+	mes "[Jac]";
+	mes "Stop by some other time with the right materials, so I can make the hats for you.";
+	close;
+}
+
+prontera.gat,142,172,5	script	Pac	705,{
+	mes "[Pac]";
+	mes "I am 3rd oldest and wisest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat so I can make them.";
+	next;
+	mes "[Pac]";
+	mes "I provide 8 hats and my brothers provides the other 24.";
+	next;
+	menu "Join",L1,"Information",L2,"Cancel",L3;
+L1:	
+	mes "[Pac]";
+	mes "What hat do you want me to make?";
+	next;
+	menu "Poring Hat",L1_26,"Sphinx Hat",L1_29;
+L1_26:
+	mes "[Pac]";
+	mes "Let me check the items you have brought here.";
+	next;
+	if((countitem(741) < 1)) goto L_ITEM_1a;//Items: Poring Doll,
+	if((countitem(909) < 300)) goto L_ITEM_2a;//Items: Jellopy,
+	mes "[Pac]";
+	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Poring Hat for you right away. Please Wait a Moment.";
+   	next;
+	delitem 741,1;//Items: Poring Doll,
+	delitem 909,300;//Items: Jellopy,
+	mes "[Pac]";
+	mes "Tah Dah! ^FF0000Poring Hat^000000...! Please Take it!";
+	getitem 5035,1;//Items: Poring Hat,
+	next;
+	mes "[Pac]";
+	mes "I liked that, I look forward to making more. Thank you.";
+	close;
+L_ITEM_1a:
+	mes "[Pac]";
+	mes "Oh, dear. You need 1 Poring Doll...";
+	close;
+L_ITEM_2a:
+	mes "[Pac]";
+	mes "Oh, dear. You need 300 Jellopys...";
+	close;
+L1_29:
+	mes "[Pac]";
+	mes "Let me check the items you have brought here.";
+	next;
+	if((countitem(999) < 25)) goto L_ITEM_1d;//Items: Steel,
+	if((countitem(979) < 1)) goto L_ITEM_2d;//Items: Darkgreen Dyestuff,
+	if((countitem(976) < 1)) goto L_ITEM_3d;//Items: Lemon Dyestuffs,
+	if((countitem(1059) < 150)) goto L_ITEM_4d;//Items: Fabric,
+	if((countitem(969) < 2)) goto L_ITEM_5d;//Items: Gold,
+	mes "[Pac]";
+	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Sphinx Hat for you right away. Please Wait a Moment.";
+   	next;
+	delitem 999,1;//Items: Steel,
+	delitem 979,1;//Items: Darkgreen Dyestuff,
+	delitem 976,1;//Items: Lemon Dyestuffs,
+	delitem 1059,150;//Items: Fabric,
+	delitem 969,2; 	//Items: Gold,
+	mes "[Pac]";
+	mes "Tah Dah! ^FF0000Sphinx Hat^000000...! Please Take it!";
+	getitem 5053,1;//Items: Sphinx Hat,
+	next;
+	mes "[Pac]";
+	mes "I liked that, I look forward to making more. Thank you.";
+	close;
+L_ITEM_1d:
+	mes "[Pac]";
+	mes "Oh, dear. You need 25 Steels...";
+	close;
+L_ITEM_2d:
+	mes "[Pac]";
+	mes "Oh, dear. You need 1 DarkGreen Dyestuff...";
+	close;
+L_ITEM_3d:
+	mes "[Pac]";
+	mes "Oh, dear. You need 1 Lemon Dyestuff...";
+	close;
+L_ITEM_4d:
+	mes "[Pac]";
+	mes "Oh, dear. You need 150 Fabric...";
+	close;
+L_ITEM_5d:
+	mes "[Pac]";
+	mes "Oh, dear. You need 2 Gold Bar's...";
+	close;
+L2:	
+	mes "[Pac]";
+	mes "Which hat materials do you wish to know?";
+	next;
+	menu "Poring Hat",L2_26,"Sphinx Hat",L2_29;
+L2_26:
+	mes "[Pac]";
+	mes "You need 1 Poring Doll and 300 Jellopys for Poring Hat.";
+	close;
+L2_29:
+	mes "[Pac]";
+	mes "You need 25 Steels, 1 DarkGreen Dyestuff, 1 Lemon Dyestuff, 150 Fabric and 2 Gold Bar's for Sphinx Hat.";
+	close;
+L3:
+	mes "[Pac]";
+	mes "Stop by some other time with the right materials, so I can make the hats for you.";
+	close;
+}
+
+
+//these scripts make our brothers to appear and disappear in order
+-	script	EDZac	-1,{
+OnInit:
+OnMinute15:
+	disablenpc "Zac";
+	end;
+OnMinute01:
+	enablenpc "Zac";
+	end;
+}
+
+-	script	EDJac	-1,{
+OnInit:
+OnMinute30:
+	disablenpc "Jac";
+	end;
+OnMinute16:
+	enablenpc "Jac";
+	end;
+}
+
+-	script	EDPac	-1,{
+OnInit:
+OnMinute45:
+	disablenpc "Pac";
+	end;
+OnMinute31:
+	enablenpc "Pac";
+	end;
+}
+
+-	script	EDBlac	-1,{
+OnInit:
+OnMinute00:
+	disablenpc "Blac";
+	end;
+OnMinute46:
+	enablenpc "Blac";
+	end;
+}
diff --git a/npc/quests/custom/kahohorn.txt b/npc/quests/custom/kahohorn.txt
index d0dfbf082..9891ed62d 100644
--- a/npc/quests/custom/kahohorn.txt
+++ b/npc/quests/custom/kahohorn.txt
@@ -26,6 +26,7 @@ geffen.gat,115,107,5	script	Lord Kaho's Servant	61,{
         mes "1 Rocker Doll - a Rocker drop";
 	mes "1 Apez Fanitem Doll - a Yoyo drop";
 	mes "1 Racoon Doll - a Smokie drop";
+	mes "1 Spore Doll - a Spore drop";
 	next;
 	mes "Finally, i worked hard to make these horns for my master with all the mentioned items above...";
 	mes "Please include 5 million zeny for my efforts."; 
diff --git a/npc/quests/custom/new_hats.txt b/npc/quests/custom/new_hats.txt
index bdbbb93c7..8c4b88bc2 100644
--- a/npc/quests/custom/new_hats.txt
+++ b/npc/quests/custom/new_hats.txt
@@ -1,13 +1,19 @@
 //===== eAthena Script =======================================
-//= The 32 New Hats
+//= The 32 New Hats (custom)
 //===== By: ==================================================
 //= Darkchild
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= eAthena 1.0
 //===== Description: =========================================
-//= 4 brothers give you quests to get 32 new hats
+//=
+//= Don't use these NPC, there are separate quests for these
+//= items in quests/newgear/ folder
+//=
+//= And some of these items have made-up ingredients
+//= 	4 brothers give you quests to get 32 new hats
+//=
 //===== Additional Comments: =================================
 //= There are 2 scripts for these 32 'new' hats.
 //= The other one doesnt have all the new ones and has some old ones
@@ -17,6 +23,7 @@
 //= 1.4 fixed amount of Fish Tail (300 -> 30), Zeny bugs in Ear of Angel,
 //=     Ear of Demon,Big Golden Bell, Mistress Crown,
 //=     Crown of The Ancient Queen, Indian Headband, Orc Hero Helm [Lupus]
+//= 1.5 Fixed Posture Fix Hat (Campus Hat).
 //============================================================
 prontera.gat,140,172,5	script	Zac	704,{
 	mes "[Zac]";
@@ -25,21 +32,21 @@ prontera.gat,140,172,5	script	Zac	704,{
 	mes "I provide 8 hats and my brothers provides the other 24.";
 	mes "What hat do you want me to make?";
 	next;
-	menu "Attitude Campus Hat",L1_1,"Fox Mask",L1_2,"X Cross Hairpin",L1_3,"Flower Hair Pin",L1_4,"Tulip Hair Pin",L1_5,"Mushroom Hairband",L1_6,"Troublesome Raccoon Doll",L1_7,"Blue Fish",L1_8;
+	menu "Posture Fix Hat",L1_1,"Fox Mask",L1_2,"X Cross Hairpin",L1_3,"Flower Hair Pin",L1_4,"Tulip Hair Pin",L1_5,"Mushroom Hairband",L1_6,"Troublesome Raccoon Doll",L1_7,"Blue Fish",L1_8;
 	L1_1:
 			mes "[Zac]";
 			mes "Let me check the items you have brought here.";
 			next;
-			if((countitem(2285)<1) && (countitem(1550)<1)) goto L_ITEM_1;//Items: Apple o' Archer, Book,
+			if((countitem(2285)<1) || (countitem(1550)<1)) goto L_ITEM_1;//Items: Apple o' Archer, Book,
 			mes "[Zac]";
 			mes "Wow!! Well done! Finally you have gathered all items needed!";
-			mes "We will make the Attitude Campus Hat for you right away.";
+			mes "We will make the Posture Fix Hat for you right away.";
 			mes "Please Wait a Moment.";
    			next;
 			delitem 2285,1;//Items: Apple o' Archer,
 			delitem 1550,1;//Items: Book,
 			mes "[Zac]";
-			mes "Tah Dah!!!^FF0000Attitude Campus Hat^000000...! Please Take it!";
+			mes "Tah Dah!!!^FF0000Posture Fix Hat^000000...! Please Take it!";
 			getitem 5073,1;//Items: Campus Hat,
 			next;
 			mes "[Zac]";
@@ -54,7 +61,7 @@ prontera.gat,140,172,5	script	Zac	704,{
 			mes "about this?";
 			next;
 			mes "[Zac]";
-			mes "Attitude Campus Hat requires~~";
+			mes "Posture Fix Hat requires~~";
 			next;
 			mes "[Zac]";
 			mes "1 Apple o' Archer";
diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt
index 19819b759..c94d9234d 100644
--- a/npc/quests/juice_maker.txt
+++ b/npc/quests/juice_maker.txt
@@ -19,8 +19,7 @@
 
 
 // Morrison ------------------------------------------------
-prt_in.gat,47,173,2	script	Morrison	97,
-{
+prt_in.gat,47,173,2	script	Morrison	97,{
 	mes "[Little Morrison]";
 	if(MEAT > 10) goto L_Candy;
 	if(MARIANNE == 1) goto L_GoAway;
@@ -110,8 +109,7 @@ L_Candy:
 }
 
 // Housewife Marianne ---------------------------------------------------
-prt_in.gat,49,172,2	script	Housewife Marianne	53,
-{
+prt_in.gat,49,172,2	script	Housewife Marianne	53,{
 	mes "[Housewife Marianne]";
 	if(MORRISON == 1) goto L_GaveMeat;
 	if(MORRISON == 2) goto L_Juice;
@@ -183,8 +181,7 @@ L_Juice:
 }
 
 // Juicer Marx Hansen ---------------------------------------------------------
-payon_in01.gat,5,48,7	script	Juicer Marx Hansen	86,
-{
+payon_in03.gat,188,146,5	script	Juicer Marx Hansen	86,{
 	mes "[Juicer Marx Hansen]";
 	if(MARIANNE == 1) goto L_Juice;
 	mes "Welcome to my shop. What brings you here?";
diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt
index 3b6868aee..ef20c4027 100644
--- a/npc/quests/monstertamers.txt
+++ b/npc/quests/monstertamers.txt
@@ -16,8 +16,7 @@
 
 
 //<================================================= Alberta ===============================================>\\
-alberta_in.gat,173,77,3	script	Monster Tamer	125,
-{
+alberta_in.gat,173,77,3	script	Monster Tamer	125,{
 	mes "[Monster Tamer Iwado]";
 	mes "Monster taming has never been more popular than it is now! Why not join in on all of the excitement?....";
 M_Menu:
@@ -130,8 +129,7 @@ M_Menu:
 
 
 //<================================================= Al De Baran ===============================================>\\
-aldeba_in.gat,167,177,3	script	Monster Tamer	125,
-{
+aldeba_in.gat,167,177,3	script	Monster Tamer	125,{
 	mes "[Monster Tamer YuU]";
 	mes "You must be looking for some Taming Items.... When it comes to making Taming Items there is no one better than me here in Rune Midgard.";
 M_Menu:
@@ -328,8 +326,7 @@ M_Menu:
 
 
 //<================================================= Izlude ===============================================>\\
-izlude_in.gat,128,64,3	script	Monster Tamer	125,
-{
+izlude_in.gat,128,64,3	script	Monster Tamer	125,{
 	mes "[Monster Tamer Shogo]";
 	mes "Are you pre-occupied with gathering items for your cute pets, and want a break? Then let us find those items for you.....";
 M_Menu:
diff --git a/npc/quests/mrsmile.txt b/npc/quests/mrsmile.txt
index 7a145ac1f..1f2bdb309 100644
--- a/npc/quests/mrsmile.txt
+++ b/npc/quests/mrsmile.txt
@@ -15,8 +15,7 @@
 
 
 // Alberta ------------------------------------------------------------------------------------------
-alberta.gat,113,53,3	script	Smile Assistance::SmileAT	92,
-{
+alberta.gat,113,53,3	script	Smile Assistance::SmileAT	92,{
 	mes "[Smile Assistant]";
 	mes "Hi, I'm a Smile Assistance.  How may I help you?";
 	next;
diff --git a/npc/quests/newgears/arjen.txt b/npc/quests/newgears/arjen.txt
new file mode 100644
index 000000000..96d854b22
--- /dev/null
+++ b/npc/quests/newgears/arjen.txt
@@ -0,0 +1,149 @@
+//===== eAthena Script =======================================
+//= X-Shaped Hairpin, Bandage & Flower Hairpin Quests
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.3
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate quests for these items.
+//===== Additional Comments: ================================= 
+//= 1.2 Fixed wrong labels, wrong items ID. [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
+//============================================================
+
+//86
+geffen.gat,128,148,6	script	Arjen	807,{ 
+ mes "[Arjen]";
+ mes "What item information do you require?";
+ next;
+ menu "X-Shaped Hairpin.",M_1,"Bandage",M_2,"Flower Hairpin.",M_3,"Quit.",M_EXIT;
+M_1:
+ 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?",M_REQ1,"No, thanks.",M_EXIT;
+
+ If ((countitem(10011) < 1) || (countitem(7220) < 400)) GOTO L_NOITEM1;//Items: Stellar Hairpin, Ectoplasm,
+ mes "[Arjen]";
+ mes "Yes, that's just what I require!";
+ mes "Nayayayaaaaaa!";
+ delitem 10011,1;//Items: Stellar Hairpin,
+ delitem 7220,400;//Items: Ectoplasm,
+ next;
+ mes "[Arjen]";
+ mes "Hmm... okay, thanks for the items.";
+ mes "Let me make it for you.";
+ next;
+ getitem 5079,1;//Items: X Hairpin,
+ mes "[Arjen]";
+ mes "Thanks very much, you look cool now.";
+ close;
+
+L_NOITEM1:
+ mes "[Arjen]";
+ mes "Come on man, gimme a break.";
+ mes "This is hot property!";
+ next;
+
+M_REQ1:
+ 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;
+
+M_2:
+ 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?",M_REQ2,"No, thanks.",M_EXIT;
+
+ If ((countitem(930) < 500) || (countitem(970) < 1)) GOTO L_NOITEM2;//Items: Rotten Bandage, Alcohol,
+ mes "[Arjen]";
+ mes "Wow! You have the stuff I need! Thanks!";
+ mes "Lemme do a swap, your stuff for the bandage";
+ delitem 930,500;//Items: Rotten Bandage,
+ delitem 970,1;//Items: Alcohol,
+ next;
+ getitem 5063,1;//Items: Bandage,
+ mes "[Arjen]";
+ mes "Thanks! Hope that cures your aches!";
+ close;
+
+L_NOITEM2:
+ mes "[Arjen]";
+ mes "Argh, please, If you want the item, bring me what I asked for.";
+ next;
+
+M_REQ2:
+ 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;
+
+M_3:
+ 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.",M_EXIT;
+
+ mes "[Arjen]";
+ mes "Well, I'm sure you would like me to make you a ^660000Flower Hairpin^000000.";
+ next;
+ menu "Yes, please.",M_REQ3,"No, thanks.",M_EXIT;
+
+L_NOITEM3:
+ mes "[Arjen]";
+ mes "Sorry, but you don't have the correct items.";
+ next;
+
+M_REQ3:
+ mes "[Arjen]";
+ mes "Well, I need...";
+ mes "1 Romantic Flower, 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.",M_EXIT;
+ 
+ If ((countitem(2269) < 1) || (countitem(999) < 10) || (Zeny < 20000)) GOTO L_NOITEM3;//Items: Romantic Flower, Steel,
+ mes "[Arjen]";
+ mes "Thanks!";
+ delitem 2269,1;//Items: Romantic Flower,
+ delitem 999,10;//Items: Steel,
+ set Zeny,Zeny-20000;
+ next;
+ getitem 5061,1;//Items: Flower Hairpin,
+ mes "[Arjen]";
+ mes "Enjoy!";
+ close;
+
+M_EXIT:
+ mes "[Arjen]";
+ mes "Okay, have a nice day!";
+ close;
+
+}
diff --git a/npc/quests/newgears/back_ribbon.txt b/npc/quests/newgears/back_ribbon.txt
new file mode 100644
index 000000000..ae61a0560
--- /dev/null
+++ b/npc/quests/newgears/back_ribbon.txt
@@ -0,0 +1,62 @@
+//===== eAthena Script ======================================= 
+//= Back Ribbon Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.3
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Back Ribbon quest.
+//===== Additional Comments: ================================= 
+//= 1.2 Fixed wrong labels, added missing text [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
+//============================================================
+
+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 "Make me a ^670000Back ribbon^000000.",-,"What are the requirements?",M_REQ,"No, I dont want one.",M_EXIT;
+
+ If ((countitem(2244) < 1) || (countitem(2209) < 1) || (countitem(10007) < 1)) GOTO L_NOITEM;//Items: Big Ribbon, Ribbon, Silk Ribbon,
+ mes "[Netpia]";
+ mes "Wow, thank you! Let me just take your items.";
+ delitem 2244,1;//Items: Big Ribbon,
+ delitem 2209,1;//Items: Ribbon,
+ delitem 10007,1;//Items: Silk Ribbon,
+ next;
+ getitem 5083,1;//Items: Back Ribbon,
+ mes "[Netpia]";
+ mes "Okay, now here is your item.";
+ next;
+ mes "[Netpia]";
+ mes "Enjoy being pretty!";
+ close;
+
+L_NOITEM:
+ mes "[Netpia]";
+ mes "Aww... sorry, but I cant make it If you don't bring me the materials.";
+ next;
+
+M_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;
+
+M_EXIT:
+ mes "[Netpia]";
+ mes "Aww, well, okay then!";
+ mes "Be pretty some other time";
+ close;
+}
diff --git a/npc/quests/newgears/bear_hat.txt b/npc/quests/newgears/bear_hat.txt
new file mode 100644
index 000000000..674ba9956
--- /dev/null
+++ b/npc/quests/newgears/bear_hat.txt
@@ -0,0 +1,68 @@
+//===== eAthena Script ======================================= 
+//= Bear Hat Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.3
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Bear hat quest.
+//===== Additional Comments: ================================= 
+//= 1.2 Fixed wrong labels, added missing text, added missing
+//=     items check [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
+//============================================================
+
+xmas.gat,152,176,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 cute expressions yourself!";
+ next;
+ mes "[Bora]";
+ mes "Well, I can make you a Bear Hat!";
+ next;
+ menu "Yes, make me one now!",-,"What are the requirements?",M_REQ,"No, thanks.",M_EXIT;
+
+ If ((countitem(5030) < 1) || (countitem(7213) < 100) || (countitem(7217) < 100) || (countitem(7167) < 300)) GOTO L_NOITEM;//Items: Panda Hat, Pin Cusion, Spool of Thread, Strange Piece of Iron,
+ mes "[Bora]";
+ mes "Yay! now I can make my famous Bear Hat!";
+ mes "Now, give me your items!";
+ delitem 5030,1;//Items: Panda Hat,
+ delitem 7213,100;//Items: Pin Cusion,
+ delitem 7217,100;//Items: Spool of Thread,
+ delitem 7167,300;//Items: Strange Piece of Iron,
+ next;
+ mes "[Bora]";
+ mes "Now I will give you the hat!";
+ next;
+ getitem 5059,1;//Items: Bear Hat,
+ mes "[Bora]";
+ mes "Thanks, and bye!";
+ close;
+
+M_REQ:
+ mes "[Bora]";
+ mes "Bring me...";
+ mes "1 Panda Hat,";
+ mes "100 Pin Cusion,";
+ mes "100 Spool of Thread";
+ mes "300 Strange Pieces of Iron.";
+ next;
+ mes "[Bora]";
+ mes "For the Pin Cusion (Stabbing Needles) and Spool of Thread,";
+ mes "Hyzoloists in Niflheim drop those, I believe.";
+ close;
+
+L_NOITEM:
+ mes "[Bora]";
+ mes "Sorry, I want all the items I asked.";
+ mes "Please dont try to cheat me.";
+ close;
+
+M_EXIT:
+ mes "[Bora]";
+ mes "Okay, well, byebye!";
+ close;
+}
diff --git a/npc/quests/newgears/burning_blood_bandana.txt b/npc/quests/newgears/burning_blood_bandana.txt
new file mode 100644
index 000000000..2d2b89a77
--- /dev/null
+++ b/npc/quests/newgears/burning_blood_bandana.txt
@@ -0,0 +1,65 @@
+//===== eAthena Script =======================================
+//= Burning Blood Bandana Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.3
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Burning Blood Bandana quest.
+//===== Additional Comments: ================================= 
+//= 1.2 Fixed wrong labels, added missing text, wrong ID [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
+//============================================================
+
+
+yuno.gat,301,188,6	script	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?",M_REQ,"Naw, bye",M_EXIT;
+
+ if ((countitem(7216) < 300) || (countitem(7097) < 300) || (countitem(982) < 1) || (countitem(2211) < 1)) GOTO L_NOITEM;//Items: Red Scarf, Burning Heart, White Dyestuff, Bandana,
+ mes "[Genbolt]";
+ mes "Very well, here you go.";
+ delitem 7216,300;//Items: Red Scarf,
+ delitem 7097,300;//Items: Burning Heart,
+ delitem 982,1;//Items: White Dyestuff,
+ delitem 2211,1;//Items: Bandana,
+ next;
+ mes "[Genbolt]";
+ mes "Now I can make it...";
+ next;
+ getitem 5070,1;//Items: Burning Blood Bandana,
+ mes "[Genbolt]";
+ mes "Enjoy.";
+ close;
+
+L_NOITEM:
+ mes "[Genbolt]";
+ mes "Where are the items? Ok, I list them for you again...";
+ next;
+
+M_REQ:
+ mes "[Genbolt]";
+ mes "Bring me:";
+ mes "300 Red Scarfs,";
+ mes "300 Burning Hearts,";
+ mes "1 White Dyestuff,";
+ mes "and 1 Bandana.";
+ close;
+
+M_EXIT:
+ mes "[Genbolt]";
+ mes "Bye then.";
+ close;
+}
diff --git a/npc/quests/newgears/cat_hairband.txt b/npc/quests/newgears/cat_hairband.txt
new file mode 100644
index 000000000..d23f10a93
--- /dev/null
+++ b/npc/quests/newgears/cat_hairband.txt
@@ -0,0 +1,74 @@
+//===== eAthena Script =======================================1
+//= Cat Hairband Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.4
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Cat Hairband quest.
+//===== Additional Comments: ================================= 
+//= 1.2 Fixed wrong labels, added missing text,
+//=	fixed zeny amount [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
+//= 1.4 Soft Feather -> Fluff
+//============================================================
+
+
+payon_in03.gat,110,160,4	script	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?",M_REQ,"Bye.",M_EXIT;
+
+ If ((countitem(2213) < 1) || (countitem(914) < 200) || (countitem(983) < 1) || (Zeny < 10000)) GOTO L_NOITEM;//Items: Kitty Band, Fluff, Black Dyestuff,
+ mes "[KoneKone]";
+ mes "Wow! thankies! I will now take your items!";
+ delitem 2213,1;//Items: Kitty Band,
+ delitem 914,200;//Items: Fluff,
+ delitem 983,1;//Items: Black Dyestuff,
+ set Zeny,Zeny-10000;
+ next;
+ mes "[KoneKone]";
+ mes "Mew mew! thanks! Now for your ears!";
+ next;
+ getitem 5057,1;//Items: Black Cat Ears,
+ mes "[KoneKone]";
+ mes "Mew! thanks! It was a pleasure to make them for you!";
+ close;
+
+L_NOITEM:
+ mes "[KoneKone]";
+ mes "Sorry, but you dont have what I asked for...";
+ close;
+
+M_REQ:
+ mes "[KoneKone]";
+ mes "For the ^670000Cat Hairband^000000, the following items are needed:";
+ next;
+ mes "[KoneKone]";
+ mes "1 Kitty Band,";
+ mes "200 Fluff,";
+ 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;
+
+M_EXIT:
+ mes "[KoneKone]";
+ mes "Okay, *meow* have a nice day!";
+ close;
+}
diff --git a/npc/quests/newgears/fox_mask.txt b/npc/quests/newgears/fox_mask.txt
new file mode 100644
index 000000000..7f6a5eb89
--- /dev/null
+++ b/npc/quests/newgears/fox_mask.txt
@@ -0,0 +1,57 @@
+//===== eAthena Script ======================================= 
+//= Fox Mask Quest
+//===== By: ================================================== 
+//= KitsuneStarWind (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.2
+//===== Compatible With: ===================================== 
+//= Any eAthena version.
+//===== Description: ========================================= 
+// Seperate quest for the Fox Mask.
+//===== Additional Comments: ================================= 
+// 1.2 optimized [Lupus]
+//============================================================
+
+pay_dun04.gat,204,152,2	script	Nine Tail	1180,{
+	mes "[Nine Tail]";
+	mes "What do you want?";
+	next;
+	mes "[Nine Tail]";
+	mes "Have you come here for a ^FF3300 Fox Mask^000000?";
+	next;
+	menu "Yeah, Sure.",-,"No",M_EXIT;
+
+	mes "[Nine Tail]";
+	mes "Fine then. If I make one for you, will you go away?";
+	mes "You realize that it requires 999 Nine Tails to make, do you?";
+	next;
+	menu "Sure.",M_MAKE,"Nah.",-;
+
+	mes "[Nine Tail]";
+	mes "Grrrr... I'll make one anyway but I hope my master gets you.";
+	next;
+M_MAKE:
+	mes "[Nine Tail]";
+	mes "Ok then, I shall make one for you.";
+	next;
+
+	if (countitem(1022) < 999) goto L_NOITEM;//Items: Nine Tails,
+	delitem 1022,999;//Items: Nine Tails,
+	getitem 5069,1;//Items: Fox Mask,
+	next;
+	mes "[Nine Tails]";
+	mes "Have fun.";
+	close;
+
+L_NOITEM:
+	mes "[Nine Tail]";
+	mes "You do not have have enough Nine Tails.";
+	mes "You need 999 of them.";
+	close;
+
+M_EXIT:
+	mes "[Nine Tail]";
+	mes "Then leave me alone... I am waiting for my master.";
+	close;
+}
diff --git a/npc/quests/newgears/hat_seller.txt b/npc/quests/newgears/hat_seller.txt
new file mode 100644
index 000000000..d71005d4e
--- /dev/null
+++ b/npc/quests/newgears/hat_seller.txt
@@ -0,0 +1,143 @@
+//===== eAthena Script =======================================1
+//= Hat Seller (New Hat Quests)
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.2
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= New Hat quests: 
+//=	Pointy Cap,Straw Hat,Cowboy Hat,Sombrero,Furry Hat
+//===== Additional Comments: ================================= 
+//= 1.2 Fixed wrong labels, added missing text
+//=	added missing delitem, fixed names, item amount [Lupus]
+//============================================================
+
+xmas_in.gat,36,25,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 "Party Hat",M_1,"Straw Hat",M_2,"Cowboy Hat",M_3,"Sombrero",M_4,"Furry Hat",M_5,"Quit",M_EXIT;
+
+M_1:
+ mes "[Hat Seller]";
+ mes "Okay well, for this item I require:";
+ mes "1 Santa's Hat,";
+ mes "100 Slick Paper,";
+ mes "100 Oiled Paper.";
+ next;
+ mes "[Hat Seller]";
+ mes "You got these items?";
+ next;
+ menu "Yes.",-,"No.",M_EXIT;
+ 
+ if ((countitem(2236) < 1) || (countitem(7111) < 100) || (countitem(7151) < 100)) GOTO L_NOITEM;//Items: Santa's Hat, Slick Paper, Oiled Paper,
+ delitem 2236,1;//Items: Santa's Hat,
+ delitem 7111,100;//Items: Slick Paper,
+ delitem 7151,100;//Items: Oiled Paper,
+ getitem 5060,1;//Items: Pointy Cap,
+ mes "[Hat Seller]";
+ mes "Thanks! Bye.";
+ close;
+
+L_NOITEM:
+ mes "[Hat Seller]";
+ mes "Not enough items, bye.";
+ close;
+
+M_EXIT:
+ mes "[Hat Seller]";
+ mes "Bye!";
+ close;
+
+M_2:
+ mes "[Hat Seller]";
+ mes "For this item I require:";
+ mes "1 Sakkat,";
+ mes "300 Healthy Branch,";
+ mes "300 Bamboo Trunk.";
+ next;
+ mes "[Hat Seller]";
+ mes "Bring those, and we got a deal.";
+ mes "You got them?";
+ next;
+ menu "Yes.",-,"No.",M_EXIT;
+
+ if ((countitem(2280) < 1) || (countitem(7203) < 300) || (countitem(7150) < 300)) GOTO L_NOITEM;//Items: Sakkat, Healthy Branch, Bamboo Trunk,
+ delitem 2280,1;//Items: Sakkat,
+ delitem 7203,300;//Items: Healthy Branch,
+ delitem 7150,300;//Items: Bamboo Trunk,
+ getitem 5062,1;//Items: Straw Hat,
+ mes "[Hat Seller]";
+ mes "There you go... bye.";
+ close;
+
+M_3:
+ mes "[Hat Seller]";
+ mes "For this item I require:";
+ mes "1 Western Grace,";
+ mes "108 Claw of Desert Wolf,";
+ mes "108 Soft Grass Leaf,";
+ 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.",M_EXIT;
+
+ if ((countitem(2248) < 1) || (countitem(7030) < 108) || (countitem(7194) < 108) || (countitem(7120) < 4)) GOTO L_NOITEM;//Items: Western Grace, Claw of Desert Wolf, Soft Grass Leaf, Burning Horseshoe,
+ delitem 2248,1;//Items: Western Grace,
+ delitem 7030,108;//Items: Claw of Desert Wolf,
+ delitem 7194,108;//Items: Soft Grass Leaf,
+ delitem 7120,4;//Items: Burning Horseshoe,
+ getitem 5075,1;//Items: Cowboy Hat,
+ mes "[Hat Seller]";
+ mes "There you go... bye.";
+ close;
+
+M_4:
+ 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.",M_EXIT;
+
+ if ((countitem(5062) < 1) || (countitem(1907) < 1) || (countitem(952) < 50)) GOTO L_NOITEM;//Items: Straw Hat, Guitar, Cactus Needle,
+ delitem 5062,1;//Items: Straw Hat,
+ delitem 1907,1;//Items: Guitar,
+ delitem 952,50;//Items: Cactus Needle,
+ getitem 5067,1;//Items: Sombrero,
+ mes "[Hat Seller]";
+ mes "There you go... bye.";
+ close;
+
+M_5:
+ mes "[Hat Seller]";
+ mes "For this item I require:";
+ mes "1 Slotted Cap,";
+ mes "300 Skin of the Black Bear.";
+ next;
+ mes "[Hat Seller]";
+ mes "Bring those, and we got a deal.";
+ mes "You got them?";
+ next;
+ menu "Yes.",-,"No.",M_EXIT;
+
+ if ((countitem(2227) < 1) || (countitem(7161) < 300)) GOTO L_NOITEM;//Items: Cap, Bear Skin,
+ delitem 2227,1;//Items: Cap,
+ delitem 7161,300;//Items: Bear Skin,
+ getitem 5076,1;//Items: Wool Hat,
+ mes "[Hat Seller]";
+ mes "There you go... bye.";
+ close;
+}
diff --git a/npc/quests/newgears/indian_headband.txt b/npc/quests/newgears/indian_headband.txt
new file mode 100644
index 000000000..a98eb8dd4
--- /dev/null
+++ b/npc/quests/newgears/indian_headband.txt
@@ -0,0 +1,57 @@
+//===== eAthena Script =======================================
+//= Indian Headband Quest
+//===== By: ================================================== 
+//= Halca (1.0), Mass Zero (1.1)
+//= Lupus (1.2)
+//===== Current Version: ===================================== 
+//= 1.3
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Indian Headband quest.
+//===== Additional Comments: ================================= 
+//= 1.2 Fixed wrong labels, added missing text, fixed
+//=     items count [Lupus]
+//= 1.3 Fixed ingredients according to kRO [Lupus]
+//============================================================
+
+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;
+ menu "Make me an Indian Headband!",-,"Bye!",M_EXIT;
+
+ mes "[Merunte]";
+ mes "Ok. Gimme:";
+ mes "1 Hair Band,";
+ mes "1 Striped Bandana,";
+ mes "10 Peco Feathers,";
+ mes "and 10,000 Zeny.";
+ next;
+ mes "[Merunte]";
+ mes "Got these items?";
+ next;
+ menu "Yep!",-,"Nope!",M_EXIT;
+
+ if ((countitem(7101) < 10) || (countitem(5049) < 1) ||  (countitem(2210) < 1) ||  (Zeny < 10000)) GOTO L_NOITEM;//Items: Peco Feather, Striped Bandana, Hair Band,
+ delitem 2210,1;//Items: Hair Band,
+ delitem 5049,1;//Items: Striped Bandana,
+ delitem 7101,10;//Items: Peco Feather,
+ set Zeny,Zeny-10000;
+ getitem 5071,1;//Items: Indian Headband,
+ mes "[Merunte]";
+ mes "Thanks! Bye.";
+ close;
+
+L_NOITEM:
+ mes "[Merunte]";
+ mes "Ya miss some items or zeny.";
+ close;
+
+M_EXIT:
+ mes "[Merunte]";
+ mes "Kay bye.";
+ close;
+}
diff --git a/npc/quests/newgears/mask_of_alarm.txt b/npc/quests/newgears/mask_of_alarm.txt
new file mode 100644
index 000000000..ede29d3be
--- /dev/null
+++ b/npc/quests/newgears/mask_of_alarm.txt
@@ -0,0 +1,53 @@
+//===== eAthena Script =======================================
+//= Mask of Alarm Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.3
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Alarm Mask quest.
+//===== Additional Comments: ================================= 
+//= 1.2 Fixed wrong labels, added missing text and labels,
+//=	changed Zeny amount, fixed wrong item ID [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
+//============================================================
+
+aldebaran.gat,236,235,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 Alarm Mask,";
+ mes "bring me 300,000 Zeny,";
+ mes "and 1 Monster Oxygen Mask.";
+ next;
+ mes "[Muslam]";
+ mes "Got these?";
+ next;
+ menu "Yep!",-,"Nope!",M_EXIT;
+
+ if ((countitem(10002) < 1) || (Zeny < 300000)) GOTO L_NOITEM;//Items: Monster Oxygen Mask,
+ mes "[Muslam]";
+ mes "Great!";
+ delitem 10002,1;//Items: Monster Oxygen Mask,
+ set Zeny,Zeny-300000;
+ next;
+ getitem 5086,1;//Items: Alarm Mask,
+ mes "[Muslam]";
+ mes "Enjoy your item!";
+ close;
+
+L_NOITEM:
+ mes "[Muslam]";
+ mes "Where is 1 Monster Oxygen Mask and 300,000 Zeny?";
+ close;
+
+M_EXIT:
+ mes "[Muslam]";
+ mes "Mkay! byeee.";
+ close;
+}
diff --git a/npc/quests/newgears/mushroom_hairband.txt b/npc/quests/newgears/mushroom_hairband.txt
new file mode 100644
index 000000000..71e07a244
--- /dev/null
+++ b/npc/quests/newgears/mushroom_hairband.txt
@@ -0,0 +1,59 @@
+//===== eAthena Script =======================================
+//= Mushroom Hairband Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.3
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Mushroom Hairband quest.
+//===== Additional Comments: ================================= 
+//= 1.2 Fixed wrong labels, added missing text [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
+//============================================================
+
+geffen.gat,66,87,6	script	Aipo	819,{
+ mes "[Aipo]";
+ If (Class == 0) GOTO L_NOVICE;
+ 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!",M_EXIT;
+
+ if (countitem(921) < 300) GOTO L_NOITEM;//Items: Mushroom Spore,
+ mes "[Aipo]";
+ mes "Wow! Thanks! Lemme make the item then.";
+ delitem 921,300;//Items: Mushroom Spore,
+ next;
+ mes "[Aipo]";
+ mes "Okay, thanks for the items, now yours in return!";
+ next;
+ getitem 5082,1;//Items: Mushroom Hairband,
+ mes "[Aipo]";
+ mes "Thanks again! Bye!";
+ close;
+
+L_NOITEM:
+ mes "[Aipo]";
+ mes "You don't have enough Mushroom Spores... sorry!";
+ close;
+
+L_NOVICE:
+ mes "I love musrooms. I wanna be their master one day...";
+ close;
+
+M_EXIT:
+ mes "[Aipo]";
+ mes "Well, I'm always here If you change your mind!";
+ close;
+}
diff --git a/npc/quests/newgears/neris.txt b/npc/quests/newgears/neris.txt
new file mode 100644
index 000000000..5809141ef
--- /dev/null
+++ b/npc/quests/newgears/neris.txt
@@ -0,0 +1,128 @@
+//===== eAthena Script =======================================1
+//= Neris (New Hat Quests)
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.3
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate New Hat quests.
+//===== Additional Comments: ================================= 
+//= 1.2 Fixed wrong labels, added missing text [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
+//============================================================
+
+yuno.gat,353,282,7	script	Neris	806,{
+ mes "[Neris]";
+ mes "So, whatcha want then?";
+ next;
+ menu "Golden Bells.",M_LGB,"Crown of Mistress.",M_COM,"Crown of Ancient Queen.",M_COAQ,"Nothing, thanks.",M_EXIT;
+
+M_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?";
+ next;
+ menu "Make me Golden Bells!",-,"What do I need to make it?",M_REQL,"Nothing, thanks.",M_EXIT;
+
+ if ((countitem(10016) < 1) || (countitem(714) < 1) || (countitem(969) < 3) || (Zeny < 1000)) GOTO L_NOITEM;//Items: Golden Bell, Emperium, Gold,
+ mes "[Neris]";
+ mes "Now, lets swap your items.";
+ delitem 10016,1;//Items: Golden Bell,
+ delitem 714,1;//Items: Emperium,
+ delitem 969,3;//Items: Gold,
+ set Zeny,Zeny-1000;
+ next;
+ getitem 5091,1;//Items: Golden Bells,
+ mes "[Neris]";
+ mes "Thanks, and bye!";
+ close;
+
+M_REQL:
+ mes "[Neris]";
+ mes "Okay all these are gold related:";
+ mes "1 Golden Bell,";
+ mes "1 Emperium,";
+ mes "3 Gold,";
+ mes "1000 Zeny for the labor.";
+ close;
+
+M_COM:
+ mes "[Neris]";
+ mes "You like mistresses?";
+ next;
+ mes "[Neris]";
+ mes "So... what can I do for you?";
+ next;
+ menu "Make me the item.",-,"What do I need to make it?",M_REQC,"Nothing, thanks.",M_EXIT;
+
+ if ((countitem(2249) < 1) || (countitem(714) < 1) || (countitem(969) < 3) || (Zeny < 1000)) GOTO L_NOITEM;//Items: Coronet, Emperium, Gold,
+ mes "[Neris]";
+ mes "Now, lets swap your items.";
+ delitem 2249,1;//Items: Coronet,
+ delitem 714,1;//Items: Emperium,
+ delitem 969,3;//Items: Gold,
+ set Zeny,Zeny-1000;
+ next;
+ getitem 5081,1;//Items: Crown of Mistress,
+ mes "[Neris]";
+ mes "Thanks, and bye!";
+ close;
+
+M_REQC:
+ mes "[Neris]";
+ mes "Okay all these are gold related:";
+ mes "1 Coronet,";
+ mes "1 Emperium,";
+ mes "3 Gold,";
+ mes "1000 Zeny for the labor.";
+ close;
+
+M_COAQ:
+ mes "[Neris]";
+ mes "You like ancient queens?";
+ next;
+ mes "[Neris]";
+ mes "So.. what can I do for you?";
+ next;
+ menu "Make me the item.",-,"What do I need to make it?",M_REQC2,"Nothing, thanks.",M_EXIT;
+
+ if ((countitem(10006) < 1) || (countitem(714) < 1) || (countitem(969) < 3) || (Zeny < 1000)) GOTO L_NOITEM;//Items: Queen's Hair Ornament, Emperium, Gold,
+ mes "[Neris]";
+ mes "Now, lets swap your items";
+ delitem 10006,1;//Items: Queen's Hair Ornament,
+ delitem 714,1;//Items: Emperium,
+ delitem 969,3;//Items: Gold,
+ set Zeny,Zeny-1000;
+ next;
+ getitem 5080,1;//Items: Crown of The Ancient Queen,
+ mes "[Neris]";
+ mes "Thanks, and bye!";
+ close;
+
+M_REQC2:
+ mes "[Neris]";
+ mes "Okay all these are gold related:";
+ mes "1 Queen's Hair Ornament,";
+ mes "1 Emperium,";
+ mes "3 Gold,";
+ mes "1000 Zeny for the labor.";
+ close;
+
+L_NOITEM:
+ mes "[Neris]";
+ mes "Don't take me for a fool!";
+ mes "No items, no deal!";
+ close; 
+
+M_EXIT:
+ mes "[Neris]";
+ mes "Bye! Come again.";
+ close; 
+}
diff --git a/npc/quests/newgears/old_blacksmith.txt b/npc/quests/newgears/old_blacksmith.txt
new file mode 100644
index 000000000..d2fbde87a
--- /dev/null
+++ b/npc/quests/newgears/old_blacksmith.txt
@@ -0,0 +1,99 @@
+//===== eAthena Script ======================================= 
+//= Angel & Devil Ears Quests
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.3
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Ears Of Angel & Ears Of Demon quests.
+//===== Additional Comments: ================================= 
+//= 1.2 Fixed wrong labels, added missing text, wrong ID! [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
+//============================================================
+
+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 Devil!",M_EOD,"Give me the Ears of Angel!",M_EOA,"Nothing, thanks",M_EXIT;
+
+M_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?",M_EODREQ,"Nothing",M_EXIT;
+
+ if ((countitem(2255) < 1) || (countitem(2286) < 1) || (Zeny < 20000)) GOTO L_NOITEM_EOD;//Items: Evil Wing, Elven Ears,
+ mes "[Old Blacksmith]";
+ mes "Wow, never thought a little fella like you could get tha.t";
+ mes "Bwahaha, ok.";
+ delitem 2255,1;//Items: Evil Wing,
+ delitem 2286,1;//Items: Elven Ears,
+ set Zeny,Zeny-20000;
+ next;
+ getitem 5068,1;//Items: Ears Of Demon,
+ mes "[Old Blacksmith]";
+ mes "Well, enjoy your item!";
+ close;
+
+L_NOITEM_EOD:
+ mes "[Old Blacksmith]";
+ mes "Well sorry, but you dont have enough items!";
+ next;
+
+M_EODREQ:
+ mes "[Old Blacksmith]";
+ mes "Well, let's see...";
+ mes "I need something for the evil, that be an Evil Wing,";
+ 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;
+
+M_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?",M_EOAREQ,"Nothing",M_EXIT;
+
+ if ((countitem(2286) < 1) || (countitem(2254) < 1) || (Zeny < 20000)) GOTO L_NOITEM_EOA;//Items: Elven Ears, Angel Wing,
+ mes "[Old Blacksmith]";
+ mes "Well well well! Someone who has the spirit!";
+ mes "Okay, gimme the items.";
+ delitem 2286,1;//Items: Elven Ears,
+ delitem 2254,1;//Items: Angel Wing,
+ set Zeny,Zeny-20000;
+ next;
+ mes "[Old Blacksmith]";
+ mes "Okay, and here you go.";
+ next;
+ getitem 5074,1;//Items: Ears of Angel,
+ mes "[Old Blacksmith]";
+ mes "Enjoy it!";
+ close;
+
+L_NOITEM_EOA:
+ mes "[Old Blacksmith]";
+ mes "Well sorry, but you dont have enough items!";
+ next;
+
+M_EOAREQ:
+ mes "[Old Blacksmith]";
+ mes "Well, this item is very holy, so I will need:";
+ mes "1 Angel Wing (Angel Headband),";
+ mes "1 Elven Ears for the ears,";
+ mes "and 20,000z for the labour costs!";
+ close;
+
+M_EXIT:
+ mes "[Old Blacksmith]";
+ mes "Fair yee well!";
+ close;
+}
diff --git a/npc/quests/newgears/posture_fix_hat.txt b/npc/quests/newgears/posture_fix_hat.txt
new file mode 100644
index 000000000..d234e64f6
--- /dev/null
+++ b/npc/quests/newgears/posture_fix_hat.txt
@@ -0,0 +1,69 @@
+//===== eAthena Script =======================================
+//= Posture Fix Hat Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.3
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Posture Fix Hat quest.
+//===== Additional Comments: ================================= 
+//= 1.2 Fixed wrong labels, added missing text
+//=	fixed wrong items ID [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
+//============================================================
+
+payon_in01.gat,143,8,5	script	Nan Hyang	814,{
+ If (getequipisequiped(5073)) GOTO L_GOOD;
+ If (Class == 0) GOTO L_NOVICE;
+ 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 some materials to make you a Posture Fix Hat.";
+ next;
+ menu "Please, make me one.",-,"What do I need to get?",M_REQ,"No thanks!",M_EXIT;
+
+ If ((countitem(1550) <1) || (countitem(2285) < 1 )) GOTO L_NOITEM;//Items: Book, Apple o' Archer,
+ mes "[Nan Hyang]";
+ mes "Ahh at last, someone who is serious!";
+ delitem 1550,1;//Items: Book,
+ delitem 2285,1;//Items: Apple o' Archer,
+ next;
+ getitem 5073,1;//Items: Posture Fix Hat,
+ mes "[Nan Hyang]";
+ mes "Hehe, well, maybe you will become more careful, or your sense will become balanced.";
+ close;
+
+M_REQ:
+ 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;
+
+L_NOITEM:
+ mes "[Nan Hyang]";
+ mes "At least be serious, you dont have enough items!";
+ mes "Come back when you wish to learn posture.";
+ close;
+
+L_GOOD:
+ mes "[Nan Hyang]";
+ mes "Ah, that's it! good to see you are willing to learn!";
+ close;
+
+L_NOVICE:
+ mes "Hi! Could you visit me next week?";
+ next;
+
+M_EXIT:
+ mes "[Nan Hyang]";
+ mes "Good day to you.";
+ close;
+}
diff --git a/npc/quests/newgears/sea_otter_hat.txt b/npc/quests/newgears/sea_otter_hat.txt
new file mode 100644
index 000000000..4e31273d7
--- /dev/null
+++ b/npc/quests/newgears/sea_otter_hat.txt
@@ -0,0 +1,54 @@
+//===== eAthena Script ======================================= 
+//= Sea Otter Hat Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.3
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Sea Otter Hat quest.
+//===== Additional Comments: ================================= 
+//= 1.2 Fixed wrong labels, added missing text [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
+//============================================================
+
+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 Lazy Racoon Hat,";
+ mes "1 Transformation Leaf";
+ next;
+ mes "[Pretty Rency]";
+ mes "Do you have these items?";
+ next;
+ menu "Yes.",-,"No.",M_EXIT;
+
+ if ((countitem(5084) < 1) || (countitem(5064) < 1)) GOTO L_NOITEM;//Items: Lazy Racoon Hat, Transformation Leaf,
+ mes "[Pretty Rency]";
+ mes "Congratulations!";
+ delitem 5084,1;//Items: Lazy Racoon Hat,
+ delitem 5064,1;//Items: Transformation Leaf,
+ next;
+ mes "[Pretty Rency]";
+ mes "Thanks for your items! Now I will make yours for you!";
+ next;
+ getitem 5078,1;//Items: Sea Otter Hat,
+ mes "[Pretty Rency]";
+ mes "Thanks! Byeeeeeee!";
+ close;
+
+L_NOITEM:
+ mes "[Pretty Rency]";
+ mes "Sorry, not enough items.";
+ close;
+
+M_EXIT:
+ mes "[Pretty Rency]";
+ mes "Byebye! Have a nice time in the world of Ragnarok!";
+ close;
+}
diff --git a/npc/quests/newgears/traveler.txt b/npc/quests/newgears/traveler.txt
new file mode 100644
index 000000000..a31177ad1
--- /dev/null
+++ b/npc/quests/newgears/traveler.txt
@@ -0,0 +1,132 @@
+//===== eAthena Script ======================================= 
+//= Traveler (New Hat Quests)
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.4
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate New Hat quests.
+//===== Additional Comments: ================================= 
+//= 1.2 Fixed wrong labels, added missing text
+//=	added missing delitem, fixed names, item amount [Lupus]
+//= 1.3 Fixed possible exploit [Lupus]
+//= 1.4 Fixed ingredients: Sashimi knife->Raw Fish (Sashimi) [Lupus]
+//============================================================
+
+morocc.gat,274,79,6	script	Traveler	807,{ 
+ mes "[Traveler]";
+ if (Class == 0) GOTO L_NOVICE;
+ mes "What kind of hat do you want from me?";
+ next;
+ menu "Lazy Racoon Hat.",M_N1,"Fresh Bluish Fish",M_N2,"Drooping Cat",M_N3,"Transformation Leaf",M_N4,"Nothing.",M_EXIT;
+
+M_N1:
+ mes "[Traveler]";
+ mes "Gimme 1000 Acorns,";
+ mes "100 Sea Otter Skins,";
+ mes "and 10 Raccoon Leaf";
+ next;
+ mes "[Traveler]";
+ mes "Got these items?";
+ next;
+ menu "Yep.",-,"No!",M_EXIT;
+
+ if ((countitem(1026) < 1000) || (countitem(7065) < 100) || (countitem(945) < 10)) GOTO L_NOITEM;//Items: Acorn, Sea Otter Fur, Raccoon Leaf,
+ mes "[Traveler]";
+ mes "Well, then here is your item";
+ delitem 1026,1000;//Items: Acorn,
+ delitem 7065,100;//Items: Sea Otter Fur,
+ delitem 945,10;//Items: Raccoon Leaf,
+ next;
+ getitem 5084,1;//Items: Lazy Racoon Hat,
+ mes "[Traveler]";
+ mes "Enjoy.";
+ close;
+
+M_N2:
+ mes "[Traveler]";
+ mes "Gimme 1 Rotten Fish,";
+ mes "300 Rotten Scales,";
+ mes "50 Raw Fish (Sashimi, not a knife),";
+ mes "1 Fish Tail,";
+ mes "and 100 Sticky Mucus";
+ next;
+ mes "[Traveler]";
+ mes "Got these items?";
+ menu "Yes",-,"No.",M_EXIT;
+
+ if ((countitem(624) < 1) || (countitem(959) < 300) || (countitem(544) < 50) || (countitem(1023) < 1) || (countitem(938) < 100)) GOTO L_NOITEM; //Items: Rotten Fish, Stinky Scale, Sashimi, Fish Tail, Sticky Mucus,
+ mes "[Traveler]";
+ mes "Okay, thanks.";
+ delitem 624,1;//Items: Rotten Fish,
+ delitem 959,300;//Items: Stinky Scale,
+ delitem 544,50;//Items: Raw Fish,
+ delitem 1023,1;//Items: Fish Tail,
+ delitem 938,100;//Items: Sticky Mucus,
+ next;
+ getitem 5065,1;//Items: Fresh Blueish Fish,
+ mes "[Traveler]";
+ mes "Thanks. Bye.";
+ close;
+
+M_N3:
+ mes "[Traveler]";
+ mes "Give me 1 Slotted Circlet,";
+ mes "1 Black Dyestuff,";
+ mes "and 300 Black Cat Dolls.";
+ mes "Loli Ruri drops the last one.";
+ next;
+ mes "[Traveler]";
+ mes "Have you these items?";
+ next;
+ menu "Yes",-,"No.",M_EXIT;
+
+ if ((countitem(2233) < 1) || (countitem(983) < 1) || (countitem(7206) < 300)) GOTO L_NOITEM;//Items: Circlet, Black Dyestuff, Black Cat Doll,
+ mes "[Traveler]";
+ mes "Okay, here you are.";
+ delitem 2233,1;//Items: Circlet,
+ delitem 983,1;//Items: Black Dyestuff,
+ delitem 7206,300;//Items: Black Cat Doll,
+ next;
+ getitem 5058,1;//Items: Resting Cat,
+ mes "[Traveler]";
+ mes "Good luck.";
+ close;
+
+M_N4:
+ mes "[Traveler]";
+ mes "Bring me 600 Raccoon Dog's Leaves (Raccoon Leaf).";
+ next;
+ mes "[Traveler]";
+ mes "You have these?";
+ next;
+ menu "Yes!",-,"Nope.",M_EXIT;
+
+ if (countitem(945) < 600) GOTO L_NOITEM;//Items: Raccoon Leaf,
+ mes "[Traveler]";
+ mes "Thanks. here's your leaf.";
+ delitem 945,600;//Items: Raccoon Leaf,
+ next;
+ getitem 5064,1;//Items: Transformation Leaf,
+ mes "[Traveler]";
+ mes "Enjoy your Item.";
+ close;
+
+L_NOITEM:
+ mes "[Traveler]";
+ mes "No stuff, no item!";
+ mes "When you have it, come back.";
+ close;
+
+L_NOVICE:
+ mes "It's damn hot today...";
+ close;
+
+M_EXIT:
+ mes "[Traveler]";
+ mes "Bye.";
+ close;
+}
diff --git a/npc/quests/newgears/tulip_hairpin.txt b/npc/quests/newgears/tulip_hairpin.txt
new file mode 100644
index 000000000..8f6b2ebfa
--- /dev/null
+++ b/npc/quests/newgears/tulip_hairpin.txt
@@ -0,0 +1,65 @@
+//===== eAthena Script ======================================= 
+//= Tulip Hairpin Quest
+//===== By: ================================================== 
+//= Halca (1.0)
+//= Mass Zero (1.1)
+//===== Current Version: ===================================== 
+//= 1.3
+//===== Compatible With: ===================================== 
+//= Any eAthena Version.
+//===== Description: ========================================= 
+//= Seperate Tulip Hairpin quest.
+//===== Additional Comments: ================================= 
+//= 1.2 Fixed wrong labels, added missing text [Lupus]
+//= 1.3 Fixed possible exploit and added missing close; [Lupus]
+//============================================================
+
+geffen.gat,84,189,6	script	Ses	815,{ 
+ mes "[Ses]";
+ If (Class == 0) GOTO L_NOVICE;
+ mes "Woo, hello! Fruit fruit!";
+ mes "Sorry, I just love flowers, fruits and everything that makes me";
+ mes "look more FRUITY!";
+ next;
+ menu "Make me a Tulip Hairpin!",-,"What do I need?",M_REQ,"Bye!",M_EXIT;
+
+ mes "[Ses]";
+ mes "You have the items?";
+ next;
+ menu "Yes!",-,"No!",M_EXIT;
+
+ If ((countitem(2278) < 1) || (countitem(975) < 1)) GOTO L_NOITEM;//Items: Mr. Smile, Scarlet Dyestuffs,
+ mes "[Ses]";
+ mes "Yay! thanks! Pineapple!";
+ mes "Here you go!";
+ delitem 2278,1;//Items: Mr. Smile,
+ delitem 975,1;//Items: Scarlet Dyestuffs,
+ next;
+ getitem 5077,1;//Items: Tulip Hairpin,
+ mes "[Ses]";
+ mes "Enjoy being pretty!";
+ close;
+
+L_NOITEM:
+ mes "[Ses]";
+ mes "You don't have enough items for a Tulip Hairpin!";
+ next;
+
+M_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;
+
+L_NOVICE:
+ mes "I love flowers... Do you love flowers, too?";
+ close;
+
+M_EXIT:
+ mes "[Ses]";
+ mes "Okay!";
+ mes "Byeeeee!";
+ close;
+}
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 5c30668b8..4cab7bb9c 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -23,9 +23,7 @@
 //=======================================================================================================//
 //						Doll Quest
 //=======================================================================================================//
-alberta.gat,117,134,8	script	Elin	96,
-{
-	
+alberta.gat,117,134,8	script	Elin	96,{
 	mes "[Elin]";
 	if(Sex == 0) mes "Hello, miss. Since you're a girl, you must like dolls, don't you?";
 	if(Sex == 1) mes "Hello, mister. Hmm, since you're a boy, you don't like dolls, do you?";
@@ -382,8 +380,7 @@ alberta_in.gat,122,53,4	script	Cherokee	47,{
 //=======================================================================================================//
 //			Bao Bao, Cresent Hairpin, Fashionbale Glasses, Heart Hairpin
 //=======================================================================================================//
-alberta.gat,120,53,3	script	Zic	51,
-{
+alberta.gat,120,53,3	script	Zic	51,{
 	mes "[Zic]";
 	mes "Yay! A cool breeze! That's why I love the sea!!";
 	emotion 2;
@@ -503,8 +500,7 @@ alberta.gat,120,53,3	script	Zic	51,
 //=======================================================================================================//
 //				Hat of Sun God, Sunday Hat, Mage Hat, Magician Hat
 //=======================================================================================================//
-alberta.gat,135,79,3	script	Tempestra	71,
-{
+alberta.gat,135,79,3	script	Tempestra	71,{
 	mes "[Tempestra]";
 	mes "Ah...... Such a cool breeze.  It's good to be next to the sea.  I think it was the right choice for me to take a break from my business and come here.";
 	emotion 2;
diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt
index 37e8d8d01..3bef59926 100644
--- a/npc/quests/quests_comodo.txt
+++ b/npc/quests/quests_comodo.txt
@@ -21,8 +21,7 @@
 //============================================================================================//
 // Cross Hat, Bulb Hairband, Striped Hairband, Blue Hairband
 //==================================================
-comodo.gat,227,158,4	script	Hair Ornament Girl	700,
-{
+comodo.gat,227,158,4	script	Hair Ornament Girl	700,{
 	mes "[Hair Ornament Girl]";
 	if(sex==1)mes "Oh, hi.  Do you need to buy a present for a friend, your mother, or maybe your girl friend? Then get her a Hair Band! It's the best gift you can get her.";
 	if(sex==0)mes "Oh, hi.  Do you need to buy a present for a friend, your mother, or maybe yourself? Then get a Hair Band! It's the best gift you can give, or get.";
@@ -117,8 +116,7 @@ M_Menu:
 //===================================================================================================//
 // 'Mine Helmet', 'Parcel Hat', 'Money Loser's Grief', 'Phantom of the Opera Mask'
 //===============================================================//
-comodo.gat,274,137,5	script	Mari Isac	702,
-{
+comodo.gat,274,137,5	script	Mari Isac	702,{
 	mes "[Mari Isac]";
 	mes "I travel all over the world and get to hear many interesting stories from the people I meet.";
 	mes "Sometimes they even teach me how to make special items";
diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt
index f59cd3c15..101d26e9f 100644
--- a/npc/quests/quests_payon.txt
+++ b/npc/quests/quests_payon.txt
@@ -220,8 +220,7 @@ L_GotOra:
 //========================================================================================//
 //			Derivuchi Cap(Hat of Petite Diablo), Helm of Angel
 //========================================================================================//
-payon_in01.gat,56,12,4	script	Young Man	89,
-{
+payon_in01.gat,56,12,4	script	Young Man	89,{
 	mes "[Young Man]";
 	mes "What is it?............";
 	next;
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index b1cb63512..0948a55ab 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -15,8 +15,7 @@
 
 
 // Ph.D Hat Quest-------------------------------------------------------
-prt_in.gat,38,108,4	script	Teacher	53,
-{
+prt_in.gat,38,108,4	script	Teacher	53,{
 	if((countitem(710) >= 1) && (countitem(703) >= 1) && (countitem(704) >= 1) && (countitem(708) >= 1)) goto L_Start;//Items: Illusion Flower, Hinalle, Aloe, Ment,
 	mes "Don't you think.... ^4444FF'flowers'^000000 are pretty?";
 	next;
diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt
index 7bde004be..25d74cf99 100644
--- a/npc/quests/quests_yuno.txt
+++ b/npc/quests/quests_yuno.txt
@@ -17,8 +17,7 @@
 
 
 //===========================================================================
-yuno_in01.gat,103,158,4	script	Bain	98,
-{
+yuno_in01.gat,103,158,4	script	Bain	98,{
 	set @name$, "[Bain]";
 	
 OnStart:
diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt
index 795df5d90..13d13503f 100644
--- a/npc/quests/skills/acolyte_skills.txt
+++ b/npc/quests/skills/acolyte_skills.txt
@@ -14,8 +14,7 @@
 //============================================================
 
 
-prt_church.gat,173,23,4	script	Acolyte Klift	79,
-{
+prt_church.gat,173,23,4	script	Acolyte Klift	79,{
 	mes "[Acolyte Klift]";
 	if (callfunc("Is_Holy_Class")) goto L_Start;
 
diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt
index 3839ab777..9918bed94 100644
--- a/npc/quests/skills/archer_skills.txt
+++ b/npc/quests/skills/archer_skills.txt
@@ -19,8 +19,7 @@
 
 
 //<======================== Roberto: Arrow crafting =========================>\\
-morocc.gat,121,109,5	script	Roberto	88,
-{
+morocc.gat,121,109,5	script	Roberto	88,{
 	mes "[Roberto]";
 	if (callfunc("Is_Bow_Class")) goto L_Start;
 
@@ -143,8 +142,7 @@ L_LowLvl:
 
 
 //<============================== Arrow Repel ===============================>\\
-payon.gat,190,176,5	script	Jason	88,
-{
+payon.gat,103,63,5	script	Jason	88,{
 	mes "[Jason]";
 	if (callfunc("Is_Bow_Class")) goto L_Start;
 
diff --git a/npc/quests/skills/mage_skills.txt b/npc/quests/skills/mage_skills.txt
index 9bcb2e5e9..101b02a1d 100644
--- a/npc/quests/skills/mage_skills.txt
+++ b/npc/quests/skills/mage_skills.txt
@@ -15,8 +15,7 @@
 
 
 
-geffen_in.gat,151,119,4	script	BLIZZARDRISS	71,
-{
+geffen_in.gat,151,119,4	script	BLIZZARDRISS	71,{
 	mes "[BLIZZARDRISS]";
 	if(callfunc("Is_Magic_Class")) goto L_Start;
 
diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt
index 958e3b7e7..454c4b6d8 100644
--- a/npc/quests/skills/merchant_skills.txt
+++ b/npc/quests/skills/merchant_skills.txt
@@ -19,16 +19,14 @@
 
 
 //--------------------------------------- Necko: Crazy Uproar--------------------------------\\
-alberta.gat,89,96,5	script	Necko	139,0,4,
-{
+alberta.gat,89,96,5	script	Necko	139,0,4,{
 	mes "[!?]";
 	mes "Muahahahahhhahahahahhahah!!";
 	mes "Pukakakakakkakakakakakakaka!!";
 	close;
 }
 
-alberta.gat,83,96,5	script	Necko	98,
-{
+alberta.gat,83,96,5	script	Necko	98,{
 	mes "[Necko]";
 	if (callfunc("Is_Merc_Class")) goto L_Start;
 
@@ -118,8 +116,7 @@ L_GotSkill:
 
 
 //----------------------------------------- Charlron: Change cart ---------------------------------\\
-alberta.gat,119,221,6	script	Charlron	107,
-{
+alberta.gat,119,221,6	script	Charlron	107,{
 	mes "[Charlron]";
 	if (callfunc("Is_Merc_Class")) goto L_Start;
 L_Other:
@@ -180,8 +177,7 @@ L_GotSkill:
 
 
 //-------------------------====-------- Gershuan: Cart Revolution ---------------------------------\\
-alberta.gat,232,106,6	script	Gershaun	57,
-{
+alberta.gat,232,106,6	script	Gershaun	57,{
 	if (callfunc("Is_Merc_Class")) goto L_Start;
 
 L_Other:
diff --git a/npc/quests/skills/novice_skills.txt b/npc/quests/skills/novice_skills.txt
index 85a565142..9f7d91595 100644
--- a/npc/quests/skills/novice_skills.txt
+++ b/npc/quests/skills/novice_skills.txt
@@ -16,8 +16,7 @@
 
 
 //<---------------------------------------------------------------------------------------------- Nurse Aid: First Aid NPC ---------------------------------------------------------------------------->\\
-prt_in.gat,235,133,4	script	Nurse Aid	90,
-{
+prt_in.gat,235,133,4	script	Nurse Aid	90,{
 	mes "[Nurse Aid]";
 	if(FIRSTAID == 1) goto L_GetAid;
 	if(getskilllv(142)>0) goto L_GotAid;
@@ -91,8 +90,7 @@ L_GotAid:
 
 
 //<-------------------------------------------------------------------------------------------------- Bulma: Play Dead -------------------------------------------------------------------------------------------->\\
-prt_in.gat,73,87,2	script	Bulma	98,
-{
+prt_in.gat,73,87,2	script	Bulma	98,{
 	mes "[Bulma]";
 	if(Class == Job_Novice) goto L_Novice;
 
@@ -221,8 +219,7 @@ L_GotSkill:
 
 
 //Newbie Assistant------------------------------------------------------------------------------
-prt_castle.gat,174,147,2	script	Newbie Assistant	84,
-{
+prt_castle.gat,174,147,2	script	Newbie Assistant	84,{
 	mes "[Newbie Assistant]";
 	if(Class == Job_Novice) goto L_Start;
 
diff --git a/npc/quests/skills/swordsman_skills.txt b/npc/quests/skills/swordsman_skills.txt
index df3331525..4558754b6 100644
--- a/npc/quests/skills/swordsman_skills.txt
+++ b/npc/quests/skills/swordsman_skills.txt
@@ -3,22 +3,22 @@
 //===== By: ==================================================
 //= kobra_k88
 //===== Current Version: =====================================
-//= 1.0a
+//= 1.1
 //===== Compatible With: =====================================
 //= eAthena 7.15 +
 //===== Description: =========================================
 //= <Description> 
 //===== Additional Comments: =================================
 //= Fully working
-//=1.0a Now using functions found in "Global_Functions.txt" for
-//= class checks.
+//= 1.0a Now using functions found in "Global_Functions.txt"
+//= for class checks.
+//= 1.1 Added missing delitem [Lupus]
 //============================================================
 
 
 
 //<-------------------------------------- Fatal Blow------------------------------------>\\
-prt_in.gat,75,88,5	script	Leon	85,
-{
+prt_in.gat,75,88,5	script	Leon	85,{
 	mes "[Leon]";
 	if(callfunc("Is_Sword_Class")) goto L_Start;
 	if(Class == Job_Novice) goto L_Novice;
@@ -159,8 +159,7 @@ L_Done:
 
 
 //<---------------------------------- Moving HP Recovery ---------------------------------->\\
-izlude_in.gat,175,130,2	script	Knight De Thomas	98,
-{
+izlude_in.gat,175,130,2	script	Knight De Thomas	98,{
 	mes "[Knight De Thomas]";
 	if(callfunc("Is_Sword_Class")) goto L_Start;
 
@@ -235,6 +234,8 @@ L_Check:
 	mes "Haha! You have just learned HP Moving Recovery!";
 	delitem 713,200;
 	delitem 1058,1;
+//-- Padded armor does not have to be deleted! --
+//	delitem 2312,1;
 	skill 144,1,0;
 	set MOVHPREC, 0;
 	next;
@@ -261,8 +262,7 @@ L_Check:
 
 
 //<----------------------------------------- Auto-Berserk --------------------------------->\\
-prt_in.gat,94,57,3	script	Juan	85,
-{
+prt_in.gat,94,57,3	script	Juan	85,{
 	mes "[Juan]";
 	if(callfunc("Is_Sword_Class")) goto L_Start;
 
diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt
index 039be7621..e3311c00a 100644
--- a/npc/quests/skills/thief_skills.txt
+++ b/npc/quests/skills/thief_skills.txt
@@ -21,8 +21,7 @@
 
 
 //======================================================================================================
-moc_prydb1.gat,154,128,4	script	Alcouskou	118,
-{
+moc_prydb1.gat,154,128,4	script	Alcouskou	118,{
 	mes "[Alcouskou]";
 	if(callfunc("Is_Thief_Class")) goto L_Start;
 	if(Class==Job_Novice) goto L_Novice;
@@ -330,8 +329,7 @@ L_Fling:
 
 
 //====================================================================================
-payon.gat,149,120,4	script	RuRumuni	99,
-{
+payon.gat,91,77,4	script	RuRumuni	99,{
 	mes "[RuRumuni]";
 	if(SANDATTACK == 1 && BAGNFNTY != 2) goto L_Start;