diff options
| -rwxr-xr-x | conf/map_athena.conf | 11 | ||||
| -rw-r--r-- | db/mob_db.txt | 11 | ||||
| -rw-r--r-- | npc/tulimshar-casino/casino.txt | 2 | ||||
| -rw-r--r-- | npc/xmas2007/pre-xmas.txt | 4 |
4 files changed, 18 insertions, 10 deletions
diff --git a/conf/map_athena.conf b/conf/map_athena.conf index 77580989..a5eb905f 100755 --- a/conf/map_athena.conf +++ b/conf/map_athena.conf @@ -109,7 +109,7 @@ npc: npc/cave2/passages.txt // Xmas snow map 10-1 npc: npc/xmas/monsters.txt npc: npc/xmas/passages.txt -npc: npc/xmas/santa.txt +//npc: npc/xmas/santa.txt npc: npc/xmas/snowman.txt npc: npc/xmas/taro.txt @@ -174,4 +174,11 @@ npc: npc/woodland-village/scythequest.txt //npc: npc/xmas/xmas17.txt //npc: npc/xmas/xmas18.txt //npc: npc/xmas/xmas19.txt -//npc: npc/xmas/xmas20.txt
\ No newline at end of file +//npc: npc/xmas/xmas20.txt + +// Halloween 2007 +//npc: npc/halloween/2007/monsters.txt +//npc: npc/halloween/2007/summon.txt + +// Christmas 2007 +npc: npc/xmas2007/pre-xmas.txt
\ No newline at end of file diff --git a/db/mob_db.txt b/db/mob_db.txt index cb33424f..60b9b155 100644 --- a/db/mob_db.txt +++ b/db/mob_db.txt @@ -12,13 +12,14 @@ 1012, Spider, Spider, 140, 800, 0, 350, 280, 1, 80, 85, 4, 6, 20, 20, 10, 10, 35, 10, 1, 1, 1, 0, 25, 175, 1000, 1500, 672, 480, 537, 500, 535, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , 1013, EvilMushroom, Evil Mushroom, 110, 650, 0, 275, 110, 1, 65, 70, 4, 6, 20, 20, 10, 10, 35, 10, 1, 1, 1, 3, 25, 137, 800, 1800, 672, 480, 535, 500, 540, 5, 534, 100, 566, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , 1014, SleepFlower, Sleep Flower, 120, 700, 0, 300, 110, 1, 70, 75, 0, 5, 20, 20, 20, 20, 20, 20, 1, 1, 1, 3, 25, 128, 800, 800, 672, 480, 535, 100, 540, 5, 1199, 100, 526, 400, 565, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , -1015, SantaSlime, Santa Slime, 130, 750, 0, 325, 0, 1, 75, 80, 2, 7, 1, 30, 1, 0, 30, 30, 1, 1, 1, 0, 20, 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, , , , , , -1016, RudolphSlime, Rudolph Slime, 50, 350, 0, 100, 16, 1, 30, 35, 2, 7, 1, 30, 1, 0, 30, 30, 1, 1, 1, 0, 20, 131, 1000, 1872, 672, 480, 504, 800, 506, 500, 508, 200, 509, 300, 510, 600, 515, 800, 516, 500, 0, 0, 0, 0, 0, 0, , , , , , +1015, SantaSlime, Santa Slime, 130, 750, 0, 325, 0, 1, 75, 80, 2, 7, 1, 30, 1, 0, 30, 30, 1, 1, 1, 0, 20, 161, 1500, 1872, 672, 480, 512, 800, 513, 700, 514, 600, 519, 500, 527, 2000, 538, 500, 0, 0, 635, 2000, 0, 0, 0, 0, , , , , , +1016, RudolphSlime, Rudolph Slime, 50, 350, 0, 100, 16, 1, 30, 35, 2, 7, 1, 30, 1, 0, 30, 30, 1, 1, 1, 0, 20, 131, 1000, 1872, 672, 480, 504, 800, 506, 500, 508, 200, 509, 300, 510, 600, 515, 800, 516, 500, 635, 2000, 0, 0, 0, 0, , , , , , 1017, Bat, Bat, 20, 150, 0, 45, 2, 1, 7, 10, 0, 5, 1, 1, 1, 0, 20, 25, 1, 1, 1, 3, 21, 129, 800, 1872, 672, 480, 505, 800, 501, 150, 518, 400, 533, 150, 521, 70, 522, 1, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , 1018, Violet, Violet, 30, 500, 0, 55, 3, 1, 7, 10, 0, 5, 1, 1, 1, 0, 20, 25, 1, 1, 1, 3, 21, 129, 800, 1872, 672, 480, 614, 800, 0, 150, 0, 400, 0, 150, 0, 70, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , 1019, Shroom, Shroom, 30, 300, 0, 60, 4, 1, 10, 13, 0, 5, 1, 1, 1, 0, 10, 10, 1, 1, 1, 3, 21, 129, 800, 1872, 672, 480, 567, 800, 501, 150, 518, 50, 613, 150, 0, 70, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , -1020, Fluffy, Fluffy, 30, 500, 0, 50, 3, 1, 10, 12, 0, 5, 1, 1, 1, 0, 20, 25, 1, 1, 1, 3, 21, 129, 800, 1872, 672, 480, 611, 800, 527, 150, 535, 400, 0, 150, 0, 70, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , +1020, Fluffy, Fluffy, 30, 500, 0, 50, 3, 1, 10, 12, 0, 5, 1, 1, 1, 0, 20, 25, 1, 1, 1, 3, 21, 129, 800, 1872, 672, 480, 611, 800, 527, 2000, 535, 400, 0, 150, 0, 70, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , 1021, LampSnake, Lamp Snake, 30, 1000, 0, 90, 5, 1, 20, 15, 1, 5, 10, 1, 1, 0, 10, 10, 1, 1, 1, 3, 21, 129, 800, 1872, 672, 480, 612, 800, 610, 10, 0, 400, 0, 150, 0, 70, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , -1023, FireSkull, Fire Skull, 30, 500, 0, 55, 2, 1, 10, 12, 0, 5, 1, 1, 1, 0, 15, 10, 1, 1, 1, 3, 21, 129, 800, 1872, 672, 480, 621, 10, 540, 150, 0, 400, 0, 150, 0, 70, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , -1024, PoisonSkull, Poison skull, 30, 1000, 0, 75, 5, 1, 20, 20, 0, 5, 1, 1, 1, 0, 15, 10, 1, 1, 1, 3, 21, 129, 800, 1872, 672, 480, 621, 10, 540, 150, 0, 400, 0, 150, 0, 70, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , +1022, JackO, JackO, 50, 6000, 0, 5000, 5000, 1, 40, 100, 20, 6, 20, 10, 10, 10, 30, 10, 1, 1, 1, 0, 20, 133, 250, 1500, 672, 480, 617, 5000, 622, 5000, 624, 5000, 620, 5000, 615, 5000, 1203, 5000, 524, 5000, 616, 5000, 0, 0, 0, 0, , , , , , +1023, FireSkull, Fire Skull, 30, 500, 0, 55, 2, 1, 10, 12, 0, 5, 1, 1, 1, 0, 15, 10, 1, 1, 1, 3, 21, 129, 800, 1872, 672, 480, 631, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , +1024, PoisonSkull, Poison skull, 30, 1000, 0, 75, 5, 1, 20, 20, 0, 5, 1, 1, 1, 0, 15, 10, 1, 1, 1, 3, 21, 129, 800, 1872, 672, 480, 631, 1000, 0, 0 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , 1025, Stumpy, Stumpy, 30, 500, 0, 65, 30, 1, 7, 10, 50, 5, 1, 1, 1, 0, 20, 25, 1, 1, 1, 3, 21, 129, 800, 1872, 672, 480, 569, 2000, 0, 150, 0, 400, 0, 150, 0, 70, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , diff --git a/npc/tulimshar-casino/casino.txt b/npc/tulimshar-casino/casino.txt index 1ba16272..fdce524a 100644 --- a/npc/tulimshar-casino/casino.txt +++ b/npc/tulimshar-casino/casino.txt @@ -16,7 +16,7 @@ new_8-1.gat,32,74 warp tohall 1,0,new_8-1.gat,68,23 new_8-1.gat,26,26,0 shop InnKeeper 112,539:175,513:20,519 -new_8-1.gat,103,26,0 script Rebeca 118,{ +new_8-1.gat,103,26,0 script Rebecca 118,{ if (zeny < 100) goto L_NoMoney; mes "[Rebecca the Waitress]"; mes "Would you like to rest? It's only 100 gp."; diff --git a/npc/xmas2007/pre-xmas.txt b/npc/xmas2007/pre-xmas.txt index aa33841b..77023d4f 100644 --- a/npc/xmas2007/pre-xmas.txt +++ b/npc/xmas2007/pre-xmas.txt @@ -56,8 +56,8 @@ new_11-1.gat,76,85,0 script Assistant 105,{ mes "at the coast south of Hurnscald.";
next;
mes "[Santas Assistant]";
- mes "Cookies can be found";
- mes "################";
+ mes "Rudolph and Santa slimes";
+ mes "always bring some cookies with them.";
close;
L_Exchange_Gotnothing:
|