lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Checks for passive skill condition scope.

Browse Source
This commit is contained in:
MobiusDevelopment 2022-09-10 21:12:01 +00:00
parent 94872de9fc
commit fd4848b02a
36 changed files with 312 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -405,6 +405,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

12
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -405,6 +405,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

12
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -405,6 +405,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

12
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -405,6 +405,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

12
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -405,6 +405,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

12
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -405,6 +405,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

12
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -405,6 +405,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

12
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -405,6 +405,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

12
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -405,6 +405,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

12
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -405,6 +405,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

12
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -405,6 +405,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

4
L2J_Mobius_Classic_1.0/dist/game/data/xsd/skills.xsd vendored
View File

@ -347,8 +347,8 @@
</xs:element>
<xs:element minOccurs="0" name="teleportBookmarkSlots" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="minLevel">
<xs:complexType>
<xs:sequence>
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>

12
L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -408,6 +408,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

4
L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/xsd/skills.xsd vendored
View File

@ -347,8 +347,8 @@
</xs:element>
<xs:element minOccurs="0" name="teleportBookmarkSlots" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="minLevel">
<xs:complexType>
<xs:sequence>
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>

12
L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -408,6 +408,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

4
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/skills.xsd vendored
View File

@ -347,8 +347,8 @@
</xs:element>
<xs:element minOccurs="0" name="teleportBookmarkSlots" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="minLevel">
<xs:complexType>
<xs:sequence>
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>

12
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -408,6 +408,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

4
L2J_Mobius_Classic_2.5_Zaken/dist/game/data/xsd/skills.xsd vendored
View File

@ -364,8 +364,8 @@
</xs:element>
<xs:element minOccurs="0" name="teleportBookmarkSlots" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="minLevel">
<xs:complexType>
<xs:sequence>
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>

12
L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -408,6 +408,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

4
L2J_Mobius_Classic_2.7_Antharas/dist/game/data/xsd/skills.xsd vendored
View File

@ -364,8 +364,8 @@
</xs:element>
<xs:element minOccurs="0" name="teleportBookmarkSlots" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="minLevel">
<xs:complexType>
<xs:sequence>
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>

12
L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -408,6 +408,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

4
L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/xsd/skills.xsd vendored
View File

@ -364,8 +364,8 @@
</xs:element>
<xs:element minOccurs="0" name="teleportBookmarkSlots" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="minLevel">
<xs:complexType>
<xs:sequence>
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>

12
L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -408,6 +408,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

4
L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/xsd/skills.xsd vendored
View File

@ -364,8 +364,8 @@
</xs:element>
<xs:element minOccurs="0" name="teleportBookmarkSlots" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="minLevel">
<xs:complexType>
<xs:sequence>
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>

12
L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -408,6 +408,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

4
L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/xsd/skills.xsd vendored
View File

@ -364,8 +364,8 @@
</xs:element>
<xs:element minOccurs="0" name="teleportBookmarkSlots" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="minLevel">
<xs:complexType>
<xs:sequence>
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">
<xs:element maxOccurs="unbounded" name="value">
<xs:complexType>
<xs:simpleContent>

12
L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -408,6 +408,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

3
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/skills.xsd vendored
View File

@ -1669,8 +1669,8 @@
<xs:element name="condition">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="maxLevel" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="alignment" type="xs:string" />
<xs:element minOccurs="0" name="amount" type="xs:unsignedShort" />
<xs:element minOccurs="0" name="classIds">
<xs:complexType>
<xs:sequence>
@ -1688,6 +1688,7 @@
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="minLevel" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="maxLevel" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="includeMe" type="xs:boolean" />
<xs:element minOccurs="0" name="weaponType">
<xs:complexType>

12
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -407,6 +407,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

12
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -408,6 +408,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

3
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/skills.xsd vendored
View File

@ -1947,8 +1947,8 @@
<xs:element name="condition">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="maxLevel" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="alignment" type="xs:string" />
<xs:element minOccurs="0" name="amount" type="xs:unsignedShort" />
<xs:element minOccurs="0" name="classIds">
<xs:complexType>
<xs:sequence>
@ -1966,6 +1966,7 @@
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="minLevel" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="maxLevel" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="includeMe" type="xs:boolean" />
<xs:element minOccurs="0" name="weaponType">
<xs:complexType>

12
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -407,6 +407,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

3
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/skills.xsd vendored
View File

@ -2022,8 +2022,8 @@
<xs:element name="condition">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="maxLevel" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="alignment" type="xs:string" />
<xs:element minOccurs="0" name="amount" type="xs:unsignedShort" />
<xs:element minOccurs="0" name="classIds">
<xs:complexType>
<xs:sequence>
@ -2041,6 +2041,7 @@
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="minLevel" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="maxLevel" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="includeMe" type="xs:boolean" />
<xs:element minOccurs="0" name="weaponType">
<xs:complexType>

12
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -407,6 +407,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else

3
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/xsd/skills.xsd vendored
View File

@ -2070,8 +2070,8 @@
<xs:element name="condition">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="maxLevel" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="alignment" type="xs:string" />
<xs:element minOccurs="0" name="amount" type="xs:unsignedShort" />
<xs:element minOccurs="0" name="classIds">
<xs:complexType>
<xs:sequence>
@ -2089,6 +2089,7 @@
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="minLevel" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="maxLevel" type="xs:unsignedByte" />
<xs:element minOccurs="0" name="includeMe" type="xs:boolean" />
<xs:element minOccurs="0" name="weaponType">
<xs:complexType>

12
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/SkillData.java
View File

@ -407,6 +407,18 @@ public class SkillData implements IXmlReader
final Function<StatSet, ISkillCondition> conditionFunction = SkillConditionHandler.getInstance().getHandlerFactory(conditionName);
if (conditionFunction != null)
{
if (skill.isPassive())
{
if (skillConditionScope != SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Non passive condition for passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
}
else if (skillConditionScope == SkillConditionScope.PASSIVE)
{
LOGGER.warning(getClass().getSimpleName() + ": Passive condition for non passive Skill Id[" + statSet.getInt(".id") + "] Level[" + level + "] SubLevel[" + subLevel + "]");
}
skill.addCondition(skillConditionScope, conditionFunction.apply(params));
}
else