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

Prevent Stakato heal when silenced.

Browse Source 
Contributed by pecanha.
This commit is contained in:
MobiusDevelopment
2020-04-20 20:32:21 +00:00
parent bc3f2e07fa
commit 325a3ae124
27 changed files with 85 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java vendored
View File

@@ -91,20 +91,19 @@ public class StakatoNest extends AbstractNpcAI
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon)
{
final MonsterInstance mob = (MonsterInstance) npc;
if ((mob.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (mob.getCurrentHp() < (mob.getMaxHp() * 0.3)))
if ((npc.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.3)))
{
final MonsterInstance follower = checkMinion(npc);
if (follower != null)
{
final double _hp = follower.getCurrentHp();
if (_hp > (follower.getMaxHp() * 0.3))
final double hp = follower.getCurrentHp();
if (hp > (follower.getMaxHp() * 0.3))
{
mob.abortAttack();
mob.abortCast();
mob.setHeading(Util.calculateHeadingFrom(mob, follower));
mob.doCast(DEVOUR_SUBORDINATE.getSkill());
mob.setCurrentHp(mob.getCurrentHp() + _hp);
npc.abortAttack();
npc.abortCast();
npc.setHeading(Util.calculateHeadingFrom(npc, follower));
npc.doCast(DEVOUR_SUBORDINATE.getSkill());
npc.setCurrentHp(npc.getCurrentHp() + hp);
follower.doDie(follower);
follower.deleteMe();
}

1
L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -3307,6 +3307,7 @@
<effectPoint>100</effectPoint>
<effectRange>1100</effectRange>
<hitTime>100</hitTime>
<isMagic>1</isMagic> <!-- Magic Skill -->
<magicLvl>75</magicLvl>
<operateType>A1</operateType>
<magicCriticalRate>-5</magicCriticalRate>

17
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java vendored
View File

@@ -91,20 +91,19 @@ public class StakatoNest extends AbstractNpcAI
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon)
{
final MonsterInstance mob = (MonsterInstance) npc;
if ((mob.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (mob.getCurrentHp() < (mob.getMaxHp() * 0.3)))
if ((npc.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.3)))
{
final MonsterInstance follower = checkMinion(npc);
if (follower != null)
{
final double _hp = follower.getCurrentHp();
if (_hp > (follower.getMaxHp() * 0.3))
final double hp = follower.getCurrentHp();
if (hp > (follower.getMaxHp() * 0.3))
{
mob.abortAttack();
mob.abortCast();
mob.setHeading(Util.calculateHeadingFrom(mob, follower));
mob.doCast(DEVOUR_SUBORDINATE.getSkill());
mob.setCurrentHp(mob.getCurrentHp() + _hp);
npc.abortAttack();
npc.abortCast();
npc.setHeading(Util.calculateHeadingFrom(npc, follower));
npc.doCast(DEVOUR_SUBORDINATE.getSkill());
npc.setCurrentHp(npc.getCurrentHp() + hp);
follower.doDie(follower);
follower.deleteMe();
}

1
L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -3307,6 +3307,7 @@
<effectPoint>100</effectPoint>
<effectRange>1100</effectRange>
<hitTime>100</hitTime>
<isMagic>1</isMagic> <!-- Magic Skill -->
<magicLvl>75</magicLvl>
<operateType>A1</operateType>
<magicCriticalRate>-5</magicCriticalRate>

17
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java vendored
View File

@@ -91,20 +91,19 @@ public class StakatoNest extends AbstractNpcAI
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon)
{
final MonsterInstance mob = (MonsterInstance) npc;
if ((mob.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (mob.getCurrentHp() < (mob.getMaxHp() * 0.3)))
if ((npc.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.3)))
{
final MonsterInstance follower = checkMinion(npc);
if (follower != null)
{
final double _hp = follower.getCurrentHp();
if (_hp > (follower.getMaxHp() * 0.3))
final double hp = follower.getCurrentHp();
if (hp > (follower.getMaxHp() * 0.3))
{
mob.abortAttack();
mob.abortCast();
mob.setHeading(Util.calculateHeadingFrom(mob, follower));
mob.doCast(DEVOUR_SUBORDINATE.getSkill());
mob.setCurrentHp(mob.getCurrentHp() + _hp);
npc.abortAttack();
npc.abortCast();
npc.setHeading(Util.calculateHeadingFrom(npc, follower));
npc.doCast(DEVOUR_SUBORDINATE.getSkill());
npc.setCurrentHp(npc.getCurrentHp() + hp);
follower.doDie(follower);
follower.deleteMe();
}

1
L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -3320,6 +3320,7 @@
<effectPoint>100</effectPoint>
<effectRange>1100</effectRange>
<hitTime>100</hitTime>
<isMagic>1</isMagic> <!-- Magic Skill -->
<magicLvl>75</magicLvl>
<operateType>A1</operateType>
<magicCriticalRate>-5</magicCriticalRate>

17
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java vendored
View File

@@ -91,20 +91,19 @@ public class StakatoNest extends AbstractNpcAI
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon)
{
final MonsterInstance mob = (MonsterInstance) npc;
if ((mob.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (mob.getCurrentHp() < (mob.getMaxHp() * 0.3)))
if ((npc.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.3)))
{
final MonsterInstance follower = checkMinion(npc);
if (follower != null)
{
final double _hp = follower.getCurrentHp();
if (_hp > (follower.getMaxHp() * 0.3))
final double hp = follower.getCurrentHp();
if (hp > (follower.getMaxHp() * 0.3))
{
mob.abortAttack();
mob.abortCast();
mob.setHeading(Util.calculateHeadingFrom(mob, follower));
mob.doCast(DEVOUR_SUBORDINATE.getSkill());
mob.setCurrentHp(mob.getCurrentHp() + _hp);
npc.abortAttack();
npc.abortCast();
npc.setHeading(Util.calculateHeadingFrom(npc, follower));
npc.doCast(DEVOUR_SUBORDINATE.getSkill());
npc.setCurrentHp(npc.getCurrentHp() + hp);
follower.doDie(follower);
follower.deleteMe();
}

1
L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -3320,6 +3320,7 @@
<effectPoint>100</effectPoint>
<effectRange>1100</effectRange>
<hitTime>100</hitTime>
<isMagic>1</isMagic> <!-- Magic Skill -->
<magicLvl>75</magicLvl>
<operateType>A1</operateType>
<magicCriticalRate>-5</magicCriticalRate>

17
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java vendored
View File

@@ -91,20 +91,19 @@ public class StakatoNest extends AbstractNpcAI
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon)
{
final MonsterInstance mob = (MonsterInstance) npc;
if ((mob.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (mob.getCurrentHp() < (mob.getMaxHp() * 0.3)))
if ((npc.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.3)))
{
final MonsterInstance follower = checkMinion(npc);
if (follower != null)
{
final double _hp = follower.getCurrentHp();
if (_hp > (follower.getMaxHp() * 0.3))
final double hp = follower.getCurrentHp();
if (hp > (follower.getMaxHp() * 0.3))
{
mob.abortAttack();
mob.abortCast();
mob.setHeading(Util.calculateHeadingFrom(mob, follower));
mob.doCast(DEVOUR_SUBORDINATE.getSkill());
mob.setCurrentHp(mob.getCurrentHp() + _hp);
npc.abortAttack();
npc.abortCast();
npc.setHeading(Util.calculateHeadingFrom(npc, follower));
npc.doCast(DEVOUR_SUBORDINATE.getSkill());
npc.setCurrentHp(npc.getCurrentHp() + hp);
follower.doDie(follower);
follower.deleteMe();
}

1
L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -3320,6 +3320,7 @@
<effectPoint>100</effectPoint>
<effectRange>1100</effectRange>
<hitTime>100</hitTime>
<isMagic>1</isMagic> <!-- Magic Skill -->
<magicLvl>75</magicLvl>
<operateType>A1</operateType>
<magicCriticalRate>-5</magicCriticalRate>

17
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java vendored
View File

@@ -91,20 +91,19 @@ public class StakatoNest extends AbstractNpcAI
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon)
{
final MonsterInstance mob = (MonsterInstance) npc;
if ((mob.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (mob.getCurrentHp() < (mob.getMaxHp() * 0.3)))
if ((npc.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.3)))
{
final MonsterInstance follower = checkMinion(npc);
if (follower != null)
{
final double _hp = follower.getCurrentHp();
if (_hp > (follower.getMaxHp() * 0.3))
final double hp = follower.getCurrentHp();
if (hp > (follower.getMaxHp() * 0.3))
{
mob.abortAttack();
mob.abortCast();
mob.setHeading(Util.calculateHeadingFrom(mob, follower));
mob.doCast(DEVOUR_SUBORDINATE.getSkill());
mob.setCurrentHp(mob.getCurrentHp() + _hp);
npc.abortAttack();
npc.abortCast();
npc.setHeading(Util.calculateHeadingFrom(npc, follower));
npc.doCast(DEVOUR_SUBORDINATE.getSkill());
npc.setCurrentHp(npc.getCurrentHp() + hp);
follower.doDie(follower);
follower.deleteMe();
}

1
L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -3320,6 +3320,7 @@
<effectPoint>100</effectPoint>
<effectRange>1100</effectRange>
<hitTime>100</hitTime>
<isMagic>1</isMagic> <!-- Magic Skill -->
<magicLvl>75</magicLvl>
<operateType>A1</operateType>
<magicCriticalRate>-5</magicCriticalRate>

17
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java vendored
View File

@@ -91,20 +91,19 @@ public class StakatoNest extends AbstractNpcAI
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon)
{
final MonsterInstance mob = (MonsterInstance) npc;
if ((mob.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (mob.getCurrentHp() < (mob.getMaxHp() * 0.3)))
if ((npc.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.3)))
{
final MonsterInstance follower = checkMinion(npc);
if (follower != null)
{
final double _hp = follower.getCurrentHp();
if (_hp > (follower.getMaxHp() * 0.3))
final double hp = follower.getCurrentHp();
if (hp > (follower.getMaxHp() * 0.3))
{
mob.abortAttack();
mob.abortCast();
mob.setHeading(Util.calculateHeadingFrom(mob, follower));
mob.doCast(DEVOUR_SUBORDINATE.getSkill());
mob.setCurrentHp(mob.getCurrentHp() + _hp);
npc.abortAttack();
npc.abortCast();
npc.setHeading(Util.calculateHeadingFrom(npc, follower));
npc.doCast(DEVOUR_SUBORDINATE.getSkill());
npc.setCurrentHp(npc.getCurrentHp() + hp);
follower.doDie(follower);
follower.deleteMe();
}

1
L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -3320,6 +3320,7 @@
<effectPoint>100</effectPoint>
<effectRange>1100</effectRange>
<hitTime>100</hitTime>
<isMagic>1</isMagic> <!-- Magic Skill -->
<magicLvl>75</magicLvl>
<operateType>A1</operateType>
<magicCriticalRate>-5</magicCriticalRate>

17
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java vendored
View File

@@ -91,20 +91,19 @@ public class StakatoNest extends AbstractNpcAI
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon)
{
final MonsterInstance mob = (MonsterInstance) npc;
if ((mob.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (mob.getCurrentHp() < (mob.getMaxHp() * 0.3)))
if ((npc.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.3)))
{
final MonsterInstance follower = checkMinion(npc);
if (follower != null)
{
final double _hp = follower.getCurrentHp();
if (_hp > (follower.getMaxHp() * 0.3))
final double hp = follower.getCurrentHp();
if (hp > (follower.getMaxHp() * 0.3))
{
mob.abortAttack();
mob.abortCast();
mob.setHeading(Util.calculateHeadingFrom(mob, follower));
mob.doCast(DEVOUR_SUBORDINATE.getSkill());
mob.setCurrentHp(mob.getCurrentHp() + _hp);
npc.abortAttack();
npc.abortCast();
npc.setHeading(Util.calculateHeadingFrom(npc, follower));
npc.doCast(DEVOUR_SUBORDINATE.getSkill());
npc.setCurrentHp(npc.getCurrentHp() + hp);
follower.doDie(follower);
follower.deleteMe();
}

1
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -3320,6 +3320,7 @@
<effectPoint>100</effectPoint>
<effectRange>1100</effectRange>
<hitTime>100</hitTime>
<isMagic>1</isMagic> <!-- Magic Skill -->
<magicLvl>75</magicLvl>
<operateType>A1</operateType>
<magicCriticalRate>-5</magicCriticalRate>

3
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java vendored
View File

@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.skills.AbnormalType;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import org.l2jmobius.gameserver.util.Broadcast;
@@ -89,7 +90,7 @@ public class StakatoNest extends AbstractNpcAI
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon)
{
if ((npc.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.3)))
if ((npc.getId() == STAKATO_LEADER) && (npc.getEffectList().getBuffInfoByAbnormalType(AbnormalType.SILENCE) == null) && (getRandom(1000) < 100) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.3)))
{
final MonsterInstance follower = checkMinion(npc);
if (follower != null)

1
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -1406,6 +1406,7 @@
<set name="effectPoint" val="100" />
<set name="effectRange" val="1100" />
<set name="hitTime" val="100" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="75" />
<set name="operateType" val="A1" />
<set name="targetType" val="ONE" />

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java vendored
View File

@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.skills.AbnormalType;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
import org.l2jmobius.gameserver.util.Broadcast;
@@ -89,7 +90,7 @@ public class StakatoNest extends AbstractNpcAI
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon)
{
if ((npc.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.3)))
if ((npc.getId() == STAKATO_LEADER) && (npc.getEffectList().getBuffInfoByAbnormalType(AbnormalType.SILENCE) == null) && (getRandom(1000) < 100) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.3)))
{
final MonsterInstance follower = checkMinion(npc);
if (follower != null)

1
L2J_Mobius_CT_2.6_HighFive/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -1406,6 +1406,7 @@
<set name="effectPoint" val="100" />
<set name="effectRange" val="1100" />
<set name="hitTime" val="100" />
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="75" />
<set name="operateType" val="A1" />
<set name="targetType" val="ONE" />

1
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -3295,6 +3295,7 @@
<effectPoint>100</effectPoint>
<effectRange>1100</effectRange>
<hitTime>100</hitTime>
<isMagic>1</isMagic> <!-- Magic Skill -->
<magicLvl>75</magicLvl>
<operateType>A1</operateType>
<magicCriticalRate>-5</magicCriticalRate>

1
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -3295,6 +3295,7 @@
<effectPoint>100</effectPoint>
<effectRange>1100</effectRange>
<hitTime>100</hitTime>
<isMagic>1</isMagic> <!-- Magic Skill -->
<magicLvl>75</magicLvl>
<operateType>A1</operateType>
<magicCriticalRate>-5</magicCriticalRate>

1
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -3295,6 +3295,7 @@
<effectPoint>100</effectPoint>
<effectRange>1100</effectRange>
<hitTime>100</hitTime>
<isMagic>1</isMagic> <!-- Magic Skill -->
<magicLvl>75</magicLvl>
<operateType>A1</operateType>
<magicCriticalRate>-5</magicCriticalRate>

1
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -3295,6 +3295,7 @@
<effectPoint>100</effectPoint>
<effectRange>1100</effectRange>
<hitTime>100</hitTime>
<isMagic>1</isMagic> <!-- Magic Skill -->
<magicLvl>75</magicLvl>
<operateType>A1</operateType>
<magicCriticalRate>-5</magicCriticalRate>

1
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -3295,6 +3295,7 @@
<effectPoint>100</effectPoint>
<effectRange>1100</effectRange>
<hitTime>100</hitTime>
<isMagic>1</isMagic> <!-- Magic Skill -->
<magicLvl>75</magicLvl>
<operateType>A1</operateType>
<magicCriticalRate>-5</magicCriticalRate>

1
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -3295,6 +3295,7 @@
<effectPoint>100</effectPoint>
<effectRange>1100</effectRange>
<hitTime>100</hitTime>
<isMagic>1</isMagic> <!-- Magic Skill -->
<magicLvl>75</magicLvl>
<operateType>A1</operateType>
<magicCriticalRate>-5</magicCriticalRate>

1
L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/04400-04499.xml vendored
View File

@@ -3313,6 +3313,7 @@
<effectPoint>100</effectPoint>
<effectRange>1100</effectRange>
<hitTime>100</hitTime>
<isMagic>1</isMagic> <!-- Magic Skill -->
<magicLvl>75</magicLvl>
<operateType>A1</operateType>
<magicCriticalRate>-5</magicCriticalRate>