Merge branch 'jesusalva/wilditems' into 'master'

Two new (fun) items for databases

See merge request evol/serverdata!207

2 files changed, 25 insertions, 14 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 ecee9e3f..d93afc2a 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1591,6 +1591,20 @@ item_db: (
     ">
 },
 {
+    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"
     Name: "Small Tentacles"
@@ -1615,22 +1629,10 @@ item_db: (
     Id: 701
     AegisName: "PiouFeathers"
     Name: "Piou Feathers"
-    Type: "IT_USABLE"
+    Type: "IT_ETC"
     Buy: 10
     Sell: 3
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 701
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 702
@@ -4902,4 +4904,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
+},
 )