diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-10-16 21:26:19 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-10-16 21:26:19 -0300 |
| commit | 04d38015f1a99389ffc1a402033506ebc30845e3 (patch) | |
| tree | bffef5d1983d192de068bd5aac2de67df7af75b2 | |
| parent | 37fcbb187b853299db984e432b236d3084fe6cb8 (diff) | |
| parent | d2578c00287413b96323aeb14cfed030f5eb3acf (diff) | |
| download | serverdata-04d38015f1a99389ffc1a402033506ebc30845e3.tar.gz serverdata-04d38015f1a99389ffc1a402033506ebc30845e3.tar.bz2 serverdata-04d38015f1a99389ffc1a402033506ebc30845e3.tar.xz serverdata-04d38015f1a99389ffc1a402033506ebc30845e3.zip | |
Merge branch 'master' into items
| -rw-r--r-- | conf/map/battle/player.conf | 2 | ||||
| -rw-r--r-- | db/re/item_db.conf | 32 |
2 files changed, 26 insertions, 8 deletions
diff --git a/conf/map/battle/player.conf b/conf/map/battle/player.conf index 2b1569e8..ed5767ae 100644 --- a/conf/map/battle/player.conf +++ b/conf/map/battle/player.conf @@ -172,7 +172,7 @@ invite_request_check: true // 0 = Disabled // 1 = Dropped only in PvP maps // 2 = Dropped in all situations -bone_drop: 0 +bone_drop: 1 // Do mounted (on Peco) characters increase their size // 0 = no diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 3f22ddac..dfc73d96 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -1259,6 +1259,7 @@ item_db: ( "> }, { +<<<<<<< HEAD Id: 611 AegisName: "GrassSeeds" Name: "Grass Seeds" @@ -1313,6 +1314,20 @@ item_db: ( BindOnEquip: false Delay: 1000 }, +======= + Id: 610 + AegisName: "DeathPotion" + Name: "Death Potion" + Type: "IT_USABLE" + Buy: 5000 + Sell: 325 + Weight: 250 + UseEffect: "EFFECT_HEAL" + Script: <" + percentheal -100, -100; + "> +}, +// Generic { Id: 700 AegisName: "SmallTentacles" @@ -1321,21 +1336,15 @@ item_db: ( Buy: 50 Sell: 16 Weight: 5 - Refine: false - ViewSprite: 700 - BindOnEquip: false }, { Id: 701 AegisName: "PiouFeathers" Name: "Piou Feathers" - Type: "IT_USABLE" + Type: "IT_ETC" Buy: 10 Sell: 3 Weight: 1 - Refine: false - ViewSprite: 701 - BindOnEquip: false }, { Id: 702 @@ -4136,4 +4145,13 @@ item_db: ( Loc: "EQP_AMMO" Subtype: "A_ARROW" }, +{ + Id: 7420 + AegisName: "AdventurerSoul" + Name: "Adventurer's Soul" + Type: "IT_ETC" + Buy: 1 + Sell: 0 + Weight: 0 +}, ) |