Minor fixes and extensions to inventory limit checks

6 files changed, 9 insertions, 5 deletions

diff --git a/npc/009-2_Hurnscald/kfahr.txt b/npc/009-2_Hurnscald/kfahr.txt
index 5d847ea0..f24d2071 100644
--- a/npc/009-2_Hurnscald/kfahr.txt
+++ b/npc/009-2_Hurnscald/kfahr.txt
@@ -831,7 +831,7 @@ L_knife_quest_completecheck:
 	delitem @MUSHROOM, @MUSHROOMS_NR;
 	getexp @KNIFE_QUEST_XP, 0;
 	getitem @BONE_KNIFE, 1;
-
+        next;
 
 	goto L_main_menu;
 
diff --git a/npc/009-2_Hurnscald/nicholas.txt b/npc/009-2_Hurnscald/nicholas.txt
index 3962bee0..c7e1728c 100644
--- a/npc/009-2_Hurnscald/nicholas.txt
+++ b/npc/009-2_Hurnscald/nicholas.txt
@@ -244,6 +244,8 @@ L_YesShield:
 	if (countitem(@INFANTRY) < 2) goto L_ShieldNoInfantry;
 	if (countitem(@IRON_ORE) < 10) goto L_ShieldNoOre;
 	if (countitem(@LEATHER_PATCH) < 1) goto L_ShieldNoLeatherPatch;
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_TooMany;
 
         mes "[Nicholas]";
         mes "\"Yes, it looks as if you have all that is needed!\"";
@@ -332,6 +334,8 @@ L_SetzerQuest:
 	if (countitem(@IRON_ORE) < 5) goto L_SetzerNoOre;
 	if (countitem(@MONSTER_OIL) < 1) goto L_SetzerNoMonsterOil;
 	if (countitem(@SHORT_SWORD) < 1) goto L_SetzerNoSword;
+	getinventorylist;
+	if ((@inventorylist_count == 100) && (countitem(@MONSTER_OIL) > 1)) goto L_TooMany;
 
         mes "[Nicholas]";
         mes "Nicholas takes the items, heats up your sword and pounds it with a heavy hammer.  Before your eyes it turns thinner and flatter.  Finally he pours the monster oil over it, heats it up again and douses it in water.";
diff --git a/npc/011-1_Woodland/alchemist.txt b/npc/011-1_Woodland/alchemist.txt
index fa088345..6329a5d6 100644
--- a/npc/011-1_Woodland/alchemist.txt
+++ b/npc/011-1_Woodland/alchemist.txt
@@ -408,7 +408,7 @@ L_dark_blue:
 	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) > 20 && countitem(@PEARL) > 2) goto L_TooMany;
+	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;
@@ -436,7 +436,7 @@ L_purple:
 	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) > 2) goto L_TooMany;
+	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;
diff --git a/npc/019-1_Snow_field/_import.txt b/npc/019-1_Snow_field/_import.txt
index 548454f4..e389a836 100644
--- a/npc/019-1_Snow_field/_import.txt
+++ b/npc/019-1_Snow_field/_import.txt
@@ -5,4 +5,3 @@ npc: npc/019-1_Snow_field/monsters.txt
 npc: npc/019-1_Snow_field/santa_helper.txt
 npc: npc/019-1_Snow_field/snowman.txt
 npc: npc/019-1_Snow_field/taro.txt
-npc: npc/019-1_Snow_field/temp
diff --git a/npc/020-1_Nivalis/_import.txt b/npc/020-1_Nivalis/_import.txt
index 440060d8..0e18f3ac 100644
--- a/npc/020-1_Nivalis/_import.txt
+++ b/npc/020-1_Nivalis/_import.txt
@@ -2,7 +2,6 @@ map: 020-1.gat
 npc: npc/020-1_Nivalis/_mobs.txt
 npc: npc/020-1_Nivalis/_warps.txt
 npc: npc/020-1_Nivalis/amrak.txt
-npc: npc/020-1_Nivalis/monsters.txt
 npc: npc/020-1_Nivalis/sexchanger.txt
 npc: npc/020-1_Nivalis/soul-menhir.txt
 npc: npc/020-1_Nivalis/startrek.txt
diff --git a/npc/020-2_Nivalis/furquest.txt b/npc/020-2_Nivalis/furquest.txt
index 5c2c00df..31538371 100644
--- a/npc/020-2_Nivalis/furquest.txt
+++ b/npc/020-2_Nivalis/furquest.txt
@@ -309,6 +309,8 @@ L_State_12:
 L_State_12_pay:
 	if (zeny < 15000) goto L_State_12_missing;
 	if (countitem(528) < 1) goto L_State_12_missing;
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_TooMany;
 	set zeny, zeny-15000;
 	delitem 528, 1;
 	getitem 655, 1;