Xmas fixes

3 files changed, 18 insertions, 53 deletions

diff --git a/npc/031-3/labyrinth.txt b/npc/031-3/labyrinth.txt
index 54877bf9..e5b4fca9 100755
--- a/npc/031-3/labyrinth.txt
+++ b/npc/031-3/labyrinth.txt
@@ -12,67 +12,39 @@
 //#    
 //#################################################################################
 
-// If Donated > 500k < 1M - Maze=1
 
 031-3.gat,205,264,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 1 ) goto L_Golbenez;
     warp "031-3.gat", 149, 261;
     end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
 }
 
 031-3.gat,149,259,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 1 ) goto L_Golbenez;
     warp "031-3.gat", 205, 266;
     end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
 }
 
 // If Donated > 1M < 1.5M - Maze=2
 
 031-3.gat,225,282,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 2) goto L_Golbenez;
     warp "031-3.gat", 274, 299;
     end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(1000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
 }
 
 031-3.gat,274,300,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 2) goto L_Golbenez;
     warp "031-3.gat", 225, 283;
     end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(1000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
 }
 
 // Second Warp
 
 031-3.gat,283,271,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 2) goto L_Golbenez;
     warp "031-3.gat", 269, 244;
     end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(1000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
 }
 
 031-3.gat,269,245,0	script	#ChristmasBarrier	127,1,1,{
-    if (Maze < 2) goto L_Golbenez;
     warp "031-3.gat", 283, 272;
     end;
-L_Golbenez:
-    message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(1000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
-    end;
-
 }
 
 // Third Warp
@@ -101,7 +73,7 @@ L_Golbenez:
 // First Warp
 031-3.gat,142,301,0	script	#ChristmasBarrier	127,1,1,{
     if (Maze < 3) goto L_Golbenez;
-    warp "031-3.gat", 97, 299;
+    warp "031-3.gat", 97, 298;
     end;
 L_Golbenez:
     message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(1500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
@@ -111,7 +83,7 @@ L_Golbenez:
 
 031-3.gat,97,301,0	script	#ChristmasBarrier	127,1,1,{
     if (Maze < 3) goto L_Golbenez;
-    warp "031-3.gat", 142, 299;
+    warp "031-3.gat", 142, 298;
     end;
 L_Golbenez:
     message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(1500000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
@@ -188,7 +160,7 @@ L_Golbenez:
 // First Warp
 031-3.gat,94,254,0	script	#ChristmasBarrier	127,1,1,{
     if (Maze < 4) goto L_Golbenez;
-    warp "031-3.gat", 54, 252;
+    warp "031-3.gat", 54, 253;
     end;
 L_Golbenez:
     message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
@@ -198,7 +170,7 @@ L_Golbenez:
 
 031-3.gat,54,250,0	script	#ChristmasBarrier	127,1,1,{
     if (Maze < 4) goto L_Golbenez;
-    warp "031-3.gat", 94, 256;
+    warp "031-3.gat", 94, 257;
     end;
 L_Golbenez:
     message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(2000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
@@ -357,7 +329,7 @@ L_Golbenez:
 // first warp
 031-3.gat,34,25,0	script	#ChristmasBarrier	127,1,1,{
     if (Maze < 6) goto L_Golbenez;
-    warp "031-3.gat", 281, 24;
+    warp "031-3.gat", 281, 25;
     end;
 L_Golbenez:
     message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(3000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
@@ -366,7 +338,7 @@ L_Golbenez:
 }
 031-3.gat,281,22,0	script	#ChristmasBarrier	127,1,1,{
     if (Maze < 6) goto L_Golbenez;
-    warp "031-3.gat", 34, 27;
+    warp "031-3.gat", 34, 28;
     end;
 L_Golbenez:
     message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(3000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
@@ -478,7 +450,7 @@ L_Golbenez:
 // # second warp
 031-3.gat,232,93,0	script	#ChristmasBarrier	127,1,1,{
     if (Maze < 8) goto L_Golbenez;
-    warp "031-3.gat", 200, 48;
+    warp "031-3.gat", 200, 47;
     end;
 L_Golbenez:
     message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(4000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
@@ -487,7 +459,7 @@ L_Golbenez:
 }
 031-3.gat,200,50,0	script	#ChristmasBarrier	127,1,1,{
     if (Maze < 8) goto L_Golbenez;
-    warp "031-3.gat", 232, 95;
+    warp "031-3.gat", 232, 90;
     end;
 L_Golbenez:
     message strcharinfo(0), "Golbenez: Mortal, you still need to give me the equivalent to " +(4000000-Golbenez_Inn_Cost)+ " Gold Pieces to go through this opening.";	
@@ -500,7 +472,7 @@ L_Golbenez:
 
 031-3.gat,120,81,0	script	#ChristmasBarrier	127,1,1,{
     if (Maze < 9) goto L_Golbenez;
-    warp "031-3.gat", 46, 22;
+    warp "031-3.gat", 46, 27;
     end;
 L_Golbenez:
     message strcharinfo(0), "Golbenez: Mortal, you are getting close to your objective but you still need to give me " +(4000000-Golbenez_Inn_Cost)+ " Gold Pieces to be able to find Santa.";	
@@ -509,7 +481,7 @@ L_Golbenez:
 }
 031-3.gat,46,24,0	script	#ChristmasBarrier	127,1,1,{
     if (Maze < 9) goto L_Golbenez;
-    warp "031-3.gat", 120, 80;
+    warp "031-3.gat", 120, 79;
     end;
 L_Golbenez:
     message strcharinfo(0), "Golbenez: Mortal, you are getting close to your objective but you still need to give me " +(4000000-Golbenez_Inn_Cost)+ " Gold Pieces to be able to find Santa.";	
diff --git a/npc/xmas/2010/golbanez.txt b/npc/xmas/2010/golbanez.txt
index f18c916e..35b903dc 100755
--- a/npc/xmas/2010/golbanez.txt
+++ b/npc/xmas/2010/golbanez.txt
@@ -81,11 +81,11 @@ _end:
 	mes "[Golbenez]";
 	mes "\"Mortal!  I am Golbenez!  I have broken through the barriers of space and time!\"";
 	next;
-	mes "\"Well to let you know, I am taking Santa Claus and rudolph and the fellow rendiers as hostages.\"";
+	mes "\"Well to let you know, I have taken Santa Claus hostage.\"";
 	next;
-	mes "\"This sounds hard to you maybe... But I need lots of stuff to build the way to the leisure place.";
+	mes "\"This may sound hard to you... But I need lots of stuff for building the way to place of leisure.";
 	next;
-	mes "\"So if you want to have gifts at christmas... we should make a deal: Bring me money.";
+	mes "\"So if you want to have gifts at Christmas... we should make a deal: Bring me money.";
 	next;
 	menu
 		"But I am broke!",L_Broke,
@@ -251,7 +251,7 @@ Glb_nvm:
 
 Glb_whypresents:
 	mes "[Golbenez]";
-	mes "\"The presents contain some sort of spiritual attachment that aids in the creation of dimensional connections to this plane of existence. The White ones contain the stronger spiritual attachment, followed by the Yellow and then green, blue and Purple present boxes. But I am not interested in the last three kinds.\"";
+	mes "\"The presents contain some sort of spiritual attachment that aids in the creation of dimensional connections to this plane of existence. The white ones contain the stronger spiritual attachment, followed by the yellow and then green, blue and purple present boxes. But I am not interested in the last three kinds.\"";
 	close;
 
 Glb_otheritems:
@@ -261,12 +261,6 @@ Glb_otheritems:
 	mes "\"I will not discuss any further, mortal!\"";
 	close;
 
-Glb_Inn_Toolate:
-	mes "[Golbenez]";
-	mes "\"Stop asking me about that old man... It is too late! I already have what I need...\"";
-	close;	
-
-
 
 L_Needmore:
 	mes "[Golbenez]";
@@ -305,7 +299,7 @@ Glb_Inn_Enough:
 	next;
 	mes "\"I have collected enough for now. You are now able to reach Santa.\"";
 	next;
-	mes "\"This will definitely help me with the leisure place.\"";
+	mes "\"This will definitely help me finish the place of leisure.\"";
 	next;
 	mes "\"Have fun trying to save Santa from that cold maze!\"";
 	close;
diff --git a/npc/xmas/2010/santa.txt b/npc/xmas/2010/santa.txt
index 4807d47b..8f58dff1 100755
--- a/npc/xmas/2010/santa.txt
+++ b/npc/xmas/2010/santa.txt
@@ -33,7 +33,7 @@ L_start:
                 "Im " + strcharinfo(0) + " and I am here to save you from Golbenez.",-;
         mes "\"I cant believe it... are you really " +strcharinfo(0)+ "? I remember all the comments that... 'Thing' was making about building his way to a 'Leisure Place' and how your donations would really help him.\"";
         next;
-        mes "\"What is his name again? Erh... Golbinos? Galvanis? Ho-hum... All I know is that it was keeping me as hostage in this cold labyrinth. And you proved yourself a good " +@gender$+ " by helping me with all those donations!\"";
+        mes "\"What is his name again? Erh... Golbinos? Galvanis? Ho-hum... All I know is that it was keeping me hostage in this cold labyrinth. And you proved yourself a good " +@gender$+ " by helping me with all those donations!\"";
         next;
         if (gettime(6) != 12 || gettime(5) >= 25) goto L_Skip_Dialogue;
         mes "\"Well, I am really late! In a few hours I have to start my usual present giving routine... But not before I give you a special gift for all you did.\"";
@@ -45,10 +45,9 @@ L_Skip_Dialogue:
 L_Calculate_Prizes:
         getinventorylist;
         if (@inventorylist_count == 100) goto L_full;        
-        setarray @prizes$[0], "Mouboo Head", "Mush Hat", "Shroom Hat", "Face Mask", "Bunny Ears", "Christmas Elf Hat", "Funky Hat", "Top Hat", "Eyepatch";
+        setarray @prizes[0], 1216, 629, 630, 634, 1214, 633, 628, 627, 621;
         mes "\"You are so generous! I believe I can give you one of the hats from this bag. I know you like these silly hats. Yes, Santa knows this kind of thing... Ho-Ho-Ho! Put your hand here and pick one hat... No, you cant look, it MUST be a surprise...\"";
-	
-        getitem @prizes$[rand(8)], 1;
+        getitem @prizes[rand(8)], 1;
         set Xmas2010, 2;
         set Golbenez_Inn_Cost, 0;
         next;