Merge branch 'master' into jesusalva/GuidedTourjesusalva/GuidedTour

10 files changed, 1723 insertions, 47 deletions

diff --git a/db/achievement_rank_db.conf b/db/achievement_rank_db.conf
new file mode 100644
index 00000000..e19194fa
--- /dev/null
+++ b/db/achievement_rank_db.conf
@@ -0,0 +1,43 @@
+//================= Hercules Database ==========================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ====================================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2018  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//==============================================================================
+//= Achievement Rank Database
+//==============================================================================
+
+achievement_rank_db:
+{
+	Rank1: 18
+	Rank2: 31
+	Rank3: 49
+	Rank4: 73
+	Rank5: 135
+	Rank6: 104
+	Rank7: 140
+	Rank8: 214
+	Rank9: 305
+	Rank10: 257
+	Rank11: 300
+}
diff --git a/db/constants.conf b/db/constants.conf
index 29d308c1..2da38e3c 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3848,6 +3848,86 @@ constants_db: {
 	HAT_EF_QSCARABA:               54
 	HAT_EF_FSTONE:                 55
 	HAT_EF_MAGICCIRCLE:            56
+	HAT_EF_BRYSINGGAMEN:           57
+	HAT_EF_MAGINGIORDE:            58
+	HAT_EF_LEVEL99_RED:            59
+	HAT_EF_LEVEL99_ULTRAMARINE:    60
+	HAT_EF_LEVEL99_CYAN:           61
+	HAT_EF_LEVEL99_LIME:           62
+	HAT_EF_LEVEL99_VIOLET:         63
+	HAT_EF_LEVEL99_LILAC:          64
+	HAT_EF_LEVEL99_SUN_ORANGE:     65
+	HAT_EF_LEVEL99_DEEP_PINK:      66
+	HAT_EF_LEVEL99_BLACK:          67
+	HAT_EF_LEVEL99_WHITE:          68
+	HAT_EF_LEVEL160_RED:           69
+	HAT_EF_LEVEL160_ULTRAMARINE:   70
+	HAT_EF_LEVEL160_CYAN:          71
+	HAT_EF_LEVEL160_LIME:          72
+	HAT_EF_LEVEL160_VIOLET:        73
+	HAT_EF_LEVEL160_LILAC:         74
+	HAT_EF_LEVEL160_SUN_ORANGE:    75
+	HAT_EF_LEVEL160_DEEP_PINK:     76
+	HAT_EF_LEVEL160_BLACK:         77
+	HAT_EF_LEVEL160_WHITE:         78
+	HAT_EF_FULL_BLOOMCHERRY_TREE:  79
+	HAT_EF_C_BLESSINGS_OF_SOUL:    80
+	HAT_EF_MANYSTARS:              81
+	HAT_EF_SUBJECT_AURA_GOLD:      82
+	HAT_EF_SUBJECT_AURA_WHITE:     83
+	HAT_EF_SUBJECT_AURA_RED:       84
+	HAT_EF_C_SHINING_ANGEL_WING:   85
+	HAT_EF_MAGIC_STAR_TW:          86
+	HAT_DIGITAL_SPACE:             87
+	HAT_EF_SLEIPNIR:               88
+
+	comment__: "Achievement Types"
+	ACH_QUEST:                          0
+	ACH_KILL_PC_TOTAL:                  1
+	ACH_KILL_PC_JOB:                    2
+	ACH_KILL_PC_JOBTYPE:                3
+	ACH_KILL_MOB_CLASS:                 4
+	ACH_DAMAGE_PC_MAX:                  5
+	ACH_DAMAGE_PC_TOTAL:                6
+	ACH_DAMAGE_PC_REC_MAX:              7
+	ACH_DAMAGE_PC_REC_TOTAL:            8
+	ACH_DAMAGE_MOB_MAX:                 9
+	ACH_DAMAGE_MOB_TOTAL:              10
+	ACH_DAMAGE_MOB_REC_MAX:            11
+	ACH_DAMAGE_MOB_REC_TOTAL:          12
+	ACH_JOB_CHANGE:                    13
+	ACH_STATUS:                        14
+	ACH_STATUS_BY_JOB:                 15
+	ACH_STATUS_BY_JOBTYPE:             16
+	ACH_CHATROOM_CREATE_DEAD:          17
+	ACH_CHATROOM_CREATE:               18
+	ACH_CHATROOM_MEMBERS:              19
+	ACH_FRIEND_ADD:                    20
+	ACH_PARTY_CREATE:                  21
+	ACH_PARTY_JOIN:                    22
+	ACH_MARRY:                         23
+	ACH_ADOPT_BABY:                    24
+	ACH_ADOPT_PARENT:                  25
+	ACH_ZENY_HOLD:                     26
+	ACH_ZENY_GET_ONCE:                 27
+	ACH_ZENY_GET_TOTAL:                28
+	ACH_ZENY_SPEND_ONCE:               29
+	ACH_ZENY_SPEND_TOTAL:              30
+	ACH_EQUIP_REFINE_SUCCESS:          31
+	ACH_EQUIP_REFINE_FAILURE:          32
+	ACH_EQUIP_REFINE_SUCCESS_TOTAL:    33
+	ACH_EQUIP_REFINE_FAILURE_TOTAL:    34
+	ACH_EQUIP_REFINE_SUCCESS_WLV:      35
+	ACH_EQUIP_REFINE_FAILURE_WLV:      36
+	ACH_EQUIP_REFINE_SUCCESS_ID:       37
+	ACH_EQUIP_REFINE_FAILURE_ID:       38
+	ACH_ITEM_GET_COUNT:                39
+	ACH_ITEM_GET_COUNT_ITEMTYPE:       40
+	ACH_ITEM_GET_WORTH:                41
+	ACH_ITEM_SELL_WORTH:               42
+	ACH_PET_CREATE:                    43
+	ACH_ACHIEVE:                       44
+	ACH_ACHIEVEMENT_RANK:              45
 
     // for disable warning
     ITMCHAIN_ORE: 1
@@ -3948,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
@@ -3998,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/map_index.txt b/db/map_index.txt
index 547afb0b..599d54b0 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -86,6 +86,7 @@
 008-2-7 86
 008-2-8 87
 008-2-9 88
-008-3-1 89
-test 90
-testbg 91
+008-3-0 89
+008-3-1 90
+test 91
+testbg 92
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/achievement_db.conf b/db/re/achievement_db.conf
new file mode 100644
index 00000000..68334840
--- /dev/null
+++ b/db/re/achievement_db.conf
@@ -0,0 +1,134 @@
+//================= Hercules Database =====================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2018  Hercules Dev Team
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Achievement Database
+//=========================================================================
+
+achievement_db: (
+/*****************************************************************
+ *                   Entry Structure
+ *****************************************************************
+{
+	Id: (int)                           Unique ID of the achievement representing it's client-side equivalent.
+	Name: (string)                      Name/Title of the Achievement.
+	Type: (string)                      Validation type for the achievement.
+	                                     [Type]                             [Validation Description] (Trigger)
+	                                    ACH_QUEST:                          Specific achievement objective update (Script).
+	                                    ACH_KILL_PC_TOTAL:                  (Accumulative) Total kill count. (Player kill)
+	                                    ACH_KILL_PC_JOB:                    Kill a player of the specified job. (Player Kill)
+	                                    ACH_KILL_PC_JOBTYPE:                Kill a player of the specified job type. (Player Kill)
+	                                    ACH_KILL_MOB_CLASS:                 Kill a particular mob class. (Mob Kill)
+	                                    ACH_DAMAGE_PC_MAX:                  Maximum damage caused on a player. (Player Damage)
+	                                    ACH_DAMAGE_PC_TOTAL:                (Accumulative) Damage on players. (Player Damage)
+	                                    ACH_DAMAGE_PC_REC_MAX:              Maximum damage received by a player. (Receive Player Damage)
+	                                    ACH_DAMAGE_PC_REC_TOTAL:            (Accumulative) Damage received by players. (Receive Player Damage)
+	                                    ACH_DAMAGE_MOB_MAX:                 Maximum damage caused on a monster. (Monster Damage)
+	                                    ACH_DAMAGE_MOB_TOTAL:               (Accumulative) Damage caused on monsters. (Monster Damage)
+	                                    ACH_DAMAGE_MOB_REC_MAX:             Maximum damage received by a monster. (Receive Monster Damage)
+	                                    ACH_DAMAGE_MOB_REC_TOTAL:           (Accumulative) Damage received by monsters. (Receive Monster Damage)
+	                                    ACH_JOB_CHANGE:                     Change to a specific job. (Job Change)
+	                                    ACH_STATUS:                         Acquire a specific amount of a particular status type. (Stat Change)
+	                                    ACH_STATUS_BY_JOB:                  Acquire a specific amount of a status type as a job class. (Stat Change)
+	                                    ACH_STATUS_BY_JOBTYPE:              Acquire a specific amount of a status type as a job type. (Stat Change)
+	                                    ACH_CHATROOM_CREATE_DEAD:           (Accumulative) Create a chatroom when dead. (Chatroom Creation)
+	                                    ACH_CHATROOM_CREATE:                (Accumulative) Create a chatroom. (Chatroom Creation)
+	                                    ACH_CHATROOM_MEMBERS:               Gather 'n' members in a chatroom. (Chatroom Join)
+	                                    ACH_FRIEND_ADD:                     Add a specific number of friends. (Friend Addition)
+	                                    ACH_PARTY_CREATE:                   (Accumulative) Create a specific number of parties. (Party Creation)
+	                                    ACH_PARTY_JOIN:                     (Accumulative) Join a specific number of parties. (Party Join)
+	                                    ACH_MARRY:                          (Accumulative) Marry a specified number of times. (Marriage)
+	                                    ACH_ADOPT_BABY:                     (Accumulative) Get Adopted. (Adoption) 
+	                                    ACH_ADOPT_PARENT:                   (Accumulative) Adopt a Baby. (Adoption)
+	                                    ACH_ZENY_HOLD:                      Hold a specific amount of zeny in your inventory. (Gain Zeny)
+	                                    ACH_ZENY_GET_ONCE:                  Gain a specific amount of zeny in one transaction. (Gain Zeny)
+	                                    ACH_ZENY_GET_TOTAL:                 (Accumulative) Gain a specific amount of zeny in total. (Gain Zeny)
+	                                    ACH_ZENY_SPEND_ONCE:                Spend a specific amount of zeny in one transaction. (Pay Zeny)
+	                                    ACH_ZENY_SPEND_TOTAL:               (Accumulative) Spend a specific amount of zeny in total. (Pay Zeny)
+	                                    ACH_EQUIP_REFINE_SUCCESS:           Refine an item to +N. (Successful Refine)
+	                                    ACH_EQUIP_REFINE_FAILURE:           Fail to refine an item of +N refine. (Failed Refine)
+	                                    ACH_EQUIP_REFINE_SUCCESS_TOTAL:     (Accumulative) Refine an item successfully N times. (Success Refine)
+	                                    ACH_EQUIP_REFINE_FAILURE_TOTAL:     (Accumulative) Fail to refine an item N times. (Failed Refine)
+	                                    ACH_EQUIP_REFINE_SUCCESS_WLV:       Refine a Weapon of a particular Level to +N. (Success Refine)
+	                                    ACH_EQUIP_REFINE_FAILURE_WLV:       Fail to refine a Weapon of a particular level from +N. (Failed Refine)
+	                                    ACH_EQUIP_REFINE_SUCCESS_ID:        Refine a particular Item successfully to +N. (Success Refine)
+	                                    ACH_EQUIP_REFINE_FAILURE_ID:        Fail to refine a particular item successfully from +N. (Failed Refine)
+	                                    ACH_ITEM_GET_COUNT:                 Acquire N amount of an item of a particular ID. (Acquire Item)
+	                                    ACH_ITEM_GET_COUNT_ITEMTYPE:        Acquire N amount of items of a particular type mask. (Acquire Item)
+	                                    ACH_ITEM_GET_WORTH:                 Acquire an item of buy value N. (Acquire Item)
+	                                    ACH_ITEM_SELL_WORTH:                Sell an item of sell value N. (NPC Sell Item)
+	                                    ACH_PET_CREATE:                     Successfully tame a pet of a particular mob class. (Successful Pet Tame)
+	                                    ACH_ACHIEVE:                        Achieve an Achievement. (Achievement Completion)
+	                                    ACH_ACHIEVEMENT_RANK:               Achieve an Achievement Rank. (Achievement Rank Increase)
+	Objectives: {                       [Mandatory Field] Objectives of an achievement. Up to 10 objectives per achievement.
+	                                    To comply with the client's order of objectives, this list must be in order.
+	    *1: {
+	        Description: (string)       [Mandatory Field] Description of a particular objective.
+	        Criteria: {                 This is a field for achievements whose objectives must meet
+	                                    certain criteria before evaluating the player's progress for it.
+	            MobId: (mixed)          MonsterId required for an objective.
+	                                    For types such as ACH_KILL_MOB_CLASS and ACH_PET_CREATE. Can be either int or string constant.
+	            JobId: (mixed)          Array or Single entry of JobIds.
+	                                    For types - ACH_KILL_PC_JOBTYPE, ACH_JOB_CHANGE or ACH_STATUS_BY_JOBTYPE.
+	                                    Can be either a numeric or string constant.
+	            ItemId: (mixed)         ItemId required for an objective.
+	                                    For Types such as ACH_ITEM_GET_COUNT. Can be either int or string constant.
+	            StatusType: (mixed)     Status Type required for an objective.
+	                                    For Types such as ACH_STATUS, ACH_STATUS_BY_JOB, ACH_STATUS_BY_JOBTYPE.
+	                                    Types -
+	                                    "SP_STR"        - Strength
+	                                    "SP_AGI"        - Agility
+	                                    "SP_VIT"        - Vitality
+	                                    "SP_INT"        - Intelligence
+	                                    "SP_DEX"        - Dexterity
+	                                    "SP_LUK"        - Luck
+	                                    "SP_BASELEVEL"  - Base Level
+	                                    "SP_JOBLEVEL"   - Job Level
+	                                    Can be either int or string constant.
+	            ItemType: (mixed)       Item type that is required for this achievement.
+	                                    For Types such as ACH_ITEM_GET_COUNT_ITEMTYPE.
+	                                    Can be either int, string or list.
+	                                    Refer "Item types" Constants from constants.conf
+	            WeaponLevel: (int)      Weapon Level that is required for this achievement. (Eg. 0, 1, 2, 3 or 4).
+	                                    For Types such as ACH_EQUIP_REFINE_SUCCESS_WLV and ACH_EQUIP_REFINE_FAILURE_WLV.
+	            Achieve: (int)          AchievementID to be achieved.
+	                                    For Type - ACH_ACHIEVE.
+	        }
+	        Goal: (int)                 Target amount to be met for the completion of the objective. Default is 1.
+	    }
+	    ...
+	    *10: {...}
+	}
+	Rewards: {
+	    Bonus: <""> (script)            Script code bonus to be given as a reward for an achievement.
+	    Items: {                        Item rewards per achievement. With a maximum defined in mmo.h as MAX_ACHEIVEMENT_ITEM_REWARDS.
+	        Apple: 1 (int)              Item ID (int or string constant) : Amount (int)
+	    }
+	    TitleId: (int)                  ID of the Title (from the Title System) awarded.
+	}
+	Points: (int)                       Points per achievement given on it's successful completion.
+}
+ *****************************************************************/
+)
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index de337b46..6f4665da 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1272,6 +1272,366 @@ item_db: (
     ">
 },
 {
+    Id: 563
+    AegisName: "Beer"
+    Name: "Beer"
+    Type: "IT_HEALING"
+    Buy: 90
+    Sell: 20
+    Weight: 20
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Refine: false
+    ViewSprite: 563
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 750
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        @min = 60;
+        @max = 110;
+        @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: "BottleOfWater"
+    Name: "Bottle of Water"
+    Type: "IT_HEALING"
+    Buy: 60
+    Sell: 5
+    Weight: 25
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Refine: false
+    ViewSprite: 565
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 450
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        @min = 70;
+        @max = 100;
+        @delay = 15;
+        @type = 1;
+        doevent "rand_sc_heal::OnUse";
+    ">
+},
+{
+    Id: 566
+    AegisName: "CherryCake"
+    Name: "Cherry Cake"
+    Type: "IT_HEALING"
+    Buy: 100
+    Sell: 15
+    Weight: 10
+    Job: {
+        All: true
+    }
+    Gender: "SEX_ANY"
+    Refine: false
+    ViewSprite: 566
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 450
+    Sprite: 0
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        @min = 20;
+        @max = 35;
+        @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 +2989,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 +3000,7 @@ item_db: (
     Gender: "SEX_ANY"
     Loc: "EQP_ACC_L"
     WeaponLv: 0
-    EquipLv: 1
+    EquipLv: 10
     Refine: false
     ViewSprite: 1000
     BindOnEquip: false
@@ -2906,6 +3266,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 +3341,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 +3471,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 +3600,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 +3789,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 +3987,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: 2905
+    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: 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 +4280,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 +4478,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 +4487,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 +4550,7 @@ item_db: (
     Buy: 17500
     Sell: 3700
     Weight: 250
-    Atk: 50
+    Atk: 200
     Matk: 0
     Def: 0
     Range: 0
@@ -3546,7 +4559,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 +4570,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 +4615,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 +4624,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 +4633,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 +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: 5004
@@ -3611,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: 5005
@@ -3620,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: 5006
@@ -3629,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: 5007
@@ -3638,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: 5008
@@ -3647,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: 5009
@@ -3656,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: 5010
@@ -3665,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: 5011
@@ -3674,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: 5012
@@ -3683,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: 5013
@@ -3692,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: 5014
@@ -3701,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: 5015
@@ -3710,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: 5016
@@ -3719,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: 5017
@@ -3728,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: 5018
@@ -3737,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: 5019
@@ -3746,7 +4786,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 +4795,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 +4804,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 +4872,7 @@ item_db: (
         bonus bLuk, 2;
         bonus bDex, -1;
     ">
-    Loc: "EQP_ACC"
+    Loc: ["EQP_ACC_L"]
 },
 {
     Id: 5029
@@ -3846,7 +4886,7 @@ item_db: (
         bonus bStr, 2;
         bonus bAgi, -1;
     ">
-    Loc: "EQP_ACC"
+    Loc: ["EQP_ACC_L"]
 },
 {
     Id: 5030
@@ -3860,7 +4900,7 @@ item_db: (
         bonus bDex, 2;
         bonus bVit, -1;
     ">
-    Loc: "EQP_ACC"
+    Loc: ["EQP_ACC_L"]
 },
 {
     Id: 5031
@@ -3874,7 +4914,7 @@ item_db: (
         bonus bInt, 2;
         bonus bVit, -1;
     ">
-    Loc: "EQP_ACC"
+    Loc: ["EQP_ACC_L"]
 },
 {
     Id: 5032
@@ -3888,7 +4928,7 @@ item_db: (
         bonus bVit, 2;
         bonus bLuk, -1;
     ">
-    Loc: "EQP_ACC"
+    Loc: ["EQP_ACC_L"]
 },
 {
     Id: 5033
@@ -3902,7 +4942,7 @@ item_db: (
         bonus bAgi, 2;
         bonus bStr, -1;
     ">
-    Loc: "EQP_ACC"
+    Loc: ["EQP_ACC_L"]
 },
 {
     Id: 6000
@@ -3913,7 +4953,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 +4964,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"
diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index e461e991..7e3365af 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -66,6 +66,7 @@ Human: {
         Rod: 65
         TwoHandRod: 65
         Shield: 10
+        Bow: 80
     }
     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
@@ -116,6 +117,7 @@ Ukar: {
         Rod: 65
         TwoHandRod: 65
         Shield: 10
+        Bow: 80
     }
     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
@@ -166,6 +168,7 @@ Demon: {
         Rod: 65
         TwoHandRod: 65
         Shield: 10
+        Bow: 80
     }
     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
@@ -216,6 +219,7 @@ Elven: {
         Rod: 65
         TwoHandRod: 65
         Shield: 10
+        Bow: 80
     }
     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
@@ -266,6 +270,7 @@ Orc: {
         Rod: 65
         TwoHandRod: 65
         Shield: 10
+        Bow: 80
     }
     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
@@ -316,6 +321,7 @@ Raijin: {
         Rod: 65
         TwoHandRod: 65
         Shield: 10
+        Bow: 80
     }
     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
@@ -366,6 +372,7 @@ Tritan: {
         Rod: 65
         TwoHandRod: 65
         Shield: 10
+        Bow: 80
     }
     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 c172b76e..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
@@ -1932,6 +1932,8 @@ mob_db: (
     AttackDelay: 1
     AttackMotion: 1
     DamageMotion: 1
+    SpawnCollisionSize: 0
+    SpawnCollisionMask: "CELLS_NOPLAYER"
     Drops: {
         DiamondShard: 500
         CrudeDiamond: 100
@@ -1974,8 +1976,10 @@ mob_db: (
     AttackDelay: 1
     AttackMotion: 1
     DamageMotion: 1
+    SpawnCollisionSize: 0
+    SpawnCollisionMask: "CELLS_NOPLAYER"
     Drops: {
-        GoldNuggets: 500
+        GoldNuggets: 1000
     }
     WeaponAttacks: {
         All: 0
@@ -1987,7 +1991,7 @@ mob_db: (
     SpriteName: "IronVein"
     Name: "Iron Vein"
     Lv: 1
-    Hp: 15
+    Hp: 10
     Sp: 0
     Exp: 1
     JExp: 0
@@ -2015,8 +2019,10 @@ mob_db: (
     AttackDelay: 1
     AttackMotion: 1
     DamageMotion: 1
+    SpawnCollisionSize: 0
+    SpawnCollisionMask: "CELLS_NOPLAYER"
     Drops: {
-        IronOre: 1500
+        IronOre: 2500
     }
     WeaponAttacks: {
         All: 0
@@ -2028,7 +2034,7 @@ mob_db: (
     SpriteName: "CoalVein"
     Name: "Coal Vein"
     Lv: 1
-    Hp: 15
+    Hp: 7
     Sp: 0
     Exp: 1
     JExp: 0
@@ -2056,8 +2062,10 @@ mob_db: (
     AttackDelay: 1
     AttackMotion: 1
     DamageMotion: 1
+    SpawnCollisionSize: 0
+    SpawnCollisionMask: "CELLS_NOPLAYER"
     Drops: {
-        Coal: 2000
+        Coal: 5000
     }
     WeaponAttacks: {
         All: 0
@@ -2148,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"
diff --git a/db/stylist_db.conf b/db/stylist_db.conf
index e857df97..193bba6c 100644
--- a/db/stylist_db.conf
+++ b/db/stylist_db.conf
@@ -40,6 +40,7 @@ stylist_db: (
 	Zeny: zeny                            (int, defaults to 0)
 	ItemID: ItemID                        (int, defaults to 0)
 	BoxItemID: BoxItemID                  (int, defaults to 0)
+	AllowDoram: true/false                (boolean, defaults to false)
 },
 **************************************************************************/
 {