diff --git a/src/main/resources/data/stats/skills/00000-00099.xml b/src/main/resources/data/stats/skills/00000-00099.xml
index d81dc332b4fd86bfb306794bb2d283da45065462..3dbfd838f593be86fb1bbee6756eab3d4da1deec 100644
--- a/src/main/resources/data/stats/skills/00000-00099.xml
+++ b/src/main/resources/data/stats/skills/00000-00099.xml
@@ -924,6 +924,7 @@
 				<param dispel="#dispelAbnormals" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22" levels="7" name="Summon Vampiric Cubic" enchantGroup1="2">
 		<!-- Confirmed CT2.5 -->
@@ -1527,6 +1528,7 @@
 				<param dispel="#dispelAbnormals" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="45" levels="9" name="Divine Heal">
 		<!-- High Five Confirmed -->
@@ -1916,6 +1918,7 @@
 				<param dispel="BLEEDING,9" />
 			</effect>
 		</enchant4Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="60" levels="1" name="Fake Death">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/00100-00199.xml b/src/main/resources/data/stats/skills/00100-00199.xml
index 36afe20d3859adaeac37d58bfe688bf26fa80fe9..aabcd3aea11b85e4472b1e55b86702fe12b0af86 100644
--- a/src/main/resources/data/stats/skills/00100-00199.xml
+++ b/src/main/resources/data/stats/skills/00100-00199.xml
@@ -913,6 +913,7 @@
 				<mul stat="mDef" val="#ench2power" />
 			</effect>
 		</enchant2Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="127" levels="14" name="Hamstring" enchantGroup1="1" enchantGroup2="1">
 		<table name="#effectPoint"> -408 -438 -467 -495 -523 -549 -566 -582 -597 -611 -624 -635 -646 -655 </table>
@@ -1059,6 +1060,7 @@
 				<mul stat="pDef" val="0.9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="134" levels="1" name="Toughness" enchantGroup1="1">
 		<table name="#ench1Traits"> 21 21 21 22 22 22 23 23 23 24 24 24 24 25 25 25 26 26 26 27 27 27 27 28 28 28 29 29 29 30 </table>
diff --git a/src/main/resources/data/stats/skills/00200-00299.xml b/src/main/resources/data/stats/skills/00200-00299.xml
index 223b5dc0c11049fb1646cda6c111a76ac0305afa..13b55913d2aa3c030fa4f738db229ee6f965fe46 100644
--- a/src/main/resources/data/stats/skills/00200-00299.xml
+++ b/src/main/resources/data/stats/skills/00200-00299.xml
@@ -710,6 +710,7 @@
 				<mul stat="movementVuln" val="#ench4Vuln" />
 			</effect>
 		</enchant4Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="231" levels="50" name="Heavy Armor Mastery" enchantGroup1="1" enchantGroup2="1">
 		<table name="#magicLvl"> 18 20 22 24 26 27 28 30 31 32 34 35 36 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 </table>
diff --git a/src/main/resources/data/stats/skills/00300-00399.xml b/src/main/resources/data/stats/skills/00300-00399.xml
index 7fed0e3d3852ab621aa69b83cfd48b0afd12df12..403f4440776b225765e847bab3be3037ae01980f 100644
--- a/src/main/resources/data/stats/skills/00300-00399.xml
+++ b/src/main/resources/data/stats/skills/00300-00399.xml
@@ -1135,6 +1135,7 @@
 				<sub stat="cancelVuln" val="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="328" levels="1" name="Wisdom" enchantGroup1="5" enchantGroup2="5" enchantGroup3="5">
 		<table name="#enchMagicLvl"> 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
@@ -1997,6 +1998,7 @@
 				</add>
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="352" levels="1" name="Shield Bash" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6" enchantGroup4="6" enchantGroup5="6">
 		<table name="#ench-Res"> 7 10 13 15 18 21 23 26 29 31 34 37 39 42 45 </table>
@@ -2236,6 +2238,7 @@
 				</mul>
 			</effect>
 		</enchant2Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="356" levels="1" name="Focus Chance" enchantGroup1="5" enchantGroup2="5">
 		<table name="#ench1rCrit"> 1.903 1.906 1.909 1.913 1.916 1.919 1.923 1.926 1.929 1.933 1.936 1.939 1.942 1.946 1.949 </table>
@@ -2306,6 +2309,7 @@
 				</mul>
 			</effect>
 		</enchant2Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="357" levels="1" name="Focus Power" enchantGroup1="5" enchantGroup2="5">
 		<table name="#ench1cAtk"> 1.61 1.62 1.62 1.63 1.64 1.64 1.65 1.65 1.66 1.67 1.67 1.68 1.69 1.69 1.7 </table>
@@ -2376,6 +2380,7 @@
 				</mul>
 			</effect>
 		</enchant2Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="358" levels="1" name="Bluff" enchantGroup1="6">
 		<!-- Confirmed CT2.5 -->
@@ -3381,6 +3386,7 @@
 				<add stat="runSpd" val="5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="396" levels="1" name="Heroic Berserker">
 		<!-- Confirmed CT2.5 -->
@@ -3415,6 +3421,7 @@
 				<add stat="runSpd" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="397" levels="1" name="none">
 		<!-- Confirmed CT2.5 -->
diff --git a/src/main/resources/data/stats/skills/00400-00499.xml b/src/main/resources/data/stats/skills/00400-00499.xml
index e729a76113bdacf399360eb5d00f4a953b86fcb4..1917270f29f0d4d1a5ff76855e1ee6988b4a8a61 100644
--- a/src/main/resources/data/stats/skills/00400-00499.xml
+++ b/src/main/resources/data/stats/skills/00400-00499.xml
@@ -819,6 +819,7 @@
 				<mul stat="blowRate" val="#ench2Chance" />
 			</effect>
 		</enchant2Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="411" levels="3" name="Stealth" enchantGroup1="1" enchantGroup2="1">
 		<table name="#abnormalLvl"> 1 2 3 </table>
@@ -853,6 +854,7 @@
 				<mul stat="pAtk" val="0.55" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="412" levels="10" name="Sand Bomb" enchantGroup1="1" enchantGroup2="1">
 		<!-- Confirmed CT2.5 -->
@@ -945,6 +947,7 @@
 				</mul>
 			</effect>
 		</enchant1Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="414" levels="8" name="Dead Eye" enchantGroup1="1">
 		<!-- High Five Confirmed -->
@@ -1069,6 +1072,7 @@
 				<mul stat="pReuse" val="#pReuse" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="417" levels="5" name="Pain of Sagittarius" enchantGroup1="1">
 		<!-- High Five Confirmed -->
@@ -1840,6 +1844,7 @@
 				<param resRecovery="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="439" levels="1" name="Shield of Revenge">
 		<set name="abnormalLvl" val="1" />
@@ -1859,6 +1864,7 @@
 				<add stat="vengeancePdam" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="440" levels="1" name="Braveheart" enchantGroup1="5">
 		<!-- High Five Confirmed -->
@@ -2041,6 +2047,7 @@
 				<param targetType="ONE" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="446" levels="1" name="Dodge">
 		<set name="abnormalLvl" val="1" />
@@ -2060,6 +2067,7 @@
 				<add stat="pSkillEvas" val="90" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="447" levels="1" name="Counterattack">
 		<set name="abnormalLvl" val="1" />
@@ -2079,6 +2087,7 @@
 				<add stat="vengeancePdam" val="90" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="448" levels="1" name="Summon Swoop Cannon" enchantGroup1="1">
 		<table name="#ench1npcId"> 14840 14841 14842 14843 14844 14845 14846 14847 14848 14849 14850 14851 14852 14853 14854 14855 14856 14857 14858 14859 14860 14861 14862 14863 14864 14865 14866 14867 14868 14869 </table>
@@ -3176,6 +3185,7 @@
 				<mul stat="runSpd" val="#ench2runSpd" />
 			</effect>
 		</enchant2Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="484" levels="1" name="Rush">
 		<!-- High Five Confirmed -->
@@ -3349,6 +3359,7 @@
 				</mul>
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="491" levels="1" name="Not In Use">
 		<!-- Confirmed CT2.5 -->
@@ -3368,6 +3379,7 @@
 				<player weight="80" />
 			</and>
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="492" levels="25" name="Spread Wing" enchantGroup1="2" enchantGroup2="2">
 		<!-- High Five Confirmed -->
@@ -3933,5 +3945,6 @@
 				<param DERANGEMENT="#trait_derangement" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/00500-00599.xml b/src/main/resources/data/stats/skills/00500-00599.xml
index 1b3a12f566ca04e84ce42879f3474834533fc16a..50d54e560bb89ed7ae63e55abac1e2c6848bebf6 100644
--- a/src/main/resources/data/stats/skills/00500-00599.xml
+++ b/src/main/resources/data/stats/skills/00500-00599.xml
@@ -124,6 +124,7 @@
 				<param charge="#ench1souls" />
 			</effect>
 		</enchant1Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="503" levels="3" name="Scorn">
 		<!-- High Five Confirmed -->
@@ -672,6 +673,7 @@
 				<player weight="80" />
 			</and>
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="513" levels="1" name="Create Dark Seed">
 		<!-- Confirmed CT2.5 -->
@@ -743,6 +745,7 @@
 				<param npcId="13045" />
 			</effect>
 		</enchant2Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="515" levels="6" name="Poison Trap" enchantGroup1="2" enchantGroup2="2">
 		<!-- Confirmed CT2.5 and Updated to H5 -->
@@ -786,6 +789,7 @@
 				<param npcId="13051" />
 			</effect>
 		</enchant2Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="516" levels="6" name="Slow Trap" enchantGroup1="2" enchantGroup2="2">
 		<!-- Confirmed CT2.5 and Updated to H5 -->
@@ -829,6 +833,7 @@
 				<param npcId="13070" />
 			</effect>
 		</enchant2Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="517" levels="5" name="Flash Trap" enchantGroup1="2" enchantGroup2="2">
 		<!-- Confirmed CT2.5 and Updated to H5 -->
@@ -872,6 +877,7 @@
 				<param npcId="13056" />
 			</effect>
 		</enchant2Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="518" levels="8" name="Binding Trap" enchantGroup1="2" enchantGroup2="2">
 		<!-- Confirmed CT2.5 and Updated to H5 -->
@@ -915,6 +921,7 @@
 				<param npcId="13064" />
 			</effect>
 		</enchant2Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="519" levels="1" name="Quiver of Bolts: A-Grade">
 		<!-- Confirmed CT2.5 -->
@@ -1191,6 +1198,7 @@
 				<param dispel="DARK_SEED,9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="525" levels="6" name="Decoy" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1">
 		<!-- Confirmed CT2.5 -->
@@ -1229,6 +1237,7 @@
 				<param npcId="#ench3npcId" npcCount="1" />
 			</effect>
 		</enchant3Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="526" levels="1" name="Enuma Elish" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6" enchantGroup4="6">
 		<!-- High Five Confirmed -->
@@ -1657,6 +1666,7 @@
 				<mul stat="mDef" val="2" /> <!-- mDef +100% -->
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="539" levels="1" name="Nail Attack">
 		<!-- High Five Confirmed -->
@@ -1736,6 +1746,7 @@
 				<param id="201" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="542" levels="1" name="Transform Grail Apostle">
 		<!-- Confirmed CT2.5 -->
@@ -1763,6 +1774,7 @@
 				<param id="202" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="543" levels="1" name="Transform Grail Apostle">
 		<!-- Confirmed CT2.5 -->
@@ -1790,6 +1802,7 @@
 				<param id="203" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="544" levels="1" name="Transform Unicorn">
 		<!-- Confirmed CT2.5 -->
@@ -1817,6 +1830,7 @@
 				<param id="204" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="545" levels="1" name="Transform Unicorn">
 		<!-- Confirmed CT2.5 -->
@@ -1844,6 +1858,7 @@
 				<param id="205" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="546" levels="1" name="Transform Unicorn">
 		<!-- Confirmed CT2.5 -->
@@ -1871,6 +1886,7 @@
 				<param id="206" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="547" levels="1" name="Transform Lilim Knight">
 		<!-- Confirmed CT2.5 -->
@@ -1898,6 +1914,7 @@
 				<param id="207" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="548" levels="1" name="Transform Lilim Knight">
 		<!-- Confirmed CT2.5 -->
@@ -1925,6 +1942,7 @@
 				<param id="208" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="549" levels="1" name="Transform Lilim Knight">
 		<!-- Confirmed CT2.5 -->
@@ -1952,6 +1970,7 @@
 				<param id="209" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="550" levels="1" name="Transform Golem Guardian">
 		<!-- Confirmed CT2.5 -->
@@ -1979,6 +1998,7 @@
 				<param id="210" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="551" levels="1" name="Transform Golem Guardian">
 		<!-- Confirmed CT2.5 -->
@@ -2006,6 +2026,7 @@
 				<param id="211" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="552" levels="1" name="Transform Golem Guardian">
 		<!-- Confirmed CT2.5 -->
@@ -2033,6 +2054,7 @@
 				<param id="212" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="553" levels="1" name="Transform Inferno Drake">
 		<!-- Confirmed CT2.5 -->
@@ -2060,6 +2082,7 @@
 				<param id="213" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="554" levels="1" name="Transform Inferno Drake">
 		<!-- Confirmed CT2.5 -->
@@ -2087,6 +2110,7 @@
 				<param id="214" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="555" levels="1" name="Transform Inferno Drake">
 		<!-- Confirmed CT2.5 -->
@@ -2114,6 +2138,7 @@
 				<param id="215" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="556" levels="1" name="Transform Dragon Bomber">
 		<!-- Confirmed CT2.5 -->
@@ -2141,6 +2166,7 @@
 				<param id="216" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="557" levels="1" name="Transform Dragon Bomber">
 		<!-- Confirmed CT2.5 -->
@@ -2168,6 +2194,7 @@
 				<param id="217" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="558" levels="1" name="Transform Dragon Bomber">
 		<!-- Confirmed CT2.5 -->
@@ -2195,6 +2222,7 @@
 				<param id="218" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="559" levels="4" name="Spear">
 		<!-- High Five Confirmed -->
@@ -2663,6 +2691,7 @@
 				<param npcId="#npcId" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="575" levels="4" name="Steel Cutter">
 		<!-- High Five Confirmed -->
@@ -2959,6 +2988,7 @@
 		<effects>
 			<effect name="SilentMove" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="584" levels="1" name="Power Claw">
 		<!-- High Five Confirmed -->
@@ -3003,6 +3033,7 @@
 				<add stat="runSpd" val="66" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="586" levels="2" name="Rolling Attack">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/00600-00699.xml b/src/main/resources/data/stats/skills/00600-00699.xml
index 268abc3b0d012aa538ab00c6d9450edf26834a72..c85fdab81dd98313decb50582b9e63e9bad9915b 100644
--- a/src/main/resources/data/stats/skills/00600-00699.xml
+++ b/src/main/resources/data/stats/skills/00600-00699.xml
@@ -257,6 +257,7 @@
 				<param id="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="618" levels="1" name="Transform Death Blader">
 		<set name="abnormalLvl" val="1" />
@@ -281,6 +282,7 @@
 				<param id="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="619" levels="1" name="Transform Dispel">
 		<!-- Confirmed CT2.5 -->
@@ -299,6 +301,7 @@
 				<param dispel="TRANSFORM,-1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="620" levels="1" name="Quiver of Bolts - Grade B">
 		<!-- Confirmed CT2.5 -->
@@ -381,6 +384,7 @@
 				<add stat="pSkillEvas" val="#pSkillEvas" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="623" levels="1" name="Find Trap">
 		<!-- High Five Confirmed -->
@@ -455,6 +459,7 @@
 				<param charge="50" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="626" levels="4" name="Critical Sense" enchantGroup1="1" enchantGroup2="1">
 		<!-- Confirmed CT2.5 -->
@@ -1038,6 +1043,7 @@
 				<param id="253" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="657" levels="3" name="Transform Divine Knight">
 		<table name="#reuseDelay"> 14400000 7200000 3600000 </table>
@@ -1065,6 +1071,7 @@
 				<param id="252" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="658" levels="3" name="Transform Divine Rogue">
 		<table name="#reuseDelay"> 14400000 7200000 3600000 </table>
@@ -1092,6 +1099,7 @@
 				<param id="254" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="659" levels="3" name="Transform Divine Wizard">
 		<table name="#reuseDelay"> 14400000 7200000 3600000 </table>
@@ -1119,6 +1127,7 @@
 				<param id="256" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="660" levels="3" name="Transform Divine Summoner">
 		<table name="#reuseDelay"> 14400000 7200000 3600000 </table>
@@ -1146,6 +1155,7 @@
 				<param id="258" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="661" levels="3" name="Transform Divine Healer">
 		<table name="#reuseDelay"> 14400000 7200000 3600000 </table>
@@ -1173,6 +1183,7 @@
 				<param id="255" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="662" levels="3" name="Transform Divine Enchanter">
 		<table name="#reuseDelay"> 14400000 7200000 3600000 </table>
@@ -1200,6 +1211,7 @@
 				<param id="257" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="663" levels="1" name="Transform Zaken">
 		<set name="abnormalLvl" val="1" />
@@ -1226,6 +1238,7 @@
 				<param id="305" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="664" levels="1" name="Transform Anakim">
 		<set name="abnormalLvl" val="1" />
@@ -1252,6 +1265,7 @@
 				<param id="306" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="665" levels="1" name="Transform Venom">
 		<set name="abnormalLvl" val="1" />
@@ -1278,6 +1292,7 @@
 				<param id="307" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="666" levels="1" name="Transform Gordon">
 		<set name="abnormalLvl" val="1" />
@@ -1304,6 +1319,7 @@
 				<param id="308" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="667" levels="1" name="Transform Ranku">
 		<set name="abnormalLvl" val="1" />
@@ -1330,6 +1346,7 @@
 				<param id="309" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="668" levels="1" name="Transform Kechi">
 		<set name="abnormalLvl" val="1" />
@@ -1356,6 +1373,7 @@
 				<param id="310" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="669" levels="1" name="Transform Demon Prince">
 		<set name="abnormalLvl" val="1" />
@@ -1382,6 +1400,7 @@
 				<param id="311" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="670" levels="1" name="Transform Heretic">
 		<set name="abnormalLvl" val="1" />
@@ -1408,6 +1427,7 @@
 				<param id="3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="671" levels="1" name="Transform Vale Master">
 		<set name="abnormalLvl" val="1" />
@@ -1434,6 +1454,7 @@
 				<param id="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="672" levels="1" name="Transform Saber Tooth Tiger">
 		<set name="abnormalLvl" val="1" />
@@ -1460,6 +1481,7 @@
 				<param id="5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="673" levels="1" name="Transform Oel Mahum">
 		<set name="abnormalLvl" val="1" />
@@ -1486,6 +1508,7 @@
 				<param id="6" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="674" levels="1" name="Transform Doll Blader">
 		<set name="abnormalLvl" val="1" />
@@ -1512,6 +1535,7 @@
 				<param id="7" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="675" levels="1" name="Divine Warrior Cross Slash">
 		<!-- High Five Confirmed -->
@@ -1603,6 +1627,7 @@
 				<mul stat="pAtk" val="1.25" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="679" levels="1" name="Sacrifice Warrior">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/00700-00799.xml b/src/main/resources/data/stats/skills/00700-00799.xml
index 637f196634255dec5460bfe37af09fb14ee35999..8ec50f0d78a213aece1bf63b2e20d27d67bbb54b 100644
--- a/src/main/resources/data/stats/skills/00700-00799.xml
+++ b/src/main/resources/data/stats/skills/00700-00799.xml
@@ -495,6 +495,7 @@
 				<param expMultiplier="0.7" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="711" levels="1" name="Divine Summoner Transfer Pain">
 		<set name="abnormalVisualEffect" val="NONE" />
@@ -912,6 +913,7 @@
 				<param slot="DEBUFF" rate="100" max="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="725" levels="2" name="Venom Power Smash">
 		<!-- High Five Confirmed -->
@@ -984,6 +986,7 @@
 				<mul stat="pAtk" val="1.08" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="728" levels="1" name="Gordon Beast Attack">
 		<!-- High Five Confirmed -->
@@ -1593,6 +1596,7 @@
 				<add stat="runSpd" val="33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="749" levels="3" name="Oel Mahum Stun Attack">
 		<!-- High Five Confirmed -->
@@ -1944,6 +1948,7 @@
 				<add stat="pAtk" val="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="762" levels="1" name="Insane Crusher">
 		<!-- High Five Confirmed -->
@@ -2173,6 +2178,7 @@
 				<add stat="pSkillEvas" val="40" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="769" levels="1" name="Wind Riding">
 		<set name="abnormalLvl" val="2" />
@@ -2197,6 +2203,7 @@
 				<add stat="pSkillEvas" val="75" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="770" levels="1" name="Ghost Walking">
 		<set name="abnormalLvl" val="2" />
@@ -2221,6 +2228,7 @@
 				<add stat="pSkillEvas" val="60" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="771" levels="1" name="Flame Hawk">
 		<!-- High Five Confirmed -->
@@ -2489,6 +2497,7 @@
 				<param id="259" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="779" levels="1" name="Summon Smart Cubic">
 		<!-- High Five Confirmed -->
@@ -2801,6 +2810,7 @@
 				<mul stat="critDmg" val="1.1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="789" levels="1" name="Spirit of Shilen">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/00800-00899.xml b/src/main/resources/data/stats/skills/00800-00899.xml
index 6f59d77d13a05ed4cb56f7fdbd3e549e4852d246..82e67b9d95f5a0ddab3c6cbdee11dc32f7fc8d05 100644
--- a/src/main/resources/data/stats/skills/00800-00899.xml
+++ b/src/main/resources/data/stats/skills/00800-00899.xml
@@ -113,6 +113,7 @@
 				<mul stat="pAtk" val="1.4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="808" levels="1" name="Golem Punch">
 		<!-- High Five Confirmed -->
@@ -856,6 +857,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="834" levels="1" name="Blood Pact">
 		<!-- High Five Confirmed -->
@@ -947,6 +949,7 @@
 				<param npcId="#npcId" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="837" levels="1" name="Painkiller">
 		<!-- Confirmed CT2.5 -->
@@ -973,6 +976,7 @@
 			</effect>
 			<effect name="BlockDebuff" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="838" levels="1" name="Switch Stance">
 		<!-- Confirmed CT2.5 -->
@@ -989,6 +993,7 @@
 				<param dispel="TRANSFORM,-1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="839" levels="1" name="Dismount">
 		<!-- Confirmed CT2.5 -->
@@ -1004,6 +1009,7 @@
 				<param dispel="TRANSFORM,-1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="840" levels="1" name="Final Flying Form">
 		<set name="abnormalLvl" val="1" />
@@ -1042,6 +1048,7 @@
 				<mul stat="reduceExpLostByRaid" val="0.1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="841" levels="1" name="Aura Bird - Falcon">
 		<set name="abnormalLvl" val="1" />
@@ -1075,6 +1082,7 @@
 				<mul stat="reduceExpLostByRaid" val="0.1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="842" levels="1" name="Aura Bird - Owl">
 		<set name="abnormalLvl" val="1" />
@@ -1108,6 +1116,7 @@
 				<mul stat="reduceExpLostByRaid" val="0.1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="843" levels="1" name="Shooting Star">
 		<!-- High Five Confirmed -->
@@ -1148,6 +1157,7 @@
 		<effects>
 			<effect name="OutpostCreate" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="845" levels="1" name="Outpost Demolition">
 		<set name="affectScope" val="SINGLE" />
@@ -1343,6 +1353,7 @@
 				<param id="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="858" levels="1" name="Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1367,6 +1378,7 @@
 				<param id="11" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="859" levels="1" name="Dark Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1391,6 +1403,7 @@
 				<param id="12" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="860" levels="1" name="Orc Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1415,6 +1428,7 @@
 				<param id="13" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="861" levels="1" name="Dwarf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1439,6 +1453,7 @@
 				<param id="14" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="862" levels="1" name="Kamael Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1463,6 +1478,7 @@
 				<param id="15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="863" levels="1" name="Royal Guard Captain">
 		<set name="abnormalLvl" val="1" />
@@ -1487,6 +1503,7 @@
 				<param id="16" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="864" levels="1" name="Archer Captain">
 		<set name="abnormalLvl" val="1" />
@@ -1511,6 +1528,7 @@
 				<param id="17" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="865" levels="1" name="Magic Leader">
 		<set name="abnormalLvl" val="1" />
@@ -1535,6 +1553,7 @@
 				<param id="18" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="866" levels="1" name="Kamael Guard Captain">
 		<set name="abnormalLvl" val="1" />
@@ -1559,6 +1578,7 @@
 				<param id="19" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="867" levels="1" name="Knight of Dawn">
 		<set name="abnormalLvl" val="1" />
@@ -1583,6 +1603,7 @@
 				<param id="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="868" levels="1" name="Fortress Captain">
 		<set name="abnormalLvl" val="1" />
@@ -1607,6 +1628,7 @@
 				<param id="21" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="869" levels="9" name="Mercenary Power Strike">
 		<!-- High Five Confirmed -->
@@ -2350,6 +2372,7 @@
 				<mul stat="pAtkSpd" val="1.2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="895" levels="1" name="Exhilarate">
 		<!-- Aurabird Owl -->
@@ -2376,6 +2399,7 @@
 				<sub stat="debuffVuln" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="896" levels="6" name="Rolling Step">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/00900-00999.xml b/src/main/resources/data/stats/skills/00900-00999.xml
index bc309ac6696d94a17fe72b93ae5874fe83cb30a2..be5599d588d010b4a317ac9023235894bd4e414f 100644
--- a/src/main/resources/data/stats/skills/00900-00999.xml
+++ b/src/main/resources/data/stats/skills/00900-00999.xml
@@ -669,6 +669,7 @@
 		<effects>
 			<effect name="FocusMaxEnergy" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="919" levels="1" name="Maximum Focus Sonic">
 		<!-- High Five Confirmed -->
@@ -2593,6 +2594,7 @@
 				<mul stat="pAtkSpd" val="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="989" levels="1" name="Defense Motion">
 		<!-- High Five Confirmed -->
@@ -2620,6 +2622,7 @@
 				<mul stat="mDef" val="1.1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="990" levels="1" name="Death Shot">
 		<!-- High Five Confirmed -->