Mirror/Nebula
1
0
Fork 0
mirror of https://github.com/Melledy/Nebula.git synced 2026-09-19 17:19:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some stuff and update enums

Browse Source
This commit is contained in:
Melledy
2025-12-23 20:56:00 -08:00
parent 92c7dbcbc5
commit c2ebff92c9
5 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/nebula/GameConstants.java
+1
View File
@@ -10,6 +10,7 @@ public class GameConstants {
public static int DATA_VERSION = 0; public static int DATA_VERSION = 0;
// Set data versions for each region // Set data versions for each region
// TODO move this to a json file inside the jar to make it easier to auto-update
static { static {
RegionConfig.getRegion("global") RegionConfig.getRegion("global")
.setDataVersion(73); .setDataVersion(73);
src/main/java/emu/nebula/command/commands/AutoBuildCommand.java
+6 -9
View File
@@ -80,11 +80,12 @@ public class AutoBuildCommand implements CommandHandler {
} }
} }
// Get target score // Get target level/score
int targetScore = 0;
int targetLevel = 0; int targetLevel = 0;
int targetScore = 0;
if (args.getSkill() < 0) { if (args.getSkill() < 0) {
// Default target level is 40
targetLevel = 40; targetLevel = 40;
} else { } else {
targetScore = args.getSkill(); targetScore = args.getSkill();
@@ -95,6 +96,7 @@ public class AutoBuildCommand implements CommandHandler {
targetLevel = args.getLevel(); targetLevel = args.getLevel();
} }
// Get target score from record level
if (targetLevel > 0) { if (targetLevel > 0) {
var data = GameData.getStarTowerBuildRankDataTable().get(targetLevel); var data = GameData.getStarTowerBuildRankDataTable().get(targetLevel);
if (data != null) { if (data != null) {
@@ -184,7 +186,7 @@ public class AutoBuildCommand implements CommandHandler {
} }
} }
// Add random trekker from list // If we have no versatile or support trekkers, add a random trekker from the remaining list
if (list.size() > 0) { if (list.size() > 0) {
builder.getCharacters().add(Utils.randomElement(list)); builder.getCharacters().add(Utils.randomElement(list));
} }
@@ -372,12 +374,7 @@ public class AutoBuildCommand implements CommandHandler {
var main = builder.getCharacters().get(0); var main = builder.getCharacters().get(0);
// Get random potentials // Get random potentials
while (potentialScore > 0) { while (potentialScore > 0 && !characters.isEmpty()) {
// End
if (potentialScore <= 0 || characters.isEmpty()) {
break;
}
// Get random character // Get random character
var character = Utils.randomElement(characters); var character = Utils.randomElement(characters);
src/main/java/emu/nebula/game/achievement/AchievementCondition.java
+9 -7
View File
@@ -56,7 +56,6 @@ public enum AchievementCondition {
LoginTotal (51), LoginTotal (51),
QuestTravelerDuelChallengeTotal (52), QuestTravelerDuelChallengeTotal (52),
QuestTourGuideSpecific (53), QuestTourGuideSpecific (53),
QuestTravelerDuelSpecific (54),
QuestWithSpecificType (55), QuestWithSpecificType (55),
RegionBossClearSpecificFullStarWithBossIdAndDifficulty (56), RegionBossClearSpecificFullStarWithBossIdAndDifficulty (56),
RegionBossClearSpecificLevelWithDifficultyAndTotal (57), RegionBossClearSpecificLevelWithDifficultyAndTotal (57),
@@ -67,12 +66,8 @@ public enum AchievementCondition {
StageClearSpecificStars (62), StageClearSpecificStars (62),
StoryClear (63), StoryClear (63),
TravelerDuelChallengeSpecificBoosLevelWithDifficultyAndTotal (64), TravelerDuelChallengeSpecificBoosLevelWithDifficultyAndTotal (64),
TravelerDuelClearBossTotal (65),
TravelerDuelClearSpecificBossIdAndDifficulty (66),
TravelerDuelChallengeClearSpecificBossLevelAndAffix (67), TravelerDuelChallengeClearSpecificBossLevelAndAffix (67),
TravelerDuelClearSpecificBossLevelWithDifficultyAndTotal (68),
TravelerDuelClearSpecificBossTotal (69), TravelerDuelClearSpecificBossTotal (69),
TravelerDuelChallengeRankUploadTotal (70),
WorldClassSpecific (71), WorldClassSpecific (71),
RegionBossClearSpecificTypeWithTotal (72), RegionBossClearSpecificTypeWithTotal (72),
CharactersWithSpecificDatingCount (73), CharactersWithSpecificDatingCount (73),
@@ -82,7 +77,6 @@ public enum AchievementCondition {
VampireSurvivorPassedSpecificLevel (77), VampireSurvivorPassedSpecificLevel (77),
CharacterParticipateTowerNumber (78), CharacterParticipateTowerNumber (78),
CharacterAllSkillReachSpecificLevel (79), CharacterAllSkillReachSpecificLevel (79),
TravelerDuelPlayTotal (80),
VampireClearTotal (81), VampireClearTotal (81),
VampireWithSpecificClearTotal (82), VampireWithSpecificClearTotal (82),
AgentFinishTotal (83), AgentFinishTotal (83),
@@ -101,6 +95,13 @@ public enum AchievementCondition {
DailyShopReceiveShopTotal (105), DailyShopReceiveShopTotal (105),
AgentApplyTotal (106), AgentApplyTotal (106),
DiscSpecific (114), DiscSpecific (114),
StorySetClearSpecific (116),
CharacterWithSpecificSkillAndLevel (118),
DiscWithSpecificQuantityLevelAndAttr (119),
TutorialLevelClearSpecific (120),
TutorialLevelSpecificClearTotal (121),
DiscWithSpecificQuantityPhaseAndAttr (122),
WeekBossClearTotal (123),
ClientReport (200), ClientReport (200),
TowerBattleTimes (501), TowerBattleTimes (501),
TowerBossChallengeSpecificHighRewardWithTotal (502), TowerBossChallengeSpecificHighRewardWithTotal (502),
@@ -137,7 +138,8 @@ public enum AchievementCondition {
TowerSpecificSecondarySkillActivateTotal (536), TowerSpecificSecondarySkillActivateTotal (536),
TowerSpecificGetExtraNoteLvTotal (537), TowerSpecificGetExtraNoteLvTotal (537),
TowerSweepTimes (539), TowerSweepTimes (539),
TowerSweepTotal (540); TowerSweepTotal (540),
TowerBattleWithPartner (541);
@Getter @Getter
private final int value; private final int value;
src/main/java/emu/nebula/game/activity/ActivityType.java
+5 -1
View File
@@ -18,7 +18,11 @@ public enum ActivityType {
Avg (10), Avg (10),
Task (11), Task (11),
Shop (12), Shop (12),
Advertise (13); Advertise (13),
BDConvert (14),
Breakout (15),
TrekkerVersus (16),
Story (17);
@Getter @Getter
private final int value; private final int value;
src/main/java/emu/nebula/game/quest/QuestCondType.java
+20 -7
View File
@@ -41,7 +41,6 @@ public enum QuestCondType {
LoginTotal (51), LoginTotal (51),
QuestTravelerDuelChallengeTotal (52), QuestTravelerDuelChallengeTotal (52),
QuestTourGuideSpecific (53), QuestTourGuideSpecific (53),
QuestTravelerDuelSpecific (54),
QuestWithSpecificType (55), QuestWithSpecificType (55),
RegionBossClearSpecificFullStarWithBossIdAndDifficulty (56), RegionBossClearSpecificFullStarWithBossIdAndDifficulty (56),
RegionBossClearSpecificLevelWithDifficultyAndTotal (57), RegionBossClearSpecificLevelWithDifficultyAndTotal (57),
@@ -51,12 +50,8 @@ public enum QuestCondType {
StageClearSpecificStars (62), StageClearSpecificStars (62),
StoryClear (63), StoryClear (63),
TravelerDuelChallengeSpecificBoosLevelWithDifficultyAndTotal (64), TravelerDuelChallengeSpecificBoosLevelWithDifficultyAndTotal (64),
TravelerDuelClearBossTotal (65),
TravelerDuelClearSpecificBossIdAndDifficulty (66),
TravelerDuelChallengeClearSpecificBossLevelAndAffix (67), TravelerDuelChallengeClearSpecificBossLevelAndAffix (67),
TravelerDuelClearSpecificBossLevelWithDifficultyAndTotal (68),
TravelerDuelClearSpecificBossTotal (69), TravelerDuelClearSpecificBossTotal (69),
TravelerDuelChallengeRankUploadTotal (70),
WorldClassSpecific (71), WorldClassSpecific (71),
RegionBossClearSpecificTypeWithTotal (72), RegionBossClearSpecificTypeWithTotal (72),
CharactersWithSpecificDatingCount (73), CharactersWithSpecificDatingCount (73),
@@ -64,7 +59,6 @@ public enum QuestCondType {
VampireSurvivorPassedSpecificLevel (77), VampireSurvivorPassedSpecificLevel (77),
CharacterParticipateTowerNumber (78), CharacterParticipateTowerNumber (78),
CharacterAllSkillReachSpecificLevel (79), CharacterAllSkillReachSpecificLevel (79),
TravelerDuelPlayTotal (80),
VampireClearTotal (81), VampireClearTotal (81),
VampireWithSpecificClearTotal (82), VampireWithSpecificClearTotal (82),
AgentFinishTotal (83), AgentFinishTotal (83),
@@ -94,10 +88,28 @@ public enum QuestCondType {
ActivityTypeLevelStarWithSpecificIdAndLevelTypeTotal (111), ActivityTypeLevelStarWithSpecificIdAndLevelTypeTotal (111),
ActivityTypeLevelPassedWithSpecificIdAndLevelIdAndSpecificPositionAndCharElem (112), ActivityTypeLevelPassedWithSpecificIdAndLevelIdAndSpecificPositionAndCharElem (112),
ActivityTypeLevelPassedSpecificIdTotal (113), ActivityTypeLevelPassedSpecificIdTotal (113),
StorySetClearSpecific (116),
CharacterWithSpecificSkillAndLevel (118),
DiscWithSpecificQuantityLevelAndAttr (119),
TutorialLevelClearSpecific (120),
TutorialLevelSpecificClearTotal (121),
DiscWithSpecificQuantityPhaseAndAttr (122),
WeekBossClearTotal (123),
ActivityStoryReadStory (124),
ClientReport (200), ClientReport (200),
TowerBattleTimes (501),
TowerBossChallengeSpecificHighRewardWithTotal (502),
TowerBuildSpecificCharacter (503),
TowerBuildSpecificScoreWithTotal (504), TowerBuildSpecificScoreWithTotal (504),
TowerClearSpecificCharacterTypeWithTotal (505),
TowerClearSpecificGroupIdAndDifficulty (506),
TowerClearSpecificLevelWithDifficultyAndTotal (507), TowerClearSpecificLevelWithDifficultyAndTotal (507),
TowerClearTotal (508),
TowerEnterRoom (509),
TowerEnterTotal (510), TowerEnterTotal (510),
TowerEventTimes (511),
TowerFateTimes (512),
TowerItemsGet (513),
TowerSpecificDifficultyShopBuyTimes (514), TowerSpecificDifficultyShopBuyTimes (514),
TowerGrowthSpecificNote (515), TowerGrowthSpecificNote (515),
TowerClearSpecificLevelWithDifficultyAndTotalHistory (516), TowerClearSpecificLevelWithDifficultyAndTotalHistory (516),
@@ -122,7 +134,8 @@ public enum QuestCondType {
TowerSpecificGetExtraNoteLvTotal (537), TowerSpecificGetExtraNoteLvTotal (537),
TowerEnterFloor (538), TowerEnterFloor (538),
TowerSweepTimes (539), TowerSweepTimes (539),
TowerSweepTotal (540); TowerSweepTotal (540),
TowerBattleWithPartner (541);
@Getter @Getter
private final int value; private final int value;