Add EmptyBottle return to player to some quests that consume water bottles.

3 files changed, 13 insertions, 5 deletions

diff --git a/world/map/npc/008-1/andra.txt b/world/map/npc/008-1/andra.txt
index 68796fd7..4d643fc6 100644
--- a/world/map/npc/008-1/andra.txt
+++ b/world/map/npc/008-1/andra.txt
@@ -54,6 +54,7 @@ L_Next4:
     mes "\"Great! Thank you for you help. If you have more items and want to help again, feel free to talk to me. We just have to be careful to not oversoak the soil with water.. but you don't need to worry, I will know when it is the right time to stop planting.";
     next;
     delitem "BottleOfWater", @water_amount;
+    getitem "EmptyBottle", @water_amount; // simply falls out if inv full.
     delitem "GrassSeed", @seeds_amount;
     set FLAGS, FLAGS | FLAG_ANDRA_HELPED;
     mes "Andra pours some water in a lot of different places and then throws some seeds to the sky. The wind carries some of them really far from her.";
@@ -118,6 +119,7 @@ L_Next5:
     if ($@spawned_plants >= $@MAX_GLOBAL_PLANTS) goto L_Gather;
     if (countitem("BottleOfWater") < @water_amount || countitem("GrassSeed") < @seeds_amount) goto L_NotEnough;
     delitem "BottleOfWater", @water_amount;
+    getitem "EmptyBottle", @water_amount; // simply falls out if inv full.
     delitem "GrassSeed", @seeds_amount;
     mes "Andra pours some water in a lot of different places and then throws the seeds to the sky. The wind carries some of them really far from her.";
     close2;
diff --git a/world/map/npc/018-2/caul.txt b/world/map/npc/018-2/caul.txt
index 66f99a6e..f8134105 100644
--- a/world/map/npc/018-2/caul.txt
+++ b/world/map/npc/018-2/caul.txt
@@ -784,6 +784,7 @@ L_brew_dempo_init:
     delitem "BottleOfWater", 1;
     delitem "Bone", 1;
     delitem "Lifestone", 1;
+    getitem "EmptyBottle", 1;
 
     set @finish_dempo, 0;
     // color can be either black or white at the beginning.
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;