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 722d7a425f9156a3189dc8a0dea2c42523fcd330..cf99add62f50e93be662ce527e92d5fbbf01d002 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
@@ -24,7 +24,8 @@ import com.l2jserver.gameserver.model.quest.State;
/**
* Light Fragment (10272)
- * @author Gladicek Updated 28-10-2011
+ * @author Gladicek
+ * @version last updated 01-05-2012
*/
public class Q10272_LightFragment extends Quest
{
@@ -81,14 +82,7 @@ public class Q10272_LightFragment extends Quest
else
{
final QuestState _prev = player.getQuestState("10271_TheEnvelopingDarkness");
- if ((_prev != null) && _prev.isCompleted())
- {
- htmltext = "32560-01.htm";
- }
- else
- {
- htmltext = "32560-02.htm";
- }
+ htmltext = ((_prev != null) && _prev.isCompleted()) ? "32560-01.htm" : "32560-02.htm";
}
break;
case State.STARTED:
@@ -144,20 +138,20 @@ public class Q10272_LightFragment extends Quest
}
else
{
+ htmltext = "32559-17.htm";
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);
+ htmltext = "32559-18.htm";
+ st.giveAdena(556980, true);
st.addExpAndSp(1009016, 91363);
st.playSound("ItemSound.quest_finish");
st.exitQuest(false);
- htmltext = "32559-18.htm";
break;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q251_NoSecrets/Q251_NoSecrets.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q251_NoSecrets/Q251_NoSecrets.java
index edeb6dfa33f58e6e95888026832d1350b5cc0f5f..69cece47e34af6786e8814210d01e5dfc6f05e1e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q251_NoSecrets/Q251_NoSecrets.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q251_NoSecrets/Q251_NoSecrets.java
@@ -21,6 +21,10 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.util.Util;
+/**
+ * No Secrets?? (215)
+ * @author Dumpster
+ */
public class Q251_NoSecrets extends Quest
{
public static final int PINAPS = 30201;
@@ -51,85 +55,70 @@ public class Q251_NoSecrets extends Quest
addStartNpc(PINAPS);
addTalkId(PINAPS);
-
- for (int i : MOBS)
- {
- addKillId(i);
- }
- for (int i : MOBS2)
- {
- addKillId(i);
- }
+ addKillId(MOBS);
+ addKillId(MOBS2);
}
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
- String htmltext = event;
QuestState st = player.getQuestState(qn);
if (st == null)
{
- return htmltext;
+ return getNoQuestMsg(player);
}
- if (npc.getNpcId() == PINAPS)
+ if (event.equalsIgnoreCase("30201-03.htm"))
{
- if (event.equalsIgnoreCase("30201-03.htm"))
- {
- st.set("cond", "1");
- st.setState(State.STARTED);
- st.playSound("ItemSound.quest_accept");
- }
+ st.set("cond", "1");
+ 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);
+ final QuestState st = player.getQuestState(qn);
if (st == null)
{
return htmltext;
}
- if (npc.getNpcId() == PINAPS)
+ switch (st.getState())
{
- switch (st.getState())
- {
- case State.CREATED:
- if (player.getLevel() >= 82)
- {
- htmltext = "30201-01.htm";
- }
- else
- {
- htmltext = "30201-00.htm";
- }
- break;
- case State.STARTED:
- if (st.getInt("cond") == 1)
- {
- htmltext = "30201-05.htm";
- }
- else if (st.getInt("cond") == 2)
+ case State.CREATED:
+ if (player.getLevel() >= 82)
+ {
+ htmltext = "30201-01.htm";
+ }
+ else
+ {
+ htmltext = "30201-00.htm";
+ }
+ break;
+ case State.STARTED:
+ if (st.getInt("cond") == 1)
+ {
+ htmltext = "30201-05.htm";
+ }
+ else if (st.getInt("cond") == 2)
+ {
+ if ((st.getQuestItemsCount(DIARY) >= 10) && (st.getQuestItemsCount(TABLE) >= 5))
{
- if ((st.getQuestItemsCount(DIARY) >= 10) && (st.getQuestItemsCount(TABLE) >= 5))
- {
- htmltext = "30201-04.htm";
- st.takeItems(DIARY, -1);
- st.takeItems(TABLE, -1);
- st.giveAdena(313355, true);
- st.addExpAndSp(56787, 160578);
- st.playSound("ItemSound.quest_finish");
- st.exitQuest(false);
- }
+ htmltext = "30201-04.htm";
+ st.rewardItems(57, 313355);
+ st.addExpAndSp(56787, 160578);
+ st.playSound("ItemSound.quest_finish");
+ st.exitQuest(false);
}
- break;
- case State.COMPLETED:
- htmltext = "30201-06.htm";
- }
+ }
+ break;
+ case State.COMPLETED:
+ htmltext = "30201-06.htm";
+ break;
}
return htmltext;
}
@@ -137,31 +126,34 @@ public class Q251_NoSecrets extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
{
- QuestState st = player.getQuestState(getName());
- int npcId = npc.getNpcId();
- if ((st == null) || (st.getState() != State.STARTED))
- {
- return null;
- }
- if (st.getInt("cond") == 1)
+ final QuestState st = player.getQuestState(getName());
+ if ((st != null) && st.isStarted() && (st.getInt("cond") == 1))
{
- if ((Util.contains(MOBS, npcId)) && (getRandom(100) < 10) && (st.getQuestItemsCount(DIARY) < 10))
+ final int npcId = npc.getNpcId();
+
+ if (Util.contains(MOBS, npcId) && (getRandom(100) < 10) && (st.getQuestItemsCount(DIARY) < 10))
{
st.giveItems(DIARY, 1);
- st.playSound("ItemSound.quest_itemget");
if ((st.getQuestItemsCount(DIARY) >= 10) && (st.getQuestItemsCount(TABLE) >= 5))
{
st.set("cond", "2");
+ st.playSound("ItemSound.quest_middle");
+ }
+ else
+ {
st.playSound("ItemSound.quest_itemget");
}
}
- else if ((Util.contains(MOBS2, npcId)) && (getRandom(100) < 5) && (st.getQuestItemsCount(TABLE) < 5))
+ else if (Util.contains(MOBS2, npcId) && (getRandom(100) < 5) && (st.getQuestItemsCount(TABLE) < 5))
{
st.giveItems(TABLE, 1);
- st.playSound("ItemSound.quest_itemget");
if ((st.getQuestItemsCount(DIARY) >= 10) && (st.getQuestItemsCount(TABLE) >= 5))
{
st.set("cond", "2");
+ st.playSound("ItemSound.quest_middle");
+ }
+ else
+ {
st.playSound("ItemSound.quest_itemget");
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q692_HowtoOpposeEvil/Q692_HowtoOpposeEvil.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q692_HowtoOpposeEvil/Q692_HowtoOpposeEvil.java
index 693ddb383d24ea6855ac34189501b76daeb7b09d..d6f59c795ecc91908c0041a462d0c575fc79c47e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q692_HowtoOpposeEvil/Q692_HowtoOpposeEvil.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q692_HowtoOpposeEvil/Q692_HowtoOpposeEvil.java
@@ -24,6 +24,7 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
/**
+ * How to Oppose Evil(692)
* @author Gigiikun
*/
public final class Q692_HowtoOpposeEvil extends Quest
@@ -42,268 +43,83 @@ public final class Q692_HowtoOpposeEvil extends Quest
15536
};
- private static final TIntObjectHashMap<Integer[]> _questMobs = new TIntObjectHashMap<Integer[]>();
+ private static final TIntObjectHashMap<int[]> _questMobs = new TIntObjectHashMap<>();
+ //@formatter:off
static
{
// Seed of Infinity
- _questMobs.put(22509, new Integer[]
- {
- 13863,
- 500
- });
- _questMobs.put(22510, new Integer[]
- {
- 13863,
- 500
- });
- _questMobs.put(22511, new Integer[]
- {
- 13863,
- 500
- });
- _questMobs.put(22512, new Integer[]
- {
- 13863,
- 500
- });
- _questMobs.put(22513, new Integer[]
- {
- 13863,
- 500
- });
- _questMobs.put(22514, new Integer[]
- {
- 13863,
- 500
- });
- _questMobs.put(22515, new Integer[]
- {
- 13863,
- 500
- });
+ _questMobs.put(22509, new int[] { 13863, 500 });
+ _questMobs.put(22510, new int[] { 13863, 500 });
+ _questMobs.put(22511, new int[] { 13863, 500 });
+ _questMobs.put(22512, new int[] { 13863, 500 });
+ _questMobs.put(22513, new int[] { 13863, 500 });
+ _questMobs.put(22514, new int[] { 13863, 500 });
+ _questMobs.put(22515, new int[] { 13863, 500 });
// Seed of Destruction
- _questMobs.put(22537, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22538, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22539, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22540, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22541, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22542, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22543, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22544, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22546, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22547, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22548, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22549, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22550, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22551, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22552, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22593, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22596, new Integer[]
- {
- 13865,
- 250
- });
- _questMobs.put(22597, new Integer[]
- {
- 13865,
- 250
- });
+ _questMobs.put(22537, new int[] { 13865, 250 });
+ _questMobs.put(22538, new int[] { 13865, 250 });
+ _questMobs.put(22539, new int[] { 13865, 250 });
+ _questMobs.put(22540, new int[] { 13865, 250 });
+ _questMobs.put(22541, new int[] { 13865, 250 });
+ _questMobs.put(22542, new int[] { 13865, 250 });
+ _questMobs.put(22543, new int[] { 13865, 250 });
+ _questMobs.put(22544, new int[] { 13865, 250 });
+ _questMobs.put(22546, new int[] { 13865, 250 });
+ _questMobs.put(22547, new int[] { 13865, 250 });
+ _questMobs.put(22548, new int[] { 13865, 250 });
+ _questMobs.put(22549, new int[] { 13865, 250 });
+ _questMobs.put(22550, new int[] { 13865, 250 });
+ _questMobs.put(22551, new int[] { 13865, 250 });
+ _questMobs.put(22552, new int[] { 13865, 250 });
+ _questMobs.put(22593, new int[] { 13865, 250 });
+ _questMobs.put(22596, new int[] { 13865, 250 });
+ _questMobs.put(22597, new int[] { 13865, 250 });
// Seed of Annihilation
- _questMobs.put(22746, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22747, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22748, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22749, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22750, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22751, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22752, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22753, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22754, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22755, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22756, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22757, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22758, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22759, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22760, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22761, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22762, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22763, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22764, new Integer[]
- {
- 15536,
- 125
- });
- _questMobs.put(22765, new Integer[]
- {
- 15536,
- 125
- });
+ _questMobs.put(22746, new int[] { 15536, 125 });
+ _questMobs.put(22747, new int[] { 15536, 125 });
+ _questMobs.put(22748, new int[] { 15536, 125 });
+ _questMobs.put(22749, new int[] { 15536, 125 });
+ _questMobs.put(22750, new int[] { 15536, 125 });
+ _questMobs.put(22751, new int[] { 15536, 125 });
+ _questMobs.put(22752, new int[] { 15536, 125 });
+ _questMobs.put(22753, new int[] { 15536, 125 });
+ _questMobs.put(22754, new int[] { 15536, 125 });
+ _questMobs.put(22755, new int[] { 15536, 125 });
+ _questMobs.put(22756, new int[] { 15536, 125 });
+ _questMobs.put(22757, new int[] { 15536, 125 });
+ _questMobs.put(22758, new int[] { 15536, 125 });
+ _questMobs.put(22759, new int[] { 15536, 125 });
+ _questMobs.put(22760, new int[] { 15536, 125 });
+ _questMobs.put(22761, new int[] { 15536, 125 });
+ _questMobs.put(22762, new int[] { 15536, 125 });
+ _questMobs.put(22763, new int[] { 15536, 125 });
+ _questMobs.put(22764, new int[] { 15536, 125 });
+ _questMobs.put(22765, new int[] { 15536, 125 });
}
+ //@formatter:on
- private final boolean giveReward(QuestState st, int itemId, int minCount, int rewardItemId, long rewardCount)
+ private static final boolean giveReward(QuestState st, int itemId, int minCount, int rewardItemId, long rewardCount)
{
long count = st.getQuestItemsCount(itemId);
- if (count >= minCount)
+ if (count < minCount)
{
- count = count / minCount;
- st.takeItems(itemId, count * minCount);
- if (rewardItemId == 57)
- {
- st.giveAdena(rewardCount * count, true);
- }
- else
- {
- st.giveItems(rewardItemId, rewardCount * count);
- }
- return true;
+ return false;
}
- return false;
+
+ count = count / minCount;
+ st.takeItems(itemId, count * minCount);
+ st.rewardItems(rewardItemId, rewardCount * count);
+ return true;
}
@Override
public final String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
- String htmltext = event;
QuestState st = player.getQuestState(QN);
if (st == null)
{
- return "";
+ return getNoQuestMsg(player);
}
if (event.equalsIgnoreCase("32549-03.htm"))
{
@@ -357,39 +173,32 @@ public final class Q692_HowtoOpposeEvil extends Quest
return "32550-20.htm";
}
}
- return htmltext;
+ return event;
}
@Override
public final String onTalk(L2Npc npc, L2PcInstance player)
{
+ String htmltext = getNoQuestMsg(player);
final QuestState st = player.getQuestState(QN);
if (st == null)
{
- return getNoQuestMsg(player);
+ return htmltext;
}
- final int cond = st.getInt("cond");
- String htmltext = "";
if (st.isCreated())
{
- if (player.getLevel() >= 75)
- {
- htmltext = "32549-01.htm";
- }
- else
- {
- htmltext = "32549-00.htm";
- }
+ htmltext = (player.getLevel() >= 75) ? "32549-01.htm" : "32549-00.htm";
}
else
{
+ final int cond = st.getInt("cond");
if (npc.getNpcId() == DILIOS)
{
if ((cond == 1) && st.hasQuestItems(LEKONS_CERTIFICATE))
{
- st.takeItems(LEKONS_CERTIFICATE, 1);
htmltext = "32549-04.htm";
+ st.takeItems(LEKONS_CERTIFICATE, -1);
st.set("cond", "2");
}
else if (cond == 2)
@@ -450,13 +259,10 @@ public final class Q692_HowtoOpposeEvil extends Quest
public Q692_HowtoOpposeEvil(int questId, String name, String descr)
{
super(questId, name, descr);
- for (int i : _questMobs.keys())
- {
- addKillId(i);
- }
addStartNpc(DILIOS);
addTalkId(DILIOS);
addTalkId(32550);
+ addKillId(_questMobs.keys());
}
public static void main(String[] args)