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

Fix relics always doing min roll after first roll (#14)

Browse Source 
* Fix relics always doing min roll after first roll

* Adjust implementation to remove stepNum
This commit is contained in:
AFNGP
2023-12-02 15:39:29 +01:00
committed by GitHub
parent dd1ee72713
commit a49f24564c
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/emu/lunarcore/game/inventory/GameItem.java
View File

@@ -212,7 +212,8 @@ public class GameItem {
private void upgradeRandomSubAffix() { private void upgradeRandomSubAffix() {
ItemSubAffix subAffix = Utils.randomElement(this.subAffixes); ItemSubAffix subAffix = Utils.randomElement(this.subAffixes);
subAffix.incrementCount(); var subAffixExcel = GameData.getRelicSubAffixExcel(this.getExcel().getRelicExcel().getSubAffixGroup(), subAffix.getId());
subAffix.incrementCount(subAffixExcel.getStepNum());
} }
/** /**

10
src/main/java/emu/lunarcore/game/inventory/ItemSubAffix.java
View File

@@ -2,6 +2,7 @@ package emu.lunarcore.game.inventory;
import dev.morphia.annotations.Entity; import dev.morphia.annotations.Entity;
import emu.lunarcore.data.excel.RelicSubAffixExcel; import emu.lunarcore.data.excel.RelicSubAffixExcel;
import emu.lunarcore.data.GameData;
import emu.lunarcore.proto.RelicAffixOuterClass.RelicAffix; import emu.lunarcore.proto.RelicAffixOuterClass.RelicAffix;
import emu.lunarcore.util.Utils; import emu.lunarcore.util.Utils;
import lombok.Getter; import lombok.Getter;
@@ -12,7 +13,7 @@ public class ItemSubAffix {
private int id; // Affix id private int id; // Affix id
private int count; private int count;
private int step; private int step;
@Deprecated @Deprecated
public ItemSubAffix() { public ItemSubAffix() {
// Morphia only! // Morphia only!
@@ -25,11 +26,12 @@ public class ItemSubAffix {
public ItemSubAffix(RelicSubAffixExcel subAffix, int count) { public ItemSubAffix(RelicSubAffixExcel subAffix, int count) {
this.id = subAffix.getAffixID(); this.id = subAffix.getAffixID();
this.count = count; this.count = count;
this.step = Utils.randomRange(0, subAffix.getStepNum()); this.step = Utils.randomRange(0, 2 * subAffix.getStepNum());
} }
public void incrementCount() { public void incrementCount(int stepNum) {
this.count += 1; this.count += 1;
this.step += Utils.randomRange(0, stepNum);
} }
public RelicAffix toProto() { public RelicAffix toProto() {
@@ -40,4 +42,4 @@ public class ItemSubAffix {
return proto; return proto;
} }
} }