From b1ced66321ffed02cde1a9ccd39fa2c9ba004125 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Tue, 23 Dec 2008 17:16:49 +0000 Subject: Fixeds to check for invy room before giving items --- npc/011-1_Woodland/alchemist.txt | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'npc/011-1_Woodland/alchemist.txt') diff --git a/npc/011-1_Woodland/alchemist.txt b/npc/011-1_Woodland/alchemist.txt index 08ba6e41..fa088345 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) > 20 && countitem(@PEARL) > 2) 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) > 2) 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."; } -- cgit v1.2.3-70-g09d2 From b9b23fe20e0563523e83a224d1e68886512bb783 Mon Sep 17 00:00:00 2001 From: Fate Date: Wed, 24 Dec 2008 10:01:01 -0700 Subject: Minor fixes and extensions to inventory limit checks --- npc/009-2_Hurnscald/kfahr.txt | 2 +- npc/009-2_Hurnscald/nicholas.txt | 4 ++++ npc/011-1_Woodland/alchemist.txt | 4 ++-- npc/019-1_Snow_field/_import.txt | 1 - npc/020-1_Nivalis/_import.txt | 1 - npc/020-2_Nivalis/furquest.txt | 2 ++ 6 files changed, 9 insertions(+), 5 deletions(-) (limited to 'npc/011-1_Woodland/alchemist.txt') 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; -- cgit v1.2.3-70-g09d2