summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
authoro11c <b.r.longbons@gmail.com>2013-10-01 11:59:36 -0700
committero11c <b.r.longbons@gmail.com>2013-10-01 11:59:36 -0700
commitcace5caccdd3a4cdf245adeb6f20145db2ad7707 (patch)
tree5df022f73d43e3efdf738f1ab0d5c76dcec36aa7 /world
parent410fa54908f4a4de6800a12de370a46ebb35629a (diff)
parent43e8ac00eb23c62a5f97b7a45c94831426b5ba06 (diff)
downloadserverdata-cace5caccdd3a4cdf245adeb6f20145db2ad7707.tar.gz
serverdata-cace5caccdd3a4cdf245adeb6f20145db2ad7707.tar.bz2
serverdata-cace5caccdd3a4cdf245adeb6f20145db2ad7707.tar.xz
serverdata-cace5caccdd3a4cdf245adeb6f20145db2ad7707.zip
Merge pull request #35 from tux9th/master
Fixing issues in NPC Scripts:
Diffstat (limited to 'world')
-rw-r--r--world/map/npc/021-2/kylian.txt4
-rw-r--r--world/map/npc/xmas/2012/helpersSaddleRug.txt3
-rw-r--r--world/map/npc/xmas/2012/helpersTalisman.txt1
-rw-r--r--world/map/npc/xmas/2012/santa.txt1
4 files changed, 8 insertions, 1 deletions
diff --git a/world/map/npc/021-2/kylian.txt b/world/map/npc/021-2/kylian.txt
index c228acba..5406f6c7 100644
--- a/world/map/npc/021-2/kylian.txt
+++ b/world/map/npc/021-2/kylian.txt
@@ -233,13 +233,15 @@ L_DesertHat: // @state == 8
mes "[Kylian]";
mes "\"That was an interesting night. Thanks for your suggestion to visit the casino.\"";
next;
+ getinventorylist;
mes "\"You helped me a lot, so I bought a souvenir for you while I was shopping.\"";
- if ((checkweight("DesertHat", count) == 0) || (@inventorylist_count == 100))
+ if ((checkweight("DesertHat", 1) == 0) || (@inventorylist_count == 100))
goto L_Inventory;
getitem "DesertHat", 1;
set @state, 9;
callsub S_Update_Mask;
next;
+
L_Done:
mes "[Kylian]";
mes "\"I hope to get a positive response about my shop license soon. I might have more things to do for you then, if you're interested.";
diff --git a/world/map/npc/xmas/2012/helpersSaddleRug.txt b/world/map/npc/xmas/2012/helpersSaddleRug.txt
index 1673e136..fb3db9d4 100644
--- a/world/map/npc/xmas/2012/helpersSaddleRug.txt
+++ b/world/map/npc/xmas/2012/helpersSaddleRug.txt
@@ -34,6 +34,7 @@
if (countitem("CottonCloth") < $@xmas2012_cotton_cloth_amount)
goto L_NoItem;
+ getinventorylist;
if ((checkweight("WhiteBlanket", 1) == 0) || (@inventorylist_count == 100))
goto L_Inventory;
delitem "CottonCloth", $@xmas2012_cotton_cloth_amount;
@@ -122,6 +123,7 @@ L_Close:
if ((countitem("WhiteBlanket") < 1) || (countitem("WhiteFur") < $@xmas2012_fluffy_fur_amount))
goto L_NoItem;
+ getinventorylist;
if ((checkweight("WhiteSaddleRug", 1) == 0) || (@inventorylist_count == 100))
goto L_Inventory;
delitem "WhiteFur", $@xmas2012_fluffy_fur_amount;
@@ -221,6 +223,7 @@ L_Close:
if ((countitem("RedDye") < $@xmas2012_red_dye_amount) || (countitem("WhiteSaddleRug") < 1))
goto L_NoItem;
+ getinventorylist;
if ((checkweight("RedSaddleRug", 1) == 0) || (@inventorylist_count == 100))
goto L_Inventory;
delitem "RedDye", $@xmas2012_red_dye_amount;
diff --git a/world/map/npc/xmas/2012/helpersTalisman.txt b/world/map/npc/xmas/2012/helpersTalisman.txt
index 8c69dda3..09d81d4c 100644
--- a/world/map/npc/xmas/2012/helpersTalisman.txt
+++ b/world/map/npc/xmas/2012/helpersTalisman.txt
@@ -120,6 +120,7 @@ L_Close:
"Ok, I'll get that.", L_Close;
if (countitem("RawLog") < $@xmas2012_raw_log_amount)
goto L_NoItem;
+ getinventorylist;
if ((checkweight("RawTalisman", 1) == 0) || (@inventorylist_count == 100))
goto L_Inventory;
delitem "RawLog", $@xmas2012_raw_log_amount;
diff --git a/world/map/npc/xmas/2012/santa.txt b/world/map/npc/xmas/2012/santa.txt
index 203e00d5..d79dff86 100644
--- a/world/map/npc/xmas/2012/santa.txt
+++ b/world/map/npc/xmas/2012/santa.txt
@@ -46,6 +46,7 @@ L_Talisman:
"I'll go and get them.", L_Close;
if ((countitem("BatWing") < $@xmas2012_bat_wing_amount) || (countitem("RawTalisman") < 1))
goto L_NoItem;
+ getinventorylist;
if ((checkweight("FlightTalisman", 1) == 0) || (@inventorylist_count == 100))
goto L_Inventory;
misceffect sfx_magic_transmute;