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_04.0_GrandCrusade/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;

3
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ItemChanceHolder.java
View File

@@ -21,8 +21,7 @@ import java.util.List;
import org.l2jmobius.commons.util.Rnd;
/**
* A DTO for items; contains item ID, count and chance.<br>
* Complemented by {@link QuestItemHolder}.
* A DTO for items; contains item ID, count and chance.
* @author xban1x
*/
public class ItemChanceHolder extends ItemHolder

3
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ItemHolder.java
View File

@@ -20,8 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.interfaces.IIdentifiable;
/**
* A simple DTO for items; contains item ID and count.<br>
* Extended by {@link ItemChanceHolder}, {@link QuestItemHolder}, {@link UniqueItemHolder}.
* A simple DTO for items; contains item ID and count.
* @author UnAfraid
*/
public class ItemHolder implements IIdentifiable

53
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/QuestItemHolder.java
View File

@@ -1,53 +0,0 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.model.holders;
/**
* A DTO for items; contains item ID, count and chance.<br>
* Complemented by {@link ItemChanceHolder}.
* @author xban1x
*/
public class QuestItemHolder extends ItemHolder
{
private final int _chance;
public QuestItemHolder(int id, int chance)
{
this(id, chance, 1);
}
public QuestItemHolder(int id, int chance, long count)
{
super(id, count);
_chance = chance;
}
/**
* Gets the chance.
* @return the drop chance of the item contained in this object
*/
public int getChance()
{
return _chance;
}
@Override
public String toString()
{
return "[" + getClass().getSimpleName() + "] ID: " + getId() + ", count: " + getCount() + ", chance: " + _chance;
}
}