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

SiegeGuards AI improvements.

Browse Source
This commit is contained in:
MobiusDev
2017-11-12 01:11:58 +00:00
parent 38318f7869
commit 1365c7bd5e
5 changed files with 45 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@@ -108,16 +108,13 @@ public class SiegeGuards extends AbstractNpcAI
{ {
if (nearby.isPlayable() && GeoEngine.getInstance().canSeeTarget(npc, nearby)) if (nearby.isPlayable() && GeoEngine.getInstance().canSeeTarget(npc, nearby))
{ {
final L2Summon summon = nearby.isSummon() ? ((L2Summon) nearby) : null; final L2Summon summon = nearby.isSummon() ? (L2Summon) nearby : null;
final L2PcInstance cha = summon == null ? (L2PcInstance) nearby : summon.getOwner(); final L2PcInstance pl = summon == null ? (L2PcInstance) nearby : summon.getOwner();
final Castle castle = npc.getCastle(); if (((pl.getSiegeState() != 2) || pl.isRegisteredOnThisSiegeField(npc.getScriptValue())) && ((pl.getSiegeState() != 0) || (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_IDLE)))
final Fort fortress = npc.getFort();
final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
if ((((cha.getSiegeState() != 2) || cha.isRegisteredOnThisSiegeField(activeSiegeId)) && (cha.getSiegeState() != 0)) || (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_IDLE))
{ {
if (!cha.isInvisible()) // skip invisible players if (!pl.isInvisible()) // skip invisible players
{ {
addAttackPlayerDesire(npc, cha); addAttackPlayerDesire(npc, pl);
} }
} }
} }
@@ -132,10 +129,7 @@ public class SiegeGuards extends AbstractNpcAI
@Override @Override
public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon) public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
{ {
final Castle castle = npc.getCastle(); if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
final Fort fortress = npc.getFort();
final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
if ((((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(activeSiegeId)) || (attacker.getSiegeState() == 0)) && (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE))
{ {
((L2Attackable) npc).stopHating(attacker); ((L2Attackable) npc).stopHating(attacker);
return null; return null;
@@ -147,6 +141,9 @@ public class SiegeGuards extends AbstractNpcAI
public String onSpawn(L2Npc npc) public String onSpawn(L2Npc npc)
{ {
npc.setRandomWalking(false); npc.setRandomWalking(false);
final Castle castle = npc.getCastle();
final Fort fortress = npc.getFort();
npc.setScriptValue(fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
startQuestTimer("AGGRO_CHECK", 2000, npc, null); startQuestTimer("AGGRO_CHECK", 2000, npc, null);
return super.onSpawn(npc); return super.onSpawn(npc);
} }

21
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@@ -108,16 +108,13 @@ public class SiegeGuards extends AbstractNpcAI
{ {
if (nearby.isPlayable() && GeoEngine.getInstance().canSeeTarget(npc, nearby)) if (nearby.isPlayable() && GeoEngine.getInstance().canSeeTarget(npc, nearby))
{ {
final L2Summon summon = nearby.isSummon() ? ((L2Summon) nearby) : null; final L2Summon summon = nearby.isSummon() ? (L2Summon) nearby : null;
final L2PcInstance cha = summon == null ? (L2PcInstance) nearby : summon.getOwner(); final L2PcInstance pl = summon == null ? (L2PcInstance) nearby : summon.getOwner();
final Castle castle = npc.getCastle(); if (((pl.getSiegeState() != 2) || pl.isRegisteredOnThisSiegeField(npc.getScriptValue())) && ((pl.getSiegeState() != 0) || (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_IDLE)))
final Fort fortress = npc.getFort();
final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
if ((((cha.getSiegeState() != 2) || cha.isRegisteredOnThisSiegeField(activeSiegeId)) && (cha.getSiegeState() != 0)) || (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_IDLE))
{ {
if (!cha.isInvisible()) // skip invisible players if (!pl.isInvisible()) // skip invisible players
{ {
addAttackPlayerDesire(npc, cha); addAttackPlayerDesire(npc, pl);
} }
} }
} }
@@ -132,10 +129,7 @@ public class SiegeGuards extends AbstractNpcAI
@Override @Override
public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon) public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
{ {
final Castle castle = npc.getCastle(); if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
final Fort fortress = npc.getFort();
final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
if ((((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(activeSiegeId)) || (attacker.getSiegeState() == 0)) && (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE))
{ {
((L2Attackable) npc).stopHating(attacker); ((L2Attackable) npc).stopHating(attacker);
return null; return null;
@@ -147,6 +141,9 @@ public class SiegeGuards extends AbstractNpcAI
public String onSpawn(L2Npc npc) public String onSpawn(L2Npc npc)
{ {
npc.setRandomWalking(false); npc.setRandomWalking(false);
final Castle castle = npc.getCastle();
final Fort fortress = npc.getFort();
npc.setScriptValue(fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
startQuestTimer("AGGRO_CHECK", 2000, npc, null); startQuestTimer("AGGRO_CHECK", 2000, npc, null);
return super.onSpawn(npc); return super.onSpawn(npc);
} }

21
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@@ -108,16 +108,13 @@ public class SiegeGuards extends AbstractNpcAI
{ {
if (nearby.isPlayable() && GeoEngine.getInstance().canSeeTarget(npc, nearby)) if (nearby.isPlayable() && GeoEngine.getInstance().canSeeTarget(npc, nearby))
{ {
final L2Summon summon = nearby.isSummon() ? ((L2Summon) nearby) : null; final L2Summon summon = nearby.isSummon() ? (L2Summon) nearby : null;
final L2PcInstance cha = summon == null ? (L2PcInstance) nearby : summon.getOwner(); final L2PcInstance pl = summon == null ? (L2PcInstance) nearby : summon.getOwner();
final Castle castle = npc.getCastle(); if (((pl.getSiegeState() != 2) || pl.isRegisteredOnThisSiegeField(npc.getScriptValue())) && ((pl.getSiegeState() != 0) || (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_IDLE)))
final Fort fortress = npc.getFort();
final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
if ((((cha.getSiegeState() != 2) || cha.isRegisteredOnThisSiegeField(activeSiegeId)) && (cha.getSiegeState() != 0)) || (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_IDLE))
{ {
if (!cha.isInvisible()) // skip invisible players if (!pl.isInvisible()) // skip invisible players
{ {
addAttackPlayerDesire(npc, cha); addAttackPlayerDesire(npc, pl);
} }
} }
} }
@@ -132,10 +129,7 @@ public class SiegeGuards extends AbstractNpcAI
@Override @Override
public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon) public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
{ {
final Castle castle = npc.getCastle(); if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
final Fort fortress = npc.getFort();
final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
if ((((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(activeSiegeId)) || (attacker.getSiegeState() == 0)) && (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE))
{ {
((L2Attackable) npc).stopHating(attacker); ((L2Attackable) npc).stopHating(attacker);
return null; return null;
@@ -147,6 +141,9 @@ public class SiegeGuards extends AbstractNpcAI
public String onSpawn(L2Npc npc) public String onSpawn(L2Npc npc)
{ {
npc.setRandomWalking(false); npc.setRandomWalking(false);
final Castle castle = npc.getCastle();
final Fort fortress = npc.getFort();
npc.setScriptValue(fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
startQuestTimer("AGGRO_CHECK", 2000, npc, null); startQuestTimer("AGGRO_CHECK", 2000, npc, null);
return super.onSpawn(npc); return super.onSpawn(npc);
} }

21
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@@ -108,16 +108,13 @@ public class SiegeGuards extends AbstractNpcAI
{ {
if (nearby.isPlayable() && GeoEngine.getInstance().canSeeTarget(npc, nearby)) if (nearby.isPlayable() && GeoEngine.getInstance().canSeeTarget(npc, nearby))
{ {
final L2Summon summon = nearby.isSummon() ? ((L2Summon) nearby) : null; final L2Summon summon = nearby.isSummon() ? (L2Summon) nearby : null;
final L2PcInstance cha = summon == null ? (L2PcInstance) nearby : summon.getOwner(); final L2PcInstance pl = summon == null ? (L2PcInstance) nearby : summon.getOwner();
final Castle castle = npc.getCastle(); if (((pl.getSiegeState() != 2) || pl.isRegisteredOnThisSiegeField(npc.getScriptValue())) && ((pl.getSiegeState() != 0) || (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_IDLE)))
final Fort fortress = npc.getFort();
final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
if ((((cha.getSiegeState() != 2) || cha.isRegisteredOnThisSiegeField(activeSiegeId)) && (cha.getSiegeState() != 0)) || (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_IDLE))
{ {
if (!cha.isInvisible()) // skip invisible players if (!pl.isInvisible()) // skip invisible players
{ {
addAttackPlayerDesire(npc, cha); addAttackPlayerDesire(npc, pl);
} }
} }
} }
@@ -132,10 +129,7 @@ public class SiegeGuards extends AbstractNpcAI
@Override @Override
public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon) public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
{ {
final Castle castle = npc.getCastle(); if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
final Fort fortress = npc.getFort();
final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
if ((((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(activeSiegeId)) || (attacker.getSiegeState() == 0)) && (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE))
{ {
((L2Attackable) npc).stopHating(attacker); ((L2Attackable) npc).stopHating(attacker);
return null; return null;
@@ -147,6 +141,9 @@ public class SiegeGuards extends AbstractNpcAI
public String onSpawn(L2Npc npc) public String onSpawn(L2Npc npc)
{ {
npc.setRandomWalking(false); npc.setRandomWalking(false);
final Castle castle = npc.getCastle();
final Fort fortress = npc.getFort();
npc.setScriptValue(fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
startQuestTimer("AGGRO_CHECK", 2000, npc, null); startQuestTimer("AGGRO_CHECK", 2000, npc, null);
return super.onSpawn(npc); return super.onSpawn(npc);
} }

21
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SiegeGuards.java vendored
View File

@@ -82,16 +82,13 @@ public class SiegeGuards extends AbstractNpcAI
{ {
if (nearby.isPlayable() && GeoEngine.getInstance().canSeeTarget(npc, nearby)) if (nearby.isPlayable() && GeoEngine.getInstance().canSeeTarget(npc, nearby))
{ {
final L2Summon summon = nearby.isSummon() ? ((L2Summon) nearby) : null; final L2Summon summon = nearby.isSummon() ? (L2Summon) nearby : null;
final L2PcInstance cha = summon == null ? (L2PcInstance) nearby : summon.getOwner(); final L2PcInstance pl = summon == null ? (L2PcInstance) nearby : summon.getOwner();
final Castle castle = npc.getCastle(); if (((pl.getSiegeState() != 2) || pl.isRegisteredOnThisSiegeField(npc.getScriptValue())) && ((pl.getSiegeState() != 0) || (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_IDLE)))
final Fort fortress = npc.getFort();
final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
if ((((cha.getSiegeState() != 2) || cha.isRegisteredOnThisSiegeField(activeSiegeId)) && (cha.getSiegeState() != 0)) || (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_IDLE))
{ {
if (!cha.isInvisible()) // skip invisible players if (!pl.isInvisible()) // skip invisible players
{ {
addAttackPlayerDesire(npc, cha); addAttackPlayerDesire(npc, pl);
} }
} }
} }
@@ -106,10 +103,7 @@ public class SiegeGuards extends AbstractNpcAI
@Override @Override
public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon) public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
{ {
final Castle castle = npc.getCastle(); if ((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(npc.getScriptValue()))
final Fort fortress = npc.getFort();
final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
if ((((attacker.getSiegeState() == 2) && !attacker.isRegisteredOnThisSiegeField(activeSiegeId)) || (attacker.getSiegeState() == 0)) && (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE))
{ {
((L2Attackable) npc).stopHating(attacker); ((L2Attackable) npc).stopHating(attacker);
return null; return null;
@@ -121,6 +115,9 @@ public class SiegeGuards extends AbstractNpcAI
public String onSpawn(L2Npc npc) public String onSpawn(L2Npc npc)
{ {
npc.setRandomWalking(false); npc.setRandomWalking(false);
final Castle castle = npc.getCastle();
final Fort fortress = npc.getFort();
npc.setScriptValue(fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0));
startQuestTimer("AGGRO_CHECK", 2000, npc, null); startQuestTimer("AGGRO_CHECK", 2000, npc, null);
return super.onSpawn(npc); return super.onSpawn(npc);
} }