From c9981fa9e28f87d7f7bcc5d5b67099fb81a88af6 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 28 Apr 2022 21:09:32 +0000
Subject: [PATCH] Summoner skill additions. Contributed by fruit.

---
 .../skillTrees/2ndClass/ElementalSummoner.xml |  20 +-
 .../skillTrees/2ndClass/PhantomSummoner.xml   |  20 +-
 .../game/data/skillTrees/2ndClass/Warlock.xml |  19 +-
 .../game/data/stats/skills/47900-47999.xml    | 299 +++++++++++++++++-
 4 files changed, 342 insertions(+), 16 deletions(-)

diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/skillTrees/2ndClass/ElementalSummoner.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/skillTrees/2ndClass/ElementalSummoner.xml
index b650dc0812..dd83d7a568 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/skillTrees/2ndClass/ElementalSummoner.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/skillTrees/2ndClass/ElementalSummoner.xml
@@ -47,7 +47,22 @@
 		<skill skillName="Swift Servitor Heal" skillId="45362" skillLevel="13" getLevel="40" levelUpSp="100000" />
 		<skill skillName="Swift Servitor Heal" skillId="45362" skillLevel="14" getLevel="40" levelUpSp="100000" />
 		<skill skillName="Swift Servitor Heal" skillId="45362" skillLevel="15" getLevel="40" levelUpSp="100000" />
-		
+		<skill skillName="Summoner's Attack Mastery" skillId="47918" skillLevel="1" getLevel="40" levelUpSp="100000">
+			<removeSkill id="249" /> <!-- Weapon Mastery -->
+			<removeSkill id="228" /> <!-- Fast Spell Casting -->
+		</skill>
+		<skill skillName="Summoner's Armor Mastery" skillId="47919" skillLevel="1" getLevel="40" levelUpSp="100000">
+			<removeSkill id="47270" /> <!-- Anti Magic -->
+			<removeSkill id="244" /> <!-- Armor Mastery -->
+			<removeSkill id="234" /> <!-- Robe Mastery -->
+			<removeSkill id="258" /> <!-- Light Armor Mastery -->
+		</skill>
+		<skill skillName="Summoner's Recovery Mastery" skillId="47920" skillLevel="1" getLevel="40" levelUpSp="100000">
+			<removeSkill id="164" /> <!-- Quick Recovery -->
+			<removeSkill id="212" /> <!-- Fast HP Recovery -->
+			<removeSkill id="229" /> <!-- Fast Mana Recovery -->
+		</skill>
+
 		<skill skillName="Anti Magic" skillId="47270" skillLevel="2" getLevel="41" levelUpSp="140000" />
 		
 		<skill skillName="Robe Mastery" skillId="234" skillLevel="12" getLevel="42" levelUpSp="140000" />
@@ -81,7 +96,6 @@
 		<skill skillName="Summon Mirage the Unicorn" skillId="1227" skillLevel="6" getLevel="44" levelUpSp="140000" />
 		<skill skillName="Summon Merrow the Unicorn" skillId="1277" skillLevel="2" getLevel="44" levelUpSp="140000" />
 		<skill skillName="Summon Aqua Cubic" skillId="1280" skillLevel="2" getLevel="44" levelUpSp="140000" />
-		<skill skillName="Spirit Sharing" skillId="1547" skillLevel="1" getLevel="44" levelUpSp="140000" />
 		<skill skillName="Swift Servitor Heal" skillId="45362" skillLevel="18" getLevel="44" levelUpSp="140000" />
 		
 		<skill skillName="Pirate Transformation" skillId="1800" skillLevel="1" getLevel="45" autoGet="true" />
@@ -276,7 +290,6 @@
 		<skill skillName="Summon Merrow the Unicorn" skillId="1277" skillLevel="8" getLevel="62" levelUpSp="850000" />
 		<skill skillName="Summon Aqua Cubic" skillId="1280" skillLevel="6" getLevel="62" levelUpSp="850000" />
 		<skill skillName="Servitor Blessing" skillId="1301" skillLevel="1" getLevel="62" levelUpSp="850000" />
-		<skill skillName="Spirit Sharing" skillId="1547" skillLevel="2" getLevel="62" levelUpSp="850000" />
 		<skill skillName="Swift Servitor Heal" skillId="45362" skillLevel="33" getLevel="62" levelUpSp="850000" />
 
 		<skill skillName="Robe Mastery" skillId="234" skillLevel="30" getLevel="63" levelUpSp="1100000" />
@@ -367,7 +380,6 @@
 		<skill skillName="Summon Merrow the Unicorn" skillId="1277" skillLevel="12" getLevel="70" levelUpSp="2000000" />
 		<skill skillName="Summon Aqua Cubic" skillId="1280" skillLevel="8" getLevel="70" levelUpSp="2000000" />
 		<skill skillName="Servitor Ultimate Defense" skillId="1299" skillLevel="2" getLevel="70" levelUpSp="2000000" />
-		<skill skillName="Spirit Sharing" skillId="1547" skillLevel="3" getLevel="70" levelUpSp="2000000" />
 		<skill skillName="White Assassin Transformation" skillId="1802" skillLevel="1" getLevel="70" autoGet="true" />
 		<skill skillName="Spell Master" skillId="1830" skillLevel="3" getLevel="70" levelUpSp="1200000">
 			<item id="57" count="500000" /> <!-- Adena -->
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/skillTrees/2ndClass/PhantomSummoner.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/skillTrees/2ndClass/PhantomSummoner.xml
index d57d4a7675..22ce275ae3 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/skillTrees/2ndClass/PhantomSummoner.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/skillTrees/2ndClass/PhantomSummoner.xml
@@ -47,7 +47,22 @@
 		<skill skillName="Swift Servitor Heal" skillId="45362" skillLevel="13" getLevel="40" levelUpSp="100000" />
 		<skill skillName="Swift Servitor Heal" skillId="45362" skillLevel="14" getLevel="40" levelUpSp="100000" />
 		<skill skillName="Swift Servitor Heal" skillId="45362" skillLevel="15" getLevel="40" levelUpSp="100000" />
-		
+		<skill skillName="Summoner's Attack Mastery" skillId="47918" skillLevel="1" getLevel="40" levelUpSp="100000">
+			<removeSkill id="249" /> <!-- Weapon Mastery -->
+			<removeSkill id="228" /> <!-- Fast Spell Casting -->
+		</skill>
+		<skill skillName="Summoner's Armor Mastery" skillId="47919" skillLevel="1" getLevel="40" levelUpSp="100000">
+			<removeSkill id="47270" /> <!-- Anti Magic -->
+			<removeSkill id="244" /> <!-- Armor Mastery -->
+			<removeSkill id="234" /> <!-- Robe Mastery -->
+			<removeSkill id="258" /> <!-- Light Armor Mastery -->
+		</skill>
+		<skill skillName="Summoner's Recovery Mastery" skillId="47920" skillLevel="1" getLevel="40" levelUpSp="100000">
+			<removeSkill id="164" /> <!-- Quick Recovery -->
+			<removeSkill id="212" /> <!-- Fast HP Recovery -->
+			<removeSkill id="229" /> <!-- Fast Mana Recovery -->
+		</skill>
+
 		<skill skillName="Anti Magic" skillId="47270" skillLevel="2" getLevel="41" levelUpSp="140000" />
 		
 		<skill skillName="Robe Mastery" skillId="234" skillLevel="12" getLevel="42" levelUpSp="140000" />
@@ -80,7 +95,6 @@
 		<skill skillName="Summon Silhouette" skillId="1228" skillLevel="6" getLevel="44" levelUpSp="140000" />
 		<skill skillName="Summon Soulless" skillId="1278" skillLevel="2" getLevel="44" levelUpSp="140000" />
 		<skill skillName="Summon Spark Cubic" skillId="1281" skillLevel="2" getLevel="44" levelUpSp="140000" />
-		<skill skillName="Spirit Sharing" skillId="1547" skillLevel="1" getLevel="44" levelUpSp="140000" />
 		<skill skillName="Swift Servitor Heal" skillId="45362" skillLevel="18" getLevel="44" levelUpSp="140000" />
 		<skill skillName="Pirate Transformation" skillId="1800" skillLevel="1" getLevel="45" autoGet="true" />
 
@@ -271,7 +285,6 @@
 		<skill skillName="Summon Silhouette" skillId="1228" skillLevel="12" getLevel="62" levelUpSp="870000" />
 		<skill skillName="Summon Soulless" skillId="1278" skillLevel="8" getLevel="62" levelUpSp="870000" />
 		<skill skillName="Servitor Blessing" skillId="1301" skillLevel="1" getLevel="62" levelUpSp="870000" />
-		<skill skillName="Spirit Sharing" skillId="1547" skillLevel="2" getLevel="62" levelUpSp="870000" />
 		<skill skillName="Swift Servitor Heal" skillId="45362" skillLevel="33" getLevel="62" levelUpSp="870000" />
 
 		<skill skillName="Robe Mastery" skillId="234" skillLevel="30" getLevel="63" levelUpSp="1100000" />
@@ -359,7 +372,6 @@
 		<skill skillName="Transfer Pain" skillId="1262" skillLevel="5" getLevel="70" levelUpSp="2000000" />
 		<skill skillName="Summon Soulless" skillId="1278" skillLevel="12" getLevel="70" levelUpSp="2000000" />
 		<skill skillName="Servitor Ultimate Defense" skillId="1299" skillLevel="2" getLevel="70" levelUpSp="2000000" />
-		<skill skillName="Spirit Sharing" skillId="1547" skillLevel="3" getLevel="70" levelUpSp="2000000" />
 		<skill skillName="White Assassin Transformation" skillId="1802" skillLevel="1" getLevel="70" autoGet="true" />
 		<skill skillName="Spell Master" skillId="1831" skillLevel="3" getLevel="70" levelUpSp="1200000">
 			<item id="57" count="500000" /> <!-- Adena -->
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/skillTrees/2ndClass/Warlock.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/skillTrees/2ndClass/Warlock.xml
index c26c27b8aa..545072480d 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/skillTrees/2ndClass/Warlock.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/skillTrees/2ndClass/Warlock.xml
@@ -47,7 +47,22 @@
 		<skill skillName="Swift Servitor Heal" skillId="45362" skillLevel="13" getLevel="40" levelUpSp="100000" />
 		<skill skillName="Swift Servitor Heal" skillId="45362" skillLevel="14" getLevel="40" levelUpSp="100000" />
 		<skill skillName="Swift Servitor Heal" skillId="45362" skillLevel="15" getLevel="40" levelUpSp="100000" />
-		
+		<skill skillName="Summoner's Attack Mastery" skillId="47918" skillLevel="1" getLevel="40" levelUpSp="100000">
+			<removeSkill id="249" /> <!-- Weapon Mastery -->
+			<removeSkill id="228" /> <!-- Fast Spell Casting -->
+		</skill>
+		<skill skillName="Summoner's Armor Mastery" skillId="47919" skillLevel="1" getLevel="40" levelUpSp="100000">
+			<removeSkill id="47270" /> <!-- Anti Magic -->
+			<removeSkill id="244" /> <!-- Armor Mastery -->
+			<removeSkill id="234" /> <!-- Robe Mastery -->
+			<removeSkill id="258" /> <!-- Light Armor Mastery -->
+		</skill>
+		<skill skillName="Summoner's Recovery Mastery" skillId="47920" skillLevel="1" getLevel="40" levelUpSp="100000">
+			<removeSkill id="164" /> <!-- Quick Recovery -->
+			<removeSkill id="212" /> <!-- Fast HP Recovery -->
+			<removeSkill id="229" /> <!-- Fast Mana Recovery -->
+		</skill>
+
 		<skill skillName="Anti Magic" skillId="47270" skillLevel="2" getLevel="41" levelUpSp="140000" />
 		
 		<skill skillName="Robe Mastery" skillId="234" skillLevel="12" getLevel="42" levelUpSp="140000" />
@@ -81,7 +96,6 @@
 		<skill skillName="Summon Mew the Cat" skillId="1225" skillLevel="6" getLevel="44" levelUpSp="140000" />
 		<skill skillName="Summon Kai the Cat" skillId="1276" skillLevel="2" getLevel="44" levelUpSp="140000" />
 		<skill skillName="Summon Binding Cubic" skillId="1279" skillLevel="2" getLevel="44" levelUpSp="140000" />
-		<skill skillName="Spirit Sharing" skillId="1547" skillLevel="1" getLevel="44" levelUpSp="140000" />
 		<skill skillName="Swift Servitor Heal" skillId="45362" skillLevel="18" getLevel="44" levelUpSp="140000" />
 		<skill skillName="Pirate Transformation" skillId="1800" skillLevel="1" getLevel="45" autoGet="true" />
 
@@ -270,7 +284,6 @@
 		<skill skillName="Summon Mew the Cat" skillId="1225" skillLevel="12" getLevel="62" levelUpSp="850000" />
 		<skill skillName="Summon Kai the Cat" skillId="1276" skillLevel="8" getLevel="62" levelUpSp="850000" />
 		<skill skillName="Servitor Blessing" skillId="1301" skillLevel="1" getLevel="62" levelUpSp="850000" />
-		<skill skillName="Spirit Sharing" skillId="1547" skillLevel="2" getLevel="62" levelUpSp="850000" />
 		<skill skillName="Swift Servitor Heal" skillId="45362" skillLevel="33" getLevel="62" levelUpSp="850000" />
 
 		<skill skillName="Robe Mastery" skillId="234" skillLevel="30" getLevel="63" levelUpSp="1100000" />
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47900-47999.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47900-47999.xml
index 2a4c49b8da..5ef3607b6d 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47900-47999.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/skills/47900-47999.xml
@@ -86,19 +86,308 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="47918" toLevel="13" name="Summoner's Attack Mastery">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
 		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>
+			<value level="1">40</value>
+			<value level="2">50</value>
+			<value level="3">60</value>
+			<value level="4">70</value>
+			<value level="5">76</value>
+			<value level="6">78</value>
+			<value level="7">80</value>
+			<value level="8">82</value>
+			<value level="9">84</value>
+			<value level="10">86</value>
+			<value level="11">88</value>
+			<value level="12">89</value>
+			<value level="13">90</value>
+		</magicLevel>
+		<effects>
+			<effect name="PAtk">
+				<amount>
+					<value level="1">18</value>
+					<value level="2">71</value>
+					<value level="3">89</value>
+					<value level="4">131</value>
+					<value level="5">143</value>
+					<value level="6">169</value>
+					<value level="7">175</value>
+					<value level="8">201</value>
+					<value level="9">207</value>
+					<value level="10">215</value>
+					<value level="11">230</value>
+					<value level="12">240</value>
+					<value level="13">250</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>
+					<value level="1">220</value>
+					<value level="2">262</value>
+					<value level="3">482</value>
+					<value level="4">628</value>
+					<value level="5">678</value>
+					<value level="6">714</value>
+					<value level="7">764</value>
+					<value level="8">805</value>
+					<value level="9">830</value>
+					<value level="10">855</value>
+					<value level="11">880</value>
+					<value level="12">920</value>
+					<value level="13">960</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicalAttackSpeed">
+				<amount>
+					<value level="1">100</value>
+					<value level="2">130</value>
+					<value level="3">140</value>
+					<value level="4">150</value>
+					<value level="5">170</value>
+					<value level="6">180</value>
+					<value level="7">190</value>
+					<value level="8">200</value>
+					<value level="9">210</value>
+					<value level="10">220</value>
+					<value level="11">230</value>
+					<value level="12">240</value>
+					<value level="13">250</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicalAttackSpeed">
+				<amount>-30</amount>
+				<mode>PER</mode>
+				<weaponType>
+					<item>BOW</item>
+					<item>POLE</item>
+				</weaponType>
+			</effect>
+			<effect name="MagicCriticalRate">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">10</value>
+					<value level="3">10</value>
+					<value level="4">30</value>
+					<value level="5">30</value>
+					<value level="6">40</value>
+					<value level="7">40</value>
+					<value level="8">50</value>
+					<value level="9">50</value>
+					<value level="10">50</value>
+					<value level="11">50</value>
+					<value level="12">50</value>
+					<value level="13">50</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="47919" toLevel="13" name="Summoner's Armor Mastery">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
 		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>
+			<value level="1">40</value>
+			<value level="2">50</value>
+			<value level="3">60</value>
+			<value level="4">70</value>
+			<value level="5">76</value>
+			<value level="6">78</value>
+			<value level="7">80</value>
+			<value level="8">82</value>
+			<value level="9">84</value>
+			<value level="10">86</value>
+			<value level="11">88</value>
+			<value level="12">89</value>
+			<value level="13">90</value>
+		</magicLevel>
+		<effects>
+			<effect name="MagicalDefence">
+				<amount>
+					<value level="1">30</value>
+					<value level="2">50</value>
+					<value level="3">80</value>
+					<value level="4">110</value>
+					<value level="5">120</value>
+					<value level="6">125</value>
+					<value level="7">130</value>
+					<value level="8">135</value>
+					<value level="9">140</value>
+					<value level="10">150</value>
+					<value level="11">160</value>
+					<value level="12">170</value>
+					<value level="13">180</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="ResistDDMagic">
+				<amount>
+					<value level="1">15</value>
+					<value level="2">15</value>
+					<value level="3">20</value>
+					<value level="4">30</value>
+					<value level="5">30</value>
+					<value level="6">30</value>
+					<value level="7">30</value>
+					<value level="8">30</value>
+					<value level="9">30</value>
+					<value level="10">30</value>
+					<value level="11">30</value>
+					<value level="12">30</value>
+					<value level="13">30</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>
+					<value level="1">30</value>
+					<value level="2">40</value>
+					<value level="3">50</value>
+					<value level="4">65</value>
+					<value level="5">73</value>
+					<value level="6">80</value>
+					<value level="7">85</value>
+					<value level="8">90</value>
+					<value level="9">96</value>
+					<value level="10">102</value>
+					<value level="11">110</value>
+					<value level="12">115</value>
+					<value level="13">120</value>
+				</amount>
+				<mode>DIFF</mode>
+				<armorType>
+					<item>MAGIC</item>
+				</armorType>
+			</effect>
+			<effect name="MaxHp">
+				<amount>
+					<value level="1">60</value>
+					<value level="2">90</value>
+					<value level="3">140</value>
+					<value level="4">220</value>
+					<value level="5">250</value>
+					<value level="6">270</value>
+					<value level="7">290</value>
+					<value level="8">310</value>
+					<value level="9">330</value>
+					<value level="10">350</value>
+					<value level="11">370</value>
+					<value level="12">390</value>
+					<value level="13">410</value>
+				</amount>
+				<mode>DIFF</mode>
+				<armorType>
+					<item>MAGIC</item>
+				</armorType>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>
+					<value level="1">13</value>
+					<value level="2">21</value>
+					<value level="3">30</value>
+					<value level="4">41</value>
+					<value level="5">48</value>
+					<value level="6">52</value>
+					<value level="7">56</value>
+					<value level="8">60</value>
+					<value level="9">64</value>
+					<value level="10">69</value>
+					<value level="11">75</value>
+					<value level="12">80</value>
+					<value level="13">90</value>
+				</amount>
+				<mode>DIFF</mode>
+				<armorType>
+					<item>LIGHT</item>
+				</armorType>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>25</amount>
+				<mode>PER</mode>
+				<armorType>
+					<item>LIGHT</item>
+				</armorType>
+			</effect>
+			<effect name="MagicalAttackSpeed">
+				<amount>
+					<value fromLevel="1" toLevel="10">88</value>
+					<value fromLevel="11" toLevel="13">90</value>
+				</amount>
+				<mode>PER</mode>
+				<armorType>
+					<item>LIGHT</item>
+				</armorType>
+			</effect>
+			<effect name="MpRegen">
+				<amount>20</amount>
+				<mode>PER</mode>
+				<armorType>
+					<item>LIGHT</item>
+				</armorType>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="47920" toLevel="8" name="Summoner's Recovery Mastery">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<magicLevel>
+			<value level="1">40</value>
+			<value level="2">50</value>
+			<value level="3">60</value>
+			<value level="4">70</value>
+			<value level="5">76</value>
+			<value level="6">80</value>
+			<value level="7">85</value>
+			<value level="8">90</value>
+		</magicLevel>
+		<effects>
+			<effect name="Reuse">
+				<amount>
+					<value level="1">-15</value>
+					<value level="2">-20</value>
+					<value level="3">-20</value>
+					<value level="4">-20</value>
+					<value level="5">-20</value>
+					<value level="6">-20</value>
+					<value level="7">-20</value>
+					<value level="8">-20</value>
+				</amount>
+				<mode>PER</mode>
+				<magicType>1</magicType>
+			</effect>
+			<effect name="HpRegen">
+				<amount>
+					<value level="1">1.7</value>
+					<value level="2">2.3</value>
+					<value level="3">2.9</value>
+					<value level="4">3.5</value>
+					<value level="5">4.1</value>
+					<value level="6">4.5</value>
+					<value level="7">5</value>
+					<value level="8">5.5</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MpRegen">
+				<amount>
+					<value level="1">1.5</value>
+					<value level="2">2.3</value>
+					<value level="3">2.9</value>
+					<value level="4">3.2</value>
+					<value level="5">3.6</value>
+					<value level="6">4.1</value>
+					<value level="7">4.5</value>
+					<value level="8">5</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="47921" toLevel="1" name="Cat Emperor - Hold">
 		<!-- AUTO GENERATED SKILL TODO: FIX IT -->