diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-03-20 22:59:29 +0100 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-03-20 23:01:44 +0100 |
| commit | 00a9c6ae0f6c0808e73929cb81ba8777927654d7 (patch) | |
| tree | 44bfeac6de66cbae9b6357336866deae3275857d /world/map/db | |
| parent | 554c243e71e60f8c1ddf09da5c20695eaf06e77e (diff) | |
| parent | 22c00753de1e821fd41323de4e335e7a89042495 (diff) | |
| download | serverdata-00a9c6ae0f6c0808e73929cb81ba8777927654d7.tar.gz serverdata-00a9c6ae0f6c0808e73929cb81ba8777927654d7.tar.bz2 serverdata-00a9c6ae0f6c0808e73929cb81ba8777927654d7.tar.xz serverdata-00a9c6ae0f6c0808e73929cb81ba8777927654d7.zip | |
Merge branch 'easter'
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/db')
| -rw-r--r-- | world/map/db/item_db.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt index 37feb868..8deda424 100644 --- a/world/map/db/item_db.txt +++ b/world/map/db/item_db.txt @@ -396,6 +396,12 @@ 879, HeartOfIsis, Heart of Isis, 5, 70000, 35000, 40, , , , , 0, 2, 8, , 85, 0, {}, {bonus bMaxHPrate, 15; bonus bHPrecovRate, 65;} 880, LazuriteRobe, Lazurite Robe, 5, 92000, 52000, 30, , 7, , 60, 0, 2, 512, , 90, 0, {}, {set @bStat$, "Int";set @minbStatVal, 70;callfunc "RequireStat"; set @bStat$, "Vit";set @minbStatVal, 40;callfunc "RequireStat"; bonus bSpeedAddRate, -15; bonus bDef2Rate, -40; bonus bMdef, 60; bonus bVit, -1; bonus bInt, 7; bonus bLuk, -1; bonus bDex, -1; bonus bStr, -1;} 881, RaggedShorts, Ragged Shorts, 5, 60, 1, 7, , 0, , -2, 0, 2, 1, , 1, 0, {}, {} +882, RedEggshellHat, Red Eggshell Hat, 5, 7000, 5000, 15, , 9, , 3, 0, 2, 256, , 1, 0, {}, {} +883, BlueEggshellHat, Blue Eggshell Hat, 5, 7000, 5000, 15, , 9, , 3, 0, 2, 256, , 1, 0, {}, {} +884, YellowEggshellHat, Yellow Eggshell Hat, 5, 7000, 5000, 15, , 9, , 3, 0, 2, 256, , 1, 0, {}, {} +885, GreenEggshellHat, Green Eggshell Hat, 5, 7000, 5000, 15, , 9, , 3, 0, 2, 256, , 1, 0, {}, {} +886, OrangeEggshellHat, Orange Eggshell Hat, 5, 7000, 5000, 15, , 9, , 3, 0, 2, 256, , 1, 0, {}, {} +887, DarkEggshellHat, Dark Eggshell Hat, 5, 7000, 5000, 15, , 9, , 3, 0, 2, 256, , 1, 0, {}, {} 888, MagicGMTopHat, Magic GM Top Hat, 5, 4200, 1900, 30, , 60, , 20, 0, 2, 256, , 0, 0, {}, {set @minLvl, 60; callfunc "RestrictedItem"; bonus bMaxHP, 31000; bonus bFlee, -200; bonus bHPrecovRate, -400; bonus bCriticalDef, 250; bonus bMdef, 89;} 889, MurdererCrown, Murderer Crown, 5, 75000, 12000, 240, , 4, , 0, 0, 2, 256, , 0, 0, {}, {} 890, BeanieCopter, Beanie Copter, 5, 8000, 2000, 20, , 4, , 2, 0, 2, 256, , 0, 0, {}, {} |