diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
| commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
| tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/db | |
| parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
| parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
| download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/db')
| -rw-r--r-- | world/map/db/const.txt | 5 | ||||
| -rw-r--r-- | world/map/db/item_db.txt | 2 | ||||
| -rw-r--r-- | world/map/db/mob_db.txt | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/world/map/db/const.txt b/world/map/db/const.txt index f6c3ccde..cc604257 100644 --- a/world/map/db/const.txt +++ b/world/map/db/const.txt @@ -1,5 +1,7 @@ // Constants usable in scripts. -// This constant is used to define whether unreleased items are equippable. This defaults to on, but should be disabled on the official server. +// This constant is used to define whether unreleased items are equippable. +// This defaults to 1, but should be disabled on the official server. +// If set to 2 or higher, it also disables global timers to aid gdb'ing. debug 1 @@ -541,6 +543,7 @@ FLAG_DECLINED_BEANIEHAT 8192 // player declined Beanie Copter Hat from Milly DOCK_tulimshar 1 DOCK_hurnscald 2 DOCK_candor 3 +DOCK_nivalis 4 // ----------------- // -- Easter 2010 -- diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt index f31e0203..023cbbef 100644 --- a/world/map/db/item_db.txt +++ b/world/map/db/item_db.txt @@ -2,7 +2,7 @@ 0, DEFAULT, Default, 0, 20, 10, 10, , , , , , 2, , , , , {}, {} 501, CactusDrink, Cactus Drink, 0, 50, 25, 4, , , , , , 2, , , 0, , {itemheal 15, 0;}, {} 502, CactusPotion, Cactus Potion, 0, 70, 35, 7, , , , , , 2, , , 0, , {itemheal 25, 0;}, {} -503, CasinoCoins, Casino Coins, 3, 20, 10, 1, , , , , , , , , , , {}, {} +503, CasinoCoins, Casino Coins, 3, 10, 10, 1, , , , , , , , , , , {}, {} 504, DecorCandy, Decor Candy, 3, 25, 10, 1, , , , , , , , , , , {}, {} 505, MaggotSlime, Maggot Slime, 3, 8, 4, 1, , , , , , , , , , , {}, {} 506, CandyCane, Candy Cane, 0, 20, 10, 1, , , , , , 2, , , 0, , {itemheal 5, 0;}, {} diff --git a/world/map/db/mob_db.txt b/world/map/db/mob_db.txt index 7898fbc7..f8d4311f 100644 --- a/world/map/db/mob_db.txt +++ b/world/map/db/mob_db.txt @@ -117,5 +117,8 @@ 1105, ViciousSquirrel, ViciousSquirrel, 15, 140, 1, 0, 5, 1, 20, 25, 1, 6, 3, 3, 1, 0, 15, 40, 1, 1, 1, 3, 20, 133, 800, 800, 672, 480, 704, 7000, 680, 1000, 681, 1000, 682, 1000, 683, 1000, 807, 800, 4005, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 15 1106, WickedMushroom, WickedMushroom, 110, 550, 0, 0, 35, 1, 70, 80, 4, 4, 16, 12, 10, 10, 35, 10, 1, 1, 1, 3, 22, 133, 800, 1800, 672, 480, 613, 500, 4007, 50, 567, 100, 566, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 60 1107, Bluepar, Bluepar, 30, 350, 0, 0, 7, 2, 7, 15, 0, 5, 1, 1, 1, 0, 20, 25, 2, 2, 1, 3, 20, 133, 800, 1872, 672, 480, 567, 800, 568, 800, 4002, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 50 +1108, AngryFireGoblin, AngryFireGoblin, 30, 320, 0, 0, 4, 1, 25, 40, 0, 10, 3, 3, 3, 2, 10, 50, 1, 1, 1, 3, 23, 133, 800, 1872, 672, 480, 505, 800, 501, 150, 518, 800, 502, 150, 521, 70, 522, 10, 701, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 +1109, AngrySeaSlime, AngrySeaSlime, 80, 1200, 0, 0, 23, 1, 40, 70, 13, 17, 3, 30, 3, 0, 35, 35, 1, 1, 1, 0, 41, 135, 1500, 1872, 672, 480, 535, 800, 657, 800, 518, 500, 510, 1000, 700, 100, 1199, 5000, 568, 100, 541, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 +1110, AngryGreenSlime, AngryGreenSlime, 60, 1000, 0, 0, 126, 1, 100, 160, 20, 30, 20, 30, 10, 10, 30, 30, 1, 1, 1, 0, 21, 175, 1200, 1872, 672, 480, 502, 200, 4004, 20, 501, 100, 521, 250, 522, 200, 526, 500, 503, 500, 535, 750, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 20 #ID, Name, Jname, LV, HP, SP, EXP, JEXP, Range1, ATK1, ATK2, DEF, MDEF, STR, AGI, VIT, INT, DEX, LUK, Range2, Range3, Scale, Race, Element,Mode, Speed, Adelay, Amotion,Dmotion,Drop1id,Drop1per, Drop2id,Drop2per,Drop3id,Drop3per,Drop4id,Drop4per,Drop5id,Drop5per,Drop6id,Drop6per,Drop7id,Drop7per, Drop8id,Drop8per,Item1, Item2, MEXP, ExpPer, MVP1id, MVP1per,MVP2id, MVP2per,MVP3id, MVP3per,mutationcount,mutationstrength |