From 940145a165508c791b60bc3bb9a768976900c685 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Wed, 22 Dec 2010 11:58:34 +0100 Subject: 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.) --- db/mob_db.txt | 4 ++-- npc/031-3/labyrinth.txt | 17 +++++++---------- npc/xmas/2010/golbanez.txt | 12 ++++++++++++ 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/db/mob_db.txt b/db/mob_db.txt index 78140b54..eb29e711 100644 --- a/db/mob_db.txt +++ b/db/mob_db.txt @@ -13,7 +13,7 @@ 1013, EvilMushroom, Evil Mushroom, 110, 650, 0, 0, 110, 1, 65, 80, 4, 6, 16, 12, 10, 10, 35, 10, 1, 1, 1, 3, 22, 137, 800, 1800, 672, 480, 535, 500, 540, 10, 534, 100, 566, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 1, 60 1014, PinkFlower, Pink Flower, 115, 700, 0, 0, 110, 2, 70, 75, 0, 5, 16, 12, 20, 20, 20, 50, 2, 2, 1, 3, 22, 128, 800, 800, 672, 480, 535, 100, 540, 10, 1199, 100, 526, 400, 565, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 50 1015, SantaSlime, Santa Slime, 120, 750, 0, 0, 0, 1, 75, 80, 2, 7, 1, 20, 1, 0, 30, 30, 1, 1, 1, 0, 21, 161, 1500, 1872, 672, 480, 512, 800, 513, 700, 514, 600, 519, 500, 527, 400, 538, 500, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 1, 10 -1016, RudolphSlime, Rudolph Slime, 50, 350, 0, 0, 16, 1, 30, 35, 10, 7, 1, 20, 1, 0, 30, 30, 1, 1, 1, 0, 21, 131, 1000, 1872, 672, 480, 504, 800, 506, 500, 508, 200, 509, 300, 510, 600, 515, 800, 516, 500, 4021, 400, 0, 0, 0, 0, , , , , , , 2, 30 +1016, RudolphSlime, Rudolph Slime, 50, 350, 0, 0, 16, 1, 30, 35, 10, 7, 1, 20, 1, 0, 30, 30, 1, 1, 1, 0, 21, 131, 1000, 1872, 672, 480, 504, 800, 506, 500, 508, 200, 509, 300, 510, 600, 515, 800, 516, 500, 0, 400, 0, 0, 0, 0, , , , , , , 2, 30 1017, Bat, Bat, 20, 150, 0, 0, 2, 1, 5, 25, 0, 5, 1, 1, 1, 0, 20, 25, 1, 1, 1, 3, 24, 129, 800, 1872, 672, 480, 505, 800, 501, 150, 518, 400, 533, 150, 521, 70, 522, 1, 753, 3000, 754, 2000, 0, 0, 0, 0, , , , , , , 2, 40 1018, Pinkie, Pinkie, 30, 500, 0, 0, 3, 2, 7, 15, 0, 5, 1, 1, 1, 0, 20, 25, 2, 2, 1, 3, 20, 129, 800, 1872, 672, 480, 614, 800, 751, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 3, 50 1019, SpikyMushroom, Spiky Mushroom, 30, 300, 0, 0, 4, 1, 10, 13, 0, 5, 1, 1, 1, 0, 10, 10, 1, 1, 1, 3, 20, 129, 800, 1872, 672, 480, 567, 800, 501, 150, 518, 50, 613, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 3, 40 @@ -69,4 +69,4 @@ 1069, Scythe, Scythe, 40, 3000, 0, 0, 500, 1, 200, 350, 30, 10, 100, 250, 1, 1, 150, 90, 1, 50, 1, 0, 40, 133, 220, 700, 672, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0 1070, BallLightning, Ball Lightning, 40, 50, 0, 0, 10, 1, 5, 10, 40, 65, 1, 200, 1, 1, 1, 1, 1, 50, 1, 0, 47, 133, 110, 1500, 672, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0 1071, IceElement, Ice Element, 20, 1000, 0, 0, 200, 2, 60, 60, 0, 20, 15, 25, 15, 15, 20, 50, 1, 1, 1, 0, 41, 135, 330, 740, 672, 400, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 20 -1072, Yeti, Yeti, 35, 3000, 0, 0, 300, 2, 50, 150, 40, 0, 70, 5, 20, 15, 5, 15, 1, 1, 1, 0, 61, 135, 400, 1500, 672, 900, 4021, 800, 4021, 800, 4021, 800, 4021, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30 +1072, Yeti, Yeti, 35, 3000, 0, 0, 300, 2, 50, 150, 40, 0, 70, 5, 20, 15, 5, 15, 1, 1, 1, 0, 61, 135, 400, 1500, 672, 900, 0, 800, 0, 800, 0, 800, 0, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30 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; -- cgit v1.2.3-70-g09d2 From 2c1627f6bb0d5771957666bf5357d052da68201e Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Wed, 22 Dec 2010 14:12:58 +0100 Subject: fixing santas check for full inventory --- npc/xmas/2010/santa.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npc/xmas/2010/santa.txt b/npc/xmas/2010/santa.txt index 8f58dff1..3ef9257d 100755 --- a/npc/xmas/2010/santa.txt +++ b/npc/xmas/2010/santa.txt @@ -79,7 +79,7 @@ L_Stocking_Prize: message strcharinfo(0), "You suddenly get dizzy... Something is not right with you. Maybe you shouldnt have put the Red Stocking so close to your face!"; end; -L_Full: +L_full: mes "[Santa Claus]"; mes "\"Your backpack seems to be full. You should get rid of some unused stuff before you get my gifts, or maybe try one super resistant red bag, my personal favorite! Hoh-hoh!\""; close; -- cgit v1.2.3-70-g09d2 From b86f1eacbcf424d7b0a626130be1e81c082b1186 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Thu, 23 Dec 2010 23:39:42 +0100 Subject: the new wlk files of 031-3 --- data/031-3.wlk | Bin 102404 -> 102404 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/031-3.wlk b/data/031-3.wlk index 8d243080..f2dcc2dd 100644 Binary files a/data/031-3.wlk and b/data/031-3.wlk differ -- cgit v1.2.3-70-g09d2