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

Signed-off-by: shennetsind <ind@henn.et>

Conflicts:
	src/map/battle.c

9 files changed, 398 insertions, 117 deletions

diff --git a/db/const.txt b/db/const.txt
index 8f649b4f3..c7fff2825 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1263,6 +1263,16 @@ 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
+
+// 2014 Halloween Event
+SC_MTF_MHP	584
+SC_MTF_MSP	585
+SC_MTF_PUMPKIN	586
+SC_MTF_HITFLEE	587
 
 e_gasp	0
 e_what	1
diff --git a/db/pet_db.txt b/db/pet_db.txt
index 24e5e4cfd..5a3431b25 100644
--- a/db/pet_db.txt
+++ b/db/pet_db.txt
@@ -77,7 +77,7 @@
 1023,ORK_WARRIOR,Orc Warrior,635,9017,10009,537,80,60,20,100,250,20,500,150,1,0,600,200,300,{ petskillattack2 "NPC_PIERCINGATT",100,1,0,10; },{ bonus bAtk,10; bonus bDef,-3; }
 1026,MUNAK,Munak,636,9018,10008,537,80,60,20,100,250,20,500,150,0,0,300,750,300,{ petskillattack2 "NPC_DARKNESSATTACK",444,1,0,10; },{ bonus bInt,1; bonus bDef,1; }
 1110,DOKEBI,Dokebi,637,9019,10005,537,80,60,20,100,250,20,500,150,0,0,300,300,800,{ petskillattack "BS_HAMMERFALL",1,0,10; },{ bonus bMatkRate,1; bonus bAtkRate,-1; }
-1170,SOHEE,Sohee,638,9020,10016,537,80,60,10,100,250,20,500,150,0,0,100,1000,200,{ petheal 400,60,33,100; },{ bonus bStr,1; bonus bDex,1; }
+1170,SOHEE,Sohee,638,9020,10016,537,80,60,10,100,250,20,500,150,0,0,100,1000,200,{ petskillsupport AL_HEAL,10,60,33,100; },{ bonus bStr,1; bonus bDex,1; }
 1029,ISIS,Isis,639,9021,10006,537,80,60,10,100,250,20,500,150,0,0,650,450,150,{ petskillsupport "PR_MAGNIFICAT",2,60,50,50; },{ bonus bMatkRate,-1; bonus bAtkRate,1; }
 1155,PETIT,Petite,640,9022,10011,537,80,60,20,100,250,20,500,150,0,0,800,400,100,{ petskillattack2 "WZ_HEAVENDRIVE",500,1,0,10; },{ bonus bDef,-2; bonus bMdef,-2; bonus bAspdRate,1; }
 1109,DEVIRUCHI,Deviruchi,641,9023,10004,711,80,60,10,100,250,20,500,150,0,0,800,200,100,{ petskillbonus bAgiDexStr,6,20,40; },{ bonus bMatkRate,1; bonus bAtkRate,1; bonus bMaxHPrate,-3; bonus bMaxSPrate,-3; }
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index ea08825cb..925a149fd 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -1757,7 +1757,7 @@ item_db: (
 	Buy: 0
 	Weight: 20
 	BuyingStore: true
-	Script: <" set Zeny,Zeny+rand(1000,10000); ">
+	Script: <" Zeny += rand(1000,10000); ">
 },
 {
 	Id: 669
@@ -5957,8 +5957,8 @@ item_db: (
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) {
-			bonus3 bAutoSpell,LK_CONCENTRATION,getskilllv(LK_CONCENTRATION)>1?getskilllv(LK_CONCENTRATION):1,30;
-			bonus3 bAutoSpell,LK_AURABLADE,getskilllv(LK_AURABLADE)>1?getskilllv(LK_AURABLADE):1,30;
+			bonus3 bAutoSpell,LK_CONCENTRATION,max(getskilllv(LK_CONCENTRATION),1),30;
+			bonus3 bAutoSpell,LK_AURABLADE,max(getskilllv(LK_AURABLADE),1),30;
 		}
 
 	">
@@ -13061,7 +13061,7 @@ item_db: (
 		bonus bAtkEle,Ele_Holy;
 		bonus bMatkRate,15;
 		bonus bInt,4;
-		bonus4 bAutoSpellOnSkill,AL_HEAL,AL_BLESSING,getskilllv(AL_BLESSING)>1?getskilllv(AL_BLESSING):1,20;
+		bonus4 bAutoSpellOnSkill,AL_HEAL,AL_BLESSING,max(getskilllv(AL_BLESSING),1),20;
 	">
 },
 {
@@ -14713,7 +14713,7 @@ item_db: (
 		bonus bInt,1;
 		bonus2 bAddRace,RC_DemiHuman,95;
 		bonus2 bCastrate,MO_EXTREMITYFIST,-25;
-		autobonus "{ bonus2 bCastrate,\"MO_EXTREMITYFIST\",-100; }",50,6000,BF_WEAPON,"{ specialeffect2 EF_SUFFRAGIUM; }";
+		autobonus "{ bonus2 bCastrate,MO_EXTREMITYFIST,-100; }",50,6000,BF_WEAPON,"{ specialeffect2 EF_SUFFRAGIUM; }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -21442,7 +21442,7 @@ item_db: (
 	EquipLv: 70
 	Script: <"
 		bonus bMdef,3;
-		bonus3 bAutoSpellWhenHit,AL_HEAL,getskilllv(AL_HEAL)?getskilllv(AL_HEAL):1,20;
+		bonus3 bAutoSpellWhenHit,AL_HEAL,max(getskilllv(AL_HEAL),1),20;
 	">
 },
 {
@@ -40983,10 +40983,10 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		bonus2 bSkillAtk, "WZ_HEAVENDRIVE", 15 + getequiprefinerycnt(EQI_HAND_R);
-		bonus2 bSkillAtk, "WZ_EARTHSPIKE", 15 + getequiprefinerycnt(EQI_HAND_R);
-		bonus2 bCastrate, "WZ_HEAVENDRIVE", -25;
-		bonus2 bCastrate, "WZ_EARTHSPIKE", -25;
+		bonus2 bSkillAtk, WZ_HEAVENDRIVE, 15 + getequiprefinerycnt(EQI_HAND_R);
+		bonus2 bSkillAtk, WZ_EARTHSPIKE, 15 + getequiprefinerycnt(EQI_HAND_R);
+		bonus2 bCastrate, WZ_HEAVENDRIVE, -25;
+		bonus2 bCastrate, WZ_EARTHSPIKE, -25;
 		;
 	">
 },
@@ -63116,7 +63116,7 @@ item_db: (
 	Weight: 80
 	Script: <"
 		if(gettime(5)!=MDiceCone) {
-			set MDiceCone,gettime(5);
+			MDiceCone = gettime(5);
 			percentheal 50,50;
 		}
 
@@ -63129,7 +63129,7 @@ item_db: (
 	Type: 2
 	Buy: 1
 	Weight: 10
-	Script: <" set Zeny,Zeny+rand(1000,10000); ">
+	Script: <" Zeny += rand(1000,10000); ">
 },
 {
 	Id: 12135
@@ -64431,7 +64431,7 @@ item_db: (
 		sitting: true
 	}
 	Script: <"
-		set .@type,getiteminfo(getequipid(EQI_HAND_R),11);
+		.@type = getiteminfo(getequipid(EQI_HAND_R),11);
 		if (.@type==6||.@type==7||.@type==8) {
 			skilleffect BS_ADRENALINE,0;
 			sc_start SC_ADRENALINE,150000,5;
@@ -69852,14 +69852,14 @@ item_db: (
 	AegisName: "Change_Slot_Card"
 	Name: "Character Position Change Coupon"
 	Type: 2
-	Script: <" set SlotChange, SlotChange + 1; ">
+	Script: <" SlotChange += 1; ">
 },
 {
 	Id: 12790
 	AegisName: "Change_Name_Card"
 	Name: "Name Change Coupon"
 	Type: 2
-	Script: <" set CharRename, CharRename + 1; ">
+	Script: <" CharRename += 1; ">
 },
 {
 	Id: 12848
diff --git a/db/quest_db.txt b/db/quest_db.txt
index 42cd3c651..bd23dea69 100644
--- a/db/quest_db.txt
+++ b/db/quest_db.txt
@@ -2339,6 +2339,24 @@
 14140,0,0,0,0,0,0,0,"To Wuhari"
 14141,0,0,0,0,0,0,0,"Ingredients for research"
 
+// 2014 Halloween Event
+14450,0,0,0,0,0,0,0,"Let's help the priest"
+14451,0,0,0,0,0,0,0,"To Church"
+14452,0,0,0,0,0,0,0,"Material of holy stuff"
+14453,0,0,0,0,0,0,0,"To Niflheim"
+14454,0,0,0,0,0,0,0,"To Lutie"
+14455,0,0,0,0,0,0,0,"Back to Church"
+14456,0,0,0,0,0,0,0,"Preparing for recall"
+14457,0,0,0,0,0,0,0,"Back to Niflheim"
+14458,0,0,0,0,0,0,0,"Request of Loru"
+14459,0,0,0,0,0,0,0,"Request of Devi"
+14460,0,3382,10,0,0,0,0,"Favor of Loru"
+14461,0,0,0,0,0,0,0,"Favor of Loru"
+14462,0,3381,10,0,0,0,0,"Favor of Devi"
+14463,0,1510,20,1507,20,0,0,"Favor of Devi"
+14464,82800,0,0,0,0,0,0,"Party is going for a day"
+14465,82800,0,0,0,0,0,0,"They are still quiet"
+
 16000,0,0,0,0,0,0,0,"Metz Brayde's Notice"
 16001,0,0,0,0,0,0,0,"First examination"
 16002,0,0,0,0,0,0,0,"Fetching Items for Arian -1"
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 42cd378f1..984549b55 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1908,7 +1908,7 @@ item_db: (
 	Weight: 20
 	Upper: 63
 	BuyingStore: true
-	Script: <" set Zeny,Zeny+rand(1000,10000); ">
+	Script: <" Zeny += rand(1000,10000); ">
 },
 {
 	Id: 669
@@ -6214,12 +6214,12 @@ item_db: (
 		bonus2 bIgnoreDefRate,RC_DemiHuman,25;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-3,1);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(), 14)-3,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) {
-			bonus3 bAutoSpell,LK_CONCENTRATION,getskilllv(LK_CONCENTRATION)>1?getskilllv(LK_CONCENTRATION):1,30;
-			bonus3 bAutoSpell,LK_AURABLADE,getskilllv(LK_AURABLADE)>1?getskilllv(LK_AURABLADE):1,30;
+			bonus3 bAutoSpell,LK_CONCENTRATION,max(getskilllv(LK_CONCENTRATION),1),30;
+			bonus3 bAutoSpell,LK_AURABLADE,max(getskilllv(LK_AURABLADE),1),30;
 		}
 	">
 },
@@ -8040,7 +8040,7 @@ item_db: (
 		bonus2 bIgnoreDefRate,RC_DemiHuman,20;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) autobonus "{ bonus bAspdRate,100; }",70,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
@@ -8074,7 +8074,7 @@ item_db: (
 		bonus2 bIgnoreDefRate,RC_DemiHuman,20;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
 			bonus2 bCriticalAddRace,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) autobonus "{ bonus bAspdRate,100; }",70,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
@@ -8371,8 +8371,8 @@ item_db: (
 	Script: <"
 		bonus bBaseAtk,(getrefine()*5);
 		bonus bCritAtkRate,getrefine();
-		set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10);
-		if(.@i>2) bonus bBaseAtk,((.@i-2)*5);
+		.@val = min(BaseLevel/10, 12);
+		if (.@val > 2) bonus bBaseAtk,((.@val-2)*5);
 	">
 },
 {
@@ -8581,7 +8581,7 @@ item_db: (
 		bonus2 bIgnoreDefRate,RC_DemiHuman,20;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 			bonus bAspdRate,5;
 		}
@@ -9425,7 +9425,7 @@ item_db: (
 		bonus2 bIgnoreDefRate,RC_DemiHuman,25;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-3,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-3,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 			bonus3 bAutoSpell,NPC_CRITICALWOUND,1,50;
 		}
@@ -9807,8 +9807,8 @@ item_db: (
 	Script: <"
 		bonus bUnbreakableWeapon,0;
 		bonus bBaseAtk,(getrefine()*7);
-		set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10);
-		if(.@i>2) bonus bBaseAtk,((.@i-2)*5);
+		.@val = min(BaseLevel/10, 12);
+		if (.@val > 2) bonus bBaseAtk,((.@val-2)*5);
 	">
 },
 //  1-Handed Spears
@@ -10339,7 +10339,7 @@ item_db: (
 		bonus2 bIgnoreDefRate,RC_DemiHuman,20;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 			bonus bAspdRate,10;
 		}
@@ -11310,7 +11310,7 @@ item_db: (
 		bonus2 bIgnoreDefRate,RC_DemiHuman,25;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) {
@@ -11492,8 +11492,8 @@ item_db: (
 	View: 5
 	Script: <"
 		bonus bBaseAtk,(getrefine()*6);
-		set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10);
-		if(.@i>2) bonus bBaseAtk,((.@i-2)*5);
+		.@val = min(BaseLevel/10, 12);
+		if (.@val > 2) bonus bBaseAtk,((.@val-2)*5);
 	">
 },
 {
@@ -12440,7 +12440,7 @@ item_db: (
 		bonus2 bIgnoreDefRate,RC_DemiHuman,20;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 			bonus bAspdRate,5;
 		}
@@ -13084,7 +13084,7 @@ item_db: (
 		bonus2 bIgnoreDefRate,RC_DemiHuman,25;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) autobonus "{ bonus bBaseAtk,200; }",30,3000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }";
@@ -13386,8 +13386,8 @@ item_db: (
 		bonus bUnbreakableWeapon,0;
 		bonus bBaseAtk,(getrefine()*5);
 		bonus bMatk,(getrefine()*2);
-		set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10);
-		if(.@i>2) bonus bBaseAtk,((.@i-2)*5);
+		.@val = min(BaseLevel/10, 12);
+		if (.@val > 2) bonus bBaseAtk,((.@val-2)*5);
 	">
 },
 {
@@ -14335,7 +14335,7 @@ item_db: (
 		bonus bUnbreakableWeapon,0;
 		if(getrefine() > 5) {
 			bonus2 bIgnoreMdefRate,RC_DemiHuman,5;
-			bonus bHealPower,5+(((getrefine()>14)?14:getrefine())-5)*2;
+			bonus bHealPower,5+(min(getrefine(),14)-5)*2;
 		}
 		if(getrefine() > 8) bonus5 bAutoSpellOnSkill,AL_HEAL,AL_HEAL,10,100,1;
 		if(getrefine() > 9) {
@@ -14508,7 +14508,7 @@ item_db: (
 	Script: <"
 		bonus bAtkEle,Ele_Holy;
 		bonus bInt,4;
-		bonus4 bAutoSpellOnSkill,AL_HEAL,AL_BLESSING,getskilllv(AL_BLESSING)>1?getskilllv(AL_BLESSING):1,20;
+		bonus4 bAutoSpellOnSkill,AL_HEAL,AL_BLESSING,max(getskilllv(AL_BLESSING),1),20;
 	">
 },
 {
@@ -14845,12 +14845,12 @@ item_db: (
 	Script: <"
 		bonus bUnbreakableWeapon,0;
 		bonus bMatk,30*(getrefine()/3);
-		if(getrefine()>=7) {
-			set .@i,1;
-			bonus4 bAutoSpell,"HW_MAGICPOWER",1,10,0;
+		if (getrefine()>=7) {
+			.@val = 1;
+			bonus4 bAutoSpell,HW_MAGICPOWER,1,10,0;
 		}
 		if (getrefine()>=4) {
-			set .@rate,5*(.@i+1);
+			.@rate = 5*(.@val+1);
 			bonus2 bMagicAddRace,RC_Boss,.@rate;
 			bonus2 bMagicAddRace,RC_NonBoss,.@rate;
 		}
@@ -15680,7 +15680,7 @@ item_db: (
 		bonus bCritAtkRate,getrefine() * 2;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) bonus2 bSkillAtk,AC_DOUBLE,20;
@@ -16687,7 +16687,7 @@ item_db: (
 		bonus bInt,1;
 		bonus2 bAddRace,RC_DemiHuman,95;
 		bonus2 bVariableCastrate,MO_EXTREMITYFIST,-25;
-		autobonus "{ bonus2 bVariableCastrate,\"MO_EXTREMITYFIST\",-100; }",50,6000,BF_WEAPON,"{ specialeffect2 EF_SUFFRAGIUM; }";
+		autobonus "{ bonus2 bVariableCastrate,MO_EXTREMITYFIST,-100; }",50,6000,BF_WEAPON,"{ specialeffect2 EF_SUFFRAGIUM; }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -16741,7 +16741,7 @@ item_db: (
 		bonus2 bIgnoreDefRate,RC_DemiHuman,20;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) {
@@ -16778,7 +16778,7 @@ item_db: (
 		bonus2 bIgnoreDefRate,RC_DemiHuman,20;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) {
@@ -17505,7 +17505,7 @@ item_db: (
 		bonus2 bIgnoreDefRate,RC_DemiHuman,20;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) bonus4 bAutoSpellOnSkill,CG_ARROWVULCAN,CG_TAROTCARD,5,100;
@@ -18255,7 +18255,7 @@ item_db: (
 		bonus2 bIgnoreDefRate,RC_DemiHuman,20;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) bonus4 bAutoSpellOnSkill,CG_ARROWVULCAN,CG_TAROTCARD,5,100;
@@ -18462,8 +18462,8 @@ item_db: (
 		bonus2 bIgnoreMdefRate,RC_DemiHuman,25;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bMagicAddRace,RC_DemiHuman,(((getrefine()>14)?14:getrefine())-5)*2;
-			bonus2 bIgnoreMdefRate,RC_DemiHuman,5+(((getrefine()>14)?14:getrefine())-5)*2;
+			bonus2 bMagicAddRace,RC_DemiHuman,(min(getrefine(),14)-5)*2;
+			bonus2 bIgnoreMdefRate,RC_DemiHuman,5+(min(getrefine(),14)-5)*2;
 		}
 		if(getrefine()>8) {
 			bonus5 bAutoSpellOnSkill,WZ_STORMGUST,MG_SAFETYWALL,10,200,1;
@@ -18855,8 +18855,8 @@ item_db: (
 		if(BaseJob==Job_Wizard) bonus bMatk,15;
 		else if(BaseJob==Job_Sage) bonus bMatk,10;
 		bonus bMatk,(getrefine()*5);
-		set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10);
-		if(.@i>2) bonus bMatk,((.@i-2)*5);
+		.@val = min(BaseLevel/10, 12);
+		if (.@val > 2) bonus bMatk,((.@val-2)*5);
 	">
 },
 //  Shields
@@ -20034,7 +20034,7 @@ item_db: (
 	Upper: 63
 	Loc: 32
 	View: 1
-	Script: <" if (getrefine()>5) bonus2 bSubEle,Ele_Neutral,((getrefine()>12)?12:getrefine())-5; ">
+	Script: <" if (getrefine()>5) bonus2 bSubEle,Ele_Neutral,min(getrefine(),12)-5; ">
 },
 {
 	Id: 2169
@@ -24605,7 +24605,7 @@ item_db: (
 	EquipLv: 100
 	Script: <"
 		bonus bMaxSP,40;
-		bonus bAgi,-7+(getequiprefinerycnt(EQI_SHOES)>8)?8:getequiprefinerycnt(EQI_SHOES);
+		bonus bAgi,-7+min(getequiprefinerycnt(EQI_SHOES),8);
 	">
 },
 {
@@ -25623,7 +25623,7 @@ item_db: (
 	EquipLv: 70
 	Script: <"
 		bonus bMdef,3;
-		bonus3 bAutoSpellWhenHit,AL_HEAL,getskilllv(AL_HEAL)?getskilllv(AL_HEAL):1,20;
+		bonus3 bAutoSpellWhenHit,AL_HEAL,max(getskilllv(AL_HEAL),1),20;
 	">
 },
 {
@@ -26104,9 +26104,9 @@ item_db: (
 	EquipLv: 100
 	Script: <"
 		bonus bFlee,5;
-		set .@i,(getskilllv("AB_ORATIO")<2)?2:getskilllv("AB_ORATIO");
-		bonus5 bAutoSpellWhenHit,"AB_ORATIO",.@i,30,BF_WEAPON,0;
-		bonus5 bAutoSpellWhenHit,"AB_ORATIO",.@i,40,BF_MAGIC,0;
+		.@val = max(getskilllv(AB_ORATIO), 2);
+		bonus5 bAutoSpellWhenHit,AB_ORATIO,.@val,30,BF_WEAPON,0;
+		bonus5 bAutoSpellWhenHit,AB_ORATIO,.@val,40,BF_MAGIC,0;
 	">
 },
 {
@@ -36913,7 +36913,7 @@ item_db: (
 	Loc: 4
 	Script: <"
 		bonus bLuk,getrefine()-5;
-		bonus bCritical,(getrefine()>10?10:getrefine());
+		bonus bCritical,min(getrefine(),10);
 	">
 },
 {
@@ -37319,7 +37319,7 @@ item_db: (
 	Weight: 10
 	Loc: 16
 	Script: <"
-		bonus bMagicDamageReturn,(getrefine()>10?10:getrefine())*2;
+		bonus bMagicDamageReturn,min(getrefine(),10)*2;
 		if(BaseClass==Job_Mage) bonus bMdef,3;
 	">
 },
@@ -38044,7 +38044,7 @@ item_db: (
 	Loc: 769
 	Script: <"
 		bonus bHealPower,4;
-		bonus2 bSkillUseSP,"AL_HEAL",-15;
+		bonus2 bSkillUseSP,AL_HEAL,-15;
 	">
 },
 {
@@ -38321,7 +38321,7 @@ item_db: (
 	Weight: 10
 	Loc: 64
 	Script: <"
-		set .@rate,((getrefine()>14)?7:5);
+		.@rate = (getrefine() > 14) ? 7 : 5);
 		bonus bMaxHPrate,.@rate;
 		bonus bMaxSPrate,.@rate;
 		bonus2 bHPRegenRate,50,10000;
@@ -38360,7 +38360,7 @@ item_db: (
 	Weight: 10
 	Loc: 16
 	Script: <"
-		set .@rate,((getrefine()>14)?30:20);
+		.@rate = (getrefine() > 14) ? 30 : 20;
 		bonus2 bAddEle,Ele_Holy,.@rate;
 		bonus2 bAddEle,Ele_Dark,.@rate;
 		bonus2 bAddRace,RC_Angel,.@rate;
@@ -38513,7 +38513,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		set .@rate, ((getrefine()>14)?15:10);
+		.@rate = (getrefine() > 14) ? 15 : 10;
 		bonus2 bAddRace,RC_NonBoss,.@rate;
 		bonus2 bAddRace,RC_Boss,.@rate;
 		bonus3 bAutoSpell,SM_MAGNUM,10,15;
@@ -39196,7 +39196,7 @@ item_db: (
 	Script: <"
 		bonus bMatkRate,((getrefine()>14)?8:5);
 		bonus bMaxSPrate,-50;
-		set .@rate,((getrefine()>14)?33:25);
+		.@rate = (getrefine() > 14) ? 33 : 25;
 		bonus2 bMagicAddRace,RC_Angel,.@rate;
 		bonus2 bMagicAddRace,RC_DemiHuman,.@rate;
 	">
@@ -39217,7 +39217,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		set .@rate, ((getrefine()>14)?350:250);
+		.@rate = (getrefine() > 14) ? 350 : 250;
 		bonus3 bAddEff,Eff_Stun,.@rate,ATF_SHORT;
 		bonus3 bAddEff,Eff_Curse,.@rate,ATF_SHORT;
 		bonus3 bAddEff,Eff_Silence,.@rate,ATF_SHORT;
@@ -39500,7 +39500,7 @@ item_db: (
 	Loc: 16
 	Script: <"
 		bonus bInt,4;
-		bonus5 bAutoSpellWhenHit,"NPC_WIDESLEEP",3,2500,BF_MAGIC,0;
+		bonus5 bAutoSpellWhenHit,NPC_WIDESLEEP,3,2500,BF_MAGIC,0;
 	">
 },
 {
@@ -39526,7 +39526,7 @@ item_db: (
 	Loc: 16
 	Script: <"
 		bonus bVit,4;
-		bonus5 bAutoSpellWhenHit,"NPC_WIDESTONE",3,2500,BF_MAGIC,0;
+		bonus5 bAutoSpellWhenHit,NPC_WIDESTONE,3,2500,BF_MAGIC,0;
 	">
 },
 //  Armor Enchant System
@@ -47849,7 +47849,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" bonus3 bAutoSpell,"SA_FROSTWEAPON",1,5; ">
+	Script: <" bonus3 bAutoSpell,SA_FROSTWEAPON,1,5; ">
 },
 {
 	Id: 5381
@@ -52241,7 +52241,7 @@ item_db: (
 	Script: <"
 		bonus bAspdRate,3;
 		bonus2 bSubEle,Ele_Earth,5;
-		if(getrefine()>6) bonus3 bAutoSpell,"MO_BALKYOUNG",1,50;
+		if(getrefine()>6) bonus3 bAutoSpell,MO_BALKYOUNG,1,50;
 	">
 },
 {
@@ -55301,11 +55301,11 @@ item_db: (
 		bonus bStr,2;
 		bonus2 bAddMonsterDropItem,574,500;
 		bonus2 bAddItemHealRate,574,5;
-		set .@rate,(getrefine()>10)?10:getrefine();
+		.@rate = min(getrefine(),10);
 		bonus bMaxHPrate,.@rate;
 		bonus bMaxSPrate,.@rate;
-		bonus3 bAutoSpellWhenHit,"AL_INCAGI",.@rate,10;
-		bonus3 bAutoSpell,"AL_INCAGI",.@rate,10;
+		bonus3 bAutoSpellWhenHit,AL_INCAGI,.@rate,10;
+		bonus3 bAutoSpell,AL_INCAGI,.@rate,10;
 	">
 },
 {
@@ -62653,6 +62653,52 @@ item_db: (
 	Buy: 0
 },
 {
+	Id: 6913
+	AegisName: "Sacred_Rosary"
+	Name: "Sacred Rosary"
+	Type: 3
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nostorage: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+},
+{
+	Id: 6914
+	AegisName: "Black_Soul"
+	Name: "Black Soul"
+	Type: 3
+	Trade: {
+		nodrop: true
+		notrade: true
+		nocart: true
+		nostorage: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+},
+{
+	Id: 6915
+	AegisName: "Captured_Soul"
+	Name: "Captured Soul"
+	Type: 3
+	Trade: {
+		nodrop: true
+		notrade: true
+		nocart: true
+		nostorage: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+},
+{
 	Id: 7001
 	AegisName: "Mould_Powder"
 	Name: "Mould Powder"
@@ -74184,6 +74230,7 @@ item_db: (
 	Buy: 10
 	Weight: 40
 	Upper: 63
+	Script: <" percentheal 5,5; ">
 },
 {
 	Id: 11551
@@ -74226,6 +74273,50 @@ item_db: (
 	Script: <" itemheal rand(20,30),0; ">
 },
 {
+	Id: 11592
+	AegisName: "Trance_Candy_R"
+	Name: "Red Transform Candy"
+	Type: 0
+	Weight: 30
+	Script: <"
+		itemheal rand(45,65),0;
+		montransform "Bloody Murderer",600000,SC_MTF_MHP,1000;
+	">
+},
+{
+	Id: 11593
+	AegisName: "Trance_Candy_B"
+	Name: "Blue Transform Candy"
+	Type: 0
+	Weight: 30
+	Script: <"
+		itemheal rand(45,65),0;
+		montransform "Bathory",600000,SC_MTF_MSP,100;
+	">
+},
+{
+	Id: 11594
+	AegisName: "Trance_Candy_Y"
+	Name: "Yellow Transform Candy"
+	Type: 0
+	Weight: 30
+	Script: <"
+		itemheal rand(45,65),0;
+		montransform "Jakk",600000,SC_MTF_PUMPKIN,2000;
+	">
+},
+{
+	Id: 11595
+	AegisName: "Trance_Candy_G"
+	Name: "Green Transform Candy"
+	Type: 0
+	Weight: 30
+	Script: <"
+		itemheal rand(45,65),0;
+		montransform "Quve",600000,SC_MTF_HITFLEE,10,20;
+	">
+},
+{
 	Id: 11701
 	AegisName: "Girl_Bunch_Of_Flower"
 	Name: "Girl's Bouquet"
@@ -76060,7 +76151,7 @@ item_db: (
 	Upper: 63
 	Script: <"
 		if(gettime(5)!=MDiceCone) {
-			set MDiceCone,gettime(5);
+			MDiceCone = gettime(5);
 			percentheal 50,50;
 		}
 	">
@@ -76073,7 +76164,7 @@ item_db: (
 	Buy: 1
 	Weight: 10
 	Upper: 63
-	Script: <" set Zeny,Zeny+rand(1000,10000); ">
+	Script: <" Zeny += rand(1000,10000); ">
 },
 {
 	Id: 12135
@@ -77463,7 +77554,7 @@ item_db: (
 		sitting: true
 	}
 	Script: <"
-		set .@type,getiteminfo(getequipid(EQI_HAND_R),11);
+		.@type = getiteminfo(getequipid(EQI_HAND_R),11);
 		if (.@type==6||.@type==7||.@type==8) {
 			skilleffect BS_ADRENALINE,0;
 			sc_start SC_ADRENALINE,150000,5;
@@ -80155,7 +80246,7 @@ item_db: (
 	Job: 0x00000400
 	Upper: 63
 	BuyingStore: true
-	Script: <" if(checkmadogear()) itemheal rand(200,300),0; ">
+	Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(200,300),0; ">
 },
 {
 	Id: 12393
@@ -80167,7 +80258,7 @@ item_db: (
 	Job: 0x00000400
 	Upper: 63
 	BuyingStore: true
-	Script: <" if(checkmadogear()) itemheal rand(300,400),0; ">
+	Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(300,400),0; ">
 },
 {
 	Id: 12394
@@ -80179,7 +80270,7 @@ item_db: (
 	Job: 0x00000400
 	Upper: 63
 	BuyingStore: true
-	Script: <" if(checkmadogear()) itemheal rand(400,500),0; ">
+	Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(400,500),0; ">
 },
 {
 	Id: 12395
@@ -84489,7 +84580,7 @@ item_db: (
 	Type: 2
 	Buy: 0
 	Upper: 63
-	Script: <" set SlotChange, SlotChange + 1; ">
+	Script: <" SlotChange += 1; ">
 },
 {
 	Id: 12787
@@ -84526,7 +84617,7 @@ item_db: (
 	Type: 2
 	Buy: 0
 	Upper: 63
-	Script: <" set CharRename, CharRename + 1; ">
+	Script: <" CharRename += 1; ">
 },
 {
 	Id: 12791
@@ -87220,7 +87311,7 @@ item_db: (
 		bonus3 bAutoSpell,PR_LEXDIVINA,1,20;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) bonus4 bAutoSpellOnSkill,RG_RAID,NPC_WIDEBLEEDING,1,250;
@@ -87612,7 +87703,7 @@ item_db: (
 	Script: <"
 		bonus2 bSkillAtk,SC_FATALMENACE,30;
 		if(getrefine() >= 6) {
-			bonus2 bSkillAtk,"SC_FATALMENACE",(getrefine()-5)*2;
+			bonus2 bSkillAtk,SC_FATALMENACE,(getrefine()-5)*2;
 			bonus bMatk,(getrefine()-5)*3;
 		}
 	">
@@ -87969,8 +88060,8 @@ item_db: (
 	Script: <"
 		bonus bBaseAtk,(getrefine()*5);
 		bonus bMatk,(getrefine()*2);
-		set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10);
-		if(.@i>2) bonus bBaseAtk,((.@i-2)*5);
+		.@val = min(BaseLevel/10, 12);
+		if (.@val > 2) bonus bBaseAtk,((.@val-2)*5);
 	">
 },
 {
@@ -88010,11 +88101,11 @@ item_db: (
 		bonus bBaseAtk,20*(getrefine()/3);
 		bonus bMatk,20*(getrefine()/3);
 		if(getrefine()>=9) {
-			set .@i,1;
+			.@val = 1;
 			bonus4 bAutoSpell,BS_WEAPONPERFECT,1,20,0;
 		}
 		if(getrefine()>=6) {
-			set .@rate,5*(.@i+1);
+			.@rate = 5*(.@val+1);
 			bonus2 bAddRace,RC_Boss,.@rate;
 			bonus2 bAddRace,RC_NonBoss,.@rate;
 			bonus2 bMagicAddRace,RC_Boss,.@rate;
@@ -88253,7 +88344,7 @@ item_db: (
 		bonus2 bIgnoreDefRate,RC_DemiHuman,20;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) {
@@ -88412,8 +88503,8 @@ item_db: (
 	EquipLv: 99
 	View: 17
 	Script: <"
-		bonus2 bSkillAtk,"GS_DESPERADO",20;
-		bonus2 bSkillAtk,"RL_FALLEN_ANGEL",20;
+		bonus2 bSkillAtk,GS_DESPERADO,20;
+		bonus2 bSkillAtk,RL_FALLEN_ANGEL,20;
 	">
 },
 {
@@ -89060,7 +89151,7 @@ item_db: (
 		bonus2 bSkillAtk,GS_TRIPLEACTION,30;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) {
@@ -89098,7 +89189,7 @@ item_db: (
 		bonus2 bSkillAtk,GS_TRIPLEACTION,30;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>10)?10:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),10)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) {
@@ -89137,7 +89228,7 @@ item_db: (
 		bonus2 bSkillAtk,GS_TRIPLEACTION,30;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>10)?10:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),10)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) {
@@ -89175,7 +89266,7 @@ item_db: (
 		bonus2 bSkillAtk,GS_TRIPLEACTION,30;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>10)?10:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),10)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) {
@@ -89291,7 +89382,7 @@ item_db: (
 	Script: <"
 		bonus bHit,10;
 		bonus bCriticalRate,15;
-		bonus4 bAutoSpell,"AL_DECAGI",1,500,0;
+		bonus4 bAutoSpell,AL_DECAGI,1,500,0;
 	">
 },
 {
@@ -89335,7 +89426,7 @@ item_db: (
 	Script: <"
 		bonus bHit,-10;
 		bonus bDelayrate,-10;
-		bonus3 bAutoSpell,"MG_THUNDERSTORM",5,500;
+		bonus3 bAutoSpell,MG_THUNDERSTORM,5,500;
 	">
 },
 {
@@ -89376,7 +89467,7 @@ item_db: (
 	Script: <"
 		bonus bHit,10;
 		bonus bCriticalRate,15;
-		bonus4 bAutoSpell,"AL_DECAGI",1,10,0;
+		bonus4 bAutoSpell,AL_DECAGI,1,10,0;
 	">
 },
 {
@@ -90583,7 +90674,7 @@ item_db: (
 		autobonus "{ bonus2 bSkillAtk,NJ_HUUMA,100; bonus2 bSkillAtk,NJ_ISSEN,100; }",50,10000;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-3,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-3,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>8) {
@@ -90739,7 +90830,7 @@ item_db: (
 	Script: <"
 		bonus bMatk,50;
 		bonus bAtkEle,Ele_Water;
-		bonus3 bAutoSpell,NJ_HYOUSYOURAKU,(getskilllv(NJ_HYOUSYOURAKU)?getskilllv(NJ_HYOUSYOURAKU):1),30;
+		bonus3 bAutoSpell,NJ_HYOUSYOURAKU,max(getskilllv(NJ_HYOUSYOURAKU),1),30;
 	">
 },
 {
@@ -90761,7 +90852,7 @@ item_db: (
 	Script: <"
 		bonus bMatk,50;
 		bonus bAtkEle,Ele_Wind;
-		bonus3 bAutoSpell,NJ_RAIGEKISAI,(getskilllv(NJ_RAIGEKISAI)?getskilllv(NJ_RAIGEKISAI):1),30;
+		bonus3 bAutoSpell,NJ_RAIGEKISAI,max(getskilllv(NJ_RAIGEKISAI),1),30;
 	">
 },
 {
@@ -91196,7 +91287,7 @@ item_db: (
 		bonus2 bIgnoreDefRate,RC_DemiHuman,20;
 		bonus bUnbreakableWeapon,0;
 		if(getrefine()>5) {
-			bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+			bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
 			bonus2 bIgnoreDefRate,RC_DemiHuman,5;
 		}
 		if(getrefine()>6) bonus bAspdRate,5;
@@ -106540,7 +106631,7 @@ item_db: (
 	EquipLv: 100
 	Script: <"
 		bonus bLuk,3;
-		bonus3 bAutoSpell,ASC_METEORASSAULT,(getskilllv(ASC_METEORASSAULT)?getskilllv(ASC_METEORASSAULT):1),20;
+		bonus3 bAutoSpell,ASC_METEORASSAULT,max(getskilllv(ASC_METEORASSAULT),1),20;
 	">
 },
 {
@@ -106573,7 +106664,7 @@ item_db: (
 	Loc: 16
 	EquipLv: 50
 	Script: <"
-		set .@rate,(getrefine()>10)?10:getrefine();
+		.@rate = min(getrefine(), 10);
 		bonus bHit,.@rate;
 		bonus bFlee,.@rate;
 	">
@@ -107341,7 +107432,7 @@ item_db: (
 	View: 8
 	Script: <"
 		bonus bAtkEle,Ele_Dark;
-		bonus3 bAutoSpell,WL_HELLINFERNO,1,(getrefine()?getrefine()*20:20);
+		bonus3 bAutoSpell,WL_HELLINFERNO,1,max(getrefine(),1)*20;
 	">
 },
 {
@@ -107473,8 +107564,8 @@ item_db: (
 	Script: <"
 		bonus bUnbreakableWeapon,0;
 		bonus bBaseAtk,(getrefine()*5);
-		set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10);
-		if(.@i>2) bonus bBaseAtk,((.@i-2)*5);
+		.@val = min(BaseLevel/10, 12);
+		if (.@val > 2) bonus bBaseAtk,((.@val-2)*5);
 	">
 },
 {
@@ -111311,8 +111402,8 @@ item_db: (
 		if(BaseJob==Job_Hunter && Upper!=2) bonus bBaseAtk,10;
 		bonus bBaseAtk,(getrefine()*3);
 		bonus bLongAtkRate,getrefine();
-		set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10);
-		if(.@i>2) bonus bBaseAtk,((.@i-2)*5);
+		.@val = max(BaseLevel/10, 12);
+		if (.@val > 2) bonus bBaseAtk,((.@val-2)*5);
 	">
 },
 {
@@ -111956,7 +112047,7 @@ item_db: (
 		bonus bAtkRate,5;
 		bonus bDelayrate,-1;
 		bonus bMaxHP,0+(getrefine()*100);
-		bonus2 bSkillAtk,"MC_MAMMONITE",20;
+		bonus2 bSkillAtk,MC_MAMMONITE,20;
 	">
 },
 {
@@ -112157,7 +112248,7 @@ item_db: (
 	Upper: 63
 	Loc: 256
 	View: 721
-	Script: <" skill "AL_INCAGI",2; ">
+	Script: <" skill AL_INCAGI,2; ">
 },
 {
 	Id: 18548
@@ -114045,7 +114136,7 @@ item_db: (
 	EquipLv: 30
 	View: 836
 	Script: <"
-		bonus3 bAutoSpell,"AL_INCAGI",10,50;
+		bonus3 bAutoSpell,AL_INCAGI,10,50;
 		bonus2 bAddItemHealRate,Carrot,2000;
 	">
 },
@@ -117800,6 +117891,87 @@ item_db: (
 	OnUnequipScript: <" sc_end SC_DECORATION_OF_MUSIC; ">
 },
 {
+	Id: 19903
+	AegisName: "C_Witchs_Hat"
+	Name: "C Witchs Hat"
+	Type: 5
+	Loc: 1024
+	EquipLv: 1
+	Refine: false
+	View: 717
+	Script: <" bonus bCastrate,-10; ">
+},
+{
+	Id: 19917
+	AegisName: "C_Gloomy_Pumpkin_Hat"
+	Name: "C Gloomy Pumpkin Hat"
+	Type: 5
+	Loc: 1024
+	EquipLv: 1
+	Refine: false
+	View: 691
+	Script: <" bonus bSpeedRate,25; ">
+},
+{
+	Id: 19918
+	AegisName: "C_Lude_Mask"
+	Name: "C Lude Mask"
+	Type: 5
+	Loc: 6144
+	EquipLv: 1
+	Refine: false
+	View: 802
+	Script: <" bonus bHealPower2,20; bonus bAddItemHealRate,20; ">
+},
+{
+	Id: 19919
+	AegisName: "C_Cube_Mask_"
+	Name: "C Cube Mask "
+	Type: 5
+	Loc: 6144
+	EquipLv: 1
+	Refine: false
+	View: 472
+	Script: <" bonus bAspdRate,10; ">
+},
+{
+	Id: 19920
+	AegisName: "C_Adv_Whisper_Mask"
+	Name: "C Adv Whisper Mask"
+	Type: 5
+	Loc: 7168
+	EquipLv: 1
+	Refine: false
+	View: 458
+	Script: <" bonus bFlee,20; ">
+},
+{
+	Id: 22067
+	AegisName: "Witch_Shoes"
+	Name: "Witch Shoes"
+	Type: 5
+	Buy: 3500
+	Weight: 400
+	Def: 10
+	Job: 0xFFFFFFFE
+	Loc: 64
+	Script: <"
+		skill ALL_CATCRY, 1;
+		bonus bUnbreakableShoes,0;
+		autobonus3 "{ }",1000,7000,ALL_CATCRY,"{ montransform 1505,420000; }";
+	">
+},
+{
+	Id: 20183
+	AegisName: "C_There_Is_Something"
+	Name: "C There Is Something"
+	Type: 5
+	Loc: 3072
+	EquipLv: 1
+	Refine: false
+	View: 1091
+},
+{
 	Id: 20500
 	AegisName: "T_Archangel_Wing"
 	Name: "T Archangel's Wings"
@@ -118020,6 +118192,45 @@ item_db: (
 	Script: <" itemskill RK_LUXANIMA,1; ">
 },
 {
+	Id: 22669
+	AegisName: "HALLOWEEN_G_BOX"
+	Name: "Halloween Box"
+	Type: 2
+	Weight: 20
+	Script: <" getrandgroupitem 22669,1; ">
+},
+{
+	Id: 22670
+	AegisName: "DARK_INVITATION"
+	Name: "Invitation of Darkness"
+	Type: 2
+	Buy: 10
+	Weight: 10
+	Upper: 63
+	Script: <"
+		.@r = rand(1,3);
+		if (.@r == 1) {
+			specialeffect2 EF_DEVIL;
+			warp "niflheim",193,186;
+		} else if(.@r == 2) {
+			heal -500,-1000;
+			sc_start SC_STUN,3000,0;
+		} else {
+			specialeffect2 EF_DEVIL;
+			warp "niflheim",347,255;
+		}
+	">
+},
+{
+	Id: 22838
+	AegisName: "Something_Candy_Holder"
+	Name: "Something Candy Holder"
+	Type: 2
+	Buy: 20
+	Weight: 10
+	Script: <" getrandgroupitem 22838,1; ">
+},
+{
 	Id: 28200
 	AegisName: "End_Of_The_Horizon"
 	Name: "End Of The Horizon"
@@ -118051,7 +118262,7 @@ item_db: (
 	WeaponLv: 4
 	EquipLv: 141
 	View: 21
-	Script: <" bonus3 bAutoSpell,"GC_CROSSIMPACT",1,50; ">
+	Script: <" bonus3 bAutoSpell,GC_CROSSIMPACT,1,50; ">
 },
 {
 	Id: 28202
@@ -118069,7 +118280,7 @@ item_db: (
 	WeaponLv: 4
 	EquipLv: 141
 	View: 21
-	Script: <" bonus3 bAutoSpell,"GC_CROSSIMPACT",1,50; ">
+	Script: <" bonus3 bAutoSpell,GC_CROSSIMPACT,1,50; ">
 },
 {
 	Id: 28203
@@ -118090,7 +118301,7 @@ item_db: (
 		bonus bHit,8;
 		bonus bCritical,8;
 		bonus2 bAddRace,RC_DemiHuman,30;
-		bonus2 bVariableCastrate,"GS_TRACKING",-20;
+		bonus2 bVariableCastrate,GS_TRACKING,-20;
 		bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10;
 		bonus bUnbreakableWeapon,0;
 	">
diff --git a/db/re/item_group.conf b/db/re/item_group.conf
index 3d0f138c2..3a25d92b8 100644
--- a/db/re/item_group.conf
+++ b/db/re/item_group.conf
@@ -4745,3 +4745,42 @@ Lucky_Bag: (
 	"Big_Luk_Bookmark",
 )
 */
+HALLOWEEN_G_BOX: (
+	("Immortal_Heart", 30),
+	("Starsand_Of_Witch", 30),
+	("Empty_Bottle", 30),
+	("Alchol", 30),
+	("Karvodailnirol", 30),
+	("Transparent_Cloth", 30),
+	("Stem", 30),
+	("Poison_Spore", 30),
+	("Speed_Up_Potion", 5),
+	("Chocolate", 5),
+	("Guarana_Candy", 5),
+	("Seed_Of_Yggdrasil", 5),
+	"Old_Blue_Box",
+	"Old_Card_Album",
+	"Old_Violet_Box"
+)
+Something_Candy_Holder: (
+	("Honey", 3),
+	("Candy", 7),
+	("Well_Baked_Cookie", 2),
+	"Piece_Of_Cake",
+	("Bread", 3),
+	"Pumpkin_Cake",
+	("Pumpkin_Pie", 3),
+	("Meat", 5),
+	"HALLOWEEN_G_BOX",
+	("Trance_Candy_R", 3),
+	("Trance_Candy_B", 3),
+	("Trance_Candy_Y", 3),
+	("Trance_Candy_G", 3),
+	"Old_Blue_Box",
+	"Yggdrasilberry",
+	"Old_Card_Album",
+	"Old_Violet_Box",
+	"DARK_INVITATION",
+	"C_There_Is_Something",
+	"Witch_Shoes"
+)
diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt
index b249aba8c..fa10f91c2 100644
--- a/db/re/mob_db.txt
+++ b/db/re/mob_db.txt
@@ -2262,3 +2262,6 @@
 //3107,E_EASTER_BUNNY
 //3108,JITTERBUG1
 //3109,JITTERBUG2
+// 2014 Halloween Event
+3381,DARK_SOUL,Dark Soul,Dark Soul,10,20,1,0,0,1,20,20,0,0,1,1,1,1,1,1,0,0,1,6,27,0x81,100,1960,960,504,0,0,0,0,0,0,0,12192,2000,6914,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3382,WANDERING_SOUL,Wandering Soul,Wandering Soul,1,10,1,0,0,1,10,10,0,0,1,1,1,1,1,1,0,0,1,6,28,0x81,100,912,1248,576,0,0,0,0,0,0,0,12192,2000,6915,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
index 8f33acdcf..37b004bfa 100644
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -568,7 +568,7 @@
 
 //===== Champion ===========================
 //-- CH_PALMSTRIKE
-370,300,0,0,0,0,0,
+370,0,300,0,0,0,0,
 //-- CH_TIGERFIST
 371,0,0,0,0,2000:4000:6000:8000:10000,0,
 //==========================================
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index 5f1e7c2f2..ebaf3ab6c 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -124,7 +124,7 @@
 77,5,6,1,6,0x28,0,10,1,yes,0,0,0,magic,0,	PR_TURNUNDEAD,Turn Undead
 78,9,6,1,0,0x1,0,1,0,yes,0,0,0,magic,0,		PR_LEXAETERNA,Lex Aeterna
 79,9,8,2,6,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,magic,0,	PR_MAGNUS,Magnus Exorcismus
-80,9,8,2,3,0x20,1:1:1:1:1:2:2:2:2:2:2,10,3:4:5:6:7:8:9:10:11:12:12,yes,0,0x80,5,magic,0,	WZ_FIREPILLAR,Fire Pillar
+80,9,8,2,3,0x20,1:1:1:1:1:2:2:2:2:2:2,10,3:4:5:6:7:8:9:10:11:12:12,yes,0,0,5,magic,0,	WZ_FIREPILLAR,Fire Pillar
 81,0,6,4,3,0,3,10,1,yes,0,0,0,magic,5,		WZ_SIGHTRASHER,Sightrasher
 83,9,8,2,3,0,3:3:3:3:3:3:3:3:3:3:14,10,1:1:2:2:3:3:4:4:5:5:15,yes,0,0,0,magic,0,	WZ_METEOR,Meteor Storm
 84,9,8,1,4,0,0,10,3:4:5:6:7:8:9:10:11:12,yes,0,0,0,magic,2:3:3:4:4:5:5:6:6:7,	WZ_JUPITEL,Jupitel Thunder
@@ -749,7 +749,7 @@
 2049,0,0,0,0,0,0,10,0,no,0,0,0,none,0,		AB_EUCHARISTICA,Eucharistica
 2050,11,6,16,6,0x1,0,1,1,yes,0,0,0,magic,0,	AB_RENOVATIO,Renovatio
 2051,11,6,16,6,0x21,0,5,1,yes,0,0,0,magic,0,	AB_HIGHNESSHEAL,Highness Heal //CHECK Info shows this has magic attack.
-2052,11,6,1,0,0x1,0,5,1,yes,0,0,0,magic,0,	AB_CLEARANCE,Clearance //CHECK Also shows this as a magic attack. Why?
+2052,11,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,	AB_CLEARANCE,Clearance
 2053,11,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,	AB_EXPIATIO,Expiatio //CHECK Does this also give the buff to party members?
 2054,0,6,4,6,0x1,0,10,1,yes,0,0,0,none,0,	AB_DUPLELIGHT,Duple Light //CHECK Had issues adding a skill level check to make the % go higher with the skills level. Will do later.
 2055,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,	AB_DUPLELIGHT_MELEE,Duple Light Melee