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

Simplified drop replacement logic.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-10-26 11:27:01 +00:00
parent eff982c293
commit 55c18870df
42 changed files with 189 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/NpcData.java
View File

@@ -614,7 +614,8 @@ public class NpcData implements IXmlReader
if (dropLists != null)
{
Collections.shuffle(dropLists);
// Drops are sorted by chance (high to low).
Collections.sort(dropLists, (d1, d2) -> Double.valueOf(d2.getChance()).compareTo(Double.valueOf(d1.getChance())));
for (DropHolder dropHolder : dropLists)
{
switch (dropHolder.getDropType())

14
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@@ -693,7 +693,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
int dropOccurrenceCounter = victim.isRaid() ? Config.DROP_MAX_OCCURRENCES_RAIDBOSS : Config.DROP_MAX_OCCURRENCES_NORMAL;
List<ItemHolder> calculatedDrops = null;
List<ItemHolder> randomDrops = null;
ItemHolder replacedItem = null;
ItemHolder cachedItem = null;
if (dropOccurrenceCounter > 0)
{
for (DropHolder dropItem : dropList)
@@ -702,10 +702,10 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
// items that have 100% drop chance without server rate multipliers drop normally
if ((dropOccurrenceCounter == 0) && (dropItem.getChance() < 100) && (randomDrops != null) && (calculatedDrops != null))
{
// remove a random existing drop (temporarily if not other item replaces it)
dropOccurrenceCounter++;
replacedItem = randomDrops.remove(Rnd.get(randomDrops.size()));
calculatedDrops.remove(replacedItem);
// remove highest chance item (temporarily if no other item replaces it)
cachedItem = randomDrops.remove(0);
calculatedDrops.remove(cachedItem);
dropOccurrenceCounter = 1;
}
// check level gap that may prevent to drop item
@@ -741,9 +741,9 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
}
}
// add temporarily removed item when not replaced
if ((dropOccurrenceCounter > 0) && (replacedItem != null) && (calculatedDrops != null))
if ((dropOccurrenceCounter > 0) && (cachedItem != null) && (calculatedDrops != null))
{
calculatedDrops.add(replacedItem);
calculatedDrops.add(cachedItem);
}
// clear random drops
if (randomDrops != null)