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

* Fix relics always doing min roll after first roll * Adjust implementation to remove stepNum
Melledy · Dec 2, 2023 · a49f245 · a49f245
1 parent dd1ee72
commit a49f245
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/main/java/emu/lunarcore/game/inventory/GameItem.java b/src/main/java/emu/lunarcore/game/inventory/GameItem.java
@@ -212,7 +212,8 @@ private void addNewSubAffix() {
 
     private void upgradeRandomSubAffix() {
         ItemSubAffix subAffix = Utils.randomElement(this.subAffixes);
-        subAffix.incrementCount();
+        var subAffixExcel = GameData.getRelicSubAffixExcel(this.getExcel().getRelicExcel().getSubAffixGroup(), subAffix.getId());
+        subAffix.incrementCount(subAffixExcel.getStepNum());
     }
 
     /**

diff --git a/src/main/java/emu/lunarcore/game/inventory/ItemSubAffix.java b/src/main/java/emu/lunarcore/game/inventory/ItemSubAffix.java
@@ -2,6 +2,7 @@
 
 import dev.morphia.annotations.Entity;
 import emu.lunarcore.data.excel.RelicSubAffixExcel;
+import emu.lunarcore.data.GameData;
 import emu.lunarcore.proto.RelicAffixOuterClass.RelicAffix;
 import emu.lunarcore.util.Utils;
 import lombok.Getter;
@@ -12,7 +13,7 @@ public class ItemSubAffix {
     private int id; // Affix id
     private int count;
     private int step;
-
+	
     @Deprecated
     public ItemSubAffix() {
         // Morphia only!
@@ -25,11 +26,12 @@ public ItemSubAffix(RelicSubAffixExcel subAffix) {
     public ItemSubAffix(RelicSubAffixExcel subAffix, int count) {
         this.id = subAffix.getAffixID();
         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.step += Utils.randomRange(0, stepNum); 
     }
 
     public RelicAffix toProto() {
@@ -40,4 +42,4 @@ public RelicAffix toProto() {
 
         return proto;
     }
-}
+}