Christmas Event: some fixes and improvements based on feedback of the playersv2011.12.12

1 files changed, 15 insertions, 2 deletions

diff --git a/world/map/npc/xmas/2011/badguy.txt b/world/map/npc/xmas/2011/badguy.txt
index 5356e774..8b25fdfb 100644
--- a/world/map/npc/xmas/2011/badguy.txt
+++ b/world/map/npc/xmas/2011/badguy.txt
@@ -96,7 +96,7 @@ L_NoBedding:
     if (!(xmas11 & $@xmas11_Decoration) || (xmas11 & $@xmas11_DecorationDone))
         goto L_NoGlitter;
     set @choice_idx[@choices_nr], @C_glitter;
-    set @choice$[@choices_nr], "They want Diamond and Ruby Powder for decoration.";
+    set @choice$[@choices_nr], "They want Topaz and Ruby Powder for decoration.";
     set @choices_nr, @choices_nr + 1;
 
 L_NoGlitter:
@@ -239,6 +239,9 @@ L_PlushMoubooWrapping:
         "I don't think this is a good idea.",L_Close;
     if ((countitem("CottonShirt") < 1) || (countitem("OpenPresentBox") < 1) || (countitem("PlushMouboo") < 1))
         goto L_NoItem;
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_Full_Inv;
     delitem "CottonShirt", 1;
     delitem "OpenPresentBox", 1;
     delitem "PlushMouboo", 1;
@@ -261,6 +264,9 @@ L_StickReinbooWrapping:
         "I think the Stick Reinboo is nice!",L_Close;
     if ((countitem("RawLog") < 1) || (countitem("OpenPresentBox") < 1) || (countitem("StickReinboo") < 1))
         goto L_NoItem;
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_Full_Inv;
     delitem "RawLog", 1;
     delitem "OpenPresentBox", 1;
     delitem "StickReinboo", 1;
@@ -283,6 +289,9 @@ L_BallWrapping:
         "Come on, now you're getting really implausible.",L_Close;
     if ((countitem("Coal") < 1) || (countitem("OpenPresentBox") < 1) || (countitem("LeatherBall") < 1))
         goto L_NoItem;
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_Full_Inv;
     delitem "Coal", 1;
     delitem "OpenPresentBox", 1;
     delitem "LeatherBall", 1;
@@ -306,6 +315,9 @@ L_DollWrapping:
         "A Mouboo Figurine is lame.",L_Close;
     if ((countitem("MoubooFigurine") < 1) || (countitem("OpenPresentBox") < 1) || (countitem("Doll") < 1))
         goto L_NoItem;
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_Full_Inv;
     delitem "MoubooFigurine", 1;
     delitem "OpenPresentBox", 1;
     delitem "Doll", 1;
@@ -404,7 +416,7 @@ L_NoItem:
 
 L_Full_Inv:
     mes "[Balthasar]";
-    mes "\"Oh, you have a lot of stuff with you, yes many many things. I'm going to give you some ... allowance for your effort.";
+    mes "\"Oh, you have a lot of stuff with you, yes many many things.";
     mes "Come back with less things in your backpack.\"";
     goto L_Close;
 
@@ -439,5 +451,6 @@ L_Close:
     set @candy_amount, 0;
     set @sabotagepoints, 0;
     set @helppoints, 0;
+    set @inventorylist_count, 0;
     close;
 }