diff --git a/trunk/dist/game/data/stats/npcs/25000-25099.xml b/trunk/dist/game/data/stats/npcs/25000-25099.xml
index 2e433f5a0b..522a6fa533 100644
--- a/trunk/dist/game/data/stats/npcs/25000-25099.xml
+++ b/trunk/dist/game/data/stats/npcs/25000-25099.xml
@@ -2068,7 +2068,7 @@
 		<equipment rhand="221" lhand="109" /> <!-- rhand: Assassin Knife lhand: Shield of Solar Eclipse -->
 		<acquire exp="5476117" sp="1314" raidPoints="520" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="69449.5684546156" hpRegen="26.794392073316" mp="402.6" mpRegen="1.8" />
+			<vitals hp="109138" hpRegen="26.794392073316" mp="402.6" mpRegen="1.8" />
 			<attack physical="163.695648646951" magical="12.9299967753255" random="10" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="410.18844" magical="200.1" evasion="-18" shield="547" shieldRate="20" />
 			<attribute>
@@ -2098,35 +2098,22 @@
 		</skill_list>
 		<ex_crt_effect>true</ex_crt_effect>
 		<ai type="BALANCED" clanHelpRange="300" isAggressive="false" />
-		<drop_lists>
-			<death>
-				<group chance="78.27729797363281">
-					<item id="61" min="9" max="25" chance="1.3428" /> <!-- Mithril Plate Gloves -->
-					<item id="607" min="9" max="27" chance="1.2682" /> <!-- Ogre Power Gauntlets -->
-					<item id="1125" min="10" max="28" chance="1.2015" /> <!-- Assault Boots -->
-					<item id="2427" min="10" max="30" chance="1.1414" /> <!-- Salamander Skin Boots -->
-					<item id="2428" min="1" max="1" chance="22.8284" /> <!-- Plate Boots -->
-					<item id="2451" min="1" max="1" chance="22.8284" /> <!-- Sage's Worn Gloves -->
-					<item id="1949" min="112" max="336" chance="4.2767" /> <!-- Mithril Gloves Design -->
-					<item id="1963" min="203" max="607" chance="2.3654" /> <!-- Ogre Power Gauntlets Part -->
-					<item id="1957" min="320" max="960" chance="1.4968" /> <!-- Assault Boots Part -->
-					<item id="2931" min="28" max="82" chance="17.4178" /> <!-- Salamander Skin Boot Lining -->
-					<item id="2932" min="36" max="108" chance="13.3052" /> <!-- Plate Boots Design -->
-					<item id="2933" min="46" max="136" chance="10.5274" /> <!-- Sage's Worn Gloves Lining -->
-				</group>
-				<group chance="29.55190086364746">
-					<item id="262" min="1" max="1" chance="29.5049" /> <!-- Scallop Jamadhr -->
-					<item id="2053" min="12" max="36" chance="70.4951" /> <!-- Scallop Jamadhr Edge -->
-				</group>
-				<group chance="44.79119873046875">
-					<item id="6574" min="1" max="1" chance="100" /> <!-- Blessed Scroll: Enchant Armor (C-Grade) -->
-				</group>
-			</death>
-		</drop_lists>
 		<collision>
 			<radius normal="30" />
 			<height normal="76" />
 		</collision>
+		<drop_lists>
+			<death>
+				<item id="61" min="1" max="1" chance="5.34" /> <!-- Mithril Plate Gloves -->
+				<item id="607" min="1" max="1" chance="2.26" /> <!-- Ogre Power Gauntlets -->
+				<item id="1125" min="1" max="1" chance="21.20" /> <!-- Assault Boots -->
+				<item id="2427" min="1" max="1" chance="17.50" /> <!-- Salamander Skin Boots -->
+				<item id="2428" min="1" max="1" chance="15" /> <!-- Plate Boots -->
+				<item id="2451" min="1" max="1" chance="12" /> <!-- Sage's Worn Gloves -->
+				<item id="262" min="1" max="1" chance="4.700" /> <!-- Scallop Jamadhr -->
+				<item id="6574" min="1" max="1" chance="100" /> <!-- Blessed Scroll: Enchant Armor (C-Grade) -->
+			</death>
+		</drop_lists>
 	</npc>
 	<npc id="25042" level="34" type="L2Monster" name="Remmel's Archer" title="Raid Fighter">
 		<parameters>
diff --git a/trunk/dist/game/data/stats/npcs/25100-25199.xml b/trunk/dist/game/data/stats/npcs/25100-25199.xml
index 19dc7ec251..6e41f7df22 100644
--- a/trunk/dist/game/data/stats/npcs/25100-25199.xml
+++ b/trunk/dist/game/data/stats/npcs/25100-25199.xml
@@ -3658,7 +3658,7 @@
 		<equipment rhand="223" /> <!-- rhand: Kukuri -->
 		<acquire exp="5476117" sp="1314" raidPoints="588" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="82089.0524454172" hpRegen="30.8726873073006" mp="447.96" mpRegen="1.8" />
+			<vitals hp="129000" hpRegen="30.8726873073006" mp="447.96" mpRegen="1.8" />
 			<attack physical="204.554218646784" magical="16.1476898312799" random="10" critical="8" accuracy="0" attackSpeed="253" type="DAGGER" range="40" distance="80" width="120" />
 			<defence physical="445.32861" magical="217.24" evasion="-18" />
 			<attribute>
@@ -3688,31 +3688,20 @@
 		</skill_list>
 		<ex_crt_effect>true</ex_crt_effect>
 		<ai type="BALANCED" clanHelpRange="300" isAggressive="false" />
-		<drop_lists>
-			<death>
-				<group chance="76.0425033569336">
-					<item id="631" min="6" max="16" chance="3.3742" /> <!-- Eldarake -->
-					<item id="2413" min="1" max="1" chance="25.9842" /> <!-- Chain Hood -->
-					<item id="2495" min="1" max="1" chance="37.1167" /> <!-- Chain Shield -->
-					<item id="1964" min="40" max="120" chance="19.1207" /> <!-- Eldarake Temper -->
-					<item id="2936" min="140" max="420" chance="4.9619" /> <!-- Chain Hood Pattern -->
-					<item id="2945" min="81" max="243" chance="9.4423" /> <!-- Chain Shield Fragment -->
-				</group>
-				<group chance="56.63840103149414">
-					<item id="226" min="1" max="1" chance="6.4873" /> <!-- Cursed Dagger -->
-					<item id="232" min="1" max="1" chance="6.4873" /> <!-- Dark Elven Dagger -->
-					<item id="2070" min="4" max="12" chance="56.7557" /> <!-- Cursed Dagger Blade -->
-					<item id="2072" min="8" max="22" chance="30.2697" /> <!-- Dark Elven Dagger Edge -->
-				</group>
-				<group chance="76.33329772949219">
-					<item id="951" min="1" max="3" chance="100" /> <!-- Scroll: Enchant Weapon (C-Grade) -->
-				</group>
-			</death>
-		</drop_lists>
 		<collision>
 			<radius normal="30" grown="36" />
 			<height normal="63" grown="76" />
 		</collision>
+		<drop_lists>
+			<death>
+				<item id="631" min="1" max="1" chance="1.250" /> <!-- Eldarake -->
+				<item id="2413" min="1" max="1" chance="2.500" /> <!-- Chain Hood -->
+				<item id="2495" min="1" max="1" chance="5.400" /> <!-- Chain Shield -->
+				<item id="226" min="1" max="1" chance="0.75" /> <!-- Cursed Dagger -->
+				<item id="232" min="1" max="1" chance="5.600" /> <!-- Dark Elven Dagger -->
+				<item id="951" min="1" max="1" chance="29.73" /> <!-- Scroll: Enchant Weapon (C-Grade) -->
+			</death>
+		</drop_lists>
 	</npc>
 	<npc id="25171" level="37" type="L2Monster" name="Hellion's Archers" title="Raid Fighter">
 		<parameters>
diff --git a/trunk/dist/game/data/stats/npcs/25300-25399.xml b/trunk/dist/game/data/stats/npcs/25300-25399.xml
index 2c3fa6e9af..cb903d2448 100644
--- a/trunk/dist/game/data/stats/npcs/25300-25399.xml
+++ b/trunk/dist/game/data/stats/npcs/25300-25399.xml
@@ -4940,7 +4940,7 @@
 		<equipment rhand="21732" /> <!-- rhand: Sword of Revolution - Event -->
 		<acquire exp="2417862" sp="580" raidPoints="456" />
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
-			<vitals hp="59258.1847978112" hpRegen="23.5043088957683" mp="358.32" mpRegen="1.8" />
+			<vitals hp="93123" hpRegen="23.5043088957683" mp="358.32" mpRegen="1.8" />
 			<attack physical="130.100600458143" magical="10.4063066607834" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="376.73181" magical="183.78" evasion="-18" />
 			<attribute>
@@ -4970,32 +4970,22 @@
 		</skill_list>
 		<ex_crt_effect>true</ex_crt_effect>
 		<ai type="BALANCED" clanHelpRange="300" isAggressive="false" />
-		<drop_lists>
-			<death>
-				<group chance="72.98799896240234">
-					<item id="352" min="1" max="1" chance="14.079" /> <!-- Brigandine Tunic -->
-					<item id="2377" min="1" max="1" chance="22.5205" /> <!-- Mithril Scale Gaiters -->
-					<item id="2378" min="1" max="1" chance="22.5205" /> <!-- Brigandine Gaiters -->
-					<item id="1941" min="14" max="42" chance="22.9664" /> <!-- Brigandine Temper -->
-					<item id="2918" min="40" max="120" chance="11.9918" /> <!-- Mithril Scale Gaiters Material -->
-					<item id="2919" min="81" max="243" chance="5.9218" /> <!-- Brigandine Gaiters Material -->
-				</group>
-				<group chance="35.49290084838867">
-					<item id="279" min="1" max="1" chance="27.8645" /> <!-- Reinforced Long Bow -->
-					<item id="2040" min="12" max="36" chance="72.1355" /> <!-- Reinforced Long Bow Shaft -->
-				</group>
-				<group chance="88.35099792480469">
-					<item id="4562" min="1" max="3" chance="38.961" /> <!-- Greater Dye of MEN <Men+1 Wit-1> -->
-					<item id="4563" min="2" max="4" chance="25.974" /> <!-- Greater Dye of WIT <Wit+1 Int-1> -->
-					<item id="4564" min="2" max="6" chance="19.4805" /> <!-- Greater Dye of WIT <Wit+1 Men-1> -->
-					<item id="955" min="3" max="7" chance="15.5845" /> <!-- Scroll: Enchant Weapon (D-Grade) -->
-				</group>
-			</death>
-		</drop_lists>
 		<collision>
 			<radius normal="15" />
 			<height normal="37" />
 		</collision>
+		<drop_lists>
+			<death>
+					<item id="352" min="1" max="1" chance="1.600" /> <!-- Brigandine Tunic -->
+					<item id="2377" min="1" max="1" chance="6.900" /> <!-- Mithril Scale Gaiters -->
+					<item id="2378" min="1" max="1" chance="3.900" /> <!-- Brigandine Gaiters -->
+					<item id="279" min="1" max="1" chance="1.150" /> <!-- Reinforced Long Bow -->
+					<item id="4562" min="1" max="3" chance="6.700" /> <!-- Greater Dye of MEN <Men+1 Wit-1> -->
+					<item id="4563" min="1" max="1" chance="13.25" /> <!-- Greater Dye of WIT <Wit+1 Int-1> -->
+					<item id="4564" min="1" max="1" chance="13.50" /> <!-- Greater Dye of WIT <Wit+1 Men-1> -->
+					<item id="955" min="1" max="1" chance="13" /> <!-- Scroll: Enchant Weapon (D-Grade) -->
+			</death>
+		</drop_lists>
 	</npc>
 	<npc id="25393" level="31" type="L2Monster" name="Marsh Stakato Noble" title="Raid Fighter">
 		<parameters>
diff --git a/trunk/dist/game/data/stats/npcs/25900-25999.xml b/trunk/dist/game/data/stats/npcs/25900-25999.xml
index 61aa855c68..a505d3b5d2 100644
--- a/trunk/dist/game/data/stats/npcs/25900-25999.xml
+++ b/trunk/dist/game/data/stats/npcs/25900-25999.xml
@@ -2850,22 +2850,80 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="25978" level="97" type="L2Npc" name="Garamor's Herald Gariott" title="Raid Boss">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="25978" level="97" type="L2RaidBoss" name="Garamor's Herald Gariott" title="Raid Boss">
+		<!-- http://l2wiki.com -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="52069755" hpRegen="7.5" mp="1345.8" mpRegen="2.7" />
+			<vitals hp="52069755" hpRegen="7.5" mp="68400" mpRegen="2.7" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
 			</speed>
 		</stats>
 		<status attackable="false" />
+		<skill_list>
+			<skill id="4416" level="2" /> <!-- -->
+			<skill id="5467" level="1" /> <!-- -->
+			<skill id="4410" level="18" /> <!-- -->
+			<skill id="4414" level="1" /> <!-- -->
+			<skill id="4494" level="1" /> <!-- -->
+			<skill id="16274" level="1" /> <!-- -->
+		</skill_list>
 		<collision>
 			<radius normal="45" />
 			<height normal="42" />
 		</collision>
+		<drop_lists>
+			<death>
+				<item id="17396" min="1" max="1" chance="0.75" /> <!-- Seraph Helmet -->
+				<item id="17399" min="1" max="1" chance="0.75" /> <!-- Seraph Gauntlets -->
+				<item id="17400" min="1" max="1" chance="0.75" /> <!-- Seraph Boots -->
+				<item id="17401" min="1" max="1" chance="0.75" /> <!-- Seraph Shield-->
+				<item id="17412" min="1" max="1" chance="0.75" /> <!-- Seraph Sigil -->
+				<item id="17526" min="1" max="1" chance="100" /> <!-- Scroll: Enchant Weapon (R-grade) -->
+				<item id="17527" min="1" max="1" chance="100" /> <!-- Scroll: Enchant Armor (R-grade) -->
+				<item id="38571" min="1" max="1" chance="100" /> <!-- Aria's Life Stone -->
+				<item id="19511" min="1" max="1" chance="34" /> <!-- Yellow Soul Crystal Fragment (R95-grade) -->
+				<item id="19512" min="1" max="1" chance="33" /> <!-- Teal Soul Crystal Fragment (R95-grade) -->
+				<item id="19513" min="1" max="1" chance="33" /> <!-- Purple Soul Crystal Fragment (R95-grade) -->
+				<item id="17688" min="1" max="1" chance="17" /> <!-- Lv. 4 Ancient INT Dye -->
+				<item id="17690" min="1" max="1" chance="17" /> <!-- Lv. 4 Ancient MEN Dye -->
+				<item id="17689" min="1" max="1" chance="17" /> <!-- Lv. 4 Ancient WIT Dye -->
+				<item id="17687" min="1" max="1" chance="17" /> <!-- Lv. 4 Ancient CON Dye -->
+				<item id="17686" min="1" max="1" chance="16" /> <!-- Lv. 4 Ancient DEX Dye -->
+				<item id="17685" min="1" max="1" chance="16" /> <!-- Lv. 4 Ancient STR Dye -->
+				<item id="38574" min="1" max="1" chance="2.300" /> <!-- Apparition Stone (Lv. 98) -->
+				<item id="38032" min="1" max="1" chance="0.3" /> <!-- Seraph Leather Gloves Crafting Pack -->
+				<item id="38030" min="1" max="1" chance="0.3" /> <!-- Seraph Leather Armor Crafting Pack -->
+				<item id="38029" min="1" max="1" chance="0.3" /> <!-- Seraph Leather Helmet Crafting Pack -->
+				<item id="38028" min="1" max="1" chance="0.3" /> <!-- Seraph Shield Crafting Pack -->
+				<item id="38033" min="1" max="1" chance="0.3" /> <!-- Seraph Leather Boots Crafting Pack -->
+				<item id="38034" min="1" max="1" chance="0.3" /> <!-- Seraph Circlet Crafting Pack -->
+				<item id="38035" min="1" max="1" chance="0.3" /> <!-- Seraph Tunic Crafting Pack -->
+				<item id="38036" min="1" max="1" chance="0.3" /> <!-- Seraph Stockings Crafting Pack -->
+				<item id="38037" min="1" max="1" chance="0.3" /> <!-- Seraph Gloves Crafting Pack -->
+				<item id="38038" min="1" max="1" chance="0.3" /> <!-- Seraph Shoes Crafting Pack -->
+				<item id="38039" min="1" max="1" chance="0.3" /> <!-- Seraph Sigil Crafting Pack -->
+				<item id="38031" min="1" max="1" chance="0.3" /> <!-- Seraph Leather Leggings Crafting Pack -->
+				<item id="38027" min="1" max="1" chance="0.3" /> <!-- Seraph Boots Crafting Pack -->
+				<item id="38026" min="1" max="1" chance="0.3" /> <!-- Seraph Gauntlets Crafting Pack -->
+				<item id="38013" min="1" max="1" chance="0.3" /> <!-- Specter Cutter Crafting Pack -->
+				<item id="38014" min="1" max="1" chance="0.3" /> <!-- Specter Slasher Crafting Pack -->
+				<item id="38015" min="1" max="1" chance="0.3" /> <!-- Specter Avenger Crafting Pack -->
+				<item id="38016" min="1" max="1" chance="0.3" /> <!-- Specter Fighter Crafting Pack -->
+				<item id="38017" min="1" max="1" chance="0.3" /> <!-- Specter Stormer Crafting Pack -->
+				<item id="38018" min="1" max="1" chance="0.3" /> <!-- Specter Thrower Crafting Pack -->
+				<item id="38019" min="1" max="1" chance="0.3" /> <!-- Specter Shooter Crafting Pack -->
+				<item id="38020" min="1" max="1" chance="0.3" /> <!-- Specter Buster Crafting Pack -->
+				<item id="38021" min="1" max="1" chance="0.3" /> <!-- Specter Caster Crafting Pack -->
+				<item id="38022" min="1" max="1" chance="0.3" /> <!-- Specter Retributer Crafting Pack -->
+				<item id="38023" min="1" max="1" chance="0.3" /> <!-- Seraph Helmet Crafting Pack -->
+				<item id="38024" min="1" max="1" chance="0.3" /> <!-- Seraph Breastplate Crafting Pack -->
+				<item id="38025" min="1" max="1" chance="0.3" /> <!-- Seraph Gaiters Crafting Pack -->
+				<item id="38012" min="1" max="1" chance="0.3" /> <!-- Specter Shaper Crafting Pack -->
+			</death>
+		</drop_lists>
 	</npc>
 	<npc id="25979" level="97" type="L2Npc" name="Varvacion" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->