From 5bf84245385c030f1e28502503ac2440a66bbe13 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Sun, 22 Apr 2012 16:36:59 +0000
Subject: [PATCH] BETA: Standardizing daily quests by nonom. * Rumble in
the Base (461) * I Must Be a Genius (463) * Olympiad Starter
(551) * Olympiad Veteran (552) * Olympiad Undefeated (553)
---
.../Q461_RumbleInTheBase.java | 32 +++++--------------
.../Q463_IMustBeaGenius.java | 14 ++++++--
.../Q551_OlympiadStarter.java | 19 +++++++++--
.../Q552_OlympiadVeteran.java | 19 +++++++++--
.../Q553_OlympiadUndefeated.java | 19 +++++++++--
5 files changed, 68 insertions(+), 35 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q461_RumbleInTheBase/Q461_RumbleInTheBase.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q461_RumbleInTheBase/Q461_RumbleInTheBase.java
index 6cc86dbe76..cc48e60f38 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q461_RumbleInTheBase/Q461_RumbleInTheBase.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q461_RumbleInTheBase/Q461_RumbleInTheBase.java
@@ -22,7 +22,7 @@ import com.l2jserver.gameserver.model.quest.QuestState.QuestType;
import com.l2jserver.gameserver.model.quest.State;
/**
- * Rumble in the Base
+ * Rumble in the Base (461).
* @author malyelfik
*/
public class Q461_RumbleInTheBase extends Quest
@@ -50,8 +50,7 @@ public class Q461_RumbleInTheBase extends Quest
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
String htmltext = event;
- QuestState st = player.getQuestState(qn);
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
@@ -70,24 +69,17 @@ public class Q461_RumbleInTheBase extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
- QuestState prev = player.getQuestState("252_ItSmellsDelicious");
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
}
+ final QuestState prev = player.getQuestState("252_ItSmellsDelicious");
switch (st.getState())
{
case State.CREATED:
- if ((player.getLevel() >= 82) && (prev != null) && prev.isCompleted())
- {
- htmltext = "30200-01.htm";
- }
- else
- {
- htmltext = "30200-02.htm";
- }
+ htmltext = ((player.getLevel() >= 82) && (prev != null) && prev.isCompleted()) ? "30200-01.htm" : "30200-02.htm";
break;
case State.STARTED:
if (st.getInt("cond") == 1)
@@ -112,14 +104,7 @@ public class Q461_RumbleInTheBase extends Quest
else
{
st.setState(State.CREATED);
- if ((player.getLevel() >= 82) && (prev != null) && (prev.getState() == State.COMPLETED))
- {
- htmltext = "30200-01.htm";
- }
- else
- {
- htmltext = "30200-02.htm";
- }
+ htmltext = ((player.getLevel() >= 82) && (prev != null) && (prev.getState() == State.COMPLETED)) ? "30200-01.htm" : "30200-02.htm";
}
break;
}
@@ -129,16 +114,15 @@ public class Q461_RumbleInTheBase extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
{
- L2PcInstance partyMember = getRandomPartyMember(player, "1");
+ final L2PcInstance partyMember = getRandomPartyMember(player, "1");
if (partyMember == null)
{
return null;
}
- final QuestState st = partyMember.getQuestState(qn);
+ final QuestState st = partyMember.getQuestState(qn);
int chance = getRandom(1000);
boolean giveItem = false;
-
switch (npc.getNpcId())
{
case 22780:
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q463_IMustBeaGenius/Q463_IMustBeaGenius.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q463_IMustBeaGenius/Q463_IMustBeaGenius.java
index 34b1fc3721..9f20662709 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q463_IMustBeaGenius/Q463_IMustBeaGenius.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q463_IMustBeaGenius/Q463_IMustBeaGenius.java
@@ -18,12 +18,14 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.QuestState.QuestType;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
import com.l2jserver.gameserver.util.Util;
/**
+ * I Must Be a Genius (463).<br>
* 2010-08-19 Based on Freya PTS.
* @author Gnacik
*/
@@ -98,7 +100,7 @@ public class Q463_IMustBeaGenius extends Quest
}
st.takeItems(_collection, -1);
st.playSound("ItemSound.quest_finish");
- st.exitQuest(false);
+ st.exitQuest(QuestType.DAILY);
}
}
return htmltext;
@@ -132,7 +134,15 @@ public class Q463_IMustBeaGenius extends Quest
}
break;
case State.COMPLETED:
- htmltext = "32069-08.htm";
+ if (st.isNowAvailable())
+ {
+ st.setState(State.CREATED); // Not required, but it'll set the proper state.
+ htmltext = (player.getLevel() >= 70) ? "32069-01.htm" : "32069-00.htm";
+ }
+ else
+ {
+ htmltext = "32069-08.htm";
+ }
break;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q551_OlympiadStarter/Q551_OlympiadStarter.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q551_OlympiadStarter/Q551_OlympiadStarter.java
index de6957569e..a382cb3c13 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q551_OlympiadStarter/Q551_OlympiadStarter.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q551_OlympiadStarter/Q551_OlympiadStarter.java
@@ -19,9 +19,11 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.olympiad.CompetitionType;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.QuestState.QuestType;
import com.l2jserver.gameserver.model.quest.State;
/**
+ * Olympiad Starter (551).<br>
* Based on official H5 PTS server.
* @since Nov. 5, 2011, improved by jurchiks.
* @version 2011-02-04
@@ -82,7 +84,7 @@ public class Q551_OlympiadStarter extends Quest
st.giveItems(MEDAL_OF_GLORY, 3);
}
st.playSound("ItemSound.quest_finish");
- st.exitQuest(false);
+ st.exitQuest(QuestType.DAILY);
}
else
{
@@ -112,7 +114,18 @@ public class Q551_OlympiadStarter extends Quest
}
else if (st.isCompleted())
{
- htmltext = "31688-05.html";
+ if(st.isNowAvailable())
+ {
+ st.setState(State.CREATED); // Not required, but it'll set the proper state.
+ if ((player.getLevel() < 75) || !player.isNoble())
+ {
+ htmltext = "31688-00.htm";
+ }
+ }
+ else
+ {
+ htmltext = "31688-05.html";
+ }
}
else if (st.isStarted())
{
@@ -123,7 +136,7 @@ public class Q551_OlympiadStarter extends Quest
st.giveItems(OLY_CHEST, 4);
st.giveItems(MEDAL_OF_GLORY, 5);
st.playSound("ItemSound.quest_finish");
- st.exitQuest(false);
+ st.exitQuest(QuestType.DAILY);
}
else
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q552_OlympiadVeteran/Q552_OlympiadVeteran.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q552_OlympiadVeteran/Q552_OlympiadVeteran.java
index 9f3b22a442..2d44ce589d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q552_OlympiadVeteran/Q552_OlympiadVeteran.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q552_OlympiadVeteran/Q552_OlympiadVeteran.java
@@ -19,9 +19,11 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.olympiad.CompetitionType;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.QuestState.QuestType;
import com.l2jserver.gameserver.model.quest.State;
/**
+ * Olympiad Veteran (552).<br>
* Based on official H5 PTS server and 551 quest ;)
* @since Nov. 5, 2011, improved by jurchiks.
* @version 2011-02-05
@@ -78,7 +80,7 @@ public class Q552_OlympiadVeteran extends Quest
{
st.giveItems(OLY_CHEST, count);
st.playSound("ItemSound.quest_finish");
- st.exitQuest(false);
+ st.exitQuest(QuestType.DAILY);
}
else
{
@@ -108,7 +110,18 @@ public class Q552_OlympiadVeteran extends Quest
}
else if (st.isCompleted())
{
- htmltext = "31688-05.html";
+ if(st.isNowAvailable())
+ {
+ st.setState(State.CREATED); // Not required, but it'll set the proper state.
+ if ((player.getLevel() < 75) || !player.isNoble())
+ {
+ htmltext = "31688-00.htm";
+ }
+ }
+ else
+ {
+ htmltext = "31688-05.html";
+ }
}
else if (st.isStarted())
{
@@ -119,7 +132,7 @@ public class Q552_OlympiadVeteran extends Quest
htmltext = "31688-04.html"; // reusing the same html
st.giveItems(OLY_CHEST, 4);
st.playSound("ItemSound.quest_finish");
- st.exitQuest(false);
+ st.exitQuest(QuestType.DAILY);
}
else
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q553_OlympiadUndefeated/Q553_OlympiadUndefeated.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q553_OlympiadUndefeated/Q553_OlympiadUndefeated.java
index 1f765ef85b..631134dcfa 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q553_OlympiadUndefeated/Q553_OlympiadUndefeated.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q553_OlympiadUndefeated/Q553_OlympiadUndefeated.java
@@ -19,9 +19,11 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.olympiad.CompetitionType;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.QuestState.QuestType;
import com.l2jserver.gameserver.model.quest.State;
/**
+ * Olympiad Undefeated (553).<br>
* Based on official H5 PTS server and 551 quest ;)
* @since Nov. 5, 2011, improved by jurchiks.
* @version 2011-02-05
@@ -83,7 +85,7 @@ public class Q553_OlympiadUndefeated extends Quest
st.giveItems(MEDAL_OF_GLORY, 3);
}
st.playSound("ItemSound.quest_finish");
- st.exitQuest(false);
+ st.exitQuest(QuestType.DAILY);
}
else
{
@@ -113,7 +115,18 @@ public class Q553_OlympiadUndefeated extends Quest
}
else if (st.isCompleted())
{
- htmltext = "31688-05.html";
+ st.setState(State.CREATED); // Not required, but it'll set the proper state.
+ if (st.isNowAvailable())
+ {
+ if ((player.getLevel() < 75) || !player.isNoble())
+ {
+ htmltext = "31688-00.htm";
+ }
+ }
+ else
+ {
+ htmltext = "31688-05.html";
+ }
}
else
{
@@ -124,7 +137,7 @@ public class Q553_OlympiadUndefeated extends Quest
st.giveItems(OLY_CHEST, 4);
st.giveItems(MEDAL_OF_GLORY, 5);
st.playSound("ItemSound.quest_finish");
- st.exitQuest(false);
+ st.exitQuest(QuestType.DAILY);
}
else
{
--
GitLab