Handle randomized daily instance rewards

src/main/java/emu/nebula/game/instance/InstanceData.java

@@ -1,5 +1,7 @@
 package emu.nebula.game.instance;
 
+import java.util.List;
+
 import emu.nebula.game.inventory.ItemParamMap;
 import emu.nebula.game.player.Player;
 
@@ -11,16 +13,36 @@ public interface InstanceData {
     
     public int getEnergyConsume();
     
-    public ItemParamMap getFirstRewards();
+    // Handle reward generation
     
-    public ItemParamMap getRewards();
+    public List<InstanceRewardParam> getFirstRewards();
     
-    public default ItemParamMap getFirstRewards(int rewardType) {
-        return this.getFirstRewards();
+    public default List<InstanceRewardParam> getFirstRewards(int rewardType) {
+        return getFirstRewards();
     }
     
-    public default ItemParamMap getRewards(int rewardType) {
-        return this.getRewards();
+    public default ItemParamMap generateFirstRewards(int rewardType) {
+        return this.generateRewards(this.getFirstRewards());
+    }
+    
+    public List<InstanceRewardParam> getRewards();
+    
+    public default List<InstanceRewardParam> getRewards(int rewardType) {
+        return getRewards();
+    }
+    
+    public default ItemParamMap generateRewards(int rewardType) {
+        return this.generateRewards(this.getRewards());
+    }
+    
+    public default ItemParamMap generateRewards(List<InstanceRewardParam> params) {
+        var map = new ItemParamMap();
+        
+        for (var param : params) {
+            map.add(param.getId(), param.getRandomCount());
+        }
+        
+        return map;
     }
     
     /**

src/main/java/emu/nebula/game/instance/InstanceManager.java

@@ -1,11 +1,14 @@
 package emu.nebula.game.instance;
 
+import java.util.ArrayList;
+
 import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.Id;
 import emu.nebula.GameConstants;
 import emu.nebula.Nebula;
 import emu.nebula.data.GameData;
 import emu.nebula.database.GameDatabaseObject;
+import emu.nebula.game.inventory.ItemParamMap;
 import emu.nebula.game.player.Player;
 import emu.nebula.game.player.PlayerChangeInfo;
 import emu.nebula.game.player.PlayerManager;
@@ -88,20 +91,17 @@ public class InstanceManager extends PlayerManager implements GameDatabaseObject
         
         // Handle win
         if (settleData.isWin()) {
-            // Reward type
-            int rewardType = this.getRewardType();
-            
             // Calculate energy and exp
             settleData.setExp(data.getEnergyConsume());
             getPlayer().consumeEnergy(settleData.getExp(), change);
             
-            // Awards
-            getPlayer().getInventory().addItem(GameConstants.EXP_ITEM_ID, settleData.getExp(), change);
-            getPlayer().getInventory().addItems(data.getRewards(rewardType), change);
+            // Calculate rewards
+            settleData.generateRewards(data, this.getRewardType());
             
-            if (settleData.isFirst()) {
-                getPlayer().getInventory().addItems(data.getFirstRewards(rewardType), change);
-            }
+            // Add to inventory
+            getPlayer().getInventory().addItem(GameConstants.EXP_ITEM_ID, settleData.getExp(), change);
+            getPlayer().getInventory().addItems(settleData.getRewards(), change);
+            getPlayer().getInventory().addItems(settleData.getFirstRewards(), change);
             
             // Log
             this.saveInstanceLog(log, logName, data.getId(), star);
@@ -146,15 +146,33 @@ public class InstanceManager extends PlayerManager implements GameDatabaseObject
             return null;
         }
         
-        // Init player change info
+        // Init variables
         var change = new PlayerChangeInfo();
+        var list = new ArrayList<ItemParamMap>();
         
         // Consume exp
         getPlayer().consumeEnergy(energyCost, change);
-        
-        // Awards
         getPlayer().getInventory().addItem(GameConstants.EXP_ITEM_ID, energyCost, change);
-        getPlayer().getInventory().addItems(data.getRewards(rewardType).mulitply(count), change);
+        
+        // Calculate total rewards
+        var totalRewards = new ItemParamMap();
+        
+        for (int i = 0; i < count; i++) {
+            // Generate rewards for each settle count
+            var rewards = data.generateRewards(rewardType);
+            
+            // Add to reward list
+            list.add(rewards);
+            
+            // Add to total rewards
+            totalRewards.add(rewards);
+        }
+        
+        // Add total rewards to inventory
+        getPlayer().getInventory().addItems(totalRewards, change);
+        
+        // Set reward list in change info so we can serialize it in the response proto later
+        change.setExtraData(list);
         
         // Quest triggers
         this.getPlayer().getQuestManager().triggerQuest(questCondition, count);

src/main/java/emu/nebula/game/instance/InstanceRewardParam.java

@@ -0,0 +1,25 @@
+package emu.nebula.game.instance;
+
+import emu.nebula.util.Utils;
+import lombok.Getter;
+
+@Getter
+public class InstanceRewardParam {
+    public int id;
+    public int min;
+    public int max;
+    
+    public InstanceRewardParam(int id, int min, int max) {
+        this.id = id;
+        this.min = min;
+        this.max = max;
+    }
+    
+    public int getRandomCount() {
+        if (this.min == this.max) {
+            return this.min;
+        }
+        
+        return Utils.randomRange(this.min, this.max);
+    }
+}

src/main/java/emu/nebula/game/instance/InstanceSettleData.java

@@ -1,5 +1,6 @@
 package emu.nebula.game.instance;
 
+import emu.nebula.game.inventory.ItemParamMap;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,7 +10,18 @@ public class InstanceSettleData {
     private boolean isFirst;
     private int exp;
     
+    private ItemParamMap firstRewards;
+    private ItemParamMap rewards;
+    
     public InstanceSettleData() {
         
     }
+    
+    public void generateRewards(InstanceData data, int rewardType) {
+        if (this.isFirst) {
+            this.firstRewards = data.generateFirstRewards(rewardType);
+        }
+        
+        this.rewards = data.generateRewards(rewardType);
+    }
 }