From 5182e94db78d8e2eba6dac4be5125a8a5d984e2e Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Fri, 5 Dec 2025 19:25:20 -0800
Subject: [PATCH] Fix item count on star tower shop goods

---
 .../nebula/game/tower/StarTowerShopGoods.java | 20 +++++++++++--------
 .../game/tower/cases/StarTowerHawkerCase.java | 16 ++++++++++-----
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/main/java/emu/nebula/game/tower/StarTowerShopGoods.java b/src/main/java/emu/nebula/game/tower/StarTowerShopGoods.java
index 9ab97fa..a4d980c 100644
--- a/src/main/java/emu/nebula/game/tower/StarTowerShopGoods.java
+++ b/src/main/java/emu/nebula/game/tower/StarTowerShopGoods.java
@@ -7,28 +7,24 @@ import lombok.Getter;
 @Entity(useDiscriminator = false)
 public class StarTowerShopGoods {
     private int type;
-    private int goodsId;
+    private int idx;     // This is actually the shop goods id
+    private int goodsId; // Item id
     private int price;
     private int discount;
-    private int count;
     private int charPos;
     private boolean sold;
     
-    public StarTowerShopGoods(int type, int goodsId, int price) {
+    public StarTowerShopGoods(int type, int idx, int goodsId, int price) {
         this.type = type;
+        this.idx = idx;
         this.goodsId = goodsId;
         this.price = price;
-        this.count = 1;
     }
 
     public void markAsSold() {
         this.sold = true;
     }
     
-    public void setCount(int count) {
-        this.count = count;
-    }
-    
     public void setCharPos(int charPos) {
         this.charPos = charPos;
     }
@@ -49,6 +45,14 @@ public class StarTowerShopGoods {
         return this.price;
     }
     
+    public int getCount() {
+        if (this.getType() == 2) {
+            return this.getIdx() == 8 ? 15 : 5;
+        }
+        
+        return 1;
+    }
+    
     public int getCharId(StarTowerGame game) {
         if (this.getCharPos() == 0) {
             return 0;
diff --git a/src/main/java/emu/nebula/game/tower/cases/StarTowerHawkerCase.java b/src/main/java/emu/nebula/game/tower/cases/StarTowerHawkerCase.java
index c6b1f9c..fef6137 100644
--- a/src/main/java/emu/nebula/game/tower/cases/StarTowerHawkerCase.java
+++ b/src/main/java/emu/nebula/game/tower/cases/StarTowerHawkerCase.java
@@ -44,12 +44,14 @@ public class StarTowerHawkerCase extends StarTowerBaseCase {
         int minPotentials = Math.max(total / 2, 2);
         int maxPotentials = Math.max(total - 1, minPotentials);
         int potentials = Utils.randomRange(minPotentials, maxPotentials);
+        
         int subNotes = total - potentials;
+        boolean hasCoins = this.getGame().getResCount(GameConstants.TOWER_COIN_ITEM_ID) >= 500;
         
         // Add goods
         for (int i = 0; i < potentials; i++) {
             // Create potential selector shop item
-            var goods = new StarTowerShopGoods(1, 102, 200);
+            var goods = new StarTowerShopGoods(1, 1, 102, 200);
             
             // Add character specific potentials
             if (Utils.generateRandomDouble() < .2) {
@@ -62,11 +64,15 @@ public class StarTowerHawkerCase extends StarTowerBaseCase {
         for (int i = 0; i < subNotes; i++) {
             // Randomize sub note
             int id = Utils.randomElement(this.getGame().getSubNoteDropList());
-            int count = Utils.randomRange(3, 10);
             
             // Create sub note shop item
-            var goods = new StarTowerShopGoods(2, id, 15 * count);
-            goods.setCount(count);
+            StarTowerShopGoods goods = null;
+            
+            if (hasCoins && Utils.randomChance(.25)) {
+                goods = new StarTowerShopGoods(2, 8, id, 400);
+            } else {
+                goods = new StarTowerShopGoods(2, 3, id, 90);
+            }
             
             // Add to goods map
             this.addGoods(goods);
@@ -219,9 +225,9 @@ public class StarTowerHawkerCase extends StarTowerBaseCase {
             var goods = entry.getValue();
             
             var info = HawkerGoods.newInstance()
-                    .setIdx(1)
                     .setSid(sid)
                     .setType(goods.getType())
+                    .setIdx(goods.getIdx())
                     .setGoodsId(goods.getGoodsId())
                     .setPrice(goods.getDisplayPrice())
                     .setTag(1);