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

Removal of QuestItemHolder class.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-01-29 00:15:02 +00:00
parent 853e48cd81
commit a849367e88
106 changed files with 603 additions and 1868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java vendored
View File

@@ -24,7 +24,7 @@ import java.util.Map;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.holders.QuestItemHolder;
import org.l2jmobius.gameserver.model.holders.ItemChanceHolder;
import ai.AbstractNpcAI;
@@ -48,25 +48,25 @@ public class Alexandria extends AbstractNpcAI
new ItemHolder(9817, 50),
};
// Agathions
private static final QuestItemHolder[] LITTLE_DEVILS = new QuestItemHolder[]
private static final ItemChanceHolder[] LITTLE_DEVILS = new ItemChanceHolder[]
{
new AdditionalQuestItemHolder(10321, 600, 1, 10408),
new QuestItemHolder(10322, 10),
new QuestItemHolder(10323, 10),
new QuestItemHolder(10324, 5),
new QuestItemHolder(10325, 5),
new QuestItemHolder(10326, 370),
new AdditionalItemChanceHolder(10321, 600, 1, 10408),
new ItemChanceHolder(10322, 10),
new ItemChanceHolder(10323, 10),
new ItemChanceHolder(10324, 5),
new ItemChanceHolder(10325, 5),
new ItemChanceHolder(10326, 370),
};
private static final QuestItemHolder[] LITTLE_ANGELS = new QuestItemHolder[]
private static final ItemChanceHolder[] LITTLE_ANGELS = new ItemChanceHolder[]
{
new AdditionalQuestItemHolder(10315, 600, 1, 10408),
new QuestItemHolder(10316, 10),
new QuestItemHolder(10317, 10),
new QuestItemHolder(10318, 5),
new QuestItemHolder(10319, 5),
new QuestItemHolder(10320, 370),
new AdditionalItemChanceHolder(10315, 600, 1, 10408),
new ItemChanceHolder(10316, 10),
new ItemChanceHolder(10317, 10),
new ItemChanceHolder(10318, 5),
new ItemChanceHolder(10319, 5),
new ItemChanceHolder(10320, 370),
};
private static final Map<String, List<QuestItemHolder>> AGATHIONS = new HashMap<>();
private static final Map<String, List<ItemChanceHolder>> AGATHIONS = new HashMap<>();
static
{
@@ -94,7 +94,7 @@ public class Alexandria extends AbstractNpcAI
final int chance = getRandom(1000);
int chance2 = 0;
int chance3 = 0;
for (QuestItemHolder agathion : AGATHIONS.get(event))
for (ItemChanceHolder agathion : AGATHIONS.get(event))
{
chance3 += agathion.getChance();
if ((chance >= chance2) && (chance2 < chance3))
@@ -103,9 +103,9 @@ public class Alexandria extends AbstractNpcAI
{
giveItems(player, agathion);
htmltext = "30098-03.html";
if (agathion instanceof AdditionalQuestItemHolder)
if (agathion instanceof AdditionalItemChanceHolder)
{
giveItems(player, ((AdditionalQuestItemHolder) agathion).getAdditionalId(), 1);
giveItems(player, ((AdditionalItemChanceHolder) agathion).getAdditionalId(), 1);
htmltext = "30098-03a.html";
}
}
@@ -121,11 +121,11 @@ public class Alexandria extends AbstractNpcAI
return htmltext;
}
private static class AdditionalQuestItemHolder extends QuestItemHolder
private static class AdditionalItemChanceHolder extends ItemChanceHolder
{
private final int _additionalId;
public AdditionalQuestItemHolder(int id, int chance, long count, int additionalId)
public AdditionalItemChanceHolder(int id, int chance, long count, int additionalId)
{
super(id, chance, count);
_additionalId = additionalId;

18
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java vendored
View File

@@ -22,7 +22,7 @@ import java.util.Map;
import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.QuestItemHolder;
import org.l2jmobius.gameserver.model.holders.ItemChanceHolder;
import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.model.quest.QuestState;
import org.l2jmobius.gameserver.util.Util;
@@ -101,15 +101,15 @@ public class Q00372_LegacyOfInsolence extends Quest
private static final int SEALED_MAJESTIC_CIRCLET_DESIGN = 5528;
// Monsters
private static final int HALLATES_INSPECTOR = 20825;
private static final Map<Integer, QuestItemHolder> MONSTER_REWARDS = new HashMap<>();
private static final Map<Integer, ItemChanceHolder> MONSTER_REWARDS = new HashMap<>();
static
{
MONSTER_REWARDS.put(20817, new QuestItemHolder(ANCIENT_RED_PAPYRUS, 302, 1));
MONSTER_REWARDS.put(20821, new QuestItemHolder(ANCIENT_RED_PAPYRUS, 410, 1));
MONSTER_REWARDS.put(HALLATES_INSPECTOR, new QuestItemHolder(ANCIENT_RED_PAPYRUS, 447, 1));
MONSTER_REWARDS.put(20829, new QuestItemHolder(ANCIENT_BLUE_PAPYRUS, 451, 1));
MONSTER_REWARDS.put(21062, new QuestItemHolder(ANCIENT_WHITE_PAPYRUS, 290, 1));
MONSTER_REWARDS.put(21069, new QuestItemHolder(ANCIENT_BLACK_PAPYRUS, 280, 1));
MONSTER_REWARDS.put(20817, new ItemChanceHolder(ANCIENT_RED_PAPYRUS, 302, 1));
MONSTER_REWARDS.put(20821, new ItemChanceHolder(ANCIENT_RED_PAPYRUS, 410, 1));
MONSTER_REWARDS.put(HALLATES_INSPECTOR, new ItemChanceHolder(ANCIENT_RED_PAPYRUS, 447, 1));
MONSTER_REWARDS.put(20829, new ItemChanceHolder(ANCIENT_BLUE_PAPYRUS, 451, 1));
MONSTER_REWARDS.put(21062, new ItemChanceHolder(ANCIENT_WHITE_PAPYRUS, 290, 1));
MONSTER_REWARDS.put(21069, new ItemChanceHolder(ANCIENT_BLACK_PAPYRUS, 280, 1));
}
// Misc
@@ -445,7 +445,7 @@ public class Q00372_LegacyOfInsolence extends Quest
@Override
public String onKill(Npc npc, Player killer, boolean isSummon)
{
final QuestItemHolder item = MONSTER_REWARDS.get(npc.getId());
final ItemChanceHolder item = MONSTER_REWARDS.get(npc.getId());
if (npc.getId() == HALLATES_INSPECTOR)
{
if (getRandom(1000) < item.getChance())