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, 74 insertions, 65 deletions

diff --git a/npc/quests/newgears/arjen.txt b/npc/quests/newgears/arjen.txt
index a0a543432..f2b19cb17 100644
--- a/npc/quests/newgears/arjen.txt
+++ b/npc/quests/newgears/arjen.txt
@@ -4,135 +4,144 @@
 //= Halca (1.0)
 //= Mass Zero (1.1)
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= Any eAthena Version.
 //===== Description: ========================================= 
 //= Seperate quests for these items.
 //===== Additional Comments: ================================= 
-//=
+//= 1.2 Fixed wrong labels, wrong items ID. [Lupus]
 //============================================================
 
 gef_tower.gat,128,148,6	script	Arjen	807,{
  mes "[Arjen]";
  mes "What item information do you require?";
-	next;
-	 menu "X-Shaped Hairpin.",M1,"Bandage",M2,"Flower Hairpin.",M3;
-M1:
+ next;
+ menu "X-Shaped Hairpin.",M_1,"Bandage",M_2,"Flower Hairpin.",M_3;
+M_1:
  mes "[Arjen]";
  mes "Hyaaaaaaaa!";
-	next;
+ 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;
+ next;
  mes "[Arjen]";
  mes "Im not much of a craftsman, but If you bring me some items I can make you";
  mes "my ^660000X-Shaped Hairpin^000000.";
-	next;
-	 menu "Make me the hairpin.",-,"What are the requirements?",X_REQ,"No, thanks.",EXT;
-		If ((countitem(10011) < 1) || (countitem(7219) < 400)) GOTO X_NM;
+ 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!";
-	next;
-		delitem 10011,1;
-		delitem 7219,400;
+ next;
+ delitem 10011,1;//Items: Stellar Hairpin,
+ delitem 7220,400;//Items: Ectoplasm,
  mes "[Arjen]";
  mes "Hmm... okay, thanks for the items.";
  mes "Let me make it for you.";
-	next;
-		getitem 5079,1;
+ next;
+ getitem 5079,1;//Items: X Hairpin,
  mes "[Arjen]";
  mes "Thanks very much, you look cool now.";
-	close;
-X_NM:
+ close;
+
+L_NOITEM1:
  mes "[Arjen]";
  mes "Come on man, gimme a break.";
  mes "This is hot property!";
-	next;
-	 GOTO X_REQ;
-X_REQ:
-	next;
+ 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;
+ next;
  mes "[Arjen]";
  mes "You need to have travelled well to get these items...";
-	close;
-M2:
+ 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;
+ next;
  mes "[Arjen]";
  mes "What is that you say? you have just the problem?";
  mes "Well, I can make you a ^660000Bandage^000000 to heal your wounds!";
-	next;
-	 menu "Yes, please make me one!",-,"What are the requirements?",B_REQ,"No, thanks.",EXT;
-		If ((countitem(930) < 500) || (countitem(970) < 1)) GOTO B_NM;
+ 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";
-	next;
-		delitem 930,500;
-		delitem 970,1;
-		getitem 5070,1;
+ next;
+ delitem 930,500;//Items: Rotten Bandage,
+ delitem 970,1;//Items: Alcohol,
+ getitem 5070,1;//Items: Bandage,
  mes "[Arjen]";
  mes "Thanks! Hope that cures your aches!";
-	close;
-B_NM:
+ close;
+
+L_NOITEM2:
  mes "[Arjen]";
  mes "Argh, please, If you want the item, bring me what I asked for.";
-	next;
-	 GOTO B_REQ;
-B_REQ:
+ 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;
-EXT:
- mes "[Arjen]";
- mes "Okay, have a nice day!";
-	close;
-M3:
+ 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.",EXT;
+ 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.",RL,"No, thanks.",EXT;
-RL:
+ 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 Leaf, for the element of love,";
+ 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;
+ next;
  mes "[Arjen]";
  mes "Would you like to make this item?";
-	next;
-	 menu "Yes.",-,"No.",EXT;
-		If ((countitem(2269) < 1) || (countitem(999) < 10) || (Zeny < 20000)) GOTO FH_NM;
+ 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!";
-	next;
-		delitem 2269,1;
-		delitem 999,10;
-		set Zeny,Zeny-20000;
-		getitem 5061,1;
+ next;
+ delitem 2269,1;//Items: Romantic Flower,
+ delitem 999,10;//Items: Steel,
+ set Zeny,Zeny-20000;
+ getitem 5061,1;//Items: Flower Hairpin,
  mes "[Arjen]";
  mes "Enjoy!";
-	close;
-FH_NM:
+ close;
+
+M_EXIT:
  mes "[Arjen]";
- mes "Sorry, but you don't have the correct items.";
-	next;
-	 GOTO RL;
-End;
-}
\ No newline at end of file
+ mes "Okay, have a nice day!";
+ close;
+
+}