Mirror/Nebula
1
0
Fork 0
mirror of https://github.com/Melledy/Nebula.git synced 2025-12-14 13:24:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge ascension/instance/infinite arena/vampire survivor progress into one manager

Browse Source
This commit is contained in:
Melledy
2025-11-09 21:27:08 -08:00
parent 3f7b0d366d
commit db5209ff06
15 changed files with 172 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/emu/nebula/game/infinitytower/InfinityTowerManager.java
View File

@@ -1,6 +1,5 @@
package emu.nebula.game.infinitytower;
import dev.morphia.annotations.Id;
import emu.nebula.data.GameData;
import emu.nebula.game.player.Player;
import emu.nebula.game.player.PlayerChangeInfo;
@@ -10,22 +9,11 @@ import lombok.Getter;
@Getter
public class InfinityTowerManager extends PlayerManager {
@Id
private int uid;
private transient int levelId;
private transient long buildId;
@Deprecated // Morphia only
public InfinityTowerManager() {
}
private int levelId;
private long buildId;
public InfinityTowerManager(Player player) {
super(player);
this.uid = player.getUid();
//this.save();
}
public int getBountyLevel() {

124
src/main/java/emu/nebula/game/instance/InstanceManager.java
View File

@@ -2,58 +2,24 @@ 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;
import emu.nebula.game.player.PlayerProgress;
import emu.nebula.game.quest.QuestCondType;
import emu.nebula.proto.PlayerData.PlayerInfo;
import emu.nebula.proto.Public.CharGemInstance;
import emu.nebula.proto.Public.DailyInstance;
import emu.nebula.proto.Public.RegionBossLevel;
import emu.nebula.proto.Public.SkillInstance;
import emu.nebula.proto.Public.WeekBossLevel;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import lombok.Getter;
@Getter
@Entity(value = "instances", useDiscriminator = false)
public class InstanceManager extends PlayerManager implements GameDatabaseObject {
@Id
private int uid;
private Int2IntMap dailyInstanceLog;
private Int2IntMap regionBossLog;
private Int2IntMap skillInstanceLog;
private Int2IntMap charGemLog;
private Int2IntMap weekBossLog;
private transient int curInstanceId;
private transient int rewardType;
@Deprecated // Morphia
public InstanceManager() {
}
public class InstanceManager extends PlayerManager {
private int curInstanceId;
private int rewardType;
public InstanceManager(Player player) {
super(player);
this.uid = player.getUid();
this.dailyInstanceLog = new Int2IntOpenHashMap();
this.regionBossLog = new Int2IntOpenHashMap();
this.skillInstanceLog = new Int2IntOpenHashMap();
this.charGemLog = new Int2IntOpenHashMap();
this.weekBossLog = new Int2IntOpenHashMap();
this.save();
}
public void setCurInstanceId(int id) {
@@ -65,18 +31,8 @@ public class InstanceManager extends PlayerManager implements GameDatabaseObject
this.rewardType = rewardType;
}
public void saveInstanceLog(Int2IntMap log, String logName, int id, int newStar) {
// Get current star
int star = log.get(id);
// Check star
if (newStar <= star || newStar > 7) {
return;
}
// Add to log and update database
log.put(id, newStar);
Nebula.getGameDatabase().update(this, this.getUid(), logName + "." + id, newStar);
private PlayerProgress getProgress() {
return this.getPlayer().getProgress();
}
public PlayerChangeInfo settleInstance(InstanceData data, QuestCondType questCondition, Int2IntMap log, String logName, int star) {
@@ -104,7 +60,7 @@ public class InstanceManager extends PlayerManager implements GameDatabaseObject
getPlayer().getInventory().addItems(settleData.getFirstRewards(), change);
// Log
this.saveInstanceLog(log, logName, data.getId(), star);
this.getProgress().saveInstanceLog(log, logName, data.getId(), star);
// Quest triggers
this.getPlayer().getQuestManager().triggerQuest(questCondition, 1);
@@ -182,68 +138,4 @@ public class InstanceManager extends PlayerManager implements GameDatabaseObject
return change.setSuccess(true);
}
// Proto
public void toProto(PlayerInfo proto) {
// Init
int minStars = 0;
// Simple hack to unlock all instances
if (Nebula.getConfig().getServerOptions().unlockInstances) {
minStars = 1;
}
// Daily instance
for (var data : GameData.getDailyInstanceDataTable()) {
int stars = Math.max(getDailyInstanceLog().get(data.getId()), minStars);
var p = DailyInstance.newInstance()
.setId(data.getId())
.setStar(stars);
proto.addDailyInstances(p);
}
// Regional boss
for (var data : GameData.getRegionBossLevelDataTable()) {
int stars = Math.max(getRegionBossLog().get(data.getId()), minStars);
var p = RegionBossLevel.newInstance()
.setId(data.getId())
.setStar(stars);
proto.addRegionBossLevels(p);
}
// Skill instance
for (var data : GameData.getSkillInstanceDataTable()) {
int stars = Math.max(getSkillInstanceLog().get(data.getId()), minStars);
var p = SkillInstance.newInstance()
.setId(data.getId())
.setStar(stars);
proto.addSkillInstances(p);
}
// Char gem instance
for (var data : GameData.getCharGemInstanceDataTable()) {
int stars = Math.max(getCharGemLog().get(data.getId()), minStars);
var p = CharGemInstance.newInstance()
.setId(data.getId())
.setStar(stars);
proto.addCharGemInstances(p);
}
// Weekly boss
for (var data : GameData.getWeekBossLevelDataTable()) {
var p = WeekBossLevel.newInstance()
.setId(data.getId())
.setFirst(this.getWeekBossLog().get(data.getId()) == 1);
proto.addWeekBossLevels(p);
}
}
}

19
src/main/java/emu/nebula/game/player/Player.java
View File

@@ -72,6 +72,8 @@ public class Player implements GameDatabaseObject {
// Managers
private final transient CharacterStorage characters;
private final transient GachaManager gachaManager;
private final transient StarTowerManager starTowerManager;
private final transient InstanceManager instanceManager;
private final transient InfinityTowerManager infinityTowerManager;
private final transient VampireSurvivorManager vampireSurvivorManager;
private final transient ScoreBossManager scoreBossManager;
@@ -80,8 +82,7 @@ public class Player implements GameDatabaseObject {
private transient Inventory inventory;
private transient FormationManager formations;
private transient Mailbox mailbox;
private transient StarTowerManager starTowerManager;
private transient InstanceManager instanceManager;
private transient PlayerProgress progress;
private transient StoryManager storyManager;
private transient QuestManager questManager;
@@ -93,6 +94,8 @@ public class Player implements GameDatabaseObject {
// Init player managers
this.characters = new CharacterStorage(this);
this.gachaManager = new GachaManager(this);
this.starTowerManager = new StarTowerManager(this);
this.instanceManager = new InstanceManager(this);
this.infinityTowerManager = new InfinityTowerManager(this);
this.vampireSurvivorManager = new VampireSurvivorManager(this);
this.scoreBossManager = new ScoreBossManager(this);
@@ -482,18 +485,18 @@ public class Player implements GameDatabaseObject {
public void onLoad() {
// Load from database
this.getCharacters().loadFromDatabase();
this.getStarTowerManager().loadFromDatabase();
// Load inventory first
// Load inventory before referenced classes
if (this.inventory == null) {
this.inventory = this.loadManagerFromDatabase(Inventory.class);
}
this.getInventory().loadFromDatabase();
// Load referenced classes
// Load referenced classes from the database
this.formations = this.loadManagerFromDatabase(FormationManager.class);
this.mailbox = this.loadManagerFromDatabase(Mailbox.class);
this.starTowerManager = this.loadManagerFromDatabase(StarTowerManager.class);
this.instanceManager = this.loadManagerFromDatabase(InstanceManager.class);
this.progress = this.loadManagerFromDatabase(PlayerProgress.class);
this.storyManager = this.loadManagerFromDatabase(StoryManager.class);
this.questManager = this.loadManagerFromDatabase(QuestManager.class);
}
@@ -646,8 +649,8 @@ public class Player implements GameDatabaseObject {
proto.addDictionaries(dictionaryProto);
}
// Add instances
this.getInstanceManager().toProto(proto);
// Add progress
this.getProgress().toProto(proto);
// Handbook
proto.addHandbook(this.getCharacters().getCharacterHandbook());

134
src/main/java/emu/nebula/game/player/PlayerProgress.java Normal file
View File

@@ -0,0 +1,134 @@
package emu.nebula.game.player;
import dev.morphia.annotations.Entity;
import dev.morphia.annotations.Id;
import emu.nebula.Nebula;
import emu.nebula.data.GameData;
import emu.nebula.database.GameDatabaseObject;
import emu.nebula.proto.PlayerData.PlayerInfo;
import emu.nebula.proto.Public.CharGemInstance;
import emu.nebula.proto.Public.DailyInstance;
import emu.nebula.proto.Public.RegionBossLevel;
import emu.nebula.proto.Public.SkillInstance;
import emu.nebula.proto.Public.WeekBossLevel;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import lombok.Getter;
@Getter
@Entity(value = "progress", useDiscriminator = false)
public class PlayerProgress extends PlayerManager implements GameDatabaseObject {
@Id
private int uid;
private Int2IntMap dailyInstanceLog;
private Int2IntMap regionBossLog;
private Int2IntMap skillInstanceLog;
private Int2IntMap charGemLog;
private Int2IntMap weekBossLog;
@Deprecated // Morphia only
public PlayerProgress() {
}
public PlayerProgress(Player player) {
super(player);
this.uid = player.getUid();
// Star Tower
// Instances
this.dailyInstanceLog = new Int2IntOpenHashMap();
this.regionBossLog = new Int2IntOpenHashMap();
this.skillInstanceLog = new Int2IntOpenHashMap();
this.charGemLog = new Int2IntOpenHashMap();
this.weekBossLog = new Int2IntOpenHashMap();
// Infinity Arena
// Vampire Survivor
// Save to database
this.save();
}
public void saveInstanceLog(Int2IntMap log, String logName, int id, int newStar) {
// Get current star
int star = log.get(id);
// Check star
if (newStar <= star || newStar > 7) {
return;
}
// Add to log and update database
log.put(id, newStar);
Nebula.getGameDatabase().update(this, this.getUid(), logName + "." + id, newStar);
}
// Proto
public void toProto(PlayerInfo proto) {
// Init
int minStars = 0;
// Simple hack to unlock all instances
if (Nebula.getConfig().getServerOptions().unlockInstances) {
minStars = 1;
}
// Daily instance
for (var data : GameData.getDailyInstanceDataTable()) {
int stars = Math.max(this.getDailyInstanceLog().get(data.getId()), minStars);
var p = DailyInstance.newInstance()
.setId(data.getId())
.setStar(stars);
proto.addDailyInstances(p);
}
// Regional boss
for (var data : GameData.getRegionBossLevelDataTable()) {
int stars = Math.max(this.getRegionBossLog().get(data.getId()), minStars);
var p = RegionBossLevel.newInstance()
.setId(data.getId())
.setStar(stars);
proto.addRegionBossLevels(p);
}
// Skill instance
for (var data : GameData.getSkillInstanceDataTable()) {
int stars = Math.max(this.getSkillInstanceLog().get(data.getId()), minStars);
var p = SkillInstance.newInstance()
.setId(data.getId())
.setStar(stars);
proto.addSkillInstances(p);
}
// Char gem instance
for (var data : GameData.getCharGemInstanceDataTable()) {
int stars = Math.max(this.getCharGemLog().get(data.getId()), minStars);
var p = CharGemInstance.newInstance()
.setId(data.getId())
.setStar(stars);
proto.addCharGemInstances(p);
}
// Weekly boss
for (var data : GameData.getWeekBossLevelDataTable()) {
var p = WeekBossLevel.newInstance()
.setId(data.getId())
.setFirst(this.getWeekBossLog().get(data.getId()) == 1);
proto.addWeekBossLevels(p);
}
}
}

29
src/main/java/emu/nebula/game/tower/StarTowerManager.java
View File

@@ -1,44 +1,29 @@
package emu.nebula.game.tower;
import dev.morphia.annotations.Entity;
import dev.morphia.annotations.Id;
import emu.nebula.Nebula;
import emu.nebula.data.GameData;
import emu.nebula.database.GameDatabaseObject;
import emu.nebula.game.player.Player;
import emu.nebula.game.player.PlayerChangeInfo;
import emu.nebula.game.player.PlayerManager;
import emu.nebula.game.quest.QuestCondType;
import emu.nebula.proto.StarTowerApply.StarTowerApplyReq;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import lombok.Getter;
@Getter
@Entity(value = "star_tower", useDiscriminator = false)
public class StarTowerManager extends PlayerManager implements GameDatabaseObject {
@Id
private int uid;
// TODO add tower talents here
public class StarTowerManager extends PlayerManager {
// Tower game instance
private transient StarTowerGame game;
private StarTowerGame game;
// Tower builds
private transient Long2ObjectMap<StarTowerBuild> builds;
private transient StarTowerBuild lastBuild;
@Deprecated // Morphia only
public StarTowerManager() {
}
private Long2ObjectMap<StarTowerBuild> builds;
private StarTowerBuild lastBuild;
public StarTowerManager(Player player) {
super(player);
this.uid = player.getUid();
this.save();
}
public Long2ObjectMap<StarTowerBuild> getBuilds() {
@@ -167,7 +152,7 @@ public class StarTowerManager extends PlayerManager implements GameDatabaseObjec
// Database
private void loadFromDatabase() {
public void loadFromDatabase() {
this.builds = new Long2ObjectOpenHashMap<>();
Nebula.getGameDatabase().getObjects(StarTowerBuild.class, "playerUid", getPlayerUid()).forEach(build -> {

19
src/main/java/emu/nebula/game/vampire/VampireSurvivorManager.java
View File

@@ -1,35 +1,18 @@
package emu.nebula.game.vampire;
import dev.morphia.annotations.Entity;
import dev.morphia.annotations.Id;
import emu.nebula.data.GameData;
import emu.nebula.database.GameDatabaseObject;
import emu.nebula.game.player.Player;
import emu.nebula.game.player.PlayerManager;
import lombok.Getter;
@Getter
@Entity(value = "vampire", useDiscriminator = false)
public class VampireSurvivorManager extends PlayerManager implements GameDatabaseObject {
@Id
private int uid;
public class VampireSurvivorManager extends PlayerManager {
// Game
private transient VampireSurvivorGame game;
// TODO talents
@Deprecated // Morphia only
public VampireSurvivorManager() {
}
public VampireSurvivorManager(Player player) {
super(player);
this.uid = player.getUid();
//this.save();
}
public VampireSurvivorGame apply(int levelId) {