Merge branch 'master' of gitlab.com:TMW2/serverdata

3 files changed, 775 insertions, 1 deletions

diff --git a/db/quest_db.conf b/db/quest_db.conf
index 7aa5c1f3a..38e827c03 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -122,6 +122,11 @@ quest_db: (
     Id: 39
     Name: "CandorQuest_Trainer"
 },
+{
+    Id: 40
+    Name: "CandorQuest_Nurse"
+},
+
 
 // ID 51 to 70: Tulimshar quests
 {
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index f24cdff00..82ec7225f 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -4923,7 +4923,7 @@ item_db: (
     Weight: 50
     Atk: 0
     Matk: 0
-    Def: 1
+    Def: 0
     Range: 0
     Slots: 0
     Job: {
@@ -4939,6 +4939,10 @@ item_db: (
     BuyingStore: true
     Delay: 0
     Sprite: 0 
+    Script: <"
+        bonus bMaxHP,-250;
+        bonus bStr,2; 
+    ">
 },
 {
     Id: 1012
@@ -7244,6 +7248,33 @@ item_db: (
     Sprite: 0
 },
 {
+    Id: 1816
+    AegisName: "CreasedBoots"
+    Name: "Creased Boots"
+    Type: "IT_ARMOR"
+    Buy: 200
+    Sell: 10
+    Weight: 12
+    Atk: 0
+    Matk: 0
+    Def: 4
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_SHOES"
+    WeaponLv: 0
+    EquipLv: 3
+    Refine: false
+    ViewSprite: 1816
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
     Id: 2000
     AegisName: "Armbands"
     Name: "Armbands"
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index ed573620f..fa6205f9b 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -4281,4 +4281,742 @@ mob_db: (
         Coal: 1000
     }
 },
+{
+    Id: 1098
+    SpriteName: "SmallRubyBif"
+    Name: "Small Ruby Bif"
+    Lv: 1
+    Hp: 4
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 350
+        Coal: 280
+        Ruby: 35
+	Topaz: 23
+	Emerald: 14
+	Diamond: 7
+	Amethyst: 4
+	Sapphire: 2
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1099
+    SpriteName: "RubyBif"
+    Name: "Ruby Bif"
+    Lv: 1
+    Hp: 8
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 5
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 500
+        Coal: 400
+        Ruby: 55
+	Topaz: 40
+	Emerald: 24
+	Diamond: 12
+	Amethyst: 6
+	Sapphire: 3
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1100
+    SpriteName: "bigRubyBif"
+    Name: "Big Ruby Bif"
+    Lv: 1
+    Hp: 15
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 10
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 800
+        Coal: 500
+        Ruby: 65
+	Topaz: 50
+	Emerald: 32
+	Diamond: 16
+	Amethyst: 8
+	Sapphire: 4
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1101
+    SpriteName: "SmallTopazBif"
+    Name: "Small Topaz Bif"
+    Lv: 1
+    Hp: 4
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 350
+        Coal: 280
+        Topaz: 35
+	Ruby: 23
+	Emerald: 14
+	Diamond: 7
+	Amethyst: 4
+	Sapphire: 2
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1102
+    SpriteName: "TopazBif"
+    Name: "Topaz Bif"
+    Lv: 1
+    Hp: 8
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 5
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 500
+        Coal: 400
+        Topaz: 55
+	Ruby: 40
+	Emerald: 24
+	Diamond: 12
+	Amethyst: 6
+	Sapphire: 3
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1103
+    SpriteName: "bigTopazBif"
+    Name: "Big Topaz Bif"
+    Lv: 1
+    Hp: 15
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 10
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 800
+        Coal: 500
+        Topaz: 65
+	Ruby: 50
+	Emerald: 32
+	Diamond: 16
+	Amethyst: 8
+	Sapphire: 4
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1104
+    SpriteName: "SmallEmeraldBif"
+    Name: "Small Emerald Bif"
+    Lv: 1
+    Hp: 4
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 350
+        Coal: 280
+	Emerald: 35
+        Ruby: 23
+	Topaz: 14
+	Diamond: 7
+	Amethyst: 4
+	Sapphire: 2
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1105
+    SpriteName: "EmeraldBif"
+    Name: "Emeald Bif"
+    Lv: 1
+    Hp: 8
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 5
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 500
+        Coal: 400
+	Emerald: 55
+        Ruby: 40
+	Topaz: 24
+	Diamond: 12
+	Amethyst: 6
+	Sapphire: 3
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1106
+    SpriteName: "bigEmeraldBif"
+    Name: "Big Emerald Bif"
+    Lv: 1
+    Hp: 15
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 10
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 800
+        Coal: 500
+	Emerald: 65
+        Ruby: 50
+	Topaz: 32
+	Diamond: 16
+	Amethyst: 8
+	Sapphire: 4
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1107
+    SpriteName: "SmallDiamondBif"
+    Name: "Small Diamond Bif"
+    Lv: 1
+    Hp: 4
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 350
+        Coal: 280
+	Diamond: 35
+        Ruby: 23
+	Topaz: 14
+	Diamond: 7
+	Amethyst: 4
+	Sapphire: 2
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1108
+    SpriteName: "DiamondBif"
+    Name: "Diamond Bif"
+    Lv: 1
+    Hp: 8
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 5
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 500
+        Coal: 400
+	Diamond: 55
+        Ruby: 40
+	Topaz: 24
+	Emerald: 12
+	Amethyst: 6
+	Sapphire: 3
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1109
+    SpriteName: "bigDiamondBif"
+    Name: "Big Diamond Bif"
+    Lv: 1
+    Hp: 15
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 10
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 800
+        Coal: 500
+	Diamond: 65
+        Ruby: 50
+	Topaz: 32
+	Emerald: 16
+	Amethyst: 8
+	Sapphire: 4
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1110
+    SpriteName: "SmallAmethystBif"
+    Name: "Small Amethyst Bif"
+    Lv: 1
+    Hp: 4
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 350
+        Coal: 280
+	Amethyst: 35
+        Ruby: 23
+	Topaz: 14
+	Emerald: 7
+	Diamond: 4
+	Sapphire: 2
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1111
+    SpriteName: "AmethystBif"
+    Name: "Amethyst Bif"
+    Lv: 1
+    Hp: 8
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 5
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 500
+        Coal: 400
+	Amethyst: 55
+        Ruby: 40
+	Topaz: 24
+	Emerald: 12
+	Diamond: 6
+	Sapphire: 3
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1112
+    SpriteName: "bigAmethystBif"
+    Name: "Big Amethyst Bif"
+    Lv: 1
+    Hp: 15
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 10
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 800
+        Coal: 500
+	Amethyst:65
+        Ruby: 50
+	Topaz: 32
+	Emerald: 16
+	Diamond: 8
+	Sapphire: 4
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1113
+    SpriteName: "SmallSapphireBif"
+    Name: "Small Sapphire Bif"
+    Lv: 1
+    Hp: 4
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 350
+        Coal: 280
+	Sapphire: 35
+        Ruby: 23
+	Topaz: 14
+	Emerald: 7
+	Diamond: 4
+	Amethyst: 2
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1114
+    SpriteName: "SapphireBif"
+    Name: "Sapphire Bif"
+    Lv: 1
+    Hp: 8
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 5
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 500
+        Coal: 400
+	Sapphire: 55
+        Ruby: 40
+	Topaz: 24
+	Emerald: 12
+	Diamond: 6
+	Amethyst: 3
+	LightGreenDiamond: 1
+    }
+},
+{
+    Id: 1115
+    SpriteName: "bigSapphireBif"
+    Name: "Big Sapphire Bif"
+    Lv: 1
+    Hp: 15
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [10, 10]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 10
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    Drops: {
+        IronOre: 800
+        Coal: 500
+	Sapphire: 65
+        Ruby: 50
+	Topaz: 32
+	Emerald: 16
+	Diamond: 8
+	Amethyst: 4
+	LightGreenDiamond: 1
+    }
+},
 )