mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-04-05 23:42:27 +02:00
Merge unstable into development (#2173)
* Remove more scene synchronized
* Fix worktop options not appearing
* Format code [skip actions]
* Fix delay with server tasks
* Format code [skip actions]
* Fully fix fairy clock (#2146)
* Fix scene transition
* fully fix fairy clock
* Re-add call to `Player#updatePlayerGameTime`
* Format code [skip actions]
* Initialize the script loader in `ResourceLoader#loadAll`
* Fix region removal checking
* Format code [skip actions]
* Use Lombok's `EqualsAndHashCode` for comparing scene regions
* Format code [skip actions]
* Move 'invalid gather object' to `trace`
* Add more information to the 'unknown condition handler' message
* Move invalid ability action to trace
* Make `KcpTunnel` public
* Validate the NPC being talked to
* Format code [skip actions]
* NPCs are not spawned server side; change logic to handle it
* Format code [skip actions]
* unload scene when there are no players (#2147)
* unload scene when there are no players
* Update src/main/java/emu/grasscutter/game/world/Scene.java
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
---------
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
* Check if a command should be copied or HTTP should be used
* Lint Code [skip actions]
* Fix character names rendering incorrectly
* Add basic troubleshooting command
* Implement handbook teleporting
also a few formatting changes and sort data by logical sense
* Fix listener `ConcurrentModificationException` issue
* Add color change to `Join the Community!`
* Lint Code [skip actions]
* Make clickable buttons appear clickable
* Remove 'Mechanicus' entities from the list of entities
* Format code [skip actions]
* Fix going back returning a blank screen
* Implement entity spawning
* Add setting level to entity card
* Add support for 'plain text' mode
* Make descriptions of objects scrollable
* Lint Code [skip actions]
* Format code [skip actions]
* Change the way existing hooks work
* Format code [skip actions]
* Upgrade Javalin to 5.5.0 & Fix project warnings
* Upgrade logging libraries
* Fix gacha mappings static file issue
* Add temporary backwards compatability for `ServerHelper`
* Format code [skip actions]
* Remove artifact signatures from VCS
* Fix forge queue data protocol definition
* Run `spotlessApply`
* Format code [skip actions]
* Download data required for building artifacts
* Add call for Facebook logins
* Add the wiki page as a submodule
* Format code [skip actions]
* Update translation (#2150)
* Update translation
* Update translation
* Separate the dispatch and game servers (pt. 1)
gacha is still broken, handbook still needs to be done
* Format code [skip actions]
* Separate the dispatch and game servers (pt. 2)
this commit fixes the gacha page
* Add description for '/troubleshoot'
* Set default avatar talent level to 10
* Separate the dispatch and game servers (pt. 3)
implement handbook across servers!
* Format code [skip actions]
* Update GitHub Actions to use 'download-file' over 'wget'
* Gm handbook lmao (#2149)
* Fix font issue
* Fix avatars
* Fix text overflow in commands
* Fix virtualized lists and items page 😭😭
* magix why 💀
* use hover style in all minicards
* button
* remove console.log
* lint
* Add icons
* magix asked
* Fix overflow padding issue
* Fix achievement text overflow
* remove icons from repo
* Change command icon
* Add the wiki page as a submodule
* total magix moment
* fix text overflow in commands
* Fix discord button
* Make text scale on Minicard
* import icons and font from another source
* Add hover effects to siebar buttons
* move font and readme to submodule repo
* Make data folder a submodule
* import icons and font from data submodule
* Update README.md
* total magix moment
* magix moment v2
* submodule change
* Import `.webp` files
* Resize `HomeButton`
* Fix 'Copy Command' reappearing after changing pages
---------
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
* Lint Code [skip actions]
* Download data for the build, not for the lint
* format imports
this is really just to see if build handbook works kek
* Implement proper handbook authentication (pt. 1)
* Implement proper handbook authentication (pt. 2)
* Format code [skip actions]
* Add quest data dumping for the handbook
* Change colors to fit _something suitable_
* Format code [skip actions]
* Fix force pushing to branches after linting
* Fix logic of `SetPlayerPropReq`
* Move more group loading to `trace`
* Add handbook IP authentication in hybrid mode
* Fix player level up not displaying on the client properly
* Format code [skip actions]
* Fix game time locking
* Format code [skip actions]
* Update player properties
* Format code [skip actions]
* Move `warn`s for groups to `debug`
* Fix player pausing
* Move more logs to `trace`
* Use `removeItemById` for deleting items via quests
* Clean up logger more
* Pause in-game time when the world is paused
* Format code [skip actions]
* More player property documentation
* Multi-threaded resource loading
* Format code [skip actions]
* Add quest widgets
* Add quests page (basic impl.)
* Add/fix colors
also fix tailwind
* Remove banned packets
client modifications already perform the job of blocking malicious packets from being executed, no point in having this if self-windy is wanted
* Re-add `BeginCameraSceneLookNotify`
* Fix being unable to attack (#2157)
* Add `PlayerOpenChestEvent`
* Add methods to get players from the server
* Add static methods to register an event handler
* Add `PlayerEnterDungeonEvent`
* Remove legacy documentation from `PlayerMoveEvent`
* Add `PlayerChatEvent`
* Add defaults to `Position`
* Clean up `.utils`
* Revert `Multi-threaded resource loading`
* Fix changing target UID when talking to the server
* Lint Code [skip actions]
* Format code [skip actions]
* fix NPC talk triggering main quest in 46101 (#2158)
Make it so that only talks where the param matches the talkId are checked.
* Format code [skip actions]
* Partially fix Chasing Shadows (#2159)
* Partially fix Chasing Shadows
* Go ahead and move it before the return before Magix tells me to.
* Format code [skip actions]
* Bring back period lol (#2160)
* Disable SNI for the HTTPS server
* Add `EntityCreationEvent`
* Add initial startup message
this is so the server appears like its preparing to start
* Format code [skip actions]
* Enable debug mode for plugin loggers if enabled for the primary logger
* Add documentation about `WorldAreaConfigData`
* Make more fields in excels accessible
* Remove deprecated fields from `GetShopRsp`
* Run `spotlessApply` on definitions
* Add `PlayerEnterAreaEvent`
* Optimize event calls
* Fix event invokes
* Format code [skip actions]
* Remove manual autofinish for main quests. (#2162)
* Add world areas to the textmap cache
* Format code [skip actions]
* Don't overdefine variables in extended classes (#2163)
* Add dumper for world areas
* Format code [skip actions]
* instantiate personalLineList (#2165)
* Fix protocol definitions
thank you Nazrin! (+ hiro for raw definitions)
* Fix the background color leaking from the character widget
* Change HTML spacing to 2 spaces
* Implement hiding widgets
* Change scrollbar to a vibrant color
* Add _some_ scaling to the home buttons and its text
* Build the handbook with Gradle
* Fix the 'finer details' with the handbook UI
* Lint Code [skip actions]
* Fix target destination for the Gradle-built handbook
* Implement fetching a player across servers & Add a chainable JsonObject
useful for plugins! might be used in grasscutter eventually
* Fix GitHub actions
* Fix event calling & canceling
* Run `spotlessApply`
* Rename fields (might be wrong)
* Add/update all/more protocol definitions
* Add/update all/more protocol definitions
* Remove outdated packet
* Fix protocol definitions
* Format code [skip actions]
* Implement some lua variables for less console spam (#2172)
* Implement some lua variables for less console spam
* Add GetHostQuestState
This fixes some chapter 3 stuff.
* Format code [skip actions]
* Fix merge import
* Format code [skip actions]
* Fully fix fairy clock for real this time (#2167)
* Fully fix fairy clock For real this time
* Make it so relogging keeps the time lock state.
* Refactor out questLockTime
* Per Hartie, the client packet needs to be changed too
* Update src/main/java/emu/grasscutter/game/world/World.java
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
* Update src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java
* Remove all code not needed to get clock working
---------
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
* Implement a proper ability system (#2166)
* Apply fix `21dec2fe`
* Apply fix `89d01d5f`
* Apply fix `d900f154`
this one was already implemented; updated to use call from previous commit
* Ability changing commit
TODO: change info to debug
* Remove use of deprecated methods/fields
* Temp commit v2
(Adding LoseHP and some fixes)
* Oopsie
* Probably fix monster battle
* Fix issue with reflecting into fields
* Fix some things
* Fix ability names for 3.6 resources
* Improve logging
---------
Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
* Format code [skip actions]
* Add system for sending messages between servers
* Format some code
* Remove protocol definitions from Spotless
* Default debug to false; enable with `-debug`
* Implement completely useless global value copying
* HACK: Return the avatar which holds the weapon when the weapon is referred to by ID
* Add properties to `AbilityModifier`
* Change the way HTML is served after authentication
* Use thread executors to speed up the database loading process
* Format code [skip actions]
* Add system for setting handbook address and port
* Lint Code [skip actions]
* Format code [skip actions]
* Fix game-related data not saving
* Format code [skip actions]
* Fix handbook server details
* Lint Code [skip actions]
* Format code [skip actions]
* Use the headers provided by a context to get the IP address
should acknowledge #1975
* Format code [skip actions]
* Move more logs to `trace`
* Format code [skip actions]
* more trace
* Fix something and implement weapon entities
* Format code [skip actions]
* Fix `EntityWeapon`
* Remove deprecated API & Fix resource checking
* Fix unnecessary warning for first-time setup
* Implement handbook request limiting
* Format code [skip actions]
* Fix new avatar weapons being null
* Format code [skip actions]
* Fix issue with 35303 being un-completable & Try to fix fulfilled quest conditions being met
* Load activity config on server startup
* Require plugins to specify an API version and match with the server
* Add default open state ignore list
* Format code [skip actions]
* Quick fix for questing, needs more investigation
This would make the questing work again
* Remove existing hack for 35303
* Fix ignored open states from being set
* Format code [skip actions]
* fix the stupidest bug ive ever seen
* Optimize player kicking on server close
* Format code [skip actions]
* Re-add hack to fix 35303
* Update GitHub actions
* Format code [skip actions]
* Potentially fix issues with regions
* Download additional handbook data
* Revert "Potentially fix issues with regions"
This reverts commit 84e3823695.
---------
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: scooterboo <lewasite@yahoo.com>
Co-authored-by: Tesutarin <105267106+Tesutarin@users.noreply.github.com>
Co-authored-by: Scald <104459145+Arikatsu@users.noreply.github.com>
Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
This commit is contained in:
Magix
@@ -1,25 +1,19 @@
|
||||
package emu.grasscutter.game.tower;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import dev.morphia.annotations.Entity;
|
||||
import dev.morphia.annotations.Transient;
|
||||
|
||||
@Entity
|
||||
public class TowerData{
|
||||
/**
|
||||
* the floor players chose
|
||||
*/
|
||||
int currentFloorId;
|
||||
int currentLevel;
|
||||
@Transient
|
||||
int currentLevelId;
|
||||
|
||||
/**
|
||||
* floorId - Record
|
||||
*/
|
||||
Map<Integer, TowerLevelRecord> recordMap;
|
||||
|
||||
@Transient
|
||||
int entryScene;
|
||||
}
|
||||
package emu.grasscutter.game.tower;
|
||||
|
||||
import dev.morphia.annotations.Entity;
|
||||
import dev.morphia.annotations.Transient;
|
||||
import java.util.Map;
|
||||
|
||||
@Entity
|
||||
public class TowerData {
|
||||
/** the floor players chose */
|
||||
int currentFloorId;
|
||||
|
||||
int currentLevel;
|
||||
@Transient int currentLevelId;
|
||||
|
||||
/** floorId - Record */
|
||||
Map<Integer, TowerLevelRecord> recordMap;
|
||||
|
||||
@Transient int entryScene;
|
||||
}
|
||||
|
||||
@@ -1,24 +1,27 @@
|
||||
package emu.grasscutter.game.tower;
|
||||
|
||||
import dev.morphia.annotations.Entity;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Entity
|
||||
public class TowerLevelRecord {
|
||||
/**
|
||||
* floorId in config
|
||||
*/
|
||||
/** floorId in config */
|
||||
private int floorId;
|
||||
/**
|
||||
* LevelId - Stars
|
||||
*/
|
||||
/** LevelId - Stars */
|
||||
private Map<Integer, Integer> passedLevelMap;
|
||||
|
||||
private int floorStarRewardProgress;
|
||||
|
||||
public TowerLevelRecord setLevelStars(int levelId, int stars){
|
||||
public TowerLevelRecord() {}
|
||||
|
||||
public TowerLevelRecord(int floorId) {
|
||||
this.floorId = floorId;
|
||||
this.passedLevelMap = new HashMap<>();
|
||||
this.floorStarRewardProgress = 0;
|
||||
}
|
||||
|
||||
public TowerLevelRecord setLevelStars(int levelId, int stars) {
|
||||
passedLevelMap.put(levelId, stars);
|
||||
return this;
|
||||
}
|
||||
@@ -27,16 +30,6 @@ public class TowerLevelRecord {
|
||||
return passedLevelMap.values().stream().mapToInt(Integer::intValue).sum();
|
||||
}
|
||||
|
||||
public TowerLevelRecord(){
|
||||
|
||||
}
|
||||
|
||||
public TowerLevelRecord(int floorId){
|
||||
this.floorId = floorId;
|
||||
this.passedLevelMap = new HashMap<>();
|
||||
this.floorStarRewardProgress = 0;
|
||||
}
|
||||
|
||||
public int getFloorId() {
|
||||
return floorId;
|
||||
}
|
||||
@@ -60,5 +53,4 @@ public class TowerLevelRecord {
|
||||
public void setFloorStarRewardProgress(int floorStarRewardProgress) {
|
||||
this.floorStarRewardProgress = floorStarRewardProgress;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,46 +1,44 @@
|
||||
package emu.grasscutter.game.tower;
|
||||
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.excels.TowerLevelData;
|
||||
import emu.grasscutter.data.excels.tower.TowerLevelData;
|
||||
import emu.grasscutter.game.dungeons.DungeonSettleListener;
|
||||
import emu.grasscutter.game.dungeons.TowerDungeonSettleListener;
|
||||
import emu.grasscutter.game.player.BasePlayerManager;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.server.packet.send.*;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class TowerManager extends BasePlayerManager {
|
||||
private static final List<DungeonSettleListener> towerDungeonSettleListener =
|
||||
List.of(new TowerDungeonSettleListener());
|
||||
|
||||
public TowerManager(Player player) {
|
||||
super(player);
|
||||
}
|
||||
|
||||
public TowerData getTowerData() {
|
||||
return getPlayer().getTowerData();
|
||||
return this.getPlayer().getTowerData();
|
||||
}
|
||||
|
||||
public int getCurrentFloorId() {
|
||||
return getTowerData().currentFloorId;
|
||||
return this.getTowerData().currentFloorId;
|
||||
}
|
||||
|
||||
public int getCurrentLevelId() {
|
||||
return getTowerData().currentLevelId + getTowerData().currentLevel;
|
||||
return this.getTowerData().currentLevelId + this.getTowerData().currentLevel;
|
||||
}
|
||||
|
||||
/**
|
||||
* form 1-3
|
||||
*/
|
||||
/** form 1-3 */
|
||||
public int getCurrentLevel() {
|
||||
return getTowerData().currentLevel + 1;
|
||||
return this.getTowerData().currentLevel + 1;
|
||||
}
|
||||
private static final List<DungeonSettleListener> towerDungeonSettleListener = List.of(new TowerDungeonSettleListener());
|
||||
|
||||
public Map<Integer, TowerLevelRecord> getRecordMap() {
|
||||
Map<Integer, TowerLevelRecord> recordMap = getTowerData().recordMap;
|
||||
if (recordMap == null || recordMap.size()==0) {
|
||||
if (recordMap == null || recordMap.size() == 0) {
|
||||
recordMap = new HashMap<>();
|
||||
recordMap.put(1001, new TowerLevelRecord(1001));
|
||||
getTowerData().recordMap = recordMap;
|
||||
@@ -52,11 +50,13 @@ public class TowerManager extends BasePlayerManager {
|
||||
var floorData = GameData.getTowerFloorDataMap().get(floor);
|
||||
getTowerData().currentFloorId = floorData.getFloorId();
|
||||
getTowerData().currentLevel = 0;
|
||||
getTowerData().currentLevelId = GameData.getTowerLevelDataMap().values().stream()
|
||||
.filter(x -> x.getLevelGroupId() == floorData.getLevelGroupId() && x.getLevelIndex() == 1)
|
||||
.findFirst()
|
||||
.map(TowerLevelData::getId)
|
||||
.orElse(0);
|
||||
getTowerData().currentLevelId =
|
||||
GameData.getTowerLevelDataMap().values().stream()
|
||||
.filter(
|
||||
x -> x.getLevelGroupId() == floorData.getLevelGroupId() && x.getLevelIndex() == 1)
|
||||
.findFirst()
|
||||
.map(TowerLevelData::getId)
|
||||
.orElse(0);
|
||||
|
||||
if (getTowerData().entryScene == 0) {
|
||||
getTowerData().entryScene = player.getSceneId();
|
||||
@@ -65,7 +65,6 @@ public class TowerManager extends BasePlayerManager {
|
||||
player.getTeamManager().setupTemporaryTeam(towerTeams);
|
||||
}
|
||||
|
||||
|
||||
public void enterLevel(int enterPointId) {
|
||||
var levelData = GameData.getTowerLevelDataMap().get(getCurrentLevelId());
|
||||
|
||||
@@ -74,53 +73,77 @@ public class TowerManager extends BasePlayerManager {
|
||||
notifyCurLevelRecordChange();
|
||||
// use team user choose
|
||||
player.getTeamManager().useTemporaryTeam(0);
|
||||
player.getServer().getDungeonSystem().handoffDungeon(player, dungeonId,
|
||||
towerDungeonSettleListener);
|
||||
player
|
||||
.getServer()
|
||||
.getDungeonSystem()
|
||||
.handoffDungeon(player, dungeonId, towerDungeonSettleListener);
|
||||
|
||||
// make sure user can exit dungeon correctly
|
||||
player.getScene().setPrevScene(getTowerData().entryScene);
|
||||
player.getScene().setPrevScenePoint(enterPointId);
|
||||
|
||||
player.getSession().send(new PacketTowerEnterLevelRsp(getTowerData().currentFloorId, getCurrentLevel()));
|
||||
player
|
||||
.getSession()
|
||||
.send(new PacketTowerEnterLevelRsp(getTowerData().currentFloorId, getCurrentLevel()));
|
||||
// stop using skill
|
||||
player.getSession().send(new PacketCanUseSkillNotify(false));
|
||||
// notify the cond of stars
|
||||
player.getSession().send(new PacketTowerLevelStarCondNotify(getTowerData().currentFloorId, getCurrentLevel()));
|
||||
player
|
||||
.getSession()
|
||||
.send(new PacketTowerLevelStarCondNotify(getTowerData().currentFloorId, getCurrentLevel()));
|
||||
}
|
||||
|
||||
public void notifyCurLevelRecordChange() {
|
||||
player.getSession().send(new PacketTowerCurLevelRecordChangeNotify(getTowerData().currentFloorId, getCurrentLevel()));
|
||||
player
|
||||
.getSession()
|
||||
.send(
|
||||
new PacketTowerCurLevelRecordChangeNotify(
|
||||
getTowerData().currentFloorId, getCurrentLevel()));
|
||||
}
|
||||
|
||||
public void notifyCurLevelRecordChangeWhenDone(int stars) {
|
||||
Map<Integer, TowerLevelRecord> recordMap = getRecordMap();
|
||||
Map<Integer, TowerLevelRecord> recordMap = this.getRecordMap();
|
||||
int currentFloorId = getTowerData().currentFloorId;
|
||||
if (!recordMap.containsKey(currentFloorId)) {
|
||||
recordMap.put(currentFloorId,
|
||||
new TowerLevelRecord(currentFloorId).setLevelStars(getCurrentLevelId(),stars));
|
||||
}else {
|
||||
recordMap.put(currentFloorId,
|
||||
recordMap.get(currentFloorId).setLevelStars(getCurrentLevelId(),stars));
|
||||
recordMap.put(
|
||||
currentFloorId,
|
||||
new TowerLevelRecord(currentFloorId).setLevelStars(getCurrentLevelId(), stars));
|
||||
} else {
|
||||
recordMap.put(
|
||||
currentFloorId, recordMap.get(currentFloorId).setLevelStars(getCurrentLevelId(), stars));
|
||||
}
|
||||
|
||||
getTowerData().currentLevel++;
|
||||
this.getTowerData().currentLevel++;
|
||||
|
||||
if (!hasNextLevel()) {
|
||||
if (!this.hasNextLevel()) {
|
||||
// set up the next floor
|
||||
var nextFloorId = this.getNextFloorId();
|
||||
recordMap.computeIfAbsent(nextFloorId, TowerLevelRecord::new);
|
||||
player.getSession().send(new PacketTowerCurLevelRecordChangeNotify(nextFloorId, 1));
|
||||
}else {
|
||||
player.getSession().send(new PacketTowerCurLevelRecordChangeNotify(currentFloorId, getCurrentLevel()));
|
||||
} else {
|
||||
player
|
||||
.getSession()
|
||||
.send(new PacketTowerCurLevelRecordChangeNotify(currentFloorId, getCurrentLevel()));
|
||||
}
|
||||
}
|
||||
|
||||
public boolean hasNextLevel() {
|
||||
return getTowerData().currentLevel < 3;
|
||||
}
|
||||
|
||||
public int getNextFloorId() {
|
||||
return player.getServer().getTowerSystem().getNextFloorId(getTowerData().currentFloorId);
|
||||
return this.player
|
||||
.getServer()
|
||||
.getTowerSystem()
|
||||
.getNextFloorId(this.getTowerData().currentFloorId);
|
||||
}
|
||||
|
||||
public boolean hasNextFloor() {
|
||||
return player.getServer().getTowerSystem().getNextFloorId(getTowerData().currentFloorId) > 0;
|
||||
return this.player
|
||||
.getServer()
|
||||
.getTowerSystem()
|
||||
.getNextFloorId(this.getTowerData().currentFloorId)
|
||||
> 0;
|
||||
}
|
||||
|
||||
public void clearEntry() {
|
||||
@@ -128,12 +151,14 @@ public class TowerManager extends BasePlayerManager {
|
||||
}
|
||||
|
||||
public boolean canEnterScheduleFloor() {
|
||||
Map<Integer, TowerLevelRecord> recordMap = getRecordMap();
|
||||
if (!recordMap.containsKey(player.getServer().getTowerSystem().getLastEntranceFloor())) {
|
||||
Map<Integer, TowerLevelRecord> recordMap = this.getRecordMap();
|
||||
if (!recordMap.containsKey(this.player.getServer().getTowerSystem().getLastEntranceFloor())) {
|
||||
return false;
|
||||
}
|
||||
return recordMap.get(player.getServer().getTowerSystem().getLastEntranceFloor())
|
||||
.getStarCount() >= 6;
|
||||
return recordMap
|
||||
.get(this.player.getServer().getTowerSystem().getLastEntranceFloor())
|
||||
.getStarCount()
|
||||
>= 6;
|
||||
}
|
||||
|
||||
public void mirrorTeamSetUp(int teamId) {
|
||||
|
||||
@@ -8,7 +8,6 @@ public class TowerScheduleConfig {
|
||||
private Date scheduleStartTime;
|
||||
private Date nextScheduleChangeTime;
|
||||
|
||||
|
||||
public int getScheduleId() {
|
||||
return scheduleId;
|
||||
}
|
||||
|
||||
@@ -3,22 +3,21 @@ package emu.grasscutter.game.tower;
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.data.DataLoader;
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.excels.TowerScheduleData;
|
||||
import emu.grasscutter.data.excels.tower.TowerScheduleData;
|
||||
import emu.grasscutter.server.game.BaseGameSystem;
|
||||
import emu.grasscutter.server.game.GameServer;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class TowerSystem extends BaseGameSystem {
|
||||
|
||||
private TowerScheduleConfig towerScheduleConfig;
|
||||
|
||||
public TowerSystem(GameServer server) {
|
||||
super(server);
|
||||
this.load();
|
||||
}
|
||||
|
||||
private TowerScheduleConfig towerScheduleConfig;
|
||||
|
||||
public synchronized void load() {
|
||||
try {
|
||||
towerScheduleConfig = DataLoader.loadClass("TowerSchedule.json", TowerScheduleConfig.class);
|
||||
@@ -34,8 +33,10 @@ public class TowerSystem extends BaseGameSystem {
|
||||
public TowerScheduleData getCurrentTowerScheduleData() {
|
||||
var data = GameData.getTowerScheduleDataMap().get(towerScheduleConfig.getScheduleId());
|
||||
if (data == null) {
|
||||
Grasscutter.getLogger().error("Could not get current tower schedule data by schedule id {}, please check your resource files",
|
||||
towerScheduleConfig.getScheduleId());
|
||||
Grasscutter.getLogger()
|
||||
.error(
|
||||
"Could not get current tower schedule data by schedule id {}, please check your resource files",
|
||||
towerScheduleConfig.getScheduleId());
|
||||
}
|
||||
|
||||
return data;
|
||||
@@ -57,13 +58,13 @@ public class TowerSystem extends BaseGameSystem {
|
||||
var nextId = 0;
|
||||
|
||||
// find in entrance floors first
|
||||
for (int i=0;i<entranceFloors.size()-1;i++) {
|
||||
for (int i = 0; i < entranceFloors.size() - 1; i++) {
|
||||
if (floorId == entranceFloors.get(i)) {
|
||||
nextId = entranceFloors.get(i+1);
|
||||
nextId = entranceFloors.get(i + 1);
|
||||
}
|
||||
}
|
||||
|
||||
if (floorId == entranceFloors.get(entranceFloors.size()-1)) {
|
||||
if (floorId == entranceFloors.get(entranceFloors.size() - 1)) {
|
||||
nextId = scheduleFloors.get(0);
|
||||
}
|
||||
|
||||
@@ -72,14 +73,17 @@ public class TowerSystem extends BaseGameSystem {
|
||||
}
|
||||
|
||||
// find in schedule floors
|
||||
for (int i=0; i < scheduleFloors.size() - 1; i++) {
|
||||
for (int i = 0; i < scheduleFloors.size() - 1; i++) {
|
||||
if (floorId == scheduleFloors.get(i)) {
|
||||
nextId = scheduleFloors.get(i + 1);
|
||||
}
|
||||
}return nextId;
|
||||
}
|
||||
return nextId;
|
||||
}
|
||||
|
||||
public Integer getLastEntranceFloor() {
|
||||
return getCurrentTowerScheduleData().getEntranceFloorId().get(getCurrentTowerScheduleData().getEntranceFloorId().size() - 1);
|
||||
return getCurrentTowerScheduleData()
|
||||
.getEntranceFloorId()
|
||||
.get(getCurrentTowerScheduleData().getEntranceFloorId().size() - 1);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user