Implement gaining melodies in monoliths

src/main/java/emu/nebula/data/GameData.java

@@ -65,4 +65,5 @@ public class GameData {
     @Getter private static DataTable<StarTowerDef> StarTowerDataTable = new DataTable<>();
     @Getter private static DataTable<StarTowerStageDef> StarTowerStageDataTable = new DataTable<>();
     @Getter private static DataTable<PotentialDef> PotentialDataTable = new DataTable<>();
+    @Getter private static DataTable<SubNoteSkillPromoteGroupDef> SubNoteSkillPromoteGroupDataTable = new DataTable<>();
 }

src/main/java/emu/nebula/data/resources/DiscDef.java

@@ -11,7 +11,9 @@ public class DiscDef extends BaseDef {
     private int StrengthenGroupId;
     private int PromoteGroupId;
     private int TransformItemId;
+    private int[] MaxStarTransformItem;
     private int[] ReadReward;
+    private int SubNoteSkillGroupId;
     
     @Override
     public int getId() {

src/main/java/emu/nebula/data/resources/SubNoteSkillPromoteGroupDef.java

@@ -0,0 +1,25 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import emu.nebula.game.inventory.ItemParamMap;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "SubNoteSkillPromoteGroup.json")
+public class SubNoteSkillPromoteGroupDef extends BaseDef {
+    private int Id;
+    private String SubNoteSkills;
+    
+    private transient ItemParamMap items;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+    
+    @Override
+    public void onLoad() {
+        this.items = ItemParamMap.fromJsonString(this.SubNoteSkills);
+    }
+}

src/main/java/emu/nebula/game/character/GameDisc.java

@@ -9,6 +9,7 @@ import emu.nebula.GameConstants;
 import emu.nebula.Nebula;
 import emu.nebula.data.GameData;
 import emu.nebula.data.resources.DiscDef;
+import emu.nebula.data.resources.SubNoteSkillPromoteGroupDef;
 import emu.nebula.database.GameDatabaseObject;
 import emu.nebula.game.inventory.ItemParamMap;
 import emu.nebula.game.player.Player;
@@ -66,6 +67,11 @@ public class GameDisc implements GameDatabaseObject {
         }
     }
     
+    public SubNoteSkillPromoteGroupDef getSubNoteSkillDef() {
+        int id = (this.getData().getSubNoteSkillGroupId() * 100) + this.getPhase();
+        return GameData.getSubNoteSkillPromoteGroupDataTable().get(id);
+    }
+    
     public int getMaxGainableExp() {
         if (this.getLevel() >= this.getMaxLevel()) {
             return 0;

src/main/java/emu/nebula/game/tower/StarTowerBuild.java

@@ -42,30 +42,34 @@ public class StarTowerBuild implements GameDatabaseObject {
         
     }
     
-    public StarTowerBuild(StarTowerGame instance) {
+    public StarTowerBuild(StarTowerGame game) {
         this.uid = Snowflake.newUid();
-        this.playerUid = instance.getPlayer().getUid();
+        this.playerUid = game.getPlayer().getUid();
         this.name = "";
         this.charPots = new Int2IntOpenHashMap();
         this.potentials = new Int2IntOpenHashMap();
         this.subNoteSkills = new Int2IntOpenHashMap();
         
         // Characters
-        this.charIds = instance.getDiscs().stream()
+        this.charIds = game.getDiscs().stream()
                 .filter(d -> d.getId() > 0)
                 .mapToInt(d -> d.getId())
                 .toArray();
         
         // Discs
-        this.discIds = instance.getDiscs().stream()
+        this.discIds = game.getDiscs().stream()
                 .filter(d -> d.getId() > 0)
                 .mapToInt(d -> d.getId())
                 .toArray();
         
         // Add potentials
-        for (int id : instance.getPotentials()) {
+        for (var entry : game.getPotentials()) {
+            //
+            int id = entry.getIntKey();
+            int level = entry.getIntValue();
+            
             // Add to potential map
-            this.getPotentials().put(id, instance.getItemCount(id));
+            this.getPotentials().put(id, level);
             
             // Add to character
             var potentialData = GameData.getPotentialDataTable().get(id);
@@ -74,6 +78,11 @@ public class StarTowerBuild implements GameDatabaseObject {
                 this.getCharPots().put(charId, this.getCharPots().get(charId) + 1);
             }
         }
+        
+        // Add sub note skills
+        for (var entry : game.getItems()) {
+            this.getSubNoteSkills().put(entry.getIntKey(), entry.getIntValue());
+        }
     }
 
     public void setName(String newName) {

src/main/java/emu/nebula/game/tower/StarTowerGame.java

@@ -9,6 +9,7 @@ import emu.nebula.data.resources.PotentialDef;
 import emu.nebula.data.resources.StarTowerDef;
 import emu.nebula.data.resources.StarTowerStageDef;
 import emu.nebula.game.formation.Formation;
+import emu.nebula.game.inventory.ItemParamMap;
 import emu.nebula.game.player.Player;
 import emu.nebula.game.player.PlayerChangeInfo;
 import emu.nebula.proto.PublicStarTower.*;
@@ -17,10 +18,10 @@ import emu.nebula.proto.StarTowerInteract.StarTowerInteractReq;
 import emu.nebula.proto.StarTowerInteract.StarTowerInteractResp;
 import emu.nebula.util.Snowflake;
 import emu.nebula.util.Utils;
-import it.unimi.dsi.fastutil.ints.Int2IntMap;
+
-import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
+
 import lombok.Getter;
 import lombok.SneakyThrows;
 
@@ -54,14 +55,24 @@ public class StarTowerGame {
     private List<StarTowerDisc> discs;
     private IntSet charIds;
     
+    // Case
     private int lastCaseId = 0;
     private int selectorCaseIndex = -1;
+    private int battleCaseIndex = -1;
     private List<StarTowerCase> cases;
     
-    private Int2IntMap items;
+    // Bag
-    private IntSet potentials;
+    private ItemParamMap items;
+    private ItemParamMap res;
+    private ItemParamMap potentials;
     
+    // Cached build
     private transient StarTowerBuild build;
+    private transient ItemParamMap newInfos;
+    
+    private static final int[] COMMON_SUB_NOTE_SKILLS = new int[] {
+        90011, 90012, 90013, 90014, 90015, 90016, 90017
+    };
     
     @Deprecated // Morphia only
     public StarTowerGame() {
@@ -90,8 +101,11 @@ public class StarTowerGame {
         this.charIds = new IntOpenHashSet();
 
         this.cases = new ArrayList<>();
-        this.items = new Int2IntOpenHashMap();
+        
-        this.potentials = new IntOpenHashSet();
+        this.items = new ItemParamMap();
+        this.res = new ItemParamMap();
+        this.potentials = new ItemParamMap();
+        this.newInfos = new ItemParamMap();
         
         // Init formation
         for (int i = 0; i < 3; i++) {
@@ -112,6 +126,14 @@ public class StarTowerGame {
             
             if (disc != null) {
                 this.discs.add(disc.toStarTowerProto());
+                
+                // Add star tower sub note skills
+                if (i >= 3) {
+                    var subNoteData = disc.getSubNoteSkillDef();
+                    if (subNoteData != null) {
+                        this.getItems().add(subNoteData.getItems());
+                    }
+                }
             } else {
                 this.discs.add(StarTowerDisc.newInstance());
             }
@@ -162,6 +184,14 @@ public class StarTowerGame {
     
     // Cases
     
+    public StarTowerCase getBattleCase() {
+        if (this.getBattleCaseIndex() < 0 || this.getBattleCaseIndex() >= this.getCases().size()) {
+            return null;
+        }
+        
+        return this.getCases().get(this.getBattleCaseIndex());
+    }
+    
     public StarTowerCase getSelectorCase() {
         if (this.getSelectorCaseIndex() < 0 || this.getSelectorCaseIndex() >= this.getCases().size()) {
             return null;
@@ -189,6 +219,8 @@ public class StarTowerGame {
         //
         if (towerCase.getIds() != null) {
             this.selectorCaseIndex = this.getCases().size() - 1;
+        } else if (towerCase.getType() == CaseType.Battle) {
+            this.battleCaseIndex = this.getCases().size() - 1;
         }
         
         return towerCase;
@@ -200,33 +232,44 @@ public class StarTowerGame {
         return this.getItems().get(id);
     }
     
-    public PlayerChangeInfo addItem(int id, int count, PlayerChangeInfo changes) {
+    public PlayerChangeInfo addItem(int id, int count, PlayerChangeInfo change) {
         // Create changes if null
-        if (changes == null) {
+        if (change == null) {
-            changes = new PlayerChangeInfo();
+            change = new PlayerChangeInfo();
         }
         
         // Get item data
         var itemData = GameData.getItemDataTable().get(id);
         if (itemData == null) {
-            return changes;
+            return change;
         }
         
-        // Add item
-        this.getItems().put(id, this.getItems().get(id) + count);
-        
         // Handle changes
         switch (itemData.getItemSubType()) {
             case Potential, SpecificPotential -> {
                 // Add potential
-                this.getPotentials().add(id);
+                this.getPotentials().add(id, count);
                 
                 // Add change
-                var change = PotentialInfo.newInstance()
+                var info = PotentialInfo.newInstance()
                         .setTid(id)
-                        .setLevel(this.getItems().get(id));
+                        .setLevel(count);
                 
-                changes.add(change);
+                change.add(info);
+            }
+            case SubNoteSkill -> {
+                // Add to items
+                this.getItems().add(id, count);
+                
+                // Add change
+                var info = TowerItemInfo.newInstance()
+                        .setTid(id)
+                        .setQty(count);
+                
+                change.add(info);
+                
+                // Add to new infos
+                this.getNewInfos().add(id, count);
             }
             default -> {
                 // Ignored
@@ -234,7 +277,48 @@ public class StarTowerGame {
         }
         
         // Return changes
-        return changes;
+        return change;
+    }
+    
+    // Potentials/Sub notes
+    
+    private StarTowerCase createPotentialSelector(int charId) {
+        // Add potential selector
+        var potentialCase = new StarTowerCase(CaseType.SelectSpecialPotential);
+        potentialCase.setTeamLevel(this.getTeamLevel());
+        
+        // Get random potentials
+        List<PotentialDef> potentials = new ArrayList<>();
+        
+        for (var potentialData : GameData.getPotentialDataTable()) {
+            if (potentialData.getCharId() == charId) {
+                potentials.add(potentialData);
+            }
+        }
+        
+        for (int i = 0; i < 3; i++) {
+            var potentialData = Utils.randomElement(potentials);
+            potentialCase.addId(potentialData.getId());
+        }
+        
+        return potentialCase;
+    }
+    
+    private PlayerChangeInfo addRandomSubNoteSkills(PlayerChangeInfo change) {
+        int count = Utils.randomRange(1, 3);
+        int id = Utils.randomElement(COMMON_SUB_NOTE_SKILLS);
+        
+        this.addItem(id, count, change);
+        
+        return change;
+    }
+    
+    private PlayerChangeInfo addRandomSubNoteSkills(int count, PlayerChangeInfo change) {
+        for (int i = 0; i < count; i++) {
+            this.addRandomSubNoteSkills(change);
+        }
+        
+        return change;
     }
     
     // Handlers
@@ -253,8 +337,23 @@ public class StarTowerGame {
             rsp = this.onEnterReq(req, rsp);
         }
         
-        // Set data protos
+        // Add any items
-        rsp.getMutableData();
+        var data = rsp.getMutableData();
+        if (this.getNewInfos().size() > 0) {
+            // Add item protos
+            for (var entry : this.getNewInfos()) {
+                var info = SubNoteSkillInfo.newInstance()
+                        .setTid(entry.getIntKey())
+                        .setQty(entry.getIntValue());
+                
+                data.getMutableInfos().add(info);
+            }
+            
+            // Clear
+            this.getNewInfos().clear();
+        }
+        
+        // Set these protos
         rsp.getMutableChange();
         
         return rsp;
@@ -278,39 +377,35 @@ public class StarTowerGame {
                 .getMutableVictory()
                 .setLv(this.getTeamLevel())
                 .setBattleTime(this.getBattleTime());
-
-            // Add potential selector
-            var potentialCase = new StarTowerCase(CaseType.SelectSpecialPotential);
-            potentialCase.setTeamLevel(this.getTeamLevel());
             
-            // Get random potentials
+            // Create potential selector
-            List<PotentialDef> potentials = new ArrayList<>();
             int charId = this.getChars().get(battleCount % this.getCharIds().size()).getId();
-            
+            var potentialCase = this.createPotentialSelector(charId);
-            for (var potentialData : GameData.getPotentialDataTable()) {
-                if (potentialData.getCharId() == charId) {
-                    potentials.add(potentialData);
-                }
-            }
-            
-            for (int i = 0; i < 3; i++) {
-                var potentialData = Utils.randomElement(potentials);
-                potentialCase.addId(potentialData.getId());
-            }
-            
-            // Increment battle count
-            this.battleCount++;
             
             // Add case
             this.addCase(rsp, potentialCase);
+            
+            // Add sub note skills
+            var battleCase = this.getBattleCase();
+            if (battleCase != null) {
+                var change = new PlayerChangeInfo();
+                int subNoteSkills = battleCase.getSubNoteSkillNum();
+                
+                this.addRandomSubNoteSkills(subNoteSkills, change);
+                
+                rsp.setChange(change.toProto());
+            }
         } else {
             // Handle defeat
             // TODO
         }
         
+        // Increment battle count
+        this.battleCount++;
+        
         return rsp;
     }
-    
+
     public StarTowerInteractResp onSelect(StarTowerInteractReq req, StarTowerInteractResp rsp) {
         var index = req.getMutableSelectReq().getIndex();
         
@@ -325,9 +420,10 @@ public class StarTowerGame {
         }
         
         // Add item
-        var changes = this.addItem(id, 1, null);
+        var change = this.addItem(id, 1, null);
         
-        rsp.setChange(changes.toProto());
+        // Set change
+        rsp.setChange(change.toProto());
         
         return rsp;
     }
@@ -361,6 +457,7 @@ public class StarTowerGame {
         
         // Clear cases
         this.selectorCaseIndex = -1;
+        this.battleCaseIndex = -1;
         this.lastCaseId = 0;
         this.cases.clear();
         
@@ -382,7 +479,7 @@ public class StarTowerGame {
         // Handle room type TODO
         if (this.roomType <= StarTowerRoomType.EliteBattleRoom.getValue()) {
             var battleCase = new StarTowerCase(CaseType.Battle);
-            battleCase.setSubNoteSkillNum(this.getBattleCount());
+            battleCase.setSubNoteSkillNum(Utils.randomRange(1, 3));
             
             this.addCase(battleCase);
             room.addCases(battleCase.toProto());
@@ -406,6 +503,23 @@ public class StarTowerGame {
         return rsp;
     }
     
+    // Score
+    
+    public int calculateScore() {
+        // Init score
+        int score = 0;
+        
+        // Potentials TODO
+        
+        // Sub note skills
+        for (var item : this.getItems()) {
+            score += item.getIntValue() * 15;
+        }
+        
+        // Complete
+        return score;
+    }
+    
     // Proto
     
     public StarTowerInfo toProto() {
@@ -428,8 +542,24 @@ public class StarTowerGame {
             proto.getMutableRoom().addCases(starTowerCase.toProto());
         }
         
-        // TODO
+        // Set up bag
-        proto.getMutableBag();
+        var bag = proto.getMutableBag();
+        
+        for (var entry : this.getItems()) {
+            var item = TowerItemInfo.newInstance()
+                    .setTid(entry.getIntKey())
+                    .setQty(entry.getIntValue());
+            
+            bag.addItems(item);
+        }
+        
+        for (var entry : this.getPotentials()) {
+            var item = PotentialInfo.newInstance()
+                    .setTid(entry.getIntKey())
+                    .setLevel(entry.getIntValue());
+            
+            bag.addPotentials(item);
+        }
         
         return proto;
     }