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

Addition of removedOnUnequipWeapon skill parameter.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-11-13 17:28:49 +00:00
parent 25678c3f9c
commit eb9d737495
45 changed files with 210 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/skills.xsd vendored
View File

@ -2358,6 +2358,7 @@
<xs:element name="channelingStart" type="xs:decimal" />
<xs:element name="channelingTickInterval" type="xs:decimal" />
<xs:element name="removedOnDamage" type="xs:boolean" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
<xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" />
<xs:element name="itemConsumeSteps" type="xs:unsignedByte" />
<xs:element name="effect">

5
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -394,10 +394,11 @@ public abstract class Inventory extends ItemContainer
}
});
}
// Must check for toggle skill item conditions.
// Must check for toggle and isRemovedOnUnequipWeapon skill item conditions.
for (Skill skill : player.getAllSkills())
{
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
if ((skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player)) //
|| (it.isWeapon() && skill.isRemovedOnUnequipWeapon()))
{
player.stopSkillEffects(true, skill.getId());
update.compareAndSet(false, true);

10
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -151,6 +151,7 @@ public class Skill implements IIdentifiable
private final boolean _removedOnAnyActionExceptMove;
private final boolean _removedOnDamage;
private final boolean _removedOnUnequipWeapon;
private final boolean _blockedInOlympiad;
@ -345,6 +346,7 @@ public class Skill implements IIdentifiable
_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
_removedOnDamage = set.getBoolean("removedOnDamage", false);
_removedOnUnequipWeapon = set.getBoolean("removedOnUnequipWeapon", false);
_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
@ -587,6 +589,14 @@ public class Skill implements IIdentifiable
return _removedOnDamage;
}
/**
* @return {@code true} if skill effects should be removed on unequip weapon
*/
public boolean isRemovedOnUnequipWeapon()
{
return _removedOnUnequipWeapon;
}
/**
* @return {@code true} if skill can not be used in olympiad.
*/

1
L2J_Mobius_2.5_Underground/dist/game/data/xsd/skills.xsd vendored
View File

@ -2453,6 +2453,7 @@
<xs:element name="channelingStart" type="xs:decimal" />
<xs:element name="channelingTickInterval" type="xs:decimal" />
<xs:element name="removedOnDamage" type="xs:boolean" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
<xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" />
<xs:element name="itemConsumeSteps" type="xs:unsignedByte" />
<xs:element name="effect">

5
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -397,10 +397,11 @@ public abstract class Inventory extends ItemContainer
}
});
}
// Must check for toggle skill item conditions.
// Must check for toggle and isRemovedOnUnequipWeapon skill item conditions.
for (Skill skill : player.getAllSkills())
{
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
if ((skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player)) //
|| (it.isWeapon() && skill.isRemovedOnUnequipWeapon()))
{
player.stopSkillEffects(true, skill.getId());
update.compareAndSet(false, true);

10
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -151,6 +151,7 @@ public class Skill implements IIdentifiable
private final boolean _removedOnAnyActionExceptMove;
private final boolean _removedOnDamage;
private final boolean _removedOnUnequipWeapon;
private final boolean _blockedInOlympiad;
@ -345,6 +346,7 @@ public class Skill implements IIdentifiable
_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
_removedOnDamage = set.getBoolean("removedOnDamage", false);
_removedOnUnequipWeapon = set.getBoolean("removedOnUnequipWeapon", false);
_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
@ -587,6 +589,14 @@ public class Skill implements IIdentifiable
return _removedOnDamage;
}
/**
* @return {@code true} if skill effects should be removed on unequip weapon
*/
public boolean isRemovedOnUnequipWeapon()
{
return _removedOnUnequipWeapon;
}
/**
* @return {@code true} if skill can not be used in olympiad.
*/

1
L2J_Mobius_3.0_Helios/dist/game/data/xsd/skills.xsd vendored
View File

@ -2485,6 +2485,7 @@
<xs:element name="channelingStart" type="xs:decimal" />
<xs:element name="channelingTickInterval" type="xs:decimal" />
<xs:element name="removedOnDamage" type="xs:boolean" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
<xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" />
<xs:element name="itemConsumeSteps" type="xs:unsignedByte" />
<xs:element name="effect">

5
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -397,10 +397,11 @@ public abstract class Inventory extends ItemContainer
}
});
}
// Must check for toggle skill item conditions.
// Must check for toggle and isRemovedOnUnequipWeapon skill item conditions.
for (Skill skill : player.getAllSkills())
{
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
if ((skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player)) //
|| (it.isWeapon() && skill.isRemovedOnUnequipWeapon()))
{
player.stopSkillEffects(true, skill.getId());
update.compareAndSet(false, true);

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -151,6 +151,7 @@ public class Skill implements IIdentifiable
private final boolean _removedOnAnyActionExceptMove;
private final boolean _removedOnDamage;
private final boolean _removedOnUnequipWeapon;
private final boolean _blockedInOlympiad;
@ -345,6 +346,7 @@ public class Skill implements IIdentifiable
_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
_removedOnDamage = set.getBoolean("removedOnDamage", false);
_removedOnUnequipWeapon = set.getBoolean("removedOnUnequipWeapon", false);
_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
@ -587,6 +589,14 @@ public class Skill implements IIdentifiable
return _removedOnDamage;
}
/**
* @return {@code true} if skill effects should be removed on unequip weapon
*/
public boolean isRemovedOnUnequipWeapon()
{
return _removedOnUnequipWeapon;
}
/**
* @return {@code true} if skill can not be used in olympiad.
*/

1
L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skills.xsd vendored
View File

@ -2497,6 +2497,7 @@
<xs:element name="channelingStart" type="xs:decimal" />
<xs:element name="channelingTickInterval" type="xs:decimal" />
<xs:element name="removedOnDamage" type="xs:boolean" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
<xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" />
<xs:element name="itemConsumeSteps" type="xs:unsignedByte" />
<xs:element name="effect">

5
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -397,10 +397,11 @@ public abstract class Inventory extends ItemContainer
}
});
}
// Must check for toggle skill item conditions.
// Must check for toggle and isRemovedOnUnequipWeapon skill item conditions.
for (Skill skill : player.getAllSkills())
{
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
if ((skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player)) //
|| (it.isWeapon() && skill.isRemovedOnUnequipWeapon()))
{
player.stopSkillEffects(true, skill.getId());
update.compareAndSet(false, true);

10
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -151,6 +151,7 @@ public class Skill implements IIdentifiable
private final boolean _removedOnAnyActionExceptMove;
private final boolean _removedOnDamage;
private final boolean _removedOnUnequipWeapon;
private final boolean _blockedInOlympiad;
@ -345,6 +346,7 @@ public class Skill implements IIdentifiable
_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
_removedOnDamage = set.getBoolean("removedOnDamage", false);
_removedOnUnequipWeapon = set.getBoolean("removedOnUnequipWeapon", false);
_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
@ -587,6 +589,14 @@ public class Skill implements IIdentifiable
return _removedOnDamage;
}
/**
* @return {@code true} if skill effects should be removed on unequip weapon
*/
public boolean isRemovedOnUnequipWeapon()
{
return _removedOnUnequipWeapon;
}
/**
* @return {@code true} if skill can not be used in olympiad.
*/

1
L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skills.xsd vendored
View File

@ -2501,6 +2501,7 @@
<xs:element name="channelingStart" type="xs:decimal" />
<xs:element name="channelingTickInterval" type="xs:decimal" />
<xs:element name="removedOnDamage" type="xs:boolean" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
<xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" />
<xs:element name="itemConsumeSteps" type="xs:unsignedByte" />
<xs:element name="effect">

5
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -402,10 +402,11 @@ public abstract class Inventory extends ItemContainer
}
});
}
// Must check for toggle skill item conditions.
// Must check for toggle and isRemovedOnUnequipWeapon skill item conditions.
for (Skill skill : player.getAllSkills())
{
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
if ((skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player)) //
|| (it.isWeapon() && skill.isRemovedOnUnequipWeapon()))
{
player.stopSkillEffects(true, skill.getId());
update.compareAndSet(false, true);

10
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -151,6 +151,7 @@ public class Skill implements IIdentifiable
private final boolean _removedOnAnyActionExceptMove;
private final boolean _removedOnDamage;
private final boolean _removedOnUnequipWeapon;
private final boolean _blockedInOlympiad;
@ -345,6 +346,7 @@ public class Skill implements IIdentifiable
_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
_removedOnDamage = set.getBoolean("removedOnDamage", false);
_removedOnUnequipWeapon = set.getBoolean("removedOnUnequipWeapon", false);
_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
@ -587,6 +589,14 @@ public class Skill implements IIdentifiable
return _removedOnDamage;
}
/**
* @return {@code true} if skill effects should be removed on unequip weapon
*/
public boolean isRemovedOnUnequipWeapon()
{
return _removedOnUnequipWeapon;
}
/**
* @return {@code true} if skill can not be used in olympiad.
*/

1
L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skills.xsd vendored
View File

@ -2501,6 +2501,7 @@
<xs:element name="channelingStart" type="xs:decimal" />
<xs:element name="channelingTickInterval" type="xs:decimal" />
<xs:element name="removedOnDamage" type="xs:boolean" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
<xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" />
<xs:element name="itemConsumeSteps" type="xs:unsignedByte" />
<xs:element name="effect">

5
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -425,10 +425,11 @@ public abstract class Inventory extends ItemContainer
}
});
}
// Must check for toggle skill item conditions.
// Must check for toggle and isRemovedOnUnequipWeapon skill item conditions.
for (Skill skill : player.getAllSkills())
{
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
if ((skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player)) //
|| (it.isWeapon() && skill.isRemovedOnUnequipWeapon()))
{
player.stopSkillEffects(true, skill.getId());
update.compareAndSet(false, true);

10
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -151,6 +151,7 @@ public class Skill implements IIdentifiable
private final boolean _removedOnAnyActionExceptMove;
private final boolean _removedOnDamage;
private final boolean _removedOnUnequipWeapon;
private final boolean _blockedInOlympiad;
@ -345,6 +346,7 @@ public class Skill implements IIdentifiable
_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
_removedOnDamage = set.getBoolean("removedOnDamage", false);
_removedOnUnequipWeapon = set.getBoolean("removedOnUnequipWeapon", false);
_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
@ -587,6 +589,14 @@ public class Skill implements IIdentifiable
return _removedOnDamage;
}
/**
* @return {@code true} if skill effects should be removed on unequip weapon
*/
public boolean isRemovedOnUnequipWeapon()
{
return _removedOnUnequipWeapon;
}
/**
* @return {@code true} if skill can not be used in olympiad.
*/

1
L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skills.xsd vendored
View File

@ -2501,6 +2501,7 @@
<xs:element name="channelingStart" type="xs:decimal" />
<xs:element name="channelingTickInterval" type="xs:decimal" />
<xs:element name="removedOnDamage" type="xs:boolean" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
<xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" />
<xs:element name="itemConsumeSteps" type="xs:unsignedByte" />
<xs:element name="effect">

5
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -425,10 +425,11 @@ public abstract class Inventory extends ItemContainer
}
});
}
// Must check for toggle skill item conditions.
// Must check for toggle and isRemovedOnUnequipWeapon skill item conditions.
for (Skill skill : player.getAllSkills())
{
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
if ((skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player)) //
|| (it.isWeapon() && skill.isRemovedOnUnequipWeapon()))
{
player.stopSkillEffects(true, skill.getId());
update.compareAndSet(false, true);

10
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -151,6 +151,7 @@ public class Skill implements IIdentifiable
private final boolean _removedOnAnyActionExceptMove;
private final boolean _removedOnDamage;
private final boolean _removedOnUnequipWeapon;
private final boolean _blockedInOlympiad;
@ -345,6 +346,7 @@ public class Skill implements IIdentifiable
_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
_removedOnDamage = set.getBoolean("removedOnDamage", false);
_removedOnUnequipWeapon = set.getBoolean("removedOnUnequipWeapon", false);
_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
@ -587,6 +589,14 @@ public class Skill implements IIdentifiable
return _removedOnDamage;
}
/**
* @return {@code true} if skill effects should be removed on unequip weapon
*/
public boolean isRemovedOnUnequipWeapon()
{
return _removedOnUnequipWeapon;
}
/**
* @return {@code true} if skill can not be used in olympiad.
*/

1
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/skills.xsd vendored
View File

@ -2501,6 +2501,7 @@
<xs:element name="channelingStart" type="xs:decimal" />
<xs:element name="channelingTickInterval" type="xs:decimal" />
<xs:element name="removedOnDamage" type="xs:boolean" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
<xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" />
<xs:element name="itemConsumeSteps" type="xs:unsignedByte" />
<xs:element name="effect">

5
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -425,10 +425,11 @@ public abstract class Inventory extends ItemContainer
}
});
}
// Must check for toggle skill item conditions.
// Must check for toggle and isRemovedOnUnequipWeapon skill item conditions.
for (Skill skill : player.getAllSkills())
{
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
if ((skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player)) //
|| (it.isWeapon() && skill.isRemovedOnUnequipWeapon()))
{
player.stopSkillEffects(true, skill.getId());
update.compareAndSet(false, true);

10
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -151,6 +151,7 @@ public class Skill implements IIdentifiable
private final boolean _removedOnAnyActionExceptMove;
private final boolean _removedOnDamage;
private final boolean _removedOnUnequipWeapon;
private final boolean _blockedInOlympiad;
@ -345,6 +346,7 @@ public class Skill implements IIdentifiable
_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
_removedOnDamage = set.getBoolean("removedOnDamage", false);
_removedOnUnequipWeapon = set.getBoolean("removedOnUnequipWeapon", false);
_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
@ -587,6 +589,14 @@ public class Skill implements IIdentifiable
return _removedOnDamage;
}
/**
* @return {@code true} if skill effects should be removed on unequip weapon
*/
public boolean isRemovedOnUnequipWeapon()
{
return _removedOnUnequipWeapon;
}
/**
* @return {@code true} if skill can not be used in olympiad.
*/

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

@ -1768,6 +1768,7 @@
<xs:element name="channelingStart" type="xs:decimal" />
<xs:element name="channelingTickInterval" type="xs:unsignedByte" />
<xs:element name="removedOnDamage" type="xs:boolean" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
<xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" />
<xs:element name="itemConsumeSteps" type="xs:unsignedByte" />
<xs:element name="soulMaxConsumeCount" type="xs:unsignedByte" />

5
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -397,10 +397,11 @@ public abstract class Inventory extends ItemContainer
}
});
}
// Must check for toggle skill item conditions.
// Must check for toggle and isRemovedOnUnequipWeapon skill item conditions.
for (Skill skill : player.getAllSkills())
{
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
if ((skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player)) //
|| (it.isWeapon() && skill.isRemovedOnUnequipWeapon()))
{
player.stopSkillEffects(true, skill.getId());
update.compareAndSet(false, true);

10
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -151,6 +151,7 @@ public class Skill implements IIdentifiable
private final boolean _removedOnAnyActionExceptMove;
private final boolean _removedOnDamage;
private final boolean _removedOnUnequipWeapon;
private final boolean _blockedInOlympiad;
@ -345,6 +346,7 @@ public class Skill implements IIdentifiable
_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
_removedOnDamage = set.getBoolean("removedOnDamage", false);
_removedOnUnequipWeapon = set.getBoolean("removedOnUnequipWeapon", false);
_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
@ -587,6 +589,14 @@ public class Skill implements IIdentifiable
return _removedOnDamage;
}
/**
* @return {@code true} if skill effects should be removed on unequip weapon
*/
public boolean isRemovedOnUnequipWeapon()
{
return _removedOnUnequipWeapon;
}
/**
* @return {@code true} if skill can not be used in olympiad.
*/

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

@ -1768,6 +1768,7 @@
<xs:element name="channelingStart" type="xs:decimal" />
<xs:element name="channelingTickInterval" type="xs:unsignedByte" />
<xs:element name="removedOnDamage" type="xs:boolean" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
<xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" />
<xs:element name="itemConsumeSteps" type="xs:unsignedByte" />
<xs:element name="soulMaxConsumeCount" type="xs:unsignedByte" />

5
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -397,10 +397,11 @@ public abstract class Inventory extends ItemContainer
}
});
}
// Must check for toggle skill item conditions.
// Must check for toggle and isRemovedOnUnequipWeapon skill item conditions.
for (Skill skill : player.getAllSkills())
{
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
if ((skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player)) //
|| (it.isWeapon() && skill.isRemovedOnUnequipWeapon()))
{
player.stopSkillEffects(true, skill.getId());
update.compareAndSet(false, true);

10
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -151,6 +151,7 @@ public class Skill implements IIdentifiable
private final boolean _removedOnAnyActionExceptMove;
private final boolean _removedOnDamage;
private final boolean _removedOnUnequipWeapon;
private final boolean _blockedInOlympiad;
@ -345,6 +346,7 @@ public class Skill implements IIdentifiable
_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
_removedOnDamage = set.getBoolean("removedOnDamage", false);
_removedOnUnequipWeapon = set.getBoolean("removedOnUnequipWeapon", false);
_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
@ -587,6 +589,14 @@ public class Skill implements IIdentifiable
return _removedOnDamage;
}
/**
* @return {@code true} if skill effects should be removed on unequip weapon
*/
public boolean isRemovedOnUnequipWeapon()
{
return _removedOnUnequipWeapon;
}
/**
* @return {@code true} if skill can not be used in olympiad.
*/

1
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/skills.xsd vendored
View File

@ -1768,6 +1768,7 @@
<xs:element name="channelingStart" type="xs:decimal" />
<xs:element name="channelingTickInterval" type="xs:unsignedByte" />
<xs:element name="removedOnDamage" type="xs:boolean" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
<xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" />
<xs:element name="itemConsumeSteps" type="xs:unsignedByte" />
<xs:element name="soulMaxConsumeCount" type="xs:unsignedByte" />

5
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -402,10 +402,11 @@ public abstract class Inventory extends ItemContainer
}
});
}
// Must check for toggle skill item conditions.
// Must check for toggle and isRemovedOnUnequipWeapon skill item conditions.
for (Skill skill : player.getAllSkills())
{
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
if ((skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player)) //
|| (it.isWeapon() && skill.isRemovedOnUnequipWeapon()))
{
player.stopSkillEffects(true, skill.getId());
update.compareAndSet(false, true);

10
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -151,6 +151,7 @@ public class Skill implements IIdentifiable
private final boolean _removedOnAnyActionExceptMove;
private final boolean _removedOnDamage;
private final boolean _removedOnUnequipWeapon;
private final boolean _blockedInOlympiad;
@ -345,6 +346,7 @@ public class Skill implements IIdentifiable
_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
_removedOnDamage = set.getBoolean("removedOnDamage", false);
_removedOnUnequipWeapon = set.getBoolean("removedOnUnequipWeapon", false);
_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
@ -587,6 +589,14 @@ public class Skill implements IIdentifiable
return _removedOnDamage;
}
/**
* @return {@code true} if skill effects should be removed on unequip weapon
*/
public boolean isRemovedOnUnequipWeapon()
{
return _removedOnUnequipWeapon;
}
/**
* @return {@code true} if skill can not be used in olympiad.
*/

1
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/skills.xsd vendored
View File

@ -1768,6 +1768,7 @@
<xs:element name="channelingStart" type="xs:decimal" />
<xs:element name="channelingTickInterval" type="xs:unsignedByte" />
<xs:element name="removedOnDamage" type="xs:boolean" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
<xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" />
<xs:element name="itemConsumeSteps" type="xs:unsignedByte" />
<xs:element name="soulMaxConsumeCount" type="xs:unsignedByte" />

5
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -425,10 +425,11 @@ public abstract class Inventory extends ItemContainer
}
});
}
// Must check for toggle skill item conditions.
// Must check for toggle and isRemovedOnUnequipWeapon skill item conditions.
for (Skill skill : player.getAllSkills())
{
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
if ((skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player)) //
|| (it.isWeapon() && skill.isRemovedOnUnequipWeapon()))
{
player.stopSkillEffects(true, skill.getId());
update.compareAndSet(false, true);

10
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -151,6 +151,7 @@ public class Skill implements IIdentifiable
private final boolean _removedOnAnyActionExceptMove;
private final boolean _removedOnDamage;
private final boolean _removedOnUnequipWeapon;
private final boolean _blockedInOlympiad;
@ -345,6 +346,7 @@ public class Skill implements IIdentifiable
_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
_removedOnDamage = set.getBoolean("removedOnDamage", false);
_removedOnUnequipWeapon = set.getBoolean("removedOnUnequipWeapon", false);
_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
@ -587,6 +589,14 @@ public class Skill implements IIdentifiable
return _removedOnDamage;
}
/**
* @return {@code true} if skill effects should be removed on unequip weapon
*/
public boolean isRemovedOnUnequipWeapon()
{
return _removedOnUnequipWeapon;
}
/**
* @return {@code true} if skill can not be used in olympiad.
*/

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

@ -1768,6 +1768,7 @@
<xs:element name="channelingStart" type="xs:decimal" />
<xs:element name="channelingTickInterval" type="xs:unsignedByte" />
<xs:element name="removedOnDamage" type="xs:boolean" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
<xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" />
<xs:element name="itemConsumeSteps" type="xs:unsignedByte" />
<xs:element name="soulMaxConsumeCount" type="xs:unsignedByte" />

5
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -425,10 +425,11 @@ public abstract class Inventory extends ItemContainer
}
});
}
// Must check for toggle skill item conditions.
// Must check for toggle and isRemovedOnUnequipWeapon skill item conditions.
for (Skill skill : player.getAllSkills())
{
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
if ((skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player)) //
|| (it.isWeapon() && skill.isRemovedOnUnequipWeapon()))
{
player.stopSkillEffects(true, skill.getId());
update.compareAndSet(false, true);

10
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -151,6 +151,7 @@ public class Skill implements IIdentifiable
private final boolean _removedOnAnyActionExceptMove;
private final boolean _removedOnDamage;
private final boolean _removedOnUnequipWeapon;
private final boolean _blockedInOlympiad;
@ -345,6 +346,7 @@ public class Skill implements IIdentifiable
_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
_removedOnDamage = set.getBoolean("removedOnDamage", false);
_removedOnUnequipWeapon = set.getBoolean("removedOnUnequipWeapon", false);
_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
@ -587,6 +589,14 @@ public class Skill implements IIdentifiable
return _removedOnDamage;
}
/**
* @return {@code true} if skill effects should be removed on unequip weapon
*/
public boolean isRemovedOnUnequipWeapon()
{
return _removedOnUnequipWeapon;
}
/**
* @return {@code true} if skill can not be used in olympiad.
*/

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

@ -1768,6 +1768,7 @@
<xs:element name="channelingStart" type="xs:decimal" />
<xs:element name="channelingTickInterval" type="xs:unsignedByte" />
<xs:element name="removedOnDamage" type="xs:boolean" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
<xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" />
<xs:element name="itemConsumeSteps" type="xs:unsignedByte" />
<xs:element name="soulMaxConsumeCount" type="xs:unsignedByte" />

5
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -425,10 +425,11 @@ public abstract class Inventory extends ItemContainer
}
});
}
// Must check for toggle skill item conditions.
// Must check for toggle and isRemovedOnUnequipWeapon skill item conditions.
for (Skill skill : player.getAllSkills())
{
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
if ((skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player)) //
|| (it.isWeapon() && skill.isRemovedOnUnequipWeapon()))
{
player.stopSkillEffects(true, skill.getId());
update.compareAndSet(false, true);

10
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -151,6 +151,7 @@ public class Skill implements IIdentifiable
private final boolean _removedOnAnyActionExceptMove;
private final boolean _removedOnDamage;
private final boolean _removedOnUnequipWeapon;
private final boolean _blockedInOlympiad;
@ -345,6 +346,7 @@ public class Skill implements IIdentifiable
_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
_removedOnDamage = set.getBoolean("removedOnDamage", false);
_removedOnUnequipWeapon = set.getBoolean("removedOnUnequipWeapon", false);
_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
@ -587,6 +589,14 @@ public class Skill implements IIdentifiable
return _removedOnDamage;
}
/**
* @return {@code true} if skill effects should be removed on unequip weapon
*/
public boolean isRemovedOnUnequipWeapon()
{
return _removedOnUnequipWeapon;
}
/**
* @return {@code true} if skill can not be used in olympiad.
*/

1
L2J_Mobius_Classic_Interlude/dist/game/data/xsd/skills.xsd vendored
View File

@ -2483,6 +2483,7 @@
<xs:element name="channelingStart" type="xs:decimal" />
<xs:element name="channelingTickInterval" type="xs:decimal" />
<xs:element name="removedOnDamage" type="xs:boolean" />
<xs:element name="removedOnUnequipWeapon" type="xs:boolean" />
<xs:element name="removedOnAnyActionExceptMove" type="xs:boolean" />
<xs:element name="itemConsumeSteps" type="xs:unsignedByte" />
<xs:element name="effect">

5
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -397,10 +397,11 @@ public abstract class Inventory extends ItemContainer
}
});
}
// Must check for toggle skill item conditions.
// Must check for toggle and isRemovedOnUnequipWeapon skill item conditions.
for (Skill skill : player.getAllSkills())
{
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
if ((skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player)) //
|| (it.isWeapon() && skill.isRemovedOnUnequipWeapon()))
{
player.stopSkillEffects(true, skill.getId());
update.compareAndSet(false, true);

10
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@ -151,6 +151,7 @@ public class Skill implements IIdentifiable
private final boolean _removedOnAnyActionExceptMove;
private final boolean _removedOnDamage;
private final boolean _removedOnUnequipWeapon;
private final boolean _blockedInOlympiad;
@ -345,6 +346,7 @@ public class Skill implements IIdentifiable
_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
_removedOnDamage = set.getBoolean("removedOnDamage", false);
_removedOnUnequipWeapon = set.getBoolean("removedOnUnequipWeapon", false);
_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
@ -587,6 +589,14 @@ public class Skill implements IIdentifiable
return _removedOnDamage;
}
/**
* @return {@code true} if skill effects should be removed on unequip weapon
*/
public boolean isRemovedOnUnequipWeapon()
{
return _removedOnUnequipWeapon;
}
/**
* @return {@code true} if skill can not be used in olympiad.
*/