summaryrefslogtreecommitdiff
path: root/world/map/npc/030-2
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/030-2')
-rw-r--r--world/map/npc/030-2/wrapping_paper_helper.txt15
1 files changed, 10 insertions, 5 deletions
diff --git a/world/map/npc/030-2/wrapping_paper_helper.txt b/world/map/npc/030-2/wrapping_paper_helper.txt
index 3ac10b12..4571d5e6 100644
--- a/world/map/npc/030-2/wrapping_paper_helper.txt
+++ b/world/map/npc/030-2/wrapping_paper_helper.txt
@@ -48,7 +48,7 @@ L_Again:
L_White:
getinventorylist;
- if (@inventorylist_count == 100 || (checkweight("WhiteWrap", $@xmas_wrap_reward) == 0))
+ if (@inventorylist_count > (100-2) || (checkweight("WhiteWrap", $@xmas_wrap_reward) == 0))
goto L_FullInv;
if ((countitem("ReedBundle") < $@xmas_reed_amount) || (countitem("BottleOfWater") < $@xmas_water_amount) || (countitem("PileOfAsh") < $@xmas_poa_amount))
goto L_NoItems;
@@ -56,13 +56,14 @@ getinventorylist;
delitem "BottleOfWater", $@xmas_water_amount;
delitem "PileOfAsh", $@xmas_poa_amount;
getitem "WhiteWrap", $@xmas_wrap_reward;
+ getitem "EmptyBottle", $@xmas_water_amount;
mes "[Reino]";
mes "\"This one is classical.\"";
goto L_MadePaper;
L_Yellow:
getinventorylist;
- if (@inventorylist_count == 100 || (checkweight("YellowWrap", $@xmas_wrap_reward) == 0))
+ if (@inventorylist_count > (100-2) || (checkweight("YellowWrap", $@xmas_wrap_reward) == 0))
goto L_FullInv;
if ((countitem("ReedBundle") < $@xmas_reed_amount) || (countitem("BottleOfWater") < $@xmas_water_amount) || (countitem("YellowDye") < $@xmas_wrap_yellow_amount))
goto L_NoItems;
@@ -70,13 +71,14 @@ L_Yellow:
delitem "BottleOfWater", $@xmas_water_amount;
delitem "YellowDye", $@xmas_wrap_yellow_amount;
getitem "YellowWrap", $@xmas_wrap_reward;
+ getitem "EmptyBottle", $@xmas_water_amount;
mes "[Reino]";
mes "\"Right, bright paper brings good vibes.\"";
goto L_MadePaper;
L_Blue:
getinventorylist;
- if (@inventorylist_count == 100 || (checkweight("BlueWrap", $@xmas_wrap_reward) == 0))
+ if (@inventorylist_count > (100-2) || (checkweight("BlueWrap", $@xmas_wrap_reward) == 0))
goto L_FullInv;
if ((countitem("ReedBundle") < $@xmas_reed_amount) || (countitem("BottleOfWater") < $@xmas_water_amount) || (countitem("LightBlueDye") < $@xmas_wrap_ltblue_amount))
goto L_NoItems;
@@ -84,13 +86,14 @@ L_Blue:
delitem "BottleOfWater", $@xmas_water_amount;
delitem "LightBlueDye", $@xmas_wrap_ltblue_amount;
getitem "BlueWrap", $@xmas_wrap_reward;
+ getitem "EmptyBottle", $@xmas_water_amount;
mes "[Reino]";
mes "\"Plain and simple. Here.\"";
goto L_MadePaper;
L_Purple:
getinventorylist;
- if (@inventorylist_count == 100 || (checkweight("PurpleWrap", $@xmas_wrap_reward) == 0))
+ if (@inventorylist_count > (100-2) || (checkweight("PurpleWrap", $@xmas_wrap_reward) == 0))
goto L_FullInv;
if ((countitem("ReedBundle") < $@xmas_reed_amount) || (countitem("BottleOfWater") < $@xmas_water_amount) || (countitem("PurpleDye") < $@xmas_wrap_purple_amount))
goto L_NoItems;
@@ -98,13 +101,14 @@ L_Purple:
delitem "BottleOfWater", $@xmas_water_amount;
delitem "PurpleDye", $@xmas_wrap_purple_amount;
getitem "PurpleWrap", $@xmas_wrap_reward;
+ getitem "EmptyBottle", $@xmas_water_amount;
mes "[Reino]";
mes "\"Mh, personally I don't like it that much, but here you go.\"";
goto L_MadePaper;
L_Green:
getinventorylist;
- if (@inventorylist_count == 100 || (checkweight("GreenWrap", $@xmas_wrap_reward) == 0))
+ if (@inventorylist_count > (100-2) || (checkweight("GreenWrap", $@xmas_wrap_reward) == 0))
goto L_FullInv;
if ((countitem("ReedBundle") < $@xmas_reed_amount) || (countitem("BottleOfWater") < $@xmas_water_amount) || (countitem("GreenDye") < $@xmas_wrap_green_amount))
goto L_NoItems;
@@ -112,6 +116,7 @@ L_Green:
delitem "BottleOfWater", $@xmas_water_amount;
delitem "GreenDye", $@xmas_wrap_green_amount;
getitem "GreenWrap", $@xmas_wrap_reward;
+ getitem "EmptyBottle", $@xmas_water_amount;
mes "[Reino]";
mes "\"Yeah, this is really Christmas-styled.\"";
goto L_MadePaper;