From 1f941bef28ddfc9aa862caaafc19cc7523d4218f Mon Sep 17 00:00:00 2001 From: Vincent Petithory Date: Thu, 8 Nov 2012 12:28:22 +0100 Subject: Fix usages of getinventorylist(): * replace incorrect usage of @inventory_count with the correct variable created by getinventorylist(): @inventorylist_count --- world/map/npc/009-4/orum.txt | 2 +- world/map/npc/020-2/furquest.txt | 2 +- world/map/npc/021-2/kylian.txt | 4 ++-- world/map/npc/022-1/adrian.txt | 4 ++-- world/map/npc/048-2/sageNikolai.txt | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/world/map/npc/009-4/orum.txt b/world/map/npc/009-4/orum.txt index 727b2976..c7c6eb55 100644 --- a/world/map/npc/009-4/orum.txt +++ b/world/map/npc/009-4/orum.txt @@ -540,7 +540,7 @@ L_Ready_Cavern: mes "\"Very good work you have done! Please take this for your efforts. It has helped me in a bind.\""; next; getinventorylist; - if ((checkweight("CandleHelmet", 1) == 0) || (@inventory_count == 100)) + if ((checkweight("CandleHelmet", 1) == 0) || (@inventorylist_count == 100)) goto L_Inventory; getexp @EXP_BREAK_BARRIERS, 0; getitem "CandleHelmet", 1; diff --git a/world/map/npc/020-2/furquest.txt b/world/map/npc/020-2/furquest.txt index 8614a428..81bb245e 100644 --- a/world/map/npc/020-2/furquest.txt +++ b/world/map/npc/020-2/furquest.txt @@ -572,7 +572,7 @@ L_State_17_BuyDress: if (Zeny < @FINEDRESS_GP) goto L_State_17_NoMoney; getinventorylist; - if (@inventory_count == 100) + if (@inventorylist_count == 100) goto L_State_17_InventoryFull; set Zeny, Zeny - @FINEDRESS_GP; diff --git a/world/map/npc/021-2/kylian.txt b/world/map/npc/021-2/kylian.txt index b18d6d6e..bce07f25 100644 --- a/world/map/npc/021-2/kylian.txt +++ b/world/map/npc/021-2/kylian.txt @@ -228,7 +228,7 @@ L_DesertHat: // @state == 8 mes "\"That was an interesting night. Thanks for your suggestion to visit the casino.\""; next; mes "\"You helped me a lot, so I bought a souvenir for you while I was shopping.\""; - if ((checkweight("DesertHat", count) == 0) || (@inventory_count == 100)) + if ((checkweight("DesertHat", count) == 0) || (@inventorylist_count == 100)) goto L_Inventory; getitem "DesertHat", 1; set @state, 9; @@ -264,7 +264,7 @@ L_Close: set @clothes_exp, 0; set @fun_money, 0; set @fun_exp, 0; - set @inventory_count, 0; + set @inventorylist_count, 0; // NOT set to zero: @KylianNTLicense, @KylianNTSightSeeing and @KylianNTCasino // those are used to check if the player logged out in the meanwhile close; diff --git a/world/map/npc/022-1/adrian.txt b/world/map/npc/022-1/adrian.txt index 50b123c8..fbae8706 100644 --- a/world/map/npc/022-1/adrian.txt +++ b/world/map/npc/022-1/adrian.txt @@ -29,7 +29,7 @@ L_Get: mes "He checks the paper Kylian gave you and then takes a critical look at you."; next; getinventorylist; - if ((checkweight("LeatherSuitcase", 1) == 0) || (@inventory_count == 100)) + if ((checkweight("LeatherSuitcase", 1) == 0) || (@inventorylist_count == 100)) goto L_Inventory; mes "[Adrian]"; mes "\"Alright, here it is.\""; @@ -47,6 +47,6 @@ L_Inventory: L_Close: set @state, 0; - set @inventory_count, 0; + set @inventorylist_count, 0; close; } diff --git a/world/map/npc/048-2/sageNikolai.txt b/world/map/npc/048-2/sageNikolai.txt index 6374b973..9c2356cc 100644 --- a/world/map/npc/048-2/sageNikolai.txt +++ b/world/map/npc/048-2/sageNikolai.txt @@ -232,7 +232,7 @@ L_GrimoireReward: next; mes "\"I'd like you to have this as a reward for your help.\""; getinventorylist; - if ((checkweight("Grimoire", 1) == 0) || (@inventory_count == 100)) + if ((checkweight("Grimoire", 1) == 0) || (@inventorylist_count == 100)) goto L_Full_Inv; getitem "Grimoire", 1; set QUEST_BlueSage, QUEST_BlueSage | $@Q_BlueSageGrimoire; @@ -247,7 +247,7 @@ L_SlimesReward: next; mes "\"While looking through some old artifacts that we found during the cleaning, we found this sword. We don't really have a use for it.\""; getinventorylist; - if ((checkweight("IceGladius", 1) == 0) || (@inventory_count == 100)) + if ((checkweight("IceGladius", 1) == 0) || (@inventorylist_count == 100)) goto L_Full_Inv; getitem "IceGladius", 1; set QUEST_BlueSage, QUEST_BlueSage | $@Q_BlueSageIceSword; -- cgit v1.2.3-60-g2f50