1 files changed, 71 insertions, 55 deletions

diff --git a/npc/quests/newgears/traveler.txt b/npc/quests/newgears/traveler.txt
index 384835274..c81734a68 100644
--- a/npc/quests/newgears/traveler.txt
+++ b/npc/quests/newgears/traveler.txt
@@ -4,111 +4,127 @@
 //= Halca (1.0)
 //= Mass Zero (1.1)
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== 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]
 //============================================================
 
 morroc.gat,234,77,6	script	Traveler	807,{
-		if (Class == 0) GOTO EXT;
  mes "[Traveler]";
- mes "What item do you want from me?";
-	next;
-	 menu "Annoyed Raccoon Dog Hat.",MN1,"Fresh Bluish Fish Hat",MN2,"Drooping Cat",MN3,"Transformation Leaf",MN4;
-MN1:
+ 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 Dog's Leaf";
-	next;
+ mes "and 10 Raccoon Leaf";
+ next;
  mes "[Traveler]";
  mes "Got these items?";
-	next;
-menu "Yep.",-,"No!",EXT;
-		if ((countitem(1026) < 1000) || (countitem(7065) < 100) || (countitem(945) < 10)) GOTO EX_NM;
+ 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";
-	next;
-		delitem 1026,1000;
-		delitem 7065,100;
-		delitem 945,10;
-		getitem 5084,1;
+ next;
+ delitem 1026,1000;//Items: Acorn,
+ delitem 7065,100;//Items: Sea Otter Fur,
+ delitem 945,10;//Items: Raccoon Leaf,
+ getitem 5084,1;//Items: Lazy Racoon Hat,
  mes "[Traveler]";
  mes "Enjoy.";
-	close;
-MN2:
+ close;
+
+M_N2:
  mes "[Traveler]";
  mes "Gimme 1 Rotten Fish,";
  mes "300 Rotten Scales,";
  mes "50 Sashimi,";
  mes "1 Tail of a Fish,";
  mes "and 100 Sticky Mucus";
-	next;
+ next;
  mes "[Traveler]";
  mes "Got these items?";
-	 menu "Yes",-,"No.",EXT;
-		if ((countitem(624) < 1) || (countitem(959) < 300) || (countitem(1144) < 50) || (countitem(1023) < 1) || (countitem(938) < 100)) GOTO EX_NM; 
+ menu "Yes",-,"No.",M_EXIT;
+
+ if ((countitem(624) < 1) || (countitem(959) < 300) || (countitem(1144) < 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.";
-	next;
-		delitem 624,1;
-		delitem 959,300;
-		delitem 1144,50;
-		delitem 1023,1;
-		delitem 938,100;
-		getitem 5065,1
+ next;
+ delitem 624,1;//Items: Rotten Fish,
+ delitem 959,300;//Items: Stinky Scale,
+ delitem 1144,50;//Items: Sashimi,
+ delitem 1023,1;//Items: Fish Tail,
+ delitem 938,100;//Items: Sticky Mucus,
+ getitem 5065,1//Items: Fresh Blueish Fish,
  mes "[Traveler]";
  mes "Thanks. Bye.";
-	close;
-MN3:
+ close;
+
+M_N3:
  mes "[Traveler]";
  mes "Give me 1 Slotted Circlet,";
  mes "1 Black Dyestuff,";
- mes "and 300 Cat Dolls.";
+ mes "and 300 Black Cat Dolls.";
  mes "Loli Ruri drops the last one.";
-	next;
+ next;
  mes "[Traveler]";
  mes "Have you these items?";
-	next;
-menu "Yes",-,"No.",EXT;
-		if ((countitem(2233) < 1) || (countitem(7206) < 300)) GOTO EX_NM;
+ 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.";
-	next;
-		delitem 2233,1;
-		delitem 7206,300;
-		getitem 5058,1;
+ next;
+ delitem 2233,1;//Items: Circlet,
+ delitem 983,1;//Items: Black Dyestuff,
+ delitem 7206,300;//Items: Black Cat Doll,
+ getitem 5058,1;//Items: Resting Cat,
  mes "[Traveler]";
  mes "Good luck.";
-	close;
-MN4:
+ close;
+
+M_N4:
  mes "[Traveler]";
  mes "Bring me 600 Raccoon Dog's Leaf (Raccoon Leaf)";
-	next;
+ next;
  mes "[Traveler]";
  mes "You have these?";
-	next;
-menu "Yes!",-,"Nope.",EXT;
-		if (countitem(945) < 600) GOTO EX_NM;
+ next;
+ menu "Yes!",-,"Nope.",M_EXIT;
+
+ if (countitem(945) < 600) GOTO L_NOITEM;//Items: Raccoon Leaf,
  mes "[Traveler]";
  mes "Thanks. here's your leaf";
-	next;
-		delitem 945,600;
-		getitem 5064,1;
+ next;
+ delitem 945,600;//Items: Raccoon Leaf,
+ getitem 5064,1;//Items: Transformation Leaf,
  mes "[Traveler]";
  mes "Enjoy your Item";
-	close;
-EX_NM:
+ close;
+
+L_NOITEM:
  mes "[Traveler]";
  mes "No stuff, no item!";
  mes "When you have it, come back.";
-	close;
-EXT:
+ close;
+
+L_NOVICE:
+ mes "It's hot today...";
+ close;
+
+M_EXIT:
  mes "[Traveler]";
  mes "Bye.";
-	close;
-}
\ No newline at end of file
+ close;
+}