Merge branch 'Gumicommit' into 'master'

Gumicommit

See merge request evol/serverdata!136

3 files changed, 1155 insertions, 38 deletions

diff --git a/db/constants.conf b/db/constants.conf
index c29903db..2da38e3c 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4028,6 +4028,45 @@ constants_db: {
     NPC_OSCAR:              145
     NPC_SHOP_BAG_TEST:      146
     NPC_RED:                147
+    NPC_KOGA:               148
+    NPC_OLD_LADY:           149
+    NPC_ARKIM:              150
+    NPC_YOUNG_MAN_APPRENTICE: 151
+    NPC_YOUNG_MAN_KFAHR:    152
+    NPC_INSPECTOR:          153
+    NPC_SUSPICIOUS_TRADER:  154
+    NPC_GENERAL_STORE:      155
+    NPC_DARK_DRUID:         156
+    NPC_AIRLIA:             157
+    NPC_NICHOLAS:           158
+    NPC_BLONDE_APPRENTICE:  159
+    NPC_GIRL_MILLY:         160
+    NPC_OLANA:              161
+    NPC_DESERT_HAT_MAN:     162
+    NPC_ANGUS_THE_SMITH:    163
+    NPC_YOUNG_MAN_IN_PINK:  164
+    NPC_WAITRESS_LEGACY:    165
+    NPC_WIZARD:             166
+    NPC_LORA_TAY:           167
+    NPC_DOCTOR_LEGACY:      168
+    NPC_BOY_MIKE:           169
+    NPC_CELESTIA:           170
+    NPC_GUMI_THE_DYER:      171
+    NPC_DIMOND:             172
+    NPC_CHEF_LEGACY:        173
+    NPC_DIMONDS_WAITRESS:   174
+    NPC_DRINKER_ROAMINGO:   175
+    NPC_DRINKER_MICKSHA:    176
+    NPC_NURSE_LEGACY:       177
+    NPC_LENA:               178
+    NPC_CAUL:               179
+    NPC_MALIK:              180
+    NPC_SNARFLES:           181
+    NPC_OLD_MAN_HURNS:      182
+    NPC_BERNARD:            183
+    NPC_SABINE:             184
+    NPC_MIKHAIL:            185
+    NPC_TROUPE_LEADER:      186
 
     NPC_CONFUSED_TREE:      400
     NPC_ALIGE:              401
@@ -4078,6 +4117,13 @@ constants_db: {
     NPC_DEVIS_ARTIS:        448
     NPC_MOUBOO:             449
     NPC_MONA:               450
+    NPC_MELINDA:            451
+    NPC_LUMBERJACK:         452
+    NPC_HINNAK:             453
+    NPC_RICHARD_LEGACY:     454
+    NPC_SOPHIALLA:          455
+    NPC_MUNDANE:            456
+    NPC_ROWBOAT_STAND_WE:   457
 
     NPC_TEST1:              800
     NPC_PLAYER:             801
diff --git a/db/quest_db.conf b/db/quest_db.conf
index 48d4129a..bc8acb82 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -162,6 +162,26 @@ quest_db: (
     Name: "Artis_Legion_Progress"
 },
 {
+    Id: 36
+    Name: "HurnscaldQuests_Hinnak"
+},
+{
+    Id: 37
+    Name: "HurnscaldQuests_Soup"
+},
+{
+    Id: 38
+    Name: "HurnscaldQuests_Inspector"
+},
+{
+    Id: 39
+    Name: "HurnscaldQuests_ForestBow"
+},
+{
+    Id: 40
+    Name: "HurnscaldQuests_WoodenShield"
+},
+{
 	Id: 1000
 	Name: "Test_testing1"
 },
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index de337b46..7c768daf 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1272,6 +1272,339 @@ item_db: (
     ">
 },
 {
+    Id: 563
+    AegisName: "Beer"
+    Name: "Beer"
+    Type: "IT_HEALING"
+    Buy: 250
+    Sell: 50
+    Weight: 50
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Refine: false
+    ViewSprite: 563
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 750
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        @min = 250;
+        @max = 450;
+        @delay = 8;
+        @type = 1;
+        doevent "rand_sc_heal::OnUse";
+    ">
+},
+{
+    Id: 564
+    AegisName: "RoastedMaggot"
+    Name: "Roasted Maggot"
+    Type: "IT_HEALING"
+    Buy: 500
+    Sell: 50
+    Weight: 25
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Refine: false
+    ViewSprite: 564
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 450
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        @min = 180;
+        @max = 360;
+        @delay = 50;
+        @type = 1;
+        doevent "rand_sc_heal::OnUse";
+    ">
+},
+{
+    Id: 565
+    AegisName: "CherryCake"
+    Name: "Cherry Cake"
+    Type: "IT_HEALING"
+    Buy: 800
+    Sell: 75
+    Weight: 35
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Refine: false
+    ViewSprite: 565
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 450
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        @min = 250;
+        @max = 450;
+        @delay = 150;
+        @type = 1;
+        doevent "rand_sc_heal::OnUse";
+    ">
+},
+{
+    Id: 600
+    AegisName: "SmallHealing"
+    Name: "Small Healing Potion"
+    Type: "IT_HEALING"
+    Buy: 2500
+    Sell: 300
+    Weight: 32
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    ViewSprite: 600
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 100
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        @min = 200;
+        @max = 300;
+        @delay = 3;
+        @type = 2;
+        doevent "rand_sc_heal::OnUse";
+    ">
+},
+{
+    Id: 601
+    AegisName: "MediumHealing"
+    Name: "Medium Healing Potion"
+    Type: "IT_HEALING"
+    Buy: 5000
+    Sell: 650
+    Weight: 64
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    ViewSprite: 601
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 100
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        @min = 400;
+        @max = 600;
+        @delay = 4;
+        @type = 2;
+        doevent "rand_sc_heal::OnUse";
+    ">
+},
+{
+    Id: 602
+    AegisName: "LargeHealing"
+    Name: "Large Healing Potion"
+    Type: "IT_HEALING"
+    Buy: 10000
+    Sell: 1250
+    Weight: 128
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    ViewSprite: 602
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 100
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        @min = 800;
+        @max = 1200;
+        @delay = 5;
+        @type = 2;
+        doevent "rand_sc_heal::OnUse";
+    ">
+},
+{
+    Id: 603
+    AegisName: "SmallMana"
+    Name: "Small Mana Potion"
+    Type: "IT_HEALING"
+    Buy: 2000
+    Sell: 250
+    Weight: 32
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    ViewSprite: 603
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 205
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        bonus bMaxSP,20;
+    ">
+},
+{
+    Id: 604
+    AegisName: "MediumMana"
+    Name: "Medium Mana Potion"
+    Type: "IT_HEALING"
+    Buy: 5000
+    Sell: 600
+    Weight: 64
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    ViewSprite: 604
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 250
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        bonus bMaxSP,50;
+    ">
+},
+{
+    Id: 605
+    AegisName: "LargeMana"
+    Name: "Large Mana Potion"
+    Type: "IT_HEALING"
+    Buy: 10000
+    Sell: 1500
+    Weight: 128
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    ViewSprite: 605
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 250
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        bonus bMaxSP,100;
+    ">
+},
+{
+    Id: 606
+    AegisName: "ConcPotion"
+    Name: "Concentration Potion"
+    Type: "IT_HEALING"
+    Buy: 2500
+    Sell: 650
+    Weight: 25
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    ViewSprite: 606
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 100
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        bonus bAspd,50;
+    ">
+},
+{
+    Id: 607
+    AegisName: "IronPotion"
+    Name: "Iron Potion"
+    Type: "IT_HEALING"
+    Buy: 2500
+    Sell: 650
+    Weight: 40
+    Atk: 0
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    WeaponLv: 0
+    EquipLv: 0
+    Refine: false
+    ViewSprite: 606
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 500
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        bonus bStr,5;
+    ">
+},
+{
     Id: 700
     AegisName: "SmallTentacles"
     Name: "Small Tentacles"
@@ -2629,8 +2962,8 @@ item_db: (
     Buy: 10000
     Sell: 400
     Weight: 50
-    Atk: 0
-    Matk: 0
+    Atk: 5
+    Matk: 25
     Def: 0
     Range: 0
     Slots: 1
@@ -2640,7 +2973,7 @@ item_db: (
     Gender: "SEX_ANY"
     Loc: "EQP_ACC_L"
     WeaponLv: 0
-    EquipLv: 1
+    EquipLv: 10
     Refine: false
     ViewSprite: 1000
     BindOnEquip: false
@@ -2906,6 +3239,54 @@ item_db: (
     ">
 },
 {
+    Id: 1308
+    AegisName: "FineDress"
+    Name: "Fine Dress"
+    Type: "IT_ARMOR"
+    Buy: 12000
+    Sell: 2600
+    Weight: 240
+    Atk: 0
+    Matk: 170
+    Def: 250
+    Range: 0
+    Slots: 1
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_MID"
+    WeaponLv: 0
+    EquipLv: 15
+    Refine: false
+    ViewSprite: 1308
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+    AllowCards: {
+        id5003: 1
+        id5004: 1
+        id5005: 1
+        id5006: 1
+        id5007: 1
+        id5008: 1
+        id5009: 1
+        id5010: 1
+        id5011: 1
+        id5012: 1
+        id5013: 1
+        id5014: 1
+        id5015: 1
+        id5016: 1
+        id5017: 1
+        id5018: 1
+        id5019: 1
+        id5020: 1
+        id5021: 1
+    }
+},
+{
     Id: 1800
     AegisName: "LousyMoccasins"
     Name: "Lousy Moccasins"
@@ -2933,6 +3314,55 @@ item_db: (
     Sprite: 0
 },
 {
+    Id: 1801
+    AegisName: "CottonBoots"
+    Name: "Cotton Boots"
+    Type: "IT_ARMOR"
+    Buy: 2600
+    Sell: 420
+    Weight: 35
+    Atk: 0
+    Matk: 0
+    Def: 120
+    Range: 0
+    Slots: 1
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_SHOES"
+    WeaponLv: 0
+    EquipLv: 12
+    Refine: false
+    ViewSprite: 1801
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+    AllowCards: {
+        id5003: 1
+        id5004: 1
+        id5005: 1
+        id5006: 1
+        id5007: 1
+        id5008: 1
+        id5009: 1
+        id5010: 1
+        id5011: 1
+        id5012: 1
+        id5013: 1
+        id5014: 1
+        id5015: 1
+        id5016: 1
+        id5017: 1
+        id5018: 1
+        id5019: 1
+        id5020: 1
+        id5021: 1
+    }
+},
+
+{
     Id: 2000
     AegisName: "Armbands"
     Name: "Armbands"
@@ -3014,6 +3444,81 @@ item_db: (
     Sprite: 0
 },
 {
+    Id: 2003
+    AegisName: "CottonGloves"
+    Name: "Cotton Gloves"
+    Type: "IT_ARMOR"
+    Buy: 3000
+    Sell: 250
+    Weight: 60
+    Atk: 0
+    Matk: 0
+    Def: 10
+    Range: 0
+    Slots: 1
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_GARMENT"
+    WeaponLv: 0
+    EquipLv: 10
+    Refine: false
+    ViewSprite: 2003
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+    AllowCards: {
+        id5003: 1
+        id5004: 1
+        id5005: 1
+        id5006: 1
+        id5007: 1
+        id5008: 1
+        id5009: 1
+        id5010: 1
+        id5011: 1
+        id5012: 1
+        id5013: 1
+        id5014: 1
+        id5015: 1
+        id5016: 1
+        id5017: 1
+        id5018: 1
+        id5019: 1
+        id5020: 1
+        id5021: 1
+    }
+},
+{
+    Id: 2004
+    AegisName: "LeatherGloves"
+    Name: "Leather Gloves"
+    Type: "IT_ARMOR"
+    Buy: 3500
+    Sell: 500
+    Weight: 140
+    Atk: 0
+    Matk: 0
+    Def: 20
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_GARMENT"
+    WeaponLv: 0
+    EquipLv: 20
+    Refine: false
+    ViewSprite: 2004
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
     Id: 2200
     AegisName: "CreasedShorts"
     Name: "Creased Shorts"
@@ -3068,6 +3573,140 @@ item_db: (
     Sprite: 0
 },
 {
+    Id: 2202
+    AegisName: "JeansChaps"
+    Name: "Jeans Chaps"
+    Type: "IT_ARMOR"
+    Buy: 2500
+    Sell: 500
+    Weight: 360
+    Atk: 0
+    Matk: -100
+    Def: 240
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_LOW"
+    WeaponLv: 0
+    EquipLv: 12
+    Refine: false
+    ViewSprite: 2202
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 2203
+    AegisName: "SilkPants"
+    Name: "Silk Pants"
+    Type: "IT_ARMOR"
+    Buy: 5000
+    Sell: 1000
+    Weight: 20
+    Atk: 0
+    Matk: 0
+    Def: 80
+    Range: 0
+    Slots: 1
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_LOW"
+    WeaponLv: 0
+    EquipLv: 17
+    Refine: false
+    ViewSprite: 2203
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+    AllowCards: {
+        id5000: 1
+        id5001: 1
+        id5002: 1
+    }
+},
+{
+    Id: 2204
+    AegisName: "CottonSkirt"
+    Name: "Cotton Skirt"
+    Type: "IT_ARMOR"
+    Buy: 3000
+    Sell: 600
+    Weight: 15
+    Atk: 0
+    Matk: 0
+    Def: 20
+    Range: 0
+    Slots: 1
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_LOW"
+    WeaponLv: 0
+    EquipLv: 5
+    Refine: false
+    ViewSprite: 2204
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+    AllowCards: {
+        id5003: 1
+        id5004: 1
+        id5005: 1
+        id5006: 1
+        id5007: 1
+        id5008: 1
+        id5009: 1
+        id5010: 1
+        id5011: 1
+        id5012: 1
+        id5013: 1
+        id5014: 1
+        id5015: 1
+        id5016: 1
+        id5017: 1
+        id5018: 1
+        id5019: 1
+        id5020: 1
+        id5021: 1
+    }
+},
+{
+    Id: 2205
+    AegisName: "LeatherTrousers"
+    Name: "Leather Trousers"
+    Type: "IT_ARMOR"
+    Buy: 9500
+    Sell: 2100
+    Weight: 280
+    Atk: 0
+    Matk: 0
+    Def: 160
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_LOW"
+    WeaponLv: 0
+    EquipLv: 15
+    Refine: false
+    ViewSprite: 2205
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
     Id: 2700
     AegisName: "Barrel"
     Name: "Barrel"
@@ -3123,6 +3762,53 @@ item_db: (
     ">
 },
 {
+    Id: 2702
+    AegisName: "WoodenShield"
+    Name: "Wooden Shield"
+    Type: "IT_ARMOR"
+    Buy: 5000
+    Sell: 750
+    Weight: 2450
+    Def: 72
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HAND_L"
+    EquipLv: 12
+    Refine: false
+    ViewSprite: 0
+    BindOnEquip: false
+    BuyingStore: true
+    OnEquipScript: <"
+        bonus bAtkRange, -1;
+    ">
+},
+{
+    Id: 2703
+    AegisName: "SteelShield"
+    Name: "Steel Shield"
+    Type: "IT_ARMOR"
+    Buy: 25000
+    Sell: 2630
+    Weight: 5500
+    Def: 200
+    Matk: -200
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HAND_L"
+    EquipLv: 20
+    Refine: false
+    ViewSprite: 2701
+    BindOnEquip: false
+    BuyingStore: true
+    OnEquipScript: <"
+        bonus bAtkRange, -1;
+    ">
+},
+{
     Id: 2900
     AegisName: "Bandana"
     Name: "Bandana"
@@ -3274,11 +3960,255 @@ item_db: (
         All: true
     }
     Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_LOW"
+    WeaponLv: 0
+    EquipLv: 1
+    Refine: false
+    ViewSprite: 2200
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+
+{
+    Id: 2906
+    AegisName: "InfantryHelmet"
+    Name: "Infantry Helmet"
+    Type: "IT_ARMOR"
+    Buy: 1600
+    Sell: 300
+    Weight: 400
+    Atk: 0
+    Matk: -50
+    Def: 160
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
-    EquipLv: 8
+    EquipLv: 12
+    Refine: false
+    ViewSprite: 2906
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 2907
+    AegisName: "CandleHelmet"
+    Name: "Candle Helmet"
+    Type: "IT_ARMOR"
+    Buy: 4500
+    Sell: 650
+    Weight: 500
+    Atk: 0
+    Matk: -25
+    Def: 180
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 16
+    Refine: false
+    ViewSprite: 2907
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 2908
+    AegisName: "WarlordHelmet"
+    Name: "Warlord Helmet"
+    Type: "IT_ARMOR"
+    Buy: 13500
+    Sell: 3200
+    Weight: 1000
+    Atk: 0
+    Matk: -300
+    Def: 340
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 24
+    Refine: false
+    ViewSprite: 2908
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 2909
+    AegisName: "AxeHat"
+    Name: "Axe Hat"
+    Type: "IT_ARMOR"
+    Buy: 3500
+    Sell: 750
+    Weight: 50
+    Atk: 0
+    Matk: 25
+    Def: 12
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 5
+    Refine: false
+    ViewSprite: 2909
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 2910
+    AegisName: "PinkieHat"
+    Name: "Pinkie Hat"
+    Type: "IT_ARMOR"
+    Buy: 12600
+    Sell: 3500
+    Weight: 5
+    Atk: 0
+    Matk: 7
+    Def: 7
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 10
     Refine: false
-    ViewSprite: 2905
+    ViewSprite: 2910
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 2911
+    AegisName: "TopHat"
+    Name: "Top Hat"
+    Type: "IT_ARMOR"
+    Buy: 50000
+    Sell: 12500
+    Weight: 40
+    Atk: 0
+    Matk: 0
+    Def: 50
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 17
+    Refine: false
+    ViewSprite: 2911
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 2912
+    AegisName: "BowlerHat"
+    Name: "Bowler Hat"
+    Type: "IT_ARMOR"
+    Buy: 17355
+    Sell: 4300
+    Weight: 30
+    Atk: 0
+    Matk: 0
+    Def: 40
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 15
+    Refine: false
+    ViewSprite: 2912
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 2913
+    AegisName: "FairyHat"
+    Name: "Fairy Hat"
+    Type: "IT_ARMOR"
+    Buy: 6300
+    Sell: 1200
+    Weight: 5
+    Atk: 0
+    Matk: 0
+    Def: 25
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 10
+    Refine: false
+    ViewSprite: 2913
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 2914
+    AegisName: "NohMask"
+    Name: "Noh Mask"
+    Type: "IT_ARMOR"
+    Buy: 25000
+    Sell: 5200
+    Weight: 150
+    Atk: 0
+    Matk: 0
+    Def: 20
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 15
+    Refine: false
+    ViewSprite: 2914
     BindOnEquip: false
     BuyingStore: true
     Delay: 0
@@ -3323,7 +4253,7 @@ item_db: (
     Gender: "SEX_ANY"
     Loc: "EQP_HAND_R"
     WeaponLv: 1
-    EquipLv: 1
+    EquipLv: 15
     Refine: false
     Subtype: "W_DAGGER"
     ViewSprite: 1
@@ -3521,7 +4451,7 @@ item_db: (
     Gender: "SEX_ANY"
     Loc: ["EQP_HAND_R","EQP_HAND_L"]
     WeaponLv: 1
-    EquipLv: 15
+    EquipLv: 12
     Refine: false
     Subtype: "W_2HSPEAR"
     BindOnEquip: false
@@ -3530,6 +4460,62 @@ item_db: (
     Sprite: 0
 },
 {
+    Id: 3508
+    AegisName: "Dagger"
+    Name: "Dagger"
+    Type: "IT_WEAPON"
+    Buy: 2500
+    Sell: 500
+    Weight: 350
+    Atk: 100
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HAND_R"
+    WeaponLv: 1
+    EquipLv: 15
+    Refine: false
+    Subtype: "W_DAGGER"
+    ViewSprite: 1
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
+    Id: 3509
+    AegisName: "Setzer"
+    Name: "Setzer"
+    Type: "IT_WEAPON"
+    Buy: 25000
+    Sell: 5000
+    Weight: 250
+    Atk: 600
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: "EQP_HAND_R"
+    WeaponLv: 1
+    EquipLv: 1
+    Refine: false
+    Subtype: "W_DAGGER"
+    ViewSprite: 1
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
     Id: 3510
     AegisName: "Pickaxe"
     Name: "Pickaxe"
@@ -3537,7 +4523,7 @@ item_db: (
     Buy: 17500
     Sell: 3700
     Weight: 250
-    Atk: 50
+    Atk: 200
     Matk: 0
     Def: 0
     Range: 0
@@ -3546,7 +4532,7 @@ item_db: (
         All: true
     }
     Gender: "SEX_ANY"
-    Loc: ["EQP_HAND_R", "EQP_HAND_L"]
+    Loc: ["EQP_HAND_R","EQP_HAND_L"]
     WeaponLv: 1
     EquipLv: 15
     Refine: false
@@ -3557,6 +4543,33 @@ item_db: (
     Sprite: 0
 },
 {
+    Id: 3511
+    AegisName: "Torch"
+    Name: "Torch"
+    Type: "IT_WEAPON"
+    Buy: 2500
+    Sell: 500
+    Weight: 100
+    Atk: 150
+    Matk: 0
+    Def: 0
+    Range: 0
+    Slots: 0
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Loc: ["EQP_HAND_R","EQP_HAND_L"]
+    WeaponLv: 1
+    EquipLv: 10
+    Refine: false
+    Subtype: "W_DAGGER"
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
     Id: 4000
     AegisName: "PiouEgg"
     Name: "Piou egg"
@@ -3575,7 +4588,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 2000
     Sell: 80
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_HEAD_LOW"]
 },
 {
     Id: 5001
@@ -3584,7 +4597,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 2000
     Sell: 80
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_HEAD_LOW"]
 },
 {
     Id: 5002
@@ -3593,7 +4606,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 2000
     Sell: 80
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_HEAD_LOW"]
 },
 {
     Id: 5003
@@ -3602,7 +4615,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5004
@@ -3611,7 +4624,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5005
@@ -3620,7 +4633,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5006
@@ -3629,7 +4642,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5007
@@ -3638,7 +4651,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5008
@@ -3647,7 +4660,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5009
@@ -3656,7 +4669,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5010
@@ -3665,7 +4678,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5011
@@ -3674,7 +4687,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5012
@@ -3683,7 +4696,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5013
@@ -3692,7 +4705,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5014
@@ -3701,7 +4714,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5015
@@ -3710,7 +4723,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5016
@@ -3719,7 +4732,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5017
@@ -3728,7 +4741,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5018
@@ -3737,7 +4750,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5019
@@ -3746,7 +4759,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5020
@@ -3755,7 +4768,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5021
@@ -3764,7 +4777,7 @@ item_db: (
     Type: "IT_CARD"
     Buy: 1200
     Sell: 70
-    Loc: "EQP_HEAD_MID"
+    Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"]
 },
 {
     Id: 5022
@@ -3832,7 +4845,7 @@ item_db: (
         bonus bLuk, 2;
         bonus bDex, -1;
     ">
-    Loc: "EQP_ACC"
+    Loc: ["EQP_ACC_L"]
 },
 {
     Id: 5029
@@ -3846,7 +4859,7 @@ item_db: (
         bonus bStr, 2;
         bonus bAgi, -1;
     ">
-    Loc: "EQP_ACC"
+    Loc: ["EQP_ACC_L"]
 },
 {
     Id: 5030
@@ -3860,7 +4873,7 @@ item_db: (
         bonus bDex, 2;
         bonus bVit, -1;
     ">
-    Loc: "EQP_ACC"
+    Loc: ["EQP_ACC_L"]
 },
 {
     Id: 5031
@@ -3874,7 +4887,7 @@ item_db: (
         bonus bInt, 2;
         bonus bVit, -1;
     ">
-    Loc: "EQP_ACC"
+    Loc: ["EQP_ACC_L"]
 },
 {
     Id: 5032
@@ -3888,7 +4901,7 @@ item_db: (
         bonus bVit, 2;
         bonus bLuk, -1;
     ">
-    Loc: "EQP_ACC"
+    Loc: ["EQP_ACC_L"]
 },
 {
     Id: 5033
@@ -3902,7 +4915,7 @@ item_db: (
         bonus bAgi, 2;
         bonus bStr, -1;
     ">
-    Loc: "EQP_ACC"
+    Loc: ["EQP_ACC_L"]
 },
 {
     Id: 6000
@@ -3913,7 +4926,7 @@ item_db: (
     Sell: 52
     Weight: 12
     Atk: 150
-    Range: 7
+    Range: 4
     MinRange: 3
     Loc: ["EQP_HAND_R", "EQP_HAND_L"]
     WeaponLv: 1
@@ -3924,6 +4937,44 @@ item_db: (
     }
 },
 {
+    Id: 6001
+    AegisName: "ShortBow"
+    Name: "Short Bow"
+    Type: "IT_WEAPON"
+    Buy: 1200
+    Sell: 250
+    Weight: 260
+    Atk: 100
+    Range: 5
+    MinRange: 3
+    Loc: ["EQP_HAND_R", "EQP_HAND_L"]
+    WeaponLv: 1
+    EquipLv: 15
+    Subtype: "W_BOW"
+    AllowAmmo: {
+        Id6500: 1
+    }
+},
+{
+    Id: 6002
+    AegisName: "ForestBow"
+    Name: "Forest Bow"
+    Type: "IT_WEAPON"
+    Buy: 7500
+    Sell: 1250
+    Weight: 480
+    Atk: 150
+    Range: 6
+    MinRange: 3
+    Loc: ["EQP_HAND_R", "EQP_HAND_L"]
+    WeaponLv: 1
+    EquipLv: 20
+    Subtype: "W_BOW"
+    AllowAmmo: {
+        Id6500: 1
+    }
+},
+{
     Id: 6500
     AegisName: "TrainingArrow"
     Name: "Training Arrow"