From c0ec4a4c6e96355f540afdb6d40ef664ce2771e7 Mon Sep 17 00:00:00 2001
From: Noe Caratini <caratinin@gmail.com>
Date: Tue, 26 Apr 2022 23:33:12 +0100
Subject: [PATCH] fix(skill): Fixed vita buffs not increasing vitality

For vitality to increase, vitalityConsumeRate has to be negative.
Some skills were adding to the stat instead of subtracting, causing vitality to decrease.
---
 src/main/resources/data/stats/skills/02500-02599.xml | 2 +-
 src/main/resources/data/stats/skills/02800-02899.xml | 4 ++--
 src/main/resources/data/stats/skills/05600-05699.xml | 2 +-
 src/main/resources/data/stats/skills/06100-06199.xml | 2 +-
 src/main/resources/data/stats/skills/08200-08299.xml | 2 +-
 src/main/resources/data/stats/skills/09000-09099.xml | 6 +++---
 src/main/resources/data/stats/skills/09100-09199.xml | 2 +-
 src/main/resources/data/stats/skills/21100-21199.xml | 6 +++---
 src/main/resources/data/stats/skills/22000-22099.xml | 8 ++++----
 src/main/resources/data/stats/skills/22100-22199.xml | 2 +-
 src/main/resources/data/stats/skills/22200-22299.xml | 6 +++---
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/data/stats/skills/02500-02599.xml b/src/main/resources/data/stats/skills/02500-02599.xml
index b53a74fc6f..14f65f4b7f 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 cbe47b651e..6dce6799ac 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 6162938ffc..22f1848eac 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 4126e15bfd..ddcba62362 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 8ba4b25d06..30b809318f 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 7c07cae950..f8da54758a 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 ab648533f3..2959d8a8ce 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 8134101033..9f03b541e0 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 356c0f7136..05e744a77f 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 7ff3533523..453abad65e 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 9c0cc2eb1c..898bd1a856 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. -->
-- 
GitLab