Merge branch 'master' of https://github.com/HerculesWS/Hercules

13 files changed, 341 insertions, 316 deletions

diff --git a/db/const.txt b/db/const.txt
index f65529cfb..cef0593e1 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -589,7 +589,6 @@ bVariableCastrate	2054
 bSkillUseSP	2055
 bMagicAtkEle 2056
 bFixedCast	2057
-
 bVariableCast	2058
 
 EQI_HEAD_TOP	1
@@ -756,22 +755,23 @@ SC_CURSE	5
 SC_SILENCE	6
 SC_CONFUSION	7
 SC_BLIND	8
-SC_BLEEDING	9
+SC_BLOODING	9
 SC_DPOISON	10
+SC_BURNING	11
 SC_PROVOKE	20
 SC_ENDURE	21
 SC_TWOHANDQUICKEN	22
-SC_CONCENTRATE	23
+SC_CONCENTRATION	23
 SC_HIDING	24
 SC_CLOAKING	25
-SC_ENCPOISON	26
+SC_ENCHANTPOISON	26
 SC_POISONREACT	27
 SC_QUAGMIRE	28
 SC_ANGELUS	29
 SC_BLESSING	30
-SC_SIGNUMCRUCIS	31
-SC_INCREASEAGI	32
-SC_DECREASEAGI	33
+SC_CRUCIS	31
+SC_INC_AGI	32
+SC_DEC_AGI	33
 SC_SLOWPOISON	34
 SC_IMPOSITIO	35
 SC_SUFFRAGIUM	36
@@ -780,40 +780,40 @@ SC_BENEDICTIO	38
 SC_KYRIE	39
 SC_MAGNIFICAT	40
 SC_GLORIA	41
-SC_AETERNA	42
+SC_LEXAETERNA	42
 SC_ADRENALINE	43
-SC_WEAPONPERFECTION	44
+SC_WEAPONPERFECT	44
 SC_OVERTHRUST	45
 SC_MAXIMIZEPOWER	46
 SC_TRICKDEAD	47
-SC_LOUD	48
+SC_SHOUT	48
 SC_ENERGYCOAT	49
 SC_BROKENARMOR	50
 SC_BROKENWEAPON	51
-SC_HALLUCINATION	52
-SC_WEIGHT50	53
-SC_WEIGHT90	54
-SC_ASPDPOTION0	55
-SC_ASPDPOTION1	56
-SC_ASPDPOTION2	57
-SC_ASPDPOTION3	58
-SC_SPEEDUP0	59
-SC_SPEEDUP1	60
-SC_ATKPOTION	61
-SC_MATKPOTION	62
+SC_ILLUSION	52
+SC_WEIGHTOVER50	53
+SC_WEIGHTOVER90	54
+SC_ATTHASTE_POTION1	55
+SC_ATTHASTE_POTION2	56
+SC_ATTHASTE_POTION3	57
+SC_ATTHASTE_INFINITY	58
+SC_MOVHASTE_HORSE	59
+SC_MOVHASTE_INFINITY	60
+SC_PLUSATTACKPOWER	61
+SC_PLUSMAGICPOWER	62
 SC_WEDDING	63
 SC_SLOWDOWN	64
-SC_ANKLE	65
+SC_ANKLESNARE	65
 SC_KEEPING	66
 SC_BARRIER	67
-SC_STRIPWEAPON	68
-SC_STRIPSHIELD	69
-SC_STRIPARMOR	70
-SC_STRIPHELM	71
-SC_CP_WEAPON	72
-SC_CP_SHIELD	73
-SC_CP_ARMOR	74
-SC_CP_HELM	75
+SC_NOEQUIPWEAPON	68
+SC_NOEQUIPSHIELD	69
+SC_NOEQUIPARMOR	70
+SC_NOEQUIPHELM	71
+SC_PROTECTWEAPON	72
+SC_PROTECTSHIELD	73
+SC_PROTECTARMOR	74
+SC_PROTECTHELM	75
 SC_AUTOGUARD	76
 SC_REFLECTSHIELD	77
 SC_SPLASHER	78
@@ -831,24 +831,24 @@ SC_SAFETYWALL	89
 SC_RUWACH	90
 SC_EXTREMITYFIST	91
 SC_EXPLOSIONSPIRITS	92
-SC_COMBO	93
+SC_COMBOATTACK	93
 SC_BLADESTOP_WAIT	94
 SC_BLADESTOP	95
-SC_FIREWEAPON	96
-SC_WATERWEAPON	97
-SC_WINDWEAPON	98
-SC_EARTHWEAPON	99
+SC_PROPERTYFIRE	96
+SC_PROPERTYWATER	97
+SC_PROPERTYWIND	98
+SC_PROPERTYGROUND	99
 SC_VOLCANO	100
 SC_DELUGE	101
 SC_VIOLENTGALE	102
 SC_WATK_ELEMENT	103
 SC_ARMOR	104
-SC_ARMOR_ELEMENT	105
+SC_ARMORPROPERTY	105
 SC_NOCHAT	106
 SC_BABY	107
 SC_AURABLADE	108
 SC_PARRYING	109
-SC_CONCENTRATION	110
+SC_LKCONCENTRATION	110
 SC_TENSIONRELAX	111
 SC_BERSERK	112
 SC_FURY	113
@@ -863,10 +863,10 @@ SC_WINDWALK	121
 SC_MELTDOWN	122
 SC_CARTBOOST	123
 SC_CHASEWALK	124
-SC_REJECTSWORD	125
-SC_MARIONETTE	126
-SC_MARIONETTE2	127
-SC_CHANGEUNDEAD	128
+SC_SWORDREJECT	125
+SC_MARIONETTE_MASTER	126
+SC_MARIONETTE	127
+SC_PROPERTYUNDEAD	128
 SC_JOINTBEAT	129
 SC_MINDBREAKER	130
 SC_MEMORIZE	131
@@ -876,170 +876,170 @@ SC_DEVOTION	134
 SC_SACRIFICE	135
 SC_STEELBODY	136
 SC_ORCISH	137
-SC_READYSTORM	138
-SC_READYDOWN	139
-SC_READYTURN	140
-SC_READYCOUNTER	141
-SC_DODGE	142
+SC_STORMKICK_READY	138
+SC_DOWNKICK_READY	139
+SC_TURNKICK_READY	140
+SC_COUNTERKICK_READY	141
+SC_DODGE_READY	142
 SC_RUN	143
-SC_SHADOWWEAPON	144
+SC_PROPERTYDARK	144
 SC_ADRENALINE2	145
-SC_GHOSTWEAPON	146
+SC_PROPERTYTELEKINESIS	146
 SC_KAIZEL	147
 SC_KAAHI	148
 SC_KAUPE	149
-SC_ONEHAND	150
+SC_ONEHANDQUICKEN	150
 SC_PRESERVE	151
-SC_BATTLEORDERS	152
-SC_REGENERATION	153
-SC_DOUBLECAST	154
+SC_GDSKILL_BATTLEORDER	152
+SC_GDSKILL_REGENERATION	153
+SC_DOUBLECASTING	154
 SC_GRAVITATION	155
-SC_MAXOVERTHRUST	156
+SC_OVERTHRUSTMAX	156
 SC_LONGING	157
 SC_HERMODE	158
-SC_SHRINK	159
-SC_SIGHTBLASTER	160
-SC_WINKCHARM	161
-SC_CLOSECONFINE	162
-SC_CLOSECONFINE2	163
-SC_DANCING	164
-SC_ELEMENTALCHANGE	165
-SC_RICHMANKIM	166
-SC_ETERNALCHAOS	167
-SC_DRUMBATTLE	168
-SC_NIBELUNGEN	169
-SC_ROKISWEIL	170
-SC_INTOABYSS	171
-SC_SIEGFRIED	172
-SC_WHISTLE	173
-SC_ASSNCROS	174
-SC_POEMBRAGI	175
-SC_APPLEIDUN	176
-SC_MODECHANGE	177
-SC_HUMMING	178
-SC_DONTFORGETME	179
-SC_FORTUNE	180
-SC_SERVICE4U	181
-SC_STOP	182
-SC_SPURT	183
-SC_SPIRIT	184
-SC_COMA	185
-SC_INTRAVISION	186
-SC_INCALLSTATUS	187
-SC_INCSTR	188
-SC_INCAGI	189
-SC_INCVIT	190
-SC_INCINT	191
-SC_INCDEX	192
-SC_INCLUK	193
-SC_INCHIT	194
-SC_INCHITRATE	195
-SC_INCFLEE	196
-SC_INCFLEERATE	197
-SC_INCMHPRATE	198
-SC_INCMSPRATE	199
-SC_INCATKRATE	200
-SC_INCMATKRATE	201
-SC_INCDEFRATE	202
-SC_STRFOOD	203
-SC_AGIFOOD	204
-SC_VITFOOD	205
-SC_INTFOOD	206
-SC_DEXFOOD	207
-SC_LUKFOOD	208
-SC_HITFOOD	209
-SC_FLEEFOOD	210
-SC_BATKFOOD	211
-SC_WATKFOOD	212
-SC_MATKFOOD	213
-SC_SCRESIST	214
-SC_XMAS	215
-SC_WARM	216
-SC_SUN_COMFORT	217
-SC_MOON_COMFORT	218
-SC_STAR_COMFORT	219
-SC_FUSION	220
-SC_SKILLRATE_UP	221
-SC_SKE	222
-SC_KAITE	223
-SC_SWOO	224
-SC_SKA	225
-SC_TKREST	226
-SC_MIRACLE	227
-SC_MADNESSCANCEL	228
-SC_ADJUSTMENT	229
-SC_INCREASING	230
-SC_GATLINGFEVER	231
-SC_TATAMIGAESHI	232
-SC_UTSUSEMI	233
-SC_BUNSINJYUTSU	234
-SC_KAENSIN	235
-SC_SUITON	236
-SC_NEN	237
-SC_KNOWLEDGE	238
-SC_SMA	239
-SC_FLING	240
-SC_AVOID	241
-SC_CHANGE	242
-SC_BLOODLUST	243
-SC_FLEET	244
-SC_SPEED	245
-SC_DEFENCE	246
-SC_INCASPDRATE	247
-SC_INCFLEE2	248
-SC_JAILED	249
-SC_ENCHANTARMS	250
-SC_MAGICALATTACK	251
-SC_SUMMER	256
-SC_EXPBOOST	257
-SC_ITEMBOOST	258
-SC_BOSSMAPINFO	259
-SC_LIFEINSURANCE	260
-SC_INCCRI	261
-//SC_INCDEF	262
-//SC_INCBASEATK	263
-//SC_FASTCAST 264
-SC_MDEF_RATE	265
-//SC_HPREGEN	266
-SC_INCHEALRATE	267
-SC_PNEUMA	268
-SC_AUTOTRADE	269
-SC_KSPROTECTED	270
-SC_ARMOR_RESIST	271
-SC_SPCOST_RATE	272
-SC_COMMONSC_RESIST	273
-SC_SEVENWIND	274
-SC_DEF_RATE	275
-//SC_SPREGEN	276
-SC_WALKSPEED	277
-SC_REBIRTH	284
-//SC_SKILLCASTRATE	285
-//SC_DEFRATIOATK	286
-//SC_HPDRAIN	287
-//SC_SKILLATKBONUS	288
-SC_ITEMSCRIPT	289
-SC_S_LIFEPOTION	290
-SC_L_LIFEPOTION	291
-SC_JEXPBOOST	292
-//SC_IGNOREDEF	293
-SC_HELLPOWER	294
-SC_INVINCIBLE	295
-SC_INVINCIBLEOFF	296
-SC_MANU_ATK	297
-SC_MANU_DEF	298
-SC_SPL_ATK	299
-SC_SPL_DEF	300
-SC_MANU_MATK	301
-SC_SPL_MATK	302
-SC_FOOD_STR_CASH	303
-SC_FOOD_AGI_CASH	304
-SC_FOOD_VIT_CASH	305
-SC_FOOD_DEX_CASH	306
-SC_FOOD_INT_CASH	307
-SC_FOOD_LUK_CASH	308
-SC_FEAR	309
-SC_BURNING	310
-SC_FREEZING	311
+SC_TAROTCARD	159
+SC_CR_SHRINK	160
+SC_WZ_SIGHTBLASTER	161
+SC_DC_WINKCHARM	162
+SC_RG_CCONFINE_M	163
+SC_RG_CCONFINE_S	164
+SC_DANCING	165
+SC_ARMOR_PROPERTY	166
+SC_RICHMANKIM	167
+SC_ETERNALCHAOS	168
+SC_DRUMBATTLE	169
+SC_NIBELUNGEN	170
+SC_ROKISWEIL	171
+SC_INTOABYSS	172
+SC_SIEGFRIED	173
+SC_WHISTLE	174
+SC_ASSNCROS	175
+SC_POEMBRAGI	176
+SC_APPLEIDUN	177
+SC_MODECHANGE	178
+SC_HUMMING	179
+SC_DONTFORGETME	180
+SC_FORTUNE	181
+SC_SERVICEFORYOU	182
+SC_STOP	183
+SC_STRUP	184
+SC_SOULLINK	185
+SC_COMA	186
+SC_CLAIRVOYANCE	187
+SC_INCALLSTATUS	188
+SC_CHASEWALK2	189
+SC_INCAGI	190
+SC_INCVIT	191
+SC_INCINT	192
+SC_INCDEX	193
+SC_INCLUK	194
+SC_INCHIT	195
+SC_INCHITRATE	196
+SC_INCFLEE	197
+SC_INCFLEERATE	198
+SC_INCMHPRATE	199
+SC_INCMSPRATE	200
+SC_INCATKRATE	201
+SC_INCMATKRATE	202
+SC_INCDEFRATE	203
+SC_FOOD_STR	204
+SC_FOOD_AGI	205
+SC_FOOD_VIT	206
+SC_FOOD_INT	207
+SC_FOOD_DEX	208
+SC_FOOD_LUK	209
+SC_FOOD_BASICHIT	210
+SC_FOOD_BASICAVOIDANCE	211
+SC_BATKFOOD	212
+SC_WATKFOOD	213
+SC_MATKFOOD	214
+SC_SCRESIST	215
+SC_XMAS	216
+SC_WARM	217
+SC_SUN_COMFORT	218
+SC_MOON_COMFORT	219
+SC_STAR_COMFORT	220
+SC_FUSION	221
+SC_SKILLRATE_UP	222
+SC_SKE	223
+SC_KAITE	224
+SC_SWOO	225
+SC_SKA	226
+SC_EARTHSCROLL	227
+SC_MIRACLE	228
+SC_GS_MADNESSCANCEL	229
+SC_GS_ADJUSTMENT	230
+SC_GS_ACCURACY	231
+SC_GS_GATLINGFEVER	232
+SC_NJ_TATAMIGAESHI	233
+SC_NJ_UTSUSEMI	234
+SC_NJ_BUNSINJYUTSU	235
+SC_NJ_KAENSIN	236
+SC_NJ_SUITON	237
+SC_NJ_NEN	238
+SC_KNOWLEDGE	239
+SC_SMA_READY	240
+SC_FLING	241
+SC_HLIF_AVOID	242
+SC_HLIF_CHANGE	243
+SC_HAMI_BLOODLUST	244
+SC_HLIF_FLEET	245
+SC_HLIF_SPEED	246
+SC_HAMI_DEFENCE	247
+SC_INCASPDRATE	248
+SC_PLUSAVOIDVALUE	249
+SC_JAILED	250
+SC_ENCHANTARMS	251
+SC_MAGICALATTACK	252
+SC_STONESKIN	253
+SC_CRITICALWOUND	254
+SC_MAGICMIRROR	255
+SC_SLOWCAST	256
+SC_SUMMER	257
+SC_CASH_PLUSEXP	258
+SC_CASH_RECEIVEITEM	259
+SC_CASH_BOSS_ALARM	260
+SC_CASH_DEATHPENALTY	261
+SC_CRITICALPERCENT	262
+SC_PROTECT_MDEF	266
+SC_HEALPLUS	268
+SC_PNEUMA	269
+SC_AUTOTRADE	270
+SC_KSPROTECTED	271
+SC_ARMOR_RESIST	272
+SC_ATKER_BLOOD	273
+SC_TARGET_BLOOD	274
+SC_TK_SEVENWIND	275
+SC_PROTECT_DEF	276
+SC_WALKSPEED	278
+SC_MER_FLEE	279
+SC_MER_ATK	280
+SC_MER_HP	281
+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
+SC_HELLPOWER	295
+SC_INVINCIBLE	296
+SC_INVINCIBLEOFF	297
+SC_MANU_ATK	298
+SC_MANU_DEF	299
+SC_SPL_ATK	300
+SC_SPL_DEF	301
+SC_MANU_MATK	302
+SC_SPL_MATK	303
+SC_FOOD_STR_CASH	304
+SC_FOOD_AGI_CASH	305
+SC_FOOD_VIT_CASH	306
+SC_FOOD_DEX_CASH	307
+SC_FOOD_INT_CASH	308
+SC_FOOD_LUK_CASH	309
+SC_FEAR	310
+SC_FROSTMISTY	311
 SC_ENCHANTBLADE	312
 SC_DEATHBOUND	313
 SC_MILLENNIUMSHIELD	314
@@ -1065,17 +1065,17 @@ SC_WHITEIMPRISON	333
 SC_MARSHOFABYSS	334
 SC_RECOGNIZEDSPELL	335
 SC_STASIS	336
-SC_SPHERE_1	337
-SC_SPHERE_2	338
-SC_SPHERE_3	339
-SC_SPHERE_4	340
-SC_SPHERE_5	341
+SC_SUMMON1	337
+SC_SUMMON2	338
+SC_SUMMON3	339
+SC_SUMMON4	340
+SC_SUMMON5	341
 SC_READING_SB	342
-SC_FREEZINGSPELL	343
+SC_FREEZINGSP	343
 SC_FEARBREEZE	344
 SC_ELECTRICSHOCKER	345
 SC_WUGDASH	346
-SC_BITE	347
+SC_WUGBITE	347
 SC_CAMOUFLAGE	348
 SC_ACCELERATION	349
 SC_HOVERING	350
@@ -1104,7 +1104,7 @@ SC_DEATHHURT	372
 SC_PYREXIA	373
 SC_OBLIVIONCURSE	374
 SC_LEECHESEND	375
-SC_REFLECTDAMAGE	376
+SC_LG_REFLECTDAMAGE	376
 SC_FORCEOFVANGUARD	377
 SC_SHIELDSPELL_DEF	378
 SC_SHIELDSPELL_MDEF	379
@@ -1121,24 +1121,24 @@ SC_STRIKING	389
 SC_WARMER	390
 SC_VACUUM_EXTREME	391
 SC_PROPERTYWALK	392
-SC_SWINGDANCE	393
-SC_SYMPHONYOFLOVER	394
-SC_MOONLITSERENADE	395
-SC_RUSHWINDMILL	396
+SC_SWING	393
+SC_SYMPHONY_LOVE	394
+SC_MOONLIT_SERENADE	395
+SC_RUSH_WINDMILL	396
 SC_ECHOSONG	397
 SC_HARMONIZE	398
-SC_VOICEOFSIREN	399
-SC_DEEPSLEEP	400
+SC_SIREN	399
+SC_DEEP_SLEEP	400
 SC_SIRCLEOFNATURE	401
 SC_GLOOMYDAY	402
 SC_GLOOMYDAY_SK	403
-SC_SONGOFMANA	404
-SC_DANCEWITHWUG	405
-SC_SATURDAYNIGHTFEVER	406
-SC_LERADSDEW	407
+SC_SONG_OF_MANA	404
+SC_DANCE_WITH_WUG	405
+SC_SATURDAY_NIGHT_FEVER	406
+SC_LERADS_DEW	407
 SC_MELODYOFSINK	408
-SC_BEYONDOFWARCRY	409
-SC_UNLIMITEDHUMMINGVOICE	410
+SC_BEYOND_OF_WARCRY	409
+SC_UNLIMITED_HUMMING_VOICE	410
 SC_SITDOWN_FORCE	411
 SC_NETHERWORLD	412
 SC_CRESCENTELBOW	413
@@ -1146,20 +1146,20 @@ SC_CURSEDCIRCLE_ATKER	414
 SC_CURSEDCIRCLE_TARGET	415
 SC_LIGHTNINGWALK	416
 SC_RAISINGDRAGON	417
-SC_GT_ENERGYGAIN	418
-SC_GT_CHANGE	419
-SC_GT_REVITALIZE	420
+SC_GENTLETOUCH_ENERGYGAIN	418
+SC_GENTLETOUCH_CHANGE	419
+SC_GENTLETOUCH_REVITALIZE	420
 SC_GN_CARTBOOST	421
-SC_THORNSTRAP	422
-SC_BLOODSUCKER	423
-SC_SMOKEPOWDER	424
-SC_TEARGAS	425
+SC_THORNS_TRAP	422
+SC_BLOOD_SUCKER	423
+SC_FIRE_EXPANSION_SMOKE_POWDER	424
+SC_FIRE_EXPANSION_TEAR_GAS	425
 SC_MANDRAGORA	426
 SC_STOMACHACHE	427
 SC_MYSTERIOUS_POWDER	428
 SC_MELON_BOMB	429
 SC_BANANA_BOMB	430
-SC_BANANA_BOMB_SITDOWN	431
+SC_BANANA_BOMB_SITDOWN_POSTDELAY	431
 SC_SAVAGE_STEAK	432
 SC_COCKTAIL_WARG_BLOOD	433
 SC_MINOR_BBQ	434
@@ -1186,7 +1186,7 @@ SC__IGNORANCE	454
 SC__LAZINESS	455
 SC__UNLUCKY	456
 SC__WEAKNESS	457
-SC__STRIPACCESSORY	458
+SC__STRIPACCESSARY	458
 SC__MANHOLE	459
 SC__BLOODYLUST	460
 SC_CIRCLE_OF_FIRE	461
@@ -1228,7 +1228,7 @@ SC_WILD_STORM	496
 SC_WILD_STORM_OPTION	497
 SC_PETROLOGY	498
 SC_PETROLOGY_OPTION	499
-SC_CURSED_SOIL	450
+SC_CURSED_SOIL	500
 SC_CURSED_SOIL_OPTION	501
 SC_UPHEAVAL	502
 SC_UPHEAVAL_OPTION	503
@@ -1241,45 +1241,54 @@ SC_GLORYWOUNDS	509
 SC_SOULCOLD	510
 SC_HAWKEYES	511
 SC_ODINS_POWER	512
-SC_RAID	513
-SC_FIRE_INSIGNIA	514
-SC_WATER_INSIGNIA	515
-SC_WIND_INSIGNIA	516
-SC_EARTH_INSIGNIA	517
-SC_PUSH_CART	518
-SC_SPELLBOOK1	519
-SC_SPELLBOOK2	520
-SC_SPELLBOOK3	521
-SC_SPELLBOOK4	522
-SC_SPELLBOOK5	523
-SC_SPELLBOOK6	524
-SC_MAXSPELLBOOK	525
-SC_INCMHP	526
-SC_INCMSP	527
-SC_PARTYFLEE	528
-SC_MEIKYOUSISUI	529
-SC_JYUMONJIKIRI	530
-SC_KYOUGAKU	531
-SC_IZAYOI	532
-SC_ZENKAI	533
-SC_KAGEHUMI	534
-SC_KYOMU	535
-SC_KAGEMUSYA	536
-SC_ZANGETSU	537
-SC_GENSOU	538
-SC_AKAITSUKI	539
-SC_STYLE_CHANGE	540
-SC_GOLDENE_FERSE	541
-SC_ANGRIFFS_MODUS	542
-SC_ERASER_CUTTER	543
-SC_OVERED_BOOST	544
-SC_LIGHT_OF_REGENE	545
-SC_ASH	546
-SC_GRANITIC_ARMOR	547
-SC_MAGMA_FLOW	548
-SC_PYROCLASTIC	549
-SC_PARALYSIS	550
-SC_PAIN_KILLER	551
+SC_FIRE_INSIGNIA	513
+SC_WATER_INSIGNIA	514
+SC_WIND_INSIGNIA	515
+SC_EARTH_INSIGNIA	516
+SC_PUSH_CART	517
+SC_SPELLBOOK1	518
+SC_SPELLBOOK2	519
+SC_SPELLBOOK3	520
+SC_SPELLBOOK4	521
+SC_SPELLBOOK5	522
+SC_SPELLBOOK6	523
+SC_SPELLBOOK7	524
+SC_INCMHP	525
+SC_INCMSP	526
+SC_PARTYFLEE	527
+SC_MEIKYOUSISUI	528
+SC_KO_JYUMONJIKIRI	529
+SC_KYOUGAKU	530
+SC_IZAYOI	531
+SC_ZENKAI	532
+SC_KG_KAGEHUMI	533
+SC_KYOMU	534
+SC_KAGEMUSYA	535
+SC_ZANGETSU	536
+SC_GENSOU	537
+SC_AKAITSUKI	538
+SC_STYLE_CHANGE	539
+SC_GOLDENE_FERSE	540
+SC_ANGRIFFS_MODUS	541
+SC_ERASER_CUTTER	542
+SC_OVERED_BOOST	543
+SC_LIGHT_OF_REGENE	544
+SC_VOLCANIC_ASH	545
+SC_GRANITIC_ARMOR	546
+SC_MAGMA_FLOW	547
+SC_PYROCLASTIC	548
+SC_NEEDLE_OF_PARALYZE	549
+SC_PAIN_KILLER	550
+SC_EXTREMITYFIST2	551
+SC_RAID	552
+SC_DARKCROW	553
+SC_FULL_THROTTLE	554
+SC_REBOUND	555
+SC_UNLIMIT	556
+SC_KINGS_GRACE	557
+SC_TELEKINESIS_INTENSE	558
+SC_OFFERTORIUM	559
+SC_FRIGG_SONG	560
 
 e_gasp	0
 e_what	1
diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt
index f632e582a..31a57ed6f 100644
--- a/db/pre-re/item_db.txt
+++ b/db/pre-re/item_db.txt
@@ -2936,7 +2936,7 @@
 //5767,Samurai_Mask,Samurai Mask,5,20,,300,,1,,0,0xFFFFFFFF,7,2,1,,50,0,644,{},{},{}
 //5768,Sakura_Coronet,Sakura Coronet,5,20,,800,,1,,1,0xFFFFFFFF,7,2,256,,1,1,645,{ bonus bMdef,3; },{},{}
 //5769,Gold_Angel_Sculpture,Gold Angel Sculpture,5,100,,0,,2,,0,0xFFFFFFFF,7,2,256,,70,0,646,{},{},{}
-5770,Splash_Hat,Splash Hat,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,1,1,349,{ autobonus "{ sc_start SC_WINDWEAPON, 180000, 1; }", 3, 180000, BF_WEAPON, "{ specialeffect2 EF_ENHANCE; }"; },{},{}
+5770,Splash_Hat,Splash Hat,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,1,1,349,{ autobonus "{ sc_start SC_PROPERTYWIND, 180000, 1; }", 3, 180000, BF_WEAPON, "{ specialeffect2 EF_ENHANCE; }"; },{},{}
 5771,Family_Hat,Family Hat,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,1,1,109,{ bonus bDex,1; bonus bMdef,1; },{},{}
 //5772,Red_Navy_Hat,Red Navy Hat,5,3000,,500,,1,,0,0xFFFFFFFF,7,2,256,,95,1,651,{},{},{}
 //5773,Navy_Beret,Navy Beret,5,3000,,500,,1,,0,0xFFFFFFFF,7,2,256,,95,1,652,{},{},{}
@@ -4577,7 +4577,7 @@
 12030,Box_Of_Grudge,Box of Resentment,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_PLUSATTACKPOWER,60000,20; },{},{}
 12031,Sleepy_Box,Box of Drowsiness,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_PLUSMAGICPOWER,60000,20; },{},{}
 12032,Box_Of_Storm,Box of Storms,11,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "ITEM_ENCHANTARMS",2; },{},{}
-12033,Box_Of_Sunlight,Box of Sunlight,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_Intravision,30000,0; },{},{}
+12033,Box_Of_Sunlight,Box of Sunlight,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_CLAIRVOYANCE,30000,0; },{},{}
 12034,Painting_Box,Box of Panting,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 0,9; if(rand(1000)<300) sc_start SC_Silence,30000,0; },{},{}
 12035,Lotto_Box01,Lotto Box 01,2,0,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem rand(7361,7370),1; },{},{}
 12036,Lotto_Box02,Lotto Box 02,2,0,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem rand(7371,7380),1; },{},{}
@@ -4840,7 +4840,7 @@
 12295,PC_Bang_Coin_Box2,PC-Room Coin Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2739,1; },{},{}
 12296,PC_Bang_Coin_Box3,PC-Room Coin Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2738,1; },{},{}
 12297,PC_Bang_Coin_Box4,PC-Room Coin Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2738,2; },{},{}
-12298,SP_Potion,SP Consumption Reduction Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SPCOST_RATE,3600000,15; },{},{}
+12298,SP_Potion,SP Consumption Reduction Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ATKER_BLOOD,3600000,15; },{},{}
 12299,Mega_Resist_Potion,Mega Resist Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_COMMONSC_RESIST,3600000,10; },{},{}
 12300,Wild_Rose_Scroll,Wild Rose Contract,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ mercenary_create 1965,1800000; },{},{}
 12301,Doppelganger_Scroll,Doppelganger Contract,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ mercenary_create 1966,1800000; },{},{}
@@ -4895,7 +4895,7 @@
 12350,Angeling_Potion,Angeling Potion,11,20,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ skilleffect "AL_BLESSING",0; sc_start SC_BLESSING,120000,5; itemskill "AL_ANGELUS",5; },{},{}
 12351,Shout_Megaphone,Scream Megaphone,11,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "MC_LOUD",1; },{},{}
 12352,Dun_Tele_Scroll3,Dungeon Teleport Scroll 3,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12353,Tiny_Waterbottle,Small Bottle,2,800,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_WATERWEAPON,90000,1; },{},{}
+12353,Tiny_Waterbottle,Small Bottle,2,800,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_PROPERTYWATER,90000,1; },{},{}
 12354,Buche_De_Noel,Buche De Noel,2,2,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_ANGELUS; sc_start SC_INCMHPRATE,600000,3; sc_start SC_INCMSPRATE,600000,3; sc_start SC_INCHITRATE,600000,3; sc_start SC_CRITICALPERCENT,600000,7; },{},{}
 12355,Xmas_Gift,Xmas Gift,2,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ getrandgroupitem(IG_Xmas_Gift),1; },{},{}
 12356,Louise_Costume_Box,Louise Costume Box,2,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ getrandgroupitem(IG_Louise_Costume_Box),1; },{},{}
@@ -5015,7 +5015,7 @@
 12472,F_Convex_Mirror,F Convex Mirror,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12473,RWC_Parti_Box,RWC Parti Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12474,RWC_Final_Comp_Box,RWC Final Comp Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12475,Cure_Free,Cure Free,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_end SC_SILENCE; sc_end SC_BLOODING; sc_end SC_POISON; sc_end SC_CURSE; sc_end SC_ORCISH; sc_end SC_CHANGEUNDEAD; itemheal 500,0; },{},{}
+12475,Cure_Free,Cure Free,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_end SC_SILENCE; sc_end SC_BLOODING; sc_end SC_POISON; sc_end SC_CURSE; sc_end SC_ORCISH; sc_end SC_PROPERTYUNDEAD; itemheal 500,0; },{},{}
 12476,PCBang_Coupon_Box3,PCBang Coupon Box3,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12477,Gift_Bundle,Gift Bundle,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12478,Chance_Box,Chance Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
@@ -6349,14 +6349,14 @@
 14534,Small_Life_Potion,Small Life Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 320; sc_start4 SC_S_LIFEPOTION,600000,-5,5,0,0; },{},{}
 14535,Med_Life_Potion,Medium Life Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 320; sc_start4 SC_L_LIFEPOTION,600000,-7,4,0,0; },{},{}
 14536,Abrasive,Abrasive,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 182; sc_start SC_CRITICALPERCENT,300000,30; },{},{}
-14537,Regeneration_Potion,Regeneration Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 348; sc_start SC_INCHEALRATE,1800000,20; },{},{}
+14537,Regeneration_Potion,Regeneration Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 348; sc_start SC_HEALPLUS,1800000,20; },{},{}
 14538,Glass_Of_Illusion,Glass of Illusion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_STEAL; sc_start SC_INCFLEE2,60000,20; },{},{}
-14539,Shadow_Armor_S,Shadow Armor Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_CLOAKING; sc_start4 SC_ELEMENTALCHANGE,1800000,1,Ele_Dark,1,0; },{},{}
-14540,Holy_Armor_S,Holy Armor Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 91; sc_start4 SC_ELEMENTALCHANGE,1800000,1,Ele_Holy,1,0; },{},{}
-14541,S_Def_Potion,Small Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_GUARD; sc_start SC_DEF_RATE,60000,3; },{},{}
-14542,B_Def_Potion,Big Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_GUARD; sc_start SC_DEF_RATE,180000,3; },{},{}
-14543,S_Mdef_Potion,Small Magic Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_SPELLBREAKER; sc_start SC_MDEF_RATE,60000,3; },{},{}
-14544,B_Mdef_Potion,Big Magic Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_SPELLBREAKER; sc_start SC_MDEF_RATE,180000,3; },{},{}
+14539,Shadow_Armor_S,Shadow Armor Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_CLOAKING; sc_start4 SC_ARMOR_PROPERTY,1800000,1,Ele_Dark,1,0; },{},{}
+14540,Holy_Armor_S,Holy Armor Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 91; sc_start4 SC_ARMOR_PROPERTY,1800000,1,Ele_Holy,1,0; },{},{}
+14541,S_Def_Potion,Small Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_GUARD; sc_start SC_PROTECT_DEF,60000,3; },{},{}
+14542,B_Def_Potion,Big Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_GUARD; sc_start SC_PROTECT_DEF,180000,3; },{},{}
+14543,S_Mdef_Potion,Small Magic Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_SPELLBREAKER; sc_start SC_PROTECT_MDEF,60000,3; },{},{}
+14544,B_Mdef_Potion,Big Magic Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_SPELLBREAKER; sc_start SC_PROTECT_MDEF,180000,3; },{},{}
 14545,Battle_Manual_X3,Field Manual 300%,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_CASH_PLUSEXP,1800000,300; },{},{}
 14546,Fire_Cracker_Love,I Love You Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ end; },{},{}
 14547,Fire_Cracker_Wday,Whiteday Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ end; },{},{}
@@ -6536,7 +6536,7 @@
 //
 18595,Horn_Of_Ancient,Horn of Ancient,5,40,,200,,8,,1,0xFFFFFFFF,7,2,256,,50,1,757,{ autobonus "{ bonus bBaseAtk,100; }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; },{},{}
 18596,Sprout_Hat,Sprout Hat,5,20,,200,,4,,0,0xFFFFFFFF,7,2,256,,70,1,758,{ skill "WZ_HEAVENDRIVE",3; },{},{}
-18597,Mercury_Riser,Mercury Riser,5,40,,200,,10,,1,0xFFFFFFFF,7,2,256,,0,,759,{ bonus bAspdRate,3; bonus bCritical,3; if(getrefine() >= 7) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; }},{},{}
+18597,Mercury_Riser,Mercury Riser,5,40,,200,,10,,1,0xFFFFFFFF,7,2,256,,0,,759,{ bonus bAspdRate,3; bonus bCritical,3; if(getrefine() >= 7) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; } },{},{}
 //
 18600,Cat_Ear_Beret,Cat Ear Beret,5,20,,100,,5,,0,0xFFFFFFFF,7,2,256,,0,1,761,{ bonus bAtkRate,5; if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRace,RC_DemiHuman,(getrefine() - 5); bonus2 bSubRace,RC_DemiHuman,(getrefine() - 5); } if(getrefine() > 12) { bonus2 bAddRace,RC_DemiHuman,7; bonus2 bSubRace,RC_DemiHuman,7; } },{},{}
 //
diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt
index 9a2c4bafb..abcda323b 100644
--- a/db/pre-re/skill_cast_db.txt
+++ b/db/pre-re/skill_cast_db.txt
@@ -1188,7 +1188,7 @@
 //-- AB_SILENTIUM 
 2057,4000,0,0,20000:30000:40000:50000:60000,0,15000
 //-- AB_OFFERTORIUM
-5011,4000,0,0,90000,0,0,-1
+5011,4000,0,0,90000,0,0
 //========================================== 
 
 //===== Warlock ============================ 
@@ -1672,7 +1672,7 @@
 //-- KO_MAKIBISHI
 3010,0,0,0,12000:14000:16000:18000:20000,10000,10000
 //-- KO_MEIKYOUSISUI
-3011,3000,0,0,10000,0
+3011,3000,0,0,10000,0,10000
 //-- KO_ZANZOU
 3012,0,1000,0,30000:27000:24000:21000:18000,0,0
 //-- KO_KYOUGAKU
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index 52b872afc..94a988e12 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -1181,10 +1181,10 @@
 2118,Arm_Guard_,Arm Guard,5,10000,,150,,50,,1,0x02000000,7,2,32,,20,1,1,{},{},{}
 2119,Improved_Arm_Guard,Advanced Arm Guard,5,40000,,150,,45,,0,0x02000000,7,2,32,,50,1,1,{ bonus bMdef,5; },{},{}
 2120,Improved_Arm_Guard_,Advanced Arm Guard,5,40000,,150,,45,,1,0x02000000,7,2,32,,50,1,1,{ bonus bMdef,5; },{},{}
-2121,Memorize_Book_,Memory Book,5,20,,1000,,25,,1,0x00810204,7,2,32,,0,1,5,{ bonus bInt,1; bonus bMdef,2; }; },{},{}
+2121,Memorize_Book_,Memory Book,5,20,,1000,,25,,1,0x00810204,7,2,32,,0,1,5,{ bonus bInt,1; bonus bMdef,2; },{},{}
 2122,Platinum_Shield,Platinum Shield,5,20,,1200,,95,,0,0xFFFFFFFE,2,2,32,,68,1,4,{ bonus bMdef,5; bonus2 bSubSize,Size_Medium,15; bonus2 bSubSize,Size_Large,15; bonus2 bSubRace,RC_Undead,10; bonus5 bAutoSpellWhenHit,"NPC_MAGICMIRROR",2,150,BF_MAGIC,0; },{},{}
 2123,Orleans_Server,Orleans's Server,5,20,,1000,,75,,1,0xFFFFFFFE,2,2,32,,55,1,4,{ bonus bMdef,2; bonus bMagicDamageReturn,5; },{},{}
-2124,Thorny_Buckler,Thorny Buckler,5,20,,1000,,85,,1,0xFFFFFFFE,2,2,32,,55,1,2,{ bonus bMdef,2; } },{},{}
+2124,Thorny_Buckler,Thorny Buckler,5,20,,1000,,85,,1,0xFFFFFFFE,2,2,32,,55,1,2,{ bonus bMdef,2; },{},{}
 2125,Strong_Shield,Strong Shield,5,20,,2500,,90,,1,0xFFFFFFFE,2,2,32,,75,1,4,{ bonus bNoKnockback,0; bonus2 bSubEle,Ele_Neutral,-20; bonus2 bSubEle,Ele_Fire,-20; bonus2 bSubEle,Ele_Water,-20; bonus2 bSubEle,Ele_Wind,-20; bonus2 bSubEle,Ele_Earth,-20; bonus2 bSubEle,Ele_Dark,-20; bonus2 bSubEle,Ele_Holy,-20; bonus2 bSubEle,Ele_Ghost,-20; },{},{}
 2126,Guyak_Shield,Guyak Shield,5,20,,700,,3,,0,0xFFFFFFFE,7,2,32,,1,1,2,{ bonus bMdef,2; bonus bMagicDamageReturn,2; autobonus2 "{ bonus bShortWeaponDamageReturn,5; }",20,1000,BF_WEAPON,"{ specialeffect2 EF_REFLECTSHIELD; }"; },{},{}
 2127,Secular_Mission,Secular Mission,5,20,,0,,10,,0,0xFFFFFFFF,7,2,32,,0,0,4,{ bonus2 bSubRace,RC_NonBoss,25; bonus2 bSubRace,RC_Boss,25; },{},{}
@@ -1197,7 +1197,7 @@
 2134,Shield_Of_Naga,Shield of Naga,5,20,,500,,35,,1,0x00CFFF80,2,2,32,,70,1,2,{ bonus bMdef,3; autobonus2 "{ bonus bShortWeaponDamageReturn,(getrefine()*3); }",10,5000,BF_WEAPON,"{ specialeffect2 EF_GUARD; }"; },{},{}
 2135,Shadow_Guard,Shadow Guard,5,20,,800,,52,,1,0x00020000,2,2,32,,70,1,2,{},{},{}
 2136,Cracked_Buckler,Cracked Buckler,5,0,,0,,5,,0,0xFFFFFFFF,7,2,32,,0,0,2,{ bonus bAgi,2; bonus2 bAddEle,Ele_Neutral,-10; bonus3 bAutoSpellWhenHit,"PR_KYRIE",10,10; bonus bMdef,1; },{},{}
-2137,Valkyrja's_Shield_C,Neo Valkyrja's Shield,5,0,,0,,5,,0,0xFFFFFFFE,2,2,32,,95,0,4,{ bonus2 bSubEle,Ele_Water,20; bonus2 bSubEle,Ele_Fire,20; bonus2 bSubEle,Ele_Dark,20; bonus2 bSubEle,Ele_Undead,20; bonus bMdef,5; } },{},{}
+2137,Valkyrja's_Shield_C,Neo Valkyrja's Shield,5,0,,0,,5,,0,0xFFFFFFFE,2,2,32,,95,0,4,{ bonus2 bSubEle,Ele_Water,20; bonus2 bSubEle,Ele_Fire,20; bonus2 bSubEle,Ele_Dark,20; bonus2 bSubEle,Ele_Undead,20; bonus bMdef,5; },{},{}
 2138,Bradium_Shield,Bradium Shield,5,20,,1800,,98,,1,0x00CFFF80,2,2,32,,65,1,3,{ bonus2 bSkillAtk,"CR_SHIELDBOOMERANG",60; bonus bAgi,-1; bonus bMaxHP,500; },{},{}
 2139,Flame_Thrower,Flame Thrower,5,20000,,2000,,60,,0,0x00000400,7,2,32,,99,0,1,{},{},{}
 2140,Energy_Rune_Guard,Energy Rune Guard,5,20,,0,,70,,1,0x00000080,7,2,32,,99,1,4,{ bonus bMaxSPrate,2; },{},{}
@@ -3461,7 +3461,7 @@
 5767,Samurai_Mask,Samurai Mask,5,20,,300,,1,,0,0xFFFFFFFF,7,2,1,,50,0,644,{ bonus2 bAddRace,RC_NonBoss,1; bonus2 bAddRace,RC_Boss,1; },{},{}
 5768,Sakura_Coronet,Sakura Coronet,5,20,,800,,1,,1,0xFFFFFFFF,7,2,256,,1,1,645,{ bonus bMdef,3; bonus bMaxSP,25; },{},{}
 5769,Gold_Angel_Sculpture,Gold Angel Sculpture,5,100,,0,,2,,0,0xFFFFFFFF,7,2,256,,70,0,646,{ skill "RG_GRAFFITI",1; },{},{}
-5770,Splash_Hat,Splash Hat,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,1,1,349,{ autobonus "{ sc_start SC_WINDWEAPON,180000,1; }",3,180000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; },{},{}
+5770,Splash_Hat,Splash Hat,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,1,1,349,{ autobonus "{ sc_start SC_PROPERTYWIND,180000,1; }",3,180000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; },{},{}
 5771,Family_Hat,Family Hat,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,1,1,109,{ bonus bDex,1; bonus bMdef,1; bonus bMaxHPrate,2; bonus bMaxSPrate,2; skill "PR_MAGNIFICAT",1; },{},{}
 //5772,Red_Navy_Hat,Red Navy Hat,5,3000,,500,,1,,0,0xFFFFFFFF,7,2,256,,95,1,651,{},{},{}
 //5773,Navy_Beret,Navy Beret,5,3000,,500,,1,,0,0xFFFFFFFF,7,2,256,,95,1,652,{},{},{}
@@ -5329,7 +5329,7 @@
 12030,Box_Of_Grudge,Box of Resentment,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_PLUSATTACKPOWER,60000,20; },{},{}
 12031,Sleepy_Box,Box of Drowsiness,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_PLUSMAGICPOWER,60000,20; },{},{}
 12032,Box_Of_Storm,Box of Storms,11,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "ITEM_ENCHANTARMS",2; },{},{}
-12033,Box_Of_Sunlight,Box of Sunlight,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_Intravision,30000,0; },{},{}
+12033,Box_Of_Sunlight,Box of Sunlight,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_CLAIRVOYANCE,30000,0; },{},{}
 12034,Painting_Box,Box of Panting,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 0,9; if(rand(1000)<300) sc_start SC_Silence,30000,0; },{},{}
 12035,Lotto_Box01,Lotto Box 01,2,0,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem rand(7361,7370),1; },{},{}
 12036,Lotto_Box02,Lotto Box 02,2,0,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem rand(7371,7380),1; },{},{}
@@ -5592,7 +5592,7 @@
 12295,PC_Bang_Coin_Box2,PC-Room Coin Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2739,1; },{},{}
 12296,PC_Bang_Coin_Box3,PC-Room Coin Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2738,1; },{},{}
 12297,PC_Bang_Coin_Box4,PC-Room Coin Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2738,2; },{},{}
-12298,SP_Potion,SP Consumption Reduction Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SPCOST_RATE,3600000,15; },{},{}
+12298,SP_Potion,SP Consumption Reduction Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ATKER_BLOOD,3600000,15; },{},{}
 12299,Mega_Resist_Potion,Mega Resist Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_COMMONSC_RESIST,3600000,10; },{},{}
 12300,Wild_Rose_Scroll,Wild Rose Contract,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ mercenary_create 1965,1800000; },{},{}
 12301,Doppelganger_Scroll,Doppelganger Contract,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ mercenary_create 1966,1800000; },{},{}
@@ -5647,7 +5647,7 @@
 12350,Angeling_Potion,Angeling Potion,11,20,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ skilleffect "AL_BLESSING",0; sc_start SC_BLESSING,120000,5; itemskill "AL_ANGELUS",5; },{},{}
 12351,Shout_Megaphone,Scream Megaphone,11,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "MC_LOUD",1; },{},{}
 12352,Dun_Tele_Scroll3,Dungeon Teleport Scroll 3,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12353,Tiny_Waterbottle,Small Bottle,2,800,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_WATERWEAPON,90000,1; },{},{}
+12353,Tiny_Waterbottle,Small Bottle,2,800,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_PROPERTYWATER,90000,1; },{},{}
 12354,Buche_De_Noel,Buche De Noel,2,2,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_ANGELUS; sc_start SC_INCMHPRATE,600000,3; sc_start SC_INCMSPRATE,600000,3; sc_start SC_INCHITRATE,600000,3; sc_start SC_CRITICALPERCENT,600000,7; },{},{}
 12355,Xmas_Gift,Xmas Gift,2,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ getrandgroupitem(IG_Xmas_Gift),1; },{},{}
 12356,Louise_Costume_Box,Louise Costume Box,2,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ getrandgroupitem(IG_Louise_Costume_Box),1; },{},{}
@@ -7194,14 +7194,14 @@
 14534,Small_Life_Potion,Small Life Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 320; sc_start4 SC_S_LIFEPOTION,600000,-5,5,0,0; },{},{}
 14535,Med_Life_Potion,Medium Life Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 320; sc_start4 SC_L_LIFEPOTION,600000,-7,4,0,0; },{},{}
 14536,Abrasive,Abrasive,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 182; sc_start SC_CRITICALPERCENT,300000,30; },{},{}
-14537,Regeneration_Potion,Regeneration Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 348; sc_start SC_INCHEALRATE,1800000,20; },{},{}
+14537,Regeneration_Potion,Regeneration Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 348; sc_start SC_HEALPLUS,1800000,20; },{},{}
 14538,Glass_Of_Illusion,Glass of Illusion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_STEAL; sc_start SC_INCFLEE2,60000,20; },{},{}
-14539,Shadow_Armor_S,Shadow Armor Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_CLOAKING; sc_start4 SC_ELEMENTALCHANGE,1800000,1,Ele_Dark,1,0; },{},{}
-14540,Holy_Armor_S,Holy Armor Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 91; sc_start4 SC_ELEMENTALCHANGE,1800000,1,Ele_Holy,1,0; },{},{}
-14541,S_Def_Potion,Small Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_GUARD; sc_start SC_DEF_RATE,60000,3; },{},{}
-14542,B_Def_Potion,Big Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_GUARD; sc_start SC_DEF_RATE,180000,3; },{},{}
-14543,S_Mdef_Potion,Small Magic Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_SPELLBREAKER; sc_start SC_MDEF_RATE,60000,3; },{},{}
-14544,B_Mdef_Potion,Big Magic Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_SPELLBREAKER; sc_start SC_MDEF_RATE,180000,3; },{},{}
+14539,Shadow_Armor_S,Shadow Armor Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_CLOAKING; sc_start4 SC_ARMOR_PROPERTY,1800000,1,Ele_Dark,1,0; },{},{}
+14540,Holy_Armor_S,Holy Armor Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 91; sc_start4 SC_ARMOR_PROPERTY,1800000,1,Ele_Holy,1,0; },{},{}
+14541,S_Def_Potion,Small Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_GUARD; sc_start SC_PROTECT_DEF,60000,3; },{},{}
+14542,B_Def_Potion,Big Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_GUARD; sc_start SC_PROTECT_DEF,180000,3; },{},{}
+14543,S_Mdef_Potion,Small Magic Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_SPELLBREAKER; sc_start SC_PROTECT_MDEF,60000,3; },{},{}
+14544,B_Mdef_Potion,Big Magic Defense Potion,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_SPELLBREAKER; sc_start SC_PROTECT_MDEF,180000,3; },{},{}
 14545,Battle_Manual_X3,Field Manual 300%,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_CASH_PLUSEXP,1800000,300; },{},{}
 14546,Fire_Cracker_Love,I Love You Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ end; },{},{}
 14547,Fire_Cracker_Wday,Whiteday Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ end; },{},{}
@@ -7808,7 +7808,7 @@
 18594,Magni_Cap_,Magni Cap,5,30000,,1000,,9,,1,0xFFFFFFFE,7,2,256,,0,1,250,{ bonus bStr,2; },{},{}
 18595,Horn_Of_Ancient,Horn of Ancient,5,40,,200,,8,,1,0xFFFFFFFF,7,2,256,,50,1,757,{ autobonus "{ bonus bBaseAtk,100; }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; },{},{}
 18596,Sprout_Hat,Sprout Hat,5,20,,200,,4,,0,0xFFFFFFFF,7,2,256,,70,1,758,{ skill "WZ_HEAVENDRIVE",3; },{},{}
-18597,Mercury_Riser,Mercury Riser,5,40,,200,,10,,1,0xFFFFFFFF,7,2,256,,0,,759,{ bonus bAspdRate,3; bonus bCritical,3; if(getrefine() >= 7) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; }},{},{}
+18597,Mercury_Riser,Mercury Riser,5,40,,200,,10,,1,0xFFFFFFFF,7,2,256,,0,,759,{ bonus bAspdRate,3; bonus bCritical,3; if(getrefine() >= 7) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; } },{},{}
 18598,Mini_Tree_J,Mini Tree J,5,20,,50,,0,,1,0xFFFFFFFF,7,2,256,,0,0,727,{ bonus bMdef,20; },{},{}
 18599,Black_Devil_Mask,Black Devil Mask,5,20,,100,,0,,0,0xFFFFFFFF,7,2,512,,0,0,760,{ bonus bAllStats,2; },{},{}
 18600,Cat_Ear_Beret,Cat Ear Beret,5,20,,100,,5,,0,0xFFFFFFFF,7,2,256,,0,1,761,{ bonus bAtkRate,5; if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRace,RC_DemiHuman,(getrefine() - 5); bonus2 bSubRace,RC_DemiHuman,(getrefine() - 5); } if(getrefine() > 12) { bonus2 bAddRace,RC_DemiHuman,7; bonus2 bSubRace,RC_DemiHuman,7; } },{},{}
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index e472626d4..cf53b968c 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -9,8 +9,8 @@
 //             -2 - use endowed element, -3 - use random element.)
 // 06 nk (skill damage properties):
 //    0x01 - No damage skill
-//    0x02 - Has splash area
-//    0x04 - Damage should be split among targets
+//    0x02 - Has splash area (requires source modification)
+//    0x04 - Damage should be split among targets (requires 0x02 in order to work)
 //    0x08 - Skill ignores caster's % damage cards (misc type always ignores)
 //    0x10 - Skill ignores elemental adjustments
 //    0x20 - Skill ignores target's defense (misc type always ignores)
diff --git a/db/re/skill_unit_db.txt b/db/re/skill_unit_db.txt
index 7468c6cc3..bece02852 100644
--- a/db/re/skill_unit_db.txt
+++ b/db/re/skill_unit_db.txt
@@ -2,7 +2,7 @@
 //
 // layout = -1:special, 0:1*1, 1:3*3, 2:5*5, up to 5:11*11
 // target = friend (party +guildmates +neutral players) / party / guild
-//          ally (party +guildmates) / all / enemy
+//          ally (party +guildmates) / all / sameguild (guild but no allies) / enemy
 // flag 0x001(UF_DEFNOTENEMY)		If 'defunit_not_enemy' is set, the target is changed to 'friend'
 //      0x002(UF_NOREITERRATION)	Spell cannot be stacked
 //      0x004(UF_NOFOOTSET)		Spell cannot be cast near/on targets
@@ -180,7 +180,7 @@
 8409,0xef,    ,  0, 1,1000,friend,0x018	//EL_ZEPHYR
 8412,0xf0,    ,  0, 1,  -1,friend,0x018	//EL_POWER_OF_GAIA
 
-10006,0xc1,   ,  2, 0,  -1,guild, 0x040	//GD_LEADERSHIP 
-10007,0xc2,   ,  2, 0,  -1,guild, 0x040	//GD_GLORYWOUNDS 
-10008,0xc3,   ,  2, 0,  -1,guild, 0x040	//GD_SOULCOLD 
-10009,0xc4,   ,  2, 0,  -1,guild, 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/src/config/const.h b/src/config/const.h
index a37cf696e..f4a2821f8 100644
--- a/src/config/const.h
+++ b/src/config/const.h
@@ -93,9 +93,11 @@
 	#define MAX_CARTS 5
 #endif
 /* Client Supports Party Recruit or Party Booking? */
+#ifdef PACKETVER_RE
 #if (PACKETVER == 20120410) || (PACKETVER == 20120418)
 	#define	PARTY_RECRUIT
 #endif
+#endif
 // Renewal variable cast time reduction
 #ifdef RENEWAL_CAST
 	#define VARCAST_REDUCTION(val){ \
diff --git a/src/map/battle.c b/src/map/battle.c
index 1fa35116e..31fe502f6 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1185,9 +1185,13 @@ int battle_calc_defense(int attack_type, struct block_list *src, struct block_li
 			 **/
 			defType def1 = status_get_def(target); //Don't use tstatus->def1 due to skill timer reductions.
 			short def2 = tstatus->def2, vit_def;
-			
+#ifdef RENEWAL			
 			def1 = status_calc_def2(target, tsc, def1, false); // equip def(RE)
 			def2 = status_calc_def(target, tsc, def2, false); // status def(RE)
+#else
+			def1 = status_calc_def(target, tsc, def1, false); // equip def(RE)
+			def2 = status_calc_def2(target, tsc, def2, false); // status def(RE)
+#endif
 
 			if( sd ){
 				i = sd->ignore_def[is_boss(target)?RC_BOSS:RC_NONBOSS];
@@ -1291,10 +1295,13 @@ int battle_calc_defense(int attack_type, struct block_list *src, struct block_li
 			{
 			defType mdef = tstatus->mdef;
 			short mdef2= tstatus->mdef2;
-
+#ifdef RENEWAL
 			mdef2 = status_calc_mdef(target, tsc, mdef2, false); // status mdef(RE)
 			mdef = status_calc_mdef2(target, tsc, mdef, false); // equip mde(RE)
-
+#else
+			mdef2 = status_calc_mdef2(target, tsc, mdef2, false); // status mdef(RE)
+			mdef = status_calc_mdef(target, tsc, mdef, false); // equip mde(RE)
+#endif
 			if( flag&1 )
 				mdef = 0;
 
@@ -5134,10 +5141,10 @@ int battle_calc_return_damage(struct block_list* bl, struct block_list *src, int
 					rdelay = clif->damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, 4, 0);
 				}
 			}
-		}
-		if( sc->data[SC_SHIELDSPELL_DEF] && sc->data[SC_SHIELDSPELL_DEF]->val1 == 2 && !is_boss(src) ){
-			NORMALIZE_RDAMAGE(damage * sc->data[SC_SHIELDSPELL_DEF]->val2 / 100);
-			rdelay = clif->damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, 4, 0);
+			if( sc->data[SC_SHIELDSPELL_DEF] && sc->data[SC_SHIELDSPELL_DEF]->val1 == 2 && !is_boss(src) ){
+				NORMALIZE_RDAMAGE(damage * sc->data[SC_SHIELDSPELL_DEF]->val2 / 100);
+				rdelay = clif->damage(src, src, iTimer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, 4, 0);
+			}
 		}
 	} else {
 		if (sd && sd->bonus.long_weapon_damage_return){ 
diff --git a/src/map/npc.c b/src/map/npc.c
index 5e03191e7..f4027096c 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -276,7 +276,7 @@ int npc_rr_secure_timeout_timer(int tid, unsigned int tick, int id, intptr_t dat
 		clif->scriptclear(sd,sd->npc_id);
 		sd->npc_idle_timer = INVALID_TIMER;
 	} else //Create a new instance of ourselves to continue
-		sd->npc_idle_timer = add_timer(gettick() + (SECURE_NPCTIMEOUT_INTERVAL*1000),npc_rr_secure_timeout_timer,sd->bl.id,0);
+		sd->npc_idle_timer = iTimer->add_timer(iTimer->gettick() + (SECURE_NPCTIMEOUT_INTERVAL*1000),npc_rr_secure_timeout_timer,sd->bl.id,0);
 	return 0;
 }
 #endif
@@ -1245,7 +1245,7 @@ int npc_scriptcont(struct map_session_data* sd, int id, bool closing)
 	/**
 	 * Update the last NPC iteration
 	 **/
-	sd->npc_idle_tick = gettick();
+	sd->npc_idle_tick = iTimer->gettick();
 #endif
 
 	/**
diff --git a/src/map/packets.h b/src/map/packets.h
index 43b36e033..244f19ed8 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -2025,6 +2025,12 @@ packet(0x020d,-1);
 
 #endif
 
+#ifndef PACKETVER_RE
+#if PACKETVER >= 20120604
+	packet(0x0861,18,clif->pPartyBookingRegisterReq,2,4,6);
+#endif
+#endif
+
 //2012-06-18aRagexeRE
 #if PACKETVER >= 20120618
 	packet(0x0983,29);
diff --git a/src/map/script.c b/src/map/script.c
index 0ef12f74d..60f741d6c 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -3355,7 +3355,7 @@ static void script_detach_state(struct script_state* st, bool dequeue_event)
 			 * We're done with this NPC session, so we cancel the timer (if existent) and move on
 			 **/
 			if( sd->npc_idle_timer != INVALID_TIMER ) {
-				delete_timer(sd->npc_idle_timer,npc_rr_secure_timeout_timer);
+				iTimer->delete_timer(sd->npc_idle_timer,npc_rr_secure_timeout_timer);
 				sd->npc_idle_timer = INVALID_TIMER;
 			}
 #endif
@@ -3396,8 +3396,8 @@ static void script_attach_state(struct script_state* st)
  **/
 #ifdef SECURE_NPCTIMEOUT
 		if( sd->npc_idle_timer == INVALID_TIMER )
-			sd->npc_idle_timer = add_timer(gettick() + (SECURE_NPCTIMEOUT_INTERVAL*1000),npc_rr_secure_timeout_timer,sd->bl.id,0);
-		sd->npc_idle_tick = gettick();
+			sd->npc_idle_timer = iTimer->add_timer(iTimer->gettick() + (SECURE_NPCTIMEOUT_INTERVAL*1000),npc_rr_secure_timeout_timer,sd->bl.id,0);
+		sd->npc_idle_tick = iTimer->gettick();
 #endif
 	}
 }
diff --git a/src/map/status.c b/src/map/status.c
index 096e673c2..8363b8021 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -10916,7 +10916,7 @@ int status_get_matk(struct block_list *bl, int flag){
 	}
 
 	if ((bl->type&BL_HOM && battle_config.hom_setting&0x20)  //Hom Min Matk is always the same as Max Matk
-		|| sc->data[SC_RECOGNIZEDSPELL])
+		|| (sc && sc->data[SC_RECOGNIZEDSPELL]))
 		status->matk_min = status->matk_max;
 
 #ifdef RENEWAL
diff --git a/src/map/unit.c b/src/map/unit.c
index 371a75ac7..7b270adc7 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -327,7 +327,8 @@ int unit_walktoxy( struct block_list *bl, short x, short y, int flag)
 	path_search(&wpd, bl->m, bl->x, bl->y, x, y, flag&1, CELL_CHKNOPASS); // Count walk path cells
 #ifdef OFFICIAL_WALKPATH
 	if( !path_search_long(NULL, bl->m, bl->x, bl->y, x, y, CELL_CHKNOPASS) // Check if there is an obstacle between
-		&& wpd.path_len > 14 ) // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett]
+		&& (wpd.path_len > 14) // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett]
+		&& (bl->type != BL_NPC) ) // If type is a NPC, please disregard.
 		return 0;
 #endif
 	if( (battle_config.max_walk_path < wpd.path_len) && (bl->type != BL_NPC) )