Use of primitive boolean for TriggerSkillByAttack critical parameter.

This commit is contained in:
MobiusDevelopment 2020-04-04 10:27:01 +00:00
parent 5c2aced5eb
commit 98e76d2817
15 changed files with 45 additions and 105 deletions

View File

@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect
private final TargetType _targetType; private final TargetType _targetType;
private final InstanceType _attackerType; private final InstanceType _attackerType;
private int _allowWeapons; private int _allowWeapons;
private final Boolean _isCritical; private final boolean _isCritical;
private final boolean _allowNormalAttack; private final boolean _allowNormalAttack;
private final boolean _allowSkillAttack; private final boolean _allowSkillAttack;
private final boolean _allowReflect; private final boolean _allowReflect;
/**
* @param params
*/
public TriggerSkillByAttack(StatSet params) public TriggerSkillByAttack(StatSet params)
{ {
_minAttackerLevel = params.getInt("minAttackerLevel", 1); _minAttackerLevel = params.getInt("minAttackerLevel", 1);
@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature);
_isCritical = params.getObject("isCritical", Boolean.class); _isCritical = params.getBoolean("isCritical", false);
_allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowNormalAttack = params.getBoolean("allowNormalAttack", true);
_allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowSkillAttack = params.getBoolean("allowSkillAttack", false);
_allowReflect = params.getBoolean("allowReflect", false); _allowReflect = params.getBoolean("allowReflect", false);
@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect
} }
// Check if there is dependancy on critical. // Check if there is dependancy on critical.
if ((_isCritical != null) && (_isCritical != event.isCritical())) if (_isCritical != event.isCritical())
{ {
return; return;
} }

View File

@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect
private final TargetType _targetType; private final TargetType _targetType;
private final InstanceType _attackerType; private final InstanceType _attackerType;
private int _allowWeapons; private int _allowWeapons;
private final Boolean _isCritical; private final boolean _isCritical;
private final boolean _allowNormalAttack; private final boolean _allowNormalAttack;
private final boolean _allowSkillAttack; private final boolean _allowSkillAttack;
private final boolean _allowReflect; private final boolean _allowReflect;
/**
* @param params
*/
public TriggerSkillByAttack(StatSet params) public TriggerSkillByAttack(StatSet params)
{ {
_minAttackerLevel = params.getInt("minAttackerLevel", 1); _minAttackerLevel = params.getInt("minAttackerLevel", 1);
@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature);
_isCritical = params.getObject("isCritical", Boolean.class); _isCritical = params.getBoolean("isCritical", false);
_allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowNormalAttack = params.getBoolean("allowNormalAttack", true);
_allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowSkillAttack = params.getBoolean("allowSkillAttack", false);
_allowReflect = params.getBoolean("allowReflect", false); _allowReflect = params.getBoolean("allowReflect", false);
@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect
} }
// Check if there is dependancy on critical. // Check if there is dependancy on critical.
if ((_isCritical != null) && (_isCritical != event.isCritical())) if (_isCritical != event.isCritical())
{ {
return; return;
} }

View File

@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect
private final TargetType _targetType; private final TargetType _targetType;
private final InstanceType _attackerType; private final InstanceType _attackerType;
private int _allowWeapons; private int _allowWeapons;
private final Boolean _isCritical; private final boolean _isCritical;
private final boolean _allowNormalAttack; private final boolean _allowNormalAttack;
private final boolean _allowSkillAttack; private final boolean _allowSkillAttack;
private final boolean _allowReflect; private final boolean _allowReflect;
/**
* @param params
*/
public TriggerSkillByAttack(StatSet params) public TriggerSkillByAttack(StatSet params)
{ {
_minAttackerLevel = params.getInt("minAttackerLevel", 1); _minAttackerLevel = params.getInt("minAttackerLevel", 1);
@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature);
_isCritical = params.getObject("isCritical", Boolean.class); _isCritical = params.getBoolean("isCritical", false);
_allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowNormalAttack = params.getBoolean("allowNormalAttack", true);
_allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowSkillAttack = params.getBoolean("allowSkillAttack", false);
_allowReflect = params.getBoolean("allowReflect", false); _allowReflect = params.getBoolean("allowReflect", false);
@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect
} }
// Check if there is dependancy on critical. // Check if there is dependancy on critical.
if ((_isCritical != null) && (_isCritical != event.isCritical())) if (_isCritical != event.isCritical())
{ {
return; return;
} }

View File

@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect
private final TargetType _targetType; private final TargetType _targetType;
private final InstanceType _attackerType; private final InstanceType _attackerType;
private int _allowWeapons; private int _allowWeapons;
private final Boolean _isCritical; private final boolean _isCritical;
private final boolean _allowNormalAttack; private final boolean _allowNormalAttack;
private final boolean _allowSkillAttack; private final boolean _allowSkillAttack;
private final boolean _allowReflect; private final boolean _allowReflect;
/**
* @param params
*/
public TriggerSkillByAttack(StatSet params) public TriggerSkillByAttack(StatSet params)
{ {
_minAttackerLevel = params.getInt("minAttackerLevel", 1); _minAttackerLevel = params.getInt("minAttackerLevel", 1);
@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature);
_isCritical = params.getObject("isCritical", Boolean.class); _isCritical = params.getBoolean("isCritical", false);
_allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowNormalAttack = params.getBoolean("allowNormalAttack", true);
_allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowSkillAttack = params.getBoolean("allowSkillAttack", false);
_allowReflect = params.getBoolean("allowReflect", false); _allowReflect = params.getBoolean("allowReflect", false);
@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect
} }
// Check if there is dependancy on critical. // Check if there is dependancy on critical.
if ((_isCritical != null) && (_isCritical != event.isCritical())) if (_isCritical != event.isCritical())
{ {
return; return;
} }

View File

@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect
private final TargetType _targetType; private final TargetType _targetType;
private final InstanceType _attackerType; private final InstanceType _attackerType;
private int _allowWeapons; private int _allowWeapons;
private final Boolean _isCritical; private final boolean _isCritical;
private final boolean _allowNormalAttack; private final boolean _allowNormalAttack;
private final boolean _allowSkillAttack; private final boolean _allowSkillAttack;
private final boolean _allowReflect; private final boolean _allowReflect;
/**
* @param params
*/
public TriggerSkillByAttack(StatSet params) public TriggerSkillByAttack(StatSet params)
{ {
_minAttackerLevel = params.getInt("minAttackerLevel", 1); _minAttackerLevel = params.getInt("minAttackerLevel", 1);
@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature);
_isCritical = params.getObject("isCritical", Boolean.class); _isCritical = params.getBoolean("isCritical", false);
_allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowNormalAttack = params.getBoolean("allowNormalAttack", true);
_allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowSkillAttack = params.getBoolean("allowSkillAttack", false);
_allowReflect = params.getBoolean("allowReflect", false); _allowReflect = params.getBoolean("allowReflect", false);
@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect
} }
// Check if there is dependancy on critical. // Check if there is dependancy on critical.
if ((_isCritical != null) && (_isCritical != event.isCritical())) if (_isCritical != event.isCritical())
{ {
return; return;
} }

View File

@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect
private final TargetType _targetType; private final TargetType _targetType;
private final InstanceType _attackerType; private final InstanceType _attackerType;
private int _allowWeapons; private int _allowWeapons;
private final Boolean _isCritical; private final boolean _isCritical;
private final boolean _allowNormalAttack; private final boolean _allowNormalAttack;
private final boolean _allowSkillAttack; private final boolean _allowSkillAttack;
private final boolean _allowReflect; private final boolean _allowReflect;
/**
* @param params
*/
public TriggerSkillByAttack(StatSet params) public TriggerSkillByAttack(StatSet params)
{ {
_minAttackerLevel = params.getInt("minAttackerLevel", 1); _minAttackerLevel = params.getInt("minAttackerLevel", 1);
@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature);
_isCritical = params.getObject("isCritical", Boolean.class); _isCritical = params.getBoolean("isCritical", false);
_allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowNormalAttack = params.getBoolean("allowNormalAttack", true);
_allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowSkillAttack = params.getBoolean("allowSkillAttack", false);
_allowReflect = params.getBoolean("allowReflect", false); _allowReflect = params.getBoolean("allowReflect", false);
@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect
} }
// Check if there is dependancy on critical. // Check if there is dependancy on critical.
if ((_isCritical != null) && (_isCritical != event.isCritical())) if (_isCritical != event.isCritical())
{ {
return; return;
} }

View File

@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect
private final TargetType _targetType; private final TargetType _targetType;
private final InstanceType _attackerType; private final InstanceType _attackerType;
private int _allowWeapons; private int _allowWeapons;
private final Boolean _isCritical; private final boolean _isCritical;
private final boolean _allowNormalAttack; private final boolean _allowNormalAttack;
private final boolean _allowSkillAttack; private final boolean _allowSkillAttack;
private final boolean _allowReflect; private final boolean _allowReflect;
/**
* @param params
*/
public TriggerSkillByAttack(StatSet params) public TriggerSkillByAttack(StatSet params)
{ {
_minAttackerLevel = params.getInt("minAttackerLevel", 1); _minAttackerLevel = params.getInt("minAttackerLevel", 1);
@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature);
_isCritical = params.getObject("isCritical", Boolean.class); _isCritical = params.getBoolean("isCritical", false);
_allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowNormalAttack = params.getBoolean("allowNormalAttack", true);
_allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowSkillAttack = params.getBoolean("allowSkillAttack", false);
_allowReflect = params.getBoolean("allowReflect", false); _allowReflect = params.getBoolean("allowReflect", false);
@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect
} }
// Check if there is dependancy on critical. // Check if there is dependancy on critical.
if ((_isCritical != null) && (_isCritical != event.isCritical())) if (_isCritical != event.isCritical())
{ {
return; return;
} }

View File

@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect
private final TargetType _targetType; private final TargetType _targetType;
private final InstanceType _attackerType; private final InstanceType _attackerType;
private int _allowWeapons; private int _allowWeapons;
private final Boolean _isCritical; private final boolean _isCritical;
private final boolean _allowNormalAttack; private final boolean _allowNormalAttack;
private final boolean _allowSkillAttack; private final boolean _allowSkillAttack;
private final boolean _allowReflect; private final boolean _allowReflect;
/**
* @param params
*/
public TriggerSkillByAttack(StatSet params) public TriggerSkillByAttack(StatSet params)
{ {
_minAttackerLevel = params.getInt("minAttackerLevel", 1); _minAttackerLevel = params.getInt("minAttackerLevel", 1);
@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature);
_isCritical = params.getObject("isCritical", Boolean.class); _isCritical = params.getBoolean("isCritical", false);
_allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowNormalAttack = params.getBoolean("allowNormalAttack", true);
_allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowSkillAttack = params.getBoolean("allowSkillAttack", false);
_allowReflect = params.getBoolean("allowReflect", false); _allowReflect = params.getBoolean("allowReflect", false);
@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect
} }
// Check if there is dependancy on critical. // Check if there is dependancy on critical.
if ((_isCritical != null) && (_isCritical != event.isCritical())) if (_isCritical != event.isCritical())
{ {
return; return;
} }

View File

@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect
private final TargetType _targetType; private final TargetType _targetType;
private final InstanceType _attackerType; private final InstanceType _attackerType;
private int _allowWeapons; private int _allowWeapons;
private final Boolean _isCritical; private final boolean _isCritical;
private final boolean _allowNormalAttack; private final boolean _allowNormalAttack;
private final boolean _allowSkillAttack; private final boolean _allowSkillAttack;
private final boolean _allowReflect; private final boolean _allowReflect;
/**
* @param params
*/
public TriggerSkillByAttack(StatSet params) public TriggerSkillByAttack(StatSet params)
{ {
_minAttackerLevel = params.getInt("minAttackerLevel", 1); _minAttackerLevel = params.getInt("minAttackerLevel", 1);
@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature);
_isCritical = params.getObject("isCritical", Boolean.class); _isCritical = params.getBoolean("isCritical", false);
_allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowNormalAttack = params.getBoolean("allowNormalAttack", true);
_allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowSkillAttack = params.getBoolean("allowSkillAttack", false);
_allowReflect = params.getBoolean("allowReflect", false); _allowReflect = params.getBoolean("allowReflect", false);
@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect
} }
// Check if there is dependancy on critical. // Check if there is dependancy on critical.
if ((_isCritical != null) && (_isCritical != event.isCritical())) if (_isCritical != event.isCritical())
{ {
return; return;
} }

View File

@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect
private final TargetType _targetType; private final TargetType _targetType;
private final InstanceType _attackerType; private final InstanceType _attackerType;
private int _allowWeapons; private int _allowWeapons;
private final Boolean _isCritical; private final boolean _isCritical;
private final boolean _allowNormalAttack; private final boolean _allowNormalAttack;
private final boolean _allowSkillAttack; private final boolean _allowSkillAttack;
private final boolean _allowReflect; private final boolean _allowReflect;
/**
* @param params
*/
public TriggerSkillByAttack(StatSet params) public TriggerSkillByAttack(StatSet params)
{ {
_minAttackerLevel = params.getInt("minAttackerLevel", 1); _minAttackerLevel = params.getInt("minAttackerLevel", 1);
@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature);
_isCritical = params.getObject("isCritical", Boolean.class); _isCritical = params.getBoolean("isCritical", false);
_allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowNormalAttack = params.getBoolean("allowNormalAttack", true);
_allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowSkillAttack = params.getBoolean("allowSkillAttack", false);
_allowReflect = params.getBoolean("allowReflect", false); _allowReflect = params.getBoolean("allowReflect", false);
@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect
} }
// Check if there is dependancy on critical. // Check if there is dependancy on critical.
if ((_isCritical != null) && (_isCritical != event.isCritical())) if (_isCritical != event.isCritical())
{ {
return; return;
} }

View File

@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect
private final TargetType _targetType; private final TargetType _targetType;
private final InstanceType _attackerType; private final InstanceType _attackerType;
private int _allowWeapons; private int _allowWeapons;
private final Boolean _isCritical; private final boolean _isCritical;
private final boolean _allowNormalAttack; private final boolean _allowNormalAttack;
private final boolean _allowSkillAttack; private final boolean _allowSkillAttack;
private final boolean _allowReflect; private final boolean _allowReflect;
/**
* @param params
*/
public TriggerSkillByAttack(StatSet params) public TriggerSkillByAttack(StatSet params)
{ {
_minAttackerLevel = params.getInt("minAttackerLevel", 1); _minAttackerLevel = params.getInt("minAttackerLevel", 1);
@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature);
_isCritical = params.getObject("isCritical", Boolean.class); _isCritical = params.getBoolean("isCritical", false);
_allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowNormalAttack = params.getBoolean("allowNormalAttack", true);
_allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowSkillAttack = params.getBoolean("allowSkillAttack", false);
_allowReflect = params.getBoolean("allowReflect", false); _allowReflect = params.getBoolean("allowReflect", false);
@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect
} }
// Check if there is dependancy on critical. // Check if there is dependancy on critical.
if ((_isCritical != null) && (_isCritical != event.isCritical())) if (_isCritical != event.isCritical())
{ {
return; return;
} }

View File

@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect
private final TargetType _targetType; private final TargetType _targetType;
private final InstanceType _attackerType; private final InstanceType _attackerType;
private int _allowWeapons; private int _allowWeapons;
private final Boolean _isCritical; private final boolean _isCritical;
private final boolean _allowNormalAttack; private final boolean _allowNormalAttack;
private final boolean _allowSkillAttack; private final boolean _allowSkillAttack;
private final boolean _allowReflect; private final boolean _allowReflect;
/**
* @param params
*/
public TriggerSkillByAttack(StatSet params) public TriggerSkillByAttack(StatSet params)
{ {
_minAttackerLevel = params.getInt("minAttackerLevel", 1); _minAttackerLevel = params.getInt("minAttackerLevel", 1);
@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature);
_isCritical = params.getObject("isCritical", Boolean.class); _isCritical = params.getBoolean("isCritical", false);
_allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowNormalAttack = params.getBoolean("allowNormalAttack", true);
_allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowSkillAttack = params.getBoolean("allowSkillAttack", false);
_allowReflect = params.getBoolean("allowReflect", false); _allowReflect = params.getBoolean("allowReflect", false);
@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect
} }
// Check if there is dependancy on critical. // Check if there is dependancy on critical.
if ((_isCritical != null) && (_isCritical != event.isCritical())) if (_isCritical != event.isCritical())
{ {
return; return;
} }

View File

@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect
private final TargetType _targetType; private final TargetType _targetType;
private final InstanceType _attackerType; private final InstanceType _attackerType;
private int _allowWeapons; private int _allowWeapons;
private final Boolean _isCritical; private final boolean _isCritical;
private final boolean _allowNormalAttack; private final boolean _allowNormalAttack;
private final boolean _allowSkillAttack; private final boolean _allowSkillAttack;
private final boolean _allowReflect; private final boolean _allowReflect;
/**
* @param params
*/
public TriggerSkillByAttack(StatSet params) public TriggerSkillByAttack(StatSet params)
{ {
_minAttackerLevel = params.getInt("minAttackerLevel", 1); _minAttackerLevel = params.getInt("minAttackerLevel", 1);
@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature);
_isCritical = params.getObject("isCritical", Boolean.class); _isCritical = params.getBoolean("isCritical", false);
_allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowNormalAttack = params.getBoolean("allowNormalAttack", true);
_allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowSkillAttack = params.getBoolean("allowSkillAttack", false);
_allowReflect = params.getBoolean("allowReflect", false); _allowReflect = params.getBoolean("allowReflect", false);
@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect
} }
// Check if there is dependancy on critical. // Check if there is dependancy on critical.
if ((_isCritical != null) && (_isCritical != event.isCritical())) if (_isCritical != event.isCritical())
{ {
return; return;
} }

View File

@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect
private final TargetType _targetType; private final TargetType _targetType;
private final InstanceType _attackerType; private final InstanceType _attackerType;
private int _allowWeapons; private int _allowWeapons;
private final Boolean _isCritical; private final boolean _isCritical;
private final boolean _allowNormalAttack; private final boolean _allowNormalAttack;
private final boolean _allowSkillAttack; private final boolean _allowSkillAttack;
private final boolean _allowReflect; private final boolean _allowReflect;
/**
* @param params
*/
public TriggerSkillByAttack(StatSet params) public TriggerSkillByAttack(StatSet params)
{ {
_minAttackerLevel = params.getInt("minAttackerLevel", 1); _minAttackerLevel = params.getInt("minAttackerLevel", 1);
@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature);
_isCritical = params.getObject("isCritical", Boolean.class); _isCritical = params.getBoolean("isCritical", false);
_allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowNormalAttack = params.getBoolean("allowNormalAttack", true);
_allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowSkillAttack = params.getBoolean("allowSkillAttack", false);
_allowReflect = params.getBoolean("allowReflect", false); _allowReflect = params.getBoolean("allowReflect", false);
@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect
} }
// Check if there is dependancy on critical. // Check if there is dependancy on critical.
if ((_isCritical != null) && (_isCritical != event.isCritical())) if (_isCritical != event.isCritical())
{ {
return; return;
} }

View File

@ -50,15 +50,11 @@ public class TriggerSkillByAttack extends AbstractEffect
private final TargetType _targetType; private final TargetType _targetType;
private final InstanceType _attackerType; private final InstanceType _attackerType;
private int _allowWeapons; private int _allowWeapons;
private final Boolean _isCritical; private final boolean _isCritical;
private final boolean _allowNormalAttack; private final boolean _allowNormalAttack;
private final boolean _allowSkillAttack; private final boolean _allowSkillAttack;
private final boolean _allowReflect; private final boolean _allowReflect;
/**
* @param params
*/
public TriggerSkillByAttack(StatSet params) public TriggerSkillByAttack(StatSet params)
{ {
_minAttackerLevel = params.getInt("minAttackerLevel", 1); _minAttackerLevel = params.getInt("minAttackerLevel", 1);
@ -68,7 +64,7 @@ public class TriggerSkillByAttack extends AbstractEffect
_skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1)); _skill = new SkillHolder(params.getInt("skillId"), params.getInt("skillLevel", 1));
_targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF); _targetType = params.getEnum("targetType", TargetType.class, TargetType.SELF);
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature); _attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.Creature);
_isCritical = params.getObject("isCritical", Boolean.class); _isCritical = params.getBoolean("isCritical", false);
_allowNormalAttack = params.getBoolean("allowNormalAttack", true); _allowNormalAttack = params.getBoolean("allowNormalAttack", true);
_allowSkillAttack = params.getBoolean("allowSkillAttack", false); _allowSkillAttack = params.getBoolean("allowSkillAttack", false);
_allowReflect = params.getBoolean("allowReflect", false); _allowReflect = params.getBoolean("allowReflect", false);
@ -94,7 +90,7 @@ public class TriggerSkillByAttack extends AbstractEffect
} }
// Check if there is dependancy on critical. // Check if there is dependancy on critical.
if ((_isCritical != null) && (_isCritical != event.isCritical())) if (_isCritical != event.isCritical())
{ {
return; return;
} }