Merge branch 'master' into jesusalva/innsjesusalva/inns

19 files changed, 3622 insertions, 2430 deletions

diff --git a/db/castle_db.conf b/db/castle_db.conf
new file mode 100644
index 00000000..fe4d07fe
--- /dev/null
+++ b/db/castle_db.conf
@@ -0,0 +1,44 @@
+//================= Hercules Database =====================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2019  Hercules Dev Team
+//= Copyright (C) 2019  Asheraf
+//=
+//= 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/>.
+//=========================================================================
+//= Castle Database
+//=========================================================================
+
+castle_db: (
+/**************************************************************************
+ ************* Entry structure ********************************************
+ **************************************************************************
+{
+	// ================ Mandatory fields ==============================
+	CastleID:              (int)    Unique ID of the castle. Must remain unique across all map-servers.
+	MapName:               (string) Map name to be considered as the castle map.
+	CastleName:            (string) Name of the castle (used by scripts and guardian name tags)
+	OnGuildBreakEventName: (string) NPC unique name to invoke ::OnGuildBreak on, when a occupied 
+	                                castle is abandoned during guild break.
+},
+**************************************************************************/
+)
diff --git a/db/castle_db.txt b/db/castle_db.txt
deleted file mode 100644
index 89b00eee..00000000
--- a/db/castle_db.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// Guild Castles Database
-//
-// Structure of Database:
-// CastleID,MapName,CastleName,OnGuildBreakEventName,Flag
-//
-// 01. CastleID                  Unique ID of the castle. Must remain unique across all map-servers.
-// 02. MapName                   Map name to be considered as the castle map.
-// 03. CastleName                Name of the castle (used by scripts and guardian name tags).
-// 04. OnGuildBreakEventName     NPC unique name to invoke ::OnGuildBreak on, when a occupied
-//                               castle is abandoned during guild break.
-// 05. Flag                      Switch flag (reserved as of athena-dev mod0796~0801, not used by server).
-
-
diff --git a/db/constants.conf b/db/constants.conf
index 8c856702..4c83ec8c 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -424,6 +424,8 @@ constants_db: {
 	mf_noviewid:           56
 	mf_pairship_startable: 57
 	mf_pairship_endable:   58
+	mf_nostorage:          59
+	mf_nogstorage:         60
 
 	comment__: "Cell Properties"
 	cell_walkable:      0
@@ -1401,36 +1403,53 @@ constants_db: {
 	SC_CLAN_INFO:                     654
 
 	comment__: "petstat"
-	PET_CLASS:    1
-	PET_NAME:     2
-	PET_LEVEL:    3
-	PET_HUNGRY:   4
-	PET_INTIMATE: 5
+	comment__: "petstat - deprecated, use *getpetinfo"
+	PET_CLASS: {
+		Value: 1
+		Deprecated: true
+	}
+	PET_NAME: {
+		Value: 2
+	Deprecated: true
+	}
+	PET_LEVEL: {
+		Value: 3
+	Deprecated: true
+	}
+	PET_HUNGRY: {
+		Value: 4
+		Deprecated: true
+	}
+	PET_INTIMATE: {
+		Value: 5
+		Deprecated: true
+	}
 
 	comment__: "getmonsterinfo"
-	MOB_NAME:     0
-	MOB_LV:       1
-	MOB_MAXHP:    2
-	MOB_BASEEXP:  3
-	MOB_JOBEXP:   4
-	MOB_ATK1:     5
-	MOB_ATK2:     6
-	MOB_DEF:      7
-	MOB_MDEF:     8
-	MOB_STR:      9
-	MOB_AGI:     10
-	MOB_VIT:     11
-	MOB_INT:     12
-	MOB_DEX:     13
-	MOB_LUK:     14
-	MOB_RANGE:   15
-	MOB_RANGE2:  16
-	MOB_RANGE3:  17
-	MOB_SIZE:    18
-	MOB_RACE:    19
-	MOB_ELEMENT: 20
-	MOB_MODE:    21
-	MOB_MVPEXP:  22
+	MOB_NAME:             0
+	MOB_LV:               1
+	MOB_MAXHP:            2
+	MOB_BASEEXP:          3
+	MOB_JOBEXP:           4
+	MOB_ATK1:             5
+	MOB_ATK2:             6
+	MOB_DEF:              7
+	MOB_MDEF:             8
+	MOB_STR:              9
+	MOB_AGI:             10
+	MOB_VIT:             11
+	MOB_INT:             12
+	MOB_DEX:             13
+	MOB_LUK:             14
+	MOB_RANGE:           15
+	MOB_RANGE2:          16
+	MOB_RANGE3:          17
+	MOB_SIZE:            18
+	MOB_RACE:            19
+	MOB_ELEMENT:         20
+	MOB_MODE:            21
+	MOB_MVPEXP:          22
+	MOB_DMG_TAKEN_RATE:  23
 
 	comment__: "mercenary guilds"
 	ARCH_MERC_GUILD:  0
@@ -3726,71 +3745,6 @@ constants_db: {
 	SEX_MALE:   1
 	SEX_ANY:    2
 
-	comment__: "Script Unit Data Types"
-	UDT_TYPE:             0
-	UDT_SIZE:             1
-	UDT_LEVEL:            2
-	UDT_HP:               3
-	UDT_MAXHP:            4
-	UDT_SP:               5
-	UDT_MAXSP:            6
-	UDT_MASTERAID:        7
-	UDT_MASTERCID:        8
-	UDT_MAPIDXY: {
-		Value: 9
-		Deprecated: true // for setunitdata use *unitwarp, for getunitdata use *getmapxy
-	}
-	UDT_WALKTOXY: {
-		Value: 10
-		Deprecated: true // use *unitwalk
-	}
-	UDT_SPEED:           11
-	UDT_MODE:            12
-	UDT_AI:              13
-	UDT_SCOPTION:        14
-	UDT_SEX:             15
-	UDT_CLASS:           16
-	UDT_HAIRSTYLE:       17
-	UDT_HAIRCOLOR:       18
-	UDT_HEADBOTTOM:      19
-	UDT_HEADMIDDLE:      20
-	UDT_HEADTOP:         21
-	UDT_CLOTHCOLOR:      22
-	UDT_SHIELD:          23
-	UDT_WEAPON:          24
-	UDT_LOOKDIR:         25
-	UDT_CANMOVETICK:     26
-	UDT_STR:             27
-	UDT_AGI:             28
-	UDT_VIT:             29
-	UDT_INT:             30
-	UDT_DEX:             31
-	UDT_LUK:             32
-	UDT_ATKRANGE:        33
-	UDT_ATKMIN:          34
-	UDT_ATKMAX:          35
-	UDT_MATKMIN:         36
-	UDT_MATKMAX:         37
-	UDT_DEF:             38
-	UDT_MDEF:            39
-	UDT_HIT:             40
-	UDT_FLEE:            41
-	UDT_PDODGE:          42
-	UDT_CRIT:            43
-	UDT_RACE:            44
-	UDT_ELETYPE:         45
-	UDT_ELELEVEL:        46
-	UDT_AMOTION:         47
-	UDT_ADELAY:          48
-	UDT_DMOTION:         49
-	UDT_HUNGER:          50
-	UDT_INTIMACY:        51
-	UDT_LIFETIME:        52
-	UDT_MERC_KILLCOUNT:  53
-	UDT_STATADD:         54
-	UDT_ROBE:            55
-	UDT_BODY2:           56
-
 	comment__: "HatEffect Constants"
 	HAT_EF_BLOSSOM_FLUTTERING:     1
 	HAT_EF_MERMAID_LONGING:        2
@@ -3958,13 +3912,22 @@ constants_db: {
     G_OTHER:        3
 
     comment__: "races"
-    Human:  0
-    Ukar:   1
-    Demon:  2
-    Elven:  3
-    Orc:    4
-    Raijin: 5
-    Tritan: 6
+    Human:        0
+    DarkUkar:     1
+    FireKralog:   2
+    LightRaijin:  3
+    FrostKralog:  4
+    DarkRaijin:   5
+    BlueTritan:   6
+    MediumHuman:  7
+    DarkHuman:    8
+    PurpleTritan: 9
+    PinkUkar:     10
+
+    comment__: "getraceflags"
+    GETRACE_RACE: 0
+    GETRACE_SKIN: 1
+    GETRACE_FULL: 2
 
     comment__: "directions"
     DOWN:           0
@@ -3976,6 +3939,12 @@ constants_db: {
     RIGHT:          6
     DOWNRIGHT:      7
 
+	comment__: "seasons"
+	WINTER:         0
+	SPRING:         1
+	SUMMER:         2
+	AUTUMN:         3
+
     comment__: "speechflags"
     S_FIRST_BLANK_LINE: 1
     S_LAST_BLANK_LINE:  2
@@ -4070,6 +4039,29 @@ constants_db: {
     NPC_SABINE:             184
     NPC_MIKHAIL:            185
     NPC_TROUPE_LEADER:      186
+    NPC_SIMON:              187
+    NPC_MORCANT:            188
+    NPC_THAMAS:             189
+    NPC_MORGAN:             190
+    NPC_ZITONI:             191
+    NPC_ROSEN:              192
+    NPC_TANISHA:            193
+    NPC_SORFINA:            194
+    NPC_JESSIE:             195
+    NPC_PRAWORS:            196
+    NPC_KAAN:               197
+    NPC_AIDAN:              198
+    NPC_ISHI:               199
+    NPC_LIANA:              200
+    NPC_AYASHA:             201
+    NPC_ZEGAS:              202
+    NPC_NYLE:               203
+    NPC_CYNRIC:             204
+    NPC_VINCENT:            205
+    NPC_AAHNA:              206
+    NPC_HASAN:              207
+    NPC_CRASMANDE:          208
+    NPC_MANATREE:           210
 
     NPC_CONFUSED_TREE:      400
     NPC_ALIGE:              401
@@ -4135,6 +4127,8 @@ constants_db: {
     NPC_YANNIKA:            463
     NPC_FLAG_L:             464
     NPC_FLAG_R:             465
+    NPC_TOICHI:             466
+    NPC_TREASURE:           469
 
     NPC_TEST1:              800
     NPC_PLAYER:             801
@@ -4246,5 +4240,8 @@ constants_db: {
     LANG_ON_SEA:    1
     LANG_IN_SHIP:   2
 
+    comment__: "Misc settings"
+    CHEST_WAITTIME: 900 // 15 minutes
+
     @include "conf/import/constants.conf"
 }
diff --git a/db/item_options.conf b/db/item_options.conf
index 95e2316a..9a827dca 100644
--- a/db/item_options.conf
+++ b/db/item_options.conf
@@ -1032,5 +1032,85 @@ item_options_db: (
 	Id: 186
 	Name: "BODY_INDESTRUCTIBLE"
 	Script: <" bonus(bUnbreakableArmor, 1); ">
+},
+{
+	Id: 187
+	Name: "IOPT_SPLASHDAMAGE"
+	Script: <" bonus(bSplashAddRange, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 188
+	Name: "IOPT_WALKSPEED"
+	Script: <" bonus(bSpeedAddRate, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 189
+	Name: "IOPT_EXPGAIN"
+	Script: <" bonus2(bExpAddRace, RC_All, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 190
+	Name: "IOPT_DOUBLEATTACK"
+	Script: <" bonus(bDoubleAddRate, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 191
+	Name: "IOPT_SCRESIST_POISON"
+	Script: <" bonus2(bResEff,Eff_Poison, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 192
+	Name: "IOPT_SCRESIST_SILENCE"
+	Script: <" bonus2(bResEff,Eff_Silence, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 193
+	Name: "IOPT_SCRESIST_CURSE"
+	Script: <" bonus2(bResEff,Eff_Curse, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 194
+	Name: "IOPT_SCRESIST_BLIND"
+	Script: <" bonus2(bResEff,Eff_Blind, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 195
+	Name: "IOPT_SCPROVOKE_POISON"
+	Script: <" bonus2(bAddEff,Eff_Poison, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 196
+	Name: "IOPT_SCPROVOKE_SILENCE"
+	Script: <" bonus2(bAddEff,Eff_Silence, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 197
+	Name: "IOPT_SCPROVOKE_CURSE"
+	Script: <" bonus2(bAddEff,Eff_Curse, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 198
+	Name: "IOPT_SCPROVOKE_BLIND"
+	Script: <" bonus2(bAddEff,Eff_Blind, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 199
+	Name: "IOPT_CRITDMG"
+	Script: <" bonus(bCritAtkRate, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 200
+	Name: "IOPT_RICHNESS"
+	Script: <" bonus2(bAddGetZenyNum, -2, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 201
+	Name: "VINTAGE_WPN"
+	Script: <" bonus2(bAddRace2, RC_All, -50); ">
+},
+{
+	Id: 202
+	Name: "VINTAGE_ARM"
+	Script: <" bonus2(bAddDefClass, RC_All, -20); ">
 }
 )
diff --git a/db/job_db2.txt b/db/job_db2.txt
index e15f683f..a8d71ed4 100644
--- a/db/job_db2.txt
+++ b/db/job_db2.txt
@@ -12,17 +12,43 @@
 //  5 = DEX increased by 1 at this job level
 //  6 = LUK increased by 1 at this job level
 //
-// Human
-0,0,6,5,0,2,3,0,1,4,0
-// Ukar
-1,0,6,5,0,2,3,0,1,4,0
-// Demon
-2,0,6,5,0,2,3,0,1,4,0
-// Elven
-3,0,6,5,0,2,3,0,1,4,0
-// Orc
-4,0,6,5,0,2,3,0,1,4,0
-// Raijin
-5,0,6,5,0,2,3,0,1,4,0
-// Tritan
-6,0,6,5,0,2,3,0,1,4,0
+// See also: https://gitlab.com/evol/evol-all/issues/67
+//
+
+// .:: HUMANS ::.
+// Kaizei Human
+0,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1,0,0,0,0,5,0,0,0,0,4,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1
+// Argaes Human
+0,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1,0,0,0,0,5,0,0,0,0,4,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1
+// Tonori Human
+0,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1,0,0,0,0,5,0,0,0,0,4,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,2,0,0,0,0,1
+
+
+// .:: RAIJINS ::.
+// Light Raijin
+3,0,0,0,0,4,0,0,0,0,5,0,0,0,0,2,0,0,0,0,4,0,0,0,0,6,0,0,0,0,2,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,4,0,0,0,0,4,0,0,0,0,5,0,0,0,0,2,0,0,0,0,4,0,0,0,0,6,0,0,0,0,2,0,0,0,0,4,0,0,0,0,5
+// Dark Raijin
+5,0,0,0,0,4,0,0,0,0,5,0,0,0,0,2,0,0,0,0,4,0,0,0,0,6,0,0,0,0,2,0,0,0,0,4,0,0,0,0,5,0,0,0,0,6,0,0,0,0,4,0,0,0,0,4,0,0,0,0,5,0,0,0,0,2,0,0,0,0,4,0,0,0,0,6,0,0,0,0,2,0,0,0,0,4,0,0,0,0,5
+
+
+// .:: KRALOGS ::.
+// Fire Kralog
+2,0,0,0,0,1,0,0,0,0,6,0,0,0,0,3,0,0,0,0,5,0,0,0,0,1,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,6,0,0,0,0,4,0,0,0,0,1,0,0,0,0,6,0,0,0,0,3,0,0,0,0,5,0,0,0,0,1,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1
+// Frost Kralog
+4,0,0,0,0,1,0,0,0,0,6,0,0,0,0,3,0,0,0,0,5,0,0,0,0,1,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1,0,0,0,0,6,0,0,0,0,4,0,0,0,0,1,0,0,0,0,6,0,0,0,0,3,0,0,0,0,5,0,0,0,0,1,0,0,0,0,3,0,0,0,0,2,0,0,0,0,1
+
+
+// .:: UKARS ::.
+// Cave Ukar
+1,0,0,0,0,3,0,0,0,0,1,0,0,0,0,2,0,0,0,0,3,0,0,0,0,5,0,0,0,0,6,0,0,0,0,1,0,0,0,0,3,0,0,0,0,5,0,0,0,0,2,0,0,0,0,3,0,0,0,0,1,0,0,0,0,2,0,0,0,0,3,0,0,0,0,5,0,0,0,0,6,0,0,0,0,1,0,0,0,0,3
+// Mountain Ukar
+10,0,0,0,0,3,0,0,0,0,1,0,0,0,0,2,0,0,0,0,3,0,0,0,0,5,0,0,0,0,6,0,0,0,0,1,0,0,0,0,3,0,0,0,0,5,0,0,0,0,2,0,0,0,0,3,0,0,0,0,1,0,0,0,0,2,0,0,0,0,3,0,0,0,0,5,0,0,0,0,6,0,0,0,0,1,0,0,0,0,3
+
+
+// .:: TRITANS ::.
+// Sea Tritan
+6,0,0,0,0,2,0,0,0,0,5,0,0,0,0,4,0,0,0,0,6,0,0,0,0,3,0,0,0,0,5,0,0,0,0,2,0,0,0,0,4,0,0,0,0,2,0,0,0,0,1,0,0,0,0,2,0,0,0,0,5,0,0,0,0,4,0,0,0,0,6,0,0,0,0,3,0,0,0,0,5,0,0,0,0,2,0,0,0,0,4,0,0,0,0,2,0,0,0,0,1
+// Lake Tritan
+9,0,0,0,0,2,0,0,0,0,5,0,0,0,0,4,0,0,0,0,6,0,0,0,0,3,0,0,0,0,5,0,0,0,0,2,0,0,0,0,4,0,0,0,0,2,0,0,0,0,1,0,0,0,0,2,0,0,0,0,5,0,0,0,0,4,0,0,0,0,6,0,0,0,0,3,0,0,0,0,5,0,0,0,0,2,0,0,0,0,4,0,0,0,0,2,0,0,0,0,1
+
+
diff --git a/db/map_index.txt b/db/map_index.txt
index 9885b94d..59a69dbf 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -53,41 +53,61 @@
 001-2-9 53
 001-3-0 54
 001-3-1 55
-008-1-1 56
-008-1 57
-008-2-0 58
-008-2-1 59
-008-2-10 60
-008-2-11 61
-008-2-12 62
-008-2-13 63
-008-2-14 64
-008-2-15 65
-008-2-16 66
-008-2-17 67
-008-2-18 68
-008-2-19 69
-008-2-2 70
-008-2-20 71
-008-2-21 72
-008-2-22 73
-008-2-23 74
-008-2-24 75
-008-2-25 76
-008-2-26 77
-008-2-27 78
-008-2-28 79
-008-2-29 80
-008-2-3 81
-008-2-30 82
-008-2-4 83
-008-2-5 84
-008-2-6 85
-008-2-7 86
-008-2-8 87
-008-2-9 88
-008-3-0 89
-008-3-1 90
-008-4-1 91
-test 92
-testbg 93
+001-3-2 56
+008-1-1 57
+008-1-2 58
+008-1 59
+008-2-0 60
+008-2-1 61
+008-2-10 62
+008-2-11 63
+008-2-12 64
+008-2-13 65
+008-2-14 66
+008-2-15 67
+008-2-16 68
+008-2-17 69
+008-2-18 70
+008-2-19 71
+008-2-2 72
+008-2-20 73
+008-2-21 74
+008-2-22 75
+008-2-23 76
+008-2-24 77
+008-2-25 78
+008-2-26 79
+008-2-27 80
+008-2-28 81
+008-2-29 82
+008-2-3 83
+008-2-30 84
+008-2-31 85
+008-2-32 86
+008-2-4 87
+008-2-5 88
+008-2-6 89
+008-2-7 90
+008-2-8 91
+008-2-9 92
+008-3-0 93
+008-3-1 94
+008-3-2 95
+008-3-3 96
+008-3-4 97
+008-3-5 98
+008-3-6 99
+012-1 100
+012-2-1 101
+012-2-2 102
+012-2-3 103
+012-2-4 104
+012-2-5 105
+012-2-6 106
+012-2-7 107
+012-3-1 108
+012-3-2 109
+012-3-3 110
+sec_pri 111
+test 112
+testbg 113
diff --git a/db/mob_db2.conf b/db/mob_db2.conf
index 015bae63..e21cc2a2 100644
--- a/db/mob_db2.conf
+++ b/db/mob_db2.conf
@@ -57,13 +57,15 @@ mob_db: (
 	MvpExp: mvp experience                (int, defaults to 0)
 	MvpDrops: {
 		AegisName: chance             (string: int)
-		...
+		// ...
 	}
 	Drops: {
 		AegisName: chance         (string: int)
-		...
+		// or
+		AegisName: (chance, "Option Drop Group")
+		// ...
 	}
-
+	DamageTakenRate: damage taken rate    (int, defaults to 100)
 },
 ******************************************************************************/
 
diff --git a/db/option_drop_groups.conf b/db/option_drop_groups.conf
new file mode 100644
index 00000000..b293be19
--- /dev/null
+++ b/db/option_drop_groups.conf
@@ -0,0 +1,53 @@
+//================= 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/>.
+//=========================================================================
+//= Random Option Drop Group Database
+//=========================================================================
+
+option_drop_group_db: (
+{
+/**************************************************************************
+ ************* Entry structure ********************************************
+ **************************************************************************
+	<Group Name Constant>: (
+		{ // Option Slot 1
+			Rate: (int) chance of filling option slot 1 (100 = 1%)
+
+			// Possible options for slot 1
+			// min/max value : int, defaults to 0
+			// chance : int, 100 = 1% if not set, will be 100%/number of possibiltiies
+			OptionName: value
+			// or
+			OptionName: [min value, max value]
+			// or
+			OptionName: [min value, max value, chance]
+			// ...  (as many as you want)
+		},
+		// ... (up to MAX_ITEM_OPTION)
+	),
+**************************************************************************/
+}
+)
diff --git a/db/quest_db.conf b/db/quest_db.conf
index 2eef4e8d..5f0b27ab 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -162,6 +162,10 @@ quest_db: (
     Name: "Artis_Legion_Progress"
 },
 {
+    Id: 34
+    Name: "ArtisQuests_TrainingLegion"
+ },
+{
     Id: 36
     Name: "HurnscaldQuests_Hinnak"
 },
@@ -186,6 +190,10 @@ quest_db: (
 	Name: "General_Cooking"
 },
 {
+	Id: 42
+	Name: "General_Brotherhood"
+},
+{
 	Id: 1000
 	Name: "Test_testing1"
 },
diff --git a/db/re/attr_fix.txt b/db/re/attr_fix.txt
index 96d6b37d..b79ff7fe 100644
--- a/db/re/attr_fix.txt
+++ b/db/re/attr_fix.txt
@@ -4,53 +4,53 @@
 // Column: attacker's weapon element
 
 1,10	// lv1 Attribute table
-//Neut Watr Erth Fire Wind Pois Holy Shdw Gho  Und
-  100, 100, 100, 100, 100, 100, 100, 100,  70, 100,  // Neutral
-  100,  25, 100, 150,  90, 100,  75, 100, 100, 100,  // Water
-  100, 100,  25,  90, 150, 100,  75, 100, 100, 100,  // Earth
-  100,  90, 150,  25, 100, 100,  75, 100, 100, 125,  // Fire
-  100, 175,  90, 100,  25, 100,  75, 100, 100, 100,  // Wind
-  100, 100, 125, 125, 125,   0,  75,  50, 100, -25,  // Poison
-  100, 100, 100, 100, 100, 100,   0, 125, 100, 150,  // Holy
-  100, 100, 100, 100, 100,  50, 125,   0, 100, -25,  // Shadow
-   70, 100, 100, 100, 100, 100,  75,  75, 125, 100,  // Ghost
-  100, 100, 100, 100, 100,  50, 100,   0, 100,   0,  // Undead
+//Neut Watr Natr Fire NYI  NYI Holy Shdw  NYI  NYI
+  100, 100, 100, 100, 100, 100, 100, 100, 100, 100,  // Neutral
+  100,  90, 120,  80, 100, 100, 100, 100, 100, 100,  // Water
+  100,  80,  90, 120, 100, 100, 100, 100, 100, 100,  // Nature
+  100, 120,  80,  90, 100, 100, 100, 100, 100, 100,  // Fire
+  100, 100, 100, 100,  90, 100, 100, 100, 100, 100,  // UNUSED
+  100, 100, 100, 100, 100,  90, 100, 100, 100, 100,  // UNUSED
+  100, 100, 100, 100, 100, 100,  90, 120, 100, 100,  // Holy
+  100, 100, 100, 100, 100, 100, 120,  90, 100, 100,  // Shadow
+  100, 100, 100, 100, 100, 100, 100, 100,  90, 100,  // UNUSED
+  100, 100, 100, 100, 100, 100, 100, 100, 100,  90,  // UNUSED
 
 2,10	// lv2 Attribute table
-//Neut Watr Erth Fire Wind Pois Holy Shdw Gho  Und
-  100, 100, 100, 100, 100, 100, 100, 100,  50, 100,  // Neutral
-  100,   0, 100, 175,  80, 100,  50,  75, 100, 100,  // Water
-  100, 100,   0,  80, 175, 100,  50,  75, 100, 100,  // Earth
-  100,  80, 175,   0, 100, 100,  50,  75, 100, 150,  // Fire
-  100, 175,  80, 100,   0, 100,  50,  75, 100, 100,  // Wind
-  100,  75, 125, 125, 125,   0,  50,  25,  75, -50,  // Poison
-  100, 100, 100, 100, 100, 100, -25, 150, 100, 175,  // Holy
-  100, 100, 100, 100, 100,  25, 150, -25, 100, -50,  // Shadow
-   50,  75,  75,  75,  75,  75,  50,  50, 150, 125,  // Ghost
-  100,  75,  75,  75,  75,  25, 125,   0, 100,   0,  // Undead
+//Neut Watr Natr Fire NYI  NYI Holy Shdw  NYI  NYI
+  100, 100, 100, 100, 100, 100, 100, 100, 100, 100,  // Neutral
+  100,  90, 130,  70, 100, 100, 100, 100, 100, 100,  // Water
+  100,  70,  90, 130, 100, 100, 100, 100, 100, 100,  // Nature
+  100, 130,  70,  90, 100, 100, 100, 100, 100, 100,  // Fire
+  100, 100, 100, 100,  90, 100, 100, 100, 100, 100,  // UNUSED
+  100, 100, 100, 100, 100,  90, 100, 100, 100, 100,  // UNUSED
+  100, 100, 100, 100, 100, 100,  90, 130, 100, 100,  // Holy
+  100, 100, 100, 100, 100, 100, 130,  90, 100, 100,  // Shadow
+  100, 100, 100, 100, 100, 100, 100, 100,  90, 100,  // UNUSED
+  100, 100, 100, 100, 100, 100, 100, 100, 100,  90,  // UNUSED
 
 3,10	// lv3 Attribute table
-//Neut Watr Erth Fire Wind Pois Holy Shdw Gho  Und
-  100, 100, 100, 100, 100, 100, 100, 100,   0, 100,  // Neutral
-  100, -25, 100, 200,  70, 100,  25,  50, 100, 125,  // Water
-  100, 100, -25,  70, 200, 100,  25,  50, 100, 100,  // Earth
-  100,  70, 200, -25, 100, 100,  25,  50, 100, 175,  // Fire
-  100, 200,  70, 100, -25, 100,  25,  50, 100, 100,  // Wind
-  100,  50, 100, 100, 100,   0,  25,   0,  50, -75,  // Poison
-  100, 100, 100, 100, 100, 125, -50, 175, 100, 200,  // Holy
-  100, 100, 100, 100, 100,   0, 175, -50, 100, -75,  // Shadow
-    0,  50,  50,  50,  50,  50,  25,  25, 175, 150,  // Ghost
-  100,  50,  50,  50,  50,   0, 150,   0, 100,   0,  // Undead
+//Neut Watr Natr Fire NYI  NYI Holy Shdw  NYI  NYI
+  100, 100, 100, 100, 100, 100, 100, 100, 100, 100,  // Neutral
+  100,  90, 140,  60, 100, 100, 100, 100, 100, 100,  // Water
+  100,  60,  90, 140, 100, 100, 100, 100, 100, 100,  // Nature
+  100, 140,  60,  90, 100, 100, 100, 100, 100, 100,  // Fire
+  100, 100, 100, 100,  90, 100, 100, 100, 100, 100,  // UNUSED
+  100, 100, 100, 100, 100,  90, 100, 100, 100, 100,  // UNUSED
+  100, 100, 100, 100, 100, 100,  90, 140, 100, 100,  // Holy
+  100, 100, 100, 100, 100, 100, 140,  90, 100, 100,  // Shadow
+  100, 100, 100, 100, 100, 100, 100, 100,  90, 100,  // UNUSED
+  100, 100, 100, 100, 100, 100, 100, 100, 100,  90,  // UNUSED
 
 4,10	// lv4 Attribute table
-//Neut Watr Erth Fire Wind Pois Holy Shdw Gho  Und
-  100, 100, 100, 100, 100, 100, 100, 100,   0, 100,  // Neutral
-  100, -50, 100, 200,  60,  75,   0,  25, 100, 150,  // Water
-  100, 100, -50,  60, 200,  75,   0,  25, 100,  50,  // Earth
-  100,  60, 200, -50, 100,  75,   0,  25, 100, 200,  // Fire
-  100, 200,  60, 100, -50,  75,   0,  25, 100, 100,  // Wind
-  100,  25,  75,  75,  75,   0,   0, -25,  25,-100,  // Poison
-  100,  75,  75,  75,  75, 125,-100, 200, 100, 200,  // Holy
-  100,  75,  75,  75,  75, -25, 200,-100, 100,-100,  // Shadow
-    0,  25,  25,  25,  25,  25,   0,   0, 200, 175,  // Ghost
-  100,  25,  25,  25,  25, -25, 175,   0, 100,   0,  // Undead
+//Neut Watr Natr Fire NYI  NYI Holy Shdw  NYI  NYI
+  100, 100, 100, 100, 100, 100, 100, 100, 100, 100,  // Neutral
+  100,  90, 150,  50, 100, 100, 100, 100, 100, 100,  // Water
+  100,  50,  90, 150, 100, 100, 100, 100, 100, 100,  // Nature
+  100, 150,  50,  90, 100, 100, 100, 100, 100, 100,  // Fire
+  100, 100, 100, 100,  90, 100, 100, 100, 100, 100,  // UNUSED
+  100, 100, 100, 100, 100,  90, 100, 100, 100, 100,  // UNUSED
+  100, 100, 100, 100, 100, 100,  90, 150, 100, 100,  // Holy
+  100, 100, 100, 100, 100, 100, 150,  90, 100, 100,  // Shadow
+  100, 100, 100, 100, 100, 100, 100, 100,  90, 100,  // UNUSED
+  100, 100, 100, 100, 100, 100, 100, 100, 100,  90,  // UNUSED
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 0dd35a51..38963955 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -34,97 +34,97 @@ item_db: (
  ************* Entry structure ************************************************
  ******************************************************************************
 {
-	// =================== Mandatory fields ===============================
-	Id: ID                        (int)
-	AegisName: "Aegis_Name"       (string)
-	Name: "Item Name"             (string)
-	// =================== Optional fields ================================
-	Type: Item Type               (string, defaults to "IT_ETC")
-	Buy: Buy Price                (int, defaults to Sell * 2)
-	Sell: Sell Price              (int, defaults to Buy / 2)
-	Weight: Item Weight           (int, defaults to 0)
-	Atk: Attack                   (int, defaults to 0)
-	Matk: Magical Attack          (int, defaults to 0, ignored in pre-re)
-	Def: Defense                  (int, defaults to 0)
-	Range: Attack Range           (int, defaults to 0)
-	MinRange: Minimal Attack Range (int, defaults to 0)
-	Slots: Slots                  (int, defaults to 0)
-	Job: Job mask                 (int, defaults to all jobs = 0xFFFFFFFF)
-	Upper: Upper mask             (bitmask array, string or int, defaults to "ITEMUPPER_ALL")
-	Gender: Gender                (string, defaults to "SEX_ANY")
-	Loc: Equip location           (bitmask array, string or int, required value for equipment)
-	WeaponLv: Weapon Level        (int, defaults to 0)
-	EquipLv: Equip required level (int, defaults to 0)
-	EquipLv: [min, max]           (alternative syntax with min / max level)
-	Refine: Refineable            (boolean, defaults to true)
-	DisableOptions: true/false    (boolean, defaults to false !!for equipments only!!) [Smokexyz]
-	Subtype: Item Subtype         (int, defaults to 0)
-	ViewSprite: Sprite view ID    (int, defaults to 0)
-	BindOnEquip: true/false       (boolean, defaults to false)
-	ForceSerial: true/false       (boolean, defaults to false)
-	BuyingStore: true/false       (boolean, defaults to false)
-	Delay: Delay to use item      (int, defaults to 0)
-	FloorLifeTime: Delay to remove item from ground (int, default flooritem_lifetime)
-	KeepAfterUse: true/false      (boolean, defaults to false)
-	DropAnnounce: true/false      (boolean, defaults to false)
-	ShowDropEffect: true/false    (boolean, defaults to false)
-	DropEffectMode: Effect Type   (int, default to 0)
-	AllowPickup: true/false       (boolean, defaults to true)
-	Charm: true/false             (boolean, defaults to false)
-	MaxFloorOffset: [x, y]        (int, defaults to 8)
-	MaxFloorOffset: offset        (int, defaults to 8)
-	Identified: true/false        (boolean, default to true)
-	RequiredStr: required strength (int, default to 0)
-	RequiredAgi: required agility  (int, default to 0)
-	RequiredVit: required vitality (int, default to 0)
-	RequiredInt: required intellect (int, default to 0)
-	RequiredDex: required dexterity (int, default to 0)
-	RequiredLuk: required luck     (int, default to 0)
-	RequiredMaxHp: required max hp (int, default to 0)
-	RequiredMaxSp: required max sp (int, default to 0)
-	RequiredAtk: required attack   (int, default to 0)
-	RequiredMAtkMin: required minimal magic attack (int, default to 0)
-	RequiredMAtkMax: required maximum magic attack (int, default to 0)
-	RequiredDef: required defence  (int, default to 0)
-	RequiredMDef: required magic defence (int, default to 0)
-	RequiredSkill: required skill (int, default to 0)
-	UseEffect: effect if use/equip item success (int, default to -1)
-	UseFailEffect: effect if use/equip item failed (int, default to -1)
-	UnequipEffect: effect if unequip item success (int, default to -1)
-	UnequipFailEffect: effect if unequip item failed (int, default to -1)
-	Trade: {                      (defaults to no restrictions)
-		override: GroupID             (int, defaults to 100)
-		nodrop: true/false            (boolean, defaults to false)
-		notrade: true/false           (boolean, defaults to false)
-		partneroverride: true/false   (boolean, defaults to false)
-		noselltonpc: true/false       (boolean, defaults to false)
-		nocart: true/false            (boolean, defaults to false)
-		nostorage: true/false         (boolean, defaults to false)
-		nogstorage: true/false        (boolean, defaults to false)
-		nomail: true/false            (boolean, defaults to false)
-		noauction: true/false         (boolean, defaults to false)
-	}
-	Nouse: {                      (defaults to no restrictions)
-		override: GroupID             (int, defaults to 100)
-		sitting: true/false           (boolean, defaults to false)
-	}
-	Stack: [amount, type]         (int, defaults to 0)
-	Sprite: SpriteID              (int, defaults to 0)
-	Script: <"
-		Script
-		(it can be multi-line)
-	">
-	OnEquipScript: <" OnEquip Script (can also be multi-line) ">
-	OnUnequipScript: <" OnUnequip Script (can also be multi-line) ">
-	OnDropScript: <" OnDrop Script (can also be multi-line) ">
-	OnTakeScript: <" OnTake Script (can also be multi-line) ">
-	OnInsertCardScript: <" OnInsert card Script (can also be multi-line) ">
-	AllowCards: {
-		idNUM: amount         (NUM is id number, amount is amount)
-	}
-	AllowAmmo: {
-		idNUM: something      (NUM is id number)
-	}
+    // =================== Mandatory fields ===============================
+    Id: ID                        (int)
+    AegisName: "Aegis_Name"       (string)
+    Name: "Item Name"             (string)
+    // =================== Optional fields ================================
+    Type: Item Type               (string, defaults to "IT_ETC")
+    Buy: Buy Price                (int, defaults to Sell * 2)
+    Sell: Sell Price              (int, defaults to Buy / 2)
+    Weight: Item Weight           (int, defaults to 0)
+    Atk: Attack                   (int, defaults to 0)
+    Matk: Magical Attack          (int, defaults to 0, ignored in pre-re)
+    Def: Defense                  (int, defaults to 0)
+    Range: Attack Range           (int, defaults to 0)
+    MinRange: Minimal Attack Range (int, defaults to 0)
+    Slots: Slots                  (int, defaults to 0)
+    Job: Job mask                 (int, defaults to all jobs = 0xFFFFFFFF)
+    Upper: Upper mask             (bitmask array, string or int, defaults to "ITEMUPPER_ALL")
+    Gender: Gender                (string, defaults to "SEX_ANY")
+    Loc: Equip location           (bitmask array, string or int, required value for equipment)
+    WeaponLv: Weapon Level        (int, defaults to 0)
+    EquipLv: Equip required level (int, defaults to 0)
+    EquipLv: [min, max]           (alternative syntax with min / max level)
+    Refine: Refineable            (boolean, defaults to true)
+    DisableOptions: true/false    (boolean, defaults to false !!for equipments only!!) [Smokexyz]
+    Subtype: Item Subtype         (int, defaults to 0)
+    ViewSprite: Sprite view ID    (int, defaults to 0)
+    BindOnEquip: true/false       (boolean, defaults to false)
+    ForceSerial: true/false       (boolean, defaults to false)
+    BuyingStore: true/false       (boolean, defaults to false)
+    Delay: Delay to use item      (int, defaults to 0)
+    FloorLifeTime: Delay to remove item from ground (int, default flooritem_lifetime)
+    KeepAfterUse: true/false      (boolean, defaults to false)
+    DropAnnounce: true/false      (boolean, defaults to false)
+    ShowDropEffect: true/false    (boolean, defaults to false)
+    DropEffectMode: Effect Type   (int, default to 0)
+    AllowPickup: true/false       (boolean, defaults to true)
+    Charm: true/false             (boolean, defaults to false)
+    MaxFloorOffset: [x, y]        (int, defaults to 8)
+    MaxFloorOffset: offset        (int, defaults to 8)
+    Identified: true/false        (boolean, default to true)
+    RequiredStr: required strength (int, default to 0)
+    RequiredAgi: required agility  (int, default to 0)
+    RequiredVit: required vitality (int, default to 0)
+    RequiredInt: required intellect (int, default to 0)
+    RequiredDex: required dexterity (int, default to 0)
+    RequiredLuk: required luck     (int, default to 0)
+    RequiredMaxHp: required max hp (int, default to 0)
+    RequiredMaxSp: required max sp (int, default to 0)
+    RequiredAtk: required attack   (int, default to 0)
+    RequiredMAtkMin: required minimal magic attack (int, default to 0)
+    RequiredMAtkMax: required maximum magic attack (int, default to 0)
+    RequiredDef: required defence  (int, default to 0)
+    RequiredMDef: required magic defence (int, default to 0)
+    RequiredSkill: required skill (int, default to 0)
+    UseEffect: effect if use/equip item success (int, default to -1)
+    UseFailEffect: effect if use/equip item failed (int, default to -1)
+    UnequipEffect: effect if unequip item success (int, default to -1)
+    UnequipFailEffect: effect if unequip item failed (int, default to -1)
+    Trade: {                      (defaults to no restrictions)
+        override: GroupID             (int, defaults to 100)
+        nodrop: true/false            (boolean, defaults to false)
+        notrade: true/false           (boolean, defaults to false)
+        partneroverride: true/false   (boolean, defaults to false)
+        noselltonpc: true/false       (boolean, defaults to false)
+        nocart: true/false            (boolean, defaults to false)
+        nostorage: true/false         (boolean, defaults to false)
+        nogstorage: true/false        (boolean, defaults to false)
+        nomail: true/false            (boolean, defaults to false)
+        noauction: true/false         (boolean, defaults to false)
+    }
+    Nouse: {                      (defaults to no restrictions)
+        override: GroupID             (int, defaults to 100)
+        sitting: true/false           (boolean, defaults to false)
+    }
+    Stack: [amount, type]         (int, defaults to 0)
+    Sprite: SpriteID              (int, defaults to 0)
+    Script: <"
+        Script
+        (it can be multi-line)
+    ">
+    OnEquipScript: <" OnEquip Script (can also be multi-line) ">
+    OnUnequipScript: <" OnUnequip Script (can also be multi-line) ">
+    OnDropScript: <" OnDrop Script (can also be multi-line) ">
+    OnTakeScript: <" OnTake Script (can also be multi-line) ">
+    OnInsertCardScript: <" OnInsert card Script (can also be multi-line) ">
+    AllowCards: {
+        idNUM: amount         (NUM is id number, amount is amount)
+    }
+    AllowAmmo: {
+        idNUM: something      (NUM is id number)
+    }
 },
 ******************************************************************************/
 
@@ -136,18 +136,7 @@ item_db: (
     Buy: 20
     Sell: 7
     Weight: 3
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 501
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         if (@useType == 1)
@@ -175,18 +164,7 @@ item_db: (
     Buy: 50
     Sell: 15
     Weight: 25
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 502
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 25;
@@ -204,18 +182,7 @@ item_db: (
     Buy: 45
     Sell: 15
     Weight: 8
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 503
-    BindOnEquip: false
     Delay: 1000
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         sc_end SC_POISON;
@@ -234,18 +201,7 @@ item_db: (
     Buy: 55
     Sell: 18
     Weight: 3
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 504
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 30;
@@ -263,18 +219,7 @@ item_db: (
     Buy: 15
     Sell: 5
     Weight: 4
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 505
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 7;
@@ -292,18 +237,7 @@ item_db: (
     Buy: 30
     Sell: 10
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 506
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 15;
@@ -321,18 +255,7 @@ item_db: (
     Buy: 20
     Sell: 5
     Weight: 2
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 507
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 12;
@@ -350,17 +273,6 @@ item_db: (
     Buy: 3
     Sell: 1
     Weight: 4
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 508
-    BindOnEquip: false
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         sc_start SC_POISON, 30000, 0;
@@ -379,18 +291,7 @@ item_db: (
     Buy: 120
     Sell: 40
     Weight: 16
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 509
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 75;
@@ -408,17 +309,6 @@ item_db: (
     Buy: 10
     Sell: 3
     Weight: 10
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 510
-    BindOnEquip: false
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         sc_start2 SC_POISON, 1, 30, 3333;
@@ -437,17 +327,6 @@ item_db: (
     Buy: 20
     Sell: 4
     Weight: 10
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 511
-    BindOnEquip: false
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         sc_start2 SC_POISON, 1, 30, 6666;
@@ -466,18 +345,7 @@ item_db: (
     Buy: 75
     Sell: 25
     Weight: 38
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 512
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 65;
@@ -495,18 +363,6 @@ item_db: (
     Buy: 100
     Sell: 35
     Weight: 80
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 513
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
     Script: <"
         doevent "Croconut::OnUse";
     ">
@@ -519,18 +375,7 @@ item_db: (
     Buy: 30
     Sell: 10
     Weight: 25
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 514
-    BindOnEquip: false
     KeepAfterUse: true
-    Sprite: 0
     Script: <"
         doevent "#001-2-6-Book4::OnUse";
     ">
@@ -543,18 +388,7 @@ item_db: (
     Buy: 42
     Sell: 14
     Weight: 8
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 515
-    BindOnEquip: false
     Delay: 1000
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         sc_start SC_ATTHASTE_POTION1, 15000, 5;
@@ -573,17 +407,6 @@ item_db: (
     Buy: 5
     Sell: 2
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 516
-    BindOnEquip: false
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         sc_start2 SC_POISON, 1, 10, 2500;
@@ -598,22 +421,23 @@ item_db: (
     Buy: 30
     Sell: 10
     Weight: 2
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
     Loc: "EQP_HEAD_MID"
-    WeaponLv: 0
     EquipLv: 1
-    Refine: false
-    ViewSprite: 517
-    BindOnEquip: false
     Trade: {
         nodrop: true
         noselltonpc: true
+        nogstorage: true
+        nomail: true
     }
-    Sprite: 0
+    OnEquipScript: <"
+        if (gettimetick(2) < COOKIE_COOLDOWN) {
+            unequip(EQI_HEAD_MID);
+            //dispbottom l("You need to wait @@ more before equipping this again.", FuzzyTime(COOKIE_COOLDOWN));
+            end;
+        }
+        COOKIE_COOLDOWN=gettimetick(2)+600;
+        addtimer 60000, "#DeliciousCookie::OnUnequip";
+    ">
 },
 {
     Id: 518
@@ -623,18 +447,7 @@ item_db: (
     Buy: 50
     Sell: 18
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 518
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 28;
@@ -652,18 +465,7 @@ item_db: (
     Buy: 5
     Sell: 2
     Weight: 10
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 519
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 60;
@@ -681,18 +483,7 @@ item_db: (
     Buy: 140
     Sell: 20
     Weight: 15
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 520
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 110;
@@ -710,18 +501,7 @@ item_db: (
     Buy: 250
     Sell: 80
     Weight: 17
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 521
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 240;
@@ -739,18 +519,7 @@ item_db: (
     Buy: 600
     Sell: 150
     Weight: 16
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 522
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 575;
@@ -768,18 +537,7 @@ item_db: (
     Buy: 1000
     Sell: 150
     Weight: 14
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 523
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 1100;
@@ -797,18 +555,7 @@ item_db: (
     Buy: 2450
     Sell: 300
     Weight: 15
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 524
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 2300;
@@ -826,18 +573,7 @@ item_db: (
     Buy: 5000
     Sell: 500
     Weight: 20
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 525
-    BindOnEquip: false
     Delay: 1000
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         percentheal 100, 100;
@@ -851,18 +587,7 @@ item_db: (
     Buy: 3000
     Sell: 100
     Weight: 210
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 526
-    BindOnEquip: false
     KeepAfterUse: true
-    Sprite: 0
     Script: <"
         doevent "Shovel::OnUse";
     ">
@@ -875,18 +600,7 @@ item_db: (
     Buy: 200
     Sell: 5
     Weight: 5
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 527
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 30;
@@ -904,11 +618,7 @@ item_db: (
     Buy: 100
     Sell: 35
     Weight: 10
-    Refine: false
-    ViewSprite: 528
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 70;
@@ -926,13 +636,7 @@ item_db: (
     Buy: 150
     Sell: 25
     Weight: 10
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 529
-    BindOnEquip: false
     Delay: 1000
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         sc_start SC_ATTHASTE_POTION1, 30000, 5;
@@ -952,11 +656,7 @@ item_db: (
     Buy: 30
     Sell: 8
     Weight: 3
-    Refine: false
-    ViewSprite: 530
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 20;
@@ -974,11 +674,7 @@ item_db: (
     Buy: 100
     Sell: 20
     Weight: 10
-    Refine: false
-    ViewSprite: 531
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 40;
@@ -996,18 +692,7 @@ item_db: (
     Buy: 50
     Sell: 11
     Weight: 25
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 532
-    BindOnEquip: false
     KeepAfterUse: true
-    Sprite: 0
     Script: <"
         doevent "#001-2-6-Book1::OnUse";
     ">
@@ -1020,18 +705,7 @@ item_db: (
     Buy: 40
     Sell: 10
     Weight: 20
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 533
-    BindOnEquip: false
     KeepAfterUse: true
-    Sprite: 0
     Script: <"
         doevent "#001-2-6-Book2::OnUse";
     ">
@@ -1044,18 +718,7 @@ item_db: (
     Buy: 30
     Sell: 10
     Weight: 25
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 534
-    BindOnEquip: false
     KeepAfterUse: true
-    Sprite: 0
     Script: <"
         doevent "#001-2-6-Book3::OnUse";
     ">
@@ -1123,14 +786,14 @@ item_db: (
     Sell: 0
     Weight: 20
     KeepAfterUse: true
-	Trade: {
-		notrade: true
-		nodrop: true
-		noselltonpc: true
-		nogstorage: true
-		nomail: true
-		noauction: true
-	}
+    Trade: {
+        notrade: true
+        nodrop: true
+        noselltonpc: true
+        nogstorage: true
+        nomail: true
+        noauction: true
+    }
     Script: <"
         doevent "#MasterBook::OnUse";
     ">
@@ -1143,15 +806,11 @@ item_db: (
     Buy: 580
     Sell: 75
     Weight: 25
-    Refine: false
-    ViewSprite: 560
-    BindOnEquip: false
     Delay: 1200
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        @min = 200;
-        @max = 300;
+        @min = 400;
+        @max = 600;
         @delay = 8;
         @type = 1;
         doevent "rand_sc_heal::OnUse";
@@ -1165,15 +824,11 @@ item_db: (
     Buy: 640
     Sell: 85
     Weight: 25
-    Refine: false
-    ViewSprite: 561
-    BindOnEquip: false
     Delay: 850
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        @min = 150;
-        @max = 300;
+        @min = 200;
+        @max = 350;
         @delay = 4;
         @type = 1;
         doevent "rand_sc_heal::OnUse";
@@ -1187,15 +842,11 @@ item_db: (
     Buy: 870
     Sell: 90
     Weight: 25
-    Refine: false
-    ViewSprite: 562
-    BindOnEquip: false
     Delay: 700
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 250;
-        @max = 400;
+        @max = 450;
         @delay = 5;
         @type = 1;
         doevent "rand_sc_heal::OnUse";
@@ -1209,11 +860,7 @@ item_db: (
     Buy: 90
     Sell: 20
     Weight: 20
-    Refine: false
-    ViewSprite: 563
-    BindOnEquip: false
     Delay: 750
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 60;
@@ -1231,15 +878,11 @@ item_db: (
     Buy: 500
     Sell: 50
     Weight: 25
-    Refine: false
-    ViewSprite: 564
-    BindOnEquip: false
     Delay: 450
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        @min = 180;
-        @max = 360;
+        @min = 100;
+        @max = 120;
         @delay = 10;
         @type = 1;
         doevent "rand_sc_heal::OnUse";
@@ -1253,15 +896,11 @@ item_db: (
     Buy: 60
     Sell: 5
     Weight: 25
-    Refine: false
-    ViewSprite: 565
-    BindOnEquip: false
     Delay: 450
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        @min = 70;
-        @max = 100;
+        @min = 200;
+        @max = 350;
         @delay = 3;
         @type = 1;
         doevent "rand_sc_heal::OnUse";
@@ -1275,11 +914,7 @@ item_db: (
     Buy: 100
     Sell: 15
     Weight: 10
-    Refine: false
-    ViewSprite: 566
-    BindOnEquip: false
     Delay: 450
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 20;
@@ -1290,29 +925,42 @@ item_db: (
     ">
 },
 {
+    Id: 567
+    AegisName: "MaggotSlimePotion"
+    Name: "Maggot Slime Potion"
+    Type: "IT_HEALING"
+    Buy: 75
+    Sell: 15
+    Weight: 15
+    Refine: false
+    Delay: 450
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        @min = 10;
+        @max = 130;
+        @delay = 2;
+        @type = 1;
+        if (rand(100) < 50) {
+            getmapxy(.@m$, .@x, .@y, 0);
+            .@mobGID = monster(.@m$, .@x, .@y, "Maggot", Maggot, 1);
+            unitattack(.@mobGID, getcharid(3));
+        }
+        doevent "rand_sc_heal::OnUse";
+    ">
+},
+{
     Id: 600
     AegisName: "SmallHealing"
     Name: "Small Healing Potion"
     Type: "IT_HEALING"
-    Buy: 2500
-    Sell: 300
+    Buy: 500
+    Sell: 45
     Weight: 32
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 600
-    BindOnEquip: false
     Delay: 100
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        @min = 200;
-        @max = 300;
+        @min = 300;
+        @max = 500;
         @delay = 3;
         @type = 2;
         doevent "rand_sc_heal::OnUse";
@@ -1323,25 +971,14 @@ item_db: (
     AegisName: "MediumHealing"
     Name: "Medium Healing Potion"
     Type: "IT_HEALING"
-    Buy: 5000
-    Sell: 650
+    Buy: 850
+    Sell: 75
     Weight: 64
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 601
-    BindOnEquip: false
     Delay: 100
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        @min = 400;
-        @max = 600;
+        @min = 500;
+        @max = 800;
         @delay = 4;
         @type = 2;
         doevent "rand_sc_heal::OnUse";
@@ -1352,21 +989,10 @@ item_db: (
     AegisName: "LargeHealing"
     Name: "Large Healing Potion"
     Type: "IT_HEALING"
-    Buy: 10000
-    Sell: 1250
+    Buy: 2480
+    Sell: 350
     Weight: 128
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 602
-    BindOnEquip: false
     Delay: 100
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 800;
@@ -1381,21 +1007,10 @@ item_db: (
     AegisName: "SmallMana"
     Name: "Small Mana Potion"
     Type: "IT_HEALING"
-    Buy: 2000
-    Sell: 250
+    Buy: 750
+    Sell: 65
     Weight: 32
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 603
-    BindOnEquip: false
     Delay: 205
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         itemheal 0, 20;
@@ -1406,21 +1021,10 @@ item_db: (
     AegisName: "MediumMana"
     Name: "Medium Mana Potion"
     Type: "IT_HEALING"
-    Buy: 5000
-    Sell: 600
+    Buy: 1650
+    Sell: 205
     Weight: 64
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 604
-    BindOnEquip: false
     Delay: 250
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         itemheal 0, 50;
@@ -1431,19 +1035,9 @@ item_db: (
     AegisName: "LargeMana"
     Name: "Large Mana Potion"
     Type: "IT_HEALING"
-    Buy: 10000
-    Sell: 1500
+    Buy: 3240
+    Sell: 340
     Weight: 128
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 605
-    BindOnEquip: false
     Delay: 250
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
@@ -1459,18 +1053,7 @@ item_db: (
     Buy: 2500
     Sell: 650
     Weight: 25
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 606
-    BindOnEquip: false
     Delay: 100
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         sc_start SC_ATTHASTE_POTION1, 30000, 20;
@@ -1485,18 +1068,7 @@ item_db: (
     Buy: 2500
     Sell: 650
     Weight: 40
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 606
-    BindOnEquip: false
     Delay: 500
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         sc_start SC_INCATKRATE, 30000, 20;
@@ -1511,19 +1083,13 @@ item_db: (
     Buy: 25000
     Sell: 2750
     Weight: 25
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 608
-    BindOnEquip: false
     Delay: 1000
-    Sprite: 0
-    UseEffect: "EFFECT_HEAL"
+    KeepAfterUse: true
+    Script: <"
+        sc_start SC_CURSE, 30000, 100;
+        sc_start SC_POISON, 30000, 100;
+        dispbottom l("Yuck! I won't drink this!");
+    ">
 },
 {
     Id: 609
@@ -1533,18 +1099,7 @@ item_db: (
     Buy: 5000
     Sell: 325
     Weight: 250
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 609
-    BindOnEquip: false
     Delay: 100
-    Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
         @min = 350;
@@ -1552,10 +1107,104 @@ item_db: (
         @delay = 10;
         @type = 2;
         doevent "rand_sc_heal::OnUse";
-        bonus bMaxSP,20;
+        bonus bMaxSP,20; // FIXME
     ">
 },
 {
+    Id: 610
+    AegisName: "DeathPotion"
+    Name: "Death Potion"
+    Type: "IT_USABLE"
+    Buy: 5000
+    Sell: 325
+    Weight: 250
+    UseEffect: "EFFECT_HEAL"
+    Script: <"
+        percentheal -100, -100;
+    ">
+},
+{
+    Id: 611
+    AegisName: "GrassSeeds"
+    Name: "Grass Seeds"
+    Type: "IT_USABLE"
+    Buy: 200
+    Sell: 35
+    Weight: 3
+    Delay: 500
+    Script: <"
+        if (!getmapxy(.@map$, .@x, .@y, 0)) {
+            monster(.@map$, .@x, .@y, strmobinfo(1, CloverPatch), CloverPatch, 1);
+        }
+    ">
+},
+{
+    Id: 612
+    AegisName: "FlowerSeeds"
+    Name: "Flower Seeds"
+    Type: "IT_USABLE"
+    Buy: 500
+    Sell: 150
+    Weight: 4
+    Delay: 500
+    Script: <"
+        if (!getmapxy(.@map$, .@x, .@y, 0)) {
+            .@mob=callfunc("any", YellowRose, BlueRose, RedRose);
+            monster(.@map$, .@x, .@y, strmobinfo(1, .@mob), .@mob, 1);
+        }
+    ">
+},
+{
+    Id: 613
+    AegisName: "PurificationPotion"
+    Name: "Purification Potion"
+    Type: "IT_USABLE"
+    Buy: 25000
+    Sell: 2750
+    Weight: 25
+    Delay: 1000
+    KeepAfterUse: true
+    Script: <"
+        sc_start SC_CURSE, 30000, 100;
+        sc_start SC_POISON, 30000, 100;
+        dispbottom l("Yuck! I won't drink this!");
+    ">
+},
+{
+    Id: 614
+    AegisName: "SailorStew"
+    Name: "Sailor's Stew"
+    Type: "IT_USABLE"
+    Buy: 50000
+    Sell: 10
+    Weight: 650
+    Delay: 1000
+    Script: <"
+        sc_start SC_ATTHASTE_POTION1, 80000, 300; // These are totally placeholders. We want STR + 10 and VIT + 5 and max. HP + 2000 for three minutes.
+        sc_start SC_INCHITRATE, 80000, 300;
+    ">
+},
+{
+	Id: 615
+	AegisName: "TreasureMap"
+	Name: "Treasure Map"
+	Type: "IT_USABLE"
+	Buy: 45000
+	Sell: 300
+	Weight: 14
+	KeepAfterUse: true
+	Refine: false
+	Script: <"
+		// ShovelQuests_Assigned<MAP$,X,Y> → Coordinates for Treasure Map
+		if (!ShovelQuests_AssignedX) {
+			callfunc "shovel_genrandtreasure";
+		}
+		dispbottom l("A treasure is burried in @@, (@@, @@)", ShovelQuests_AssignedMAP$, ShovelQuests_AssignedX, ShovelQuests_AssignedY);
+	">
+},
+
+// Generic
+{
     Id: 700
     AegisName: "SmallTentacles"
     Name: "Small Tentacles"
@@ -1563,39 +1212,15 @@ item_db: (
     Buy: 50
     Sell: 16
     Weight: 5
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 700
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 701
     AegisName: "PiouFeathers"
     Name: "Piou Feathers"
-    Type: "IT_USABLE"
+    Type: "IT_ETC"
     Buy: 10
     Sell: 3
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 701
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 702
@@ -1605,18 +1230,6 @@ item_db: (
     Buy: 25
     Sell: 8
     Weight: 25
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 702
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 703
@@ -1626,18 +1239,6 @@ item_db: (
     Buy: 40
     Sell: 13
     Weight: 2
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 703
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 704
@@ -1647,18 +1248,6 @@ item_db: (
     Buy: 30
     Sell: 10
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 704
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 705
@@ -1668,18 +1257,6 @@ item_db: (
     Buy: 30
     Sell: 10
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 705
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 706
@@ -1689,18 +1266,6 @@ item_db: (
     Buy: 60
     Sell: 20
     Weight: 45
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 706
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 707
@@ -1710,18 +1275,6 @@ item_db: (
     Buy: 250
     Sell: 40
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 707
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 708
@@ -1731,18 +1284,6 @@ item_db: (
     Buy: 90
     Sell: 30
     Weight: 95
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 708
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 709
@@ -1752,18 +1293,6 @@ item_db: (
     Buy: 18
     Sell: 6
     Weight: 2
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 709
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 710
@@ -1773,18 +1302,6 @@ item_db: (
     Buy: 1000
     Sell: 200
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 710
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 711
@@ -1794,18 +1311,6 @@ item_db: (
     Buy: 100
     Sell: 35
     Weight: 10
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 711
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 712
@@ -1815,18 +1320,6 @@ item_db: (
     Buy: 80
     Sell: 27
     Weight: 10
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 712
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 713
@@ -1836,22 +1329,10 @@ item_db: (
     Buy: 2
     Sell: 1
     Weight: 1250
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 713
-    BindOnEquip: false
-    Delay: 0
     Trade: {
         nodrop: true
         noselltonpc: true
     }
-    Sprite: 0
 },
 {
     Id: 714
@@ -1861,22 +1342,10 @@ item_db: (
     Buy: 2
     Sell: 1
     Weight: 850
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 714
-    BindOnEquip: false
-    Delay: 0
     Trade: {
         nodrop: true
         noselltonpc: true
     }
-    Sprite: 0
 },
 {
     Id: 715
@@ -1886,22 +1355,10 @@ item_db: (
     Buy: 2
     Sell: 1
     Weight: 1400
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 715
-    BindOnEquip: false
-    Delay: 0
     Trade: {
         nodrop: true
         noselltonpc: true
     }
-    Sprite: 0
 },
 {
     Id: 716
@@ -1911,22 +1368,10 @@ item_db: (
     Buy: 2
     Sell: 1
     Weight: 720
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 716
-    BindOnEquip: false
-    Delay: 0
     Trade: {
         nodrop: true
         noselltonpc: true
     }
-    Sprite: 0
 },
 {
     Id: 717
@@ -1936,16 +1381,6 @@ item_db: (
     Buy: 2
     Sell: 1
     Weight: 20
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 717
-    BindOnEquip: false
     Delay: 0
     Trade: {
         nodrop: true
@@ -1961,16 +1396,6 @@ item_db: (
     Buy: 2
     Sell: 1
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 718
-    BindOnEquip: false
     Delay: 0
     Trade: {
         nodrop: true
@@ -1986,18 +1411,6 @@ item_db: (
     Buy: 10
     Sell: 3
     Weight: 35
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 719
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 720
@@ -2007,18 +1420,6 @@ item_db: (
     Buy: 10
     Sell: 3
     Weight: 3
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 720
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 721
@@ -2028,18 +1429,6 @@ item_db: (
     Buy: 10
     Sell: 3
     Weight: 35
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 721
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 722
@@ -2049,18 +1438,6 @@ item_db: (
     Buy: 15
     Sell: 5
     Weight: 530
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 722
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 723
@@ -2070,18 +1447,6 @@ item_db: (
     Buy: 5
     Sell: 1
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 723
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 724
@@ -2091,18 +1456,6 @@ item_db: (
     Buy: 2
     Sell: 1
     Weight: 2
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 724
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 725
@@ -2112,18 +1465,6 @@ item_db: (
     Buy: 100
     Sell: 30
     Weight: 8
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 725
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 726
@@ -2133,18 +1474,6 @@ item_db: (
     Buy: 600
     Sell: 60
     Weight: 200
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 726
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 727
@@ -2154,18 +1483,6 @@ item_db: (
     Buy: 900
     Sell: 80
     Weight: 200
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 727
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 728
@@ -2175,18 +1492,6 @@ item_db: (
     Buy: 5000
     Sell: 150
     Weight: 20
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 728
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 729
@@ -2196,18 +1501,6 @@ item_db: (
     Buy: 200
     Sell: 8
     Weight: 2
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 729
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 730
@@ -2225,18 +1518,6 @@ item_db: (
     Buy: 500
     Sell: 100
     Weight: 100
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 731
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 732
@@ -2246,18 +1527,6 @@ item_db: (
     Buy: 200
     Sell: 5
     Weight: 200
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 732
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 733
@@ -2267,18 +1536,6 @@ item_db: (
     Buy: 500
     Sell: 15
     Weight: 25
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 733
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 734
@@ -2288,18 +1545,6 @@ item_db: (
     Buy: 1500
     Sell: 50
     Weight: 100
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 734
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 735
@@ -2309,18 +1554,6 @@ item_db: (
     Buy: 75
     Sell: 8
     Weight: 5
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 735
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 736
@@ -2330,18 +1563,6 @@ item_db: (
     Buy: 500
     Sell: 20
     Weight: 5
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 736
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 737
@@ -2351,18 +1572,6 @@ item_db: (
     Buy: 20
     Sell: 1
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 737
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 738
@@ -2372,18 +1581,6 @@ item_db: (
     Buy: 20
     Sell: 1
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 738
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 739
@@ -2393,18 +1590,6 @@ item_db: (
     Buy: 20
     Sell: 1
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 739
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 740
@@ -2414,18 +1599,6 @@ item_db: (
     Buy: 20
     Sell: 1
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 740
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 741
@@ -2435,18 +1608,6 @@ item_db: (
     Buy: 10000
     Sell: 1500
     Weight: 100
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 741
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 742
@@ -2456,18 +1617,6 @@ item_db: (
     Buy: 1800
     Sell: 100
     Weight: 50
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 742
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 743
@@ -2477,18 +1626,6 @@ item_db: (
     Buy: 6500
     Sell: 350
     Weight: 150
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 743
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 744
@@ -2498,18 +1635,6 @@ item_db: (
     Buy: 100
     Sell: 3
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 744
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 745
@@ -2519,18 +1644,6 @@ item_db: (
     Buy: 100
     Sell: 4
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 745
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 746
@@ -2540,18 +1653,6 @@ item_db: (
     Buy: 750
     Sell: 60
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 746
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 747
@@ -2561,18 +1662,6 @@ item_db: (
     Buy: 500
     Sell: 25
     Weight: 1
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    ViewSprite: 746
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 748
@@ -2582,17 +1671,6 @@ item_db: (
     Buy: 1000
     Sell: 75
     Weight: 10
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 749
@@ -2602,17 +1680,6 @@ item_db: (
     Buy: 1000
     Sell: 75
     Weight: 10
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 750
@@ -2622,17 +1689,6 @@ item_db: (
     Buy: 1000
     Sell: 75
     Weight: 10
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 751
@@ -2642,17 +1698,6 @@ item_db: (
     Buy: 2000
     Sell: 150
     Weight: 10
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 752
@@ -2662,17 +1707,6 @@ item_db: (
     Buy: 800
     Sell: 65
     Weight: 10
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 753
@@ -2682,17 +1716,6 @@ item_db: (
     Buy: 800
     Sell: 65
     Weight: 10
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 754
@@ -2702,17 +1725,6 @@ item_db: (
     Buy: 800
     Sell: 65
     Weight: 10
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 755
@@ -2722,17 +1734,51 @@ item_db: (
     Buy: 1600
     Sell: 130
     Weight: 10
-    Atk: 0
-    Matk: 0
-    Def: 0
-    Range: 0
-    Slots: 0
-    WeaponLv: 0
-    EquipLv: 0
-    Refine: false
-    BindOnEquip: false
-    Delay: 0
-    Sprite: 0
+},
+{
+    Id: 756
+    AegisName: "CoinBag"
+    Name: "Coin Bag"
+    Type: "IT_ETC"
+    Buy: 10000
+    Sell: 500
+    Weight: 250
+},
+{
+    Id: 757
+    AegisName: "MagicFeather"
+    Name: "Magic Feather"
+    Type: "IT_ETC"
+    Buy: 100000
+    Sell: 12500
+    Weight: 25
+},
+{
+    Id: 758
+    AegisName: "SmallMushroom"
+    Name: "Small Mushroom"
+    Type: "IT_ETC"
+    Buy: 500
+    Sell: 80
+    Weight: 75
+},
+{
+    Id: 759
+    AegisName: "BlackScorpionStinger"
+    Name: "Black Scorpion Stinger"
+    Type: "IT_ETC"
+    Buy: 1000
+    Sell: 100
+    Weight: 200
+},
+{
+    Id: 760
+    AegisName: "GoldenScorpionStinger"
+    Name: "Golden Scorpion Stinger"
+    Type: "IT_ETC"
+    Buy: 25000
+    Sell: 8500
+    Weight: 500
 },
 {
     Id: 800
@@ -2743,8 +1789,6 @@ item_db: (
     Sell: 700
     Weight: 10
     Slots: 0
-    Refine: false
-    BindOnEquip: false
 },
 {
     Id: 801
@@ -2755,8 +1799,6 @@ item_db: (
     Sell: 700
     Weight: 10
     Slots: 0
-    Refine: false
-    BindOnEquip: false
 },
 {
     Id: 802
@@ -2767,8 +1809,6 @@ item_db: (
     Sell: 700
     Weight: 10
     Slots: 0
-    Refine: false
-    BindOnEquip: false
 },
 {
     Id: 803
@@ -2779,8 +1819,6 @@ item_db: (
     Sell: 700
     Weight: 10
     Slots: 0
-    Refine: false
-    BindOnEquip: false
 },
 {
     Id: 804
@@ -2791,8 +1829,6 @@ item_db: (
     Sell: 700
     Weight: 10
     Slots: 0
-    Refine: false
-    BindOnEquip: false
 },
 {
     Id: 805
@@ -2803,10 +1839,46 @@ item_db: (
     Sell: 700
     Weight: 10
     Slots: 0
-    Refine: false
-    BindOnEquip: false
 },
 {
+    Id: 806
+    AegisName: "EmptyBowl"
+    Name: "Empty Bowl"
+    Type: "IT_ETC"
+    Buy: 50000
+    Sell: 5000
+    Weight: 150
+    Slots: 0
+},
+{
+    Id: 807
+    AegisName: "ClothesPack"
+    Name: "Clothes Pack"
+    Type: "IT_ETC"
+    Buy: 0
+    Sell: 0
+    Weight: 25
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+	Id: 808
+	AegisName: "TreasureKey"
+	Name: "Treasure Key"
+	Type: "IT_ETC"
+	Buy: 500
+	Sell: 110
+	Weight: 2
+	Refine: false
+},
+// Necklaces
+{
     Id: 1000
     AegisName: "CopperNecklace"
     Name: "Copper Necklace"
@@ -2816,8 +1888,6 @@ item_db: (
     Weight: 50
     Atk: 5
     Matk: 25
-    Def: 0
-    Range: 0
     Slots: 1
     Loc: "EQP_ACC_L"
     WeaponLv: 0
@@ -2825,8 +1895,6 @@ item_db: (
     Refine: false
     ViewSprite: 1000
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
     AllowCards: {
         id5028: 1
         id5029: 1
@@ -2836,6 +1904,7 @@ item_db: (
         id5033: 1
     }
 },
+// Armor
 {
     Id: 1300
     AegisName: "CreasedShirt"
@@ -2844,10 +1913,7 @@ item_db: (
     Buy: 70
     Sell: 18
     Weight: 17
-    Atk: 0
-    Matk: 0
-    Def: 50
-    Range: 0
+    Def: 1
     Slots: 0
     Loc: "EQP_HEAD_MID"
     WeaponLv: 0
@@ -2855,8 +1921,6 @@ item_db: (
     Refine: false
     ViewSprite: 1300
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 1301
@@ -2866,10 +1930,7 @@ item_db: (
     Buy: 1800
     Sell: 200
     Weight: 30
-    Atk: 0
-    Matk: 0
-    Def: 140
-    Range: 0
+    Def: 6
     Slots: 1
     Loc: "EQP_HEAD_MID"
     WeaponLv: 0
@@ -2877,8 +1938,6 @@ item_db: (
     Refine: false
     ViewSprite: 1301
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
     AllowCards: {
         id5000: 1
         id5001: 1
@@ -2893,10 +1952,7 @@ item_db: (
     Buy: 1200
     Sell: 120
     Weight: 11
-    Atk: 0
-    Matk: 0
-    Def: 100
-    Range: 0
+    Def: 2
     Slots: 1
     Loc: "EQP_HEAD_MID"
     WeaponLv: 0
@@ -2904,8 +1960,6 @@ item_db: (
     Refine: false
     ViewSprite: 1302
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
     AllowCards: {
         id5003: 1
         id5004: 1
@@ -2936,10 +1990,7 @@ item_db: (
     Buy: 1900
     Sell: 250
     Weight: 22
-    Atk: 0
-    Matk: 0
-    Def: 180
-    Range: 0
+    Def: 6
     Slots: 0
     Loc: "EQP_HEAD_MID"
     WeaponLv: 0
@@ -2947,8 +1998,6 @@ item_db: (
     Refine: false
     ViewSprite: 1303
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 1304
@@ -2958,10 +2007,7 @@ item_db: (
     Buy: 4500
     Sell: 300
     Weight: 120
-    Atk: 0
-    Matk: 0
-    Def: 200
-    Range: 0
+    Def: 7
     Slots: 0
     Loc: "EQP_HEAD_MID"
     WeaponLv: 0
@@ -2969,8 +2015,6 @@ item_db: (
     Refine: false
     ViewSprite: 1304
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 1305
@@ -2980,10 +2024,7 @@ item_db: (
     Buy: 12000
     Sell: 800
     Weight: 340
-    Atk: 0
-    Matk: 0
-    Def: 400
-    Range: 0
+    Def: 10
     Slots: 0
     Loc: "EQP_HEAD_MID"
     WeaponLv: 0
@@ -2991,8 +2032,6 @@ item_db: (
     Refine: false
     ViewSprite: 1305
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 1306
@@ -3002,10 +2041,7 @@ item_db: (
     Buy: 25000
     Sell: 7300
     Weight: 170
-    Atk: 0
-    Matk: 0
-    Def: 350
-    Range: 0
+    Def: 11
     Slots: 0
     Loc: "EQP_HEAD_MID"
     WeaponLv: 0
@@ -3013,8 +2049,6 @@ item_db: (
     Refine: false
     ViewSprite: 1306
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
     Script: <"
         bonus bDex, 5;
     ">
@@ -3027,10 +2061,7 @@ item_db: (
     Buy: 35000
     Sell: 2900
     Weight: 70
-    Atk: 0
-    Matk: 0
-    Def: 100
-    Range: 0
+    Def: 6
     Slots: 0
     Loc: "EQP_HEAD_MID"
     WeaponLv: 0
@@ -3038,11 +2069,10 @@ item_db: (
     Refine: false
     ViewSprite: 1307
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
     Script: <"
         bonus bInt, 3;
         bonus bAgi, 1;
+        bonus bMatk, 30;
     ">
 },
 {
@@ -3053,10 +2083,7 @@ item_db: (
     Buy: 12000
     Sell: 2600
     Weight: 240
-    Atk: 0
-    Matk: 0
-    Def: 250
-    Range: 0
+    Def: 10
     Slots: 1
     Loc: "EQP_HEAD_MID"
     WeaponLv: 0
@@ -3064,8 +2091,6 @@ item_db: (
     Refine: false
     ViewSprite: 1308
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
     AllowCards: {
         id5003: 1
         id5004: 1
@@ -3096,15 +2121,8 @@ item_db: (
     Buy: 75000
     Sell: 8500
     Weight: 1500
-    Atk: 0
-    Matk: 0
-    Def: 350
-    Range: 0
+    Def: 28
     Slots: 0
-    Job: {
-        All: true
-    }
-    Gender: "SEX_ANY"
     Loc: "EQP_HEAD_MID"
     WeaponLv: 0
     EquipLv: 35
@@ -3112,14 +2130,56 @@ item_db: (
     ViewSprite: 1309
     BindOnEquip: false
     BuyingStore: true
-    Delay: 0
-    Sprite: 0
     Script: <"
         bonus bStr, 2;
         bonus bVit, 1;
     ">
 },
 {
+    Id: 1310
+    AegisName: "LegionIronArmor"
+    Name: "Legion's Iron Armor"
+    Type: "IT_ARMOR"
+    Buy: 55000
+    Sell: 13000
+    Weight: 680
+    Def: 18
+    Slots: 0
+    Loc: "EQP_HEAD_MID"
+    WeaponLv: 0
+    EquipLv: 25
+    Refine: false
+    ViewSprite: 1310
+    BindOnEquip: false
+},
+{
+    Id: 1311
+    AegisName: "GoldenWarlordPlate"
+    Name: "Golden Warlord Plate"
+    Type: "IT_ARMOR"
+    Buy: 150000
+    Sell: 45000
+    Weight: 3500
+    Def: 65
+    Slots: 0
+    Loc: "EQP_HEAD_MID"
+    WeaponLv: 0
+    EquipLv: 50
+    Refine: false
+    ViewSprite: 1311
+    BindOnEquip: false
+    BuyingStore: true
+    Script: <"
+        bonus bStr, 4;
+        bonus bVit, 2;
+    ">
+    Trade: {
+        nodrop: true
+        noselltonpc: true
+    }
+},
+// Boots
+{
     Id: 1800
     AegisName: "LousyMoccasins"
     Name: "Lousy Moccasins"
@@ -3127,10 +2187,7 @@ item_db: (
     Buy: 600
     Sell: 180
     Weight: 18
-    Atk: 0
-    Matk: 0
-    Def: 100
-    Range: 0
+    Def: 1
     Slots: 0
     Loc: "EQP_SHOES"
     WeaponLv: 0
@@ -3138,8 +2195,6 @@ item_db: (
     Refine: false
     ViewSprite: 1800
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 1801
@@ -3149,10 +2204,7 @@ item_db: (
     Buy: 2600
     Sell: 420
     Weight: 35
-    Atk: 0
-    Matk: 0
-    Def: 120
-    Range: 0
+    Def: 2
     Slots: 1
     Loc: "EQP_SHOES"
     WeaponLv: 0
@@ -3160,8 +2212,6 @@ item_db: (
     Refine: false
     ViewSprite: 1801
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
     AllowCards: {
         id5003: 1
         id5004: 1
@@ -3192,15 +2242,8 @@ item_db: (
     Buy: 12000
     Sell: 650
     Weight:75
-    Atk: 0
-    Matk: 0
-    Def: 35
-    Range: 0
+    Def: 4
     Slots: 0
-    Job: {
-        All: true
-    }
-    Gender: "SEX_ANY"
     Loc: "EQP_SHOES"
     WeaponLv: 0
     EquipLv: 20
@@ -3208,10 +2251,25 @@ item_db: (
     ViewSprite: 1802
     BindOnEquip: false
     BuyingStore: true
-    Delay: 0
-    Sprite: 0
 },
-
+{
+    Id: 1803
+    AegisName: "BanditBoots"
+    Name: "Bandit Boots"
+    Type: "IT_ARMOR"
+    Buy: 15000
+    Sell: 900
+    Weight: 60
+    Def: 4
+    Loc: "EQP_SHOES"
+    WeaponLv: 0
+    EquipLv: 20
+    Refine: false
+    ViewSprite: 1803
+    BindOnEquip: false
+    BuyingStore: true
+},
+// Gloves
 {
     Id: 2000
     AegisName: "Armbands"
@@ -3220,10 +2278,7 @@ item_db: (
     Buy: 400
     Sell: 120
     Weight: 10
-    Atk: 0
-    Matk: 0
-    Def: 80
-    Range: 0
+    Def: 1
     Slots: 0
     Loc: "EQP_GARMENT"
     WeaponLv: 0
@@ -3231,8 +2286,6 @@ item_db: (
     Refine: false
     ViewSprite: 2000
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2001
@@ -3242,10 +2295,7 @@ item_db: (
     Buy: 4000
     Sell: 800
     Weight: 20
-    Atk: 0
-    Matk: 0
-    Def: 120
-    Range: 0
+    Def: 2
     Slots: 0
     Loc: "EQP_GARMENT"
     WeaponLv: 0
@@ -3253,8 +2303,6 @@ item_db: (
     Refine: false
     ViewSprite: 2001
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2002
@@ -3264,10 +2312,7 @@ item_db: (
     Buy: 7500
     Sell: 940
     Weight: 30
-    Atk: 0
-    Matk: 0
-    Def: 180
-    Range: 0
+    Def: 3
     Slots: 0
     Loc: "EQP_GARMENT"
     WeaponLv: 0
@@ -3275,8 +2320,6 @@ item_db: (
     Refine: false
     ViewSprite: 2002
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2003
@@ -3286,10 +2329,7 @@ item_db: (
     Buy: 3000
     Sell: 250
     Weight: 60
-    Atk: 0
-    Matk: 0
-    Def: 10
-    Range: 0
+    Def: 1
     Slots: 1
     Loc: "EQP_GARMENT"
     WeaponLv: 0
@@ -3297,8 +2337,6 @@ item_db: (
     Refine: false
     ViewSprite: 2003
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
     AllowCards: {
         id5003: 1
         id5004: 1
@@ -3329,10 +2367,7 @@ item_db: (
     Buy: 3500
     Sell: 500
     Weight: 140
-    Atk: 0
-    Matk: 0
-    Def: 20
-    Range: 0
+    Def: 3
     Slots: 0
     Loc: "EQP_GARMENT"
     WeaponLv: 0
@@ -3340,10 +2375,26 @@ item_db: (
     Refine: false
     ViewSprite: 2004
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
+    Id: 2005
+    AegisName: "BanditGloves"
+    Name: "Bandit Gloves"
+    Type: "IT_ARMOR"
+    Buy: 8500
+    Sell: 650
+    Weight: 85
+    Def: 4
+    Slots: 0
+    Loc: "EQP_GARMENT"
+    WeaponLv: 0
+    EquipLv: 25
+    Refine: false
+    ViewSprite: 2005
+    BindOnEquip: false
+},
+// Pants
+{
     Id: 2200
     AegisName: "CreasedShorts"
     Name: "Creased Shorts"
@@ -3351,10 +2402,7 @@ item_db: (
     Buy: 60
     Sell: 15
     Weight: 20
-    Atk: 0
-    Matk: 0
-    Def: 60
-    Range: 0
+    Def: 1
     Slots: 0
     Loc: "EQP_HEAD_LOW"
     WeaponLv: 0
@@ -3362,8 +2410,6 @@ item_db: (
     Refine: false
     ViewSprite: 2200
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2201
@@ -3373,10 +2419,7 @@ item_db: (
     Buy: 1200
     Sell: 250
     Weight: 35
-    Atk: 0
-    Matk: 0
-    Def: 140
-    Range: 0
+    Def: 2
     Slots: 0
     Loc: "EQP_HEAD_LOW"
     WeaponLv: 0
@@ -3384,8 +2427,6 @@ item_db: (
     Refine: false
     ViewSprite: 2201
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2202
@@ -3397,8 +2438,7 @@ item_db: (
     Weight: 360
     Atk: 0
     Matk: -100
-    Def: 240
-    Range: 0
+    Def: 3
     Slots: 0
     Loc: "EQP_HEAD_LOW"
     WeaponLv: 0
@@ -3406,8 +2446,6 @@ item_db: (
     Refine: false
     ViewSprite: 2202
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2203
@@ -3417,10 +2455,7 @@ item_db: (
     Buy: 5000
     Sell: 1000
     Weight: 20
-    Atk: 0
-    Matk: 0
-    Def: 80
-    Range: 0
+    Def: 3
     Slots: 1
     Loc: "EQP_HEAD_LOW"
     WeaponLv: 0
@@ -3428,8 +2463,6 @@ item_db: (
     Refine: false
     ViewSprite: 2203
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
     AllowCards: {
         id5000: 1
         id5001: 1
@@ -3444,10 +2477,7 @@ item_db: (
     Buy: 3000
     Sell: 600
     Weight: 15
-    Atk: 0
-    Matk: 0
-    Def: 20
-    Range: 0
+    Def: 1
     Slots: 1
     Loc: "EQP_HEAD_LOW"
     WeaponLv: 0
@@ -3455,8 +2485,6 @@ item_db: (
     Refine: false
     ViewSprite: 2204
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
     AllowCards: {
         id5003: 1
         id5004: 1
@@ -3487,10 +2515,7 @@ item_db: (
     Buy: 9500
     Sell: 2100
     Weight: 280
-    Atk: 0
-    Matk: 0
-    Def: 160
-    Range: 0
+    Def: 3
     Slots: 0
     Loc: "EQP_HEAD_LOW"
     WeaponLv: 0
@@ -3498,10 +2523,26 @@ item_db: (
     Refine: false
     ViewSprite: 2205
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
+    Id: 2206
+    AegisName: "BanditTrousers"
+    Name: "Bandit Trousers"
+    Type: "IT_ARMOR"
+    Buy: 9500
+    Sell: 1100
+    Weight: 110
+    Def: 6
+    Slots: 0
+    Loc: "EQP_HEAD_LOW"
+    WeaponLv: 0
+    EquipLv: 25
+    Refine: false
+    ViewSprite: 2206
+    BindOnEquip: false
+},
+// Shields
+{
     Id: 2700
     AegisName: "Barrel"
     Name: "Barrel"
@@ -3509,10 +2550,7 @@ item_db: (
     Buy: 150
     Sell: 50
     Weight: 400
-    Atk: 0
-    Matk: 0
-    Def: 100
-    Range: 0
+    Def: 2
     Slots: 0
     Loc: "EQP_HAND_L"
     WeaponLv: 0
@@ -3520,8 +2558,6 @@ item_db: (
     Refine: false
     ViewSprite: 2700
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
     OnEquipScript: <"
         bonus bAspd, -30;
         bonus bCriticalDef, 15;
@@ -3536,7 +2572,7 @@ item_db: (
     Buy: 2000
     Sell: 250
     Weight: 100
-    Def: 50
+    Def: 2
     Loc: "EQP_HAND_L"
     EquipLv: 5
     Refine: false
@@ -3554,7 +2590,7 @@ item_db: (
     Buy: 5000
     Sell: 750
     Weight: 2450
-    Def: 72
+    Def: 6
     Loc: "EQP_HAND_L"
     EquipLv: 12
     Refine: false
@@ -3572,7 +2608,7 @@ item_db: (
     Buy: 25000
     Sell: 2630
     Weight: 5500
-    Def: 200
+    Def: 12
     Matk: -200
     Loc: "EQP_HAND_L"
     EquipLv: 20
@@ -3583,6 +2619,7 @@ item_db: (
         bonus bAtkRange, -1;
     ">
 },
+// Headgear
 {
     Id: 2900
     AegisName: "Bandana"
@@ -3591,10 +2628,7 @@ item_db: (
     Buy: 950
     Sell: 220
     Weight: 4
-    Atk: 0
-    Matk: 0
-    Def: 40
-    Range: 0
+    Def: 1
     Slots: 0
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
@@ -3602,8 +2636,6 @@ item_db: (
     Refine: false
     ViewSprite: 2900
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2901
@@ -3613,10 +2645,7 @@ item_db: (
     Buy: 320
     Sell: 100
     Weight: 50
-    Atk: 0
-    Matk: 0
-    Def: 20
-    Range: 0
+    Def: 1
     Slots: 0
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
@@ -3624,8 +2653,6 @@ item_db: (
     Refine: false
     ViewSprite: 2901
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2902
@@ -3635,10 +2662,7 @@ item_db: (
     Buy: 320
     Sell: 100
     Weight: 11
-    Atk: 0
-    Matk: 0
-    Def: 20
-    Range: 0
+    Def: 1
     Slots: 0
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
@@ -3646,8 +2670,6 @@ item_db: (
     Refine: false
     ViewSprite: 2902
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2903
@@ -3657,10 +2679,7 @@ item_db: (
     Buy: 1000
     Sell: 240
     Weight: 20
-    Atk: 0
-    Matk: 0
-    Def: 100
-    Range: 0
+    Def: 1
     Slots: 0
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
@@ -3668,8 +2687,6 @@ item_db: (
     Refine: false
     ViewSprite: 2903
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2904
@@ -3679,10 +2696,7 @@ item_db: (
     Buy: 1600
     Sell: 300
     Weight: 23
-    Atk: 0
-    Matk: 0
-    Def: 110
-    Range: 0
+    Def: 1
     Slots: 0
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
@@ -3690,8 +2704,6 @@ item_db: (
     Refine: false
     ViewSprite: 2904
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2905
@@ -3701,19 +2713,14 @@ item_db: (
     Buy: 1600
     Sell: 300
     Weight: 22
-    Atk: 0
-    Matk: 0
-    Def: 110
-    Range: 0
+    Def: 1
     Slots: 0
-    Loc: "EQP_HEAD_LOW"
+    Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
     EquipLv: 1
     Refine: false
     ViewSprite: 2200
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 
 {
@@ -3726,8 +2733,7 @@ item_db: (
     Weight: 400
     Atk: 0
     Matk: -50
-    Def: 160
-    Range: 0
+    Def: 2
     Slots: 0
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
@@ -3735,8 +2741,6 @@ item_db: (
     Refine: false
     ViewSprite: 2906
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2907
@@ -3748,8 +2752,7 @@ item_db: (
     Weight: 500
     Atk: 0
     Matk: -25
-    Def: 180
-    Range: 0
+    Def: 4
     Slots: 0
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
@@ -3757,8 +2760,12 @@ item_db: (
     Refine: false
     ViewSprite: 2907
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
+    OnEquipScript: <"
+        doevent "#SpotlightMaster::OnTouch";
+    ">
+    OnUnequipScript: <"
+        doevent "#SpotlightMaster::OnTouch";
+    ">
 },
 {
     Id: 2908
@@ -3770,8 +2777,7 @@ item_db: (
     Weight: 1000
     Atk: 0
     Matk: -300
-    Def: 340
-    Range: 0
+    Def: 6
     Slots: 0
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
@@ -3779,8 +2785,6 @@ item_db: (
     Refine: false
     ViewSprite: 2908
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2909
@@ -3792,8 +2796,7 @@ item_db: (
     Weight: 50
     Atk: 0
     Matk: 25
-    Def: 12
-    Range: 0
+    Def: 1
     Slots: 0
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
@@ -3801,8 +2804,6 @@ item_db: (
     Refine: false
     ViewSprite: 2909
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2910
@@ -3814,8 +2815,7 @@ item_db: (
     Weight: 5
     Atk: 0
     Matk: 7
-    Def: 7
-    Range: 0
+    Def: 2
     Slots: 0
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
@@ -3823,8 +2823,6 @@ item_db: (
     Refine: false
     ViewSprite: 2910
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2911
@@ -3834,10 +2832,7 @@ item_db: (
     Buy: 50000
     Sell: 12500
     Weight: 40
-    Atk: 0
-    Matk: 0
-    Def: 50
-    Range: 0
+    Def: 4
     Slots: 0
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
@@ -3845,8 +2840,6 @@ item_db: (
     Refine: false
     ViewSprite: 2911
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2912
@@ -3856,10 +2849,7 @@ item_db: (
     Buy: 17355
     Sell: 4300
     Weight: 30
-    Atk: 0
-    Matk: 0
-    Def: 40
-    Range: 0
+    Def: 3
     Slots: 0
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
@@ -3867,8 +2857,10 @@ item_db: (
     Refine: false
     ViewSprite: 2912
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
+    Trade: {
+        nodrop: true
+        noselltonpc: true
+    }
 },
 {
     Id: 2913
@@ -3878,10 +2870,7 @@ item_db: (
     Buy: 6300
     Sell: 1200
     Weight: 5
-    Atk: 0
-    Matk: 0
-    Def: 25
-    Range: 0
+    Def: 2
     Slots: 0
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
@@ -3889,8 +2878,6 @@ item_db: (
     Refine: false
     ViewSprite: 2913
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2914
@@ -3900,10 +2887,7 @@ item_db: (
     Buy: 25000
     Sell: 5200
     Weight: 150
-    Atk: 0
-    Matk: 0
-    Def: 20
-    Range: 0
+    Def: 3
     Slots: 0
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
@@ -3911,8 +2895,6 @@ item_db: (
     Refine: false
     ViewSprite: 2914
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 2915
@@ -3924,8 +2906,7 @@ item_db: (
     Weight: 50
     Atk: 0
     Matk: 10
-    Def: 10
-    Range: 0
+    Def: 2
     Slots: 0
     Loc: "EQP_HEAD_TOP"
     WeaponLv: 0
@@ -3933,10 +2914,222 @@ item_db: (
     Refine: false
     ViewSprite: 2915
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
+    Id: 2916
+    AegisName: "BanditHood"
+    Name: "Bandit Hood"
+    Type: "IT_ARMOR"
+    Buy: 9560
+    Sell: 780
+    Weight: 30
+    Def: 5
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 20
+    Refine: false
+    ViewSprite: 2916
+    BindOnEquip: false
+},
+{
+    Id: 2917
+    AegisName: "BrownBowlerHat"
+    Name: "Brown Bowler Hat"
+    Type: "IT_ARMOR"
+    Buy: 17355
+    Sell: 4300
+    Weight: 30
+    Def: 3
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 15
+    Refine: false
+    ViewSprite: 2917
+    BindOnEquip: false
+    Trade: {
+        nodrop: true
+        noselltonpc: true
+    }
+},
+{
+    Id: 2918
+    AegisName: "CatEars"
+    Name: "Cat Ears"
+    Type: "IT_ARMOR"
+    Buy: 37500
+    Sell: 12500
+    Weight: 10
+    Def: 3
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 35
+    Refine: false
+    ViewSprite: 2918
+    BindOnEquip: false
+    Script: <"
+        bonus bAgi, 3;
+    ">
+    Trade: {
+        nodrop: true
+        noselltonpc: true
+    }
+},
+{
+    Id: 2919
+    AegisName: "SantaHat"
+    Name: "Santa Hat"
+    Type: "IT_ARMOR"
+    Buy: 950
+    Sell: 220
+    Weight: 28
+    Def: 1
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 5
+    Refine: false
+    ViewSprite: 2919
+    BindOnEquip: false
+    Trade: {
+        nodrop: true
+        noselltonpc: true
+    }
+},
+{
+    Id: 2920
+    AegisName: "MoonshroomHat"
+    Name: "Moonshroom Hat"
+    Type: "IT_ARMOR"
+    Buy: 950
+    Sell: 220
+    Weight: 50
+    Def: 7
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 5
+    Refine: false
+    ViewSprite: 2920
+    BindOnEquip: false
+    Script: <"
+        bonus bInt, 3;
+        bonus bStr, -1;
+    ">
+    Trade: {
+        nodrop: true
+        noselltonpc: true
+    }
+},
+{
+    Id: 2921
+    AegisName: "SantaBeardHat"
+    Name: "Santa Beard Hat"
+    Type: "IT_ARMOR"
+    Buy: 950
+    Sell: 220
+    Weight: 32
+    Def: 1
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 5
+    Refine: false
+    ViewSprite: 2921
+    BindOnEquip: false
+    Trade: {
+        nodrop: true
+        noselltonpc: true
+    }
+},
+{
+    Id: 2922
+    AegisName: "FunkyHat"
+    Name: "Funky Hat"
+    Type: "IT_ARMOR"
+    Buy: 950
+    Sell: 220
+    Weight: 50
+    Def: 2
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 5
+    Refine: false
+    ViewSprite: 2922
+    BindOnEquip: false
+    Trade: {
+        nodrop: true
+        noselltonpc: true
+    }
+    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: 2923
+    AegisName: "CashierShade"
+    Name: "Cashier Shade"
+    Type: "IT_ARMOR"
+    Buy: 950
+    Sell: 220
+    Weight: 28
+    Def: 1
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 5
+    Refine: false
+    ViewSprite: 2923
+    BindOnEquip: false
+    Trade: {
+        nodrop: true
+        noselltonpc: true
+    }
+},
+{
+    Id: 2924
+    AegisName: "BeanieCopter"
+    Name: "Beanie Copter"
+    Type: "IT_ARMOR"
+    Buy: 950
+    Sell: 220
+    Weight: 20
+    Def: 4
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 3
+    Refine: false
+    ViewSprite: 2924
+    BindOnEquip: false
+	Trade: {
+		nodrop: true
+		noselltonpc: true
+	}
+},
+// Scarfs
+{
     Id: 3200
     AegisName: "Shemagh"
     Name: "Shemagh"
@@ -3944,7 +3137,7 @@ item_db: (
     Buy: 1000
     Sell: 90
     Weight: 22
-    Def: 50
+    Def: 1
     Loc: "EQP_ACC_R"
     EquipLv: 3
     Refine: false
@@ -3952,6 +3145,41 @@ item_db: (
     BindOnEquip: false
 },
 {
+    Id: 3201
+    AegisName: "BanditShawl"
+    Name: "Bandit Shawl"
+    Type: "IT_ARMOR"
+    Buy: 6500
+    Sell: 450
+    Weight: 45
+    Def: 1
+    Loc: "EQP_ACC_R"
+    EquipLv: 30
+    Refine: false
+    ViewSprite: 3201
+    BindOnEquip: false
+},
+{
+    Id: 3202
+    AegisName: "Eyepatch"
+    Name: "Eyepatch"
+    Type: "IT_ARMOR"
+    Buy: 1000
+    Sell: 250
+    Weight: 8
+    Def: 1
+    Loc: "EQP_ACC_R"
+    EquipLv: 16
+    Refine: false
+    ViewSprite: 3202
+    BindOnEquip: false
+    Trade: {
+        nodrop: true
+        noselltonpc: true
+    }
+},
+// Weapons
+{
     Id: 3500
     AegisName: "Knife"
     Name: "Knife"
@@ -3959,9 +3187,8 @@ item_db: (
     Buy: 90
     Sell: 25
     Weight: 6
-    Atk: 50
+    Atk: 10
     Matk: 0
-    Def: 0
     Range: 0
     Slots: 0
     Loc: "EQP_HAND_R"
@@ -3971,8 +3198,6 @@ item_db: (
     Subtype: "W_DAGGER"
     ViewSprite: 1
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 3501
@@ -3982,9 +3207,8 @@ item_db: (
     Buy: 1100
     Sell: 300
     Weight: 26
-    Atk: 150
+    Atk: 25
     Matk: 0
-    Def: 0
     Range: 0
     Slots: 0
     Loc: "EQP_HAND_R"
@@ -3993,8 +3217,6 @@ item_db: (
     Refine: false
     Subtype: "W_DAGGER"
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 3502
@@ -4004,19 +3226,16 @@ item_db: (
     Buy: 5000
     Sell: 400
     Weight: 58
-    Atk: 350
+    Atk: 40
     Matk: 0
-    Def: 0
     Range: 0
     Slots: 0
     Loc: "EQP_HAND_R"
     WeaponLv: 1
     EquipLv: 5
     Refine: false
-    Subtype: "W_DAGGER"
+    Subtype: "W_1HSWORD"
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 3503
@@ -4028,17 +3247,14 @@ item_db: (
     Weight: 25
     Atk: 40
     Matk: 0
-    Def: 0
     Range: 0
     Slots: 0
     Loc: "EQP_HAND_R"
     WeaponLv: 1
     EquipLv: 5
     Refine: false
-    Subtype: "W_DAGGER"
+    Subtype: "W_1HSWORD"
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 3504
@@ -4048,19 +3264,16 @@ item_db: (
     Buy: 25800
     Sell: 1200
     Weight: 86
-    Atk: 800
+    Atk: 120
     Matk: 0
-    Def: 0
     Range: 0
     Slots: 0
     Loc: "EQP_HAND_R"
     WeaponLv: 1
     EquipLv: 15
     Refine: false
-    Subtype: "W_DAGGER"
+    Subtype: "W_1HSWORD"
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 3505
@@ -4070,9 +3283,8 @@ item_db: (
     Buy: 20000
     Sell: 1500
     Weight: 67
-    Atk: 150
+    Atk: 10
     Matk: 250
-    Def: 0
     Range: 0
     Slots: 0
     Loc: ["EQP_HAND_R", "EQP_HAND_L"]
@@ -4081,8 +3293,12 @@ item_db: (
     Refine: false
     Subtype: "W_STAFF"
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
+    OnEquipScript: <"
+        doevent "#SpotlightMaster::OnTouch";
+    ">
+    OnUnequipScript: <"
+        doevent "#SpotlightMaster::OnTouch";
+    ">
     Script: <"
         skill AL_HEAL, 1;
         bonus bMagicAtkDef, 10;
@@ -4096,9 +3312,8 @@ item_db: (
     Buy: 12500
     Sell: 1000
     Weight: 150
-    Atk: 200
+    Atk: 10
     Matk: 150
-    Def: 0
     Range: 0
     Slots: 0
     Loc: ["EQP_HAND_R", "EQP_HAND_L"]
@@ -4107,8 +3322,12 @@ item_db: (
     Refine: false
     Subtype: "W_STAFF"
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
+    OnEquipScript: <"
+        doevent "#SpotlightMaster::OnTouch";
+    ">
+    OnUnequipScript: <"
+        doevent "#SpotlightMaster::OnTouch";
+    ">
     Script: <"
         skill MG_FIREBALL, 1;
         bonus bMatkRate, 10;
@@ -4122,9 +3341,9 @@ item_db: (
     Buy: 104800
     Sell: 1750
     Weight: 1200
-    Atk: 2000
+    Atk: 100
     Matk: 0
-    Def: 200
+    Def: 2
     Range: 2
     Slots: 0
     Loc: ["EQP_HAND_R","EQP_HAND_L"]
@@ -4133,8 +3352,6 @@ item_db: (
     Refine: false
     Subtype: "W_2HSPEAR"
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 3508
@@ -4144,9 +3361,8 @@ item_db: (
     Buy: 2500
     Sell: 500
     Weight: 350
-    Atk: 100
+    Atk: 120
     Matk: 0
-    Def: 0
     Range: 0
     Slots: 0
     Loc: "EQP_HAND_R"
@@ -4156,8 +3372,6 @@ item_db: (
     Subtype: "W_DAGGER"
     ViewSprite: 1
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 3509
@@ -4167,20 +3381,17 @@ item_db: (
     Buy: 25000
     Sell: 5000
     Weight: 250
-    Atk: 600
+    Atk: 150
     Matk: 0
-    Def: 0
     Range: 0
     Slots: 0
     Loc: "EQP_HAND_R"
     WeaponLv: 1
-    EquipLv: 1
+    EquipLv: 20
     Refine: false
     Subtype: "W_DAGGER"
     ViewSprite: 1
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 3510
@@ -4190,9 +3401,8 @@ item_db: (
     Buy: 17500
     Sell: 3700
     Weight: 250
-    Atk: 200
+    Atk: 130
     Matk: 0
-    Def: 0
     Range: 0
     Slots: 0
     Loc: ["EQP_HAND_R","EQP_HAND_L"]
@@ -4201,8 +3411,6 @@ item_db: (
     Refine: false
     Subtype: "W_KATAR"
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 3511
@@ -4212,19 +3420,22 @@ item_db: (
     Buy: 2500
     Sell: 500
     Weight: 100
-    Atk: 150
+    Atk: 85
     Matk: 0
-    Def: 0
     Range: 0
     Slots: 0
     Loc: ["EQP_HAND_R","EQP_HAND_L"]
     WeaponLv: 1
     EquipLv: 10
     Refine: false
-    Subtype: "W_DAGGER"
+    Subtype: "W_STAFF"
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
+    OnEquipScript: <"
+        doevent "#SpotlightMaster::OnTouch";
+    ">
+    OnUnequipScript: <"
+        doevent "#SpotlightMaster::OnTouch";
+    ">
 },
 {
     Id: 3512
@@ -4234,9 +3445,9 @@ item_db: (
     Buy: 12000
     Sell: 2000
     Weight: 500
-    Atk: 300
+    Atk: 80
     Matk: 0
-    Def: 20
+    Def: 2
     Range: 0
     Slots: 0
     Loc: "EQP_HAND_R"
@@ -4245,8 +3456,6 @@ item_db: (
     Refine: false
     Subtype: "W_1HAXE"
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
     Id: 3513
@@ -4256,7 +3465,7 @@ item_db: (
     Buy: 10000
     Sell: 1500
     Weight: 800
-    Atk: 400
+    Atk: 80
     Matk: 0
     Def: 50
     Range: 2
@@ -4267,10 +3476,62 @@ item_db: (
     Refine: false
     Subtype: "W_2HSTAFF"
     BindOnEquip: false
-    Delay: 0
-    Sprite: 0
 },
 {
+    Id: 3514
+    AegisName: "Halberd"
+    Name: "Halberd"
+    Type: "IT_WEAPON"
+    Buy: 25000
+    Sell: 7500
+    Weight: 1200
+    Atk: 170
+    Matk: 0
+    Def: 8
+    Range: 2
+    Slots: 0
+    Loc: ["EQP_HAND_R", "EQP_HAND_L"]
+    WeaponLv: 1
+    EquipLv: 20
+    Refine: false
+    Subtype: "W_2HAXE"
+    BindOnEquip: false
+},
+{
+    Id: 3515
+    AegisName: "SharpKnife"
+    Name: "Sharp Knife"
+    Type: "IT_WEAPON"
+    Buy: 180
+    Sell: 50
+    Weight: 15
+    Atk: 120
+    Loc: "EQP_HAND_R"
+    WeaponLv: 1
+    EquipLv: 1
+    Refine: false
+    Subtype: "W_DAGGER"
+    BindOnEquip: false
+},
+{
+    Id: 3516
+    AegisName: "BoneKnife"
+    Name: "Bone Knife"
+    Type: "IT_WEAPON"
+    Buy: 20000
+    Sell: 4000
+    Weight: 250
+    Atk: 125
+    Loc: "EQP_HAND_R"
+    WeaponLv: 1
+    EquipLv: 15
+    Refine: false
+    Subtype: "W_DAGGER"
+    ViewSprite: 1
+    BindOnEquip: false
+},
+// Pet Eggs
+{
     Id: 4000
     AegisName: "PiouEgg"
     Name: "Piou egg"
@@ -4282,6 +3543,7 @@ item_db: (
         bpet;
     ">
 },
+// Cards & Dyes
 {
     Id: 5000
     AegisName: "CrimsonCashmereDye"
@@ -4618,6 +3880,7 @@ item_db: (
     ">
     Loc: ["EQP_ACC_L"]
 },
+// Bows
 {
     Id: 6000
     AegisName: "WoodenBow"
@@ -4626,9 +3889,9 @@ item_db: (
     Buy: 550
     Sell: 52
     Weight: 12
-    Atk: 150
+    Atk: 40
     Range: 4
-    MinRange: 3
+    MinRange: 2
     Loc: ["EQP_HAND_R", "EQP_HAND_L"]
     WeaponLv: 1
     EquipLv: 5
@@ -4645,9 +3908,9 @@ item_db: (
     Buy: 1200
     Sell: 250
     Weight: 260
-    Atk: 100
+    Atk: 115
     Range: 5
-    MinRange: 3
+    MinRange: 2
     Loc: ["EQP_HAND_R", "EQP_HAND_L"]
     WeaponLv: 1
     EquipLv: 15
@@ -4666,7 +3929,7 @@ item_db: (
     Weight: 480
     Atk: 150
     Range: 6
-    MinRange: 3
+    MinRange: 2
     Loc: ["EQP_HAND_R", "EQP_HAND_L"]
     WeaponLv: 1
     EquipLv: 20
@@ -4675,16 +3938,678 @@ item_db: (
         Id6500: 1
     }
 },
+// Ammo
 {
     Id: 6500
     AegisName: "TrainingArrow"
     Name: "Training Arrow"
     Type: "IT_AMMO"
-    Buy: 100
+    Buy: 3
     Sell: 1
     Weight: 1
-    Atk: 100
+    Atk: 5
     Loc: "EQP_AMMO"
     Subtype: "A_ARROW"
 },
+// Misc.
+{
+    Id: 7420
+    AegisName: "AdventurerSoul"
+    Name: "Adventurer's Soul"
+    Type: "IT_ETC"
+    Buy: 1
+    Sell: 0
+    Weight: 0
+},
+// LEGACY merge items, generic or usable
+{
+    Id: 8000
+    AegisName: "BlackPearl"
+    Name: "Black Pearl"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 100
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8001
+    AegisName: "Bloodstone"
+    Name: "Bloodstone"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 100
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8002
+    AegisName: "BottleOfSand"
+    Name: "Bottle of Sand"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 200
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8003
+    AegisName: "Brainstem"
+    Name: "Brainstem"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 50
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8004
+    AegisName: "ClosedChristmasBox"
+    Name: "Closed Christmas Box"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 100
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8005
+    AegisName: "OpenChristmasBox"
+    Name: "Open Christmas Box"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 100
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8006
+    AegisName: "RedChristmasOrnament"
+    Name: "Red Christmas Ornament"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 20
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8007
+    AegisName: "YellowChristmasOrnament"
+    Name: "Yellow Christmas Ornament"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 20
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8008
+    AegisName: "GreenChristmasOrnament"
+    Name: "Green Christmas Ornament"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 20
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8009
+    AegisName: "AquaChristmasOrnament"
+    Name: "Aqua Christmas Ornament"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 20
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8010
+    AegisName: "BlueChristmasOrnament"
+    Name: "Blue Christmas Ornament"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 20
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8011
+    AegisName: "PurpleChristmasOrnament"
+    Name: "Purple Christmas Ornament"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 20
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8012
+    AegisName: "Doll"
+    Name: "Doll"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 75
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8013
+    AegisName: "EasterBasket"
+    Name: "Easter Basket"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 2000
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8014
+    AegisName: "LegendaryEasterEgg"
+    Name: "Legendary Easter Egg"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 50
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8015
+    AegisName: "FakePlasticFangs"
+    Name: "Fake Plastic Fangs"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 25
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8016
+    AegisName: "FlawedLens"
+    Name: "Flawed Lens"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 50
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8017
+    AegisName: "DarkPetal"
+    Name: "Dark Petal"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 250
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8018
+    AegisName: "FlightTalisman"
+    Name: "Flight Talisman"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 500
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8019
+    AegisName: "Jellybeans"
+    Name: "Jellybeans"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 150
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8020
+    AegisName: "Leatherball"
+    Name: "Leatherball"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 750
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8021
+    AegisName: "BooberryBlueLollipop"
+    Name: "Booberry Blue Lollipop"
+    Type: "IT_USABLE"
+    Buy: 100
+    Sell: 5
+    Weight: 150
+    Script: <"
+        @min = 1500;
+        @max = 2500;
+        @delay = 3;
+        @type = 1;
+        doevent "rand_sc_heal::OnUse";
+    ">
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8022
+    AegisName: "GhastlyGreenLollipop"
+    Name: "Ghastly Green Lollipop"
+    Type: "IT_USABLE"
+    Buy: 100
+    Sell: 5
+    Weight: 150
+    Script: <"
+        @min = 1500;
+        @max = 2500;
+        @delay = 3;
+        @type = 1;
+        doevent "rand_sc_heal::OnUse";
+    ">
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8023
+    AegisName: "BloodRedLollipop"
+    Name: "Blood Red Lollipop"
+    Type: "IT_USABLE"
+    Buy: 100
+    Sell: 5
+    Weight: 150
+    Script: <"
+        @min = 1500;
+        @max = 2500;
+        @delay = 3;
+        @type = 1;
+        doevent "rand_sc_heal::OnUse";
+    ">
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8024
+    AegisName: "PlushMouboo"
+    Name: "Plush Mouboo"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 250
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8025
+    AegisName: "RedStocking"
+    Name: "Red Stocking"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 100
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8026
+    AegisName: "StickReinboo"
+    Name: "Stick Reinboo"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 100
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8027
+    AegisName: "RubberBat" // add squeak sound with approx. 3 ~ 5s delay.
+    Name: "Rubber Bat"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 30
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8028
+    AegisName: "SantaCookie"
+    Name: "Santa Cookie"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 25
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8029
+    AegisName: "SantaGlobe"
+    Name: "Santa Globe"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 500
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8030
+    AegisName: "Scissors"
+    Name: "Scissors"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 150
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8031
+    AegisName: "SilverBell"
+    Name: "Silver Bell"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 250
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8032
+    AegisName: "SnowmanGlobe"
+    Name: "Snowman Globe"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 500
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8033
+    AegisName: "StrangeCoin"
+    Name: "Strange Coin"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 10
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8034
+    AegisName: "Tongue"
+    Name: "Tongue"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 100
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8035
+    AegisName: "WrappingPaperDotted"
+    Name: "Dotted Wrapping Paper"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 50
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
+{
+    Id: 8036
+    AegisName: "WrappingPaperStriped"
+    Name: "Striped Wrapping Paper"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 50
+    Trade: {
+        nodrop: true
+        notrade: true
+        noselltonpc: true
+        noauction: true
+        nomail: true
+        nogstorage: true
+    }
+},
 )
diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index 7e3365af..02b4e16a 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -61,12 +61,14 @@ Human: {
         Dagger: 55
         Sword: 57
         Axe: 50
+        TwoHandAxe: 100
         Mace: 50
         TwoHandMace: 55
         Rod: 65
         TwoHandRod: 65
         Shield: 10
         Bow: 80
+        Katar: 65
     }
     HPTable:[ 400,  450,  500,  550,  600,  650,  700,  750,  800,  850,    // 1 - 10
               900,  950, 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350,    // 11 - 20
@@ -102,7 +104,7 @@ Human: {
              1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
 }
 
-Ukar: {
+DarkUkar: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
     MoveSpeed: 170
@@ -112,12 +114,14 @@ Ukar: {
         Dagger: 55
         Sword: 57
         Axe: 50
+        TwoHandAxe: 100
         Mace: 50
         TwoHandMace: 55
         Rod: 65
         TwoHandRod: 65
         Shield: 10
         Bow: 80
+        Katar: 65
     }
     HPTable:[ 400,  450,  500,  550,  600,  650,  700,  750,  800,  850,    // 1 - 10
               900,  950, 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350,    // 11 - 20
@@ -152,8 +156,7 @@ Ukar: {
              1410, 1420, 1430, 1440, 1450, 1460, 1470, 1480, 1490, 1500,    // 141 - 150
              1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
 }
-
-Demon: {
+FireKralog: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
     MoveSpeed: 170
@@ -163,12 +166,14 @@ Demon: {
         Dagger: 55
         Sword: 57
         Axe: 50
+        TwoHandAxe: 100
         Mace: 50
         TwoHandMace: 55
         Rod: 65
         TwoHandRod: 65
         Shield: 10
         Bow: 80
+        Katar: 65
     }
     HPTable:[ 400,  450,  500,  550,  600,  650,  700,  750,  800,  850,    // 1 - 10
               900,  950, 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350,    // 11 - 20
@@ -204,7 +209,7 @@ Demon: {
              1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
 }
 
-Elven: {
+LightRaijin: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
     MoveSpeed: 170
@@ -214,12 +219,14 @@ Elven: {
         Dagger: 55
         Sword: 57
         Axe: 50
+        TwoHandAxe: 100
         Mace: 50
         TwoHandMace: 55
         Rod: 65
         TwoHandRod: 65
         Shield: 10
         Bow: 80
+        Katar: 65
     }
     HPTable:[ 400,  450,  500,  550,  600,  650,  700,  750,  800,  850,    // 1 - 10
               900,  950, 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350,    // 11 - 20
@@ -255,7 +262,7 @@ Elven: {
              1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
 }
 
-Orc: {
+BlueTritan: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
     MoveSpeed: 170
@@ -265,12 +272,14 @@ Orc: {
         Dagger: 55
         Sword: 57
         Axe: 50
+        TwoHandAxe: 100
         Mace: 50
         TwoHandMace: 55
         Rod: 65
         TwoHandRod: 65
         Shield: 10
         Bow: 80
+        Katar: 65
     }
     HPTable:[ 400,  450,  500,  550,  600,  650,  700,  750,  800,  850,    // 1 - 10
               900,  950, 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350,    // 11 - 20
@@ -306,104 +315,46 @@ Orc: {
              1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
 }
 
-Raijin: {
+FrostKralog: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
     MoveSpeed: 170
-    Weight: 20000
-    BaseASPD: {
-        Fist: 40
-        Dagger: 55
-        Sword: 57
-        Axe: 50
-        Mace: 50
-        TwoHandMace: 55
-        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
-             1400, 1450, 1500, 1550, 1600, 1650, 1700, 1750, 1800, 1850,    // 21 - 30
-             1900, 1950, 2000, 2050, 2100, 2150, 2200, 2250, 2300, 2350,    // 31 - 40
-             2400, 2450, 2500, 2550, 2600, 2650, 2700, 2750, 2800, 2850,    // 41 - 50
-             2900, 2950, 3000, 3050, 3100, 3150, 3200, 3250, 3300, 3350,    // 51 - 60
-             3400, 3450, 3500, 3550, 3600, 3650, 3700, 3750, 3800, 3850,    // 61 - 70
-             3900, 3950, 4000, 4050, 4100, 4150, 4200, 4250, 4300, 4350,    // 71 - 80
-             4400, 4450, 4500, 4550, 4600, 4650, 4700, 4750, 4800, 4850,    // 81 - 90
-             4900, 4950, 5000, 5050, 5100, 5150, 5200, 5250, 5300, 5350,    // 91 - 100
-             5400, 5450, 5500, 5550, 5600, 5650, 5700, 5750, 5800, 5850,    // 101 - 110
-             5900, 5950, 6000, 6050, 6100, 6150, 6200, 6250, 6300, 6350,    // 111 - 120
-             6400, 6450, 6500, 6550, 6600, 6650, 6700, 6750, 6800, 6850,    // 121 - 130
-             6900, 6950, 7000, 7050, 7100, 7150, 7200, 7250, 7300, 7350,    // 131 - 140
-             7400, 7450, 7500, 7550, 7600, 7650, 7700, 7750, 7800, 7850,    // 141 - 150
-             7900, 7950, 8000, 8050, 8100, 8150, 8200, 8250, 8300, 835]    // 151 - 160
-    SPTable:[ 110,  120,  130,  140,  150,  160,  170,  180,  190,  200,    // 1 - 10
-              210,  220,  230,  240,  250,  260,  270,  280,  290,  300,    // 11 - 20
-              310,  320,  330,  340,  350,  360,  370,  380,  390,  400,    // 21 - 30
-              410,  420,  430,  440,  450,  460,  470,  480,  490,  500,    // 31 - 40
-              510,  520,  530,  540,  550,  560,  570,  580,  590,  600,    // 41 - 50
-              610,  620,  630,  640,  650,  660,  670,  680,  690,  700,    // 51 - 60
-              710,  720,  730,  740,  750,  760,  770,  780,  790,  800,    // 61 - 70
-              810,  820,  830,  840,  850,  860,  870,  880,  890,  900,    // 71 - 80
-              910,  920,  930,  940,  950,  960,  970,  980,  990, 1000,    // 81 - 90
-             1010, 1020, 1030, 1040, 1050, 1060, 1070, 1080, 1090, 1000,    // 91 - 100
-             1010, 1020, 1030, 1040, 1050, 1060, 1070, 1080, 1090, 1100,    // 101 - 110
-             1110, 1120, 1130, 1140, 1150, 1160, 1170, 1180, 1190, 1200,    // 111 - 120
-             1210, 1220, 1230, 1240, 1250, 1260, 1270, 1280, 1290, 1300,    // 121 - 130
-             1310, 1320, 1330, 1340, 1350, 1360, 1370, 1380, 1390, 1400,    // 131 - 140
-             1410, 1420, 1430, 1440, 1450, 1460, 1470, 1480, 1490, 1500,    // 141 - 150
-             1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
+	Inherit: ( "FireKralog" );	// Base job from which this job will inherit its max weight, base ASPD set and HP/SP table.
 }
 
-Tritan: {
+DarkRaijin: {
     BaseExpGroup: "EvolClasses"
     JobExpGroup: "EvolClasses"
     MoveSpeed: 170
-    Weight: 20000
-    BaseASPD: {
-        Fist: 40
-        Dagger: 55
-        Sword: 57
-        Axe: 50
-        Mace: 50
-        TwoHandMace: 55
-        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
-             1400, 1450, 1500, 1550, 1600, 1650, 1700, 1750, 1800, 1850,    // 21 - 30
-             1900, 1950, 2000, 2050, 2100, 2150, 2200, 2250, 2300, 2350,    // 31 - 40
-             2400, 2450, 2500, 2550, 2600, 2650, 2700, 2750, 2800, 2850,    // 41 - 50
-             2900, 2950, 3000, 3050, 3100, 3150, 3200, 3250, 3300, 3350,    // 51 - 60
-             3400, 3450, 3500, 3550, 3600, 3650, 3700, 3750, 3800, 3850,    // 61 - 70
-             3900, 3950, 4000, 4050, 4100, 4150, 4200, 4250, 4300, 4350,    // 71 - 80
-             4400, 4450, 4500, 4550, 4600, 4650, 4700, 4750, 4800, 4850,    // 81 - 90
-             4900, 4950, 5000, 5050, 5100, 5150, 5200, 5250, 5300, 5350,    // 91 - 100
-             5400, 5450, 5500, 5550, 5600, 5650, 5700, 5750, 5800, 5850,    // 101 - 110
-             5900, 5950, 6000, 6050, 6100, 6150, 6200, 6250, 6300, 6350,    // 111 - 120
-             6400, 6450, 6500, 6550, 6600, 6650, 6700, 6750, 6800, 6850,    // 121 - 130
-             6900, 6950, 7000, 7050, 7100, 7150, 7200, 7250, 7300, 7350,    // 131 - 140
-             7400, 7450, 7500, 7550, 7600, 7650, 7700, 7750, 7800, 7850,    // 141 - 150
-             7900, 7950, 8000, 8050, 8100, 8150, 8200, 8250, 8300, 835]    // 151 - 160
-    SPTable:[ 110,  120,  130,  140,  150,  160,  170,  180,  190,  200,    // 1 - 10
-              210,  220,  230,  240,  250,  260,  270,  280,  290,  300,    // 11 - 20
-              310,  320,  330,  340,  350,  360,  370,  380,  390,  400,    // 21 - 30
-              410,  420,  430,  440,  450,  460,  470,  480,  490,  500,    // 31 - 40
-              510,  520,  530,  540,  550,  560,  570,  580,  590,  600,    // 41 - 50
-              610,  620,  630,  640,  650,  660,  670,  680,  690,  700,    // 51 - 60
-              710,  720,  730,  740,  750,  760,  770,  780,  790,  800,    // 61 - 70
-              810,  820,  830,  840,  850,  860,  870,  880,  890,  900,    // 71 - 80
-              910,  920,  930,  940,  950,  960,  970,  980,  990, 1000,    // 81 - 90
-             1010, 1020, 1030, 1040, 1050, 1060, 1070, 1080, 1090, 1000,    // 91 - 100
-             1010, 1020, 1030, 1040, 1050, 1060, 1070, 1080, 1090, 1100,    // 101 - 110
-             1110, 1120, 1130, 1140, 1150, 1160, 1170, 1180, 1190, 1200,    // 111 - 120
-             1210, 1220, 1230, 1240, 1250, 1260, 1270, 1280, 1290, 1300,    // 121 - 130
-             1310, 1320, 1330, 1340, 1350, 1360, 1370, 1380, 1390, 1400,    // 131 - 140
-             1410, 1420, 1430, 1440, 1450, 1460, 1470, 1480, 1490, 1500,    // 141 - 150
-             1510, 1520, 1530, 1540, 1550, 1560, 1570, 1580, 1590, 160]    // 151 - 160
+	Inherit: ( "LightRaijin" );	// Base job from which this job will inherit its max weight, base ASPD set and HP/SP table.
+}
+
+MediumHuman: {
+    BaseExpGroup: "EvolClasses"
+    JobExpGroup: "EvolClasses"
+    MoveSpeed: 170
+	Inherit: ( "Human" );
+}
+
+DarkHuman: {
+    BaseExpGroup: "EvolClasses"
+    JobExpGroup: "EvolClasses"
+    MoveSpeed: 170
+	Inherit: ( "Human" );
+}
+
+PurpleTritan: {
+    BaseExpGroup: "EvolClasses"
+    JobExpGroup: "EvolClasses"
+    MoveSpeed: 170
+	Inherit: ( "BlueTritan" );
 }
+
+PinkUkar: {
+    BaseExpGroup: "EvolClasses"
+    JobExpGroup: "EvolClasses"
+    MoveSpeed: 170
+	Inherit: ( "DarkUkar" );
+}
+
+
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 85b946fe..c9656171 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -91,12 +91,15 @@ mob_db: (
     MvpExp: mvp experience                (int, defaults to 0)
     MvpDrops: {
         AegisName: chance             (string: int)
-        ...
+        // ...
     }
     Drops: {
         AegisName: chance         (string: int)
-        ...
+        // or
+        AegisName: (chance, "Option Drop Group")
+        // ...
     }
+    DamageTakenRate: damage taken rate    (int, defaults to 100)
     WeaponAttacks: {
         WeaponType: 10000
     }
@@ -112,12 +115,12 @@ mob_db: (
     SpriteName: "Piou"
     Name: "Piou"
     Lv: 1
-    Hp: 120
+    Hp: 110
     Sp: 0
-    Exp: 1
+    Exp: 3
     JExp: 0
     AttackRange: 1
-    Attack: [50, 100]
+    Attack: [22, 25]
     Def: 0
     Mdef: 0
     WalkMask: "WALK_AIR"
@@ -143,7 +146,6 @@ mob_db: (
     AttackDelay: 1872
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         PiouFeathers: 2300
         PiouLegs: 2700
@@ -154,12 +156,12 @@ mob_db: (
     SpriteName: "Piousse"
     Name: "Piousse"
     Lv: 2
-    Hp: 400
+    Hp: 220
     Sp: 0
-    Exp: 2
+    Exp: 7
     JExp: 0
     AttackRange: 1
-    Attack: [80, 180]
+    Attack: [38, 40]
     Def: 1
     Mdef: 0
     Stats: {
@@ -184,7 +186,6 @@ mob_db: (
     AttackDelay: 1872
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         HalfEggshell: 4000
         PiouLegs: 3000
@@ -196,13 +197,13 @@ mob_db: (
     SpriteName: "Tortuga"
     Name: "Tortuga"
     Lv: 3
-    Hp: 800
+    Hp: 325
     Sp: 0
-    Exp: 3
+    Exp: 6
     JExp: 0
     AttackRange: 1
-    Attack: [70, 90]
-    Def: 10
+    Attack: [44, 45]
+    Def: 5
     Mdef: 0
     WalkMask: "WALK_WATER"
     Stats: {
@@ -228,7 +229,6 @@ mob_db: (
     AttackDelay: 2872
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         TortugaShellFragment: 1880
         LettuceLeaf: 1800
@@ -240,7 +240,7 @@ mob_db: (
         Moss: 500
     }
     WeaponAttacks: {
-        Bows: 5000
+        Bows: 7000
     }
 },
 {
@@ -248,13 +248,13 @@ mob_db: (
     SpriteName: "Ratto"
     Name: "Ratto"
     Lv: 5
-    Hp: 1500
+    Hp: 540
     Sp: 0
-    Exp: 6
+    Exp: 10
     JExp: 0
     AttackRange: 1
-    Attack: [100, 200]
-    Def: 10
+    Attack: [49, 50]
+    Def: 8
     Mdef: 0
     Stats: {
         Str: 5
@@ -280,7 +280,6 @@ mob_db: (
     AttackDelay: 1872
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         Cheese: 2000
         RattoTeeth: 1000
@@ -294,14 +293,14 @@ mob_db: (
     SpriteName: "Croc"
     Name: "Croc"
     Lv: 8
-    Hp: 2000
+    Hp: 900
     Sp: 0
-    Exp: 11
+    Exp: 12
     JExp: 0
     AttackRange: 1
-    Attack: [150, 250]
-    Def: 27
-    Mdef: 0
+    Attack: [64, 70]
+    Def: 15
+    Mdef: 1
     Stats: {
         Str: 6
         Agi: 20
@@ -325,7 +324,6 @@ mob_db: (
     AttackDelay: 1872
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         CrocClaw: 2000
         BlueCoral: 1300
@@ -339,14 +337,14 @@ mob_db: (
     SpriteName: "LittleBlub"
     Name: "Little Blub"
     Lv: 4
-    Hp: 1200
+    Hp: 440
     Sp: 0
-    Exp: 5
+    Exp: 7
     JExp: 0
     AttackRange: 1
-    Attack: [120, 150]
-    Def: 10
-    Mdef: 0
+    Attack: [25, 30]
+    Def: 6
+    Mdef: 1
     WalkMask: "WALK_WATER"
     Stats: {
         Str: 5
@@ -372,7 +370,6 @@ mob_db: (
     AttackDelay: 1100
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         SmallTentacles: 1500
         PinkBlobime: 1500
@@ -386,15 +383,15 @@ mob_db: (
     Id: 1008
     SpriteName: "Blub"
     Name: "Blub"
-    Lv: 10
-    Hp: 3300
+    Lv: 8
+    Hp: 1300
     Sp: 0
-    Exp: 19
-    JExp: 0
+    Exp: 27
+    JExp: 2
     AttackRange: 1
-    Attack: [250, 300]
-    Def: 15
-    Mdef: 0
+    Attack: [90, 100]
+    Def: 14
+    Mdef: 3
     WalkMask: "WALK_WATER"
     Stats: {
         Str: 8
@@ -421,7 +418,6 @@ mob_db: (
     AttackDelay: 2150
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         Tentacles: 1800
         PinkBlobime: 2000
@@ -435,15 +431,15 @@ mob_db: (
     Id: 1009
     SpriteName: "ToppyBlub"
     Name: "Toppy Blub"
-    Lv: 15
-    Hp: 5100
+    Lv: 11
+    Hp: 1200
     Sp: 0
-    Exp: 28
+    Exp: 16
     JExp: 0
     AttackRange: 1
-    Attack: [300, 400]
-    Def: 18
-    Mdef: 0
+    Attack: [150, 180]
+    Def: 21
+    Mdef: 3
     WalkMask: "WALK_WATER"
     Stats: {
         Str: 20
@@ -469,7 +465,6 @@ mob_db: (
     AttackDelay: 2150
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         Tentacles: 2300
         PurpleBlobime: 1800
@@ -484,14 +479,14 @@ mob_db: (
     SpriteName: "Crocotree"
     Name: "Crocotree"
     Lv: 10
-    Hp: 4800
+    Hp: 1100
     Sp: 0
-    Exp: 1
+    Exp: 15
     JExp: 0
     AttackRange: 1
     Attack: [10, 10]
-    Def: 35
-    Mdef: 0
+    Def: 19
+    Mdef: 3
     Stats: {
         Str: 2
         Agi: 1
@@ -509,7 +504,6 @@ mob_db: (
     AttackDelay: 800
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         HalfCroconut: 4200
         Croconut: 3300
@@ -545,7 +539,6 @@ mob_db: (
     AttackDelay: 800
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         Plushroom: 7000
         MushroomSpores: 2000
@@ -557,14 +550,14 @@ mob_db: (
     SpriteName: "Frostiana"
     Name: "Frostiana"
     Lv: 9
-    Hp: 1200
+    Hp: 980
     Sp: 0
-    Exp: 10
+    Exp: 15
     JExp: 0
     AttackRange: 1
-    Attack: [200, 400]
-    Def: 5
-    Mdef: 0
+    Attack: [95, 100]
+    Def: 17
+    Mdef: 2
     Stats: {
         Str: 10
         Agi: 1
@@ -586,7 +579,6 @@ mob_db: (
     AttackDelay: 2400
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         MushroomSpores: 4000
         Moss: 700
@@ -597,14 +589,14 @@ mob_db: (
     SpriteName: "Pikpik"
     Name: "Pikpik"
     Lv: 10
-    Hp: 100
+    Hp: 1120
     Sp: 0
-    Exp: 3
+    Exp: 16
     JExp: 0
     AttackRange: 0
-    Attack: [300, 600]
-    Def: 15
-    Mdef: 0
+    Attack: [65, 100]
+    Def: 19
+    Mdef: 3
     Stats: {
         Str: 5
         Agi: 1
@@ -626,7 +618,6 @@ mob_db: (
     AttackDelay: 1872
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         UrchinMeat: 2000
     }
@@ -665,7 +656,6 @@ mob_db: (
     AttackDelay: 800
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         HalfCroconut: 4200
         Croconut: 3300
@@ -676,14 +666,14 @@ mob_db: (
     SpriteName: "Tipiu"
     Name: "Tipiu"
     Lv: 20
-    Hp: 14000
+    Hp: 2200
     Sp: 0
-    Exp: 50
-    JExp: 0
+    Exp: 42
+    JExp: 2
     AttackRange: 1
-    Attack: [500, 700]
-    Def: 20
-    Mdef: 0
+    Attack: [75, 100]
+    Def: 46
+    Mdef: 8
     WalkMask: "WALK_AIR"
     Stats: {
         Str: 10
@@ -710,7 +700,6 @@ mob_db: (
     AttackDelay: 1120
     AttackMotion: 1672
     DamageMotion: 100
-    MvpExp: 0
     Drops: {
         PiouFeathers: 3700
         PiouLegs: 4000
@@ -722,14 +711,14 @@ mob_db: (
     SpriteName: "Tipiou"
     Name: "Tipiou"
     Lv: 45
-    Hp: 15000
+    Hp: 5000
     Sp: 0
-    Exp: 30
-    JExp: 0
+    Exp: 340
+    JExp: 9
     AttackRange: 1
-    Attack: [350, 600]
-    Def: 15
-    Mdef: 0
+    Attack: [220, 250]
+    Def: 128
+    Mdef: 22
     WalkMask: "WALK_AIR"
     Stats: {
         Str: 15
@@ -755,7 +744,6 @@ mob_db: (
     AttackDelay: 1120
     AttackMotion: 1672
     DamageMotion: 100
-    MvpExp: 0
     Drops: {
         PiouFeathers: 3300
         PiouLegs: 3700
@@ -767,13 +755,13 @@ mob_db: (
     SpriteName: "MananaTree"
     Name: "Manana Tree"
     Lv: 5
-    Hp: 3500
+    Hp: 600
     Sp: 0
-    Exp: 1
+    Exp: 9
     JExp: 0
     AttackRange: 1
     Attack: [10, 10]
-    Def: 25
+    Def: 15
     Mdef: 1
     Stats: {
         Str: 1
@@ -792,7 +780,6 @@ mob_db: (
     AttackDelay: 800
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         Manana: 2500
         Manana: 1000
@@ -803,14 +790,14 @@ mob_db: (
     SpriteName: "Crafty"
     Name: "Crafty"
     Lv: 7
-    Hp: 500
+    Hp: 760
     Sp: 0
-    Exp: 9
-    JExp: 0
+    Exp: 12
+    JExp: 1
     AttackRange: 1
-    Attack: [100, 150]
-    Def: 7
-    Mdef: 40
+    Attack: [25, 30]
+    Def: 12
+    Mdef: 1
     Stats: {
         Str: 4
         Agi: 30
@@ -835,7 +822,6 @@ mob_db: (
     AttackDelay: 800
     AttackMotion: 672
     DamageMotion: 270
-    MvpExp: 0
     Drops: {
         LeftCraftyWing: 4000
         RightCraftyWing: 4000
@@ -872,7 +858,6 @@ mob_db: (
     AttackDelay: 800
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         PumpkinJuice: 5000
     }
@@ -882,14 +867,14 @@ mob_db: (
     SpriteName: "Cuco"
     Name: "Cuco"
     Lv: 25
-    Hp: 27000
+    Hp: 2700
     Sp: 0
-    Exp: 100
+    Exp: 37
     JExp: 0
     AttackRange: 1
-    Attack: [400, 500]
-    Def: 45
-    Mdef: 40
+    Attack: [150, 200]
+    Def: 60
+    Mdef: 10
     Stats: {
         Str: 20
         Agi: 1
@@ -914,7 +899,6 @@ mob_db: (
     AttackDelay: 1300
     AttackMotion: 672
     DamageMotion: 270
-    MvpExp: 0
     Drops: {
         Pumpkin: 10000
     }
@@ -924,7 +908,7 @@ mob_db: (
     SpriteName: "Dummy"
     Name: "Dummy"
     Lv: 1
-    Hp: 80
+    Hp: 20
     Sp: 0
     Exp: 1
     JExp: 0
@@ -952,20 +936,19 @@ mob_db: (
     AttackDelay: 800
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
 },
 {
     Id: 1022
     SpriteName: "Fluffy"
     Name: "Fluffy"
-    Lv: 6
-    Hp: 2800
+    Lv: 4
+    Hp: 440
     Sp: 0
-    Exp: 5
+    Exp: 6
     JExp: 0
     AttackRange: 1
-    Attack: [200, 250]
-    Def: 8
+    Attack: [70, 90]
+    Def: 6
     Mdef: 0
     Stats: {
         Str: 5
@@ -990,7 +973,6 @@ mob_db: (
     AttackDelay: 2872
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         FluffyFur: 3500
         LettuceLeaf: 2000
@@ -999,17 +981,17 @@ mob_db: (
 },
 {
     Id: 1023
-    SpriteName: "mouboo"
+    SpriteName: "Mouboo"
     Name: "Mouboo"
     Lv: 16
-    Hp: 2600
+    Hp: 1600
     Sp: 0
-    Exp: 50
+    Exp: 24
     JExp: 0
     AttackRange: 2
-    Attack: [600, 850]
-    Def: 30
-    Mdef: 5
+    Attack: [300, 350]
+    Def: 35
+    Mdef: 6
     Stats: {
         Str: 25
         Agi: 5
@@ -1033,24 +1015,23 @@ mob_db: (
     AttackDelay: 3200
     AttackMotion: 1400
     DamageMotion: 1200
-    MvpExp: 0
     Drops: {
         Pearl: 10
     }
 },
 {
     Id: 1024
-    SpriteName: "slime"
+    SpriteName: "Slime"
     Name: "Green Slime"
     Lv: 10
-    Hp: 1200
+    Hp: 1080
     Sp: 0
-    Exp: 30
-    JExp: 0
+    Exp: 16
+    JExp: 1
     AttackRange: 1
-    Attack: [200, 400]
-    Def: 15
-    Mdef: 0
+    Attack: [85, 100]
+    Def: 19
+    Mdef: 3
     Stats: {
         Str: 5
         Agi: 15
@@ -1075,32 +1056,32 @@ mob_db: (
     AttackDelay: 2462
     AttackMotion: 864
     DamageMotion: 1026
-    MvpExp: 0
     Drops: {
         MaggotSlime: 800
-        HalfEggshell: 200
         Moss: 400
+        HalfEggshell: 200
+        TreasureKey: 100
     }
 },
 {
     Id: 1025
-    SpriteName: "slime-littleslime"
+    SpriteName: "LittleSlime"
     Name: "Little Green Slime"
     Lv: 8
-    Hp: 500
+    Hp: 700
     Sp: 0
-    Exp: 20
+    Exp: 12
     JExp: 0
     AttackRange: 1
-    Attack: [150, 250]
-    Def: 5
-    Mdef: 0
+    Attack: [75, 100]
+    Def: 14
+    Mdef: 1
     Stats: {
         Str: 5
         Agi: 10
         Vit: 15
         Int: 1
-        Dex: 30
+        Dex: 20
         Luk: 5
     }
     ViewRange: 2
@@ -1118,8 +1099,7 @@ mob_db: (
     MoveSpeed: 1100
     AttackDelay: 2462
     AttackMotion: 864
-    DamageMotion: 1026
-    MvpExp: 0
+    DamageMotion: 466
     Drops: {
         MaggotSlime: 550
     }
@@ -1129,14 +1109,14 @@ mob_db: (
     SpriteName: "Maggot"
     Name: "Maggot"
     Lv: 10
-    Hp: 500
+    Hp: 1100
     Sp: 0
-    Exp: 40
+    Exp: 15
     JExp: 0
     AttackRange: 1
-    Attack: [200, 300]
-    Def: 15
-    Mdef: 0
+    Attack: [90, 100]
+    Def: 19
+    Mdef: 3
     Stats: {
         Str: 10
         Agi: 15
@@ -1160,7 +1140,6 @@ mob_db: (
     AttackDelay: 1976
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         MaggotSlime: 500
         BugLeg: 600
@@ -1171,14 +1150,14 @@ mob_db: (
     SpriteName: "CaveMaggot"
     Name: "Cave Maggot"
     Lv: 12
-    Hp: 1250
+    Hp: 1300
     Sp: 0
-    Exp: 65
-    JExp: 0
+    Exp: 20
+    JExp: 2
     AttackRange: 1
-    Attack: [250, 450]
-    Def: 20
-    Mdef: 0
+    Attack: [75, 100]
+    Def: 24
+    Mdef: 4
     Stats: {
         Str: 10
         Agi: 18
@@ -1204,7 +1183,6 @@ mob_db: (
     AttackDelay: 1576
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         MaggotSlime: 500
     }
@@ -1213,15 +1191,15 @@ mob_db: (
     Id: 1028
     SpriteName: "ForestMaggot"
     Name: "Forest Maggot"
-    Lv: 15
-    Hp: 1500
+    Lv: 13
+    Hp: 1400
     Sp: 0
-    Exp: 75
+    Exp: 20
     JExp: 0
     AttackRange: 1
-    Attack: [300, 500]
-    Def: 25
-    Mdef: 0
+    Attack: [125, 150]
+    Def: 27
+    Mdef: 5
     Stats: {
         Str: 20
         Agi: 25
@@ -1246,7 +1224,6 @@ mob_db: (
     AttackDelay: 1676
     AttackMotion: 672
     DamageMotion: 480
-    MvpExp: 0
     Drops: {
         MaggotSlime: 500
     }
@@ -1255,19 +1232,19 @@ mob_db: (
     Id: 1029
     SpriteName: "Bee"
     Name: "Bee"
-    Lv: 20
-    Hp: 600
+    Lv: 5
+    Hp: 540
     Sp: 0
-    Exp: 25
+    Exp: 11
     JExp: 0
     AttackRange: 1
-    Attack: [250, 450]
-    Def: 30
+    Attack: [85, 100]
+    Def: 8
     Mdef: 0
     WalkMask: "WALK_AIR"
     Stats: {
         Str: 20
-        Agi: 20
+        Agi: 65
         Vit: 15
         Int: 3
         Dex: 40
@@ -1290,7 +1267,6 @@ mob_db: (
     AttackDelay: 1600
     AttackMotion: 1000
     DamageMotion: 800
-    MvpExp: 0
     Drops: {
     }
 },
@@ -1299,14 +1275,14 @@ mob_db: (
     SpriteName: "Pinkie"
     Name: "Pinkie"
     Lv: 12
-    Hp: 900
+    Hp: 1300
     Sp: 0
-    Exp: 40
+    Exp: 19
     JExp: 1
     AttackRange: 1
-    Attack: [350, 500]
-    Def: 35
-    Mdef: 0
+    Attack: [235, 250]
+    Def: 32
+    Mdef: 5
     Stats: {
         Str: 5
         Agi: 10
@@ -1331,7 +1307,6 @@ mob_db: (
     AttackDelay: 2500
     AttackMotion: 600
     DamageMotion: 200
-    MvpExp: 0
     Drops: {
         PinkAntennae: 5000
     }
@@ -1341,14 +1316,14 @@ mob_db: (
     SpriteName: "LogHead"
     Name: "Log Head"
     Lv: 15
-    Hp: 1200
+    Hp: 1625
     Sp: 0
-    Exp: 40
+    Exp: 21
     JExp: 0
     AttackRange: 1
-    Attack: [200, 300]
-    Def: 40
-    Mdef: 0
+    Attack: [235, 250]
+    Def: 32
+    Mdef: 5
     Stats: {
         Str: 30
         Agi: 5
@@ -1373,7 +1348,6 @@ mob_db: (
     AttackDelay: 2500
     AttackMotion: 800
     DamageMotion: 600
-    MvpExp: 0
     Drops: {
         RawLog: 5000
     }
@@ -1382,19 +1356,19 @@ mob_db: (
     Id: 1032
     SpriteName: "Butterfly"
     Name: "Butterfly"
-    Lv: 22
-    Hp: 700
+    Lv: 11
+    Hp: 1200
     Sp: 0
-    Exp: 30
+    Exp: 18
     JExp: 0
     AttackRange: 1
-    Attack: [200, 350]
-    Def: 35
-    Mdef: 0
+    Attack: [75, 100]
+    Def: 24
+    Mdef: 4
     WalkMask: "WALK_AIR"
     Stats: {
         Str: 5
-        Agi: 30
+        Agi: 60
         Vit: 15
         Int: 3
         Dex: 25
@@ -1415,7 +1389,6 @@ mob_db: (
     AttackDelay: 1600
     AttackMotion: 700
     DamageMotion: 850
-    MvpExp: 0
     Drops: {
         BugLeg: 5000
         AlizarinHerb: 1000
@@ -1457,6 +1430,8 @@ mob_db: (
     AttackMotion: 1
     DamageMotion: 1
     Drops: {
+        GrassSeeds: 2000
+        FlowerSeeds: 100
     }
 },
 {
@@ -1464,13 +1439,13 @@ mob_db: (
     SpriteName: "PinkFlower"
     Name: "Pink Flower"
     Lv: 15
-    Hp: 500
+    Hp: 1500
     Sp: 0
-    Exp: 45
+    Exp: 23
     JExp: 0
     AttackRange: 2
-    Attack: [200, 500]
-    Def: 10
+    Attack: [15, 20]
+    Def: 20
     Mdef: 10
     Stats: {
         Str: 5
@@ -1493,6 +1468,8 @@ mob_db: (
     AttackMotion: 750
     DamageMotion: 550
     Drops: {
+        PinkPetal: 1000
+        PinkPetal: 200
     }
 },
 {
@@ -1500,14 +1477,14 @@ mob_db: (
     SpriteName: "ManaBug"
     Name: "Mana Bug"
     Lv: 15
-    Hp: 450
+    Hp: 1580
     Sp: 0
-    Exp: 15
-    JExp: 0
+    Exp: 28
+    JExp: 2
     AttackRange: 1
-    Attack: [320, 480]
-    Def: 15
-    Mdef: 0
+    Attack: [90, 100]
+    Def: 32
+    Mdef: 5
     WalkMask: "WALK_AIR"
     Stats: {
         Str: 5
@@ -1533,7 +1510,6 @@ mob_db: (
     AttackDelay: 1800
     AttackMotion: 500
     DamageMotion: 700
-    MvpExp: 0
     Drops: {
         BugLeg: 10000
     }
@@ -1730,9 +1706,8 @@ mob_db: (
     AttackDelay: 2500
     AttackMotion: 1200
     DamageMotion: 600
-    MvpExp: 0
     Drops: {
-        SilkCocoon: 4000
+        SilkCocoon: 3500
         SilkCocoon: 500
     }
 },
@@ -1740,15 +1715,15 @@ mob_db: (
     Id: 1041
     SpriteName: "Squirrel"
     Name: "Squirrel"
-    Lv: 20
-    Hp: 1300
+    Lv: 11
+    Hp: 1180
     Sp: 0
-    Exp: 30
+    Exp: 16
     JExp: 0
     AttackRange: 1
-    Attack: [100, 200]
-    Def: 10
-    Mdef: 0
+    Attack: [55, 75]
+    Def: 21
+    Mdef: 3
     Stats: {
         Str: 15
         Agi: 25
@@ -1772,7 +1747,6 @@ mob_db: (
     AttackDelay: 895
     AttackMotion: 750
     DamageMotion: 600
-    MvpExp: 0
     Drops: {
         Acorn: 2500
         CobaltHerb: 1000
@@ -1784,14 +1758,14 @@ mob_db: (
     SpriteName: "GrassSnake"
     Name: "Grass Snake"
     Lv: 20
-    Hp: 2000
+    Hp: 2200
     Sp: 0
-    Exp: 85
-    JExp: 3
+    Exp: 30
+    JExp: 4
     AttackRange: 1
-    Attack: [400, 550]
-    Def: 25
-    Mdef: 0
+    Attack: [75, 100]
+    Def: 46
+    Mdef: 8
     Stats: {
         Str: 20
         Agi: 30
@@ -1815,7 +1789,6 @@ mob_db: (
     AttackDelay: 800
     AttackMotion: 400
     DamageMotion: 380
-    MvpExp: 0
     Drops: {
     }
 },
@@ -1823,15 +1796,15 @@ mob_db: (
     Id: 1043
     SpriteName: "Scorpion"
     Name: "Scorpion"
-    Lv: 18
-    Hp: 3000
+    Lv: 14
+    Hp: 1500
     Sp: 0
-    Exp: 70
+    Exp: 21
     JExp: 2
     AttackRange: 1
-    Attack: [600, 700]
-    Def: 30
-    Mdef: 5
+    Attack: [110, 150]
+    Def: 35
+    Mdef: 6
     Stats: {
         Str: 25
         Agi: 15
@@ -1855,7 +1828,6 @@ mob_db: (
     AttackDelay: 1250
     AttackMotion: 800
     DamageMotion: 500
-    MvpExp: 0
     Drops: {
     }
 },
@@ -1864,14 +1836,14 @@ mob_db: (
     SpriteName: "Spider"
     Name: "Spider"
     Lv: 22
-    Hp: 1800
+    Hp: 2350
     Sp: 0
-    Exp: 11
-    JExp: 1
+    Exp: 29
+    JExp: 4
     AttackRange: 1
-    Attack: [350, 650]
-    Def: 25
-    Mdef: 0
+    Attack: [140, 150]
+    Def: 52
+    Mdef: 9
     Stats: {
         Str: 18
         Agi: 32
@@ -1895,7 +1867,6 @@ mob_db: (
     AttackDelay: 1400
     AttackMotion: 500
     DamageMotion: 300
-    MvpExp: 0
     Drops: {
     }
 },
@@ -1938,6 +1909,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -1979,6 +1956,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -2020,6 +2003,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -2061,6 +2050,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -2069,14 +2064,14 @@ mob_db: (
     SpriteName: "SpikyMushroom"
     Name: "Spiky Mushroom"
     Lv: 19
-    Hp: 2200
+    Hp: 2050
     Sp: 0
-    Exp: 11
+    Exp: 32
     JExp: 0
     AttackRange: 1
-    Attack: [350, 450]
-    Def: 25
-    Mdef: 0
+    Attack: [45, 50]
+    Def: 43
+    Mdef: 7
     Stats: {
         Str: 10
         Agi: 5
@@ -2101,9 +2096,9 @@ mob_db: (
     AttackDelay: 600
     AttackMotion: 700
     DamageMotion: 600
-    MvpExp: 0
     Drops: {
         HardSpike: 1000
+        SmallMushroom: 800
     }
 },
 {
@@ -2111,14 +2106,14 @@ mob_db: (
     SpriteName: "WickedMushroom"
     Name: "Wicked Mushroom"
     Lv: 26
-    Hp: 2700
+    Hp: 2800
     Sp: 0
-    Exp: 11
-    JExp: 0
+    Exp: 37
+    JExp: 3
     AttackRange: 1
-    Attack: [450, 550]
-    Def: 30
-    Mdef: 15
+    Attack: [60, 100]
+    Def: 64
+    Mdef: 11
     Stats: {
         Str: 10
         Agi: 5
@@ -2142,7 +2137,6 @@ mob_db: (
     AttackDelay: 600
     AttackMotion: 700
     DamageMotion: 600
-    MvpExp: 0
     Drops: {
         HardSpike: 2000
     }
@@ -2186,6 +2180,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -2228,6 +2228,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -2270,6 +2276,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -2312,6 +2324,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -2354,6 +2372,12 @@ mob_db: (
     }
     WeaponAttacks: {
         All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
         Katars: 10000
     }
 },
@@ -2398,19 +2422,19 @@ mob_db: (
     Id: 1058
     SpriteName: "BadBee"
     Name: "Bad Bee"
-    Lv: 25
-    Hp: 850
+    Lv: 15
+    Hp: 1600
     Sp: 0
-    Exp: 40
+    Exp: 33
     JExp: 0
     AttackRange: 1
-    Attack: [350, 500]
-    Def: 25
-    Mdef: 0
+    Attack: [100, 120]
+    Def: 32
+    Mdef: 5
     WalkMask: "WALK_AIR"
     Stats: {
         Str: 25
-        Agi: 25
+        Agi: 55
         Vit: 15
         Int: 1
         Dex: 35
@@ -2429,11 +2453,10 @@ mob_db: (
         Angry: true
         Aggressive: true
     }
-    MoveSpeed: 85
-    AttackDelay: 800
-    AttackMotion: 500
-    DamageMotion: 300
-    MvpExp: 0
+    MoveSpeed: 105
+    AttackDelay: 1200
+    AttackMotion: 750
+    DamageMotion: 750
     Drops: {
     }
 },
@@ -2589,18 +2612,589 @@ mob_db: (
     }
 },
 {
+	Id: 1063
+	SpriteName: "Bandit"
+	Name: "Bandit"
+	Lv: 26
+	Hp: 2800
+	Sp: 0
+	Exp: 48
+	JExp: 6
+	AttackRange: 1
+	Attack: [120, 150]
+	Def: 64
+	Mdef: 10
+	Stats: {
+		Str: 11
+		Agi: 20
+		Vit: 24
+		Int: 10
+		Dex: 33
+		Luk: 11
+	}
+	ViewRange: 9
+	ChaseRange: 12
+	Race: 2
+	Element: (7, 1)
+	Mode: {
+		Aggressive: true
+		CanMove: true
+		CanAttack: true
+		CastSensorChase: true
+		ChangeChase: true
+	}
+	MoveSpeed: 440
+	AttackDelay: 1260
+	AttackMotion: 672
+	DamageMotion: 900
+	Drops: {
+		CoinBag: 500
+		BottleOfWater: 250
+		TreasureKey: 200
+		Dagger: 90
+		BanditTrousers: 1
+		BanditHood: 1
+		BanditBoots: 2
+	}
+},
+{
+	Id: 1064
+	SpriteName: "RobinBandit"
+	Name: "Robin Bandit"
+	Lv: 35
+	Hp: 3400
+	Sp: 0
+	Exp: 140
+	JExp: 12
+	AttackRange: 5
+	Attack: [149, 152]
+	Def: 90
+	Mdef: 22
+	Stats: {
+		Str: 15
+		Agi: 25
+		Vit: 28
+		Int: 21
+		Dex: 38
+		Luk: 24
+	}
+	ViewRange: 8
+	ChaseRange: 12
+	Race: 2
+	Element: (7, 1)
+	Mode: {
+		Aggressive: true
+		CanMove: true
+		CanAttack: true
+		CastSensorChase: true
+		ChangeChase: true
+	}
+	MoveSpeed: 420
+	AttackDelay: 920
+	AttackMotion: 672
+	DamageMotion: 900
+	Drops: {
+		TrainingArrow: 5000
+		TrainingArrow: 1000
+		TrainingArrow: 500
+		EmptyBottle: 500
+		CoinBag: 500
+		TreasureKey: 200
+		BanditTrousers: 1
+		BanditHood: 1
+		BanditGloves: 1
+	}
+},
+{
+	Id: 1065
+	SpriteName: "BanditLord"
+	Name: "Bandit Lord"
+	Lv: 55
+	Hp: 12000
+	Sp: 0
+	Exp: 500
+	JExp: 60
+	AttackRange: 5
+	Attack: [572, 600]
+	Def: 150
+	Mdef: 44
+	Stats: {
+		Str: 28
+		Agi: 40
+		Vit: 53
+		Int: 31
+		Dex: 55
+		Luk: 28
+	}
+	ViewRange: 12
+	ChaseRange: 16
+	Race: 2
+	Element: (7, 1)
+	Mode: {
+		Aggressive: true
+		CanMove: true
+		CanAttack: true
+		CastSensorChase: true
+		ChangeChase: true
+		Boss: true
+		Angry: true
+	}
+	MoveSpeed: 640
+	AttackDelay: 2400
+	AttackMotion: 672
+	DamageMotion: 900
+	Drops: {
+		TreasureKey: 2000
+		CoinBag: 750
+		Dagger: 150
+		BanditShawl: 10
+		BanditTrousers: 5
+		BanditHood: 5
+	}
+},
+{
+	Id: 1066
+	SpriteName: "LegionSwordswoman"
+	Name: "Legion Swordswoman"
+	Lv: 20
+	Hp: 2220
+	Sp: 0
+	Exp: 27
+	JExp: 3
+	AttackRange: 1
+	Attack: [75, 100]
+	Def: 46
+	Mdef: 7
+	Stats: {
+		Str: 15
+		Agi: 10
+		Vit: 25
+		Int: 5
+		Dex: 20
+		Luk: 10
+	}
+	ViewRange: 6
+	ChaseRange: 9
+	Race: 2
+	Element: (7, 1)
+	Mode: {
+		CanMove: true
+		CanAttack: true
+		CastSensorChase: true
+		ChangeChase: true
+	}
+	MoveSpeed: 280
+	AttackDelay: 870
+	AttackMotion: 672
+	DamageMotion: 400
+},
+{
+	Id: 1067
+	SpriteName: "LegionHalberdier"
+	Name: "Legion Halberdier"
+	Lv: 22
+	Hp: 2200
+	Sp: 0
+	Exp: 30
+	JExp: 4
+	AttackRange: 2
+	Attack: [200, 240]
+	Def: 50
+	Mdef: 9
+	Stats: {
+		Str: 10
+		Agi: 5
+		Vit: 30
+		Int: 5
+		Dex: 40
+		Luk: 10
+	}
+	ViewRange: 6
+	ChaseRange: 9
+	Race: 2
+	Element: (7, 1)
+	Mode: {
+		CanMove: true
+		CanAttack: true
+		CastSensorChase: true
+		ChangeChase: true
+	}
+	MoveSpeed: 380
+	AttackDelay: 2170
+	AttackMotion: 954
+	DamageMotion: 620
+},
+{
+	Id: 1068
+	SpriteName: "LegionLieutenant"
+	Name: "Legion Lieutenant"
+	Lv: 30
+	Hp: 2900
+	Sp: 0
+	Exp: 75
+	JExp: 8
+	AttackRange: 2
+	Attack: [125, 150]
+	Def: 60
+	Mdef: 14
+	Stats: {
+		Str: 20
+		Agi: 30
+		Vit: 20
+		Int: 10
+		Dex: 40
+		Luk: 10
+	}
+	ViewRange: 6
+	ChaseRange: 9
+	Race: 2
+	Element: (7, 1)
+	Mode: {
+		CanMove: true
+		CanAttack: true
+		CastSensorChase: true
+		ChangeChase: true
+	}
+	MoveSpeed: 260
+	AttackDelay: 870
+	AttackMotion: 454
+	DamageMotion: 420
+},
+{
+    Id: 1069
+    SpriteName: "GemVeinbloc"
+    Name: "Gem Veinbloc"
+    Lv: 1
+    Hp: 20
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 0
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1
+    Drops: {
+        CrudeDiamond: 45
+        CrudeAmethyst: 23
+        CrudeSapphire: 15
+        CrudeRuby: 98
+        CrudeTopaz: 68
+        CrudeEmerald: 40
+        Coal: 1500
+        IronOre: 500
+        GoldNuggets: 100
+    }
+    WeaponAttacks: {
+        All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
+        Katars: 10000
+    }
+},
+{
+    Id: 1070
+    SpriteName: "GoldVeinbloc"
+    Name: "Gold Veinbloc"
+    Lv: 1
+    Hp: 15
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 0
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1
+    Drops: {
+        GoldNuggets: 500
+        Coal: 2500
+        IronOre: 1250
+        DiamondShard: 150
+        AmethystShard: 75
+        SapphireShard: 50
+    }
+    WeaponAttacks: {
+        All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
+        Katars: 10000
+    }
+},
+{
+    Id: 1071
+    SpriteName: "CoalVeinbloc"
+    Name: "Coal Veinbloc"
+    Lv: 1
+    Hp: 7
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 0
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1
+    Drops: {
+        Coal: 3500
+        IronOre: 1000
+        RubyShard: 350
+        TopazShard: 250
+        EmeraldShard: 200
+    }
+    WeaponAttacks: {
+        All: 0
+        Daggers: 2500
+        1HSwords: 3300
+        1HAxes: 5000
+        2HSwords: 5000 
+        2HAxes: 6600
+        2HMaces: 7500
+        Katars: 10000
+    }
+},
+{
+    Id: 1072
+    SpriteName: "Moubi"
+    Name: "Moubi"
+    Lv: 26
+    Hp: 3600
+    Sp: 0
+    Exp: 69
+    JExp: 0
+    AttackRange: 2
+    Attack: [690, 960]
+    Def: 96
+    Mdef: 69
+    Stats: {
+        Str: 29
+        Agi: 9
+        Vit: 9
+        Int: 6
+        Dex: 9
+        Luk: 69
+    }
+    ViewRange: 6
+    ChaseRange: 9
+    Size: 0
+    Race: 2
+    Element: (1, 1)
+    Mode: {
+        CanMove: true
+        CanAttack: true
+        CastSensorChase: true
+        ChangeChase: true
+    }
+    MoveSpeed: 300
+    AttackDelay: 3200
+    AttackMotion: 1400
+    DamageMotion: 1200
+    Drops: {
+        Pearl: 10
+        MagicFeather: 10
+        CopperNecklace: 1
+    }
+},
+{
+    Id: 1073
+    SpriteName: "YellowSlime"
+    Name: "Yellow Slime"
+    Lv: 10
+    Hp: 1050
+    Sp: 0
+    Exp: 15
+    JExp: 0
+    AttackRange: 1
+    Attack: [90, 100]
+    Def: 19
+    Mdef: 3
+    Stats: {
+        Str: 5
+        Agi: 15
+        Vit: 20
+        Int: 1
+        Dex: 35
+        Luk: 10
+    }
+    ViewRange: 8
+    ChaseRange: 8
+    Size: 0
+    Race: 2
+    Element: (1, 1)
+    Mode: {
+        CanMove: true
+        CanAttack: false
+        Looter: true
+    }
+    MoveSpeed: 330
+    AttackDelay: 2462
+    AttackMotion: 864
+    DamageMotion: 1026
+    Drops: {
+        MaggotSlime: 800
+        Moss: 400
+        TopazShard: 200
+        GoldNuggets: 10
+    }
+},
+{
+    Id: 1074
+    SpriteName: "RedSlime"
+    Name: "Red Slime"
+    Lv: 15
+    Hp: 1650
+    Sp: 0
+    Exp: 15
+    JExp: 0
+    AttackRange: 1
+    Attack: [90, 100]
+    Def: 19
+    Mdef: 3
+    Stats: {
+        Str: 15
+        Agi: 15
+        Vit: 30
+        Int: 1
+        Dex: 35
+        Luk: 10
+    }
+    ViewRange: 8
+    ChaseRange: 8
+    Size: 0
+    Race: 2
+    Element: (1, 1)
+    Mode: {
+        CanMove: true
+        CanAttack: false
+    }
+    MoveSpeed: 320
+    AttackDelay: 2262
+    AttackMotion: 764
+    DamageMotion: 826
+    Drops: {
+        MaggotSlime: 800
+        Moss: 400
+        RubyShard: 200
+        CoinBag: 10
+    }
+},
+{
+    Id: 1075
+    SpriteName: "Snake"
+    Name: "Snake"
+    Lv: 25
+    Hp: 2640
+    Sp: 0
+    Exp: 45
+    JExp: 5
+    AttackRange: 1
+    Attack: [150, 225]
+    Def: 55
+    Mdef: 10
+    Stats: {
+        Str: 25
+        Agi: 35
+        Vit: 25
+        Int: 5
+        Dex: 50
+        Luk: 20
+    }
+    ViewRange: 1
+    ChaseRange: 15
+    Size: 0
+    Race: 2
+    Element: (1, 1)
+    Mode: {
+        CanMove: true
+        CanAttack: true
+        CastSensorChase: true
+        ChangeChase: true
+    }
+    MoveSpeed: 260
+    AttackDelay: 1000
+    AttackMotion: 750
+    DamageMotion: 1120
+    Drops: {
+    }
+},
+{
     Id: 1100
     SpriteName: "PoisonSkull"
     Name: "Poison Skull"
     Lv: 50
-    Hp: 7500
+    Hp: 5100
     Sp: 0
-    Exp: 250
+    Exp: 420
     JExp: 45
     AttackRange: 2
-    Attack: [750, 1000]
-    Def: 35
-    Mdef: 0
+    Attack: [250, 300]
+    Def: 135
+    Mdef: 25
     Stats: {
         Str: 30
         Agi: 40
@@ -2625,7 +3219,6 @@ mob_db: (
     AttackDelay: 1025
     AttackMotion: 452
     DamageMotion: 652
-    MvpExp: 0
     Drops: {
     }
 },
@@ -2634,14 +3227,14 @@ mob_db: (
     SpriteName: "ManaGhost"
     Name: "Mana Ghost"
     Lv: 40
-    Hp: 5500
+    Hp: 3900
     Sp: 0
     Exp: 180
     JExp: 25
     AttackRange: 2
-    Attack: [500, 750]
-    Def: 45
-    Mdef: 0
+    Attack: [120, 150]
+    Def: 90
+    Mdef: 25
     Stats: {
         Str: 20
         Agi: 50
@@ -2665,7 +3258,6 @@ mob_db: (
     AttackDelay: 625
     AttackMotion: 550
     DamageMotion: 450
-    MvpExp: 0
     Drops: {
     }
 },
@@ -2674,14 +3266,14 @@ mob_db: (
     SpriteName: "GameBalance"
     Name: "Game Balance"
     Lv: 40
-    Hp: 12000
+    Hp: 11000
     Sp: 0
-    Exp: 180
-    JExp: 25
+    Exp: 380
+    JExp: 35
     AttackRange: 2
-    Attack: [250, 750]
-    Def: 45
-    Mdef: 80
+    Attack: [260, 300]
+    Def: 75
+    Mdef: 60
     Stats: {
         Str: 20
         Agi: 50
@@ -2708,7 +3300,6 @@ mob_db: (
     AttackDelay: 1625
     AttackMotion: 550
     DamageMotion: 450
-    MvpExp: 0
     Drops: {
     }
 },
@@ -2717,14 +3308,14 @@ mob_db: (
     SpriteName: "AngryCrafty"
     Name: "AngryCrafty"
     Lv: 7
-    Hp: 500
+    Hp: 750
     Sp: 0
-    Exp: 9
+    Exp: 13
     JExp: 0
     AttackRange: 1
-    Attack: [100, 150]
-    Def: 7
-    Mdef: 40
+    Attack: [25, 50]
+    Def: 12
+    Mdef: 4
     Stats: {
         Str: 4
         Agi: 30
@@ -2751,7 +3342,6 @@ mob_db: (
     AttackDelay: 800
     AttackMotion: 672
     DamageMotion: 270
-    MvpExp: 0
     Drops: {
         LeftCraftyWing: 4000
         RightCraftyWing: 4000
@@ -2763,14 +3353,14 @@ mob_db: (
     SpriteName: "BlackScorpion"
     Name: "Black Scorpion"
     Lv: 18
-    Hp: 3000
+    Hp: 2000
     Sp: 0
-    Exp: 70
+    Exp: 26
     JExp: 2
     AttackRange: 1
-    Attack: [600, 700]
-    Def: 30
-    Mdef: 5
+    Attack: [120, 150]
+    Def: 35
+    Mdef: 7
     Stats: {
         Str: 25
         Agi: 15
@@ -2794,8 +3384,8 @@ mob_db: (
     AttackDelay: 1250
     AttackMotion: 800
     DamageMotion: 500
-    MvpExp: 0
     Drops: {
+        BlackScorpionStinger: 750
     }
 },
 {
@@ -2803,14 +3393,14 @@ mob_db: (
     SpriteName: "ThiefSlime"
     Name: "Thief Slime"
     Lv: 10
-    Hp: 1200
+    Hp: 1050
     Sp: 0
-    Exp: 30
+    Exp: 15
     JExp: 0
     AttackRange: 1
-    Attack: [200, 400]
-    Def: 15
-    Mdef: 0
+    Attack: [90, 100]
+    Def: 19
+    Mdef: 3
     Stats: {
         Str: 5
         Agi: 15
@@ -2829,15 +3419,261 @@ mob_db: (
         CanAttack: false
         Looter: true
     }
-    MoveSpeed: 300
+    MoveSpeed: 320
     AttackDelay: 2462
     AttackMotion: 864
     DamageMotion: 1026
-    MvpExp: 0
     Drops: {
         MaggotSlime: 800
         HalfEggshell: 200
         Moss: 400
     }
 },
+{
+    Id: 1106
+    SpriteName: "SpiderQueen"
+    Name: "Spider Queen"
+    Lv: 45
+    Hp: 16000
+    Sp: 0
+    Exp: 1250
+    JExp: 125
+    AttackRange: 3
+    Attack: [300, 350]
+    Def: 120
+    Mdef: 80
+    Stats: {
+        Str: 40
+        Agi: 30
+        Vit: 50
+        Int: 15
+        Dex: 65
+        Luk: 40
+    }
+    ViewRange: 8
+    ChaseRange: 15
+    Size: 0
+    Race: 2
+    Element: (5, 1)
+    Mode: {
+        CanMove: true
+        CanAttack: true
+        CastSensorChase: true
+        ChangeChase: true
+        Boss: true
+        Angry: true
+        Aggressive: true
+    }
+    MoveSpeed: 210
+    AttackDelay: 1200
+    AttackMotion: 550
+    DamageMotion: 450
+    Drops: {
+    }
+},
+{
+    Id: 1107
+    SpriteName: "FireDummy"
+    Name: "Burning Dummy"
+    Lv: 1
+    Hp: 20
+    Sp: 1000
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [100, 100]
+    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
+        Aggressive: true
+        CanAttack: true
+    }
+    MoveSpeed: 1000
+    AttackDelay: 800
+    AttackMotion: 672
+    DamageMotion: 480
+    Drops: {
+    }
+},
+{
+    Id: 1109
+    SpriteName: "Swampling"
+    Name: "Swampling"
+    Lv: 16
+    Hp: 1600
+    Sp: 0
+    Exp: 24
+    JExp: 0
+    AttackRange: 2
+    Attack: [300, 350]
+    Def: 35
+    Mdef: 6
+    Stats: {
+        Str: 25
+        Agi: 5
+        Vit: 30
+        Int: 1
+        Dex: 5
+        Luk: 35
+    }
+    ViewRange: 1
+    ChaseRange: 20
+    Size: 0
+    Race: 2
+    Element: (1, 1)
+    Mode: {
+        CanMove: true
+        CanAttack: true
+        CastSensorChase: true
+        ChangeChase: true
+    }
+    MoveSpeed: 300
+    AttackDelay: 3200
+    AttackMotion: 1400
+    DamageMotion: 1200
+    Drops: {
+        Pearl: 10
+    }
+},
+{
+    Id: 1110
+    SpriteName: "GoldenScorpion"
+    Name: "Golden Scorpion"
+    Lv: 40
+    Hp: 18000
+    Sp: 0
+    Exp: 1600
+    JExp: 200
+    AttackRange: 2
+    Attack: [470, 520]
+    Def: 90
+    Mdef: 50
+    Stats: {
+        Str: 30
+        Agi: 30
+        Vit: 50
+        Int: 5
+        Dex: 40
+        Luk: 20
+    }
+    ViewRange: 7
+    ChaseRange: 12
+    Size: 0
+    Race: 2
+    Element: (1, 1)
+    Mode: {
+        CanMove: true
+        CanAttack: true
+        ChangeChase: true
+        ChangeTargetMelee: true
+        CastSensorChase: true
+        Boss: true
+    }
+    MoveSpeed: 300
+    AttackDelay: 872
+    AttackMotion: 672
+    DamageMotion: 480
+    Drops: {
+        BugLeg: 4000
+        GoldenScorpionStinger: 1500
+    }
+},
+{
+    Id: 1120
+    SpriteName: "Tengu"
+    Name: "Tengu"
+    Lv: 80
+    Hp: 12500
+    Sp: 0
+    Exp: 5000
+    JExp: 100
+    AttackRange: 2
+    Attack: [470, 500]
+    Def: 260
+    Mdef: 80
+    Stats: {
+        Str: 70
+        Agi: 20
+        Vit: 40
+        Int: 10
+        Dex: 80
+        Luk: 20
+    }
+    ViewRange: 6
+    ChaseRange: 12
+    Size: 1
+    Race: 2
+    Element: (5, 1)
+    Mode: {
+        CanMove: true
+        CanAttack: true
+        CastSensorChase: true
+        ChangeChase: true
+        Boss: true
+        Angry: true
+        Aggressive: true
+    }
+    MoveSpeed: 170
+    AttackDelay: 1200
+    AttackMotion: 450
+    DamageMotion: 850
+    Drops: {
+    }
+},
+{
+    Id: 1121
+    SpriteName: "Golem"
+    Name: "Golem"
+    Lv: 80
+    Hp: 12500
+    Sp: 0
+    Exp: 5000
+    JExp: 100
+    AttackRange: 2
+    Attack: [470, 500]
+    Def: 320
+    Mdef: 40
+    Stats: {
+        Str: 70
+        Agi: 20
+        Vit: 40
+        Int: 10
+        Dex: 80
+        Luk: 20
+    }
+    ViewRange: 6
+    ChaseRange: 12
+    Size: 1
+    Race: 2
+    Element: (5, 1)
+    Mode: {
+        CanMove: true
+        CanAttack: true
+        CastSensorChase: true
+        ChangeChase: true
+        Boss: false
+        Angry: true
+        Aggressive: true
+    }
+    MoveSpeed: 320
+    AttackDelay: 4000
+    AttackMotion: 2000
+    DamageMotion: 2000
+    Drops: {
+    }
+},
 )
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf
index 8e395099..7e4c18e8 100644
--- a/db/re/mob_skill_db.conf
+++ b/db/re/mob_skill_db.conf
@@ -35,24 +35,141 @@ mob_skill_db:(
 	<Monster_Constant>: {
 		<Skill_Constant>: {
 			ClearSkills:   (boolean, defaults to false) allows cleaning all previous defined skills for the mob.
-			SkillLevel:    (int, defaults to 1)
-			SkillState:    (int, defaults to 0)
+			SkillLevel:	(int, defaults to 1)
+			SkillState:	(int, defaults to 0)
 			SkillTarget:   (int, defaults to 0)
-			Rate:          (int, defaults to 1)
-			CastTime:      (int, defaults to 0)
-			Delay:         (int, defaults to 0)
-			Cancelable:    (boolean, defaults to false)
+			Rate:		  (int, defaults to 1) Rate refers to the chance of the skill being casted when the condition is fulfilled.(10000 = 100%)
+			CastTime:	  (int, defaults to 0) CastTime is the time in milliseconds that has to be pass to casting skill
+			Delay:		 (int, defaults to 0) Delay is the time in milliseconds that has to be pass before recasting the same skill.
+			Cancelable:	(boolean, defaults to false)
 			CastCondition: (int, defaults to 0)
 			ConditionData: (int, defaults to 0)
-			val0:          (int, defaults to 0)
-			val1:          (int, defaults to 0)
-			val2:          (int, defaults to 0)
-			val3:          (int, defaults to 0)
-			val4:          (int, defaults to 0)
-			Emotion:       (int, defaults to 0)
-			ChatMsgID:     (int, defaults to 0)
+			val0:		  (int, defaults to 0) Value 0
+			val1:		  (int, defaults to 0)
+			val2:		  (int, defaults to 0)
+			val3:		  (int, defaults to 0)
+			val4:		  (int, defaults to 0)
+			Emotion:	   (int, defaults to 0)
+			ChatMsgID:	 (int, defaults to 0)
 		}
 	}
+
+// STATE:
+//	any (except dead) / idle (in standby) / walk (in movement) / dead (on killed) /
+//	loot /attack / angry (like attack, except player has not attacked mob yet) /
+//	chase (following target, after being attacked) / follow (following target,
+//	without being attacked) / anytarget (attack+angry+chase+follow)
+SKILL_STATES = {
+	"any":	   "MSS_ANY",
+	"idle":	  "MSS_IDLE",
+	"walk":	  "MSS_WALK",
+	"loot":	  "MSS_LOOT",
+	"dead":	  "MSS_DEAD",
+	"attack":	"MSS_BERSERK",
+	"angry":	 "MSS_ANGRY",
+	"chase":	 "MSS_RUSH",
+	"follow":	"MSS_FOLLOW",
+	"anytarget": "MSS_ANYTARGET"
+}
+
+
+// TARGET:
+//	target (current target) / self / friend / master / randomtarget (any enemy within skill's range)
+//
+//	The following are for ground-skills, a random target tile is selected from the specified area:
+//		around1 (3x3 area around self) / around2 (5x5 area around self) /
+//		around3 (7x7 area around self) / around4 (9x9 area around self) /
+//		around5 (3x3 area around target) / around6 (5x5 area around target) /
+//		around7 (7x7 area around target) / around8 (9x9 area around target) /
+//		around = around4
+SKILL_TARGET = {
+	"target":	   "MST_TARGET",
+	"randomtarget": "MST_RANDOM",
+	"self":		 "MST_SELF",
+	"friend":	   "MST_FRIEND",
+	"master":	   "MST_MASTER",
+	"around5":	  "MST_AROUND5",
+	"around6":	  "MST_AROUND6",
+	"around7":	  "MST_AROUND7",
+	"around8":	  "MST_AROUND8",
+	"around1":	  "MST_AROUND1",
+	"around2":	  "MST_AROUND2",
+	"around3":	  "MST_AROUND3",
+	"around4":	  "MST_AROUND4",
+	"around":	   "MST_AROUND"
+}
+
+// CONDITION:
+//	always			Unconditional (no condition value).
+//	onspawn			When mob spawns/respawns (no condition value).
+//	myhpltmaxrate		When mob's HP drops to the specified %.
+//	myhpinrate		When mob's HP is in a certain % range (condition value = lower bound, val1 = upper bound).
+//	mystatuson		If mob has the specified abnormality in status.
+//	mystatusoff		If mob has ended the specified abnormality in status.
+//	friendhpltmaxrate	When mob's friend's HP drops to the specified %.
+//	friendhpinrate		When mob's friend's HP is in a certain % range (condition value = lower bound, val1 = upper bound).
+//	friendstatuson		If friend has the specified abnormality in status.
+//	friendstatusoff		If friend has ended the specified abnormality in status.
+//	attackpcgt		When attack PCs become greater than specified number.
+//	attackpcge		When attack PCs become greater than or equal to the specified number.
+//	slavelt			When number of slaves is less than the original specified number.
+//	slavele			When number of slaves is less than or equal to the original specified number.
+//	closedattacked		When close range melee attacked (no condition value).
+//	longrangeattacked	When long range attacked, ex. bows, guns, ranged skills (no condition value).
+//	skillused		When the specified skill is used on the mob.
+//	afterskill		After mob casts the specified skill.
+//	casttargeted		When a target is in cast range (no condition value).
+//	rudeattacked		When mob is rude attacked (no condition value).
+SKILL_COND1 = {
+	"always":			"MSC_ALWAYS",
+	"myhpltmaxrate":	 "MSC_MYHPLTMAXRATE",
+	"myhpinrate":		"MSC_MYHPINRATE",
+	"friendhpltmaxrate": "MSC_FRIENDHPLTMAXRATE",
+	"friendhpinrate":	"MSC_FRIENDHPINRATE",
+	"mystatuson":		"MSC_MYSTATUSON",
+	"mystatusoff":	   "MSC_MYSTATUSOFF",
+	"friendstatuson":	"MSC_FRIENDSTATUSON",
+	"friendstatusoff":   "MSC_FRIENDSTATUSOFF",
+	"attackpcgt":		"MSC_ATTACKPCGT",
+	"attackpcge":		"MSC_ATTACKPCGE",
+	"slavelt":		   "MSC_SLAVELT",
+	"slavele":		   "MSC_SLAVELE",
+	"closedattacked":	"MSC_CLOSEDATTACKED",
+	"longrangeattacked": "MSC_LONGRANGEATTACKED",
+	"skillused":		 "MSC_SKILLUSED",
+	"afterskill":		"MSC_AFTERSKILL",
+	"casttargeted":	  "MSC_CASTTARGETED",
+	"rudeattacked":	  "MSC_RUDEATTACKED",
+	"masterhpltmaxrate": "MSC_MASTERHPLTMAXRATE",
+	"masterattacked":	"MSC_MASTERATTACKED",
+	"alchemist":		 "MSC_ALCHEMIST",
+	"onspawn":		   "MSC_SPAWN"
+}
+
+//	Status abnormalities specified through the statuson/statusoff system:
+//		anybad (any type of state change) / stone / freeze / stun / sleep /
+//		poison / curse / silence / confusion / blind / hiding / sight (unhidden)
+//
+// Note: if a negative MobID is provided, the skill will be treated as 'global':
+//	-1: added for all boss types.
+//	-2: added for all normal types.
+//	-4: added for all mobs.
+
+SKILL_COND2 = {
+	"anybad":	"MSC_ANY",
+	"stone":	 "SC_STONE",
+	"freeze":	"SC_FREEZE",
+	"stun":	  "SC_STUN",
+	"sleep":	 "SC_SLEEP",
+	"poison":	"SC_POISON",
+	"curse":	 "SC_CURSE",
+	"silence":   "SC_SILENCE",
+	"confusion": "SC_CONFUSION",
+	"blind":	 "SC_BLIND",
+	"hiding":	"SC_HIDING",
+	"sight":	 "SC_SIGHT"
+}
+
 **************************************************************************/
 	Ratto: {
 		NPC_POISON: {
@@ -65,6 +182,8 @@ mob_skill_db:(
 			CastCondition: "MSC_ALWAYS"
 		}
 	}
+
+	/**********************************************************************/
 	Blub: {
 		NPC_SUMMONSLAVE: {
 			SkillState: "MSS_ANY"
@@ -77,6 +196,8 @@ mob_skill_db:(
 			val0: 1007
 		}
 	}
+
+	/**********************************************************************/
 	Crocotree: {
 		NPC_REBIRTH: {
 			SkillState: "MSS_DEAD"
@@ -98,6 +219,8 @@ mob_skill_db:(
 			val0: 1014
 		}
 	}
+
+	/**********************************************************************/
 	Frostiana: {
 		NPC_POISON: {
 			SkillState: "MSS_BERSERK"
@@ -109,6 +232,8 @@ mob_skill_db:(
 			CastCondition: "MSC_ALWAYS"
 		}
 	}
+
+	/**********************************************************************/
 	Pikpik: {
 		NPC_SELFDESTRUCTION: {
 			SkillState: "MSS_BERSERK"
@@ -127,6 +252,8 @@ mob_skill_db:(
 			CastCondition: "MSC_ALWAYS"
 		}
 	}
+
+	/**********************************************************************/
 	CroconutMob: {
 		NPC_SUICIDE: {
 			SkillState: "MSS_ANY"
@@ -137,6 +264,8 @@ mob_skill_db:(
 			CastCondition: "MSC_ALWAYS"
 		}
 	}
+
+	/**********************************************************************/
 	Tipiu: {
 		NPC_SUMMONSLAVE: {
 			SkillState: "MSS_IDLE"
@@ -169,6 +298,8 @@ mob_skill_db:(
 			val0: 1003
 		}
 	}
+
+	/**********************************************************************/
 	Tipiou: {
 		NPC_SUMMONSLAVE: {
 			SkillState: "MSS_IDLE"
@@ -201,28 +332,68 @@ mob_skill_db:(
 			val0: 1002
 		}
 	}
-	slime: {
+
+	/**********************************************************************/
+	Slime: {
 		NPC_SUMMONMONSTER: {
 			SkillState: "MSS_DEAD"
 			SkillLevel: 2
 			Rate: 10000
 			SkillTarget: "MST_SELF"
 			CastCondition: "MSC_ALWAYS"
-			ConditionData: 2
 			val0: 1025
 		}
 	}
+
+	/**********************************************************************/
 	Beehive: {
 		NPC_SUMMONMONSTER: {
+			SkillState: "MSS_ANYTARGET"
+			SkillLevel: 1
+			Rate: 10000
+			CastTime: 100
+			Delay: 6500
+			Cancelable: false
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_MYHPLTMAXRATE"
+			ConditionData: 90
+			val0: 1058
+		}
+		NPC_SUMMONMONSTER: {
+			SkillState: "MSS_ANYTARGET"
+			SkillLevel: 2
+			Rate: 10000
+			CastTime: 100
+			Delay: 6500
+			Cancelable: false
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_MYHPLTMAXRATE"
+			ConditionData: 50
+			val0: 1058
+		}
+		NPC_SUMMONMONSTER: {
+			SkillState: "MSS_ANYTARGET"
+			SkillLevel: 3
+			Rate: 10000
+			CastTime: 100
+			Delay: 6500
+			Cancelable: false
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_MYHPLTMAXRATE"
+			ConditionData: 20
+			val0: 1058
+		}
+		NPC_SUMMONMONSTER: {
 			SkillState: "MSS_DEAD"
-			SkillLevel: 5
+			SkillLevel: 1
 			Rate: 10000
 			SkillTarget: "MST_SELF"
 			CastCondition: "MSC_ALWAYS"
-			ConditionData: 15
 			val0: 1058
 		}
 	}
+
+	/**********************************************************************/
 	PoisonSkull: {
 		NPC_POISON: {
 			SkillState: "MSS_BERSERK"
@@ -234,6 +405,196 @@ mob_skill_db:(
 			CastCondition: "MSC_ALWAYS"
 		}
 	}
+
+	/**********************************************************************/
+	BanditLord: {
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_ANYTARGET"
+			SkillLevel: 1
+			Rate: 10000
+			CastTime: 300
+			Delay: 270000
+			Cancelable: false
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_MYHPLTMAXRATE"
+			ConditionData: 70
+			val0: 1063
+		}
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_ANYTARGET"
+			SkillLevel: 2
+			Rate: 10000
+			CastTime: 300
+			Delay: 270000
+			Cancelable: false
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_MYHPLTMAXRATE"
+			ConditionData: 50
+			val0: 1064
+		}
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_ANYTARGET"
+			SkillLevel: 2
+			Rate: 10000
+			CastTime: 1000
+			Delay: 90000
+			Cancelable: false
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_LONGRANGEATTACKED"
+			val0: 1064
+		}
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_ANYTARGET"
+			SkillLevel: 3
+			Rate: 10000
+			CastTime: 1000
+			Delay: 270000
+			Cancelable: false
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_MYHPLTMAXRATE"
+			ConditionData: 25
+			val0: 1063
+		}
+		NPC_POISON: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 20
+			Rate: 7500
+			Delay: 20000
+			Cancelable: true
+			SkillTarget: "MST_TARGET"
+			CastCondition: "MSC_MYHPLTMAXRATE"
+			ConditionData: 7
+		}
+	/**********************************************************************/
+	}
+	SpiderQueen: {
+		NPC_POISON: {
+			SkillState: "MSS_ALL"
+			SkillLevel: 20
+			Rate: 5000
+			Delay: 100
+			Cancelable: true
+			SkillTarget: "MST_TARGET"
+			CastCondition: "MSC_ALWAYS"
+		}
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 5
+			Rate: 10000
+			CastTime: 700
+			Delay: 60000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_SPAWN"
+			val0: 1044
+		}
+	}
+	/**********************************************************************/
+	FireDummy: {
+		MG_FIREWALL: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 1
+			Rate: 9000
+			CastTime: 1800
+			Delay: 120000
+			Cancelable: true
+			SkillTarget: "MST_TARGET"
+			CastCondition: "MSC_ALWAYS"
+		}
+	}
+	/**********************************************************************/
+	PinkFlower: {
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 1
+			Rate: 10000
+            CastTime: 1000
+            Delay: 20000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_SLAVELE"
+			ConditionData: 3
+			val0: 1029
+		}
+	}
+	/**********************************************************************/
+	YellowTulip: {
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 1
+			Rate: 10000
+            CastTime: 500
+            Delay: 10000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_SLAVELE"
+			ConditionData: 1
+			val0: 1029
+		}
+	}
+	/**********************************************************************/
+	YellowRose: {
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 1
+			Rate: 10000
+            CastTime: 200
+            Delay: 5000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_SLAVELE"
+			ConditionData: 2
+			val0: 1029
+		}
+	}
+	/**********************************************************************/
+	BlueRose: {
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 2
+			Rate: 10000
+            CastTime: 100
+            Delay: 3000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_SLAVELE"
+			ConditionData: 2
+			val0: 1029
+		}
+	}
+	/**********************************************************************/
+	RedRose: {
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 1
+			Rate: 10000
+            CastTime: 1000
+            Delay: 20000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_SLAVELE"
+			ConditionData: 2
+			val0: 1029
+		}
+	}
+	/**********************************************************************/
+	GoldenScorpion: {
+		SM_BASH: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 6
+			Rate: 1800
+			Delay: 20000
+			Cancelable: true
+			SkillTarget: "MST_TARGET"
+			CastCondition: "MSC_ATTACKPCGE"
+			ConditionData: 2
+		}
+		NPC_SILENCEATTACK: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 2
+			Rate: 9800
+			Delay: 40000
+			CastTime: 700
+			Cancelable: true
+			SkillTarget: "MST_TARGET"
+			CastCondition: "MSC_LONGRANGEATTACKED"
+		}
+	}
 }
 )
 
+
diff --git a/db/re/mob_skill_db.txt b/db/re/mob_skill_db.txt
deleted file mode 100644
index 4af6834b..00000000
--- a/db/re/mob_skill_db.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-// Mob Skill Database
-// Based on Aegis Episode 14.2
-//
-// Structure of Database:
-// MobID,Dummy value (info only),State,SkillID,SkillLv,Rate,CastTime,Delay,Cancelable,Target,Condition type,Condition value,val1,val2,val3,val4,val5,Emotion,Chat
-//
-// RATE: the chance of the skill being casted when the condition is fulfilled (10000 = 100%).
-// DELAY: the time (in milliseconds) before attempting to recast the same skill.
-//
-// STATE:
-//	any (except dead) / idle (in standby) / walk (in movement) / dead (on killed) /
-//	loot /attack / angry (like attack, except player has not attacked mob yet) /
-//	chase (following target, after being attacked) / follow (following target,
-//	without being attacked) / anytarget (attack+angry+chase+follow)
-//
-// TARGET:
-//	target (current target) / self / friend / master / randomtarget (any enemy within skill's range)
-//
-//	The following are for ground-skills, a random target tile is selected from the specified area:
-//	    around1 (3x3 area around self) / around2 (5x5 area around self) /
-//	    around3 (7x7 area around self) / around4 (9x9 area around self) /
-//	    around5 (3x3 area around target) / around6 (5x5 area around target) /
-//	    around7 (7x7 area around target) / around8 (9x9 area around target) /
-//	    around = around4
-//
-// CONDITION:
-//	always			Unconditional (no condition value).
-//	onspawn			When mob spawns/respawns (no condition value).
-//	myhpltmaxrate		When mob's HP drops to the specified %.
-//	myhpinrate		When mob's HP is in a certain % range (condition value = lower bound, val1 = upper bound).
-//	mystatuson		If mob has the specified abnormality in status.
-//	mystatusoff		If mob has ended the specified abnormality in status.
-//	friendhpltmaxrate	When mob's friend's HP drops to the specified %.
-//	friendhpinrate		When mob's friend's HP is in a certain % range (condition value = lower bound, val1 = upper bound).
-//	friendstatuson		If friend has the specified abnormality in status.
-//	friendstatusoff		If friend has ended the specified abnormality in status.
-//	attackpcgt		When attack PCs become greater than specified number.
-//	attackpcge		When attack PCs become greater than or equal to the specified number.
-//	slavelt			When number of slaves is less than the original specified number.
-//	slavele			When number of slaves is less than or equal to the original specified number.
-//	closedattacked		When close range melee attacked (no condition value).
-//	longrangeattacked	When long range attacked, ex. bows, guns, ranged skills (no condition value).
-//	skillused		When the specified skill is used on the mob.
-//	afterskill		After mob casts the specified skill.
-//	casttargeted		When a target is in cast range (no condition value).
-//	rudeattacked		When mob is rude attacked (no condition value).
-//
-//	Status abnormalities specified through the statuson/statusoff system:
-//	    anybad (any type of state change) / stone / freeze / stun / sleep /
-//	    poison / curse / silence / confusion / blind / hiding / sight (unhidden)
-//
-// Note: if a negative MobID is provided, the skill will be treated as 'global':
-//	-1: added for all boss types.
-//	-2: added for all normal types.
-//	-4: added for all mobs.
-//id,name@skill,state,skillid,skilllevel,rate,casttime,delay,cancel,target,cond1,cond2,val0,val1,val2,val3,val4,emotion,chat
-1005,Ratto@NPC_POISON,attack,176,20,500,0,500,yes,target,always,0,,,,,,,
-1008,Blub@NPC_SUMMONSLAVE,any,196,4,10000,700,60000,no,self,onspawn,0,1007,,,,,,
-1010,Crocotree@NPC_REBIRTH,dead,208,2,10000,0,0,yes,self,always,0,,,,,,,
-1010,Crocotree@NPC_TRANSFORMATION,any,198,1,10000,700,60000,no,self,afterskill,208,1014,,,,,,
-1012,Frostiana@NPC_POISON,attack,176,5,1000,0,2000,yes,target,always,0,,,,,,,
-1013,Pikpik@NPC_SELFDESTRUCTION,attack,173,1,10000,1000,0,no,self,always,0,,,,,,,
-1013,Pikpik@NPC_SELFDESTRUCTION,chase,173,1,2000,1000,0,no,self,always,0,,,,,,,
-1014,Croconut@NPC_SUICIDE,any,175,1,10000,1000,0,no,self,always,0,,,,,,,
-1015,Tipiu@NPC_SUMMONSLAVE,idle,196,6,10000,0,0,no,self,onspawn,0,1003,,,,,,
-1015,Tipiu@NPC_SUMMONSLAVE,attack,196,2,2000,700,10000,no,self,slavele,5,1003,,,,,,
-1015,Tipiu@NPC_SUMMONSLAVE,idle,196,2,7000,700,10000,no,self,slavele,5,1003,,,,,,
-1016,Tipiou@NPC_SUMMONSLAVE,idle,196,5,10000,0,0,no,self,onspawn,0,1002,,,,,,
-1016,Tipiou@NPC_SUMMONSLAVE,attack,196,2,2000,700,10000,no,self,slavele,4,1002,,,,,,
-1016,Tipiou@NPC_SUMMONSLAVE,idle,196,2,7000,700,10000,no,self,slavele,4,1002,,,,,,
-1024,Green Slime@NPC_SUMMONMONSTER,dead,209,2,10000,0,0,no,self,always,2,1025,,,,,,
-1029,Bee@NPC_POISON,attack,176,20,1000,0,500,yes,anytarget,always,0,0,10,,,,,
-1034,PinkFlower@NPC_SUMMONSLAVE,any,196,1,2000,1000,10000,no,self,slavelt,4,1058,,,,,,
-1100,PoisonSkull@NPC_POISON,attack,176,20,2500,0,100,yes,target,always,0,,,,,,,
diff --git a/db/re/refine_db.conf b/db/re/refine_db.conf
index 4974e003..e21c03c0 100644
--- a/db/re/refine_db.conf
+++ b/db/re/refine_db.conf
@@ -37,6 +37,32 @@ Armors/WeaponLevel1~4: {                                       // Specifies weap
 	RandomBonusStartLevel: (int)                               // This value specifies the start point for those levels that give a random bonus value (usually the first unsafe upgrade).
 															   // - RandomBonusStartLevel is only applied for weapons, and not displayed client-side.
 	RandomBonusValue: (int)                                    // A random number between 0 and (Random bonus start level - Upgrade level + 1) * this value is applied for all upgrades past.
+
+	RefineryUISettings: (
+		{
+			Level: (int or array of int)                       // Holds either the individule refine level meant for this setting or an array defining a range
+			                                                      of Low to Max level
+			BlacksmithBlessing: (int) (optional)               // How many Blacksmith Blessing required for this range to be safe from breaking
+			Announce: "(string)" (optional)                    // Sends an announcement server wide when a player reach this refine level using
+			                                                      Refinery UI, this feature is only available starting from 2017-08-30 RagexeRE or
+																  2017-09-06 Ragexe the field accepts the following values and it defaults to not announce
+																  Success to set the announcement on item refine successful
+																  Failure to set the announcement on item refine failure
+																  Always to always announce it
+			Items: {
+				AegisName: {
+					Type: "(string)"                           // The type to determine the chances used for this item, REFINE_CHANCE_TYPE_*
+                                                                  constants are used in here
+					Cost: (int) (optional)                     // Amount of zeny required
+					FailureBehavior: "(string)" (optional)     // The expected behvaior on failure for this item, the following strings are used in here
+																  Destroy (default) sets the item to be destroyed on failure
+																  Keep keeps the item after failure
+																  Downgrade downgrades the item by one level on failure
+				}
+			}
+		}
+	)
+
 	Rates: {                                                   // Per level configuration of the refine rates.
 		Lv1~20: {                                              // Lv1 ~ Lv20.
 			NormalChance: (int)                                // (optional, defaults to 100) Chance of successful refine using normal ores (100 = 100%).
@@ -51,6 +77,17 @@ Armors/WeaponLevel1~4: {                                       // Specifies weap
 **************************************************************************/
 
 Armors: {
+	RefineryUISettings: (
+		{
+			Level: [1, 20]
+			Items: {
+				Acorn: {
+					Type: "REFINE_CHANCE_TYPE_NORMAL"
+					Cost: 100000000
+				}
+			}
+		},
+	)
 	StatsPerLevel: 0
 	RandomBonusStartLevel: 0
 	RandomBonusValue: 0
@@ -172,6 +209,17 @@ Armors: {
 	}
 }
 WeaponLevel1: {
+	RefineryUISettings: (
+		{
+			Level: [1, 20]
+			Items: {
+				Acorn: {
+					Type: "REFINE_CHANCE_TYPE_NORMAL"
+					Cost: 100000000
+				}
+			}
+		},
+	)
 	StatsPerLevel: 200
 	RandomBonusStartLevel: 8
 	RandomBonusValue: 300
@@ -252,6 +300,17 @@ WeaponLevel1: {
 	}
 }
 WeaponLevel2: {
+	RefineryUISettings: (
+		{
+			Level: [1, 20]
+			Items: {
+				Acorn: {
+					Type: "REFINE_CHANCE_TYPE_NORMAL"
+					Cost: 100000000
+				}
+			}
+		},
+	)
 	StatsPerLevel: 300
 	RandomBonusStartLevel: 7
 	RandomBonusValue: 500
@@ -338,6 +397,17 @@ WeaponLevel2: {
 	}
 }
 WeaponLevel3: {
+	RefineryUISettings: (
+		{
+			Level: [1, 20]
+			Items: {
+				Acorn: {
+					Type: "REFINE_CHANCE_TYPE_NORMAL"
+					Cost: 100000000
+				}
+			}
+		},
+	)
 	StatsPerLevel: 500
 	RandomBonusStartLevel: 6
 	RandomBonusValue: 800
@@ -430,6 +500,17 @@ WeaponLevel3: {
 	}
 }
 WeaponLevel4: {
+	RefineryUISettings: (
+		{
+			Level: [1, 20]
+			Items: {
+				Acorn: {
+					Type: "REFINE_CHANCE_TYPE_NORMAL"
+					Cost: 100000000
+				}
+			}
+		},
+	)
 	StatsPerLevel: 700
 	RandomBonusStartLevel: 5
 	RandomBonusValue: 1400
diff --git a/db/re/size_fix.txt b/db/re/size_fix.txt
index e8e3774d..ae5ebdd4 100644
--- a/db/re/size_fix.txt
+++ b/db/re/size_fix.txt
@@ -2,6 +2,6 @@
 
 // Columns: Weapon type, Rows: Target size.
 // Unarmed, Knife, 1H Sword, 2H Sword, 1H Spear, 2H Spears, 1H Axe, 2H Axe, Mace, 2H Mace, Staff, Bow, Knuckle, Musical Instrument, Whip, Book, Katar, Revolver, Rifle, Shotgun, Gatling Gun, Grenade Launcher, Fuuma Shuriken, 2H Staff
-100,100, 75, 75, 75, 75, 50, 50, 75, 75,100,100,100, 75, 75,100, 75,100,100,100,100,100, 75,100	// Size: Small
-100, 75,100, 75, 75, 75, 75, 75,100,100,100,100, 75,100,100,100,100,100,100,100,100,100, 75,100	// Size: Medium
-100, 50, 75,100,100,100,100,100,100,100,100, 75, 50, 75, 50, 50, 75,100,100,100,100,100,100,100	// Size: Large
+100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100, 100,100,100,100,100,100,100,100	// Size: Small
+100,100,100,100,100,100,100,100,100,100,100,100, 100,100,100,100,100,100,100,100,100,100,100,100	// Size: Medium
+100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100, 100,100,100,100,100,100,100,100	// Size: Large
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index d24edf1c..30cc7466 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -75,6 +75,7 @@
                             Works like FreeCastReduced, but not reduce speed.
         ShowSkillScale: true/false              (boolean, defaults to false)
         AllowReproduce: true/false              (boolean, defaults to false)
+        HiddenTrap: true/false                  (boolean, defaults to false)
     }
     AttackType: "Attack Type"                   (string, defaults to "None")
                                                 Types: "None", "Weapon", "Magic" or "Misc"
@@ -340,27 +341,6 @@ skill_db: (
         }
         WeaponTypes: {
             NoWeapon: true
-            Daggers: true
-            1HSwords: true
-            2HSwords: true
-            1HSpears: true
-            2HSpears: true
-            1HAxes: true
-            2HAxes: true
-            Maces: true
-            2HMaces: true
-            Staves: true
-            Knuckles: true
-            Instruments: true
-            Whips: true
-            Books: true
-            Katars: true
-            Revolvers: true
-            Rifles: true
-            GatlingGuns: true
-            Shotguns: true
-            GrenadeLaunchers: true
-            FuumaShurikens: true
         }
     }
 },
@@ -2004,16 +1984,16 @@ skill_db: (
     AttackType: "Weapon"
     Element: "Ele_Poison"
     SkillData2: {
-        Lv1: 15000
-        Lv2: 20000
-        Lv3: 25000
-        Lv4: 30000
-        Lv5: 35000
-        Lv6: 40000
-        Lv7: 45000
-        Lv8: 50000
-        Lv9: 55000
-        Lv10: 60000
+        Lv1: 20000
+        Lv2: 40000
+        Lv3: 60000
+        Lv4: 80000
+        Lv5: 100000
+        Lv6: 120000
+        Lv7: 140000
+        Lv8: 160000
+        Lv9: 180000
+        Lv10: 200000
     }
     FixedCastTime: 0
     Requirements: {
@@ -38662,4 +38642,14 @@ skill_db: (
         Self: true
     }
 },
+{
+    Id: 20003
+    Name: "EVOL_MONSTER_IDENTIFY"
+    Description: "Monster Identify"
+    MaxLevel: 1
+    SkillType: {
+        Self: true
+    }
+    CoolDown: 3000
+},
 )
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 3d7128d2..f604479d 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -85,10 +85,11 @@ Human: {
 		MG_COLDBOLT: 0
 		EVOL_MASS_PROVOKE: 0
 		EVOL_PHYSICAL_SHIELD: 0
+		EVOL_MONSTER_IDENTIFY: 0
 	}
 }
 
-Ukar: {
+DarkUkar: {
 	skills: {
         SM_SWORD: 0
         SM_TWOHAND: 0
@@ -148,10 +149,11 @@ Ukar: {
 		MG_COLDBOLT: 0
 		EVOL_MASS_PROVOKE: 0
 		EVOL_PHYSICAL_SHIELD: 0
+		EVOL_MONSTER_IDENTIFY: 0
 	}
 }
 
-Demon: {
+FireKralog: {
 	skills: {
         SM_SWORD: 0
         SM_TWOHAND: 0
@@ -211,10 +213,11 @@ Demon: {
 		MG_COLDBOLT: 0
 		EVOL_MASS_PROVOKE: 0
 		EVOL_PHYSICAL_SHIELD: 0
+		EVOL_MONSTER_IDENTIFY: 0
 	}
 }
 
-Elven: {
+LightRaijin: {
 	skills: {
         SM_SWORD: 0
         SM_TWOHAND: 0
@@ -274,10 +277,11 @@ Elven: {
 		MG_COLDBOLT: 0
 		EVOL_MASS_PROVOKE: 0
 		EVOL_PHYSICAL_SHIELD: 0
+		EVOL_MONSTER_IDENTIFY: 0
 	}
 }
 
-Orc: {
+BlueTritan: {
 	skills: {
         SM_SWORD: 0
         SM_TWOHAND: 0
@@ -337,131 +341,32 @@ Orc: {
 		MG_COLDBOLT: 0
 		EVOL_MASS_PROVOKE: 0
 		EVOL_PHYSICAL_SHIELD: 0
+		EVOL_MONSTER_IDENTIFY: 0
 	}
 }
 
-Raijin: {
-	skills: {
-        SM_SWORD: 0
-        SM_TWOHAND: 0
-        AC_OWL: 0
-		NV_BASIC: 0
-		NV_FIRSTAID: 0
-		NV_TRICKDEAD: 0
-		WE_BABY: 0
-		WE_CALLPARENT: 0
-		WE_CALLBABY: 0
-		ALL_INCCARRY: 0
-		MC_VENDING: 0
-		MC_PUSHCART: 0
-		ALL_BUYING_STORE: 0
-		AM_CALLHOMUN: 0
-		KN_RIDING: 0
-		SM_BASH: 0
-		TK_HIGHJUMP: 0
-		MG_THUNDERSTORM: 0
-		AS_CLOAKING: 0
-		TF_DOUBLE: 0
-		TF_HIDING: 0
-		WZ_VERMILION: 0
-		ST_CHASEWALK: 0
-		WS_CARTBOOST: 0
-		TK_RUN: 0
-		RA_RESEARCHTRAP: 0
-		SC_DIMENSIONDOOR: 0
-		WZ_STORMGUST: 0
-		WL_SUMMONFB: 0
-		WL_RELEASE: 0
-		WL_SUMMONSTONE: 0
-		SC_INVISIBILITY: 0
-		RG_GRAFFITI: 0
-		RG_CLEANER: 0
-		SA_COMA: 0
-		CH_SOULCOLLECT: 0
-		SL_STUN: 0
-		AL_BLESSING: 0
-		WL_STASIS: 0
-		RA_CAMOUFLAGE: 0
-		SC_MANHOLE: 0
-		AL_RUWACH: 0
-		AL_TELEPORT: 0
-		MG_SAFETYWALL: 0
-		WZ_QUAGMIRE: 0
-		WZ_FROSTNOVA: 0
-		MO_BODYRELOCATION: 0
-		MO_CALLSPIRITS: 0
-		GN_HELLS_PLANT: 0
-		GN_DEMONIC_FIRE: 0
-		GN_CRAZYWEED: 0
-		GN_WALLOFTHORN: 0
-		WE_MALE: 0
-		WE_FEMALE: 0
-		WE_CALLPARTNER: 0
-		MG_COLDBOLT: 0
-		EVOL_MASS_PROVOKE: 0
-		EVOL_PHYSICAL_SHIELD: 0
-	}
+
+FrostKralog: {
+	inherit: ( "FireKralog" );
 }
 
-Tritan: {
-	skills: {
-        SM_SWORD: 0
-        SM_TWOHAND: 0
-        AC_OWL: 0
-		NV_BASIC: 0
-		NV_FIRSTAID: 0
-		NV_TRICKDEAD: 0
-		WE_BABY: 0
-		WE_CALLPARENT: 0
-		WE_CALLBABY: 0
-		ALL_INCCARRY: 0
-		MC_VENDING: 0
-		MC_PUSHCART: 0
-		ALL_BUYING_STORE: 0
-		AM_CALLHOMUN: 0
-		KN_RIDING: 0
-		SM_BASH: 0
-		TK_HIGHJUMP: 0
-		MG_THUNDERSTORM: 0
-		AS_CLOAKING: 0
-		TF_DOUBLE: 0
-		TF_HIDING: 0
-		WZ_VERMILION: 0
-		ST_CHASEWALK: 0
-		WS_CARTBOOST: 0
-		TK_RUN: 0
-		RA_RESEARCHTRAP: 0
-		SC_DIMENSIONDOOR: 0
-		WZ_STORMGUST: 0
-		WL_SUMMONFB: 0
-		WL_RELEASE: 0
-		WL_SUMMONSTONE: 0
-		SC_INVISIBILITY: 0
-		RG_GRAFFITI: 0
-		RG_CLEANER: 0
-		SA_COMA: 0
-		CH_SOULCOLLECT: 0
-		SL_STUN: 0
-		AL_BLESSING: 0
-		WL_STASIS: 0
-		RA_CAMOUFLAGE: 0
-		SC_MANHOLE: 0
-		AL_RUWACH: 0
-		AL_TELEPORT: 0
-		MG_SAFETYWALL: 0
-		WZ_QUAGMIRE: 0
-		WZ_FROSTNOVA: 0
-		MO_BODYRELOCATION: 0
-		MO_CALLSPIRITS: 0
-		GN_HELLS_PLANT: 0
-		GN_DEMONIC_FIRE: 0
-		GN_CRAZYWEED: 0
-		GN_WALLOFTHORN: 0
-		WE_MALE: 0
-		WE_FEMALE: 0
-		WE_CALLPARTNER: 0
-		MG_COLDBOLT: 0
-		EVOL_MASS_PROVOKE: 0
-		EVOL_PHYSICAL_SHIELD: 0
-	}
+DarkRaijin: {
+	inherit: ( "LightRaijin" );
+}
+
+PurpleTritan: {
+	inherit: ( "BlueTritan" );
+}
+
+PinkUkar: {
+	inherit: ( "DarkUkar" );
+}
+
+MediumHuman: {
+	inherit: ( "Human" );
+}
+
+DarkHuman: {
+	inherit: ( "Human" );
 }
+