Workaround for missing ranged weapon reuse delays.
This commit is contained in:
@@ -163,7 +163,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -103,6 +103,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -103,6 +103,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -103,6 +103,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -103,6 +103,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -103,6 +103,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -103,6 +103,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -103,6 +103,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -105,6 +105,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -105,6 +105,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -105,6 +105,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -105,6 +105,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -105,6 +105,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private SkillHolder _unequipSkill = null;
|
private SkillHolder _unequipSkill = null;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -195,6 +195,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -68,4 +68,9 @@ public enum WeaponType implements ItemType
|
|||||||
{
|
{
|
||||||
return _traitType;
|
return _traitType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isRanged()
|
||||||
|
{
|
||||||
|
return (this == BOW);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -149,7 +149,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private SkillHolder _unequipSkill = null;
|
private SkillHolder _unequipSkill = null;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -197,6 +197,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -71,4 +71,9 @@ public enum WeaponType implements ItemType
|
|||||||
{
|
{
|
||||||
return _traitType;
|
return _traitType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isRanged()
|
||||||
|
{
|
||||||
|
return (this == BOW) || (this == CROSSBOW);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -149,7 +149,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private SkillHolder _unequipSkill = null;
|
private SkillHolder _unequipSkill = null;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -197,6 +197,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -71,4 +71,9 @@ public enum WeaponType implements ItemType
|
|||||||
{
|
{
|
||||||
return _traitType;
|
return _traitType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isRanged()
|
||||||
|
{
|
||||||
|
return (this == BOW) || (this == CROSSBOW);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -163,7 +163,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -101,6 +101,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -101,6 +101,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -101,6 +101,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -101,6 +101,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -101,6 +101,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -101,6 +101,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -101,6 +101,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -101,6 +101,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -101,6 +101,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -103,6 +103,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -101,6 +101,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -101,6 +101,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -101,6 +101,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public abstract class ItemTemplate extends ListenersContainer implements IIdenti
|
|||||||
private List<ItemSkillHolder> _skills;
|
private List<ItemSkillHolder> _skills;
|
||||||
|
|
||||||
private int _useSkillDisTime;
|
private int _useSkillDisTime;
|
||||||
private int _reuseDelay;
|
protected int _reuseDelay;
|
||||||
private int _sharedReuseGroup;
|
private int _sharedReuseGroup;
|
||||||
|
|
||||||
private CommissionItemType _commissionItemType;
|
private CommissionItemType _commissionItemType;
|
||||||
|
|||||||
@@ -101,6 +101,12 @@ public class Weapon extends ItemTemplate
|
|||||||
_isForceEquip = set.getBoolean("isForceEquip", false);
|
_isForceEquip = set.getBoolean("isForceEquip", false);
|
||||||
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
|
||||||
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
|
||||||
|
|
||||||
|
// Check if ranged weapon reuse delay is missing.
|
||||||
|
if ((_reuseDelay == 0) && _type.isRanged())
|
||||||
|
{
|
||||||
|
_reuseDelay = 1500;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user