diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Engine.java b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Engine.java
index d688f77ddcb7b6022b82a95898c1e38dd330039e..e4ba909929c120cf1a2fa43dd8185d41ceab8b4c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Engine.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Engine.java
@@ -37,6 +37,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
public class Engine extends Quest implements Runnable
{
+ private static final String pointsInfoFile = "data/hellboundTrustPoints.xml";
+
private static final int UPDATE_INTERVAL = 10000;
private static final int[][] DOOR_LIST =
@@ -121,7 +123,7 @@ public class Engine extends Quest implements Runnable
}
catch (Exception e)
{
- e.printStackTrace();
+ _log.log(Level.WARNING, "Hellbound doors problem!", e);
}
}
@@ -135,86 +137,83 @@ public class Engine extends Quest implements Runnable
private void loadPointsInfoData()
{
- String pointsInfoFile = "data/hellboundTrustPoints.xml";
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setValidating(false);
- factory.setIgnoringComments(true);
- File file = new File(Config.DATAPACK_ROOT, pointsInfoFile);
+ final File file = new File(Config.DATAPACK_ROOT, pointsInfoFile);
+ if (file.exists())
+ {
+ _log.warning("Can't locate points info file: " + pointsInfoFile);
+ return;
+ }
+
Document doc = null;
+ try
+ {
+ final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setValidating(false);
+ factory.setIgnoringComments(true);
+ doc = factory.newDocumentBuilder().parse(file);
+ }
+ catch (Exception e)
+ {
+ _log.log(Level.WARNING, "Could not parse " + pointsInfoFile + " file: " + e.getMessage(), e);
+ return;
+ }
- if (file.exists())
+ for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling())
{
- try
- {
- doc = factory.newDocumentBuilder().parse(file);
- }
- catch (Exception e)
+ if ("list".equalsIgnoreCase(n.getNodeName()))
{
- _log.log(Level.WARNING, "Could not parse " + pointsInfoFile + " file: " + e.getMessage(), e);
- }
-
- for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling())
- {
- if ("list".equalsIgnoreCase(n.getNodeName()))
+ for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
{
- for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
+ if ("npc".equalsIgnoreCase(d.getNodeName()))
{
- if ("npc".equalsIgnoreCase(d.getNodeName()))
+ NamedNodeMap attrs = d.getAttributes();
+ Node att;
+
+ att = attrs.getNamedItem("id");
+ if (att == null)
+ {
+ _log.severe("[Hellbound Trust Points Info] Missing NPC ID, skipping record");
+ continue;
+ }
+
+ int npcId = Integer.parseInt(att.getNodeValue());
+
+ att = attrs.getNamedItem("points");
+ if (att == null)
+ {
+ _log.severe("[Hellbound Trust Points Info] Missing reward point info for NPC ID " + npcId + ", skipping record");
+ continue;
+ }
+ int points = Integer.parseInt(att.getNodeValue());
+
+ att = attrs.getNamedItem("minHellboundLvl");
+ if (att == null)
+ {
+ _log.severe("[Hellbound Trust Points Info] Missing minHellboundLvl info for NPC ID " + npcId + ", skipping record");
+ continue;
+ }
+ int minHbLvl = Integer.parseInt(att.getNodeValue());
+
+ att = attrs.getNamedItem("maxHellboundLvl");
+ if (att == null)
+ {
+ _log.severe("[Hellbound Trust Points Info] Missing maxHellboundLvl info for NPC ID " + npcId + ", skipping record");
+ continue;
+ }
+ int maxHbLvl = Integer.parseInt(att.getNodeValue());
+
+ att = attrs.getNamedItem("lowestTrustLimit");
+ int lowestTrustLimit = 0;
+ if (att != null)
{
- NamedNodeMap attrs = d.getAttributes();
- Node att;
-
- att = attrs.getNamedItem("id");
- if (att == null)
- {
- _log.severe("[Hellbound Trust Points Info] Missing NPC ID, skipping record");
- continue;
- }
-
- int npcId = Integer.parseInt(att.getNodeValue());
-
- att = attrs.getNamedItem("points");
- if (att == null)
- {
- _log.severe("[Hellbound Trust Points Info] Missing reward point info for NPC ID " + npcId + ", skipping record");
- continue;
- }
- int points = Integer.parseInt(att.getNodeValue());
-
- att = attrs.getNamedItem("minHellboundLvl");
- if (att == null)
- {
- _log.severe("[Hellbound Trust Points Info] Missing minHellboundLvl info for NPC ID " + npcId + ", skipping record");
- continue;
- }
- int minHbLvl = Integer.parseInt(att.getNodeValue());
-
- att = attrs.getNamedItem("maxHellboundLvl");
- if (att == null)
- {
- _log.severe("[Hellbound Trust Points Info] Missing maxHellboundLvl info for NPC ID " + npcId + ", skipping record");
- continue;
- }
- int maxHbLvl = Integer.parseInt(att.getNodeValue());
-
- att = attrs.getNamedItem("lowestTrustLimit");
- int lowestTrustLimit = 0;
- if (att != null)
- {
- lowestTrustLimit = Integer.parseInt(att.getNodeValue());
- }
-
- pointsInfo.put(npcId, new PointsInfoHolder(points, minHbLvl, maxHbLvl, lowestTrustLimit));
+ lowestTrustLimit = Integer.parseInt(att.getNodeValue());
}
+
+ pointsInfo.put(npcId, new PointsInfoHolder(points, minHbLvl, maxHbLvl, lowestTrustLimit));
}
}
}
}
- else
- {
- _log.warning("Can't locate points info file: " + pointsInfoFile);
- }
-
_log.info("HellboundEngine: Loaded: " + pointsInfo.size() + " trust point reward data");
}
@@ -266,7 +265,7 @@ public class Engine extends Quest implements Runnable
HellboundManager.getInstance().registerEngine(this, UPDATE_INTERVAL);
loadPointsInfoData();
- // register onKill for all rewardable monsters
+ // Register onKill for all rewardable monsters
for (int npcId : pointsInfo.keySet())
{
addKillId(npcId);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
index 1adba3f6030f0445905b814ed2918007bed67ecd..3c7fc083c902cd16dcf8e8f61ed4474280204471 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
@@ -21,7 +21,8 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
/**
- * Journey To Gracia (10267). Original jython script by Kerberos v1.0 on 2009/05/2
+ * Journey To Gracia (10267).<br>
+ * Original jython script by Kerberos v1.0 on 2009/05/2
* @author nonom
*/
public class Q10267_JourneyToGracia extends Quest
@@ -40,15 +41,13 @@ public class Q10267_JourneyToGracia extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
-
- int npcId = npc.getNpcId();
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
}
+ final int npcId = npc.getNpcId();
switch (st.getState())
{
case State.COMPLETED:
@@ -64,33 +63,20 @@ public class Q10267_JourneyToGracia extends Quest
case State.CREATED:
if (npcId == ORVEN)
{
- if (player.getLevel() < 75)
- {
- htmltext = "30857-00.htm";
- }
- else
- {
- htmltext = "30857-01.htm";
- }
+ htmltext = (player.getLevel() < 75) ? "30857-00.htm" : "30857-01.htm";
}
break;
case State.STARTED:
+ final int cond = st.getInt("cond");
if (npcId == ORVEN)
{
htmltext = "30857-07.htm";
}
else if (npcId == PAPIKU)
{
- if (st.getInt("cond") == 1)
- {
- htmltext = "32564-01.htm";
- }
- else
- {
- htmltext = "32564-03.htm";
- }
+ htmltext = (cond == 1) ? "32564-01.htm" : "32564-03.htm";
}
- else if ((npcId == KEUCEREUS) && (st.getInt("cond") == 2))
+ else if ((npcId == KEUCEREUS) && (cond == 2))
{
htmltext = "32548-01.htm";
}
@@ -103,8 +89,7 @@ public class Q10267_JourneyToGracia 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;
@@ -123,7 +108,7 @@ public class Q10267_JourneyToGracia extends Quest
st.playSound("ItemSound.quest_middle");
break;
case "32548-02.htm":
- st.giveItems(57, 92500);
+ st.giveAdena(92500, false);
st.addExpAndSp(75480, 7570);
st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
@@ -138,9 +123,7 @@ public class Q10267_JourneyToGracia extends Quest
addStartNpc(ORVEN);
- addTalkId(ORVEN);
- addTalkId(KEUCEREUS);
- addTalkId(PAPIKU);
+ addTalkId(ORVEN, KEUCEREUS, PAPIKU);
questItemIds = new int[]
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
index 2d1998b265b6cd0ea2ab62de132f47d1f306f9aa..9ced5bdf96a58ded4cbe04f970514953255de64e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
@@ -21,7 +21,8 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
/**
- * To the Seed of Infinity (10268). Original jython script by Kerberos v1.0 on 2009/05/1
+ * To the Seed of Infinity (10268).<br>
+ * Original jython script by Kerberos v1.0 on 2009/05/1
* @author nonom
*/
public class Q10268_ToTheSeedOfInfinity extends Quest
@@ -39,38 +40,22 @@ public class Q10268_ToTheSeedOfInfinity extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
-
- int npcId = npc.getNpcId();
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
}
+ final int npcId = npc.getNpcId();
switch (st.getState())
{
case State.COMPLETED:
- if (npcId == TEPIOS)
- {
- htmltext = "32530-02.htm";
- }
- else
- {
- htmltext = "32548-0a.htm";
- }
+ htmltext = (npcId == TEPIOS) ? "32530-02.htm" : "32548-0a.htm";
break;
case State.CREATED:
if (npcId == KEUCEREUS)
{
- if (player.getLevel() < 75)
- {
- htmltext = "32548-00.htm";
- }
- else
- {
- htmltext = "32548-01.htm";
- }
+ htmltext = (player.getLevel() < 75) ? "32548-00.htm" : "32548-01.htm";
}
break;
case State.STARTED:
@@ -81,7 +66,7 @@ public class Q10268_ToTheSeedOfInfinity extends Quest
else if (npcId == TEPIOS)
{
htmltext = "32530-01.htm";
- st.giveItems(57, 16671);
+ st.giveAdena(16671, false);
st.addExpAndSp(100640, 10098);
st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
@@ -95,8 +80,7 @@ public class Q10268_ToTheSeedOfInfinity 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;
@@ -117,8 +101,7 @@ public class Q10268_ToTheSeedOfInfinity extends Quest
super(questId, name, descr);
addStartNpc(KEUCEREUS);
- addTalkId(KEUCEREUS);
- addTalkId(TEPIOS);
+ addTalkId(KEUCEREUS, TEPIOS);
questItemIds = new int[]
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
index d3497eea881a86b95dcc515f919b0f93ebde0ff5..9e0b2a1862677f46600a5576546fd84ba0da4e4a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
@@ -21,7 +21,8 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
/**
- * To the Seed of Destruction (10269). Original jython script by Kerberos v1.0 on 2009/05/1
+ * To the Seed of Destruction (10269).<br>
+ * Original jython script by Kerberos v1.0 on 2009/05/1
* @author nonom
*/
public class Q10269_ToTheSeedOfDestruction extends Quest
@@ -39,37 +40,22 @@ public class Q10269_ToTheSeedOfDestruction extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
- int npcId = npc.getNpcId();
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
}
+ final int npcId = npc.getNpcId();
switch (st.getState())
{
case State.COMPLETED:
- if (npcId == ALLENOS)
- {
- htmltext = "32526-02.htm";
- }
- else
- {
- htmltext = "32548-0a.htm";
- }
+ htmltext = (npcId == ALLENOS) ? "32526-02.htm" : "32548-0a.htm";
break;
case State.CREATED:
if (npcId == KEUCEREUS)
{
- if (player.getLevel() < 75)
- {
- htmltext = "32548-00.htm";
- }
- else
- {
- htmltext = "32548-01.htm";
- }
+ htmltext = (player.getLevel() < 75) ? "32548-00.htm" : "32548-01.htm";
}
break;
case State.STARTED:
@@ -80,7 +66,7 @@ public class Q10269_ToTheSeedOfDestruction extends Quest
else if (npcId == ALLENOS)
{
htmltext = "32526-01.htm";
- st.giveItems(57, 29174);
+ st.giveAdena(29174, false);
st.addExpAndSp(176121, 7671);
st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
@@ -94,8 +80,7 @@ public class Q10269_ToTheSeedOfDestruction 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;
@@ -116,8 +101,7 @@ public class Q10269_ToTheSeedOfDestruction extends Quest
super(questId, name, descr);
addStartNpc(KEUCEREUS);
- addTalkId(KEUCEREUS);
- addTalkId(ALLENOS);
+ addTalkId(KEUCEREUS, ALLENOS);
questItemIds = new int[]
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
index 393f4dd419c59f439bd3c7cd2c7a02c1801b2588..a12e49164cd5486e975b5ff0d046d788c8cc25c8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
@@ -37,20 +37,28 @@ public class Q10271_TheEnvelopingDarkness extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
+ final QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
+ }
- if (npc.getNpcId() == ORBYU)
+ final int npcId = npc.getNpcId();
+ final int cond = st.getInt("cond");
+ if (npcId == ORBYU)
{
switch (st.getState())
{
case State.CREATED:
- QuestState _prev = player.getQuestState("10269_ToTheSeedOfDestruction");
+ final QuestState _prev = player.getQuestState("10269_ToTheSeedOfDestruction");
if ((_prev != null) && _prev.isCompleted() && (player.getLevel() >= 75))
+ {
htmltext = "32560-01.htm";
+ }
else
+ {
htmltext = "32560-02.htm";
+ }
break;
case State.STARTED:
htmltext = "32560-05.htm";
@@ -59,73 +67,70 @@ public class Q10271_TheEnvelopingDarkness extends Quest
htmltext = "32560-03.htm";
break;
}
- if (st.getInt("cond") == 2)
- {
- htmltext = "32560-06.htm";
- }
- else if (st.getInt("cond") == 3)
- {
- htmltext = "32560-07.htm";
- }
- else if (st.getInt("cond") == 4)
+
+ switch (cond)
{
- htmltext = "32560-08.htm";
- st.unset("cond");
- st.setState(State.COMPLETED);
- st.giveItems(57, 62516);
- st.addExpAndSp(377403, 37867);
- st.playSound("ItemSound.quest_finish");
- st.exitQuest(false);
+ case 2:
+ htmltext = "32560-06.htm";
+ break;
+ case 3:
+ htmltext = "32560-07.htm";
+ break;
+ case 4:
+ htmltext = "32560-08.htm";
+ st.giveAdena(62516, false);
+ st.addExpAndSp(377403, 37867);
+ st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
+ break;
}
-
}
-
- else if (npc.getNpcId() == EL)
+ else if (npcId == EL)
{
if (st.isCompleted())
{
htmltext = "32556-02.htm";
}
- if (st.getInt("cond") == 1)
- {
- htmltext = "32556-01.htm";
- }
- else if (st.getInt("cond") == 2)
- {
- htmltext = "32556-07.htm";
- }
- else if (st.getInt("cond") == 3)
+ else
{
- htmltext = "32556-08.htm";
- }
- else if (st.getInt("cond") == 4)
- {
- htmltext = "32556-09.htm";
+ switch (cond)
+ {
+ case 1:
+ htmltext = "32556-01.htm";
+ break;
+ case 2:
+ htmltext = "32556-07.htm";
+ break;
+ case 3:
+ htmltext = "32556-08.htm";
+ break;
+ case 4:
+ htmltext = "32556-09.htm";
+ break;
+ }
}
}
-
- else if (npc.getNpcId() == MEDIBAL_CORPSE)
+ else if (npcId == MEDIBAL_CORPSE)
{
- switch (st.getState())
- {
- case State.COMPLETED:
- htmltext = "32528-02.htm";
- break;
- }
- if (st.getInt("cond") == 2)
- {
- htmltext = "32528-01.htm";
- st.playSound("ItemSound.quest_middle");
- st.set("cond", "3");
- st.giveItems(MEDIBAL_DOCUMENT, 1);
- }
- else if (st.getInt("cond") == 3)
+ if (st.isCompleted())
{
- htmltext = "32528-03.htm";
+ htmltext = "32528-02.htm";
}
- else if (st.getInt("cond") == 4)
+ else
{
- htmltext = "32528-03.htm";
+ switch (cond)
+ {
+ case 2:
+ htmltext = "32528-01.htm";
+ st.playSound("ItemSound.quest_middle");
+ st.set("cond", "3");
+ st.giveItems(MEDIBAL_DOCUMENT, 1);
+ break;
+ case 3:
+ case 4:
+ htmltext = "32528-03.htm";
+ break;
+ }
}
}
return htmltext;
@@ -135,10 +140,11 @@ public class Q10271_TheEnvelopingDarkness 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;
+ }
if (event.equalsIgnoreCase("32560-05.htm"))
{
@@ -165,9 +171,8 @@ public class Q10271_TheEnvelopingDarkness extends Quest
{
super(questId, name, descr);
addStartNpc(ORBYU);
- addTalkId(ORBYU);
- addTalkId(EL);
- addTalkId(MEDIBAL_CORPSE);
+ addTalkId(ORBYU, EL, MEDIBAL_CORPSE);
+
questItemIds = new int[]
{
MEDIBAL_DOCUMENT
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
index 2ae7423f338e9756607737d683944a07f83321fa..e9d558b7c54c871365162797c822570e22f9f7bc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
@@ -17,6 +17,7 @@ package quests.Q10272_LightFragment;
import com.l2jserver.Config;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
@@ -47,22 +48,35 @@ public class Q10272_LightFragment extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
+ final QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
+ }
+ final int npcId = npc.getNpcId();
+ final int cond = st.getInt("cond");
if (npc.getNpcId() == ORBYU)
{
switch (st.getState())
{
case State.CREATED:
- QuestState _prev = player.getQuestState("10271_TheEnvelopingDarkness");
- if ((_prev != null) && _prev.isCompleted() && (player.getLevel() >= 75))
- htmltext = "32560-01.htm";
- else
- htmltext = "32560-02.htm";
- if (player.getLevel() <= 75)
+ if (player.getLevel() < 75)
+ {
htmltext = "32560-03.htm";
+ }
+ else
+ {
+ final QuestState _prev = player.getQuestState("10271_TheEnvelopingDarkness");
+ if ((_prev != null) && _prev.isCompleted())
+ {
+ htmltext = "32560-01.htm";
+ }
+ else
+ {
+ htmltext = "32560-02.htm";
+ }
+ }
break;
case State.STARTED:
htmltext = "32560-06.htm";
@@ -77,123 +91,119 @@ public class Q10272_LightFragment extends Quest
htmltext = "32560-06.htm";
}
}
- else if (npc.getNpcId() == ARTIUS)
+ else if (npcId == ARTIUS)
{
if (st.isCompleted())
{
htmltext = "32559-19.htm";
}
- if (st.getInt("cond") == 1)
- {
- htmltext = "32559-01.htm";
- }
- if (st.getInt("cond") == 2)
- {
- htmltext = "32559-04.htm";
- }
- if (st.getInt("cond") == 3)
- {
- htmltext = "32559-08.htm";
- }
- else if (st.getInt("cond") == 4)
- {
- htmltext = "32559-10.htm";
- }
- else if (st.getInt("cond") == 5)
- {
- if (st.getQuestItemsCount(FRAGMENT_POWDER) >= 100)
- {
- htmltext = "32559-15.htm";
- st.set("cond", "6");
- }
- else if (st.hasQuestItems(FRAGMENT_POWDER))
- {
- htmltext = "32559-14.htm";
- }
- else if (!st.hasQuestItems(FRAGMENT_POWDER))
- {
- htmltext = "32559-13.htm";
- }
- }
- else if (st.getInt("cond") == 6)
+ else
{
- if (st.getQuestItemsCount(LIGHT_FRAGMENT_POWDER) < 100)
- htmltext = "32559-16.htm";
- else
+ switch (cond)
{
- st.set("cond", "7");
- st.playSound("ItemSound.quest_middle");
- htmltext = "32559-17.htm";
+ case 1:
+ htmltext = "32559-01.htm";
+ break;
+ case 2:
+ htmltext = "32559-04.htm";
+ break;
+ case 3:
+ htmltext = "32559-08.htm";
+ break;
+ case 4:
+ htmltext = "32559-10.htm";
+ break;
+ case 5:
+ if (st.getQuestItemsCount(FRAGMENT_POWDER) >= 100)
+ {
+ htmltext = "32559-15.htm";
+ st.set("cond", "6");
+ }
+ else
+ {
+ htmltext = st.hasQuestItems(FRAGMENT_POWDER) ? "32559-14.htm" : "32559-13.htm";
+ }
+ break;
+ case 6:
+ if (st.getQuestItemsCount(LIGHT_FRAGMENT_POWDER) < 100)
+ {
+ htmltext = "32559-16.htm";
+ }
+ else
+ {
+ st.set("cond", "7");
+ st.playSound("ItemSound.quest_middle");
+ htmltext = "32559-17.htm";
+ }
+ break;
+ case 7:
+ // TODO Nothing here?
+ break;
+ case 8:
+ st.giveAdena(556980, false);
+ st.addExpAndSp(1009016, 91363);
+ st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
+ htmltext = "32559-18.htm";
+ break;
}
}
- else if (st.getInt("cond") == 8)
- {
- st.unset("cond");
- st.giveItems(57, 556980);
- st.addExpAndSp(1009016, 91363);
- st.playSound("ItemSound.quest_finish");
- st.setState(State.COMPLETED);
- st.exitQuest(false);
- htmltext = "32559-18.htm";
- }
}
- else if (npc.getNpcId() == GINBY)
+ else if (npcId == GINBY)
{
- if (st.getInt("cond") == 1)
- {
- htmltext = "32566-02.htm";
- }
- else if (st.getInt("cond") == 2)
- {
- htmltext = "32566-02.htm";
- }
- else if (st.getInt("cond") == 3)
- {
- htmltext = "32566-01.htm";
- }
- else if (st.getInt("cond") == 4)
+ switch (cond)
{
- htmltext = "32566-09.htm";
- }
- else if (st.getInt("cond") == 5)
- {
- htmltext = "32566-10.htm";
- }
- else if (st.getInt("cond") == 6)
- {
- htmltext = "32566-10.htm";
+ case 1:
+ case 2:
+ htmltext = "32566-02.htm";
+ break;
+ case 3:
+ htmltext = "32566-01.htm";
+ break;
+ case 4:
+ htmltext = "32566-09.htm";
+ break;
+ case 5:
+ htmltext = "32566-10.htm";
+ break;
+ case 6:
+ htmltext = "32566-10.htm";
+ break;
}
-
}
- else if (npc.getNpcId() == LELRIKIA)
+ else if (npcId == LELRIKIA)
{
- if (st.getInt("cond") == 3)
+ switch (cond)
{
- htmltext = "32567-01.htm";
- }
- else if (st.getInt("cond") == 4)
- {
- htmltext = "32567-05.htm";
+ case 3:
+ htmltext = "32567-01.htm";
+ break;
+ case 4:
+ htmltext = "32567-05.htm";
+ break;
}
}
- else if (npc.getNpcId() == LEKON)
+ else if (npcId == LEKON)
{
- if (st.getInt("cond") == 7)
- {
- htmltext = "32557-01.htm";
-
- if (st.getInt("wait") == 1)
- {
- st.giveItems(LIGHT_FRAGMENT, 1);;
- st.set("cond", "8");
- st.unset("wait");
- st.playSound("ItemSound.quest_middle");
- htmltext = "32557-05.htm";
- }
- }
- else if (st.getInt("cond") == 8)
+ switch (cond)
{
- htmltext = "32557-06.htm";
+ case 7:
+ if (st.getInt("wait") == 1)
+ {
+ st.giveItems(LIGHT_FRAGMENT, 1);;
+ st.set("cond", "8");
+ st.unset("wait");
+ st.playSound("ItemSound.quest_middle");
+ htmltext = "32557-05.htm";
+ }
+ else
+ {
+ htmltext = "32557-01.htm";
+ }
+ break;
+ case 8:
+ htmltext = "32557-06.htm";
+ break;
}
}
return htmltext;
@@ -203,10 +213,11 @@ public class Q10272_LightFragment 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;
+ }
if (event.equalsIgnoreCase("32560-06.htm"))
{
@@ -224,11 +235,15 @@ public class Q10272_LightFragment extends Quest
}
else if (event.equalsIgnoreCase("pay"))
{
- if (st.getQuestItemsCount(57) >= 10000)
- st.takeItems(57, 10000);
- htmltext = "32566-05.htm";
- if (st.getQuestItemsCount(57) < 10000)
+ if (st.getQuestItemsCount(PcInventory.ADENA_ID) >= 10000)
+ {
+ st.giveAdena(10000, false);
+ htmltext = "32566-05.htm";
+ }
+ else
+ {
htmltext = "32566-04a.htm";
+ }
}
else if (event.equalsIgnoreCase("32567-04.htm"))
{
@@ -247,7 +262,9 @@ public class Q10272_LightFragment extends Quest
st.set("wait", "1");
}
else
+ {
htmltext = "32557-04.htm";
+ }
}
return htmltext;
}
@@ -265,15 +282,19 @@ public class Q10272_LightFragment extends Quest
int numItems = chance / 100;
chance = chance % 100;
if (st.getRandom(100) < chance)
+ {
numItems++;
+ }
if (numItems > 0)
{
- if (count + numItems >= 100)
+ if ((count + numItems) >= 100)
{
numItems = 100 - (int) count;
}
else
+ {
st.playSound("ItemSound.quest_itemget");
+ }
st.giveItems(FRAGMENT_POWDER, numItems);
}
}
@@ -284,16 +305,11 @@ public class Q10272_LightFragment extends Quest
public Q10272_LightFragment(int questId, String name, String descr)
{
super(questId, name, descr);
+
addStartNpc(ORBYU);
- addTalkId(ORBYU);
- addTalkId(ARTIUS);
- addTalkId(GINBY);
- addTalkId(LELRIKIA);
- addTalkId(LEKON);
- for (int i : Monsters)
- {
- addKillId(i);
- }
+ addTalkId(ORBYU, ARTIUS, GINBY, LELRIKIA, LEKON);
+ addKillId(Monsters);
+
questItemIds = new int[]
{
FRAGMENT_POWDER, LIGHT_FRAGMENT_POWDER,
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
index 33410829fb0fed242400ed5fb4c0f582b3f342c2..ae2eb77abbc0e264645228c56e9d3c547f9358eb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
@@ -15,6 +15,7 @@
package quests.Q10273_GoodDayToFly;
import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.model.L2Skill;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
@@ -22,7 +23,8 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
/**
- * Good Day to Fly (10273). Original Jython script by Kerberos v1.0 on 2009/04/25
+ * Good Day to Fly (10273).<br>
+ * Original Jython script by Kerberos v1.0 on 2009/04/25
* @author nonom
*/
public class Q10273_GoodDayToFly extends Quest
@@ -40,33 +42,28 @@ public class Q10273_GoodDayToFly extends Quest
// Items
private static final int MARK = 13856;
+ // Skills
+ private static final L2Skill AuraBirdFalcon = SkillTable.getInstance().getInfo(5982, 1);
+ private static final L2Skill AuraBirdOwl = SkillTable.getInstance().getInfo(5983, 1);
+
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
}
- int transform = st.getInt("transform");
-
+ final int transform = st.getInt("transform");
switch (st.getState())
{
case State.COMPLETED:
htmltext = "32557-0a.htm";
break;
case State.CREATED:
- if (player.getLevel() < 75)
- {
- htmltext = "32557-00.htm";
- }
- else
- {
- htmltext = "32557-01.htm";
- }
+ htmltext = (player.getLevel() < 75) ? "32557-00.htm" : "32557-01.htm";
break;
default:
if (st.getQuestItemsCount(MARK) >= 5)
@@ -82,8 +79,8 @@ public class Q10273_GoodDayToFly extends Quest
}
st.giveItems(13857, 1);
st.addExpAndSp(25160, 2525);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
}
else if (transform == 0)
{
@@ -102,8 +99,7 @@ public class Q10273_GoodDayToFly 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;
@@ -118,20 +114,20 @@ public class Q10273_GoodDayToFly extends Quest
break;
case "32557-09.htm":
st.set("transform", "1");
- SkillTable.getInstance().getInfo(5982, 1).getEffects(player, player);
+ AuraBirdFalcon.getEffects(player, player);
break;
case "32557-10.htm":
st.set("transform", "2");
- SkillTable.getInstance().getInfo(5983, 1).getEffects(player, player);
+ AuraBirdOwl.getEffects(player, player);
break;
case "32557-13.htm":
if (st.getInt("transform") == 1)
{
- SkillTable.getInstance().getInfo(5982, 1).getEffects(player, player);
+ AuraBirdFalcon.getEffects(player, player);
}
else if (st.getInt("transform") == 2)
{
- SkillTable.getInstance().getInfo(5983, 1).getEffects(player, player);
+ AuraBirdOwl.getEffects(player, player);
}
break;
}
@@ -141,20 +137,13 @@ public class Q10273_GoodDayToFly extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isPet)
{
- QuestState st = killer.getQuestState(qn);
-
- if (st == null)
- {
- return null;
- }
-
- if (!st.isStarted())
+ final QuestState st = killer.getQuestState(qn);
+ if ((st == null) || !st.isStarted())
{
return null;
}
final long count = st.getQuestItemsCount(MARK);
-
if ((st.getInt("cond") == 1) && (count < 5))
{
st.giveItems(MARK, 1);
@@ -176,10 +165,8 @@ public class Q10273_GoodDayToFly extends Quest
super(questId, name, descr);
addStartNpc(LEKON);
addTalkId(LEKON);
- for (int i : MOBS)
- {
- addKillId(i);
- }
+ addKillId(MOBS);
+
questItemIds = new int[]
{
MARK
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
index 7fea96430fdd391bb2819a2a2304bea2fa42135a..ac24b333087f3dd3899f73347150a1872f508830 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
@@ -24,7 +24,8 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.util.Util;
/**
- * Collecting in the Air (10274). Original Jython script by Kerberos v1.0 on 2009/04/26
+ * Collecting in the Air (10274).<br>
+ * Original Jython script by Kerberos v1.0 on 2009/04/26
* @author nonom
*/
public class Q10274_CollectingInTheAir extends Quest
@@ -49,8 +50,7 @@ public class Q10274_CollectingInTheAir extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
@@ -65,14 +65,7 @@ public class Q10274_CollectingInTheAir extends Quest
QuestState qs = player.getQuestState("10273_GoodDayToFly");
if (qs != null)
{
- if (qs.isCompleted() && (player.getLevel() >= 75))
- {
- htmltext = "32557-01.htm";
- }
- else
- {
- htmltext = "32557-00.htm";
- }
+ htmltext = (qs.isCompleted() && (player.getLevel() >= 75)) ? "32557-01.htm" : "32557-00.htm";
}
else
{
@@ -85,9 +78,8 @@ public class Q10274_CollectingInTheAir extends Quest
htmltext = "32557-05.htm";
st.giveItems(13728, 1);
st.addExpAndSp(25160, 2525);
- st.unset("transform");
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
}
else
{
@@ -102,8 +94,7 @@ public class Q10274_CollectingInTheAir 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;
@@ -122,22 +113,8 @@ public class Q10274_CollectingInTheAir extends Quest
@Override
public String onSkillSee(L2Npc npc, L2PcInstance caster, L2Skill skill, L2Object[] targets, boolean isPet)
{
- super.onSkillSee(npc, caster, skill, targets, isPet);
-
- QuestState st = caster.getQuestState(qn);
- int npcId = npc.getNpcId();
-
- if (st == null)
- {
- return null;
- }
-
- if (!st.isStarted())
- {
- return null;
- }
-
- if (!Util.contains(MOBS, npcId))
+ final QuestState st = caster.getQuestState(qn);
+ if ((st == null) || !st.isStarted())
{
return null;
}
@@ -145,7 +122,7 @@ public class Q10274_CollectingInTheAir extends Quest
if (Util.contains(targets, npc) && (st.getInt("cond") == 1) && (skill.getId() == 2630))
{
st.playSound("ItemSound.quest_itemget");
-
+ final int npcId = npc.getNpcId();
// Red Star Stones
if ((npcId >= 18684) && (npcId <= 18686))
{
@@ -163,7 +140,7 @@ public class Q10274_CollectingInTheAir extends Quest
}
npc.doDie(caster);
}
- return null;
+ return super.onSkillSee(npc, caster, skill, targets, isPet);
}
public Q10274_CollectingInTheAir(int questId, String name, String descr)
@@ -173,15 +150,7 @@ public class Q10274_CollectingInTheAir extends Quest
addStartNpc(LEKON);
addTalkId(LEKON);
- addSkillSeeId(18684);
- addSkillSeeId(18685);
- addSkillSeeId(18686);
- addSkillSeeId(18687);
- addSkillSeeId(18688);
- addSkillSeeId(18689);
- addSkillSeeId(18690);
- addSkillSeeId(18691);
- addSkillSeeId(18692);
+ addSkillSeeId(MOBS);
questItemIds = new int[]
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
index 6a0cf21b5b35a9595cbc8410cbfe87cbc6a14457..a938e32ea21937aad7bec61a04096c5abbfeb8c2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
@@ -16,6 +16,7 @@ package quests.Q10275_ContainingTheAttributePower;
import com.l2jserver.gameserver.datatables.SkillTable;
import com.l2jserver.gameserver.model.Elementals;
+import com.l2jserver.gameserver.model.L2Skill;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.itemcontainer.Inventory;
@@ -25,7 +26,8 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.util.Util;
/**
- * Containing the Attribute Power (10275). Original jython script by Kerberos v1.0 on 2009/05/03
+ * Containing the Attribute Power (10275).<br>
+ * Original jython script by Kerberos v1.0 on 2009/05/03
* @author nonom
*/
public class Q10275_ContainingTheAttributePower extends Quest
@@ -47,20 +49,22 @@ public class Q10275_ContainingTheAttributePower extends Quest
private static final int SOULPIECEWATER = 13861;
private static final int SOULPIECEAIR = 13862;
+ // Skills
+ private static final L2Skill BlessingOfFire = SkillTable.getInstance().getInfo(2635, 1);
+ private static final L2Skill BlessingOfEarth = SkillTable.getInstance().getInfo(2636, 1);
+
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
- int npcId = npc.getNpcId();
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
}
- int cond = st.getInt("cond");
-
+ final int npcId = npc.getNpcId();
+ final int cond = st.getInt("cond");
switch (st.getState())
{
case State.COMPLETED:
@@ -168,8 +172,7 @@ public class Q10275_ContainingTheAttributePower 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;
@@ -202,7 +205,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
st.playSound("ItemSound.quest_middle");
break;
case "32325-06.htm":
- if (st.getQuestItemsCount(YINSWORD) > 0)
+ if (st.hasQuestItems(YINSWORD))
{
st.takeItems(YINSWORD, 1);
htmltext = "32325-07.htm";
@@ -210,7 +213,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
st.giveItems(YINSWORD, 1, Elementals.FIRE, 10);
break;
case "32326-06.htm":
- if (st.getQuestItemsCount(YANGSWORD) > 0)
+ if (st.hasQuestItems(YANGSWORD))
{
st.takeItems(YANGSWORD, 1);
htmltext = "32326-07.htm";
@@ -219,13 +222,13 @@ public class Q10275_ContainingTheAttributePower extends Quest
break;
case "32325-09.htm":
st.set("cond", "5");
- SkillTable.getInstance().getInfo(2635, 1).getEffects(player, player);
+ BlessingOfFire.getEffects(player, player);
st.giveItems(YINSWORD, 1, Elementals.FIRE, 10);
st.playSound("ItemSound.quest_middle");
break;
case "32326-09.htm":
st.set("cond", "10");
- SkillTable.getInstance().getInfo(2636, 1).getEffects(player, player);
+ BlessingOfEarth.getEffects(player, player);
st.giveItems(YANGSWORD, 1, Elementals.EARTH, 10);
st.playSound("ItemSound.quest_middle");
break;
@@ -235,8 +238,8 @@ public class Q10275_ContainingTheAttributePower extends Quest
{
st.giveItems(10520 + Integer.valueOf(event), 2);
st.addExpAndSp(202160, 20375);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
htmltext = Integer.toString(npc.getNpcId()) + "-1" + event + ".htm";
}
@@ -247,16 +250,21 @@ public class Q10275_ContainingTheAttributePower extends Quest
public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
{
final QuestState st = player.getQuestState(qn);
+ if (st == null)
+ {
+ return null;
+ }
+ final int cond = st.getInt("cond");
switch (npc.getNpcId())
{
case AIR:
- if ((st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == YANGSWORD) && ((st.getInt("cond") == 8) || (st.getInt("cond") == 10)) && (st.getQuestItemsCount(SOULPIECEAIR) < 6) && (st.getRandom(100) < 30))
+ if ((st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == YANGSWORD) && ((cond == 8) || (cond == 10)) && (st.getQuestItemsCount(SOULPIECEAIR) < 6) && (st.getRandom(100) < 30))
{
st.giveItems(SOULPIECEAIR, 1);
if (st.getQuestItemsCount(SOULPIECEAIR) >= 6)
{
- st.set("cond", Integer.toString(st.getInt("cond") + 1));
+ st.set("cond", Integer.toString(cond + 1));
st.playSound("ItemSound.quest_middle");
}
else
@@ -266,13 +274,12 @@ public class Q10275_ContainingTheAttributePower extends Quest
}
break;
case WATER:
- int cond = st.getInt("cond");
if ((st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == YINSWORD) && ((cond >= 3) || (cond <= 5)) && (st.getQuestItemsCount(SOULPIECEWATER) < 6) && (st.getRandom(100) < 30))
{
st.giveItems(SOULPIECEWATER, 1);
if (st.getQuestItemsCount(SOULPIECEWATER) >= 6)
{
- st.set("cond", Integer.toString(st.getInt("cond") + 1));
+ st.set("cond", Integer.toString(cond + 1));
st.playSound("ItemSound.quest_middle");
}
else
@@ -290,16 +297,11 @@ public class Q10275_ContainingTheAttributePower extends Quest
{
super(questId, name, descr);
- addStartNpc(HOLLY);
- addStartNpc(WEBER);
+ addStartNpc(HOLLY, WEBER);
- addTalkId(HOLLY);
- addTalkId(WEBER);
- addTalkId(YIN);
- addTalkId(YANG);
+ addTalkId(HOLLY, WEBER, YIN, YANG);
- addKillId(AIR);
- addKillId(WATER);
+ addKillId(AIR, WATER);
questItemIds = new int[]
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
index 6413da6aeeabee5d3446d431b2aca2e788eb857e..fcc43d012de1a90abf17490f2e53be390521b069 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
@@ -24,7 +24,8 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.util.Rnd;
/**
- * Mutated Kaneus - Gludio (10276). Original Jython script by Gnacik on 2010-06-29
+ * Mutated Kaneus - Gludio (10276).<br>
+ * Original Jython script by Gnacik on 2010-06-29
* @author nonom
*/
public class Q10276_MutatedKaneusGludio extends Quest
@@ -45,8 +46,7 @@ public class Q10276_MutatedKaneusGludio extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
@@ -59,15 +59,11 @@ public class Q10276_MutatedKaneusGludio extends Quest
{
htmltext = "30332-06.htm";
}
- else if (st.isCreated() && (player.getLevel() >= 18))
- {
- htmltext = "30332-01.htm";
- }
- else if (st.isCreated() && (player.getLevel() < 18))
+ else if (st.isCreated())
{
- htmltext = "30332-00.htm";
+ htmltext = (player.getLevel() >= 18) ? "30332-01.htm" : "30332-00.htm";
}
- else if ((st.getQuestItemsCount(TISSUE_TK) > 0) && (st.getQuestItemsCount(TISSUE_OA) > 0))
+ else if (st.hasQuestItems(TISSUE_TK) && st.hasQuestItems(TISSUE_OA))
{
htmltext = "30332-05.htm";
}
@@ -79,9 +75,9 @@ public class Q10276_MutatedKaneusGludio extends Quest
case ROHMER:
if (st.isCompleted())
{
- htmltext = Quest.getAlreadyCompletedMsg(player);
+ htmltext = getAlreadyCompletedMsg(player);
}
- else if ((st.getQuestItemsCount(TISSUE_TK) > 0) && (st.getQuestItemsCount(TISSUE_OA) > 0))
+ else if (st.hasQuestItems(TISSUE_TK) && st.hasQuestItems(TISSUE_OA))
{
htmltext = "30344-02.htm";
}
@@ -98,8 +94,7 @@ public class Q10276_MutatedKaneusGludio 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;
@@ -114,11 +109,10 @@ public class Q10276_MutatedKaneusGludio extends Quest
break;
case "30344-03.htm":
st.rewardItems(57, 8500);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
break;
}
-
return htmltext;
}
@@ -126,76 +120,62 @@ public class Q10276_MutatedKaneusGludio extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isPet)
{
QuestState st = killer.getQuestState(qn);
-
if (st == null)
{
return null;
}
+ final int npcId = npc.getNpcId();
if (killer.getParty() != null)
{
- FastList<QuestState> PartyMembers = new FastList<QuestState>();
-
+ final FastList<QuestState> PartyMembers = new FastList<QuestState>();
for (L2PcInstance member : killer.getParty().getPartyMembers())
{
st = member.getQuestState(qn);
- if ((st != null) && st.isStarted() && (st.getInt("cond") == 1))
+ if ((st != null) && st.isStarted() && (st.getInt("cond") == 1) && (((npcId == TOMLAN_KAMOS) && !st.hasQuestItems(TISSUE_TK)) || ((npcId == TISSUE_OA) && !st.hasQuestItems(TISSUE_OA))))
{
- if ((npc.getNpcId() == TOMLAN_KAMOS) && (st.getQuestItemsCount(TISSUE_TK) == 0))
- {
- PartyMembers.add(st);
- }
- else if ((npc.getNpcId() == TISSUE_OA) && (st.getQuestItemsCount(TISSUE_OA) == 0))
- {
- PartyMembers.add(st);
- }
+ PartyMembers.add(st);
}
}
- if (PartyMembers.isEmpty())
- {
- return null;
- }
-
- QuestState winnerst = PartyMembers.get(Rnd.get(PartyMembers.size()));
-
- if ((npc.getNpcId() == TOMLAN_KAMOS) && (winnerst.getQuestItemsCount(TISSUE_TK) == 0))
+ if (!PartyMembers.isEmpty())
{
- winnerst.giveItems(TISSUE_TK, 1);
- winnerst.playSound("ItemSound.quest_itemget");
- }
- else if ((npc.getNpcId() == OL_ARIOSH) && (winnerst.getQuestItemsCount(TISSUE_OA) == 0))
- {
- winnerst.giveItems(TISSUE_OA, 1);
- winnerst.playSound("ItemSound.quest_itemget");
+ rewardItem(npcId, PartyMembers.get(Rnd.get(PartyMembers.size())));
}
}
else
{
- if ((npc.getNpcId() == TOMLAN_KAMOS) && (st.getQuestItemsCount(TISSUE_TK) == 0))
- {
- st.giveItems(TISSUE_TK, 1);
- st.playSound("ItemSound.quest_itemget");
- }
- else if ((npc.getNpcId() == OL_ARIOSH) && (st.getQuestItemsCount(TISSUE_OA) == 0))
- {
- st.giveItems(TISSUE_OA, 1);
- st.playSound("ItemSound.quest_itemget");
- }
+ rewardItem(npcId, st);
}
return null;
}
+ /**
+ * @param npcId the killed monster Id.
+ * @param st the quest state of the killer or party member.
+ */
+ private final void rewardItem(int npcId, QuestState st)
+ {
+ if ((npcId == TOMLAN_KAMOS) && !st.hasQuestItems(TISSUE_TK))
+ {
+ st.giveItems(TISSUE_TK, 1);
+ st.playSound("ItemSound.quest_itemget");
+ }
+ else if ((npcId == OL_ARIOSH) && !st.hasQuestItems(TISSUE_OA))
+ {
+ st.giveItems(TISSUE_OA, 1);
+ st.playSound("ItemSound.quest_itemget");
+ }
+ }
+
public Q10276_MutatedKaneusGludio(int questId, String name, String descr)
{
super(questId, name, descr);
addStartNpc(BATHIS);
- addTalkId(BATHIS);
- addTalkId(ROHMER);
+ addTalkId(BATHIS, ROHMER);
- addKillId(TOMLAN_KAMOS);
- addKillId(OL_ARIOSH);
+ addKillId(TOMLAN_KAMOS, OL_ARIOSH);
questItemIds = new int[]
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
index 6c8131a8827f19ddfaf27f80422de418b25d7301..998c46c6578b486295ce8b2c1598d8cad8ff2f15 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
@@ -45,8 +45,7 @@ public class Q10277_MutatedKaneusDion extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
@@ -59,15 +58,11 @@ public class Q10277_MutatedKaneusDion extends Quest
{
htmltext = "30071-06.htm";
}
- else if (st.isCreated() && (player.getLevel() >= 28))
- {
- htmltext = "30071-01.htm";
- }
- else if (st.isCreated() && (player.getLevel() < 28))
+ else if (st.isCreated())
{
- htmltext = "30371-00.htm";
+ htmltext = (player.getLevel() >= 28) ? "30071-01.htm" : "30371-00.htm";
}
- else if ((st.getQuestItemsCount(TISSUE_CH) > 0) && (st.getQuestItemsCount(TISSUE_SF) > 0))
+ else if (st.hasQuestItems(TISSUE_CH) && st.hasQuestItems(TISSUE_SF))
{
htmltext = "30371-05.htm";
}
@@ -79,7 +74,7 @@ public class Q10277_MutatedKaneusDion extends Quest
case MIRIEN:
if (st.isCompleted())
{
- htmltext = Quest.getAlreadyCompletedMsg(player);
+ htmltext = getAlreadyCompletedMsg(player);
}
else if ((st.getQuestItemsCount(TISSUE_CH) > 0) && (st.getQuestItemsCount(TISSUE_SF) > 0))
{
@@ -98,8 +93,7 @@ public class Q10277_MutatedKaneusDion 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;
@@ -114,8 +108,8 @@ public class Q10277_MutatedKaneusDion extends Quest
break;
case "30461-03.htm":
st.rewardItems(57, 20000);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
break;
}
return htmltext;
@@ -125,76 +119,62 @@ public class Q10277_MutatedKaneusDion extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isPet)
{
QuestState st = killer.getQuestState(qn);
-
if (st == null)
{
return null;
}
+ final int npcId = npc.getNpcId();
if (killer.getParty() != null)
{
- FastList<QuestState> PartyMembers = new FastList<QuestState>();
-
+ final FastList<QuestState> PartyMembers = new FastList<QuestState>();
for (L2PcInstance member : killer.getParty().getPartyMembers())
{
st = member.getQuestState(qn);
- if ((st != null) && st.isStarted() && (st.getInt("cond") == 1))
+ if (((st != null) && st.isStarted() && (st.getInt("cond") == 1) && ((npc.getNpcId() == CRIMSON_HATU) && !st.hasQuestItems(TISSUE_CH))) || ((npc.getNpcId() == SEER_FLOUROS) && !st.hasQuestItems(TISSUE_SF)))
{
- if ((npc.getNpcId() == CRIMSON_HATU) && (st.getQuestItemsCount(TISSUE_CH) == 0))
- {
- PartyMembers.add(st);
- }
- else if ((npc.getNpcId() == SEER_FLOUROS) && (st.getQuestItemsCount(TISSUE_SF) == 0))
- {
- PartyMembers.add(st);
- }
+ PartyMembers.add(st);
}
}
- if (PartyMembers.isEmpty())
- {
- return null;
- }
-
- QuestState winnerst = PartyMembers.get(Rnd.get(PartyMembers.size()));
-
- if ((npc.getNpcId() == CRIMSON_HATU) && (winnerst.getQuestItemsCount(TISSUE_CH) == 0))
+ if (!PartyMembers.isEmpty())
{
- winnerst.giveItems(TISSUE_CH, 1);
- winnerst.playSound("ItemSound.quest_itemget");
- }
- else if ((npc.getNpcId() == SEER_FLOUROS) && (winnerst.getQuestItemsCount(TISSUE_SF) == 0))
- {
- winnerst.giveItems(TISSUE_SF, 1);
- winnerst.playSound("ItemSound.quest_itemget");
+ rewardItem(npcId, PartyMembers.get(Rnd.get(PartyMembers.size())));
}
}
else
{
- if ((npc.getNpcId() == CRIMSON_HATU) && (st.getQuestItemsCount(TISSUE_CH) == 0))
- {
- st.giveItems(TISSUE_CH, 1);
- st.playSound("ItemSound.quest_itemget");
- }
- else if ((npc.getNpcId() == SEER_FLOUROS) && (st.getQuestItemsCount(TISSUE_SF) == 0))
- {
- st.giveItems(TISSUE_SF, 1);
- st.playSound("ItemSound.quest_itemget");
- }
+ rewardItem(npcId, st);
}
return null;
}
+ /**
+ * @param npcId the killed monster Id.
+ * @param st the quest state of the killer or party member.
+ */
+ private final void rewardItem(int npcId, QuestState st)
+ {
+ if ((npcId == CRIMSON_HATU) && !st.hasQuestItems(TISSUE_CH))
+ {
+ st.giveItems(TISSUE_CH, 1);
+ st.playSound("ItemSound.quest_itemget");
+ }
+ else if ((npcId == SEER_FLOUROS) && !st.hasQuestItems(TISSUE_SF))
+ {
+ st.giveItems(TISSUE_SF, 1);
+ st.playSound("ItemSound.quest_itemget");
+ }
+ }
+
public Q10277_MutatedKaneusDion(int questId, String name, String descr)
{
super(questId, name, descr);
addStartNpc(LUKAS);
- addTalkId(LUKAS);
- addTalkId(MIRIEN);
+ addTalkId(LUKAS, MIRIEN);
- addKillId(CRIMSON_HATU);
- addKillId(SEER_FLOUROS);
+ addKillId(CRIMSON_HATU, SEER_FLOUROS);
questItemIds = new int[]
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
index 7a1f33b4bc71c7907e1c7b9d0c372a37aeb7c37a..03f9e66ce253e10fd82584ea9aef8c6ffc280d6a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
@@ -24,7 +24,8 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.util.Rnd;
/**
- * Mutated Kaneus - Heine (10278). Original Jython script by Gnacik on 2010-06-29
+ * Mutated Kaneus - Heine (10278).<br>
+ * Original Jython script by Gnacik on 2010-06-29
* @author nonom
*/
public class Q10278_MutatedKaneusHeine extends Quest
@@ -45,8 +46,7 @@ public class Q10278_MutatedKaneusHeine extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
@@ -59,15 +59,11 @@ public class Q10278_MutatedKaneusHeine extends Quest
{
htmltext = "30916-06.htm";
}
- else if (st.isCreated() && (player.getLevel() >= 38))
- {
- htmltext = "30916-01.htm";
- }
- else if (st.isCreated() && (player.getLevel() < 38))
+ else if (st.isCreated())
{
- htmltext = "30916-00.htm";
+ htmltext = (player.getLevel() >= 38) ? "30916-01.htm" : "30916-00.htm";
}
- else if ((st.getQuestItemsCount(TISSUE_BO) > 0) && (st.getQuestItemsCount(TISSUE_WB) > 0))
+ else if (st.hasQuestItems(TISSUE_BO) && st.hasQuestItems(TISSUE_WB))
{
htmltext = "30916-05.htm";
}
@@ -79,9 +75,9 @@ public class Q10278_MutatedKaneusHeine extends Quest
case MINEVIA:
if (st.isCompleted())
{
- htmltext = Quest.getAlreadyCompletedMsg(player);
+ htmltext = getAlreadyCompletedMsg(player);
}
- else if ((st.getQuestItemsCount(TISSUE_BO) > 0) && (st.getQuestItemsCount(TISSUE_WB) > 0))
+ else if (st.hasQuestItems(TISSUE_BO) && !st.hasQuestItems(TISSUE_WB))
{
htmltext = "30907-02.htm";
}
@@ -98,8 +94,7 @@ public class Q10278_MutatedKaneusHeine 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;
@@ -114,8 +109,8 @@ public class Q10278_MutatedKaneusHeine extends Quest
break;
case "30907-03.htm":
st.rewardItems(57, 50000);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
break;
}
return htmltext;
@@ -125,66 +120,54 @@ public class Q10278_MutatedKaneusHeine extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isPet)
{
QuestState st = killer.getQuestState(qn);
-
if (st == null)
{
return null;
}
+ final int npcId = npc.getNpcId();
if (killer.getParty() != null)
{
- FastList<QuestState> PartyMembers = new FastList<QuestState>();
-
+ final FastList<QuestState> PartyMembers = new FastList<QuestState>();
for (L2PcInstance member : killer.getParty().getPartyMembers())
{
st = member.getQuestState(qn);
- if ((st != null) && st.isStarted() && (st.getInt("cond") == 1))
+ if ((st != null) && st.isStarted() && (st.getInt("cond") == 1) && (((npcId == BLADE_OTIS) && !st.hasQuestItems(TISSUE_BO)) || ((npcId == WEIRD_BUNEI) && !st.hasQuestItems(TISSUE_WB))))
{
- if ((npc.getNpcId() == BLADE_OTIS) && (st.getQuestItemsCount(TISSUE_BO) == 0))
- {
- PartyMembers.add(st);
- }
- else if ((npc.getNpcId() == WEIRD_BUNEI) && (st.getQuestItemsCount(TISSUE_WB) == 0))
- {
- PartyMembers.add(st);
- }
+ PartyMembers.add(st);
}
}
- if (PartyMembers.isEmpty())
- {
- return null;
- }
-
- QuestState winnerst = PartyMembers.get(Rnd.get(PartyMembers.size()));
-
- if ((npc.getNpcId() == BLADE_OTIS) && (winnerst.getQuestItemsCount(TISSUE_BO) == 0))
+ if (!PartyMembers.isEmpty())
{
- winnerst.giveItems(TISSUE_BO, 1);
- winnerst.playSound("ItemSound.quest_itemget");
- }
- else if ((npc.getNpcId() == WEIRD_BUNEI) && (winnerst.getQuestItemsCount(TISSUE_WB) == 0))
- {
- winnerst.giveItems(TISSUE_WB, 1);
- winnerst.playSound("ItemSound.quest_itemget");
+ rewardItem(npcId, PartyMembers.get(Rnd.get(PartyMembers.size())));
}
}
else
{
- if ((npc.getNpcId() == BLADE_OTIS) && (st.getQuestItemsCount(TISSUE_BO) == 0))
- {
- st.giveItems(TISSUE_BO, 1);
- st.playSound("ItemSound.quest_itemget");
- }
- else if ((npc.getNpcId() == WEIRD_BUNEI) && (st.getQuestItemsCount(TISSUE_WB) == 0))
- {
- st.giveItems(TISSUE_WB, 1);
- st.playSound("ItemSound.quest_itemget");
- }
+ rewardItem(npcId, st);
}
return null;
}
+ /**
+ * @param npcId the killed monster Id.
+ * @param st the quest state of the killer or party member.
+ */
+ private final void rewardItem(int npcId, QuestState st)
+ {
+ if ((npcId == BLADE_OTIS) && !st.hasQuestItems(TISSUE_BO))
+ {
+ st.giveItems(TISSUE_BO, 1);
+ st.playSound("ItemSound.quest_itemget");
+ }
+ else if ((npcId == WEIRD_BUNEI) && !st.hasQuestItems(TISSUE_WB))
+ {
+ st.giveItems(TISSUE_WB, 1);
+ st.playSound("ItemSound.quest_itemget");
+ }
+ }
+
public Q10278_MutatedKaneusHeine(int questId, String name, String descr)
{
super(questId, name, descr);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
index 2631c7e25e5fefc715ba7c77f51c2ce5cc268e66..8232bf6925224f11d01c3bc08d5ba50cb73b41f8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
@@ -24,7 +24,8 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.util.Rnd;
/**
- * Mutated Kaneus - Oren (10279). Original Jython script by Gnacik on 2010-06-29
+ * Mutated Kaneus - Oren (10279).<br>
+ * Original Jython script by Gnacik on 2010-06-29
* @author nonom
*/
public class Q10279_MutatedKaneusOren extends Quest
@@ -45,8 +46,7 @@ public class Q10279_MutatedKaneusOren extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
@@ -59,15 +59,11 @@ public class Q10279_MutatedKaneusOren extends Quest
{
htmltext = "30196-06.htm";
}
- else if (st.isCreated() && (player.getLevel() >= 48))
- {
- htmltext = "30196-01.htm";
- }
- else if (st.isCreated() && (player.getLevel() < 48))
+ else if (st.isCreated())
{
- htmltext = "30196-00.htm";
+ htmltext = (player.getLevel() >= 48) ? "30196-01.htm" : "30196-00.htm";
}
- else if ((st.getQuestItemsCount(TISSUE_KA) > 0) && (st.getQuestItemsCount(TISSUE_KM) > 0))
+ else if (st.hasQuestItems(TISSUE_KA) && st.hasQuestItems(TISSUE_KM))
{
htmltext = "30196-05.htm";
}
@@ -79,9 +75,9 @@ public class Q10279_MutatedKaneusOren extends Quest
case ROVIA:
if (st.isCompleted())
{
- htmltext = Quest.getAlreadyCompletedMsg(player);
+ htmltext = getAlreadyCompletedMsg(player);
}
- else if ((st.getQuestItemsCount(TISSUE_KA) > 0) && (st.getQuestItemsCount(TISSUE_KM) > 0))
+ else if (st.hasQuestItems(TISSUE_KA) && st.hasQuestItems(TISSUE_KM))
{
htmltext = "30189-02.htm";
}
@@ -98,8 +94,7 @@ public class Q10279_MutatedKaneusOren 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;
@@ -114,8 +109,8 @@ public class Q10279_MutatedKaneusOren extends Quest
break;
case "30189-03.htm":
st.rewardItems(57, 100000);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
break;
}
return htmltext;
@@ -125,76 +120,69 @@ public class Q10279_MutatedKaneusOren extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isPet)
{
QuestState st = killer.getQuestState(qn);
-
if (st == null)
{
return null;
}
+ final int npcId = npc.getNpcId();
if (killer.getParty() != null)
{
- FastList<QuestState> PartyMembers = new FastList<QuestState>();
-
+ final FastList<QuestState> PartyMembers = new FastList<QuestState>();
for (L2PcInstance member : killer.getParty().getPartyMembers())
{
st = member.getQuestState(qn);
if ((st != null) && st.isStarted() && (st.getInt("cond") == 1))
{
- if ((npc.getNpcId() == KAIM_ABIGORE) && (st.getQuestItemsCount(TISSUE_KA) == 0))
+ if ((npcId == KAIM_ABIGORE) && !st.hasQuestItems(TISSUE_KA))
{
PartyMembers.add(st);
}
- else if ((npc.getNpcId() == KNIGHT_MONTAGNAR) && (st.getQuestItemsCount(TISSUE_KM) == 0))
+ else if ((npcId == KNIGHT_MONTAGNAR) && !st.hasQuestItems(TISSUE_KM))
{
PartyMembers.add(st);
}
}
}
- if (PartyMembers.isEmpty())
- {
- return null;
- }
-
- QuestState winnerst = PartyMembers.get(Rnd.get(PartyMembers.size()));
-
- if ((npc.getNpcId() == KAIM_ABIGORE) && (winnerst.getQuestItemsCount(TISSUE_KA) == 0))
+ if (!PartyMembers.isEmpty())
{
- winnerst.giveItems(TISSUE_KA, 1);
- winnerst.playSound("ItemSound.quest_itemget");
- }
- else if ((npc.getNpcId() == KNIGHT_MONTAGNAR) && (winnerst.getQuestItemsCount(TISSUE_KM) == 0))
- {
- winnerst.giveItems(TISSUE_KM, 1);
- winnerst.playSound("ItemSound.quest_itemget");
+ rewardItem(npcId, PartyMembers.get(Rnd.get(PartyMembers.size())));
}
}
else
{
- if ((npc.getNpcId() == KAIM_ABIGORE) && (st.getQuestItemsCount(TISSUE_KA) == 0))
- {
- st.giveItems(TISSUE_KA, 1);
- st.playSound("ItemSound.quest_itemget");
- }
- else if ((npc.getNpcId() == KNIGHT_MONTAGNAR) && (st.getQuestItemsCount(TISSUE_KM) == 0))
- {
- st.giveItems(TISSUE_KM, 1);
- st.playSound("ItemSound.quest_itemget");
- }
+ rewardItem(npcId, st);
}
return null;
}
+ /**
+ * @param npcId the killed monster Id.
+ * @param st the quest state of the killer or party member.
+ */
+ private final void rewardItem(int npcId, QuestState st)
+ {
+ if ((npcId == KAIM_ABIGORE) && !st.hasQuestItems(TISSUE_KA))
+ {
+ st.giveItems(TISSUE_KA, 1);
+ st.playSound("ItemSound.quest_itemget");
+ }
+ else if ((npcId == KNIGHT_MONTAGNAR) && !st.hasQuestItems(TISSUE_KM))
+ {
+ st.giveItems(TISSUE_KM, 1);
+ st.playSound("ItemSound.quest_itemget");
+ }
+ }
+
public Q10279_MutatedKaneusOren(int questId, String name, String descr)
{
super(questId, name, descr);
addStartNpc(MOUEN);
- addTalkId(MOUEN);
- addTalkId(ROVIA);
+ addTalkId(MOUEN, ROVIA);
- addKillId(KAIM_ABIGORE);
- addKillId(KNIGHT_MONTAGNAR);
+ addKillId(KAIM_ABIGORE, KNIGHT_MONTAGNAR);
questItemIds = new int[]
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
index d668642f674194d0e1c0b5ac0a8bfb43014fdc8c..f4d604e95e87b2e9872756420660b054849cc077 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
@@ -24,7 +24,8 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.util.Rnd;
/**
- * Mutated Kaneus - Schuttgart (10280). Original Jython script by Gnacik on 2010-06-29
+ * Mutated Kaneus - Schuttgart (10280).<br>
+ * Original Jython script by Gnacik on 2010-06-29
* @author nonom
*/
public class Q10280_MutatedKaneusSchuttgart extends Quest
@@ -45,8 +46,7 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
@@ -59,15 +59,11 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest
{
htmltext = "31981-06.htm";
}
- else if (st.isCreated() && (player.getLevel() >= 58))
- {
- htmltext = "31981-01.htm";
- }
- else if (st.isCreated() && (player.getLevel() < 58))
+ else if (st.isCreated())
{
- htmltext = "31981-00.htm";
+ htmltext = (player.getLevel() >= 58) ? "31981-01.htm" : "31981-00.htm";
}
- else if ((st.getQuestItemsCount(TISSUE_VS) > 0) && (st.getQuestItemsCount(TISSUE_KB) > 0))
+ else if (st.hasQuestItems(TISSUE_VS) && st.hasQuestItems(TISSUE_KB))
{
htmltext = "31981-05.htm";
}
@@ -79,9 +75,9 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest
case ATRAXIA:
if (st.isCompleted())
{
- htmltext = Quest.getAlreadyCompletedMsg(player);
+ htmltext = getAlreadyCompletedMsg(player);
}
- else if ((st.getQuestItemsCount(TISSUE_VS) > 0) && (st.getQuestItemsCount(TISSUE_KB) > 0))
+ else if (st.hasQuestItems(TISSUE_VS) && st.hasQuestItems(TISSUE_KB))
{
htmltext = "31972-02.htm";
}
@@ -98,11 +94,10 @@ public class Q10280_MutatedKaneusSchuttgart 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;
+ return getNoQuestMsg(player);
}
switch (event)
@@ -114,8 +109,8 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest
break;
case "31972-03.htm":
st.rewardItems(57, 210000);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
break;
}
return htmltext;
@@ -125,79 +120,69 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isPet)
{
QuestState st = killer.getQuestState(qn);
-
if (st == null)
{
return null;
}
+ final int npcId = npc.getNpcId();
if (killer.getParty() != null)
{
- FastList<QuestState> PartyMembers = new FastList<>();
-
+ final FastList<QuestState> PartyMembers = new FastList<>();
for (L2PcInstance member : killer.getParty().getPartyMembers())
{
st = member.getQuestState(qn);
if ((st != null) && st.isStarted() && (st.getInt("cond") == 1))
{
- if ((npc.getNpcId() == VENOMOUS_STORACE) && (st.getQuestItemsCount(TISSUE_VS) == 0))
+ if ((npc.getNpcId() == VENOMOUS_STORACE) && !st.hasQuestItems(TISSUE_VS))
{
PartyMembers.add(st);
}
- else if ((npc.getNpcId() == KEL_BILETTE) && (st.getQuestItemsCount(TISSUE_KB) == 0))
+ else if ((npc.getNpcId() == KEL_BILETTE) && !st.hasQuestItems(TISSUE_KB))
{
PartyMembers.add(st);
}
}
}
- if (PartyMembers.isEmpty())
- {
- return null;
- }
-
- QuestState winnerst = PartyMembers.get(Rnd.get(PartyMembers.size()));
-
- if ((npc.getNpcId() == VENOMOUS_STORACE) && (winnerst.getQuestItemsCount(TISSUE_VS) == 0))
- {
- winnerst.giveItems(TISSUE_VS, 1);
- winnerst.playSound("ItemSound.quest_itemget");
- }
- else if ((npc.getNpcId() == KEL_BILETTE) && (winnerst.getQuestItemsCount(TISSUE_KB) == 0))
+ if (!PartyMembers.isEmpty())
{
- winnerst.giveItems(TISSUE_KB, 1);
- winnerst.playSound("ItemSound.quest_itemget");
+ rewardItem(npcId, PartyMembers.get(Rnd.get(PartyMembers.size())));
}
-
}
else
{
-
- if ((npc.getNpcId() == VENOMOUS_STORACE) && (st.getQuestItemsCount(TISSUE_VS) == 0))
- {
- st.giveItems(TISSUE_VS, 1);
- st.playSound("ItemSound.quest_itemget");
- }
- else if ((npc.getNpcId() == KEL_BILETTE) && (st.getQuestItemsCount(TISSUE_KB) == 0))
- {
- st.giveItems(TISSUE_KB, 1);
- st.playSound("ItemSound.quest_itemget");
- }
+ rewardItem(npcId, st);
}
-
return null;
}
+ /**
+ * @param npcId the killed monster Id.
+ * @param st the quest state of the killer or party member.
+ */
+ private final void rewardItem(int npcId, QuestState st)
+ {
+ if ((npcId == VENOMOUS_STORACE) && !st.hasQuestItems(TISSUE_VS))
+ {
+ st.giveItems(TISSUE_VS, 1);
+ st.playSound("ItemSound.quest_itemget");
+ }
+ else if ((npcId == KEL_BILETTE) && !st.hasQuestItems(TISSUE_KB))
+ {
+ st.giveItems(TISSUE_KB, 1);
+ st.playSound("ItemSound.quest_itemget");
+ }
+ }
+
public Q10280_MutatedKaneusSchuttgart(int questId, String name, String descr)
{
super(questId, name, descr);
addStartNpc(VISHOTSKY);
- addTalkId(VISHOTSKY);
- addTalkId(ATRAXIA);
+ addTalkId(VISHOTSKY, ATRAXIA);
- addKillId(VENOMOUS_STORACE);
- addKillId(KEL_BILETTE);
+ addKillId(VENOMOUS_STORACE, KEL_BILETTE);
questItemIds = new int[]
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
index 92446323799e87176327b2fb449677baeb81d9fe..758cc005908287b1539993c8f232edab3901d962 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
@@ -24,7 +24,8 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.util.Rnd;
/**
- * Mutated Kaneus - Rune (10281). Original Jython script by Gnacik on 2010-06-29
+ * Mutated Kaneus - Rune (10281).<br>
+ * Original Jython script by Gnacik on 2010-06-29
* @author nonom
*/
public class Q10281_MutatedKaneusRune extends Quest
@@ -43,8 +44,7 @@ public class Q10281_MutatedKaneusRune extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
@@ -57,13 +57,9 @@ public class Q10281_MutatedKaneusRune extends Quest
{
htmltext = "31340-06.htm";
}
- else if (st.isCreated() && (player.getLevel() >= 68))
- {
- htmltext = "31340-01.htm";
- }
- else if (st.isCreated() && (player.getLevel() < 68))
+ else if (st.isCreated())
{
- htmltext = "31340-00.htm";
+ htmltext = (player.getLevel() >= 68) ? "31340-01.htm" : "31340-00.htm";
}
else if (st.getQuestItemsCount(TISSUE_WA) > 0)
{
@@ -129,46 +125,47 @@ public class Q10281_MutatedKaneusRune extends Quest
return null;
}
+ final int npcId = npc.getNpcId();
if (killer.getParty() != null)
{
- FastList<QuestState> PartyMembers = new FastList<QuestState>();
-
+ final FastList<QuestState> PartyMembers = new FastList<QuestState>();
for (L2PcInstance member : killer.getParty().getPartyMembers())
{
st = member.getQuestState(qn);
if ((st != null) && st.isStarted() && (st.getInt("cond") == 1))
{
- if ((npc.getNpcId() == WHITE_ALLOSCE) && (st.getQuestItemsCount(TISSUE_WA) == 0))
+ if ((npcId == WHITE_ALLOSCE) && (st.getQuestItemsCount(TISSUE_WA) == 0))
{
PartyMembers.add(st);
}
}
}
- if (PartyMembers.isEmpty())
- {
- return null;
- }
-
- QuestState winnerst = PartyMembers.get(Rnd.get(PartyMembers.size()));
-
- if ((npc.getNpcId() == WHITE_ALLOSCE) && (winnerst.getQuestItemsCount(TISSUE_WA) == 0))
+ if (!PartyMembers.isEmpty())
{
- winnerst.giveItems(TISSUE_WA, 1);
- winnerst.playSound("ItemSound.quest_itemget");
+ rewardItem(npcId, PartyMembers.get(Rnd.get(PartyMembers.size())));
}
}
else
{
- if ((npc.getNpcId() == WHITE_ALLOSCE) && (st.getQuestItemsCount(TISSUE_WA) == 0))
- {
- st.giveItems(TISSUE_WA, 1);
- st.playSound("ItemSound.quest_itemget");
- }
+ rewardItem(npcId, st);
}
return null;
}
+ /**
+ * @param npcId the killed monster Id.
+ * @param st the quest state of the killer or party member.
+ */
+ private final void rewardItem(int npcId, QuestState st)
+ {
+ if ((npcId == WHITE_ALLOSCE) && !st.hasQuestItems(TISSUE_WA))
+ {
+ st.giveItems(TISSUE_WA, 1);
+ st.playSound("ItemSound.quest_itemget");
+ }
+ }
+
public Q10281_MutatedKaneusRune(int questId, String name, String descr)
{
super(questId, name, descr);
@@ -189,4 +186,4 @@ public class Q10281_MutatedKaneusRune extends Quest
{
new Q10281_MutatedKaneusRune(10281, qn, "Mutated Kaneus - Rune");
}
-}
\ No newline at end of file
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
index 22c8c04b40ff145d9f5d726a574e70749bd0852e..dd9a81425ed175d65830fe0e6687383b3f0bcae7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
@@ -21,7 +21,8 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
/**
- * To the Seed of Destruction (10269). Original jython script by Gnacik 2010-08-13 Based on Freya PTS
+ * To the Seed of Destruction (10269).<br>
+ * Original jython script by Gnacik 2010-08-13 Based on Freya PTS
* @author nonom
*/
public class Q10282_ToTheSeedOfAnnihilation extends Quest
@@ -39,16 +40,13 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
- int npcId = npc.getNpcId();
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
}
- int cond = st.getInt("cond");
-
+ final int npcId = npc.getNpcId();
switch (st.getState())
{
case State.COMPLETED:
@@ -62,17 +60,10 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
}
break;
case State.CREATED:
- if (player.getLevel() < 84)
- {
- htmltext = "32733-01.htm";
- }
- else
- {
- htmltext = "32733-00.htm";
- }
+ htmltext = (player.getLevel() < 84) ? "32733-01.htm" : "32733-00.htm";
break;
case State.STARTED:
- if (cond == 1)
+ if (st.getInt("cond") == 1)
{
if (npcId == KBALDIR)
{
@@ -92,8 +83,7 @@ public class Q10282_ToTheSeedOfAnnihilation 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;
@@ -121,12 +111,11 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
super(questId, name, descr);
addStartNpc(KBALDIR);
- addTalkId(KBALDIR);
- addTalkId(KLEMIS);
+ addTalkId(KBALDIR, KLEMIS);
}
public static void main(String[] args)
{
new Q10282_ToTheSeedOfAnnihilation(10282, qn, "To the Seed of Annihilation");
}
-}
\ No newline at end of file
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
index 779aa784855a49508fe4bce7b7898709b6c25ff2..becdf4918e0da5f03d36eb37ed8ec5308907e16f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
@@ -21,9 +21,8 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
/**
- ** @author Gnacik
- **
- ** 2010-08-07 Based on Freya PTS
+ * 2010-08-07 Based on Freya PTS
+ * @author Gnacik
*/
public class Q10283_RequestOfIceMerchant extends Quest
{
@@ -38,20 +37,19 @@ public class Q10283_RequestOfIceMerchant extends Quest
super(questId, name, descr);
addStartNpc(_rafforty);
- addTalkId(_rafforty);
- addTalkId(_kier);
+ addTalkId(_rafforty, _kier, _jinia);
addFirstTalkId(_jinia);
- addTalkId(_jinia);
}
@Override
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;
+ }
if (npc.getNpcId() == _rafforty)
{
@@ -67,12 +65,12 @@ public class Q10283_RequestOfIceMerchant extends Quest
st.playSound("ItemSound.quest_middle");
}
}
- else if (npc.getNpcId() == _kier && event.equalsIgnoreCase("spawn"))
+ else if ((npc.getNpcId() == _kier) && event.equalsIgnoreCase("spawn"))
{
addSpawn(_jinia, 104322, -107669, -3680, 44954, false, 60000);
return null;
}
- else if (npc.getNpcId() == _jinia && event.equalsIgnoreCase("32760-04.html"))
+ else if ((npc.getNpcId() == _jinia) && event.equalsIgnoreCase("32760-04.html"))
{
st.giveItems(57, 190000);
st.addExpAndSp(627000, 50300);
@@ -89,37 +87,54 @@ public class Q10283_RequestOfIceMerchant extends Quest
String htmltext = getNoQuestMsg(player);
QuestState st = player.getQuestState(qn);
if (st == null)
- return htmltext;
-
- if (npc.getNpcId() == _rafforty)
- {
- switch (st.getState())
- {
- case State.CREATED:
- QuestState _prev = player.getQuestState("115_TheOtherSideOfTruth");
- if ((_prev != null) && _prev.isCompleted() && (player.getLevel() >= 82))
- htmltext = "32020-01.htm";
- else
- htmltext = "32020-00.htm";
- break;
- case State.STARTED:
- if (st.getInt("cond") == 1)
- htmltext = "32020-04.htm";
- else if (st.getInt("cond") == 2)
- htmltext = "32020-08.htm";
- break;
- case State.COMPLETED:
- htmltext = "32020-09.htm";
- break;
- }
- }
- else if (npc.getNpcId() == _kier && st.getInt("cond") == 2)
{
- htmltext = "32022-01.html";
+ return htmltext;
}
- else if (npc.getNpcId() == _jinia && st.getInt("cond") == 2)
+ final int npcId = npc.getNpcId();
+ final int cond = st.getInt("cond");
+ switch (npcId)
{
- htmltext = "32760-02.html";
+ case _rafforty:
+ switch (st.getState())
+ {
+ case State.CREATED:
+ QuestState _prev = player.getQuestState("115_TheOtherSideOfTruth");
+ if ((_prev != null) && _prev.isCompleted() && (player.getLevel() >= 82))
+ {
+ htmltext = "32020-01.htm";
+ }
+ else
+ {
+ htmltext = "32020-00.htm";
+ }
+ break;
+ case State.STARTED:
+ if (cond == 1)
+ {
+ htmltext = "32020-04.htm";
+ }
+ else if (cond == 2)
+ {
+ htmltext = "32020-08.htm";
+ }
+ break;
+ case State.COMPLETED:
+ htmltext = "32020-09.htm";
+ break;
+ }
+ break;
+ case _kier:
+ if (cond == 2)
+ {
+ htmltext = "32022-01.html";
+ }
+ break;
+ case _jinia:
+ if (cond == 2)
+ {
+ htmltext = "32760-02.html";
+ }
+ break;
}
return htmltext;
}
@@ -127,13 +142,16 @@ public class Q10283_RequestOfIceMerchant extends Quest
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(qn);
-
if (npc.getInstanceId() > 0)
+ {
return "32760-10.html";
- if (npc.getNpcId() == _jinia && st != null && st.getInt("cond") == 2)
- return "32760-01.html";
+ }
+ final QuestState st = player.getQuestState(qn);
+ if ((npc.getNpcId() == _jinia) && (st != null) && (st.getInt("cond") == 2))
+ {
+ return "32760-01.html";
+ }
return null;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
index c1ee955238b8c9d899d2565570c5d40adcbe57da..724270efc9dc3529b57291a3e07cd7101fbec3f7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
@@ -14,7 +14,6 @@
*/
package quests.Q10288_SecretMission;
-import com.l2jserver.gameserver.instancemanager.QuestManager;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
@@ -29,7 +28,7 @@ public class Q10288_SecretMission extends Quest
{
private static final String qn = "10288_SecretMission";
// NPC's
- private static final int _dominic = 31350;
+ private static final int _dominic = 31350;
private static final int _aquilani = 32780;
private static final int _greymore = 32757;
// Items
@@ -42,7 +41,9 @@ public class Q10288_SecretMission extends Quest
QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
+ }
if (npc.getNpcId() == _dominic)
{
@@ -54,7 +55,7 @@ public class Q10288_SecretMission extends Quest
st.playSound("ItemSound.quest_accept");
}
}
- else if (npc.getNpcId() == _greymore && event.equalsIgnoreCase("32757-03.htm"))
+ else if ((npc.getNpcId() == _greymore) && event.equalsIgnoreCase("32757-03.htm"))
{
st.unset("cond");
st.takeItems(_letter, -1);
@@ -65,7 +66,7 @@ public class Q10288_SecretMission extends Quest
}
else if (npc.getNpcId() == _aquilani)
{
- if (st.getState() == State.STARTED)
+ if (st.isStarted())
{
if (event.equalsIgnoreCase("32780-05.html"))
{
@@ -88,43 +89,51 @@ public class Q10288_SecretMission extends Quest
String htmltext = getNoQuestMsg(player);
QuestState st = player.getQuestState(qn);
if (st == null)
- return htmltext;
-
- if (npc.getNpcId() == _dominic)
- {
- switch(st.getState())
- {
- case State.CREATED :
- if (player.getLevel() >= 82)
- htmltext = "31350-01.htm";
- else
- htmltext = "31350-00.htm";
- break;
- case State.STARTED :
- if (st.getInt("cond") == 1)
- htmltext = "31350-06.htm";
- else if (st.getInt("cond") == 2)
- htmltext = "31350-07.htm";
- break;
- case State.COMPLETED :
- htmltext = "31350-08.htm";
- break;
- }
- }
- else if (npc.getNpcId() == _aquilani)
{
- if (st.getInt("cond") == 1)
- {
- htmltext = "32780-03.html";
- }
- else if (st.getInt("cond") == 2)
- {
- htmltext = "32780-06.html";
- }
+ return htmltext;
}
- else if (npc.getNpcId() == _greymore && st.getInt("cond") == 2)
+
+ final int npcId = npc.getNpcId();
+ final int cond = st.getInt("cond");
+ switch (npcId)
{
- return "32757-01.htm";
+ case _dominic:
+ switch (st.getState())
+ {
+ case State.CREATED:
+ htmltext = (player.getLevel() >= 82) ? "31350-01.htm" : "31350-00.htm";
+ break;
+ case State.STARTED:
+ if (cond == 1)
+ {
+ htmltext = "31350-06.htm";
+ }
+ else if (cond == 2)
+ {
+ htmltext = "31350-07.htm";
+ }
+ break;
+ case State.COMPLETED:
+ htmltext = "31350-08.htm";
+ break;
+ }
+ break;
+ case _aquilani:
+ if (cond == 1)
+ {
+ htmltext = "32780-03.html";
+ }
+ else if (cond == 2)
+ {
+ htmltext = "32780-06.html";
+ }
+ break;
+ case _greymore:
+ if (cond == 2)
+ {
+ return "32757-01.htm";
+ }
+ break;
}
return htmltext;
}
@@ -135,16 +144,12 @@ public class Q10288_SecretMission extends Quest
QuestState st = player.getQuestState(qn);
if (st == null)
{
- Quest q = QuestManager.getInstance().getQuest(qn);
- st = q.newQuestState(player);
+ st = newQuestState(player);
}
+
if (npc.getNpcId() == _aquilani)
{
- if (st.isCompleted())
- {
- return "32780-01.html";
- }
- return "32780-00.html";
+ return st.isCompleted() ? "32780-01.html" : "32780-00.html";
}
return null;
}
@@ -153,11 +158,8 @@ public class Q10288_SecretMission extends Quest
{
super(questId, name, descr);
- addStartNpc(_dominic);
- addStartNpc(_aquilani);
- addTalkId(_dominic);
- addTalkId(_greymore);
- addTalkId(_aquilani);
+ addStartNpc(_dominic, _aquilani);
+ addTalkId(_dominic, _greymore, _aquilani);
addFirstTalkId(_aquilani);
}
@@ -165,4 +167,4 @@ public class Q10288_SecretMission extends Quest
{
new Q10288_SecretMission(10288, qn, "Secret Mission");
}
-}
\ No newline at end of file
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
index c8053a30c8f666b513a1d6c4c27809f2e47b72ad..f124fd3725ce603827caf5db1d41863b9ab0b306 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.util.Util;
/**
* @author Plim
*/
-
public class Q10289_FadeToBlack extends Quest
{
private static final String qn = "10289_FadeToBlack";
@@ -35,8 +34,8 @@ public class Q10289_FadeToBlack extends Quest
// Items
private static final int MARK_OF_DARKNESS = 15528;
private static final int MARK_OF_SPLENDOR = 15527;
-
- //MOBs
+
+ // MOBs
private static final int ANAYS = 25701;
@Override
@@ -46,7 +45,9 @@ public class Q10289_FadeToBlack extends Quest
QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
+ }
if (npc.getNpcId() == GREYMORE)
{
@@ -56,7 +57,7 @@ public class Q10289_FadeToBlack extends Quest
st.set("cond", "1");
st.playSound("ItemSound.quest_accept");
}
- else if(Util.isDigit(event) && st.hasQuestItems(MARK_OF_SPLENDOR))
+ else if (Util.isDigit(event) && st.hasQuestItems(MARK_OF_SPLENDOR))
{
int itemId = Integer.parseInt(event);
st.takeItems(MARK_OF_SPLENDOR, 1);
@@ -68,7 +69,7 @@ public class Q10289_FadeToBlack extends Quest
}
return htmltext;
}
-
+
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
@@ -76,33 +77,46 @@ public class Q10289_FadeToBlack extends Quest
QuestState st = player.getQuestState(qn);
QuestState secretMission = player.getQuestState("10288_SecretMission");
if (st == null)
+ {
return htmltext;
+ }
if (npc.getNpcId() == GREYMORE)
{
- switch(st.getState())
+ final int cond = st.getInt("cond");
+ switch (st.getState())
{
- case State.CREATED :
- if (player.getLevel() >= 82 && secretMission != null && secretMission.isCompleted())
+ case State.CREATED:
+ if ((player.getLevel() >= 82) && (secretMission != null) && secretMission.isCompleted())
+ {
htmltext = "32757-02.htm";
+ }
else if (player.getLevel() < 82)
+ {
htmltext = "32757-00.htm";
+ }
else
+ {
htmltext = "32757-01.htm";
+ }
break;
- case State.STARTED :
- if (st.getInt("cond") == 1)
+ case State.STARTED:
+ if (cond == 1)
+ {
htmltext = "32757-04b.htm";
- if (st.getInt("cond") == 2 && st.hasQuestItems(MARK_OF_DARKNESS))
+ }
+ if ((cond == 2) && st.hasQuestItems(MARK_OF_DARKNESS))
{
htmltext = "32757-05.htm";
st.takeItems(MARK_OF_DARKNESS, 1);
player.addExpAndSp(55983, 136500);
- st.set("cond","1");
+ st.set("cond", "1");
st.playSound("ItemSound.quest_middle");
}
- else if (st.getInt("cond") == 3)
+ else if (cond == 3)
+ {
htmltext = "32757-06.htm";
+ }
break;
}
}
@@ -112,36 +126,34 @@ public class Q10289_FadeToBlack extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
{
- L2PcInstance partyMember = getRandomPartyMember(player,"1");
-
- if (partyMember == null)
+ final L2PcInstance randomPartyMember = getRandomPartyMember(player, "1");
+ if (randomPartyMember == null)
+ {
return super.onKill(npc, player, isPet);
+ }
- QuestState st = partyMember.getQuestState(qn);
-
+ final QuestState st = randomPartyMember.getQuestState(qn);
if (st != null)
{
st.giveItems(MARK_OF_SPLENDOR, 1);
st.playSound("ItemSound.quest_itemget");
- st.set("cond","3");
+ st.set("cond", "3");
}
if (player.getParty() != null)
{
QuestState st2;
- for(L2PcInstance pmember : player.getParty().getPartyMembers())
+ for (L2PcInstance partyMember : player.getParty().getPartyMembers())
{
- st2 = pmember.getQuestState(qn);
-
- if(st2 != null && st2.getInt("cond") == 1 && pmember.getObjectId() != partyMember.getObjectId())
+ st2 = partyMember.getQuestState(qn);
+ if ((st2 != null) && (st2.getInt("cond") == 1) && (partyMember.getObjectId() != randomPartyMember.getObjectId()))
{
st2.giveItems(MARK_OF_DARKNESS, 1);
st2.playSound("ItemSound.quest_itemget");
- st2.set("cond","2");
+ st2.set("cond", "2");
}
}
}
-
return super.onKill(npc, player, isPet);
}
@@ -158,4 +170,4 @@ public class Q10289_FadeToBlack extends Quest
{
new Q10289_FadeToBlack(10289, qn, "Fade to Black");
}
-}
\ No newline at end of file
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
index 3141ae5db803c294bd438a28b08fe267eabdc4fd..8f0787945f7ae0cf225a7c8fa7335a41ec824108 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
@@ -29,7 +29,11 @@ public class Q10290_LandDragonConqueror extends Quest
private static final String qn = "10290_LandDragonConqueror";
// NPC
private static final int Theodoric = 30755;
- private static final int[] Antharas = { 29019, 29066, 29067, 29068 }; //Old, Weak, Normal, Strong
+ // Old, Weak, Normal, Strong
+ private static final int[] Antharas =
+ {
+ 29019, 29066, 29067, 29068
+ };
// Item
private static final int PortalStone = 3865;
private static final int ShabbyNecklace = 15522;
@@ -40,10 +44,11 @@ public class Q10290_LandDragonConqueror 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;
+ }
if (event.equalsIgnoreCase("30755-07.htm"))
{
@@ -59,41 +64,53 @@ public class Q10290_LandDragonConqueror extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
+ }
switch (st.getState())
{
case State.CREATED:
{
- if (player.getLevel() >= 83 && st.hasQuestItems(PortalStone))
- htmltext = "30755-01.htm";
- else if (player.getLevel() < 83)
+ if (player.getLevel() < 83)
+ {
htmltext = "30755-02.htm";
+ }
+ else if (st.hasQuestItems(PortalStone))
+ {
+ htmltext = "30755-01.htm";
+ }
else
+ {
htmltext = "30755-04.htm";
+ }
break;
}
case State.STARTED:
{
- if (st.getInt("cond") == 1 && st.getQuestItemsCount(ShabbyNecklace) >= 1)
- htmltext = "30755-08.htm";
- else if (st.getInt("cond") == 1 && st.getQuestItemsCount(ShabbyNecklace) == 0)
+ final int cond = st.getInt("cond");
+ if (cond == 1)
{
- st.giveItems(ShabbyNecklace, 1);
- htmltext = "30755-09.htm";
+ if (st.hasQuestItems(ShabbyNecklace))
+ {
+ htmltext = "30755-08.htm";
+ }
+ else
+ {
+ st.giveItems(ShabbyNecklace, 1);
+ htmltext = "30755-09.htm";
+ }
}
- else if (st.getInt("cond") == 2)
+ else if (cond == 2)
{
st.takeItems(MiracleNecklace, 1);
- st.giveItems(57, 131236);
+ st.giveAdena(131236, false);
st.addExpAndSp(702557, 76334);
st.giveItems(AntharaSlayerCirclet, 1);
- st.unset("cond");
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
htmltext = "30755-10.htm";
}
break;
@@ -114,18 +131,21 @@ public class Q10290_LandDragonConqueror extends Quest
if (player.getParty() != null)
{
for (L2PcInstance partyMember : player.getParty().getPartyMembers())
+ {
rewardPlayer(partyMember);
+ }
}
else
+ {
rewardPlayer(player);
+ }
return null;
}
private void rewardPlayer(L2PcInstance player)
{
- QuestState st = player.getQuestState(qn);
-
- if (st != null && st.getInt("cond") == 1)
+ final QuestState st = player.getQuestState(qn);
+ if ((st != null) && (st.getInt("cond") == 1))
{
st.takeItems(ShabbyNecklace, 1);
st.giveItems(MiracleNecklace, 1);
@@ -137,16 +157,19 @@ public class Q10290_LandDragonConqueror extends Quest
public Q10290_LandDragonConqueror(int questId, String name, String descr)
{
super(questId, name, descr);
+
addStartNpc(Theodoric);
addTalkId(Theodoric);
- for (int i : Antharas)
- addKillId(i);
+ addKillId(Antharas);
- questItemIds = new int[] { MiracleNecklace, ShabbyNecklace };
+ questItemIds = new int[]
+ {
+ MiracleNecklace, ShabbyNecklace
+ };
}
public static void main(String[] args)
{
new Q10290_LandDragonConqueror(10290, qn, "Land Dragon Conqueror");
}
-}
\ No newline at end of file
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
index d9ae9000ce0839fd8ac545918739465c2aa1b024..908488f878d578a188d138eb15d4fcd3f6b62828 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
@@ -40,10 +40,11 @@ public class Q10291_FireDragonDestroyer 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;
+ }
if (event.equalsIgnoreCase("31540-07.htm"))
{
@@ -59,41 +60,54 @@ public class Q10291_FireDragonDestroyer extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
+ final QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
+ }
switch (st.getState())
{
case State.CREATED:
{
- if (player.getLevel() >= 83 && st.hasQuestItems(FloatingStone))
- htmltext = "31540-01.htm";
- else if (player.getLevel() < 83)
+ if (player.getLevel() < 83)
+ {
htmltext = "31540-02.htm";
+ }
+ else if (st.hasQuestItems(FloatingStone))
+ {
+ htmltext = "31540-01.htm";
+ }
else
+ {
htmltext = "31540-04.htm";
+ }
break;
}
case State.STARTED:
{
- if (st.getInt("cond") == 1 && st.getQuestItemsCount(PoorNecklace) >= 1)
- htmltext = "31540-08.htm";
- else if (st.getInt("cond") == 1 && st.getQuestItemsCount(PoorNecklace) == 0)
+ final int cond = st.getInt("cond");
+ if (cond == 1)
{
- st.giveItems(PoorNecklace, 1);
- htmltext = "31540-09.htm";
+ if (st.hasQuestItems(PoorNecklace))
+ {
+ htmltext = "31540-08.htm";
+ }
+ else
+ {
+ st.giveItems(PoorNecklace, 1);
+ htmltext = "31540-09.htm";
+ }
}
- else if (st.getInt("cond") == 2)
+ else if (cond == 2)
{
st.takeItems(ValorNecklace, 1);
- st.giveItems(57, 126549);
+ st.giveAdena(126549, false);
st.addExpAndSp(717291, 77397);
st.giveItems(ValakaSlayerCirclet, 1);
- st.unset("cond");
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
htmltext = "31540-10.htm";
}
break;
@@ -114,18 +128,24 @@ public class Q10291_FireDragonDestroyer extends Quest
if (player.getParty() != null)
{
for (L2PcInstance partyMember : player.getParty().getPartyMembers())
+ {
rewardPlayer(partyMember);
+ }
}
else
+ {
rewardPlayer(player);
+ }
return null;
}
+ /**
+ * @param player the player to reward.
+ */
private void rewardPlayer(L2PcInstance player)
{
- QuestState st = player.getQuestState(qn);
-
- if (st != null && st.getInt("cond") == 1)
+ final QuestState st = player.getQuestState(qn);
+ if ((st != null) && (st.getInt("cond") == 1))
{
st.takeItems(PoorNecklace, 1);
st.giveItems(ValorNecklace, 1);
@@ -137,15 +157,19 @@ public class Q10291_FireDragonDestroyer extends Quest
public Q10291_FireDragonDestroyer(int questId, String name, String descr)
{
super(questId, name, descr);
+
addStartNpc(Klein);
addTalkId(Klein);
addKillId(Valakas);
- questItemIds = new int[] { PoorNecklace, ValorNecklace };
+ questItemIds = new int[]
+ {
+ PoorNecklace, ValorNecklace
+ };
}
public static void main(String[] args)
{
new Q10291_FireDragonDestroyer(10291, qn, "Fire Dragon Destroyer");
}
-}
\ No newline at end of file
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q132_MatrasCuriosity/Q132_MatrasCuriosity.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q132_MatrasCuriosity/Q132_MatrasCuriosity.java
index e98c15914c83bcde89d783d88cd19ae770dd72b4..205baae0f918e319cc635ad964e71fe210bf306b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q132_MatrasCuriosity/Q132_MatrasCuriosity.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q132_MatrasCuriosity/Q132_MatrasCuriosity.java
@@ -32,17 +32,6 @@ public final class Q132_MatrasCuriosity extends Quest
private static final int DEMON_PRINCE = 25540;
private static final int RANKU = 25542;
- public Q132_MatrasCuriosity(int questId, String name, String descr)
- {
- super(questId, name, descr);
-
- addStartNpc(MATRAS);
- addTalkId(MATRAS);
-
- addKillId(RANKU);
- addKillId(DEMON_PRINCE);
- }
-
// Items
private static final int FIRE = 10521;
private static final int WATER = 10522;
@@ -57,8 +46,7 @@ public final class Q132_MatrasCuriosity 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 getNoQuestMsg(player);
@@ -66,7 +54,7 @@ public final class Q132_MatrasCuriosity extends Quest
if (event.equalsIgnoreCase("32245-03.htm") && (player.getLevel() >= 76) && !st.isCompleted())
{
- if (st.getState() == State.CREATED)
+ if (st.isCreated())
{
st.setState(State.STARTED);
st.set("cond", "1");
@@ -99,29 +87,21 @@ public final class Q132_MatrasCuriosity extends Quest
public final String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = Quest.getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
}
- if (st.getState() == State.CREATED)
+ if (st.isCreated())
{
- if (player.getLevel() >= 76)
- {
- htmltext = "32245-01.htm";
- }
- else
- {
- htmltext = "32245-02.htm";
- }
+ htmltext = (player.getLevel() >= 76) ? "32245-01.htm" : "32245-02.htm";
}
else if (st.isCompleted())
{
htmltext = getAlreadyCompletedMsg(player);
}
- else if (st.getState() == State.STARTED)
+ else if (st.isStarted())
{
switch (st.getInt("cond"))
{
@@ -196,9 +176,18 @@ public final class Q132_MatrasCuriosity extends Quest
return null;
}
+ public Q132_MatrasCuriosity(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+
+ addStartNpc(MATRAS);
+ addTalkId(MATRAS);
+
+ addKillId(RANKU, DEMON_PRINCE);
+ }
+
public static void main(String[] args)
{
new Q132_MatrasCuriosity(132, qn, "Matras' Curiosity");
}
-
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q146_TheZeroHour/Q146_TheZeroHour.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q146_TheZeroHour/Q146_TheZeroHour.java
index 7b9c9bcecf6ddc96358301e5d19487edc439babf..5190cf121ced545e0effb563e0f0d3138ca1cc5f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q146_TheZeroHour/Q146_TheZeroHour.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q146_TheZeroHour/Q146_TheZeroHour.java
@@ -36,11 +36,11 @@ public class Q146_TheZeroHour extends Quest
@Override
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 getNoQuestMsg(player);
+ }
if (event.equalsIgnoreCase("31554-03.htm"))
{
@@ -48,42 +48,51 @@ public class Q146_TheZeroHour extends Quest
st.setState(State.STARTED);
st.playSound("ItemSound.quest_accept");
}
- return htmltext;
+ return event;
}
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
- QuestState prev = player.getQuestState("109_InSearchOfTheNest");
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
+ }
switch (st.getState())
{
case State.CREATED:
if (player.getLevel() < 81)
+ {
htmltext = "31554-02.htm";
+ }
else
{
+ final QuestState prev = player.getQuestState("109_InSearchOfTheNest");
if ((prev != null) && prev.isCompleted())
+ {
htmltext = "31554-01a.htm";
+ }
else
+ {
htmltext = "31554-04.html";
+ }
}
break;
case State.STARTED:
if (st.getInt("cond") == 1)
+ {
htmltext = "31554-06.html";
+ }
else
{
st.giveItems(14849, 1);
st.addExpAndSp(154616, 12500);
st.takeItems(Fang, 1);
- st.exitQuest(false);
st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
htmltext = "31554-05.html";
}
break;
@@ -99,9 +108,10 @@ public class Q146_TheZeroHour extends Quest
{
L2PcInstance partyMember = getRandomPartyMember(player, "1");
if (partyMember == null)
+ {
return null;
+ }
QuestState st = partyMember.getQuestState(qn);
-
if (!st.hasQuestItems(Fang))
{
st.giveItems(Fang, 1);
@@ -118,7 +128,10 @@ public class Q146_TheZeroHour extends Quest
addTalkId(Kahman);
addKillId(QueenShyeed);
- questItemIds = new int[] { Fang };
+ questItemIds = new int[]
+ {
+ Fang
+ };
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q147_PathtoBecominganEliteMercenary/Q147_PathtoBecominganEliteMercenary.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q147_PathtoBecominganEliteMercenary/Q147_PathtoBecominganEliteMercenary.java
index 9aa9fd921ed87443ac09e31ac4b0290d6ff82a91..39c97c16f937acfd2f0b6b68fc0415e52002d8e0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q147_PathtoBecominganEliteMercenary/Q147_PathtoBecominganEliteMercenary.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q147_PathtoBecominganEliteMercenary/Q147_PathtoBecominganEliteMercenary.java
@@ -19,18 +19,20 @@ 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.State;
-import com.l2jserver.gameserver.util.Util;
/**
- ** @author Gnacik
- **
- ** 2010-09-30 Based on official server Franz
+ * 2010-09-30 Based on official server Franz
+ * @author Gnacik
*/
public class Q147_PathtoBecominganEliteMercenary extends Quest
{
private static final String qn = "147_PathtoBecominganEliteMercenary";
+
// NPCs
- private static final int[] _merc = { 36481, 36482, 36483, 36484, 36485, 36486, 36487, 36488, 36489 };
+ private static final int[] _merc =
+ {
+ 36481, 36482, 36483, 36484, 36485, 36486, 36487, 36488, 36489
+ };
// Items
private static final int _cert_ordinary = 13766;
private static final int _cert_elite = 13767;
@@ -39,25 +41,26 @@ public class Q147_PathtoBecominganEliteMercenary 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;
+ }
- if (Util.contains(_merc, npc.getNpcId()))
+ if (event.equalsIgnoreCase("elite-02.htm"))
{
- if (event.equalsIgnoreCase("elite-02.htm"))
+ if (st.hasQuestItems(_cert_ordinary))
{
- if (st.hasQuestItems(_cert_ordinary))
- return "elite-02a.htm";
- st.giveItems(_cert_ordinary, 1);
- }
- else if (event.equalsIgnoreCase("elite-04.htm"))
- {
- st.setState(State.STARTED);
- st.set("cond", "1");
- st.playSound("ItemSound.quest_accept");
+ return "elite-02a.htm";
}
+ st.giveItems(_cert_ordinary, 1);
+ }
+ else if (event.equalsIgnoreCase("elite-04.htm"))
+ {
+ st.setState(State.STARTED);
+ st.set("cond", "1");
+ st.playSound("ItemSound.quest_accept");
}
return htmltext;
}
@@ -66,39 +69,41 @@ public class Q147_PathtoBecominganEliteMercenary extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
+ final QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
+ }
- if (Util.contains(_merc, npc.getNpcId()))
+ switch (st.getState())
{
- switch(st.getState())
- {
- case State.CREATED :
- if (player.getClan() != null && player.getClan().getHasCastle() > 0)
- htmltext = "castle.htm";
- else
- htmltext = "elite-01.htm";
- break;
- case State.STARTED :
- if (st.getInt("cond") < 4)
- {
- htmltext = "elite-05.htm";
- }
- else if (st.getInt("cond") == 4)
- {
- st.unset("cond");
- st.unset("kills");
- st.takeItems(_cert_ordinary, -1);
- st.giveItems(_cert_elite, 1);
- st.exitQuest(false);
- htmltext = "elite-06.htm";
- }
- break;
- case State.COMPLETED :
- htmltext = getAlreadyCompletedMsg(player);
- break;
- }
+ case State.CREATED:
+ if ((player.getClan() != null) && (player.getClan().getHasCastle() > 0))
+ {
+ htmltext = "castle.htm";
+ }
+ else
+ {
+ htmltext = "elite-01.htm";
+ }
+ break;
+ case State.STARTED:
+ final int cond = st.getInt("cond");
+ if (cond < 4)
+ {
+ htmltext = "elite-05.htm";
+ }
+ else if (cond == 4)
+ {
+ st.takeItems(_cert_ordinary, -1);
+ st.giveItems(_cert_elite, 1);
+ st.exitQuest(false);
+ htmltext = "elite-06.htm";
+ }
+ break;
+ case State.COMPLETED:
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
return htmltext;
}
@@ -107,15 +112,12 @@ public class Q147_PathtoBecominganEliteMercenary extends Quest
{
super(questId, name, descr);
- for(int _npc : _merc)
- {
- addStartNpc(_npc);
- addTalkId(_npc);
- }
+ addStartNpc(_merc);
+ addTalkId(_merc);
}
public static void main(String[] args)
{
new Q147_PathtoBecominganEliteMercenary(147, qn, "Path to Becoming an Elite Mercenary");
}
-}
\ No newline at end of file
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q148_PathtoBecominganExaltedMercenary/Q148_PathtoBecominganExaltedMercenary.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q148_PathtoBecominganExaltedMercenary/Q148_PathtoBecominganExaltedMercenary.java
index 4dd993bf4f65a306dd6e54e3bf7aa012b3a3e234..8ffa55eb2bddebf6c6078d33dbbea82bf39c2d17 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q148_PathtoBecominganExaltedMercenary/Q148_PathtoBecominganExaltedMercenary.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q148_PathtoBecominganExaltedMercenary/Q148_PathtoBecominganExaltedMercenary.java
@@ -19,18 +19,19 @@ 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.State;
-import com.l2jserver.gameserver.util.Util;
/**
- ** @author Gnacik
- **
- ** 2010-09-30 Based on official server Franz
+ * 2010-09-30 Based on official server Franz
+ * @author Gnacik
*/
public class Q148_PathtoBecominganExaltedMercenary extends Quest
{
private static final String qn = "148_PathtoBecominganExaltedMercenary";
// NPCs
- private static final int[] _merc = { 36481, 36482, 36483, 36484, 36485, 36486, 36487, 36488, 36489 };
+ private static final int[] _merc =
+ {
+ 36481, 36482, 36483, 36484, 36485, 36486, 36487, 36488, 36489
+ };
// Items
private static final int _cert_elite = 13767;
private static final int _cert_top_elite = 13768;
@@ -39,23 +40,21 @@ public class Q148_PathtoBecominganExaltedMercenary 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;
+ }
- if (Util.contains(_merc, npc.getNpcId()))
+ if (event.equalsIgnoreCase("exalted-00b.htm"))
{
- if (event.equalsIgnoreCase("exalted-00b.htm"))
- {
- st.giveItems(_cert_elite, 1);
- }
- else if (event.equalsIgnoreCase("exalted-03.htm"))
- {
- st.setState(State.STARTED);
- st.set("cond", "1");
- st.playSound("ItemSound.quest_accept");
- }
+ st.giveItems(_cert_elite, 1);
+ }
+ else if (event.equalsIgnoreCase("exalted-03.htm"))
+ {
+ st.setState(State.STARTED);
+ st.set("cond", "1");
+ st.playSound("ItemSound.quest_accept");
}
return htmltext;
}
@@ -64,51 +63,52 @@ public class Q148_PathtoBecominganExaltedMercenary extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
+ final QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
+ }
- if (Util.contains(_merc, npc.getNpcId()))
+ switch (st.getState())
{
- switch(st.getState())
- {
- case State.CREATED :
- QuestState _prev = player.getQuestState("147_PathtoBecominganEliteMercenary");
- if (player.getClan() != null && player.getClan().getHasCastle() > 0)
+ case State.CREATED:
+ QuestState _prev = player.getQuestState("147_PathtoBecominganEliteMercenary");
+ if ((player.getClan() != null) && (player.getClan().getHasCastle() > 0))
+ {
+ htmltext = "castle.htm";
+ }
+ else if (st.hasQuestItems(_cert_elite))
+ {
+ htmltext = "exalted-01.htm";
+ }
+ else
+ {
+ if ((_prev != null) && _prev.isCompleted())
{
- htmltext = "castle.htm";
- }
- else if (st.hasQuestItems(_cert_elite))
- {
- htmltext = "exalted-01.htm";
+ htmltext = "exalted-00a.htm";
}
else
{
- if ((_prev != null) && _prev.isCompleted())
- htmltext = "exalted-00a.htm";
- else
- htmltext = "exalted-00.htm";
- }
- break;
- case State.STARTED :
- if (st.getInt("cond") < 4)
- {
- htmltext = "exalted-04.htm";
+ htmltext = "exalted-00.htm";
}
- else if (st.getInt("cond") == 4)
- {
- st.unset("cond");
- st.unset("kills");
- st.takeItems(_cert_elite, -1);
- st.giveItems(_cert_top_elite, 1);
- st.exitQuest(false);
- htmltext = "exalted-05.htm";
- }
- break;
- case State.COMPLETED :
- htmltext = getAlreadyCompletedMsg(player);
- break;
- }
+ }
+ break;
+ case State.STARTED:
+ if (st.getInt("cond") < 4)
+ {
+ htmltext = "exalted-04.htm";
+ }
+ else if (st.getInt("cond") == 4)
+ {
+ st.takeItems(_cert_elite, -1);
+ st.giveItems(_cert_top_elite, 1);
+ st.exitQuest(false);
+ htmltext = "exalted-05.htm";
+ }
+ break;
+ case State.COMPLETED:
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
return htmltext;
}
@@ -117,15 +117,12 @@ public class Q148_PathtoBecominganExaltedMercenary extends Quest
{
super(questId, name, descr);
- for(int _npc : _merc)
- {
- addStartNpc(_npc);
- addTalkId(_npc);
- }
+ addStartNpc(_merc);
+ addTalkId(_merc);
}
public static void main(String[] args)
{
new Q148_PathtoBecominganExaltedMercenary(148, qn, "Path to Becoming an Exalted Mercenary");
}
-}
\ No newline at end of file
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q153_DeliverGoods/Q153_DeliverGoods.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q153_DeliverGoods/Q153_DeliverGoods.java
index 8eebebd729a90fb1faaf49aa5575ca41194e9c67..2507ec5d2468c388debbadf9b3ece888ad42ec0f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q153_DeliverGoods/Q153_DeliverGoods.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q153_DeliverGoods/Q153_DeliverGoods.java
@@ -34,7 +34,7 @@ public class Q153_DeliverGoods extends Quest
private static final int SilviaId = 30003;
private static final int ArnoldId = 30041;
private static final int RantId = 30054;
- //ITEMs
+ // ITEMs
private static final int DeliveryListId = 1012;
private static final int HeavyWoodBoxId = 1013;
private static final int ClothBundleId = 1014;
@@ -43,8 +43,8 @@ public class Q153_DeliverGoods extends Quest
private static final int SilviasReceipt = 1017;
private static final int RantsReceipt = 1018;
- //REWARDs
- private static final int SoulshotNoGradeId = 1835; //You get 3 Soulshots no grade.
+ // REWARDs
+ private static final int SoulshotNoGradeId = 1835; // You get 3 Soulshots no grade.
private static final int RingofKnowledgeId = 875;
private static final int XpRewardAmount = 600;
@@ -52,7 +52,10 @@ public class Q153_DeliverGoods extends Quest
{
super(questId, name, descr);
- questItemIds = new int[] { DeliveryListId, HeavyWoodBoxId, ClothBundleId, ClayPotId, JacksonsReceipt, SilviasReceipt, RantsReceipt };
+ questItemIds = new int[]
+ {
+ DeliveryListId, HeavyWoodBoxId, ClothBundleId, ClayPotId, JacksonsReceipt, SilviasReceipt, RantsReceipt
+ };
addStartNpc(ArnoldId);
addTalkId(JacksonId);
addTalkId(SilviaId);
@@ -64,8 +67,7 @@ public class Q153_DeliverGoods 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) && (npc.getNpcId() == ArnoldId))
{
if (event.equalsIgnoreCase("30041-02.html"))
@@ -86,7 +88,7 @@ public class Q153_DeliverGoods extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
+ final QuestState st = player.getQuestState(qn);
if (st != null)
{
if (npc.getNpcId() == ArnoldId)
@@ -94,28 +96,22 @@ public class Q153_DeliverGoods extends Quest
switch (st.getState())
{
case State.CREATED:
- if (player.getLevel() >= 2)
- {
- htmltext = "30041-01.htm";
- }
- else
- {
- htmltext = "30041-00.htm";
- }
+ htmltext = (player.getLevel() >= 2) ? "30041-01.htm" : "30041-00.htm";
break;
case State.STARTED:
- if (st.getInt("cond") == 1)
+ final int cond = st.getInt("cond");
+ if (cond == 1)
{
htmltext = "30041-03.html";
}
- else if (st.getInt("cond") == 2)
+ else if (cond == 2)
{
htmltext = "30041-04.html";
st.takeItems(DeliveryListId, -1);
st.takeItems(JacksonsReceipt, -1);
st.takeItems(SilviasReceipt, -1);
st.takeItems(RantsReceipt, -1);
- //On retail it gives 2 rings but one at the time.
+ // On retail it gives 2 rings but one at the time.
st.giveItems(RingofKnowledgeId, 1);
st.giveItems(RingofKnowledgeId, 1);
st.addExpAndSp(XpRewardAmount, 0);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q179_IntoTheLargeCavern/Q179_IntoTheLargeCavern.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q179_IntoTheLargeCavern/Q179_IntoTheLargeCavern.java
index 6102f7c3f9e2aaa9e0fc31804a5a9d62df821151..f47c2ab347ebd74d075611a017dc28c9271fbf6b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q179_IntoTheLargeCavern/Q179_IntoTheLargeCavern.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q179_IntoTheLargeCavern/Q179_IntoTheLargeCavern.java
@@ -16,32 +16,34 @@ package quests.Q179_IntoTheLargeCavern;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.base.Race;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
/**
- ** @author Gnacik
- **
- ** 2010-10-15 Based on official server Naia
+ * 2010-10-15 Based on official server Naia
+ * @author Gnacik
*/
-
public class Q179_IntoTheLargeCavern extends Quest
{
private static final String qn = "179_IntoTheLargeCavern";
+
// NPC's
private static final int _kekropus = 32138;
private static final int _nornil = 32258;
-
+
@Override
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;
-
+ }
+
if (npc.getNpcId() == _kekropus)
{
if (event.equalsIgnoreCase("32138-03.htm"))
@@ -71,60 +73,61 @@ public class Q179_IntoTheLargeCavern extends Quest
}
return htmltext;
}
-
+
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
-
+ }
+
QuestState _prev = player.getQuestState("178_IconicTrinity");
- if (_prev != null
- && _prev.isCompleted()
- && player.getLevel() >= 17
- && player.getRace().ordinal() == 5
- && player.getClassId().level() == 0)
+ if ((_prev != null) && _prev.isCompleted() && (player.getLevel() >= 17) && (player.getRace() == Race.Kamael) && (player.getClassId().level() == 0))
{
if (npc.getNpcId() == _kekropus)
{
- switch(st.getState())
+ switch (st.getState())
{
- case State.CREATED :
- htmltext = "32138-01.htm";
+ case State.CREATED:
+ htmltext = "32138-01.htm";
break;
- case State.STARTED :
+ case State.STARTED:
if (st.getInt("cond") == 1)
+ {
htmltext = "32138-03.htm";
+ }
break;
- case State.COMPLETED :
+ case State.COMPLETED:
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
- else if (npc.getNpcId() == _nornil && st.getState() == State.STARTED)
+ else if ((npc.getNpcId() == _nornil) && (st.getState() == State.STARTED))
{
htmltext = "32258-01.htm";
}
}
else
+ {
htmltext = "32138-00.htm";
-
+ }
+
return htmltext;
}
-
+
public Q179_IntoTheLargeCavern(int questId, String name, String descr)
{
super(questId, name, descr);
-
+
addStartNpc(_kekropus);
- addTalkId(_kekropus);
- addTalkId(_nornil);
+ addTalkId(_kekropus, _nornil);
}
-
+
public static void main(String[] args)
{
new Q179_IntoTheLargeCavern(179, qn, "Into The Large Cavern");
}
-}
\ No newline at end of file
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q182_NewRecruits/Q182_NewRecruits.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q182_NewRecruits/Q182_NewRecruits.java
index 9174183a3b3813842354d1befc7aee45ee777602..b63c0f60191b39d0084b7787d25cdd60dff68642 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q182_NewRecruits/Q182_NewRecruits.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q182_NewRecruits/Q182_NewRecruits.java
@@ -16,19 +16,19 @@ package quests.Q182_NewRecruits;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.base.Race;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
/**
- ** @author Gnacik
- **
- ** 2010-10-15 Based on official server Naia
+ * 2010-10-15 Based on official server Naia
+ * @author Gnacik
*/
-
public class Q182_NewRecruits extends Quest
{
private static final String qn = "182_NewRecruits";
+
// NPC's
private static final int _kekropus = 32138;
private static final int _nornil = 32258;
@@ -37,10 +37,11 @@ public class Q182_NewRecruits 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;
+ }
if (npc.getNpcId() == _kekropus)
{
@@ -73,11 +74,13 @@ public class Q182_NewRecruits extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
+ final QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
+ }
- if(player.getRace().ordinal() == 5)
+ if (player.getRace() == Race.Kamael)
{
htmltext = "32138-00.htm";
}
@@ -85,26 +88,27 @@ public class Q182_NewRecruits extends Quest
{
if (npc.getNpcId() == _kekropus)
{
- switch(st.getState())
+ switch (st.getState())
{
- case State.CREATED :
- htmltext = "32138-01.htm";
+ case State.CREATED:
+ htmltext = "32138-01.htm";
break;
- case State.STARTED :
+ case State.STARTED:
if (st.getInt("cond") == 1)
+ {
htmltext = "32138-03.htm";
+ }
break;
- case State.COMPLETED :
+ case State.COMPLETED:
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
- else if (npc.getNpcId() == _nornil && st.getState() == State.STARTED)
+ else if ((npc.getNpcId() == _nornil) && st.isStarted())
{
htmltext = "32258-01.htm";
}
}
-
return htmltext;
}
@@ -113,12 +117,11 @@ public class Q182_NewRecruits extends Quest
super(questId, name, descr);
addStartNpc(_kekropus);
- addTalkId(_kekropus);
- addTalkId(_nornil);
+ addTalkId(_kekropus, _nornil);
}
public static void main(String[] args)
{
new Q182_NewRecruits(182, qn, "New Recruits");
}
-}
\ No newline at end of file
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q19_GoToThePastureland/Q19_GoToThePastureland.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q19_GoToThePastureland/Q19_GoToThePastureland.java
index 13af6c31f2b505566be80d6b86b31fb8a9ed998c..837918f591da336979e87afc426109265c60aff7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q19_GoToThePastureland/Q19_GoToThePastureland.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q19_GoToThePastureland/Q19_GoToThePastureland.java
@@ -27,6 +27,7 @@ import com.l2jserver.gameserver.model.quest.State;
public class Q19_GoToThePastureland extends Quest
{
private static final String qn = "19_GoToThePastureland";
+
// NPC
private static final int Vladimir = 31302;
private static final int Tunatun = 31537;
@@ -38,10 +39,12 @@ public class Q19_GoToThePastureland 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 getNoQuestMsg(player);
+ }
if (event.equalsIgnoreCase("31302-02.htm"))
{
@@ -55,7 +58,7 @@ public class Q19_GoToThePastureland extends Quest
if (st.hasQuestItems(YoungWildBeastMeat))
{
st.takeItems(YoungWildBeastMeat, -1);
- st.giveItems(57, 50000);
+ st.giveAdena(50000, false);
st.addExpAndSp(136766, 12688);
st.playSound("ItemSound.quest_finish");
st.exitQuest(false);
@@ -64,7 +67,7 @@ public class Q19_GoToThePastureland extends Quest
else if (st.hasQuestItems(Veal))
{
st.takeItems(Veal, -1);
- st.giveItems(57, 147200);
+ st.giveAdena(147200, false);
st.addExpAndSp(385040, 75250);
st.playSound("ItemSound.quest_finish");
st.exitQuest(false);
@@ -82,10 +85,11 @@ public class Q19_GoToThePastureland extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
+ }
if (npc.getNpcId() == Vladimir)
{
@@ -93,9 +97,13 @@ public class Q19_GoToThePastureland extends Quest
{
case State.CREATED:
if (player.getLevel() >= 82)
+ {
htmltext = "31302-01.htm";
+ }
else
+ {
htmltext = "31302-03.html";
+ }
break;
case State.STARTED:
htmltext = "31302-04.html";
@@ -105,7 +113,7 @@ public class Q19_GoToThePastureland extends Quest
break;
}
}
- else if (npc.getNpcId() == Tunatun && st.getInt("cond") == 1)
+ else if ((npc.getNpcId() == Tunatun) && (st.getInt("cond") == 1))
{
htmltext = "31537-01.html";
}
@@ -115,11 +123,14 @@ public class Q19_GoToThePastureland extends Quest
public Q19_GoToThePastureland(int questId, String name, String descr)
{
super(questId, name, descr);
+
addStartNpc(Vladimir);
- addTalkId(Vladimir);
- addTalkId(Tunatun);
+ addTalkId(Vladimir, Tunatun);
- questItemIds = new int[] { Veal, YoungWildBeastMeat };
+ questItemIds = new int[]
+ {
+ Veal, YoungWildBeastMeat
+ };
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q20_BringUpWithLove/Q20_BringUpWithLove.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q20_BringUpWithLove/Q20_BringUpWithLove.java
index fdbdcf49bce56021027cee4afdb6b4a0803b238e..0a125daf6fa11c0b07371e7d13a995cd5b7e6b30 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q20_BringUpWithLove/Q20_BringUpWithLove.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q20_BringUpWithLove/Q20_BringUpWithLove.java
@@ -14,7 +14,6 @@
*/
package quests.Q20_BringUpWithLove;
-import com.l2jserver.gameserver.instancemanager.QuestManager;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
@@ -28,6 +27,7 @@ import com.l2jserver.gameserver.model.quest.State;
public class Q20_BringUpWithLove extends Quest
{
private static final String qn = "20_BringUpWithLove";
+
// Npc
private static final int _tunatun = 31537;
// Item
@@ -39,10 +39,12 @@ public class Q20_BringUpWithLove 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;
+ }
if (npc.getNpcId() == _tunatun)
{
@@ -62,7 +64,6 @@ public class Q20_BringUpWithLove extends Quest
}
else if (event.equalsIgnoreCase("31537-15.htm"))
{
- st.unset("cond");
st.takeItems(_jewel, -1);
st.giveItems(_crystal, 1);
st.playSound("ItemSound.quest_finish");
@@ -71,9 +72,13 @@ public class Q20_BringUpWithLove extends Quest
else if (event.equalsIgnoreCase("31537-21.html"))
{
if (player.getLevel() < 82)
+ {
return "31537-23.html";
+ }
if (st.hasQuestItems(_beast_whip))
+ {
return "31537-22.html";
+ }
st.giveItems(_beast_whip, 1);
}
}
@@ -86,23 +91,33 @@ public class Q20_BringUpWithLove extends Quest
String htmltext = getNoQuestMsg(player);
QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
+ }
if (npc.getNpcId() == _tunatun)
{
- switch(st.getState())
+ switch (st.getState())
{
- case State.CREATED :
+ case State.CREATED:
if (player.getLevel() >= 82)
+ {
htmltext = "31537-01.htm";
+ }
else
+ {
htmltext = "31537-00.htm";
+ }
break;
- case State.STARTED :
+ case State.STARTED:
if (st.getInt("cond") == 1)
+ {
htmltext = "31537-13.htm";
+ }
else if (st.getInt("cond") == 2)
+ {
htmltext = "31537-14.htm";
+ }
break;
}
}
@@ -115,8 +130,7 @@ public class Q20_BringUpWithLove extends Quest
QuestState st = player.getQuestState(qn);
if (st == null)
{
- Quest q = QuestManager.getInstance().getQuest(qn);
- st = q.newQuestState(player);
+ newQuestState(player);
}
return "31537-20.html";
}
@@ -134,4 +148,4 @@ public class Q20_BringUpWithLove extends Quest
{
new Q20_BringUpWithLove(20, qn, "Bring Up With Love");
}
-}
\ No newline at end of file
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q249_PoisonedPlainsOfTheLizardmen/Q249_PoisonedPlainsOfTheLizardmen.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q249_PoisonedPlainsOfTheLizardmen/Q249_PoisonedPlainsOfTheLizardmen.java
index bad99f7d88e3d9c6bc2992377538595fd5f4ec05..a79a7cf4f8a2cbbcec93fb325f7e671e24803a80 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q249_PoisonedPlainsOfTheLizardmen/Q249_PoisonedPlainsOfTheLizardmen.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q249_PoisonedPlainsOfTheLizardmen/Q249_PoisonedPlainsOfTheLizardmen.java
@@ -21,13 +21,13 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
/**
- ** @author Gnacik
- **
- ** 2010-08-04 Based on Freya PTS
+ * 2010-08-04 Based on Freya PTS
+ * @author Gnacik
*/
public class Q249_PoisonedPlainsOfTheLizardmen extends Quest
{
private static final String qn = "249_PoisonedPlainsOfTheLizardmen";
+
private static final int _mouen = 30196;
private static final int _johnny = 32744;
@@ -35,10 +35,11 @@ public class Q249_PoisonedPlainsOfTheLizardmen 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;
+ }
if (npc.getNpcId() == _mouen)
{
@@ -49,10 +50,9 @@ public class Q249_PoisonedPlainsOfTheLizardmen extends Quest
st.playSound("ItemSound.quest_accept");
}
}
- else if (npc.getNpcId() == _johnny && event.equalsIgnoreCase("32744-03.htm"))
+ else if ((npc.getNpcId() == _johnny) && event.equalsIgnoreCase("32744-03.htm"))
{
- st.unset("cond");
- st.giveItems(57, 83056);
+ st.giveAdena(83056, false);
st.addExpAndSp(477496, 58743);
st.playSound("ItemSound.quest_finish");
st.exitQuest(false);
@@ -64,25 +64,33 @@ public class Q249_PoisonedPlainsOfTheLizardmen extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
+ final QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
+ }
if (npc.getNpcId() == _mouen)
{
- switch(st.getState())
+ switch (st.getState())
{
- case State.CREATED :
+ case State.CREATED:
if (player.getLevel() >= 82)
+ {
htmltext = "30196-01.htm";
+ }
else
+ {
htmltext = "30196-00.htm";
+ }
break;
- case State.STARTED :
+ case State.STARTED:
if (st.getInt("cond") == 1)
+ {
htmltext = "30196-04.htm";
+ }
break;
- case State.COMPLETED :
+ case State.COMPLETED:
htmltext = "30196-05.htm";
break;
}
@@ -90,9 +98,13 @@ public class Q249_PoisonedPlainsOfTheLizardmen extends Quest
else if (npc.getNpcId() == _johnny)
{
if (st.getInt("cond") == 1)
+ {
htmltext = "32744-01.htm";
+ }
else if (st.isCompleted())
+ {
htmltext = "32744-04.htm";
+ }
}
return htmltext;
}
@@ -102,12 +114,11 @@ public class Q249_PoisonedPlainsOfTheLizardmen extends Quest
super(questId, name, descr);
addStartNpc(_mouen);
- addTalkId(_mouen);
- addTalkId(_johnny);
+ addTalkId(_mouen, _johnny);
}
public static void main(String[] args)
{
new Q249_PoisonedPlainsOfTheLizardmen(249, qn, "Poisoned Plains of the Lizardmen");
}
-}
\ No newline at end of file
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q250_WatchWhatYouEat/Q250_WatchWhatYouEat.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q250_WatchWhatYouEat/Q250_WatchWhatYouEat.java
index e955af35bc2504258f12ac0f0727861330f74cb9..086d382064e457b79804bab0d4c8dcaeba9510de 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q250_WatchWhatYouEat/Q250_WatchWhatYouEat.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q250_WatchWhatYouEat/Q250_WatchWhatYouEat.java
@@ -14,7 +14,6 @@
*/
package quests.Q250_WatchWhatYouEat;
-import com.l2jserver.gameserver.instancemanager.QuestManager;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
@@ -22,31 +21,39 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
/**
- ** @author Gnacik
- **
- ** 2010-08-05 Based on Freya PTS
+ * 2010-08-05 Based on Freya PTS
+ * @author Gnacik
*/
-
public class Q250_WatchWhatYouEat extends Quest
{
private static final String qn = "250_WatchWhatYouEat";
+
// NPCs
private static final int _sally = 32743;
// Mobs - Items
- private static final int[][] _mobs = {
- { 18864, 15493 },
- { 18865, 15494 },
- { 18868, 15495 }
+ private static final int[][] _mobs =
+ {
+ {
+ 18864, 15493
+ },
+ {
+ 18865, 15494
+ },
+ {
+ 18868, 15495
+ }
};
@Override
- public String onAdvEvent (String event, L2Npc npc, L2PcInstance player)
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
String htmltext = event;
QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
+ }
if (npc.getNpcId() == _sally)
{
@@ -58,9 +65,8 @@ public class Q250_WatchWhatYouEat extends Quest
}
else if (event.equalsIgnoreCase("32743-end.htm"))
{
- st.unset("cond");
- st.rewardItems(57,135661);
- st.addExpAndSp(698334,76369);
+ st.giveAdena(135661, false);
+ st.addExpAndSp(698334, 76369);
st.playSound("ItemSound.quest_finish");
st.exitQuest(false);
}
@@ -76,38 +82,48 @@ public class Q250_WatchWhatYouEat extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
+ final QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
+ }
if (npc.getNpcId() == _sally)
{
- switch(st.getState())
+ switch (st.getState())
{
- case State.CREATED :
+ case State.CREATED:
if (player.getLevel() >= 82)
+ {
htmltext = "32743-01.htm";
+ }
else
+ {
htmltext = "32743-00.htm";
+ }
break;
- case State.STARTED :
+ case State.STARTED:
if (st.getInt("cond") == 1)
{
htmltext = "32743-04.htm";
}
else if (st.getInt("cond") == 2)
{
- if(st.hasQuestItems(_mobs[0][1]) && st.hasQuestItems(_mobs[1][1]) && st.hasQuestItems(_mobs[2][1]))
+ if (st.hasQuestItems(_mobs[0][1]) && st.hasQuestItems(_mobs[1][1]) && st.hasQuestItems(_mobs[2][1]))
{
htmltext = "32743-05.htm";
- for(int items[] : _mobs)
+ for (int items[] : _mobs)
+ {
st.takeItems(items[1], -1);
+ }
}
else
+ {
htmltext = "32743-06.htm";
+ }
}
break;
- case State.COMPLETED :
+ case State.COMPLETED:
htmltext = "32743-done.htm";
break;
}
@@ -118,12 +134,14 @@ public class Q250_WatchWhatYouEat extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
{
- QuestState st = player.getQuestState(qn);
+ final QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return null;
- if (st.getState() == State.STARTED && st.getInt("cond") == 1)
+ }
+ if (st.isStarted() && (st.getInt("cond") == 1))
{
- for(int mob[] : _mobs)
+ for (int mob[] : _mobs)
{
if (npc.getNpcId() == mob[0])
{
@@ -134,7 +152,7 @@ public class Q250_WatchWhatYouEat extends Quest
}
}
}
- if(st.hasQuestItems(_mobs[0][1]) && st.hasQuestItems(_mobs[1][1]) && st.hasQuestItems(_mobs[2][1]))
+ if (st.hasQuestItems(_mobs[0][1]) && st.hasQuestItems(_mobs[1][1]) && st.hasQuestItems(_mobs[2][1]))
{
st.set("cond", "2");
st.playSound("ItemSound.quest_middle");
@@ -146,15 +164,16 @@ public class Q250_WatchWhatYouEat extends Quest
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
- QuestState st = player.getQuestState(qn);
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
- Quest q = QuestManager.getInstance().getQuest(qn);
- st = q.newQuestState(player);
+ newQuestState(player);
}
if (npc.getNpcId() == _sally)
+ {
return "32743-20.html";
+ }
return null;
}
@@ -163,14 +182,19 @@ public class Q250_WatchWhatYouEat extends Quest
{
super(questId, name, descr);
- questItemIds = new int[]{15493,15494,15495};
-
+ questItemIds = new int[]
+ {
+ 15493, 15494, 15495
+ };
+
addStartNpc(_sally);
addFirstTalkId(_sally);
addTalkId(_sally);
- for(int i[] : _mobs)
+ for (int i[] : _mobs)
+ {
addKillId(i[0]);
+ }
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q278_HomeSecurity/Q278_HomeSecurity.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q278_HomeSecurity/Q278_HomeSecurity.java
index fb21725721527561f4adf34cdbce293b6c217214..50e60d859bfbb7739ce1f10ddd177b02c1c6cea3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q278_HomeSecurity/Q278_HomeSecurity.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q278_HomeSecurity/Q278_HomeSecurity.java
@@ -30,7 +30,10 @@ public class Q278_HomeSecurity extends Quest
private static final String qn = "278_HomeSecurity";
// NPC
private static final int Tunatun = 31537;
- private static final int[] Monster = { 18905, 18906, 18907 };
+ private static final int[] Monster =
+ {
+ 18905, 18906, 18907
+ };
// Item
private static final int SelMahumMane = 15531;
@@ -38,17 +41,15 @@ public class Q278_HomeSecurity 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;
+ }
if (event.equalsIgnoreCase("31537-02.htm"))
{
- if (player.getLevel() >= 82)
- htmltext = "31537-02.htm";
- else
- htmltext = "31537-03.html";
+ htmltext = (player.getLevel() >= 82) ? "31537-02.htm" : "31537-03.html";
}
else if (event.equalsIgnoreCase("31537-04.htm"))
{
@@ -61,31 +62,57 @@ public class Q278_HomeSecurity extends Quest
int i0 = Rnd.get(100);
if (i0 < 10)
+ {
st.giveItems(960, 1);
+ }
else if (i0 < 19)
+ {
st.giveItems(960, 2);
+ }
else if (i0 < 27)
+ {
st.giveItems(960, 3);
+ }
else if (i0 < 34)
+ {
st.giveItems(960, 4);
+ }
else if (i0 < 40)
+ {
st.giveItems(960, 5);
+ }
else if (i0 < 45)
+ {
st.giveItems(960, 6);
+ }
else if (i0 < 49)
+ {
st.giveItems(960, 7);
+ }
else if (i0 < 52)
+ {
st.giveItems(960, 8);
+ }
else if (i0 < 54)
+ {
st.giveItems(960, 9);
+ }
else if (i0 < 55)
+ {
st.giveItems(960, 10);
+ }
else if (i0 < 75)
+ {
st.giveItems(9553, 1);
+ }
else if (i0 < 90)
+ {
st.giveItems(9553, 2);
+ }
else
+ {
st.giveItems(959, 1);
+ }
st.takeItems(SelMahumMane, -1);
st.unset("cond");
@@ -100,10 +127,11 @@ public class Q278_HomeSecurity extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- QuestState st = player.getQuestState(qn);
-
+ final QuestState st = player.getQuestState(qn);
if (st == null)
+ {
return htmltext;
+ }
switch (st.getState())
{
@@ -111,10 +139,14 @@ public class Q278_HomeSecurity extends Quest
htmltext = "31537-01.htm";
break;
case State.STARTED:
- if (st.getInt("cond") == 1 || st.getQuestItemsCount(SelMahumMane) < 300)
+ if ((st.getInt("cond") == 1) || (st.getQuestItemsCount(SelMahumMane) < 300))
+ {
htmltext = "31537-06.html";
- else if (st.getInt("cond") == 2 && st.getQuestItemsCount(SelMahumMane) >= 300)
+ }
+ else if ((st.getInt("cond") == 2) && (st.getQuestItemsCount(SelMahumMane) >= 300))
+ {
htmltext = "31537-05.html";
+ }
break;
}
return htmltext;
@@ -125,7 +157,9 @@ public class Q278_HomeSecurity extends Quest
{
L2PcInstance partyMember = getRandomPartyMember(player, "1");
if (partyMember == null)
+ {
return null;
+ }
final QuestState st = partyMember.getQuestState(qn);
int chance, i1;
@@ -145,7 +179,9 @@ public class Q278_HomeSecurity extends Quest
st.playSound("ItemSound.quest_middle");
}
else
+ {
st.playSound("ItemSound.quest_itemget");
+ }
}
break;
case 18905: // Farm Ravager (Crazy)
@@ -189,12 +225,15 @@ public class Q278_HomeSecurity extends Quest
public Q278_HomeSecurity(int questId, String name, String descr)
{
super(questId, name, descr);
+
addStartNpc(Tunatun);
addTalkId(Tunatun);
- for (int i : Monster)
- addKillId(i);
+ addKillId(Monster);
- questItemIds = new int[] { SelMahumMane };
+ questItemIds = new int[]
+ {
+ SelMahumMane
+ };
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q279_TargetOfOpportunity/Q279_TargetOfOpportunity.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q279_TargetOfOpportunity/Q279_TargetOfOpportunity.java
index 850c7875dc0331a4f9470f2f317ecea198351294..5125bcd090627c71744f36553902b3e53b4aec36 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q279_TargetOfOpportunity/Q279_TargetOfOpportunity.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q279_TargetOfOpportunity/Q279_TargetOfOpportunity.java
@@ -54,11 +54,7 @@ public final class Q279_TargetOfOpportunity extends Quest
addStartNpc(JERIAN);
addTalkId(JERIAN);
-
- for (int monster : MONSTERS)
- {
- addKillId(monster);
- }
+ addKillId(MONSTERS);
}
@Override
@@ -66,7 +62,6 @@ public final class Q279_TargetOfOpportunity extends Quest
{
String htmltext = event;
final QuestState st = player.getQuestState(qn);
-
if ((st == null) || (player.getLevel() < 82))
{
return getNoQuestMsg(player);
@@ -96,35 +91,20 @@ public final class Q279_TargetOfOpportunity extends Quest
@Override
public final String onTalk(L2Npc npc, L2PcInstance player)
{
- String htmltext = Quest.getNoQuestMsg(player);
+ String htmltext = getNoQuestMsg(player);
final QuestState st = player.getQuestState(qn);
- if (st != null)
+ if (st == null)
{
- if (st.getState() == State.CREATED)
- {
- if (player.getLevel() >= 82)
- {
- htmltext = "32302-01.htm";
- }
- else
- {
- htmltext = "32302-02.htm";
- }
- }
- else if (st.getState() == State.STARTED)
- {
- if (st.getInt("progress") == 1)
- {
- if (st.hasQuestItems(SEAL_COMPONENTS[0]) && st.hasQuestItems(SEAL_COMPONENTS[1]) && st.hasQuestItems(SEAL_COMPONENTS[2]) && st.hasQuestItems(SEAL_COMPONENTS[3]))
- {
- htmltext = "32302-07.htm";
- }
- else
- {
- htmltext = "32302-06.htm";
- }
- }
- }
+ return htmltext;
+ }
+
+ if (st.getState() == State.CREATED)
+ {
+ htmltext = (player.getLevel() >= 82) ? "32302-01.htm" : "32302-02.htm";
+ }
+ else if ((st.getState() == State.STARTED) && (st.getInt("progress") == 1))
+ {
+ htmltext = (st.hasQuestItems(SEAL_COMPONENTS[0]) && st.hasQuestItems(SEAL_COMPONENTS[1]) && st.hasQuestItems(SEAL_COMPONENTS[2]) && st.hasQuestItems(SEAL_COMPONENTS[3])) ? "32302-07.htm" : "32302-06.htm";
}
return htmltext;
}