diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index cf84c07a62..37a11accb5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -413,7 +413,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index cce41a244a..20dd3ca18c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -104,6 +104,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -194,6 +195,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -518,6 +520,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/Weapon.java index 2eb41538ea..4c93e9fd3f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -84,12 +84,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index cf84c07a62..37a11accb5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -413,7 +413,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index cce41a244a..20dd3ca18c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -104,6 +104,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -194,6 +195,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -518,6 +520,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/Weapon.java index 2eb41538ea..4c93e9fd3f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -84,12 +84,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index cf84c07a62..37a11accb5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -413,7 +413,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index cce41a244a..20dd3ca18c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -104,6 +104,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -194,6 +195,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -518,6 +520,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/Weapon.java index 2eb41538ea..4c93e9fd3f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -84,12 +84,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index cf84c07a62..37a11accb5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -413,7 +413,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index cce41a244a..20dd3ca18c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -104,6 +104,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -194,6 +195,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -518,6 +520,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/Weapon.java index 2eb41538ea..4c93e9fd3f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -84,12 +84,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index cf84c07a62..37a11accb5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -413,7 +413,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index cce41a244a..20dd3ca18c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -104,6 +104,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -194,6 +195,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -518,6 +520,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/Weapon.java index 2eb41538ea..4c93e9fd3f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -84,12 +84,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index cf84c07a62..37a11accb5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -413,7 +413,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index cce41a244a..20dd3ca18c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -104,6 +104,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -194,6 +195,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -518,6 +520,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/Weapon.java index 2eb41538ea..4c93e9fd3f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -84,12 +84,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index cf84c07a62..37a11accb5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -413,7 +413,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index cce41a244a..20dd3ca18c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -104,6 +104,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -194,6 +195,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -518,6 +520,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/Weapon.java index 2eb41538ea..4c93e9fd3f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -84,12 +84,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index cf84c07a62..37a11accb5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -413,7 +413,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index cce41a244a..20dd3ca18c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -104,6 +104,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -194,6 +195,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -518,6 +520,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/Weapon.java index a9b4d7740e..3f2263bc27 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -86,12 +86,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 04cd1fb1df..9c6a01c307 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -423,7 +423,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 33faf70086..1a809fc3d0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index a7ce4c1dcc..9136e42cb1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -104,6 +104,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -194,6 +195,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -518,6 +520,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/Weapon.java index a9b4d7740e..3f2263bc27 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -86,12 +86,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 04cd1fb1df..9c6a01c307 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -423,7 +423,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 33faf70086..1a809fc3d0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index a7ce4c1dcc..9136e42cb1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -104,6 +104,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -194,6 +195,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -518,6 +520,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/Weapon.java index a9b4d7740e..3f2263bc27 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -86,12 +86,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 04cd1fb1df..9c6a01c307 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -423,7 +423,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 33faf70086..1a809fc3d0 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index a7ce4c1dcc..9136e42cb1 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -104,6 +104,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -194,6 +195,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -518,6 +520,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/Weapon.java index a9b4d7740e..3f2263bc27 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -86,12 +86,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 1c23322476..30933b3a63 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -546,7 +546,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 0d5d08bd58..33768515ca 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -95,6 +95,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _spiritShotChance; private int _minSkillChance; private int _maxSkillChance; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -177,6 +178,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _spiritShotChance = set.getInt("spiritShotChance", 0); _minSkillChance = set.getInt("minSkillChance", 7); _maxSkillChance = set.getInt("maxSkillChance", 15); + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers @@ -477,6 +479,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _maxSkillChance; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java index 29ca2834d0..587830a7bd 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -45,6 +45,7 @@ public class Weapon extends ItemTemplate private int _spiritShotCount; private int _mpConsume; private int _baseAttackRange; + private int _baseAttackRadius; private int _baseAttackAngle; /** * Skill that activates when item is enchanted +4 (for duals). @@ -90,13 +91,15 @@ public class Weapon extends ItemTemplate _mpConsume = set.getInt("mp_consume", 0); _baseAttackRange = set.getInt("attack_range", 40); final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle - if ((damageRange.length > 1) && Util.isDigit(damageRange[3])) + if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackRadius = Integer.parseInt(damageRange[2]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { - _baseAttackAngle = 240; // 360 - 120 + _baseAttackRadius = 40; + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); @@ -279,6 +282,11 @@ public class Weapon extends ItemTemplate return _baseAttackRange; } + public int getBaseAttackRadius() + { + return _baseAttackRadius; + } + public int getBaseAttackAngle() { return _baseAttackAngle; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 7be15b70ac..99abfc5b0b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -564,7 +564,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 0cb77f3ddf..2d4934c402 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -95,6 +95,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _spiritShotChance; private int _minSkillChance; private int _maxSkillChance; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -177,6 +178,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _spiritShotChance = set.getInt("spiritShotChance", 0); _minSkillChance = set.getInt("minSkillChance", 7); _maxSkillChance = set.getInt("maxSkillChance", 15); + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers @@ -477,6 +479,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _maxSkillChance; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/Weapon.java index 4c8f9d0c5c..0fe5349e2c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -45,6 +45,7 @@ public class Weapon extends ItemTemplate private int _spiritShotCount; private int _mpConsume; private int _baseAttackRange; + private int _baseAttackRadius; private int _baseAttackAngle; /** * Skill that activates when item is enchanted +4 (for duals). @@ -91,13 +92,15 @@ public class Weapon extends ItemTemplate _mpConsume = set.getInt("mp_consume", 0); _baseAttackRange = set.getInt("attack_range", 40); final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle - if ((damageRange.length > 1) && Util.isDigit(damageRange[3])) + if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackRadius = Integer.parseInt(damageRange[2]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { - _baseAttackAngle = 240; // 360 - 120 + _baseAttackRadius = 40; + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); @@ -281,6 +284,11 @@ public class Weapon extends ItemTemplate return _baseAttackRange; } + public int getBaseAttackRadius() + { + return _baseAttackRadius; + } + public int getBaseAttackAngle() { return _baseAttackAngle; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 7be15b70ac..99abfc5b0b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -564,7 +564,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 0cb77f3ddf..2d4934c402 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -95,6 +95,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _spiritShotChance; private int _minSkillChance; private int _maxSkillChance; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -177,6 +178,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _spiritShotChance = set.getInt("spiritShotChance", 0); _minSkillChance = set.getInt("minSkillChance", 7); _maxSkillChance = set.getInt("maxSkillChance", 15); + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); if (Config.ENABLE_NPC_STAT_MULTIPLIERS) // Custom NPC Stat Multipliers @@ -477,6 +479,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _maxSkillChance; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/Weapon.java index 4c8f9d0c5c..0fe5349e2c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -45,6 +45,7 @@ public class Weapon extends ItemTemplate private int _spiritShotCount; private int _mpConsume; private int _baseAttackRange; + private int _baseAttackRadius; private int _baseAttackAngle; /** * Skill that activates when item is enchanted +4 (for duals). @@ -91,13 +92,15 @@ public class Weapon extends ItemTemplate _mpConsume = set.getInt("mp_consume", 0); _baseAttackRange = set.getInt("attack_range", 40); final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle - if ((damageRange.length > 1) && Util.isDigit(damageRange[3])) + if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackRadius = Integer.parseInt(damageRange[2]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { - _baseAttackAngle = 240; // 360 - 120 + _baseAttackRadius = 40; + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); @@ -281,6 +284,11 @@ public class Weapon extends ItemTemplate return _baseAttackRange; } + public int getBaseAttackRadius() + { + return _baseAttackRadius; + } + public int getBaseAttackAngle() { return _baseAttackAngle; diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 8f331376a0..782d74c566 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -403,7 +403,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 91f13b99a5..73901e5bd0 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -104,6 +104,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -194,6 +195,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -518,6 +520,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/item/Weapon.java index b293af7fd7..b914a10302 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -82,12 +82,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 8f331376a0..782d74c566 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -403,7 +403,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 9b08ab324e..d24dab7f89 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -105,6 +105,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -195,6 +196,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -519,6 +521,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/item/Weapon.java index b293af7fd7..b914a10302 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -82,12 +82,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 8f331376a0..782d74c566 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -403,7 +403,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 9b08ab324e..d24dab7f89 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -105,6 +105,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -195,6 +196,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -519,6 +521,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/Weapon.java index b293af7fd7..b914a10302 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -82,12 +82,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 8f331376a0..782d74c566 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -403,7 +403,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 9b08ab324e..d24dab7f89 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -105,6 +105,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -195,6 +196,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -519,6 +521,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/item/Weapon.java index b293af7fd7..b914a10302 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -82,12 +82,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 8f331376a0..782d74c566 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -403,7 +403,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 9b08ab324e..d24dab7f89 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -105,6 +105,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -195,6 +196,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -519,6 +521,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/item/Weapon.java index b293af7fd7..b914a10302 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -82,12 +82,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 8f331376a0..782d74c566 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -403,7 +403,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 2a1e580441..431a9a1a85 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -106,6 +106,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -200,6 +201,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -534,6 +536,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/item/Weapon.java index b293af7fd7..b914a10302 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -82,12 +82,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 8f331376a0..782d74c566 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -403,7 +403,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 2a1e580441..431a9a1a85 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -106,6 +106,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -200,6 +201,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -534,6 +536,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/item/Weapon.java index 86ed8bbf17..a5c8e3138a 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -82,12 +82,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 8f331376a0..782d74c566 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -403,7 +403,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 2a1e580441..431a9a1a85 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -106,6 +106,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -200,6 +201,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -534,6 +536,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/Weapon.java index b293af7fd7..b914a10302 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -82,12 +82,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 8f331376a0..782d74c566 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -403,7 +403,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 2a1e580441..431a9a1a85 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -106,6 +106,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -200,6 +201,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -534,6 +536,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/Weapon.java index 86ed8bbf17..a5c8e3138a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -82,12 +82,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 8f331376a0..782d74c566 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -403,7 +403,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 911704f05b..88232e46e8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 91f13b99a5..73901e5bd0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -104,6 +104,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -194,6 +195,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -518,6 +520,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java index 2eb41538ea..4c93e9fd3f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -84,12 +84,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index fe084eead5..b0ddb25713 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -413,7 +413,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 33faf70086..1a809fc3d0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 675f01efa2..1e7dbc55c4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -105,6 +105,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -199,6 +200,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -533,6 +535,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/Weapon.java index 86ed8bbf17..a5c8e3138a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -82,12 +82,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index fe084eead5..b0ddb25713 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -413,7 +413,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 33faf70086..1a809fc3d0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 675f01efa2..1e7dbc55c4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -105,6 +105,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -199,6 +200,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -533,6 +535,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/Weapon.java index 86ed8bbf17..a5c8e3138a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -82,12 +82,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index fe084eead5..b0ddb25713 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -413,7 +413,7 @@ public class CreatureStat public int getPhysicalAttackAngle() { - return 240; // 360 - 120 + return 0; } /** diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java index 33faf70086..1a809fc3d0 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/stat/NpcStat.java @@ -36,4 +36,10 @@ public class NpcStat extends CreatureStat { return (Npc) super.getActiveChar(); } + + @Override + public int getPhysicalAttackAngle() + { + return getActiveChar().getTemplate().getBaseAttackAngle(); + } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 675f01efa2..1e7dbc55c4 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -105,6 +105,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private int _maxSkillChance; private double _hitTimeFactor; private double _hitTimeFactorSkill; + private int _baseAttackAngle; private Map _skills; private Map> _aiSkillLists; private Set _clans; @@ -199,6 +200,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; + _baseAttackAngle = set.getInt("width", 120); _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); @@ -533,6 +535,11 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return _hitTimeFactorSkill; } + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + @Override public Map getSkills() { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/Weapon.java index 86ed8bbf17..a5c8e3138a 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/Weapon.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -82,12 +82,12 @@ public class Weapon extends ItemTemplate if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) { _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + _baseAttackAngle = Integer.parseInt(damageRange[3]); } else { _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 + _baseAttackAngle = 0; } final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(",");