summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Petithory <vincent.petithory@gmail.com>2013-05-04 22:24:22 +0200
committerVincent Petithory <vincent.petithory@gmail.com>2013-05-04 22:58:59 +0200
commit262912f0c8545a82fe2fbf68699cc53d65384b1d (patch)
tree8a7fef2018d1ab4dc260bc3421ad5f5a2bfde9dd
parente364c115c4c26f6fbf366c75cae1546a337d48d3 (diff)
downloadserverdata-2013.05.12.tar.gz
serverdata-2013.05.12.tar.bz2
serverdata-2013.05.12.tar.xz
serverdata-2013.05.12.zip
Brodomir cave: on reward, skip calling getitem if there is no item to give.v2013.05.12
-rw-r--r--world/map/npc/009-6/brodomir.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/world/map/npc/009-6/brodomir.txt b/world/map/npc/009-6/brodomir.txt
index f3fc8399..881a7b4d 100644
--- a/world/map/npc/009-6/brodomir.txt
+++ b/world/map/npc/009-6/brodomir.txt
@@ -170,7 +170,7 @@ L_Warp:
L_Warpfail:
mapannounce "009-6.gat", "There are not enough players around to start!", 0;
- if ($@BRODOMIR_ITEM_AMOUNT == 0)
+ if ($@BRODOMIR_ITEM_AMOUNT == 0 || $@BRODOMIR_ITEM$ == "")
goto L_Cleanup;
if (attachrid($@BRODOMIR_SPONSOR) == 0)
goto L_SkipItemback;
@@ -199,6 +199,8 @@ onReward:
goto L_Dead;
message strcharinfo(0), "Congratulations you won!";
set Zeny, Zeny + ($@BRODOMIR_MONEY + 150 * $@BRODOMIR_PLAYERS);
+ if ($@BRODOMIR_ITEM_AMOUNT == 0 || $@BRODOMIR_ITEM$ == "")
+ goto L_SkipItem;
// we need this loop because for items that can't be stacked, getitem will stack them nevertheless
L_Getitem:
@@ -207,6 +209,7 @@ L_Getitem:
if ($@BRODOMIR_ITEM_AMOUNT > 0)
goto L_Getitem;
+L_SkipItem:
set $@BRODOMIR_ITEM$, "";
set $@BRODOMIR_SPONSOR, 0;
set $@BRODOMIR_MONEY, 0;