diff --git a/src/main/resources/data/stats/skills/02500-02599.xml b/src/main/resources/data/stats/skills/02500-02599.xml
index b53a74fc6f82c5e629bd81c11c9051cb178dfc5b..14f65f4b7f4ffa1a8058188cb47693fff70416ed 100644
--- a/src/main/resources/data/stats/skills/02500-02599.xml
+++ b/src/main/resources/data/stats/skills/02500-02599.xml
@@ -1738,7 +1738,7 @@
 		</cond>
 		<effects>
 			<effect name="Buff">
-				<add stat="vitalityConsumeRate" val="1" />
+				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/src/main/resources/data/stats/skills/02800-02899.xml b/src/main/resources/data/stats/skills/02800-02899.xml
index cbe47b651e8f35401dd8ae170f05fbb702e29c12..6dce6799ac03fedbeaf885c5fe0e3403ec076b5c 100644
--- a/src/main/resources/data/stats/skills/02800-02899.xml
+++ b/src/main/resources/data/stats/skills/02800-02899.xml
@@ -1946,7 +1946,7 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="Buff">
-				<add stat="vitalityConsumeRate" val="1" />
+				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
 	</skill>
@@ -1973,7 +1973,7 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="Buff">
-				<add stat="vitalityConsumeRate" val="1" />
+				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/src/main/resources/data/stats/skills/05600-05699.xml b/src/main/resources/data/stats/skills/05600-05699.xml
index 6162938ffc216ac16525a77089b64e9f0a5691e6..22f1848eac217c0bb103cf788e261e42f7e4a7a0 100644
--- a/src/main/resources/data/stats/skills/05600-05699.xml
+++ b/src/main/resources/data/stats/skills/05600-05699.xml
@@ -1211,6 +1211,7 @@
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="7200" />
 		<set name="abnormalType" val="TRANSFORM" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="1" />
 		<set name="hitTime" val="2500" />
 		<set name="icon" val="icon.skilltransform1" />
@@ -1231,7 +1232,6 @@
 				<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 -->
diff --git a/src/main/resources/data/stats/skills/06100-06199.xml b/src/main/resources/data/stats/skills/06100-06199.xml
index 4126e15bfd67723d94d8a8611936b019cb48c453..ddcba62362067744c6f96897eb51fb2ea7d598f7 100644
--- a/src/main/resources/data/stats/skills/06100-06199.xml
+++ b/src/main/resources/data/stats/skills/06100-06199.xml
@@ -426,7 +426,7 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="Debuff">
-				<sub stat="vitalityConsumeRate" val="0" />
+				<mul stat="vitalityConsumeRate" val="0" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/src/main/resources/data/stats/skills/08200-08299.xml b/src/main/resources/data/stats/skills/08200-08299.xml
index 8ba4b25d0697a5b03d6686d13d690e4c8f8b089e..30b809318f780be1a86428e97a944fb498729b83 100644
--- a/src/main/resources/data/stats/skills/08200-08299.xml
+++ b/src/main/resources/data/stats/skills/08200-08299.xml
@@ -1176,6 +1176,7 @@
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="7200" />
 		<set name="abnormalType" val="TRANSFORM" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="effectPoint" val="1" />
 		<set name="icon" val="icon.skilltransform3" />
@@ -1194,7 +1195,6 @@
 				<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 -->
diff --git a/src/main/resources/data/stats/skills/09000-09099.xml b/src/main/resources/data/stats/skills/09000-09099.xml
index 7c07cae950c99ac69eb5755d6df17f5a5bf1c672..f8da54758a657030b2df34f60b3779b796ef0bef 100644
--- a/src/main/resources/data/stats/skills/09000-09099.xml
+++ b/src/main/resources/data/stats/skills/09000-09099.xml
@@ -592,7 +592,7 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="Debuff">
-				<sub stat="vitalityConsumeRate" val="0" />
+				<mul stat="vitalityConsumeRate" val="0" />
 			</effect>
 		</effects>
 	</skill>
@@ -1224,6 +1224,7 @@
 		<set name="abnormalTime" val="600" />
 		<set name="abnormalType" val="VP_KEEP" />
 		<set name="abnormalVisualEffect" val="VP_KEEP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="icon" val="icon.etc_lesser_potion_blue_i00" />
 		<set name="irreplaceableBuff" val="true" />
@@ -1240,13 +1241,13 @@
 				<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 -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="1800" />
 		<set name="abnormalType" val="VP_KEEP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="icon" val="icon.etc_lesser_potion_scarlet_i00" />
 		<set name="irreplaceableBuff" val="true" />
@@ -1262,7 +1263,6 @@
 				<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 -->
diff --git a/src/main/resources/data/stats/skills/09100-09199.xml b/src/main/resources/data/stats/skills/09100-09199.xml
index ab648533f34e161f411a5d69d34b1efb151c3970..2959d8a8ce71e8252f84045b2cd9c8d79cfe0ab3 100644
--- a/src/main/resources/data/stats/skills/09100-09199.xml
+++ b/src/main/resources/data/stats/skills/09100-09199.xml
@@ -1748,7 +1748,7 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="Buff">
-				<add stat="vitalityConsumeRate" val="1" />
+				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/src/main/resources/data/stats/skills/21100-21199.xml b/src/main/resources/data/stats/skills/21100-21199.xml
index 8134101033d10bafff2a04f9077239afc8fe4088..9f03b541e08851267079eb2577f398125b06fd22 100644
--- a/src/main/resources/data/stats/skills/21100-21199.xml
+++ b/src/main/resources/data/stats/skills/21100-21199.xml
@@ -2280,7 +2280,7 @@
 				<param id="20002" />
 			</effect>
 			<effect name="Buff">
-				<sub stat="vitalityConsumeRate" val="1" />
+				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
 	</skill>
@@ -2310,7 +2310,7 @@
 				<param id="20003" />
 			</effect>
 			<effect name="Buff">
-				<sub stat="vitalityConsumeRate" val="1" />
+				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
 	</skill>
@@ -2401,7 +2401,7 @@
 				<param value="20000" />
 			</effect>
 			<effect name="Buff">
-				<sub stat="vitalityConsumeRate" val="0" />
+				<mul stat="vitalityConsumeRate" val="0" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/src/main/resources/data/stats/skills/22000-22099.xml b/src/main/resources/data/stats/skills/22000-22099.xml
index 356c0f71367cd358755a103eaed54adb85e21881..05e744a77f26cdbbcd63d75f995c18dad9ecdb20 100644
--- a/src/main/resources/data/stats/skills/22000-22099.xml
+++ b/src/main/resources/data/stats/skills/22000-22099.xml
@@ -125,6 +125,7 @@
 		<set name="abnormalTime" val="300" />
 		<set name="abnormalType" val="BR_EVENT_BUF2" />
 		<set name="abnormalVisualEffect" val="VP_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="effectPoint" val="100" />
 		<set name="hitTime" val="100" />
@@ -140,7 +141,6 @@
 				<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 -->
@@ -773,7 +773,7 @@
 		</cond>
 		<effects>
 			<effect name="Buff">
-				<add stat="vitalityConsumeRate" val="1" />
+				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
 	</skill>
@@ -1239,8 +1239,9 @@
 	<skill id="22054" levels="1" name="Potion of Energy Maintenance">
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
-		<set name="abnormalType" val="VP_UP" />
+		<set name="abnormalType" val="VP_KEEP" />
 		<set name="abnormalVisualEffect" val="VP_UP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skilltransform4" />
 		<set name="irreplaceableBuff" val="true" />
@@ -1255,7 +1256,6 @@
 				<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 -->
diff --git a/src/main/resources/data/stats/skills/22100-22199.xml b/src/main/resources/data/stats/skills/22100-22199.xml
index 7ff3533523dd8a420dfa868c0e3e80931f1eaaff..453abad65ead338e3996b8c132c2c33f2a7eb105 100644
--- a/src/main/resources/data/stats/skills/22100-22199.xml
+++ b/src/main/resources/data/stats/skills/22100-22199.xml
@@ -1419,7 +1419,7 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="Buff">
-				<add stat="vitalityConsumeRate" val="1" />
+				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
 	</skill>
diff --git a/src/main/resources/data/stats/skills/22200-22299.xml b/src/main/resources/data/stats/skills/22200-22299.xml
index 9c0cc2eb1c4343be0c4bd0f52607e18f395864c8..898bd1a856d633a0927cdde9dd11562f0904c077 100644
--- a/src/main/resources/data/stats/skills/22200-22299.xml
+++ b/src/main/resources/data/stats/skills/22200-22299.xml
@@ -376,7 +376,7 @@
 		<set name="targetType" val="SELF" />
 		<effects>
 			<effect name="Buff">
-				<add stat="vitalityConsumeRate" val="1" />
+				<sub stat="vitalityConsumeRate" val="10" />
 			</effect>
 		</effects>
 	</skill>
@@ -520,6 +520,7 @@
 		<set name="abnormalTime" val="1800" />
 		<set name="abnormalType" val="VP_KEEP" />
 		<set name="abnormalVisualEffect" val="VP_KEEP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="BranchSys2.icon.br_essence_rose_i00" />
@@ -535,7 +536,6 @@
 				<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. -->
@@ -543,6 +543,7 @@
 		<set name="abnormalTime" val="1800" />
 		<set name="abnormalType" val="VP_KEEP" />
 		<set name="abnormalVisualEffect" val="VP_KEEP" />
+		<set name="affectScope" val="SINGLE" />
 		<set name="effectPoint" val="100" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="BranchSys2.icon.br_essence_rose_i00" />
@@ -558,7 +559,6 @@
 				<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. -->