From 6a97c353fe1d1af8067781ed58a87bee87a53922 Mon Sep 17 00:00:00 2001
From: Adry_85 <Adrya85@hotmail.it>
Date: Wed, 18 Dec 2013 11:09:25 +0000
Subject: [PATCH] BETA: Improvements for some quests. Reported by: jurchiks
---
.../Q00198_SevenSignsEmbryo.java | 1 -
.../Q10284_AcquisitionOfDivineSword.java | 11 ++------
.../Q10285_MeetingSirra.java | 13 +++------
.../Q10286_ReunionWithSirra.java | 13 +++------
.../Q10287_StoryOfThoseLeft.java | 28 ++++++++++---------
5 files changed, 26 insertions(+), 40 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index 5e600c9e5f..d6d865032e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -176,7 +176,6 @@ public class Q00198_SevenSignsEmbryo extends Quest
{
return htmltext;
}
-
return "32617-01.html";
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
index 32f70dd521..872faf93aa 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.model.quest.State;
* Acquisition of Divine Sword (10284)
* @author Adry_85
*/
-public class Q10284_AcquisitionOfDivineSword extends Quest
+public final class Q10284_AcquisitionOfDivineSword extends Quest
{
// NPCs
private static final int RAFFORTY = 32020;
@@ -58,7 +58,7 @@ public class Q10284_AcquisitionOfDivineSword extends Quest
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, false);
if (st == null)
{
return null;
@@ -207,13 +207,8 @@ public class Q10284_AcquisitionOfDivineSword extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
index 99d8d9a161..16cd5d0a37 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
@@ -36,7 +36,7 @@ import com.l2jserver.gameserver.network.serverpackets.NpcSay;
* Meeting Sirra (10285)
* @author Adry_85
*/
-public class Q10285_MeetingSirra extends Quest
+public final class Q10285_MeetingSirra extends Quest
{
// NPCs
private static final int RAFFORTY = 32020;
@@ -61,7 +61,7 @@ public class Q10285_MeetingSirra extends Quest
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, false);
if (st == null)
{
return null;
@@ -104,7 +104,7 @@ public class Q10285_MeetingSirra extends Quest
{
if (st.isMemoState(1) && (st.getInt("ex") == 2))
{
- L2Npc sirra = addSpawn(SIRRA, -23905, -8790, -5384, 56238, false, 0, false, npc.getInstanceId());
+ final L2Npc sirra = addSpawn(SIRRA, -23905, -8790, -5384, 56238, false, 0, false, npc.getInstanceId());
sirra.broadcastPacket(new NpcSay(sirra.getObjectId(), Say2.NPC_ALL, sirra.getId(), NpcStringId.THERES_NOTHING_YOU_CANT_SAY_I_CANT_LISTEN_TO_YOU_ANYMORE));
st.set("ex", 3);
st.setCond(5, true);
@@ -212,13 +212,8 @@ public class Q10285_MeetingSirra extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
index 195f2d30b4..2a7f66c180 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
@@ -36,7 +36,7 @@ import com.l2jserver.gameserver.network.serverpackets.NpcSay;
* Reunion with Sirra (10286)
* @author Adry_85
*/
-public class Q10286_ReunionWithSirra extends Quest
+public final class Q10286_ReunionWithSirra extends Quest
{
// NPCs
private static final int RAFFORTY = 32020;
@@ -61,7 +61,7 @@ public class Q10286_ReunionWithSirra extends Quest
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
- final QuestState st = player.getQuestState(getName());
+ final QuestState st = getQuestState(player, false);
if (st == null)
{
return null;
@@ -92,7 +92,7 @@ public class Q10286_ReunionWithSirra extends Quest
{
if (st.isMemoState(1))
{
- L2Npc sirra = addSpawn(SIRRA, -23905, -8790, -5384, 56238, false, 0, false, npc.getInstanceId());
+ final L2Npc sirra = addSpawn(SIRRA, -23905, -8790, -5384, 56238, false, 0, false, npc.getInstanceId());
sirra.broadcastPacket(new NpcSay(sirra.getObjectId(), Say2.NPC_ALL, sirra.getId(), NpcStringId.YOU_ADVANCED_BRAVELY_BUT_GOT_SUCH_A_TINY_RESULT_HOHOHO));
st.set("ex", 1);
st.setCond(3, true);
@@ -162,13 +162,8 @@ public class Q10286_ReunionWithSirra extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(getName());
+ QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
index fb45cc334f..9da68d04b7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
@@ -28,7 +28,6 @@ import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
-import com.l2jserver.gameserver.util.Util;
/**
* Story of Those Left (10287)
@@ -125,13 +124,21 @@ public final class Q10287_StoryOfThoseLeft extends Quest
}
break;
}
- }
-
- if (Util.isDigit(event) && st.isMemoState(2))
- {
- st.rewardItems(Integer.valueOf(event), 1);
- htmltext = "32020-09.html";
- st.exitQuest(false, true);
+ case "10549":
+ case "10550":
+ case "10551":
+ case "10552":
+ case "10553":
+ case "14219":
+ {
+ if (st.isMemoState(2))
+ {
+ st.rewardItems(Integer.valueOf(event), 1);
+ htmltext = "32020-09.html";
+ st.exitQuest(false, true);
+ }
+ break;
+ }
}
return htmltext;
}
@@ -141,11 +148,6 @@ public final class Q10287_StoryOfThoseLeft extends Quest
{
QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
--
GitLab