lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Weapon baseAttackAngle is relative to character position in degrees.

Browse Source
This commit is contained in:
MobiusDev 2018-12-18 07:35:43 +00:00
parent 4c592c1707
commit 872dfa30a7
23 changed files with 78 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
View File

@ -396,7 +396,7 @@ public class CharStat
public int getPhysicalAttackAngle()
{
return 120;
return 240; // 360 - 120
}
/**

10
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/L2Weapon.java
View File

@ -77,16 +77,16 @@ public final class L2Weapon extends L2Item
_spiritShotCount = set.getInt("spiritshots", 0);
_mpConsume = set.getInt("mp_consume", 0);
_baseAttackRange = set.getInt("attack_range", 40);
final String[] damgeRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damgeRange.length > 1) && Util.isDigit(damgeRange[2]) && Util.isDigit(damgeRange[3]))
final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3]))
{
_baseAttackRadius = Integer.parseInt(damgeRange[2]);
_baseAttackAngle = Integer.parseInt(damgeRange[3]);
_baseAttackRadius = Integer.parseInt(damageRange[2]);
_baseAttackAngle = 360 - Integer.parseInt(damageRange[3]);
}
else
{
_baseAttackRadius = 40;
_baseAttackAngle = 120;
_baseAttackAngle = 240; // 360 - 120
}
final String[] reduced_soulshots = set.getString("reduced_soulshot", "").split(",");

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
View File

@ -396,7 +396,7 @@ public class CharStat
public int getPhysicalAttackAngle()
{
return 120;
return 240; // 360 - 120
}
/**

10
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/L2Weapon.java
View File

@ -77,16 +77,16 @@ public final class L2Weapon extends L2Item
_spiritShotCount = set.getInt("spiritshots", 0);
_mpConsume = set.getInt("mp_consume", 0);
_baseAttackRange = set.getInt("attack_range", 40);
final String[] damgeRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damgeRange.length > 1) && Util.isDigit(damgeRange[2]) && Util.isDigit(damgeRange[3]))
final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3]))
{
_baseAttackRadius = Integer.parseInt(damgeRange[2]);
_baseAttackAngle = Integer.parseInt(damgeRange[3]);
_baseAttackRadius = Integer.parseInt(damageRange[2]);
_baseAttackAngle = 360 - Integer.parseInt(damageRange[3]);
}
else
{
_baseAttackRadius = 40;
_baseAttackAngle = 120;
_baseAttackAngle = 240; // 360 - 120
}
final String[] reduced_soulshots = set.getString("reduced_soulshot", "").split(",");

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
View File

@ -396,7 +396,7 @@ public class CharStat
public int getPhysicalAttackAngle()
{
return 120;
return 240; // 360 - 120
}
/**

10
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/L2Weapon.java
View File

@ -77,16 +77,16 @@ public final class L2Weapon extends L2Item
_spiritShotCount = set.getInt("spiritshots", 0);
_mpConsume = set.getInt("mp_consume", 0);
_baseAttackRange = set.getInt("attack_range", 40);
final String[] damgeRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damgeRange.length > 1) && Util.isDigit(damgeRange[2]) && Util.isDigit(damgeRange[3]))
final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3]))
{
_baseAttackRadius = Integer.parseInt(damgeRange[2]);
_baseAttackAngle = Integer.parseInt(damgeRange[3]);
_baseAttackRadius = Integer.parseInt(damageRange[2]);
_baseAttackAngle = 360 - Integer.parseInt(damageRange[3]);
}
else
{
_baseAttackRadius = 40;
_baseAttackAngle = 120;
_baseAttackAngle = 240; // 360 - 120
}
final String[] reduced_soulshots = set.getString("reduced_soulshot", "").split(",");

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
View File

@ -396,7 +396,7 @@ public class CharStat
public int getPhysicalAttackAngle()
{
return 120;
return 240; // 360 - 120
}
/**

10
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/L2Weapon.java
View File

@ -77,16 +77,16 @@ public final class L2Weapon extends L2Item
_spiritShotCount = set.getInt("spiritshots", 0);
_mpConsume = set.getInt("mp_consume", 0);
_baseAttackRange = set.getInt("attack_range", 40);
final String[] damgeRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damgeRange.length > 1) && Util.isDigit(damgeRange[2]) && Util.isDigit(damgeRange[3]))
final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3]))
{
_baseAttackRadius = Integer.parseInt(damgeRange[2]);
_baseAttackAngle = Integer.parseInt(damgeRange[3]);
_baseAttackRadius = Integer.parseInt(damageRange[2]);
_baseAttackAngle = 360 - Integer.parseInt(damageRange[3]);
}
else
{
_baseAttackRadius = 40;
_baseAttackAngle = 120;
_baseAttackAngle = 240; // 360 - 120
}
final String[] reduced_soulshots = set.getString("reduced_soulshot", "").split(",");

2
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
View File

@ -396,7 +396,7 @@ public class CharStat
public int getPhysicalAttackAngle()
{
return 120;
return 240; // 360 - 120
}
/**

10
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/items/L2Weapon.java
View File

@ -77,16 +77,16 @@ public final class L2Weapon extends L2Item
_spiritShotCount = set.getInt("spiritshots", 0);
_mpConsume = set.getInt("mp_consume", 0);
_baseAttackRange = set.getInt("attack_range", 40);
final String[] damgeRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damgeRange.length > 1) && Util.isDigit(damgeRange[2]) && Util.isDigit(damgeRange[3]))
final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3]))
{
_baseAttackRadius = Integer.parseInt(damgeRange[2]);
_baseAttackAngle = Integer.parseInt(damgeRange[3]);
_baseAttackRadius = Integer.parseInt(damageRange[2]);
_baseAttackAngle = 360 - Integer.parseInt(damageRange[3]);
}
else
{
_baseAttackRadius = 40;
_baseAttackAngle = 120;
_baseAttackAngle = 240; // 360 - 120
}
final String[] reduced_soulshots = set.getString("reduced_soulshot", "").split(",");

2
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
View File

@ -396,7 +396,7 @@ public class CharStat
public int getPhysicalAttackAngle()
{
return 120;
return 240; // 360 - 120
}
/**

10
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/items/L2Weapon.java
View File

@ -77,16 +77,16 @@ public final class L2Weapon extends L2Item
_spiritShotCount = set.getInt("spiritshots", 0);
_mpConsume = set.getInt("mp_consume", 0);
_baseAttackRange = set.getInt("attack_range", 40);
final String[] damgeRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damgeRange.length > 1) && Util.isDigit(damgeRange[2]) && Util.isDigit(damgeRange[3]))
final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3]))
{
_baseAttackRadius = Integer.parseInt(damgeRange[2]);
_baseAttackAngle = Integer.parseInt(damgeRange[3]);
_baseAttackRadius = Integer.parseInt(damageRange[2]);
_baseAttackAngle = 360 - Integer.parseInt(damageRange[3]);
}
else
{
_baseAttackRadius = 40;
_baseAttackAngle = 120;
_baseAttackAngle = 240; // 360 - 120
}
final String[] reduced_soulshots = set.getString("reduced_soulshot", "").split(",");

12
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
View File

@ -569,17 +569,7 @@ public class CharStat
public int getPhysicalAttackAngle()
{
final L2Weapon weapon = _activeChar.getActiveWeaponItem();
final int baseAttackAngle;
if (weapon != null)
{
baseAttackAngle = weapon.getBaseAttackAngle();
}
else
{
baseAttackAngle = 120;
}
return baseAttackAngle;
return 240; // 360 - 120
}
/**

8
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
View File

@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
import com.l2jmobius.gameserver.model.events.EventDispatcher;
import com.l2jmobius.gameserver.model.events.impl.character.playable.OnPlayableExpChanged;
import com.l2jmobius.gameserver.model.events.returns.TerminateReturn;
import com.l2jmobius.gameserver.model.items.L2Weapon;
import com.l2jmobius.gameserver.model.zone.ZoneId;
import com.l2jmobius.gameserver.model.zone.type.L2SwampZone;
@ -251,4 +252,11 @@ public class PlayableStat extends CharStat
{
return ExperienceData.getInstance().getMaxLevel();
}
@Override
public int getPhysicalAttackAngle()
{
final L2Weapon weapon = getActiveChar().getActiveWeaponItem();
return weapon != null ? weapon.getBaseAttackAngle() : super.getPhysicalAttackAngle();
}
}

11
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/L2Weapon.java
View File

@ -89,8 +89,15 @@ public final class L2Weapon extends L2Item
_rndDam = set.getInt("random_damage", 0);
_mpConsume = set.getInt("mp_consume", 0);
_baseAttackRange = set.getInt("attack_range", 40);
final String[] damgeRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
_baseAttackAngle = (damgeRange.length > 1) && Util.isDigit(damgeRange[3]) ? Integer.parseInt(damgeRange[3]) : 120;
final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damageRange.length > 1) && Util.isDigit(damageRange[3]))
{
_baseAttackAngle = 360 - Integer.parseInt(damageRange[3]);
}
else
{
_baseAttackAngle = 240; // 360 - 120
}
final String[] reduced_soulshots = set.getString("reduced_soulshot", "").split(",");
_reducedSoulshotChance = (reduced_soulshots.length == 2) ? Integer.parseInt(reduced_soulshots[0]) : 0;

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
View File

@ -386,7 +386,7 @@ public class CharStat
public int getPhysicalAttackAngle()
{
return 120;
return 240; // 360 - 120
}
/**

10
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/L2Weapon.java
View File

@ -77,16 +77,16 @@ public final class L2Weapon extends L2Item
_spiritShotCount = set.getInt("spiritshots", 0);
_mpConsume = set.getInt("mp_consume", 0);
_baseAttackRange = set.getInt("attack_range", 40);
final String[] damgeRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damgeRange.length > 1) && Util.isDigit(damgeRange[2]) && Util.isDigit(damgeRange[3]))
final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3]))
{
_baseAttackRadius = Integer.parseInt(damgeRange[2]);
_baseAttackAngle = Integer.parseInt(damgeRange[3]);
_baseAttackRadius = Integer.parseInt(damageRange[2]);
_baseAttackAngle = 360 - Integer.parseInt(damageRange[3]);
}
else
{
_baseAttackRadius = 40;
_baseAttackAngle = 120;
_baseAttackAngle = 240; // 360 - 120
}
final String[] reduced_soulshots = set.getString("reduced_soulshot", "").split(",");

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
View File

@ -386,7 +386,7 @@ public class CharStat
public int getPhysicalAttackAngle()
{
return 120;
return 240; // 360 - 120
}
/**

10
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/L2Weapon.java
View File

@ -77,16 +77,16 @@ public final class L2Weapon extends L2Item
_spiritShotCount = set.getInt("spiritshots", 0);
_mpConsume = set.getInt("mp_consume", 0);
_baseAttackRange = set.getInt("attack_range", 40);
final String[] damgeRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damgeRange.length > 1) && Util.isDigit(damgeRange[2]) && Util.isDigit(damgeRange[3]))
final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3]))
{
_baseAttackRadius = Integer.parseInt(damgeRange[2]);
_baseAttackAngle = Integer.parseInt(damgeRange[3]);
_baseAttackRadius = Integer.parseInt(damageRange[2]);
_baseAttackAngle = 360 - Integer.parseInt(damageRange[3]);
}
else
{
_baseAttackRadius = 40;
_baseAttackAngle = 120;
_baseAttackAngle = 240; // 360 - 120
}
final String[] reduced_soulshots = set.getString("reduced_soulshot", "").split(",");

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
View File

@ -386,7 +386,7 @@ public class CharStat
public int getPhysicalAttackAngle()
{
return 120;
return 240; // 360 - 120
}
/**

10
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Weapon.java
View File

@ -77,16 +77,16 @@ public final class L2Weapon extends L2Item
_spiritShotCount = set.getInt("spiritshots", 0);
_mpConsume = set.getInt("mp_consume", 0);
_baseAttackRange = set.getInt("attack_range", 40);
final String[] damgeRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damgeRange.length > 1) && Util.isDigit(damgeRange[2]) && Util.isDigit(damgeRange[3]))
final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3]))
{
_baseAttackRadius = Integer.parseInt(damgeRange[2]);
_baseAttackAngle = Integer.parseInt(damgeRange[3]);
_baseAttackRadius = Integer.parseInt(damageRange[2]);
_baseAttackAngle = 360 - Integer.parseInt(damageRange[3]);
}
else
{
_baseAttackRadius = 40;
_baseAttackAngle = 120;
_baseAttackAngle = 240; // 360 - 120
}
final String[] reduced_soulshots = set.getString("reduced_soulshot", "").split(",");

2
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
View File

@ -386,7 +386,7 @@ public class CharStat
public int getPhysicalAttackAngle()
{
return 120;
return 240; // 360 - 120
}
/**

10
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/items/L2Weapon.java
View File

@ -77,16 +77,16 @@ public final class L2Weapon extends L2Item
_spiritShotCount = set.getInt("spiritshots", 0);
_mpConsume = set.getInt("mp_consume", 0);
_baseAttackRange = set.getInt("attack_range", 40);
final String[] damgeRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damgeRange.length > 1) && Util.isDigit(damgeRange[2]) && Util.isDigit(damgeRange[3]))
final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3]))
{
_baseAttackRadius = Integer.parseInt(damgeRange[2]);
_baseAttackAngle = Integer.parseInt(damgeRange[3]);
_baseAttackRadius = Integer.parseInt(damageRange[2]);
_baseAttackAngle = 360 - Integer.parseInt(damageRange[3]);
}
else
{
_baseAttackRadius = 40;
_baseAttackAngle = 120;
_baseAttackAngle = 240; // 360 - 120
}
final String[] reduced_soulshots = set.getString("reduced_soulshot", "").split(",");