From 4da479a88a8c4ea0d17ec90a00625e2b96f15586 Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Mon, 15 Dec 2025 08:39:29 -0800
Subject: [PATCH] Fix gacha 4 star probability rates

---
 .../emu/nebula/data/resources/GachaDef.java   | 34 +++++++++++--------
 .../data/resources/GachaStorageDef.java       |  1 +
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/main/java/emu/nebula/data/resources/GachaDef.java b/src/main/java/emu/nebula/data/resources/GachaDef.java
index fedd988..192cc22 100644
--- a/src/main/java/emu/nebula/data/resources/GachaDef.java
+++ b/src/main/java/emu/nebula/data/resources/GachaDef.java
@@ -4,6 +4,7 @@ import emu.nebula.data.BaseDef;
 import emu.nebula.data.GameData;
 import emu.nebula.data.ResourceType;
 import emu.nebula.util.WeightedList;
+
 import lombok.Getter;
 
 @Getter
@@ -55,13 +56,14 @@ public class GachaDef extends BaseDef {
         
         if (this.ATypePkg > 0) {
             packageA.add(
-                    10000 - storage.getATypeUpProb(), 
-                    new GachaPackage(GachaPackageType.A, this.ATypePkg)
+                10000 - storage.getATypeUpProb(), 
+                new GachaPackage(GachaPackageType.A, this.ATypePkg)
             );
-        } if (this.ATypeUpPkg > 0) {
+        }
+        if (this.ATypeUpPkg > 0) {
             packageA.add(
-                    storage.getATypeUpProb(),
-                    new GachaPackage(GachaPackageType.A_UP, this.ATypeUpPkg)
+                storage.getATypeUpProb(),
+                new GachaPackage(GachaPackageType.A_UP, this.ATypeUpPkg)
             );
         }
         
@@ -70,18 +72,20 @@ public class GachaDef extends BaseDef {
         
         if (this.BTypePkg > 0) {
             packageB.add(
-                    10000 - storage.getBTypeUpProb(), 
-                    new GachaPackage(GachaPackageType.B, this.BTypePkg)
+                storage.getBTypeProb(), 
+                new GachaPackage(GachaPackageType.B, this.BTypePkg)
             );
-        } else if (this.BGuaranteePkg > 0) {
+        }
+        if (this.BGuaranteePkg > 0) {
             packageB.add(
-                    10000 - storage.getBTypeUpProb(),
-                    new GachaPackage(GachaPackageType.B, this.BGuaranteePkg)
+                storage.getBTypeGuaranteeProb(), 
+                new GachaPackage(GachaPackageType.B, this.BGuaranteePkg)
             );
-        } if (this.BTypeUpPkg > 0) {
+        } 
+        if (this.BTypeUpPkg > 0) {
             packageB.add(
-                    storage.getBTypeUpProb(),
-                    new GachaPackage(GachaPackageType.B_UP, this.BTypeUpPkg)
+                storage.getBTypeUpProb(),
+                new GachaPackage(GachaPackageType.B_UP, this.BTypeUpPkg)
             );
         }
         
@@ -90,8 +94,8 @@ public class GachaDef extends BaseDef {
         
         if (this.CTypePkg > 0) {
             packageC.add(
-                    10000,
-                    new GachaPackage(GachaPackageType.C, this.CTypePkg)
+                10000,
+                new GachaPackage(GachaPackageType.C, this.CTypePkg)
             );
         }
     }
diff --git a/src/main/java/emu/nebula/data/resources/GachaStorageDef.java b/src/main/java/emu/nebula/data/resources/GachaStorageDef.java
index 31fced5..422435d 100644
--- a/src/main/java/emu/nebula/data/resources/GachaStorageDef.java
+++ b/src/main/java/emu/nebula/data/resources/GachaStorageDef.java
@@ -16,6 +16,7 @@ public class GachaStorageDef extends BaseDef {
     private int CostQty;
     
     private int ATypeUpProb;
+    private int BTypeProb;
     private int BTypeUpProb;
     private int BTypeGuaranteeProb;