Small improvements for Tauti.

This commit is contained in:
MobiusDev
2017-11-21 22:44:08 +00:00
parent 702675e537
commit 70f2db33f9
8 changed files with 52 additions and 28 deletions

View File

@@ -1,4 +1,4 @@
<html><body>Pinaria:<br> <html><body>Finaria:<br>
Welcome. I've been waiting for you. We <font color="LEVEL">Revolutionaries</font> are fighting the <font color="LEVEL">Kunda</font>.<br> Welcome. I've been waiting for you. We <font color="LEVEL">Revolutionaries</font> are fighting the <font color="LEVEL">Kunda</font>.<br>
We must not fail! Please, lend your aid to our cause and join us in fighting the <font color="LEVEL">Kunda</font>, or kill <font color="LEVEL">Tauti</font> before all of the <font color="LEVEL">Revolutionaries</font> fall. We must not fail! Please, lend your aid to our cause and join us in fighting the <font color="LEVEL">Kunda</font>, or kill <font color="LEVEL">Tauti</font> before all of the <font color="LEVEL">Revolutionaries</font> fall.
</body></html> </body></html>

View File

@@ -69,13 +69,19 @@ public final class TautiWarzone extends AbstractInstance
case "enterEasyInstance": case "enterEasyInstance":
{ {
enterInstance(player, npc, TEMPLATE_ID); enterInstance(player, npc, TEMPLATE_ID);
startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false); if (player.getInstanceWorld() != null)
{
startQuestTimer("WORLD_STATUS_CHECK", 5000, player.getInstanceWorld().getNpc(FINARIA), null);
}
break; break;
} }
case "enterExtremeInstance": case "enterExtremeInstance":
{ {
enterInstance(player, npc, EXTREME_TEMPLATE_ID); enterInstance(player, npc, EXTREME_TEMPLATE_ID);
startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false); if (player.getInstanceWorld() != null)
{
startQuestTimer("WORLD_STATUS_CHECK", 5000, player.getInstanceWorld().getNpc(FINARIA), null);
}
break; break;
} }
case "useKey": case "useKey":
@@ -124,11 +130,11 @@ public final class TautiWarzone extends AbstractInstance
} }
case "WORLD_STATUS_CHECK": case "WORLD_STATUS_CHECK":
{ {
if ((player == null) || (player.getInstanceId() == 0)) final Instance world = npc.getInstanceWorld();
if (world == null)
{ {
return null; return null;
} }
final Instance world = player.getInstanceWorld();
if (world.isStatus(0)) if (world.isStatus(0))
{ {
world.setStatus(1); world.setStatus(1);
@@ -138,7 +144,7 @@ public final class TautiWarzone extends AbstractInstance
{ {
takeItems(member, KEY_OF_DARKNESS, -1); takeItems(member, KEY_OF_DARKNESS, -1);
} }
startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false); startQuestTimer("WORLD_STATUS_CHECK", 5000, npc, null);
} }
else if (world.isStatus(1)) else if (world.isStatus(1))
{ {
@@ -151,7 +157,7 @@ public final class TautiWarzone extends AbstractInstance
monster.setRandomWalking(false); monster.setRandomWalking(false);
} }
} }
startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false); startQuestTimer("WORLD_STATUS_CHECK", 5000, npc, null);
} }
return null; return null;
} }

View File

@@ -1,4 +1,4 @@
<html><body>Pinaria:<br> <html><body>Finaria:<br>
Welcome. I've been waiting for you. We <font color="LEVEL">Revolutionaries</font> are fighting the <font color="LEVEL">Kunda</font>.<br> Welcome. I've been waiting for you. We <font color="LEVEL">Revolutionaries</font> are fighting the <font color="LEVEL">Kunda</font>.<br>
We must not fail! Please, lend your aid to our cause and join us in fighting the <font color="LEVEL">Kunda</font>, or kill <font color="LEVEL">Tauti</font> before all of the <font color="LEVEL">Revolutionaries</font> fall. We must not fail! Please, lend your aid to our cause and join us in fighting the <font color="LEVEL">Kunda</font>, or kill <font color="LEVEL">Tauti</font> before all of the <font color="LEVEL">Revolutionaries</font> fall.
</body></html> </body></html>

View File

@@ -69,13 +69,19 @@ public final class TautiWarzone extends AbstractInstance
case "enterEasyInstance": case "enterEasyInstance":
{ {
enterInstance(player, npc, TEMPLATE_ID); enterInstance(player, npc, TEMPLATE_ID);
startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false); if (player.getInstanceWorld() != null)
{
startQuestTimer("WORLD_STATUS_CHECK", 5000, player.getInstanceWorld().getNpc(FINARIA), null);
}
break; break;
} }
case "enterExtremeInstance": case "enterExtremeInstance":
{ {
enterInstance(player, npc, EXTREME_TEMPLATE_ID); enterInstance(player, npc, EXTREME_TEMPLATE_ID);
startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false); if (player.getInstanceWorld() != null)
{
startQuestTimer("WORLD_STATUS_CHECK", 5000, player.getInstanceWorld().getNpc(FINARIA), null);
}
break; break;
} }
case "useKey": case "useKey":
@@ -124,11 +130,11 @@ public final class TautiWarzone extends AbstractInstance
} }
case "WORLD_STATUS_CHECK": case "WORLD_STATUS_CHECK":
{ {
if ((player == null) || (player.getInstanceId() == 0)) final Instance world = npc.getInstanceWorld();
if (world == null)
{ {
return null; return null;
} }
final Instance world = player.getInstanceWorld();
if (world.isStatus(0)) if (world.isStatus(0))
{ {
world.setStatus(1); world.setStatus(1);
@@ -138,7 +144,7 @@ public final class TautiWarzone extends AbstractInstance
{ {
takeItems(member, KEY_OF_DARKNESS, -1); takeItems(member, KEY_OF_DARKNESS, -1);
} }
startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false); startQuestTimer("WORLD_STATUS_CHECK", 5000, npc, null);
} }
else if (world.isStatus(1)) else if (world.isStatus(1))
{ {
@@ -151,7 +157,7 @@ public final class TautiWarzone extends AbstractInstance
monster.setRandomWalking(false); monster.setRandomWalking(false);
} }
} }
startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false); startQuestTimer("WORLD_STATUS_CHECK", 5000, npc, null);
} }
return null; return null;
} }

View File

@@ -1,4 +1,4 @@
<html><body>Pinaria:<br> <html><body>Finaria:<br>
Welcome. I've been waiting for you. We <font color="LEVEL">Revolutionaries</font> are fighting the <font color="LEVEL">Kunda</font>.<br> Welcome. I've been waiting for you. We <font color="LEVEL">Revolutionaries</font> are fighting the <font color="LEVEL">Kunda</font>.<br>
We must not fail! Please, lend your aid to our cause and join us in fighting the <font color="LEVEL">Kunda</font>, or kill <font color="LEVEL">Tauti</font> before all of the <font color="LEVEL">Revolutionaries</font> fall. We must not fail! Please, lend your aid to our cause and join us in fighting the <font color="LEVEL">Kunda</font>, or kill <font color="LEVEL">Tauti</font> before all of the <font color="LEVEL">Revolutionaries</font> fall.
</body></html> </body></html>

View File

@@ -69,13 +69,19 @@ public final class TautiWarzone extends AbstractInstance
case "enterEasyInstance": case "enterEasyInstance":
{ {
enterInstance(player, npc, TEMPLATE_ID); enterInstance(player, npc, TEMPLATE_ID);
startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false); if (player.getInstanceWorld() != null)
{
startQuestTimer("WORLD_STATUS_CHECK", 5000, player.getInstanceWorld().getNpc(FINARIA), null);
}
break; break;
} }
case "enterExtremeInstance": case "enterExtremeInstance":
{ {
enterInstance(player, npc, EXTREME_TEMPLATE_ID); enterInstance(player, npc, EXTREME_TEMPLATE_ID);
startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false); if (player.getInstanceWorld() != null)
{
startQuestTimer("WORLD_STATUS_CHECK", 5000, player.getInstanceWorld().getNpc(FINARIA), null);
}
break; break;
} }
case "useKey": case "useKey":
@@ -124,11 +130,11 @@ public final class TautiWarzone extends AbstractInstance
} }
case "WORLD_STATUS_CHECK": case "WORLD_STATUS_CHECK":
{ {
if ((player == null) || (player.getInstanceId() == 0)) final Instance world = npc.getInstanceWorld();
if (world == null)
{ {
return null; return null;
} }
final Instance world = player.getInstanceWorld();
if (world.isStatus(0)) if (world.isStatus(0))
{ {
world.setStatus(1); world.setStatus(1);
@@ -138,7 +144,7 @@ public final class TautiWarzone extends AbstractInstance
{ {
takeItems(member, KEY_OF_DARKNESS, -1); takeItems(member, KEY_OF_DARKNESS, -1);
} }
startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false); startQuestTimer("WORLD_STATUS_CHECK", 5000, npc, null);
} }
else if (world.isStatus(1)) else if (world.isStatus(1))
{ {
@@ -151,7 +157,7 @@ public final class TautiWarzone extends AbstractInstance
monster.setRandomWalking(false); monster.setRandomWalking(false);
} }
} }
startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false); startQuestTimer("WORLD_STATUS_CHECK", 5000, npc, null);
} }
return null; return null;
} }

View File

@@ -1,4 +1,4 @@
<html><body>Pinaria:<br> <html><body>Finaria:<br>
Welcome. I've been waiting for you. We <font color="LEVEL">Revolutionaries</font> are fighting the <font color="LEVEL">Kunda</font>.<br> Welcome. I've been waiting for you. We <font color="LEVEL">Revolutionaries</font> are fighting the <font color="LEVEL">Kunda</font>.<br>
We must not fail! Please, lend your aid to our cause and join us in fighting the <font color="LEVEL">Kunda</font>, or kill <font color="LEVEL">Tauti</font> before all of the <font color="LEVEL">Revolutionaries</font> fall. We must not fail! Please, lend your aid to our cause and join us in fighting the <font color="LEVEL">Kunda</font>, or kill <font color="LEVEL">Tauti</font> before all of the <font color="LEVEL">Revolutionaries</font> fall.
</body></html> </body></html>

View File

@@ -69,13 +69,19 @@ public final class TautiWarzone extends AbstractInstance
case "enterEasyInstance": case "enterEasyInstance":
{ {
enterInstance(player, npc, TEMPLATE_ID); enterInstance(player, npc, TEMPLATE_ID);
startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false); if (player.getInstanceWorld() != null)
{
startQuestTimer("WORLD_STATUS_CHECK", 5000, player.getInstanceWorld().getNpc(FINARIA), null);
}
break; break;
} }
case "enterExtremeInstance": case "enterExtremeInstance":
{ {
enterInstance(player, npc, EXTREME_TEMPLATE_ID); enterInstance(player, npc, EXTREME_TEMPLATE_ID);
startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false); if (player.getInstanceWorld() != null)
{
startQuestTimer("WORLD_STATUS_CHECK", 5000, player.getInstanceWorld().getNpc(FINARIA), null);
}
break; break;
} }
case "useKey": case "useKey":
@@ -124,11 +130,11 @@ public final class TautiWarzone extends AbstractInstance
} }
case "WORLD_STATUS_CHECK": case "WORLD_STATUS_CHECK":
{ {
if ((player == null) || (player.getInstanceId() == 0)) final Instance world = npc.getInstanceWorld();
if (world == null)
{ {
return null; return null;
} }
final Instance world = player.getInstanceWorld();
if (world.isStatus(0)) if (world.isStatus(0))
{ {
world.setStatus(1); world.setStatus(1);
@@ -138,7 +144,7 @@ public final class TautiWarzone extends AbstractInstance
{ {
takeItems(member, KEY_OF_DARKNESS, -1); takeItems(member, KEY_OF_DARKNESS, -1);
} }
startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false); startQuestTimer("WORLD_STATUS_CHECK", 5000, npc, null);
} }
else if (world.isStatus(1)) else if (world.isStatus(1))
{ {
@@ -151,7 +157,7 @@ public final class TautiWarzone extends AbstractInstance
monster.setRandomWalking(false); monster.setRandomWalking(false);
} }
} }
startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false); startQuestTimer("WORLD_STATUS_CHECK", 5000, npc, null);
} }
return null; return null;
} }