diff --git a/L2J_Mobius_1.0_Ertheia/dist/db_installer/sql/game/pets_skills.sql b/L2J_Mobius_1.0_Ertheia/dist/db_installer/sql/game/pets_skills.sql
index 10354e4846..c34cbc4796 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/db_installer/sql/game/pets_skills.sql
+++ b/L2J_Mobius_1.0_Ertheia/dist/db_installer/sql/game/pets_skills.sql
@@ -2188,13 +2188,25 @@ INSERT INTO `pets_skills` VALUES
 (15139,1,10087,2),
 (15140,1,10087,3),
 (15141,1,10087,4),
+(15191,1,10087,5),
+(15192,1,10087,6),
+(15193,1,10087,7),
 
 (15138,1,10088,1),
 (15139,1,10088,2),
 (15140,1,10088,3),
 (15141,1,10088,4),
+(15191,1,10088,5),
+(15192,1,10088,6),
+(15193,1,10088,7),
 
 (15138,1,10095,1),
+(15139,1,10095,1),
+(15140,1,10095,1),
+(15141,1,10095,1),
+(15191,1,10095,1),
+(15192,1,10095,1),
+(15193,1,10095,1),
 
 -- Golden Lion
 (14936,1,10051,1),
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/14900-14999.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/14900-14999.xml
index 0dfb1764cf..b5bded34e2 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/14900-14999.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/14900-14999.xml
@@ -919,7 +919,6 @@
 		</collision>
 	</npc>
 	<npc id="14919" level="85" type="L2Monster" name="Meow Unit">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -949,7 +948,6 @@
 		</collision>
 	</npc>
 	<npc id="14920" level="85" type="L2Monster" name="Cydiareal Archer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>FAIRY</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -979,7 +977,6 @@
 		</collision>
 	</npc>
 	<npc id="14921" level="85" type="L2Monster" name="Abyssal Tormentor">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1010,7 +1007,6 @@
 		</collision>
 	</npc>
 	<npc id="14922" level="85" type="L2Monster" name="Meow Unit">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1040,7 +1036,6 @@
 		</collision>
 	</npc>
 	<npc id="14923" level="85" type="L2Monster" name="Cydiareal Archer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>FAIRY</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1070,7 +1065,6 @@
 		</collision>
 	</npc>
 	<npc id="14924" level="85" type="L2Monster" name="Abyssal Tormentor">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1100,7 +1094,6 @@
 		</collision>
 	</npc>
 	<npc id="14925" level="85" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -1131,7 +1124,6 @@
 		</collision>
 	</npc>
 	<npc id="14926" level="91" type="L2Monster" name="Naviarope">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11284" level="1" />
 			<skill name="Skill02_ID" id="11285" level="1" />
@@ -1165,7 +1157,6 @@
 		</collision>
 	</npc>
 	<npc id="14927" level="99" type="L2EffectPoint" name="Death Gate">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1198,7 +1189,6 @@
 		</collision>
 	</npc>
 	<npc id="14928" level="85" type="L2Monster" name="Hodling">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1228,7 +1218,6 @@
 		</collision>
 	</npc>
 	<npc id="14929" level="85" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="1" />
 			<skill name="Skill02_ID" id="11279" level="1" />
@@ -1264,7 +1253,6 @@
 		</collision>
 	</npc>
 	<npc id="14930" level="85" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="1" />
 			<skill name="Skill02_ID" id="11281" level="1" />
@@ -1300,7 +1288,6 @@
 		</collision>
 	</npc>
 	<npc id="14931" level="85" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="1" />
 			<skill name="Skill02_ID" id="11283" level="1" />
@@ -1338,7 +1325,6 @@
 		</collision>
 	</npc>
 	<npc id="14932" level="85" type="L2Monster" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="1" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -1379,7 +1365,6 @@
 		</collision>
 	</npc>
 	<npc id="14933" level="85" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="1" />
 		</parameters>
@@ -1411,7 +1396,6 @@
 		</collision>
 	</npc>
 	<npc id="14934" level="85" type="L2Monster" name="Knock-down Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1441,7 +1425,6 @@
 		</collision>
 	</npc>
 	<npc id="14935" level="85" type="L2Monster" name="Jumping Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1471,7 +1454,6 @@
 		</collision>
 	</npc>
 	<npc id="14936" level="85" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="1" />
 			<skill name="s_claw" id="10052" level="1" />
@@ -1511,7 +1493,6 @@
 		</collision>
 	</npc>
 	<npc id="14937" level="86" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="2" />
 			<skill name="s_claw" id="10052" level="2" />
@@ -1551,7 +1532,6 @@
 		</collision>
 	</npc>
 	<npc id="14938" level="89" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="3" />
 			<skill name="s_claw" id="10052" level="3" />
@@ -1591,7 +1571,6 @@
 		</collision>
 	</npc>
 	<npc id="14939" level="92" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="4" />
 			<skill name="s_claw" id="10052" level="4" />
@@ -1631,7 +1610,6 @@
 		</collision>
 	</npc>
 	<npc id="14940" level="87" type="L2Monster" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="2" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -1671,7 +1649,6 @@
 		</collision>
 	</npc>
 	<npc id="14941" level="89" type="L2Monster" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="3" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -1711,7 +1688,6 @@
 		</collision>
 	</npc>
 	<npc id="14942" level="91" type="L2Monster" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="4" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -1751,7 +1727,6 @@
 		</collision>
 	</npc>
 	<npc id="14943" level="90" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="2" />
 		</parameters>
@@ -1783,7 +1758,6 @@
 		</collision>
 	</npc>
 	<npc id="14944" level="90" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -1814,7 +1788,6 @@
 		</collision>
 	</npc>
 	<npc id="14945" level="95" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -1845,7 +1818,6 @@
 		</collision>
 	</npc>
 	<npc id="14946" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -1876,7 +1848,6 @@
 		</collision>
 	</npc>
 	<npc id="14947" level="87" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="2" />
 			<skill name="Skill02_ID" id="11279" level="2" />
@@ -1912,7 +1883,6 @@
 		</collision>
 	</npc>
 	<npc id="14948" level="89" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="3" />
 			<skill name="Skill02_ID" id="11279" level="3" />
@@ -1948,7 +1918,6 @@
 		</collision>
 	</npc>
 	<npc id="14949" level="91" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="4" />
 			<skill name="Skill02_ID" id="11279" level="4" />
@@ -1984,7 +1953,6 @@
 		</collision>
 	</npc>
 	<npc id="14950" level="93" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="5" />
 			<skill name="Skill02_ID" id="11279" level="5" />
@@ -2020,7 +1988,6 @@
 		</collision>
 	</npc>
 	<npc id="14951" level="95" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="6" />
 			<skill name="Skill02_ID" id="11279" level="6" />
@@ -2056,7 +2023,6 @@
 		</collision>
 	</npc>
 	<npc id="14952" level="97" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="7" />
 			<skill name="Skill02_ID" id="11279" level="7" />
@@ -2092,7 +2058,6 @@
 		</collision>
 	</npc>
 	<npc id="14953" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="8" />
 			<skill name="Skill02_ID" id="11279" level="8" />
@@ -2128,7 +2093,6 @@
 		</collision>
 	</npc>
 	<npc id="14954" level="87" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="2" />
 			<skill name="Skill02_ID" id="11281" level="2" />
@@ -2164,7 +2128,6 @@
 		</collision>
 	</npc>
 	<npc id="14955" level="89" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="3" />
 			<skill name="Skill02_ID" id="11281" level="3" />
@@ -2200,7 +2163,6 @@
 		</collision>
 	</npc>
 	<npc id="14956" level="91" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="4" />
 			<skill name="Skill02_ID" id="11281" level="4" />
@@ -2236,7 +2198,6 @@
 		</collision>
 	</npc>
 	<npc id="14957" level="93" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="5" />
 			<skill name="Skill02_ID" id="11281" level="5" />
@@ -2272,7 +2233,6 @@
 		</collision>
 	</npc>
 	<npc id="14958" level="95" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="6" />
 			<skill name="Skill02_ID" id="11281" level="6" />
@@ -2308,7 +2268,6 @@
 		</collision>
 	</npc>
 	<npc id="14959" level="97" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="7" />
 			<skill name="Skill02_ID" id="11281" level="7" />
@@ -2344,7 +2303,6 @@
 		</collision>
 	</npc>
 	<npc id="14960" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="8" />
 			<skill name="Skill02_ID" id="11281" level="8" />
@@ -2380,7 +2338,6 @@
 		</collision>
 	</npc>
 	<npc id="14961" level="87" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="2" />
 			<skill name="Skill02_ID" id="11283" level="2" />
@@ -2416,7 +2373,6 @@
 		</collision>
 	</npc>
 	<npc id="14962" level="89" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="3" />
 			<skill name="Skill02_ID" id="11283" level="3" />
@@ -2452,7 +2408,6 @@
 		</collision>
 	</npc>
 	<npc id="14963" level="91" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="4" />
 			<skill name="Skill02_ID" id="11283" level="4" />
@@ -2488,7 +2443,6 @@
 		</collision>
 	</npc>
 	<npc id="14964" level="93" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="5" />
 			<skill name="Skill02_ID" id="11283" level="5" />
@@ -2524,7 +2478,6 @@
 		</collision>
 	</npc>
 	<npc id="14965" level="95" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="6" />
 			<skill name="Skill02_ID" id="11283" level="6" />
@@ -2560,7 +2513,6 @@
 		</collision>
 	</npc>
 	<npc id="14966" level="97" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="7" />
 			<skill name="Skill02_ID" id="11283" level="7" />
@@ -2596,7 +2548,6 @@
 		</collision>
 	</npc>
 	<npc id="14967" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="8" />
 			<skill name="Skill02_ID" id="11283" level="8" />
@@ -2632,7 +2583,6 @@
 		</collision>
 	</npc>
 	<npc id="14968" level="93" type="L2Monster" name="Naviarope">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11284" level="2" />
 			<skill name="Skill02_ID" id="11285" level="2" />
@@ -2666,7 +2616,6 @@
 		</collision>
 	</npc>
 	<npc id="14969" level="95" type="L2Monster" name="Naviarope">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11284" level="3" />
 			<skill name="Skill02_ID" id="11285" level="3" />
@@ -2700,7 +2649,6 @@
 		</collision>
 	</npc>
 	<npc id="14970" level="97" type="L2Monster" name="Naviarope">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11284" level="4" />
 			<skill name="Skill02_ID" id="11285" level="4" />
@@ -2734,7 +2682,6 @@
 		</collision>
 	</npc>
 	<npc id="14971" level="99" type="L2Monster" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="8" />
 			<skill name="Skill02_ID" id="11279" level="8" />
@@ -2770,7 +2717,6 @@
 		</collision>
 	</npc>
 	<npc id="14972" level="99" type="L2Monster" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="8" />
 			<skill name="Skill02_ID" id="11281" level="8" />
@@ -2806,7 +2752,6 @@
 		</collision>
 	</npc>
 	<npc id="14973" level="99" type="L2Monster" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="8" />
 			<skill name="Skill02_ID" id="11283" level="8" />
@@ -2842,7 +2787,6 @@
 		</collision>
 	</npc>
 	<npc id="14974" level="95" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="5" />
 			<skill name="s_claw" id="10052" level="5" />
@@ -2882,7 +2826,6 @@
 		</collision>
 	</npc>
 	<npc id="14975" level="98" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="6" />
 			<skill name="s_claw" id="10052" level="6" />
@@ -2922,7 +2865,6 @@
 		</collision>
 	</npc>
 	<npc id="14976" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="101" />
 			<skill name="s_claw" id="10052" level="101" />
@@ -2958,7 +2900,6 @@
 		</collision>
 	</npc>
 	<npc id="14977" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="102" />
 			<skill name="s_claw" id="10052" level="102" />
@@ -2994,7 +2935,6 @@
 		</collision>
 	</npc>
 	<npc id="14978" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="103" />
 			<skill name="s_claw" id="10052" level="103" />
@@ -3030,7 +2970,6 @@
 		</collision>
 	</npc>
 	<npc id="14979" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="104" />
 			<skill name="s_claw" id="10052" level="104" />
@@ -3066,7 +3005,6 @@
 		</collision>
 	</npc>
 	<npc id="14980" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="105" />
 			<skill name="s_claw" id="10052" level="105" />
@@ -3102,7 +3040,6 @@
 		</collision>
 	</npc>
 	<npc id="14981" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="106" />
 			<skill name="s_claw" id="10052" level="106" />
@@ -3138,7 +3075,6 @@
 		</collision>
 	</npc>
 	<npc id="14982" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="107" />
 			<skill name="s_claw" id="10052" level="107" />
@@ -3174,7 +3110,6 @@
 		</collision>
 	</npc>
 	<npc id="14983" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="108" />
 			<skill name="s_claw" id="10052" level="108" />
@@ -3210,7 +3145,6 @@
 		</collision>
 	</npc>
 	<npc id="14984" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="109" />
 			<skill name="s_claw" id="10052" level="109" />
@@ -3246,7 +3180,6 @@
 		</collision>
 	</npc>
 	<npc id="14985" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="110" />
 			<skill name="s_claw" id="10052" level="110" />
@@ -3282,7 +3215,6 @@
 		</collision>
 	</npc>
 	<npc id="14986" level="93" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="5" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3322,7 +3254,6 @@
 		</collision>
 	</npc>
 	<npc id="14987" level="95" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="6" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3362,7 +3293,6 @@
 		</collision>
 	</npc>
 	<npc id="14988" level="97" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="7" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3402,7 +3332,6 @@
 		</collision>
 	</npc>
 	<npc id="14989" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="8" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3442,7 +3371,6 @@
 		</collision>
 	</npc>
 	<npc id="14990" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="101" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3479,7 +3407,6 @@
 		</collision>
 	</npc>
 	<npc id="14991" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="102" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3516,7 +3443,6 @@
 		</collision>
 	</npc>
 	<npc id="14992" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="103" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3553,7 +3479,6 @@
 		</collision>
 	</npc>
 	<npc id="14993" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="104" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3590,7 +3515,6 @@
 		</collision>
 	</npc>
 	<npc id="14994" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="105" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3627,7 +3551,6 @@
 		</collision>
 	</npc>
 	<npc id="14995" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="106" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3664,7 +3587,6 @@
 		</collision>
 	</npc>
 	<npc id="14996" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="107" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3701,7 +3623,6 @@
 		</collision>
 	</npc>
 	<npc id="14997" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="108" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3738,7 +3659,6 @@
 		</collision>
 	</npc>
 	<npc id="14998" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="109" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3775,7 +3695,6 @@
 		</collision>
 	</npc>
 	<npc id="14999" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="110" />
 			<skill name="s_purge" id="10795" level="1" />
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/15000-15099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/15000-15099.xml
index 374c0ce6dc..b5ad087145 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/15000-15099.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/15000-15099.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
 	<npc id="15000" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -33,7 +32,6 @@
 		</collision>
 	</npc>
 	<npc id="15001" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -65,7 +63,6 @@
 		</collision>
 	</npc>
 	<npc id="15002" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -97,7 +94,6 @@
 		</collision>
 	</npc>
 	<npc id="15003" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -129,7 +125,6 @@
 		</collision>
 	</npc>
 	<npc id="15004" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -161,7 +156,6 @@
 		</collision>
 	</npc>
 	<npc id="15005" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -193,7 +187,6 @@
 		</collision>
 	</npc>
 	<npc id="15006" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -225,7 +218,6 @@
 		</collision>
 	</npc>
 	<npc id="15007" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -257,7 +249,6 @@
 		</collision>
 	</npc>
 	<npc id="15008" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -289,7 +280,6 @@
 		</collision>
 	</npc>
 	<npc id="15009" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -321,7 +311,6 @@
 		</collision>
 	</npc>
 	<npc id="15010" level="95" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="3" />
 		</parameters>
@@ -347,13 +336,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15011" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="4" />
 		</parameters>
@@ -379,13 +368,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15012" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="101" />
 		</parameters>
@@ -411,13 +400,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15013" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="102" />
 		</parameters>
@@ -443,13 +432,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15014" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="103" />
 		</parameters>
@@ -475,13 +464,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15015" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="104" />
 		</parameters>
@@ -507,13 +496,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15016" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="105" />
 		</parameters>
@@ -539,13 +528,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15017" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="106" />
 		</parameters>
@@ -571,13 +560,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15018" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="107" />
 		</parameters>
@@ -603,13 +592,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15019" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="108" />
 		</parameters>
@@ -635,13 +624,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15020" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="109" />
 		</parameters>
@@ -667,13 +656,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15021" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="110" />
 		</parameters>
@@ -699,13 +688,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15022" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="101" />
 			<skill name="Skill02_ID" id="11279" level="101" />
@@ -741,7 +730,6 @@
 		</collision>
 	</npc>
 	<npc id="15023" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="102" />
 			<skill name="Skill02_ID" id="11279" level="102" />
@@ -777,7 +765,6 @@
 		</collision>
 	</npc>
 	<npc id="15024" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="103" />
 			<skill name="Skill02_ID" id="11279" level="103" />
@@ -813,7 +800,6 @@
 		</collision>
 	</npc>
 	<npc id="15025" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="104" />
 			<skill name="Skill02_ID" id="11279" level="104" />
@@ -849,7 +835,6 @@
 		</collision>
 	</npc>
 	<npc id="15026" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="105" />
 			<skill name="Skill02_ID" id="11279" level="105" />
@@ -885,7 +870,6 @@
 		</collision>
 	</npc>
 	<npc id="15027" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="106" />
 			<skill name="Skill02_ID" id="11279" level="106" />
@@ -921,7 +905,6 @@
 		</collision>
 	</npc>
 	<npc id="15028" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="107" />
 			<skill name="Skill02_ID" id="11279" level="107" />
@@ -957,7 +940,6 @@
 		</collision>
 	</npc>
 	<npc id="15029" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="108" />
 			<skill name="Skill02_ID" id="11279" level="108" />
@@ -993,7 +975,6 @@
 		</collision>
 	</npc>
 	<npc id="15030" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="109" />
 			<skill name="Skill02_ID" id="11279" level="109" />
@@ -1029,7 +1010,6 @@
 		</collision>
 	</npc>
 	<npc id="15031" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="110" />
 			<skill name="Skill02_ID" id="11279" level="110" />
@@ -1065,7 +1045,6 @@
 		</collision>
 	</npc>
 	<npc id="15032" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="101" />
 			<skill name="Skill02_ID" id="11281" level="101" />
@@ -1101,7 +1080,6 @@
 		</collision>
 	</npc>
 	<npc id="15033" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="102" />
 			<skill name="Skill02_ID" id="11281" level="102" />
@@ -1137,7 +1115,6 @@
 		</collision>
 	</npc>
 	<npc id="15034" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="103" />
 			<skill name="Skill02_ID" id="11281" level="103" />
@@ -1173,7 +1150,6 @@
 		</collision>
 	</npc>
 	<npc id="15035" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="104" />
 			<skill name="Skill02_ID" id="11281" level="104" />
@@ -1209,7 +1185,6 @@
 		</collision>
 	</npc>
 	<npc id="15036" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="105" />
 			<skill name="Skill02_ID" id="11281" level="105" />
@@ -1245,7 +1220,6 @@
 		</collision>
 	</npc>
 	<npc id="15037" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="106" />
 			<skill name="Skill02_ID" id="11281" level="106" />
@@ -1281,7 +1255,6 @@
 		</collision>
 	</npc>
 	<npc id="15038" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="107" />
 			<skill name="Skill02_ID" id="11281" level="107" />
@@ -1317,7 +1290,6 @@
 		</collision>
 	</npc>
 	<npc id="15039" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="108" />
 			<skill name="Skill02_ID" id="11281" level="108" />
@@ -1353,7 +1325,6 @@
 		</collision>
 	</npc>
 	<npc id="15040" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="109" />
 			<skill name="Skill02_ID" id="11281" level="109" />
@@ -1389,7 +1360,6 @@
 		</collision>
 	</npc>
 	<npc id="15041" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="110" />
 			<skill name="Skill02_ID" id="11281" level="110" />
@@ -1425,7 +1395,6 @@
 		</collision>
 	</npc>
 	<npc id="15042" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="101" />
 			<skill name="Skill02_ID" id="11283" level="101" />
@@ -1461,7 +1430,6 @@
 		</collision>
 	</npc>
 	<npc id="15043" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="102" />
 			<skill name="Skill02_ID" id="11283" level="102" />
@@ -1497,7 +1465,6 @@
 		</collision>
 	</npc>
 	<npc id="15044" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="103" />
 			<skill name="Skill02_ID" id="11283" level="103" />
@@ -1533,7 +1500,6 @@
 		</collision>
 	</npc>
 	<npc id="15045" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="104" />
 			<skill name="Skill02_ID" id="11283" level="104" />
@@ -1569,7 +1535,6 @@
 		</collision>
 	</npc>
 	<npc id="15046" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="105" />
 			<skill name="Skill02_ID" id="11283" level="105" />
@@ -1605,7 +1570,6 @@
 		</collision>
 	</npc>
 	<npc id="15047" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="106" />
 			<skill name="Skill02_ID" id="11283" level="106" />
@@ -1641,7 +1605,6 @@
 		</collision>
 	</npc>
 	<npc id="15048" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="107" />
 			<skill name="Skill02_ID" id="11283" level="107" />
@@ -1677,7 +1640,6 @@
 		</collision>
 	</npc>
 	<npc id="15049" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="108" />
 			<skill name="Skill02_ID" id="11283" level="108" />
@@ -1713,7 +1675,6 @@
 		</collision>
 	</npc>
 	<npc id="15050" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="109" />
 			<skill name="Skill02_ID" id="11283" level="109" />
@@ -1749,7 +1710,6 @@
 		</collision>
 	</npc>
 	<npc id="15051" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="110" />
 			<skill name="Skill02_ID" id="11283" level="110" />
@@ -1784,8 +1744,7 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="15052" level="99" type="L2Monster" name="Naviarope">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15052" level="99" type="L2Servitor" name="Naviarope">
 		<parameters>
 			<skill name="Skill01_ID" id="11284" level="4" />
 			<skill name="Skill02_ID" id="11285" level="4" />
@@ -1818,8 +1777,7 @@
 			<height normal="39.5" />
 		</collision>
 	</npc>
-	<npc id="15053" level="85" type="L2Monster" name="Clan Guardian">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15053" level="85" type="L2Servitor" name="Clan Guardian">
 		<parameters>
 			<param name="skill_delay" value="1" />
 			<param name="despawn_time" value="180" />
@@ -1847,13 +1805,13 @@
 			<skill id="4121" level="9" /> <!-- Summoned Monster Magic Protection -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="15054" level="85" type="L2Monster" name="Siege Golem">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15054" level="85" type="L2Servitor" name="Siege Golem">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1881,8 +1839,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="15055" level="90" type="L2Monster" name="Siege Golem">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15055" level="90" type="L2Servitor" name="Siege Golem">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1910,8 +1867,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="15056" level="95" type="L2Monster" name="Siege Golem">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15056" level="95" type="L2Servitor" name="Siege Golem">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1939,8 +1895,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="15057" level="99" type="L2Monster" name="Siege Golem">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15057" level="99" type="L2Servitor" name="Siege Golem">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1968,8 +1923,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="15058" level="85" type="L2Monster" name="Wild Hog Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15058" level="85" type="L2Servitor" name="Wild Hog Cannon">
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" />
 		</parameters>
@@ -2003,8 +1957,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="15059" level="90" type="L2Monster" name="Wild Hog Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15059" level="90" type="L2Servitor" name="Wild Hog Cannon">
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" />
 		</parameters>
@@ -2038,8 +1991,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="15060" level="95" type="L2Monster" name="Wild Hog Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15060" level="95" type="L2Servitor" name="Wild Hog Cannon">
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" />
 		</parameters>
@@ -2073,8 +2025,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="15061" level="99" type="L2Monster" name="Wild Hog Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15061" level="99" type="L2Servitor" name="Wild Hog Cannon">
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" />
 		</parameters>
@@ -2108,8 +2059,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="15062" level="85" type="L2Monster" name="Swoop Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15062" level="85" type="L2Servitor" name="Swoop Cannon">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2137,8 +2087,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="15063" level="90" type="L2Monster" name="Swoop Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15063" level="90" type="L2Servitor" name="Swoop Cannon">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2166,8 +2115,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="15064" level="95" type="L2Monster" name="Swoop Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15064" level="95" type="L2Servitor" name="Swoop Cannon">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2195,8 +2143,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="15065" level="99" type="L2Monster" name="Swoop Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15065" level="99" type="L2Servitor" name="Swoop Cannon">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2225,7 +2172,6 @@
 		</collision>
 	</npc>
 	<npc id="15066" level="85" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2240,18 +2186,18 @@
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15067" level="87" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2266,18 +2212,18 @@
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15068" level="89" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2292,18 +2238,18 @@
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15069" level="91" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2318,18 +2264,18 @@
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15070" level="93" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2344,18 +2290,18 @@
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15071" level="95" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2370,18 +2316,18 @@
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15072" level="97" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2396,18 +2342,18 @@
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15073" level="99" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2422,18 +2368,18 @@
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15074" level="85" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2448,18 +2394,18 @@
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15075" level="87" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2474,18 +2420,18 @@
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15076" level="89" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2500,18 +2446,18 @@
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15077" level="91" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2526,18 +2472,18 @@
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15078" level="93" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2552,18 +2498,18 @@
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15079" level="95" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2578,18 +2524,18 @@
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15080" level="97" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2604,18 +2550,18 @@
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15081" level="99" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2630,18 +2576,18 @@
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15082" level="85" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2656,18 +2602,18 @@
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15083" level="87" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2682,18 +2628,18 @@
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15084" level="89" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2708,18 +2654,18 @@
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15085" level="91" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2734,18 +2680,18 @@
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15086" level="93" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2760,18 +2706,18 @@
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15087" level="95" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2786,18 +2732,18 @@
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15088" level="97" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2812,18 +2758,18 @@
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15089" level="99" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2838,18 +2784,18 @@
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15090" level="85" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2864,18 +2810,18 @@
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15091" level="87" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2890,18 +2836,18 @@
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15092" level="89" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2916,18 +2862,18 @@
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15093" level="91" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2942,18 +2888,18 @@
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15094" level="93" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2968,18 +2914,18 @@
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15095" level="95" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2994,18 +2940,18 @@
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15096" level="97" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -3020,18 +2966,18 @@
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15097" level="99" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -3046,18 +2992,18 @@
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15098" level="85" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -3072,18 +3018,18 @@
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15099" level="87" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -3098,11 +3044,12 @@
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/15100-15199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/15100-15199.xml
index f7977100a2..63b0210e8e 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/15100-15199.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/15100-15199.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
 	<npc id="15100" level="89" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -15,19 +14,20 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15101" level="91" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -41,19 +41,20 @@
 			<attribute>
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15102" level="93" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -67,19 +68,20 @@
 			<attribute>
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15103" level="95" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -93,19 +95,20 @@
 			<attribute>
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15104" level="97" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -119,19 +122,20 @@
 			<attribute>
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15105" level="99" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -145,19 +149,20 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15106" level="85" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -171,19 +176,20 @@
 			<attribute>
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15107" level="87" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -197,19 +203,20 @@
 			<attribute>
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15108" level="89" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -223,19 +230,20 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15109" level="91" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -249,19 +257,20 @@
 			<attribute>
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15110" level="93" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -275,19 +284,20 @@
 			<attribute>
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15111" level="95" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -301,19 +311,20 @@
 			<attribute>
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15112" level="97" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -327,19 +338,20 @@
 			<attribute>
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15113" level="99" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -353,19 +365,20 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15114" level="85" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -379,19 +392,20 @@
 			<attribute>
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15115" level="87" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -405,19 +419,20 @@
 			<attribute>
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15116" level="89" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -431,19 +446,20 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15117" level="91" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -457,19 +473,20 @@
 			<attribute>
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15118" level="93" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -483,19 +500,20 @@
 			<attribute>
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15119" level="95" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -509,19 +527,20 @@
 			<attribute>
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15120" level="97" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -535,19 +554,20 @@
 			<attribute>
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15121" level="99" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -561,19 +581,20 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15122" level="85" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -587,19 +608,20 @@
 			<attribute>
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15123" level="87" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -613,19 +635,20 @@
 			<attribute>
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15124" level="89" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -639,19 +662,20 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15125" level="91" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -665,19 +689,20 @@
 			<attribute>
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15126" level="93" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -691,19 +716,20 @@
 			<attribute>
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15127" level="95" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -717,19 +743,20 @@
 			<attribute>
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15128" level="97" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -743,19 +770,20 @@
 			<attribute>
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15129" level="99" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -769,19 +797,20 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15130" level="85" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -795,19 +824,20 @@
 			<attribute>
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15131" level="87" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -821,19 +851,20 @@
 			<attribute>
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15132" level="89" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -847,19 +878,20 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15133" level="91" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -873,19 +905,20 @@
 			<attribute>
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15134" level="93" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -899,19 +932,20 @@
 			<attribute>
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15135" level="95" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -925,19 +959,20 @@
 			<attribute>
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15136" level="97" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -951,19 +986,20 @@
 			<attribute>
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15137" level="99" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -977,19 +1013,24 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15138" level="85" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="1" />
+			<skill name="Skill02_ID" id="10088" level="1" />
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1003,19 +1044,24 @@
 			<attribute>
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15139" level="90" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="2" />
+			<skill name="Skill02_ID" id="10088" level="2" />
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1029,19 +1075,24 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15140" level="95" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="3" />
+			<skill name="Skill02_ID" id="10088" level="3" />
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1055,19 +1106,24 @@
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="250" dark="250" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15141" level="99" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="4" />
+			<skill name="Skill02_ID" id="10088" level="4" />
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1081,20 +1137,21 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15142" level="77" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2985" hpRegen="8.5" mp="1777" mpRegen="3" />
@@ -1104,8 +1161,12 @@
 			</speed>
 			<attack physical="1234.9234747" magical="611.21496200028" critical="4" attackSpeed="199" range="40" />
 			<defence physical="341.56626506024" magical="250.10934828423" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1116,14 +1177,14 @@
 			<skill id="4708" level="7" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15143" level="80" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="3067" hpRegen="8.5" mp="1870" mpRegen="3" />
@@ -1133,8 +1194,12 @@
 			</speed>
 			<attack physical="1310.6223434462" magical="648.50417608589" critical="4" attackSpeed="199" range="40" />
 			<defence physical="354.43786982249" magical="258.94897182026" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1145,14 +1210,14 @@
 			<skill id="4708" level="8" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15144" level="85" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="7859" hpRegen="9.5" mp="1936" mpRegen="3.3" />
@@ -1162,8 +1227,12 @@
 			</speed>
 			<attack physical="1659.589786306" magical="684.4913890957" critical="4" attackSpeed="283" range="900" />
 			<defence physical="729.31034482759" magical="467.7364288153" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1174,14 +1243,14 @@
 			<skill id="4708" level="9" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15145" level="90" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="8531" hpRegen="9.5" mp="2160" mpRegen="3.3" />
@@ -1191,8 +1260,12 @@
 			</speed>
 			<attack physical="1923.6731458249" magical="793.5354227748" critical="4" attackSpeed="283" range="900" />
 			<defence physical="805.02793296089" magical="529.15906115751" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1203,14 +1276,14 @@
 			<skill id="4708" level="10" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15146" level="95" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10999" hpRegen="10.5" mp="2314" mpRegen="3.6" />
@@ -1220,8 +1293,12 @@
 			</speed>
 			<attack physical="2230.0489677799" magical="920.00495648114" critical="4" attackSpeed="283" range="900" />
 			<defence physical="889.13043478261" magical="598.72291576984" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1232,14 +1309,14 @@
 			<skill id="4708" level="11" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15147" level="99" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="11766" hpRegen="10.5" mp="2472" mpRegen="3.6" />
@@ -1249,8 +1326,12 @@
 			</speed>
 			<attack physical="2509.9023444611" magical="1035.4245512193" critical="4" attackSpeed="283" range="900" />
 			<defence physical="962.23404255319" magical="660.76820448002" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1261,14 +1342,14 @@
 			<skill id="4708" level="12" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15148" level="80" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2985" hpRegen="8.5" mp="1777" mpRegen="3" />
@@ -1278,8 +1359,12 @@
 			</speed>
 			<attack physical="1235.0601494593" magical="611.04859573439" critical="4" attackSpeed="199" range="40" />
 			<defence physical="341.4201183432" magical="249.96582498487" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1288,14 +1373,14 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15149" level="83" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="3067" hpRegen="9.5" mp="1870" mpRegen="3.3" />
@@ -1305,8 +1390,12 @@
 			</speed>
 			<attack physical="1310.4004119195" magical="648.57434758956" critical="4" attackSpeed="199" range="40" />
 			<defence physical="354.06976744186" magical="259.03753166014" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1315,14 +1404,14 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15150" level="85" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="8843" hpRegen="9.5" mp="1870" mpRegen="3.3" />
@@ -1332,8 +1421,12 @@
 			</speed>
 			<attack physical="1659.3991813067" magical="684.4913890957" critical="4" attackSpeed="283" range="900" />
 			<defence physical="729.31034482759" magical="467.7364288153" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1342,14 +1435,14 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15151" level="90" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9479" hpRegen="9.5" mp="1870" mpRegen="3.3" />
@@ -1359,8 +1452,12 @@
 			</speed>
 			<attack physical="1923.8146797978" magical="793.5354227748" critical="4" attackSpeed="283" range="900" />
 			<defence physical="805.02793296089" magical="529.15906115751" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1369,14 +1466,14 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15152" level="95" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="12220" hpRegen="10.5" mp="1870" mpRegen="3.6" />
@@ -1386,8 +1483,12 @@
 			</speed>
 			<attack physical="2230.1290771274" magical="920.00495648114" critical="4" attackSpeed="283" range="900" />
 			<defence physical="889.13043478261" magical="598.72291576984" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1396,14 +1497,14 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15153" level="99" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="13073" hpRegen="10.5" mp="1870" mpRegen="3.6" />
@@ -1413,8 +1514,12 @@
 			</speed>
 			<attack physical="2509.8533414028" magical="1035.4245512193" critical="4" attackSpeed="283" range="900" />
 			<defence physical="962.23404255319" magical="660.76820448002" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1423,6 +1528,7 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml
index ac3a5931e7..2e24b42e86 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml
@@ -4778,7 +4778,6 @@
 		<isDebuff>true</isDebuff>
 		<activateRate>80</activateRate>
 		<basicProperty>MAGIC</basicProperty>
-		<isDebuff>true</isDebuff>
 		<lvlBonusRate>2</lvlBonusRate>
 		<effects>
 			<effect name="PhysicalDefence">
@@ -4803,16 +4802,34 @@
 	</skill>
 	<skill id="10087" toLevel="7" name="Blood Panther Roar">
 		<!-- Updated to IO -->
-		<!-- Inflicts 7750 damage onto nearby enemies, and has a chance of restraining their P. Atk. For 5 sec. -->
+		<!-- Inflicts 7750 damage on to nearby enemies, and has a chance of restraining their P. Atk. For 5 sec. -->
 		<icon>icon.skill1336</icon>
-		<abnormalLvl>1</abnormalLvl>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+			<value level="4">4</value>
+			<value level="5">5</value>
+			<value level="6">6</value>
+			<value level="7">7</value>
+		</abnormalLvl>
 		<abnormalTime>5</abnormalTime>
 		<abnormalType>NORMAL_ATTACK_BLOCK</abnormalType>
-		<activateRate>80</activateRate> <!-- Guessed -->
+		<activateRate>100</activateRate>
 		<affectRange>150</affectRange>
-		<basicProperty>MAGIC</basicProperty> <!-- Guessed -->
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+			<value level="5">101</value>
+			<value level="6">103</value>
+			<value level="7">105</value>
+		</magicLvl>
+		<basicProperty>MAGIC</basicProperty>
+		<nextAction>ATTACK</nextAction>
 		<operateType>A2</operateType>
-		<targetType>SELF</targetType>
+		<targetType>ENEMY</targetType>
 		<affectScope>POINT_BLANK</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<trait>PHYSICAL_BLOCKADE</trait>
@@ -4861,9 +4878,10 @@
 		<abnormalTime>5</abnormalTime>
 		<abnormalType>STUN</abnormalType>
 		<abnormalVisualEffect>STUN</abnormalVisualEffect>
-		<activateRate>80</activateRate> <!-- Guessed -->
+		<activateRate>100</activateRate>
 		<affectRange>600</affectRange>
-		<basicProperty>PHYSICAL</basicProperty> <!-- Guessed -->
+		<basicProperty>PHYSICAL</basicProperty>
+		<nextAction>ATTACK</nextAction>
 		<fanRange>0;0;600;60</fanRange>
 		<operateType>DA2</operateType>
 		<targetType>ENEMY</targetType>
diff --git a/L2J_Mobius_2.5_Underground/dist/db_installer/sql/game/pets_skills.sql b/L2J_Mobius_2.5_Underground/dist/db_installer/sql/game/pets_skills.sql
index 10354e4846..c34cbc4796 100644
--- a/L2J_Mobius_2.5_Underground/dist/db_installer/sql/game/pets_skills.sql
+++ b/L2J_Mobius_2.5_Underground/dist/db_installer/sql/game/pets_skills.sql
@@ -2188,13 +2188,25 @@ INSERT INTO `pets_skills` VALUES
 (15139,1,10087,2),
 (15140,1,10087,3),
 (15141,1,10087,4),
+(15191,1,10087,5),
+(15192,1,10087,6),
+(15193,1,10087,7),
 
 (15138,1,10088,1),
 (15139,1,10088,2),
 (15140,1,10088,3),
 (15141,1,10088,4),
+(15191,1,10088,5),
+(15192,1,10088,6),
+(15193,1,10088,7),
 
 (15138,1,10095,1),
+(15139,1,10095,1),
+(15140,1,10095,1),
+(15141,1,10095,1),
+(15191,1,10095,1),
+(15192,1,10095,1),
+(15193,1,10095,1),
 
 -- Golden Lion
 (14936,1,10051,1),
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/14900-14999.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/14900-14999.xml
index 513df776f3..dbb73c34a4 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/14900-14999.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/14900-14999.xml
@@ -919,7 +919,6 @@
 		</collision>
 	</npc>
 	<npc id="14919" level="85" type="L2Monster" name="Meow Unit">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -949,7 +948,6 @@
 		</collision>
 	</npc>
 	<npc id="14920" level="85" type="L2Monster" name="Cydiareal Archer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>FAIRY</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -979,7 +977,6 @@
 		</collision>
 	</npc>
 	<npc id="14921" level="85" type="L2Monster" name="Abyssal Tormentor">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1010,7 +1007,6 @@
 		</collision>
 	</npc>
 	<npc id="14922" level="85" type="L2Monster" name="Meow Unit">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1040,7 +1036,6 @@
 		</collision>
 	</npc>
 	<npc id="14923" level="85" type="L2Monster" name="Cydiareal Archer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>FAIRY</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1070,7 +1065,6 @@
 		</collision>
 	</npc>
 	<npc id="14924" level="85" type="L2Monster" name="Abyssal Tormentor">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1100,7 +1094,6 @@
 		</collision>
 	</npc>
 	<npc id="14925" level="85" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -1131,7 +1124,6 @@
 		</collision>
 	</npc>
 	<npc id="14926" level="91" type="L2Monster" name="Naviarope">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11284" level="1" />
 			<skill name="Skill02_ID" id="11285" level="1" />
@@ -1165,7 +1157,6 @@
 		</collision>
 	</npc>
 	<npc id="14927" level="99" type="L2EffectPoint" name="Death Gate">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1198,7 +1189,6 @@
 		</collision>
 	</npc>
 	<npc id="14928" level="85" type="L2Monster" name="Hodling">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1228,7 +1218,6 @@
 		</collision>
 	</npc>
 	<npc id="14929" level="85" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="1" />
 			<skill name="Skill02_ID" id="11279" level="1" />
@@ -1264,7 +1253,6 @@
 		</collision>
 	</npc>
 	<npc id="14930" level="85" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="1" />
 			<skill name="Skill02_ID" id="11281" level="1" />
@@ -1300,7 +1288,6 @@
 		</collision>
 	</npc>
 	<npc id="14931" level="85" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="1" />
 			<skill name="Skill02_ID" id="11283" level="1" />
@@ -1338,7 +1325,6 @@
 		</collision>
 	</npc>
 	<npc id="14932" level="85" type="L2Monster" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="1" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -1379,7 +1365,6 @@
 		</collision>
 	</npc>
 	<npc id="14933" level="85" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="1" />
 		</parameters>
@@ -1411,7 +1396,6 @@
 		</collision>
 	</npc>
 	<npc id="14934" level="85" type="L2Monster" name="Knock-down Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1441,7 +1425,6 @@
 		</collision>
 	</npc>
 	<npc id="14935" level="85" type="L2Monster" name="Jumping Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1471,7 +1454,6 @@
 		</collision>
 	</npc>
 	<npc id="14936" level="85" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="1" />
 			<skill name="s_claw" id="10052" level="1" />
@@ -1511,7 +1493,6 @@
 		</collision>
 	</npc>
 	<npc id="14937" level="86" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="2" />
 			<skill name="s_claw" id="10052" level="2" />
@@ -1551,7 +1532,6 @@
 		</collision>
 	</npc>
 	<npc id="14938" level="89" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="3" />
 			<skill name="s_claw" id="10052" level="3" />
@@ -1591,7 +1571,6 @@
 		</collision>
 	</npc>
 	<npc id="14939" level="92" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="4" />
 			<skill name="s_claw" id="10052" level="4" />
@@ -1631,7 +1610,6 @@
 		</collision>
 	</npc>
 	<npc id="14940" level="87" type="L2Monster" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="2" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -1671,7 +1649,6 @@
 		</collision>
 	</npc>
 	<npc id="14941" level="89" type="L2Monster" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="3" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -1711,7 +1688,6 @@
 		</collision>
 	</npc>
 	<npc id="14942" level="91" type="L2Monster" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="4" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -1751,7 +1727,6 @@
 		</collision>
 	</npc>
 	<npc id="14943" level="90" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="2" />
 		</parameters>
@@ -1783,7 +1758,6 @@
 		</collision>
 	</npc>
 	<npc id="14944" level="90" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -1814,7 +1788,6 @@
 		</collision>
 	</npc>
 	<npc id="14945" level="95" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -1845,7 +1818,6 @@
 		</collision>
 	</npc>
 	<npc id="14946" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -1876,7 +1848,6 @@
 		</collision>
 	</npc>
 	<npc id="14947" level="87" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="2" />
 			<skill name="Skill02_ID" id="11279" level="2" />
@@ -1912,7 +1883,6 @@
 		</collision>
 	</npc>
 	<npc id="14948" level="89" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="3" />
 			<skill name="Skill02_ID" id="11279" level="3" />
@@ -1948,7 +1918,6 @@
 		</collision>
 	</npc>
 	<npc id="14949" level="91" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="4" />
 			<skill name="Skill02_ID" id="11279" level="4" />
@@ -1984,7 +1953,6 @@
 		</collision>
 	</npc>
 	<npc id="14950" level="93" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="5" />
 			<skill name="Skill02_ID" id="11279" level="5" />
@@ -2020,7 +1988,6 @@
 		</collision>
 	</npc>
 	<npc id="14951" level="95" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="6" />
 			<skill name="Skill02_ID" id="11279" level="6" />
@@ -2056,7 +2023,6 @@
 		</collision>
 	</npc>
 	<npc id="14952" level="97" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="7" />
 			<skill name="Skill02_ID" id="11279" level="7" />
@@ -2092,7 +2058,6 @@
 		</collision>
 	</npc>
 	<npc id="14953" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="8" />
 			<skill name="Skill02_ID" id="11279" level="8" />
@@ -2128,7 +2093,6 @@
 		</collision>
 	</npc>
 	<npc id="14954" level="87" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="2" />
 			<skill name="Skill02_ID" id="11281" level="2" />
@@ -2164,7 +2128,6 @@
 		</collision>
 	</npc>
 	<npc id="14955" level="89" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="3" />
 			<skill name="Skill02_ID" id="11281" level="3" />
@@ -2200,7 +2163,6 @@
 		</collision>
 	</npc>
 	<npc id="14956" level="91" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="4" />
 			<skill name="Skill02_ID" id="11281" level="4" />
@@ -2236,7 +2198,6 @@
 		</collision>
 	</npc>
 	<npc id="14957" level="93" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="5" />
 			<skill name="Skill02_ID" id="11281" level="5" />
@@ -2272,7 +2233,6 @@
 		</collision>
 	</npc>
 	<npc id="14958" level="95" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="6" />
 			<skill name="Skill02_ID" id="11281" level="6" />
@@ -2308,7 +2268,6 @@
 		</collision>
 	</npc>
 	<npc id="14959" level="97" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="7" />
 			<skill name="Skill02_ID" id="11281" level="7" />
@@ -2344,7 +2303,6 @@
 		</collision>
 	</npc>
 	<npc id="14960" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="8" />
 			<skill name="Skill02_ID" id="11281" level="8" />
@@ -2380,7 +2338,6 @@
 		</collision>
 	</npc>
 	<npc id="14961" level="87" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="2" />
 			<skill name="Skill02_ID" id="11283" level="2" />
@@ -2416,7 +2373,6 @@
 		</collision>
 	</npc>
 	<npc id="14962" level="89" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="3" />
 			<skill name="Skill02_ID" id="11283" level="3" />
@@ -2452,7 +2408,6 @@
 		</collision>
 	</npc>
 	<npc id="14963" level="91" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="4" />
 			<skill name="Skill02_ID" id="11283" level="4" />
@@ -2488,7 +2443,6 @@
 		</collision>
 	</npc>
 	<npc id="14964" level="93" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="5" />
 			<skill name="Skill02_ID" id="11283" level="5" />
@@ -2524,7 +2478,6 @@
 		</collision>
 	</npc>
 	<npc id="14965" level="95" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="6" />
 			<skill name="Skill02_ID" id="11283" level="6" />
@@ -2560,7 +2513,6 @@
 		</collision>
 	</npc>
 	<npc id="14966" level="97" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="7" />
 			<skill name="Skill02_ID" id="11283" level="7" />
@@ -2596,7 +2548,6 @@
 		</collision>
 	</npc>
 	<npc id="14967" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="8" />
 			<skill name="Skill02_ID" id="11283" level="8" />
@@ -2632,7 +2583,6 @@
 		</collision>
 	</npc>
 	<npc id="14968" level="93" type="L2Monster" name="Naviarope">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11284" level="2" />
 			<skill name="Skill02_ID" id="11285" level="2" />
@@ -2666,7 +2616,6 @@
 		</collision>
 	</npc>
 	<npc id="14969" level="95" type="L2Monster" name="Naviarope">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11284" level="3" />
 			<skill name="Skill02_ID" id="11285" level="3" />
@@ -2700,7 +2649,6 @@
 		</collision>
 	</npc>
 	<npc id="14970" level="97" type="L2Monster" name="Naviarope">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11284" level="4" />
 			<skill name="Skill02_ID" id="11285" level="4" />
@@ -2734,7 +2682,6 @@
 		</collision>
 	</npc>
 	<npc id="14971" level="99" type="L2Monster" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="8" />
 			<skill name="Skill02_ID" id="11279" level="8" />
@@ -2770,7 +2717,6 @@
 		</collision>
 	</npc>
 	<npc id="14972" level="99" type="L2Monster" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="8" />
 			<skill name="Skill02_ID" id="11281" level="8" />
@@ -2806,7 +2752,6 @@
 		</collision>
 	</npc>
 	<npc id="14973" level="99" type="L2Monster" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="8" />
 			<skill name="Skill02_ID" id="11283" level="8" />
@@ -2842,7 +2787,6 @@
 		</collision>
 	</npc>
 	<npc id="14974" level="95" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="5" />
 			<skill name="s_claw" id="10052" level="5" />
@@ -2882,7 +2826,6 @@
 		</collision>
 	</npc>
 	<npc id="14975" level="98" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="6" />
 			<skill name="s_claw" id="10052" level="6" />
@@ -2922,7 +2865,6 @@
 		</collision>
 	</npc>
 	<npc id="14976" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="101" />
 			<skill name="s_claw" id="10052" level="101" />
@@ -2958,7 +2900,6 @@
 		</collision>
 	</npc>
 	<npc id="14977" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="102" />
 			<skill name="s_claw" id="10052" level="102" />
@@ -2994,7 +2935,6 @@
 		</collision>
 	</npc>
 	<npc id="14978" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="103" />
 			<skill name="s_claw" id="10052" level="103" />
@@ -3030,7 +2970,6 @@
 		</collision>
 	</npc>
 	<npc id="14979" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="104" />
 			<skill name="s_claw" id="10052" level="104" />
@@ -3066,7 +3005,6 @@
 		</collision>
 	</npc>
 	<npc id="14980" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="105" />
 			<skill name="s_claw" id="10052" level="105" />
@@ -3102,7 +3040,6 @@
 		</collision>
 	</npc>
 	<npc id="14981" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="106" />
 			<skill name="s_claw" id="10052" level="106" />
@@ -3138,7 +3075,6 @@
 		</collision>
 	</npc>
 	<npc id="14982" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="107" />
 			<skill name="s_claw" id="10052" level="107" />
@@ -3174,7 +3110,6 @@
 		</collision>
 	</npc>
 	<npc id="14983" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="108" />
 			<skill name="s_claw" id="10052" level="108" />
@@ -3210,7 +3145,6 @@
 		</collision>
 	</npc>
 	<npc id="14984" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="109" />
 			<skill name="s_claw" id="10052" level="109" />
@@ -3246,7 +3180,6 @@
 		</collision>
 	</npc>
 	<npc id="14985" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="110" />
 			<skill name="s_claw" id="10052" level="110" />
@@ -3282,7 +3215,6 @@
 		</collision>
 	</npc>
 	<npc id="14986" level="93" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="5" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3322,7 +3254,6 @@
 		</collision>
 	</npc>
 	<npc id="14987" level="95" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="6" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3362,7 +3293,6 @@
 		</collision>
 	</npc>
 	<npc id="14988" level="97" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="7" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3402,7 +3332,6 @@
 		</collision>
 	</npc>
 	<npc id="14989" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="8" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3442,7 +3371,6 @@
 		</collision>
 	</npc>
 	<npc id="14990" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="101" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3479,7 +3407,6 @@
 		</collision>
 	</npc>
 	<npc id="14991" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="102" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3516,7 +3443,6 @@
 		</collision>
 	</npc>
 	<npc id="14992" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="103" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3553,7 +3479,6 @@
 		</collision>
 	</npc>
 	<npc id="14993" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="104" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3590,7 +3515,6 @@
 		</collision>
 	</npc>
 	<npc id="14994" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="105" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3627,7 +3551,6 @@
 		</collision>
 	</npc>
 	<npc id="14995" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="106" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3664,7 +3587,6 @@
 		</collision>
 	</npc>
 	<npc id="14996" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="107" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3701,7 +3623,6 @@
 		</collision>
 	</npc>
 	<npc id="14997" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="108" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3738,7 +3659,6 @@
 		</collision>
 	</npc>
 	<npc id="14998" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="109" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3775,7 +3695,6 @@
 		</collision>
 	</npc>
 	<npc id="14999" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="110" />
 			<skill name="s_purge" id="10795" level="1" />
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/15000-15099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/15000-15099.xml
index 7a967a5d31..43a2b0e081 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/15000-15099.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/15000-15099.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
 	<npc id="15000" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -33,7 +32,6 @@
 		</collision>
 	</npc>
 	<npc id="15001" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -65,7 +63,6 @@
 		</collision>
 	</npc>
 	<npc id="15002" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -97,7 +94,6 @@
 		</collision>
 	</npc>
 	<npc id="15003" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -129,7 +125,6 @@
 		</collision>
 	</npc>
 	<npc id="15004" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -161,7 +156,6 @@
 		</collision>
 	</npc>
 	<npc id="15005" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -193,7 +187,6 @@
 		</collision>
 	</npc>
 	<npc id="15006" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -225,7 +218,6 @@
 		</collision>
 	</npc>
 	<npc id="15007" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -257,7 +249,6 @@
 		</collision>
 	</npc>
 	<npc id="15008" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -289,7 +280,6 @@
 		</collision>
 	</npc>
 	<npc id="15009" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -321,7 +311,6 @@
 		</collision>
 	</npc>
 	<npc id="15010" level="95" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="3" />
 		</parameters>
@@ -347,13 +336,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15011" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="4" />
 		</parameters>
@@ -379,13 +368,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15012" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="101" />
 		</parameters>
@@ -411,13 +400,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15013" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="102" />
 		</parameters>
@@ -443,13 +432,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15014" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="103" />
 		</parameters>
@@ -475,13 +464,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15015" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="104" />
 		</parameters>
@@ -507,13 +496,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15016" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="105" />
 		</parameters>
@@ -539,13 +528,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15017" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="106" />
 		</parameters>
@@ -571,13 +560,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15018" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="107" />
 		</parameters>
@@ -603,13 +592,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15019" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="108" />
 		</parameters>
@@ -635,13 +624,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15020" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="109" />
 		</parameters>
@@ -667,13 +656,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15021" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="110" />
 		</parameters>
@@ -699,13 +688,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15022" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="101" />
 			<skill name="Skill02_ID" id="11279" level="101" />
@@ -741,7 +730,6 @@
 		</collision>
 	</npc>
 	<npc id="15023" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="102" />
 			<skill name="Skill02_ID" id="11279" level="102" />
@@ -777,7 +765,6 @@
 		</collision>
 	</npc>
 	<npc id="15024" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="103" />
 			<skill name="Skill02_ID" id="11279" level="103" />
@@ -813,7 +800,6 @@
 		</collision>
 	</npc>
 	<npc id="15025" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="104" />
 			<skill name="Skill02_ID" id="11279" level="104" />
@@ -849,7 +835,6 @@
 		</collision>
 	</npc>
 	<npc id="15026" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="105" />
 			<skill name="Skill02_ID" id="11279" level="105" />
@@ -885,7 +870,6 @@
 		</collision>
 	</npc>
 	<npc id="15027" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="106" />
 			<skill name="Skill02_ID" id="11279" level="106" />
@@ -921,7 +905,6 @@
 		</collision>
 	</npc>
 	<npc id="15028" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="107" />
 			<skill name="Skill02_ID" id="11279" level="107" />
@@ -957,7 +940,6 @@
 		</collision>
 	</npc>
 	<npc id="15029" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="108" />
 			<skill name="Skill02_ID" id="11279" level="108" />
@@ -993,7 +975,6 @@
 		</collision>
 	</npc>
 	<npc id="15030" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="109" />
 			<skill name="Skill02_ID" id="11279" level="109" />
@@ -1029,7 +1010,6 @@
 		</collision>
 	</npc>
 	<npc id="15031" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="110" />
 			<skill name="Skill02_ID" id="11279" level="110" />
@@ -1065,7 +1045,6 @@
 		</collision>
 	</npc>
 	<npc id="15032" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="101" />
 			<skill name="Skill02_ID" id="11281" level="101" />
@@ -1101,7 +1080,6 @@
 		</collision>
 	</npc>
 	<npc id="15033" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="102" />
 			<skill name="Skill02_ID" id="11281" level="102" />
@@ -1137,7 +1115,6 @@
 		</collision>
 	</npc>
 	<npc id="15034" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="103" />
 			<skill name="Skill02_ID" id="11281" level="103" />
@@ -1173,7 +1150,6 @@
 		</collision>
 	</npc>
 	<npc id="15035" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="104" />
 			<skill name="Skill02_ID" id="11281" level="104" />
@@ -1209,7 +1185,6 @@
 		</collision>
 	</npc>
 	<npc id="15036" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="105" />
 			<skill name="Skill02_ID" id="11281" level="105" />
@@ -1245,7 +1220,6 @@
 		</collision>
 	</npc>
 	<npc id="15037" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="106" />
 			<skill name="Skill02_ID" id="11281" level="106" />
@@ -1281,7 +1255,6 @@
 		</collision>
 	</npc>
 	<npc id="15038" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="107" />
 			<skill name="Skill02_ID" id="11281" level="107" />
@@ -1317,7 +1290,6 @@
 		</collision>
 	</npc>
 	<npc id="15039" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="108" />
 			<skill name="Skill02_ID" id="11281" level="108" />
@@ -1353,7 +1325,6 @@
 		</collision>
 	</npc>
 	<npc id="15040" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="109" />
 			<skill name="Skill02_ID" id="11281" level="109" />
@@ -1389,7 +1360,6 @@
 		</collision>
 	</npc>
 	<npc id="15041" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="110" />
 			<skill name="Skill02_ID" id="11281" level="110" />
@@ -1425,7 +1395,6 @@
 		</collision>
 	</npc>
 	<npc id="15042" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="101" />
 			<skill name="Skill02_ID" id="11283" level="101" />
@@ -1461,7 +1430,6 @@
 		</collision>
 	</npc>
 	<npc id="15043" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="102" />
 			<skill name="Skill02_ID" id="11283" level="102" />
@@ -1497,7 +1465,6 @@
 		</collision>
 	</npc>
 	<npc id="15044" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="103" />
 			<skill name="Skill02_ID" id="11283" level="103" />
@@ -1533,7 +1500,6 @@
 		</collision>
 	</npc>
 	<npc id="15045" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="104" />
 			<skill name="Skill02_ID" id="11283" level="104" />
@@ -1569,7 +1535,6 @@
 		</collision>
 	</npc>
 	<npc id="15046" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="105" />
 			<skill name="Skill02_ID" id="11283" level="105" />
@@ -1605,7 +1570,6 @@
 		</collision>
 	</npc>
 	<npc id="15047" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="106" />
 			<skill name="Skill02_ID" id="11283" level="106" />
@@ -1641,7 +1605,6 @@
 		</collision>
 	</npc>
 	<npc id="15048" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="107" />
 			<skill name="Skill02_ID" id="11283" level="107" />
@@ -1677,7 +1640,6 @@
 		</collision>
 	</npc>
 	<npc id="15049" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="108" />
 			<skill name="Skill02_ID" id="11283" level="108" />
@@ -1713,7 +1675,6 @@
 		</collision>
 	</npc>
 	<npc id="15050" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="109" />
 			<skill name="Skill02_ID" id="11283" level="109" />
@@ -1749,7 +1710,6 @@
 		</collision>
 	</npc>
 	<npc id="15051" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="110" />
 			<skill name="Skill02_ID" id="11283" level="110" />
@@ -1784,8 +1744,7 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="15052" level="99" type="L2Monster" name="Naviarope">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15052" level="99" type="L2Servitor" name="Naviarope">
 		<parameters>
 			<skill name="Skill01_ID" id="11284" level="4" />
 			<skill name="Skill02_ID" id="11285" level="4" />
@@ -1818,8 +1777,7 @@
 			<height normal="39.5" />
 		</collision>
 	</npc>
-	<npc id="15053" level="85" type="L2Monster" name="Clan Guardian">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15053" level="85" type="L2Servitor" name="Clan Guardian">
 		<parameters>
 			<param name="skill_delay" value="1" />
 			<param name="despawn_time" value="180" />
@@ -1847,13 +1805,13 @@
 			<skill id="4121" level="9" /> <!-- Summoned Monster Magic Protection -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="15054" level="85" type="L2Monster" name="Siege Golem">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15054" level="85" type="L2Servitor" name="Siege Golem">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1881,8 +1839,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="15055" level="90" type="L2Monster" name="Siege Golem">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15055" level="90" type="L2Servitor" name="Siege Golem">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1910,8 +1867,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="15056" level="95" type="L2Monster" name="Siege Golem">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15056" level="95" type="L2Servitor" name="Siege Golem">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1939,8 +1895,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="15057" level="99" type="L2Monster" name="Siege Golem">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15057" level="99" type="L2Servitor" name="Siege Golem">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1968,8 +1923,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="15058" level="85" type="L2Monster" name="Wild Hog Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15058" level="85" type="L2Servitor" name="Wild Hog Cannon">
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" />
 		</parameters>
@@ -2003,8 +1957,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="15059" level="90" type="L2Monster" name="Wild Hog Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15059" level="90" type="L2Servitor" name="Wild Hog Cannon">
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" />
 		</parameters>
@@ -2038,8 +1991,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="15060" level="95" type="L2Monster" name="Wild Hog Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15060" level="95" type="L2Servitor" name="Wild Hog Cannon">
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" />
 		</parameters>
@@ -2073,8 +2025,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="15061" level="99" type="L2Monster" name="Wild Hog Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15061" level="99" type="L2Servitor" name="Wild Hog Cannon">
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" />
 		</parameters>
@@ -2108,8 +2059,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="15062" level="85" type="L2Monster" name="Swoop Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15062" level="85" type="L2Servitor" name="Swoop Cannon">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2137,8 +2087,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="15063" level="90" type="L2Monster" name="Swoop Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15063" level="90" type="L2Servitor" name="Swoop Cannon">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2166,8 +2115,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="15064" level="95" type="L2Monster" name="Swoop Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15064" level="95" type="L2Servitor" name="Swoop Cannon">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2195,8 +2143,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="15065" level="99" type="L2Monster" name="Swoop Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15065" level="99" type="L2Servitor" name="Swoop Cannon">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2225,7 +2172,6 @@
 		</collision>
 	</npc>
 	<npc id="15066" level="85" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2240,18 +2186,18 @@
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15067" level="87" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2266,18 +2212,18 @@
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15068" level="89" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2292,18 +2238,18 @@
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15069" level="91" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2318,18 +2264,18 @@
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15070" level="93" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2344,18 +2290,18 @@
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15071" level="95" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2370,18 +2316,18 @@
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15072" level="97" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2396,18 +2342,18 @@
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15073" level="99" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2422,18 +2368,18 @@
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15074" level="85" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2448,18 +2394,18 @@
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15075" level="87" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2474,18 +2420,18 @@
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15076" level="89" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2500,18 +2446,18 @@
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15077" level="91" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2526,18 +2472,18 @@
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15078" level="93" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2552,18 +2498,18 @@
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15079" level="95" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2578,18 +2524,18 @@
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15080" level="97" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2604,18 +2550,18 @@
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15081" level="99" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2630,18 +2576,18 @@
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15082" level="85" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2656,18 +2602,18 @@
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15083" level="87" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2682,18 +2628,18 @@
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15084" level="89" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2708,18 +2654,18 @@
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15085" level="91" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2734,18 +2680,18 @@
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15086" level="93" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2760,18 +2706,18 @@
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15087" level="95" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2786,18 +2732,18 @@
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15088" level="97" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2812,18 +2758,18 @@
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15089" level="99" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2838,18 +2784,18 @@
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15090" level="85" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2864,18 +2810,18 @@
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15091" level="87" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2890,18 +2836,18 @@
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15092" level="89" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2916,18 +2862,18 @@
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15093" level="91" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2942,18 +2888,18 @@
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15094" level="93" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2968,18 +2914,18 @@
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15095" level="95" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2994,18 +2940,18 @@
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15096" level="97" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -3020,18 +2966,18 @@
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15097" level="99" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -3046,18 +2992,18 @@
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15098" level="85" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -3072,18 +3018,18 @@
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15099" level="87" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -3098,11 +3044,12 @@
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/15100-15199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/15100-15199.xml
index 809879c675..de1dc9c149 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/15100-15199.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/15100-15199.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
 	<npc id="15100" level="89" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -15,19 +14,20 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15101" level="91" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -41,19 +41,20 @@
 			<attribute>
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15102" level="93" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -67,19 +68,20 @@
 			<attribute>
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15103" level="95" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -93,19 +95,20 @@
 			<attribute>
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15104" level="97" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -119,19 +122,20 @@
 			<attribute>
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15105" level="99" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -145,19 +149,20 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15106" level="85" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -171,19 +176,20 @@
 			<attribute>
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15107" level="87" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -197,19 +203,20 @@
 			<attribute>
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15108" level="89" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -223,19 +230,20 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15109" level="91" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -249,19 +257,20 @@
 			<attribute>
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15110" level="93" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -275,19 +284,20 @@
 			<attribute>
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15111" level="95" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -301,19 +311,20 @@
 			<attribute>
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15112" level="97" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -327,19 +338,20 @@
 			<attribute>
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15113" level="99" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -353,19 +365,20 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15114" level="85" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -379,19 +392,20 @@
 			<attribute>
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15115" level="87" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -405,19 +419,20 @@
 			<attribute>
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15116" level="89" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -431,19 +446,20 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15117" level="91" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -457,19 +473,20 @@
 			<attribute>
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15118" level="93" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -483,19 +500,20 @@
 			<attribute>
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15119" level="95" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -509,19 +527,20 @@
 			<attribute>
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15120" level="97" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -535,19 +554,20 @@
 			<attribute>
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15121" level="99" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -561,19 +581,20 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15122" level="85" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -587,19 +608,20 @@
 			<attribute>
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15123" level="87" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -613,19 +635,20 @@
 			<attribute>
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15124" level="89" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -639,19 +662,20 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15125" level="91" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -665,19 +689,20 @@
 			<attribute>
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15126" level="93" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -691,19 +716,20 @@
 			<attribute>
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15127" level="95" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -717,19 +743,20 @@
 			<attribute>
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15128" level="97" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -743,19 +770,20 @@
 			<attribute>
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15129" level="99" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -769,19 +797,20 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15130" level="85" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -795,19 +824,20 @@
 			<attribute>
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15131" level="87" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -821,19 +851,20 @@
 			<attribute>
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15132" level="89" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -847,19 +878,20 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15133" level="91" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -873,19 +905,20 @@
 			<attribute>
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15134" level="93" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -899,19 +932,20 @@
 			<attribute>
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15135" level="95" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -925,19 +959,20 @@
 			<attribute>
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15136" level="97" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -951,19 +986,20 @@
 			<attribute>
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15137" level="99" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -977,19 +1013,24 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15138" level="85" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="1" />
+			<skill name="Skill02_ID" id="10088" level="1" />
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1003,19 +1044,24 @@
 			<attribute>
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15139" level="90" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="2" />
+			<skill name="Skill02_ID" id="10088" level="2" />
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1029,19 +1075,24 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15140" level="95" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="3" />
+			<skill name="Skill02_ID" id="10088" level="3" />
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1055,19 +1106,24 @@
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="250" dark="250" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15141" level="99" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="4" />
+			<skill name="Skill02_ID" id="10088" level="4" />
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1081,20 +1137,21 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15142" level="77" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2985" hpRegen="8.5" mp="1777" mpRegen="3" />
@@ -1104,8 +1161,12 @@
 			</speed>
 			<attack physical="1234.9234747" magical="611.21496200028" critical="4" attackSpeed="199" range="40" />
 			<defence physical="341.56626506024" magical="250.10934828423" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1116,14 +1177,14 @@
 			<skill id="4708" level="7" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15143" level="80" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="3067" hpRegen="8.5" mp="1870" mpRegen="3" />
@@ -1133,8 +1194,12 @@
 			</speed>
 			<attack physical="1310.6223434462" magical="648.50417608589" critical="4" attackSpeed="199" range="40" />
 			<defence physical="354.43786982249" magical="258.94897182026" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1145,14 +1210,14 @@
 			<skill id="4708" level="8" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15144" level="85" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="7859" hpRegen="9.5" mp="1936" mpRegen="3.3" />
@@ -1162,8 +1227,12 @@
 			</speed>
 			<attack physical="1659.589786306" magical="684.4913890957" critical="4" attackSpeed="283" range="900" />
 			<defence physical="729.31034482759" magical="467.7364288153" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1174,14 +1243,14 @@
 			<skill id="4708" level="9" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15145" level="90" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="8531" hpRegen="9.5" mp="2160" mpRegen="3.3" />
@@ -1191,8 +1260,12 @@
 			</speed>
 			<attack physical="1923.6731458249" magical="793.5354227748" critical="4" attackSpeed="283" range="900" />
 			<defence physical="805.02793296089" magical="529.15906115751" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1203,14 +1276,14 @@
 			<skill id="4708" level="10" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15146" level="95" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10999" hpRegen="10.5" mp="2314" mpRegen="3.6" />
@@ -1220,8 +1293,12 @@
 			</speed>
 			<attack physical="2230.0489677799" magical="920.00495648114" critical="4" attackSpeed="283" range="900" />
 			<defence physical="889.13043478261" magical="598.72291576984" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1232,14 +1309,14 @@
 			<skill id="4708" level="11" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15147" level="99" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="11766" hpRegen="10.5" mp="2472" mpRegen="3.6" />
@@ -1249,8 +1326,12 @@
 			</speed>
 			<attack physical="2509.9023444611" magical="1035.4245512193" critical="4" attackSpeed="283" range="900" />
 			<defence physical="962.23404255319" magical="660.76820448002" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1261,14 +1342,14 @@
 			<skill id="4708" level="12" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15148" level="80" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2985" hpRegen="8.5" mp="1777" mpRegen="3" />
@@ -1278,8 +1359,12 @@
 			</speed>
 			<attack physical="1235.0601494593" magical="611.04859573439" critical="4" attackSpeed="199" range="40" />
 			<defence physical="341.4201183432" magical="249.96582498487" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1288,14 +1373,14 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15149" level="83" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="3067" hpRegen="9.5" mp="1870" mpRegen="3.3" />
@@ -1305,8 +1390,12 @@
 			</speed>
 			<attack physical="1310.4004119195" magical="648.57434758956" critical="4" attackSpeed="199" range="40" />
 			<defence physical="354.06976744186" magical="259.03753166014" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1315,14 +1404,14 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15150" level="85" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="8843" hpRegen="9.5" mp="1870" mpRegen="3.3" />
@@ -1332,8 +1421,12 @@
 			</speed>
 			<attack physical="1659.3991813067" magical="684.4913890957" critical="4" attackSpeed="283" range="900" />
 			<defence physical="729.31034482759" magical="467.7364288153" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1342,14 +1435,14 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15151" level="90" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9479" hpRegen="9.5" mp="1870" mpRegen="3.3" />
@@ -1359,8 +1452,12 @@
 			</speed>
 			<attack physical="1923.8146797978" magical="793.5354227748" critical="4" attackSpeed="283" range="900" />
 			<defence physical="805.02793296089" magical="529.15906115751" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1369,14 +1466,14 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15152" level="95" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="12220" hpRegen="10.5" mp="1870" mpRegen="3.6" />
@@ -1386,8 +1483,12 @@
 			</speed>
 			<attack physical="2230.1290771274" magical="920.00495648114" critical="4" attackSpeed="283" range="900" />
 			<defence physical="889.13043478261" magical="598.72291576984" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1396,14 +1497,14 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15153" level="99" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="13073" hpRegen="10.5" mp="1870" mpRegen="3.6" />
@@ -1413,8 +1514,12 @@
 			</speed>
 			<attack physical="2509.8533414028" magical="1035.4245512193" critical="4" attackSpeed="283" range="900" />
 			<defence physical="962.23404255319" magical="660.76820448002" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1423,13 +1528,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15154" level="101" type="L2Servitor" name="Mother Tree">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="19219" level="1" />
 		</parameters>
@@ -1443,6 +1548,9 @@
 			</speed>
 			<attack physical="1" magical="1" critical="4" attackSpeed="253" range="40" type="FIST" distance="0" width="0" random="10" accuracy="4.75" />
 			<defence physical="962" magical="568" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="false" canMove="false" targetable="false" />
@@ -1452,942 +1560,1225 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="18" />
 			<height normal="78" />
 		</collision>
 	</npc>
 	<npc id="15155" level="100" type="L2Servitor" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="13890" hpRegen="7.5" mp="1255" mpRegen="2.7" />
+			<attack physical="2822.6" magical="1164.3" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1043.7" magical="729.3" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
 	<npc id="15156" level="101" type="L2Servitor" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14027" hpRegen="7.5" mp="1275" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
 	<npc id="15157" level="102" type="L2Servitor" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14164" hpRegen="7.5" mp="1295" mpRegen="2.7" />
+			<attack physical="3571.59375" magical="1473.5671875" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1227.845675" magical="890.4935325" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
 	<npc id="15158" level="103" type="L2Servitor" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14301" hpRegen="7.5" mp="1316" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
 	<npc id="15159" level="104" type="L2Servitor" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14443" hpRegen="7.5" mp="1336" mpRegen="2.7" />
+			<attack physical="4520.29833984375" magical="1864.983471679688" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1445.450624751875" magical="1087.314865520813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
 	<npc id="15160" level="105" type="L2Servitor" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
 	<npc id="15161" level="100" type="L2Servitor" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9921" hpRegen="7.5" mp="897" mpRegen="2.7" />
+			<attack physical="2822.6" magical="1164.3" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1043.7" magical="729.3" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
 	<npc id="15162" level="101" type="L2Servitor" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10019" hpRegen="7.5" mp="911" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
 	<npc id="15163" level="102" type="L2Servitor" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10117" hpRegen="7.5" mp="925" mpRegen="2.7" />
+			<attack physical="3571.59375" magical="1473.5671875" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1227.845675" magical="890.4935325" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
 	<npc id="15164" level="103" type="L2Servitor" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10215" hpRegen="7.5" mp="940" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
 	<npc id="15165" level="104" type="L2Servitor" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10317" hpRegen="7.5" mp="954" mpRegen="2.7" />
+			<attack physical="4520.29833984375" magical="1864.983471679688" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1445.450624751875" magical="1087.314865520813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
 	<npc id="15166" level="105" type="L2Servitor" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
 	<npc id="15167" level="100" type="L2Servitor" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="13890" hpRegen="7.5" mp="1255" mpRegen="2.7" />
+			<attack physical="2822.6" magical="1164.3" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1043.7" magical="729.3" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15168" level="101" type="L2Servitor" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14027" hpRegen="7.5" mp="1275" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15169" level="102" type="L2Servitor" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14164" hpRegen="7.5" mp="1295" mpRegen="2.7" />
+			<attack physical="3571.59375" magical="1473.5671875" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1227.845675" magical="890.4935325" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15170" level="103" type="L2Servitor" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14301" hpRegen="7.5" mp="1316" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15171" level="104" type="L2Servitor" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14443" hpRegen="7.5" mp="1336" mpRegen="2.7" />
+			<attack physical="4520.29833984375" magical="1864.983471679688" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1445.450624751875" magical="1087.314865520813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15172" level="105" type="L2Servitor" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15173" level="100" type="L2Servitor" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9921" hpRegen="7.5" mp="897" mpRegen="2.7" />
+			<attack physical="2822.6" magical="1164.3" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1043.7" magical="729.3" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15174" level="101" type="L2Servitor" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10019" hpRegen="7.5" mp="911" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15175" level="102" type="L2Servitor" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10117" hpRegen="7.5" mp="925" mpRegen="2.7" />
+			<attack physical="3571.59375" magical="1473.5671875" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1227.845675" magical="890.4935325" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15176" level="103" type="L2Servitor" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10215" hpRegen="7.5" mp="940" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15177" level="104" type="L2Servitor" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10317" hpRegen="7.5" mp="954" mpRegen="2.7" />
+			<attack physical="4520.29833984375" magical="1864.983471679688" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1445.450624751875" magical="1087.314865520813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15178" level="105" type="L2Servitor" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15179" level="100" type="L2Servitor" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="13890" hpRegen="7.5" mp="1255" mpRegen="2.7" />
+			<attack physical="2822.6" magical="1164.3" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1043.7" magical="729.3" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
 	<npc id="15180" level="101" type="L2Servitor" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14027" hpRegen="7.5" mp="1275" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
 	<npc id="15181" level="102" type="L2Servitor" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14164" hpRegen="7.5" mp="1295" mpRegen="2.7" />
+			<attack physical="3571.59375" magical="1473.5671875" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1227.845675" magical="890.4935325" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
 	<npc id="15182" level="103" type="L2Servitor" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14301" hpRegen="7.5" mp="1316" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
 	<npc id="15183" level="104" type="L2Servitor" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14443" hpRegen="7.5" mp="1336" mpRegen="2.7" />
+			<attack physical="4520.29833984375" magical="1864.983471679688" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1445.450624751875" magical="1087.314865520813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
 	<npc id="15184" level="105" type="L2Servitor" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
 	<npc id="15185" level="100" type="L2Servitor" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9921" hpRegen="7.5" mp="897" mpRegen="2.7" />
+			<attack physical="2822.6" magical="1164.3" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1043.7" magical="729.3" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15186" level="101" type="L2Servitor" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10019" hpRegen="7.5" mp="911" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15187" level="102" type="L2Servitor" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10117" hpRegen="7.5" mp="925" mpRegen="2.7" />
+			<attack physical="3571.59375" magical="1473.5671875" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1227.845675" magical="890.4935325" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15188" level="103" type="L2Servitor" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10215" hpRegen="7.5" mp="940" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15189" level="104" type="L2Servitor" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10317" hpRegen="7.5" mp="954" mpRegen="2.7" />
+			<attack physical="4520.29833984375" magical="1864.983471679688" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1445.450624751875" magical="1087.314865520813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15190" level="105" type="L2Servitor" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15191" level="101" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="5" />
+			<skill name="Skill02_ID" id="10088" level="5" />
+		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14027" hpRegen="7.5" mp="1275" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="360" range="40" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15192" level="103" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="6" />
+			<skill name="Skill02_ID" id="10088" level="6" />
+		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14301" hpRegen="7.5" mp="1316" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="360" range="40" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15193" level="105" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="7" />
+			<skill name="Skill02_ID" id="10088" level="7" />
+		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="360" range="40" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15194" level="101" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14027" hpRegen="7.5" mp="1275" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="80" />
 				<run ground="160" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15195" level="103" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14301" hpRegen="7.5" mp="1316" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="80" />
 				<run ground="160" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15196" level="105" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="80" />
 				<run ground="160" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15197" level="101" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14027" hpRegen="7.5" mp="1275" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="60" />
 				<run ground="140" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15198" level="103" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14301" hpRegen="7.5" mp="1316" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="60" />
 				<run ground="140" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15199" level="105" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="60" />
 				<run ground="140" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml
index 2f1d2fac03..a884a8a84f 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml
@@ -4788,7 +4788,6 @@
 		<isDebuff>true</isDebuff>
 		<activateRate>80</activateRate>
 		<basicProperty>MAGIC</basicProperty>
-		<isDebuff>true</isDebuff>
 		<lvlBonusRate>2</lvlBonusRate>
 		<effects>
 			<effect name="PhysicalDefence">
@@ -4813,16 +4812,34 @@
 	</skill>
 	<skill id="10087" toLevel="7" name="Blood Panther Roar">
 		<!-- Updated to IO -->
-		<!-- Inflicts 7750 damage onto nearby enemies, and has a chance of restraining their P. Atk. For 5 sec. -->
+		<!-- Inflicts 7750 damage on to nearby enemies, and has a chance of restraining their P. Atk. For 5 sec. -->
 		<icon>icon.skill1336</icon>
-		<abnormalLvl>1</abnormalLvl>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+			<value level="4">4</value>
+			<value level="5">5</value>
+			<value level="6">6</value>
+			<value level="7">7</value>
+		</abnormalLvl>
 		<abnormalTime>5</abnormalTime>
 		<abnormalType>NORMAL_ATTACK_BLOCK</abnormalType>
-		<activateRate>80</activateRate> <!-- Guessed -->
+		<activateRate>100</activateRate>
 		<affectRange>150</affectRange>
-		<basicProperty>MAGIC</basicProperty> <!-- Guessed -->
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+			<value level="5">101</value>
+			<value level="6">103</value>
+			<value level="7">105</value>
+		</magicLvl>
+		<basicProperty>MAGIC</basicProperty>
+		<nextAction>ATTACK</nextAction>
 		<operateType>A2</operateType>
-		<targetType>SELF</targetType>
+		<targetType>ENEMY</targetType>
 		<affectScope>POINT_BLANK</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<trait>PHYSICAL_BLOCKADE</trait>
@@ -4871,9 +4888,10 @@
 		<abnormalTime>5</abnormalTime>
 		<abnormalType>STUN</abnormalType>
 		<abnormalVisualEffect>STUN</abnormalVisualEffect>
-		<activateRate>80</activateRate> <!-- Guessed -->
+		<activateRate>100</activateRate>
 		<affectRange>600</affectRange>
-		<basicProperty>PHYSICAL</basicProperty> <!-- Guessed -->
+		<basicProperty>PHYSICAL</basicProperty>
+		<nextAction>ATTACK</nextAction>
 		<fanRange>0;0;600;60</fanRange>
 		<operateType>DA2</operateType>
 		<targetType>ENEMY</targetType>
diff --git a/L2J_Mobius_3.0_Helios/dist/db_installer/sql/game/pets_skills.sql b/L2J_Mobius_3.0_Helios/dist/db_installer/sql/game/pets_skills.sql
index 10354e4846..c34cbc4796 100644
--- a/L2J_Mobius_3.0_Helios/dist/db_installer/sql/game/pets_skills.sql
+++ b/L2J_Mobius_3.0_Helios/dist/db_installer/sql/game/pets_skills.sql
@@ -2188,13 +2188,25 @@ INSERT INTO `pets_skills` VALUES
 (15139,1,10087,2),
 (15140,1,10087,3),
 (15141,1,10087,4),
+(15191,1,10087,5),
+(15192,1,10087,6),
+(15193,1,10087,7),
 
 (15138,1,10088,1),
 (15139,1,10088,2),
 (15140,1,10088,3),
 (15141,1,10088,4),
+(15191,1,10088,5),
+(15192,1,10088,6),
+(15193,1,10088,7),
 
 (15138,1,10095,1),
+(15139,1,10095,1),
+(15140,1,10095,1),
+(15141,1,10095,1),
+(15191,1,10095,1),
+(15192,1,10095,1),
+(15193,1,10095,1),
 
 -- Golden Lion
 (14936,1,10051,1),
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/14900-14999.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/14900-14999.xml
index 513df776f3..dbb73c34a4 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/14900-14999.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/14900-14999.xml
@@ -919,7 +919,6 @@
 		</collision>
 	</npc>
 	<npc id="14919" level="85" type="L2Monster" name="Meow Unit">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -949,7 +948,6 @@
 		</collision>
 	</npc>
 	<npc id="14920" level="85" type="L2Monster" name="Cydiareal Archer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>FAIRY</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -979,7 +977,6 @@
 		</collision>
 	</npc>
 	<npc id="14921" level="85" type="L2Monster" name="Abyssal Tormentor">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1010,7 +1007,6 @@
 		</collision>
 	</npc>
 	<npc id="14922" level="85" type="L2Monster" name="Meow Unit">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1040,7 +1036,6 @@
 		</collision>
 	</npc>
 	<npc id="14923" level="85" type="L2Monster" name="Cydiareal Archer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>FAIRY</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1070,7 +1065,6 @@
 		</collision>
 	</npc>
 	<npc id="14924" level="85" type="L2Monster" name="Abyssal Tormentor">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1100,7 +1094,6 @@
 		</collision>
 	</npc>
 	<npc id="14925" level="85" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -1131,7 +1124,6 @@
 		</collision>
 	</npc>
 	<npc id="14926" level="91" type="L2Monster" name="Naviarope">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11284" level="1" />
 			<skill name="Skill02_ID" id="11285" level="1" />
@@ -1165,7 +1157,6 @@
 		</collision>
 	</npc>
 	<npc id="14927" level="99" type="L2EffectPoint" name="Death Gate">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1198,7 +1189,6 @@
 		</collision>
 	</npc>
 	<npc id="14928" level="85" type="L2Monster" name="Hodling">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1228,7 +1218,6 @@
 		</collision>
 	</npc>
 	<npc id="14929" level="85" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="1" />
 			<skill name="Skill02_ID" id="11279" level="1" />
@@ -1264,7 +1253,6 @@
 		</collision>
 	</npc>
 	<npc id="14930" level="85" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="1" />
 			<skill name="Skill02_ID" id="11281" level="1" />
@@ -1300,7 +1288,6 @@
 		</collision>
 	</npc>
 	<npc id="14931" level="85" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="1" />
 			<skill name="Skill02_ID" id="11283" level="1" />
@@ -1338,7 +1325,6 @@
 		</collision>
 	</npc>
 	<npc id="14932" level="85" type="L2Monster" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="1" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -1379,7 +1365,6 @@
 		</collision>
 	</npc>
 	<npc id="14933" level="85" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="1" />
 		</parameters>
@@ -1411,7 +1396,6 @@
 		</collision>
 	</npc>
 	<npc id="14934" level="85" type="L2Monster" name="Knock-down Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1441,7 +1425,6 @@
 		</collision>
 	</npc>
 	<npc id="14935" level="85" type="L2Monster" name="Jumping Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1471,7 +1454,6 @@
 		</collision>
 	</npc>
 	<npc id="14936" level="85" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="1" />
 			<skill name="s_claw" id="10052" level="1" />
@@ -1511,7 +1493,6 @@
 		</collision>
 	</npc>
 	<npc id="14937" level="86" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="2" />
 			<skill name="s_claw" id="10052" level="2" />
@@ -1551,7 +1532,6 @@
 		</collision>
 	</npc>
 	<npc id="14938" level="89" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="3" />
 			<skill name="s_claw" id="10052" level="3" />
@@ -1591,7 +1571,6 @@
 		</collision>
 	</npc>
 	<npc id="14939" level="92" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="4" />
 			<skill name="s_claw" id="10052" level="4" />
@@ -1631,7 +1610,6 @@
 		</collision>
 	</npc>
 	<npc id="14940" level="87" type="L2Monster" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="2" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -1671,7 +1649,6 @@
 		</collision>
 	</npc>
 	<npc id="14941" level="89" type="L2Monster" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="3" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -1711,7 +1688,6 @@
 		</collision>
 	</npc>
 	<npc id="14942" level="91" type="L2Monster" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="4" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -1751,7 +1727,6 @@
 		</collision>
 	</npc>
 	<npc id="14943" level="90" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="2" />
 		</parameters>
@@ -1783,7 +1758,6 @@
 		</collision>
 	</npc>
 	<npc id="14944" level="90" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -1814,7 +1788,6 @@
 		</collision>
 	</npc>
 	<npc id="14945" level="95" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -1845,7 +1818,6 @@
 		</collision>
 	</npc>
 	<npc id="14946" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -1876,7 +1848,6 @@
 		</collision>
 	</npc>
 	<npc id="14947" level="87" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="2" />
 			<skill name="Skill02_ID" id="11279" level="2" />
@@ -1912,7 +1883,6 @@
 		</collision>
 	</npc>
 	<npc id="14948" level="89" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="3" />
 			<skill name="Skill02_ID" id="11279" level="3" />
@@ -1948,7 +1918,6 @@
 		</collision>
 	</npc>
 	<npc id="14949" level="91" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="4" />
 			<skill name="Skill02_ID" id="11279" level="4" />
@@ -1984,7 +1953,6 @@
 		</collision>
 	</npc>
 	<npc id="14950" level="93" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="5" />
 			<skill name="Skill02_ID" id="11279" level="5" />
@@ -2020,7 +1988,6 @@
 		</collision>
 	</npc>
 	<npc id="14951" level="95" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="6" />
 			<skill name="Skill02_ID" id="11279" level="6" />
@@ -2056,7 +2023,6 @@
 		</collision>
 	</npc>
 	<npc id="14952" level="97" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="7" />
 			<skill name="Skill02_ID" id="11279" level="7" />
@@ -2092,7 +2058,6 @@
 		</collision>
 	</npc>
 	<npc id="14953" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="8" />
 			<skill name="Skill02_ID" id="11279" level="8" />
@@ -2128,7 +2093,6 @@
 		</collision>
 	</npc>
 	<npc id="14954" level="87" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="2" />
 			<skill name="Skill02_ID" id="11281" level="2" />
@@ -2164,7 +2128,6 @@
 		</collision>
 	</npc>
 	<npc id="14955" level="89" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="3" />
 			<skill name="Skill02_ID" id="11281" level="3" />
@@ -2200,7 +2163,6 @@
 		</collision>
 	</npc>
 	<npc id="14956" level="91" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="4" />
 			<skill name="Skill02_ID" id="11281" level="4" />
@@ -2236,7 +2198,6 @@
 		</collision>
 	</npc>
 	<npc id="14957" level="93" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="5" />
 			<skill name="Skill02_ID" id="11281" level="5" />
@@ -2272,7 +2233,6 @@
 		</collision>
 	</npc>
 	<npc id="14958" level="95" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="6" />
 			<skill name="Skill02_ID" id="11281" level="6" />
@@ -2308,7 +2268,6 @@
 		</collision>
 	</npc>
 	<npc id="14959" level="97" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="7" />
 			<skill name="Skill02_ID" id="11281" level="7" />
@@ -2344,7 +2303,6 @@
 		</collision>
 	</npc>
 	<npc id="14960" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="8" />
 			<skill name="Skill02_ID" id="11281" level="8" />
@@ -2380,7 +2338,6 @@
 		</collision>
 	</npc>
 	<npc id="14961" level="87" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="2" />
 			<skill name="Skill02_ID" id="11283" level="2" />
@@ -2416,7 +2373,6 @@
 		</collision>
 	</npc>
 	<npc id="14962" level="89" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="3" />
 			<skill name="Skill02_ID" id="11283" level="3" />
@@ -2452,7 +2408,6 @@
 		</collision>
 	</npc>
 	<npc id="14963" level="91" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="4" />
 			<skill name="Skill02_ID" id="11283" level="4" />
@@ -2488,7 +2443,6 @@
 		</collision>
 	</npc>
 	<npc id="14964" level="93" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="5" />
 			<skill name="Skill02_ID" id="11283" level="5" />
@@ -2524,7 +2478,6 @@
 		</collision>
 	</npc>
 	<npc id="14965" level="95" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="6" />
 			<skill name="Skill02_ID" id="11283" level="6" />
@@ -2560,7 +2513,6 @@
 		</collision>
 	</npc>
 	<npc id="14966" level="97" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="7" />
 			<skill name="Skill02_ID" id="11283" level="7" />
@@ -2596,7 +2548,6 @@
 		</collision>
 	</npc>
 	<npc id="14967" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="8" />
 			<skill name="Skill02_ID" id="11283" level="8" />
@@ -2632,7 +2583,6 @@
 		</collision>
 	</npc>
 	<npc id="14968" level="93" type="L2Monster" name="Naviarope">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11284" level="2" />
 			<skill name="Skill02_ID" id="11285" level="2" />
@@ -2666,7 +2616,6 @@
 		</collision>
 	</npc>
 	<npc id="14969" level="95" type="L2Monster" name="Naviarope">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11284" level="3" />
 			<skill name="Skill02_ID" id="11285" level="3" />
@@ -2700,7 +2649,6 @@
 		</collision>
 	</npc>
 	<npc id="14970" level="97" type="L2Monster" name="Naviarope">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11284" level="4" />
 			<skill name="Skill02_ID" id="11285" level="4" />
@@ -2734,7 +2682,6 @@
 		</collision>
 	</npc>
 	<npc id="14971" level="99" type="L2Monster" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="8" />
 			<skill name="Skill02_ID" id="11279" level="8" />
@@ -2770,7 +2717,6 @@
 		</collision>
 	</npc>
 	<npc id="14972" level="99" type="L2Monster" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="8" />
 			<skill name="Skill02_ID" id="11281" level="8" />
@@ -2806,7 +2752,6 @@
 		</collision>
 	</npc>
 	<npc id="14973" level="99" type="L2Monster" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="8" />
 			<skill name="Skill02_ID" id="11283" level="8" />
@@ -2842,7 +2787,6 @@
 		</collision>
 	</npc>
 	<npc id="14974" level="95" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="5" />
 			<skill name="s_claw" id="10052" level="5" />
@@ -2882,7 +2826,6 @@
 		</collision>
 	</npc>
 	<npc id="14975" level="98" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="6" />
 			<skill name="s_claw" id="10052" level="6" />
@@ -2922,7 +2865,6 @@
 		</collision>
 	</npc>
 	<npc id="14976" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="101" />
 			<skill name="s_claw" id="10052" level="101" />
@@ -2958,7 +2900,6 @@
 		</collision>
 	</npc>
 	<npc id="14977" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="102" />
 			<skill name="s_claw" id="10052" level="102" />
@@ -2994,7 +2935,6 @@
 		</collision>
 	</npc>
 	<npc id="14978" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="103" />
 			<skill name="s_claw" id="10052" level="103" />
@@ -3030,7 +2970,6 @@
 		</collision>
 	</npc>
 	<npc id="14979" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="104" />
 			<skill name="s_claw" id="10052" level="104" />
@@ -3066,7 +3005,6 @@
 		</collision>
 	</npc>
 	<npc id="14980" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="105" />
 			<skill name="s_claw" id="10052" level="105" />
@@ -3102,7 +3040,6 @@
 		</collision>
 	</npc>
 	<npc id="14981" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="106" />
 			<skill name="s_claw" id="10052" level="106" />
@@ -3138,7 +3075,6 @@
 		</collision>
 	</npc>
 	<npc id="14982" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="107" />
 			<skill name="s_claw" id="10052" level="107" />
@@ -3174,7 +3110,6 @@
 		</collision>
 	</npc>
 	<npc id="14983" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="108" />
 			<skill name="s_claw" id="10052" level="108" />
@@ -3210,7 +3145,6 @@
 		</collision>
 	</npc>
 	<npc id="14984" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="109" />
 			<skill name="s_claw" id="10052" level="109" />
@@ -3246,7 +3180,6 @@
 		</collision>
 	</npc>
 	<npc id="14985" level="99" type="L2Servitor" name="Golden Lion">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_roar" id="10051" level="110" />
 			<skill name="s_claw" id="10052" level="110" />
@@ -3282,7 +3215,6 @@
 		</collision>
 	</npc>
 	<npc id="14986" level="93" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="5" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3322,7 +3254,6 @@
 		</collision>
 	</npc>
 	<npc id="14987" level="95" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="6" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3362,7 +3293,6 @@
 		</collision>
 	</npc>
 	<npc id="14988" level="97" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="7" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3402,7 +3332,6 @@
 		</collision>
 	</npc>
 	<npc id="14989" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="8" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3442,7 +3371,6 @@
 		</collision>
 	</npc>
 	<npc id="14990" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="101" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3479,7 +3407,6 @@
 		</collision>
 	</npc>
 	<npc id="14991" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="102" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3516,7 +3443,6 @@
 		</collision>
 	</npc>
 	<npc id="14992" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="103" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3553,7 +3479,6 @@
 		</collision>
 	</npc>
 	<npc id="14993" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="104" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3590,7 +3515,6 @@
 		</collision>
 	</npc>
 	<npc id="14994" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="105" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3627,7 +3551,6 @@
 		</collision>
 	</npc>
 	<npc id="14995" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="106" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3664,7 +3587,6 @@
 		</collision>
 	</npc>
 	<npc id="14996" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="107" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3701,7 +3623,6 @@
 		</collision>
 	</npc>
 	<npc id="14997" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="108" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3738,7 +3659,6 @@
 		</collision>
 	</npc>
 	<npc id="14998" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="109" />
 			<skill name="s_purge" id="10795" level="1" />
@@ -3775,7 +3695,6 @@
 		</collision>
 	</npc>
 	<npc id="14999" level="99" type="L2Servitor" name="Thunder Hawk">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_rush" id="10794" level="110" />
 			<skill name="s_purge" id="10795" level="1" />
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/15000-15099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/15000-15099.xml
index 7a967a5d31..43a2b0e081 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/15000-15099.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/15000-15099.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
 	<npc id="15000" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -33,7 +32,6 @@
 		</collision>
 	</npc>
 	<npc id="15001" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -65,7 +63,6 @@
 		</collision>
 	</npc>
 	<npc id="15002" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -97,7 +94,6 @@
 		</collision>
 	</npc>
 	<npc id="15003" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -129,7 +125,6 @@
 		</collision>
 	</npc>
 	<npc id="15004" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -161,7 +156,6 @@
 		</collision>
 	</npc>
 	<npc id="15005" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -193,7 +187,6 @@
 		</collision>
 	</npc>
 	<npc id="15006" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -225,7 +218,6 @@
 		</collision>
 	</npc>
 	<npc id="15007" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -257,7 +249,6 @@
 		</collision>
 	</npc>
 	<npc id="15008" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -289,7 +280,6 @@
 		</collision>
 	</npc>
 	<npc id="15009" level="99" type="L2Monster" name="Unison of Lights">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="35708" /> <!-- Lumi Exclusive Weapon -->
@@ -321,7 +311,6 @@
 		</collision>
 	</npc>
 	<npc id="15010" level="95" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="3" />
 		</parameters>
@@ -347,13 +336,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15011" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="4" />
 		</parameters>
@@ -379,13 +368,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15012" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="101" />
 		</parameters>
@@ -411,13 +400,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15013" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="102" />
 		</parameters>
@@ -443,13 +432,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15014" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="103" />
 		</parameters>
@@ -475,13 +464,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15015" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="104" />
 		</parameters>
@@ -507,13 +496,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15016" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="105" />
 		</parameters>
@@ -539,13 +528,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15017" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="106" />
 		</parameters>
@@ -571,13 +560,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15018" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="107" />
 		</parameters>
@@ -603,13 +592,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15019" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="108" />
 		</parameters>
@@ -635,13 +624,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15020" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="109" />
 		</parameters>
@@ -667,13 +656,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15021" level="99" type="L2Servitor" name="Tree of Life">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="11806" level="110" />
 		</parameters>
@@ -699,13 +688,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="50.5" />
 		</collision>
 	</npc>
 	<npc id="15022" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="101" />
 			<skill name="Skill02_ID" id="11279" level="101" />
@@ -741,7 +730,6 @@
 		</collision>
 	</npc>
 	<npc id="15023" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="102" />
 			<skill name="Skill02_ID" id="11279" level="102" />
@@ -777,7 +765,6 @@
 		</collision>
 	</npc>
 	<npc id="15024" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="103" />
 			<skill name="Skill02_ID" id="11279" level="103" />
@@ -813,7 +800,6 @@
 		</collision>
 	</npc>
 	<npc id="15025" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="104" />
 			<skill name="Skill02_ID" id="11279" level="104" />
@@ -849,7 +835,6 @@
 		</collision>
 	</npc>
 	<npc id="15026" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="105" />
 			<skill name="Skill02_ID" id="11279" level="105" />
@@ -885,7 +870,6 @@
 		</collision>
 	</npc>
 	<npc id="15027" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="106" />
 			<skill name="Skill02_ID" id="11279" level="106" />
@@ -921,7 +905,6 @@
 		</collision>
 	</npc>
 	<npc id="15028" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="107" />
 			<skill name="Skill02_ID" id="11279" level="107" />
@@ -957,7 +940,6 @@
 		</collision>
 	</npc>
 	<npc id="15029" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="108" />
 			<skill name="Skill02_ID" id="11279" level="108" />
@@ -993,7 +975,6 @@
 		</collision>
 	</npc>
 	<npc id="15030" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="109" />
 			<skill name="Skill02_ID" id="11279" level="109" />
@@ -1029,7 +1010,6 @@
 		</collision>
 	</npc>
 	<npc id="15031" level="99" type="L2Servitor" name="Cute Bear">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11278" level="110" />
 			<skill name="Skill02_ID" id="11279" level="110" />
@@ -1065,7 +1045,6 @@
 		</collision>
 	</npc>
 	<npc id="15032" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="101" />
 			<skill name="Skill02_ID" id="11281" level="101" />
@@ -1101,7 +1080,6 @@
 		</collision>
 	</npc>
 	<npc id="15033" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="102" />
 			<skill name="Skill02_ID" id="11281" level="102" />
@@ -1137,7 +1115,6 @@
 		</collision>
 	</npc>
 	<npc id="15034" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="103" />
 			<skill name="Skill02_ID" id="11281" level="103" />
@@ -1173,7 +1150,6 @@
 		</collision>
 	</npc>
 	<npc id="15035" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="104" />
 			<skill name="Skill02_ID" id="11281" level="104" />
@@ -1209,7 +1185,6 @@
 		</collision>
 	</npc>
 	<npc id="15036" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="105" />
 			<skill name="Skill02_ID" id="11281" level="105" />
@@ -1245,7 +1220,6 @@
 		</collision>
 	</npc>
 	<npc id="15037" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="106" />
 			<skill name="Skill02_ID" id="11281" level="106" />
@@ -1281,7 +1255,6 @@
 		</collision>
 	</npc>
 	<npc id="15038" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="107" />
 			<skill name="Skill02_ID" id="11281" level="107" />
@@ -1317,7 +1290,6 @@
 		</collision>
 	</npc>
 	<npc id="15039" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="108" />
 			<skill name="Skill02_ID" id="11281" level="108" />
@@ -1353,7 +1325,6 @@
 		</collision>
 	</npc>
 	<npc id="15040" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="109" />
 			<skill name="Skill02_ID" id="11281" level="109" />
@@ -1389,7 +1360,6 @@
 		</collision>
 	</npc>
 	<npc id="15041" level="99" type="L2Servitor" name="Saber Tooth Cougar">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="110" />
 			<skill name="Skill02_ID" id="11281" level="110" />
@@ -1425,7 +1395,6 @@
 		</collision>
 	</npc>
 	<npc id="15042" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="101" />
 			<skill name="Skill02_ID" id="11283" level="101" />
@@ -1461,7 +1430,6 @@
 		</collision>
 	</npc>
 	<npc id="15043" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="102" />
 			<skill name="Skill02_ID" id="11283" level="102" />
@@ -1497,7 +1465,6 @@
 		</collision>
 	</npc>
 	<npc id="15044" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="103" />
 			<skill name="Skill02_ID" id="11283" level="103" />
@@ -1533,7 +1500,6 @@
 		</collision>
 	</npc>
 	<npc id="15045" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="104" />
 			<skill name="Skill02_ID" id="11283" level="104" />
@@ -1569,7 +1535,6 @@
 		</collision>
 	</npc>
 	<npc id="15046" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="105" />
 			<skill name="Skill02_ID" id="11283" level="105" />
@@ -1605,7 +1570,6 @@
 		</collision>
 	</npc>
 	<npc id="15047" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="106" />
 			<skill name="Skill02_ID" id="11283" level="106" />
@@ -1641,7 +1605,6 @@
 		</collision>
 	</npc>
 	<npc id="15048" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="107" />
 			<skill name="Skill02_ID" id="11283" level="107" />
@@ -1677,7 +1640,6 @@
 		</collision>
 	</npc>
 	<npc id="15049" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="108" />
 			<skill name="Skill02_ID" id="11283" level="108" />
@@ -1713,7 +1675,6 @@
 		</collision>
 	</npc>
 	<npc id="15050" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="109" />
 			<skill name="Skill02_ID" id="11283" level="109" />
@@ -1749,7 +1710,6 @@
 		</collision>
 	</npc>
 	<npc id="15051" level="99" type="L2Servitor" name="Grim Reaper">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="11282" level="110" />
 			<skill name="Skill02_ID" id="11283" level="110" />
@@ -1784,8 +1744,7 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="15052" level="99" type="L2Monster" name="Naviarope">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15052" level="99" type="L2Servitor" name="Naviarope">
 		<parameters>
 			<skill name="Skill01_ID" id="11284" level="4" />
 			<skill name="Skill02_ID" id="11285" level="4" />
@@ -1818,8 +1777,7 @@
 			<height normal="39.5" />
 		</collision>
 	</npc>
-	<npc id="15053" level="85" type="L2Monster" name="Clan Guardian">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15053" level="85" type="L2Servitor" name="Clan Guardian">
 		<parameters>
 			<param name="skill_delay" value="1" />
 			<param name="despawn_time" value="180" />
@@ -1847,13 +1805,13 @@
 			<skill id="4121" level="9" /> <!-- Summoned Monster Magic Protection -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="15054" level="85" type="L2Monster" name="Siege Golem">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15054" level="85" type="L2Servitor" name="Siege Golem">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1881,8 +1839,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="15055" level="90" type="L2Monster" name="Siege Golem">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15055" level="90" type="L2Servitor" name="Siege Golem">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1910,8 +1867,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="15056" level="95" type="L2Monster" name="Siege Golem">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15056" level="95" type="L2Servitor" name="Siege Golem">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1939,8 +1895,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="15057" level="99" type="L2Monster" name="Siege Golem">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15057" level="99" type="L2Servitor" name="Siege Golem">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1968,8 +1923,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="15058" level="85" type="L2Monster" name="Wild Hog Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15058" level="85" type="L2Servitor" name="Wild Hog Cannon">
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" />
 		</parameters>
@@ -2003,8 +1957,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="15059" level="90" type="L2Monster" name="Wild Hog Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15059" level="90" type="L2Servitor" name="Wild Hog Cannon">
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" />
 		</parameters>
@@ -2038,8 +1991,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="15060" level="95" type="L2Monster" name="Wild Hog Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15060" level="95" type="L2Servitor" name="Wild Hog Cannon">
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" />
 		</parameters>
@@ -2073,8 +2025,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="15061" level="99" type="L2Monster" name="Wild Hog Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15061" level="99" type="L2Servitor" name="Wild Hog Cannon">
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" />
 		</parameters>
@@ -2108,8 +2059,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="15062" level="85" type="L2Monster" name="Swoop Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15062" level="85" type="L2Servitor" name="Swoop Cannon">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2137,8 +2087,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="15063" level="90" type="L2Monster" name="Swoop Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15063" level="90" type="L2Servitor" name="Swoop Cannon">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2166,8 +2115,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="15064" level="95" type="L2Monster" name="Swoop Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15064" level="95" type="L2Servitor" name="Swoop Cannon">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2195,8 +2143,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="15065" level="99" type="L2Monster" name="Swoop Cannon">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="15065" level="99" type="L2Servitor" name="Swoop Cannon">
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2225,7 +2172,6 @@
 		</collision>
 	</npc>
 	<npc id="15066" level="85" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2240,18 +2186,18 @@
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15067" level="87" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2266,18 +2212,18 @@
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15068" level="89" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2292,18 +2238,18 @@
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15069" level="91" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2318,18 +2264,18 @@
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15070" level="93" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2344,18 +2290,18 @@
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15071" level="95" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2370,18 +2316,18 @@
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15072" level="97" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2396,18 +2342,18 @@
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15073" level="99" type="L2Servitor" name="Wynn Kai the Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2422,18 +2368,18 @@
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15074" level="85" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2448,18 +2394,18 @@
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15075" level="87" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2474,18 +2420,18 @@
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15076" level="89" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2500,18 +2446,18 @@
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15077" level="91" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2526,18 +2472,18 @@
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15078" level="93" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2552,18 +2498,18 @@
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15079" level="95" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2578,18 +2524,18 @@
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15080" level="97" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2604,18 +2550,18 @@
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15081" level="99" type="L2Servitor" name="Wynn Feline King">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2630,18 +2576,18 @@
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="6" />
 			<height normal="16.0055" />
 		</collision>
 	</npc>
 	<npc id="15082" level="85" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2656,18 +2602,18 @@
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15083" level="87" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2682,18 +2628,18 @@
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15084" level="89" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2708,18 +2654,18 @@
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15085" level="91" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2734,18 +2680,18 @@
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15086" level="93" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2760,18 +2706,18 @@
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15087" level="95" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2786,18 +2732,18 @@
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15088" level="97" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2812,18 +2758,18 @@
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15089" level="99" type="L2Servitor" name="Wynn Feline Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2838,18 +2784,18 @@
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="8" />
 			<height normal="15" />
 		</collision>
 	</npc>
 	<npc id="15090" level="85" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2864,18 +2810,18 @@
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15091" level="87" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2890,18 +2836,18 @@
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15092" level="89" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2916,18 +2862,18 @@
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15093" level="91" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2942,18 +2888,18 @@
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15094" level="93" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2968,18 +2914,18 @@
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15095" level="95" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2994,18 +2940,18 @@
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15096" level="97" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -3020,18 +2966,18 @@
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15097" level="99" type="L2Servitor" name="Wynn Nightshade">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -3046,18 +2992,18 @@
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="35.5" />
 		</collision>
 	</npc>
 	<npc id="15098" level="85" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -3072,18 +3018,18 @@
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15099" level="87" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -3098,11 +3044,12 @@
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/15100-15199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/15100-15199.xml
index 809879c675..de1dc9c149 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/15100-15199.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/15100-15199.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
 	<npc id="15100" level="89" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -15,19 +14,20 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15101" level="91" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -41,19 +41,20 @@
 			<attribute>
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15102" level="93" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -67,19 +68,20 @@
 			<attribute>
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15103" level="95" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -93,19 +95,20 @@
 			<attribute>
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15104" level="97" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -119,19 +122,20 @@
 			<attribute>
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15105" level="99" type="L2Servitor" name="Wynn Spectral Lord">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -145,19 +149,20 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12.5" />
 			<height normal="33.5" />
 		</collision>
 	</npc>
 	<npc id="15106" level="85" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -171,19 +176,20 @@
 			<attribute>
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15107" level="87" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -197,19 +203,20 @@
 			<attribute>
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15108" level="89" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -223,19 +230,20 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15109" level="91" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -249,19 +257,20 @@
 			<attribute>
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15110" level="93" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -275,19 +284,20 @@
 			<attribute>
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15111" level="95" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -301,19 +311,20 @@
 			<attribute>
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15112" level="97" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -327,19 +338,20 @@
 			<attribute>
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15113" level="99" type="L2Servitor" name="Wynn Soulless">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -353,19 +365,20 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="7" />
 			<height normal="33" />
 		</collision>
 	</npc>
 	<npc id="15114" level="85" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -379,19 +392,20 @@
 			<attribute>
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15115" level="87" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -405,19 +419,20 @@
 			<attribute>
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15116" level="89" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -431,19 +446,20 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15117" level="91" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -457,19 +473,20 @@
 			<attribute>
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15118" level="93" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -483,19 +500,20 @@
 			<attribute>
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15119" level="95" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -509,19 +527,20 @@
 			<attribute>
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15120" level="97" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -535,19 +554,20 @@
 			<attribute>
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15121" level="99" type="L2Servitor" name="Wynn Merrow">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -561,19 +581,20 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="17" />
 		</collision>
 	</npc>
 	<npc id="15122" level="85" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -587,19 +608,20 @@
 			<attribute>
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15123" level="87" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -613,19 +635,20 @@
 			<attribute>
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15124" level="89" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -639,19 +662,20 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15125" level="91" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -665,19 +689,20 @@
 			<attribute>
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15126" level="93" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -691,19 +716,20 @@
 			<attribute>
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15127" level="95" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -717,19 +743,20 @@
 			<attribute>
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15128" level="97" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -743,19 +770,20 @@
 			<attribute>
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15129" level="99" type="L2Servitor" name="Wynn Magnus">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -769,19 +797,20 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15130" level="85" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -795,19 +824,20 @@
 			<attribute>
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15131" level="87" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -821,19 +851,20 @@
 			<attribute>
 				<defence fire="180" water="180" wind="180" earth="180" holy="180" dark="180" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15132" level="89" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -847,19 +878,20 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15133" level="91" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -873,19 +905,20 @@
 			<attribute>
 				<defence fire="220" water="220" wind="220" earth="220" holy="220" dark="220" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15134" level="93" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -899,19 +932,20 @@
 			<attribute>
 				<defence fire="240" water="240" wind="240" earth="240" holy="240" dark="240" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15135" level="95" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -925,19 +959,20 @@
 			<attribute>
 				<defence fire="260" water="260" wind="260" earth="260" holy="260" dark="260" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15136" level="97" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -951,19 +986,20 @@
 			<attribute>
 				<defence fire="280" water="280" wind="280" earth="280" holy="280" dark="280" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15137" level="99" type="L2Servitor" name="Wynn Seraphim">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -977,19 +1013,24 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="13.5" />
 			<height normal="25.5" />
 		</collision>
 	</npc>
 	<npc id="15138" level="85" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="1" />
+			<skill name="Skill02_ID" id="10088" level="1" />
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1003,19 +1044,24 @@
 			<attribute>
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15139" level="90" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="2" />
+			<skill name="Skill02_ID" id="10088" level="2" />
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1029,19 +1075,24 @@
 			<attribute>
 				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15140" level="95" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="3" />
+			<skill name="Skill02_ID" id="10088" level="3" />
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1055,19 +1106,24 @@
 			<attribute>
 				<defence fire="250" water="250" wind="250" earth="250" holy="250" dark="250" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15141" level="99" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="4" />
+			<skill name="Skill02_ID" id="10088" level="4" />
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1081,20 +1137,21 @@
 			<attribute>
 				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
 			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15142" level="77" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2985" hpRegen="8.5" mp="1777" mpRegen="3" />
@@ -1104,8 +1161,12 @@
 			</speed>
 			<attack physical="1234.9234747" magical="611.21496200028" critical="4" attackSpeed="199" range="40" />
 			<defence physical="341.56626506024" magical="250.10934828423" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1116,14 +1177,14 @@
 			<skill id="4708" level="7" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15143" level="80" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="3067" hpRegen="8.5" mp="1870" mpRegen="3" />
@@ -1133,8 +1194,12 @@
 			</speed>
 			<attack physical="1310.6223434462" magical="648.50417608589" critical="4" attackSpeed="199" range="40" />
 			<defence physical="354.43786982249" magical="258.94897182026" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1145,14 +1210,14 @@
 			<skill id="4708" level="8" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15144" level="85" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="7859" hpRegen="9.5" mp="1936" mpRegen="3.3" />
@@ -1162,8 +1227,12 @@
 			</speed>
 			<attack physical="1659.589786306" magical="684.4913890957" critical="4" attackSpeed="283" range="900" />
 			<defence physical="729.31034482759" magical="467.7364288153" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1174,14 +1243,14 @@
 			<skill id="4708" level="9" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15145" level="90" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="8531" hpRegen="9.5" mp="2160" mpRegen="3.3" />
@@ -1191,8 +1260,12 @@
 			</speed>
 			<attack physical="1923.6731458249" magical="793.5354227748" critical="4" attackSpeed="283" range="900" />
 			<defence physical="805.02793296089" magical="529.15906115751" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1203,14 +1276,14 @@
 			<skill id="4708" level="10" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15146" level="95" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10999" hpRegen="10.5" mp="2314" mpRegen="3.6" />
@@ -1220,8 +1293,12 @@
 			</speed>
 			<attack physical="2230.0489677799" magical="920.00495648114" critical="4" attackSpeed="283" range="900" />
 			<defence physical="889.13043478261" magical="598.72291576984" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1232,14 +1309,14 @@
 			<skill id="4708" level="11" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15147" level="99" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="11766" hpRegen="10.5" mp="2472" mpRegen="3.6" />
@@ -1249,8 +1326,12 @@
 			</speed>
 			<attack physical="2509.9023444611" magical="1035.4245512193" critical="4" attackSpeed="283" range="900" />
 			<defence physical="962.23404255319" magical="660.76820448002" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="3" /> <!-- HP Medium-High -->
@@ -1261,14 +1342,14 @@
 			<skill id="4708" level="12" /> <!-- Cursed Strike -->
 			<skill id="4410" level="14" /> <!-- Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15148" level="80" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="2985" hpRegen="8.5" mp="1777" mpRegen="3" />
@@ -1278,8 +1359,12 @@
 			</speed>
 			<attack physical="1235.0601494593" magical="611.04859573439" critical="4" attackSpeed="199" range="40" />
 			<defence physical="341.4201183432" magical="249.96582498487" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1288,14 +1373,14 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15149" level="83" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="3067" hpRegen="9.5" mp="1870" mpRegen="3.3" />
@@ -1305,8 +1390,12 @@
 			</speed>
 			<attack physical="1310.4004119195" magical="648.57434758956" critical="4" attackSpeed="199" range="40" />
 			<defence physical="354.06976744186" magical="259.03753166014" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1315,14 +1404,14 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15150" level="85" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="8843" hpRegen="9.5" mp="1870" mpRegen="3.3" />
@@ -1332,8 +1421,12 @@
 			</speed>
 			<attack physical="1659.3991813067" magical="684.4913890957" critical="4" attackSpeed="283" range="900" />
 			<defence physical="729.31034482759" magical="467.7364288153" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1342,14 +1435,14 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15151" level="90" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9479" hpRegen="9.5" mp="1870" mpRegen="3.3" />
@@ -1359,8 +1452,12 @@
 			</speed>
 			<attack physical="1923.8146797978" magical="793.5354227748" critical="4" attackSpeed="283" range="900" />
 			<defence physical="805.02793296089" magical="529.15906115751" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1369,14 +1466,14 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15152" level="95" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="12220" hpRegen="10.5" mp="1870" mpRegen="3.6" />
@@ -1386,8 +1483,12 @@
 			</speed>
 			<attack physical="2230.1290771274" magical="920.00495648114" critical="4" attackSpeed="283" range="900" />
 			<defence physical="889.13043478261" magical="598.72291576984" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1396,14 +1497,14 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15153" level="99" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>UNDEAD</race>
+		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="13073" hpRegen="10.5" mp="1870" mpRegen="3.6" />
@@ -1413,8 +1514,12 @@
 			</speed>
 			<attack physical="2509.8533414028" magical="1035.4245512193" critical="4" attackSpeed="283" range="900" />
 			<defence physical="962.23404255319" magical="660.76820448002" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 			<skill id="4408" level="6" /> <!-- HP Very High -->
@@ -1423,13 +1528,13 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4410" level="13" /> <!-- Slightly Strong P. Atk. -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15154" level="101" type="L2Servitor" name="Mother Tree">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="s_tree_heal" id="19219" level="1" />
 		</parameters>
@@ -1443,6 +1548,9 @@
 			</speed>
 			<attack physical="1" magical="1" critical="4" attackSpeed="253" range="40" type="FIST" distance="0" width="0" random="10" accuracy="4.75" />
 			<defence physical="962" magical="568" />
+			<attribute>
+				<defence fire="200" water="200" wind="200" earth="200" holy="200" dark="200" />
+			</attribute>
 			<abnormalResist physical="10" magical="10" />
 		</stats>
 		<status attackable="false" canMove="false" targetable="false" />
@@ -1452,942 +1560,1225 @@
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="4416" level="5" /> <!-- Plants -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="18" />
 			<height normal="78" />
 		</collision>
 	</npc>
 	<npc id="15155" level="100" type="L2Servitor" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="13890" hpRegen="7.5" mp="1255" mpRegen="2.7" />
+			<attack physical="2822.6" magical="1164.3" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1043.7" magical="729.3" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
 	<npc id="15156" level="101" type="L2Servitor" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14027" hpRegen="7.5" mp="1275" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
 	<npc id="15157" level="102" type="L2Servitor" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14164" hpRegen="7.5" mp="1295" mpRegen="2.7" />
+			<attack physical="3571.59375" magical="1473.5671875" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1227.845675" magical="890.4935325" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
 	<npc id="15158" level="103" type="L2Servitor" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14301" hpRegen="7.5" mp="1316" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
 	<npc id="15159" level="104" type="L2Servitor" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14443" hpRegen="7.5" mp="1336" mpRegen="2.7" />
+			<attack physical="4520.29833984375" magical="1864.983471679688" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1445.450624751875" magical="1087.314865520813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
 	<npc id="15160" level="105" type="L2Servitor" name="Commando Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="16.75" />
 		</collision>
 	</npc>
 	<npc id="15161" level="100" type="L2Servitor" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9921" hpRegen="7.5" mp="897" mpRegen="2.7" />
+			<attack physical="2822.6" magical="1164.3" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1043.7" magical="729.3" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
 	<npc id="15162" level="101" type="L2Servitor" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10019" hpRegen="7.5" mp="911" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
 	<npc id="15163" level="102" type="L2Servitor" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10117" hpRegen="7.5" mp="925" mpRegen="2.7" />
+			<attack physical="3571.59375" magical="1473.5671875" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1227.845675" magical="890.4935325" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
 	<npc id="15164" level="103" type="L2Servitor" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10215" hpRegen="7.5" mp="940" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
 	<npc id="15165" level="104" type="L2Servitor" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10317" hpRegen="7.5" mp="954" mpRegen="2.7" />
+			<attack physical="4520.29833984375" magical="1864.983471679688" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1445.450624751875" magical="1087.314865520813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
 	<npc id="15166" level="105" type="L2Servitor" name="Witch Cat">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="15.9" />
 		</collision>
 	</npc>
 	<npc id="15167" level="100" type="L2Servitor" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="13890" hpRegen="7.5" mp="1255" mpRegen="2.7" />
+			<attack physical="2822.6" magical="1164.3" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1043.7" magical="729.3" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15168" level="101" type="L2Servitor" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14027" hpRegen="7.5" mp="1275" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15169" level="102" type="L2Servitor" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14164" hpRegen="7.5" mp="1295" mpRegen="2.7" />
+			<attack physical="3571.59375" magical="1473.5671875" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1227.845675" magical="890.4935325" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15170" level="103" type="L2Servitor" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14301" hpRegen="7.5" mp="1316" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15171" level="104" type="L2Servitor" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14443" hpRegen="7.5" mp="1336" mpRegen="2.7" />
+			<attack physical="4520.29833984375" magical="1864.983471679688" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1445.450624751875" magical="1087.314865520813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15172" level="105" type="L2Servitor" name="Unicorn Lancer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15173" level="100" type="L2Servitor" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9921" hpRegen="7.5" mp="897" mpRegen="2.7" />
+			<attack physical="2822.6" magical="1164.3" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1043.7" magical="729.3" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15174" level="101" type="L2Servitor" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10019" hpRegen="7.5" mp="911" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15175" level="102" type="L2Servitor" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10117" hpRegen="7.5" mp="925" mpRegen="2.7" />
+			<attack physical="3571.59375" magical="1473.5671875" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1227.845675" magical="890.4935325" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15176" level="103" type="L2Servitor" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10215" hpRegen="7.5" mp="940" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15177" level="104" type="L2Servitor" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10317" hpRegen="7.5" mp="954" mpRegen="2.7" />
+			<attack physical="4520.29833984375" magical="1864.983471679688" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1445.450624751875" magical="1087.314865520813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15178" level="105" type="L2Servitor" name="Unicorn Cherub">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="10" />
 			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="15179" level="100" type="L2Servitor" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="13890" hpRegen="7.5" mp="1255" mpRegen="2.7" />
+			<attack physical="2822.6" magical="1164.3" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1043.7" magical="729.3" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
 	<npc id="15180" level="101" type="L2Servitor" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14027" hpRegen="7.5" mp="1275" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
 	<npc id="15181" level="102" type="L2Servitor" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14164" hpRegen="7.5" mp="1295" mpRegen="2.7" />
+			<attack physical="3571.59375" magical="1473.5671875" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1227.845675" magical="890.4935325" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
 	<npc id="15182" level="103" type="L2Servitor" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14301" hpRegen="7.5" mp="1316" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
 	<npc id="15183" level="104" type="L2Servitor" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14443" hpRegen="7.5" mp="1336" mpRegen="2.7" />
+			<attack physical="4520.29833984375" magical="1864.983471679688" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1445.450624751875" magical="1087.314865520813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
 	<npc id="15184" level="105" type="L2Servitor" name="Soul Specter">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="28.6" />
 		</collision>
 	</npc>
 	<npc id="15185" level="100" type="L2Servitor" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9921" hpRegen="7.5" mp="897" mpRegen="2.7" />
+			<attack physical="2822.6" magical="1164.3" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1043.7" magical="729.3" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15186" level="101" type="L2Servitor" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10019" hpRegen="7.5" mp="911" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15187" level="102" type="L2Servitor" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10117" hpRegen="7.5" mp="925" mpRegen="2.7" />
+			<attack physical="3571.59375" magical="1473.5671875" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1227.845675" magical="890.4935325" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15188" level="103" type="L2Servitor" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10215" hpRegen="7.5" mp="940" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15189" level="104" type="L2Servitor" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10317" hpRegen="7.5" mp="954" mpRegen="2.7" />
+			<attack physical="4520.29833984375" magical="1864.983471679688" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1445.450624751875" magical="1087.314865520813" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15190" level="105" type="L2Servitor" name="Banshee Queen">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="10417" hpRegen="7.5" mp="969" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="5038" level="15" /> <!-- Servitor PvP Penalty -->
 			<skill id="11496" level="2" /> <!-- Summoner Boss Penalty -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="12" />
 			<height normal="23.5" />
 		</collision>
 	</npc>
 	<npc id="15191" level="101" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="5" />
+			<skill name="Skill02_ID" id="10088" level="5" />
+		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14027" hpRegen="7.5" mp="1275" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="360" range="40" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15192" level="103" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="6" />
+			<skill name="Skill02_ID" id="10088" level="6" />
+		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14301" hpRegen="7.5" mp="1316" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="360" range="40" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15193" level="105" type="L2Servitor" name="Blood Panther">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<skill name="Skill01_ID" id="10087" level="7" />
+			<skill name="Skill02_ID" id="10088" level="7" />
+		</parameters>
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="360" range="40" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="50" />
 				<run ground="198" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="10095" level="1" /> <!-- Blood Panther's Death Touch -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="14.5" />
 		</collision>
 	</npc>
 	<npc id="15194" level="101" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14027" hpRegen="7.5" mp="1275" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="80" />
 				<run ground="160" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15195" level="103" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14301" hpRegen="7.5" mp="1316" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="80" />
 				<run ground="160" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15196" level="105" type="L2Servitor" name="Cursed Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="80" />
 				<run ground="160" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="20" />
 			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="15197" level="101" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14027" hpRegen="7.5" mp="1275" mpRegen="2.7" />
+			<attack physical="3174.75" magical="1309.8375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1131.655" magical="805.8765" />
 			<speed>
 				<walk ground="60" />
 				<run ground="140" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15198" level="103" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14301" hpRegen="7.5" mp="1316" mpRegen="2.7" />
+			<attack physical="4018.04296875" magical="1657.7630859375" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1332.212557375" magical="983.9953534125" />
 			<speed>
 				<walk ground="60" />
 				<run ground="140" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
 	<npc id="15199" level="105" type="L2Servitor" name="Reanimated Man">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="14583" hpRegen="7.5" mp="1356" mpRegen="2.7" />
+			<attack physical="5085.335632324219" magical="2098.106405639648" critical="4" attackSpeed="283" range="900" />
+			<defence physical="1568.313927855784" magical="1201.482926400498" />
 			<speed>
 				<walk ground="60" />
 				<run ground="140" />
 			</speed>
+			<attribute>
+				<defence fire="300" water="300" wind="300" earth="300" holy="300" dark="300" />
+			</attribute>
+			<abnormalResist physical="10" magical="10" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" undying="false" />
 		<skill_list>
 			<skill id="4416" level="1" /> <!-- Undead -->
 		</skill_list>
+		<shots soul="1" spirit="1" />
 		<collision>
 			<radius normal="11" grown="13" />
 			<height normal="25" grown="31" />
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml
index adcf4f9eb3..7ea4f035dd 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml
@@ -4778,7 +4778,6 @@
 		<isDebuff>true</isDebuff>
 		<activateRate>80</activateRate>
 		<basicProperty>MAGIC</basicProperty>
-		<isDebuff>true</isDebuff>
 		<lvlBonusRate>2</lvlBonusRate>
 		<effects>
 			<effect name="PhysicalDefence">
@@ -4803,16 +4802,34 @@
 	</skill>
 	<skill id="10087" toLevel="7" name="Blood Panther Roar">
 		<!-- Updated to IO -->
-		<!-- Inflicts 7750 damage onto nearby enemies, and has a chance of restraining their P. Atk. For 5 sec. -->
+		<!-- Inflicts 7750 damage on to nearby enemies, and has a chance of restraining their P. Atk. For 5 sec. -->
 		<icon>icon.skill1336</icon>
-		<abnormalLvl>1</abnormalLvl>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+			<value level="4">4</value>
+			<value level="5">5</value>
+			<value level="6">6</value>
+			<value level="7">7</value>
+		</abnormalLvl>
 		<abnormalTime>5</abnormalTime>
 		<abnormalType>NORMAL_ATTACK_BLOCK</abnormalType>
-		<activateRate>80</activateRate> <!-- Guessed -->
+		<activateRate>100</activateRate>
 		<affectRange>150</affectRange>
-		<basicProperty>MAGIC</basicProperty> <!-- Guessed -->
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">90</value>
+			<value level="3">95</value>
+			<value level="4">99</value>
+			<value level="5">101</value>
+			<value level="6">103</value>
+			<value level="7">105</value>
+		</magicLvl>
+		<basicProperty>MAGIC</basicProperty>
+		<nextAction>ATTACK</nextAction>
 		<operateType>A2</operateType>
-		<targetType>SELF</targetType>
+		<targetType>ENEMY</targetType>
 		<affectScope>POINT_BLANK</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<trait>PHYSICAL_BLOCKADE</trait>
@@ -4861,9 +4878,10 @@
 		<abnormalTime>5</abnormalTime>
 		<abnormalType>STUN</abnormalType>
 		<abnormalVisualEffect>STUN</abnormalVisualEffect>
-		<activateRate>80</activateRate> <!-- Guessed -->
+		<activateRate>100</activateRate>
 		<affectRange>600</affectRange>
-		<basicProperty>PHYSICAL</basicProperty> <!-- Guessed -->
+		<basicProperty>PHYSICAL</basicProperty>
+		<nextAction>ATTACK</nextAction>
 		<fanRange>0;0;600;60</fanRange>
 		<operateType>DA2</operateType>
 		<targetType>ENEMY</targetType>