lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for quest 341, 380 and 383.

Browse Source 
Source: f7fc3cd95f
This commit is contained in:
MobiusDevelopment
2020-01-14 19:09:38 +00:00
parent 86552032d8
commit b1a5ff9dba
6 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java vendored
View File

@@ -87,7 +87,7 @@ public class Q00341_HuntingForWildBeasts extends Quest
@Override @Override
public String onTalk(Npc npc, PlayerInstance player) public String onTalk(Npc npc, PlayerInstance player)
{ {
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
switch (qs.getState()) switch (qs.getState())

10
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java vendored
View File

@@ -19,6 +19,7 @@ package quests.Q00380_BringOutTheFlavorOfIngredients;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder;
@@ -193,10 +194,17 @@ public class Q00380_BringOutTheFlavorOfIngredients extends Quest
if ((qs != null) && (qs.getCond() < 4)) if ((qs != null) && (qs.getCond() < 4))
{ {
final ItemChanceHolder item = MONSTER_CHANCES.get(npc.getId()); final ItemChanceHolder item = MONSTER_CHANCES.get(npc.getId());
if (giveItemRandomly(qs.getPlayer(), npc, item.getId(), 1, item.getCount(), item.getChance(), true)) if (giveItemRandomly(qs.getPlayer(), npc, item.getId(), 1, item.getCount(), item.getChance(), false))
{
if ((getQuestItemsCount(killer, RITRON_FRUIT) >= 3) && (getQuestItemsCount(killer, MOON_FLOWER) >= 20) && (getQuestItemsCount(killer, LEECH_FLUIDS) >= 10))
{ {
qs.setCond(qs.getCond() + 1, true); qs.setCond(qs.getCond() + 1, true);
} }
else
{
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);
} }

2
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java vendored
View File

@@ -139,7 +139,7 @@ public class Q00383_TreasureHunt extends Quest
{ {
if (hasQuestItems(player, THIEF_KEY)) if (hasQuestItems(player, THIEF_KEY))
{ {
takeItems(player, THIEF_KEY, -1); takeItems(player, THIEF_KEY, 1);
qs.exitQuest(true, true); qs.exitQuest(true, true);
htmltext = event; htmltext = event;

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java vendored
View File

@@ -87,7 +87,7 @@ public class Q00341_HuntingForWildBeasts extends Quest
@Override @Override
public String onTalk(Npc npc, PlayerInstance player) public String onTalk(Npc npc, PlayerInstance player)
{ {
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
switch (qs.getState()) switch (qs.getState())

10
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java vendored
View File

@@ -19,6 +19,7 @@ package quests.Q00380_BringOutTheFlavorOfIngredients;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder;
@@ -193,10 +194,17 @@ public class Q00380_BringOutTheFlavorOfIngredients extends Quest
if ((qs != null) && (qs.getCond() < 4)) if ((qs != null) && (qs.getCond() < 4))
{ {
final ItemChanceHolder item = MONSTER_CHANCES.get(npc.getId()); final ItemChanceHolder item = MONSTER_CHANCES.get(npc.getId());
if (giveItemRandomly(qs.getPlayer(), npc, item.getId(), 1, item.getCount(), item.getChance(), true)) if (giveItemRandomly(qs.getPlayer(), npc, item.getId(), 1, item.getCount(), item.getChance(), false))
{
if ((getQuestItemsCount(killer, RITRON_FRUIT) >= 3) && (getQuestItemsCount(killer, MOON_FLOWER) >= 20) && (getQuestItemsCount(killer, LEECH_FLUIDS) >= 10))
{ {
qs.setCond(qs.getCond() + 1, true); qs.setCond(qs.getCond() + 1, true);
} }
else
{
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);
} }

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java vendored
View File

@@ -139,7 +139,7 @@ public class Q00383_TreasureHunt extends Quest
{ {
if (hasQuestItems(player, THIEF_KEY)) if (hasQuestItems(player, THIEF_KEY))
{ {
takeItems(player, THIEF_KEY, -1); takeItems(player, THIEF_KEY, 1);
qs.exitQuest(true, true); qs.exitQuest(true, true);
htmltext = event; htmltext = event;