Dropped Transform method allowAllSkills.
This commit is contained in:
@@ -433,14 +433,6 @@
|
|||||||
</xs:attribute>
|
</xs:attribute>
|
||||||
<xs:attribute name="setName" type="xs:string" use="optional" />
|
<xs:attribute name="setName" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="allow_all_skills" use="optional">
|
|
||||||
<xs:simpleType>
|
|
||||||
<xs:restriction base="xs:nonNegativeInteger">
|
|
||||||
<xs:minInclusive value="0" />
|
|
||||||
<xs:maxInclusive value="1" />
|
|
||||||
</xs:restriction>
|
|
||||||
</xs:simpleType>
|
|
||||||
</xs:attribute>
|
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
|
|||||||
-14
@@ -8376,12 +8376,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isTransformed() && !hasTransformSkill(skill))
|
|
||||||
{
|
|
||||||
sendPacket(ActionFailed.STATIC_PACKET);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
||||||
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
||||||
{
|
{
|
||||||
@@ -11763,11 +11757,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
|
|
||||||
public boolean hasTransformSkill(Skill skill)
|
public boolean hasTransformSkill(Skill skill)
|
||||||
{
|
{
|
||||||
if (checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -11809,8 +11798,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
{
|
{
|
||||||
final Map<Integer, Skill> transformSkills = _transformSkills;
|
final Map<Integer, Skill> transformSkills = _transformSkills;
|
||||||
if (transformSkills != null)
|
if (transformSkills != null)
|
||||||
{
|
|
||||||
if (!checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
{
|
||||||
// Include transformation skills and those skills that are allowed during transformation.
|
// Include transformation skills and those skills that are allowed during transformation.
|
||||||
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
||||||
@@ -11842,7 +11829,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
// Include transformation skills.
|
// Include transformation skills.
|
||||||
currentSkills.addAll(transformSkills.values());
|
currentSkills.addAll(transformSkills.values());
|
||||||
}
|
}
|
||||||
|
|||||||
-10
@@ -53,7 +53,6 @@ public final class Transform implements IIdentifiable
|
|||||||
private final boolean _canAttack;
|
private final boolean _canAttack;
|
||||||
private final String _name;
|
private final String _name;
|
||||||
private final String _title;
|
private final String _title;
|
||||||
private final boolean _allowAllSkills;
|
|
||||||
|
|
||||||
private TransformTemplate _maleTemplate;
|
private TransformTemplate _maleTemplate;
|
||||||
private TransformTemplate _femaleTemplate;
|
private TransformTemplate _femaleTemplate;
|
||||||
@@ -68,7 +67,6 @@ public final class Transform implements IIdentifiable
|
|||||||
_spawnHeight = set.getInt("spawn_height", 0);
|
_spawnHeight = set.getInt("spawn_height", 0);
|
||||||
_name = set.getString("setName", null);
|
_name = set.getString("setName", null);
|
||||||
_title = set.getString("setTitle", null);
|
_title = set.getString("setTitle", null);
|
||||||
_allowAllSkills = set.getInt("allow_all_skills", 1) == 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -148,14 +146,6 @@ public final class Transform implements IIdentifiable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Allow all skills for this transformation.
|
|
||||||
*/
|
|
||||||
public boolean allowAllSkills()
|
|
||||||
{
|
|
||||||
return _allowAllSkills;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -433,14 +433,6 @@
|
|||||||
</xs:attribute>
|
</xs:attribute>
|
||||||
<xs:attribute name="setName" type="xs:string" use="optional" />
|
<xs:attribute name="setName" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="allow_all_skills" use="optional">
|
|
||||||
<xs:simpleType>
|
|
||||||
<xs:restriction base="xs:nonNegativeInteger">
|
|
||||||
<xs:minInclusive value="0" />
|
|
||||||
<xs:maxInclusive value="1" />
|
|
||||||
</xs:restriction>
|
|
||||||
</xs:simpleType>
|
|
||||||
</xs:attribute>
|
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
|
|||||||
-14
@@ -8383,12 +8383,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isTransformed() && !hasTransformSkill(skill))
|
|
||||||
{
|
|
||||||
sendPacket(ActionFailed.STATIC_PACKET);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
||||||
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
||||||
{
|
{
|
||||||
@@ -11770,11 +11764,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
|
|
||||||
public boolean hasTransformSkill(Skill skill)
|
public boolean hasTransformSkill(Skill skill)
|
||||||
{
|
{
|
||||||
if (checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -11816,8 +11805,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
{
|
{
|
||||||
final Map<Integer, Skill> transformSkills = _transformSkills;
|
final Map<Integer, Skill> transformSkills = _transformSkills;
|
||||||
if (transformSkills != null)
|
if (transformSkills != null)
|
||||||
{
|
|
||||||
if (!checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
{
|
||||||
// Include transformation skills and those skills that are allowed during transformation.
|
// Include transformation skills and those skills that are allowed during transformation.
|
||||||
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
||||||
@@ -11849,7 +11836,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
// Include transformation skills.
|
// Include transformation skills.
|
||||||
currentSkills.addAll(transformSkills.values());
|
currentSkills.addAll(transformSkills.values());
|
||||||
}
|
}
|
||||||
|
|||||||
-10
@@ -53,7 +53,6 @@ public final class Transform implements IIdentifiable
|
|||||||
private final boolean _canAttack;
|
private final boolean _canAttack;
|
||||||
private final String _name;
|
private final String _name;
|
||||||
private final String _title;
|
private final String _title;
|
||||||
private final boolean _allowAllSkills;
|
|
||||||
|
|
||||||
private TransformTemplate _maleTemplate;
|
private TransformTemplate _maleTemplate;
|
||||||
private TransformTemplate _femaleTemplate;
|
private TransformTemplate _femaleTemplate;
|
||||||
@@ -68,7 +67,6 @@ public final class Transform implements IIdentifiable
|
|||||||
_spawnHeight = set.getInt("spawn_height", 0);
|
_spawnHeight = set.getInt("spawn_height", 0);
|
||||||
_name = set.getString("setName", null);
|
_name = set.getString("setName", null);
|
||||||
_title = set.getString("setTitle", null);
|
_title = set.getString("setTitle", null);
|
||||||
_allowAllSkills = set.getInt("allow_all_skills", 1) == 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -148,14 +146,6 @@ public final class Transform implements IIdentifiable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Allow all skills for this transformation.
|
|
||||||
*/
|
|
||||||
public boolean allowAllSkills()
|
|
||||||
{
|
|
||||||
return _allowAllSkills;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -433,14 +433,6 @@
|
|||||||
</xs:attribute>
|
</xs:attribute>
|
||||||
<xs:attribute name="setName" type="xs:string" use="optional" />
|
<xs:attribute name="setName" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="allow_all_skills" use="optional">
|
|
||||||
<xs:simpleType>
|
|
||||||
<xs:restriction base="xs:nonNegativeInteger">
|
|
||||||
<xs:minInclusive value="0" />
|
|
||||||
<xs:maxInclusive value="1" />
|
|
||||||
</xs:restriction>
|
|
||||||
</xs:simpleType>
|
|
||||||
</xs:attribute>
|
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
|
|||||||
-14
@@ -8385,12 +8385,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isTransformed() && !hasTransformSkill(skill))
|
|
||||||
{
|
|
||||||
sendPacket(ActionFailed.STATIC_PACKET);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
||||||
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
||||||
{
|
{
|
||||||
@@ -11780,11 +11774,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
|
|
||||||
public boolean hasTransformSkill(Skill skill)
|
public boolean hasTransformSkill(Skill skill)
|
||||||
{
|
{
|
||||||
if (checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -11826,8 +11815,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
{
|
{
|
||||||
final Map<Integer, Skill> transformSkills = _transformSkills;
|
final Map<Integer, Skill> transformSkills = _transformSkills;
|
||||||
if (transformSkills != null)
|
if (transformSkills != null)
|
||||||
{
|
|
||||||
if (!checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
{
|
||||||
// Include transformation skills and those skills that are allowed during transformation.
|
// Include transformation skills and those skills that are allowed during transformation.
|
||||||
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
||||||
@@ -11859,7 +11846,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
// Include transformation skills.
|
// Include transformation skills.
|
||||||
currentSkills.addAll(transformSkills.values());
|
currentSkills.addAll(transformSkills.values());
|
||||||
}
|
}
|
||||||
|
|||||||
-10
@@ -53,7 +53,6 @@ public final class Transform implements IIdentifiable
|
|||||||
private final boolean _canAttack;
|
private final boolean _canAttack;
|
||||||
private final String _name;
|
private final String _name;
|
||||||
private final String _title;
|
private final String _title;
|
||||||
private final boolean _allowAllSkills;
|
|
||||||
|
|
||||||
private TransformTemplate _maleTemplate;
|
private TransformTemplate _maleTemplate;
|
||||||
private TransformTemplate _femaleTemplate;
|
private TransformTemplate _femaleTemplate;
|
||||||
@@ -68,7 +67,6 @@ public final class Transform implements IIdentifiable
|
|||||||
_spawnHeight = set.getInt("spawn_height", 0);
|
_spawnHeight = set.getInt("spawn_height", 0);
|
||||||
_name = set.getString("setName", null);
|
_name = set.getString("setName", null);
|
||||||
_title = set.getString("setTitle", null);
|
_title = set.getString("setTitle", null);
|
||||||
_allowAllSkills = set.getInt("allow_all_skills", 1) == 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -148,14 +146,6 @@ public final class Transform implements IIdentifiable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Allow all skills for this transformation.
|
|
||||||
*/
|
|
||||||
public boolean allowAllSkills()
|
|
||||||
{
|
|
||||||
return _allowAllSkills;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -433,14 +433,6 @@
|
|||||||
</xs:attribute>
|
</xs:attribute>
|
||||||
<xs:attribute name="setName" type="xs:string" use="optional" />
|
<xs:attribute name="setName" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="allow_all_skills" use="optional">
|
|
||||||
<xs:simpleType>
|
|
||||||
<xs:restriction base="xs:nonNegativeInteger">
|
|
||||||
<xs:minInclusive value="0" />
|
|
||||||
<xs:maxInclusive value="1" />
|
|
||||||
</xs:restriction>
|
|
||||||
</xs:simpleType>
|
|
||||||
</xs:attribute>
|
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
|
|||||||
-14
@@ -8383,12 +8383,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isTransformed() && !hasTransformSkill(skill))
|
|
||||||
{
|
|
||||||
sendPacket(ActionFailed.STATIC_PACKET);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
||||||
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
||||||
{
|
{
|
||||||
@@ -11764,11 +11758,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
|
|
||||||
public boolean hasTransformSkill(Skill skill)
|
public boolean hasTransformSkill(Skill skill)
|
||||||
{
|
{
|
||||||
if (checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -11810,8 +11799,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
{
|
{
|
||||||
final Map<Integer, Skill> transformSkills = _transformSkills;
|
final Map<Integer, Skill> transformSkills = _transformSkills;
|
||||||
if (transformSkills != null)
|
if (transformSkills != null)
|
||||||
{
|
|
||||||
if (!checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
{
|
||||||
// Include transformation skills and those skills that are allowed during transformation.
|
// Include transformation skills and those skills that are allowed during transformation.
|
||||||
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
||||||
@@ -11843,7 +11830,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
// Include transformation skills.
|
// Include transformation skills.
|
||||||
currentSkills.addAll(transformSkills.values());
|
currentSkills.addAll(transformSkills.values());
|
||||||
}
|
}
|
||||||
|
|||||||
-10
@@ -53,7 +53,6 @@ public final class Transform implements IIdentifiable
|
|||||||
private final boolean _canAttack;
|
private final boolean _canAttack;
|
||||||
private final String _name;
|
private final String _name;
|
||||||
private final String _title;
|
private final String _title;
|
||||||
private final boolean _allowAllSkills;
|
|
||||||
|
|
||||||
private TransformTemplate _maleTemplate;
|
private TransformTemplate _maleTemplate;
|
||||||
private TransformTemplate _femaleTemplate;
|
private TransformTemplate _femaleTemplate;
|
||||||
@@ -68,7 +67,6 @@ public final class Transform implements IIdentifiable
|
|||||||
_spawnHeight = set.getInt("spawn_height", 0);
|
_spawnHeight = set.getInt("spawn_height", 0);
|
||||||
_name = set.getString("setName", null);
|
_name = set.getString("setName", null);
|
||||||
_title = set.getString("setTitle", null);
|
_title = set.getString("setTitle", null);
|
||||||
_allowAllSkills = set.getInt("allow_all_skills", 1) == 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -148,14 +146,6 @@ public final class Transform implements IIdentifiable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Allow all skills for this transformation.
|
|
||||||
*/
|
|
||||||
public boolean allowAllSkills()
|
|
||||||
{
|
|
||||||
return _allowAllSkills;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -433,14 +433,6 @@
|
|||||||
</xs:attribute>
|
</xs:attribute>
|
||||||
<xs:attribute name="setName" type="xs:string" use="optional" />
|
<xs:attribute name="setName" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="allow_all_skills" use="optional">
|
|
||||||
<xs:simpleType>
|
|
||||||
<xs:restriction base="xs:nonNegativeInteger">
|
|
||||||
<xs:minInclusive value="0" />
|
|
||||||
<xs:maxInclusive value="1" />
|
|
||||||
</xs:restriction>
|
|
||||||
</xs:simpleType>
|
|
||||||
</xs:attribute>
|
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
|
|||||||
-14
@@ -8385,12 +8385,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isTransformed() && !hasTransformSkill(skill))
|
|
||||||
{
|
|
||||||
sendPacket(ActionFailed.STATIC_PACKET);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
||||||
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
||||||
{
|
{
|
||||||
@@ -11770,11 +11764,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
|
|
||||||
public boolean hasTransformSkill(Skill skill)
|
public boolean hasTransformSkill(Skill skill)
|
||||||
{
|
{
|
||||||
if (checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -11816,8 +11805,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
{
|
{
|
||||||
final Map<Integer, Skill> transformSkills = _transformSkills;
|
final Map<Integer, Skill> transformSkills = _transformSkills;
|
||||||
if (transformSkills != null)
|
if (transformSkills != null)
|
||||||
{
|
|
||||||
if (!checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
{
|
||||||
// Include transformation skills and those skills that are allowed during transformation.
|
// Include transformation skills and those skills that are allowed during transformation.
|
||||||
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
||||||
@@ -11849,7 +11836,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
// Include transformation skills.
|
// Include transformation skills.
|
||||||
currentSkills.addAll(transformSkills.values());
|
currentSkills.addAll(transformSkills.values());
|
||||||
}
|
}
|
||||||
|
|||||||
-10
@@ -53,7 +53,6 @@ public final class Transform implements IIdentifiable
|
|||||||
private final boolean _canAttack;
|
private final boolean _canAttack;
|
||||||
private final String _name;
|
private final String _name;
|
||||||
private final String _title;
|
private final String _title;
|
||||||
private final boolean _allowAllSkills;
|
|
||||||
|
|
||||||
private TransformTemplate _maleTemplate;
|
private TransformTemplate _maleTemplate;
|
||||||
private TransformTemplate _femaleTemplate;
|
private TransformTemplate _femaleTemplate;
|
||||||
@@ -68,7 +67,6 @@ public final class Transform implements IIdentifiable
|
|||||||
_spawnHeight = set.getInt("spawn_height", 0);
|
_spawnHeight = set.getInt("spawn_height", 0);
|
||||||
_name = set.getString("setName", null);
|
_name = set.getString("setName", null);
|
||||||
_title = set.getString("setTitle", null);
|
_title = set.getString("setTitle", null);
|
||||||
_allowAllSkills = set.getInt("allow_all_skills", 1) == 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -148,14 +146,6 @@ public final class Transform implements IIdentifiable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Allow all skills for this transformation.
|
|
||||||
*/
|
|
||||||
public boolean allowAllSkills()
|
|
||||||
{
|
|
||||||
return _allowAllSkills;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -433,14 +433,6 @@
|
|||||||
</xs:attribute>
|
</xs:attribute>
|
||||||
<xs:attribute name="setName" type="xs:string" use="optional" />
|
<xs:attribute name="setName" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="allow_all_skills" use="optional">
|
|
||||||
<xs:simpleType>
|
|
||||||
<xs:restriction base="xs:nonNegativeInteger">
|
|
||||||
<xs:minInclusive value="0" />
|
|
||||||
<xs:maxInclusive value="1" />
|
|
||||||
</xs:restriction>
|
|
||||||
</xs:simpleType>
|
|
||||||
</xs:attribute>
|
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
|
|||||||
-14
@@ -8385,12 +8385,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isTransformed() && !hasTransformSkill(skill))
|
|
||||||
{
|
|
||||||
sendPacket(ActionFailed.STATIC_PACKET);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
||||||
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
||||||
{
|
{
|
||||||
@@ -11770,11 +11764,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
|
|
||||||
public boolean hasTransformSkill(Skill skill)
|
public boolean hasTransformSkill(Skill skill)
|
||||||
{
|
{
|
||||||
if (checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -11816,8 +11805,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
{
|
{
|
||||||
final Map<Integer, Skill> transformSkills = _transformSkills;
|
final Map<Integer, Skill> transformSkills = _transformSkills;
|
||||||
if (transformSkills != null)
|
if (transformSkills != null)
|
||||||
{
|
|
||||||
if (!checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
{
|
||||||
// Include transformation skills and those skills that are allowed during transformation.
|
// Include transformation skills and those skills that are allowed during transformation.
|
||||||
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
||||||
@@ -11849,7 +11836,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
// Include transformation skills.
|
// Include transformation skills.
|
||||||
currentSkills.addAll(transformSkills.values());
|
currentSkills.addAll(transformSkills.values());
|
||||||
}
|
}
|
||||||
|
|||||||
-10
@@ -53,7 +53,6 @@ public final class Transform implements IIdentifiable
|
|||||||
private final boolean _canAttack;
|
private final boolean _canAttack;
|
||||||
private final String _name;
|
private final String _name;
|
||||||
private final String _title;
|
private final String _title;
|
||||||
private final boolean _allowAllSkills;
|
|
||||||
|
|
||||||
private TransformTemplate _maleTemplate;
|
private TransformTemplate _maleTemplate;
|
||||||
private TransformTemplate _femaleTemplate;
|
private TransformTemplate _femaleTemplate;
|
||||||
@@ -68,7 +67,6 @@ public final class Transform implements IIdentifiable
|
|||||||
_spawnHeight = set.getInt("spawn_height", 0);
|
_spawnHeight = set.getInt("spawn_height", 0);
|
||||||
_name = set.getString("setName", null);
|
_name = set.getString("setName", null);
|
||||||
_title = set.getString("setTitle", null);
|
_title = set.getString("setTitle", null);
|
||||||
_allowAllSkills = set.getInt("allow_all_skills", 1) == 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -148,14 +146,6 @@ public final class Transform implements IIdentifiable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Allow all skills for this transformation.
|
|
||||||
*/
|
|
||||||
public boolean allowAllSkills()
|
|
||||||
{
|
|
||||||
return _allowAllSkills;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -433,14 +433,6 @@
|
|||||||
</xs:attribute>
|
</xs:attribute>
|
||||||
<xs:attribute name="setName" type="xs:string" use="optional" />
|
<xs:attribute name="setName" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="allow_all_skills" use="optional">
|
|
||||||
<xs:simpleType>
|
|
||||||
<xs:restriction base="xs:nonNegativeInteger">
|
|
||||||
<xs:minInclusive value="0" />
|
|
||||||
<xs:maxInclusive value="1" />
|
|
||||||
</xs:restriction>
|
|
||||||
</xs:simpleType>
|
|
||||||
</xs:attribute>
|
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
|
|||||||
-14
@@ -8327,12 +8327,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isTransformed() && !hasTransformSkill(skill))
|
|
||||||
{
|
|
||||||
sendPacket(ActionFailed.STATIC_PACKET);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
||||||
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
||||||
{
|
{
|
||||||
@@ -11604,11 +11598,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
|
|
||||||
public boolean hasTransformSkill(Skill skill)
|
public boolean hasTransformSkill(Skill skill)
|
||||||
{
|
{
|
||||||
if (checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -11650,8 +11639,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
{
|
{
|
||||||
final Map<Integer, Skill> transformSkills = _transformSkills;
|
final Map<Integer, Skill> transformSkills = _transformSkills;
|
||||||
if (transformSkills != null)
|
if (transformSkills != null)
|
||||||
{
|
|
||||||
if (!checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
{
|
||||||
// Include transformation skills and those skills that are allowed during transformation.
|
// Include transformation skills and those skills that are allowed during transformation.
|
||||||
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
||||||
@@ -11683,7 +11670,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
// Include transformation skills.
|
// Include transformation skills.
|
||||||
currentSkills.addAll(transformSkills.values());
|
currentSkills.addAll(transformSkills.values());
|
||||||
}
|
}
|
||||||
|
|||||||
-10
@@ -53,7 +53,6 @@ public final class Transform implements IIdentifiable
|
|||||||
private final boolean _canAttack;
|
private final boolean _canAttack;
|
||||||
private final String _name;
|
private final String _name;
|
||||||
private final String _title;
|
private final String _title;
|
||||||
private final boolean _allowAllSkills;
|
|
||||||
|
|
||||||
private TransformTemplate _maleTemplate;
|
private TransformTemplate _maleTemplate;
|
||||||
private TransformTemplate _femaleTemplate;
|
private TransformTemplate _femaleTemplate;
|
||||||
@@ -68,7 +67,6 @@ public final class Transform implements IIdentifiable
|
|||||||
_spawnHeight = set.getInt("spawn_height", 0);
|
_spawnHeight = set.getInt("spawn_height", 0);
|
||||||
_name = set.getString("setName", null);
|
_name = set.getString("setName", null);
|
||||||
_title = set.getString("setTitle", null);
|
_title = set.getString("setTitle", null);
|
||||||
_allowAllSkills = set.getInt("allow_all_skills", 1) == 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -148,14 +146,6 @@ public final class Transform implements IIdentifiable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Allow all skills for this transformation.
|
|
||||||
*/
|
|
||||||
public boolean allowAllSkills()
|
|
||||||
{
|
|
||||||
return _allowAllSkills;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -433,14 +433,6 @@
|
|||||||
</xs:attribute>
|
</xs:attribute>
|
||||||
<xs:attribute name="setName" type="xs:string" use="optional" />
|
<xs:attribute name="setName" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="allow_all_skills" use="optional">
|
|
||||||
<xs:simpleType>
|
|
||||||
<xs:restriction base="xs:nonNegativeInteger">
|
|
||||||
<xs:minInclusive value="0" />
|
|
||||||
<xs:maxInclusive value="1" />
|
|
||||||
</xs:restriction>
|
|
||||||
</xs:simpleType>
|
|
||||||
</xs:attribute>
|
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
|
|||||||
-14
@@ -8328,12 +8328,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isTransformed() && !hasTransformSkill(skill))
|
|
||||||
{
|
|
||||||
sendPacket(ActionFailed.STATIC_PACKET);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
||||||
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
||||||
{
|
{
|
||||||
@@ -11611,11 +11605,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
|
|
||||||
public boolean hasTransformSkill(Skill skill)
|
public boolean hasTransformSkill(Skill skill)
|
||||||
{
|
{
|
||||||
if (checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -11657,8 +11646,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
{
|
{
|
||||||
final Map<Integer, Skill> transformSkills = _transformSkills;
|
final Map<Integer, Skill> transformSkills = _transformSkills;
|
||||||
if (transformSkills != null)
|
if (transformSkills != null)
|
||||||
{
|
|
||||||
if (!checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
{
|
||||||
// Include transformation skills and those skills that are allowed during transformation.
|
// Include transformation skills and those skills that are allowed during transformation.
|
||||||
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
||||||
@@ -11690,7 +11677,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
// Include transformation skills.
|
// Include transformation skills.
|
||||||
currentSkills.addAll(transformSkills.values());
|
currentSkills.addAll(transformSkills.values());
|
||||||
}
|
}
|
||||||
|
|||||||
-10
@@ -53,7 +53,6 @@ public final class Transform implements IIdentifiable
|
|||||||
private final boolean _canAttack;
|
private final boolean _canAttack;
|
||||||
private final String _name;
|
private final String _name;
|
||||||
private final String _title;
|
private final String _title;
|
||||||
private final boolean _allowAllSkills;
|
|
||||||
|
|
||||||
private TransformTemplate _maleTemplate;
|
private TransformTemplate _maleTemplate;
|
||||||
private TransformTemplate _femaleTemplate;
|
private TransformTemplate _femaleTemplate;
|
||||||
@@ -68,7 +67,6 @@ public final class Transform implements IIdentifiable
|
|||||||
_spawnHeight = set.getInt("spawn_height", 0);
|
_spawnHeight = set.getInt("spawn_height", 0);
|
||||||
_name = set.getString("setName", null);
|
_name = set.getString("setName", null);
|
||||||
_title = set.getString("setTitle", null);
|
_title = set.getString("setTitle", null);
|
||||||
_allowAllSkills = set.getInt("allow_all_skills", 1) == 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -148,14 +146,6 @@ public final class Transform implements IIdentifiable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Allow all skills for this transformation.
|
|
||||||
*/
|
|
||||||
public boolean allowAllSkills()
|
|
||||||
{
|
|
||||||
return _allowAllSkills;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -433,14 +433,6 @@
|
|||||||
</xs:attribute>
|
</xs:attribute>
|
||||||
<xs:attribute name="setName" type="xs:string" use="optional" />
|
<xs:attribute name="setName" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="allow_all_skills" use="optional">
|
|
||||||
<xs:simpleType>
|
|
||||||
<xs:restriction base="xs:nonNegativeInteger">
|
|
||||||
<xs:minInclusive value="0" />
|
|
||||||
<xs:maxInclusive value="1" />
|
|
||||||
</xs:restriction>
|
|
||||||
</xs:simpleType>
|
|
||||||
</xs:attribute>
|
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
|
|||||||
-14
@@ -8330,12 +8330,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isTransformed() && !hasTransformSkill(skill))
|
|
||||||
{
|
|
||||||
sendPacket(ActionFailed.STATIC_PACKET);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
||||||
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
||||||
{
|
{
|
||||||
@@ -11613,11 +11607,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
|
|
||||||
public boolean hasTransformSkill(Skill skill)
|
public boolean hasTransformSkill(Skill skill)
|
||||||
{
|
{
|
||||||
if (checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -11659,8 +11648,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
{
|
{
|
||||||
final Map<Integer, Skill> transformSkills = _transformSkills;
|
final Map<Integer, Skill> transformSkills = _transformSkills;
|
||||||
if (transformSkills != null)
|
if (transformSkills != null)
|
||||||
{
|
|
||||||
if (!checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
{
|
||||||
// Include transformation skills and those skills that are allowed during transformation.
|
// Include transformation skills and those skills that are allowed during transformation.
|
||||||
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
||||||
@@ -11692,7 +11679,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
// Include transformation skills.
|
// Include transformation skills.
|
||||||
currentSkills.addAll(transformSkills.values());
|
currentSkills.addAll(transformSkills.values());
|
||||||
}
|
}
|
||||||
|
|||||||
-10
@@ -53,7 +53,6 @@ public final class Transform implements IIdentifiable
|
|||||||
private final boolean _canAttack;
|
private final boolean _canAttack;
|
||||||
private final String _name;
|
private final String _name;
|
||||||
private final String _title;
|
private final String _title;
|
||||||
private final boolean _allowAllSkills;
|
|
||||||
|
|
||||||
private TransformTemplate _maleTemplate;
|
private TransformTemplate _maleTemplate;
|
||||||
private TransformTemplate _femaleTemplate;
|
private TransformTemplate _femaleTemplate;
|
||||||
@@ -68,7 +67,6 @@ public final class Transform implements IIdentifiable
|
|||||||
_spawnHeight = set.getInt("spawn_height", 0);
|
_spawnHeight = set.getInt("spawn_height", 0);
|
||||||
_name = set.getString("setName", null);
|
_name = set.getString("setName", null);
|
||||||
_title = set.getString("setTitle", null);
|
_title = set.getString("setTitle", null);
|
||||||
_allowAllSkills = set.getInt("allow_all_skills", 1) == 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -148,14 +146,6 @@ public final class Transform implements IIdentifiable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Allow all skills for this transformation.
|
|
||||||
*/
|
|
||||||
public boolean allowAllSkills()
|
|
||||||
{
|
|
||||||
return _allowAllSkills;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -433,14 +433,6 @@
|
|||||||
</xs:attribute>
|
</xs:attribute>
|
||||||
<xs:attribute name="setName" type="xs:string" use="optional" />
|
<xs:attribute name="setName" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
<xs:attribute name="setTitle" type="xs:string" use="optional" />
|
||||||
<xs:attribute name="allow_all_skills" use="optional">
|
|
||||||
<xs:simpleType>
|
|
||||||
<xs:restriction base="xs:nonNegativeInteger">
|
|
||||||
<xs:minInclusive value="0" />
|
|
||||||
<xs:maxInclusive value="1" />
|
|
||||||
</xs:restriction>
|
|
||||||
</xs:simpleType>
|
|
||||||
</xs:attribute>
|
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
|
|||||||
-14
@@ -8330,12 +8330,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isTransformed() && !hasTransformSkill(skill))
|
|
||||||
{
|
|
||||||
sendPacket(ActionFailed.STATIC_PACKET);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
|
||||||
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(L2EffectType.TELEPORT))
|
||||||
{
|
{
|
||||||
@@ -11613,11 +11607,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
|
|
||||||
public boolean hasTransformSkill(Skill skill)
|
public boolean hasTransformSkill(Skill skill)
|
||||||
{
|
{
|
||||||
if (checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
return (_transformSkills != null) && (_transformSkills.get(skill.getId()) == skill);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -11659,8 +11648,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
{
|
{
|
||||||
final Map<Integer, Skill> transformSkills = _transformSkills;
|
final Map<Integer, Skill> transformSkills = _transformSkills;
|
||||||
if (transformSkills != null)
|
if (transformSkills != null)
|
||||||
{
|
|
||||||
if (!checkTransformed(Transform::allowAllSkills))
|
|
||||||
{
|
{
|
||||||
// Include transformation skills and those skills that are allowed during transformation.
|
// Include transformation skills and those skills that are allowed during transformation.
|
||||||
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
currentSkills = currentSkills.stream().filter(Skill::allowOnTransform).collect(Collectors.toList());
|
||||||
@@ -11692,7 +11679,6 @@ public final class L2PcInstance extends L2Playable
|
|||||||
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
addSkill(SkillData.getInstance().getSkill(revelationSkill, 1), false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
// Include transformation skills.
|
// Include transformation skills.
|
||||||
currentSkills.addAll(transformSkills.values());
|
currentSkills.addAll(transformSkills.values());
|
||||||
}
|
}
|
||||||
|
|||||||
-10
@@ -53,7 +53,6 @@ public final class Transform implements IIdentifiable
|
|||||||
private final boolean _canAttack;
|
private final boolean _canAttack;
|
||||||
private final String _name;
|
private final String _name;
|
||||||
private final String _title;
|
private final String _title;
|
||||||
private final boolean _allowAllSkills;
|
|
||||||
|
|
||||||
private TransformTemplate _maleTemplate;
|
private TransformTemplate _maleTemplate;
|
||||||
private TransformTemplate _femaleTemplate;
|
private TransformTemplate _femaleTemplate;
|
||||||
@@ -68,7 +67,6 @@ public final class Transform implements IIdentifiable
|
|||||||
_spawnHeight = set.getInt("spawn_height", 0);
|
_spawnHeight = set.getInt("spawn_height", 0);
|
||||||
_name = set.getString("setName", null);
|
_name = set.getString("setName", null);
|
||||||
_title = set.getString("setTitle", null);
|
_title = set.getString("setTitle", null);
|
||||||
_allowAllSkills = set.getInt("allow_all_skills", 1) == 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -148,14 +146,6 @@ public final class Transform implements IIdentifiable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Allow all skills for this transformation.
|
|
||||||
*/
|
|
||||||
public boolean allowAllSkills()
|
|
||||||
{
|
|
||||||
return _allowAllSkills;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
* @return {@code true} if transform type is mode change, {@code false} otherwise
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user