From 254ef3759b9cfea49197a6dbcf1e367ea5d3b7ad Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 30 May 2019 20:19:33 +0000
Subject: [PATCH] Dualclass skilltree changes. Contributed by Liamxroy.

---
 .../data/skillTrees/dualClassSkillTree.xml    | 156 ++++++------------
 .../game/data/stats/skills/01900-01999.xml    |  45 ++---
 2 files changed, 78 insertions(+), 123 deletions(-)

diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/skillTrees/dualClassSkillTree.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/skillTrees/dualClassSkillTree.xml
index 13c80c2de9..df2045dbc2 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/skillTrees/dualClassSkillTree.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/skillTrees/dualClassSkillTree.xml
@@ -1,127 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/skillTrees.xsd">
 	<skillTree type="dualClassSkillTree">
-		<skill skillName="Dual - P. Atk./M. Atk. Increase" skillId="1962" skillLvl="1" getLevel="1">
+		<skill skillName="Dual Certification - Attack" skillId="1962" skillLvl="1" getLevel="1">
 			<item id="36078" count="1" />
 		</skill>
-		<skill skillName="Dual - P. Atk./M. Atk. Increase" skillId="1962" skillLvl="2" getLevel="1">
+		<skill skillName="Dual Certification - Attack" skillId="1962" skillLvl="2" getLevel="1">
 			<item id="36078" count="1" />
 		</skill>
-		<skill skillName="Dual - P. Atk./M. Atk. Increase" skillId="1962" skillLvl="3" getLevel="1">
+		<skill skillName="Dual Certification - Attack" skillId="1962" skillLvl="3" getLevel="1">
 			<item id="36078" count="1" />
 		</skill>
-		<skill skillName="Dual - P. Atk./M. Atk. Increase" skillId="1962" skillLvl="4" getLevel="1">
+		<skill skillName="Dual Certification - Attack" skillId="1962" skillLvl="4" getLevel="1">
 			<item id="36078" count="1" />
 		</skill>
-		<skill skillName="Dual - P. Def./M. Def. Increase" skillId="1963" skillLvl="1" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - P. Def./M. Def. Increase" skillId="1963" skillLvl="2" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - P. Def./M. Def. Increase" skillId="1963" skillLvl="3" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - P. Def./M. Def. Increase" skillId="1963" skillLvl="4" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - Atk. Spd./Casting Spd. Increase" skillId="1964" skillLvl="1" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - Atk. Spd./Casting Spd. Increase" skillId="1964" skillLvl="2" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - Atk. Spd./Casting Spd. Increase" skillId="1964" skillLvl="3" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - Atk. Spd./Casting Spd. Increase" skillId="1964" skillLvl="4" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - Max HP Increase" skillId="1965" skillLvl="1" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - Max HP Increase" skillId="1965" skillLvl="2" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - Max HP Increase" skillId="1965" skillLvl="3" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - Max HP Increase" skillId="1965" skillLvl="4" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - Max MP Increase" skillId="1966" skillLvl="1" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - Max MP Increase" skillId="1966" skillLvl="2" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - Max MP Increase" skillId="1966" skillLvl="3" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - Max MP Increase" skillId="1966" skillLvl="4" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - Max CP Increase" skillId="1967" skillLvl="1" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - Max CP Increase" skillId="1967" skillLvl="2" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - Max CP Increase" skillId="1967" skillLvl="3" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - Max CP Increase" skillId="1967" skillLvl="4" getLevel="1">
-			<item id="36078" count="1" />
-		</skill>
-		<skill skillName="Dual - HP Drain" skillId="1968" skillLvl="1" getLevel="1">
-			<item id="36078" count="2" />
-		</skill>
-		<skill skillName="Dual - MP Drain" skillId="1969" skillLvl="1" getLevel="1">
-			<item id="36078" count="2" />
-		</skill>
-		<skill skillName="Dual - Specialized for P. Atk." skillId="1970" skillLvl="1" getLevel="1">
-			<item id="36078" count="2" />
-		</skill>
-		<skill skillName="Dual - Specialized for M. Atk." skillId="1971" skillLvl="1" getLevel="1">
-			<item id="36078" count="2" />
-		</skill>
-		<skill skillName="Dual - Physical Trait Increase" skillId="1972" skillLvl="1" getLevel="1">
-			<item id="36078" count="2" />
-		</skill>
-		<skill skillName="Dual - Mental Trait Increase" skillId="1973" skillLvl="1" getLevel="1">
-			<item id="36078" count="2" />
-		</skill>
-		<skill skillName="Dual - Berserker's Rage" skillId="1974" skillLvl="1" getLevel="1">
+		<skill skillName="Dual Certification - Berserker's Rage" skillId="1974" skillLvl="1" getLevel="1">
 			<item id="36078" count="3" />
 		</skill>
-		<skill skillName="Dual - Master's Rage" skillId="1976" skillLvl="1" getLevel="1">
+		<skill skillName="	Dual Certification - Condition" skillId="1965" skillLvl="1" getLevel="1">
+			<item id="36078" count="1" />
+		</skill>
+		<skill skillName="	Dual Certification - Condition" skillId="1965" skillLvl="2" getLevel="1">
+			<item id="36078" count="1" />
+		</skill>
+		<skill skillName="	Dual Certification - Condition" skillId="1965" skillLvl="3" getLevel="1">
+			<item id="36078" count="1" />
+		</skill>
+		<skill skillName="	Dual Certification - Condition" skillId="1965" skillLvl="4" getLevel="1">
+			<item id="36078" count="1" />
+		</skill>
+		<skill skillName="Dual Certification - Death" skillId="2000" skillLvl="1" getLevel="1">
+			<item id="36078" count="2" />
+		</skill>
+		<skill skillName="Dual Certification - Defense" skillId="1963" skillLvl="1" getLevel="1">
+			<item id="36078" count="1" />
+		</skill>
+		<skill skillName="Dual Certification - Defense" skillId="1963" skillLvl="2" getLevel="1">
+			<item id="36078" count="1" />
+		</skill>
+		<skill skillName="Dual Certification - Defense" skillId="1963" skillLvl="3" getLevel="1">
+			<item id="36078" count="1" />
+		</skill>
+		<skill skillName="Dual Certification - Defense" skillId="1963" skillLvl="4" getLevel="1">
+			<item id="36078" count="1" />
+		</skill>
+		<skill skillName="Dual Certification - Light of Protection" skillId="1978" skillLvl="1" getLevel="1">
 			<item id="36078" count="3" />
 		</skill>
-		<skill skillName="Dual - Light of Protection" skillId="1978" skillLvl="1" getLevel="1">
+		<skill skillName="Dual Certification - Magical" skillId="1971" skillLvl="1" getLevel="1">
+			<item id="36078" count="2" />
+		</skill>
+		<skill skillName="Dual Certification - Master's Rage" skillId="1976" skillLvl="1" getLevel="1">
 			<item id="36078" count="3" />
 		</skill>
-		<skill skillName="Dual - Light of Blessing" skillId="1980" skillLvl="1" getLevel="1">
-			<item id="36078" count="3" />
-		</skill>
-		<skill skillName="Dual - Shackles of the Giants" skillId="1982" skillLvl="1" getLevel="1">
-			<item id="36078" count="4" />
-		</skill>
-		<skill skillName="Dual - Silence of the Giants" skillId="1983" skillLvl="1" getLevel="1">
-			<item id="36078" count="4" />
-		</skill>
-		<skill skillName="Dual - Yoke of the Giants" skillId="1984" skillLvl="1" getLevel="1">
-			<item id="36078" count="4" />
-		</skill>
-		<skill skillName="Dual - Shield of the Giants" skillId="1985" skillLvl="1" getLevel="1">
-			<item id="36078" count="4" />
-		</skill>
-		<skill skillName="Dual Certification - Vital" skillId="1998" skillLvl="1" getLevel="1">
+		<skill skillName="Dual Certification - Physical" skillId="1970" skillLvl="1" getLevel="1">
 			<item id="36078" count="2" />
 		</skill>
 		<skill skillName="Dual Certification - Recovery" skillId="1999" skillLvl="1" getLevel="1">
 			<item id="36078" count="2" />
 		</skill>
-		<skill skillName="Dual Certification - Death" skillId="2000" skillLvl="1" getLevel="1">
+		<skill skillName="Dual Certification - Speed" skillId="1964" skillLvl="1" getLevel="1">
+			<item id="36078" count="1" />
+		</skill>
+		<skill skillName="Dual Certification - Speed" skillId="1964" skillLvl="2" getLevel="1">
+			<item id="36078" count="1" />
+		</skill>
+		<skill skillName="Dual Certification - Speed" skillId="1964" skillLvl="3" getLevel="1">
+			<item id="36078" count="1" />
+		</skill>
+		<skill skillName="Dual Certification - Speed" skillId="1964" skillLvl="4" getLevel="1">
+			<item id="36078" count="1" />
+		</skill>
+		<skill skillName="Dual Certification - Vampiric" skillId="1968" skillLvl="1" getLevel="1">
+			<item id="36078" count="2" />
+		</skill>
+		<skill skillName="Dual Certification - Vital" skillId="1998" skillLvl="1" getLevel="1">
 			<item id="36078" count="2" />
 		</skill>
 	</skillTree>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml
index 3a12dcb741..4234b1f27e 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml
@@ -1600,10 +1600,28 @@
 		<effects>
 			<effect name="MaxHp">
 				<amount>
-					<value level="1">6</value>
-					<value level="2">12</value>
-					<value level="3">18</value>
-					<value level="4">24</value>
+					<value level="1">5</value>
+					<value level="2">10</value>
+					<value level="3">15</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">10</value>
+					<value level="3">15</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxCp">
+				<amount>
+					<value level="1">5</value>
+					<value level="2">10</value>
+					<value level="3">15</value>
+					<value level="4">20</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
@@ -1620,7 +1638,6 @@
 			<value level="4">99</value>
 		</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
-		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="MaxMp">
 				<amount>
@@ -1644,7 +1661,6 @@
 			<value level="4">99</value>
 		</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
-		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="MaxCp">
 				<amount>
@@ -1677,7 +1693,6 @@
 		<operateType>P</operateType>
 		<magicLvl>99</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
-		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="TriggerSkillByMagicType">
 				<!-- Dual - MP Drain -->
@@ -1763,7 +1778,6 @@
 		<operateType>P</operateType>
 		<magicLvl>99</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
-		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="AttackTrait">
 				<SHOCK>20</SHOCK>
@@ -1789,7 +1803,6 @@
 		<operateType>P</operateType>
 		<magicLvl>99</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
-		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="AttackTrait">
 				<HOLD>20</HOLD>
@@ -1895,11 +1908,7 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="MagicalSkillPower">
-				<amount>27</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPower">
 				<amount>27</amount>
 				<mode>PER</mode>
 			</effect>
@@ -1960,7 +1969,6 @@
 		<operateType>P</operateType>
 		<magicLvl>99</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
-		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="TriggerSkillByDamage">
 				<!-- Dual - Light of Blessing -->
@@ -2016,7 +2024,6 @@
 		<staticReuse>true</staticReuse>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
-		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2046,7 +2053,6 @@
 		<staticReuse>true</staticReuse>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
-		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2079,7 +2085,6 @@
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND_PC</affectObject>
-		<excludedFromCheck>true</excludedFromCheck>
 		<conditions>
 			<condition name="OpTargetPc" />
 		</conditions>
@@ -2108,7 +2113,6 @@
 		<reuseDelay>600000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
-		<excludedFromCheck>true</excludedFromCheck>
 		<effects>
 			<effect name="DamageShieldResist">
 				<amount>100</amount>
@@ -2118,7 +2122,7 @@
 	<skill id="1986" toLevel="7" name="Dual Maximum HP">
 		<!-- Max HP +$s1. Can be used when the main/ dual class is Level $s2 or above. -->
 		<icon>icon.skill0917</icon>
-		<operateType>T</operateType>
+		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<excludedFromCheck>true</excludedFromCheck>
 		<magicLvl>
@@ -2130,7 +2134,6 @@
 			<value level="6">103</value>
 			<value level="7">105</value>
 		</magicLvl>
-		<targetType>NONE</targetType>
 		<effects>
 			<effect name="MaxHp">
 				<amount>