Merge branch 'master' into magic

1 files changed, 28 insertions, 0 deletions

diff --git a/npc/011-1_Woodland/alchemist.txt b/npc/011-1_Woodland/alchemist.txt
index 08ba6e41..6329a5d6 100644
--- a/npc/011-1_Woodland/alchemist.txt
+++ b/npc/011-1_Woodland/alchemist.txt
@@ -107,6 +107,8 @@ L_main_menu:
 
 L_iron:
   	if(countitem(566) < 20) goto L_no_iron;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(566) > 20) goto L_TooMany;
 	mes "[Rauk the Alchemist]";
 	mes "\"Great! You brought me exactly what I need!";
 	mes "Here is your Iron potion.\"";
@@ -116,6 +118,8 @@ L_iron:
 
 L_concentration:
 	if(countitem(565) < 20) goto L_no_concentration;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(565) > 20) goto L_TooMany;
 	mes "[Rauk the Alchemist]";
 	mes "\"Great! You brought me exactly what I need!";
 	mes "Here is your Concentration potion.\"";
@@ -259,6 +263,8 @@ L_ok:
 
 L_red:
 	if (countitem(@RED) < 10) goto L_red_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@RED) > 10) goto L_TooMany;
 	delitem @RED, 10;
 	getitem 690, 1;
 	goto L_ok;
@@ -277,6 +283,8 @@ L_d_red:
 
 L_yellow:
 	if (countitem(@YELLOW) < 10) goto L_yellow_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@YELLOW) > 10) goto L_TooMany;
 	delitem @YELLOW, 10;
 	getitem 693, 1;
 	goto L_ok;
@@ -295,6 +303,8 @@ L_d_yellow:
 
 L_light_blue:
 	if (countitem(@BLUE) < 10) goto L_light_blue_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@BLUE) > 10) goto L_TooMany;
 	delitem @BLUE, 10;
 	getitem 694, 1;
 	goto L_ok;
@@ -314,6 +324,8 @@ L_d_light_blue:
 L_green:
 	if (countitem(@BLUE) < 20) goto L_green_fail;
 	if (countitem(@YELLOW) < 20) goto L_green_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@BLUE) > 20 && countitem(@YELLOW) > 20) goto L_TooMany;
 	if (zeny < 1000) goto L_green_fail;
 	delitem @BLUE, 20;
 	delitem @YELLOW, 20;
@@ -342,6 +354,8 @@ L_orange:
 	if (countitem(@RED) < 10) goto L_orange_fail;
 	if (countitem(@YELLOW) < 10) goto L_orange_fail;
 	if (countitem(@ORE) < 2) goto L_orange_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@RED) > 10 && countitem(@YELLOW) > 10 && countitem(@ORE) > 2) goto L_TooMany;
 	if (zeny < 1000) goto L_orange_fail;
 	delitem @RED, 10;
 	delitem @YELLOW, 10;
@@ -367,6 +381,8 @@ L_pink:
 	if (countitem(@RED) < 10) goto L_pink_fail;
 	if (countitem(@PETAL) < 6) goto L_pink_fail;
 	if (zeny < 1000) goto L_pink_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@RED) > 10 && countitem(@PETAL) > 6) goto L_TooMany;
 	delitem @RED, 10;
 	delitem @PETAL, 6;
 	set zeny, zeny - 1000;
@@ -391,6 +407,8 @@ L_dark_blue:
 	if (countitem(@MAUVE) < 50) goto L_dark_blue_fail;
 	if (countitem(@PEARL) < 1) goto L_dark_blue_fail;
 	if (zeny < 10000) goto L_dark_blue_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@BLUE) > 100 && countitem(@MAUVE) > 50 && countitem(@PEARL) > 1) goto L_TooMany;
 	delitem @BLUE, 100;
 	delitem @MAUVE, 50;
 	delitem @PEARL, 1;
@@ -417,6 +435,8 @@ L_purple:
 	if (countitem(@RED) < 100) goto L_purple_fail;
 	if (countitem(@MAUVE) < 20) goto L_purple_fail;
 	if (countitem(@PEARL) < 1) goto L_purple_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@BLUE) > 100 && countitem(@RED) > 100 && countitem(@MAUVE) > 20 && countitem(@PEARL) > 1) goto L_TooMany;
 	if (zeny < 40000) goto L_purple_fail;
 	delitem @BLUE, 100;
 	delitem @RED, 100;
@@ -448,6 +468,8 @@ L_black:
 	if (countitem(@RED) < 40) goto L_black_fail;
 	if (countitem(@YELLOW) < 40) goto L_black_fail;
 	if (countitem(@MAUVE) < 40) goto L_black_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@BLUE) > 40 && countitem(@RED) > 40 && countitem(@YELLOW) > 40 && countitem(@MAUVE) > 40) goto L_TooMany;
 	if (zeny < 20000) goto L_black_fail;
 	delitem @BLUE, 40;
 	delitem @RED, 40;
@@ -481,6 +503,8 @@ L_dark_green:
 	if (countitem(@MAUVE) < 10) goto L_dark_green_fail;
 	if (countitem(@MAGGOTSLIME) < 1) goto L_dark_green_fail;
 	if (zeny < 1000) goto L_dark_green_fail;
+	getinventorylist;
+	if (@inventorylist_count == 100 && countitem(@BLUE) > 10 && countitem(@YELLOW) > 10 && countitem(@MAUVE) > 10 && countitem(@MAGGOTSLIME) > 1) goto L_TooMany;
 	delitem @BLUE, 10;
 	delitem @MAUVE, 10;
 	delitem @YELLOW, 10;
@@ -714,4 +738,8 @@ L_Update_Var:
 		(QUEST_Forestbow_state & ~(@Q_MASK)
 		| (@Q_status << @Q_SHIFT));
 	return;
+
+L_TooMany:
+	mes "[Rauk the Alchemist]";
+	mes "You don't have room for this.";
 }