From 61fb072ccbb96af288125fad5d9cd0b20c2aa463 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 4 Mar 2022 10:51:48 +0000
Subject: [PATCH] Skill Holy Strike (49) and Dark Strike (45257) adjustments.
 Contributed by MacuK.

---
 .../game/data/stats/skills/00000-00099.xml    | 13 ++--
 .../game/data/stats/skills/45200-45299.xml    | 10 ++-
 .../dist/game/data/xsd/skills.xsd             | 30 +++++++--
 .../game/data/stats/skills/00000-00099.xml    | 13 ++--
 .../game/data/stats/skills/45200-45299.xml    | 10 ++-
 .../dist/game/data/xsd/skills.xsd             | 30 +++++++--
 .../game/data/stats/skills/00000-00099.xml    | 13 ++--
 .../game/data/stats/skills/45200-45299.xml    | 10 ++-
 .../dist/game/data/xsd/skills.xsd             | 62 +++++++++++++------
 9 files changed, 142 insertions(+), 49 deletions(-)

diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/00000-00099.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/00000-00099.xml
index d2f1023288..ef283f98a8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/00000-00099.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/00000-00099.xml
@@ -4847,7 +4847,6 @@
 		<attributeType>HOLY</attributeType>
 		<attributeValue>20</attributeValue>
 		<hitTime>2000</hitTime>
-		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<magicLevel>
 			<value level="1">40</value>
 			<value level="2">43</value>
@@ -4913,17 +4912,23 @@
 			<value level="30">63</value>
 		</mpConsume>
 		<operateType>A1</operateType>
-		<reuseDelay>5000</reuseDelay>
+		<reuseDelay>
+			<value fromLevel="1" toLevel="25">5000</value>
+			<value fromLevel="26" toLevel="30">1000</value>
+		</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="TargetRace">
-				<race>UNDEAD</race>
+				<race>
+					<item>UNDEAD</item>
+					<item>DEMONIC</item>
+				</race>
 			</condition>
 		</conditions>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="PhysicalAttack">
 				<power>
 					<value level="1">638</value>
 					<value level="2">780</value>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45200-45299.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45200-45299.xml
index f561e0071a..58dd5b84d9 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45200-45299.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/skills/45200-45299.xml
@@ -6732,10 +6732,14 @@
 			<value level="30">63</value>
 		</mpConsume>
 		<nextAction>ATTACK</nextAction>
-		<operateType>A1</operateType>
-		<reuseDelay>5000</reuseDelay>
+		<staticReuse>
+			<value fromLevel="1" toLevel="25">true</value>
+		</staticReuse>
+		<reuseDelay>
+			<value fromLevel="1" toLevel="25">5000</value>
+			<value fromLevel="26" toLevel="30">1000</value>
+		</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
-		<coolTime>500</coolTime>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/skills.xsd
index 1235e76767..5a5e735718 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/skills.xsd
@@ -263,7 +263,9 @@
 												<xs:complexType>
 													<xs:simpleContent>
 														<xs:extension base="xs:unsignedInt">
-															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+															<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
 														</xs:extension>
 													</xs:simpleContent>
 												</xs:complexType>
@@ -318,7 +320,13 @@
 															</xs:element>
 															<xs:element name="skillId" type="xs:unsignedShort" />
 															<xs:element name="affectType" type="xs:string" />
-															<xs:element name="race" type="xs:string" />
+															<xs:element name="race">
+																<xs:complexType mixed="true">
+																	<xs:sequence minOccurs="0">
+																		<xs:element maxOccurs="unbounded" name="item" type="xs:string" />
+																	</xs:sequence>
+																</xs:complexType>
+															</xs:element>
 															<xs:element name="amount">
 																<xs:complexType mixed="true">
 																	<xs:sequence minOccurs="0">
@@ -1434,7 +1442,6 @@
 																	</xs:sequence>
 																</xs:complexType>
 															</xs:element>
-															<xs:element name="pAtkSpeedMode" />
 															<xs:element name="transformationId" type="xs:unsignedShort" />
 															<xs:element name="distance" type="xs:unsignedByte" />
 															<xs:element name="speed" type="xs:unsignedShort" />
@@ -1802,7 +1809,22 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="staticReuse" type="xs:boolean" />
+								<xs:element name="staticReuse">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:boolean">
+															<xs:attribute name="fromLevel" type="xs:unsignedByte" use="required" />
+															<xs:attribute name="toLevel" type="xs:unsignedByte" use="required" />
+														</xs:extension>
+													</xs:simpleContent>
+												</xs:complexType>
+											</xs:element>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
 								<xs:element name="attributeType">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00000-00099.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00000-00099.xml
index 77c86b680b..5d81717d9e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00000-00099.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/00000-00099.xml
@@ -4935,7 +4935,6 @@
 		<attributeType>HOLY</attributeType>
 		<attributeValue>20</attributeValue>
 		<hitTime>2000</hitTime>
-		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<magicLevel>
 			<value level="1">40</value>
 			<value level="2">43</value>
@@ -5001,17 +5000,23 @@
 			<value level="30">63</value>
 		</mpConsume>
 		<operateType>A1</operateType>
-		<reuseDelay>5000</reuseDelay>
+		<reuseDelay>
+			<value fromLevel="1" toLevel="25">5000</value>
+			<value fromLevel="26" toLevel="30">1000</value>
+		</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="TargetRace">
-				<race>UNDEAD</race>
+				<race>
+					<item>UNDEAD</item>
+					<item>DEMONIC</item>
+				</race>
 			</condition>
 		</conditions>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="PhysicalAttack">
 				<power>
 					<value level="1">638</value>
 					<value level="2">780</value>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45200-45299.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45200-45299.xml
index f0b4e28a74..5a63092d6e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45200-45299.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45200-45299.xml
@@ -6928,10 +6928,14 @@
 			<value level="30">63</value>
 		</mpConsume>
 		<nextAction>ATTACK</nextAction>
-		<operateType>A1</operateType>
-		<reuseDelay>5000</reuseDelay>
+		<staticReuse>
+			<value fromLevel="1" toLevel="25">true</value>
+		</staticReuse>
+		<reuseDelay>
+			<value fromLevel="1" toLevel="25">5000</value>
+			<value fromLevel="26" toLevel="30">1000</value>
+		</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
-		<coolTime>500</coolTime>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/skills.xsd
index ba5c60b1a3..28d1594263 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/skills.xsd
@@ -263,7 +263,9 @@
 												<xs:complexType>
 													<xs:simpleContent>
 														<xs:extension base="xs:unsignedInt">
-															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+															<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
 														</xs:extension>
 													</xs:simpleContent>
 												</xs:complexType>
@@ -318,7 +320,13 @@
 															</xs:element>
 															<xs:element name="skillId" type="xs:unsignedShort" />
 															<xs:element name="affectType" type="xs:string" />
-															<xs:element name="race" type="xs:string" />
+															<xs:element name="race">
+																<xs:complexType mixed="true">
+																	<xs:sequence minOccurs="0">
+																		<xs:element maxOccurs="unbounded" name="item" type="xs:string" />
+																	</xs:sequence>
+																</xs:complexType>
+															</xs:element>
 															<xs:element name="amount">
 																<xs:complexType mixed="true">
 																	<xs:sequence minOccurs="0">
@@ -1449,7 +1457,6 @@
 																	</xs:sequence>
 																</xs:complexType>
 															</xs:element>
-															<xs:element name="pAtkSpeedMode" />
 															<xs:element name="transformationId" type="xs:unsignedShort" />
 															<xs:element name="despawnDelay" type="xs:unsignedInt" />
 															<xs:element name="normal" type="xs:unsignedShort" />
@@ -1859,7 +1866,22 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="staticReuse" type="xs:boolean" />
+								<xs:element name="staticReuse">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:boolean">
+															<xs:attribute name="fromLevel" type="xs:unsignedByte" use="required" />
+															<xs:attribute name="toLevel" type="xs:unsignedByte" use="required" />
+														</xs:extension>
+													</xs:simpleContent>
+												</xs:complexType>
+											</xs:element>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
 								<xs:element name="attributeType">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/00000-00099.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/00000-00099.xml
index 28d2765770..319bfa48fa 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/00000-00099.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/00000-00099.xml
@@ -4939,7 +4939,6 @@
 		<attributeType>HOLY</attributeType>
 		<attributeValue>20</attributeValue>
 		<hitTime>2000</hitTime>
-		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<magicLevel>
 			<value level="1">40</value>
 			<value level="2">43</value>
@@ -5005,17 +5004,23 @@
 			<value level="30">63</value>
 		</mpConsume>
 		<operateType>A1</operateType>
-		<reuseDelay>5000</reuseDelay>
+		<reuseDelay>
+			<value fromLevel="1" toLevel="25">5000</value>
+			<value fromLevel="26" toLevel="30">1000</value>
+		</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="TargetRace">
-				<race>UNDEAD</race>
+				<race>
+					<item>UNDEAD</item>
+					<item>DEMONIC</item>
+				</race>
 			</condition>
 		</conditions>
 		<effects>
-			<effect name="MagicalAttack">
+			<effect name="PhysicalAttack">
 				<power>
 					<value level="1">638</value>
 					<value level="2">780</value>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/45200-45299.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/45200-45299.xml
index 955c8cb2bc..83b0847314 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/45200-45299.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/45200-45299.xml
@@ -6928,10 +6928,14 @@
 			<value level="30">63</value>
 		</mpConsume>
 		<nextAction>ATTACK</nextAction>
-		<operateType>A1</operateType>
-		<reuseDelay>5000</reuseDelay>
+		<staticReuse>
+			<value fromLevel="1" toLevel="25">true</value>
+		</staticReuse>
+		<reuseDelay>
+			<value fromLevel="1" toLevel="25">5000</value>
+			<value fromLevel="26" toLevel="30">1000</value>
+		</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
-		<coolTime>500</coolTime>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/xsd/skills.xsd
index 3d4191474c..449ae3a414 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/xsd/skills.xsd
@@ -44,11 +44,11 @@
 												<xs:complexType>
 													<xs:simpleContent>
 														<xs:extension base="xs:string">
+															<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
 															<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
 															<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
 															<xs:attribute name="fromSubLevel" type="xs:unsignedShort" use="optional" />
 															<xs:attribute name="toSubLevel" type="xs:unsignedShort" use="optional" />
-															<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
 														</xs:extension>
 													</xs:simpleContent>
 												</xs:complexType>
@@ -263,7 +263,9 @@
 												<xs:complexType>
 													<xs:simpleContent>
 														<xs:extension base="xs:unsignedInt">
-															<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+															<xs:attribute name="fromLevel" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="toLevel" type="xs:unsignedByte" use="optional" />
+															<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
 														</xs:extension>
 													</xs:simpleContent>
 												</xs:complexType>
@@ -318,7 +320,13 @@
 															</xs:element>
 															<xs:element name="skillId" type="xs:unsignedShort" />
 															<xs:element name="affectType" type="xs:string" />
-															<xs:element name="race" type="xs:string" />
+															<xs:element name="race">
+																<xs:complexType mixed="true">
+																	<xs:sequence minOccurs="0">
+																		<xs:element maxOccurs="unbounded" name="item" type="xs:string" />
+																	</xs:sequence>
+																</xs:complexType>
+															</xs:element>
 															<xs:element name="amount">
 																<xs:complexType mixed="true">
 																	<xs:sequence minOccurs="0">
@@ -937,6 +945,21 @@
 															<xs:element name="expMultiplier" type="xs:decimal" />
 															<xs:element name="attribute" type="xs:string" />
 															<xs:element name="isAdvanced" type="xs:boolean" />
+															<xs:element name="PISTOLS">
+																<xs:complexType mixed="true">
+																	<xs:sequence minOccurs="0">
+																		<xs:element maxOccurs="unbounded" name="value">
+																			<xs:complexType>
+																				<xs:simpleContent>
+																					<xs:extension base="xs:unsignedByte">
+																						<xs:attribute name="level" type="xs:unsignedByte" use="required" />
+																					</xs:extension>
+																				</xs:simpleContent>
+																			</xs:complexType>
+																		</xs:element>
+																	</xs:sequence>
+																</xs:complexType>
+															</xs:element>
 															<xs:element name="rate">
 																<xs:complexType mixed="true">
 																	<xs:sequence minOccurs="0">
@@ -1673,21 +1696,6 @@
 															<xs:element name="percentFrom" type="xs:unsignedByte" />
 															<xs:element name="closeSkill" type="xs:unsignedShort" />
 															<xs:element name="rangeSkill" type="xs:unsignedShort" />
-															<xs:element name="PISTOLS">
-																<xs:complexType mixed="true">
-																	<xs:sequence minOccurs="0">
-																		<xs:element maxOccurs="unbounded" name="value">
-																			<xs:complexType>
-																				<xs:simpleContent>
-																					<xs:extension base="xs:unsignedByte">
-																						<xs:attribute name="level" type="xs:unsignedByte" use="required" />
-																					</xs:extension>
-																				</xs:simpleContent>
-																			</xs:complexType>
-																		</xs:element>
-																	</xs:sequence>
-																</xs:complexType>
-															</xs:element>
 															<xs:element name="existingSkillId" type="xs:unsignedShort" />
 															<xs:element name="replacementSkillId" type="xs:unsignedShort" />
 															<xs:element name="IMPRISON">
@@ -1705,7 +1713,6 @@
 																	</xs:sequence>
 																</xs:complexType>
 															</xs:element>
-															<xs:element name="mdef" type="xs:unsignedShort" />
 															<xs:element name="min" type="xs:unsignedShort" />
 															<xs:element name="addStat" type="xs:string" />
 															<xs:element name="staticChance" type="xs:boolean" />
@@ -1879,7 +1886,22 @@
 										</xs:sequence>
 									</xs:complexType>
 								</xs:element>
-								<xs:element name="staticReuse" type="xs:boolean" />
+								<xs:element name="staticReuse">
+									<xs:complexType mixed="true">
+										<xs:sequence minOccurs="0">
+											<xs:element name="value">
+												<xs:complexType>
+													<xs:simpleContent>
+														<xs:extension base="xs:boolean">
+															<xs:attribute name="fromLevel" type="xs:unsignedByte" use="required" />
+															<xs:attribute name="toLevel" type="xs:unsignedByte" use="required" />
+														</xs:extension>
+													</xs:simpleContent>
+												</xs:complexType>
+											</xs:element>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
 								<xs:element name="attributeType">
 									<xs:complexType mixed="true">
 										<xs:sequence minOccurs="0">