diff --git a/src/main/resources/data/stats/skills/01300-01399.xml b/src/main/resources/data/stats/skills/01300-01399.xml
index 45a1dd39632a1d3b8a9e4569f079b37113cabda2..8aa31633b60e5e5b27149a7e96b221d683991d8d 100644
--- a/src/main/resources/data/stats/skills/01300-01399.xml
+++ b/src/main/resources/data/stats/skills/01300-01399.xml
@@ -709,6 +709,7 @@
 				<param CROSSBOW="6" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1327" levels="1" name="Symphony of Noblesse">
 		<!-- High Five Confirmed -->
@@ -761,6 +762,7 @@
 				<param CROSSBOW="6" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1328" levels="8" name="Mass Summon Storm Cubic" enchantGroup1="2">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/01400-01499.xml b/src/main/resources/data/stats/skills/01400-01499.xml
index 83d0bc90b91dc07fc74dbbb24b245ccb4e0c219e..de13a9cb22e63f11b09d366f2d9d30d74ba2aed6 100644
--- a/src/main/resources/data/stats/skills/01400-01499.xml
+++ b/src/main/resources/data/stats/skills/01400-01499.xml
@@ -992,6 +992,7 @@
 				<param npcId="13028" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1423" levels="1" name="Gehenna">
 		<set name="affectLimit" val="15-25" />
@@ -1189,6 +1190,7 @@
 		<effects>
 			<effect name="CallParty" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1430" levels="5" name="Invocation">
 		<!-- High Five Confirmed -->
@@ -1731,6 +1733,7 @@
 				<mul stat="mAtk" val="#mAtk" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1442" levels="3" name="Protection from Darkness" enchantGroup1="1" enchantGroup2="1">
 		<!-- High Five Confirmed -->
@@ -2611,6 +2614,7 @@
 				<add stat="healEffect" val="#ench1Power" />
 			</effect>
 		</enchant1Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1460" levels="1" name="Mana Gain" enchantGroup1="5" enchantGroup2="5">
 		<!-- High Five Confirmed -->
@@ -3889,6 +3893,7 @@
 				<add stat="waterRes" val="60" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1494" levels="1" name="Hurricane Armor">
 		<!-- High Five Confirmed -->
@@ -3918,6 +3923,7 @@
 				<add stat="windRes" val="60" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1495" levels="1" name="Vampiric Mist">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/01500-01599.xml b/src/main/resources/data/stats/skills/01500-01599.xml
index abfc7308721431d5eca12479b88442f133cf4c24..6b75f06be39157ba28f082e331f17534e5d1e808 100644
--- a/src/main/resources/data/stats/skills/01500-01599.xml
+++ b/src/main/resources/data/stats/skills/01500-01599.xml
@@ -659,6 +659,7 @@
 				<param CROSSBOW="6" />
 			</effect>
 		</enchant2Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1515" levels="1" name="Lightning Barrier" enchantGroup1="5" enchantGroup2="5" enchantGroup3="5">
 		<!-- Confirmed CT2.5 -->
@@ -724,6 +725,7 @@
 				<param targetType="ONE" />
 			</effect>
 		</enchant3Effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1516" levels="1" name="Soul Strike" enchantGroup1="6" enchantGroup2="6">
 		<!-- High Five Confirmed -->
@@ -910,6 +912,7 @@
 				<param id="316" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1521" levels="1" name="Inquisitor">
 		<!-- Confirmed CT2.5 -->
@@ -936,6 +939,7 @@
 				<param id="317" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1522" levels="1" name="Inquisitor">
 		<!-- Confirmed CT2.5 -->
@@ -962,6 +966,7 @@
 				<param id="318" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1523" levels="42" name="Divine Punishment">
 		<!-- High Five Confirmed -->
@@ -1335,6 +1340,7 @@
 				<mul stat="magicalMpConsumeRate" val="0.1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1533" levels="1" name="Enlightenment">
 		<set name="abnormalLvl" val="1" />
@@ -1360,6 +1366,7 @@
 				<mul stat="magicalMpConsumeRate" val="0.1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1534" levels="1" name="Courage of Pa'agrio">
 		<!-- High Five Confirmed -->
@@ -1636,6 +1643,7 @@
 				<mul stat="regHp" val="0" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1541" levels="1" name="Curse of Desparion">
 		<!-- Confirmed CT2.5 -->
@@ -2315,6 +2323,7 @@
 				<param heal="true" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="1562" levels="2" name="Chant of Berserker">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/02000-02099.xml b/src/main/resources/data/stats/skills/02000-02099.xml
index ba9c58daa95cb616b6ce22e8db1bf7952d556431..1526add364788a7fd094fab3ad58dc4f26bdb495 100644
--- a/src/main/resources/data/stats/skills/02000-02099.xml
+++ b/src/main/resources/data/stats/skills/02000-02099.xml
@@ -86,6 +86,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2007" levels="1" name="Scroll: Enchant Armor (Grade A)">
 		<set name="isMagic" val="2" />
@@ -93,6 +94,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2008" levels="1" name="Item - Beast Spirit Shot">
 		<set name="isMagic" val="2" />
@@ -100,6 +102,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2009" levels="1" name="Item - Beast Blessed Spirit Shot">
 		<set name="isMagic" val="2" />
@@ -107,6 +110,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2010" levels="1" name="Endeavor Potion">
 		<!-- High Five Confirmed -->
@@ -210,6 +214,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2016" levels="1" name="Scroll: Enchant Armor (Grade B)">
 		<set name="isMagic" val="2" />
@@ -217,6 +222,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2017" levels="1" name="Scroll: Enchant Weapon (Grade C)">
 		<set name="isMagic" val="2" />
@@ -224,6 +230,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2018" levels="1" name="Scroll: Enchant Armor (Grade C)">
 		<set name="isMagic" val="2" />
@@ -231,6 +238,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2019" levels="1" name="Scroll: Enchant Weapon (Grade D)">
 		<set name="isMagic" val="2" />
@@ -238,6 +246,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2020" levels="1" name="Scroll: Enchant Armor (Grade D)">
 		<set name="isMagic" val="2" />
@@ -245,6 +254,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2021" levels="1" name="Scroll: Enchant Weapon (Grade S)">
 		<set name="isMagic" val="2" />
@@ -252,6 +262,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2022" levels="1" name="Scroll: Enchant Armor (Grade S)">
 		<set name="isMagic" val="2" />
@@ -259,6 +270,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2023" levels="1" name="Star Shard">
 		<!-- High Five Confirmed -->
@@ -303,6 +315,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2027" levels="1" name="Scroll: Enchant Weapon (Grade A)">
 		<!-- Blessed Enchant -->
@@ -311,6 +324,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2028" levels="1" name="Scroll: Enchant Weapon (Grade B)">
 		<!-- Blessed Enchant -->
@@ -319,6 +333,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2029" levels="1" name="Scroll: Enchant Weapon (Grade C)">
 		<!-- Blessed Enchant -->
@@ -327,6 +342,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2030" levels="1" name="Scroll: Enchant Weapon (Grade D)">
 		<!-- Blessed Enchant -->
@@ -335,6 +351,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2031" levels="1" name="Lesser Healing Potion">
 		<!-- High Five Confirmed -->
@@ -382,6 +399,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2034" levels="1" name="Greater Haste Potion">
 		<!-- High Five Confirmed -->
@@ -486,6 +504,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2040" levels="1" name="Scroll of Escape: Clan Hall">
 		<!-- High Five Confirmed -->
@@ -615,6 +634,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2048" levels="1" name="Wolves' Food">
 		<!-- High Five Confirmed -->
@@ -895,6 +915,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2062" levels="1" name="Blessed Scroll of Resurrection">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/02100-02199.xml b/src/main/resources/data/stats/skills/02100-02199.xml
index d73b0dc05c56d51546b091c7a51dc65cac9df2b0..02e737a576423fc4fca3e698c71a3e3d86e45231 100644
--- a/src/main/resources/data/stats/skills/02100-02199.xml
+++ b/src/main/resources/data/stats/skills/02100-02199.xml
@@ -73,6 +73,7 @@
 				<player transformationId="103" />
 			</not>
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2104" levels="1" name="Greater Compressed Package of Soulshots: No-grade">
 		<!-- Confirmed CT2.5 -->
@@ -693,6 +694,7 @@
 				<param power="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2137" levels="1" name="Summon Regular Tree">
 		<!-- Confirmed CT2.5 -->
@@ -751,6 +753,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2141" levels="1" name="Item - Carol Sound Crystal">
 		<set name="isMagic" val="2" />
@@ -758,6 +761,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2142" levels="1" name="Item - Carol Sound Crystal">
 		<set name="isMagic" val="2" />
@@ -765,6 +769,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2143" levels="1" name="Item - Carol Sound Crystal">
 		<set name="isMagic" val="2" />
@@ -772,6 +777,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2144" levels="1" name="Item - Carol Sound Crystal">
 		<set name="isMagic" val="2" />
@@ -779,6 +785,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2145" levels="1" name="Item - Carol Sound Crystal">
 		<set name="isMagic" val="2" />
@@ -786,6 +793,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2146" levels="1" name="Item - Carol Sound Crystal">
 		<set name="isMagic" val="2" />
@@ -793,6 +801,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2147" levels="1" name="Item - Carol Sound Crystal">
 		<set name="isMagic" val="2" />
@@ -800,6 +809,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2148" levels="1" name="Item - Carol Sound Crystal">
 		<set name="isMagic" val="2" />
@@ -807,6 +817,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2149" levels="1" name="Item - Carol Sound Crystal">
 		<set name="isMagic" val="2" />
@@ -814,6 +825,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2150" levels="1" name="Soulshot: D-Grade">
 		<set name="isMagic" val="2" />
@@ -821,6 +833,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2151" levels="1" name="Soulshot: C-Grade">
 		<set name="isMagic" val="2" />
@@ -828,6 +841,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2152" levels="1" name="Soulshot: B-Grade">
 		<set name="isMagic" val="2" />
@@ -835,6 +849,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2153" levels="1" name="Soulshot: A-Grade">
 		<set name="isMagic" val="2" />
@@ -842,6 +857,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2154" levels="1" name="Soulshot: S-Grade">
 		<set name="isMagic" val="2" />
@@ -849,6 +865,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2155" levels="1" name="Spiritshot: D-Grade">
 		<set name="isMagic" val="2" />
@@ -856,6 +873,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2156" levels="1" name="Spiritshot: C-Grade">
 		<set name="isMagic" val="2" />
@@ -863,6 +881,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2157" levels="1" name="Spiritshot: B-Grade">
 		<set name="isMagic" val="2" />
@@ -870,6 +889,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2158" levels="1" name="Spiritshot: A-Grade">
 		<set name="isMagic" val="2" />
@@ -877,6 +897,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2159" levels="1" name="Spiritshot: S-Grade">
 		<set name="isMagic" val="2" />
@@ -884,6 +905,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2160" levels="1" name="Blessed Spiritshot: D-Grade">
 		<set name="isMagic" val="2" />
@@ -891,6 +913,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2161" levels="1" name="Blessed Spiritshot: C-Grade">
 		<set name="isMagic" val="2" />
@@ -898,6 +921,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2162" levels="1" name="Blessed Spiritshot: B-Grade">
 		<set name="isMagic" val="2" />
@@ -905,6 +929,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2163" levels="1" name="Blessed Spiritshot: A-Grade">
 		<set name="isMagic" val="2" />
@@ -912,6 +937,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2164" levels="1" name="Blessed Spiritshot: S-Grade">
 		<set name="isMagic" val="2" />
@@ -919,6 +945,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2165" levels="1" name="Energy Stone">
 		<!-- Confirmed CT2.5 -->
@@ -932,6 +959,7 @@
 				<param charge="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2166" levels="2" name="CP Gauge Potion">
 		<table name="#amount"> 50 200 </table>
@@ -945,6 +973,7 @@
 				<param amount="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2167" levels="4" name="Scroll of SP">
 		<!-- Confirmed CT2.5 -->
@@ -964,6 +993,7 @@
 				<param sp="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2168" levels="6" name="Raid Blessing">
 		<table name="#abnormalLvl"> 1 2 3 4 5 6 </table>
@@ -986,6 +1016,7 @@
 				<mul stat="reduceDeathPenaltyByRaid" val="0" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2169" levels="2" name="Magic Haste Potion">
 		<!-- Lvl 2 is Greater Magic Haste Potion -->
@@ -1007,6 +1038,7 @@
 				<mul stat="mAtkSpd" val="#mAtkSpd" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2170" levels="1" name="Scroll: Cancel Sleep">
 		<!-- High Five Confirmed -->
@@ -1266,6 +1298,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2182" levels="1" name="Item - Fishing Shot">
 		<set name="isMagic" val="2" />
@@ -1273,6 +1306,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2183" levels="1" name="Item - Fishing Shot">
 		<set name="isMagic" val="2" />
@@ -1280,6 +1314,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2184" levels="1" name="Item - Fishing Shot">
 		<set name="isMagic" val="2" />
@@ -1287,6 +1322,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2185" levels="1" name="Item - Fishing Shot">
 		<set name="isMagic" val="2" />
@@ -1294,6 +1330,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2186" levels="1" name="Item - Fishing Shot">
 		<set name="isMagic" val="2" />
@@ -1301,6 +1338,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2187" levels="1" name="Item - Special Sound Crystal">
 		<set name="isMagic" val="2" />
@@ -1308,6 +1346,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2188" levels="1" name="Golden Spice">
 		<!-- Confirmed CT2.5 -->
diff --git a/src/main/resources/data/stats/skills/02200-02299.xml b/src/main/resources/data/stats/skills/02200-02299.xml
index 5d7afb252fdf5c76c9dc8adaeb08ef18d984d8c3..4b07ba78d7ee06596bac0cdbc5037af8e284535b 100644
--- a/src/main/resources/data/stats/skills/02200-02299.xml
+++ b/src/main/resources/data/stats/skills/02200-02299.xml
@@ -198,6 +198,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2209" levels="1" name="Item - Blessed Scroll of Enchant Armor">
 		<set name="isMagic" val="2" />
@@ -205,6 +206,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2210" levels="1" name="Item - Blessed Scroll of Enchant Armor">
 		<set name="isMagic" val="2" />
@@ -212,6 +214,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2211" levels="1" name="Item - Blessed Scroll of Enchant Armor">
 		<set name="isMagic" val="2" />
@@ -219,6 +222,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2212" levels="1" name="Item - Blessed Scroll of Enchant Armor">
 		<set name="isMagic" val="2" />
@@ -226,6 +230,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2213" levels="22" name="Escape - Talking Island Village">
 		<!-- High Five Confirmed -->
@@ -713,6 +718,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2231" levels="1" name="Amulet: Protection of Valakas">
 		<!-- Confirmed CT2.5 -->
@@ -734,6 +740,7 @@
 				<param VALAKAS="11" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2232" levels="1" name="Amulet: Slay Valakas">
 		<!-- Confirmed CT2.5 -->
@@ -755,6 +762,7 @@
 				<param VALAKAS="-20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2233" levels="1" name="Amulet: Flames of Valakas">
 		<!-- Confirmed CT2.5 -->
@@ -772,6 +780,7 @@
 				<param dispel="DRAGON_BREATH,1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2234" levels="1" name="Soul Breaking Arrow">
 		<!-- High Five Confirmed -->
@@ -1156,6 +1165,7 @@
 				<add stat="firePower" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2249" levels="1" name="Bless of Water">
 		<set name="abnormalLvl" val="1" />
@@ -1176,6 +1186,7 @@
 				<add stat="waterPower" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2250" levels="1" name="Bless of Wind">
 		<set name="abnormalLvl" val="1" />
@@ -1196,6 +1207,7 @@
 				<add stat="windPower" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2251" levels="1" name="Bless of Earth">
 		<set name="abnormalLvl" val="1" />
@@ -1216,6 +1228,7 @@
 				<add stat="earthPower" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2252" levels="1" name="Bless of Darkness">
 		<set name="abnormalLvl" val="1" />
@@ -1236,6 +1249,7 @@
 				<add stat="darkPower" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2253" levels="1" name="Bless of Sacredness">
 		<set name="abnormalLvl" val="1" />
@@ -1256,6 +1270,7 @@
 				<add stat="holyPower" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2254" levels="3" name="Crystal of Fire">
 		<set name="hitTime" val="1000" />
@@ -1267,6 +1282,7 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2255" levels="3" name="Crystal of Water">
 		<set name="hitTime" val="1000" />
@@ -1278,6 +1294,7 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2256" levels="3" name="Crystal of Wind">
 		<set name="hitTime" val="1000" />
@@ -1289,6 +1306,7 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2257" levels="3" name="Crystal of Earth">
 		<set name="hitTime" val="1000" />
@@ -1300,6 +1318,7 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2258" levels="3" name="Crystal of Darkness">
 		<set name="hitTime" val="1000" />
@@ -1311,6 +1330,7 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2259" levels="3" name="Crystal of Sacredness">
 		<set name="hitTime" val="1000" />
@@ -1322,6 +1342,7 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2260" levels="1" name="Key of Riddles">
 		<!-- Confirmed CT2.5 -->
@@ -1673,6 +1694,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2273" levels="1" name="Item - Red Devil Support Box">
 		<!-- Confirmed CT2.5 -->
@@ -1714,6 +1736,7 @@
 		<effects>
 			<effect name="ChangeFishingMastery" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2275" levels="1" name="Fisherman's Recovery Potion">
 		<!-- Confirmed CT2.5 -->
@@ -1728,6 +1751,7 @@
 				<param dispel="FISHING_MASTERY_DOWN,1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2276" levels="1" name="Dewdrop of Destruction">
 		<!-- High Five Confirmed -->
@@ -2092,6 +2116,7 @@
 		<effects>
 			<effect name="ChangeFace" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2292" levels="1" name="Facelifting Potion">
 		<!-- Confirmed CT2.5 -->
@@ -2108,6 +2133,7 @@
 				<param value="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2293" levels="1" name="Facelifting Potion">
 		<!-- Confirmed CT2.5 -->
@@ -2124,6 +2150,7 @@
 				<param value="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2294" levels="1" name="Dye Potion">
 		<!-- Confirmed CT2.5 -->
@@ -2138,6 +2165,7 @@
 		<effects>
 			<effect name="ChangeHairColor" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2295" levels="1" name="Dye Potion">
 		<!-- Confirmed CT2.5 -->
@@ -2154,6 +2182,7 @@
 				<param value="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2296" levels="1" name="Dye Potion">
 		<!-- Confirmed CT2.5 -->
@@ -2170,6 +2199,7 @@
 				<param value="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2297" levels="1" name="Dye Potion">
 		<!-- Confirmed CT2.5 -->
@@ -2186,6 +2216,7 @@
 				<param value="3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2298" levels="1" name="Hair Style Change Potion">
 		<!-- Confirmed CT2.5 -->
@@ -2200,6 +2231,7 @@
 		<effects>
 			<effect name="ChangeHairStyle" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2299" levels="1" name="Hair Style Change Potion">
 		<!-- Confirmed CT2.5 -->
@@ -2216,5 +2248,6 @@
 				<param value="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/02300-02399.xml b/src/main/resources/data/stats/skills/02300-02399.xml
index c26a65ce2a38a9bfd3b3e552e0b070fa03df81fb..12c42b3a3c0925c46ba8964685c54cf35f6675bc 100644
--- a/src/main/resources/data/stats/skills/02300-02399.xml
+++ b/src/main/resources/data/stats/skills/02300-02399.xml
@@ -15,6 +15,7 @@
 				<param value="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2301" levels="1" name="Hair Style Change Potion">
 		<!-- Confirmed CT2.5 -->
@@ -31,6 +32,7 @@
 				<param value="3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2302" levels="1" name="Hair Style Change Potion">
 		<!-- Confirmed CT2.5 -->
@@ -47,6 +49,7 @@
 				<param value="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2303" levels="1" name="Hair Style Change Potion">
 		<!-- Confirmed CT2.5 -->
@@ -66,6 +69,7 @@
 				<param value="5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2304" levels="1" name="Hair Style Change Potion">
 		<!-- Confirmed CT2.5 -->
@@ -85,6 +89,7 @@
 				<param value="6" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2305" levels="1" name="Primeval Potion">
 		<!-- Confirmed CT2.5 -->
@@ -101,6 +106,7 @@
 				<param SHOCK="15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2306" levels="3" name="Primeval Crystals">
 		<!-- Lvl 1 Name - Blue Primeval Crystal -->
@@ -125,6 +131,7 @@
 				<param sp="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2307" levels="1" name="Remove Petrification Scroll">
 		<!-- Confirmed CT2.5 -->
@@ -141,6 +148,7 @@
 				<param dispel="TURN_STONE" rate="99" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2308" levels="36" name="Event Item">
 		<!-- Confirmed CT2.5 -->
@@ -239,6 +247,7 @@
 				<add stat="accCombat" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2311" levels="1" name="Scroll of Death Whisper - Event Use">
 		<set name="abnormalLvl" val="4" />
@@ -258,6 +267,7 @@
 				<mul stat="critDmg" val="1.35" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2312" levels="1" name="Scroll of Focus - Event Use">
 		<set name="abnormalLvl" val="4" />
@@ -277,6 +287,7 @@
 				<mul stat="critRate" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2313" levels="1" name="Scroll of Acumen - Event Use">
 		<set name="abnormalLvl" val="4" />
@@ -296,6 +307,7 @@
 				<mul stat="mAtkSpd" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2314" levels="1" name="Scroll of Haste - Event Use">
 		<set name="abnormalLvl" val="3" />
@@ -315,6 +327,7 @@
 				<mul stat="pAtkSpd" val="1.33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2315" levels="1" name="Scroll of Agility - Event Use">
 		<set name="abnormalLvl" val="4" />
@@ -334,6 +347,7 @@
 				<add stat="rEvas" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2316" levels="1" name="Scroll of Empower - Event Use">
 		<set name="abnormalLvl" val="4" />
@@ -353,6 +367,7 @@
 				<mul stat="mAtk" val="1.75" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2317" levels="1" name="Scroll of Might - Event Use">
 		<set name="abnormalLvl" val="4" />
@@ -372,6 +387,7 @@
 				<mul stat="pAtk" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2318" levels="1" name="Scroll of Wind Walk - Event Use">
 		<set name="abnormalLvl" val="3" />
@@ -391,6 +407,7 @@
 				<add stat="runSpd" val="33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2319" levels="1" name="Scroll of Shield - Event Use">
 		<set name="abnormalLvl" val="4" />
@@ -410,6 +427,7 @@
 				<mul stat="pDef" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2320" levels="1" name="Blessed Scroll of Escape - Event Use">
 		<!-- High Five Confirmed -->
@@ -456,6 +474,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2322" levels="1" name="Chest Key - For Events Only">
 		<!-- High Five Confirmed -->
@@ -628,6 +647,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2330" levels="4" name="Water Stone">
 		<set name="isMagic" val="2" />
@@ -635,6 +655,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2331" levels="4" name="Wind Stone">
 		<set name="isMagic" val="2" />
@@ -642,6 +663,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2332" levels="4" name="Earth Stone">
 		<set name="isMagic" val="2" />
@@ -649,6 +671,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2333" levels="4" name="Divine Stone">
 		<set name="isMagic" val="2" />
@@ -656,6 +679,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2334" levels="4" name="Dark Stone">
 		<set name="isMagic" val="2" />
@@ -663,6 +687,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2335" levels="1" name="Fire Resist Potion">
 		<set name="abnormalLvl" val="1" />
@@ -680,6 +705,7 @@
 				<add stat="fireRes" val="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2336" levels="1" name="Water Resist Potion">
 		<set name="abnormalLvl" val="1" />
@@ -697,6 +723,7 @@
 				<add stat="waterRes" val="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2337" levels="1" name="Wind Resist Potion">
 		<set name="abnormalLvl" val="1" />
@@ -714,6 +741,7 @@
 				<add stat="windRes" val="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2338" levels="1" name="Earth Resist Potion">
 		<set name="abnormalLvl" val="1" />
@@ -731,6 +759,7 @@
 				<add stat="earthRes" val="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2339" levels="1" name="Holy Resist Potion">
 		<set name="abnormalLvl" val="1" />
@@ -748,6 +777,7 @@
 				<add stat="holyRes" val="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2340" levels="1" name="Unholy Resist Potion">
 		<set name="abnormalLvl" val="1" />
@@ -765,6 +795,7 @@
 				<add stat="darkRes" val="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2341" levels="1" name="Caravan's Secret Medicine">
 		<set name="abnormalLvl" val="2" />
@@ -779,6 +810,7 @@
 		<effects>
 			<effect name="Buff" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2342" levels="1" name="Ballista Bomb">
 		<!-- High Five Confirmed -->
@@ -1174,6 +1206,7 @@
 		<effects>
 			<effect name="Buff" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2358" levels="1" name="Holy Water">
 		<!-- High Five Confirmed -->
@@ -1458,6 +1491,7 @@
 				<param id="104" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2371" levels="1" name="Transform Sealbook - Onyx Beast">
 		<!-- Confirmed CT2.5 -->
@@ -1481,6 +1515,7 @@
 				<param id="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2372" levels="1" name="Transform Sealbook - Death Blader">
 		<!-- Confirmed CT2.5 -->
@@ -1504,6 +1539,7 @@
 				<param id="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2373" levels="1" name="Transform Sealbook - Grail Apostle">
 		<!-- Confirmed CT2.5 -->
@@ -1528,6 +1564,7 @@
 				<param id="202" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2374" levels="1" name="Transform Sealbook - Unicorn">
 		<!-- Confirmed CT2.5 -->
@@ -1552,6 +1589,7 @@
 				<param id="205" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2375" levels="1" name="Transform Sealbook - Lilim Knight">
 		<!-- Confirmed CT2.5 -->
@@ -1576,6 +1614,7 @@
 				<param id="208" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2376" levels="1" name="Transform Sealbook - Golem Guardian">
 		<!-- Confirmed CT2.5 -->
@@ -1600,6 +1639,7 @@
 				<param id="211" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2377" levels="1" name="Transform Sealbook - Inferno Drake">
 		<!-- Confirmed CT2.5 -->
@@ -1624,6 +1664,7 @@
 				<param id="214" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2378" levels="1" name="Transform Sealbook - Dragon Bomber">
 		<!-- Confirmed CT2.5 -->
@@ -1648,6 +1689,7 @@
 				<param id="217" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2379" levels="1" name="Wind">
 		<!-- Confirmed CT2.5 -->
@@ -1665,6 +1707,7 @@
 				<add stat="runSpd" val="33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2380" levels="1" name="Shield">
 		<!-- Confirmed CT2.5 -->
@@ -1682,6 +1725,7 @@
 				<mul stat="pDef" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2381" levels="1" name="Magic Barrier">
 		<!-- Confirmed CT2.5 -->
@@ -1699,6 +1743,7 @@
 				<mul stat="mDef" val="1.23" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2382" levels="1" name="Bless Shield">
 		<!-- Confirmed CT2.5 -->
@@ -1716,6 +1761,7 @@
 				<mul stat="rShld" val="1.35" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2383" levels="1" name="Haste">
 		<!-- Confirmed CT2.5 -->
@@ -1733,6 +1779,7 @@
 				<mul stat="pAtkSpd" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2384" levels="1" name="Acumen">
 		<!-- Confirmed CT2.5 -->
@@ -1750,6 +1797,7 @@
 				<mul stat="mAtkSpd" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2385" levels="1" name="Empower">
 		<!-- Confirmed CT2.5 -->
@@ -1767,6 +1815,7 @@
 				<mul stat="mAtk" val="1.55" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2386" levels="1" name="Divine Power">
 		<!-- Confirmed CT2.5 -->
@@ -1784,6 +1833,7 @@
 				<add stat="healEffect" val="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2387" levels="1" name="Might">
 		<!-- Confirmed CT2.5 -->
@@ -1801,6 +1851,7 @@
 				<mul stat="pAtk" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2388" levels="1" name="Focus">
 		<!-- Confirmed CT2.5 -->
@@ -1818,6 +1869,7 @@
 				<mul stat="critRate" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2389" levels="1" name="Guidance">
 		<!-- Confirmed CT2.5 -->
@@ -1835,6 +1887,7 @@
 				<add stat="accCombat" val="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2390" levels="1" name="Berserker Spirit">
 		<!-- Confirmed CT2.5 -->
@@ -1859,6 +1912,7 @@
 				<sub stat="rEvas" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2391" levels="1" name="Clarity">
 		<!-- Confirmed CT2.5 -->
@@ -1878,6 +1932,7 @@
 				<mul stat="danceMpConsumeRate" val="0.9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2392" levels="1" name="Blessed Scroll of Battlefield Escape">
 		<!-- High Five Confirmed -->
@@ -1925,6 +1980,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2394" levels="1" name="Scroll of Battlefield Transformation">
 		<!-- Confirmed CT2.5 -->
@@ -1949,6 +2005,7 @@
 				<param id="304" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2395" levels="1" name="Lesser Battlefield Healing Potion">
 		<!-- Confirmed CT2.5 -->
@@ -1969,6 +2026,7 @@
 				<param amount="1900" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2396" levels="1" name="Mental Potion">
 		<!-- Confirmed CT2.5 -->
@@ -1988,6 +2046,7 @@
 				<param DERANGEMENT="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2397" levels="1" name="Medusa Potion">
 		<!-- Confirmed CT2.5 -->
@@ -2004,10 +2063,10 @@
 		<effects>
 			<effect name="Stun" />
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockBuff" />
 			<effect name="BlockDebuff" />
@@ -2015,6 +2074,7 @@
 				<mul stat="regHp" val="0" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2398" levels="1" name="Instant Haste Potion">
 		<!-- Confirmed CT2.5 -->
@@ -2032,6 +2092,7 @@
 				<add stat="runSpd" val="66" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2399" levels="1" name="Capture Rope">
 		<!-- Confirmed CT2.5 -->
diff --git a/src/main/resources/data/stats/skills/02400-02499.xml b/src/main/resources/data/stats/skills/02400-02499.xml
index e344559c4d4fe9ae86c144ad77210f5fa2e5444d..ecb00bc4740d9df5ed216656c16505bf0f7f47b1 100644
--- a/src/main/resources/data/stats/skills/02400-02499.xml
+++ b/src/main/resources/data/stats/skills/02400-02499.xml
@@ -39,6 +39,7 @@
 				<param amount="360" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2402" levels="1" name="Lesser Battlefield CP Potion">
 		<!-- Confirmed CT2.5 -->
@@ -56,6 +57,7 @@
 				<param amount="1000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2403" levels="1" name="Spring CP Potion">
 		<!-- Confirmed CT2.5 -->
@@ -70,6 +72,7 @@
 				<param amount="1000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2404" levels="1" name="Might">
 		<!-- Confirmed CT2.5 -->
@@ -88,6 +91,7 @@
 				<mul stat="pAtk" val="1.12" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2405" levels="1" name="Shield">
 		<!-- Confirmed CT2.5 -->
@@ -106,6 +110,7 @@
 				<mul stat="pDef" val="1.12" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2406" levels="1" name="Wind Walk">
 		<!-- Confirmed CT2.5 -->
@@ -124,6 +129,7 @@
 				<add stat="runSpd" val="33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2407" levels="1" name="Focus">
 		<!-- Confirmed CT2.5 -->
@@ -142,6 +148,7 @@
 				<mul stat="critRate" val="1.25" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2408" levels="1" name="Death Whisper">
 		<!-- Confirmed CT2.5 -->
@@ -160,6 +167,7 @@
 				<mul stat="critDmg" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2409" levels="1" name="Guidance">
 		<!-- Confirmed CT2.5 -->
@@ -178,6 +186,7 @@
 				<add stat="accCombat" val="3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2410" levels="1" name="Bless Shield">
 		<!-- Confirmed CT2.5 -->
@@ -196,6 +205,7 @@
 				<mul stat="rShld" val="1.1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2411" levels="1" name="Blessed Body">
 		<!-- Confirmed CT2.5 -->
@@ -215,6 +225,7 @@
 				<param type="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2412" levels="1" name="Haste">
 		<!-- Confirmed CT2.5 -->
@@ -233,6 +244,7 @@
 				<mul stat="pAtkSpd" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2413" levels="1" name="Vampiric Rage">
 		<!-- High Five Confirmed -->
@@ -278,6 +290,7 @@
 				<sub stat="rEvas" val="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2415" levels="1" name="Magic Barrier">
 		<!-- Confirmed CT2.5 -->
@@ -296,6 +309,7 @@
 				<mul stat="mDef" val="1.23" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2416" levels="1" name="Blessed Soul">
 		<!-- Confirmed CT2.5 -->
@@ -315,6 +329,7 @@
 				<param type="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2417" levels="1" name="Empower">
 		<!-- Confirmed CT2.5 -->
@@ -333,6 +348,7 @@
 				<mul stat="mAtk" val="1.65" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2418" levels="1" name="Acumen">
 		<!-- Confirmed CT2.5 -->
@@ -351,6 +367,7 @@
 				<mul stat="mAtkSpd" val="1.23" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2419" levels="1" name="Clarity">
 		<!-- Confirmed CT2.5 -->
@@ -371,6 +388,7 @@
 				<mul stat="danceMpConsumeRate" val="0.9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2420" levels="1" name="White Seed of Evil Lump">
 		<!-- Confirmed CT2.5 -->
@@ -566,6 +584,7 @@
 				<param id="105" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2429" levels="1" name="Haste Juice">
 		<!-- Confirmed CT2.5 -->
@@ -586,6 +605,7 @@
 				<mul stat="pAtkSpd" val="1.33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2430" levels="1" name="Accuracy Juice">
 		<!-- Confirmed CT2.5 -->
@@ -606,6 +626,7 @@
 				<add stat="accCombat" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2431" levels="1" name="Critical Power Juice">
 		<!-- Confirmed CT2.5 -->
@@ -626,6 +647,7 @@
 				<mul stat="critDmg" val="1.35" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2432" levels="1" name="Critical Attack Juice">
 		<!-- Confirmed CT2.5 -->
@@ -646,6 +668,7 @@
 				<mul stat="critRate" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2433" levels="1" name="Casting Speed Juice">
 		<!-- Confirmed CT2.5 -->
@@ -666,6 +689,7 @@
 				<mul stat="mAtkSpd" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2434" levels="1" name="Evasion Juice">
 		<!-- Confirmed CT2.5 -->
@@ -686,6 +710,7 @@
 				<add stat="rEvas" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2435" levels="1" name="Magic Power Juice">
 		<!-- Confirmed CT2.5 -->
@@ -706,6 +731,7 @@
 				<mul stat="mAtk" val="1.75" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2436" levels="1" name="Power Juice">
 		<!-- Confirmed CT2.5 -->
@@ -726,6 +752,7 @@
 				<mul stat="pAtk" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2437" levels="1" name="Speed Juice">
 		<!-- Confirmed CT2.5 -->
@@ -746,6 +773,7 @@
 				<add stat="runSpd" val="33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2438" levels="1" name="Defense Juice">
 		<!-- Confirmed CT2.5 -->
@@ -766,6 +794,7 @@
 				<mul stat="pDef" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2439" levels="1" name="MP Consumption Juice">
 		<!-- Confirmed CT2.5 -->
@@ -788,6 +817,7 @@
 				<mul stat="danceMpConsumeRate" val="0.9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2440" levels="1" name="Ancient Tome of the Demon">
 		<!-- Confirmed CT2.5 -->
@@ -835,6 +865,7 @@
 				<param skillId="755" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2442" levels="1" name="Protection of Elemental">
 		<!-- Confirmed CT2.5 -->
@@ -860,6 +891,7 @@
 				<param skillId="756" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2443" levels="1" name="Protection of Alignment">
 		<!-- Confirmed CT2.5 -->
@@ -885,6 +917,7 @@
 				<param skillId="757" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2444" levels="1" name="Fighter's Will">
 		<!-- Confirmed CT2.5 -->
@@ -910,6 +943,7 @@
 				<param skillId="758" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2445" levels="1" name="Archer's Will">
 		<!-- Confirmed CT2.5 -->
@@ -935,6 +969,7 @@
 				<param skillId="759" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2446" levels="1" name="Anti-magic Armor">
 		<!-- Confirmed CT2.5 -->
@@ -960,6 +995,7 @@
 				<param skillId="760" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2447" levels="1" name="Seed of Revenge">
 		<!-- Confirmed CT2.5 -->
@@ -988,6 +1024,7 @@
 				<param skillId="762" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2448" levels="1" name="Hell Scream">
 		<!-- Confirmed CT2.5 -->
@@ -1013,6 +1050,7 @@
 				<param skillId="763" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2449" levels="1" name="Song of Wind Storm">
 		<!-- Confirmed CT2.5 -->
@@ -1038,6 +1076,7 @@
 				<param skillId="764" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2450" levels="1" name="Dance of Blade Storm">
 		<!-- Confirmed CT2.5 -->
@@ -1063,6 +1102,7 @@
 				<param skillId="765" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2451" levels="1" name="Sixth Sense">
 		<!-- Confirmed CT2.5 -->
@@ -1088,6 +1128,7 @@
 				<param skillId="766" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2452" levels="1" name="Expose Weak Point">
 		<!-- Confirmed CT2.5 -->
@@ -1113,6 +1154,7 @@
 				<param skillId="767" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2453" levels="1" name="Exciting Adventure">
 		<!-- Confirmed CT2.5 -->
@@ -1138,6 +1180,7 @@
 				<param skillId="768" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2454" levels="1" name="Wind Riding">
 		<!-- Confirmed CT2.5 -->
@@ -1163,6 +1206,7 @@
 				<param skillId="769" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2455" levels="1" name="Ghost Walking">
 		<!-- Confirmed CT2.5 -->
@@ -1188,6 +1232,7 @@
 				<param skillId="770" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2456" levels="1" name="Flame Hawk">
 		<!-- Confirmed CT2.5 -->
@@ -1213,6 +1258,7 @@
 				<param skillId="771" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2457" levels="1" name="Arrow Rain">
 		<!-- Confirmed CT2.5 -->
@@ -1238,6 +1284,7 @@
 				<param skillId="772" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2458" levels="1" name="Ghost Piercing">
 		<!-- Confirmed CT2.5 -->
@@ -1263,6 +1310,7 @@
 				<param skillId="773" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2459" levels="1" name="Dread Pool">
 		<!-- Confirmed CT2.5 -->
@@ -1288,6 +1336,7 @@
 				<param skillId="774" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2460" levels="1" name="Weapon Blockade">
 		<!-- Confirmed CT2.5 -->
@@ -1313,6 +1362,7 @@
 				<param skillId="775" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2461" levels="1" name="Force of Destruction">
 		<!-- High Five Confirmed -->
@@ -1365,6 +1415,7 @@
 				<param skillId="777" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2463" levels="1" name="Golem Armor">
 		<!-- Confirmed CT2.5 -->
@@ -1390,6 +1441,7 @@
 				<param skillId="778" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2464" levels="1" name="Flame Armor">
 		<!-- Confirmed CT2.5 -->
@@ -1415,6 +1467,7 @@
 				<param skillId="1492" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2465" levels="1" name="Frost Armor">
 		<!-- Confirmed CT2.5 -->
@@ -1440,6 +1493,7 @@
 				<param skillId="1493" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2466" levels="1" name="Hurricane Armor">
 		<!-- Confirmed CT2.5 -->
@@ -1465,6 +1519,7 @@
 				<param skillId="1494" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2467" levels="1" name="Vampiric Mist">
 		<!-- Confirmed CT2.5 -->
@@ -1490,6 +1545,7 @@
 				<param skillId="1495" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2468" levels="1" name="Servitor Barrier">
 		<!-- Confirmed CT2.5 -->
@@ -1515,6 +1571,7 @@
 				<param skillId="1496" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2469" levels="1" name="Excessive Loyalty">
 		<!-- Confirmed CT2.5 -->
@@ -1540,6 +1597,7 @@
 				<param skillId="1497" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2470" levels="1" name="Mutual Response">
 		<!-- Confirmed CT2.5 -->
@@ -1565,6 +1623,7 @@
 				<param skillId="1498" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2471" levels="1" name="Improve Combat">
 		<!-- Confirmed CT2.5 -->
@@ -1590,6 +1649,7 @@
 				<param skillId="1499" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2472" levels="1" name="Improve Magic">
 		<!-- Confirmed CT2.5 -->
@@ -1615,6 +1675,7 @@
 				<param skillId="1500" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2473" levels="1" name="Improve Condition">
 		<!-- Confirmed CT2.5 -->
@@ -1640,6 +1701,7 @@
 				<param skillId="1501" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2474" levels="1" name="Improve Critical">
 		<!-- Confirmed CT2.5 -->
@@ -1665,6 +1727,7 @@
 				<param skillId="1502" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2475" levels="1" name="Improve Shield Defense">
 		<!-- Confirmed CT2.5 -->
@@ -1690,6 +1753,7 @@
 				<param skillId="1503" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2476" levels="1" name="Improve Movement">
 		<!-- Confirmed CT2.5 -->
@@ -1715,6 +1779,7 @@
 				<param skillId="1504" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2477" levels="1" name="Sublime Self-sacrifice">
 		<!-- Confirmed CT2.5 -->
@@ -1740,6 +1805,7 @@
 				<param skillId="1505" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2478" levels="1" name="Blessing of Eva">
 		<!-- Confirmed CT2.5 -->
@@ -1765,6 +1831,7 @@
 				<param skillId="1506" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2479" levels="1" name="Lord of Vampire">
 		<!-- Confirmed CT2.5 -->
@@ -1790,6 +1857,7 @@
 				<param skillId="1507" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2480" levels="1" name="Throne Root">
 		<!-- Confirmed CT2.5 -->
@@ -1815,6 +1883,7 @@
 				<param skillId="1508" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2481" levels="1" name="Seal of Limit">
 		<!-- Confirmed CT2.5 -->
@@ -1840,6 +1909,7 @@
 				<param skillId="1509" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2482" levels="1" name="Spirit of Phoenix">
 		<!-- Confirmed CT2.5 -->
@@ -1868,6 +1938,7 @@
 				<param skillId="785" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2483" levels="1" name="Eva's Will">
 		<!-- Confirmed CT2.5 -->
@@ -1896,6 +1967,7 @@
 				<param skillId="787" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2484" levels="1" name="Pain of Shilen">
 		<!-- Confirmed CT2.5 -->
@@ -1924,6 +1996,7 @@
 				<param skillId="789" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2485" levels="1" name="Herb of Life">
 		<!-- High Five Confirmed -->
@@ -1980,6 +2053,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2488" levels="1" name="Wild Shot">
 		<!-- Confirmed CT2.5 -->
@@ -2005,6 +2079,7 @@
 				<param skillId="790" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2489" levels="1" name="Lightning Shock">
 		<!-- Confirmed CT2.5 -->
@@ -2030,6 +2105,7 @@
 				<param skillId="791" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2490" levels="1" name="Magic Defense Toolkit for beginners">
 		<!-- Confirmed CT2.5 -->
@@ -2066,6 +2142,7 @@
 				<param skillId="663" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2492" levels="1" name="Transform Anakim">
 		<!-- Confirmed CT2.5 -->
@@ -2080,6 +2157,7 @@
 				<param skillId="664" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2493" levels="1" name="Transform Venom">
 		<!-- Confirmed CT2.5 -->
@@ -2094,6 +2172,7 @@
 				<param skillId="665" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2494" levels="1" name="Transform Gordon">
 		<!-- Confirmed CT2.5 -->
@@ -2108,6 +2187,7 @@
 				<param skillId="666" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2495" levels="1" name="Transform Ranku">
 		<!-- Confirmed CT2.5 -->
@@ -2122,6 +2202,7 @@
 				<param skillId="667" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2496" levels="1" name="Transform Kietch">
 		<!-- Confirmed CT2.5 -->
@@ -2136,6 +2217,7 @@
 				<param skillId="668" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2497" levels="1" name="Transform Demon Prince">
 		<!-- Confirmed CT2.5 -->
@@ -2150,6 +2232,7 @@
 				<param skillId="669" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2498" levels="1" name="Bottle of Empty Soul">
 		<!-- Confirmed CT2.5 -->
@@ -2184,5 +2267,6 @@
 				<param charge="5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/02500-02599.xml b/src/main/resources/data/stats/skills/02500-02599.xml
index cbb819b26449c5ca4a9fe0820088be4d1b4ed238..b53a74fc6f82c5e629bd81c11c9051cb178dfc5b 100644
--- a/src/main/resources/data/stats/skills/02500-02599.xml
+++ b/src/main/resources/data/stats/skills/02500-02599.xml
@@ -106,6 +106,7 @@
 				<param skillId="1517" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2506" levels="1" name="Chant of Critical Attack">
 		<!-- Confirmed CT2.5 -->
@@ -131,6 +132,7 @@
 				<param skillId="1518" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2507" levels="1" name="Chant of Blood Awakening">
 		<!-- Confirmed CT2.5 -->
@@ -156,6 +158,7 @@
 				<param skillId="1519" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2508" levels="1" name="Squash Seed">
 		<!-- Confirmed CT2.5 -->
@@ -174,6 +177,7 @@
 				<param npcId="12774" npcCount="1" despawnDelay="180000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2509" levels="1" name="Large Squash Seed">
 		<!-- Confirmed CT2.5 -->
@@ -192,6 +196,7 @@
 				<param npcId="12777" npcCount="1" despawnDelay="180000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2510" levels="1" name="Wondrous Cubic">
 		<!-- Confirmed CT2.5 and Updated to H5 -->
@@ -236,6 +241,7 @@
 				<param id="107" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2512" levels="1" name="Herb of Vampiric Rage">
 		<!-- High Five Confirmed -->
@@ -330,6 +336,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2516" levels="1" name="Lucky Clover - C-Grade">
 		<set name="isMagic" val="2" />
@@ -337,6 +344,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2517" levels="1" name="Lucky Clover - B-Grade">
 		<set name="isMagic" val="2" />
@@ -344,6 +352,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2518" levels="1" name="Lucky Clover - A-Grade">
 		<set name="isMagic" val="2" />
@@ -351,6 +360,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2519" levels="1" name="Lucky Clover - S-Grade">
 		<set name="isMagic" val="2" />
@@ -358,6 +368,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2520" levels="1" name="Lucky Clover - D-Grade">
 		<set name="isMagic" val="2" />
@@ -365,6 +376,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2521" levels="1" name="Lucky Clover - C-Grade">
 		<set name="isMagic" val="2" />
@@ -372,6 +384,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2522" levels="1" name="Lucky Clover - B-Grade">
 		<set name="isMagic" val="2" />
@@ -379,6 +392,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2523" levels="1" name="Lucky Clover - A-Grade">
 		<set name="isMagic" val="2" />
@@ -386,6 +400,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2524" levels="1" name="Lucky Clover - S-Grade">
 		<set name="isMagic" val="2" />
@@ -393,6 +408,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2525" levels="1" name="Scroll to move to Kamael Village">
 		<!-- High Five Confirmed -->
@@ -444,6 +460,7 @@
 				<param skillId="818" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2527" levels="1" name="Evasion Chance">
 		<!-- Confirmed CT2.5 -->
@@ -469,6 +486,7 @@
 				<param skillId="819" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2528" levels="1" name="Evasion Haste">
 		<!-- Confirmed CT2.5 -->
@@ -494,6 +512,7 @@
 				<param skillId="820" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2529" levels="1" name="Shadow Step">
 		<!-- Confirmed CT2.5 -->
@@ -519,6 +538,7 @@
 				<param skillId="821" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2530" levels="1" name="Recovery Item for Battlefield Use">
 		<!-- Confirmed CT2.5 -->
@@ -534,6 +554,7 @@
 				<param dispel="DEATH_PENALTY,-1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2531" levels="1" name="Adventurer's Scroll of Escape">
 		<!-- High Five Confirmed -->
@@ -1653,16 +1674,17 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockDebuff" />
 			<effect name="Buff">
 				<sub stat="cancelVuln" val="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2578" levels="1" name="Cure Poison Paralyze">
 		<!-- Confirmed CT2.5 -->
@@ -1676,6 +1698,7 @@
 				<param dispel="POISON,9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2579" levels="1" name="Cure Death Clock">
 		<!-- Confirmed CT2.5 -->
@@ -1689,6 +1712,7 @@
 				<param dispel="DEATH_CLACK,1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2580" levels="1" name="Vitality Replenishing Herb">
 		<!-- High Five Confirmed -->
@@ -1725,6 +1749,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2582" levels="1" name="not_used">
 		<set name="effectPoint" val="1" />
@@ -1733,6 +1758,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2583" levels="1" name="not_used">
 		<set name="effectPoint" val="1" />
@@ -1741,6 +1767,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2584" levels="1" name="Item - Special Sound Crystal">
 		<set name="isMagic" val="2" />
@@ -1748,6 +1775,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2585" levels="1" name="Item - Special Sound Crystal">
 		<set name="isMagic" val="2" />
@@ -1755,6 +1783,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2586" levels="2" name="Energy Replenishing Potion">
 		<!-- Confirmed CT2.5 -->
@@ -1770,6 +1799,7 @@
 				<param value="#value" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2587" levels="1" name="Increase number of teleport slots.">
 		<set name="isMagic" val="2" />
@@ -1779,6 +1809,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2588" levels="1" name="My Teleport">
 		<set name="hitTime" val="20000" />
@@ -1787,6 +1818,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2589" levels="1" name="Extra Entrance Pass - Kamaloka (Hall of the Abyss)">
 		<set name="isMagic" val="2" />
@@ -1796,6 +1828,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2590" levels="1" name="Extra Entrance Pass - Near Kamaloka">
 		<set name="isMagic" val="2" />
@@ -1805,6 +1838,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2591" levels="1" name="Extra Entrance Pass - Kamaloka (Labyrinth of the Abyss)">
 		<set name="isMagic" val="2" />
@@ -1814,6 +1848,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2592" levels="1" name="Quick Healing Potion">
 		<set name="isMagic" val="2" />
@@ -1826,6 +1861,7 @@
 				<param power="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2593" levels="1" name="Bow/Crossbow Attack Resistance Potion">
 		<set name="abnormalLvl" val="4" />
@@ -1846,6 +1882,7 @@
 				<param CROSSBOW="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2594" levels="1" name="Pailaka Scroll of Escape">
 		<!-- High Five Confirmed -->
@@ -1918,6 +1955,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2597" levels="1" name="Gran Kain's Echo Crystal - Theme of Journey">
 		<set name="isMagic" val="2" />
@@ -1925,6 +1963,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2598" levels="1" name="Gran Kain's Echo Crystal - Theme of Battle">
 		<set name="isMagic" val="2" />
@@ -1932,6 +1971,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2599" levels="1" name="Gran Kain's Echo Crystal - Theme of Love">
 		<set name="isMagic" val="2" />
@@ -1939,5 +1979,6 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/02600-02699.xml b/src/main/resources/data/stats/skills/02600-02699.xml
index d7bb20eebf0875ce842704145f30e3f9e51dbe42..eb47b4f764d6df45f0d22860579ee4c491c675d0 100644
--- a/src/main/resources/data/stats/skills/02600-02699.xml
+++ b/src/main/resources/data/stats/skills/02600-02699.xml
@@ -6,6 +6,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2601" levels="1" name="Gran Kain's Echo Crystal - Theme of the Feast">
 		<set name="isMagic" val="2" />
@@ -13,6 +14,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2602" levels="1" name="Gran Kain's Echo Crystal - Theme of Celebration">
 		<set name="isMagic" val="2" />
@@ -20,6 +22,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2603" levels="1" name="Gran Kain's Echo Crystal - Theme of Comedy">
 		<set name="isMagic" val="2" />
@@ -27,6 +30,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2604" levels="1" name="Gran Kain's Firework">
 		<set name="isMagic" val="2" />
@@ -37,6 +41,7 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2605" levels="1" name="Gran Kain's Large Firework">
 		<set name="isMagic" val="2" />
@@ -47,6 +52,7 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2606" levels="1" name="Gran Kain's Gift Box">
 		<!-- Confirmed CT2.5 -->
@@ -119,6 +125,7 @@
 				<param sp="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2609" levels="20" name="Escape - Talking Island Village">
 		<!-- High Five Confirmed -->
@@ -158,6 +165,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2611" levels="1" name="Large Firework">
 		<!-- High Five Confirmed -->
@@ -304,6 +312,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2620" levels="1" name="Extra Entrance Pass - Near Kamaloka (Event)">
 		<set name="isMagic" val="2" />
@@ -313,6 +322,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2621" levels="1" name="Extra Entrance Pass - Kamaloka (Labyrinth of the Abyss) (Event)">
 		<set name="isMagic" val="2" />
@@ -322,6 +332,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2622" levels="1" name="Summon Life-size Decoy">
 		<!-- Confirmed CT2.5 -->
@@ -352,6 +363,7 @@
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2624" levels="1" name="Life Aid Banding">
 		<set name="abnormalLvl" val="4" />
@@ -364,6 +376,7 @@
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2625" levels="1" name="Embalming">
 		<set name="isMagic" val="1" />
@@ -371,6 +384,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2626" levels="1" name="Lighting Incense">
 		<set name="isMagic" val="1" />
@@ -378,6 +392,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2627" levels="1" name="Elixir Miracle">
 		<set name="isMagic" val="1" />
@@ -385,6 +400,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2628" levels="1" name="Structure Scarab">
 		<set name="abnormalLvl" val="1" />
@@ -405,6 +421,7 @@
 				<param resRecovery="50" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2629" levels="1" name="Ancient Treasure Sack">
 		<set name="isMagic" val="2" />
@@ -412,6 +429,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2630" levels="1" name="Presentation - Collect Items">
 		<!-- High Five Confirmed -->
@@ -453,6 +471,7 @@
 				<param id="111" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2632" levels="1" name="Scroll of Transformation - Young Child">
 		<set name="abnormalLvl" val="1" />
@@ -474,6 +493,7 @@
 				<param id="112" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2633" levels="1" name="Elmore-Aden's Holy Water">
 		<!-- High Five Confirmed -->
@@ -536,6 +556,7 @@
 				<add stat="firePower" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2636" levels="1" name="Blessing of Earth">
 		<set name="abnormalLvl" val="1" />
@@ -552,6 +573,7 @@
 				<add stat="earthPower" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2637" levels="1" name="Scroll: Enchant Weapon (Event)">
 		<set name="isMagic" val="2" />
@@ -559,6 +581,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2638" levels="1" name="Five-year anniversary event box">
 		<!-- Confirmed CT2.5 -->
@@ -743,6 +766,7 @@
 				<param value="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2646" levels="1" name="Honey Wheat Cake">
 		<!-- Confirmed CT2.5 -->
@@ -758,6 +782,7 @@
 				<param value="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2647" levels="1" name="Energy Star Stone">
 		<!-- Confirmed CT2.5 -->
@@ -776,6 +801,7 @@
 				<param value="25" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2648" levels="1" name="High Quality Energy Star Stone">
 		<!-- Confirmed CT2.5 -->
@@ -794,6 +820,7 @@
 				<param value="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2649" levels="9" name="Escape - Gludin Village">
 		<!-- High Five Confirmed -->
@@ -875,6 +902,7 @@
 				<param skillId="913" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2652" levels="1" name="Song of Purification">
 		<!-- Confirmed CT2.5 -->
@@ -900,6 +928,7 @@
 				<param skillId="914" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2653" levels="1" name="Dance of Berserker">
 		<!-- Confirmed CT2.5 -->
@@ -925,6 +954,7 @@
 				<param skillId="915" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2654" levels="1" name="Final Secret">
 		<!-- Confirmed CT2.5 -->
@@ -950,6 +980,7 @@
 				<param skillId="917" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2655" levels="1" name="Maximum Force Focus">
 		<!-- Confirmed CT2.5 -->
@@ -975,6 +1006,7 @@
 				<param skillId="918" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2656" levels="1" name="Maximum Sonic Focus">
 		<!-- Confirmed CT2.5 -->
@@ -1000,6 +1032,7 @@
 				<param skillId="919" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2657" levels="1" name="Hide">
 		<!-- Confirmed CT2.5 -->
@@ -1025,6 +1058,7 @@
 				<param skillId="922" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2658" levels="1" name="Dual Dagger Mastery">
 		<!-- Confirmed CT2.5 -->
@@ -1050,6 +1084,7 @@
 				<param skillId="923" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2659" levels="1" name="Seven Arrow">
 		<!-- Confirmed CT2.5 -->
@@ -1075,6 +1110,7 @@
 				<param skillId="924" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2660" levels="1" name="Enlightenment">
 		<!-- Confirmed CT2.5 -->
@@ -1100,6 +1136,7 @@
 				<param skillId="1532" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2661" levels="1" name="Enlightenment">
 		<!-- Confirmed CT2.5 -->
@@ -1125,6 +1162,7 @@
 				<param skillId="1533" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2662" levels="1" name="Chant of Movement">
 		<!-- Confirmed CT2.5 -->
@@ -1150,6 +1188,7 @@
 				<param skillId="1535" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2663" levels="1" name="Combat of Pa'agrio">
 		<!-- Confirmed CT2.5 -->
@@ -1175,6 +1214,7 @@
 				<param skillId="1536" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2664" levels="1" name="Critical of Pa'agrio">
 		<!-- Confirmed CT2.5 -->
@@ -1200,6 +1240,7 @@
 				<param skillId="1537" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2665" levels="1" name="Condition of Pa'agrio">
 		<!-- Confirmed CT2.5 -->
@@ -1225,6 +1266,7 @@
 				<param skillId="1538" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2666" levels="1" name="Dual Blow">
 		<!-- Confirmed CT2.5 -->
@@ -1250,6 +1292,7 @@
 				<param skillId="928" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2667" levels="1" name="Spirit of the Cat">
 		<!-- Confirmed CT2.5 -->
@@ -1275,6 +1318,7 @@
 				<param skillId="929" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2668" levels="1" name="Spirit of the Phantom">
 		<!-- Confirmed CT2.5 -->
@@ -1300,6 +1344,7 @@
 				<param skillId="930" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2669" levels="1" name="Spirit of the Unicorn">
 		<!-- Confirmed CT2.5 -->
@@ -1325,6 +1370,7 @@
 				<param skillId="931" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2670" levels="1" name="Scroll of Transformation - Red">
 		<!-- Confirmed CT2.5 -->
@@ -1347,6 +1393,7 @@
 				<param id="121" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2671" levels="1" name="Scroll of Transformation - Blue">
 		<!-- Confirmed CT2.5 -->
@@ -1369,6 +1416,7 @@
 				<param id="122" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2672" levels="1" name="Gludio Human Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1401,6 +1449,7 @@
 				<param id="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2673" levels="1" name="Gludio Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1433,6 +1482,7 @@
 				<param id="11" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2674" levels="1" name="Gludio Dark Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1465,6 +1515,7 @@
 				<param id="12" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2675" levels="1" name="Gludio Orc Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1497,6 +1548,7 @@
 				<param id="13" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2676" levels="1" name="Gludio Dwarf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1529,6 +1581,7 @@
 				<param id="14" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2677" levels="1" name="Gludio Kamael Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1561,6 +1614,7 @@
 				<param id="15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2678" levels="1" name="Gludio Knight Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1593,6 +1647,7 @@
 				<param id="16" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2679" levels="1" name="Gludio Archer Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1625,6 +1680,7 @@
 				<param id="17" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2680" levels="1" name="Gludio Wizard Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1657,6 +1713,7 @@
 				<param id="18" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2681" levels="1" name="Gludio Kamael Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1689,6 +1746,7 @@
 				<param id="19" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2682" levels="1" name="Gludio Knight Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1721,6 +1779,7 @@
 				<param id="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2683" levels="1" name="Gludio Commander Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1753,6 +1812,7 @@
 				<param id="21" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2684" levels="1" name="Dion Human Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1785,6 +1845,7 @@
 				<param id="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2685" levels="1" name="Dion Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1817,6 +1878,7 @@
 				<param id="11" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2686" levels="1" name="Dion Dark Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1849,6 +1911,7 @@
 				<param id="12" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2687" levels="1" name="Dion Orc Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1881,6 +1944,7 @@
 				<param id="13" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2688" levels="1" name="Dion Dwarf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1913,6 +1977,7 @@
 				<param id="14" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2689" levels="1" name="Dion Kamael Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1945,6 +2010,7 @@
 				<param id="15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2690" levels="1" name="Dion Knight Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1977,6 +2043,7 @@
 				<param id="16" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2691" levels="1" name="Dion Archer Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2009,6 +2076,7 @@
 				<param id="17" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2692" levels="1" name="Dion Wizard Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2041,6 +2109,7 @@
 				<param id="18" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2693" levels="1" name="Dion Kamael Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2073,6 +2142,7 @@
 				<param id="19" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2694" levels="1" name="Dion Knight Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2105,6 +2175,7 @@
 				<param id="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2695" levels="1" name="Dion Commander Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2137,6 +2208,7 @@
 				<param id="21" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2696" levels="1" name="Giran Human Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2169,6 +2241,7 @@
 				<param id="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2697" levels="1" name="Giran Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2201,6 +2274,7 @@
 				<param id="11" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2698" levels="1" name="Giran Dark Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2233,6 +2307,7 @@
 				<param id="12" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2699" levels="1" name="Giran Orc Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2265,5 +2340,6 @@
 				<param id="13" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/02700-02799.xml b/src/main/resources/data/stats/skills/02700-02799.xml
index df797bb297c6f65727161c70629046e5318be535..b87b2b45d2e9883fa944cd734798c0e8b3717a83 100644
--- a/src/main/resources/data/stats/skills/02700-02799.xml
+++ b/src/main/resources/data/stats/skills/02700-02799.xml
@@ -31,6 +31,7 @@
 				<param id="14" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2701" levels="1" name="Giran Kamael Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -63,6 +64,7 @@
 				<param id="15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2702" levels="1" name="Giran Knight Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -95,6 +97,7 @@
 				<param id="16" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2703" levels="1" name="Giran Archer Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -127,6 +130,7 @@
 				<param id="17" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2704" levels="1" name="Giran Wizard Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -159,6 +163,7 @@
 				<param id="18" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2705" levels="1" name="Giran Kamael Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -191,6 +196,7 @@
 				<param id="19" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2706" levels="1" name="Giran Knight Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -223,6 +229,7 @@
 				<param id="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2707" levels="1" name="Giran Commander Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -255,6 +262,7 @@
 				<param id="21" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2708" levels="1" name="Oren Human Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -287,6 +295,7 @@
 				<param id="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2709" levels="1" name="Oren Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -319,6 +328,7 @@
 				<param id="11" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2710" levels="1" name="Oren Dark Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -351,6 +361,7 @@
 				<param id="12" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2711" levels="1" name="Oren Orc Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -383,6 +394,7 @@
 				<param id="13" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2712" levels="1" name="Oren Dwarf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -415,6 +427,7 @@
 				<param id="14" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2713" levels="1" name="Oren Kamael Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -447,6 +460,7 @@
 				<param id="15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2714" levels="1" name="Oren Knight Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -479,6 +493,7 @@
 				<param id="16" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2715" levels="1" name="Oren Archer Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -511,6 +526,7 @@
 				<param id="17" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2716" levels="1" name="Oren Wizard Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -543,6 +559,7 @@
 				<param id="18" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2717" levels="1" name="Oren Kamael Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -575,6 +592,7 @@
 				<param id="19" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2718" levels="1" name="Oren Knight Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -607,6 +625,7 @@
 				<param id="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2719" levels="1" name="Oren Commander Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -639,6 +658,7 @@
 				<param id="21" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2720" levels="1" name="Aden Human Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -671,6 +691,7 @@
 				<param id="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2721" levels="1" name="Aden Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -703,6 +724,7 @@
 				<param id="11" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2722" levels="1" name="Aden Dark Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -735,6 +757,7 @@
 				<param id="12" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2723" levels="1" name="Aden Orc Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -767,6 +790,7 @@
 				<param id="13" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2724" levels="1" name="Aden Dwarf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -799,6 +823,7 @@
 				<param id="14" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2725" levels="1" name="Aden Kamael Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -831,6 +856,7 @@
 				<param id="15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2726" levels="1" name="Aden Knight Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -863,6 +889,7 @@
 				<param id="16" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2727" levels="1" name="Aden Archer Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -895,6 +922,7 @@
 				<param id="17" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2728" levels="1" name="Aden Wizard Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -927,6 +955,7 @@
 				<param id="18" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2729" levels="1" name="Aden Kamael Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -959,6 +988,7 @@
 				<param id="19" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2730" levels="1" name="Aden Knight Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -991,6 +1021,7 @@
 				<param id="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2731" levels="1" name="Aden Commander Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1023,6 +1054,7 @@
 				<param id="21" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2732" levels="1" name="Innadril Human Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1055,6 +1087,7 @@
 				<param id="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2733" levels="1" name="Innadril Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1087,6 +1120,7 @@
 				<param id="11" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2734" levels="1" name="Innadril Dark Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1119,6 +1153,7 @@
 				<param id="12" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2735" levels="1" name="Innadril Orc Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1151,6 +1186,7 @@
 				<param id="13" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2736" levels="1" name="Innadril Dwarf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1183,6 +1219,7 @@
 				<param id="14" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2737" levels="1" name="Innadril Kamael Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1215,6 +1252,7 @@
 				<param id="15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2738" levels="1" name="Innadril Knight Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1247,6 +1285,7 @@
 				<param id="16" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2739" levels="1" name="Innadril Archer Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1279,6 +1318,7 @@
 				<param id="17" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2740" levels="1" name="Innadril Wizard Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1311,6 +1351,7 @@
 				<param id="18" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2741" levels="1" name="Innadril Kamael Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1343,6 +1384,7 @@
 				<param id="19" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2742" levels="1" name="Innadril Knight Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1375,6 +1417,7 @@
 				<param id="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2743" levels="1" name="Innadril Commander Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1407,6 +1450,7 @@
 				<param id="21" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2744" levels="1" name="Goddard Human Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1439,6 +1483,7 @@
 				<param id="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2745" levels="1" name="Goddard Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1471,6 +1516,7 @@
 				<param id="11" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2746" levels="1" name="Goddard Dark Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1503,6 +1549,7 @@
 				<param id="12" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2747" levels="1" name="Goddard Orc Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1535,6 +1582,7 @@
 				<param id="13" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2748" levels="1" name="Goddard Dwarf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1567,6 +1615,7 @@
 				<param id="14" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2749" levels="1" name="Goddard Kamael Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1599,6 +1648,7 @@
 				<param id="15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2750" levels="1" name="Goddard Knight Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1631,6 +1681,7 @@
 				<param id="16" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2751" levels="1" name="Goddard Archer Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1663,6 +1714,7 @@
 				<param id="17" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2752" levels="1" name="Goddard Wizard Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1695,6 +1747,7 @@
 				<param id="18" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2753" levels="1" name="Goddard Kamael Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1727,6 +1780,7 @@
 				<param id="19" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2754" levels="1" name="Goddard Knight Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1759,6 +1813,7 @@
 				<param id="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2755" levels="1" name="Goddard Commander Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1791,6 +1846,7 @@
 				<param id="21" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2756" levels="1" name="Rune Human Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1823,6 +1879,7 @@
 				<param id="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2757" levels="1" name="Rune Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1855,6 +1912,7 @@
 				<param id="11" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2758" levels="1" name="Rune Dark Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1887,6 +1945,7 @@
 				<param id="12" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2759" levels="1" name="Rune Orc Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1919,6 +1978,7 @@
 				<param id="13" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2760" levels="1" name="Rune Dwarf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1951,6 +2011,7 @@
 				<param id="14" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2761" levels="1" name="Rune Kamael Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -1983,6 +2044,7 @@
 				<param id="15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2762" levels="1" name="Rune Knight Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2015,6 +2077,7 @@
 				<param id="16" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2763" levels="1" name="Rune Archer Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2047,6 +2110,7 @@
 				<param id="17" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2764" levels="1" name="Rune Wizard Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2079,6 +2143,7 @@
 				<param id="18" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2765" levels="1" name="Rune Kamael Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2111,6 +2176,7 @@
 				<param id="19" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2766" levels="1" name="Rune Knight Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2143,6 +2209,7 @@
 				<param id="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2767" levels="1" name="Rune Commander Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2175,6 +2242,7 @@
 				<param id="21" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2768" levels="1" name="Schuttgart Human Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2207,6 +2275,7 @@
 				<param id="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2769" levels="1" name="Schuttgart Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2239,6 +2308,7 @@
 				<param id="11" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2770" levels="1" name="Schuttgart Dark Elf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2271,6 +2341,7 @@
 				<param id="12" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2771" levels="1" name="Schuttgart Orc Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2303,6 +2374,7 @@
 				<param id="13" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2772" levels="1" name="Schuttgart Dwarf Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2335,6 +2407,7 @@
 				<param id="14" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2773" levels="1" name="Schuttgart Kamael Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2367,6 +2440,7 @@
 				<param id="15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2774" levels="1" name="Schuttgart Knight Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2399,6 +2473,7 @@
 				<param id="16" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2775" levels="1" name="Schuttgart Archer Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2431,6 +2506,7 @@
 				<param id="17" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2776" levels="1" name="Schuttgart Wizard Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2463,6 +2539,7 @@
 				<param id="18" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2777" levels="1" name="Schuttgart Kamael Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2495,6 +2572,7 @@
 				<param id="19" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2778" levels="1" name="Schuttgart Knight Captain Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2527,6 +2605,7 @@
 				<param id="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2779" levels="1" name="Schuttgart Commander Mercenary">
 		<set name="abnormalLvl" val="1" />
@@ -2559,6 +2638,7 @@
 				<param id="21" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2780" levels="1" name="Magician's Will">
 		<!-- Confirmed CT2.5 -->
@@ -2584,6 +2664,7 @@
 				<param skillId="945" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2781" levels="1" name="Silent Mind">
 		<!-- Confirmed CT2.5 -->
@@ -2609,6 +2690,7 @@
 				<param skillId="946" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2782" levels="1" name="Turn Stone">
 		<!-- Confirmed CT2.5 -->
@@ -2634,6 +2716,7 @@
 				<param skillId="1540" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2783" levels="1" name="Lucky Strike">
 		<!-- High Five Confirmed -->
@@ -2686,6 +2769,7 @@
 				<param skillId="948" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2785" levels="1" name="Curse of Desparion">
 		<!-- Confirmed CT2.5 -->
@@ -2711,6 +2795,7 @@
 				<param skillId="1541" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2786" levels="1" name="Counter Critical">
 		<!-- Confirmed CT2.5 -->
@@ -2736,6 +2821,7 @@
 				<param skillId="1542" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2787" levels="1" name="Onslaught of Pa'agrio">
 		<!-- Confirmed CT2.5 -->
@@ -2761,6 +2847,7 @@
 				<param skillId="949" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2788" levels="1" name="Great Fury">
 		<!-- Confirmed CT2.5 -->
@@ -2786,6 +2873,7 @@
 				<param skillId="1543" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2789" levels="1" name="Final Flying Form">
 		<!-- Confirmed CT2.5 -->
@@ -2811,6 +2899,7 @@
 				<param skillId="840" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2790" levels="1" name="Aura Bird - Falcon">
 		<!-- Confirmed CT2.5 -->
@@ -2835,6 +2924,7 @@
 				<param skillId="841" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2791" levels="1" name="Aura Bird - Owl">
 		<!-- Confirmed CT2.5 -->
@@ -2859,6 +2949,7 @@
 				<param skillId="842" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2792" levels="2" name="Stone of Stamina">
 		<!-- High Five Confirmed -->
@@ -2876,6 +2967,7 @@
 				<param power="#hpHeal" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2793" levels="2" name="Stone of Mana">
 		<!-- High Five Confirmed -->
@@ -2893,6 +2985,7 @@
 				<param power="#mpHeal" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2794" levels="2" name="Stone of Recovery">
 		<!-- High Five Confirmed -->
@@ -2914,6 +3007,7 @@
 				<param power="#mpHeal" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2795" levels="1" name="Stone of Destruction">
 		<!-- High Five Confirmed -->
@@ -2932,6 +3026,7 @@
 				<mul stat="pAtk" val="1.12" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2796" levels="1" name="Stone of Invincibility">
 		<!-- High Five Confirmed -->
@@ -2950,6 +3045,7 @@
 				<mul stat="pDef" val="1.12" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2797" levels="1" name="Stone of Great Speed">
 		<!-- High Five Confirmed -->
@@ -2969,6 +3065,7 @@
 				<mul stat="mAtkSpd" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2798" levels="1" name="Stone of Speed">
 		<!-- High Five Confirmed -->
@@ -2987,6 +3084,7 @@
 				<add stat="runSpd" val="33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2799" levels="1" name="Stone of Concentration">
 		<!-- High Five Confirmed -->
@@ -3005,5 +3103,6 @@
 				<mul stat="critRate" val="1.25" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/02800-02899.xml b/src/main/resources/data/stats/skills/02800-02899.xml
index a6683d2defaa81b2c597270bd0bb74ed3f8523e6..cbe47b651e8f35401dd8ae170f05fbb702e29c12 100644
--- a/src/main/resources/data/stats/skills/02800-02899.xml
+++ b/src/main/resources/data/stats/skills/02800-02899.xml
@@ -18,6 +18,7 @@
 				<param type="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2801" levels="1" name="Stone of Abundance">
 		<!-- High Five Confirmed -->
@@ -37,6 +38,7 @@
 				<param type="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2802" levels="1" name="Recovery Stone">
 		<!-- High Five Confirmed -->
@@ -57,6 +59,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2803" levels="1" name="Seed of Revenge">
 		<!-- Confirmed CT2.5 -->
@@ -85,6 +88,7 @@
 				<param skillId="762" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2804" levels="1" name="Hell Scream">
 		<!-- Confirmed CT2.5 -->
@@ -110,6 +114,7 @@
 				<param skillId="763" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2805" levels="1" name="Spirit of Phoenix">
 		<!-- Confirmed CT2.5 -->
@@ -138,6 +143,7 @@
 				<param skillId="785" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2806" levels="1" name="Eva's Will">
 		<!-- Confirmed CT2.5 -->
@@ -166,6 +172,7 @@
 				<param skillId="787" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2807" levels="1" name="Pain of Shilen">
 		<!-- Confirmed CT2.5 -->
@@ -194,6 +201,7 @@
 				<param skillId="789" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2808" levels="1" name="Exciting Adventure">
 		<!-- Confirmed CT2.5 -->
@@ -219,6 +227,7 @@
 				<param skillId="768" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2809" levels="1" name="Wind Riding">
 		<!-- Confirmed CT2.5 -->
@@ -244,6 +253,7 @@
 				<param skillId="769" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2810" levels="1" name="Ghost Walking">
 		<!-- Confirmed CT2.5 -->
@@ -269,6 +279,7 @@
 				<param skillId="770" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2811" levels="1" name="Flame Hawk">
 		<!-- Confirmed CT2.5 -->
@@ -294,6 +305,7 @@
 				<param skillId="771" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2812" levels="1" name="Arrow Rain">
 		<!-- Confirmed CT2.5 -->
@@ -319,6 +331,7 @@
 				<param skillId="772" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2813" levels="1" name="Ghost Piercing">
 		<!-- Confirmed CT2.5 -->
@@ -344,6 +357,7 @@
 				<param skillId="773" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2814" levels="1" name="Dread Pool">
 		<!-- Confirmed CT2.5 -->
@@ -369,6 +383,7 @@
 				<param skillId="774" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2815" levels="1" name="Force of Destruction">
 		<!-- High Five Confirmed -->
@@ -421,6 +436,7 @@
 				<param skillId="777" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2817" levels="1" name="Golem Armor">
 		<!-- Confirmed CT2.5 -->
@@ -446,6 +462,7 @@
 				<param skillId="778" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2818" levels="1" name="Wild Shot">
 		<!-- Confirmed CT2.5 -->
@@ -471,6 +488,7 @@
 				<param skillId="790" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2819" levels="1" name="Lightning Shock">
 		<!-- Confirmed CT2.5 -->
@@ -496,6 +514,7 @@
 				<param skillId="791" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2820" levels="1" name="Flame Armor">
 		<!-- Confirmed CT2.5 -->
@@ -521,6 +540,7 @@
 				<param skillId="1492" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2821" levels="1" name="Frost Armor">
 		<!-- Confirmed CT2.5 -->
@@ -546,6 +566,7 @@
 				<param skillId="1493" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2822" levels="1" name="Hurricane Armor">
 		<!-- Confirmed CT2.5 -->
@@ -571,6 +592,7 @@
 				<param skillId="1494" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2823" levels="1" name="Vampiric Mist">
 		<!-- Confirmed CT2.5 -->
@@ -596,6 +618,7 @@
 				<param skillId="1495" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2824" levels="1" name="Meteor">
 		<!-- Confirmed CT2.5 -->
@@ -621,6 +644,7 @@
 				<param skillId="1467" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2825" levels="1" name="Starfall">
 		<!-- Confirmed CT2.5 -->
@@ -646,6 +670,7 @@
 				<param skillId="1468" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2826" levels="1" name="Sublime Self-Sacrifice">
 		<!-- Confirmed CT2.5 -->
@@ -671,6 +696,7 @@
 				<param skillId="1505" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2827" levels="1" name="Blessing of Eva">
 		<!-- Confirmed CT2.5 -->
@@ -696,6 +722,7 @@
 				<param skillId="1506" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2828" levels="1" name="Lord of Vampire">
 		<!-- Confirmed CT2.5 -->
@@ -721,6 +748,7 @@
 				<param skillId="1507" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2829" levels="1" name="Throne Root">
 		<!-- Confirmed CT2.5 -->
@@ -746,6 +774,7 @@
 				<param skillId="1508" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2830" levels="1" name="Seal of Limit">
 		<!-- Confirmed CT2.5 -->
@@ -771,6 +800,7 @@
 				<param skillId="1509" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2831" levels="1" name="Weapon Blockade">
 		<!-- Confirmed CT2.5 -->
@@ -796,6 +826,7 @@
 				<param skillId="775" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2832" levels="1" name="S80 Weapon Chest">
 		<!-- Confirmed CT2.5 -->
@@ -915,6 +946,7 @@
 		<set name="reuseDelay" val="600000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2838" levels="1" name="Treasure Sack of the Ancient Giants">
 		<!-- Confirmed CT2.5 -->
@@ -955,6 +987,7 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2840" levels="1" name="Star Stone Gathering">
 		<!-- Confirmed CT2.5 -->
@@ -979,6 +1012,7 @@
 				<param skillId="932" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2841" levels="1" name="PC Cafe Points">
 		<set name="isMagic" val="2" />
@@ -989,6 +1023,7 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2842" levels="1" name="Duel Supplies">
 		<!-- Confirmed CT2.5 -->
@@ -1364,6 +1399,7 @@
 				<mul stat="runSpd" val="0.8" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2857" levels="1" name="Christmas Event - Magic Use Enhancement Scroll">
 		<!-- Confirmed CT2.5 -->
@@ -1397,6 +1433,7 @@
 				<mul stat="runSpd" val="0.8" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2858" levels="1" name="Christmas Red Sock">
 		<!-- Confirmed CT2.5 -->
@@ -1431,6 +1468,7 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2860" levels="6" name="Highest Power Secret Medicine of Life">
 		<!-- Confirmed CT2.5 -->
@@ -1452,6 +1490,7 @@
 				<param amount="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2861" levels="6" name="Highest Power Secret Medicine of Mind">
 		<!-- Confirmed CT2.5 -->
@@ -1473,6 +1512,7 @@
 				<param amount="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2862" levels="6" name="Highest Power Secret Medicine of Will">
 		<!-- Confirmed CT2.5 -->
@@ -1494,6 +1534,7 @@
 				<param amount="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2863" levels="1" name="Highest Power Healing Potion">
 		<!-- Confirmed CT2.5 -->
@@ -1514,6 +1555,7 @@
 				<param ticks="3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2864" levels="1" name="Highest Power Quick Healing Potion">
 		<!-- Confirmed CT2.5 -->
@@ -1529,6 +1571,7 @@
 				<param amount="870" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2865" levels="1" name="Agathion's New Year's Gift 1">
 		<!-- Confirmed CT2.5 -->
@@ -1589,6 +1632,7 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2868" levels="1" name="Cupid's Enhanced Cure">
 		<set name="effectPoint" val="-1000" />
@@ -1601,6 +1645,7 @@
 		<set name="reuseDelay" val="4000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2869" levels="1" name="Event - Milk Cow Summon Scroll">
 		<!-- Confirmed CT2.5 -->
@@ -1619,6 +1664,7 @@
 				<param npcId="13187" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2870" levels="1" name="Event - Head Milk Cow Summon Scroll">
 		<!-- Confirmed CT2.5 -->
@@ -1637,6 +1683,7 @@
 				<param npcId="13188" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2871" levels="1" name="Summon Gloomy Milk Cow">
 		<!-- Confirmed CT2.5 -->
@@ -1689,6 +1736,7 @@
 				<mul stat="pAtk" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2874" levels="1" name="Wind Walk">
 		<!-- Confirmed CT2.5 -->
@@ -1707,6 +1755,7 @@
 				<add stat="runSpd" val="33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2875" levels="1" name="Haste">
 		<!-- Confirmed CT2.5 -->
@@ -1725,6 +1774,7 @@
 				<mul stat="pAtkSpd" val="1.33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2876" levels="1" name="Vampiric Rage">
 		<!-- High Five Confirmed -->
@@ -1770,6 +1820,7 @@
 				<sub stat="rEvas" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2878" levels="1" name="Empower">
 		<!-- Confirmed CT2.5 -->
@@ -1788,6 +1839,7 @@
 				<mul stat="mAtk" val="1.75" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2879" levels="1" name="Acumen">
 		<!-- Confirmed CT2.5 -->
@@ -1806,6 +1858,7 @@
 				<mul stat="mAtkSpd" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2880" levels="1" name="Event - Gloomy Milk Cow Summon Scroll">
 		<!-- Confirmed CT2.5 -->
@@ -1824,6 +1877,7 @@
 				<param npcId="13194" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2881" levels="1" name="Event - Gloomy Head Milk Cow Summon Scroll">
 		<!-- Confirmed CT2.5 -->
@@ -1842,6 +1896,7 @@
 				<param npcId="13195" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2882" levels="1" name="Crystal Cube">
 		<!-- Confirmed CT2.5 -->
@@ -1939,6 +1994,7 @@
 				<mul stat="pDef" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2886" levels="1" name="Focus">
 		<!-- Confirmed CT2.5 -->
@@ -1957,6 +2013,7 @@
 				<mul stat="critRate" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2887" levels="1" name="Death Whisper">
 		<!-- Confirmed CT2.5 -->
@@ -1975,6 +2032,7 @@
 				<mul stat="critDmg" val="1.35" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2888" levels="1" name="Guidance">
 		<!-- Confirmed CT2.5 -->
@@ -1993,6 +2051,7 @@
 				<add stat="accCombat" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2889" levels="1" name="Clarity">
 		<!-- Confirmed CT2.5 -->
@@ -2013,6 +2072,7 @@
 				<mul stat="danceMpConsumeRate" val="0.8" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2890" levels="1" name="Wild Magic">
 		<!-- High Five Confirmed -->
@@ -2051,6 +2111,7 @@
 				<sub stat="cancel" val="53" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2892" levels="1" name="Event - Extra Entrance Pass">
 		<set name="isMagic" val="2" />
@@ -2060,6 +2121,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2893" levels="1" name="Solo Escape Petition">
 		<set name="abnormalLvl" val="2" />
@@ -2078,6 +2140,7 @@
 		<set name="reuseDelay" val="1800000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2894" levels="1" name="White Day Candy">
 		<!-- Confirmed CT2.5 -->
@@ -2094,6 +2157,7 @@
 				<param value="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2895" levels="1" name="Special White Day Candy Basket">
 		<!-- Confirmed CT2.5 -->
diff --git a/src/main/resources/data/stats/skills/02900-02999.xml b/src/main/resources/data/stats/skills/02900-02999.xml
index 22f6391f2c50a94b238a48b97db43aeb12163bd5..ea3391f8bdf8a531ea1caa42ef60fa16b63e405d 100644
--- a/src/main/resources/data/stats/skills/02900-02999.xml
+++ b/src/main/resources/data/stats/skills/02900-02999.xml
@@ -120,6 +120,7 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2905" levels="1" name="Growth Accelerator">
 		<!-- High Five Confirmed -->
@@ -170,6 +171,7 @@
 				<param amount="1900" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2908" levels="5" name="Battlefield Use Secret Medicine of Mind">
 		<!-- Confirmed CT2.5 -->
@@ -187,6 +189,7 @@
 				<param amount="360" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2909" levels="5" name="Battlefield Use Secret Medicine of Will">
 		<!-- Confirmed CT2.5 -->
@@ -204,6 +207,7 @@
 				<param amount="360" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2910" levels="1" name="Skull Key of Pain">
 		<set name="isMagic" val="2" />
@@ -213,6 +217,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2911" levels="1" name="Skull Key of Erosion">
 		<set name="isMagic" val="2" />
@@ -222,6 +227,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2912" levels="1" name="Skull Key of the Heart">
 		<set name="isMagic" val="2" />
@@ -231,6 +237,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2913" levels="1" name="Soul Extraction">
 		<set name="effectPoint" val="-100" />
@@ -240,6 +247,7 @@
 		<set name="reuseDelay" val="60000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2914" levels="3" name="Equipment Set 90 Day Pack">
 		<!-- Confirmed CT2.5 -->
@@ -259,6 +267,7 @@
 				<param npcId="#npcId" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2915" levels="1" name="Clear Five-Colored Crystal">
 		<!-- High Five Confirmed -->
@@ -2138,6 +2147,7 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2994" levels="1" name="Disguised Half - Aqua Elf">
 		<set name="abnormalLvl" val="1" />
@@ -2159,6 +2169,7 @@
 				<param id="125" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2995" levels="1" name="PC room private weapon strengthening order sheet - D grade">
 		<set name="isMagic" val="2" />
@@ -2166,6 +2177,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2996" levels="1" name="PC room private weapon strengthening order sheet - C grade">
 		<set name="isMagic" val="2" />
@@ -2173,6 +2185,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2997" levels="1" name="PC room private weapon strengthening order sheet - B grade">
 		<set name="isMagic" val="2" />
@@ -2180,6 +2193,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2998" levels="1" name="PC room private weapon strengthening order sheet - A grade">
 		<set name="isMagic" val="2" />
@@ -2187,6 +2201,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="2999" levels="1" name="PC room private weapon strengthening order sheet - S grade">
 		<set name="isMagic" val="2" />
@@ -2194,5 +2209,6 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/03000-03099.xml b/src/main/resources/data/stats/skills/03000-03099.xml
index 45f73bb201773787a2bbebd572e9acdca60bfb1d..6a6f5a063946a6ec4595808f239195cf96f9c576 100644
--- a/src/main/resources/data/stats/skills/03000-03099.xml
+++ b/src/main/resources/data/stats/skills/03000-03099.xml
@@ -54,7 +54,7 @@
 		<set name="icon" val="icon.skill0042" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
-			<!-- TODO: Implement proper effect. -->
+		<!-- TODO: Implement proper effect. -->
 	</skill>
 	<skill id="3007" levels="6" name="Special Ability: Guidance">
 		<!-- Confirmed CT2.5 -->
@@ -819,6 +819,7 @@
 				<param power="8.39" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3050" levels="2" name="Special Ability: Focus">
 		<!-- Confirmed CT2.5 -->
@@ -1710,10 +1711,10 @@
 		<effects>
 			<effect name="Stun" />
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockBuff" />
 			<effect name="BlockDebuff" />
diff --git a/src/main/resources/data/stats/skills/03100-03199.xml b/src/main/resources/data/stats/skills/03100-03199.xml
index 9d3b957b111999f386395c9b0262955cfc94e41f..81c4e292daf3681ee390116f686bdbdf4b246b49 100644
--- a/src/main/resources/data/stats/skills/03100-03199.xml
+++ b/src/main/resources/data/stats/skills/03100-03199.xml
@@ -92,10 +92,10 @@
 		<effects>
 			<effect name="Stun" />
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockBuff" />
 			<effect name="BlockDebuff" />
@@ -508,10 +508,10 @@
 		<effects>
 			<effect name="Stun" />
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockBuff" />
 			<effect name="BlockDebuff" />
@@ -686,6 +686,7 @@
 				<param power="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3124" levels="10" name="Item Skill: Blessed Body">
 		<!-- Confirmed CT2.5 -->
@@ -713,6 +714,7 @@
 				<param power="#maxHp" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3125" levels="10" name="Item Skill: Battle Roar">
 		<!-- High Five Confirmed -->
@@ -771,6 +773,7 @@
 				<mul stat="healEffect" val="#healEffect" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3127" levels="10" name="Item Skill: Recharge">
 		<!-- High Five Confirmed -->
@@ -827,6 +830,7 @@
 				<param power="#maxMp" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3129" levels="10" name="Item Skill: Mana Gain">
 		<!-- Confirmed CT2.5 -->
@@ -854,6 +858,7 @@
 				<add stat="manaCharge" val="#manaCharge" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3130" levels="10" name="Item Skill: Ritual">
 		<!-- Confirmed CT2.5 -->
@@ -878,6 +883,7 @@
 				<param amount="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3131" levels="10" name="Item Skill: Cheer">
 		<!-- Confirmed CT2.5 -->
@@ -905,6 +911,7 @@
 				<param power="#maxCp" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3132" levels="10" name="Item Skill: Might">
 		<!-- Confirmed CT2.5 -->
@@ -932,6 +939,7 @@
 				<add stat="pAtk" val="#pAtk" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3133" levels="10" name="Item Skill: Empower">
 		<!-- Confirmed CT2.5 -->
@@ -959,6 +967,7 @@
 				<add stat="mAtk" val="#mAtk" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3134" levels="10" name="Item Skill: Duel Might">
 		<!-- Confirmed CT2.5 -->
@@ -986,6 +995,7 @@
 				<mul stat="pvpPhysSkillsDmg" val="1.05" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3135" levels="10" name="Item Skill: Shield">
 		<!-- Confirmed CT2.5 -->
@@ -1013,6 +1023,7 @@
 				<add stat="pDef" val="#pDef" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3136" levels="10" name="Item Skill: Magic Barrier">
 		<!-- Confirmed CT2.5 -->
@@ -1040,6 +1051,7 @@
 				<add stat="mDef" val="#mDef" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3137" levels="10" name="Item Skill: Duel Weakness">
 		<!-- Confirmed CT2.5 -->
@@ -1100,6 +1112,7 @@
 				<add stat="healEffect" val="#healEffect" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3139" levels="10" name="Item Skill: Agility">
 		<!-- Confirmed CT2.5 -->
@@ -1127,6 +1140,7 @@
 				<add stat="rEvas" val="#rEvas" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3140" levels="10" name="Item Skill: Guidance">
 		<!-- Confirmed CT2.5 -->
@@ -1154,6 +1168,7 @@
 				<add stat="accCombat" val="#accCombat" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3141" levels="10" name="Item Skill: Focus">
 		<!-- Confirmed CT2.5 -->
@@ -1181,6 +1196,7 @@
 				<mul stat="critRate" val="#rCrit" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3142" levels="10" name="Item Skill: Wild Magic">
 		<!-- Confirmed CT2.5 -->
@@ -1208,6 +1224,7 @@
 				<add stat="mCritRate" val="#mCritRate" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3143" levels="10" name="Item Skill: Kiss of Eva">
 		<!-- Confirmed CT2.5 -->
@@ -1234,6 +1251,7 @@
 				<mul stat="breath" val="7" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3144" levels="10" name="Item Skill: Acrobatics">
 		<!-- Confirmed CT2.5 -->
@@ -1260,6 +1278,7 @@
 				<sub stat="fall" val="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3145" levels="10" name="Item Skill: Iron Body">
 		<!-- Confirmed CT2.5 -->
@@ -1287,6 +1306,7 @@
 				<sub stat="damageZoneVuln" val="#damageZoneVuln" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3146" levels="1" name="Item Skill: Recall">
 		<!-- High Five Confirmed -->
@@ -1578,6 +1598,7 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3157" levels="1" name="Item Skill: Large Firework">
 		<!-- Confirmed CT2.5 -->
@@ -1589,6 +1610,7 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3158" levels="1" name="Item Skill: Lesser Celestial Shield">
 		<!-- Confirmed CT2.5 -->
@@ -1608,12 +1630,13 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3159" levels="3" name="Item Skill: Stealth">
 		<!-- Confirmed CT2.5 -->
@@ -1644,6 +1667,7 @@
 				<mul stat="pAtk" val="0.55" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3160" levels="9" name="Item Skill: Resurrection">
 		<!-- Confirmed CT2.5 -->
@@ -1674,6 +1698,7 @@
 				<param power="#power" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3161" levels="3" name="Item Skill: Skill Clarity">
 		<!-- Confirmed CT2.5 -->
@@ -1701,6 +1726,7 @@
 				<mul stat="physicalMpConsumeRate" val="#PhysicalMpConsumeRate" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3162" levels="3" name="Item Skill: Spell Clarity">
 		<!-- Confirmed CT2.5 -->
@@ -1728,6 +1754,7 @@
 				<mul stat="magicalMpConsumeRate" val="#MagicalMpConsumeRate" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3163" levels="3" name="Item Skill: Music Clarity">
 		<!-- Confirmed CT2.5 -->
@@ -1755,6 +1782,7 @@
 				<mul stat="danceMpConsumeRate" val="#DanceMpConsumeRate" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3164" levels="3" name="Item Skill: Clarity">
 		<!-- Confirmed CT2.5 -->
@@ -1785,6 +1813,7 @@
 				<mul stat="danceMpConsumeRate" val="0.9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3165" levels="10" name="Item Skill: Prominence">
 		<!-- High Five Confirmed -->
@@ -2731,10 +2760,10 @@
 		<effects>
 			<effect name="Stun" />
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockBuff" />
 			<effect name="BlockDebuff" />
@@ -2949,5 +2978,6 @@
 				<mul stat="pReuse" val="0.85" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/03200-03299.xml b/src/main/resources/data/stats/skills/03200-03299.xml
index ff03de3d3ac2839c8f2d8396772da9bb8491670e..ca4db94ffbfa8a411c3cd16dea636aa9db2e28e4 100644
--- a/src/main/resources/data/stats/skills/03200-03299.xml
+++ b/src/main/resources/data/stats/skills/03200-03299.xml
@@ -25,6 +25,7 @@
 				<mul stat="mReuse" val="0.85" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3201" levels="3" name="Item Skill: Music Refresh">
 		<!-- Confirmed CT2.5 -->
@@ -51,6 +52,7 @@
 				<mul stat="dReuse" val="0.85" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3202" levels="3" name="Item Skill: Refresh">
 		<!-- Confirmed CT2.5 -->
@@ -79,6 +81,7 @@
 				<mul stat="dReuse" val="0.85" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3203" levels="1" name="Item Skill: Mystery Skill">
 		<!-- Confirmed CT2.5 -->
@@ -96,6 +99,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<set name="trait" val="ETC" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3204" levels="3" name="Item Skill: Reflect Damage">
 		<!-- Confirmed CT2.5 -->
@@ -124,6 +128,7 @@
 				<add stat="reflectDam" val="#reflectDam" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3205" levels="2" name="Item Skill: Party Recall">
 		<!-- High Five Confirmed -->
@@ -171,6 +176,7 @@
 		<set name="reuseDelay" val="12000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3207" levels="10" name="Item Skill: Heal">
 		<!-- Confirmed CT2.5 -->
@@ -1109,6 +1115,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3264" levels="1" name="Blessed Escape">
 		<!-- High Five Confirmed -->
@@ -1149,6 +1156,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<set name="trait" val="ETC" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3266" levels="1" name="Large Fireworks Ability">
 		<!-- Allows the use of Large Fireworks. -->
@@ -1161,6 +1169,7 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3267" levels="1" name="Dismiss Agathion">
 		<!-- Confirmed CT2.5 -->
@@ -1245,6 +1254,7 @@
 				<add stat="pAtk" val="63" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3272" levels="1" name="Blue Talisman of Defense">
 		<!-- Confirmed CT2.5 -->
@@ -1267,6 +1277,7 @@
 				<add stat="pDef" val="72" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3273" levels="1" name="Red Talisman of Recovery">
 		<!-- Confirmed CT2.5 -->
@@ -1289,6 +1300,7 @@
 				<param amount="200" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3274" levels="1" name="Blue Talisman of Protection">
 		<!-- Confirmed CT2.5 -->
@@ -1311,6 +1323,7 @@
 				<add stat="sDef" val="220" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3275" levels="1" name="Blue Talisman of Protection">
 		<!-- Confirmed CT2.5 -->
@@ -1333,6 +1346,7 @@
 				<mul stat="rShld" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3276" levels="1" name="Blue Talisman - Magic Resistance">
 		<!-- Confirmed CT2.5 -->
@@ -1355,6 +1369,7 @@
 				<add stat="mDef" val="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3277" levels="1" name="Blue Talisman of Wild Magic">
 		<!-- Confirmed CT2.5 -->
@@ -1377,6 +1392,7 @@
 				<add stat="mCritRate" val="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3278" levels="1" name="Red Talisman of Mental Regeneration">
 		<!-- Confirmed CT2.5 -->
@@ -1399,6 +1415,7 @@
 				<mul stat="regMp" val="1.1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3279" levels="1" name="Red Talisman of Meditation">
 		<!-- High Five Confirmed -->
@@ -1454,6 +1471,7 @@
 				<mul stat="runSpd" val="0.6" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3281" levels="1" name="Red Talisman of Minimum Clarity">
 		<!-- Confirmed CT2.5 -->
@@ -1478,6 +1496,7 @@
 				<mul stat="danceMpConsumeRate" val="0.9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3282" levels="1" name="Red Talisman of Maximum Clarity">
 		<!-- Confirmed CT2.5 -->
@@ -1502,6 +1521,7 @@
 				<mul stat="danceMpConsumeRate" val="0" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3283" levels="1" name="Blue Talisman of Healing">
 		<!-- Confirmed CT2.5 -->
@@ -1524,6 +1544,7 @@
 				<add stat="healEffect" val="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3284" levels="1" name="Blue Talisman - Divine Protection">
 		<!-- Confirmed CT2.5 -->
@@ -1547,6 +1568,7 @@
 				<add stat="mDef" val="2700" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3285" levels="1" name="Blue Talisman of Defense">
 		<!-- Confirmed CT2.5 -->
@@ -1576,6 +1598,7 @@
 				<sub stat="rEvas" val="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3286" levels="1" name="Black Talisman - Mending">
 		<!-- Confirmed CT2.5 -->
@@ -1595,6 +1618,7 @@
 				<param dispel="BLEEDING,9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3287" levels="1" name="Black Talisman of Physical Freedom">
 		<!-- Confirmed CT2.5 -->
@@ -1614,6 +1638,7 @@
 				<param dispel="ROOT_PHYSICALLY,9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3288" levels="1" name="Black Talisman of Arcane Freedom">
 		<!-- Confirmed CT2.5 -->
@@ -1633,6 +1658,7 @@
 				<param dispel="ROOT_MAGICALLY,9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3289" levels="1" name="Black Talisman - Escape">
 		<!-- Confirmed CT2.5 -->
@@ -1652,6 +1678,7 @@
 				<param dispel="ROOT_PHYSICALLY,3;ROOT_MAGICALLY,3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3290" levels="1" name="Black Talisman of Rescue">
 		<!-- Confirmed CT2.5 -->
@@ -1671,6 +1698,7 @@
 				<param dispel="SILENCE_PHYSICAL,9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3291" levels="1" name="Black Talisman of Vocalization">
 		<!-- Confirmed CT2.5 -->
@@ -1690,6 +1718,7 @@
 				<param dispel="SILENCE,9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3292" levels="1" name="Black Talisman of Free Speech">
 		<!-- Confirmed CT2.5 -->
@@ -1709,6 +1738,7 @@
 				<param dispel="SILENCE_ALL,9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3293" levels="1" name="Yellow Talisman of Power">
 		<!-- Confirmed CT2.5 -->
diff --git a/src/main/resources/data/stats/skills/03300-03399.xml b/src/main/resources/data/stats/skills/03300-03399.xml
index 218a4a6d83bad9754cd088f1f47a94203d0680f2..7581524c32a1e82b2450194a2db5c843ebe71d1e 100644
--- a/src/main/resources/data/stats/skills/03300-03399.xml
+++ b/src/main/resources/data/stats/skills/03300-03399.xml
@@ -284,6 +284,7 @@
 				<mul stat="defCritRate" val="0.95" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3322" levels="1" name="Brass Bracelet">
 		<!-- Confirmed CT2.5 -->
@@ -563,6 +564,7 @@
 				<param id="102" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3336" levels="1" name="Transform Buffalo">
 		<!-- Confirmed CT2.5 -->
@@ -589,6 +591,7 @@
 				<param dispel="BIG_HEAD,9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3337" levels="1" name="Transform Cutie Pig">
 		<!-- Confirmed CT2.5 -->
@@ -613,6 +616,7 @@
 				<param id="104" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3338" levels="1" name="Shield Master">
 		<!-- High Five Confirmed -->
@@ -914,6 +918,7 @@
 				<param id="101" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3360" levels="1" name="Cheap Shot">
 		<!-- Confirmed CT2.5 -->
diff --git a/src/main/resources/data/stats/skills/03400-03499.xml b/src/main/resources/data/stats/skills/03400-03499.xml
index 968f5557a8321dd9c64139972b617bd7b5dfe9da..f28fcc37ebd079bf3ac85d310c6e393269d1b189 100644
--- a/src/main/resources/data/stats/skills/03400-03499.xml
+++ b/src/main/resources/data/stats/skills/03400-03499.xml
@@ -60,6 +60,7 @@
 				<player transformationId="103" />
 			</not>
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3405" levels="1" name="Large Firecracker Effect">
 		<set name="isMagic" val="2" />
@@ -68,6 +69,7 @@
 		<set name="reuseDelay" val="1200000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3406" levels="1" name="Weight Decrease Ring">
 		<!-- Confirmed CT2.5 -->
@@ -99,6 +101,7 @@
 				<mul stat="runSpd" val="0.6" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3408" levels="1" name="Blessed Ring of Escape">
 		<!-- High Five Confirmed -->
@@ -147,6 +150,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3410" levels="1" name="Blue Talisman of Reflection">
 		<set name="abnormalLvl" val="1" />
@@ -167,6 +171,7 @@
 				<add stat="reflectDam" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3411" levels="1" name="Special Ability: Focus">
 		<set name="icon" val="icon.skill1077" />
@@ -307,6 +312,7 @@
 				<param id="104" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3419" levels="1" name="Magic Immunity">
 		<set name="icon" val="icon.etc_stripe_shirts_s_i05" />
@@ -341,6 +347,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3422" levels="1" name="Wolf Dismount">
 		<set name="blockedInOlympiad" val="true" />
@@ -350,6 +357,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3423" levels="1" name="Little Angel Agathion - Summon (or Release)">
 		<!-- Confirmed CT2.5 -->
@@ -439,7 +447,7 @@
 				<mul stat="pvpMagicalDmg" val="1.07" />
 				<mul stat="pvpPhysSkillsDmg" val="1.07" />
 				<add stat="reflectDam" val="9" />
-			</effect>			
+			</effect>
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="true" />
@@ -472,6 +480,7 @@
 				<mul stat="pAtkSpd" val="1.1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3429" levels="1" name="Red Talisman - Life Force">
 		<!-- Confirmed CT2.5 -->
@@ -491,6 +500,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3430" levels="1" name="White Talisman - Darkness">
 		<!-- Confirmed CT2.5 -->
@@ -513,6 +523,7 @@
 				<add stat="darkRes" val="50" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3431" levels="1" name="White Talisman - Storm">
 		<!-- Confirmed CT2.5 -->
@@ -535,6 +546,7 @@
 				<add stat="windRes" val="50" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3432" levels="1" name="White Talisman - Water">
 		<!-- Confirmed CT2.5 -->
@@ -557,6 +569,7 @@
 				<add stat="waterRes" val="50" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3433" levels="1" name="White Talisman - Fire">
 		<!-- Confirmed CT2.5 -->
@@ -579,6 +592,7 @@
 				<add stat="fireRes" val="50" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3434" levels="1" name="White Talisman - Earth">
 		<!-- Confirmed CT2.5 -->
@@ -601,6 +615,7 @@
 				<add stat="earthRes" val="50" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3435" levels="1" name="White Talisman - Light">
 		<!-- Confirmed CT2.5 -->
@@ -623,6 +638,7 @@
 				<add stat="holyRes" val="50" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3436" levels="1" name="Blue Talisman of Self destruction">
 		<!-- High Five Confirmed -->
@@ -668,6 +684,7 @@
 				<mul stat="mAtk" val="1.55" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3438" levels="1" name="Blue Talisman - Great Healing">
 		<!-- Confirmed CT2.5 -->
@@ -690,6 +707,7 @@
 				<add stat="healEffect" val="1000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3439" levels="1" name="Silk Shirt">
 		<set name="magicLvl" val="49" />
@@ -1264,6 +1282,7 @@
 				<add stat="pAtk" val="9.4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3488" levels="1" name="Blue Talisman of Protection">
 		<!-- Confirmed CT2.5 -->
@@ -1286,6 +1305,7 @@
 				<add stat="sDef" val="63" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3489" levels="1" name="Yellow Talisman of Arcane Power">
 		<!-- Confirmed CT2.5 -->
@@ -1392,6 +1412,7 @@
 				<param amount="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3497" levels="1" name="Yellow Talisman of MP Regeneration">
 		<!-- Confirmed CT2.5 -->
@@ -1431,5 +1452,6 @@
 				<param dispel="TRANSFORM,9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/03600-03699.xml b/src/main/resources/data/stats/skills/03600-03699.xml
index 85838a181e4d7232c4a01d9fcec8421d5431a0fc..42c11f13b61ac9c41b54ceaf98d8ce1ad9715885 100644
--- a/src/main/resources/data/stats/skills/03600-03699.xml
+++ b/src/main/resources/data/stats/skills/03600-03699.xml
@@ -738,6 +738,7 @@
 				<param SHOCK="#trait_shock" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3634" levels="1" name="Special Ability: Infinity Sword">
 		<!-- Confirmed CT2.5 and Updated to H5 -->
@@ -1299,6 +1300,7 @@
 				<param type="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3665" levels="2" name="Red Talisman - CP Regeneration">
 		<!-- Confirmed CT2.5 -->
@@ -1322,6 +1324,7 @@
 				<mul stat="regCp" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="3666" levels="1" name="Yellow Talisman - Increase Force">
 		<!-- Confirmed CT2.5 -->
diff --git a/src/main/resources/data/stats/skills/04100-04199.xml b/src/main/resources/data/stats/skills/04100-04199.xml
index b77dad5337ce7d75ed3a0ac773200f956d463942..c61c28dd990698da1846f7491c114ed197f214ff 100644
--- a/src/main/resources/data/stats/skills/04100-04199.xml
+++ b/src/main/resources/data/stats/skills/04100-04199.xml
@@ -733,6 +733,7 @@
 				<mul stat="regHp" val="0.05" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="4126" levels="1" name="Reduction in recovery time">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/04200-04299.xml b/src/main/resources/data/stats/skills/04200-04299.xml
index 83d5f2d69e08fee78e9650cec7f1010005de883b..2b2846f7839bbc0b43310a7ba59f7412c1b02955 100644
--- a/src/main/resources/data/stats/skills/04200-04299.xml
+++ b/src/main/resources/data/stats/skills/04200-04299.xml
@@ -569,6 +569,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="4223" levels="1" name="Face Chance: Night to Day">
 		<!-- Confirmed CT2.5 -->
@@ -586,6 +587,7 @@
 		<effects>
 			<effect name="Buff" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="4224" levels="1" name="Face Chance: Day to Night">
 		<!-- Confirmed CT2.5 -->
@@ -604,6 +606,7 @@
 			<!-- TODO: Abnormal Change Texture for Day to Night Face -->
 			<effect name="Buff" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="4225" levels="5" name="Resist Shock">
 		<!-- Freya retail confirmed -->
@@ -643,6 +646,7 @@
 				<mul stat="regHp" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="4228" levels="12" name="NPC Double Dagger Attack">
 		<!-- High Five Confirmed -->
@@ -923,6 +927,7 @@
 				<mul stat="regHp" val="0.4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="4240" levels="1" name="Antharas Regeneration">
 		<!-- Confirmed CT2.5 -->
@@ -939,6 +944,7 @@
 				<mul stat="regHp" val="0.7" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="4241" levels="1" name="Antharas Regeneration">
 		<!-- Confirmed CT2.5 -->
@@ -955,6 +961,7 @@
 				<mul stat="regHp" val="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="4242" levels="1" name="Zaken Regeneration">
 		<!-- Confirmed CT2.5 -->
@@ -969,6 +976,7 @@
 		<effects>
 			<effect name="Buff" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="4243" levels="1" name="Venomous Poison">
 		<!-- Freya retail confirmed -->
diff --git a/src/main/resources/data/stats/skills/04400-04499.xml b/src/main/resources/data/stats/skills/04400-04499.xml
index 2aad1a3d198485bbc30d60edd0b0b4eba262b254..8c803713a087d17dcf6379ff43ba87d9eb57801f 100644
--- a/src/main/resources/data/stats/skills/04400-04499.xml
+++ b/src/main/resources/data/stats/skills/04400-04499.xml
@@ -1151,6 +1151,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="4470" levels="1" name="NPC Spoils">
 		<!-- High Five Confirmed -->
@@ -1192,6 +1193,7 @@
 				<mul stat="pDef" val="#pAtkDef" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="4472" levels="12" name="NPC Strike Golem">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/04500-04599.xml b/src/main/resources/data/stats/skills/04500-04599.xml
index 18d8f00573bd9615c81a68b3bb3d0e5dc5a15a30..8a49b1fca834bf96029a1124452f3f49dc048756 100644
--- a/src/main/resources/data/stats/skills/04500-04599.xml
+++ b/src/main/resources/data/stats/skills/04500-04599.xml
@@ -270,6 +270,7 @@
 				<add stat="rEvas" val="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="4524" levels="1" name="Quest - BOSS Bluff">
 		<set name="abnormalLvl" val="1" />
@@ -285,6 +286,7 @@
 		<effects>
 			<effect name="Buff" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="4525" levels="1" name="Quest - BOSS Defend">
 		<set name="abnormalVisualEffect" val="NONE" />
@@ -314,6 +316,7 @@
 				<param mode="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="4527" levels="1" name="Quest - BOSS Inc HP to Summoned">
 		<!-- High Five Confirmed -->
@@ -710,6 +713,7 @@
 				<mul stat="pAtk" val="#pAtk" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="4545" levels="1" name="Quest - BOSS Reflect">
 		<set name="abnormalVisualEffect" val="NONE" />
diff --git a/src/main/resources/data/stats/skills/05000-05099.xml b/src/main/resources/data/stats/skills/05000-05099.xml
index 60242632860a0467fa33f0e6d0756154f6a2ba3d..223ccd753c90f945bb3c18f14377fb55ddfc13fe 100644
--- a/src/main/resources/data/stats/skills/05000-05099.xml
+++ b/src/main/resources/data/stats/skills/05000-05099.xml
@@ -2079,6 +2079,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5091" levels="1" name="Sailren Production 2">
 		<!-- Confirmed CT2.5 -->
@@ -2087,6 +2088,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5092" levels="1" name="Antharas Terror">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/05100-05199.xml b/src/main/resources/data/stats/skills/05100-05199.xml
index b121c7cd057e8cc0c9f4458abbf2c050e477a53a..345501aa8fb6df5eb95ec088ac8875ecb5824170 100644
--- a/src/main/resources/data/stats/skills/05100-05199.xml
+++ b/src/main/resources/data/stats/skills/05100-05199.xml
@@ -97,6 +97,7 @@
 				<mul stat="pAtk" val="#pAtk" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5105" levels="3" name="Spell Force">
 		<!-- Not Used Anymore -->
@@ -117,6 +118,7 @@
 				<mul stat="mAtk" val="#mAtk" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5106" levels="4" name="Capture A State">
 		<!-- High Five Confirmed -->
@@ -511,6 +513,7 @@
 				<mul stat="pAtk" val="1.5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5123" levels="1" name="Maximum Defense">
 		<!-- High Five Confirmed -->
@@ -555,8 +558,8 @@
 			<effect name="DispelBySlotProbability">
 				<param dispel="DANCE_OF_CONCENTRATION" rate="100" />
 			</effect>
-				<effect name="DispelBySlotProbability">
-			<param dispel="DANCE_OF_EARTH_GUARD" rate="100" />
+			<effect name="DispelBySlotProbability">
+				<param dispel="DANCE_OF_EARTH_GUARD" rate="100" />
 			</effect>
 			<effect name="DispelBySlotProbability">
 				<param dispel="DANCE_OF_FIRE" rate="100" />
@@ -1233,6 +1236,7 @@
 				<param power="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5147" levels="10" name="Blessed Body">
 		<!-- Confirmed CT2.5 -->
@@ -1255,6 +1259,7 @@
 				<param power="#maxHp" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5148" levels="10" name="Prayer">
 		<!-- Confirmed CT2.5 -->
@@ -1277,6 +1282,7 @@
 				<mul stat="healEffect" val="#healEffect" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5149" levels="10" name="Recharge">
 		<!-- Confirmed CT2.5 -->
@@ -1296,6 +1302,7 @@
 				<param power="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5150" levels="10" name="Blessed Soul">
 		<!-- Confirmed CT2.5 -->
@@ -1318,6 +1325,7 @@
 				<param power="#maxMp" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5151" levels="10" name="Mana Gain">
 		<!-- Confirmed CT2.5 -->
@@ -1339,6 +1347,7 @@
 				<add stat="manaCharge" val="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5152" levels="10" name="Ritual">
 		<!-- Confirmed CT2.5 -->
@@ -1358,6 +1367,7 @@
 				<param amount="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5153" levels="10" name="Cheer">
 		<!-- Confirmed CT2.5 -->
@@ -1380,6 +1390,7 @@
 				<param power="#maxCp" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5154" levels="10" name="Might">
 		<!-- Confirmed CT2.5 -->
@@ -1402,6 +1413,7 @@
 				<add stat="pAtk" val="#pAtk" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5156" levels="10" name="Empower">
 		<!-- Confirmed CT2.5 -->
@@ -1424,6 +1436,7 @@
 				<add stat="mAtk" val="#mAtk" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5157" levels="10" name="Duel Might">
 		<!-- Confirmed CT2.5 -->
@@ -1446,6 +1459,7 @@
 				<mul stat="pvpPhysSkillsDmg" val="1.05" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5158" levels="10" name="Shield">
 		<!-- Confirmed CT2.5 -->
@@ -1468,6 +1482,7 @@
 				<add stat="pDef" val="#pDef" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5159" levels="10" name="Magic Barrier">
 		<!-- Confirmed CT2.5 -->
@@ -1490,6 +1505,7 @@
 				<add stat="mDef" val="#mDef" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5160" levels="10" name="Duel Weakness">
 		<!-- Confirmed CT2.5 -->
@@ -1540,6 +1556,7 @@
 				<add stat="rEvas" val="#rEvas" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5162" levels="10" name="Guidance">
 		<!-- Confirmed CT2.5 -->
@@ -1562,6 +1579,7 @@
 				<add stat="accCombat" val="#accCombat" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5163" levels="10" name="Focus">
 		<!-- Confirmed CT2.5 -->
@@ -1584,6 +1602,7 @@
 				<mul stat="critRate" val="#rCrit" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5164" levels="10" name="Wild Magic">
 		<!-- Confirmed CT2.5 -->
@@ -1606,6 +1625,7 @@
 				<add stat="mCritRate" val="#mCritRate" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5165" levels="10" name="Charm">
 		<!-- Confirmed CT2.5 -->
diff --git a/src/main/resources/data/stats/skills/05200-05299.xml b/src/main/resources/data/stats/skills/05200-05299.xml
index ed0df3dd54de8726aaa998f530f634f6a5f63a95..66c979bc439aca79261e625d1add0ab884afebac 100644
--- a/src/main/resources/data/stats/skills/05200-05299.xml
+++ b/src/main/resources/data/stats/skills/05200-05299.xml
@@ -129,6 +129,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5205" levels="1" name="Boss Regeneration">
 		<!-- High Five Confirmed -->
@@ -543,6 +544,7 @@
 				<mul stat="pDef" val="1.5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5225" levels="1" name="Invincible">
 		<!-- Confirmed CT2.5 -->
@@ -571,6 +573,7 @@
 				<sub stat="cancelVuln" val="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5226" levels="1" name="Imprison">
 		<!-- High Five Confirmed -->
@@ -838,6 +841,7 @@
 				<add stat="runSpd" val="33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5237" levels="1" name="Speed Down">
 		<!-- Confirmed CT2.5 -->
@@ -857,6 +861,7 @@
 				<mul stat="runSpd" val="0.8" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5238" levels="1" name="Freezing">
 		<!-- High Five Confirmed -->
@@ -1431,6 +1436,7 @@
 				<param fullLethal="#lethalStrikeRate" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5258" levels="12" name="Mana Burn">
 		<!-- High Five Confirmed -->
@@ -1540,6 +1546,7 @@
 				<param id="303" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5262" levels="12" name="NPC - Rise Shot">
 		<!-- High Five Confirmed -->
@@ -1689,6 +1696,7 @@
 				<mul stat="danceMpConsumeRate" val="#val" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5267" levels="21" name="Trap Explosion">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/05400-05499.xml b/src/main/resources/data/stats/skills/05400-05499.xml
index 1676efd928271951ccba5f0e5f2d43ded933fc08..af9849f6e58f8fba70b944a15e9f79d203235850 100644
--- a/src/main/resources/data/stats/skills/05400-05499.xml
+++ b/src/main/resources/data/stats/skills/05400-05499.xml
@@ -48,6 +48,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5403" levels="1" name="Presentation - Balor 3">
 		<!-- Balor - Magic Skill2 -->
@@ -57,6 +58,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5404" levels="1" name="Presentation - Balor 4">
 		<!-- High Five Confirmed -->
@@ -438,6 +440,7 @@
 				<mul stat="mAtkSpd" val="0.85" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5427" levels="1" name="Counter Rapid Shot">
 		<!-- High Five Confirmed -->
@@ -495,6 +498,7 @@
 				<param power="49" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5430" levels="1" name="Spoil Bomb">
 		<!-- High Five Confirmed -->
@@ -929,6 +933,7 @@
 		<effects>
 			<effect name="TargetCancel" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5449" levels="1" name="Weak Constitution">
 		<!-- Confirmed CT2.5 -->
@@ -942,6 +947,7 @@
 		<effects>
 			<effect name="Stun" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5450" levels="7" name="Thin Skin">
 		<!-- Confirmed CT2.5 -->
@@ -964,6 +970,7 @@
 				<param ticks="5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5451" levels="1" name="Enervation">
 		<!-- Confirmed CT2.5 -->
@@ -981,6 +988,7 @@
 				<mul stat="mAtkSpd" val="0.7" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5452" levels="3" name="Spite">
 		<!-- Confirmed CT2.5 -->
@@ -999,6 +1007,7 @@
 				<mul stat="defCritDamage" val="#defCritDamage" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5453" levels="4" name="Mental Impoverish">
 		<!-- Confirmed CT2.5 -->
@@ -1013,6 +1022,7 @@
 				<param power="#power" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5454" levels="1" name="Shadow Bind">
 		<!-- High Five Confirmed -->
@@ -1604,6 +1614,7 @@
 				<param flyRadius="300" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5495" levels="1" name="Bleed">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/05500-05599.xml b/src/main/resources/data/stats/skills/05500-05599.xml
index df5339e47908a923e4b25f801e2191d83ac4e33c..939d97b7c62cfe8ce90a98cd570b831d7695f8ae 100644
--- a/src/main/resources/data/stats/skills/05500-05599.xml
+++ b/src/main/resources/data/stats/skills/05500-05599.xml
@@ -455,6 +455,7 @@
 				<mul stat="regHp" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5518" levels="1" name="Last Stand">
 		<!-- High Five Confirmed -->
@@ -878,6 +879,7 @@
 		<cond msgId="2292">
 			<player agathionId="16031" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5536" levels="1" name="Little Devil Cuteness Trick">
 		<set name="icon" val="icon.skill_agathion_cute" />
@@ -889,6 +891,7 @@
 		<cond msgId="2292">
 			<player agathionId="16032" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5537" levels="1" name="Rudolph Cuteness Trick">
 		<set name="icon" val="icon.skill_agathion_cute" />
@@ -900,6 +903,7 @@
 		<cond msgId="2292">
 			<player agathionId="16033" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5538" levels="1" name="Little Angel Agathion Special Skill - Firecrackers">
 		<set name="icon" val="icon.skill_agathion_special" />
@@ -912,6 +916,7 @@
 		<cond msgId="2292">
 			<player agathionId="16031" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5539" levels="1" name="Little Angel Agathion Special Skill - Mysterious Power">
 		<set name="abnormalLvl" val="0" />
@@ -930,6 +935,7 @@
 		<cond msgId="2292">
 			<player agathionId="16031" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5540" levels="1" name="Little Angel Agathion Special Skill - Blessed Escape">
 		<!-- High Five Confirmed -->
@@ -985,6 +991,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5542" levels="1" name="Little Devil Agathion Special Skill - Firecrackers">
 		<set name="icon" val="icon.skill_agathion_special" />
@@ -997,6 +1004,7 @@
 		<cond msgId="2292">
 			<player agathionId="16032" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5543" levels="1" name="Little Devil Agathion Special Skill - Mysterious Power">
 		<set name="abnormalLvl" val="0" />
@@ -1015,6 +1023,7 @@
 		<cond msgId="2292">
 			<player agathionId="16032" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5544" levels="1" name="Little Devil Agathion Special Skill - Blessed Escape">
 		<!-- High Five Confirmed -->
@@ -1070,6 +1079,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5546" levels="1" name="Alert">
 		<!-- High Five Confirmed -->
@@ -1138,6 +1148,7 @@
 				<param charge="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5549" levels="1" name="Physical Short-range Weakness">
 		<set name="magicLvl" val="70" />
diff --git a/src/main/resources/data/stats/skills/05600-05699.xml b/src/main/resources/data/stats/skills/05600-05699.xml
index 75bfadd0d11a1340e3b9d151a9a3f36f70a13b0f..6162938ffc216ac16525a77089b64e9f0a5691e6 100644
--- a/src/main/resources/data/stats/skills/05600-05699.xml
+++ b/src/main/resources/data/stats/skills/05600-05699.xml
@@ -61,6 +61,7 @@
 				<param mode="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5603" levels="1" name="Dagger Mastery">
 		<!-- Confirmed CT2.5 -->
@@ -80,6 +81,7 @@
 				<mul stat="blowRate" val="1.1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5604" levels="1" name="Blunt Mastery">
 		<!-- Confirmed CT2.5 -->
@@ -101,6 +103,7 @@
 				<param SHOCK="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5605" levels="2" name="Power of Apella">
 		<!-- Confirmed CT2.5 -->
@@ -127,6 +130,7 @@
 				<add stat="critRate" val="#rCrit" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5607" levels="2" name="Power of Apella">
 		<!-- Confirmed CT2.5 -->
@@ -153,6 +157,7 @@
 				<mul stat="pAtkSpd" val="#pAtkSpd" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5608" levels="2" name="Power of Apella">
 		<!-- Confirmed CT2.5 -->
@@ -177,6 +182,7 @@
 				<mul stat="mAtk" val="#mAtk" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5609" levels="1" name="Sound 1">
 		<!-- High Five Confirmed -->
@@ -1225,6 +1231,7 @@
 				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5656" levels="85" name="Gatekeeper Aura Flare">
 		<!-- High Five Confirmed -->
@@ -1429,6 +1436,7 @@
 				<sub stat="accCombat" val="#val2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5661" levels="1" name="Match Participation">
 		<!-- High Five Confirmed -->
@@ -1725,6 +1733,7 @@
 				<mul stat="blowRate" val="1.1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5675" levels="1" name="Evasion Haste">
 		<set name="abnormalLvl" val="1" />
@@ -1743,6 +1752,7 @@
 				<mul stat="pAtkSpd" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5676" levels="1" name="Steal Mana">
 		<!-- Confirmed CT2.5 -->
@@ -1756,6 +1766,7 @@
 				<param amount="41" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5677" levels="1" name="Steal Mana">
 		<!-- Confirmed CT2.5 -->
@@ -1769,6 +1780,7 @@
 				<param amount="51" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5678" levels="1" name="Steal Mana">
 		<!-- Confirmed CT2.5 -->
@@ -1782,6 +1794,7 @@
 				<param amount="59" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5679" levels="3" name="Oblivion Trap">
 		<!-- High Five Confirmed -->
@@ -1932,6 +1945,7 @@
 				<mul stat="mAtkSpd" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5686" levels="1" name="PvP Weapon - Rapid Fire">
 		<!-- Confirmed CT2.5 -->
@@ -1953,6 +1967,7 @@
 				<mul stat="pAtkSpd" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5687" levels="1" name="PvP Weapon - Decrease Range">
 		<!-- High Five Confirmed -->
@@ -2037,6 +2052,7 @@
 				<add stat="reflectDam" val="50" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5690" levels="1" name="PvP Armor - Damage Down">
 		<!-- Confirmed CT2.5 -->
@@ -2060,6 +2076,7 @@
 				<mul stat="pvpPhysDef" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5691" levels="1" name="PvP Armor - Critical Down">
 		<!-- Confirmed CT2.5 -->
@@ -2082,6 +2099,7 @@
 				<mul stat="defCritDamage" val="0.85" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5692" levels="1" name="PvP Armor - Heal">
 		<!-- High Five Confirmed -->
@@ -2168,6 +2186,7 @@
 				<param charge="5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5696" levels="1" name="Dizziness">
 		<set name="abnormalLvl" val="9" />
@@ -2187,6 +2206,7 @@
 				<mul stat="pAtkSpd" val="0.8" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5697" levels="4" name="Seal">
 		<!-- High Five Confirmed -->
@@ -2230,6 +2250,7 @@
 				<param amount="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5699" levels="7" name="Decrease P. Def">
 		<!-- Lvl 1 - Kamaloka (Labyrinth of the Abyss) 29 -->
@@ -2254,5 +2275,6 @@
 				<mul stat="pDef" val="0.34" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/05700-05799.xml b/src/main/resources/data/stats/skills/05700-05799.xml
index 8edad34eb8e14534c2401d1552e29f8d910f8b36..1917979306517fdbcac723d34a4a17a6e459a070 100644
--- a/src/main/resources/data/stats/skills/05700-05799.xml
+++ b/src/main/resources/data/stats/skills/05700-05799.xml
@@ -23,6 +23,7 @@
 				<mul stat="mDef" val="0.34" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5701" levels="7" name="Decrease P. Atk">
 		<!-- Lvl 1 - Kamaloka (Labyrinth of the Abyss) 29 -->
@@ -47,6 +48,7 @@
 				<mul stat="pAtk" val="0.34" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5702" levels="2" name="Adiantum Round Fighter">
 		<!-- High Five Confirmed -->
@@ -508,6 +510,7 @@
 				<mul stat="pAtk" val="1.50" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5719" levels="1" name="Kamabion Susceptibility">
 		<!-- High Five Confirmed -->
@@ -1484,6 +1487,7 @@
 		<effects>
 			<effect name="Buff" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5754" levels="1" name="Presentation - Adiantum Round Fighter">
 		<!-- High Five Confirmed -->
@@ -1551,6 +1555,7 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5759" levels="1" name="Presentation - The Rise of Latana">
 		<!-- High Five Confirmed -->
@@ -1559,6 +1564,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5760" levels="9" name="Critical Hit">
 		<!-- High Five Confirmed -->
@@ -1590,6 +1596,7 @@
 				<param allowWeapons="ALL" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5761" levels="2" name="Power Strike">
 		<!-- High Five Confirmed -->
@@ -1878,6 +1885,7 @@
 		<effects>
 			<effect name="Buff" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5772" levels="1" name="Surrender to Fire">
 		<!-- High Five Confirmed -->
@@ -2077,6 +2085,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5782" levels="1" name="Presentation - Lindvior Gust">
 		<!-- Confirmed CT2.5 -->
@@ -2085,6 +2094,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5783" levels="1" name="Presentation - Lindvior Descent">
 		<!-- Confirmed CT2.5 -->
@@ -2093,6 +2103,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5784" levels="1" name="Presentation - Lindvior Dust">
 		<!-- Confirmed CT2.5 -->
@@ -2101,6 +2112,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5785" levels="1" name="Presentation - Dimensional Door">
 		<!-- Confirmed CT2.5 -->
@@ -2108,6 +2120,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5786" levels="1" name="Presentation - Ekimus Separation">
 		<!-- Confirmed CT2.5 -->
@@ -2117,6 +2130,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5787" levels="1" name="Presentation - Ekimus Approach">
 		<!-- Confirmed CT2.5 -->
@@ -2126,6 +2140,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5788" levels="1" name="Presentation - Ekimus Blood Hail">
 		<!-- Confirmed CT2.5 -->
@@ -2135,6 +2150,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5789" levels="1" name="Presentation - Ekimus Sneer">
 		<!-- Confirmed CT2.5 -->
@@ -2144,6 +2160,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5790" levels="1" name="Presentation - Ekimus Aftereffect">
 		<!-- Confirmed CT2.5 -->
@@ -2151,6 +2168,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5791" levels="1" name="Presentation - Magyun's Entrance">
 		<!-- Confirmed CT2.5 -->
@@ -2160,6 +2178,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5792" levels="1" name="Presentation - Summon Banshee Queen Boomi">
 		<!-- Confirmed CT2.5 -->
@@ -2168,6 +2187,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5793" levels="1" name="Presentation - Summon Boomi">
 		<!-- Confirmed CT2.5 -->
@@ -2176,6 +2196,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5794" levels="1" name="Decrease Spd.">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/05800-05899.xml b/src/main/resources/data/stats/skills/05800-05899.xml
index fe0341ff240c3d7ac5506de736ad0b97442da9af..591f800a715ef98c7f4709229c58c5b0c6f2101a 100644
--- a/src/main/resources/data/stats/skills/05800-05899.xml
+++ b/src/main/resources/data/stats/skills/05800-05899.xml
@@ -1251,6 +1251,7 @@
 				<param id="117" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5857" levels="1" name="Transform Lure Tow">
 		<!-- Confirmed CT2.5 -->
@@ -1273,6 +1274,7 @@
 				<param id="118" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5858" levels="1" name="Transform Heavy Tow">
 		<!-- Confirmed CT2.5 -->
@@ -1295,6 +1297,7 @@
 				<param id="119" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5859" levels="1" name="Transform Wing Tow">
 		<!-- Confirmed CT2.5 -->
@@ -1317,6 +1320,7 @@
 				<param id="120" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5860" levels="1" name="Wrath of Valakas">
 		<!-- High Five Confirmed -->
@@ -2544,7 +2548,7 @@
 		<set name="mpConsume2" val="82" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
-		<set name="rideState" val="NONE" /> 
+		<set name="rideState" val="NONE" />
 		<set name="targetType" val="PC_BODY" />
 		<selfEffects>
 			<effect name="HpPerMax">
diff --git a/src/main/resources/data/stats/skills/05900-05999.xml b/src/main/resources/data/stats/skills/05900-05999.xml
index 6dd629e6790e07b205b0766573b22704bea71502..bb037a2a211ffa0108ef4a0fd69f002b1d11fa67 100644
--- a/src/main/resources/data/stats/skills/05900-05999.xml
+++ b/src/main/resources/data/stats/skills/05900-05999.xml
@@ -99,6 +99,7 @@
 		<effects>
 			<effect name="TargetCancel" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5903" levels="1" name="Burst of Misplace">
 		<!-- High Five Confirmed -->
@@ -687,6 +688,7 @@
 				<mul stat="mAtk" val="1.03" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="5924" levels="1" name="Devour Soul">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/06000-06099.xml b/src/main/resources/data/stats/skills/06000-06099.xml
index 0076a7d2c4a4c418f8b56f083cf8e6c8eb775e19..08b0954b4ce604d58bfc21b9fc82b16cf5112d54 100644
--- a/src/main/resources/data/stats/skills/06000-06099.xml
+++ b/src/main/resources/data/stats/skills/06000-06099.xml
@@ -162,6 +162,7 @@
 				<mul stat="mAtk" val="1.06" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6021" levels="1" name="Soul Retain">
 		<!-- Confirmed CT2.5 -->
@@ -184,6 +185,7 @@
 				<mul stat="mAtk" val="1.09" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6022" levels="1" name="Soul Retain">
 		<!-- Confirmed CT2.5 -->
@@ -206,6 +208,7 @@
 				<mul stat="mAtk" val="1.12" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6023" levels="1" name="Soul Retain">
 		<!-- Confirmed CT2.5 -->
@@ -228,6 +231,7 @@
 				<mul stat="mAtk" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6024" levels="1" name="Weight Aerial Cleft">
 		<!-- High Five Confirmed -->
@@ -705,6 +709,7 @@
 				<mul stat="mDef" val="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6050" levels="14" name="Power Smash">
 		<!-- High Five Confirmed -->
@@ -815,6 +820,7 @@
 				<mul stat="mDef" val="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6054" levels="1" name="Switch State">
 		<!-- Confirmed CT2.5 -->
@@ -933,6 +939,7 @@
 				</mul>
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6060" levels="1" name="Great Fury">
 		<!-- High Five Confirmed -->
@@ -1267,6 +1274,7 @@
 				<mul stat="runSpd" val="0.9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6094" levels="11" name="Panther Cancel">
 		<!-- Confirmed CT2.5 -->
diff --git a/src/main/resources/data/stats/skills/06100-06199.xml b/src/main/resources/data/stats/skills/06100-06199.xml
index 90da1e183ab36feb6ff187663fd66be571035d37..4126e15bfd67723d94d8a8611936b019cb48c453 100644
--- a/src/main/resources/data/stats/skills/06100-06199.xml
+++ b/src/main/resources/data/stats/skills/06100-06199.xml
@@ -441,6 +441,7 @@
 		<cond msgId="2292">
 			<player agathionId="16063" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6125" levels="1" name="Paralysis">
 		<!-- High Five Confirmed -->
@@ -716,6 +717,7 @@
 		<cond msgId="2292">
 			<player agathionId="16064" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6137" levels="1" name="Agathion Juju - Effect of Doubt">
 		<!-- High Five Confirmed -->
@@ -958,6 +960,7 @@
 				<add stat="reflectDam" val="70" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6148" levels="1" name="Altar's Curse">
 		<!-- You have been weakened by the Altar's Curse. You probably can't fight in this condition. -->
@@ -1392,6 +1395,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6174" levels="1" name="Presentation - Incense for Relic">
 		<!-- Confirmed CT2.5 -->
@@ -1402,6 +1406,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6175" levels="1" name="Presentation - High Ranking Dawn Priest's Prayer">
 		<!-- Confirmed CT2.5 -->
@@ -1413,6 +1418,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6176" levels="1" name="Presentation - Dawn's Seal Stone">
 		<!-- Confirmed CT2.5 -->
@@ -1423,6 +1429,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6177" levels="1" name="Presentation - Anakim's Message">
 		<!-- Confirmed CT2.5 -->
@@ -1434,6 +1441,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6178" levels="1" name="Presentation - Ultimate Seal Motion1">
 		<!-- Confirmed CT2.5 -->
@@ -1444,6 +1452,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6179" levels="1" name="Presentation - Ultimate Seal Motion2">
 		<!-- Confirmed CT2.5 -->
@@ -1454,6 +1463,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6180" levels="1" name="Presentation - Lilith Presentation1">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/06200-06299.xml b/src/main/resources/data/stats/skills/06200-06299.xml
index a04c98a0f44f8a0976273c6c6a03a3784e569233..787110a0955302cef90c116a901856103ca7ec3c 100644
--- a/src/main/resources/data/stats/skills/06200-06299.xml
+++ b/src/main/resources/data/stats/skills/06200-06299.xml
@@ -302,6 +302,7 @@
 				<add stat="runSpd" val="66" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6208" levels="1" name="Blessed Guidance">
 		<!-- High Five Confirmed -->
@@ -482,6 +483,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6235" levels="1" name="Blessed Focus">
 		<!-- High Five Confirmed -->
@@ -609,6 +611,7 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6241" levels="1" name="Heatstroke Prevention Effect - Gludio">
 		<!-- High Five Confirmed -->
@@ -1428,6 +1431,7 @@
 				<add stat="vengeanceMdam" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6283" levels="1" name="Ice Storm">
 		<!-- Confirmed CT2.5 -->
@@ -1470,6 +1474,7 @@
 				<mul stat="pAtkSpd" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6285" levels="1" name="Rage of Ice">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/06300-06399.xml b/src/main/resources/data/stats/skills/06300-06399.xml
index f7887a738978642e6d0a23eda09dce8604d836c0..74f69680cafa4670669ff020d9abe47fc681b5b9 100644
--- a/src/main/resources/data/stats/skills/06300-06399.xml
+++ b/src/main/resources/data/stats/skills/06300-06399.xml
@@ -72,6 +72,7 @@
 				<mul stat="mDef" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6303" levels="1" name="Trial of the Coup">
 		<!-- Confirmed CT2.5 -->
@@ -436,6 +437,7 @@
 				<param power="15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6317" levels="1" name="Sacred Tacit">
 		<!-- High Five Confirmed -->
@@ -819,6 +821,7 @@
 				<mul stat="pAtkSpd" val="0.7" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6332" levels="1" name="Camp Fire Full">
 		<!-- Confirmed CT2.5 -->
@@ -842,6 +845,7 @@
 				<mul stat="pAtkSpd" val="0.7" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6333" levels="1" name="Electric Bolt 1">
 		<!-- Confirmed CT2.5 -->
diff --git a/src/main/resources/data/stats/skills/06400-06499.xml b/src/main/resources/data/stats/skills/06400-06499.xml
index a082e8df66254d0c8b70823ff8a6639bc25c981c..0fd53a5b8b45dc358af283e0361ad6fb27820e0f 100644
--- a/src/main/resources/data/stats/skills/06400-06499.xml
+++ b/src/main/resources/data/stats/skills/06400-06499.xml
@@ -198,10 +198,10 @@
 		<effects>
 			<effect name="Stun" />
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockBuff" />
 			<effect name="BlockDebuff" />
@@ -665,6 +665,7 @@
 				<mul stat="pDef" val="0.1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6426" levels="1" name="Priest's Ire">
 		<!-- High Five Confirmed -->
@@ -1246,6 +1247,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6446" levels="1" name="Presentation - Freya's Message 2">
 		<!-- Confirmed CT2.5 -->
@@ -1256,6 +1258,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6447" levels="1" name="Presentation - Freya's Message 3">
 		<!-- Confirmed CT2.5 -->
@@ -1266,6 +1269,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6448" levels="1" name="Presentation - Freya's Message 4">
 		<!-- Confirmed CT2.5 -->
@@ -1276,6 +1280,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6449" levels="1" name="Presentation - Freya's Message 5">
 		<!-- Confirmed CT2.5 -->
@@ -1286,6 +1291,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6450" levels="1" name="Presentation - Freya Nova">
 		<!-- Confirmed CT2.5 -->
@@ -1296,6 +1302,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6451" levels="1" name="Presentation - Freya Move">
 		<!-- Confirmed CT2.5 -->
@@ -1306,6 +1313,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6452" levels="1" name="Presentation - Freya Space Change">
 		<!-- Confirmed CT2.5 -->
@@ -1316,6 +1324,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6453" levels="1" name="Presentation - Freya Death">
 		<!-- Confirmed CT2.5 -->
@@ -1326,6 +1335,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6454" levels="1" name="Presentation - Freya Frustration">
 		<!-- Confirmed CT2.5 -->
@@ -1336,6 +1346,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6455" levels="1" name="Presentation - Freya Destroy">
 		<!-- Confirmed CT2.5 -->
@@ -1346,6 +1357,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6456" levels="1" name="Presentation - Freya Eternal Blizzard">
 		<!-- High Five Confirmed -->
@@ -1367,6 +1379,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6458" levels="1" name="Presentation - Transform of Sirr">
 		<!-- Confirmed CT2.5 -->
@@ -1377,6 +1390,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6459" levels="1" name="Presentation - Kegor Super Buff">
 		<!-- Confirmed CT2.5 -->
@@ -1387,6 +1401,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6460" levels="1" name="Presentation - Jinia Super Buff">
 		<!-- Confirmed CT2.5 -->
@@ -1397,6 +1412,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6461" levels="1" name="Presentation - Kegor's Message 1">
 		<!-- Confirmed CT2.5 -->
@@ -1407,6 +1423,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6462" levels="1" name="Presentation - Kegor's Message 1">
 		<!-- Confirmed CT2.5 -->
@@ -1417,6 +1434,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6463" levels="1" name="Presentation - Transfer Achievement">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/06700-06799.xml b/src/main/resources/data/stats/skills/06700-06799.xml
index 407eaa63d25c3123195a60f8722944dfa42339fa..2561217e251cf2369236a0a2373f91a205ee0333 100644
--- a/src/main/resources/data/stats/skills/06700-06799.xml
+++ b/src/main/resources/data/stats/skills/06700-06799.xml
@@ -1479,6 +1479,7 @@
 				<mul stat="pAtkSpd" val="1.33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6763" levels="1" name="Dragon Earth Strike">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/06900-06999.xml b/src/main/resources/data/stats/skills/06900-06999.xml
index 0e950fd021a0667b7a9c830e34156dee1aede979..a0a90b91e39e815bbb6fdc3f7bc6898eea0610e2 100644
--- a/src/main/resources/data/stats/skills/06900-06999.xml
+++ b/src/main/resources/data/stats/skills/06900-06999.xml
@@ -82,6 +82,7 @@
 				<param id="22" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6909" levels="1" name="Charming">
 		<!-- High Five Confirmed -->
@@ -91,6 +92,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6910" levels="1" name="Dance">
 		<!-- High Five Confirmed -->
@@ -100,6 +102,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6911" levels="1" name="Greeting">
 		<!-- High Five Confirmed -->
@@ -109,6 +112,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6912" levels="1" name="Stigma Aftermath">
 		<!-- High Five Confirmed -->
@@ -184,6 +188,7 @@
 				<mul stat="pAtkSpd" val="#rate" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6915" levels="10" name="npc Acumen">
 		<!-- High Five Confirmed -->
@@ -203,6 +208,7 @@
 				<mul stat="mAtkSpd" val="#mAtkSpd" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6916" levels="1" name="Antharas's Cute Tricks">
 		<!-- High Five Confirmed -->
@@ -214,6 +220,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6917" levels="1" name="Kanna's Splendor">
 		<!-- High Five Confirmed -->
@@ -225,6 +232,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6918" levels="1" name="Kallesin's Splendor">
 		<!-- High Five Confirmed -->
@@ -236,6 +244,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6919" levels="1" name="Challenge Acceptance">
 		<!-- High Five Confirmed -->
@@ -269,6 +278,7 @@
 				<mul stat="rEvas" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="6920" levels="1" name="Collector's Fortune">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/07000-07099.xml b/src/main/resources/data/stats/skills/07000-07099.xml
index f3c600b2f5c159cae815405ebc3f4420075a3685..260f2336c5cf98a00b307073538c042f1a155213 100644
--- a/src/main/resources/data/stats/skills/07000-07099.xml
+++ b/src/main/resources/data/stats/skills/07000-07099.xml
@@ -73,6 +73,7 @@
 				<param dispel="TURN_STONE,2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="7005" levels="4" name="Greater Chant of Vampire">
 		<!-- This skill only has one level, 4. -->
@@ -1481,6 +1482,7 @@
 				<param npcId="30048" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="7073" levels="1" name="Test - Find Trap">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/08200-08299.xml b/src/main/resources/data/stats/skills/08200-08299.xml
index 02a57d039cd274bc5a20233f4f5a033428fc8f0a..8ba4b25d0697a5b03d6686d13d690e4c8f8b089e 100644
--- a/src/main/resources/data/stats/skills/08200-08299.xml
+++ b/src/main/resources/data/stats/skills/08200-08299.xml
@@ -1007,6 +1007,7 @@
 				<param power="540" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8238" levels="1" name="Shalin Strike">
 		<!-- High Five Confirmed -->
@@ -1057,6 +1058,7 @@
 				<param allowWeapons="ALL" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8240" levels="3" name="Obliteration Storm">
 		<!-- High Five Confirmed -->
@@ -1122,6 +1124,7 @@
 				<mul stat="critRate" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8242" levels="1" name="Ice Ball">
 		<!-- High Five Confirmed -->
@@ -1191,6 +1194,7 @@
 				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8245" levels="1" name="Summon Agathion - Love">
 		<!-- Confirmed CT2.5 -->
@@ -1229,6 +1233,7 @@
 				<param id="108" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8247" levels="1" name="Mount Darkmane Pacer">
 		<!-- Confirmed CT2.5 -->
@@ -1252,6 +1257,7 @@
 				<param id="106" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8248" levels="1" name="Cancel Gatekeeper Transformation">
 		<!-- Confirmed CT2.5 -->
@@ -1268,6 +1274,7 @@
 				<param dispel="TRANSFORM,319" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8249" levels="1" name="Cancel Critical Hit">
 		<!-- Confirmed CT2.5 -->
@@ -1282,6 +1289,7 @@
 				<param dispel="SEED_OF_CRITICAL,10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8250" levels="2" name="Summon Tigress">
 		<table name="#npcIds"> 14916 14917 </table>
@@ -1504,6 +1512,7 @@
 				<param id="110" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8262" levels="1" name="Tawny Maned Lion Mount">
 		<!-- Confirmed CT2.5 -->
@@ -1527,6 +1536,7 @@
 				<param id="109" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8263" levels="1" name="Transform Snow King">
 		<!-- Confirmed CT2.5 -->
@@ -1549,6 +1559,7 @@
 				<param id="114" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8264" levels="1" name="Transform Scarecrow Jack">
 		<!-- Confirmed CT2.5 -->
@@ -1571,6 +1582,7 @@
 				<param id="115" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8265" levels="1" name="Transform Tin Golem">
 		<!-- Confirmed CT2.5 -->
@@ -1593,6 +1605,7 @@
 				<param id="116" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8266" levels="1" name="Gludio Talisman">
 		<!-- Confirmed CT2.5 -->
@@ -1736,6 +1749,7 @@
 				<param id="101" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8278" levels="1" name="Transform Guard of Dawn">
 		<set name="abnormalLvl" val="1" />
@@ -1757,6 +1771,7 @@
 				<param id="113" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8279" levels="1" name="Blessing of Fire">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/08300-08399.xml b/src/main/resources/data/stats/skills/08300-08399.xml
index 14ae2d4b05b298504d9265ee99a5e61c8e472d85..f6350811a824ab4a800e3d75a94e02bb17e7fb47 100644
--- a/src/main/resources/data/stats/skills/08300-08399.xml
+++ b/src/main/resources/data/stats/skills/08300-08399.xml
@@ -224,6 +224,7 @@
 				<param amount="1200" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8309" levels="1" name="Red Talisman - Territory Convoy">
 		<!-- Confirmed CT2.5 -->
@@ -249,6 +250,7 @@
 				<param amount="800" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8310" levels="1" name="Arcana Sigil">
 		<set name="icon" val="icon.arcana_sigil_i00" />
@@ -453,6 +455,7 @@
 		<set name="reuseDelay" val="15000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8324" levels="1" name="Warrior's Shirt">
 		<set name="magicLvl" val="75" />
@@ -644,6 +647,7 @@
 				<param amount="1500" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8334" levels="1" name="Blue Talisman - Lord's Divine Protection">
 		<!-- Confirmed CT2.5 -->
@@ -667,6 +671,7 @@
 				<mul stat="pvpPhysDef" val="1.75" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8335" levels="1" name="White Talisman - Attribute Resistance">
 		<!-- Confirmed CT2.5 -->
@@ -694,6 +699,7 @@
 				<add stat="darkRes" val="15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8336" levels="1" name="Guardian's Strider Mount">
 		<!-- High Five Confirmed -->
@@ -1110,6 +1116,7 @@
 		<set name="reuseDelay" val="15000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8360" levels="1" name="Energy Maintenance Effect">
 		<!-- Confirmed CT2.5 -->
@@ -1131,6 +1138,7 @@
 				<mul stat="vitalityConsumeRate" val="0" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8361" levels="1" name="Sixth Anniversary Party Earring">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/08400-08499.xml b/src/main/resources/data/stats/skills/08400-08499.xml
index 66a800ca0fd1e2076cd6455980aa285a77a0c395..21e4e57544c69eb71c8c214bbeddf420ddecd18a 100644
--- a/src/main/resources/data/stats/skills/08400-08499.xml
+++ b/src/main/resources/data/stats/skills/08400-08499.xml
@@ -1204,6 +1204,7 @@
 		<set name="reuseDelay" val="15000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8466" levels="2" name="Sword of Vampiric Rage">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/08500-08599.xml b/src/main/resources/data/stats/skills/08500-08599.xml
index f93e82099fe174ace2c1e19fe4312c7bc178162a..c2cbfd2017b3761faa1f0e3082d9e42f3fe68e2f 100644
--- a/src/main/resources/data/stats/skills/08500-08599.xml
+++ b/src/main/resources/data/stats/skills/08500-08599.xml
@@ -188,16 +188,19 @@
 		<!-- "When used, you can obtain at random one 3-, 7-, 10-, 30-day, or unlimited National Representative Warrior's accessory set. Upon skill use, 10 Proofs of Cheers are consumed, and it can be cancelled when attacked." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8513" levels="1" name="National Representative Spell of Blessing">
 		<!-- "When used, you can obtain at random a Blessed Scroll of Escape or a B~S grade Blessed Weapon/Armor Strengthening Scroll. Upon skill use, 10 Proofs of Cheers are consumed, and it can be cancelled when attacked." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8514" levels="1" name="National Representative Energy of Victory">
 		<!-- "When used, you can obtain at random one Nevit's Hourglass 1~4 hours and Nevit's Voice. Upon skill use, 10 Proofs of Cheers are consumed, and it can be cancelled when attacked." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8515" levels="1" name="Release Seal on Agathion - Ball Trapping Gnosian">
 		<!-- High Five Skill -->
@@ -214,6 +217,7 @@
 				<param npcId="1576" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8516" levels="1" name="Release Seal on Agathion - Ball Trapping Orodriel">
 		<!-- High Five Skill -->
@@ -230,6 +234,7 @@
 				<param npcId="1577" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8517" levels="1" name="Release Seal on Agathion - Penalty Kick">
 		<!-- High Five Skill -->
@@ -246,21 +251,25 @@
 				<param npcId="1578" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8518" levels="1" name="Notifier">
 		<!-- Informs you of the re-supply time of the gift given by the Agathion. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8519" levels="1" name="Notifier">
 		<!-- Informs you of the re-supply time of the gift given by the Agathion. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8520" levels="1" name="Notifier">
 		<!-- Informs you of the re-supply time of the gift given by the Agathion. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8521" levels="1" name="Release Seal on Agathion - Antharas">
 		<!-- High Five Skill -->
@@ -275,6 +284,7 @@
 				<param npcId="16077" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8522" levels="1" name="Release Seal on Agathion - Nevit's Messenger Kanna">
 		<!-- High Five Skill -->
@@ -289,6 +299,7 @@
 				<param npcId="16078" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8523" levels="1" name="Release Seal on Agathion - Guardian of the Dawn Kallesin">
 		<!-- High Five Skill -->
@@ -303,6 +314,7 @@
 				<param npcId="16079" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="8524" levels="1" name="Hero's Holy Attack">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/09000-09099.xml b/src/main/resources/data/stats/skills/09000-09099.xml
index 7263305db7f336fcbcecc52f437ef1a99b3a7874..7c07cae950c99ac69eb5755d6df17f5a5bf1c672 100644
--- a/src/main/resources/data/stats/skills/09000-09099.xml
+++ b/src/main/resources/data/stats/skills/09000-09099.xml
@@ -6,6 +6,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9001" levels="1" name="PC room private armor strengthening order sheet - C grade">
 		<set name="isMagic" val="2" />
@@ -13,6 +14,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9002" levels="1" name="PC room private armor strengthening order sheet - B grade">
 		<set name="isMagic" val="2" />
@@ -20,6 +22,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9003" levels="1" name="PC room private weapon strengthening order sheet - A grade">
 		<set name="isMagic" val="2" />
@@ -27,6 +30,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9004" levels="1" name="PC room private armor strengthening order sheet - S grade">
 		<set name="isMagic" val="2" />
@@ -34,6 +38,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9005" levels="1" name="PC room private blessed weapon strengthening order sheet - D grade">
 		<set name="isMagic" val="2" />
@@ -41,6 +46,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9006" levels="1" name="PC room private blessed weapon strengthening order sheet - C grade">
 		<set name="isMagic" val="2" />
@@ -48,6 +54,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9007" levels="1" name="PC room private blessed weapon strengthening order sheet - B grade">
 		<set name="isMagic" val="2" />
@@ -55,6 +62,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9008" levels="1" name="PC room private blessed weapon strengthening order sheet - A grade">
 		<set name="isMagic" val="2" />
@@ -62,6 +70,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9009" levels="1" name="PC room private blessed weapon strengthening order sheet - S grade">
 		<set name="isMagic" val="2" />
@@ -69,6 +78,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9010" levels="1" name="Cool air cannon">
 		<!-- High Five Confirmed -->
@@ -114,6 +124,7 @@
 				<mul stat="pAtk" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9012" levels="1" name="Shield">
 		<!-- Confirmed CT2.5 -->
@@ -132,6 +143,7 @@
 				<mul stat="pDef" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9013" levels="1" name="Wind Walk">
 		<!-- Confirmed CT2.5 -->
@@ -150,6 +162,7 @@
 				<add stat="runSpd" val="33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9014" levels="1" name="Focus">
 		<!-- Confirmed CT2.5 -->
@@ -168,6 +181,7 @@
 				<mul stat="critRate" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9015" levels="1" name="Death Whisper">
 		<!-- Confirmed CT2.5 -->
@@ -186,6 +200,7 @@
 				<mul stat="critDmg" val="1.35" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9016" levels="1" name="Guidance">
 		<!-- Confirmed CT2.5 -->
@@ -204,6 +219,7 @@
 				<add stat="accCombat" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9017" levels="1" name="Blessed Shield">
 		<!-- Confirmed CT2.5 -->
@@ -222,6 +238,7 @@
 				<mul stat="rShld" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9018" levels="1" name="Blessed Body">
 		<!-- Confirmed CT2.5 -->
@@ -241,6 +258,7 @@
 				<param type="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9019" levels="1" name="Haste">
 		<!-- Confirmed CT2.5 -->
@@ -259,6 +277,7 @@
 				<mul stat="pAtkSpd" val="1.33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9020" levels="1" name="Vampiric Rage">
 		<!-- High Five Confirmed -->
@@ -304,6 +323,7 @@
 				<sub stat="rEvas" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9022" levels="1" name="Magic Barrier">
 		<!-- Confirmed CT2.5 -->
@@ -322,6 +342,7 @@
 				<mul stat="mDef" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9023" levels="1" name="Blessed Soul">
 		<!-- Confirmed CT2.5 -->
@@ -341,6 +362,7 @@
 				<param type="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9024" levels="1" name="Empower">
 		<!-- Confirmed CT2.5 -->
@@ -359,6 +381,7 @@
 				<mul stat="mAtk" val="1.75" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9025" levels="1" name="Acumen">
 		<!-- Confirmed CT2.5 -->
@@ -377,6 +400,7 @@
 				<mul stat="mAtkSpd" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9026" levels="1" name="Clarity">
 		<!-- Confirmed CT2.5 -->
@@ -397,6 +421,7 @@
 				<mul stat="danceMpConsumeRate" val="0.8" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9027" levels="1" name="PC cafe personal instant lottery">
 		<!-- Confirmed CT2.5 -->
@@ -466,6 +491,7 @@
 				<param npcId="13271" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9030" levels="1" name="Honey Watermelon Seed">
 		<!-- Confirmed CT2.5 -->
@@ -483,6 +509,7 @@
 				<param npcId="13275" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9031" levels="1" name="Copied Watermelon Seed">
 		<!-- Confirmed CT2.5 -->
@@ -500,6 +527,7 @@
 				<param npcId="13271" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9032" levels="1" name="Copied Honey Watermelon Seed">
 		<!-- Confirmed CT2.5 -->
@@ -517,6 +545,7 @@
 				<param npcId="13275" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9033" levels="1" name="Herdsman's Love Scroll">
 		<set name="isMagic" val="2" />
@@ -526,6 +555,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9034" levels="1" name="Vitality Belt Enchant Scroll">
 		<set name="isMagic" val="2" />
@@ -535,6 +565,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9035" levels="1" name="Steamed Rice Cake">
 		<!-- High Five Confirmed -->
@@ -628,6 +659,7 @@
 				<param value="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9039" levels="1" name="Steamed Rice Cake">
 		<!-- Confirmed CT2.5 -->
@@ -644,6 +676,7 @@
 				<param value="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9040" levels="1" name="PC Cafe Points">
 		<set name="isMagic" val="2" />
@@ -654,6 +687,7 @@
 		<set name="reuseDelay" val="604800000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9041" levels="1" name="Sixth Anniversary Cake">
 		<set name="abnormalLvl" val="8" />
@@ -671,6 +705,7 @@
 		<set name="reuseDelay" val="43200000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9042" levels="1" name="6th Anniversary Cube">
 		<!-- Confirmed CT2.5 -->
@@ -1084,6 +1119,7 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9062" levels="1" name="Belldandy Summon Scroll">
 		<set name="isMagic" val="2" />
@@ -1094,6 +1130,7 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9063" levels="1" name="Skooldie Summon Scroll">
 		<set name="isMagic" val="2" />
@@ -1104,6 +1141,7 @@
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9064" levels="1" name="Halloween Toy Chest">
 		<!-- Confirmed CT2.5 -->
@@ -1202,6 +1240,7 @@
 				<mul stat="vitalityConsumeRate" val="0" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9068" levels="2" name="Potion of Vitality Maintenance">
 		<!-- Confirmed CT2.5 -->
@@ -1223,6 +1262,7 @@
 				<mul stat="vitalityConsumeRate" val="0" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9069" levels="1" name="10,000 SP scroll">
 		<!-- Confirmed CT2.5 -->
@@ -1239,6 +1279,7 @@
 				<param sp="10000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9070" levels="1" name="Halloween Pumpkin">
 		<!-- Confirmed CT2.5 -->
@@ -1351,6 +1392,7 @@
 				<param amount="2300" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9075" levels="1" name="Awful Soup">
 		<!-- High Five Confirmed -->
@@ -1437,6 +1479,7 @@
 				<mul stat="regCp" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9079" levels="1" name="Santa's Buff Scroll">
 		<!-- Confirmed CT2.5 -->
@@ -1476,6 +1519,7 @@
 				<mul stat="runSpd" val="0.8" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9080" levels="1" name="Santa's Sock">
 		<!-- Confirmed CT2.5 -->
@@ -1518,6 +1562,7 @@
 				<param value="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9082" levels="1" name="White Christmas Petition">
 		<!-- Confirmed CT2.5 -->
@@ -1542,6 +1587,7 @@
 				<mul stat="vitalityConsumeRate" val="0" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9083" levels="1" name="Christmas Cake - event">
 		<!-- Confirmed CT2.5 -->
@@ -1560,6 +1606,7 @@
 				<param value="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9084" levels="1" name="White Christmas Petition - event">
 		<!-- Confirmed CT2.5 -->
@@ -1583,6 +1630,7 @@
 				<mul stat="vitalityConsumeRate" val="0" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9085" levels="1" name="Santa Claus's Gift">
 		<!-- Confirmed CT2.5 -->
@@ -1621,6 +1669,7 @@
 				<param amount="300" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9087" levels="1" name="Create Item">
 		<!-- Confirmed CT2.5 -->
@@ -1647,6 +1696,7 @@
 				<param skillId="172" skillLvl="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9088" levels="1" name="Cupid's Arrow">
 		<set name="effectPoint" val="-1000" />
@@ -1659,6 +1709,7 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9089" levels="1" name="Cupid's Major Cure">
 		<set name="effectPoint" val="-1000" />
@@ -1671,6 +1722,7 @@
 		<set name="reuseDelay" val="4000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9090" levels="1" name="Fighter's Will">
 		<!-- Confirmed CT2.5 -->
@@ -1696,6 +1748,7 @@
 				<param skillId="758" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9091" levels="1" name="Archer's Will">
 		<!-- Confirmed CT2.5 -->
@@ -1721,6 +1774,7 @@
 				<param skillId="759" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9092" levels="1" name="Magician's Will">
 		<!-- Confirmed CT2.5 -->
@@ -1746,6 +1800,7 @@
 				<param skillId="945" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9093" levels="1" name="Protection of Rune">
 		<!-- Confirmed CT2.5 -->
@@ -1771,6 +1826,7 @@
 				<param skillId="755" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9094" levels="1" name="Protection of Elemental">
 		<!-- Confirmed CT2.5 -->
@@ -1796,6 +1852,7 @@
 				<param skillId="756" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9095" levels="1" name="Protection of Alignment">
 		<!-- Confirmed CT2.5 -->
@@ -1821,6 +1878,7 @@
 				<param skillId="757" skillLvl="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9096" levels="1" name="Event - White Baby Tiger Scroll">
 		<!-- Confirmed CT2.5 -->
@@ -1837,6 +1895,7 @@
 				<param npcId="13286" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9097" levels="1" name="Event - White Baby King-Tiger Scroll">
 		<!-- Confirmed CT2.5 -->
@@ -1853,6 +1912,7 @@
 				<param npcId="13287" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9098" levels="1" name="Event - Sad White Baby Tiger Scroll">
 		<!-- Confirmed CT2.5 -->
@@ -1869,6 +1929,7 @@
 				<param npcId="13293" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9099" levels="1" name="Event - Sad White Baby King-Tiger Scroll">
 		<!-- Confirmed CT2.5 -->
@@ -1885,5 +1946,6 @@
 				<param npcId="13294" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/09100-09199.xml b/src/main/resources/data/stats/skills/09100-09199.xml
index 4e7a162c3387dd6b29965d4245b84c256faa8399..ab648533f34e161f411a5d69d34b1efb151c3970 100644
--- a/src/main/resources/data/stats/skills/09100-09199.xml
+++ b/src/main/resources/data/stats/skills/09100-09199.xml
@@ -342,6 +342,7 @@
 		<set name="reuseDelay" val="1800000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9114" levels="1" name="Nevit's Voice">
 		<!-- High Five Confirmed -->
@@ -414,8 +415,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="5400" />
+			<effect name="BonusTimeLimitUp">
+				<param time="5400" />
 			</effect>
 		</effects>
 	</skill>
@@ -443,8 +444,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="7200" />
+			<effect name="BonusTimeLimitUp">
+				<param time="7200" />
 			</effect>
 		</effects>
 	</skill>
@@ -472,8 +473,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="9000" />
+			<effect name="BonusTimeLimitUp">
+				<param time="9000" />
 			</effect>
 		</effects>
 	</skill>
@@ -501,8 +502,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="10800" />
+			<effect name="BonusTimeLimitUp">
+				<param time="10800" />
 			</effect>
 		</effects>
 	</skill>
@@ -530,8 +531,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="3600" />
+			<effect name="BonusTimeLimitUp">
+				<param time="3600" />
 			</effect>
 		</effects>
 	</skill>
@@ -559,8 +560,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="5400" />
+			<effect name="BonusTimeLimitUp">
+				<param time="5400" />
 			</effect>
 		</effects>
 	</skill>
@@ -588,8 +589,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="7200" />
+			<effect name="BonusTimeLimitUp">
+				<param time="7200" />
 			</effect>
 		</effects>
 	</skill>
@@ -617,8 +618,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="9000" />
+			<effect name="BonusTimeLimitUp">
+				<param time="9000" />
 			</effect>
 		</effects>
 	</skill>
@@ -646,8 +647,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="10800" />
+			<effect name="BonusTimeLimitUp">
+				<param time="10800" />
 			</effect>
 		</effects>
 	</skill>
@@ -675,8 +676,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="3600" />
+			<effect name="BonusTimeLimitUp">
+				<param time="3600" />
 			</effect>
 		</effects>
 	</skill>
@@ -704,8 +705,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="5400" />
+			<effect name="BonusTimeLimitUp">
+				<param time="5400" />
 			</effect>
 		</effects>
 	</skill>
@@ -733,8 +734,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="7200" />
+			<effect name="BonusTimeLimitUp">
+				<param time="7200" />
 			</effect>
 		</effects>
 	</skill>
@@ -762,8 +763,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="9000" />
+			<effect name="BonusTimeLimitUp">
+				<param time="9000" />
 			</effect>
 		</effects>
 	</skill>
@@ -791,8 +792,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="10800" />
+			<effect name="BonusTimeLimitUp">
+				<param time="10800" />
 			</effect>
 		</effects>
 	</skill>
@@ -820,8 +821,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="3600" />
+			<effect name="BonusTimeLimitUp">
+				<param time="3600" />
 			</effect>
 		</effects>
 	</skill>
@@ -849,8 +850,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="5400" />
+			<effect name="BonusTimeLimitUp">
+				<param time="5400" />
 			</effect>
 		</effects>
 	</skill>
@@ -878,8 +879,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="7200" />
+			<effect name="BonusTimeLimitUp">
+				<param time="7200" />
 			</effect>
 		</effects>
 	</skill>
@@ -907,8 +908,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="9000" />
+			<effect name="BonusTimeLimitUp">
+				<param time="9000" />
 			</effect>
 		</effects>
 	</skill>
@@ -936,8 +937,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="10800" />
+			<effect name="BonusTimeLimitUp">
+				<param time="10800" />
 			</effect>
 		</effects>
 	</skill>
@@ -965,8 +966,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="3600" />
+			<effect name="BonusTimeLimitUp">
+				<param time="3600" />
 			</effect>
 		</effects>
 	</skill>
@@ -994,8 +995,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="5400" />
+			<effect name="BonusTimeLimitUp">
+				<param time="5400" />
 			</effect>
 		</effects>
 	</skill>
@@ -1023,8 +1024,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="7200" />
+			<effect name="BonusTimeLimitUp">
+				<param time="7200" />
 			</effect>
 		</effects>
 	</skill>
@@ -1052,8 +1053,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="9000" />
+			<effect name="BonusTimeLimitUp">
+				<param time="9000" />
 			</effect>
 		</effects>
 	</skill>
@@ -1081,8 +1082,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="10800" />
+			<effect name="BonusTimeLimitUp">
+				<param time="10800" />
 			</effect>
 		</effects>
 	</skill>
@@ -1110,8 +1111,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="3600" />
+			<effect name="BonusTimeLimitUp">
+				<param time="3600" />
 			</effect>
 		</effects>
 	</skill>
@@ -1139,8 +1140,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="5400" />
+			<effect name="BonusTimeLimitUp">
+				<param time="5400" />
 			</effect>
 		</effects>
 	</skill>
@@ -1168,8 +1169,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="7200" />
+			<effect name="BonusTimeLimitUp">
+				<param time="7200" />
 			</effect>
 		</effects>
 	</skill>
@@ -1197,8 +1198,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="9000" />
+			<effect name="BonusTimeLimitUp">
+				<param time="9000" />
 			</effect>
 		</effects>
 	</skill>
@@ -1226,8 +1227,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="10800" />
+			<effect name="BonusTimeLimitUp">
+				<param time="10800" />
 			</effect>
 		</effects>
 	</skill>
@@ -1255,8 +1256,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="3600" />
+			<effect name="BonusTimeLimitUp">
+				<param time="3600" />
 			</effect>
 		</effects>
 	</skill>
@@ -1284,8 +1285,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="5400" />
+			<effect name="BonusTimeLimitUp">
+				<param time="5400" />
 			</effect>
 		</effects>
 	</skill>
@@ -1313,8 +1314,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="7200" />
+			<effect name="BonusTimeLimitUp">
+				<param time="7200" />
 			</effect>
 		</effects>
 	</skill>
@@ -1342,8 +1343,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="9000" />
+			<effect name="BonusTimeLimitUp">
+				<param time="9000" />
 			</effect>
 		</effects>
 	</skill>
@@ -1371,8 +1372,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="10800" />
+			<effect name="BonusTimeLimitUp">
+				<param time="10800" />
 			</effect>
 		</effects>
 	</skill>
@@ -1578,6 +1579,7 @@
 				<param id="306" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9160" levels="1" name="Transformation Scroll - Zaken">
 		<set name="abnormalLvl" val="1" />
@@ -1603,6 +1605,7 @@
 				<param id="305" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9161" levels="1" name="Vesper's Mighty Power">
 		<!-- Increase Physical Attack by 15%, Magical Attack by 20%, and Moving Speed by 10 for 10 minutes. -->
@@ -1627,6 +1630,7 @@
 				<add stat="runSpd" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9162" levels="1" name="Vesper's Critical Attack Power">
 		<!-- Increase Physical Critical Attack Rate by 15, Magic Critical Attack Rate by 2, and Moving Speed by 10 for 10 minutes. Recovers 5% of the standard short-range physical damage inflicted on the enemy as HP. -->
@@ -1652,6 +1656,7 @@
 				<add stat="absorbDam" val="5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9163" levels="1" name="Invincible Vesper">
 		<!-- Increase Max. Attack Speed by 20%, Magic Speed by 20%, and Moving Speed by 20 for 10 minutes. -->
@@ -1676,6 +1681,7 @@
 				<add stat="runSpd" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9164" levels="1" name="Special Gift of April Fool's Day - Event">
 		<!-- Confirmed CT2.5 -->
@@ -1717,6 +1723,7 @@
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9166" levels="1" name="Vitality Replenishing Herb Tea">
 		<!-- High Five Confirmed -->
@@ -1770,8 +1777,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="3600" />
+			<effect name="BonusTimeLimitUp">
+				<param time="3600" />
 			</effect>
 		</effects>
 	</skill>
@@ -1799,8 +1806,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="5400" />
+			<effect name="BonusTimeLimitUp">
+				<param time="5400" />
 			</effect>
 		</effects>
 	</skill>
@@ -1828,8 +1835,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="7200" />
+			<effect name="BonusTimeLimitUp">
+				<param time="7200" />
 			</effect>
 		</effects>
 	</skill>
@@ -1857,8 +1864,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="9000" />
+			<effect name="BonusTimeLimitUp">
+				<param time="9000" />
 			</effect>
 		</effects>
 	</skill>
@@ -1886,8 +1893,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="10800" />
+			<effect name="BonusTimeLimitUp">
+				<param time="10800" />
 			</effect>
 		</effects>
 	</skill>
@@ -1915,8 +1922,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="14400" />
+			<effect name="BonusTimeLimitUp">
+				<param time="14400" />
 			</effect>
 		</effects>
 	</skill>
@@ -1954,6 +1961,7 @@
 				<param sp="500000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9175" levels="1" name="1,000,000 SP scroll">
 		<!-- High Five Skill -->
@@ -1971,11 +1979,13 @@
 				<param sp="1000000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9176" levels="1" name="Provided gift of cheers">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9177" levels="1" name="Olympiad Reward Box">
 		<!-- High Five Confirmed -->
@@ -2005,6 +2015,7 @@
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9179" levels="1" name="Antharas's Blood Crystal">
 		<!-- High Five Confirmed -->
@@ -2049,6 +2060,7 @@
 				<param sp="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9181" levels="1" name="Nevit's Hourglass - 4 hour(s)">
 		<!-- High Five Confirmed -->
@@ -2073,8 +2085,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="14400" />
+			<effect name="BonusTimeLimitUp">
+				<param time="14400" />
 			</effect>
 		</effects>
 	</skill>
@@ -2101,8 +2113,8 @@
 			<target checkAbnormal="VOTE;1;false" /> <!-- Nevit's Hourglass -->
 		</cond>
 		<effects>
-			<effect name="BonusTimeLimitUp">
-				<param time="14400" />
+			<effect name="BonusTimeLimitUp">
+				<param time="14400" />
 			</effect>
 		</effects>
 	</skill>
@@ -2110,10 +2122,12 @@
 		<!-- "For 4 hours, recovers vitality when Exp. is acquired through hunting." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="9184" levels="1" name="Freya's Refreshing Breeze - 4 hour(s)">
 		<!-- "For 4 hours, recovers vitality when Exp. is acquired through hunting." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/20000-20099.xml b/src/main/resources/data/stats/skills/20000-20099.xml
index 3437547a13eb0367f01fb537343424f4d37f2c0a..29f789f4461ed7d4fec6daebce9e5392e434844a 100644
--- a/src/main/resources/data/stats/skills/20000-20099.xml
+++ b/src/main/resources/data/stats/skills/20000-20099.xml
@@ -23,6 +23,7 @@
 		<!-- Slams down on the treasure chest with a hammer to open it. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="20002" levels="1" name="Dragon Kick">
 		<!-- High Five Confirmed -->
@@ -163,5 +164,6 @@
 				<param heal="true" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/21000-21099.xml b/src/main/resources/data/stats/skills/21000-21099.xml
index 31d5c50612110644068a5733e301b86eb1ab814f..ce800022e5e27fe48e38a4a09de3b05ad67d26d5 100644
--- a/src/main/resources/data/stats/skills/21000-21099.xml
+++ b/src/main/resources/data/stats/skills/21000-21099.xml
@@ -87,6 +87,7 @@
 				<add stat="runSpd" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21005" levels="1" name="Agility">
 		<!-- Confirmed CT2.5 -->
@@ -107,6 +108,7 @@
 				<add stat="rEvas" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21006" levels="1" name="Large Firework Effect">
 		<!-- Confirmed CT2.5 -->
@@ -117,6 +119,7 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21007" levels="1" name="Ability of Doubt">
 		<!-- Confirmed CT2.5 -->
@@ -134,6 +137,7 @@
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<set name="trait" val="ETC" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21008" levels="1" name="Release Seal on Agathion - Baby Panda">
 		<!-- Confirmed CT2.5 -->
@@ -204,6 +208,7 @@
 				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21012" levels="1" name="Energy Recovery">
 		<!-- Recovers energy when acquiring Exp. for 20 minutes -->
@@ -226,6 +231,7 @@
 				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21013" levels="1" name="Energy Recovery">
 		<!-- Recovers energy when acquiring Exp. for 20 minutes -->
@@ -248,6 +254,7 @@
 				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21014" levels="1" name="Scissors">
 		<!-- High Five Confirmed -->
@@ -729,6 +736,7 @@
 				<param power="50" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21043" levels="1" name="Agathion Seal Cancel - Red Sumo Wrestler">
 		<!-- Confirmed CT2.5 -->
@@ -877,6 +885,7 @@
 				<param id="110" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21052" levels="1" name="Bless the Body">
 		<!-- Confirmed CT2.5 -->
@@ -898,6 +907,7 @@
 				<param type="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21053" levels="1" name="Bless the Soul">
 		<!-- Confirmed CT2.5 -->
@@ -919,6 +929,7 @@
 				<param type="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21054" levels="1" name="Blessed Resurrection Ability">
 		<!-- Confirmed CT2.5 -->
@@ -942,6 +953,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21055" levels="1" name="Wind Walk">
 		<!-- Confirmed CT2.5 -->
@@ -963,6 +975,7 @@
 				<add stat="runSpd" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21056" levels="1" name="Agility">
 		<!-- Confirmed CT2.5 -->
@@ -983,6 +996,7 @@
 				<add stat="rEvas" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21057" levels="1" name="Reflect">
 		<!-- Confirmed CT2.5 -->
@@ -1006,6 +1020,7 @@
 				<add stat="reflectDam" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21058" levels="1" name="Mana Regeneration">
 		<!-- High Five Confirmed -->
@@ -1059,6 +1074,7 @@
 				<param power="444" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21060" levels="1" name="Death Whisper">
 		<!-- Confirmed CT2.5 -->
@@ -1080,6 +1096,7 @@
 				<mul stat="critDmg" val="1.35" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21061" levels="1" name="Agility">
 		<!-- Confirmed CT2.5 -->
@@ -1100,6 +1117,7 @@
 				<add stat="rEvas" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21062" levels="1" name="Wild Magic">
 		<!-- Confirmed CT2.5 -->
@@ -1121,6 +1139,7 @@
 				<add stat="mCritRate" val="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21063" levels="1" name="Wind Walk">
 		<!-- Confirmed CT2.5 -->
@@ -1142,6 +1161,7 @@
 				<add stat="runSpd" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21064" levels="1" name="Mana Regeneration">
 		<!-- High Five Confirmed -->
@@ -1191,6 +1211,7 @@
 				<add stat="reflectDam" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21066" levels="1" name="Energy Recovery">
 		<!-- Confirmed CT2.5 -->
@@ -1214,6 +1235,7 @@
 				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21067" levels="1" name="Blessed Escape">
 		<!-- High Five Confirmed -->
@@ -1264,6 +1286,7 @@
 				<add stat="darkRes" val="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21069" levels="1" name="Wind Walk">
 		<!-- Confirmed CT2.5 -->
@@ -1285,6 +1308,7 @@
 				<add stat="runSpd" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21070" levels="1" name="Death Whisper">
 		<!-- Confirmed CT2.5 -->
@@ -1306,6 +1330,7 @@
 				<mul stat="critDmg" val="1.35" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21071" levels="1" name="Agility">
 		<!-- Confirmed CT2.5 -->
@@ -1326,6 +1351,7 @@
 				<add stat="rEvas" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21072" levels="1" name="Wild Magic">
 		<!-- Confirmed CT2.5 -->
@@ -1347,6 +1373,7 @@
 				<add stat="mCritRate" val="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21073" levels="1" name="Mana Regeneration">
 		<!-- High Five Confirmed -->
@@ -1396,6 +1423,7 @@
 				<add stat="reflectDam" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21075" levels="1" name="Greater Heal">
 		<!-- Confirmed CT2.5 -->
@@ -1423,6 +1451,7 @@
 				<param power="444" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21076" levels="1" name="Resist Unholy">
 		<!-- Confirmed CT2.5 -->
@@ -1446,6 +1475,7 @@
 				<add stat="darkRes" val="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21077" levels="1" name="Wind Walk">
 		<!-- Confirmed CT2.5 -->
@@ -1467,6 +1497,7 @@
 				<add stat="runSpd" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21078" levels="1" name="Death Whisper">
 		<!-- Confirmed CT2.5 -->
@@ -1488,6 +1519,7 @@
 				<mul stat="critDmg" val="1.35" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21079" levels="1" name="Agility">
 		<!-- Confirmed CT2.5 -->
@@ -1508,6 +1540,7 @@
 				<add stat="rEvas" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21080" levels="1" name="Wild Magic">
 		<!-- Confirmed CT2.5 -->
@@ -1529,6 +1562,7 @@
 				<add stat="mCritRate" val="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21081" levels="1" name="Mana Regeneration">
 		<!-- High Five Confirmed -->
@@ -1578,6 +1612,7 @@
 				<add stat="reflectDam" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21083" levels="1" name="Greater Heal">
 		<!-- Confirmed CT2.5 -->
@@ -1605,6 +1640,7 @@
 				<param power="444" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21084" levels="1" name="Energy Recovery">
 		<!-- Confirmed CT2.5 -->
@@ -1628,6 +1664,7 @@
 				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21085" levels="1" name="Agathion Seal Cancel - Pomona">
 		<!-- Confirmed CT2.5 -->
@@ -1674,6 +1711,7 @@
 				<sub stat="cancelVuln" val="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21087" levels="1" name="Berserker Spirit">
 		<!-- Confirmed CT2.5 -->
@@ -1702,6 +1740,7 @@
 				<sub stat="rEvas" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21088" levels="1" name="Summon Friend">
 		<!-- High Five Confirmed -->
@@ -1756,6 +1795,7 @@
 				<mul stat="runSpd" val="0.5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21090" levels="1" name="Soul of Phoenix">
 		<!-- Confirmed CT2.5 -->
@@ -1780,6 +1820,7 @@
 				<param resRecovery="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21091" levels="1" name="Agathion Seal Cancel - Weaver">
 		<!-- Confirmed CT2.5 -->
@@ -1837,6 +1878,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21096" levels="1" name="Ability of Cool Watermelon">
 		<!-- Confirmed CT2.5 -->
@@ -1859,6 +1901,7 @@
 				<mul stat="critDmg" val="1.35" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21097" levels="1" name="Summon Friend">
 		<!-- High Five Confirmed -->
@@ -1921,6 +1964,7 @@
 				<sub stat="debuffVuln" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21099" levels="1" name="Great Warrior's Soul Power: Strength">
 		<!-- Confirmed CT2.5 -->
@@ -1945,5 +1989,6 @@
 				<add stat="absorbDam" val="5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/21100-21199.xml b/src/main/resources/data/stats/skills/21100-21199.xml
index 5df36118c9567b9e4b32b04b27de14c8f0bb1059..8134101033d10bafff2a04f9077239afc8fe4088 100644
--- a/src/main/resources/data/stats/skills/21100-21199.xml
+++ b/src/main/resources/data/stats/skills/21100-21199.xml
@@ -23,6 +23,7 @@
 				<mul stat="magicalMpConsumeRate" val="0.95" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21101" levels="1" name="Blessed Scroll of Escape">
 		<!-- High Five Confirmed -->
@@ -73,6 +74,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21103" levels="1" name="Great Adventurer's Soul Power : Endless">
 		<!-- For five minutes, the Great Spirit increases maximum HP by 20%, maximum MP by 20%, moving speed by 20%, and resistance against debuff by 10%. -->
@@ -103,6 +105,7 @@
 				<sub stat="debuffVuln" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21104" levels="1" name="Appetite for Destruction">
 		<!-- High Five Confirmed -->
@@ -258,6 +261,7 @@
 				<sub stat="debuffVuln" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21112" levels="1" name="Great Warrior's Soul Power: Strength">
 		<!-- Increase attack speed by 20%, P. Atk by 10%, P. Def. by 20% with help of a spirit for 5 minutes. Bestows the ability to recover as HP 5% of the standard short-range physical damage inflicted on the enemy. Reuse Delay 1 hour. -->
@@ -282,6 +286,7 @@
 				<add stat="absorbDam" val="5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21113" levels="1" name="Great Wizard's Soul Power: Acuity">
 		<!-- Increase Casting Speed by 20%, Magic Power by 20%, Magic Def. by 20% with help of a spirit for 5 minutes. Reduce consumed MP for skill usage by 5%. Reuse Delay 1 hour. -->
@@ -306,6 +311,7 @@
 				<mul stat="magicalMpConsumeRate" val="0.95" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21114" levels="1" name="Great Adventurer's Soul Power: Resilience">
 		<!-- Increase max HP 20%, max MP 20%, Spd. 20% with help of a spirit for 5 minutes. Increase resistance by 10% against debuff. Reuse Delay 1 hour. -->
@@ -336,6 +342,7 @@
 				<sub stat="debuffVuln" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21115" levels="1" name="Great Warrior's Soul Power: Strength">
 		<!-- Increase attack speed by 20%, P. Atk by 10%, P. Def. by 20% with help of a spirit for 5 minutes. Bestows the ability to recover as HP 5% of the standard short-range physical damage inflicted on the enemy. Reuse Delay 1 hour. -->
@@ -360,6 +367,7 @@
 				<add stat="absorbDam" val="5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21116" levels="1" name="Great Wizard's Soul Power: Acuity">
 		<!-- Increase Casting Speed by 20%, Magic Power by 20%, Magic Def. by 20% with help of a spirit for 5 minutes. Reduce consumed MP for skill usage by 5%. Reuse Delay 1 hour. -->
@@ -384,6 +392,7 @@
 				<mul stat="magicalMpConsumeRate" val="0.95" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21117" levels="1" name="Great Adventurer's Soul Power : Immortality">
 		<!-- Increase max HP 20%, max MP 20%, Spd. 20% with help of a spirit for 5 minutes. Increase HP recovery bonus by 20%, MP recovery bonus by 20%. Reuse Delay 1 hour. -->
@@ -415,6 +424,7 @@
 				<mul stat="regMp" val="1.2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21118" levels="1" name="Great Warrior's Soul Power: Destruction">
 		<!-- Increase attack speed by 20%, P. Atk by 10%, P. Def. by 20% with help of a spirit for 5 minutes. Increase power of Critical Attack by 20%, Chance of Critical Attack by 20%. Reuse Delay 1 hour. -->
@@ -440,6 +450,7 @@
 				<mul stat="critRate" val="1.2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21119" levels="1" name="Great Wizard's Soul Power: Brilliance">
 		<!-- Increase Casting Speed by 20%, Magic Power by 20%, Magic Def. by 20% with help of a spirit for 5 minutes. Increase power of Prominent Damage caused with damage magic by 20%, chance of Prominent Damage caused with damage magic by 2. Reuse Delay 1 hour. -->
@@ -464,6 +475,7 @@
 				<add stat="mCritRate" val="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21120" levels="1" name="Jack O'Lantern Card">
 		<!-- High Five Confirmed -->
@@ -523,6 +535,7 @@
 				<add stat="darkRes" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21123" levels="1" name="Blessing of Skooldy : Protection of Darkness">
 		<!-- Increase max HP by 20%, max MP by 20%, physical Def. by 20%, magic Def. by 20% for 1 hour. Increase dark attack resistance by 20. Reuse Delay 1 hour. -->
@@ -554,6 +567,7 @@
 				<add stat="darkRes" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21124" levels="1" name="Blessing of Skooldy : Protection of Darkness">
 		<!-- Increase max HP by 20%, max MP by 20%, physical Def. by 20%, magic Def. by 20% for 1 hour. Increase dark attack resistance by 20. Reuse Delay 1 hour. -->
@@ -585,6 +599,7 @@
 				<add stat="darkRes" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21125" levels="1" name="Blessing of Skooldy : Protection of Darkness">
 		<!-- Increase max HP by 20%, max MP by 20%, physical Def. by 20%, magic Def. by 20% for 1 hour. Increase dark attack resistance by 20. Reuse Delay 1 hour. -->
@@ -616,6 +631,7 @@
 				<add stat="darkRes" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21126" levels="1" name="Blessing of Skooldy : Protection of Darkness">
 		<!-- Increase max HP by 20%, max MP by 20%, physical Def. by 20%, magic Def. by 20% for 1 hour. Increase dark attack resistance by 20. Reuse Delay 1 hour. -->
@@ -647,6 +663,7 @@
 				<add stat="darkRes" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21127" levels="1" name="Blessing of Halloween">
 		<!-- Increase max HP by 40%, max MP by 40%, attack speed by 20%, attack power by 10% for 1 hour.Increase dark attack resistance by 20. Reuse Delay 2 hours. -->
@@ -678,6 +695,7 @@
 				<add stat="darkRes" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21128" levels="1" name="Blessing of Halloween">
 		<!-- Increase max HP by 40%, max MP by 40%, chance of critical by 10%, critical damage by 10% for 1 hour. Increase dark attack resistance by 20. Reuse Delay 2 hours. -->
@@ -709,6 +727,7 @@
 				<add stat="darkRes" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21129" levels="1" name="Blessing of Halloween">
 		<!-- Increase max HP by 40%, max MP by 40%, speed by 10% for 1 hour. Bestows the ability to recover as HP 5% of the standard short-range physical damage inflicted on the enemy. Increase dark attack resistance by 20. Reuse Delay 2 hours. -->
@@ -740,6 +759,7 @@
 				<add stat="darkRes" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21130" levels="1" name="Blessing of Halloween">
 		<!-- Increase max HP by 40%, max MP by 40%, speed by 20% for 1 hour. Reduce consumed MP for skill usage by 5%. Increase dark attack resistance by 20. Reuse Delay 2 hours. -->
@@ -772,6 +792,7 @@
 				<add stat="darkRes" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21131" levels="1" name="Blessing of Halloween">
 		<!-- Increase max HP by 40%, max MP by 40%, casting speed by 20% for 1 hour. Increases chance of prominent damage by Damage Magic by 2. Increase dark attack resistance by 20. Reuse Delay 2 hours. -->
@@ -802,6 +823,7 @@
 				<add stat="darkRes" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21132" levels="1" name="Ability of Shadow">
 		<!-- Decrease own speed by 30% and will not receive monster's preemptive attack for 2 minutes. Reuse Delay 1 hour. -->
@@ -823,6 +845,7 @@
 				<mul stat="runSpd" val="0.7" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21133" levels="1" name="Agathion Seal Cancel - Zombie">
 		<!-- Confirmed CT2.5 -->
@@ -948,6 +971,7 @@
 				<add stat="darkRes" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21138" levels="1" name="Blessing of Halloween">
 		<!-- Increase max HP by 40%, max MP by 40%, chance of critical by 10%, critical damage by 10% for 10 minutes. Increase dark attack resistance by 20. Reuse Delay 1 hour. -->
@@ -979,6 +1003,7 @@
 				<add stat="darkRes" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21139" levels="1" name="Blessing of Halloween">
 		<!-- Increase max HP by 40%, max MP by 40%, speed by 10% for 10 minutes. Bestows the ability to recover as HP 5% of the standard short-range physical damage inflicted on the enemy. Increase dark attack resistance by 20. Reuse Delay 1 hour. -->
@@ -1010,6 +1035,7 @@
 				<add stat="darkRes" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21140" levels="1" name="Blessing of Halloween">
 		<!-- Increase max HP by 40%, max MP by 40%, speed by 20% for 10 minutes. Reduce consumed MP for skill usage by 5%. Increase dark attack resistance by 20. Reuse Delay 1 hour. -->
@@ -1043,6 +1069,7 @@
 				<add stat="darkRes" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21141" levels="1" name="Blessing of Halloween">
 		<!-- For 10 minutes, increases Max HP by 40%, Max MP by 40%, and Casting Spd. by 20%. Increases the rate of causing exceptional magic damage by 2. Increases Resistance to Dark by 20. Reuse delay is 1 hour. -->
@@ -1074,6 +1101,7 @@
 				<add stat="darkRes" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21142" levels="1" name="Agathion Seal Cancel - Gwangong">
 		<!-- Confirmed CT2.5 -->
@@ -1243,6 +1271,7 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21153" levels="1" name="Blessed Body">
 		<!-- Increases Max HP by 25% for 20 minutes. Reuse Delay 1 hours. -->
@@ -1263,6 +1292,7 @@
 				<param type="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21154" levels="1" name="Blessed Soul">
 		<!-- Increases Max MP by 25% for 20 minutes. Reuse Delay 1 hours. -->
@@ -1283,6 +1313,7 @@
 				<param type="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21155" levels="1" name="Scent of Flavorful Cheese">
 		<!-- For 5 minutes, receives the soul's help to raise Atk. Spd. by 20%, P. Atk. by 10%, and P. Def. by 20%. Increases Critical attack power by 20% and Critical attack rate by 20%. Reuse delay is 1 hour. -->
@@ -1308,6 +1339,7 @@
 				<mul stat="critRate" val="1.2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21156" levels="1" name="Scent of Sweet Cheese">
 		<!-- For 5 minutes, receives the soul's help to raise Casting Spd. by 20%, M. Atk. by 20%, and M. Def. by 20%. Raises Prominent Damage power via damage magic by 20% and the chance of Prominent Damage occurring via damage magic by 2. Reuse delay is 1 hour. -->
@@ -1333,6 +1365,7 @@
 				<mul stat="mCritPower" val="1.2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21157" levels="1" name="Agathion Seal Cancel - Iken">
 		<!-- Confirmed CT2.5 -->
@@ -1546,6 +1579,7 @@
 				<param id="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21170" levels="1" name="Blessed Soul">
 		<!-- Increases Max MP by 25% for 20 minutes. Reuse delay is 1 hours. -->
@@ -1566,6 +1600,7 @@
 				<param type="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21171" levels="1" name="Riding Jet Bike">
 		<!-- Confirmed CT2.5 -->
@@ -1589,6 +1624,7 @@
 				<param id="20001" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21172" levels="1" name="Enhanced Authority - CON+1 STR+1">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/21200-21299.xml b/src/main/resources/data/stats/skills/21200-21299.xml
index abc4d6a11c7f9bf3d828b7c3dc576ab999b67c6b..663b09e50fe629429e8393c9611296929e8278c7 100644
--- a/src/main/resources/data/stats/skills/21200-21299.xml
+++ b/src/main/resources/data/stats/skills/21200-21299.xml
@@ -17,6 +17,7 @@
 		<set name="reuseDelay" val="7200000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21201" levels="1" name="Haste">
 		<!-- Increases Atk. Spd. by 33% for 20 minutes. Reuse delay is 1 hours. -->
@@ -33,6 +34,7 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21202" levels="1" name="Agathion Seal Cancel - Ball Trapping Gnocian">
 		<!-- Confirmed CT2.5 -->
@@ -340,11 +342,13 @@
 		<set name="reuseDelay" val="43200000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21222" levels="1" name="Resist Elemental">
 		<!-- "For 1 hour, increases Resistance to Fire/Water/Wind/Earth by 20. Reuse delay is 4 hours." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21223" levels="1" name="Ultimate Defense">
 		<!-- High Five Confirmed -->
@@ -383,41 +387,49 @@
 		<!-- "For 5 minutes, receives the soul's help to raise Max HP by 20%, Max MP by 20%, and Speed by 20%. Increases Resistance to de-buffs by 10%. Reuse delay is 1 hour." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21225" levels="1" name="Soul of a Strong Warrior's Ability">
 		<!-- "For 5 minutes, increases Atk. Spd. by 20%, P. Atk. by 10%, and P. Def. by 20% with the soul's help. Bestows the ability to recover as HP 5% of the standard short-range physical damage inflicted on an enemy. Reuse delay is 1 hour." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21226" levels="1" name="Soul of a Wise Magician's Ability">
 		<!-- "For 5 minutes, receives the soul's help to raise Casting Spd. by 20%, M. Atk. by 20%, and M. Def. by 20%. Decreases MP consumption for skill use by 5%. Reuse delay is 1 hour." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21227" levels="1" name="Ability of Prominent Adventure's Soul">
 		<!-- "For 5 minutes, receives the soul's help to raise Max HP by 20%, Max MP by 20%, and Speed by 20%. Increases HP Recovery Bonus by 20% and MP Recovery Bonus by 20%. Reuse delay is 1 hour." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21228" levels="1" name="Soul of a Brave Warrior's Ability">
 		<!-- "For 5 minutes, increases Atk. Spd. by 20%, P. Atk. by 10%, and P. Def. by 20% with the soul's help. Increases Critical Damage by 20% and critical rate by 20%. Reuse delay is 1 hour." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21229" levels="1" name="Blood Awakening">
 		<!-- "Combines general attack damage absorption and Atk. Spd. increase for a more advanced blood awakening effect. For 1 hour, increases Atk. Spd. by 33% and bestows the ability to recover as HP 9% of the standard short-range physical damage inflicted on an enemy. Reuse delay is 4 hours." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21230" levels="1" name="Improved Magic">
 		<!-- "Combines M. Atk. increase and M. Def. increase to have more advanced magic ability increase effect. For 1 hour, increases M. Atk. by 75% and M. Def. by 30%. Reuse delay is 4 hours." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21231" levels="1" name="Improved Critical Attack">
 		<!-- "Combines critical rate increase and Critical Damage increase to have more advanced critical increase effect. For 1 hour, increases critical rate by 30% and Critical Damage by 35%. Reuse delay is 4 hours." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21232" levels="1" name="Shiny Lit Platform">
 		<!-- High Five Skill -->
@@ -435,6 +447,7 @@
 				<mul stat="runSpd" val="1.5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21233" levels="1" name="Release Seal on Agathion - Singer Dancer">
 		<!-- High Five Skill -->
@@ -449,6 +462,7 @@
 				<param npcId="1594" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21234" levels="1" name="Release Seal on Agathion - Zaken Spirit Sword">
 		<!-- High Five Skill -->
@@ -463,6 +477,7 @@
 				<param npcId="1595" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21235" levels="1" name="7th Anniversary T-shirt: Speed">
 		<!-- High Five Skill -->
@@ -515,19 +530,21 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="BlockDamage">
-				<param block="HP"/>
+				<param block="HP" />
 			</effect>
 			<effect name="BlockDamage">
-				<param block="MP"/>
+				<param block="MP" />
 			</effect>
 			<effect name="BlockDebuff" />
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21238" levels="1" name="Jet Bike">
 		<!-- Mounts a jet bike. -->
 		<set name="irreplaceableBuff" val="true" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21239" levels="1" name="Release Seal on Agathion - Kau">
 		<!-- High Five Skill -->
@@ -542,6 +559,7 @@
 				<param npcId="1596" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21240" levels="1" name="Release Seal on Agathion - Tow">
 		<!-- High Five Skill -->
@@ -556,6 +574,7 @@
 				<param npcId="1597" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21241" levels="1" name="Magic Glasses">
 		<!-- High Five Skill -->
@@ -669,16 +688,19 @@
 				<param npcId="1598" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21246" levels="1" name="Rudolph's Energy">
 		<!-- "For 10 minute(s), energy is replenished when Exp. is acquired through hunting. Reuse time is 30 minutes." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21247" levels="1" name="Gift from Santa Claus">
 		<!-- "Receives a gift from Santa Claus. It can be used only once a day, and the reuse time is reset every morning at 6:30 AM." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21248" levels="1" name="Release Seal on Agathion - Zinenze">
 		<!-- High Five Skill -->
@@ -693,6 +715,7 @@
 				<param npcId="1599" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21249" levels="1" name="Release Seal on Agathion - Enze">
 		<!-- High Five Skill -->
@@ -707,6 +730,7 @@
 				<param npcId="1600" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21250" levels="1" name="Academy Circlet">
 		<!-- "Characters between levels 40 to 75, when worn this item decreases death EXP. Penalty by 50%." -->
@@ -718,6 +742,7 @@
 		<!-- Increases Max HP by 35% for 20 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21252" levels="1" name="Hellblade">
 		<!-- Confirmed High Five -->
@@ -852,11 +877,13 @@
 				<param npcId="1604" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21260" levels="1" name="Notifier">
 		<!-- Description: You can use to learn the number of received gifts and the number of remaining gifts. The gift provision time is reset every morning at 6:30. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21261" levels="1" name="Bad Bunny's Necklace">
 		<!-- Description: Its effects are MP+250, HP+500, CP+1035, increased P. Atk., increased M. Atk., wild magic effect, and increased Critical attack power. -->
@@ -948,10 +975,12 @@
 				<param npcId="1605" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="21267" levels="1" name="Notifier">
 		<!-- Description: Notifies the number of received gifts and remaining gifts when used. The gift supply time is initialized at 6:30 am every day. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/22000-22099.xml b/src/main/resources/data/stats/skills/22000-22099.xml
index 9e576332986f2256864b57bdf0e1c94f176e84d1..356c0f71367cd358755a103eaed54adb85e21881 100644
--- a/src/main/resources/data/stats/skills/22000-22099.xml
+++ b/src/main/resources/data/stats/skills/22000-22099.xml
@@ -140,6 +140,7 @@
 				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22005" levels="1" name="Energy Red Ginseng">
 		<!-- Confirmed CT2.5 -->
@@ -158,6 +159,7 @@
 				<param value="600" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22006" levels="1" name="Halloween Candy">
 		<!-- Confirmed CT2.5 -->
@@ -171,6 +173,7 @@
 				<param value="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22007" levels="1" name="Good Luck Lucky Bag">
 		<!-- Confirmed CT2.5 -->
@@ -345,6 +348,7 @@
 				<mul stat="danceMpConsumeRate" val="0.9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22014" levels="1" name="Holiday Festival">
 		<set name="abnormalLvl" val="3" />
@@ -386,6 +390,7 @@
 				<mul stat="danceMpConsumeRate" val="0.85" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22015" levels="1" name="Christmas Festival">
 		<!-- High Five Confirmed -->
@@ -546,6 +551,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22020" levels="1" name="Extra Entrance Pass - Near Kamaloka">
 		<set name="isMagic" val="2" />
@@ -555,6 +561,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22021" levels="1" name="Extra Entrance Pass - Kamaloka (Labyrinth of the Abyss)">
 		<set name="isMagic" val="2" />
@@ -564,6 +571,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22022" levels="1" name="Premium Valentine Decoration">
 		<!-- Confirmed CT2.5 -->
@@ -711,6 +719,7 @@
 				<param value="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22029" levels="1" name="Baguette's Herb">
 		<!-- High Five Confirmed -->
@@ -856,6 +865,7 @@
 				<param npcId="106" npcCount="1" despawnDelay="1200000" isSummonSpawn="true" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22035" levels="1" name="Birthday Cake Vitality Buff">
 		<!-- High Five Confirmed -->
@@ -887,6 +897,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22037" levels="1" name="Beast Spiritshot">
 		<set name="isMagic" val="2" />
@@ -894,6 +905,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22038" levels="1" name="Blessed Beast Spiritshot">
 		<set name="isMagic" val="2" />
@@ -901,6 +913,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22039" levels="2" name="Rune of Experience Points">
 		<!-- Confirmed CT2.5 -->
@@ -957,6 +970,7 @@
 				<param amount="200" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22043" levels="6" name="Secret medicine of Will">
 		<!-- Confirmed CT2.5 -->
@@ -977,6 +991,7 @@
 				<param amount="#amount" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22044" levels="6" name="Secret medicine of Life">
 		<!-- Confirmed CT2.5 -->
@@ -996,6 +1011,7 @@
 				<param power="50" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22045" levels="1" name="Omen Beast Transformation Scroll">
 		<set name="abnormalLvl" val="26" />
@@ -1019,6 +1035,7 @@
 				<param id="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22046" levels="1" name="Death Blader Transformation Scroll">
 		<set name="abnormalLvl" val="26" />
@@ -1042,6 +1059,7 @@
 				<param id="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22047" levels="1" name="Grail Apostle Transformation Scroll">
 		<set name="abnormalLvl" val="26" />
@@ -1065,6 +1083,7 @@
 				<param id="203" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22048" levels="1" name="Unicorn Transformation Scroll">
 		<set name="abnormalLvl" val="26" />
@@ -1088,6 +1107,7 @@
 				<param id="206" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22049" levels="1" name="Lilim Knight Transformation Scroll">
 		<set name="abnormalLvl" val="26" />
@@ -1111,6 +1131,7 @@
 				<param id="209" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22050" levels="1" name="Golem Guardian Transformation Scroll">
 		<set name="abnormalLvl" val="26" />
@@ -1134,6 +1155,7 @@
 				<param id="212" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22051" levels="1" name="Inferno Drake Transformation Scroll">
 		<set name="abnormalLvl" val="26" />
@@ -1157,6 +1179,7 @@
 				<param id="215" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22052" levels="1" name="Dragon Bomber Transformation Scroll">
 		<set name="abnormalLvl" val="26" />
@@ -1180,6 +1203,7 @@
 				<param id="218" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22053" levels="19" name="Escape - Talking Island Village">
 		<!-- High Five Confirmed -->
@@ -1231,6 +1255,7 @@
 				<mul stat="vitalityConsumeRate" val="0" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22055" levels="1" name="Potion of Energy Replenishing">
 		<!-- Confirmed CT2.5 -->
@@ -1245,6 +1270,7 @@
 				<param value="5000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22056" levels="1" name="Wind Walk">
 		<set name="abnormalLvl" val="26" />
@@ -1263,6 +1289,7 @@
 				<add stat="runSpd" val="33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22057" levels="1" name="Haste">
 		<set name="abnormalLvl" val="26" />
@@ -1281,6 +1308,7 @@
 				<mul stat="pAtkSpd" val="1.33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22058" levels="1" name="Might">
 		<set name="abnormalLvl" val="26" />
@@ -1299,6 +1327,7 @@
 				<mul stat="pAtk" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22059" levels="1" name="Shield">
 		<set name="abnormalLvl" val="26" />
@@ -1317,6 +1346,7 @@
 				<mul stat="pDef" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22060" levels="1" name="Death Whisper">
 		<set name="abnormalLvl" val="26" />
@@ -1335,6 +1365,7 @@
 				<mul stat="critDmg" val="1.35" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22061" levels="1" name="Guidance">
 		<set name="abnormalLvl" val="26" />
@@ -1353,6 +1384,7 @@
 				<add stat="accCombat" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22062" levels="1" name="Empower">
 		<set name="abnormalLvl" val="26" />
@@ -1371,6 +1403,7 @@
 				<mul stat="mAtk" val="1.75" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22063" levels="1" name="Greater Acumen">
 		<set name="abnormalLvl" val="26" />
@@ -1389,6 +1422,7 @@
 				<mul stat="mAtkSpd" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22064" levels="1" name="Vampiric Rage">
 		<!-- High Five Confirmed -->
@@ -1430,6 +1464,7 @@
 				<param type="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22066" levels="1" name="Berserker Spirit">
 		<set name="abnormalLvl" val="26" />
@@ -1455,6 +1490,7 @@
 				<add stat="runSpd" val="8" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22067" levels="1" name="Magic Barrier">
 		<set name="abnormalLvl" val="26" />
@@ -1473,6 +1509,7 @@
 				<mul stat="mDef" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22068" levels="1" name="Bless the Soul">
 		<set name="abnormalLvl" val="26" />
@@ -1492,6 +1529,7 @@
 				<param type="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22069" levels="1" name="Clarity">
 		<set name="abnormalLvl" val="26" />
@@ -1512,6 +1550,7 @@
 				<mul stat="danceMpConsumeRate" val="0.8" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22070" levels="1" name="Wild Magic">
 		<set name="abnormalLvl" val="26" />
@@ -1530,6 +1569,7 @@
 				<add stat="mCritRate" val="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22071" levels="1" name="Huge Fortuna Box">
 		<!-- Confirmed CT2.5 -->
@@ -1581,6 +1621,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22074" levels="1" name="Armor Enchant Scroll - S Grade">
 		<set name="isMagic" val="2" />
@@ -1588,6 +1629,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22075" levels="1" name="Ancient Weapon Enchant Crystal - S grade">
 		<set name="isMagic" val="2" />
@@ -1595,6 +1637,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22076" levels="1" name="Ancient Armor Enchant Crystal - S grade">
 		<set name="isMagic" val="2" />
@@ -1602,6 +1645,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22077" levels="1" name="Divine Weapon Enchant Crystal - S grade">
 		<set name="isMagic" val="2" />
@@ -1609,6 +1653,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22078" levels="1" name="Divine Armor Enchant Crystal - S grade">
 		<set name="isMagic" val="2" />
@@ -1616,6 +1661,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22079" levels="1" name="Resist Aqua">
 		<!-- Increases resistance to water type attacks by 20% for 1 hour -->
@@ -1632,6 +1678,7 @@
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22080" levels="1" name="Resist Wind">
 		<!-- Increases resistance to wind type attacks by 20% for 1 hour -->
@@ -1648,6 +1695,7 @@
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22081" levels="1" name="Resist Fire">
 		<!-- Increases resistance to fire type attacks by 20% for 1 hour -->
@@ -1664,6 +1712,7 @@
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22082" levels="1" name="Resist Holy">
 		<!-- Increases resistance to divinity type attacks by 23% for 1 hour -->
@@ -1680,6 +1729,7 @@
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22083" levels="1" name="Resist Unholy">
 		<!-- Increases resistance to darkness type attacks by 23% for 1 hour -->
@@ -1696,6 +1746,7 @@
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22084" levels="1" name="Mental Shield">
 		<!-- Confirmed CT2.5 -->
@@ -1720,6 +1771,7 @@
 				<param DERANGEMENT="40" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22085" levels="1" name="Focus">
 		<!-- Confirmed CT2.5 -->
@@ -1742,6 +1794,7 @@
 				<mul stat="critRate" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22086" levels="1" name="Concentration">
 		<!-- Confirmed CT2.5 -->
@@ -1764,6 +1817,7 @@
 				<sub stat="cancel" val="36" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22087" levels="1" name="Blessing Shield">
 		<!-- Confirmed CT2.5 -->
@@ -1786,6 +1840,7 @@
 				<mul stat="rShld" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22088" levels="1" name="Agility">
 		<!-- Confirmed CT2.5 -->
@@ -1808,6 +1863,7 @@
 				<add stat="rEvas" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22089" levels="1" name="Regeneration">
 		<!-- Confirmed CT2.5 -->
@@ -1830,6 +1886,7 @@
 				<mul stat="regHp" val="1.2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22090" levels="1" name="Advanced Block">
 		<!-- Confirmed CT2.5 -->
@@ -1852,6 +1909,7 @@
 				<mul stat="sDef" val="1.4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22091" levels="1" name="Eva's Rune">
 		<!-- Confirmed CT2.5 -->
@@ -2016,6 +2074,7 @@
 				<mul stat="danceMpConsumeRate" val="0.9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22098" levels="1" name="Boy's Gift of Gratitude">
 		<!-- Confirmed CT2.5 -->
@@ -2057,6 +2116,7 @@
 				<mul stat="danceMpConsumeRate" val="0.9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22099" levels="1" name="Soul Silver Foil">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/22100-22199.xml b/src/main/resources/data/stats/skills/22100-22199.xml
index ebccd215b957c6cfe6ad7e458d5aae18e2f185d0..7ff3533523dd8a420dfa868c0e3e80931f1eaaff 100644
--- a/src/main/resources/data/stats/skills/22100-22199.xml
+++ b/src/main/resources/data/stats/skills/22100-22199.xml
@@ -154,6 +154,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22105" levels="1" name="Uldie Summon Scroll (Event)">
 		<!-- Confirmed CT2.5 -->
@@ -182,6 +183,7 @@
 				<param randomOffset="40" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22106" levels="1" name="Belldandy Summon Scroll (Event)">
 		<!-- Confirmed CT2.5 -->
@@ -210,6 +212,7 @@
 				<param randomOffset="40" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22107" levels="1" name="Skooldie Summon Scroll (Event)">
 		<!-- Confirmed CT2.5 -->
@@ -238,6 +241,7 @@
 				<param randomOffset="40" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22108" levels="1" name="Halloween Toy Box">
 		<!-- Confirmed CT2.5 -->
@@ -300,6 +304,7 @@
 				<param npcId="22" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22111" levels="1" name="Ambient Sky Lantern Summon">
 		<!-- Confirmed CT2.5 -->
@@ -316,6 +321,7 @@
 				<param npcId="23" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22112" levels="1" name="Sway Sky Lantern Summon">
 		<!-- Confirmed CT2.5 -->
@@ -332,6 +338,7 @@
 				<param npcId="24" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22113" levels="1" name="Comfort Sky Lantern Summon">
 		<!-- Confirmed CT2.5 -->
@@ -348,6 +355,7 @@
 				<param npcId="25" npcCount="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22114" levels="1" name="Morph Scroll Box">
 		<!-- Confirmed CT2.5 -->
@@ -421,6 +429,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22118" levels="1" name="Warmth of Kotatz">
 		<!-- High Five Confirmed -->
@@ -471,6 +480,7 @@
 				<add stat="mCritRate" val="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22120" levels="1" name="Happy New Year">
 		<!-- Confirmed CT2.5 -->
@@ -494,6 +504,7 @@
 				<add stat="accCombat" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22121" levels="1" name="Female Aniruddha">
 		<!-- Confirmed CT2.5 -->
@@ -517,6 +528,7 @@
 				<add stat="sDef" val="15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22122" levels="1" name="Kung Hei Fat Choy">
 		<!-- Confirmed CT2.5 -->
@@ -546,6 +558,7 @@
 				<add stat="absorbDam" val="9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22123" levels="1" name="Chinese Feast">
 		<!-- Confirmed CT2.5 -->
@@ -574,6 +587,7 @@
 				<mul stat="physicalMpConsumeRate" val="0.9" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22124" levels="1" name="Hwa Gei Bu Gwi">
 		<!-- Confirmed CT2.5 -->
@@ -596,6 +610,7 @@
 				<add stat="pAtkSpd" val="33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22125" levels="1" name="Fire Stamp">
 		<!-- Confirmed CT2.5 -->
@@ -622,6 +637,7 @@
 				<add stat="runSpd" val="33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22126" levels="1" name="Baby Food Skill">
 		<set name="affectScope" val="SINGLE" />
@@ -685,6 +701,7 @@
 				<mul stat="mAtkSpd" val="#AtkSpd" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22129" levels="1" name="Red Dimensional Stone">
 		<!-- TODO: Implement. -->
@@ -698,6 +715,7 @@
 		<set name="reuseDelay" val="18000000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22130" levels="1" name="Food of Doubt's Effect">
 		<!-- Food of Doubt's effect.For 20 minutes, energy is recovered when Exp. is acquired. -->
@@ -712,6 +730,7 @@
 		<set name="operateType" val="A2" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22131" levels="1" name="Red Firework Flames">
 		<!-- Confirmed CT2.5 -->
@@ -734,6 +753,7 @@
 				<add stat="waterRes" val="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22132" levels="1" name="Gold Firework Flames">
 		<!-- Confirmed CT2.5 -->
@@ -756,6 +776,7 @@
 				<add stat="holyRes" val="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22133" levels="1" name="Blue Firework Flames">
 		<!-- Confirmed CT2.5 -->
@@ -778,6 +799,7 @@
 				<add stat="fireRes" val="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22134" levels="1" name="Pink Firework Flames">
 		<!-- Confirmed CT2.5 -->
@@ -800,6 +822,7 @@
 				<add stat="earthRes" val="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22135" levels="1" name="White Firework Flames">
 		<!-- Confirmed CT2.5 -->
@@ -822,6 +845,7 @@
 				<add stat="windRes" val="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22136" levels="1" name="Silver Firework Flames">
 		<!-- Confirmed CT2.5 -->
@@ -844,6 +868,7 @@
 				<add stat="darkRes" val="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22137" levels="1" name="Star Food">
 		<!-- Confirmed CT2.5 -->
@@ -857,6 +882,7 @@
 				<param value="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22138" levels="1" name="Mango Dessert">
 		<!-- Confirmed CT2.5 -->
@@ -873,6 +899,7 @@
 				<param value="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22139" levels="1" name="Branding Wind Walk">
 		<!-- Confirmed CT2.5 -->
@@ -892,6 +919,7 @@
 				<add stat="runSpd" val="33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22140" levels="1" name="Hwa Gei Bu Gwi Haste">
 		<!-- Confirmed CT2.5 -->
@@ -911,6 +939,7 @@
 				<mul stat="pAtkSpd" val="1.33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22141" levels="1" name="Branding Agility">
 		<!-- Confirmed CT2.5 -->
@@ -930,6 +959,7 @@
 				<add stat="rEvas" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22142" levels="1" name="Female Aniruddha's Shield">
 		<!-- Confirmed CT2.5 -->
@@ -949,6 +979,7 @@
 				<mul stat="pDef" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22143" levels="1" name="Happy New Year Death Whisper">
 		<!-- Confirmed CT2.5 -->
@@ -968,6 +999,7 @@
 				<mul stat="critRate" val="1.35" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22144" levels="1" name="Happy New Year Guidance">
 		<!-- Confirmed CT2.5 -->
@@ -987,6 +1019,7 @@
 				<add stat="accCombat" val="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22145" levels="1" name="Love for All Seasons Empower">
 		<!-- Confirmed CT2.5 -->
@@ -1006,6 +1039,7 @@
 				<mul stat="mAtk" val="1.75" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22146" levels="1" name="Chinese Feast Greater Acumen">
 		<!-- Confirmed CT2.5 -->
@@ -1025,6 +1059,7 @@
 				<mul stat="mAtkSpd" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22147" levels="1" name="Kung Hei Fat Choy Vampiric Rage">
 		<!-- High Five Confirmed -->
@@ -1067,6 +1102,7 @@
 				<param type="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22149" levels="1" name="Kung Hei Fat Choy Berserker Spirit">
 		<!-- Confirmed CT2.5 -->
@@ -1092,6 +1128,7 @@
 				<add stat="runSpd" val="8" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22150" levels="1" name="Female Aniruddha's Magic Barrier">
 		<!-- Confirmed CT2.5 -->
@@ -1111,6 +1148,7 @@
 				<mul stat="mDef" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22151" levels="1" name="Chinese Feast Blessed Soul">
 		<!-- Confirmed CT2.5 -->
@@ -1131,6 +1169,7 @@
 				<param type="PER" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22152" levels="1" name="Chinese Feast Clarity">
 		<!-- Confirmed CT2.5 -->
@@ -1152,6 +1191,7 @@
 				<mul stat="physicalMpConsumeRate" val="0.8" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22153" levels="1" name="Love for All Seasons Wild Magic">
 		<!-- Confirmed CT2.5 -->
@@ -1171,6 +1211,7 @@
 				<add stat="mCritRate" val="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22154" levels="1" name="Happy New Year Focus">
 		<!-- Confirmed CT2.5 -->
@@ -1190,6 +1231,7 @@
 				<mul stat="critRate" val="1.3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22155" levels="1" name="Female Aniruddha's Blessed Shield">
 		<!-- Confirmed CT2.5 -->
@@ -1209,6 +1251,7 @@
 				<add stat="rShld" val="15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22156" levels="1" name="Hwa Gei Bu Gwi Decrease Weight">
 		<!-- Confirmed CT2.5 -->
@@ -1228,6 +1271,7 @@
 				<add stat="weightPenalty" val="9000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22157" levels="1" name="Kung Hei Fat Choy Might">
 		<!-- Confirmed CT2.5 -->
@@ -1247,6 +1291,7 @@
 				<mul stat="pAtk" val="1.15" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22158" levels="10" name="Rose Petal">
 		<!-- Confirmed CT2.5 -->
@@ -1272,6 +1317,7 @@
 				<mul stat="regMp" val="1.2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22159" levels="1" name="Vesper Super Power">
 		<!-- Increases P. Atk. by 15%, M. Atk. by 20% and Speed by 10 for 10 minutes. -->
@@ -1297,6 +1343,7 @@
 				<add stat="runSpd" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22160" levels="1" name="Vesper Critical Power">
 		<!-- Increases Physical critical attack rate by 15, Magical critical attack rate by 2 and Speed by 10 for 10 minutes. 5% of the standard short-range physical damage inflicted on the enemy is recovered as HP. -->
@@ -1323,6 +1370,7 @@
 				<add stat="absorbDam" val="5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22161" levels="1" name="Invincible Vesper">
 		<!-- Increases Atk. Spd. by 20%, Casting Spd. by 20% and Speed by 20 for 10 minutes. -->
@@ -1348,6 +1396,7 @@
 				<add stat="runSpd" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22162" levels="1" name="Herb of Mt. Fuji">
 		<!-- High Five Confirmed -->
@@ -1438,6 +1487,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22166" levels="1" name="Energy Replenish">
 		<!-- 10000 Soul Avatar Energy is replenished. -->
@@ -1449,6 +1499,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22167" levels="1" name="April Fools' Day Vesper Weapon Gift">
 		<!-- Confirmed CT2.5 -->
@@ -1483,6 +1534,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22169" levels="1" name="Soccer Ball of Cheers Release">
 		<!-- Confirmed CT2.5 -->
@@ -1525,6 +1577,7 @@
 		<set name="reuseDelay" val="900000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22171" levels="1" name="Hardin's Blessing">
 		<!-- Maximies M. Def. for 10 seconds. -->
@@ -1542,6 +1595,7 @@
 		<set name="reuseDelay" val="900000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22172" levels="1" name="Sylphide's Wings">
 		<!-- Increases one's own moving speed by 300 for 15 seconds. -->
@@ -1558,6 +1612,7 @@
 		<set name="reuseDelay" val="900000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22173" levels="1" name="Sylphide's Blessing">
 		<!-- Increases the moving speed of yourself and friendly nearby targets by 300 for 15 seconds. -->
@@ -1629,6 +1684,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22178" levels="1" name="Hero's Potion">
 		<!-- Confirmed CT2.5 -->
@@ -1650,6 +1706,7 @@
 				<param amount="200" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22179" levels="1" name="Fortuna of Chaos">
 		<!-- Confirmed CT2.5 -->
@@ -1707,6 +1764,7 @@
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22182" levels="1" name="Joyous Vitality Potion">
 		<!-- High Five Confirmed -->
@@ -1751,6 +1809,7 @@
 				<param id="20005" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22184" levels="1" name="Dragon Master Karin Transformation Scroll">
 		<!-- High Five Skill -->
@@ -1766,31 +1825,37 @@
 				<param id="20006" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22185" levels="1" name="Shiny Lighting">
 		<!-- Lighting shines brightly above the character's head. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22186" levels="1" name="Echo Crystal - Theme of Celebration">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22187" levels="1" name="Honeymoon Ticket - Joy of Energy">
 		<!-- State in which the Energy Stage is maintained. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22188" levels="1" name="Summon Big Wedding Cake">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22189" levels="1" name="Flower Shower">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22190" levels="1" name="Transformation Scroll - Blue Block Checker">
 		<!-- High Five Skill -->
@@ -1810,6 +1875,7 @@
 				<param id="127" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22191" levels="1" name="Transformation Scroll - Onyx Beast Event">
 		<!-- Transformed into an Onyx Beast. -->
@@ -1835,6 +1901,7 @@
 				<param id="1" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22192" levels="1" name="Transformation Scroll - Death Blader Event">
 		<!-- Transformed into a Death Blader. -->
@@ -1860,6 +1927,7 @@
 				<param id="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22193" levels="1" name="Transformation Scroll - Grail Apostle Event">
 		<!-- Transformed into a Grail Apostle. -->
@@ -1885,6 +1953,7 @@
 				<param id="202" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22194" levels="1" name="Transformation Scroll - Unicorn Event">
 		<!-- Transformed into a Unicorn. -->
@@ -1910,6 +1979,7 @@
 				<param id="205" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22195" levels="1" name="Transformation Scroll - Lilim Knight Event">
 		<!-- Transformed into a Lilim Knight. -->
@@ -1935,6 +2005,7 @@
 				<param id="208" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22196" levels="1" name="Transformation Scroll - Golem Guardian Event">
 		<!-- Transformed into a Golem Guardian. -->
@@ -1960,6 +2031,7 @@
 				<param id="211" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22197" levels="1" name="Transformation Scroll - Inferno Drake Event">
 		<!-- Transformed into an Inferno Drake. -->
@@ -1985,6 +2057,7 @@
 				<param id="214" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22198" levels="1" name="Transformation Scroll - Dragon Bomber Event">
 		<!-- Transformed into a Dragon Bomber. -->
@@ -2010,6 +2083,7 @@
 				<param id="217" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22199" levels="1" name="Transformation Scroll - Heretic Event">
 		<!-- Transformed into a Heretic. -->
@@ -2035,5 +2109,6 @@
 				<param id="3" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/22200-22299.xml b/src/main/resources/data/stats/skills/22200-22299.xml
index 4a864cac6e8549844bd9d3b24b92f65ba1459ee7..9c0cc2eb1c4343be0c4bd0f52607e18f395864c8 100644
--- a/src/main/resources/data/stats/skills/22200-22299.xml
+++ b/src/main/resources/data/stats/skills/22200-22299.xml
@@ -24,6 +24,7 @@
 				<param id="4" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22201" levels="1" name="Transformation Scroll - Saber Tooth Tiger Event">
 		<!-- Transformed into a Saber Tooth Tiger. -->
@@ -49,6 +50,7 @@
 				<param id="5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22202" levels="1" name="Transformation Scroll - Ol Mahum Event">
 		<!-- Transformed into an Ol Mahum. -->
@@ -74,6 +76,7 @@
 				<param id="6" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22203" levels="1" name="Transformation Scroll - Doll Blader Event">
 		<!-- Transformed into a Doll Blader. -->
@@ -99,6 +102,7 @@
 				<param id="7" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22204" levels="1" name="Transformation Scroll - Zaken Event">
 		<!-- Transformed into Zaken. -->
@@ -124,6 +128,7 @@
 				<param id="305" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22205" levels="1" name="Transformation Scroll - Anakim Event">
 		<!-- Transformed into Anakim. -->
@@ -149,6 +154,7 @@
 				<param id="306" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22206" levels="1" name="Transformation Scroll - Venom Event">
 		<!-- Transformed into Venom. -->
@@ -174,6 +180,7 @@
 				<param id="307" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22207" levels="1" name="Transformation Scroll - Gordon Event">
 		<!-- Transformed into Gordon. -->
@@ -199,6 +206,7 @@
 				<param id="308" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22208" levels="1" name="Transformation Scroll - Ranku Event">
 		<!-- Transformed into Ranku. -->
@@ -224,6 +232,7 @@
 				<param id="309" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22209" levels="1" name="Transformation Scroll - Kechi Event">
 		<!-- Transformed into Kechi. -->
@@ -249,6 +258,7 @@
 				<param id="310" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22210" levels="1" name="Transformation Scroll - Demon Prince Event">
 		<!-- Transformed into Demon Prince. -->
@@ -274,17 +284,20 @@
 				<param id="311" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22211" levels="1" name="Blessed Scroll of Escape">
 		<!-- none -->
 		<set name="blockedInOlympiad" val="true" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22212" levels="1" name="Highest Power Quick Healing Potion">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22213" levels="1" name="Mysterious Scroll - Prophecy of Wind">
 		<!-- "For 60 minutes, receives help from a great spirit to increase Max HP by 20%, rate of critical attack by 20%, rate of Prominent Damage through magic damage by 20%, P. Atk. by 10%, P. Def. by 20%, Atk. Spd. by 20%, M. Atk. by 20%, M. Def. by 20%, Casting Spd. by 20%, and resistance to de-buff by 10%. Decreases Speed by 20%. Bestows the ability to recover as HP 5% of the standard short-range physical damage inflicted on an enemy." -->
@@ -300,7 +313,7 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="10000" />
-		<set name="targetType" val="SELF" />	
+		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="MaxHp">
 				<param power="20" />
@@ -320,6 +333,7 @@
 				<add stat="absorbDam" val="5" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22214" levels="1" name="MP Recovery Potion">
 		<!-- Magic potion that quickly recovers MP by 50% when used. -->
@@ -337,6 +351,7 @@
 				<param power="50" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22215" levels="1" name="Vitality Replenishing Herb Tea">
 		<!-- High Five Confirmed -->
@@ -389,6 +404,7 @@
 				<param id="306" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22217" levels="1" name="Super Healthy Juice (HP)">
 		<!-- Magic juice that instantly fully recovers HP. -->
@@ -406,6 +422,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22218" levels="1" name="Super Healthy Juice (HP)">
 		<!-- Magic juice that instantly fully recovers HP. -->
@@ -423,6 +440,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22219" levels="1" name="Super Healthy Juice (CP)">
 		<!-- Magic juice that temporarily recovers CP in full. -->
@@ -440,6 +458,7 @@
 				<param amount="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22220" levels="1" name="Super Healthy Juice (CP)">
 		<!-- Magic juice that temporarily recovers CP in full. -->
@@ -457,6 +476,7 @@
 				<param amount="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22221" levels="1" name="Energy Replenishing Beverage">
 		<!-- Vitality is replenished to 100% upon use. -->
@@ -474,6 +494,7 @@
 				<param value="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22222" levels="1" name="Energy Replenishing Beverage">
 		<!-- Vitality is replenished to 100% upon use. -->
@@ -491,6 +512,7 @@
 				<param value="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22223" levels="1" name="Potion of Energy Maintenance">
 		<!-- Energy is maintained for 30 minutes. -->
@@ -513,6 +535,7 @@
 				<mul stat="vitalityConsumeRate" val="0" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22224" levels="1" name="Potion of Energy Maintenance">
 		<!-- Energy is maintained for 30 minutes. -->
@@ -535,116 +558,139 @@
 				<mul stat="vitalityConsumeRate" val="0" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22225" levels="1" name="Gludio Homemade Cookie">
 		<!-- Increases P. Atk. by 10% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22226" levels="1" name="Gludio Homemade Cookie">
 		<!-- Increases P. Atk. by 10% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22227" levels="1" name="Dion Homemade Cookie">
 		<!-- Increases P. Def. by 15% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22228" levels="1" name="Dion Homemade Cookie">
 		<!-- Increases P. Def. by 15% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22229" levels="1" name="Aden Designer Cookie">
 		<!-- "For 60 minutes, receives help from a great spirit to recover 20% of HP, and to increase Max HP by 20%, the chance of prominent magic damage by 2, Critical Attack by 20%, P. Atk. by 10%, P. Def. by 20%, Atk. Spd. by 20%, M. Atk. by 20%, M. Def. by 20%, Casting Spd. by 20%, resistance to de-buffs by 10%, and Accuracy by 4. Decreases Speed by 20%." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22230" levels="1" name="Aden Designer Cookie">
 		<!-- "For 60 minutes, receives help from a great spirit to recover 20% of HP, and to increase Max HP by 20%, the chance of prominent magic damage by 2, Critical Attack by 20%, P. Atk. by 10%, P. Def. by 20%, Atk. Spd. by 20%, M. Atk. by 20%, M. Def. by 20%, Casting Spd. by 20%, resistance to de-buffs by 10%, and Accuracy by 4. Decreases Speed by 20%." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22231" levels="1" name="Giran Designer Cookie">
 		<!-- "Increases P. Def. against Critical by 30% for 60 minutes. When the target receives an attack above a certain amount of damage, the Critical Damage of general short-range physical attack is increased for 8 seconds." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22232" levels="1" name="Giran Designer Cookie">
 		<!-- "Increases P. Def. against Critical by 30% for 60 minutes. When the target receives an attack above a certain amount of damage, the Critical Damage of general short-range physical attack is increased for 8 seconds." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22233" levels="1" name="Rune Designer Cookie">
 		<!-- Greatly increases the power of recharge received for 60 minutes. The amount of recovered MP may differ according to the level. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22234" levels="1" name="Rune Designer Cookie">
 		<!-- Greatly increases the power of recharge received for 60 minutes. The amount of recovered MP may differ according to the level. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22235" levels="1" name="Crystal of Fortune Treasure Sack">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22236" levels="1" name="Crystal of Fortune Treasure Sack">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22237" levels="1" name="Enchant Scroll of Fortune Treasure Sack">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22238" levels="1" name="Enchant Scroll of Fortune Treasure Sack">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22239" levels="1" name="Bead of Fortune Treasure Sack">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22240" levels="1" name="Bead of Fortune Treasure Sack">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22241" levels="1" name="Rider Pouch">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22242" levels="1" name="Rider Pouch">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22243" levels="1" name="Fashion Pouch">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22244" levels="1" name="Fashion Pouch">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22245" levels="1" name="Buff Pouch">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22246" levels="1" name="Buff Pouch">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22247" levels="1" name="Olf's T-shirt Enchant Scroll">
 		<set name="isMagic" val="2" />
@@ -652,6 +698,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22248" levels="1" name="Blessed Olf's T-shirt Enchant Scroll">
 		<set name="isMagic" val="2" />
@@ -659,6 +706,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22249" levels="1" name="Birthday Cake">
 		<!-- High Five Skill -->
@@ -672,6 +720,7 @@
 				<param npcId="139" npcCount="1" despawnDelay="1200000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22250" levels="1" name="Birthday Cake Vitality Buff">
 		<!-- High Five Confirmed -->
@@ -1333,42 +1382,50 @@
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22276" levels="1" name="Rune Jewelry Box - Talisman">
 		<!-- none -->
 		<set name="blockedInOlympiad" val="true" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22277" levels="1" name="Pablo's Box">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22278" levels="1" name="Large Ancient Weapon">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22279" levels="1" name="Giant Ancient Weapon">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22280" levels="1" name="Small Ancient Jewel">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22281" levels="1" name="Large Ancient Jewel">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22282" levels="1" name="Giant Ancient Jewel">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22283" levels="1" name="PC Cafe Blessing">
 		<!-- "For 20 minute(s), recovers energy when Exp. is acquired through hunting." -->
@@ -1379,31 +1436,37 @@
 		<!-- "For 60 minute(s), energy is replenished when Exp. is acquired through hunting." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22285" levels="1" name="PC Cafe Energy">
 		<!-- "For 2 hours, recovers energy when Exp. is acquired through hunting." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22286" levels="1" name="PC Cafe Energy">
 		<!-- "For 3 hours, recovers energy when Exp. is acquired through hunting." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22287" levels="1" name="PC Cafe Energy">
 		<!-- "For 4 hours, recovers energy when Exp. is acquired through hunting." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22288" levels="1" name="PC Cafe Energy Pack">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22289" levels="1" name="Santa Claus's Treasure Box">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22290" levels="1" name="Scroll: Valakas Call">
 		<!-- High Five Confirmed -->
@@ -1529,6 +1592,7 @@
 				<param npcId="143" npcCount="1" despawnDelay="1800000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22295" levels="1" name="Totem of Spirit">
 		<set name="blockedInOlympiad" val="true" />
@@ -1542,6 +1606,7 @@
 				<param npcId="144" npcCount="1" despawnDelay="1800000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22296" levels="1" name="Totem of Bravery">
 		<set name="blockedInOlympiad" val="true" />
@@ -1556,6 +1621,7 @@
 				<param npcId="145" npcCount="1" despawnDelay="1800000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22297" levels="1" name="Totem of Fortitude">
 		<set name="blockedInOlympiad" val="true" />
@@ -1569,6 +1635,7 @@
 				<param npcId="146" npcCount="1" despawnDelay="1800000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22298" levels="1" name="Refined Red Dragon Blood">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/22300-22399.xml b/src/main/resources/data/stats/skills/22300-22399.xml
index 203f17edd1e61de5cee808ce2eeff3a4f3e4c363..3df225146173d84cee4255ae52214f2b912d6aed 100644
--- a/src/main/resources/data/stats/skills/22300-22399.xml
+++ b/src/main/resources/data/stats/skills/22300-22399.xml
@@ -28,16 +28,19 @@
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22302" levels="1" name="Sweet Chocolate - 4 hour">
 		<!-- "For 4 hours, recovers energy when Exp. is acquired through hunting." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22303" levels="1" name="Party Cake">
 		<!-- Party Cake's energy effect. Maintains vitality for 20 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22304" levels="1" name="Campfire's Warmth">
 		<!-- "The campfire's warmth can be felt. Increases HP regeneration by 80%, CP regeneration by 60%, and MP regeneration by 40%." -->
@@ -48,36 +51,43 @@
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22306" levels="1" name="Event - Baby Bunny Scroll of Summon">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22307" levels="1" name="Event - Baby Bunny Captain Scroll of Summon">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22308" levels="1" name="Event - Sad Baby Bunny Scroll of Summon">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22309" levels="1" name="Event - Sad Baby Bunny Captain Scroll of Summon">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22310" levels="1" name="Cupid's Cure">
 		<!-- Sends mutated animals a heart filled with love. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22311" levels="1" name="Cupid's Enhanced Cure">
 		<!-- Sends mutated animals a powerful heart filled with love. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22312" levels="1" name="Joyous Vitality Potion">
 		<!-- High Five Confirmed -->
@@ -112,101 +122,121 @@
 		<!-- "For 4 hours, recovers energy when Exp. is acquired through hunting." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22314" levels="1" name="Treasure Sack 1st Place">
 		<!-- none -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22315" levels="2" name="Treasure Sack 2nd Place">
 		<!-- This skill only has one level, 2. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22316" levels="3" name="Treasure Sack 3rd Place">
 		<!-- This skill only has one level, 3. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22317" levels="4" name="Treasure Sack 4th Place">
 		<!-- This skill only has one level, 4. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22318" levels="5" name="Treasure Sack 5th Place">
 		<!-- This skill only has one level, 5. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22319" levels="6" name="Treasure Sack 6th Place">
 		<!-- This skill only has one level, 6. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22320" levels="1" name="Berserker Spirit">
 		<!-- "Decreases P. Def. by 8%, M. Def. by 16%, and Evasion by 4, increases P. Atk. by 8%, M. Atk. by 16%, Atk. Spd. by 8%, Casting Spd. by 8%, and Speed by 8 for 60 minutes." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22321" levels="1" name="Acumen">
 		<!-- Increases Casting Spd. by 30% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22322" levels="1" name="Magic Barrier">
 		<!-- Increases M. Def. by 30% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22323" levels="1" name="Clarity">
 		<!-- "Decreases MP Consumption by 20% for physical skills, by 10% for magical skills, and by 20% for song/dance skills for 60 minutes." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22324" levels="1" name="Blessed Soul">
 		<!-- Increases Max MP by 35% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22325" levels="1" name="Blessed Body">
 		<!-- Increases Max HP by 35% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22326" levels="1" name="Empower">
 		<!-- Increases M. Atk. by 75% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22327" levels="1" name="Wind Walk">
 		<!-- Increases Speed by 33 for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22328" levels="1" name="Shield">
 		<!-- Increases P. Def. by 15% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22329" levels="1" name="Wind Walk">
 		<!-- Increases Speed by 33 for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22330" levels="1" name="Shield">
 		<!-- Increases P. Def. by 15% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22331" levels="1" name="Haste">
 		<!-- Increases Atk. Spd. by 33% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22332" levels="1" name="Death Whisper">
 		<!-- Increases Critical Attack by 35% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22333" levels="1" name="Vampiric Rage">
 		<!-- High Five Confirmed -->
@@ -234,46 +264,55 @@
 		<!-- Increases Accuracy by 4 for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22335" levels="1" name="Might">
 		<!-- Increases P. Atk. by 15% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22336" levels="1" name="Blessed Body">
 		<!-- Increases Max HP by 35% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22337" levels="1" name="Focus">
 		<!-- Increases Critical Rate by 30% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22338" levels="1" name="Bless Shield">
 		<!-- Increases Shield Defense Rate by 30% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22339" levels="1" name="Berserker Spirit">
 		<!-- "Decreases P. Def. by 8%, M. Def. by 16%, and Evasion by 4, and increases P. Atk. by 8%, M. Atk. by 16%, Atk. Spd. by 8%, Casting Spd. by 8%, and Speed by 8 for 60 minutes." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22340" levels="1" name="Might">
 		<!-- Increases P. Atk. by 15% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22341" levels="1" name="Wind Walk">
 		<!-- Increases Speed by 33 for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22342" levels="1" name="Haste">
 		<!-- Increases Atk. Spd. by 33% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22343" levels="1" name="Vampiric Rage">
 		<!-- High Five Confirmed -->
@@ -301,128 +340,154 @@
 		<!-- "Decreases P. Def. by 8%, M. Def. by 16%, and Evasion by 4, and increases P. Atk. by 8%, M. Atk. by 16%, Atk. Spd. by 8%, Casting Spd. by 8%, and Speed by 8 for 60 minutes." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22345" levels="1" name="Empower">
 		<!-- Increases M. Atk. by 75% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22346" levels="1" name="Acumen">
 		<!-- Increases Casting Spd. by 30% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22347" levels="1" name="Shield">
 		<!-- Increases P. Def. by 15% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22348" levels="1" name="Focus">
 		<!-- Increases Critical Rate by 30% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22349" levels="1" name="Death Whisper">
 		<!-- Increases Critical Attack by 35% for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22350" levels="1" name="Guidance">
 		<!-- Increases Accuracy by 4 for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22351" levels="1" name="Clarity">
 		<!-- "Decreases MP Consumption by 20% for physical skills, by 10% for magical skills, and by 20% for song/dance skills for 60 minutes." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22352" levels="1" name="Wild Magic">
 		<!-- Increases the chance of prominent magic damage by 2 for 60 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22353" levels="6" name="Concentration">
 		<!-- Decreases magic cancel damage by 53 for 60 minutes. -->
 		<!-- This skill only has one level, 6. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22354" levels="1" name="Lantern Agathion's Gift">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22355" levels="1" name="Soul Crystal Box - Level 17">
 		<set name="blockedInOlympiad" val="true" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22356" levels="1" name="Soul Crystal Box - Level 18">
 		<set name="blockedInOlympiad" val="true" />
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22357" levels="1" name="S84 High-Grade Weapon Box">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22358" levels="1" name="Vorpal Armor Box">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22359" levels="1" name="Scroll: Enchant Weapon of Destruction (S-Grade)">
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22360" levels="1" name="Scroll: Enchant Armor of Destruction (S-Grade)">
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22361" levels="1" name="Scroll: Enchant Weapon of Destruction (A-Grade)">
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22362" levels="1" name="Scroll: Enchant Armor of Destruction (A-Grade)">
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22363" levels="1" name="Scroll: Enchant Weapon of Destruction (B-Grade)">
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22364" levels="1" name="Scroll: Enchant Armor of Destruction (B-Grade)">
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22365" levels="1" name="Scroll: Enchant Weapon of Destruction (C-Grade)">
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22366" levels="1" name="Scroll: Enchant Armor of Destruction (C-Grade)">
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22367" levels="1" name="Scroll: Enchant Weapon of Destruction (D-Grade)">
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22368" levels="1" name="Scroll: Enchant Armor of Destruction (D-Grade)">
-		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22369" levels="1" name="Blessed Spiritshot - S grade">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22370" levels="1" name="Mysterious Soulshot Pack (S-Grade)">
 		<!-- High Five Confirmed -->
@@ -472,115 +537,143 @@
 	<skill id="22372" levels="1" name="Meteor">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22373" levels="1" name="Starfall">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22374" levels="1" name="Sweet Chocolate">
 		<!-- For 30 minutes, Vitality is replenished when Exp. is acquired through hunting. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22375" levels="1" name="Valentine's Day Love Pouch">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22376" levels="1" name="Sweet Chocolate">
 		<!-- For 30 minutes, Vitality is replenished when Exp. is acquired through hunting. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22377" levels="1" name="Bad Bunny's Necklace Box">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22378" levels="1" name="Bad Bunny's Earring Box">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22379" levels="1" name="Bad Bunny's Ring Box">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22380" levels="1" name="Lantern Agathion's Gift Set">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22381" levels="1" name="Attribute Ore Box">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22382" levels="1" name="Attribute Crystal Box">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22383" levels="1" name="Pathfinder Supplies">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22384" levels="1" name="Pathfinder Supplies">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22385" levels="1" name="Pathfinder Supplies">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22386" levels="1" name="PC Café Transformation Scroll Box">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22387" levels="1" name="PC Café Gift Box">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22388" levels="1" name="PC Café Transformation Stick Box">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22389" levels="1" name="PC Café Hair Accessory Box">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22390" levels="1" name="PC Café Luxury Gift Box">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22391" levels="1" name="Jewelry Box - Talisman">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22392" levels="1" name="Happiness Cake - Low Grade">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22393" levels="1" name="Happiness Cake - Medium Grade">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22394" levels="1" name="Happiness Cake - High Grade">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22395" levels="1" name="Happiness Cake - Top Grade">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22396" levels="1" name="Holy Happiness Cake">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22397" levels="1" name="Sweet Chocolate Cookie">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22398" levels="1" name="Allegra Box">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22399" levels="1" name="Latus Box">
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/22400-22499.xml b/src/main/resources/data/stats/skills/22400-22499.xml
index fa78bacb5a3fd4aa2826c5885271d199be24850f..8e772c56b7ce7bd192829259202d6a596d85a243 100644
--- a/src/main/resources/data/stats/skills/22400-22499.xml
+++ b/src/main/resources/data/stats/skills/22400-22499.xml
@@ -4,46 +4,55 @@
 		<!-- Transformed into Zaken. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22401" levels="1" name="Transformation Scroll - Ranku">
 		<!-- Transformed into Ranku. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22402" levels="1" name="Juju Agathion's Gift">
 		<!-- There is no available description. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22403" levels="1" name="Extra Entrance Pass - Kamaloka (Hall of the Abyss)">
 		<!-- There is no available description. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22404" levels="1" name="Pathfinder's Reward">
 		<!-- There is no available description. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22405" levels="1" name="S84 Top-Grade Weapon Box">
 		<!-- There is no available description. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22406" levels="1" name="Ellegia Armor Box">
 		<!-- There is no available description. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22407" levels="1" name="PC Cafe Energy">
 		<!-- For 60 minutes, recovers Vitality when Exp. is acquired through hunting. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22408" levels="1" name="Enchantment Tool Box">
 		<!-- There is no available description. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="22409" levels="1" name="Rune of Fate">
 		<!-- Increases acquired XP and SP by 200%. -->
diff --git a/src/main/resources/data/stats/skills/23000-23099.xml b/src/main/resources/data/stats/skills/23000-23099.xml
index da70dbcd7a9fe4f4ebfef917f376280fc8b3a8a4..ea5f0830c8777b676bb8b1fa2f4349dcea0b01f1 100644
--- a/src/main/resources/data/stats/skills/23000-23099.xml
+++ b/src/main/resources/data/stats/skills/23000-23099.xml
@@ -11,6 +11,7 @@
 		<cond msgId="2292">
 			<player agathionId="1501" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23001" levels="1" name="Gold Majo Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -23,6 +24,7 @@
 		<cond msgId="2292">
 			<player agathionId="1502" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23002" levels="1" name="Black Majo Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -35,6 +37,7 @@
 		<cond msgId="2292">
 			<player agathionId="1503" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23003" levels="1" name="Plaipitak Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -47,6 +50,7 @@
 		<cond msgId="2292">
 			<player agathionId="1504" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23004" levels="1" name="Majo Agathion Special Skill - Mysterious Power">
 		<set name="abnormalLvl" val="0" />
@@ -67,6 +71,7 @@
 		<cond msgId="2292">
 			<player agathionId="1501" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23005" levels="1" name="Gold Majo Agathion Special Skill - Power of Blessed Resurrection">
 		<set name="blockedInOlympiad" val="true" />
@@ -92,6 +97,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23006" levels="1" name="Black Majo Agathion Special Skill - Blessed Escape">
 		<!-- High Five Confirmed -->
@@ -142,6 +148,7 @@
 		<cond msgId="2292">
 			<player agathionId="1504" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23008" levels="1" name="Plaipitak Agathion Special Skill - Blessed Escape">
 		<!-- High Five Confirmed -->
@@ -197,6 +204,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23010" levels="1" name="Baby Panda Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -209,6 +217,7 @@
 		<cond msgId="2292">
 			<player agathionId="1505" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23011" levels="1" name="Bamboo Panda Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -221,6 +230,7 @@
 		<cond msgId="2292">
 			<player agathionId="1506" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23012" levels="1" name="Sexy Panda Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -233,6 +243,7 @@
 		<cond msgId="2292">
 			<player agathionId="1507" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23013" levels="1" name="Baby Panda Agathion Special Skill - Mysterious Power">
 		<set name="abnormalLvl" val="0" />
@@ -253,6 +264,7 @@
 		<cond msgId="2292">
 			<player agathionId="1505" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23014" levels="1" name="Bamboo Panda Agathion Special Skill - Power of Blessed Resurrection">
 		<set name="blockedInOlympiad" val="true" />
@@ -278,6 +290,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23015" levels="1" name="Sexy Panda Agathion Special Skill - Blessed Escape">
 		<!-- High Five Confirmed -->
@@ -333,6 +346,7 @@
 				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23017" levels="1" name="Christmas Festival">
 		<!-- High Five Confirmed -->
@@ -564,6 +578,7 @@
 				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23025" levels="1" name="Charming Cupid Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -576,6 +591,7 @@
 		<cond msgId="2292">
 			<player agathionId="1508" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23026" levels="1" name="Naughty Cupid Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -588,6 +604,7 @@
 		<cond msgId="2292">
 			<player agathionId="1509" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23027" levels="1" name="White Maneki Neko Agathion Cute Trick I">
 		<set name="hitTime" val="3000" />
@@ -600,6 +617,7 @@
 		<cond msgId="2292">
 			<player agathionId="1510" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23028" levels="1" name="Black Maneki Neko Agathion Cute Trick I">
 		<set name="hitTime" val="3000" />
@@ -612,6 +630,7 @@
 		<cond msgId="2292">
 			<player agathionId="1511" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23029" levels="1" name="Brown Maneki Neko Agathion Cute Trick I">
 		<set name="hitTime" val="3000" />
@@ -624,6 +643,7 @@
 		<cond msgId="2292">
 			<player agathionId="1512" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23030" levels="1" name="White Maneki Neko Agathion Special Skill - Blessed Resurrection Ability">
 		<set name="blockedInOlympiad" val="true" />
@@ -649,6 +669,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23031" levels="1" name="Black Maneki Neko Agathion Special Skill - Ability of Blessed Return">
 		<!-- High Five Confirmed -->
@@ -705,6 +726,7 @@
 				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23033" levels="1" name="One-Eyed Bat Drove Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -717,6 +739,7 @@
 		<cond msgId="2292">
 			<player agathionId="1513" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23034" levels="1" name="One-eyed Bat Drove Agathion Special Skill - Ability of Resist Unholy">
 		<!-- Increases resistance to darkness type attacks by 30% for 5 minutes. Reuse Delay 1 hours -->
@@ -743,6 +766,7 @@
 				<add stat="darkRes" val="30" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23035" levels="1" name="One-eyed Bat Drove Agathion Special Skill - Ability of Energy Recovery">
 		<!-- Recovers energy when acquiring Exp. for 5 minutes. Reuse Delay 1 hours -->
@@ -769,6 +793,7 @@
 				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23036" levels="1" name="Pegasus Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -781,6 +806,7 @@
 		<cond msgId="2292">
 			<player agathionId="1514" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23037" levels="1" name="Pegasus Agathion Special Skill - Ability of Wind Walk">
 		<!-- Increases moving speed by 33 for 5 minutes. Reuse Delay 4 hours -->
@@ -807,6 +833,7 @@
 				<add stat="runSpd" val="33" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23038" levels="1" name="Pegasus Agathion Special Skill - Ability of Blessed Return">
 		<!-- High Five Confirmed -->
@@ -849,6 +876,7 @@
 		<cond msgId="2292">
 			<player agathionId="1515" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23040" levels="1" name="Blue-Robed Tojigong Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -861,6 +889,7 @@
 		<cond msgId="2292">
 			<player agathionId="1516" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23041" levels="1" name="Green-Robed Tojigong Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -873,6 +902,7 @@
 		<cond msgId="2292">
 			<player agathionId="1517" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23042" levels="1" name="Yellow-robed Tojigong Agathion Special Skill - Ability of Greater Heal">
 		<!-- Recovers HP by 444 and increases HP Recovery by 30 for 15 seconds. Reuse Delay 4 hours -->
@@ -902,6 +932,7 @@
 				<param power="444" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23043" levels="1" name="Blue-robed Tojigong Agathion Special Skill - Ability of Reflect Damage">
 		<!-- For 5 minutes, returns 20% of the damage back to the enemy. Excludes skill and long-range attacks. Reuse Delay 1 hours -->
@@ -928,6 +959,7 @@
 				<add stat="reflectDam" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23044" levels="1" name="Green-robed Tojigong Agathion Special Skill - Ability of Mana Regeneration">
 		<!-- High Five Confirmed -->
@@ -969,6 +1001,7 @@
 		<cond msgId="2292">
 			<player agathionId="1518" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23046" levels="1" name="White Maneki Neko Agathion Cute Trick II">
 		<set name="hitTime" val="3000" />
@@ -981,6 +1014,7 @@
 		<cond msgId="2292">
 			<player agathionId="1510" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23047" levels="1" name="Black Maneki Neko Agathion Cute Trick II">
 		<set name="hitTime" val="3000" />
@@ -993,6 +1027,7 @@
 		<cond msgId="2292">
 			<player agathionId="1511" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23048" levels="1" name="Brown Maneki Neko Agathion Cute Trick II">
 		<set name="hitTime" val="3000" />
@@ -1005,6 +1040,7 @@
 		<cond msgId="2292">
 			<player agathionId="1512" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23049" levels="1" name="Red Sumo Wrestler Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -1017,6 +1053,7 @@
 		<cond msgId="2292">
 			<player agathionId="1519" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23050" levels="1" name="Blue Sumo Wrestler Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -1029,6 +1066,7 @@
 		<cond msgId="2292">
 			<player agathionId="1520" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23051" levels="1" name="Great Sumo Match Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -1041,6 +1079,7 @@
 		<cond msgId="2292">
 			<player agathionId="1521" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23052" levels="1" name="Button-Eyed Bear Doll Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -1053,6 +1092,7 @@
 		<cond msgId="2292">
 			<player agathionId="1522" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23053" levels="1" name="God of Fortune Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -1065,6 +1105,7 @@
 		<cond msgId="2292">
 			<player agathionId="1523" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23054" levels="1" name="Dryad Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -1077,6 +1118,7 @@
 		<cond msgId="2292">
 			<player agathionId="1524" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23055" levels="1" name="Wonboso Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -1089,6 +1131,7 @@
 		<cond msgId="2292">
 			<player agathionId="1525" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23056" levels="1" name="Daewoonso Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -1101,6 +1144,7 @@
 		<cond msgId="2292">
 			<player agathionId="1526" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23057" levels="1" name="Red Sumo Wrestler Agathion Special Skill - Death Whisper Ability">
 		<!-- Increases Critical attack power by 35% for 5 minutes. Reuse Delay 1 hours -->
@@ -1125,6 +1169,7 @@
 				<mul stat="critDmg" val="1.35" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23058" levels="1" name="Blue Sumo Wrestler Agathion Special Skill - Wild Magic Ability">
 		<!-- For 5 minutes, increases by 2% the occurrence rate of damage that is caused by damage magic. Reuse Delay 1 hours -->
@@ -1149,6 +1194,7 @@
 				<add stat="mCritRate" val="2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23059" levels="1" name="Great Sumo Match Agathion Special Skill - Mysterious Power">
 		<!-- A mysterious power that no one knows. Use with caution! Reuse Delay 1 hour -->
@@ -1170,6 +1216,7 @@
 		<cond msgId="2292">
 			<player agathionId="1521" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23060" levels="1" name="Great Sumo Match Agathion Special Skill - Ability of Firework">
 		<set name="blockedInOlympiad" val="true" />
@@ -1183,6 +1230,7 @@
 		<cond msgId="2292">
 			<player agathionId="1521" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23061" levels="1" name="Button-Eyed Bear Doll Agathion Special Skill - Ability of Blessed Return">
 		<!-- High Five Confirmed -->
@@ -1238,6 +1286,7 @@
 				<param power="100" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23063" levels="1" name="Button-Eyed Bear Doll Agathion Special Skill - Ability of Energy Recovery">
 		<!-- Recovers energy when acquiring Exp. for 5 minutes. Reuse Delay 1 hours -->
@@ -1264,6 +1313,7 @@
 				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23064" levels="1" name="God of Fortune Agathion Special Skill - Energy Recovery Ability">
 		<!-- Recovers energy when acquiring Exp. for 5 minutes. Reuse Delay 1 hours -->
@@ -1290,6 +1340,7 @@
 				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23065" levels="1" name="Wonboso Agathion Special Skill - Wind Walk Ability">
 		<!-- Increases moving speed by 20 for 5 minutes. Reuse Delay 1 hours -->
@@ -1314,6 +1365,7 @@
 				<add stat="runSpd" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23066" levels="1" name="Daewoonso Agathion Special Skill - New Year's Gift Ability">
 		<!-- Confirmed CT2.5 -->
@@ -1354,6 +1406,7 @@
 		<cond msgId="2292">
 			<player agathionId="1527" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23068" levels="1" name="Pomona Agathion Special Skill - Mental Shield Ability">
 		<!-- Confirmed CT2.5 -->
@@ -1378,6 +1431,7 @@
 				<param DERANGEMENT="50" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23069" levels="1" name="Threatening Roar">
 		<!-- High Five Confirmed -->
@@ -1556,6 +1610,7 @@
 		<cond msgId="2292">
 			<player agathionId="1528" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23077" levels="1" name="Weaver Agathion Special Skill - Power of the Golden Calf">
 		<!-- High Five Confirmed -->
@@ -1695,6 +1750,7 @@
 		<cond msgId="2292">
 			<player agathionId="1529" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23080" levels="1" name="Chon-chon Agathion Special Skill - Great Warrior Soul Power">
 		<!-- Confirmed CT2.5 -->
@@ -1723,6 +1779,7 @@
 				<mul stat="critDmg" val="1.2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23081" levels="1" name="Tang-tang Agathion Cute Trick">
 		<!-- Confirmed CT2.5 -->
@@ -1736,6 +1793,7 @@
 		<cond msgId="2292">
 			<player agathionId="1530" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23082" levels="1" name="Tang-tang Agathion Special Skill - Great Wizard Soul Power">
 		<!-- Confirmed CT2.5 -->
@@ -1764,6 +1822,7 @@
 				<mul stat="mAtkSpd" val="1.2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23083" levels="1" name="Dancing Kid Agathion Cute Trick">
 		<!-- Confirmed CT2.5 -->
@@ -1777,6 +1836,7 @@
 		<cond msgId="2292">
 			<player agathionId="1531" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23084" levels="1" name="Dancing Kid Agathion Special Skill - Great Adventurer Soul Power">
 		<!-- Confirmed CT2.5 -->
@@ -1811,6 +1871,7 @@
 				<mul stat="regHp" val="1.2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23085" levels="1" name="Monkey King Agathion Cute Trick">
 		<!-- Confirmed CT2.5 -->
@@ -1824,6 +1885,7 @@
 		<cond msgId="2292">
 			<player agathionId="1532" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23086" levels="1" name="Monkey King Agathion Special Skill - Great Wizard Soul Power">
 		<!-- Confirmed CT2.5 -->
@@ -1852,6 +1914,7 @@
 				<mul stat="mAtkSpd" val="1.2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23087" levels="1" name="Utanka Agathion Cute Trick">
 		<!-- Confirmed CT2.5 -->
@@ -1865,6 +1928,7 @@
 		<cond msgId="2292">
 			<player agathionId="1533" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23088" levels="1" name="Utanka Agathion Special Skill - Great Warrior Soul Power">
 		<!-- Confirmed CT2.5 -->
@@ -1893,6 +1957,7 @@
 				<mul stat="critDmg" val="1.2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23089" levels="1" name="Bonus B Agathion Cute Trick">
 		<!-- Confirmed CT2.5 -->
@@ -1906,6 +1971,7 @@
 		<cond msgId="2292">
 			<player agathionId="1534" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23090" levels="1" name="Bonus B Agathion Special Skill - Great Adventurer Soul Power">
 		<!-- Confirmed CT2.5 -->
@@ -1940,6 +2006,7 @@
 				<mul stat="regHp" val="1.2" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23091" levels="1" name="Three Siblings' Trickery">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/23100-23199.xml b/src/main/resources/data/stats/skills/23100-23199.xml
index 0ab720419121d61c5467629b3b16136de64b8e90..af08ac8e636ae3f1d95dadba00c20132086b0f41 100644
--- a/src/main/resources/data/stats/skills/23100-23199.xml
+++ b/src/main/resources/data/stats/skills/23100-23199.xml
@@ -659,6 +659,7 @@
 				<add stat="runSpd" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23141" levels="1" name="Iken Agathion Cute Trick">
 		<!-- High Five Confirmed -->
@@ -1725,6 +1726,7 @@
 				<mul stat="vitalityConsumeRate" val="0" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23180" levels="1" name="Joy of Vitality">
 		<!-- Confirmed CT2.5 -->
@@ -1742,6 +1744,7 @@
 				<param value="20000" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23181" levels="1" name="Three-headed Dragon Agathion Cute Trick">
 		<set name="hitTime" val="3000" />
@@ -1754,6 +1757,7 @@
 		<cond msgId="2292">
 			<player agathionId="1575" />
 		</cond>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23182" levels="1" name="Three-headed Dragon Agathion Special Skill - Wind Walk">
 		<!-- Increases moving speed by 20 for 20 minutes. Reuse delay is 1 hours. -->
@@ -1779,6 +1783,7 @@
 				<add stat="runSpd" val="20" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23183" levels="1" name="Ball Trapping Gnosian Agathion Special Skill - Buff of Cheers">
 		<!-- With the power of cheers, for 1 hour, increases Max MP, MP Recovery Bonus, HP Recovery Bonus, Critical Attack Power, P. Def., Atk. Spd., M. Atk., M. Def., Casting Spd. by 20%, the occurrence rate of Prominent Damage through damage magic by 2, P. Atk. by 10%, and resistance to de-buffs by 10%. Also decreases MP consumption needed for skill use by 5% and moving speed by 20%. Reuse Delay 1 hour. Consumes 30 energy. -->
@@ -1794,6 +1799,7 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23184" levels="1" name="Ball Trapping Gnosian Agathion Special Skill - Soccer Ball of Cheers">
 		<!-- Confirmed CT2.5 -->
@@ -1833,6 +1839,7 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23186" levels="1" name="Ball Trapping Orodriel Agathion Special Skill - Soccer Ball of Cheers">
 		<!-- Confirmed CT2.5 -->
@@ -1872,6 +1879,7 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23188" levels="1" name="Ball Trapping Penalty Kick Agathion Special Skill - Soccer Ball of Cheers">
 		<!-- Confirmed CT2.5 -->
@@ -1911,6 +1919,7 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23190" levels="1" name="Ball Trapping Gnosian Agathion Special Skill - Soccer Ball of Cheers">
 		<!-- Confirmed CT2.5 -->
@@ -1950,6 +1959,7 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23192" levels="1" name="Ball Trapping Orodriel Agathion Special Skill - Soccer Ball of Cheers">
 		<!-- Confirmed CT2.5 -->
@@ -1989,6 +1999,7 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23194" levels="1" name="Ball Trapping Penalty Kick Agathion Special Skill - Soccer Ball of Cheers">
 		<!-- Confirmed CT2.5 -->
@@ -2028,6 +2039,7 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23196" levels="1" name="Ball Trapping Gnosian Agathion Special Skill - Soccer Ball of Cheers">
 		<!-- Confirmed CT2.5 -->
@@ -2067,6 +2079,7 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23198" levels="1" name="Ball Trapping Orodriel Agathion Special Skill - Soccer Ball of Cheers">
 		<!-- Confirmed CT2.5 -->
@@ -2106,5 +2119,6 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 </list>
diff --git a/src/main/resources/data/stats/skills/23200-23299.xml b/src/main/resources/data/stats/skills/23200-23299.xml
index 8832f2c5cc02f7d4662a4fb2a015362429646638..ef017097908dfe321079510305d009c2eef5b766 100644
--- a/src/main/resources/data/stats/skills/23200-23299.xml
+++ b/src/main/resources/data/stats/skills/23200-23299.xml
@@ -172,6 +172,7 @@
 		<set name="reuseDelay" val="1000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23211" levels="85" name="Prominence">
 		<table name="#effectPoint"> -92 -97 -101 -106 -111 -116 -121 -126 -132 -138 -143 -149 -156 -162 -168 -175 -182 -189 -196 -204 -211 -219 -227 -235 -243 -251 -259 -268 -277 -285 -294 -303 -313 -322 -331 -341 -350 -360 -369 -379 -389 -399 -408 -418 -428 -438 -448 -457 -467 -477 -486 -495 -505 -514 -523 -532 -541 -549 -558 -566 -574 -582 -590 -597 -604 -611 -617 -624 -630 -635 -641 -646 -650 -655 -659 -662 -666 -669 -673 -676 -679 -681 -684 -687 -689 </table>
@@ -184,6 +185,7 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23212" levels="85" name="Flame Strike">
 		<table name="#effectPoint"> -92 -97 -101 -106 -111 -116 -121 -126 -132 -138 -143 -149 -156 -162 -168 -175 -182 -189 -196 -204 -211 -219 -227 -235 -243 -251 -259 -268 -277 -285 -294 -303 -313 -322 -331 -341 -350 -360 -369 -379 -389 -399 -408 -418 -428 -438 -448 -457 -467 -477 -486 -495 -505 -514 -523 -532 -541 -549 -558 -566 -574 -582 -590 -597 -604 -611 -617 -624 -630 -635 -641 -646 -650 -655 -659 -662 -666 -669 -673 -676 -679 -681 -684 -687 -689 </table>
@@ -213,6 +215,7 @@
 		<set name="reuseDelay" val="6000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23214" levels="1" name="Good/Bad of Life">
 		<!-- Confirmed CT2.5 -->
@@ -228,6 +231,7 @@
 				<param amount="500" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23215" levels="1" name="Good/Bad of Mind">
 		<!-- Confirmed CT2.5 -->
@@ -243,6 +247,7 @@
 				<param amount="500" />
 			</effect>
 		</effects>
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23216" levels="1" name="Granny Tiger Agathion Cute Trick">
 		<set name="icon" val="icon.skill_agathion_cute" />
@@ -251,6 +256,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23217" levels="1" name="Granny Tiger Agathion Special Skill - Fundamentals">
 		<!-- For 1 minute(s), 50% of the standard short-range physical damage inflicted on the enemy is recovered as HP. Reuse delay is 1 hours. -->
@@ -266,6 +272,7 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23218" levels="1" name="Flower Fairy Spirit Agathion Cute Trick">
 		<set name="icon" val="icon.skill_agathion_cute" />
@@ -274,6 +281,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23219" levels="1" name="Flower Fairy Spirit Agathion Special Skill - Fairy's Blessing">
 		<!-- For 5 minutes, increases Atk. Spd. by 30% and all attribute defense by 10. Reuse delay is 1 hours. -->
@@ -289,6 +297,7 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23220" levels="1" name="Cheerleader Orodriel Agathion Cute Trick">
 		<set name="icon" val="icon.skill_agathion_cute" />
@@ -297,6 +306,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23221" levels="1" name="Cheerleader Orodriel Agathion Special Skill - Joy of Cheering">
 		<!-- For 20 minutes, increases Casting Spd. by 10% and Atk. Spd. by 10%. Decreases MP consumption for skill use by 30%. Reuse delay is 2 hours. -->
@@ -312,6 +322,7 @@
 		<set name="reuseDelay" val="7200000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23222" levels="1" name="Cheerleader Lana Agathion Cute Trick">
 		<set name="icon" val="icon.skill_agathion_cute" />
@@ -320,6 +331,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23223" levels="1" name="Cheerleader Lana Agathion Special Skill - Joy of Cheering">
 		<!-- For 20 minutes, increases Casting Spd. by 10% and Atk. Spd. by 10%. Decreases MP consumption for skill use by 30%. Reuse delay is 2 hours. -->
@@ -335,6 +347,7 @@
 		<set name="reuseDelay" val="7200000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23224" levels="1" name="Cheerleader Naonin Agathion Cute Trick">
 		<set name="icon" val="icon.skill_agathion_cute" />
@@ -343,6 +356,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23225" levels="1" name="Cheerleader Naonin Agathion Special Skill - Joy of Cheering">
 		<!-- For 20 minutes, increases Casting Spd. by 10% and Atk. Spd. by 10%. Decreases MP consumption for skill use by 30%. Reuse delay is 2 hours. -->
@@ -358,6 +372,7 @@
 		<set name="reuseDelay" val="7200000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23226" levels="1" name="Cheerleader Mortia Agathion Cute Trick">
 		<set name="icon" val="icon.skill_agathion_cute" />
@@ -366,6 +381,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23227" levels="1" name="Cheerleader Mortia Agathion Special Skill - Joy of Cheering">
 		<!-- For 20 minutes, increases Casting Spd. by 10% and Atk. Spd. by 10%. Decreases MP consumption for skill use by 30%. Reuse delay is 2 hours. -->
@@ -381,6 +397,7 @@
 		<set name="reuseDelay" val="7200000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23228" levels="1" name="Cheerleader Kaurin Agathion Cute Trick">
 		<set name="icon" val="icon.skill_agathion_cute" />
@@ -389,6 +406,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23229" levels="1" name="Cheerleader Kaurin Agathion Special Skill - Joy of Cheering">
 		<!-- For 20 minutes, increases Casting Spd. by 10% and Atk. Spd. by 10%. Decreases MP consumption for skill use by 30%. Reuse delay is 2 hours. -->
@@ -404,6 +422,7 @@
 		<set name="reuseDelay" val="7200000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23230" levels="1" name="Cheerleader Meruril Agathion Cute Trick">
 		<set name="icon" val="icon.skill_agathion_cute" />
@@ -412,6 +431,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23231" levels="1" name="Cheerleader Meruril Agathion Special Skill - Joy of Cheering">
 		<!-- For 20 minutes, increases Casting Spd. by 10% and Atk. Spd. by 10%. Decreases MP consumption for skill use by 30%. Reuse delay is 2 hours. -->
@@ -427,6 +447,7 @@
 		<set name="reuseDelay" val="7200000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23232" levels="1" name="Handy Agathion Cute Trick">
 		<set name="icon" val="icon.skill_agathion_cute" />
@@ -435,6 +456,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23233" levels="1" name="Handy Agathion Special Skill - Halloween's Blessing">
 		<!-- For 1 hour, increases Max HP by 40% and Max MP by 40%. Increases Atk. Spd. by 20% and P. Atk. by 10%. Increases resistance to darkness by 20. Reuse delay is 2 hours. -->
@@ -450,26 +472,31 @@
 		<set name="reuseDelay" val="7200000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23234" levels="1" name="Singer Dancer Agathion Cute Trick">
 		<!-- You can see the summoned spirit's cute tricks. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23235" levels="1" name="Singer Dancer Agathion Special Skill - Song of Hunter">
 		<!-- Increases critical attack rate by 100% for 2 minutes. Reuse delay 20 minutes. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23236" levels="1" name="Zaken Spirit Sword Cute Trick">
 		<!-- You can see the summoned spirit's cute tricks. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23237" levels="1" name="Zaken Spirit Sword Special Skill - Song of the Sword">
 		<!-- "For 30 minutes, increases Max HP by 40% and Max MP by 40%. Increases Atk. Spd. by 20% and P. Atk. by 10%. Reuse delay is 2 hours." -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23238" levels="1" name="Master's Blessing - Eye of Pa'agrio">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/23300-23399.xml b/src/main/resources/data/stats/skills/23300-23399.xml
index bb8c01a4b14fae801c44082b61667f95b47f6a86..61bf5ad6aa9e7942578c911be7d05c97f4e9caf8 100644
--- a/src/main/resources/data/stats/skills/23300-23399.xml
+++ b/src/main/resources/data/stats/skills/23300-23399.xml
@@ -30,11 +30,13 @@
 		<!-- Summons a dimensional door that moves the PC to the Dimensional Door B. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23302" levels="1" name="Dimensional Door B">
 		<!-- Summons a dimensional door that moves the PC to the Dimensional Door A. -->
 		<set name="operateType" val="P" />
 		<set name="targetType" val="NONE" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="23303" levels="1" name="Move">
 		<!-- High Five Confirmed -->
diff --git a/src/main/resources/data/stats/skills/26000-26099.xml b/src/main/resources/data/stats/skills/26000-26099.xml
index 5e0f336bb4b47d856dd67da37c95a65a3d0f6a03..3c1429d797250ae258f615ca7a49d2798a9a312a 100644
--- a/src/main/resources/data/stats/skills/26000-26099.xml
+++ b/src/main/resources/data/stats/skills/26000-26099.xml
@@ -138,6 +138,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26007" levels="1" name="Weapon Enchant Scroll - C Grade">
 		<set name="isMagic" val="2" />
@@ -145,6 +146,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26008" levels="1" name="Weapon Enchant Scroll - B Grade">
 		<set name="isMagic" val="2" />
@@ -152,6 +154,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26009" levels="1" name="Weapon Enchant Scroll - A Grade">
 		<set name="isMagic" val="2" />
@@ -159,6 +162,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26010" levels="1" name="Armor Enchant Scroll - D Grade">
 		<set name="isMagic" val="2" />
@@ -166,6 +170,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26011" levels="1" name="Armor Enchant Scroll - C Grade">
 		<set name="isMagic" val="2" />
@@ -173,6 +178,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26012" levels="1" name="Armor Enchant Scroll - B Grade">
 		<set name="isMagic" val="2" />
@@ -180,6 +186,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26013" levels="1" name="Armor Enchant Scroll - A Grade">
 		<set name="isMagic" val="2" />
@@ -187,6 +194,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26014" levels="1" name="Ancient Weapon Enchant Crystal - B grade">
 		<set name="isMagic" val="2" />
@@ -194,6 +202,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26015" levels="1" name="Ancient Weapon Enchant Crystal - A grade">
 		<set name="isMagic" val="2" />
@@ -201,6 +210,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26016" levels="1" name="Ancient Armor Enchant Crystal - B grade">
 		<set name="isMagic" val="2" />
@@ -208,6 +218,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26017" levels="1" name="Ancient Armor Enchant Crystal - A grade">
 		<set name="isMagic" val="2" />
@@ -215,6 +226,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26018" levels="1" name="Divine Weapon Enchant Crystal - B grade">
 		<set name="isMagic" val="2" />
@@ -222,6 +234,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26019" levels="1" name="Divine Weapon Enchant Crystal - A grade">
 		<set name="isMagic" val="2" />
@@ -229,6 +242,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26020" levels="1" name="Divine Armor Enchant Crystal - B grade">
 		<set name="isMagic" val="2" />
@@ -236,6 +250,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26021" levels="1" name="Divine Armor Enchant Crystal - A grade">
 		<set name="isMagic" val="2" />
@@ -243,6 +258,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26022" levels="1" name="High grade potion which improves attack speed">
 		<!-- High Five Confirmed -->
@@ -896,6 +912,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26051" levels="1" name="Blessed Spiritshot - C grade">
 		<set name="isMagic" val="2" />
@@ -903,6 +920,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26052" levels="1" name="Blessed Spiritshot - B grade">
 		<set name="isMagic" val="2" />
@@ -910,6 +928,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26053" levels="1" name="Blessed Spiritshot - A grade">
 		<set name="isMagic" val="2" />
@@ -917,6 +936,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26054" levels="1" name="Blessed Spiritshot - S grade">
 		<set name="isMagic" val="2" />
@@ -924,6 +944,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26055" levels="1" name="Spiritshot - D grade">
 		<set name="isMagic" val="2" />
@@ -931,6 +952,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26056" levels="1" name="Spiritshot - C grade">
 		<set name="isMagic" val="2" />
@@ -938,6 +960,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26057" levels="1" name="Spiritshot - B grade">
 		<set name="isMagic" val="2" />
@@ -945,6 +968,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26058" levels="1" name="Spiritshot - A grade">
 		<set name="isMagic" val="2" />
@@ -952,6 +976,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26059" levels="1" name="Spiritshot - S grade">
 		<set name="isMagic" val="2" />
@@ -959,6 +984,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26060" levels="1" name="Soulshot - D grade">
 		<set name="isMagic" val="2" />
@@ -966,6 +992,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26061" levels="1" name="Soulshot - C grade">
 		<set name="isMagic" val="2" />
@@ -973,6 +1000,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26062" levels="1" name="Soulshot - B grade">
 		<set name="isMagic" val="2" />
@@ -980,6 +1008,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26063" levels="1" name="Soulshot - A grade">
 		<set name="isMagic" val="2" />
@@ -987,6 +1016,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26064" levels="1" name="Soulshot - S grade">
 		<set name="isMagic" val="2" />
@@ -994,6 +1024,7 @@
 		<set name="operateType" val="A1" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
+		<set name="affectScope" val="SINGLE" />
 	</skill>
 	<skill id="26065" levels="1" name="A Scroll Bundle of Fighter">
 		<!-- Confirmed CT2.5 -->