summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2008-12-24 10:15:56 +0000
committerJared Adams <jaxad0127@gmail.com>2008-12-24 10:15:56 +0000
commite896b785935c661319ade424f473f4442e1878eb (patch)
tree671677480a757728b73a98a0242d78c44878c2fb
parentf6da63ee431c417d9a885e87af3637f4aff4156b (diff)
downloadserverdata-e896b785935c661319ade424f473f4442e1878eb.tar.gz
serverdata-e896b785935c661319ade424f473f4442e1878eb.tar.bz2
serverdata-e896b785935c661319ade424f473f4442e1878eb.tar.xz
serverdata-e896b785935c661319ade424f473f4442e1878eb.zip
Remove unneeded inventory checks and add fix one
-rw-r--r--npc/006-1_Desert_mountains/pachua.txt2
-rw-r--r--npc/009-2_Hurnscald/nicholas.txt6
-rw-r--r--npc/020-2_Nivalis/furquest.txt3
3 files changed, 4 insertions, 7 deletions
diff --git a/npc/006-1_Desert_mountains/pachua.txt b/npc/006-1_Desert_mountains/pachua.txt
index af293ff6..51c2d3b2 100644
--- a/npc/006-1_Desert_mountains/pachua.txt
+++ b/npc/006-1_Desert_mountains/pachua.txt
@@ -140,7 +140,7 @@ L_leather_patch:
if (countitem(@SNAKE_SKIN) < 1) goto L_NoSkins;
if (zeny < @LEATHER_PATCH_PRICE) goto L_NoMoney;
getinventorylist;
- if (@inventorylist_count == 100) goto L_TooMany;
+ if (@inventorylist_count == 100 && countitem(@SNAKE_SKIN) > 1) goto L_TooMany;
set zeny, zeny - @LEATHER_PATCH_PRICE;
delitem @SNAKE_SKIN, 1;
diff --git a/npc/009-2_Hurnscald/nicholas.txt b/npc/009-2_Hurnscald/nicholas.txt
index c7e1728c..349593db 100644
--- a/npc/009-2_Hurnscald/nicholas.txt
+++ b/npc/009-2_Hurnscald/nicholas.txt
@@ -244,8 +244,7 @@ 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;
+ // No inventory check needed, as infantry helms are removed, opening two slots
mes "[Nicholas]";
mes "\"Yes, it looks as if you have all that is needed!\"";
@@ -334,8 +333,7 @@ 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;
+ // No inventory check needed, as the short sword is removed, opening a slot
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/020-2_Nivalis/furquest.txt b/npc/020-2_Nivalis/furquest.txt
index 31538371..67a6eb10 100644
--- a/npc/020-2_Nivalis/furquest.txt
+++ b/npc/020-2_Nivalis/furquest.txt
@@ -309,8 +309,7 @@ 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;
+ // No inventory check needed, as boots are removed, opening a slot
set zeny, zeny-15000;
delitem 528, 1;
getitem 655, 1;