From 70f2db33f91ad24ea05fac3f9a106da27d856193 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 21 Nov 2017 22:44:08 +0000
Subject: [PATCH] Small improvements for Tauti.
---
.../data/scripts/ai/bosses/Tauti/33675.htm | 2 +-
.../scripts/ai/bosses/Tauti/TautiWarzone.java | 18 ++++++++++++------
.../data/scripts/ai/bosses/Tauti/33675.htm | 2 +-
.../scripts/ai/bosses/Tauti/TautiWarzone.java | 18 ++++++++++++------
.../data/scripts/ai/bosses/Tauti/33675.htm | 2 +-
.../scripts/ai/bosses/Tauti/TautiWarzone.java | 18 ++++++++++++------
.../data/scripts/ai/bosses/Tauti/33675.htm | 2 +-
.../scripts/ai/bosses/Tauti/TautiWarzone.java | 18 ++++++++++++------
8 files changed, 52 insertions(+), 28 deletions(-)
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tauti/33675.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tauti/33675.htm
index b1439cd401..72dbfe7011 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tauti/33675.htm
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tauti/33675.htm
@@ -1,4 +1,4 @@
-Pinaria:
+Finaria:
Welcome. I've been waiting for you. We Revolutionaries are fighting the Kunda.
We must not fail! Please, lend your aid to our cause and join us in fighting the Kunda, or kill Tauti before all of the Revolutionaries fall.
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index bafead9552..d7a9e17b4b 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -69,13 +69,19 @@ public final class TautiWarzone extends AbstractInstance
case "enterEasyInstance":
{
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;
}
case "enterExtremeInstance":
{
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;
}
case "useKey":
@@ -124,11 +130,11 @@ public final class TautiWarzone extends AbstractInstance
}
case "WORLD_STATUS_CHECK":
{
- if ((player == null) || (player.getInstanceId() == 0))
+ final Instance world = npc.getInstanceWorld();
+ if (world == null)
{
return null;
}
- final Instance world = player.getInstanceWorld();
if (world.isStatus(0))
{
world.setStatus(1);
@@ -138,7 +144,7 @@ public final class TautiWarzone extends AbstractInstance
{
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))
{
@@ -151,7 +157,7 @@ public final class TautiWarzone extends AbstractInstance
monster.setRandomWalking(false);
}
}
- startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false);
+ startQuestTimer("WORLD_STATUS_CHECK", 5000, npc, null);
}
return null;
}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tauti/33675.htm b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tauti/33675.htm
index b1439cd401..72dbfe7011 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tauti/33675.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tauti/33675.htm
@@ -1,4 +1,4 @@
-Pinaria:
+Finaria:
Welcome. I've been waiting for you. We Revolutionaries are fighting the Kunda.
We must not fail! Please, lend your aid to our cause and join us in fighting the Kunda, or kill Tauti before all of the Revolutionaries fall.
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index bafead9552..d7a9e17b4b 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -69,13 +69,19 @@ public final class TautiWarzone extends AbstractInstance
case "enterEasyInstance":
{
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;
}
case "enterExtremeInstance":
{
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;
}
case "useKey":
@@ -124,11 +130,11 @@ public final class TautiWarzone extends AbstractInstance
}
case "WORLD_STATUS_CHECK":
{
- if ((player == null) || (player.getInstanceId() == 0))
+ final Instance world = npc.getInstanceWorld();
+ if (world == null)
{
return null;
}
- final Instance world = player.getInstanceWorld();
if (world.isStatus(0))
{
world.setStatus(1);
@@ -138,7 +144,7 @@ public final class TautiWarzone extends AbstractInstance
{
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))
{
@@ -151,7 +157,7 @@ public final class TautiWarzone extends AbstractInstance
monster.setRandomWalking(false);
}
}
- startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false);
+ startQuestTimer("WORLD_STATUS_CHECK", 5000, npc, null);
}
return null;
}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tauti/33675.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tauti/33675.htm
index b1439cd401..72dbfe7011 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tauti/33675.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tauti/33675.htm
@@ -1,4 +1,4 @@
-Pinaria:
+Finaria:
Welcome. I've been waiting for you. We Revolutionaries are fighting the Kunda.
We must not fail! Please, lend your aid to our cause and join us in fighting the Kunda, or kill Tauti before all of the Revolutionaries fall.
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index bafead9552..d7a9e17b4b 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -69,13 +69,19 @@ public final class TautiWarzone extends AbstractInstance
case "enterEasyInstance":
{
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;
}
case "enterExtremeInstance":
{
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;
}
case "useKey":
@@ -124,11 +130,11 @@ public final class TautiWarzone extends AbstractInstance
}
case "WORLD_STATUS_CHECK":
{
- if ((player == null) || (player.getInstanceId() == 0))
+ final Instance world = npc.getInstanceWorld();
+ if (world == null)
{
return null;
}
- final Instance world = player.getInstanceWorld();
if (world.isStatus(0))
{
world.setStatus(1);
@@ -138,7 +144,7 @@ public final class TautiWarzone extends AbstractInstance
{
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))
{
@@ -151,7 +157,7 @@ public final class TautiWarzone extends AbstractInstance
monster.setRandomWalking(false);
}
}
- startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false);
+ startQuestTimer("WORLD_STATUS_CHECK", 5000, npc, null);
}
return null;
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tauti/33675.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tauti/33675.htm
index b1439cd401..72dbfe7011 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tauti/33675.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tauti/33675.htm
@@ -1,4 +1,4 @@
-Pinaria:
+Finaria:
Welcome. I've been waiting for you. We Revolutionaries are fighting the Kunda.
We must not fail! Please, lend your aid to our cause and join us in fighting the Kunda, or kill Tauti before all of the Revolutionaries fall.
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
index bafead9552..d7a9e17b4b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tauti/TautiWarzone.java
@@ -69,13 +69,19 @@ public final class TautiWarzone extends AbstractInstance
case "enterEasyInstance":
{
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;
}
case "enterExtremeInstance":
{
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;
}
case "useKey":
@@ -124,11 +130,11 @@ public final class TautiWarzone extends AbstractInstance
}
case "WORLD_STATUS_CHECK":
{
- if ((player == null) || (player.getInstanceId() == 0))
+ final Instance world = npc.getInstanceWorld();
+ if (world == null)
{
return null;
}
- final Instance world = player.getInstanceWorld();
if (world.isStatus(0))
{
world.setStatus(1);
@@ -138,7 +144,7 @@ public final class TautiWarzone extends AbstractInstance
{
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))
{
@@ -151,7 +157,7 @@ public final class TautiWarzone extends AbstractInstance
monster.setRandomWalking(false);
}
}
- startQuestTimer("WORLD_STATUS_CHECK", 5000, null, player, false);
+ startQuestTimer("WORLD_STATUS_CHECK", 5000, npc, null);
}
return null;
}