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

Refactored NPC display state functions.

Browse Source
This commit is contained in:
MobiusDev
2015-10-13 12:46:58 +00:00
parent aa2a04b466
commit c39ac887e3
13 changed files with 56 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
trunk/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java vendored
View File

@ -302,9 +302,9 @@ public final class CavernOfThePirateCaptain extends AbstractInstance
{
case "BURN_BLUE":
{
if (npc.isState(0))
if (npc.getDisplayEffect() == 0)
{
npc.setState(1); // Burning
npc.setDisplayEffect(1); // Burning
startQuestTimer("BURN_BLUE2", 3000, npc, player);
if (world._blueFounded == 4)
{
@ -315,27 +315,27 @@ public final class CavernOfThePirateCaptain extends AbstractInstance
}
case "BURN_BLUE2":
{
if (npc.isState(1)) // Burning
if (npc.getDisplayEffect() == 1) // Burning
{
npc.setState(3); // Blue glow
npc.setDisplayEffect(3); // Blue glow
}
break;
}
case "BURN_RED":
{
if (npc.isState(0))
if (npc.getDisplayEffect() == 0)
{
npc.setState(1); // Burning
npc.setDisplayEffect(1); // Burning
startQuestTimer("BURN_RED2", 3000, npc, player);
}
break;
}
case "BURN_RED2":
{
if (npc.isState(1)) // Burning
if (npc.getDisplayEffect() == 1) // Burning
{
final int room = getRoomByCandle(npc);
npc.setState(2); // Red glow
npc.setDisplayEffect(2); // Red glow
manageScreenMsg(world, NpcStringId.THE_CANDLES_CAN_LEAD_YOU_TO_ZAKEN_DESTROY_HIM);
spawnNpc(world._is83 ? DOLL_BLADER_83 : DOLL_BLADER_60, room, player, world);
spawnNpc(world._is83 ? VALE_MASTER_83 : VALE_MASTER_60, room, player, world);

14
trunk/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java vendored
View File

@ -504,7 +504,7 @@ public final class IceQueensCastleBattle extends AbstractInstance
{
final L2Attackable knight = (L2Attackable) addSpawn((world.isHardCore ? KNIGHT_HARD : KNIGHT_EASY), loc, false, 0, false, world.getInstanceId());
knight.disableCoreAI(true);
knight.setState(1);
knight.setDisplayEffect(1);
knight.getSpawn().setLocation(loc);
world.spawnedMobs.add(knight);
startQuestTimer("ICE_RUPTURE", getRandom(2, 5) * 1000, knight, null);
@ -525,7 +525,7 @@ public final class IceQueensCastleBattle extends AbstractInstance
knight.getVariables().set("SPAWNED_NPC", npc);
knight.disableCoreAI(true);
knight.setIsImmobilized(true);
knight.setState(1);
knight.setDisplayEffect(1);
knight.getSpawn().setLocation(loc);
world.spawnedMobs.add(knight);
@ -540,7 +540,7 @@ public final class IceQueensCastleBattle extends AbstractInstance
{
final Location loc = new Location(MIDDLE_POINT.getX() + getRandom(-1000, 1000), MIDDLE_POINT.getY() + getRandom(-1000, 1000), MIDDLE_POINT.getZ());
final L2Attackable glacier = (L2Attackable) addSpawn(GLACIER, loc, false, 0, false, world.getInstanceId());
glacier.setState(1);
glacier.setDisplayEffect(1);
glacier.disableCoreAI(true);
glacier.setIsImmobilized(true);
world.spawnedMobs.add(glacier);
@ -554,7 +554,7 @@ public final class IceQueensCastleBattle extends AbstractInstance
{
npc.disableCoreAI(false);
npc.setIsImmobilized(false);
npc.setState(2);
npc.setDisplayEffect(2);
manageRandomAttack(world, (L2Attackable) npc);
}
break;
@ -566,7 +566,7 @@ public final class IceQueensCastleBattle extends AbstractInstance
}
case "CHANGE_STATE":
{
npc.setState(2);
npc.setDisplayEffect(2);
startQuestTimer("CAST_SKILL", 20000, npc, null);
break;
}
@ -582,7 +582,7 @@ public final class IceQueensCastleBattle extends AbstractInstance
}
case "SUICIDE":
{
npc.setState(3);
npc.setDisplayEffect(3);
npc.setIsMortal(true);
npc.doDie(null);
break;
@ -989,7 +989,7 @@ public final class IceQueensCastleBattle extends AbstractInstance
manageRandomAttack(world, (L2Attackable) npc);
npc.disableCoreAI(false);
npc.setIsImmobilized(false);
npc.setState(2);
npc.setDisplayEffect(2);
cancelQuestTimer("ICE_RUPTURE", npc, null);
}
break;

2
trunk/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java vendored
View File

@ -254,7 +254,7 @@ public final class LabyrinthOfBelis extends AbstractInstance
case "room_3":
{
world.setStatus(7);
world.generator.setState(1);
world.generator.setDisplayEffect(1);
final L2ZoneType dmgZone = ZoneManager.getInstance().getZoneById(DAMAGE_ZONE_ID);
if (dmgZone != null)
{