From 6fd9eda1120088863a6508313e1d2d58d14b975e Mon Sep 17 00:00:00 2001
From: Adry_85 <Adrya85@hotmail.it>
Date: Thu, 16 Jan 2014 12:06:53 +0000
Subject: [PATCH] BETA: Improvements for some quest. Reported by: jurchiks
---
.../Q00235_MimirsElixir.java | 21 ++++++++-----------
.../Q00648_AnIceMerchantsDream.java | 9 +++++---
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
index 34ec5005b2..fc0931804f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
@@ -233,15 +233,15 @@ public final class Q00235_MimirsElixir extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
{
- final QuestItemHolder item = MOBS.get(npc.getId());
if (getRandom(5) == 0)
{
L2PcInstance luckyPlayer = getRandomPartyMember(player, npc);
if (luckyPlayer != null)
{
- final QuestState st = luckyPlayer.getQuestState(getName());
+ final QuestItemHolder item = MOBS.get(npc.getId());
if (giveItemRandomly(luckyPlayer, npc, item.getId(), item.getCount(), item.getCount(), 1.0, true))
{
+ final QuestState st = luckyPlayer.getQuestState(getName());
st.setMemoState(item.getChance());
st.setCond(item.getChance());
}
@@ -259,20 +259,17 @@ public final class Q00235_MimirsElixir extends Quest
{
if (npc.getId() == LADD)
{
- if (player.getRace() != PcRace.Kamael)
+ if (player.getRace() == PcRace.Kamael)
{
- if (player.getLevel() >= MIN_LEVEL)
- {
- htmltext = ((hasQuestItems(player, STAR_OF_DESTINY)) ? "30721-01.htm" : "30721-07.html");
- }
- else
- {
- htmltext = "30721-08.html";
- }
+ htmltext = "30721-09.html";
+ }
+ else if (player.getLevel() < MIN_LEVEL)
+ {
+ htmltext = "30721-08.html";
}
else
{
- htmltext = "30721-09.html";
+ htmltext = ((hasQuestItems(player, STAR_OF_DESTINY)) ? "30721-01.htm" : "30721-07.html");
}
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
index de93300841..05a662a80f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
@@ -291,10 +291,13 @@ public final class Q00648_AnIceMerchantsDream extends Quest
giveItemRandomly(st.getPlayer(), npc, SILVER_ICE_CRYSTAL, 1, 0, info.getFirstChance(), true);
}
- final QuestState st2 = st.getPlayer().getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName());
- if ((st.getCond() >= 2) && (st2 != null) && st2.isCompleted())
+ if (info.getSecondChance() > 0)
{
- giveItemRandomly(st.getPlayer(), npc, SILVER_HEMOCYTE, 1, 0, info.getSecondChance(), true);
+ final QuestState st2 = st.getPlayer().getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName());
+ if ((st.getCond() >= 2) && (st2 != null) && st2.isCompleted())
+ {
+ giveItemRandomly(st.getPlayer(), npc, SILVER_HEMOCYTE, 1, 0, info.getSecondChance(), true);
+ }
}
}
return super.onKill(npc, killer, isSummon);
--
GitLab