Merge branch 'master' into magicv2008.12.25

1 files changed, 13 insertions, 5 deletions

diff --git a/npc/008-1_Hurnscald_outskirts/hinnak.txt b/npc/008-1_Hurnscald_outskirts/hinnak.txt
index 27dcd677..ce0af655 100644
--- a/npc/008-1_Hurnscald_outskirts/hinnak.txt
+++ b/npc/008-1_Hurnscald_outskirts/hinnak.txt
@@ -53,7 +53,7 @@ L_Reward:
 
 L_Exchange:
 	mes "[Farmer Hinnak]";
-	mes "Have you got the 10 antennae?";
+	mes "\"Have you got the 10 antennae?\"";
 	next;
 
 	if (countitem(614) < 10) goto L_Exchange_Notenough;
@@ -64,6 +64,9 @@ L_Exchange:
 	close;
 
 L_Exchange_Exchange:
+	if (countitem(614) < 10) goto L_Exchange_Notenough;
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_Exchange_TooMany;
 	delitem 614, 10;
 	getitem 623, 1;
 	set QUEST_Scythe_state, 2;
@@ -72,13 +75,18 @@ L_Exchange_Exchange:
 	close;
 
 L_Exchange_Notenough:
-	menu
-		"Not yet, but I am working on it.", -;
+	mes "[Farmer Hinnak]";
+	mes "\"It doesn't look like you do.\"";
+	close;
+
+L_Exchange_TooMany:
+	mes "[Farmer Hinnak]";
+	mes "\"Looks like you don't have room for this. Come back later to receive your reward. Hold on to the antennea until then.\"";
 	close;
 
 L_ThanksAgain:
 	mes "[Farmer Hinnak]";
-	mes "Thanks again for helping me with the pinkies.";
+	mes "\"Thanks again for helping me with the pinkies.\"";
 	close;
 
 L_NohMask:
@@ -97,4 +105,4 @@ L_NohMask_Satchel:
 	mes "[Farmer Hinnak]";
 	mes "\"Yes, I saw someone with a large sack on their back go to the minning camp.\"";
 	close;
-}
\ No newline at end of file
+}