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);