Addition of onlyReplaceByLearn skilltree parameter.

L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/skillTrees.xsd

@@ -32,6 +32,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -271,7 +271,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_2.5_Underground/dist/game/data/xsd/skillTrees.xsd

@@ -32,6 +32,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -271,7 +271,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_3.0_Helios/dist/game/data/xsd/skillTrees.xsd

@@ -32,6 +32,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -271,7 +271,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skillTrees.xsd

@@ -32,6 +32,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -271,7 +271,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skillTrees.xsd

@@ -32,6 +32,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -271,7 +271,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skillTrees.xsd

@@ -32,6 +32,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -271,7 +271,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skillTrees.xsd

@@ -31,6 +31,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -271,7 +271,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/skillTrees.xsd

@@ -31,6 +31,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -271,7 +271,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_8.0_Homunculus/dist/game/data/xsd/skillTrees.xsd

@@ -31,6 +31,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -271,7 +271,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/skillTrees.xsd

@@ -32,6 +32,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -271,7 +271,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/skillTrees.xsd

@@ -32,6 +32,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -271,7 +271,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/skillTrees.xsd

@@ -32,6 +32,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -271,7 +271,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/skillTrees.xsd

@@ -32,6 +32,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -271,7 +271,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/skillTrees.xsd

@@ -32,6 +32,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -271,7 +271,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/skillTrees.xsd

@@ -32,6 +32,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -270,7 +270,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_Classic_Interlude/dist/game/data/xsd/skillTrees.xsd

@@ -32,6 +32,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -271,7 +271,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/xsd/skillTrees.xsd

@@ -32,6 +32,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -270,7 +270,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}

L2J_Mobius_Essence_5.0_Sylph/dist/game/data/xsd/skillTrees.xsd

@@ -32,6 +32,7 @@
 										<xs:element name="removeSkill" minOccurs="0" maxOccurs="unbounded">
 											<xs:complexType>
 												<xs:attribute name="id" type="xs:positiveInteger" use="required" />
+												<xs:attribute name="onlyReplaceByLearn" type="xs:boolean" use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="socialClass" minOccurs="0" maxOccurs="1">

L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java

@@ -270,7 +270,10 @@ public class SkillTreeData implements IXmlReader
 										{
 											final int removeSkillId = parseInteger(attrs, "id");
 											skillLearn.addRemoveSkills(removeSkillId);
-											_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											if (!parseBoolean(attrs, "onlyReplaceByLearn", false))
+											{
+												_removeSkillCache.computeIfAbsent(classId, k -> new HashSet<>()).add(removeSkillId);
+											}
 											break;
 										}
 									}