Merge branch 'weapons' into 'master'

Add the chopstick and the axe that were accidentially merged in client-data already

See merge request evol/serverdata!147

2 files changed, 64 insertions, 18 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 79ca4860..aef21302 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -4563,7 +4563,7 @@ item_db: (
     WeaponLv: 1
     EquipLv: 15
     Refine: false
-    Subtype: "W_2HMACE"
+    Subtype: "W_KATAR"
     BindOnEquip: false
     BuyingStore: true
     Delay: 0
@@ -4597,6 +4597,60 @@ item_db: (
     Sprite: 0
 },
 {
+    Id: 3512
+    AegisName: "Axe"
+    Name: "Axe"
+    Type: "IT_WEAPON"
+    Buy: 12000
+    Sell: 2000
+    Weight: 500
+    Atk: 300
+    Matk: 0
+    Def: 20
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HAND_R"
+    WeaponLv: 1
+    EquipLv: 10
+    Refine: false
+    Subtype: "W_1HAXE"
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 3513
+    AegisName: "Chopstick"
+    Name: "Chopstick"
+    Type: "IT_WEAPON"
+    Buy: 10000
+    Sell: 1500
+    Weight: 800
+    Atk: 400
+    Matk: 0
+    Def: 50
+    Range: 2
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: ["EQP_HAND_R", "EQP_HAND_L"]
+    WeaponLv: 1
+    EquipLv: 10
+    Refine: false
+    Subtype: "W_2HSTAFF"
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
     Id: 4000
     AegisName: "PiouEgg"
     Name: "Piou egg"
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 1d43ef6d..87b64496 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -1932,15 +1932,13 @@ mob_db: (
     AttackDelay: 1
     AttackMotion: 1
     DamageMotion: 1
-    SpawnCollisionSize: 0
-    SpawnCollisionMask: "CELLS_NOPLAYER"
     Drops: {
         DiamondShard: 500
         CrudeDiamond: 100
     }
     WeaponAttacks: {
         All: 0
-        2HMaces: 10000
+        Katars: 10000
     }
 },
 {
@@ -1976,14 +1974,12 @@ mob_db: (
     AttackDelay: 1
     AttackMotion: 1
     DamageMotion: 1
-    SpawnCollisionSize: 0
-    SpawnCollisionMask: "CELLS_NOPLAYER"
     Drops: {
         GoldNuggets: 1000
     }
     WeaponAttacks: {
         All: 0
-        2HMaces: 10000
+        Katars: 10000
     }
 },
 {
@@ -2019,14 +2015,12 @@ mob_db: (
     AttackDelay: 1
     AttackMotion: 1
     DamageMotion: 1
-    SpawnCollisionSize: 0
-    SpawnCollisionMask: "CELLS_NOPLAYER"
     Drops: {
         IronOre: 2500
     }
     WeaponAttacks: {
         All: 0
-        2HMaces: 10000
+        Katars: 10000
     }
 },
 {
@@ -2062,14 +2056,12 @@ mob_db: (
     AttackDelay: 1
     AttackMotion: 1
     DamageMotion: 1
-    SpawnCollisionSize: 0
-    SpawnCollisionMask: "CELLS_NOPLAYER"
     Drops: {
         Coal: 5000
     }
     WeaponAttacks: {
         All: 0
-        2HMaces: 10000
+        Katars: 10000
     }
 },
 {
@@ -2194,7 +2186,7 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
-        2HMaces: 10000
+        Katars: 10000
     }
 },
 {
@@ -2236,7 +2228,7 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
-        2HMaces: 10000
+        Katars: 10000
     }
 },
 {
@@ -2278,7 +2270,7 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
-        2HMaces: 10000
+        Katars: 10000
     }
 },
 {
@@ -2320,7 +2312,7 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
-        2HMaces: 10000
+        Katars: 10000
     }
 },
 {
@@ -2362,7 +2354,7 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
-        2HMaces: 10000
+        Katars: 10000
     }
 },
 {