Removing yellow present boxes as regular drop in mob_db. Fixing presentcounter in Golbanez. Corrected the messages in 031-3 labyrinth. (Hopefully all that are wrong.)

1 files changed, 12 insertions, 0 deletions

diff --git a/npc/xmas/2010/golbanez.txt b/npc/xmas/2010/golbanez.txt
index fe9ac50d..0b145ca9 100755
--- a/npc/xmas/2010/golbanez.txt
+++ b/npc/xmas/2010/golbanez.txt
@@ -145,6 +145,12 @@ L_Menu:
 	if (@menuitem[@menu] == 4022) goto L_Check_White;
 
 L_Check_Yellow:
+	// If you have already donated more than you have collected in the right way (Via script),
+	// then whatever you have donated so far will remain, but if you have some spare boxes,
+	// it will be not possible to give it.
+	if (Count_Yellow > Yellow) set Yellow, Count_Yellow;
+	if (Count_Yellow + @count > Yellow) goto L_Fail_Box;
+
 	if (Count_Yellow >= 40) goto L_Done_Yellow;
 	if (@count > Yellow) goto L_Fail_Box;
 	delitem @menuitem[@menu], @count;
@@ -153,6 +159,12 @@ L_Check_Yellow:
 	goto Golbenez_pay_presents;
 
 L_Check_White:
+	// If you have already donated more than you have collected in the right way (Via script),
+	// then whatever you have donated so far will remain, but if you have some spare boxes,
+	// it will be not possible to give it.
+	if (Count_White > White) set White, Count_White;
+	if (Count_White + @count > White) goto L_Fail_Box;
+
 	if (Count_White >= 30) goto L_Done_White;
 	if (@count > White) goto L_Fail_Box;
 	delitem @menuitem[@menu], @count;