Consider skill reuseDelay for item equip delay configurations.

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

View File

@@ -599,7 +599,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;
}
}
@@ -655,7 +656,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;
@@ -718,7 +720,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;
}
}
@@ -840,7 +843,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;