Update db from hercules.

10 files changed, 501 insertions, 162 deletions

diff --git a/db/const.txt b/db/const.txt
index 451c5304..bd963c24 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1,18 +1,18 @@
 // Script Constant Database
 //
 // Structure of Database:
-// Identifier   Value[  Type]
+// Identifier	Value[	Type]
 //
 // Alternatively:
 // Identifier,Value[,Type]
 //
-// 01. Identifier       Unique name for the constant, must not have same name as script commands, functions or variables.
-// 02. Value            Value assigned to the constant. This value cannot be changed during the runtime of the server.
-// 03. Type                     Specifies whether the identifier is a constant (0) or a parameter (1) (optional, defaults to 0).
+// 01. Identifier	Unique name for the constant, must not have same name as script commands, functions or variables.
+// 02. Value		Value assigned to the constant. This value cannot be changed during the runtime of the server.
+// 03. Type			Specifies whether the identifier is a constant (0) or a parameter (1) (optional, defaults to 0).
 //
-// NOTE:                        Parameters are special in that they retrieve certain runtime values depending on the specified ID
-//                                      in field Value. Depending on the implementation values assigned by scripts to parameters will affect
-//                                      runtime values, such as Zeny, as well (see pc_readparam/pc_setparam).
+// NOTE:			Parameters are special in that they retrieve certain runtime values depending on the specified ID
+//					in field Value. Depending on the implementation values assigned by scripts to parameters will affect
+//					runtime values, such as Zeny, as well (see pc_readparam/pc_setparam).
 
 Job_Novice	0
 Job_Swordman	1
@@ -43,6 +43,7 @@ Job_Gunslinger	24
 Job_Ninja	25
 Job_Xmas	26
 Job_Summer	27
+
 Job_Novice_High	4001
 Job_Swordman_High	4002
 Job_Mage_High	4003
@@ -65,6 +66,7 @@ Job_Creator	4019
 Job_Clown	4020
 Job_Gypsy	4021
 Job_Paladin2	4022
+
 Job_Baby	4023
 Job_Baby_Swordman	4024
 Job_Baby_Mage	4025
@@ -89,25 +91,30 @@ Job_Baby_Bard	4042
 Job_Baby_Dancer	4043
 Job_Baby_Crusader2	4044
 Job_Super_Baby	4045
+
 Job_Taekwon	4046
 Job_Star_Gladiator	4047
 Job_Star_Gladiator2	4048
 Job_Soul_Linker	4049
+
 Job_Gangsi	4050
 Job_Death_Knight	4051
 Job_Dark_Collector	4052
+
 Job_Rune_Knight	4054
 Job_Warlock	4055
 Job_Ranger	4056
 Job_Arch_Bishop	4057
 Job_Mechanic	4058
 Job_Guillotine_Cross	4059
+
 Job_Rune_Knight_T	4060
 Job_Warlock_T	4061
 Job_Ranger_T	4062
 Job_Arch_Bishop_T	4063
 Job_Mechanic_T	4064
 Job_Guillotine_Cross_T	4065
+
 Job_Royal_Guard	4066
 Job_Sorcerer	4067
 Job_Minstrel	4068
@@ -115,6 +122,7 @@ Job_Wanderer	4069
 Job_Sura	4070
 Job_Genetic	4071
 Job_Shadow_Chaser	4072
+
 Job_Royal_Guard_T	4073
 Job_Sorcerer_T	4074
 Job_Minstrel_T	4075
@@ -122,6 +130,7 @@ Job_Wanderer_T	4076
 Job_Sura_T	4077
 Job_Genetic_T	4078
 Job_Shadow_Chaser_T	4079
+
 Job_Rune_Knight2	4080
 Job_Rune_Knight_T2	4081
 Job_Royal_Guard2	4082
@@ -130,6 +139,7 @@ Job_Ranger2	4084
 Job_Ranger_T2	4085
 Job_Mechanic2	4086
 Job_Mechanic_T2	4087
+
 Job_Baby_Rune	4096
 Job_Baby_Warlock	4097
 Job_Baby_Ranger	4098
@@ -143,24 +153,30 @@ Job_Baby_Wanderer	4105
 Job_Baby_Sura	4106
 Job_Baby_Genetic	4107
 Job_Baby_Chaser	4108
+
 Job_Baby_Rune2	4109
 Job_Baby_Guard2	4110
 Job_Baby_Ranger2	4111
 Job_Baby_Mechanic2	4112
+
 Job_Super_Novice_E	4190
 Job_Super_Baby_E	4191
+
 Job_Kagerou	4211
 Job_Oboro	4212
 Job_Rebellion	4215
+
 EAJL_2_1	0x100
 EAJL_2_2	0x200
 EAJL_2	0x300
 EAJL_UPPER	0x1000
 EAJL_BABY	0x2000
 EAJL_THIRD	0x4000
+
 EAJ_BASEMASK	0x00ff
 EAJ_UPPERMASK	0x0fff
 EAJ_THIRDMASK	0x4fff
+
 EAJ_NOVICE	0x0
 EAJ_SWORDMAN	0x1
 EAJ_MAGE	0x2
@@ -172,6 +188,7 @@ EAJ_TAEKWON	0x7
 EAJ_GUNSLINGER	0x9
 EAJ_NINJA	0x0A
 EAJ_GANGSI	0x0D
+
 EAJ_SUPER_NOVICE	0x100
 EAJ_KNIGHT	0x101
 EAJ_WIZARD	0x102
@@ -180,9 +197,10 @@ EAJ_PRIEST	0x104
 EAJ_BLACKSMITH	0x105
 EAJ_ASSASSIN	0x106
 EAJ_STAR_GLADIATOR	0x107
-EAJ_REBELLION	0x109
+EAJ_REBELLION		0x109
 EAJ_KAGEROUOBORO	0x10A
 EAJ_DEATH_KNIGHT	0x10D
+
 EAJ_CRUSADER	0x201
 EAJ_SAGE	0x202
 EAJ_BARDDANCER	0x203
@@ -191,6 +209,7 @@ EAJ_ALCHEMIST	0x205
 EAJ_ROGUE	0x206
 EAJ_SOUL_LINKER	0x207
 EAJ_DARK_COLLECTOR	0x20D
+
 EAJ_NOVICE_HIGH	0x1000
 EAJ_SWORDMAN_HIGH	0x1001
 EAJ_MAGE_HIGH	0x1002
@@ -198,18 +217,21 @@ EAJ_ARCHER_HIGH	0x1003
 EAJ_ACOLYTE_HIGH	0x1004
 EAJ_MERCHANT_HIGH	0x1005
 EAJ_THIEF_HIGH	0x1006
+
 EAJ_LORD_KNIGHT	0x1101
 EAJ_HIGH_WIZARD	0x1102
 EAJ_SNIPER	0x1103
 EAJ_HIGH_PRIEST	0x1104
 EAJ_WHITESMITH	0x1105
 EAJ_ASSASSIN_CROSS	0x1106
+
 EAJ_PALADIN	0x1201
 EAJ_PROFESSOR	0x1202
 EAJ_CLOWNGYPSY	0x1203
 EAJ_CHAMPION	0x1204
 EAJ_CREATOR	0x1205
 EAJ_STALKER	0x1206
+
 EAJ_BABY	0x2000
 EAJ_BABY_SWORDMAN	0x2001
 EAJ_BABY_MAGE	0x2002
@@ -217,6 +239,7 @@ EAJ_BABY_ARCHER	0x2003
 EAJ_BABY_ACOLYTE	0x2004
 EAJ_BABY_MERCHANT	0x2005
 EAJ_BABY_THIEF	0x2006
+
 EAJ_SUPER_BABY	0x2100
 EAJ_BABY_KNIGHT	0x2101
 EAJ_BABY_WIZARD	0x2102
@@ -224,12 +247,14 @@ EAJ_BABY_HUNTER	0x2103
 EAJ_BABY_PRIEST	0x2104
 EAJ_BABY_BLACKSMITH	0x2105
 EAJ_BABY_ASSASSIN	0x2106
+
 EAJ_BABY_CRUSADER	0x2201
 EAJ_BABY_SAGE	0x2202
 EAJ_BABY_BARDDANCER	0x2203
 EAJ_BABY_MONK	0x2204
 EAJ_BABY_ALCHEMIST	0x2205
 EAJ_BABY_ROGUE	0x2206
+
 EAJ_SUPER_NOVICE_E	0x4100
 EAJ_RUNE_KNIGHT	0x4101
 EAJ_WARLOCK	0x4102
@@ -237,37 +262,43 @@ EAJ_RANGER	0x4103
 EAJ_ARCH_BISHOP	0x4104
 EAJ_MECHANIC	0x4105
 EAJ_GUILLOTINE_CROSS	0x4106
+
 EAJ_ROYAL_GUARD	0x4201
 EAJ_SORCERER	0x4202
 EAJ_MINSTRELWANDERER	0x4203
 EAJ_SURA	0x4204
 EAJ_GENETIC	0x4205
 EAJ_SHADOW_CHASER	0x4206
+
 EAJ_RUNE_KNIGHT_T	0x5101
 EAJ_WARLOCK_T	0x5102
 EAJ_RANGER_T	0x5103
 EAJ_ARCH_BISHOP_T	0x5104
 EAJ_MECHANIC_T	0x5105
 EAJ_GUILLOTINE_CROSS_T	0x5106
+
 EAJ_ROYAL_GUARD_T	0x5201
 EAJ_SORCERER_T	0x5202
 EAJ_MINSTRELWANDERER_T	0x5203
 EAJ_SURA_T	0x5204
 EAJ_GENETIC_T	0x5205
 EAJ_SHADOW_CHASER_T	0x5206
+
 EAJ_SUPER_BABY_E	0x6100
-EAJ_BABY_RUNE	0x6101
+EAJ_BABY_RUNE		0x6101
 EAJ_BABY_WARLOCK	0x6102
-EAJ_BABY_RANGER	0x6103
-EAJ_BABY_BISHOP	0x6104
+EAJ_BABY_RANGER		0x6103
+EAJ_BABY_BISHOP		0x6104
 EAJ_BABY_MECHANIC	0x6105
-EAJ_BABY_CROSS	0x6106
-EAJ_BABY_GUARD	0x6201
+EAJ_BABY_CROSS		0x6106
+
+EAJ_BABY_GUARD		0x6201
 EAJ_BABY_SORCERER	0x6202
 EAJ_BABY_MINSTRELWANDERER	0x6203
-EAJ_BABY_SURA	0x6204
+EAJ_BABY_SURA		0x6204
 EAJ_BABY_GENETIC	0x6205
-EAJ_BABY_CHASER	0x6206
+EAJ_BABY_CHASER		0x6206
+
 bc_all	0
 bc_map	1
 bc_area	2
@@ -277,6 +308,7 @@ bc_npc	8
 bc_yellow	0
 bc_blue	16
 bc_woe	32
+
 mf_nomemo	0
 mf_noteleport	1
 mf_nosave	2
@@ -329,6 +361,7 @@ mf_battleground	51
 mf_reset	52
 mf_notomb	53
 mf_nocashshop	54
+
 cell_walkable	0
 cell_shootable	1
 cell_water	2
@@ -337,6 +370,7 @@ cell_basilica	4
 cell_landprotector	5
 cell_novending	6
 cell_nochat	7
+
 //cell_gettype	0
 cell_chkwall	1
 cell_chkwater	2
@@ -351,6 +385,7 @@ cell_chkbasilica	10
 cell_chklandprotector	11
 cell_chknovending	12
 cell_chknochat	13
+
 StatusPoint	9	1
 BaseLevel	11	1
 SkillPoint	12	1
@@ -373,13 +408,14 @@ Sp	7	1
 MaxSp	8	1
 BaseJob	119	1
 BaseClass	120	1
-killerrid	121	1
-killedrid	122	1
+killerrid	121 1
+killedrid	122 1
 SlotChange	123	1
 CharRename	124	1
 ModExp	125	1
 ModDrop	126	1
 ModDeath	127	1
+
 bMaxHP	6
 bMaxSP	8
 bStr	13
@@ -401,6 +437,7 @@ bCritical	52
 bAspd	53
 bFame	59
 bUnbreakable	60
+
 bAtkRange	1000
 bAtkEle	1001
 bDefEle	1002
@@ -474,7 +511,7 @@ bBreakArmorRate	1069
 bAddStealRate	1070
 bMagicDamageReturn	1071
 bAllStats	1073
-bAgiVit	1074
+bAgiVit		1074
 bAgiDexStr	1075
 bPerfectHide	1076
 bNoKnockback	1077
@@ -492,6 +529,7 @@ bSkillHeal2	1088
 bAddEffOnSkill	1089
 bHealPower	1090
 bHealPower2	1091
+
 bRestartFullRecover	2000
 bNoCastCancel	2001
 bNoSizeFix	2002
@@ -513,6 +551,7 @@ bAutoSpellWhenHit	2017
 bSkillAtk	2018
 bUnstripable	2019
 bAutoSpellOnSkill	2020
+
 bSPGainValue	2021
 bHPRegenRate	2022
 bHPLossRate	2023
@@ -543,17 +582,19 @@ bSPGainRaceAttack	2047
 bHPGainRaceAttack	2048
 bSkillUseSPrate	2049
 bSkillCooldown	2050
+
 bSkillFixedCast	2051
 bSkillVariableCast	2052
 bFixedCastrate	2053
 bVariableCastrate	2054
 bSkillUseSP	2055
-bMagicAtkEle	2056
+bMagicAtkEle 2056
 bFixedCast	2057
 bVariableCast	2058
 bSetDefRace	2059
 bSetMDefRace	2060
 bAddRaceTolerance	2061
+bAddMaxWeight	2062
 
 //reference to script.c::script_defaults():equip[] array used for easy-conversion
 EQI_HEAD_TOP	1
@@ -576,6 +617,7 @@ EQI_SHADOW_SHIELD	17
 EQI_SHADOW_SHOES	18
 EQI_SHADOW_ACC_R	19
 EQI_SHADOW_ACC_L	20
+
 LOOK_BASE	0
 LOOK_HAIR	1
 LOOK_WEAPON	2
@@ -589,6 +631,7 @@ LOOK_SHOES	9
 LOOK_BODY	10
 LOOK_FLOOR	11
 LOOK_ROBE	12
+
 Eff_Stone	0
 Eff_Freeze	1
 Eff_Stun	2
@@ -604,6 +647,7 @@ Eff_Fear	11
 Eff_Cold	12
 Eff_Burning	13
 Eff_Deepsleep	14
+
 Ele_Neutral	0
 Ele_Water	1
 Ele_Earth	2
@@ -648,6 +692,7 @@ RC2_Turtle	8
 Size_Small	0
 Size_Medium	1
 Size_Large	2
+
 BF_WEAPON	0x0001
 BF_MAGIC	0x0002
 BF_MISC	0x0004
@@ -655,6 +700,7 @@ BF_SHORT	0x0010
 BF_LONG	0x0040
 BF_SKILL	0x0100
 BF_NORMAL	0x0200
+
 ATF_SELF	0x01
 ATF_TARGET	0x02
 ATF_SHORT	0x04
@@ -663,6 +709,7 @@ ATF_WEAPON	0x10
 ATF_MAGIC	0x20
 ATF_MISC	0x40
 ATF_SKILL	0x60
+
 SC_ALL	-1
 SC_STONE	0
 SC_FREEZE	1
@@ -940,7 +987,6 @@ SC_MER_SP	282
 SC_MER_HIT	283
 SC_MER_QUICKEN	284
 SC_REBIRTH	285
-SC_ITEMSCRIPT	290
 SC_S_LIFEPOTION	291
 SC_L_LIFEPOTION	292
 SC_CASH_PLUSONLYJOBEXP	293
@@ -1209,14 +1255,14 @@ SC_OFFERTORIUM	559
 SC_FRIGG_SONG	560
 SC_ALL_RIDING	561
 SC_HANBOK	562
-SC_MONSTER_TRANSFORM	563
-SC_ANGEL_PROTECT	564
-SC_ILLUSIONDOPING	565
-SC_MTF_ASPD	566
-SC_MTF_RANGEATK	567
-SC_MTF_MATK	568
-SC_MTF_MLEATKED	569
-SC_MTF_CRIDAMAGE	570
+SC_MONSTER_TRANSFORM 563
+SC_ANGEL_PROTECT 564
+SC_ILLUSIONDOPING 565
+SC_MTF_ASPD 566
+SC_MTF_RANGEATK 567
+SC_MTF_MATK 568
+SC_MTF_MLEATKED 569
+SC_MTF_CRIDAMAGE 570
 SC_MOONSTAR	571
 SC_SUPER_STAR	572
 SC_OKTOBERFEST	573
@@ -1226,14 +1272,67 @@ SC__MAELSTROM	576
 SC__CHAOS	577
 SC__FEINTBOMB_MASTER	578
 SC_FALLENEMPIRE	579
-SC_FLASHCOMBO	580
-SC_DEFSET	581
-SC_MDEFSET	582
-SC_NO_SWITCH_EQUIP	583
+SC_FLASHCOMBO 580
+SC_DEFSET 581
+SC_MDEFSET 582
+SC_NO_SWITCH_EQUIP 583
+
+// 2014 Halloween Event
 SC_MTF_MHP	584
 SC_MTF_MSP	585
 SC_MTF_PUMPKIN	586
 SC_MTF_HITFLEE	587
+
+SC_LJOSALFAR	588
+SC_MERMAID_LONGING	589
+
+SC_ACARAJE	590
+SC_TARGET_ASPD	591
+
+// Geffen Scrolls
+SC_SKELSCROLL	592
+SC_DISTRUCTIONSCROLL	593
+SC_ROYALSCROLL	594
+SC_IMMUNITYSCROLL	595
+SC_MYSTICSCROLL	596
+SC_BATTLESCROLL	597
+SC_ARMORSCROLL	598
+SC_FREYJASCROLL	599
+SC_SOULSCROLL	600
+
+// Eden Crystal Synthesis
+SC_QUEST_BUFF1	601
+SC_QUEST_BUFF2	602
+SC_QUEST_BUFF3	603
+
+// Geffen Magic Tournament
+SC_GEFFEN_MAGIC1	604
+SC_GEFFEN_MAGIC2	605
+SC_GEFFEN_MAGIC3	606
+SC_FENRIR_CARD	607
+
+SC_ATKER_ASPD	608
+SC_ATKER_MOVESPEED	609
+SC_FOOD_CRITICALSUCCESSVALUE	610
+SC_CUP_OF_BOZA	611
+SC_OVERLAPEXPUP	612
+SC_MORA_BUFF	613
+
+// MVP Scrolls
+SC_MVPCARD_TAOGUNKA	614
+SC_MVPCARD_MISTRESS	615
+SC_MVPCARD_ORCHERO	616
+SC_MVPCARD_ORCLORD	617
+
+SC_HAT_EFFECT	618
+SC_FLOWERSMOKE	619
+SC_FSTONE	620
+SC_HAPPINESS_STAR	621
+SC_MAPLE_FALLS	622
+SC_TIME_ACCESSORY	623
+SC_MAGICAL_FEATHER	624
+SC_BLOSSOM_FLUTTERING	625
+
 e_gasp	0
 e_what	1
 e_ho	2
@@ -1315,11 +1414,13 @@ e_spit	77
 e_ene	78
 e_panic	79
 e_whisp	80
+
 PET_CLASS	1
 PET_NAME	2
 PET_LEVEL	3
 PET_HUNGRY	4
 PET_INTIMATE	5
+
 MOB_NAME	0
 MOB_LV	1
 MOB_MAXHP	2
@@ -1343,9 +1444,11 @@ MOB_RACE	19
 MOB_ELEMENT	20
 MOB_MODE	21
 MOB_MVPEXP	22
+
 ARCH_MERC_GUILD	0
 SPEAR_MERC_GUILD	1
 SWORD_MERC_GUILD	2
+
 EF_NONE	-1
 EF_HIT1	0
 EF_HIT2	1
@@ -2369,11 +2472,13 @@ EF_MIRESULT_MAKE_FAIL	1018
 EF_ALL_RAY_OF_PROTECTION	1019
 EF_VENOMFOG	1020
 EF_DUSTSTORM	1021
+//1022 - 1039 Unknown
 EF_GC_DARKCROW	1040
 EF_RK_DRAGONBREATH_WATER	1041
 EF_ALL_FULL_THROTTLE	1042
 EF_SR_FLASHCOMBO	1043
 EF_RK_LUXANIMA	1044
+//1045 Unknown
 EF_SO_ELEMENTAL_SHIELD	1046
 EF_AB_OFFERTORIUM	1047
 EF_WL_TELEKINESIS_INTENSE	1048
@@ -2389,11 +2494,15 @@ EF_AB_OFFERTORIUM_RING	1057
 EF_SC_ESCAPE	1058
 EF_WM_FRIGG_SONG	1059
 EF_C_MAKER	1060
+//1061 Unknown
 EF_HAMMER_OF_GOD	1062
+//1063 - 1065 Unknown
 EF_BANISHING_BUSTER	1066
 EF_SLUGSHOT	1067
 EF_D_TAIL	1068
+//1069 - 1077 Unknown
 EF_S_STORM	1078
+
 WARPNPC	45
 1_ETC_01	46
 1_M_01	47
@@ -2475,7 +2584,9 @@ HIDDEN_NPC	111
 2_F_MAGICMASTER	123
 4_F_TELEPORTER	124
 4_M_TELEPORTER	125
+// Free ID's 126 - 138
 HIDDEN_WARP_NPC	139
+// Free ID's 140 - 400
 4_M_MUT2	401
 4_M_SCIENCE	402
 4_F_VALKYRIE2	403
@@ -3085,11 +3196,11 @@ PORTAL	10007
 THANATOS_BATTLE	10008
 THANATOS_KEEP	10009
 4_F_LYDIA	10010
-4_LUDE	10011
-4_ALIZA	10012
-4_ALICE	10013
+4_LUDE		10011
+4_ALIZA		10012
+4_ALICE		10013
 4_ARCHER_SKEL	10014
-4_JACK	10015
+4_JACK		10015
 4_SOLDIER_SKEL	10016
 4_LOLI_RURI	10017
 4_M_SAKRAY_TIED	10018
@@ -3188,6 +3299,67 @@ THANATOS_KEEP	10009
 4_JP_EDGA_H	10111
 4_JP_BRAGOLEM_H	10112
 4_EL_AQUA	10113
+4_EP16_NIHIL	10114
+4_EP16_SPICA	10115
+4_EP16_SKIA	10116
+4_EP16_PETER	10117
+4_EP16_CRUX	10118
+4_EP16_GRANZ	10119
+4_EP16_STOLZ	10120
+4_EP16_EGEO	10121
+4_EP16_COOK	10122
+4_EP16_MARK	10123
+4_EP16_TAMARIN	10124
+4_EP16_POE	10125
+4_EP16_ISAAC	10126
+4_EP16_HELMUT	10127
+4_EP16_WOLF	10128
+4_EP16_MEYER	10129
+4_EP16_AGNES	10130
+4_EP16_FOOD	10131
+4_EP16_LOUVIERE	10132
+4_EP16_MAX	10133
+4_EP16_SPIEGEL	10134
+4_MOONLIGHT	10135
+4_MISTRESS	10136
+4_DRACULA	10137
+4_STORMKNIGHT	10138
+4_TATTER	10139
+4_AS_RAGGED_GOLEM	10140
+4_AS_BLOODY_KNIGHT	10141
+4_AS_WIND_GHOST	10142
+4_F_BIJOU	10143
+4_EP16_COOK2	10144
+4_SERVICE_30_M_01	10145
+4_SERVICE_30_F_01	10146
+4_SCR_AT_ROBOTS	10147
+4_F_RANGER	10148
+4_WAG	10149
+4_NPC_TRAP	10150
+4_RAGGLER	10151
+4_DR_PEPE	10152
+4_DR_GAMBERI	10153
+4_DR_AGLIO	10154
+4_DR_OLIO	10155
+4_DR_STELO	10156
+4_DR_TORTEL	10157
+4_BASIL_SLAVE	10158
+4_DOU_JINDO	10159
+4_DOU_SIBA	10160
+4_TARUTUPI	10161
+4_DR_SOLDIER	10162
+4_DR_M_01	10163
+4_DR_M_02	10164
+4_DR_F_01	10165
+4_DR_F_02	10166
+4_DR_KID_01	10167
+4_JP_2015EVT	10168
+4_ALLIGATOR	10169
+4_ANOLIAN	10170
+4_TACNU	10171
+4_CENERE	10172
+4_F_ARUNA_POP2	10173
+4_JACK_HEAD	10174
 
 MER_LIF	6001
 MER_AMISTR	6002
@@ -3235,9 +3407,11 @@ MER_SWORDMAN07	6043
 MER_SWORDMAN08	6044
 MER_SWORDMAN09	6045
 MER_SWORDMAN10	6046
+
 HAVEQUEST	0
 PLAYTIME	1
 HUNTING	2
+
 QTYPE_NONE	0x270f
 QTYPE_QUEST	0x00
 QTYPE_QUEST2	0x01
@@ -3247,6 +3421,7 @@ QTYPE_EVENT	0x04
 QTYPE_EVENT2	0x05
 QTYPE_WARG	0x06
 QTYPE_WARG2	0x08
+
 FW_DONTCARE	0
 FW_THIN	100
 FW_EXTRALIGHT	200
@@ -3257,6 +3432,7 @@ FW_SEMIBOLD	600
 FW_BOLD	700
 FW_EXTRABOLD	800
 FW_HEAVY	900
+
 VAR_HEAD	1
 VAR_WEAPON	2
 VAR_HEAD_TOP	3
@@ -3266,6 +3442,7 @@ VAR_HEADPALETTE	6
 VAR_BODYPALETTE	7
 VAR_SHIELD	8
 VAR_SHOES	9
+
 DIR_NORTH	0
 DIR_NORTHWEST	1
 DIR_WEST	2
@@ -3274,6 +3451,7 @@ DIR_SOUTH	4
 DIR_SOUTHEAST	5
 DIR_EAST	6
 DIR_NORTHEAST	7
+
 IT_HEALING	0
 IT_USABLE	2
 IT_ETC	3
@@ -3285,29 +3463,39 @@ IT_PETARMOR	8
 IT_AMMO	10
 IT_DELAYCONSUME	11
 IT_CASH	18
-HQO_OnLogout	1
-HQO_OnDeath	2
-HQO_OnMapChange	3
+
+QUEUEOPT_LOGOUT	1
+QUEUEOPT_DEATH	2
+QUEUEOPT_MAPCHANGE	3
+
 IOT_NONE	0
 IOT_CHAR	1
 IOT_PARTY	2
 IOT_GUILD	3
+
 false	0
 true	1
+
 NST_ZENY	0
 NST_CASH	1
 NST_MARKET	2
 NST_CUSTOM	3
+
+// strcharinfo
 PC_NAME	0
 PC_PARTY	1
 PC_GUILD	2
 PC_MAP	3
+
+// sc_start
 SCFLAG_NONE	0x00
 SCFLAG_NOAVOID	0x01
 SCFLAG_FIXEDTICK	0x02
 SCFLAG_LOADED	0x04
 SCFLAG_FIXEDRATE	0x08
 SCFLAG_NOICON	0x10
+
+// Mount types
 MOUNT_NONE	0
 MOUNT_PECO	1
 MOUNT_WUG	2
@@ -3318,17 +3506,75 @@ MOUNT_DRAGON_BROWN	5
 MOUNT_DRAGON_GRAY	6
 MOUNT_DRAGON_BLUE	7
 MOUNT_DRAGON_RED	8
-ClientVersion	10000	1
+
+// gettime( <param> )
+GETTIME_SECOND	1
+GETTIME_MINUTE	2
+GETTIME_HOUR	3
+GETTIME_WEEKDAY	4
+GETTIME_DAYOFMONTH	5
+GETTIME_MONTH	6
+GETTIME_YEAR	7
+GETTIME_DAYOFYEAR	8
+
+// Weekday
+SUNDAY	0
+MONDAY	1
+TUESDAY	2
+WEDNESDAY	3
+THURSDAY	4
+FRIDAY	5
+SATURDAY	6
+
+// Month
+JANUARY	1
+FEBRUARY	2
+MARCH	3
+APRIL	4
+MAY	5
+JUNE	6
+JULY	7
+AUGUST	8
+SEPTEMBER	9
+OCTOBER	10
+NOVEMBER	11
+DECEMBER	12
+
+UNITTYPE_PC	0
+UNITTYPE_NPC	1
+UNITTYPE_PET	2
+UNITTYPE_MOB	3
+UNITTYPE_HOM	4
+UNITTYPE_MER	5
+UNITTYPE_ELEM	6
+
+C_AQUA	0x00FFFF
+C_BLACK	0x000000
+C_BLUE	0x0000FF
+C_GRAY	0x808080
+C_GREEN	0x008000
+C_LIME	0x00FF00
+C_MAROON	0x800000
+C_NAVY	0x000080
+C_OLIVE	0x808000
+C_ORANGE	0xFFA500
+C_PURPLE	0x800080
+C_RED	0xFF0000
+C_SILVER	0xC0C0C0
+C_TEAL	0x008080
+C_WHITE	0xFFFFFF
+C_YELLOW	0xFFFF00
+C_PINK	0xFFC0CB
+C_CHOCOLATE	0xD2691E
+C_GOLD	0xFFD700
+C_VIOLET	0xEE82EE
+
 // evol constants
+ClientVersion	10000	1
 debug	1
-bMatk1	43
-bMatk2	44
-bDeaf	70
-bAspdAddRate	1030
-bMagicSubRace	1037
-bAddSpeed	1050
-bRandomAttackIncrease	1069
-bAddAtkRange	2010
+
+// outdated constants. must be removed
+// >>>
 equip_head	1
 equip_shield	2
 equip_hand2	3
@@ -3339,16 +3585,14 @@ equip_misc1	7
 equip_misc2	8
 equip_torso	9
 equip_legs	10
+// <<<
+// outdated constants. must be removed
+
+// genders
 G_FEMALE 0
 G_MALE 1
 G_OTHER 3
-WEDDING_FEE	100
-DIVORCE_FEE_PER_LEVEL	500
-WEDDING_MIN_LEVEL	32
-sfx_skillup	1
-SKILL_GUILD	500
-SKILL_CRAFT	501
-SKILL_DYE	502
+
 // races
 Human	0
 Ukar	1
@@ -3358,7 +3602,7 @@ Orc	4
 Raijin	5
 Tritan	6
 
-EFFECT_HEAL	7
+// directions
 DOWN	0
 DOWNLEFT	1
 LEFT	2
@@ -3368,6 +3612,7 @@ UPRIGHT	5
 RIGHT	6
 RIGHTDOWN	7
 
+// npcs
 NPC_EMPTY	-1
 NPC_KNIVES	100
 NPC_DEMON_MAN	101
diff --git a/db/re/exp_homun.txt b/db/re/exp_homun.txt
index 3c479cfa..f74c5016 100644
--- a/db/re/exp_homun.txt
+++ b/db/re/exp_homun.txt
@@ -148,4 +148,4 @@
 8922000
 8966000
 9094000
-0    
+0
diff --git a/db/re/homunculus_db.txt b/db/re/homunculus_db.txt
index 4c82a2d3..5c74b70f 100644
--- a/db/re/homunculus_db.txt
+++ b/db/re/homunculus_db.txt
@@ -25,3 +25,9 @@
 6005,6013,Lif,537,60000,0,1,7,0,700,150,40,12,20,15,35,24,14,60,100,4,9,5,19,4,20,5,19,6,20,5,19,6,20,800,2400,220,480,10,30,30,50,20,40,20,40,10,30,10,20
 6006,6014,Amistr,912,60000,0,1,2,0,700,320,10,20,17,35,11,24,13,80,130,1,4,8,20,1,10,4,20,3,19,4,20,3,19,1600,3600,120,360,20,50,20,50,20,50,10,30,10,30,10,30
 6007,6015,Filir,910,60000,0,1,2,0,700,90,25,29,35,9,8,30,9,45,75,3,6,4,20,3,19,1,10,4,20,8,20,3,19,1200,3200,200,400,10,30,10,30,10,30,20,50,20,50,10,20
+6008,6016,Vanilmirth,911,60000,0,1,0,0,700,80,11,11,11,11,11,11,11,30,150,0,7,1,30,1,30,1,30,1,30,1,30,1,30,1200,4800,480,640,10,30,20,50,10,30,10,50,10,30,10,100
+6048,6048,Eira,6098,60000,1,1,8,0,700,450,120,36,60,45,105,86,42,40,160,20,42,13,39,14,48,15,25,16,36,28,42,9,18,1000,2000,10,200,1,10,1,10,1,10,1,10,1,10,1,10
+6049,6049,Bayeri,6112,60000,1,1,2,0,700,1060,30,60,51,105,33,86,39,90,360,48,52,18,36,22,44,16,32,12,24,8,36,20,36,1000,2000,10,200,1,10,1,10,1,10,1,10,1,10,1,10
+6050,6050,Sera,6108,60000,1,1,4,0,700,330,80,87,90,55,24,126,9,60,240,36,64,10,25,7,35,5,25,28,40,16,32,20,40,1000,2000,10,200,1,10,1,10,1,10,1,10,1,10,1,10
+6051,6051,Dieter,6104,60000,1,1,0,0,700,300,44,44,44,44,44,53,44,240,480,40,120,20,40,15,40,18,36,16,32,13,26,4,16,1000,2000,10,200,1,10,1,10,1,10,1,10,1,10,1,10
+6052,6052,Eleanor,6115,60000,1,1,7,0,700,310,60,87,115,27,24,108,27,60,300,10,20,20,40,5,15,24,48,12,36,10,50,2,10,1000,2000,10,200,1,10,1,10,1,10,1,10,1,10,1,10
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index d4fe7f4f..d95a2f81 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1,3 +1,32 @@
+//================= Hercules Database =====================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2014-2015  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/>.
+//=========================================================================
+//= Items Database
+//=========================================================================
+
 item_db: (
 //  Items Database
 //
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index cd4fcef7..a9080133 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -1,3 +1,32 @@
+//================= Hercules Database =====================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2015  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/>.
+//=========================================================================
+//= Mobs Database
+//=========================================================================
+
 mob_db: (
 //  Mobs Database
 //
diff --git a/db/re/refine_db.conf b/db/re/refine_db.conf
index 5a6bdfe2..927e2d6b 100644
--- a/db/re/refine_db.conf
+++ b/db/re/refine_db.conf
@@ -1,28 +1,53 @@
-/********************************************************************************
- *			Renewal Refine Database					*
- ********************************************************************************
-Refine Database Structure -
+//================= Hercules Database =====================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2015  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/>.
+//=========================================================================
+//= Renewal Refine Database
+//=========================================================================
 
-Armors/WeaponLevel1~4: { (0 - Armors, 1 - Level 1 Weapons, 2 - Level 2 Weapons, 3 - Level 3 Weapons, 4 - Level 4 Weapons)
-						- For armors, values of 100 add 1 armor defense.
-						- For weapons, values of 100 add 1 ATK&MATK.
-	StatsPerLevel: (int)			This value is applied for ever level.
-	RandomBonusStartLevel: (int)		This value specifies the start point for those levels that give a random bonus value (usually the first unsafe upgrade).
-	RandomBonusValue: (int)			A random number between 0 and (Random bonus start level - Upgrade level + 1) * this value is applied for all upgrades past.
-						Random bonus start level. This is only applied for weapons, and not displayed client-side.
-	Rates: {				Per level configuration of the refine rates.
-		Lv1~10: {			Level of refine
-			Chance: (int)			Chance of successful refine (100 = 100%)
-							Note: If not mentioned, defaults to 100.
-			Bonus: (int)			Bonus for this level of refine (Optional Field)
-							Note: If not mentioned, defaults to 0.
-		}
+/**************************************************************************
+ ************* Entry structure ********************************************
+ **************************************************************************
+Armors/WeaponLevel1~4: { // Specifies weapon level or armor type
+			- For armors, values of 100 add 1 armor defense.
+			- For weapons, values of 100 add 1 ATK&MATK.
+	StatsPerLevel: value              (int) // This value is applied for ever level.
+	RandomBonusStartLevel: level      (int) // This value specifies the start point for those levels that give a random bonus value (usually the first unsafe upgrade).
+	RandomBonusValue: value           (int) // A random number between 0 and (Random bonus start level - Upgrade level + 1) * this value is applied for all upgrades past.
+	                                        //   Random bonus start level. This is only applied for weapons, and not displayed client-side.
+	Rates: { // Per level configuration of the refine rates.
+		Lv1~10: { // Level of refine
+			Chance: value     (int, optional, defaults to 100) // Chance of successful refine (100 = 100%)
+			Bonus: value      (int, optional, defaults to 0)   // Bonus for this level of refine
+		}
+		// Note: Refine levels that use default values need not be listed. (Example: Lv1: Chance: 100 Bonus: 0)
 	}
 }
+// A note about renewal Armors, there may or may not be another bonus, according to iRO wiki: Every upgrade gives floor[( 3 + current upgrade ) / 4]
+**************************************************************************/
 
-* -- Refine levels that use default values need not be listed. (Example: Lv1: Chance: 100 Bonus: 0)
-* -- A note about renewal Armors, there may or may not be another bonus, according to iRO wiki: Every upgrade gives floor[( 3 + current upgrade ) / 4]
-******************************************************************************/
 Armors: {
 	StatsPerLevel: 0
 	RandomBonusStartLevel: 0
diff --git a/db/re/size_fix.txt b/db/re/size_fix.txt
index f83560a8..e8e3774d 100644
--- a/db/re/size_fix.txt
+++ b/db/re/size_fix.txt
@@ -1,7 +1,7 @@
 // Database for size fix for weapon damage.
 
-//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
+// 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
diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
index 7d73fcce..2e349205 100644
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -8,7 +8,7 @@
 // AfterCastWalkDleay : amount of time before character can move again, in milliseconds
 // Duration1 / Duration2 : usually the durations used by the skill, at special cases it is used to hold special data
 // Cool Down : amount of time until character can re-use this skill, in milliseconds
-// Fixed Casting Time: the skills fixed casting time in milliseconds (when 0, uses 20% of cast time and less than 0 means no fixed cast time) 
+// Fixed Casting Time: the skills fixed casting time in milliseconds (when 0, uses 20% of cast time and less than 0 means no fixed cast time)
 //== Extra
 // On all fields you can use ':' as a delimiter to level-specific values,
 // - Example using SM_PROVOKE
@@ -17,7 +17,6 @@
 // - Makes lvl 1 have 1000 (1s) cool down, lvl 2 2500 (2.5s), lvl 3 3000, and so on.
 //==========================================
 
-
 //===== Swordman ===========================
 //-- SM_PROVOKE
 6,0,0,0,30000,0,0,0
@@ -27,7 +26,6 @@
 8,0,0,0,10000:13000:16000:19000:22000:25000:28000:31000:34000:37000,10000,10000,0
 //==========================================
 
-
 //===== Mage ===============================
 //-- MG_SIGHT
 10,0,0,0,10000,0,0,0
@@ -55,7 +53,6 @@
 21,640:1280:1920:2560:3200:3840:4480:5120:5760:6400,2000:2000:2000:2000:2000:2000:2000:2000:2000:2000,0,500,0,0,160:320:480:640:800:960:1120:1280:1440:1600
 //==========================================
 
-
 //===== Acolyte ============================
 //-- AL_RUWACH
 24,0,0,0,10000,0,0,0
@@ -83,7 +80,6 @@
 35,0,1000,0,0,6000,0,0
 //==========================================
 
-
 //===== Archer =============================
 //-- AC_CONCENTRATION
 45,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0,0
@@ -93,7 +89,6 @@
 47,0,100,0,100,0,0,0
 //==========================================
 
-
 //===== Thief ==============================
 //-- TF_HIDING
 51,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0,0
@@ -101,13 +96,11 @@
 52,0,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0,0
 //==========================================
 
-
 //===== First planned to be shared =========
 //-- ALL_RESURRECTION
 54,4800:3200:1600:0,0:1000:2000:3000,0,0,0,0,1200:800:400:0
 //==========================================
 
-
 //===== Knight =============================
 //-- KN_BRANDISHSPEAR
 57,350,0,0,0,0,0,350
@@ -121,7 +114,6 @@
 62,350,0,0,0,0,0,350
 //==========================================
 
-
 //===== Priest =============================
 //-- PR_IMPOSITIO
 66,0,3000,0,60000,0,0,0
@@ -154,7 +146,6 @@
 
 //==========================================
 
-
 //===== Wizard =============================
 //-- WZ_FIREPILLAR
 80,1920:1728:1536:1344:1152:960:768:576:384:192,1000,0,30000,600:800:1000:1200:1400:1600:1800:2000:2200:2400,0,480:432:384:336:288:240:192:144:96:48
@@ -182,7 +173,6 @@
 92,0,1000,0,5000:10000:15000:20000:25000,5000:10000:15000:20000:25000,0,0
 //==========================================
 
-
 //===== Blacksmith =========================
 //-- BS_REPAIRWEAPON
 108,2500,0,0,0,0,0,2500
@@ -198,7 +188,6 @@
 114,0,0,0,1000:2000:3000:4000:5000,0,0,0
 //==========================================
 
-
 //===== Hunter =============================
 //-- HT_SKIDTRAP
 115,0,0,0,300000:240000:180000:120000:60000,0,0,0
@@ -224,7 +213,6 @@
 129,800,1000,0,0,0,0,200
 //==========================================
 
-
 //===== Assassin ===========================
 //-- AS_CLOAKING
 135,0,0,0,500:1000:2000:3000:4000:5000:6000:7000:8000:9000,0,0,0
@@ -240,7 +228,6 @@
 141,500,0,0,5000:5500:6000:6500:7000:7500:8000:8500:9000:9500,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,7500:8000:8500:9000:9500:10000:10500:11000:11500:12000,500
 //==========================================
 
-
 //===== 1st Jobs Quest Skills===============
 //-- NV_TRICKDEAD
 143,0,0,0,600000,0,0,0
@@ -268,7 +255,6 @@
 157,0,0,0,300000,0,0,5000
 //==========================================
 
-
 //===== NPC Skills Part 1 ==================
 //-- NPC_ATTRICHANGE
 161,0,0,0,1800000,0,0,0
@@ -322,7 +308,6 @@
 207,0,0,0,30000:40000:50000:60000:70000:80000:90000:100000:110000:120000,0,0,0
 //==========================================
 
-
 //===== Rogue ==============================
 //-- RG_BACKSTAP
 212,0,500,0,5000,0,0,0
@@ -340,7 +325,6 @@
 220,0,0,0,180000,0,0,0
 //==========================================
 
-
 //===== Alchemist ==========================
 //-- AM_DEMONSTRATION
 229,800,500,0,40000:45000:50000:55000:60000,0,0,200
@@ -364,7 +348,6 @@
 247,2000,0,0,0,0,0,1000
 //==========================================
 
-
 //===== Crusader ===========================
 //-- CR_AUTOGUARD
 249,0,0,0,300000,0,0,0
@@ -388,7 +371,6 @@
 258,0,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0,0,0
 //==========================================
 
-
 //===== Monk ===============================
 //-- MO_CALLSPIRITS
 261,500,0,0,600000,0,0,500
@@ -439,7 +421,6 @@
 294,0,0,0,1200000,0,0,0
 //==========================================
 
-
 //===== Bard & Dancer (Ensemble Skills) ====
 //-- BD_ADAPTATION
 304,0,0,0,0,5000,0,0
@@ -461,7 +442,6 @@
 313,0,0,0,60000,60000,0,0
 //==========================================
 
-
 //===== Bard ===============================
 //-- BA_MUSICALSTRIKE
 316,1200,0,0,0,0,0,300
@@ -479,7 +459,6 @@
 322,0,0,0,180000,20000,0,0
 //==========================================
 
-
 //===== Dancer =============================
 //-- DC_THROWARROW
 324,1200,0,0,0,0,0,300
@@ -497,7 +476,6 @@
 330,0,0,0,180000,20000,0,0
 //==========================================
 
-
 //===== Wedding Skills =====================
 //-- WE_MALE
 334,1500,0,0,0,0,0,1500
@@ -507,7 +485,6 @@
 336,0,0,0,20000,0,0,0
 //==========================================
 
-
 //===== NPC Skills Part 2 ==================
 //-- NPC_GRANDDARKNESS
 339,0,0,900,900,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000,0,0
@@ -525,7 +502,6 @@
 354,0,0,0,0,0,0,0
 //==========================================
 
-
 //===== Lord Knight ========================
 //-- LK_AURABLADE
 355,0,0,0,40000:60000:80000:100000:120000,0,0,0
@@ -541,7 +517,6 @@
 360,0,0,0,300000,0,0,0
 //==========================================
 
-
 //===== High Priest ========================
 //-- HP_ASSUMPTIO
 361,800:1200:1600:2000:2400:2400:2400:2400:2400:2400,1100:1200:1300:1400:1500,0,20000:40000:60000:80000:100000,0,0,200:300:400:500:600
@@ -549,15 +524,13 @@
 362,0,2000:3000:4000:5000:6000,0,20000:25000:30000:35000:40000,20000:25000:30000:35000:40000,0,5000:6000:7000:8000:9000
 //==========================================
 
-
 //===== High Wzard =========================
 //-- HW_MAGICCRASHER
 365,240,300,0,0,0,0,60
-//-- HW_MAGICPOWER 
+//-- HW_MAGICPOWER
 366,0,0,0,30000,0,0,
 //==========================================
 
-
 //===== Paladin ============================
 //-- PA_PRESSURE
 367,1600,2000:2500:3000:3500:4000,0,0,2000:3000:4000:5000:6000,0,400
@@ -565,7 +538,6 @@
 369,0,0,0,60000,60000,0,
 //==========================================
 
-
 //===== Champion ===========================
 //-- CH_PALMSTRIKE
 370,0,300,0,0,0,0,
@@ -573,7 +545,6 @@
 371,0,0,0,0,2000:4000:6000:8000:10000,0,
 //==========================================
 
-
 //===== Professor ==========================
 //-- PF_HPCONVERSION
 373,1000:1200:1400:1600:1800,0,0,0,0,0,
@@ -583,7 +554,6 @@
 375,0,0,0,0,0,10000:10000:10000:10000:15000,0
 //==========================================
 
-
 //===== Assassin Cross =====================
 //-- ASC_EDP
 378,0,2000,0,40000:45000:50000:55000:60000,20000:30000:40000:50000:60000,0,0
@@ -591,7 +561,6 @@
 379,250,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0,0,0,250
 //==========================================
 
-
 //===== Sniper =============================
 //-- SN_SIGHT
 380,0,0,0,30000,0,0,0
@@ -603,7 +572,6 @@
 383,1500:1800:2100:2400:2700:3000:3300:3600:3900:4200,2000,0,130000:160000:190000:220000:250000:280000:310000:340000:370000:400000,0,0,500:600:700:800:900:1000:1100:1200:1300:1400
 //==========================================
 
-
 //===== Whitesmith =========================
 //-- WS_MELTDOWN
 384,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,5000,0,5:5:6:6:7:7:8:8:9:10
@@ -611,7 +579,6 @@
 387,0,0,0,60000,0,0,0
 //==========================================
 
-
 //===== Stalker ============================
 //-- ST_CHASEWALK
 389,500,0,0,10000,30000,0,500
@@ -619,7 +586,6 @@
 390,0,0,0,300000,0,0,
 //==========================================
 
-
 //===== Clown / Gypsy ======================
 //-- CG_ARROWVULCAN
 394,1600:1760:1920:2080:2240:2400:2560:2720:2880:3040,2000,2000,0,0,0,400:440:480:520:560:600:640:680:720:760
@@ -658,7 +624,6 @@
 407,0,5000,0,0,0,0,0
 //==========================================
 
-
 //===== Adoption Skills ====================
 //-- WE_BABY
 408,0,0,0,300000,0,0,2000
@@ -668,7 +633,6 @@
 410,0,0,0,20000,0,0,0
 //==========================================
 
-
 //===== Taekwon ============================
 //-- TK_RUN
 411,3000:2500:2000:1500:100:500:0:0:0:0,300,0,1000,150000,0,3000:2500:2000:1500:1000:500:0:0:0:0
@@ -836,7 +800,6 @@
 499,0,100,0,100,0,0,0
 //==========================================
 
-
 //===== Gunslinger =========================
 //-- GS_GLITTERING
 500,0,0,0,600000,0,0,0
@@ -872,7 +835,6 @@
 521,800,1000,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,10000,0,200
 //==========================================
 
-
 //===== Ninja ==============================
 //-- NJ_KUNAI
 524,0,1000,0,0,0,0,0
@@ -1107,7 +1069,7 @@
 2015,0,0,0,180000,10000,0,2000
 //-- RK_VITALITYACTIVATION
 2016,0,0,0,180000,0,0,-1
-//-- RK_STORMBLAST 
+//-- RK_STORMBLAST
 2017,2000,2000,0,0,0,0,-1
 //-- RK_FIGHTINGSPIRIT
 2018,0,0,0,180000,0,0,-1
@@ -1147,7 +1109,7 @@
 2034,0,1000,0,0,0,0,-1
 //-- GC_HALLUCINATIONWALK
 2035,0,0,0,30000:35000:40000:45000:50000,25000,300000,-1
-//-- GC_ROLLINGCUTTER 
+//-- GC_ROLLINGCUTTER
 2036,0,200,0,3000,0,0,-1
 //-- GC_CROSSRIPPERSLASHER
 2037,0,1000,0,0,0,0,-1
@@ -1160,7 +1122,7 @@
 2038,2000,500,0,0,0,0,500
 //-- AB_ANCILLA
 2039,1000,1000,0,0,0,0,-1
-//-- AB_ADORAMUS 
+//-- AB_ADORAMUS
 2040,2000,500,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,2000,-1
 //-- AB_CLEMENTIA
 2041,3000,0,0,120000:180000:240000,0,0,1000
@@ -1197,7 +1159,7 @@
 //==========================================
 
 //===== Warlock ============================
-//-- WL_WHITEIMPRISON 
+//-- WL_WHITEIMPRISON
 2201,0,0,0,6000:8000:10000:12000:14000,15000,4000,-1
 //-- WL_SOULEXPANSION
 2202,2000,500,0,0,0,0,-1
@@ -1205,13 +1167,13 @@
 2203,2000:2500:3000:3500:4000,1000,0,40000,0,4000,500
 //-- WL_JACKFROST
 2204,2000:2500:3000:3500:4000,1000,0,10000:15000:20000:25000:30000,0,0,1000
-//-- WL_MARSHOFABYSS 
+//-- WL_MARSHOFABYSS
 2205,0,1000,0,30000,0,2500:3000:3500:4000:4500,500
 //-- WL_RECOGNIZEDSPELL
 2206,1000,1000,0,60000:90000:120000:150000:180000,0,50000:80000:110000:140000:170000,1000
-//-- WL_SIENNAEXECRATE 
+//-- WL_SIENNAEXECRATE
 2207,2000,2000,0,10000:12000:14000:16000:18000,0,0,-1
-//-- WL_STASIS 
+//-- WL_STASIS
 2209,3000,2000,0,10000:15000:20000:25000:30000,1000,180000:190000:200000:210000:220000,1000
 //-- WL_DRAINLIFE
 2210,4000,0,0,0,0,2000,1000
@@ -1219,11 +1181,11 @@
 2211,5000,2000,0,5000,0,5000,1000
 //-- WL_HELLINFERNO
 2212,3000,1000,0,20000:30000:40000:50000:60000,0,0,1000
-//-- WL_COMET 
+//-- WL_COMET
 2213,10000:11000:12000:13000:14000,0,0,100,42000,60000,1000:1500:2000:2500:3000
-//-- WL_CHAINLIGHTNING 
+//-- WL_CHAINLIGHTNING
 2214,3500:4000:4500:5000:5500,0,0,100,0,3000,1000
-//-- WL_EARTHSTRAIN 
+//-- WL_EARTHSTRAIN
 2216,2000:3000:4000:5000:6000,1000,0,100,75000:90000:105000:120000:135000,10000,2000
 //-- WL_TETRAVORTEX
 2217,5000:6000:7000:8000:9000,2000,0,15000:120000:40000:5000,0,15000,2000
@@ -1235,7 +1197,7 @@
 2224,2000,0,0,120000:160000:200000:240000:280000,0,0,-1
 //-- WL_SUMMONSTONE
 2229,2000,0,0,120000:160000:200000:240000:280000,0,0,-1
-//-- WL_READING_SB 
+//-- WL_READING_SB
 2231,5000,500,0,0,0,0,1000
 //-- WL_TELEKINESIS_INTENSE
 5012,1000,0,0,60000,0,300000,-1
@@ -1251,9 +1213,9 @@
 2236,4000,1000,0,0,0,0,500
 //-- RA_DETONATOR
 2237,0,0,0,1000,0,0,-1
-//-- RA_ELECTRICSHOCKER 
+//-- RA_ELECTRICSHOCKER
 2238,0,0,0,15000,20000:22000:24000:26000:28000,0,-1
-//-- RA_CLUSTERBOMB 
+//-- RA_CLUSTERBOMB
 2239,0,0,0,15000,0,0,-1
 //-- RA_WUGMASTERY
 2240,0,1000,0,0,0,0,-1
@@ -1344,7 +1306,7 @@
 //===== Shadow Chaser ======================
 //-- SC_FATALMENACE
 2284,0,500,0,0,0,0,-1
-//-- SC_REPRODUCE 
+//-- SC_REPRODUCE
 2285,0,1000,0,60000,0,0,-1
 //-- SC_AUTOSHADOWSPELL
 2286,4000:3600:3200:2800:2400:2000:1600:1200:800:400,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:300000,0,0,2000
@@ -1398,7 +1360,7 @@
 2310,0,0,0,3500:4000:4500:5000:5500,0,2000,-1
 //-- LG_REFLECTDAMAGE
 2311,0,0,0,300000,0,0,-1
-//-- LG_PINPOINTATTACK 
+//-- LG_PINPOINTATTACK
 2312,0,1000,0,5000,0,5000,-1
 //-- LG_FORCEOFVANGUARD
 2313,0,1000,0,300000,0,0,-1
@@ -1435,7 +1397,7 @@
 2326,0,0,0,3000,0,0,-1
 //-- SR_SKYNETBLOW
 2327,0,500,0,0,0,0,-1
-//-- SR_EARTHSHAKER 
+//-- SR_EARTHSHAKER
 2328,0,0,0,1000,0,3000,-1
 //-- SR_FALLENEMPIRE
 2329,0,0,0,500:1000:1500:2000:2500,0,0,-1
@@ -1468,7 +1430,7 @@
 2344,0,0,0,5000:7000:9000:11000:13000,0,1000:1500:2000:2500:3000,-1
 //-- SR_GENTLETOUCH_CURE
 2345,0,1000,0,0,0,1000:1500:2000:2500:3000,-1
-//-- SR_GENTLETOUCH_ENERGYGAIN 
+//-- SR_GENTLETOUCH_ENERGYGAIN
 2346,1000,1000,0,240000,0,0,1000:1500:2000:2500:3000
 //-- SR_GENTLETOUCH_CHANGE
 2347,1000,1000,0,240000,0,200000:180000:160000:140000:120000,1000
@@ -1564,7 +1526,7 @@
 2451,1000,1000,0,60000,0,2000,-1
 //-- SO_WARMER
 2452,2200:2400:2600:2800:3000,1000,0,40000:45000:50000:55000:60000,30000,35000:40000:45000:50000:55000,1800:1600:1400:1200:1000
-//-- SO_VACUUM_EXTREME 
+//-- SO_VACUUM_EXTREME
 2453,1000:1500:2000:2500:3000,1000,0,4000:6000:8000:10000:12000,0,5000,-1
 //-- SO_VARETYR_SPEAR
 2454,2200:2400:2600:2800:3000,1000,0,0,2200:2400:2600:2800:3000,2000,1800:1600:1400:1200:1000
@@ -1572,15 +1534,15 @@
 2455,2200:2400:2600:2800:3000,1000,0,8000:10000:12000:14000:16000,0,5000:6000:7000:8000:9000,800:600:400:200:-1
 //-- SO_EL_CONTROL
 2456,2000,0,0,0,0,5000,0
-//-- SO_SUMMON_AGNI 
+//-- SO_SUMMON_AGNI
 2457,1000:2000:3000,0,0,600000:900000:1200000,0,60000,2000
 //-- SO_SUMMON_AQUA
 2458,1000:2000:3000,0,0,600000:900000:1200000,0,60000,2000
-//-- SO_SUMMON_VENTUS 
+//-- SO_SUMMON_VENTUS
 2459,1000:2000:3000,0,0,600000:900000:1200000,0,60000,2000
-//-- SO_SUMMON_TERA 
+//-- SO_SUMMON_TERA
 2460,1000:2000:3000,0,0,600000:900000:1200000,0,60000,2000
-//-- SO_EL_ACTION 
+//-- SO_EL_ACTION
 2461,0,0,0,0,0,5000,0
 //-- SO_EL_ANALYSIS
 2462,0,0,0,0,0,0,2000
@@ -1614,7 +1576,7 @@
 2481,1500,500,0,2000:2000:3000:3000:4000,0,5000,-1
 //-- GN_WALLOFTHORN
 2482,1500,500,0,10000:11000:12000:13000:14000,0,5000,-1
-//-- GN_CRAZYWEED 
+//-- GN_CRAZYWEED
 2483,3000:3500:4000:4500:5000:5500:6000:6500:7000:7500,500,0,0,0,5000,-1
 //-- GN_CRAZYWEED_ATK
 2484,0,0,0,100,0,0,-1
@@ -1630,7 +1592,7 @@
 
 //-- GN_HELLS_PLANT
 2490,3000:3500:4000:4500:5000,500,0,14000:21000:28000:35000:42000,0,0,-1
-//-- GN_HELLS_PLANT_ATK 
+//-- GN_HELLS_PLANT_ATK
 2491,0,0,0,20000,0,0,-1
 //-- GN_MANDRAGORA
 2492,1000,500,0,10000:15000:20000:25000:30000,0,10000,-1
@@ -1769,7 +1731,7 @@
 
 //-- MH_SUMMON_LEGION
 8018,1600:1400:1200:1000:800,0,0,20000:30000:40000:50000:60000,0,0,400:600:800:1000:1200
-//-- MH_NEEDLE_OF_PARALYZE 
+//-- MH_NEEDLE_OF_PARALYZE
 8019,1000:1100:1200:1300:1400,0,0,12000:14000:16000:18000:20000,0,0,500:400:300:200:100
 //-- MH_POISON_MIST
 8020,500:700:900:1100:1300,0,0,12000:14000:16000:18000:20000,4000:6000:8000:10000:12000,0,500
@@ -1793,7 +1755,7 @@
 //8029,0,0,0,0,0,0,0
 //-- MH_MIDNIGHT_FRENZY
 //8030,0,0,0,0,0,0,0
-//-- MH_STAHL_HORN 
+//-- MH_STAHL_HORN
 8031,800:600:400:200:0,0,0,5000,0,0,200:400:600:800:1000
 //-- MH_GOLDENE_FERSE
 8032,1000:1200:1400:1600:1800,0,0,30000:45000:60000:75000:90000,0,0,-1
diff --git a/db/re/skill_unit_db.txt b/db/re/skill_unit_db.txt
index ffc451a0..fc74dcbc 100644
--- a/db/re/skill_unit_db.txt
+++ b/db/re/skill_unit_db.txt
@@ -168,7 +168,7 @@
 5010,0xfe,    ,  0, 2,  -1,enemy, 0x000	//SC_ESCAPE
 
 8020,0xf5,    ,  0, 3,2300:2100:1900:1700:1500,enemy,   0x018	//MH_POISON_MIST
-8033,0x7e,    ,  0, 0,  -1,all,   0x003	//MH_STEINWAND 
+8033,0x7e,    ,  0, 0,  -1,all,   0x003	//MH_STEINWAND
 8025,0x86,    ,  0, 2:2:3:3:4,1000,enemy, 0x018	//MH_XENO_SLASHER
 8041,0xf6,    ,  1:1:2:2:3, 0,2000,enemy,   0x01A	//MH_LAVA_SLIDE
 8043,0xf7,    ,  1, 0,-1,enemy,   0x2018	//MH_VOLCANIC_ASH
@@ -184,7 +184,7 @@
 8409,0xef,    ,  0, 1,	-1,friend,0x2018	//EL_ZEPHYR
 8412,0xf0,    ,  0, 1,  -1,friend,0x2018	//EL_POWER_OF_GAIA
 
-10006,0xc1,   ,  2, 0,  -1,sameguild, 0x040  //GD_LEADERSHIP 
-10007,0xc2,   ,  2, 0,  -1,sameguild, 0x040  //GD_GLORYWOUNDS 
-10008,0xc3,   ,  2, 0,  -1,sameguild, 0x040  //GD_SOULCOLD 
-10009,0xc4,   ,  2, 0,  -1,sameguild, 0x040  //GD_HAWKEYES 
+10006,0xc1,   ,  2, 0,  -1,sameguild, 0x040  //GD_LEADERSHIP
+10007,0xc2,   ,  2, 0,  -1,sameguild, 0x040  //GD_GLORYWOUNDS
+10008,0xc3,   ,  2, 0,  -1,sameguild, 0x040  //GD_SOULCOLD
+10009,0xc4,   ,  2, 0,  -1,sameguild, 0x040  //GD_HAWKEYES
diff --git a/db/sc_config.txt b/db/sc_config.txt
index cd0b050f..d8272d39 100644
--- a/db/sc_config.txt
+++ b/db/sc_config.txt
@@ -11,8 +11,8 @@
 //         32 - SC considered as debuff and be removed by Gospel and etc.
 //         64 - SC cannot be reset when MADO Gear is taken off.
 //        128 - SC cannot be reset by 'sc_end SC_ALL' and status change clear.
-//Example:
-//SC_ENDURE, 21 //SC_ENDURE: cannot be removed by death and dispell and cosidered as buff. (16 + 4 + 1 = 21)
+// Example:
+// SC_ENDURE, 21 //SC_ENDURE: cannot be removed by death and dispell and cosidered as buff. (16 + 4 + 1 = 21)
 
 SC_PROVOKE, 32
 SC_ENDURE, 21
@@ -89,7 +89,7 @@ SC_SAFETYWALL, 28
 SC_PNEUMA, 28
 SC_ASSUMPTIO, 16
 SC_BASILICA, 26
-//SC_GROUNDMAGIC, 26 //is divided to SC_VOLCANO, 0xSC_DELUGE, 0xSC_VIOLENTGALE
+//SC_GROUNDMAGIC, 26 // is divided to SC_VOLCANO, 0xSC_DELUGE, 0xSC_VIOLENTGALE
 SC_VOLCANO, 26
 SC_DELUGE, 26
 SC_VIOLENTGALE, 26
@@ -158,7 +158,7 @@ SC_FOOD_INT, 92
 SC_FOOD_LUK, 92
 SC_FOOD_BASICAVOIDANCE, 88
 SC_FOOD_BASICHIT, 88
-//SC_FOOD_CRITICALSUCCESSVALUE, 24
+SC_FOOD_CRITICALSUCCESSVALUE, 24
 SC_CASH_PLUSEXP, 93
 SC_CASH_DEATHPENALTY, 93
 SC_CASH_RECEIVEITEM, 93
@@ -205,9 +205,9 @@ SC_S_LIFEPOTION, 92
 SC_L_LIFEPOTION, 92
 SC_CRITICALPERCENT, 92
 SC_PLUSAVOIDVALUE, 92
-//SC_ATKER_ASPD, 28
-//SC_TARGET_ASPD, 92
-//SC_ATKER_MOVESPEED, 28
+SC_ATKER_ASPD, 28
+SC_TARGET_ASPD, 92
+SC_ATKER_MOVESPEED, 28
 SC_ATKER_BLOOD, 28
 SC_TARGET_BLOOD, 30
 SC_ARMOR_PROPERTY, 29
@@ -317,7 +317,7 @@ SC_RAISINGDRAGON, 30
 SC__IGNORANCE, 16
 SC__LAZINESS, 16
 SC_LIGHTNINGWALK, 28
-//SC_ACARAJE, 24
+SC_ACARAJE, 24
 SC__UNLUCKY, 16
 SC_CURSEDCIRCLE_ATKER, 28
 SC_CURSEDCIRCLE_TARGET, 28
@@ -397,9 +397,40 @@ SC_MTF_MLEATKED,12
 SC_MTF_CRIDAMAGE, 12
 SC_FULL_THROTTLE, 18
 SC_REBOUND, 18
-SC_TELEKINESIS_INTENSE,18
+SC_TELEKINESIS_INTENSE, 18
 
-//Guild Auras should not be saved
+// Geffen Scrolls
+SC_SKELSCROLL, 69
+SC_DISTRUCTIONSCROLL, 69
+SC_ROYALSCROLL, 69
+SC_IMMUNITYSCROLL, 69
+SC_MYSTICSCROLL, 69
+SC_BATTLESCROLL, 69
+SC_ARMORSCROLL, 69
+SC_FREYJASCROLL, 69
+SC_SOULSCROLL, 69
+
+// Eden Crystal Synthesis [Needs more info]
+//SC_QUEST_BUFF1, ??
+//SC_QUEST_BUFF2, ??
+//SC_QUEST_BUFF3, ??
+
+// Geffen Magic Tournament [Needs more info]
+SC_GEFFEN_MAGIC1, 2
+SC_GEFFEN_MAGIC2, 2
+SC_GEFFEN_MAGIC3, 2
+//SC_FENRIR_CARD, ??
+
+SC_OVERLAPEXPUP, 12
+SC_MORA_BUFF, 2
+
+// MVP Scrolls
+SC_MVPCARD_TAOGUNKA, 60
+SC_MVPCARD_MISTRESS, 60
+SC_MVPCARD_ORCHERO, 60
+SC_MVPCARD_ORCLORD, 60
+
+// Guild Auras should not be saved
 SC_LEADERSHIP,78
 SC_GLORYWOUNDS,78
 SC_SOULCOLD,78
@@ -435,10 +466,22 @@ SC_FORTUNE, 79
 SC_SERVICEFORYOU, 79
 SC_INCHIT, 77
 SC_PUSH_CART, 205
+
+// Costumes
 SC_MOONSTAR, 207
 SC_SUPER_STAR, 207
 SC_STRANGELIGHTS, 207
 SC_DECORATION_OF_MUSIC, 207
+SC_LJOSALFAR, 207
+SC_MERMAID_LONGING, 207
+SC_HAT_EFFECT, 207
+SC_FLOWERSMOKE, 207
+SC_FSTONE, 207
+SC_HAPPINESS_STAR, 207
+SC_MAPLE_FALLS, 207
+SC_TIME_ACCESSORY, 207
+SC_MAGICAL_FEATHER, 207
+SC_BLOSSOM_FLUTTERING, 207
 
-//Cant Clear
+// Cant Clear
 SC_ALL_RIDING, 141