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

Support for Blessed Soulshots.

Browse Source
This commit is contained in:
MobiusDev
2017-06-29 19:14:30 +00:00
parent 57b647f5fd
commit 9d3c1fd5cc
45 changed files with 639 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
L2J_Mobius_Classic/java/com/l2jmobius/gameserver/enums/ShotType.java
View File

@@ -23,6 +23,7 @@ public enum ShotType
{
SOULSHOTS,
SPIRITSHOTS,
BLESSED_SOULSHOTS,
BLESSED_SPIRITSHOTS,
FISH_SOULSHOTS;

4
L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -1134,7 +1134,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
setCurrentCp(getCurrentCp() - 10);
}
final boolean wasSSCharged = isChargedShot(ShotType.SOULSHOTS); // Verify if soulshots are charged.
final boolean wasSSCharged = isChargedShot(ShotType.SOULSHOTS) || isChargedShot(ShotType.BLESSED_SOULSHOTS); // Verify if soulshots are charged.
final int timeAtk = Formulas.calculateTimeBetweenAttacks(this, weaponType); // Get the Attack Speed of the L2Character (delay (in milliseconds) before next attack)
final int timeToHit = timeAtk / 2; // the hit is calculated to happen halfway to the animation - might need further tuning e.g. in bow case
final int ssGrade = (weaponItem != null) ? weaponItem.getItemGrade().ordinal() : 0;
@@ -4013,7 +4013,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
else
{
// If we didn't miss the hit, discharge the shoulshots, if any
setChargedShot(ShotType.SOULSHOTS, false);
setChargedShot(isChargedShot(ShotType.BLESSED_SOULSHOTS) ? ShotType.BLESSED_SOULSHOTS : ShotType.SOULSHOTS, false);
}
// Check Raidboss attack

2
L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1467,7 +1467,7 @@ public final class Skill implements IIdentifiable
}
else if (useSoulShot())
{
caster.setChargedShot(ShotType.SOULSHOTS, false);
caster.setChargedShot(caster.isChargedShot(ShotType.BLESSED_SOULSHOTS) ? ShotType.BLESSED_SOULSHOTS : ShotType.SOULSHOTS, false);
}
}

2
L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java
View File

@@ -221,7 +221,7 @@ public class SkillChannelizer implements Runnable
}
else
{
_channelizer.setChargedShot(ShotType.SOULSHOTS, false);
_channelizer.setChargedShot(_channelizer.isChargedShot(ShotType.BLESSED_SOULSHOTS) ? ShotType.BLESSED_SOULSHOTS : ShotType.SOULSHOTS, false);
}
// Shots are re-charged every cast.