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

Polearm auto attack rework.

Browse Source
This commit is contained in:
MobiusDev 2018-09-04 03:38:21 +00:00
parent 5967cd7be1
commit 70c624ed4a
8 changed files with 185 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -1153,10 +1153,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{
final boolean isDual = WeaponType.DUAL.equals(weaponType) || WeaponType.DUALBLUNT.equals(weaponType) || WeaponType.DUALDAGGER.equals(weaponType) || WeaponType.DUALFIST.equals(weaponType);
final Attack attack = new Attack(this, target);
boolean shotConsumed = false;
// Calculate the main target hit
// Calculate the main target hit.
Hit hit = generateHit(target, weapon, shotConsumed, isDual);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
@ -1184,23 +1183,31 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
continue;
}
// Skip dead or fake dead target.
if (obj.isAlikeDead())
{
continue;
}
// Check if target is auto attackable.
if (!obj.isAutoAttackable(this))
{
continue;
}
// Check if target is within attack angle.
if (Math.abs(calculateDirectionTo(obj) - headingAngle) > physicalAttackAngle)
{
continue;
}
// Launch a simple attack against the L2Character targeted
if (obj.isAutoAttackable(this))
// Launch a simple attack against the additional target.
hit = generateHit(obj, weapon, shotConsumed, false);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
if (--attackCountMax <= 0)
{
hit = generateHit(obj, weapon, shotConsumed, false);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
if (--attackCountMax <= 0)
{
break;
}
break;
}
}
}

31
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -1153,10 +1153,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{
final boolean isDual = WeaponType.DUAL.equals(weaponType) || WeaponType.DUALBLUNT.equals(weaponType) || WeaponType.DUALDAGGER.equals(weaponType) || WeaponType.DUALFIST.equals(weaponType);
final Attack attack = new Attack(this, target);
boolean shotConsumed = false;
// Calculate the main target hit
// Calculate the main target hit.
Hit hit = generateHit(target, weapon, shotConsumed, isDual);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
@ -1184,23 +1183,31 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
continue;
}
// Skip dead or fake dead target.
if (obj.isAlikeDead())
{
continue;
}
// Check if target is auto attackable.
if (!obj.isAutoAttackable(this))
{
continue;
}
// Check if target is within attack angle.
if (Math.abs(calculateDirectionTo(obj) - headingAngle) > physicalAttackAngle)
{
continue;
}
// Launch a simple attack against the L2Character targeted
if (obj.isAutoAttackable(this))
// Launch a simple attack against the additional target.
hit = generateHit(obj, weapon, shotConsumed, false);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
if (--attackCountMax <= 0)
{
hit = generateHit(obj, weapon, shotConsumed, false);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
if (--attackCountMax <= 0)
{
break;
}
break;
}
}
}

31
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -1153,10 +1153,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{
final boolean isDual = WeaponType.DUAL.equals(weaponType) || WeaponType.DUALBLUNT.equals(weaponType) || WeaponType.DUALDAGGER.equals(weaponType) || WeaponType.DUALFIST.equals(weaponType);
final Attack attack = new Attack(this, target);
boolean shotConsumed = false;
// Calculate the main target hit
// Calculate the main target hit.
Hit hit = generateHit(target, weapon, shotConsumed, isDual);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
@ -1184,23 +1183,31 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
continue;
}
// Skip dead or fake dead target.
if (obj.isAlikeDead())
{
continue;
}
// Check if target is auto attackable.
if (!obj.isAutoAttackable(this))
{
continue;
}
// Check if target is within attack angle.
if (Math.abs(calculateDirectionTo(obj) - headingAngle) > physicalAttackAngle)
{
continue;
}
// Launch a simple attack against the L2Character targeted
if (obj.isAutoAttackable(this))
// Launch a simple attack against the additional target.
hit = generateHit(obj, weapon, shotConsumed, false);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
if (--attackCountMax <= 0)
{
hit = generateHit(obj, weapon, shotConsumed, false);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
if (--attackCountMax <= 0)
{
break;
}
break;
}
}
}

31
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -1153,10 +1153,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{
final boolean isDual = WeaponType.DUAL.equals(weaponType) || WeaponType.DUALBLUNT.equals(weaponType) || WeaponType.DUALDAGGER.equals(weaponType) || WeaponType.DUALFIST.equals(weaponType);
final Attack attack = new Attack(this, target);
boolean shotConsumed = false;
// Calculate the main target hit
// Calculate the main target hit.
Hit hit = generateHit(target, weapon, shotConsumed, isDual);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
@ -1184,23 +1183,31 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
continue;
}
// Skip dead or fake dead target.
if (obj.isAlikeDead())
{
continue;
}
// Check if target is auto attackable.
if (!obj.isAutoAttackable(this))
{
continue;
}
// Check if target is within attack angle.
if (Math.abs(calculateDirectionTo(obj) - headingAngle) > physicalAttackAngle)
{
continue;
}
// Launch a simple attack against the L2Character targeted
if (obj.isAutoAttackable(this))
// Launch a simple attack against the additional target.
hit = generateHit(obj, weapon, shotConsumed, false);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
if (--attackCountMax <= 0)
{
hit = generateHit(obj, weapon, shotConsumed, false);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
if (--attackCountMax <= 0)
{
break;
}
break;
}
}
}

123
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -1317,82 +1317,63 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
*/
private boolean doAttackHitByPole(Attack attack, L2Character target, int sAtk)
{
// double angleChar;
final int maxRadius = _stat.getPhysicalAttackRange();
final int maxAngleDiff = _stat.getPhysicalAttackAngle();
// o1 x: 83420 y: 148158 (Giran)
// o2 x: 83379 y: 148081 (Giran)
// dx = -41
// dy = -77
// distance between o1 and o2 = 87.24
// arctan2 = -120 (240) degree (excel arctan2(dx, dy); java arctan2(dy, dx))
//
// o2
//
// o1 ----- (heading)
// In the diagram above:
// o1 has a heading of 0/360 degree from horizontal (facing East)
// Degree of o2 in respect to o1 = -120 (240) degree
//
// o2 / (heading)
// /
// o1
// In the diagram above
// o1 has a heading of -80 (280) degree from horizontal (facing north east)
// Degree of o2 in respect to 01 = -40 (320) degree
// Get char's heading degree
// angleChar = Util.convertHeadingToDegree(getHeading());
// Perform the main target hit.
boolean hitted = doAttackHitSimple(attack, target, 100, sAtk);
// H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599).
final int attackRandomCountMax = (int) _stat.calcStat(Stats.ATTACK_COUNT_MAX, 1, null, null);
int attackcount = 0;
// if (angleChar <= 0) angleChar += 360;
boolean hitted = doAttackHitSimple(attack, target, 100, sAtk);
double attackpercent = 85;
for (L2Character obj : L2World.getInstance().getVisibleObjects(this, L2Character.class, maxRadius))
int attackCountMax = (int) _stat.calcStat(Stats.ATTACK_COUNT_MAX, 1, null, null);
if (attackCountMax > 1)
{
if (obj == target)
final int maxRadius = _stat.getPhysicalAttackRange();
final int maxAngleDiff = _stat.getPhysicalAttackAngle();
double attackpercent = 85;
for (L2Character obj : L2World.getInstance().getVisibleObjects(this, L2Character.class, maxRadius))
{
continue; // do not hit twice
}
if (obj.isPet() && isPlayer() && (((L2PetInstance) obj).getOwner() == getActingPlayer()))
{
continue;
}
if (!isFacing(obj, maxAngleDiff))
{
continue;
}
if (isAttackable() && obj.isPlayer() && _target.isAttackable())
{
continue;
}
if (isAttackable() && obj.isAttackable() && !((L2Attackable) this).isChaos())
{
continue;
}
// Launch a simple attack against the L2Character targeted
if (!obj.isAlikeDead())
{
if ((obj == getAI().getAttackTarget()) || obj.isAutoAttackable(this))
// Skip main target.
if (obj == target)
{
hitted |= doAttackHitSimple(attack, obj, attackpercent, sAtk);
attackpercent /= 1.15;
attackcount++;
if (attackcount > attackRandomCountMax)
{
break;
}
continue;
}
// Skip dead or fake dead target.
if (obj.isAlikeDead())
{
continue;
}
// Check if target is auto attackable.
if (!obj.isAutoAttackable(this))
{
continue;
}
// Check if target is within attack angle.
if (!isFacing(obj, maxAngleDiff))
{
continue;
}
if (obj.isPet() && isPlayer() && (((L2PetInstance) obj).getOwner() == getActingPlayer()))
{
continue;
}
if (isAttackable() && obj.isPlayer() && _target.isAttackable())
{
continue;
}
if (isAttackable() && obj.isAttackable() && !((L2Attackable) this).isChaos())
{
continue;
}
// Launch a simple attack against the additional target.
hitted |= doAttackHitSimple(attack, obj, attackpercent, sAtk);
attackpercent /= 1.15;
if (--attackCountMax <= 0)
{
break;
}
}
}

31
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -1153,10 +1153,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{
final boolean isDual = WeaponType.DUAL.equals(weaponType) || WeaponType.DUALBLUNT.equals(weaponType) || WeaponType.DUALDAGGER.equals(weaponType) || WeaponType.DUALFIST.equals(weaponType);
final Attack attack = new Attack(this, target);
boolean shotConsumed = false;
// Calculate the main target hit
// Calculate the main target hit.
Hit hit = generateHit(target, weapon, shotConsumed, isDual);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
@ -1184,23 +1183,31 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
continue;
}
// Skip dead or fake dead target.
if (obj.isAlikeDead())
{
continue;
}
// Check if target is auto attackable.
if (!obj.isAutoAttackable(this))
{
continue;
}
// Check if target is within attack angle.
if (Math.abs(calculateDirectionTo(obj) - headingAngle) > physicalAttackAngle)
{
continue;
}
// Launch a simple attack against the L2Character targeted
if (obj.isAutoAttackable(this))
// Launch a simple attack against the additional target.
hit = generateHit(obj, weapon, shotConsumed, false);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
if (--attackCountMax <= 0)
{
hit = generateHit(obj, weapon, shotConsumed, false);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
if (--attackCountMax <= 0)
{
break;
}
break;
}
}
}

31
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -1153,10 +1153,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{
final boolean isDual = WeaponType.DUAL.equals(weaponType) || WeaponType.DUALBLUNT.equals(weaponType) || WeaponType.DUALDAGGER.equals(weaponType) || WeaponType.DUALFIST.equals(weaponType);
final Attack attack = new Attack(this, target);
boolean shotConsumed = false;
// Calculate the main target hit
// Calculate the main target hit.
Hit hit = generateHit(target, weapon, shotConsumed, isDual);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
@ -1184,23 +1183,31 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
continue;
}
// Skip dead or fake dead target.
if (obj.isAlikeDead())
{
continue;
}
// Check if target is auto attackable.
if (!obj.isAutoAttackable(this))
{
continue;
}
// Check if target is within attack angle.
if (Math.abs(calculateDirectionTo(obj) - headingAngle) > physicalAttackAngle)
{
continue;
}
// Launch a simple attack against the L2Character targeted
if (obj.isAutoAttackable(this))
// Launch a simple attack against the additional target.
hit = generateHit(obj, weapon, shotConsumed, false);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
if (--attackCountMax <= 0)
{
hit = generateHit(obj, weapon, shotConsumed, false);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
if (--attackCountMax <= 0)
{
break;
}
break;
}
}
}

31
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -1153,10 +1153,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{
final boolean isDual = WeaponType.DUAL.equals(weaponType) || WeaponType.DUALBLUNT.equals(weaponType) || WeaponType.DUALDAGGER.equals(weaponType) || WeaponType.DUALFIST.equals(weaponType);
final Attack attack = new Attack(this, target);
boolean shotConsumed = false;
// Calculate the main target hit
// Calculate the main target hit.
Hit hit = generateHit(target, weapon, shotConsumed, isDual);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
@ -1184,23 +1183,31 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
continue;
}
// Skip dead or fake dead target.
if (obj.isAlikeDead())
{
continue;
}
// Check if target is auto attackable.
if (!obj.isAutoAttackable(this))
{
continue;
}
// Check if target is within attack angle.
if (Math.abs(calculateDirectionTo(obj) - headingAngle) > physicalAttackAngle)
{
continue;
}
// Launch a simple attack against the L2Character targeted
if (obj.isAutoAttackable(this))
// Launch a simple attack against the additional target.
hit = generateHit(obj, weapon, shotConsumed, false);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
if (--attackCountMax <= 0)
{
hit = generateHit(obj, weapon, shotConsumed, false);
attack.addHit(hit);
shotConsumed = hit.isShotUsed();
if (--attackCountMax <= 0)
{
break;
}
break;
}
}
}