Merge branch 'mobs' into 'master's20181205

Add all the gem veins, add beehive

See merge request evol/serverdata!141

2 files changed, 264 insertions, 6 deletions

diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index e747fd85..1d43ef6d 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -1904,7 +1904,7 @@ mob_db: (
     SpriteName: "DiamondVein"
     Name: "Diamond Vein"
     Lv: 1
-    Hp: 1
+    Hp: 20
     Sp: 0
     Exp: 1
     JExp: 0
@@ -1979,7 +1979,7 @@ mob_db: (
     SpawnCollisionSize: 0
     SpawnCollisionMask: "CELLS_NOPLAYER"
     Drops: {
-        GoldNuggets: 500
+        GoldNuggets: 1000
     }
     WeaponAttacks: {
         All: 0
@@ -1991,7 +1991,7 @@ mob_db: (
     SpriteName: "IronVein"
     Name: "Iron Vein"
     Lv: 1
-    Hp: 15
+    Hp: 10
     Sp: 0
     Exp: 1
     JExp: 0
@@ -2022,7 +2022,7 @@ mob_db: (
     SpawnCollisionSize: 0
     SpawnCollisionMask: "CELLS_NOPLAYER"
     Drops: {
-        IronOre: 1500
+        IronOre: 2500
     }
     WeaponAttacks: {
         All: 0
@@ -2034,7 +2034,7 @@ mob_db: (
     SpriteName: "CoalVein"
     Name: "Coal Vein"
     Lv: 1
-    Hp: 15
+    Hp: 7
     Sp: 0
     Exp: 1
     JExp: 0
@@ -2065,7 +2065,7 @@ mob_db: (
     SpawnCollisionSize: 0
     SpawnCollisionMask: "CELLS_NOPLAYER"
     Drops: {
-        Coal: 2000
+        Coal: 5000
     }
     WeaponAttacks: {
         All: 0
@@ -2156,6 +2156,253 @@ mob_db: (
     }
 },
 {
+    Id: 1051
+    SpriteName: "RubyVein"
+    Name: "Ruby Vein"
+    Lv: 1
+    Hp: 20
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 0
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1
+    Drops: {
+        RubyShard: 500
+        CrudeRuby: 100
+    }
+    WeaponAttacks: {
+        All: 0
+        2HMaces: 10000
+    }
+},
+{
+    Id: 1052
+    SpriteName: "EmeraldVein"
+    Name: "Emerald Vein"
+    Lv: 1
+    Hp: 20
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 0
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1
+    Drops: {
+        EmeraldShard: 500
+        CrudeEmerald: 100
+    }
+    WeaponAttacks: {
+        All: 0
+        2HMaces: 10000
+    }
+},
+{
+    Id: 1053
+    SpriteName: "SapphireVein"
+    Name: "Sapphire Vein"
+    Lv: 1
+    Hp: 25
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 0
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1
+    Drops: {
+        SapphireShard: 450
+        CrudeSapphire: 95
+    }
+    WeaponAttacks: {
+        All: 0
+        2HMaces: 10000
+    }
+},
+{
+    Id: 1054
+    SpriteName: "TopazVein"
+    Name: "Topaz Vein"
+    Lv: 1
+    Hp: 20
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 0
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1
+    Drops: {
+        TopazShard: 500
+        CrudeTopaz: 100
+    }
+    WeaponAttacks: {
+        All: 0
+        2HMaces: 10000
+    }
+},
+{
+    Id: 1055
+    SpriteName: "AmethystVein"
+    Name: "Amethyst Vein"
+    Lv: 1
+    Hp: 22
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 0
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1
+    Drops: {
+        AmethystShard: 475
+        CrudeAmethyst: 98
+    }
+    WeaponAttacks: {
+        All: 0
+        2HMaces: 10000
+    }
+},
+{
+    Id: 1056
+    SpriteName: "Beehive"
+    Name: "Beehive"
+    Lv: 1
+    Hp: 10
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 5
+    ChaseRange: 15
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1
+    Drops: {
+        BugLeg: 5000
+    }
+},
+{
     Id: 1100
     SpriteName: "PoisonSkull"
     Name: "Poison Skull"
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf
index 8eaf5ea8..6c60c207 100644
--- a/db/re/mob_skill_db.conf
+++ b/db/re/mob_skill_db.conf
@@ -212,6 +212,17 @@ mob_skill_db:(
 			val0: 1025
 		}
 	}
+	Beehive: {
+		NPC_SUMMONMONSTER: {
+			SkillState: "MSS_DEAD"
+			SkillLevel: 5
+			Rate: 10000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_ALWAYS"
+			ConditionData: 15
+			val0: 1029
+		}
+	}
 	PoisonSkull: {
 		NPC_POISON: {
 			SkillState: "MSS_BERSERK"