Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Fixed passive skills casting when not unlocked

Browse Source
This commit is contained in:
Indyuce 2020-04-18 13:25:59 +02:00
parent c27d138c0a
commit 148344f35f
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
View File

@ -686,6 +686,11 @@ public class PlayerData extends OfflinePlayerData {
if (event.isCancelled()) if (event.isCancelled())
return new SkillResult(this, skill, CancelReason.OTHER); return new SkillResult(this, skill, CancelReason.OTHER);
/*
* skill, mana and cooldown requirements are all calculated in the
* SkillResult instances. this cast(SkillResult) method only applies
* cooldown, reduces mana and send messages
*/
SkillResult cast = skill.getSkill().whenCast(this, skill); SkillResult cast = skill.getSkill().whenCast(this, skill);
if (!cast.isSuccessful()) { if (!cast.isSuccessful()) {
if (!skill.getSkill().isPassive()) { if (!skill.getSkill().isPassive()) {

3
src/main/java/net/Indyuce/mmocore/api/skill/Skill.java
View File

@ -88,6 +88,9 @@ public abstract class Skill {
return icon.clone(); return icon.clone();
} }
/*
* passive skills do not display any message
*/
public boolean isPassive() { public boolean isPassive() {
return passive; return passive;
} }

18
src/main/java/net/Indyuce/mmocore/api/skill/SkillResult.java
View File

@ -6,8 +6,8 @@ import net.Indyuce.mmocore.api.skill.Skill.SkillInfo;
public class SkillResult { public class SkillResult {
private final SkillInfo skill; private final SkillInfo skill;
private final int level; private final int level;
private final double mana, cooldown; private final double mana, cooldown;
private CancelReason cancelReason; private CancelReason cancelReason;
public SkillResult(PlayerData data, SkillInfo skill) { public SkillResult(PlayerData data, SkillInfo skill) {
@ -16,7 +16,8 @@ public class SkillResult {
level = data.getSkillLevel(skill.getSkill()); level = data.getSkillLevel(skill.getSkill());
cooldown = (skill.getSkill().hasModifier("cooldown") ? data.getSkillData().getCooldown(skill) : 0); cooldown = (skill.getSkill().hasModifier("cooldown") ? data.getSkillData().getCooldown(skill) : 0);
mana = (skill.getSkill().hasModifier("mana") ? skill.getModifier("mana", level) : 0); mana = (skill.getSkill().hasModifier("mana") ? skill.getModifier("mana", level) : 0);
cancelReason = cooldown > 0 ? CancelReason.COOLDOWN : mana > data.getMana() ? CancelReason.MANA : null; cancelReason = !data.hasSkillUnlocked(skill.getSkill()) ? CancelReason.LOCKED
: cooldown > 0 ? CancelReason.COOLDOWN : mana > data.getMana() ? CancelReason.MANA : null;
} }
public SkillResult(PlayerData data, SkillInfo skill, CancelReason reason) { public SkillResult(PlayerData data, SkillInfo skill, CancelReason reason) {
@ -24,8 +25,8 @@ public class SkillResult {
this.cancelReason = reason; this.cancelReason = reason;
level = data.getSkillLevel(skill.getSkill()); level = data.getSkillLevel(skill.getSkill());
cooldown = (skill.getSkill().hasModifier("cooldown") ? data.getSkillData().getCooldown(skill) : 0); cooldown = skill.getSkill().hasModifier("cooldown") ? data.getSkillData().getCooldown(skill) : 0;
mana = (skill.getSkill().hasModifier("mana") ? skill.getModifier("mana", level) : 0); mana = skill.getSkill().hasModifier("mana") ? skill.getModifier("mana", level) : 0;
} }
public Skill getSkill() { public Skill getSkill() {
@ -69,8 +70,17 @@ public class SkillResult {
} }
public enum CancelReason { public enum CancelReason {
// not enough mana
MANA, MANA,
// skill still on cooldown
COOLDOWN, COOLDOWN,
// skill still not unlocked
LOCKED,
// no reason specified
OTHER; OTHER;
} }
} }