summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2010-12-22 11:58:34 +0100
committerWombat <hpwombat@yahoo.com>2010-12-22 12:14:26 -0500
commitb400f51483a5f50b8920b3053fdd711ba25f3122 (patch)
treed3d3068ace56e271351434fe4743ed55fca0049e /npc
parentd5c4679e208aa29d4ff7344a4253f3ec099fc79c (diff)
downloadserverdata-b400f51483a5f50b8920b3053fdd711ba25f3122.tar.gz
serverdata-b400f51483a5f50b8920b3053fdd711ba25f3122.tar.bz2
serverdata-b400f51483a5f50b8920b3053fdd711ba25f3122.tar.xz
serverdata-b400f51483a5f50b8920b3053fdd711ba25f3122.zip
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.)
Diffstat (limited to 'npc')
-rwxr-xr-xnpc/031-3/labyrinth.txt17
-rwxr-xr-xnpc/xmas/2010/golbanez.txt12
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;