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

Consider skill reuseDelay for item equip delay configurations.

Browse Source
This commit is contained in:
MobiusDevelopment
2023-01-12 03:28:52 +00:00
parent 3264cd1e2f
commit 722e712cf2
52 changed files with 260 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Character.ini vendored
View File

@@ -159,11 +159,13 @@ CalculateMagicSuccessBySkillMagicLevel = True
BlowRateChanceLimit = 100
# Disables active, non offensive, item skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable.
# Default: 300000 (5 minutes).
ItemEquipActiveSkillReuse = 300000
# Disables active, non offensive, armor set skills for a fixed time upon equip.
# This is an alternative duration for skills that do not have reuseDelay.
# Use 0 to disable.
# Default: 60000 (1 minute).
ArmorSetEquipActiveSkillReuse = 60000

12
L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -568,7 +568,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip.
if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true;
}
}
@@ -624,7 +625,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip.
if (!skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
}
updateTimestamp = true;
@@ -687,7 +689,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip.
if (skill.isActive() && !skill.isBad() && !skill.isTransformation() && (Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{
player.addTimeStamp(skill, Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
final long reuse = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
player.addTimeStamp(skill, reuse > 0 ? reuse : skill.getReuseDelay() > 0 ? skill.getReuseDelay() : Config.ITEM_EQUIP_ACTIVE_SKILL_REUSE);
updateTimestamp = true;
}
}
@@ -806,7 +809,8 @@ public abstract class Inventory extends ItemContainer
// Active, non offensive, skills start with reuse on equip.
if (!itemSkill.isBad() && !itemSkill.isTransformation() && (Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE > 0) && player.hasEnteredWorld())
{
player.addTimeStamp(itemSkill, Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
final long reuse = player.getSkillRemainingReuseTime(itemSkill.getReuseHashCode());
player.addTimeStamp(itemSkill, reuse > 0 ? reuse : itemSkill.getReuseDelay() > 0 ? itemSkill.getReuseDelay() : Config.ARMOR_SET_EQUIP_ACTIVE_SKILL_REUSE);
}
updateTimeStamp = true;