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

Prevent forcing Freya movement while in combat.

Browse Source
This commit is contained in:
MobiusDev
2018-09-03 02:23:48 +00:00
parent 7e2dafb4ff
commit 9fda26b387
5 changed files with 110 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java vendored
View File

@@ -382,9 +382,12 @@ public final class IceQueensCastleBattle extends AbstractInstance
if (npc.getVariables().getInt("FREYA_MOVE") == 0) if (npc.getVariables().getInt("FREYA_MOVE") == 0)
{ {
controller.getVariables().set("FREYA_MOVE", 1); controller.getVariables().set("FREYA_MOVE", 1);
if (!freya.isInCombat())
{
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
break; break;
} }
case "CAST_BLIZZARD": case "CAST_BLIZZARD":
@@ -750,10 +753,13 @@ public final class IceQueensCastleBattle extends AbstractInstance
if ((controller.getVariables().getInt("FREYA_MOVE") == 0) && world.isStatus(1)) if ((controller.getVariables().getInt("FREYA_MOVE") == 0) && world.isStatus(1))
{ {
controller.getVariables().set("FREYA_MOVE", 1); controller.getVariables().set("FREYA_MOVE", 1);
if (!freya.isInCombat())
{
manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE); manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE);
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
if (npc.getCurrentHp() < (npc.getMaxHp() * 0.02)) if (npc.getCurrentHp() < (npc.getMaxHp() * 0.02))
{ {
@@ -825,9 +831,12 @@ public final class IceQueensCastleBattle extends AbstractInstance
if (controller.getVariables().getInt("FREYA_MOVE") == 0) if (controller.getVariables().getInt("FREYA_MOVE") == 0)
{ {
controller.getVariables().set("FREYA_MOVE", 1); controller.getVariables().set("FREYA_MOVE", 1);
if (!freya.isInCombat())
{
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.2)) && !params.getBoolean("isSupportActive", false)) if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.2)) && !params.getBoolean("isSupportActive", false))
{ {
@@ -1113,12 +1122,14 @@ public final class IceQueensCastleBattle extends AbstractInstance
if ((var.getInt("FREYA_MOVE") == 0) && world.isStatus(1)) if ((var.getInt("FREYA_MOVE") == 0) && world.isStatus(1))
{ {
var.set("FREYA_MOVE", 1); var.set("FREYA_MOVE", 1);
manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE);
final L2Npc freya = params.getObject("freya", L2Npc.class); final L2Npc freya = params.getObject("freya", L2Npc.class);
if (!freya.isInCombat())
{
manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE);
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
if ((knightCount < 10) && (world.isStatus(2))) if ((knightCount < 10) && (world.isStatus(2)))
{ {

15
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java vendored
View File

@@ -382,9 +382,12 @@ public final class IceQueensCastleBattle extends AbstractInstance
if (npc.getVariables().getInt("FREYA_MOVE") == 0) if (npc.getVariables().getInt("FREYA_MOVE") == 0)
{ {
controller.getVariables().set("FREYA_MOVE", 1); controller.getVariables().set("FREYA_MOVE", 1);
if (!freya.isInCombat())
{
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
break; break;
} }
case "CAST_BLIZZARD": case "CAST_BLIZZARD":
@@ -750,10 +753,13 @@ public final class IceQueensCastleBattle extends AbstractInstance
if ((controller.getVariables().getInt("FREYA_MOVE") == 0) && world.isStatus(1)) if ((controller.getVariables().getInt("FREYA_MOVE") == 0) && world.isStatus(1))
{ {
controller.getVariables().set("FREYA_MOVE", 1); controller.getVariables().set("FREYA_MOVE", 1);
if (!freya.isInCombat())
{
manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE); manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE);
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
if (npc.getCurrentHp() < (npc.getMaxHp() * 0.02)) if (npc.getCurrentHp() < (npc.getMaxHp() * 0.02))
{ {
@@ -825,9 +831,12 @@ public final class IceQueensCastleBattle extends AbstractInstance
if (controller.getVariables().getInt("FREYA_MOVE") == 0) if (controller.getVariables().getInt("FREYA_MOVE") == 0)
{ {
controller.getVariables().set("FREYA_MOVE", 1); controller.getVariables().set("FREYA_MOVE", 1);
if (!freya.isInCombat())
{
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.2)) && !params.getBoolean("isSupportActive", false)) if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.2)) && !params.getBoolean("isSupportActive", false))
{ {
@@ -1113,12 +1122,14 @@ public final class IceQueensCastleBattle extends AbstractInstance
if ((var.getInt("FREYA_MOVE") == 0) && world.isStatus(1)) if ((var.getInt("FREYA_MOVE") == 0) && world.isStatus(1))
{ {
var.set("FREYA_MOVE", 1); var.set("FREYA_MOVE", 1);
manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE);
final L2Npc freya = params.getObject("freya", L2Npc.class); final L2Npc freya = params.getObject("freya", L2Npc.class);
if (!freya.isInCombat())
{
manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE);
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
if ((knightCount < 10) && (world.isStatus(2))) if ((knightCount < 10) && (world.isStatus(2)))
{ {

15
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java vendored
View File

@@ -382,9 +382,12 @@ public final class IceQueensCastleBattle extends AbstractInstance
if (npc.getVariables().getInt("FREYA_MOVE") == 0) if (npc.getVariables().getInt("FREYA_MOVE") == 0)
{ {
controller.getVariables().set("FREYA_MOVE", 1); controller.getVariables().set("FREYA_MOVE", 1);
if (!freya.isInCombat())
{
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
break; break;
} }
case "CAST_BLIZZARD": case "CAST_BLIZZARD":
@@ -750,10 +753,13 @@ public final class IceQueensCastleBattle extends AbstractInstance
if ((controller.getVariables().getInt("FREYA_MOVE") == 0) && world.isStatus(1)) if ((controller.getVariables().getInt("FREYA_MOVE") == 0) && world.isStatus(1))
{ {
controller.getVariables().set("FREYA_MOVE", 1); controller.getVariables().set("FREYA_MOVE", 1);
if (!freya.isInCombat())
{
manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE); manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE);
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
if (npc.getCurrentHp() < (npc.getMaxHp() * 0.02)) if (npc.getCurrentHp() < (npc.getMaxHp() * 0.02))
{ {
@@ -825,9 +831,12 @@ public final class IceQueensCastleBattle extends AbstractInstance
if (controller.getVariables().getInt("FREYA_MOVE") == 0) if (controller.getVariables().getInt("FREYA_MOVE") == 0)
{ {
controller.getVariables().set("FREYA_MOVE", 1); controller.getVariables().set("FREYA_MOVE", 1);
if (!freya.isInCombat())
{
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.2)) && !params.getBoolean("isSupportActive", false)) if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.2)) && !params.getBoolean("isSupportActive", false))
{ {
@@ -1113,12 +1122,14 @@ public final class IceQueensCastleBattle extends AbstractInstance
if ((var.getInt("FREYA_MOVE") == 0) && world.isStatus(1)) if ((var.getInt("FREYA_MOVE") == 0) && world.isStatus(1))
{ {
var.set("FREYA_MOVE", 1); var.set("FREYA_MOVE", 1);
manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE);
final L2Npc freya = params.getObject("freya", L2Npc.class); final L2Npc freya = params.getObject("freya", L2Npc.class);
if (!freya.isInCombat())
{
manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE);
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
if ((knightCount < 10) && (world.isStatus(2))) if ((knightCount < 10) && (world.isStatus(2)))
{ {

15
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java vendored
View File

@@ -382,9 +382,12 @@ public final class IceQueensCastleBattle extends AbstractInstance
if (npc.getVariables().getInt("FREYA_MOVE") == 0) if (npc.getVariables().getInt("FREYA_MOVE") == 0)
{ {
controller.getVariables().set("FREYA_MOVE", 1); controller.getVariables().set("FREYA_MOVE", 1);
if (!freya.isInCombat())
{
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
break; break;
} }
case "CAST_BLIZZARD": case "CAST_BLIZZARD":
@@ -750,10 +753,13 @@ public final class IceQueensCastleBattle extends AbstractInstance
if ((controller.getVariables().getInt("FREYA_MOVE") == 0) && world.isStatus(1)) if ((controller.getVariables().getInt("FREYA_MOVE") == 0) && world.isStatus(1))
{ {
controller.getVariables().set("FREYA_MOVE", 1); controller.getVariables().set("FREYA_MOVE", 1);
if (!freya.isInCombat())
{
manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE); manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE);
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
if (npc.getCurrentHp() < (npc.getMaxHp() * 0.02)) if (npc.getCurrentHp() < (npc.getMaxHp() * 0.02))
{ {
@@ -825,9 +831,12 @@ public final class IceQueensCastleBattle extends AbstractInstance
if (controller.getVariables().getInt("FREYA_MOVE") == 0) if (controller.getVariables().getInt("FREYA_MOVE") == 0)
{ {
controller.getVariables().set("FREYA_MOVE", 1); controller.getVariables().set("FREYA_MOVE", 1);
if (!freya.isInCombat())
{
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.2)) && !params.getBoolean("isSupportActive", false)) if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.2)) && !params.getBoolean("isSupportActive", false))
{ {
@@ -1113,12 +1122,14 @@ public final class IceQueensCastleBattle extends AbstractInstance
if ((var.getInt("FREYA_MOVE") == 0) && world.isStatus(1)) if ((var.getInt("FREYA_MOVE") == 0) && world.isStatus(1))
{ {
var.set("FREYA_MOVE", 1); var.set("FREYA_MOVE", 1);
manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE);
final L2Npc freya = params.getObject("freya", L2Npc.class); final L2Npc freya = params.getObject("freya", L2Npc.class);
if (!freya.isInCombat())
{
manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE);
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
if ((knightCount < 10) && (world.isStatus(2))) if ((knightCount < 10) && (world.isStatus(2)))
{ {

15
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java vendored
View File

@@ -403,9 +403,12 @@ public final class IceQueensCastleBattle extends AbstractInstance
if (npc.getVariables().getInt("FREYA_MOVE") == 0) if (npc.getVariables().getInt("FREYA_MOVE") == 0)
{ {
controller.getVariables().set("FREYA_MOVE", 1); controller.getVariables().set("FREYA_MOVE", 1);
if (!freya.isInCombat())
{
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
break; break;
} }
case "CAST_BLIZZARD": case "CAST_BLIZZARD":
@@ -779,10 +782,13 @@ public final class IceQueensCastleBattle extends AbstractInstance
if ((controller.getVariables().getInt("FREYA_MOVE") == 0) && world.isStatus(1)) if ((controller.getVariables().getInt("FREYA_MOVE") == 0) && world.isStatus(1))
{ {
controller.getVariables().set("FREYA_MOVE", 1); controller.getVariables().set("FREYA_MOVE", 1);
if (!freya.isInCombat())
{
manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE); manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE);
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
if (npc.getCurrentHp() < (npc.getMaxHp() * 0.02)) if (npc.getCurrentHp() < (npc.getMaxHp() * 0.02))
{ {
@@ -860,9 +866,12 @@ public final class IceQueensCastleBattle extends AbstractInstance
if (controller.getVariables().getInt("FREYA_MOVE") == 0) if (controller.getVariables().getInt("FREYA_MOVE") == 0)
{ {
controller.getVariables().set("FREYA_MOVE", 1); controller.getVariables().set("FREYA_MOVE", 1);
if (!freya.isInCombat())
{
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.2)) && !params.getBoolean("isSupportActive", false)) if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.2)) && !params.getBoolean("isSupportActive", false))
{ {
@@ -1154,12 +1163,14 @@ public final class IceQueensCastleBattle extends AbstractInstance
if ((var.getInt("FREYA_MOVE") == 0) && world.isStatus(1)) if ((var.getInt("FREYA_MOVE") == 0) && world.isStatus(1))
{ {
var.set("FREYA_MOVE", 1); var.set("FREYA_MOVE", 1);
manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE);
final L2Npc freya = params.getObject("freya", L2Npc.class); final L2Npc freya = params.getObject("freya", L2Npc.class);
if (!freya.isInCombat())
{
manageScreenMsg(world, NpcStringId.FREYA_HAS_STARTED_TO_MOVE);
freya.setRunning(); freya.setRunning();
freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT);
} }
}
if ((knightCount < 10) && (world.isStatus(2))) if ((knightCount < 10) && (world.isStatus(2)))
{ {