Mirror/LunarCore
1
0
Fork 0
mirror of https://github.com/Melledy/LunarCore.git synced 2025-12-16 15:24:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix drop modifiers causing an imperfect amount of drops

Browse Source
This commit is contained in:
Melledy
2023-12-10 18:27:17 -08:00
parent 851d4aa885
commit 5a46313f5f
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/emu/lunarcore/game/drops/DropParam.java
View File

@@ -1,5 +1,7 @@
package emu.lunarcore.game.drops; package emu.lunarcore.game.drops;
import java.math.BigDecimal;
import emu.lunarcore.GameConstants; import emu.lunarcore.GameConstants;
import emu.lunarcore.LunarCore; import emu.lunarcore.LunarCore;
import emu.lunarcore.data.GameData; import emu.lunarcore.data.GameData;
@@ -80,11 +82,11 @@ public class DropParam {
} }
// Get count // Get count
double count = generateCount(); var count = BigDecimal.valueOf(generateCount());
var rates = LunarCore.getConfig().getServerRates(); var rates = LunarCore.getConfig().getServerRates();
// Generate item(s) // Generate item(s)
while (count > 0) { while (count.doubleValue() > 0) {
int itemId = generateItemId(); int itemId = generateItemId();
ItemExcel excel = GameData.getItemExcelMap().get(itemId); ItemExcel excel = GameData.getItemExcelMap().get(itemId);
@@ -94,17 +96,18 @@ public class DropParam {
// Add relic/equipment drop // Add relic/equipment drop
if (rates.getEquip() > 0) { if (rates.getEquip() > 0) {
drops.addTo(itemId, 1); drops.addTo(itemId, 1);
count -= (1 / rates.getEquip()); count = count.subtract(BigDecimal.valueOf(1.0 / rates.getEquip()));
} else { } else {
count -= 1; // To prevent a rate of 0 from freezing the server // To prevent a rate of 0 from freezing the server
count = count.subtract(BigDecimal.ONE);
} }
} else { } else {
// Apply server rates to drop amount amount // Apply server rates to drop amount amount
int amount = switch (itemId) { int amount = switch (itemId) {
case GameConstants.TRAILBLAZER_EXP_ID -> (int) Math.floor(count * rates.getExp()); case GameConstants.TRAILBLAZER_EXP_ID -> (int) Math.floor(count.doubleValue() * rates.getExp());
case GameConstants.MATERIAL_COIN_ID -> (int) Math.floor(count * rates.getCredit()); case GameConstants.MATERIAL_COIN_ID -> (int) Math.floor(count.doubleValue() * rates.getCredit());
case GameConstants.MATERIAL_HCOIN_ID -> (int) Math.floor(count * rates.getJade()); case GameConstants.MATERIAL_HCOIN_ID -> (int) Math.floor(count.doubleValue() * rates.getJade());
default -> (int) Math.floor(count * rates.getMaterial()); default -> (int) Math.floor(count.doubleValue() * rates.getMaterial());
}; };
// Add material/virtual drop // Add material/virtual drop
@@ -113,7 +116,7 @@ public class DropParam {
} }
// To prevent a rate of 0 from freezing the server // To prevent a rate of 0 from freezing the server
count -= count; count = BigDecimal.ZERO;
} }
} }
} }