Merge branch 'Jedzkie-Pull_07' into hercules

Closes #949 as merged

3 files changed, 336 insertions, 284 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index cc8aa14c2..f6b644d3f 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -87,8 +87,7 @@ item_db: (
 },
 **************************************************************************/
 
-//  Healing Items
-// =============================================================
+//== Healing Items =========================================
 {
 	Id: 501
 	AegisName: "Red_Potion"
@@ -1121,8 +1120,8 @@ item_db: (
 	Weight: 10
 	Script: <" itemheal rand(105,145),0; ">
 },
-//  Usable Items
-// ===================================================================
+
+//== Usable Items ==========================================
 {
 	Id: 601
 	AegisName: "Wing_Of_Fly"
@@ -1891,11 +1890,12 @@ item_db: (
 	Weight: 100
 	BuyingStore: true
 	Script: <"
-		if(Class==Job_Assassin_Cross) {
-			sc_start SC_DPOISON,60000,0;
-			sc_start SC_ATTHASTE_INFINITY,60000,0;
+		if (Class == Job_Assassin_Cross || Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T) {
+			sc_start SC_DPOISON, 60000, 0;
+			sc_start SC_ATTHASTE_INFINITY, 60000, 0;
+		} else {
+			percentheal -100, -100;
 		}
-		else percentheal -100,-100;
 	">
 },
 {
@@ -1906,10 +1906,7 @@ item_db: (
 	Buy: 5000
 	Weight: 300
 	BuyingStore: true
-	Script: <"
-		sc_start SC_DPOISON,10000,0,1000,SCFLAG_NONE;
-		sc_start SC_POISON,50000,0;
-	">
+	Script: <" percentheal 50, 50; ">
 },
 {
 	Id: 680
@@ -2167,8 +2164,8 @@ item_db: (
 	}
 	Script: <" itemskill MG_FROSTDIVER,1; ">
 },
-//  Etc Items
-// ===================================================================
+
+//== Etc Items =============================================
 {
 	Id: 701
 	AegisName: "Ora_Ora"
@@ -4415,9 +4412,8 @@ item_db: (
 	Weight: 10
 	BuyingStore: true
 },
-//  Weapons
-// ===================================================================
-//  1-Handed Swords
+
+//== One-Handed Swords =====================================
 {
 	Id: 1101
 	AegisName: "Sword"
@@ -5258,7 +5254,8 @@ item_db: (
 	EquipLv: 27
 	View: 2
 },
-//  2-Handed Swords
+
+//== Two-Handed Swords =====================================
 {
 	Id: 1151
 	AegisName: "Slayer"
@@ -6088,7 +6085,8 @@ item_db: (
 		bonus2 bAddSize,Size_Large,40;
 	">
 },
-//  Daggers
+
+//== Daggers ===============================================
 {
 	Id: 1201
 	AegisName: "Knife"
@@ -6913,7 +6911,8 @@ item_db: (
 	View: 1
 	Script: <" bonus bAtkEle,Ele_Water; ">
 },
-//  Katars
+
+//== Katars ================================================
 {
 	Id: 1250
 	AegisName: "Jur"
@@ -7720,7 +7719,8 @@ item_db: (
 		bonus2 bAddSize,Size_Large,40;
 	">
 },
-//  1-Handed Axes
+
+//== One-Handed Axes =======================================
 {
 	Id: 1301
 	AegisName: "Axe"
@@ -8030,7 +8030,8 @@ item_db: (
 		bonus bStr,10;
 	">
 },
-//  2-Handed Axes
+
+//== Two-Handed Axes =======================================
 {
 	Id: 1351
 	AegisName: "Battle_Axe"
@@ -8889,7 +8890,8 @@ item_db: (
 		bonus bStr,10;
 	">
 },
-//  1-Handed Spears
+
+//== One-Handed Spears =====================================
 {
 	Id: 1401
 	AegisName: "Javelin"
@@ -9566,7 +9568,8 @@ item_db: (
 		bonus bDex,1;
 	">
 },
-//  2-Handed Spears
+
+//== Two-Handed Spears =====================================
 {
 	Id: 1451
 	AegisName: "Guisarme"
@@ -9921,7 +9924,8 @@ item_db: (
 		bonus bStr,3;
 	">
 },
-//  2-Handed Staffs
+
+//== Two-Handed Staves =====================================
 {
 	Id: 1472
 	AegisName: "Staff_Of_Soul"
@@ -9962,7 +9966,8 @@ item_db: (
 		bonus bMatkRate,15;
 	">
 },
-//  2-Handed Spears
+
+//== Two-Handed Spears =====================================
 {
 	Id: 1474
 	AegisName: "Gae_Bolg"
@@ -10304,7 +10309,8 @@ item_db: (
 		bonus3 bAutoSpell,KN_PIERCE,5,30;
 	">
 },
-//  Maces
+
+//== Maces =================================================
 {
 	Id: 1501
 	AegisName: "Club"
@@ -11244,7 +11250,8 @@ item_db: (
 		bonus bLuk,1;
 	">
 },
-//  Books
+
+//== Books =================================================
 {
 	Id: 1550
 	AegisName: "Book"
@@ -11963,7 +11970,8 @@ item_db: (
 	Refine: false
 	View: 15
 },
-//  GM Weapon
+
+//== GM Weapon =============================================
 {
 	Id: 1599
 	AegisName: "Angra_Manyu"
@@ -11991,7 +11999,8 @@ item_db: (
 		skill GM_SANDMAN,1;
 	">
 },
-//  Staffs
+
+//== Staves ================================================
 {
 	Id: 1601
 	AegisName: "Rod"
@@ -13117,7 +13126,8 @@ item_db: (
 
 	">
 },
-//  Bows
+
+//== Bows ==================================================
 {
 	Id: 1701
 	AegisName: "Bow"
@@ -13960,7 +13970,8 @@ item_db: (
 		bonus2 bSkillAtk,AC_CHARGEARROW,10;
 	">
 },
-//  Arrows
+
+//== Arrows ================================================
 {
 	Id: 1750
 	AegisName: "Arrow"
@@ -14287,7 +14298,8 @@ item_db: (
 		bonus2 bAddRace,RC_Demon,5;
 	">
 },
-//  Knuckles
+
+//== Knuckles ==============================================
 {
 	Id: 1801
 	AegisName: "Waghnakh"
@@ -14895,7 +14907,8 @@ item_db: (
 		bonus2 bAddSize,Size_Large,40;
 	">
 },
-//  Instruments
+
+//== Instruments ===========================================
 {
 	Id: 1901
 	AegisName: "Violin"
@@ -15512,7 +15525,8 @@ item_db: (
 		bonus2 bAddSize,Size_Large,40;
 	">
 },
-//  Whips
+
+//== Whips =================================================
 {
 	Id: 1950
 	AegisName: "Rope"
@@ -16183,7 +16197,8 @@ item_db: (
 		bonus2 bAddSize,Size_Large,40;
 	">
 },
-//  Additional 2-Handed Staffs
+
+//== More Two-Handed Staves ================================
 {
 	Id: 2000
 	AegisName: "Destruction_Rod"
@@ -16370,8 +16385,8 @@ item_db: (
 		bonus bInt,6;
 	">
 },
-//  Shields
-// ===================================================================
+
+//== Shields ===============================================
 {
 	Id: 2101
 	AegisName: "Guard"
@@ -17027,7 +17042,8 @@ item_db: (
 		bonus bMaxHP,500;
 	">
 },
-//  GM Shield
+
+//== GM Shield =============================================
 {
 	Id: 2199
 	AegisName: "Ahura_Mazda"
@@ -17054,8 +17070,8 @@ item_db: (
 	OnEquipScript: <" sc_start4 SC_ENDURE,60000,10,0,0,1; ">
 	OnUnequipScript: <" sc_end SC_ENDURE; ">
 },
-//  Headgears
-// ===================================================================
+
+//== Headgears =============================================
 {
 	Id: 2201
 	AegisName: "Sunglasses"
@@ -18299,8 +18315,8 @@ item_db: (
 	Loc: 256
 	View: 86
 },
-//  Armors
-// ===================================================================
+
+//== Armors ================================================
 {
 	Id: 2301
 	AegisName: "Cotton_Shirt"
@@ -19898,8 +19914,8 @@ item_db: (
 	Loc: 16
 	Script: <" bonus bMdef,3; ">
 },
-//  Footgears
-// ===================================================================
+
+//== Footgears =============================================
 {
 	Id: 2401
 	AegisName: "Sandals"
@@ -20733,8 +20749,8 @@ item_db: (
 		bonus bVit,2;
 	">
 },
-//  Garments
-// ===================================================================
+
+//== Garments ==============================================
 {
 	Id: 2501
 	AegisName: "Hood"
@@ -21639,8 +21655,8 @@ item_db: (
 		bonus bMdef,3;
 	">
 },
-//  Accessories
-// ===================================================================
+
+//== Accessories ===========================================
 {
 	Id: 2601
 	AegisName: "Ring"
@@ -25332,8 +25348,8 @@ item_db: (
 		skill MG_FIREBOLT,1;
 	">
 },
-// Cards
-// ===================================================================
+
+//== Cards =================================================
 {
 	Id: 4001
 	AegisName: "Poring_Card"
@@ -30817,8 +30833,8 @@ item_db: (
 	Loc: 2
 	Script: <" bonus bBaseAtk,25; ">
 },
-//  Armor Enchant System
-// ===================================================================
+
+//== Armor Enchant System ==================================
 {
 	Id: 4700
 	AegisName: "Strength1"
@@ -31661,8 +31677,8 @@ item_db: (
 	Weight: 10
 	Loc: 16
 },
-//  More Headgears
-// ===================================================================
+
+//== More Headgears ========================================
 {
 	Id: 5001
 	AegisName: "Headset"
@@ -46152,8 +46168,8 @@ item_db: (
 	}
 	Script: <" bonus bAllStats,1; ">
 },
-//  More Etc Items
-// ===================================================================
+
+//== More Etc Items ========================================
 {
 	Id: 6000
 	AegisName: "Dark_Ashes"
@@ -59940,8 +59956,8 @@ item_db: (
 		noauction: true
 	}
 },
-//  Pet Eggs
-// ===================================================================
+
+//== Pet Eggs ==============================================
 {
 	Id: 9001
 	AegisName: "Poring_Egg"
@@ -60341,8 +60357,8 @@ item_db: (
 	Type: 7
 	Buy: 20
 },
-//  Pet Accessories
-// ===================================================================
+
+//== Pet Accessories =======================================
 {
 	Id: 10001
 	AegisName: "Skull_Helm"
@@ -60609,8 +60625,8 @@ item_db: (
 	Type: 8
 	Buy: 20
 },
-//  Misc "Etc" Books
-// ===================================================================
+
+//== Misc "Etc" Books ======================================
 {
 	Id: 11000
 	AegisName: "Prontera_Book_01"
@@ -61076,8 +61092,8 @@ item_db: (
 	Buy: 1000
 	Weight: 10
 },
-//  More Usable Items
-// ===================================================================
+
+//== More Usable Items =====================================
 {
 	Id: 11500
 	AegisName: "Light_Yellow_Pot"
@@ -64014,8 +64030,7 @@ item_db: (
 	Weight: 200
 },
 
-// Cash Shop Usable Items
-// ===================================================================
+//== Cash Shop Usable Items ================================
 {
 	Id: 12202
 	AegisName: "Str_Dish10_"
@@ -69105,7 +69120,8 @@ item_db: (
 	Buy: 0
 	Weight: 10
 },
-//  Guillotine Cross Poisons
+
+//== Guillotine Cross Poisons ==============================
 {
 	Id: 12717
 	AegisName: "Poison_Paralysis"
@@ -69114,7 +69130,10 @@ item_db: (
 	Buy: 2
 	Weight: 100
 	BuyingStore: true
-	Script: <" sc_start SC_PARALYSE,300000,0,10,SCFLAG_FIXEDTICK; ">
+	Script: <"
+		specialeffect2 EF_ENCHANTPOISON;
+		sc_start SC_PARALYSE,300000,0,10,SCFLAG_FIXEDTICK;
+	">
 },
 {
 	Id: 12718
@@ -69124,7 +69143,10 @@ item_db: (
 	Buy: 2
 	Weight: 100
 	BuyingStore: true
-	Script: <" sc_start SC_LEECHESEND,300000,0,10,SCFLAG_FIXEDTICK; ">
+	Script: <"
+		specialeffect2 EF_ENCHANTPOISON;
+		sc_start SC_LEECHESEND,300000,0,10,SCFLAG_FIXEDTICK;
+	">
 },
 {
 	Id: 12719
@@ -69134,7 +69156,10 @@ item_db: (
 	Buy: 2
 	Weight: 100
 	BuyingStore: true
-	Script: <" sc_start SC_OBLIVIONCURSE,300000,0,10,SCFLAG_FIXEDTICK; ">
+	Script: <"
+		specialeffect2 EF_ENCHANTPOISON;
+		sc_start SC_OBLIVIONCURSE,300000,0,10,SCFLAG_FIXEDTICK;
+	">
 },
 {
 	Id: 12720
@@ -69144,7 +69169,10 @@ item_db: (
 	Buy: 2
 	Weight: 100
 	BuyingStore: true
-	Script: <" sc_start SC_DEATHHURT,300000,0,10,SCFLAG_FIXEDTICK; ">
+	Script: <"
+		specialeffect2 EF_ENCHANTPOISON;
+		sc_start SC_DEATHHURT,300000,0,10,SCFLAG_FIXEDTICK;
+	">
 },
 {
 	Id: 12721
@@ -69154,7 +69182,10 @@ item_db: (
 	Buy: 2
 	Weight: 100
 	BuyingStore: true
-	Script: <" sc_start SC_TOXIN,300000,0,10,SCFLAG_FIXEDTICK; ">
+	Script: <"
+		specialeffect2 EF_ENCHANTPOISON;
+		sc_start SC_TOXIN,300000,0,10,SCFLAG_FIXEDTICK;
+	">
 },
 {
 	Id: 12722
@@ -69164,7 +69195,10 @@ item_db: (
 	Buy: 2
 	Weight: 100
 	BuyingStore: true
-	Script: <" sc_start SC_PYREXIA,300000,0,10,SCFLAG_FIXEDTICK; ">
+	Script: <"
+		specialeffect2 EF_ENCHANTPOISON;
+		sc_start SC_PYREXIA,300000,0,10,SCFLAG_FIXEDTICK;
+	">
 },
 {
 	Id: 12723
@@ -69174,7 +69208,10 @@ item_db: (
 	Buy: 2
 	Weight: 100
 	BuyingStore: true
-	Script: <" sc_start SC_MAGICMUSHROOM,300000,0,10,SCFLAG_FIXEDTICK; ">
+	Script: <"
+		specialeffect2 EF_ENCHANTPOISON;
+		sc_start SC_MAGICMUSHROOM,300000,0,10,SCFLAG_FIXEDTICK;
+	">
 },
 {
 	Id: 12724
@@ -69184,9 +69221,13 @@ item_db: (
 	Buy: 2
 	Weight: 100
 	BuyingStore: true
-	Script: <" sc_start SC_VENOMBLEED,15000,0,10,SCFLAG_FIXEDTICK; ">
+	Script: <"
+		specialeffect2 EF_ENCHANTPOISON;
+		sc_start SC_VENOMBLEED,15000,0,10,SCFLAG_FIXEDTICK;
+	">
 },
-//  Rune Knight's Rune Stones
+
+//== Rune Knight's Rune Stones =============================
 {
 	Id: 12725
 	AegisName: "Runstone_Nosiege"
@@ -69459,6 +69500,8 @@ item_db: (
 	BuyingStore: true
 	Script: <" makerune 8; ">
 },
+
+//== More Cash Shop Usable Items ===========================
 {
 	Id: 12739
 	AegisName: "Snow_Flower"
@@ -71409,9 +71452,8 @@ item_db: (
 	Weight: 10
 	Script: <" getitem 604,3; ">
 },
-//  More Weapons
-// ===================================================================
-//  Daggers and Ninja Weapons
+
+//== More Daggers ==========================================
 {
 	Id: 13000
 	AegisName: "Jujube_Dagger"
@@ -72444,7 +72486,8 @@ item_db: (
 		noauction: true
 	}
 },
-//  Revolvers
+
+//== Revolvers =============================================
 {
 	Id: 13100
 	AegisName: "Six_Shooter"
@@ -72729,7 +72772,8 @@ item_db: (
 	}
 	Script: <" bonus bHit,-5; ">
 },
-//  Guns
+
+//== Guns ==================================================
 {
 	Id: 13150
 	AegisName: "Branch"
@@ -73428,7 +73472,8 @@ item_db: (
 
 	">
 },
-//  Bullets
+
+//== Bullets ===============================================
 {
 	Id: 13200
 	AegisName: "Bullet"
@@ -73546,7 +73591,8 @@ item_db: (
 	View: 5
 	Script: <" bonus bAtkEle,Ele_Water; ">
 },
-//  Shurikens & Kunais
+
+//== Shurikens & Kunais ====================================
 {
 	Id: 13250
 	AegisName: "Shuriken"
@@ -73685,7 +73731,8 @@ item_db: (
 		bonus2 bAddEff,Eff_Poison,500;
 	">
 },
-//  Genetic Created Bombs And Throwing Items
+
+//== Geneticist Created Bombs and Throwing Items ===========
 {
 	Id: 13260
 	AegisName: "Apple_Bomb"
@@ -74141,7 +74188,8 @@ item_db: (
 	View: 9
 	Script: <" sc_start2 SC_STOMACHACHE,60000,rand(5,10),75; ">
 },
-//  Ninja Fuuma Shurikens
+
+//== Ninja Fuuma Shurikens =================================
 {
 	Id: 13300
 	AegisName: "Huuma_Bird_Wing"
@@ -74396,7 +74444,8 @@ item_db: (
 		noauction: true
 	}
 },
-//  More 1-Handed Swords
+
+//== More One-Handed Swords ================================
 {
 	Id: 13400
 	AegisName: "Cutlas_"
@@ -74954,7 +75003,8 @@ item_db: (
 	}
 	Script: <" bonus bUnbreakableWeapon,0; ">
 },
-//  More Cash Shop Items
+
+//== More Cash Shop Items ==================================
 {
 	Id: 13500
 	AegisName: "Insurance60_Package"
@@ -86946,7 +86996,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 320;
+		specialeffect2 EF_HEAL3;
 		sc_start4 SC_S_LIFEPOTION,600000,-5,5,0,0;
 	">
 },
@@ -86967,7 +87017,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 320;
+		specialeffect2 EF_HEAL3;
 		sc_start4 SC_L_LIFEPOTION,600000,-7,4,0,0;
 	">
 },
@@ -86988,7 +87038,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 182;
+		specialeffect2 EF_MAGICALATTHIT;
 		sc_start SC_CRITICALPERCENT,300000,30;
 	">
 },
@@ -87009,7 +87059,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 348;
+		specialeffect2 EF_LIGHTSPHERE;
 		sc_start SC_HEALPLUS,1800000,20;
 	">
 },
@@ -87073,7 +87123,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 91;
+		specialeffect2 EF_BENEDICTIO;
 		sc_start4 SC_ARMOR_PROPERTY,1800000,1,Ele_Holy,1,0;
 	">
 },
@@ -88074,8 +88124,7 @@ item_db: (
 	Script: <" percentheal 10,10; ">
 },
 
-// More Armors
-// ===================================================================
+//== More Armors ===========================================
 {
 	Id: 15000
 	AegisName: "Bone_Plate"
@@ -88118,7 +88167,8 @@ item_db: (
 		noauction: true
 	}
 },
-//  More Maces
+
+//== More Maces ============================================
 {
 	Id: 16000
 	AegisName: "Erde"
@@ -88201,7 +88251,8 @@ item_db: (
 		bonus2 bAddSize,Size_Large,40;
 	">
 },
-//  More Rental Boxes
+
+//== More Rental Boxes =====================================
 {
 	Id: 16134
 	AegisName: "King_Frog_Hat_Box"
@@ -88756,8 +88807,7 @@ item_db: (
 	Script: <" getitem 12581,50; ">
 },
 
-// Mechanic/Genetic Cannonballs
-// ===================================================================
+//== Mechanic / Geneticist Cannon Balls ====================
 {
 	Id: 18000
 	AegisName: "Cannon_Ball"
@@ -88832,8 +88882,7 @@ item_db: (
 	View: 8
 },
 
-// More Bows
-// ===================================================================
+//== More Bows =============================================
 {
 	Id: 18100
 	AegisName: "Shooting_Star"
@@ -88900,8 +88949,7 @@ item_db: (
 	">
 },
 
-// More Headgears
-// ===================================================================
+//== More Headgears ========================================
 {
 	Id: 18500
 	AegisName: "Cheer_Scarf6"
@@ -89192,7 +89240,8 @@ item_db: (
 		bonus2 bMagicAddRace,RC_Demon,15;
 	">
 },
-//  Costume System
+
+//== Costume System ========================================
 {
 	Id: 19500
 	AegisName: "T_Mr_Smile"
@@ -89255,6 +89304,8 @@ item_db: (
 	Refine: false
 	View: 654
 },
+
+//== New Etc Items =========================================
 {
 	Id: 22540
 	AegisName: "Runstone_Luxanima"
diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt
index 264d37aac..bc5203d8f 100644
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@@ -303,12 +303,14 @@
 15091:18820:20721:22033,{ bonus2 bSubEle,Ele_Neutral,15; bonus bMaxHPrate,25; bonus bMaxSPrate,25; bonus bMatkRate,10; }
 15117:20744:22047,{ bonus bMaxHP,25; bonus bMaxSP,25; bonus bSpeedRate,25; if (getequiprefinerycnt(EQI_GARMENT)+getequiprefinerycnt(EQI_SHOES)+getequiprefinerycnt(EQI_ARMOR) >= 30) { bonus bMaxHP,5; bonus bMaxSP,5; } }
 18510:18511,{ bonus2 bAddRace,RC_Angel,3; }
+18728:15061:2495:20700,{ bonus bAllStats, 1; bonus2 bSubEle, Ele_Water, 50; }
 18776:20710,{ bonus bAgi,5; bonus bFlee,10; }
 18824:18825,{ bonus bMaxHP,100; bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_HEAD_TOP); }
 18997:28326:28327,{ bonus bSpeedRate,10; bonus bBaseAtk,50; bonus bMatk,50; if(getequiprefinerycnt(EQI_HEAD_TOP)>=9){ bonus bMaxHPrate,10; bonus bMaxSPrate,50; } }
-19026:20756,{ set .@c, getequiprefinerycnt(EQI_GARMENT); bonus2 bSPGainRace,RC_Fish,10; bonus3 bAddMonsterDropItem,551,RC_Fish,(5+.@c); bonus2 bAddItemHealRate,551,5; bonus bHPrecovRate,(5+.@c); }
-19026:22059,{ bonus2 bCriticalAddRace,RC_Fish,(10+getequiprefinerycnt(EQI_SHOES)); }
-19026:20756:22059:15138,{ bonus bMaxHP,1000; bonus bMaxSP,100; bonus2 bExpAddRace,RC_Fish,20; bonus2 bMagicAddRace,RC_Fish,50; bonus2 bSubEle,Ele_Water,50; }
+19026:15138,{ bonus2 bAddRaceTolerance, RC_Fish, 10 + getequiprefinerycnt(EQI_ARMOR); }
+19026:20756,{ .@r = getequiprefinerycnt(EQI_GARMENT); bonus2 bSPGainRace, RC_Fish, 10; bonus3 bAddMonsterDropItem, Shusi, RC_Fish, (5 + .@r); bonus3 bAddMonsterDropItem, Fish_Slice, RC_Fish, (5 + .@r); bonus2 bAddItemHealRate, Shusi, 5; bonus2 bAddItemHealRate, Fish_Slice, 5; bonus bHPrecovRate, (5 + .@r); }
+19026:22059,{ bonus2 bCriticalAddRace, RC_Fish, 10 + getequiprefinerycnt(EQI_SHOES); }
+19026:15138:22059:20756,{ bonus bMaxHP, 1000; bonus bMaxSP, 100; bonus2 bExpAddRace, RC_Fish, 20; bonus2 bAddRace, RC_Fish, 50; bonus2 bMagicAddRace, RC_Fish, 50; bonus2 bSubEle, Ele_Water, 50; }
 19827:20763,{ bonus2 bAddRaceTolerance,RC_Player,4; }
 20717:22000,{ bonus bMaxHPrate,15; bonus bMaxSPrate,5; }
 20717:22001,{ bonus bMaxHPrate,15; bonus bMaxSPrate,5; }
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 775c2d358..5c81f7ea0 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -87,8 +87,7 @@ item_db: (
 },
 **************************************************************************/
 
-// Healing Items
-// ===================================================================
+//== Healing Items =========================================
 {
 	Id: 501
 	AegisName: "Red_Potion"
@@ -1140,8 +1139,7 @@ item_db: (
 	Script: <" itemheal rand(105,145),0; ">
 },
 
-// Usable Items
-// ===================================================================
+//== Usable Items ==========================================
 {
 	Id: 601
 	AegisName: "Wing_Of_Fly"
@@ -1910,11 +1908,12 @@ item_db: (
 	Weight: 100
 	BuyingStore: true
 	Script: <"
-		if(Class == Job_Assassin_Cross || Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T) {
-			sc_start SC_DPOISON,60000,0;
-			sc_start SC_ATTHASTE_INFINITY,60000,9;
+		if (Class == Job_Assassin_Cross || Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T) {
+			sc_start SC_DPOISON, 60000, 0;
+			sc_start SC_ATTHASTE_INFINITY, 60000, 9;
+		} else {
+			percentheal -100, -100;
 		}
-		else percentheal -100,-100;
 	">
 },
 {
@@ -1925,10 +1924,7 @@ item_db: (
 	Buy: 5000
 	Weight: 300
 	BuyingStore: true
-	Script: <"
-		sc_start SC_DPOISON,10000,0,1000,SCFLAG_NONE;
-		sc_start SC_POISON,50000,0;
-	">
+	Script: <" percentheal 50, 50; ">
 },
 {
 	Id: 680
@@ -2187,8 +2183,7 @@ item_db: (
 	Script: <" itemskill MG_FROSTDIVER,1; ">
 },
 
-// Etc Items
-// ===================================================================
+//== Etc Items =============================================
 {
 	Id: 701
 	AegisName: "Ora_Ora"
@@ -4190,8 +4185,7 @@ item_db: (
 	BuyingStore: true
 },
 
-// One-Handed Swords
-// ===================================================================
+//== One-Handed Swords =====================================
 {
 	Id: 1101
 	AegisName: "Sword"
@@ -5036,8 +5030,7 @@ item_db: (
 	View: 2
 },
 
-// Two-Handed Swords
-// ===================================================================
+//== Two-Handed Swords =====================================
 {
 	Id: 1151
 	AegisName: "Slayer"
@@ -6072,8 +6065,7 @@ item_db: (
 	View: 3
 },
 
-// Daggers
-// ===================================================================
+//== Daggers ===============================================
 {
 	Id: 1201
 	AegisName: "Knife"
@@ -6897,8 +6889,7 @@ item_db: (
 	Script: <" bonus bAtkEle,Ele_Water; ">
 },
 
-// Katars
-// ===================================================================
+//== Katars ================================================
 {
 	Id: 1250
 	AegisName: "Jur"
@@ -8007,8 +7998,7 @@ item_db: (
 	">
 },
 
-// One-Handed Axes
-// ===================================================================
+//== One-Handed Axes =======================================
 {
 	Id: 1301
 	AegisName: "Axe"
@@ -8411,8 +8401,7 @@ item_db: (
 	">
 },
 
-// Two-Handed Axes
-// ===================================================================
+//== Two-Handed Axes =======================================
 {
 	Id: 1351
 	AegisName: "Battle_Axe"
@@ -9490,8 +9479,7 @@ item_db: (
 	">
 },
 
-// One-Handed Spears
-// ===================================================================
+//== One-Handed Spears =====================================
 {
 	Id: 1400
 	AegisName: "Spear_of_Vicious_Mind"
@@ -10383,8 +10371,7 @@ item_db: (
 	">
 },
 
-// Two-Handed Spears
-// ===================================================================
+//== Two-Handed Spears =====================================
 {
 	Id: 1450
 	AegisName: "Lance_of_Vicious_Mind"
@@ -10758,6 +10745,8 @@ item_db: (
 		bonus bStr,3;
 	">
 },
+
+//== Two-Handed Staves =====================================
 {
 	Id: 1472
 	AegisName: "Staff_Of_Soul"
@@ -10798,6 +10787,8 @@ item_db: (
 		bonus bDex,2;
 	">
 },
+
+//== Two-Handed Spears =====================================
 {
 	Id: 1474
 	AegisName: "Gae_Bolg"
@@ -11374,8 +11365,7 @@ item_db: (
 	">
 },
 
-// Maces
-// ===================================================================
+//== Maces =================================================
 {
 	Id: 1501
 	AegisName: "Club"
@@ -12343,8 +12333,7 @@ item_db: (
 	View: 8
 },
 
-// Books
-// ===================================================================
+//== Books =================================================
 {
 	Id: 1550
 	AegisName: "Book"
@@ -13328,8 +13317,7 @@ item_db: (
 	">
 },
 
-// GM Weapon
-// ===================================================================
+//== GM Weapon =============================================
 {
 	Id: 1599
 	AegisName: "Angra_Manyu"
@@ -13360,8 +13348,7 @@ item_db: (
 	">
 },
 
-// Staffs / Staves
-// ===================================================================
+//== Staves ================================================
 {
 	Id: 1600
 	AegisName: "Rod_of_Vicious_Mind"
@@ -15063,8 +15050,7 @@ item_db: (
 	">
 },
 
-// Bows
-// ===================================================================
+//== Bows ==================================================
 {
 	Id: 1701
 	AegisName: "Bow"
@@ -16002,8 +15988,7 @@ item_db: (
 	">
 },
 
-// Arrows
-// ===================================================================
+//== Arrows ================================================
 {
 	Id: 1750
 	AegisName: "Arrow"
@@ -16359,8 +16344,7 @@ item_db: (
 	View: 1
 },
 
-// Knuckles
-// ===================================================================
+//== Knuckles ==============================================
 {
 	Id: 1800
 	AegisName: "Fist_of_Vicious_Mind"
@@ -17172,8 +17156,7 @@ item_db: (
 	">
 },
 
-// Instruments
-// ===================================================================
+//== Instruments ===========================================
 {
 	Id: 1900
 	AegisName: "Violin_of_Vicious_Mind"
@@ -18089,8 +18072,7 @@ item_db: (
 	">
 },
 
-// Whips
-// ===================================================================
+//== Whips =================================================
 {
 	Id: 1950
 	AegisName: "Rope"
@@ -19033,8 +19015,7 @@ item_db: (
 	">
 },
 
-// More Two-Handed Staffs / Staves
-// ===================================================================
+//== More Two-Handed Staves ================================
 {
 	Id: 2000
 	AegisName: "Destruction_Rod"
@@ -19714,8 +19695,7 @@ item_db: (
 	">
 },
 
-// Shields
-// ===================================================================
+//== Shields ===============================================
 {
 	Id: 2101
 	AegisName: "Guard"
@@ -21335,8 +21315,7 @@ item_db: (
 	">
 },
 
-// GM Shield
-// ===================================================================
+//== GM Shield =============================================
 {
 	Id: 2199
 	AegisName: "Ahura_Mazda"
@@ -21367,8 +21346,7 @@ item_db: (
 	OnUnequipScript: <" sc_end SC_ENDURE; ">
 },
 
-// Headgears
-// ===================================================================
+//== Headgears =============================================
 {
 	Id: 2201
 	AegisName: "Sunglasses"
@@ -22612,8 +22590,7 @@ item_db: (
 	View: 86
 },
 
-// Armors
-// ===================================================================
+//== Armors ================================================
 {
 	Id: 2301
 	AegisName: "Cotton_Shirt"
@@ -24254,8 +24231,7 @@ item_db: (
 	Script: <" bonus bMdef,3; ">
 },
 
-// Footgears
-// ===================================================================
+//== Footgears =============================================
 {
 	Id: 2401
 	AegisName: "Sandals"
@@ -25895,8 +25871,10 @@ item_db: (
 	Loc: 64
 	EquipLv: 110
 	Script: <"
-		if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Job_Acolyte) bonus bMaxHP,BaseLevel*5;
-		else if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) bonus bMaxSP,JobLevel*2;
+		if (BaseClass == Job_Mage || BaseClass == Job_Archer || BaseClass == Job_Acolyte)
+			bonus bMaxHP, BaseLevel * 5;
+		else if (BaseClass == Job_Swordman || BaseClass == Job_Merchant || BaseClass == Job_Thief)
+			bonus bMaxSP, JobLevel * 2;
 	">
 },
 {
@@ -25997,8 +25975,7 @@ item_db: (
 	">
 },
 
-// Garments
-// ===================================================================
+//== Garments ==============================================
 {
 	Id: 2501
 	AegisName: "Hood"
@@ -27712,8 +27689,7 @@ item_db: (
 	">
 },
 
-// Accessories
-// ===================================================================
+//== Accessories ===========================================
 {
 	Id: 2601
 	AegisName: "Ring"
@@ -33917,8 +33893,7 @@ item_db: (
 	">
 },
 
-// Cards
-// ===================================================================
+//== Cards =================================================
 {
 	Id: 4001
 	AegisName: "Poring_Card"
@@ -42508,8 +42483,7 @@ item_db: (
 	">
 },
 
-// Armor Enchant System
-// ===================================================================
+//== Armor Enchant System ==================================
 {
 	Id: 4700
 	AegisName: "Strength1"
@@ -44247,8 +44221,7 @@ item_db: (
 	Script: <" bonus bMaxSP,75; ">
 },
 
-// More Headgears
-// ===================================================================
+//== More Headgears ========================================
 {
 	Id: 5001
 	AegisName: "Headset"
@@ -58939,8 +58912,7 @@ item_db: (
 	">
 },
 
-// More Etc Items
-// ===================================================================
+//== More Etc Items ========================================
 {
 	Id: 6000
 	AegisName: "Dark_Ashes"
@@ -74471,8 +74443,7 @@ item_db: (
 	Weight: 10
 },
 
-// Pet Eggs
-// ===================================================================
+//== Pet Eggs ==============================================
 {
 	Id: 9001
 	AegisName: "Poring_Egg"
@@ -74919,8 +74890,7 @@ item_db: (
 	Buy: 20
 },
 
-// Pet Accessories
-// ===================================================================
+//== Pet Accessories =======================================
 {
 	Id: 10001
 	AegisName: "Skull_Helm"
@@ -75195,8 +75165,7 @@ item_db: (
 	Buy: 20
 },
 
-// Misc "Etc" Books
-// ===================================================================
+//== Misc "Etc" Books ======================================
 {
 	Id: 11000
 	AegisName: "Prontera_Book_01"
@@ -75681,8 +75650,7 @@ item_db: (
 	Weight: 10
 },
 
-// More Usable Items
-// ===================================================================
+//== More Usable Items =====================================
 {
 	Id: 11500
 	AegisName: "Light_Yellow_Pot"
@@ -76092,7 +76060,22 @@ item_db: (
 	Type: 0
 	Buy: 0
 	Weight: 10
-	Script: <" itemheal rand(70,110),0; ">
+	Script: <"
+		.@temp = rand(1,4);
+		if (.@temp == 1) {
+			heal -100, 0;
+		} else if (.@temp == 2) {
+			showscript "Huuph...! Yucky..! Wa, Water...!!";
+			sc_start SC_STUN, 3000, 0, 50000, SCFLAG_NONE;
+		} else if (.@temp == 3) {
+			showscript "Yeeyuck...!! This is rotten!!";
+			sc_start SC_POISON, 50000, 0;
+		} else {
+			specialeffect2 EF_HIT4;
+			showscript "Arrrrrgggg...!! Bu, Bu, Bugggggg!!!!!";
+			getitem Rice_weevil_Bug, 1;
+		}
+	">
 },
 {
 	Id: 11537
@@ -76101,7 +76084,34 @@ item_db: (
 	Type: 0
 	Buy: 0
 	Weight: 10
-	Script: <" itemheal rand(100,150),0; ">
+	Script: <"
+		.@temp = rand(1,6);
+		if (.@temp == 1) {
+			specialeffect2 EF_POISONHIT;
+			showscript "Errrgg!!! This is so.. bitter....!!";
+			heal 0,-50;
+		} else if (.@temp == 2) {
+			specialeffect2 EF_HEAL;
+			showscript "....Well at least this is good for my health though.";
+			percentheal 15,0;
+		} else if (.@temp == 3) {
+			specialeffect2 EF_POISONHIT;
+			showscript "Phewphew!! Arg.... Is this poisoned or what?!";
+			heal 0,-100;
+		} else if (.@temp == 4) {
+			specialeffect2 EF_POISONHIT;
+			showscript "Whasdfhwkljhrtklwert....!!";
+			heal 0,-200;
+		} else if (.@temp == 5) {
+			specialeffect2 EF_HEAL;
+			showscript "It's ok, no one sew me yet..";
+			percentheal 10,0;
+		} else {
+			specialeffect2 EF_HEAL;
+			showscript "I really need something to eat... ?? Sorry, little buggy.";
+			percentheal 5,0;
+		}
+	">
 },
 {
 	Id: 11538
@@ -78943,8 +78953,7 @@ item_db: (
 	Weight: 200
 },
 
-// Cash Shop Usable Items
-// ===================================================================
+//== Cash Shop Usable Items ================================
 {
 	Id: 12202
 	AegisName: "Str_Dish10_"
@@ -85665,8 +85674,7 @@ item_db: (
 	Weight: 10
 },
 
-// Guillotine Cross Poisons
-// ===================================================================
+//== Guillotine Cross Poisons ==============================
 {
 	Id: 12717
 	AegisName: "Poison_Paralysis"
@@ -85772,8 +85780,7 @@ item_db: (
 	">
 },
 
-// Rune Knight's Rune Stones
-// ===================================================================
+//== Rune Knight's Rune Stones =============================
 {
 	Id: 12725
 	AegisName: "Runstone_Nosiege"
@@ -86032,8 +86039,7 @@ item_db: (
 	Script: <" makerune 8; ">
 },
 
-// More Cash Shop Usable Items
-// ===================================================================
+//== More Cash Shop Usable Items ===========================
 {
 	Id: 12739
 	AegisName: "Snow_Flower"
@@ -88764,6 +88770,8 @@ item_db: (
 	}
 	Script: <" getitem 604,3; ">
 },
+
+//== More Daggers ==========================================
 {
 	Id: 13000
 	AegisName: "Jujube_Dagger"
@@ -90542,8 +90550,7 @@ item_db: (
 	">
 },
 
-// Revolvers
-// ===================================================================
+//== Revolvers =============================================
 {
 	Id: 13100
 	AegisName: "Six_Shooter"
@@ -91034,8 +91041,7 @@ item_db: (
 	Script: <" bonus bAtk,pow(min(getrefine(),15),2); ">
 },
 
-// Guns
-// ===================================================================
+//== Guns ==================================================
 {
 	Id: 13150
 	AegisName: "Branch"
@@ -92030,8 +92036,7 @@ item_db: (
 	">
 },
 
-// Bullets
-// ===================================================================
+//== Bullets ===============================================
 {
 	Id: 13200
 	AegisName: "Bullet"
@@ -92225,8 +92230,7 @@ item_db: (
 	View: 3
 },
 
-// Shurikens & Kunais
-// ===================================================================
+//== Shurikens & Kunais ====================================
 {
 	Id: 13250
 	AegisName: "Shuriken"
@@ -92360,8 +92364,7 @@ item_db: (
 	">
 },
 
-// Genetic Created Bombs And Throwing Items
-// ===================================================================
+//== Geneticist Created Bombs and Throwing Items ===========
 {
 	Id: 13260
 	AegisName: "Apple_Bomb"
@@ -92793,8 +92796,7 @@ item_db: (
 	Script: <" sc_start2 SC_STOMACHACHE,60000,rand(5,10),75; ">
 },
 
-// More Shurikens & Kunais
-// ===================================================================
+//== More Shurikens & Kunais ===============================
 {
 	Id: 13291
 	AegisName: "Starfish"
@@ -92905,8 +92907,7 @@ item_db: (
 	}
 },
 
-// Ninja Fuuma Shurikens
-// ===================================================================
+//== Ninja Fuuma Shurikens =================================
 {
 	Id: 13300
 	AegisName: "Huuma_Bird_Wing"
@@ -93375,8 +93376,7 @@ item_db: (
 	">
 },
 
-// More One-Handed Swords
-// ===================================================================
+//== More One-Handed Swords ================================
 {
 	Id: 13400
 	AegisName: "Cutlas_"
@@ -94290,8 +94290,7 @@ item_db: (
 	Script: <" bonus bAtk,pow(min(getrefine(),15),2); ">
 },
 
-// More Cash Shop Items
-// ===================================================================
+//== More Cash Shop Items ==================================
 {
 	Id: 13500
 	AegisName: "Insurance60_Package"
@@ -111915,6 +111914,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
+	Script: <"
+		specialeffect2 EF_GUARD;
+		sc_start SC_PROTECT_DEF, 1800000, 1;
+		sc_start SC_PROTECT_MDEF, 1800000, 1;
+	">
 },
 {
 	Id: 14616
@@ -112054,8 +112058,7 @@ item_db: (
 	">
 },
 
-// More Armors
-// ===================================================================
+//== More Armors ===========================================
 {
 	Id: 15000
 	AegisName: "Bone_Plate"
@@ -113168,13 +113171,12 @@ item_db: (
 	Loc: 16
 	EquipLv: 110
 	Script: <"
-		bonus bStr,1;
-		bonus bInt,1;
-		bonus bVit,1;
-		bonus bDex,1;
-		bonus bAgi,1;
-		bonus bLuk,1;
-		bonus bUnbreakableArmor,0;
+		bonus bAllStats, 1;
+		if (BaseClass == Job_Mage || BaseClass == Job_Archer || BaseClass == Job_Acolyte)
+			bonus2 bResEff, Eff_Silence, 5000;
+		else if (BaseClass == Job_Swordman || BaseClass == Job_Merchant || BaseClass == Job_Thief)
+			bonus2 bResEff, Eff_Stun, 5000;
+		bonus bUnbreakableArmor, 0;
 	">
 },
 {
@@ -113368,22 +113370,23 @@ item_db: (
 },
 {
 	Id: 15138
-	AegisName: "Aegir_Armor"
+	AegisName: "Egir_Armor_K"
 	Name: "Aegir Armor"
 	Type: 5
-	Buy: 20
+	Buy: 200000
 	Weight: 1600
 	Def: 25
+	Slots: 1
 	Loc: 16
 	EquipLv: 40
 	Script: <"
-		bonus bMaxHP,500;
-		bonus bMaxSP,50;
+		bonus bMaxHP, 500;
+		bonus bMaxSP, 50;
+		bonus bUnbreakableArmor, 0;
 	">
 },
 
-// More Maces
-// ===================================================================
+//== More Maces ============================================
 {
 	Id: 16000
 	AegisName: "Erde"
@@ -114068,6 +114071,8 @@ item_db: (
 		bonus bUnbreakableWeapon,0;
 	">
 },
+
+//== More Rental Boxes =====================================
 {
 	Id: 16131
 	AegisName: "Lady_Tanee_Doll_Box"
@@ -118385,8 +118390,7 @@ item_db: (
 	Script: <" getitem LUK_Biscuit_Stick,20; ">
 },
 
-// Mechanic/Genetic Cannonballs
-// ===================================================================
+//== Mechanic / Geneticist Cannon Balls ====================
 {
 	Id: 18000
 	AegisName: "Cannon_Ball"
@@ -118456,8 +118460,7 @@ item_db: (
 	View: 8
 },
 
-// More Bows
-// ===================================================================
+//== More Bows =============================================
 {
 	Id: 18100
 	AegisName: "Shooting_Star_C"
@@ -119054,8 +119057,7 @@ item_db: (
 	">
 },
 
-// More Headgears
-// ===================================================================
+//== More Headgears ========================================
 {
 	Id: 18500
 	AegisName: "Cheer_Scarf6"
@@ -122594,8 +122596,8 @@ item_db: (
 	EquipLv: 110
 	View: 870
 	Script: <"
-		bonus bMdef,5;
-		bonus bUnbreakableHelm,0;
+		bonus bMdef, 5;
+		bonus bUnbreakableHelm, 0;
 	">
 },
 {
@@ -125521,15 +125523,20 @@ item_db: (
 },
 {
 	Id: 19026
-	AegisName: "Aegir_Helm_"
+	AegisName: "Egir_Helm_K"
 	Name: "Aegir Helm"
 	Type: 5
+	Buy: 200000
 	Weight: 800
 	Def: 10
 	Slots: 1
 	Loc: 256
 	EquipLv: 110
 	View: 870
+	Script: <"
+		bonus bVit, 3;
+		bonus bUnbreakableHelm, 0;
+	">
 },
 {
 	Id: 19027
@@ -125892,8 +125899,7 @@ item_db: (
 	">
 },
 
-// Costume Equipments
-// ===================================================================
+//== Costume System ========================================
 {
 	Id: 19500
 	AegisName: "T_Mr_Smile"
@@ -132753,8 +132759,7 @@ item_db: (
 	View: 650
 },
 
-// New Garments
-// ===================================================================
+//== New Garments ==========================================
 {
 	Id: 20500
 	AegisName: "T_Archangel_Wing"
@@ -132789,8 +132794,11 @@ item_db: (
 	Loc: 4
 	EquipLv: 110
 	Script: <"
-		bonus bUnbreakableGarment,0;
-		bonus bUnbreakableHelm,0;
+		bonus bUnbreakableGarment, 0;
+		if (BaseClass == Job_Mage || BaseClass == Job_Archer || BaseClass == Job_Acolyte)
+			bonus bFlee2, 5 + (getequiprefinerycnt(EQI_GARMENT) * 2);
+		else if (BaseClass == Job_Swordman || BaseClass == Job_Merchant || BaseClass == Job_Thief)
+			bonus bShortWeaponDamageReturn, 5 + (getequiprefinerycnt(EQI_GARMENT) * 2);
 	">
 },
 {
@@ -133143,18 +133151,19 @@ item_db: (
 },
 {
 	Id: 20756
-	AegisName: "Aegir_Cloak"
+	AegisName: "Egir_Manteau_K"
 	Name: "Aegir Cloak"
 	Type: 5
-	Buy: 20
+	Buy: 200000
 	Weight: 300
 	Def: 10
+	Slots: 1
 	Loc: 4
 	EquipLv: 40
 	Script: <"
-		bonus bUnbreakableGarment,1;
-		bonus bMaxHP,500;
-		bonus bMaxSP,50;
+		bonus bMaxHP, 500;
+		bonus bMaxSP, 50;
+		bonus bUnbreakableGarment, 0;
 	">
 },
 {
@@ -133274,8 +133283,7 @@ item_db: (
 	">
 },
 
-// New Two-Handed Swords
-// ===================================================================
+//== New Two-Handed Swords =================================
 {
 	Id: 21000
 	AegisName: "Upg_Twohand_Sword"
@@ -133687,8 +133695,7 @@ item_db: (
 	">
 },
 
-// New Shoes
-// ===================================================================
+//== New Shoes =============================================
 {
 	Id: 22000
 	AegisName: "Temporal_STR_Boots"
@@ -134287,18 +134294,19 @@ item_db: (
 },
 {
 	Id: 22059
-	AegisName: "Egir_Shoes_"
+	AegisName: "Egir_Shoes_K"
 	Name: "Egir Shoes"
 	Type: 5
-	Buy: 20
+	Buy: 200000
 	Weight: 300
 	Def: 13
+	Slots: 1
 	Loc: 64
 	EquipLv: 40
 	Script: <"
-		bonus bMaxHP,500;
-		bonus bMaxSP,50;
-		bonus bUnbreakableShoes,0;
+		bonus bMaxHP, 500;
+		bonus bMaxSP, 50;
+		bonus bUnbreakableShoes, 0;
 	">
 },
 {
@@ -134318,8 +134326,7 @@ item_db: (
 	">
 },
 
-// New Etc Items
-// ===================================================================
+//== New Etc Items =========================================
 {
 	Id: 22514
 	AegisName: "Candy_Holder"
@@ -134371,13 +134378,13 @@ item_db: (
 	Buy: 10
 	Weight: 10
 	Script: <"
-		.@r = rand(1,3);
-		if (.@r == 1) {
+		.@temp = rand(1,3);
+		if (.@temp == 1) {
 			specialeffect2 EF_DEVIL;
 			warp "niflheim",193,186;
-		} else if (.@r == 2) {
-			heal -500,-1000;
-			sc_start SC_STUN,3000,0;
+		} else if (.@temp == 2) {
+			specialeffect2 EF_DEVIL;
+			warp "niflheim",106,254;
 		} else {
 			specialeffect2 EF_DEVIL;
 			warp "niflheim",347,255;
@@ -134489,8 +134496,7 @@ item_db: (
 	Script: <" getrandgroupitem 22838,1; ">
 },
 
-// Shadow Equipments
-// ===================================================================
+//== Shadow Equipments =====================================
 {
 	Id: 24000
 	AegisName: "T_STR1_Armor_Shadow"
@@ -137400,8 +137406,7 @@ item_db: (
 	">
 },
 
-// New Katars
-// ===================================================================
+//== New Katars ============================================
 {
 	Id: 28000
 	AegisName: "Thanatos_Katar"
@@ -137537,8 +137542,7 @@ item_db: (
 	">
 },
 
-// New Axes
-// ===================================================================
+//== New Axes ==============================================
 {
 	Id: 28100
 	AegisName: "Thanatos_Axe"
@@ -137654,8 +137658,7 @@ item_db: (
 	">
 },
 
-// New Grenade Launcher
-// ===================================================================
+//== New Grenade Launcher ==================================
 {
 	Id: 28200
 	AegisName: "End_Of_The_Horizon"
@@ -137751,8 +137754,7 @@ item_db: (
 	">
 },
 
-// New Accessories
-// ===================================================================
+//== New Accessories =======================================
 {
 	Id: 28306
 	AegisName: "Luna's_Blessing"
@@ -137993,8 +137995,7 @@ item_db: (
 	">
 },
 
-// New Books
-// ===================================================================
+//== New Books =============================================
 {
 	Id: 28604
 	AegisName: "Crimson_Bible"
@@ -138039,8 +138040,7 @@ item_db: (
 	">
 },
 
-// New Daggers
-// ===================================================================
+//== New Daggers ===========================================
 {
 	Id: 28703
 	AegisName: "Infinity_Dagger"
@@ -138126,8 +138126,7 @@ item_db: (
 	">
 },
 
-// New Shields
-// ===================================================================
+//== New Shields ===========================================
 {
 	Id: 28900
 	AegisName: "Praetorian_Shield"