fixed some item names

and fixed coords of some NPC of new headgear quests

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

15 files changed, 49 insertions, 45 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index 4d340c90e..a9903c0a6 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1299,7 +1299,7 @@
 5083,Back_Ribbon,Back Ribbon,5,20,0,200,,1,,0,10477567,0,256,,45,167,{},{ bonus bMdef,10; }
 5084,Lazy_Raccoon_Hat,Lazy Racoon Hat,5,20,0,500,,1,,0,10477567,2,256,,0,168,{},{ bonus2 bResEff,Eff_Sleep,2000; }
 5085,Small_Twin_Ribbons,Small Twin Ribbons,5,20,0,100,,1,,0,10477567,0,512,,45,169,{},{}
-5086,Alarm_Mask,Alarm MaskĄ5,20,0,100,,2,,0,10477567,2,513,,0,170,{},{ bonus2 bResEff,Eff_Blind,5000; }
+5086,Alarm_Mask,Alarm Mask,5,20,0,100,,2,,0,10477567,2,513,,0,170,{},{ bonus2 bResEff,Eff_Blind,5000; }
 5087,Expressionless_Mask,Expressionless Mask,5,20,0,100,,1,,0,10477567,2,513,,0,171,{},{}
 5088,Surprised_Mask,Surprised Mask,5,20,0,100,,1,,0,10477567,2,513,,0,172,{},{}
 5089,Annoyed_Mask,Annoyed Mask,5,20,0,100,,1,,0,10477567,2,513,,0,173,{},{}
diff --git a/npc/quests/newgears/arjen.txt b/npc/quests/newgears/arjen.txt
index d4c5ce788..8eb51f9be 100644
--- a/npc/quests/newgears/arjen.txt
+++ b/npc/quests/newgears/arjen.txt
@@ -1,4 +1,4 @@
-//===== eAthena Script ======================================= 
+//===== eAthena Script =======================================
 //= X-Shaped Hairpin, Bandage & Flower Hairpin Quests
 //===== By: ================================================== 
 //= Halca (1.0)
@@ -13,7 +13,8 @@
 //= 1.2 Fixed wrong labels, wrong items ID. [Lupus]
 //============================================================
 
-gef_tower.gat,128,148,6	script	Arjen	807,{
+//86
+geffen.gat,128,148,6	script	Arjen	807,{ 
  mes "[Arjen]";
  mes "What item information do you require?";
  next;
@@ -82,7 +83,7 @@ M_2:
  next;
  delitem 930,500;//Items: Rotten Bandage,
  delitem 970,1;//Items: Alcohol,
- getitem 5070,1;//Items: Bandage,
+ getitem 5063,1;//Items: Bandage,
  mes "[Arjen]";
  mes "Thanks! Hope that cures your aches!";
  close;
diff --git a/npc/quests/newgears/bear_hat.txt b/npc/quests/newgears/bear_hat.txt
index 1f1b6b819..3c33a62a3 100644
--- a/npc/quests/newgears/bear_hat.txt
+++ b/npc/quests/newgears/bear_hat.txt
@@ -14,7 +14,7 @@
 //=     items check [Lupus]
 //============================================================
 
-xmas.gat,156,152,3	script	Bora	826,{
+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 vute expressions yourself!";
diff --git a/npc/quests/newgears/burning_blood_bandana.txt b/npc/quests/newgears/burning_blood_bandana.txt
index 923977765..bc83f57e4 100644
--- a/npc/quests/newgears/burning_blood_bandana.txt
+++ b/npc/quests/newgears/burning_blood_bandana.txt
@@ -1,4 +1,4 @@
-//===== eAthena Script ======================================= 
+//===== eAthena Script ======================================= ?sprite
 //= Burning Blood Bandana Quest
 //===== By: ================================================== 
 //= Halca (1.0)
@@ -8,7 +8,7 @@
 //===== Compatible With: ===================================== 
 //= Any eAthena Version.
 //===== Description: ========================================= 
-//= Seperate Red Bandana (Burning Blood Bandana?) quest.
+//= Seperate Burning Blood Bandana quest.
 //===== Additional Comments: ================================= 
 //= 1.2 Fixed wrong labels, added missing text, wrong ID [Lupus]
 //============================================================
@@ -21,7 +21,7 @@ yuno.gat,301,188,6	Genbolt	826,{
  next;
  mes "[Genbolt]";
  mes "I am the only one who can make you look the coolest,";
- mes "as I can craft a ^000090Red Bandana^000000.";
+ 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;
@@ -38,7 +38,7 @@ yuno.gat,301,188,6	Genbolt	826,{
  mes "[Genbolt]";
  mes "Now I can make it...";
  next;
- getitem 2275,1;//Items: Red Bandana,
+ getitem 5070,1;//Items: Burning Blood Bandana,
  mes "[Genbolt]";
  mes "Enjoy.";
  close;
diff --git a/npc/quests/newgears/cat_hairband.txt b/npc/quests/newgears/cat_hairband.txt
index 5aa2b5097..95bf7f77e 100644
--- a/npc/quests/newgears/cat_hairband.txt
+++ b/npc/quests/newgears/cat_hairband.txt
@@ -1,4 +1,4 @@
-//===== eAthena Script ======================================= 
+//===== eAthena Script =======================================1
 //= Cat Hairband Quest
 //===== By: ================================================== 
 //= Halca (1.0)
@@ -8,19 +8,20 @@
 //===== Compatible With: ===================================== 
 //= Any eAthena Version.
 //===== Description: ========================================= 
-//= Seperate Black Cat Ears (Cat Hairband) quest.
+//= Seperate Cat Hairband quest.
 //===== Additional Comments: ================================= 
 //= 1.2 Fixed wrong labels, added missing text,
 //=	fixed zeny amount [Lupus]
 //============================================================
 
-pay_cast01.gat,110,160,4	KoneKone	819,{
+
+payon_in01.gat,62,10,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 Black Cat Ears!";
+ 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;
@@ -52,7 +53,7 @@ L_NOITEM:
 
 M_REQ:
  mes "[KoneKone]";
- mes "For the ^670000Black Cat Ears^000000, the following items are needed:";
+ mes "For the ^670000Cat Hairband^000000, the following items are needed:";
  next;
  mes "[KoneKone]";
  mes "1 Kitty Band,";
diff --git a/npc/quests/newgears/fox_mask.txt b/npc/quests/newgears/fox_mask.txt
index 0186ee69e..8d8a2474e 100644
--- a/npc/quests/newgears/fox_mask.txt
+++ b/npc/quests/newgears/fox_mask.txt
@@ -25,6 +25,7 @@ pay_dun04.gat,204,152,2	script	Nine Tail	1180,{
 	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]";

diff --git a/npc/quests/newgears/hat_seller.txt b/npc/quests/newgears/hat_seller.txt
index ef791e117..1334933a1 100644
--- a/npc/quests/newgears/hat_seller.txt
+++ b/npc/quests/newgears/hat_seller.txt
@@ -1,4 +1,4 @@
-//===== eAthena Script ======================================= 
+//===== eAthena Script =======================================1
 //= Hat Seller (New Hat Quests)
 //===== By: ================================================== 
 //= Halca (1.0)
@@ -20,13 +20,13 @@ xmas_in.gat,123,131,4	script	Hat Seller	806,{
  mes "What hat would you like information on?";
  mes "I can make all the hats I mention here";
  next;
- menu "Pointy Cap",M_1,"Straw Hat",M_2,"Cowboy Hat",M_3,"Sombrero",M_4,"Furry Hat",M_5,"Quit",M_EXIT;
+ 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 String Paper,";
+ mes "100 Slick Paper,";
  mes "100 Oiled Paper.";
  next;
  mes "[Hat Seller]";
@@ -34,9 +34,9 @@ M_1:
  next;
  menu "Yes.",-,"No.",M_EXIT;
  
- if ((countitem(2236) < 1) || (countitem(7111) < 100) || (countitem(7151) < 100)) GOTO L_NOITEM;//Items: Santa's Hat, String Paper, Oiled Paper,
+ 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: String Paper,
+ delitem 7111,100;//Items: Slick Paper,
  delitem 7151,100;//Items: Oiled Paper,
  getitem 5060,1;//Items: Pointy Cap,
  mes "[Hat Seller]";
@@ -124,7 +124,7 @@ M_4:
 M_5:
  mes "[Hat Seller]";
  mes "For this item I require:";
- mes "1 Cap,";
+ mes "1 Slotted Cap,";
  mes "300 Skin of the Black Bear.";
  next;
  mes "[Hat Seller]";
@@ -133,10 +133,10 @@ M_5:
  next;
  menu "Yes.",-,"No.",M_EXIT;
 
- if ((countitem(2227) < 1) || (countitem(7161) < 300)) GOTO L_NOITEM;//Items: Cap, Skin of the Black Bear,
+ if ((countitem(2227) < 1) || (countitem(7161) < 300)) GOTO L_NOITEM;//Items: Cap, Bear Skin,
  delitem 2227,1;//Items: Cap,
- delitem 7161,300;//Items: Skin of the Black Bear,
- getitem 5076,1;//Items: Furry Hat,
+ 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/mask_of_alarm.txt b/npc/quests/newgears/mask_of_alarm.txt
index f53564767..e75b34212 100644
--- a/npc/quests/newgears/mask_of_alarm.txt
+++ b/npc/quests/newgears/mask_of_alarm.txt
@@ -1,4 +1,4 @@
-//===== eAthena Script ======================================= 
+//===== eAthena Script =======================================
 //= Mask of Alarm Quest
 //===== By: ================================================== 
 //= Halca (1.0)
@@ -8,19 +8,19 @@
 //===== Compatible With: ===================================== 
 //= Any eAthena Version.
 //===== Description: ========================================= 
-//= Seperate Expressionless Mask (Mask of Alarm) quest.
+//= Seperate Alarm Mask quest.
 //===== Additional Comments: ================================= 
 //= 1.2 Fixed wrong labels, added missing text and labels,
 //=	changed Zeny amount, fixed wrong item ID [Lupus]
 //============================================================
 
-aldebaran.gat,87,181,3	script	Muslam	819,{
+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 Expressionless Mask (Mask of an Alarm),";
+ mes "Anyways... If you want a Alarm Mask,";
  mes "bring me 300,000 Zeny,";
  mes "and 1 Monster Oxygen Mask.";
  next;
@@ -35,7 +35,7 @@ aldebaran.gat,87,181,3	script	Muslam	819,{
  next;
  delitem 10002,1;//Items: Monster Oxygen Mask,
  set Zeny,Zeny-300000;
- getitem 5087,1;//Items: Expressionless Mask,
+ getitem 5086,1;//Items: Alarm Mask,
  mes "[Muslam]";
  mes "Enjoy your item!";
  close;
diff --git a/npc/quests/newgears/mushroom_hairband.txt b/npc/quests/newgears/mushroom_hairband.txt
index 87f6c4baf..de777ce6f 100644
--- a/npc/quests/newgears/mushroom_hairband.txt
+++ b/npc/quests/newgears/mushroom_hairband.txt
@@ -13,7 +13,7 @@
 //= 1.2 Fixed wrong labels, added missing text [Lupus]
 //============================================================
 
-prontera.gat,66,87,6	script	Aipo	819,{
+geffen.gat,66,87,6	script	Aipo	819,{
  mes "[Aipo]";
  If (Class == 0) GOTO L_NOVICE;
  mes "Heeeeee.";
diff --git a/npc/quests/newgears/neris.txt b/npc/quests/newgears/neris.txt
index b1c46bd35..3356a6bad 100644
--- a/npc/quests/newgears/neris.txt
+++ b/npc/quests/newgears/neris.txt
@@ -1,4 +1,4 @@
-//===== eAthena Script ======================================= 
+//===== eAthena Script =======================================1
 //= Neris (New Hat Quests)
 //===== By: ================================================== 
 //= Halca (1.0)
@@ -13,11 +13,12 @@
 //= 1.2 Fixed wrong labels, added missing text [Lupus]
 //============================================================
 
-yuno.gat,21,17,7	script	Neris	806,{
+
+yuno.gat,353,282,7	script	Neris	806,{
  mes "[Neris]";
  mes "So, whatcha want then?";
  next;
- menu "Big Golden Bell.",M_LGB,"Crown of Mistress.",M_COM,"Crown of Ancient Queen.",M_COAQ,"Nothing, thanks.",M_EXIT;
+ menu "Golden Bells.",M_LGB,"Crown of Mistress.",M_COM,"Crown of Ancient Queen.",M_COAQ,"Nothing, thanks.",M_EXIT;
 
 M_LGB:
  mes "[Neris]";
@@ -27,7 +28,7 @@ M_LGB:
  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?",M_REQL,"Nothing, thanks.",M_EXIT;
+ 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]";
@@ -37,7 +38,7 @@ M_LGB:
  delitem 714,1;//Items: Emperium,
  delitem 969,3;//Items: Gold,
  set Zeny,Zeny-1000;
- getitem 5091,1;//Items: Big Golden Bell,
+ getitem 5091,1;//Items: Golden Bells,
  mes "[Neris]";
  mes "Thanks, and bye!";
  close;
diff --git a/npc/quests/newgears/old_blacksmith.txt b/npc/quests/newgears/old_blacksmith.txt
index dc1d9963e..f26fd658d 100644
--- a/npc/quests/newgears/old_blacksmith.txt
+++ b/npc/quests/newgears/old_blacksmith.txt
@@ -73,7 +73,7 @@ M_EOA:
  mes "[Old Blacksmith]";
  mes "Okay, and here you go.";
  next;
- getitem 5074,1;//Items: Horns of Succubus,
+ getitem 5074,1;//Items: Ears of Angel,
  mes "[Old Blacksmith]";
  mes "Enjoy it!";
  close;
diff --git a/npc/quests/newgears/posture_fix_hat.txt b/npc/quests/newgears/posture_fix_hat.txt
index 7c77edee6..9060866b6 100644
--- a/npc/quests/newgears/posture_fix_hat.txt
+++ b/npc/quests/newgears/posture_fix_hat.txt
@@ -1,4 +1,4 @@
-//===== eAthena Script ======================================= 
+//===== eAthena Script =======================================
 //= Posture Fix Hat Quest
 //===== By: ================================================== 
 //= Halca (1.0)
@@ -8,13 +8,13 @@
 //===== Compatible With: ===================================== 
 //= Any eAthena Version.
 //===== Description: ========================================= 
-//= Campus Hat (Posture Fix Hat) quest.
+//= Posture Fix Hat quest.
 //===== Additional Comments: ================================= 
 //= 1.2 Fixed wrong labels, added missing text
 //=	fixed wrong items ID [Lupus]
 //============================================================
 
-pay_in01.gat,171,142,5	script	Nan Hyang	814,{
+payon.gat,155,115,5	script	Nan Hyang	814,{
  If (getequipisequiped(5073)) GOTO L_GOOD;
  If (Class == 0) GOTO L_NOVICE;
  mes "[Nan Hyang]";
@@ -22,9 +22,9 @@ pay_in01.gat,171,142,5	script	Nan Hyang	814,{
  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 Campus Hat.";
+ mes "I could correct it for you If you brought me some materials to make you a Posture Fix Hat.";
  next;
- menu "Make me a Campus Hat.",-,"What do I need to get?",M_REQ,"No thanks!",M_EXIT;
+ 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]";
@@ -32,7 +32,7 @@ pay_in01.gat,171,142,5	script	Nan Hyang	814,{
  next;
  delitem 1550,1;//Items: Book,
  delitem 2285,1;//Items: Apple o' Archer,
- getitem 5073,1;//Items: Campus Hat,
+ 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;
diff --git a/npc/quests/newgears/sea_otter_hat.txt b/npc/quests/newgears/sea_otter_hat.txt
index 87e302192..977ba8ab5 100644
--- a/npc/quests/newgears/sea_otter_hat.txt
+++ b/npc/quests/newgears/sea_otter_hat.txt
@@ -8,7 +8,7 @@
 //===== Compatible With: ===================================== 
 //= Any eAthena Version.
 //===== Description: ========================================= 
-//= Seperate Seo Otter Hat quest.
+//= Seperate Sea Otter Hat quest.
 //===== Additional Comments: ================================= 
 //= 1.2 Fixed wrong labels, added missing text [Lupus]
 //============================================================
diff --git a/npc/quests/newgears/traveler.txt b/npc/quests/newgears/traveler.txt
index c81734a68..520996226 100644
--- a/npc/quests/newgears/traveler.txt
+++ b/npc/quests/newgears/traveler.txt
@@ -14,7 +14,7 @@
 //=	added missing delitem, fixed names, item amount [Lupus]
 //============================================================
 
-morroc.gat,234,77,6	script	Traveler	807,{
+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?";
@@ -49,7 +49,7 @@ M_N2:
  mes "Gimme 1 Rotten Fish,";
  mes "300 Rotten Scales,";
  mes "50 Sashimi,";
- mes "1 Tail of a Fish,";
+ mes "1 Fish Tail,";
  mes "and 100 Sticky Mucus";
  next;
  mes "[Traveler]";
diff --git a/npc/quests/newgears/tulip_hairpin.txt b/npc/quests/newgears/tulip_hairpin.txt
index 8c4dc327e..257cb47c6 100644
--- a/npc/quests/newgears/tulip_hairpin.txt
+++ b/npc/quests/newgears/tulip_hairpin.txt
@@ -13,7 +13,7 @@
 //= 1.2 Fixed wrong labels, added missing text [Lupus]
 //============================================================
 
-prontera.gat,84,189,6	script	Ses	815,{
+geffen.gat,84,189,6	script	Ses	815,{ 
  mes "[Ses]";
  If (Class == 0) GOTO L_NOVICE;
  mes "Woo, hello! Fruit fruit!";