Merge branch 'caves' into 'master'

Caves

See merge request evol/serverdata!225

5 files changed, 222 insertions, 0 deletions

diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index 8a2231d0..02b4e16a 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -68,6 +68,7 @@ Human: {
         TwoHandRod: 65
         Shield: 10
         Bow: 80
+        Katar: 65
     }
     HPTable:[ 400,  450,  500,  550,  600,  650,  700,  750,  800,  850,    // 1 - 10
               900,  950, 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350,    // 11 - 20
@@ -120,6 +121,7 @@ DarkUkar: {
         TwoHandRod: 65
         Shield: 10
         Bow: 80
+        Katar: 65
     }
     HPTable:[ 400,  450,  500,  550,  600,  650,  700,  750,  800,  850,    // 1 - 10
               900,  950, 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350,    // 11 - 20
@@ -171,6 +173,7 @@ FireKralog: {
         TwoHandRod: 65
         Shield: 10
         Bow: 80
+        Katar: 65
     }
     HPTable:[ 400,  450,  500,  550,  600,  650,  700,  750,  800,  850,    // 1 - 10
               900,  950, 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350,    // 11 - 20
@@ -223,6 +226,7 @@ LightRaijin: {
         TwoHandRod: 65
         Shield: 10
         Bow: 80
+        Katar: 65
     }
     HPTable:[ 400,  450,  500,  550,  600,  650,  700,  750,  800,  850,    // 1 - 10
               900,  950, 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350,    // 11 - 20
@@ -275,6 +279,7 @@ BlueTritan: {
         TwoHandRod: 65
         Shield: 10
         Bow: 80
+        Katar: 65
     }
     HPTable:[ 400,  450,  500,  550,  600,  650,  700,  750,  800,  850,    // 1 - 10
               900,  950, 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350,    // 11 - 20
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 26d6cf1a..486fe045 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -1908,6 +1908,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -1949,6 +1955,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -1990,6 +2002,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -2031,6 +2049,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -2154,6 +2178,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -2196,6 +2226,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -2238,6 +2274,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -2280,6 +2322,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -2322,6 +2370,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -2802,6 +2856,165 @@ mob_db: (
 	DamageMotion: 420
 },
 {
+    Id: 1069
+    SpriteName: "GemVeinbloc"
+    Name: "Gem Veinbloc"
+    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: {
+
+        CrudeDiamond: 45
+        CrudeAmethyst: 23
+        CrudeSapphire: 15
+        CrudeRuby: 98
+        CrudeTopaz: 68
+        CrudeEmerald: 40
+        Coal: 1500
+        IronOre: 500
+        GoldNuggets: 100
+    }
+    WeaponAttacks: {
+        All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
+        Katars: 10000
+    }
+},
+{
+    Id: 1070
+    SpriteName: "GoldVeinbloc"
+    Name: "Gold Veinbloc"
+    Lv: 1
+    Hp: 15
+    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: {
+        GoldNuggets: 500
+        Coal: 2500
+        IronOre: 1250
+        DiamondShard: 150
+        AmethystShard: 75
+        SapphireShard: 50
+    }
+    WeaponAttacks: {
+        All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
+        Katars: 10000
+    }
+},
+{
+    Id: 1071
+    SpriteName: "CoalVeinbloc"
+    Name: "Coal Veinbloc"
+    Lv: 1
+    Hp: 7
+    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: {
+        Coal: 3500
+        IronOre: 1000
+        RubyShard: 350
+        TopazShard: 250
+        EmeraldShard: 200
+    }
+    WeaponAttacks: {
+        All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
+        Katars: 10000
+    }
+},
+{
     Id: 1100
     SpriteName: "PoisonSkull"
     Name: "Poison Skull"
diff --git a/maps/re/008-3-0.mcache b/maps/re/008-3-0.mcache
index 5a291c6f..7e80234e 100644
--- a/maps/re/008-3-0.mcache
+++ b/maps/re/008-3-0.mcache
diff --git a/maps/re/008-3-1.mcache b/maps/re/008-3-1.mcache
index e34f7676..849c3f33 100644
--- a/maps/re/008-3-1.mcache
+++ b/maps/re/008-3-1.mcache
diff --git a/npc/008-3-0/_mobs.txt b/npc/008-3-0/_mobs.txt
index f7062926..93710b2b 100644
--- a/npc/008-3-0/_mobs.txt
+++ b/npc/008-3-0/_mobs.txt
@@ -20,3 +20,7 @@
 008-3-0,100,180,0,0	monster	Topaz Vein	1054,1,600000,60000
 008-3-0,97,176,0,0	monster	Sapphire Vein	1053,1,600000,60000
 008-3-0,94,180,0,0	monster	Amethyst Vein	1055,1,600000,60000
+008-3-0,108,107,0,0	monster	Gem Veinbloc	1069,1,600000,60000
+008-3-0,118,96,0,0	monster	Gem Veinbloc	1069,1,600000,60000
+008-3-0,131,93,0,0	monster	Gem Veinbloc	1069,1,600000,60000
+008-3-0,119,101,0,0	monster	Gold Veinbloc	1070,1,600000,60000