From bc51006120b0e2e9b0e02aa819b08cdf8d573f24 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 7 Mar 2021 13:23:00 +0000
Subject: [PATCH] Fixes for quest Tomb Raiders (933). Contributed by
CostyKiller.
---
.../quests/Q00933_TombRaiders/32594-03.htm | 4 +-
.../quests/Q00933_TombRaiders/32594-04.htm | 2 +-
.../quests/Q00933_TombRaiders/32594-06.htm | 6 +--
.../Q00933_TombRaiders.java | 38 ++++++++++++++-----
.../quests/Q00933_TombRaiders/32594-03.htm | 4 +-
.../quests/Q00933_TombRaiders/32594-04.htm | 2 +-
.../quests/Q00933_TombRaiders/32594-06.htm | 6 +--
.../Q00933_TombRaiders.java | 38 ++++++++++++++-----
8 files changed, 68 insertions(+), 32 deletions(-)
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-03.htm b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-03.htm
index 7b2475daaa..e5749df62f 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-03.htm
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-03.htm
@@ -1,4 +1,4 @@
-Search Team's Teleporter:
-You have completed all the tasks and passed the trial.
+Leopard:
+Have you killed all the monsters?
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-04.htm b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-04.htm
index e0be8fe0b8..36adfac409 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-04.htm
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-04.htm
@@ -1,3 +1,3 @@
-Search Team's Teleporter:
+Leopard:
Congratulations. You have completed all the tasks and passed the trial.
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-06.htm b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-06.htm
index 27930fbf17..c71e51641f 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-06.htm
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-06.htm
@@ -1,4 +1,4 @@
-Search Team's Teleporter:
-Password Decoder Leopard from the Town of Goddard asks you to defeat the monsters who have conquered the Imperial Tomb. You need to defeat 150 monsters in total.
-To hunt: Tomb Guardian, Tomb Raider, Tomb Watcher, Tomb Soultaker, Tomb Patrol.
+Leopard:
+You did not finish your job, you have to defeat the monsters who have conquered the Imperial Tomb:
+Tomb Guardian, Tomb Raider, Tomb Watcher, Tomb Soultaker, Tomb Patrol.
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
index fc9ca86480..ce7aecd3a5 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
@@ -20,6 +20,7 @@ import java.util.HashSet;
import java.util.Set;
import org.l2jmobius.gameserver.enums.QuestSound;
+import org.l2jmobius.gameserver.enums.QuestType;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
@@ -64,7 +65,7 @@ public class Q00933_TombRaiders extends Quest
final QuestState qs = getQuestState(player, false);
if (qs == null)
{
- return htmltext;
+ return null;
}
switch (event)
{
@@ -81,7 +82,7 @@ public class Q00933_TombRaiders extends Quest
{
addExpAndSp(player, 20700253956096L, 1450359376);
giveItems(player, BENUSTA_REWARD_BOX, 1);
- qs.exitQuest(true, true);
+ qs.exitQuest(QuestType.DAILY, true);
htmltext = event;
}
break;
@@ -99,24 +100,41 @@ public class Q00933_TombRaiders extends Quest
{
case State.CREATED:
{
- htmltext = "34552-01.htm";
+ if (npc.getId() == SEARCH_TEAM_TELEPORTER)
+ {
+ htmltext = "34552-01.htm";
+ }
break;
}
case State.STARTED:
{
- if (qs.isCond(2))
+ if (npc.getId() == LEOPARD)
{
- htmltext = "32594-03.htm";
- }
- else
- {
- htmltext = "32594-06.htm";
+ if (qs.isCond(2))
+ {
+ htmltext = "32594-03.htm";
+ }
+ else
+ {
+ htmltext = "32594-06.htm";
+ }
}
break;
}
case State.COMPLETED:
{
- htmltext = getAlreadyCompletedMsg(player);
+ if (npc.getId() == SEARCH_TEAM_TELEPORTER)
+ {
+ if (qs.isNowAvailable())
+ {
+ qs.setState(State.CREATED);
+ htmltext = "34552-01.htm";
+ }
+ else
+ {
+ htmltext = getAlreadyCompletedMsg(player, QuestType.DAILY);
+ }
+ }
break;
}
}
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-03.htm b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-03.htm
index 7b2475daaa..e5749df62f 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-03.htm
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-03.htm
@@ -1,4 +1,4 @@
-Search Team's Teleporter:
-You have completed all the tasks and passed the trial.
+Leopard:
+Have you killed all the monsters?
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-04.htm b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-04.htm
index e0be8fe0b8..36adfac409 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-04.htm
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-04.htm
@@ -1,3 +1,3 @@
-Search Team's Teleporter:
+Leopard:
Congratulations. You have completed all the tasks and passed the trial.
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-06.htm b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-06.htm
index 27930fbf17..c71e51641f 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-06.htm
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/32594-06.htm
@@ -1,4 +1,4 @@
-Search Team's Teleporter:
-Password Decoder Leopard from the Town of Goddard asks you to defeat the monsters who have conquered the Imperial Tomb. You need to defeat 150 monsters in total.
-To hunt: Tomb Guardian, Tomb Raider, Tomb Watcher, Tomb Soultaker, Tomb Patrol.
+Leopard:
+You did not finish your job, you have to defeat the monsters who have conquered the Imperial Tomb:
+Tomb Guardian, Tomb Raider, Tomb Watcher, Tomb Soultaker, Tomb Patrol.
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
index fc9ca86480..ce7aecd3a5 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q00933_TombRaiders/Q00933_TombRaiders.java
@@ -20,6 +20,7 @@ import java.util.HashSet;
import java.util.Set;
import org.l2jmobius.gameserver.enums.QuestSound;
+import org.l2jmobius.gameserver.enums.QuestType;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
@@ -64,7 +65,7 @@ public class Q00933_TombRaiders extends Quest
final QuestState qs = getQuestState(player, false);
if (qs == null)
{
- return htmltext;
+ return null;
}
switch (event)
{
@@ -81,7 +82,7 @@ public class Q00933_TombRaiders extends Quest
{
addExpAndSp(player, 20700253956096L, 1450359376);
giveItems(player, BENUSTA_REWARD_BOX, 1);
- qs.exitQuest(true, true);
+ qs.exitQuest(QuestType.DAILY, true);
htmltext = event;
}
break;
@@ -99,24 +100,41 @@ public class Q00933_TombRaiders extends Quest
{
case State.CREATED:
{
- htmltext = "34552-01.htm";
+ if (npc.getId() == SEARCH_TEAM_TELEPORTER)
+ {
+ htmltext = "34552-01.htm";
+ }
break;
}
case State.STARTED:
{
- if (qs.isCond(2))
+ if (npc.getId() == LEOPARD)
{
- htmltext = "32594-03.htm";
- }
- else
- {
- htmltext = "32594-06.htm";
+ if (qs.isCond(2))
+ {
+ htmltext = "32594-03.htm";
+ }
+ else
+ {
+ htmltext = "32594-06.htm";
+ }
}
break;
}
case State.COMPLETED:
{
- htmltext = getAlreadyCompletedMsg(player);
+ if (npc.getId() == SEARCH_TEAM_TELEPORTER)
+ {
+ if (qs.isNowAvailable())
+ {
+ qs.setState(State.CREATED);
+ htmltext = "34552-01.htm";
+ }
+ else
+ {
+ htmltext = getAlreadyCompletedMsg(player, QuestType.DAILY);
+ }
+ }
break;
}
}