fixed 16 newgear quests

(each contained 1-4 bugs: missing labels, wrong labels, wrong items amount, missing checks, missing delitem wrong item ID ,etc )

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

1 files changed, 82 insertions, 67 deletions

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