From 12b69ed5e9855d6367391644ca7c4d800580c7ac Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 8 Nov 2015 11:13:43 +0000
Subject: [PATCH] Race skilltree changes. Contributed by rocknowx.

---
 .../data/skillTrees/4rthClass/TyrrDuelist.xml |  8 +++++
 .../4rthClass/TyrrGrandKhavatari.xml          |  8 +++++
 .../skillTrees/ErtheiaClass/CloudBreaker.xml  |  2 --
 .../ErtheiaClass/ErtheiaFighter.xml           |  3 ++
 .../skillTrees/ErtheiaClass/ErtheiaWizard.xml |  3 ++
 .../skillTrees/ErtheiaClass/Eviscerator.xml   |  2 ++
 .../data/skillTrees/ErtheiaClass/Marauder.xml |  4 ---
 .../game/data/skillTrees/raceSkillTree.xml    |  6 ++--
 .../game/data/stats/skills/30400-30499.xml    | 31 +++++++++++++++++--
 .../clientpackets/CharacterCreate.java        |  5 ---
 10 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/trunk/dist/game/data/skillTrees/4rthClass/TyrrDuelist.xml b/trunk/dist/game/data/skillTrees/4rthClass/TyrrDuelist.xml
index 8717a0b328..3bdde8048e 100644
--- a/trunk/dist/game/data/skillTrees/4rthClass/TyrrDuelist.xml
+++ b/trunk/dist/game/data/skillTrees/4rthClass/TyrrDuelist.xml
@@ -155,6 +155,14 @@
 			<removeSkill id="260" />
 			<removeSkill id="95" />
 		</skill>
+		<skill skillName="Hurricane Storm" skillId="10288" skillLvl="1" getLevel="85" levelUpSp="10000">
+			<removeSkill id="526" />
+			<removeSkill id="347" />
+			<removeSkill id="6" />
+			<removeSkill id="7" />
+			<removeSkill id="54" />
+			<removeSkill id="35" />
+		</skill>
 		<skill skillName="Eruption" skillId="10265" skillLvl="2" getLevel="86" levelUpSp="50000" />
 		<skill skillName="Sonic Rage" skillId="345" skillLvl="6" getLevel="86" levelUpSp="50000" />
 		<skill skillName="Sonic Storm" skillId="7" skillLvl="35" getLevel="86" levelUpSp="50000" />
diff --git a/trunk/dist/game/data/skillTrees/4rthClass/TyrrGrandKhavatari.xml b/trunk/dist/game/data/skillTrees/4rthClass/TyrrGrandKhavatari.xml
index bb7f18856c..cfe31b9970 100644
--- a/trunk/dist/game/data/skillTrees/4rthClass/TyrrGrandKhavatari.xml
+++ b/trunk/dist/game/data/skillTrees/4rthClass/TyrrGrandKhavatari.xml
@@ -155,6 +155,14 @@
 			<removeSkill id="260" />
 			<removeSkill id="95" />
 		</skill>
+		<skill skillName="Hurricane Storm" skillId="10288" skillLvl="1" getLevel="85" levelUpSp="10000">
+			<removeSkill id="526" />
+			<removeSkill id="347" />
+			<removeSkill id="6" />
+			<removeSkill id="7" />
+			<removeSkill id="54" />
+			<removeSkill id="35" />
+		</skill>
 		<skill skillName="Fury Fists" skillId="222" skillLvl="4" getLevel="85" levelUpSp="10000" />
 		<skill skillName="Eruption" skillId="10265" skillLvl="2" getLevel="86" levelUpSp="50000" />
 		<skill skillName="Mega Strike" skillId="10260" skillLvl="2" getLevel="86" levelUpSp="50000" />
diff --git a/trunk/dist/game/data/skillTrees/ErtheiaClass/CloudBreaker.xml b/trunk/dist/game/data/skillTrees/ErtheiaClass/CloudBreaker.xml
index d1810b3c85..1ed9abb3ad 100644
--- a/trunk/dist/game/data/skillTrees/ErtheiaClass/CloudBreaker.xml
+++ b/trunk/dist/game/data/skillTrees/ErtheiaClass/CloudBreaker.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="185" parentClassId="183">
-		<skill skillName="Windy Healing Potion" skillId="17920" skillLvl="1" getLevel="40" autoGet="true" />
-		<skill skillName="Alchemy Cube" skillId="17943" skillLvl="1" getLevel="40" autoGet="true" />
 		<skill skillName="Eminent Ability" skillId="30045" skillLvl="1" getLevel="40" levelUpSp="45" />
 		<skill skillName="Hydro Strike" skillId="30004" skillLvl="1" getLevel="40" levelUpSp="45" />
 		<skill skillName="Air Rush" skillId="30012" skillLvl="1" getLevel="40" levelUpSp="45" />
diff --git a/trunk/dist/game/data/skillTrees/ErtheiaClass/ErtheiaFighter.xml b/trunk/dist/game/data/skillTrees/ErtheiaClass/ErtheiaFighter.xml
index e603a2291f..9619c57e9d 100644
--- a/trunk/dist/game/data/skillTrees/ErtheiaClass/ErtheiaFighter.xml
+++ b/trunk/dist/game/data/skillTrees/ErtheiaClass/ErtheiaFighter.xml
@@ -3,6 +3,9 @@
 	<skillTree type="classSkillTree" classId="182">
 		<skill skillName="Lucky" skillId="194" skillLvl="1" getLevel="1" autoGet="true" />
 		<skill skillName="Common Craft" skillId="1322" skillLvl="1" getLevel="1" autoGet="true" />
+		<skill skillName="Divine Wind" skillId="30400" skillLvl="1" getLevel="1" autoGet="true" /> <!-- Race skill -->
+		<skill skillName="Efficacy" skillId="30402" skillLvl="1" getLevel="1" autoGet="true" /> <!-- Race skill -->
+		<skill skillName="Tenacity" skillId="30401" skillLvl="1" getLevel="1" autoGet="true" /> <!-- Race skill -->
 		<skill skillName="Expertise D" skillId="239" skillLvl="1" getLevel="20" autoGet="true" />
 		<skill skillName="Create Common Item" skillId="1320" skillLvl="2" getLevel="20" autoGet="true" />
 		<skill skillName="Eminent Fist Weapon Mastery" skillId="30540" skillLvl="2" getLevel="20" levelUpSp="6" />
diff --git a/trunk/dist/game/data/skillTrees/ErtheiaClass/ErtheiaWizard.xml b/trunk/dist/game/data/skillTrees/ErtheiaClass/ErtheiaWizard.xml
index 6505671a91..f5c9b83278 100644
--- a/trunk/dist/game/data/skillTrees/ErtheiaClass/ErtheiaWizard.xml
+++ b/trunk/dist/game/data/skillTrees/ErtheiaClass/ErtheiaWizard.xml
@@ -3,6 +3,9 @@
 	<skillTree type="classSkillTree" classId="183">
 		<skill skillName="Lucky" skillId="194" skillLvl="1" getLevel="1" autoGet="true" />
 		<skill skillName="Common Craft" skillId="1322" skillLvl="1" getLevel="1" autoGet="true" />
+		<skill skillName="Divine Wind" skillId="30400" skillLvl="1" getLevel="1" autoGet="true" /> <!-- Race skill -->
+		<skill skillName="Efficacy" skillId="30402" skillLvl="1" getLevel="1" autoGet="true" /> <!-- Race skill -->
+		<skill skillName="Tenacity" skillId="30401" skillLvl="1" getLevel="1" autoGet="true" /> <!-- Race skill -->
 		<skill skillName="Hydro Attack" skillId="30001" skillLvl="1" getLevel="1" autoGet="true" />
 		<skill skillName="Expertise D" skillId="239" skillLvl="1" getLevel="20" autoGet="true" />
 		<skill skillName="Create Common Item" skillId="1320" skillLvl="2" getLevel="20" autoGet="true" />
diff --git a/trunk/dist/game/data/skillTrees/ErtheiaClass/Eviscerator.xml b/trunk/dist/game/data/skillTrees/ErtheiaClass/Eviscerator.xml
index 994c1d1454..8109c20392 100644
--- a/trunk/dist/game/data/skillTrees/ErtheiaClass/Eviscerator.xml
+++ b/trunk/dist/game/data/skillTrees/ErtheiaClass/Eviscerator.xml
@@ -7,6 +7,8 @@
 		<skill skillName="Expertise R99" skillId="239" skillLvl="10" getLevel="99" autoGet="true" />
 		<skill skillName="Common Craft" skillId="1322" skillLvl="1" getLevel="1" autoGet="true" />
 		<skill skillName="Create Common Item" skillId="1320" skillLvl="10" getLevel="85" autoGet="true" />
+		<skill skillName="Eminent Attack Movement" skillId="30522" skillLvl="1" getLevel="40" levelUpSp="42" />
+		<skill skillName="Heavy Punch" skillId="30526" skillLvl="1" getLevel="76" levelUpSp="3000" />
 		
 		<skill skillName="Dual Maximum HP" skillId="1986" skillLvl="1" getLevel="85" getDualClassLevel="85" />
 		<skill skillName="Dual Maximum HP" skillId="1986" skillLvl="2" getLevel="90" getDualClassLevel="90" />
diff --git a/trunk/dist/game/data/skillTrees/ErtheiaClass/Marauder.xml b/trunk/dist/game/data/skillTrees/ErtheiaClass/Marauder.xml
index 859abcd400..9bb9b90232 100644
--- a/trunk/dist/game/data/skillTrees/ErtheiaClass/Marauder.xml
+++ b/trunk/dist/game/data/skillTrees/ErtheiaClass/Marauder.xml
@@ -70,9 +70,5 @@
 		<skill skillName="Eminent Light Armor Mastery" skillId="30541" skillLvl="5" getLevel="64" levelUpSp="443" />
 
 		<skill skillName="Eminent Stability" skillId="30542" skillLvl="2" getLevel="40" levelUpSp="42" />
-
-		<skill skillName="Windy Healing Potion" skillId="17920" skillLvl="1" getLevel="40">
-			<item id="57" count="724000" />
-		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/trunk/dist/game/data/skillTrees/raceSkillTree.xml b/trunk/dist/game/data/skillTrees/raceSkillTree.xml
index e937d5a0f7..a712131107 100644
--- a/trunk/dist/game/data/skillTrees/raceSkillTree.xml
+++ b/trunk/dist/game/data/skillTrees/raceSkillTree.xml
@@ -27,8 +27,8 @@
 		<skill skillName="Flying Body Reinforcement" skillId="1954" skillLvl="1" getLevel="1" autoGet="true" />
 	</skillTree>
 	<skillTree type="raceSkillTree" race="ERTHEIA">
-		<skill skillName="Divine Wind" skillId="30400" skillLvl="1" getLevel="1" autoGet="true" />
-		<skill skillName="Tenacity" skillId="30401" skillLvl="1" getLevel="1" autoGet="true" />
-		<skill skillName="Efficacy" skillId="30402" skillLvl="1" getLevel="1" autoGet="true" />
+		<skill skillName="Divine Wind" skillId="30400" skillLvl="2" getLevel="1" autoGet="true" />
+		<skill skillName="Tenacity" skillId="30401" skillLvl="2" getLevel="1" autoGet="true" />
+		<skill skillName="Efficacy" skillId="30402" skillLvl="2" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/trunk/dist/game/data/stats/skills/30400-30499.xml b/trunk/dist/game/data/stats/skills/30400-30499.xml
index 688ac46672..813106976a 100644
--- a/trunk/dist/game/data/stats/skills/30400-30499.xml
+++ b/trunk/dist/game/data/stats/skills/30400-30499.xml
@@ -1,24 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="30400" levels="2" name="Divine Wind">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Wind/Holy Resistance + 10. -->
+		<table name="#magicLvl"> 1 85 </table>
+		<table name="#res"> 10 20 </table>
 		<set name="icon" val="icon.skill30400" />
+		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="PASSIVE" />
 		<set name="targetType" val="SELF" />
+		<for>
+			<effect name="Buff">
+				<add stat="windRes" val="#res" />
+				<add stat="holyRes" val="#res" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="30401" levels="2" name="Tenacity">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Max. HP + 1%, Speed + 4. -->
+		<table name="#magicLvl"> 1 85 </table>
+		<table name="#maxHp"> 1.01 1.02 </table>
+		<table name="#spd"> 4 7 </table>
 		<set name="icon" val="icon.skill30401" />
+		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="PASSIVE" />
 		<set name="targetType" val="SELF" />
+		<for>
+			<effect name="Buff">
+				<mul stat="maxHp" val="#maxHp" />
+				<add stat="runSpd" val="#spd" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="30402" levels="2" name="Efficacy">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- MP Consumption - 1%. -->
+		<table name="#magicLvl"> 1 85 </table>
+		<table name="#mpConsumeRate"> 0.99 0.98 </table>
 		<set name="icon" val="icon.skill30402" />
+		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="PASSIVE" />
 		<set name="targetType" val="SELF" />
+		<for>
+			<effect name="Buff">
+				<mul stat="physicalMpConsumeRate" val="#mpConsumeRate" />
+				<mul stat="magicalMpConsumeRate" val="#mpConsumeRate" />
+			</effect>
+		</for>
 	</skill>
 </list>
\ No newline at end of file
diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java
index 0abeb4ea16..2db49d33a1 100644
--- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java
+++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java
@@ -338,11 +338,6 @@ public final class CharacterCreate extends L2GameClientPacket
 			}
 		}
 		
-		for (L2SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(newChar.getRace()))
-		{
-			newChar.addSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()), true);
-		}
-		
 		for (L2SkillLearn skill : SkillTreesData.getInstance().getAvailableSkills(newChar, newChar.getClassId(), false, true))
 		{
 			if (Config.DEBUG)