Fixes for quest Tomb Raiders (933).

Contributed by CostyKiller.
This commit is contained in:
MobiusDevelopment 2021-03-07 13:23:00 +00:00
parent d91189c1fc
commit bc51006120
8 changed files with 68 additions and 32 deletions

View File

@ -1,4 +1,4 @@
<html><body>Search Team's Teleporter:<br>
You have completed all the tasks and passed the trial.<br>
<html><body>Leopard:<br>
Have you killed all the monsters?<br>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q00933_TombRaiders 32594-04.htm">"Yes, sure."</Button>
</body></html>

View File

@ -1,3 +1,3 @@
<html><body>Search Team's Teleporter:<br>
<html><body>Leopard:<br>
Congratulations. You have completed all the tasks and passed the trial.
</body></html>

View File

@ -1,4 +1,4 @@
<html><body>Search Team's Teleporter:<br>
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.<br>
To hunt: Tomb Guardian, Tomb Raider, Tomb Watcher, Tomb Soultaker, Tomb Patrol.
<html><body>Leopard:<br>
You did not finish your job, you have to defeat the monsters who have conquered the Imperial Tomb: <br>
Tomb Guardian, Tomb Raider, Tomb Watcher, Tomb Soultaker, Tomb Patrol.
</body></html>

View File

@ -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;
}
}

View File

@ -1,4 +1,4 @@
<html><body>Search Team's Teleporter:<br>
You have completed all the tasks and passed the trial.<br>
<html><body>Leopard:<br>
Have you killed all the monsters?<br>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q00933_TombRaiders 32594-04.htm">"Yes, sure."</Button>
</body></html>

View File

@ -1,3 +1,3 @@
<html><body>Search Team's Teleporter:<br>
<html><body>Leopard:<br>
Congratulations. You have completed all the tasks and passed the trial.
</body></html>

View File

@ -1,4 +1,4 @@
<html><body>Search Team's Teleporter:<br>
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.<br>
To hunt: Tomb Guardian, Tomb Raider, Tomb Watcher, Tomb Soultaker, Tomb Patrol.
<html><body>Leopard:<br>
You did not finish your job, you have to defeat the monsters who have conquered the Imperial Tomb: <br>
Tomb Guardian, Tomb Raider, Tomb Watcher, Tomb Soultaker, Tomb Patrol.
</body></html>

View File

@ -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;
}
}