diff options
Diffstat (limited to 'npc')
| -rwxr-xr-x | npc/031-3/labyrinth.txt | 17 | ||||
| -rwxr-xr-x | npc/xmas/2010/golbanez.txt | 12 |
2 files changed, 19 insertions, 10 deletions
diff --git a/npc/031-3/labyrinth.txt b/npc/031-3/labyrinth.txt index e5b4fca9..4616891b 100755 --- a/npc/031-3/labyrinth.txt +++ b/npc/031-3/labyrinth.txt @@ -47,6 +47,11 @@ end; } +031-3.gat,148,150,0 script #ChristmasBarrier 127,1,1,{ + warp "031-3.gat", 128, 134; + end; +} + // Third Warp 031-3.gat,139,258,0 script #ChristmasBarrier 127,1,1,{ if (Maze < 2) goto L_Golbenez; @@ -438,15 +443,7 @@ L_Golbenez: end; } -031-3.gat,148,150,0 script #ChristmasBarrier 127,1,1,{ - if (Maze < 8) goto L_Golbenez; - warp "031-3.gat", 128, 134; -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."; - end; - end; -} // # second warp 031-3.gat,232,93,0 script #ChristmasBarrier 127,1,1,{ if (Maze < 8) goto L_Golbenez; @@ -475,7 +472,7 @@ L_Golbenez: 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."; + message strcharinfo(0), "Golbenez: Mortal, you are getting close to your objective but you still need to give me " +(5000000-Golbenez_Inn_Cost)+ " Gold Pieces to be able to find Santa."; end; } @@ -484,7 +481,7 @@ L_Golbenez: 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."; + message strcharinfo(0), "Golbenez: Mortal, you are getting close to your objective but you still need to give me " +(5000000-Golbenez_Inn_Cost)+ " Gold Pieces to be able to find Santa."; end; } 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; |