Merge branch 'master' into jesusalva/newpermjesusalva/newperm

3 files changed, 133 insertions, 14 deletions

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
+},
 )
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 42cacaad..c0669370 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -3086,6 +3086,49 @@ mob_db: (
     }
 },
 {
+    Id: 1106
+    SpriteName: "SpiderQueen"
+    Name: "Spider Queen"
+    Lv: 45
+    Hp: 18000
+    Sp: 0
+    Exp: 1250
+    JExp: 125
+    AttackRange: 3
+    Attack: [450, 750]
+    Def: 50
+    Mdef: 120
+    Stats: {
+        Str: 40
+        Agi: 30
+        Vit: 50
+        Int: 15
+        Dex: 65
+        Luk: 40
+    }
+    ViewRange: 8
+    ChaseRange: 15
+    Size: 0
+    Race: 2
+    Element: (5, 1)
+    Mode: {
+        CanMove: true
+        CanAttack: true
+        CastSensorChase: true
+        ChangeChase: true
+        Boss: true
+        Angry: true
+        Aggressive: true
+    }
+    MoveSpeed: 210
+    AttackDelay: 1200
+    AttackMotion: 550
+    DamageMotion: 450
+    MvpExp: 0
+    Drops: {
+    }
+},
+{
     Id: 1107
     SpriteName: "Dummy2"
     Name: "Dummy"
@@ -3187,4 +3230,47 @@ mob_db: (
     Drops: {
     }
 },
+{
+    Id: 1120
+    SpriteName: "Tengu"
+    Name: "Tengu"
+    Lv: 80
+    Hp: 7500
+    Sp: 0
+    Exp: 100
+    JExp: 15
+    AttackRange: 2
+    Attack: [250, 750]
+    Def: 45
+    Mdef: 10
+    Stats: {
+        Str: 70
+        Agi: 20
+        Vit: 40
+        Int: 10
+        Dex: 80
+        Luk: 20
+    }
+    ViewRange: 6
+    ChaseRange: 12
+    Size: 1
+    Race: 2
+    Element: (5, 1)
+    Mode: {
+        CanMove: true
+        CanAttack: true
+        CastSensorChase: true
+        ChangeChase: true
+        Boss: true
+        Angry: true
+        Aggressive: true
+    }
+    MoveSpeed: 170
+    AttackDelay: 1200
+    AttackMotion: 450
+    DamageMotion: 850
+    MvpExp: 0
+    Drops: {
+    }
+},
 )
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf
index d1a08402..85e7a240 100644
--- a/db/re/mob_skill_db.conf
+++ b/db/re/mob_skill_db.conf
@@ -314,8 +314,29 @@ mob_skill_db:(
 			CastCondition: "MSC_MYHPLTMAXRATE"
 			ConditionData: 7
 		}
+	/**********************************************************************/
+	}
+	SpiderQueen: {
+		NPC_POISON: {
+			SkillState: "MSS_ALL"
+			SkillLevel: 20
+			Rate: 5000
+			Delay: 100
+			Cancelable: true
+			SkillTarget: "MST_TARGET"
+			CastCondition: "MSC_ALWAYS"
+		}
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 5
+			Rate: 10000
+			CastTime: 700
+			Delay: 60000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_SPAWN"
+			val0: 1044
+		}
 	}
-
 	/**********************************************************************/
 	FireDummy: {
 		MG_FIREWALL: {
@@ -333,3 +354,4 @@ mob_skill_db:(
 }
 )
 
+