From 42b3b3cae60121ff461014c7433bd26fdc37f617 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 29 Jul 2017 17:34:33 +0000
Subject: [PATCH] Minor transformation improvements.

---
 .../dist/game/data/skillTrees/Commons.xml     |  6 +-
 .../game/data/stats/skills/01800-01899.xml    | 87 +++++++++++++++++--
 .../game/data/stats/transformations/157.xml   |  2 -
 .../game/data/stats/transformations/158.xml   |  2 -
 .../game/data/stats/transformations/159.xml   |  2 -
 .../game/data/stats/transformations/160.xml   | 12 +--
 .../game/data/stats/transformations/161.xml   |  2 -
 .../game/data/stats/transformations/162.xml   |  2 -
 .../game/data/stats/transformations/163.xml   | 10 +--
 .../game/data/stats/transformations/164.xml   |  2 -
 .../game/data/stats/transformations/165.xml   | 20 ++---
 .../game/data/stats/transformations/166.xml   | 20 ++---
 .../game/data/stats/transformations/167.xml   | 20 ++---
 13 files changed, 118 insertions(+), 69 deletions(-)

diff --git a/L2J_Mobius_Classic/dist/game/data/skillTrees/Commons.xml b/L2J_Mobius_Classic/dist/game/data/skillTrees/Commons.xml
index e96d3ecf77..c6f7fe96cd 100644
--- a/L2J_Mobius_Classic/dist/game/data/skillTrees/Commons.xml
+++ b/L2J_Mobius_Classic/dist/game/data/skillTrees/Commons.xml
@@ -7,8 +7,8 @@
 		<skill skillName="Expertise B" skillId="239" skillLvl="3" getLevel="52" autoGet="true" />
 		<skill skillName="Expertise A" skillId="239" skillLvl="4" getLevel="61" autoGet="true" />
 
-		<skill skillName="Pirate" skillId="1800" skillLvl="1" getLevel="45" autoGet="true" />
-		<skill skillName="Dark Assassin" skillId="1801" skillLvl="1" getLevel="60" autoGet="true" />
-		<skill skillName="White Assassin" skillId="1802" skillLvl="1" getLevel="70" autoGet="true" />
+		<!-- <skill skillName="Pirate" skillId="1800" skillLvl="1" getLevel="45" autoGet="true" /> Does not exist in Saviors client -->
+		<!-- <skill skillName="Dark Assassin" skillId="1801" skillLvl="1" getLevel="60" autoGet="true" /> Does not exist in Saviors client -->
+		<!-- <skill skillName="White Assassin" skillId="1802" skillLvl="1" getLevel="70" autoGet="true" /> Does not exist in Saviors client -->
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/skills/01800-01899.xml b/L2J_Mobius_Classic/dist/game/data/stats/skills/01800-01899.xml
index d843ffff96..62332942c8 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/skills/01800-01899.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/skills/01800-01899.xml
@@ -1,19 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="1800" toLevel="1" name="Pirate">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>300</abnormalTime>
+		<abnormalType>TRANSFORM</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
+		<effectPoint>1</effectPoint>
+		<icon>icon.skill1800</icon>
+		<isMagic>1</isMagic> <!-- Magic Skill -->
+		<magicLvl>56</magicLvl>
+		<operateType>A2</operateType>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<irreplacableBuff>true</irreplacableBuff>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="CanTransform">
+				<transformId>165</transformId> <!-- TODO: proper id -->
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="Transformation">
+				<transformationId>165</transformationId> <!-- TODO: proper id -->
+			</effect>
+		</effects>
 	</skill>
 	<skill id="1801" toLevel="1" name="Dark Assassin">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>300</abnormalTime>
+		<abnormalType>TRANSFORM</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
+		<effectPoint>1</effectPoint>
+		<icon>icon.skill1801</icon>
+		<isMagic>1</isMagic> <!-- Magic Skill -->
+		<magicLvl>56</magicLvl>
+		<operateType>A2</operateType>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<irreplacableBuff>true</irreplacableBuff>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="CanTransform">
+				<transformId>166</transformId> <!-- TODO: proper id -->
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="Transformation">
+				<transformationId>166</transformationId> <!-- TODO: proper id -->
+			</effect>
+		</effects>
 	</skill>
 	<skill id="1802" toLevel="1" name="White Assassin">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>300</abnormalTime>
+		<abnormalType>TRANSFORM</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
+		<effectPoint>1</effectPoint>
+		<icon>icon.skill1802</icon>
+		<isMagic>1</isMagic> <!-- Magic Skill -->
+		<magicLvl>56</magicLvl>
+		<operateType>A2</operateType>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<irreplacableBuff>true</irreplacableBuff>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="CanTransform">
+				<transformId>167</transformId> <!-- TODO: proper id -->
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="Transformation">
+				<transformationId>167</transformationId> <!-- TODO: proper id -->
+			</effect>
+		</effects>
 	</skill>
 	<skill id="1810" toLevel="1" name="">
 		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/transformations/157.xml b/L2J_Mobius_Classic/dist/game/data/stats/transformations/157.xml
index 76cedab30c..ec0bad035e 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/transformations/157.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/transformations/157.xml
@@ -11,7 +11,6 @@
 			<skills>
 				<skill id="9210" level="1" /> <!-- Dismount -->
 				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
 			</skills>
 		</Male>
 		<Female>
@@ -24,7 +23,6 @@
 			<skills>
 				<skill id="9210" level="1" /> <!-- Dismount -->
 				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
 			</skills>
 		</Female>
 	</transform>
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/transformations/158.xml b/L2J_Mobius_Classic/dist/game/data/stats/transformations/158.xml
index 5e6b1ac2d0..04148fdaa0 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/transformations/158.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/transformations/158.xml
@@ -11,7 +11,6 @@
 			<skills>
 				<skill id="9210" level="1" /> <!-- Dismount -->
 				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
 			</skills>
 		</Male>
 		<Female>
@@ -24,7 +23,6 @@
 			<skills>
 				<skill id="9210" level="1" /> <!-- Dismount -->
 				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
 			</skills>
 		</Female>
 	</transform>
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/transformations/159.xml b/L2J_Mobius_Classic/dist/game/data/stats/transformations/159.xml
index 354a033329..c55202791a 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/transformations/159.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/transformations/159.xml
@@ -11,7 +11,6 @@
 			<skills>
 				<skill id="9210" level="1" /> <!-- Dismount -->
 				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
 			</skills>
 		</Male>
 		<Female>
@@ -24,7 +23,6 @@
 			<skills>
 				<skill id="9210" level="1" /> <!-- Dismount -->
 				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
 			</skills>
 		</Female>
 	</transform>
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/transformations/160.xml b/L2J_Mobius_Classic/dist/game/data/stats/transformations/160.xml
index da59b7a441..af6d766ee1 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/transformations/160.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/transformations/160.xml
@@ -5,11 +5,11 @@
 			<common>
 				<base range="20" attackSpeed="300" attackType="SWORD" critRate="5" mAtk="5" pAtk="5" randomDamage="10" />
 				<collision radius="25" height="22.5" />
-				<moving walk="30" run="170" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
+				<moving walk="45" run="170" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
 			</common>
-			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
+			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
 			<skills>
-				<skill id="839" level="1" /> <!-- Dismount -->
+				<skill id="9210" level="1" /> <!-- Dismount -->
 				<skill id="5437" level="2" /> <!-- Dissonance -->
 			</skills>
 		</Male>
@@ -17,11 +17,11 @@
 			<common>
 				<base range="20" attackSpeed="300" attackType="SWORD" critRate="5" mAtk="5" pAtk="5" randomDamage="10" />
 				<collision radius="25" height="22.5" />
-				<moving walk="53" run="170" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
+				<moving walk="45" run="170" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
 			</common>
-			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
+			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
 			<skills>
-				<skill id="839" level="1" /> <!-- Dismount -->
+				<skill id="9210" level="1" /> <!-- Dismount -->
 				<skill id="5437" level="2" /> <!-- Dissonance -->
 			</skills>
 		</Female>
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/transformations/161.xml b/L2J_Mobius_Classic/dist/game/data/stats/transformations/161.xml
index cd23adeddf..f7fb408dc4 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/transformations/161.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/transformations/161.xml
@@ -11,7 +11,6 @@
 			<skills>
 				<skill id="9210" level="1" /> <!-- Dismount -->
 				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
 			</skills>
 		</Male>
 		<Female>
@@ -24,7 +23,6 @@
 			<skills>
 				<skill id="9210" level="1" /> <!-- Dismount -->
 				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
 			</skills>
 		</Female>
 	</transform>
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/transformations/162.xml b/L2J_Mobius_Classic/dist/game/data/stats/transformations/162.xml
index cdeee4682a..72a9072a3b 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/transformations/162.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/transformations/162.xml
@@ -11,7 +11,6 @@
 			<skills>
 				<skill id="9210" level="1" /> <!-- Dismount -->
 				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
 			</skills>
 		</Male>
 		<Female>
@@ -24,7 +23,6 @@
 			<skills>
 				<skill id="9210" level="1" /> <!-- Dismount -->
 				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
 			</skills>
 		</Female>
 	</transform>
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/transformations/163.xml b/L2J_Mobius_Classic/dist/game/data/stats/transformations/163.xml
index 9b34780d4d..5c52c0b289 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/transformations/163.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/transformations/163.xml
@@ -3,28 +3,26 @@
 	<transform id="163" type="RIDING_MODE" can_swim="0" normal_attackable="0">
 		<Male>
 			<common>
-				<base range="20" attackSpeed="300" attackType="SWORD" critRate="5" mAtk="5" pAtk="5" randomDamage="10" />
-				<collision radius="20" height="29.4" />
+				<base range="20" attackSpeed="300" attackType="FIST" critRate="5" mAtk="5" pAtk="5" randomDamage="10" />
+				<collision radius="20" height="40" />
 				<moving walk="45" run="170" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
 			</common>
 			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
 			<skills>
 				<skill id="9210" level="1" /> <!-- Dismount -->
 				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
 			</skills>
 		</Male>
 		<Female>
 			<common>
-				<base range="20" attackSpeed="300" attackType="SWORD" critRate="5" mAtk="5" pAtk="5" randomDamage="10" />
-				<collision radius="21" height="30.2" />
+				<base range="20" attackSpeed="300" attackType="FIST" critRate="5" mAtk="5" pAtk="5" randomDamage="10" />
+				<collision radius="20" height="40" />
 				<moving walk="45" run="170" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
 			</common>
 			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
 			<skills>
 				<skill id="9210" level="1" /> <!-- Dismount -->
 				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
 			</skills>
 		</Female>
 	</transform>
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/transformations/164.xml b/L2J_Mobius_Classic/dist/game/data/stats/transformations/164.xml
index f4ffeb20bf..407e2e5295 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/transformations/164.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/transformations/164.xml
@@ -11,7 +11,6 @@
 			<skills>
 				<skill id="9210" level="1" /> <!-- Dismount -->
 				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
 			</skills>
 		</Male>
 		<Female>
@@ -24,7 +23,6 @@
 			<skills>
 				<skill id="9210" level="1" /> <!-- Dismount -->
 				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
 			</skills>
 		</Female>
 	</transform>
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/transformations/165.xml b/L2J_Mobius_Classic/dist/game/data/stats/transformations/165.xml
index 3f7ecabeee..8a948c8c6c 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/transformations/165.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/transformations/165.xml
@@ -1,30 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/transformations.xsd">
-	<transform id="165" type="RIDING_MODE" can_swim="0" normal_attackable="0">
+	<transform id="165" type="NON_COMBAT" can_swim="0" normal_attackable="0">
 		<Male>
 			<common>
 				<base range="20" attackSpeed="300" attackType="SWORD" critRate="5" mAtk="5" pAtk="5" randomDamage="10" />
 				<collision radius="20" height="29" />
-				<moving walk="45" run="170" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
+				<moving walk="50" run="137" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
 			</common>
-			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
+			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
 			<skills>
-				<skill id="9210" level="1" /> <!-- Dismount -->
-				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
+				<skill id="619" level="1" /> <!-- Dispel Transform -->
+				<skill id="5437" level="1" /> <!-- Dissonance -->
 			</skills>
 		</Male>
 		<Female>
 			<common>
 				<base range="20" attackSpeed="300" attackType="SWORD" critRate="5" mAtk="5" pAtk="5" randomDamage="10" />
 				<collision radius="20" height="29" />
-				<moving walk="45" run="170" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
+				<moving walk="50" run="137" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
 			</common>
-			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
+			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
 			<skills>
-				<skill id="9210" level="1" /> <!-- Dismount -->
-				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
+				<skill id="619" level="1" /> <!-- Dispel Transform -->
+				<skill id="5437" level="1" /> <!-- Dissonance -->
 			</skills>
 		</Female>
 	</transform>
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/transformations/166.xml b/L2J_Mobius_Classic/dist/game/data/stats/transformations/166.xml
index 66045a35ee..67bffc43f1 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/transformations/166.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/transformations/166.xml
@@ -1,30 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/transformations.xsd">
-	<transform id="166" type="RIDING_MODE" can_swim="0" normal_attackable="0">
+	<transform id="166" type="NON_COMBAT" can_swim="0" normal_attackable="0">
 		<Male>
 			<common>
 				<base range="20" attackSpeed="300" attackType="SWORD" critRate="5" mAtk="5" pAtk="5" randomDamage="10" />
 				<collision radius="20" height="29" />
-				<moving walk="45" run="170" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
+				<moving walk="50" run="137" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
 			</common>
-			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
+			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
 			<skills>
-				<skill id="9210" level="1" /> <!-- Dismount -->
-				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
+				<skill id="619" level="1" /> <!-- Dispel Transform -->
+				<skill id="5437" level="1" /> <!-- Dissonance -->
 			</skills>
 		</Male>
 		<Female>
 			<common>
 				<base range="20" attackSpeed="300" attackType="SWORD" critRate="5" mAtk="5" pAtk="5" randomDamage="10" />
 				<collision radius="20" height="29" />
-				<moving walk="45" run="170" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
+				<moving walk="50" run="137" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
 			</common>
-			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
+			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
 			<skills>
-				<skill id="9210" level="1" /> <!-- Dismount -->
-				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
+				<skill id="619" level="1" /> <!-- Dispel Transform -->
+				<skill id="5437" level="1" /> <!-- Dissonance -->
 			</skills>
 		</Female>
 	</transform>
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/transformations/167.xml b/L2J_Mobius_Classic/dist/game/data/stats/transformations/167.xml
index a4f895d121..402d901bd2 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/transformations/167.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/transformations/167.xml
@@ -1,30 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/transformations.xsd">
-	<transform id="167" type="RIDING_MODE" can_swim="0" normal_attackable="0">
+	<transform id="168" type="NON_COMBAT" can_swim="0" normal_attackable="0">
 		<Male>
 			<common>
 				<base range="20" attackSpeed="300" attackType="SWORD" critRate="5" mAtk="5" pAtk="5" randomDamage="10" />
 				<collision radius="20" height="29" />
-				<moving walk="45" run="170" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
+				<moving walk="50" run="137" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
 			</common>
-			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
+			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
 			<skills>
-				<skill id="9210" level="1" /> <!-- Dismount -->
-				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
+				<skill id="619" level="1" /> <!-- Dispel Transform -->
+				<skill id="5437" level="1" /> <!-- Dissonance -->
 			</skills>
 		</Male>
 		<Female>
 			<common>
 				<base range="20" attackSpeed="300" attackType="SWORD" critRate="5" mAtk="5" pAtk="5" randomDamage="10" />
 				<collision radius="20" height="29" />
-				<moving walk="45" run="170" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
+				<moving walk="50" run="137" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
 			</common>
-			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
+			<actions>1 3 4 5 6 7 8 9 11 15 16 17 18 19 21 22 23 32 36 39 40 41 42 43 44 45 46 47 48 50 52 53 54 55 56 57 63 64 65 70 86 1000 1001 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 1099 1100 1101 1102 1103 1104 1106 1107 1108 1109 1110 1111 1113 1114 1115 1116 1117 1118 1120 1121</actions>
 			<skills>
-				<skill id="9210" level="1" /> <!-- Dismount -->
-				<skill id="5437" level="2" /> <!-- Dissonance -->
-				<skill id="9206" level="1" /> <!-- Fast Run -->
+				<skill id="619" level="1" /> <!-- Dispel Transform -->
+				<skill id="5437" level="1" /> <!-- Dissonance -->
 			</skills>
 		</Female>
 	</transform>