From e8ed52bcd868a7b52717490fcc0495013b1242a7 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 22 Jul 2021 22:36:58 +0000
Subject: [PATCH] Target related skill XML changes. Contributed by nasseka.

---
 .../game/data/stats/skills/01300-01399.xml    | 41 ++++++++++++++-----
 .../game/data/stats/skills/11700-11799.xml    |  9 +---
 .../game/data/stats/skills/11800-11899.xml    | 21 +++++++---
 .../game/data/stats/skills/19200-19299.xml    | 15 ++++---
 .../game/data/stats/skills/01300-01399.xml    |  2 +-
 .../game/data/stats/skills/11700-11799.xml    |  9 +---
 .../game/data/stats/skills/11800-11899.xml    |  8 ++--
 .../game/data/stats/skills/19200-19299.xml    | 22 ++++------
 .../game/data/stats/skills/30800-30899.xml    |  2 +-
 .../dist/game/data/xsd/skills.xsd             |  5 ++-
 .../game/data/stats/skills/01300-01399.xml    |  2 +-
 .../game/data/stats/skills/11700-11799.xml    |  9 +---
 .../game/data/stats/skills/11800-11899.xml    |  8 ++--
 .../game/data/stats/skills/19200-19299.xml    | 20 ++++-----
 .../game/data/stats/skills/30800-30899.xml    |  2 +-
 .../dist/game/data/xsd/skills.xsd             |  5 ++-
 .../game/data/stats/skills/01300-01399.xml    |  2 +-
 .../game/data/stats/skills/11700-11799.xml    |  9 +---
 .../game/data/stats/skills/11800-11899.xml    |  8 ++--
 .../game/data/stats/skills/19200-19299.xml    | 20 ++++-----
 .../game/data/stats/skills/30800-30899.xml    |  2 +-
 .../dist/game/data/xsd/skills.xsd             |  5 ++-
 22 files changed, 118 insertions(+), 108 deletions(-)

diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/01300-01399.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/01300-01399.xml
index a3423e2400..a737376ff1 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/01300-01399.xml
@@ -733,6 +733,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<affectObject>FRIEND</affectObject>
 		<effects>
 			<effect name="NoblesseBless" />
 		</effects>
@@ -3284,13 +3285,14 @@
 		<abnormalLevel>1</abnormalLevel>
 		<abnormalTime>60</abnormalTime>
 		<abnormalType>HERO_BUFF</abnormalType>
+		<abnormalVisualEffect>SILENCE</abnormalVisualEffect>
 		<affectRange>1000</affectRange>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<effectPoint>676</effectPoint>
 		<hitTime>2500</hitTime>
-		<isMagic>1</isMagic> <!-- Magic Skill -->
-		<itemConsumeCount>120</itemConsumeCount>
-		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ores -->
+		<isMagic>22</isMagic>
+		<itemConsumeCount>240</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<magicLevel>-1</magicLevel>
 		<mpConsume>231</mpConsume>
 		<mpInitialConsume>58</mpInitialConsume>
@@ -3298,23 +3300,39 @@
 		<reuseDelay>600000</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>0</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>2</hitCancelTime>
 		<targetType>SELF</targetType>
-		<affectScope>PLEDGE</affectScope>
+		<affectScope>PARTY</affectScope>
 		<affectObject>FRIEND</affectObject>
 		<effects>
 			<effect name="PAtk">
-				<amount>10</amount>
+				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MAtk">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="CriticalDamage">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicCriticalDamage">
 				<amount>10</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="Speed">
-				<amount>30</amount>
+				<amount>50</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
@@ -3325,6 +3343,7 @@
 		<abnormalLevel>2</abnormalLevel>
 		<abnormalTime>15</abnormalTime>
 		<abnormalType>HERO_DEBUFF</abnormalType>
+		<abnormalVisualEffect>HEROIC_SILENCE_AVE</abnormalVisualEffect>
 		<activateRate>80</activateRate>
 		<affectRange>1000</affectRange>
 		<basicProperty>MAGIC</basicProperty>
@@ -3343,7 +3362,7 @@
 		<operateType>A2</operateType>
 		<reuseDelay>600000</reuseDelay>
 		<staticReuse>true</staticReuse>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>0</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
 		<hitCancelTime>2</hitCancelTime>
 		<trait>DERANGEMENT</trait>
@@ -3371,9 +3390,9 @@
 		<!-- For 5 seconds, instills nearby enemies with fear and causes them to flee, and decreases their Speed by 180. Hero's Weakening effect is not applied at the same time, and release is not possible Consumes 240 Spirit Ores. Cannot be used in the Olympiad. Inflicted status: Confusion (Fear, Aerial Yoke, Faint, Charm, Stun, Paralysis, Knockback, Knockdown, Pull). -->
 		<icon>icon.skill1376</icon>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>8</abnormalTime>
+		<abnormalTime>5</abnormalTime>
 		<abnormalType>HERO_DEBUFF</abnormalType>
-		<abnormalVisualEffect>TURN_FLEE</abnormalVisualEffect>
+		<abnormalVisualEffect>HEROIC_FEAR_AVE_1</abnormalVisualEffect>
 		<activateRate>80</activateRate>
 		<affectRange>1000</affectRange>
 		<basicProperty>MAGIC</basicProperty>
@@ -3404,7 +3423,7 @@
 			<effect name="Fear">
 			</effect>
 			<effect name="Speed">
-				<amount>-100</amount>
+				<amount>-180</amount>
 				<mode>DIFF</mode>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml
index 423a19783b..086e41f2e3 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml
@@ -256,7 +256,7 @@
 		<effectRange>1100</effectRange>
 		<abnormalLevel>1</abnormalLevel>
 		<isMagic>1</isMagic>
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="TargetMyParty">
@@ -748,14 +748,9 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLevel>85</magicLevel>
 		<affectRange>1000</affectRange>
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<affectObject>FRIEND</affectObject>
-		<conditions>
-			<condition name="TargetMyParty">
-				<includeMe>true</includeMe>
-			</condition>
-		</conditions>
 		<effects>
 			<effect name="DamageBlock">
 				<type>BLOCK_HP</type>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11800-11899.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11800-11899.xml
index 9d8fb4bf92..77e4989007 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11800-11899.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11800-11899.xml
@@ -1444,7 +1444,7 @@
 		<icon>icon.skill11850new</icon>
 		<operateType>A1</operateType>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY_PLEDGE</affectScope>
+		<affectScope>PLEDGE</affectScope>
 		<affectObject>FRIEND</affectObject>
 		<mpConsume>
 			<value level="1">185</value>
@@ -1458,6 +1458,7 @@
 			<value level="3">45</value>
 			<value level="4">49</value>
 		</mpInitialConsume>
+		<affectRange>1000</affectRange>
 		<hitTime>10000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>600000</reuseDelay>
@@ -1468,6 +1469,7 @@
 			<value level="3">95</value>
 			<value level="4">99</value>
 		</magicLevel>
+		<staticReuse>true</staticReuse>
 		<effectPoint>560</effectPoint>
 		<conditions>
 			<condition name="RemainMpPer">
@@ -1923,9 +1925,6 @@
 		<operateType>A2</operateType>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<castRange>900</castRange>
-		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
 		<mpConsume>82</mpConsume>
 		<affectRange>900</affectRange>
 		<hitTime>1000</hitTime>
@@ -1936,6 +1935,14 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<itemConsumeCount>10</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<targetType>MY_PARTY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<reuseDelayGroup>11861</reuseDelayGroup>
+		<conditions>
+			<condition name="TargetMyParty">
+				<includeMe>true</includeMe>
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="DefenceAttribute">
 				<amount>30</amount>
@@ -1982,7 +1989,7 @@
 		<itemConsumeCount>10</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<operateType>A2</operateType>
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<magicLevel>99</magicLevel>
 		<mpConsume>82</mpConsume>
@@ -1992,6 +1999,7 @@
 		<reuseDelay>2000</reuseDelay>
 		<effectPoint>687</effectPoint>
 		<isMagic>1</isMagic>
+		<reuseDelayGroup>11861</reuseDelayGroup>
 		<conditions>
 			<condition name="TargetMyParty">
 				<includeMe>true</includeMe>
@@ -2038,7 +2046,7 @@
 		<itemConsumeCount>10</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<operateType>A2</operateType>
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<magicLevel>99</magicLevel>
 		<mpConsume>82</mpConsume>
@@ -2048,6 +2056,7 @@
 		<reuseDelay>2000</reuseDelay>
 		<effectPoint>687</effectPoint>
 		<isMagic>1</isMagic>
+		<reuseDelayGroup>11861</reuseDelayGroup>
 		<conditions>
 			<condition name="TargetMyParty">
 				<includeMe>true</includeMe>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml
index 4a6b7b87a0..bfa88e4e32 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml
@@ -444,13 +444,13 @@
 		<operateType>A2</operateType>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<castRange>600</castRange>
+		<effectRange>900</effectRange>
 		<effectPoint>867</effectPoint>
 		<mpConsume>46</mpConsume>
 		<affectRange>600</affectRange>
 		<hitTime>1500</hitTime>
 		<coolTime>300</coolTime>
 		<reuseDelay>180000</reuseDelay>
-		<affectLimit>0-0</affectLimit>
 		<abnormalLevel>1</abnormalLevel>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="1">30</value>
@@ -461,12 +461,17 @@
 		<abnormalVisualEffect>SHILLIEN_PROTECTION</abnormalVisualEffect>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
-		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<targetType>TARGET</targetType>
+		<affectScope>SINGLE</affectScope>
 		<itemConsumeCount>5</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<conditions>
+			<condition name="TargetMyParty">
+				<includeMe>true</includeMe>
+			</condition>
+		</conditions>
 		<effects>
+			<effect name="IgnoreDeath" />
 			<effect name="TriggerSkillByDeathBlow">
 				<chance>100</chance>
 				<skillId>19221</skillId> <!-- Power of Darkness -->
@@ -963,7 +968,7 @@
 			<value level="1">40</value>
 			<value level="2">120</value>
 		</itemConsumeCount>
-		<targetType>MY_PARTY</targetType>
+		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="ExpModify">
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/01300-01399.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/01300-01399.xml
index 17187d9da3..4580bdee03 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/01300-01399.xml
@@ -731,7 +731,7 @@
 		<reuseDelay>1000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
-		<targetType>MY_PARTY</targetType>
+		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<affectObject>FRIEND</affectObject>
 		<effects>
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11700-11799.xml
index 63f69318dd..be98e92638 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11700-11799.xml
@@ -282,7 +282,7 @@
 		<effectRange>1100</effectRange>
 		<abnormalLevel>1</abnormalLevel>
 		<isMagic>1</isMagic>
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="TargetMyParty">
@@ -759,14 +759,9 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLevel>85</magicLevel>
 		<affectRange>1000</affectRange>
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<affectObject>FRIEND</affectObject>
-		<conditions>
-			<condition name="TargetMyParty">
-				<includeMe>true</includeMe>
-			</condition>
-		</conditions>
 		<effects>
 			<effect name="DamageBlock">
 				<type>BLOCK_HP</type>
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11800-11899.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11800-11899.xml
index 812ae5923c..dd6079e478 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11800-11899.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/11800-11899.xml
@@ -1941,7 +1941,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<itemConsumeCount>10</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<reuseDelayGroup>11861</reuseDelayGroup>
 		<conditions>
@@ -1995,7 +1995,7 @@
 		<itemConsumeCount>10</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<operateType>A2</operateType>
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<magicLevel>99</magicLevel>
 		<mpConsume>82</mpConsume>
@@ -2052,7 +2052,7 @@
 		<itemConsumeCount>10</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<operateType>A2</operateType>
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<magicLevel>99</magicLevel>
 		<mpConsume>82</mpConsume>
@@ -2094,4 +2094,4 @@
 			</effect>
 		</effects>
 	</skill>
-</list>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/19200-19299.xml
index 3dff522973..53ff8304ac 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/19200-19299.xml
@@ -126,34 +126,30 @@
 		<!-- For $s1, the targeted party member's P. Critical Rate, P./ M. Skill Critical Rate, P. Critical Damage, and P./ M. Skill Critical Damage +$s2. Additionally, activates the Spirit of Iss effect. P./ M. Atk. and P./ M. Def. +$s3. Cannot be used with Chant of Bison/ Victories of Pa'agrio. Consumes $s4 Spirit Ore. <The character is targeted automatically> -->
 		<icon>icon.skill19204</icon>
 		<abnormalType>SONG_WEAPON</abnormalType>
-		<isTriggeredSkill>true</isTriggeredSkill>
-		<affectRange>1000</affectRange>
+		<castRange>400</castRange>
 		<itemConsumeCount>10</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
-		<operateType>A3</operateType>
+		<operateType>A2</operateType>
+		<abnormalLevel>1</abnormalLevel>
 		<targetType>MY_PARTY</targetType>
-		<affectScope>PARTY</affectScope>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>FRIEND</affectObject>
 		<mpConsume>332</mpConsume>
 		<hitTime>8000</hitTime>
 		<coolTime>300</coolTime>
 		<effectPoint>712</effectPoint>
 		<reuseDelay>600000</reuseDelay>
-		<conditions>
-			<condition name="TargetMyParty">
-				<includeMe>true</includeMe>
-			</condition>
-		</conditions>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="1">300</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1010">{base + subIndex}</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1011" toSubLevel="1020">{base + 10 + 0.5 * subIndex}</value>
 		</abnormalTime>
-		<selfEffects>
+		<startEffects>
 			<effect name="CallSkill">
-				<skillId>30848</skillId> <!-- Spirit of iss -->
+				<skillId>30848</skillId> <!-- Spirit of Iss -->
 				<skillLevel>1</skillLevel>
 			</effect>
-		</selfEffects>
+		</startEffects>
 		<effects>
 			<effect name="CriticalRate">
 				<amount>25</amount>
@@ -988,7 +984,7 @@
 			<value level="1">40</value>
 			<value level="2">120</value>
 		</itemConsumeCount>
-		<targetType>MY_PARTY</targetType>
+		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="ExpModify">
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30800-30899.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30800-30899.xml
index db9e50136b..96f40ee3cc 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30800-30899.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/30800-30899.xml
@@ -2512,7 +2512,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<itemConsumeCount>40</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="TargetMyParty">
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/skills.xsd b/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/skills.xsd
index e8456af09e..8115a70822 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/skills.xsd
@@ -569,7 +569,6 @@
 																			</xs:complexType>
 																		</xs:element>
 																	</xs:sequence>
-																	<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
 																</xs:complexType>
 															</xs:element>
 															<xs:element name="mode">
@@ -2944,6 +2943,10 @@
 										<xs:sequence>
 											<xs:element name="effect">
 												<xs:complexType>
+													<xs:sequence minOccurs="0">
+														<xs:element name="skillId" type="xs:unsignedShort" />
+														<xs:element name="skillLevel" type="xs:unsignedByte" />
+													</xs:sequence>
 													<xs:attribute name="name" type="xs:string" use="required" />
 												</xs:complexType>
 											</xs:element>
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/01300-01399.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/01300-01399.xml
index 17187d9da3..4580bdee03 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/01300-01399.xml
@@ -731,7 +731,7 @@
 		<reuseDelay>1000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
-		<targetType>MY_PARTY</targetType>
+		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<affectObject>FRIEND</affectObject>
 		<effects>
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11700-11799.xml
index 8dec8a4504..b2725f9c01 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11700-11799.xml
@@ -282,7 +282,7 @@
 		<effectRange>1100</effectRange>
 		<abnormalLevel>1</abnormalLevel>
 		<isMagic>1</isMagic>
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="TargetMyParty">
@@ -759,14 +759,9 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLevel>85</magicLevel>
 		<affectRange>1000</affectRange>
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<affectObject>FRIEND</affectObject>
-		<conditions>
-			<condition name="TargetMyParty">
-				<includeMe>true</includeMe>
-			</condition>
-		</conditions>
 		<effects>
 			<effect name="DamageBlock">
 				<type>BLOCK_HP</type>
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11800-11899.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11800-11899.xml
index 812ae5923c..dd6079e478 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11800-11899.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11800-11899.xml
@@ -1941,7 +1941,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<itemConsumeCount>10</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<reuseDelayGroup>11861</reuseDelayGroup>
 		<conditions>
@@ -1995,7 +1995,7 @@
 		<itemConsumeCount>10</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<operateType>A2</operateType>
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<magicLevel>99</magicLevel>
 		<mpConsume>82</mpConsume>
@@ -2052,7 +2052,7 @@
 		<itemConsumeCount>10</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<operateType>A2</operateType>
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<magicLevel>99</magicLevel>
 		<mpConsume>82</mpConsume>
@@ -2094,4 +2094,4 @@
 			</effect>
 		</effects>
 	</skill>
-</list>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19200-19299.xml
index 94998605f5..e6491f0d25 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/19200-19299.xml
@@ -126,34 +126,30 @@
 		<!-- For $s1, the targeted party member's P. Critical Rate, P./ M. Skill Critical Rate, P. Critical Damage, and P./ M. Skill Critical Damage +$s2. Additionally, activates the Spirit of Iss effect. P./ M. Atk. and P./ M. Def. +$s3. Cannot be used with Chant of Bison/ Victories of Pa'agrio. Consumes $s4 Spirit Ore. <The character is targeted automatically> -->
 		<icon>icon.skill19204</icon>
 		<abnormalType>SONG_WEAPON</abnormalType>
-		<isTriggeredSkill>true</isTriggeredSkill>
-		<affectRange>1000</affectRange>
+		<castRange>400</castRange>
 		<itemConsumeCount>10</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
-		<operateType>A3</operateType>
+		<operateType>A2</operateType>
+		<abnormalLevel>1</abnormalLevel>
 		<targetType>MY_PARTY</targetType>
-		<affectScope>PARTY</affectScope>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>FRIEND</affectObject>
 		<mpConsume>332</mpConsume>
 		<hitTime>8000</hitTime>
 		<coolTime>300</coolTime>
 		<effectPoint>712</effectPoint>
 		<reuseDelay>600000</reuseDelay>
-		<conditions>
-			<condition name="TargetMyParty">
-				<includeMe>true</includeMe>
-			</condition>
-		</conditions>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="1">300</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1010">{base + subIndex}</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1011" toSubLevel="1020">{base + 10 + 0.5 * subIndex}</value>
 		</abnormalTime>
-		<selfEffects>
+		<startEffects>
 			<effect name="CallSkill">
 				<skillId>30848</skillId> <!-- Spirit of Iss -->
 				<skillLevel>1</skillLevel>
 			</effect>
-		</selfEffects>
+		</startEffects>
 		<effects>
 			<effect name="CriticalRate">
 				<amount>25</amount>
@@ -988,7 +984,7 @@
 			<value level="1">40</value>
 			<value level="2">120</value>
 		</itemConsumeCount>
-		<targetType>MY_PARTY</targetType>
+		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="ExpModify">
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml
index 105b1b5bfb..357f321027 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml
@@ -2512,7 +2512,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<itemConsumeCount>40</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="TargetMyParty">
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/xsd/skills.xsd b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/xsd/skills.xsd
index e8456af09e..8115a70822 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/xsd/skills.xsd
@@ -569,7 +569,6 @@
 																			</xs:complexType>
 																		</xs:element>
 																	</xs:sequence>
-																	<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
 																</xs:complexType>
 															</xs:element>
 															<xs:element name="mode">
@@ -2944,6 +2943,10 @@
 										<xs:sequence>
 											<xs:element name="effect">
 												<xs:complexType>
+													<xs:sequence minOccurs="0">
+														<xs:element name="skillId" type="xs:unsignedShort" />
+														<xs:element name="skillLevel" type="xs:unsignedByte" />
+													</xs:sequence>
 													<xs:attribute name="name" type="xs:string" use="required" />
 												</xs:complexType>
 											</xs:element>
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/01300-01399.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/01300-01399.xml
index 17187d9da3..4580bdee03 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/01300-01399.xml
@@ -731,7 +731,7 @@
 		<reuseDelay>1000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
-		<targetType>MY_PARTY</targetType>
+		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<affectObject>FRIEND</affectObject>
 		<effects>
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/11700-11799.xml
index 8dec8a4504..b2725f9c01 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/11700-11799.xml
@@ -282,7 +282,7 @@
 		<effectRange>1100</effectRange>
 		<abnormalLevel>1</abnormalLevel>
 		<isMagic>1</isMagic>
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="TargetMyParty">
@@ -759,14 +759,9 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLevel>85</magicLevel>
 		<affectRange>1000</affectRange>
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<affectObject>FRIEND</affectObject>
-		<conditions>
-			<condition name="TargetMyParty">
-				<includeMe>true</includeMe>
-			</condition>
-		</conditions>
 		<effects>
 			<effect name="DamageBlock">
 				<type>BLOCK_HP</type>
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/11800-11899.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/11800-11899.xml
index 812ae5923c..dd6079e478 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/11800-11899.xml
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/11800-11899.xml
@@ -1941,7 +1941,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<itemConsumeCount>10</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<reuseDelayGroup>11861</reuseDelayGroup>
 		<conditions>
@@ -1995,7 +1995,7 @@
 		<itemConsumeCount>10</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<operateType>A2</operateType>
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<magicLevel>99</magicLevel>
 		<mpConsume>82</mpConsume>
@@ -2052,7 +2052,7 @@
 		<itemConsumeCount>10</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<operateType>A2</operateType>
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<magicLevel>99</magicLevel>
 		<mpConsume>82</mpConsume>
@@ -2094,4 +2094,4 @@
 			</effect>
 		</effects>
 	</skill>
-</list>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/19200-19299.xml
index 94998605f5..e6491f0d25 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/19200-19299.xml
@@ -126,34 +126,30 @@
 		<!-- For $s1, the targeted party member's P. Critical Rate, P./ M. Skill Critical Rate, P. Critical Damage, and P./ M. Skill Critical Damage +$s2. Additionally, activates the Spirit of Iss effect. P./ M. Atk. and P./ M. Def. +$s3. Cannot be used with Chant of Bison/ Victories of Pa'agrio. Consumes $s4 Spirit Ore. <The character is targeted automatically> -->
 		<icon>icon.skill19204</icon>
 		<abnormalType>SONG_WEAPON</abnormalType>
-		<isTriggeredSkill>true</isTriggeredSkill>
-		<affectRange>1000</affectRange>
+		<castRange>400</castRange>
 		<itemConsumeCount>10</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
-		<operateType>A3</operateType>
+		<operateType>A2</operateType>
+		<abnormalLevel>1</abnormalLevel>
 		<targetType>MY_PARTY</targetType>
-		<affectScope>PARTY</affectScope>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>FRIEND</affectObject>
 		<mpConsume>332</mpConsume>
 		<hitTime>8000</hitTime>
 		<coolTime>300</coolTime>
 		<effectPoint>712</effectPoint>
 		<reuseDelay>600000</reuseDelay>
-		<conditions>
-			<condition name="TargetMyParty">
-				<includeMe>true</includeMe>
-			</condition>
-		</conditions>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="1">300</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1001" toSubLevel="1010">{base + subIndex}</value>
 			<value fromLevel="1" toLevel="1" fromSubLevel="1011" toSubLevel="1020">{base + 10 + 0.5 * subIndex}</value>
 		</abnormalTime>
-		<selfEffects>
+		<startEffects>
 			<effect name="CallSkill">
 				<skillId>30848</skillId> <!-- Spirit of Iss -->
 				<skillLevel>1</skillLevel>
 			</effect>
-		</selfEffects>
+		</startEffects>
 		<effects>
 			<effect name="CriticalRate">
 				<amount>25</amount>
@@ -988,7 +984,7 @@
 			<value level="1">40</value>
 			<value level="2">120</value>
 		</itemConsumeCount>
-		<targetType>MY_PARTY</targetType>
+		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="ExpModify">
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/30800-30899.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/30800-30899.xml
index 105b1b5bfb..357f321027 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/30800-30899.xml
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/30800-30899.xml
@@ -2512,7 +2512,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<itemConsumeCount>40</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
-		<targetType>TARGET</targetType>
+		<targetType>MY_PARTY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="TargetMyParty">
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/xsd/skills.xsd b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/xsd/skills.xsd
index c50df3ec7e..edd0d9163c 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/xsd/skills.xsd
@@ -569,7 +569,6 @@
 																			</xs:complexType>
 																		</xs:element>
 																	</xs:sequence>
-																	<xs:attribute name="level" type="xs:unsignedByte" use="optional" />
 																</xs:complexType>
 															</xs:element>
 															<xs:element name="mode">
@@ -2958,6 +2957,10 @@
 										<xs:sequence>
 											<xs:element name="effect">
 												<xs:complexType>
+													<xs:sequence minOccurs="0">
+														<xs:element name="skillId" type="xs:unsignedShort" />
+														<xs:element name="skillLevel" type="xs:unsignedByte" />
+													</xs:sequence>
 													<xs:attribute name="name" type="xs:string" use="required" />
 												</xs:complexType>
 											</xs:element>