mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-04-10 09:52: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:
63
src/main/java/emu/grasscutter/game/talk/TalkExec.java
Normal file
63
src/main/java/emu/grasscutter/game/talk/TalkExec.java
Normal file
@@ -0,0 +1,63 @@
|
||||
package emu.grasscutter.game.talk;
|
||||
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Stream;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@AllArgsConstructor
|
||||
public enum TalkExec {
|
||||
TALK_EXEC_NONE(0),
|
||||
TALK_EXEC_SET_GADGET_STATE(1),
|
||||
TALK_EXEC_SET_GAME_TIME(2),
|
||||
TALK_EXEC_NOTIFY_GROUP_LUA(3),
|
||||
TALK_EXEC_SET_DAILY_TASK_VAR(4),
|
||||
TALK_EXEC_INC_DAILY_TASK_VAR(5),
|
||||
TALK_EXEC_DEC_DAILY_TASK_VAR(6),
|
||||
TALK_EXEC_SET_QUEST_VAR(7),
|
||||
TALK_EXEC_INC_QUEST_VAR(8),
|
||||
TALK_EXEC_DEC_QUEST_VAR(9),
|
||||
TALK_EXEC_SET_QUEST_GLOBAL_VAR(10),
|
||||
TALK_EXEC_INC_QUEST_GLOBAL_VAR(11),
|
||||
TALK_EXEC_DEC_QUEST_GLOBAL_VAR(12),
|
||||
TALK_EXEC_TRANS_SCENE_DUMMY_POINT(13),
|
||||
TALK_EXEC_SAVE_TALK_ID(14);
|
||||
|
||||
private static final Int2ObjectMap<TalkExec> execMap = new Int2ObjectOpenHashMap<>();
|
||||
private static final Map<String, TalkExec> execStringMap = new HashMap<>();
|
||||
|
||||
static {
|
||||
Stream.of(TalkExec.values())
|
||||
.filter(e -> e.name().startsWith("TALK_EXEC_"))
|
||||
.forEach(
|
||||
entry -> {
|
||||
execMap.put(entry.getValue(), entry);
|
||||
execStringMap.put(entry.name(), entry);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the talk execution condition by its value.
|
||||
*
|
||||
* @param value The integer value of the condition.
|
||||
* @return The corresponding enum value.
|
||||
*/
|
||||
public static TalkExec getExecByValue(int value) {
|
||||
return execMap.getOrDefault(value, TALK_EXEC_NONE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the talk execution by its name.
|
||||
*
|
||||
* @param name The string name of the condition.
|
||||
* @return The corresponding enum value.
|
||||
*/
|
||||
public static TalkExec getExecByName(String name) {
|
||||
return execStringMap.getOrDefault(name, TALK_EXEC_NONE);
|
||||
}
|
||||
|
||||
@Getter private final int value;
|
||||
}
|
||||
14
src/main/java/emu/grasscutter/game/talk/TalkExecHandler.java
Normal file
14
src/main/java/emu/grasscutter/game/talk/TalkExecHandler.java
Normal file
@@ -0,0 +1,14 @@
|
||||
package emu.grasscutter.game.talk;
|
||||
|
||||
import emu.grasscutter.data.excels.TalkConfigData;
|
||||
import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
|
||||
public abstract class TalkExecHandler {
|
||||
/**
|
||||
* @param player The player who is talking.
|
||||
* @param talkData The data associated with the talk.
|
||||
* @param execParam The execution parameter for the talk.
|
||||
*/
|
||||
public abstract void execute(Player player, TalkConfigData talkData, TalkExecParam execParam);
|
||||
}
|
||||
59
src/main/java/emu/grasscutter/game/talk/TalkManager.java
Normal file
59
src/main/java/emu/grasscutter/game/talk/TalkManager.java
Normal file
@@ -0,0 +1,59 @@
|
||||
package emu.grasscutter.game.talk;
|
||||
|
||||
import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_COMPLETE_TALK;
|
||||
import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_COMPLETE_ANY_TALK;
|
||||
import static emu.grasscutter.game.quest.enums.QuestContent.QUEST_CONTENT_COMPLETE_TALK;
|
||||
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.binout.MainQuestData.TalkData;
|
||||
import emu.grasscutter.game.player.BasePlayerManager;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import lombok.NonNull;
|
||||
|
||||
public final class TalkManager extends BasePlayerManager {
|
||||
public TalkManager(@NonNull Player player) {
|
||||
super(player);
|
||||
}
|
||||
|
||||
/**
|
||||
* Invoked when a talk is triggered.
|
||||
*
|
||||
* @param talkId The ID of the talk.
|
||||
* @param npcEntityId The entity ID of the NPC being talked to.
|
||||
*/
|
||||
public void triggerTalkAction(int talkId, int npcEntityId) {
|
||||
var talkData = GameData.getTalkConfigDataMap().get(talkId);
|
||||
if (talkData == null) return;
|
||||
|
||||
var player = this.getPlayer();
|
||||
// Check if the NPC id is valid.
|
||||
var entity = player.getScene().getEntityById(npcEntityId);
|
||||
if (entity != null) {
|
||||
// The config ID of the entity is the NPC's ID.
|
||||
if (!talkData.getNpcId().contains(entity.getConfigId())) return;
|
||||
}
|
||||
|
||||
// Execute the talk action on associated handlers.
|
||||
talkData
|
||||
.getFinishExec()
|
||||
.forEach(e -> player.getServer().getTalkSystem().triggerExec(player, talkData, e));
|
||||
|
||||
// Invoke the talking events for quests.
|
||||
var questManager = player.getQuestManager();
|
||||
questManager.queueEvent(QUEST_CONTENT_COMPLETE_ANY_TALK, talkId);
|
||||
questManager.queueEvent(QUEST_CONTENT_COMPLETE_TALK, talkId);
|
||||
questManager.queueEvent(QUEST_COND_COMPLETE_TALK, talkId);
|
||||
|
||||
// Save the talk value to the quest's data.
|
||||
this.saveTalkToQuest(talkId, talkData.getQuestId());
|
||||
}
|
||||
|
||||
public void saveTalkToQuest(int talkId, int mainQuestId) {
|
||||
// TODO, problem with this is that some talks for activity also have
|
||||
// quest id, which isn't present in QuestExcels
|
||||
var mainQuest = this.getPlayer().getQuestManager().getMainQuestById(mainQuestId);
|
||||
if (mainQuest == null) return;
|
||||
|
||||
mainQuest.getTalks().put(talkId, new TalkData(talkId, ""));
|
||||
}
|
||||
}
|
||||
83
src/main/java/emu/grasscutter/game/talk/TalkSystem.java
Normal file
83
src/main/java/emu/grasscutter/game/talk/TalkSystem.java
Normal file
@@ -0,0 +1,83 @@
|
||||
package emu.grasscutter.game.talk;
|
||||
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.data.excels.TalkConfigData;
|
||||
import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.server.game.BaseGameSystem;
|
||||
import emu.grasscutter.server.game.GameServer;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
||||
import org.reflections.Reflections;
|
||||
|
||||
public final class TalkSystem extends BaseGameSystem {
|
||||
private final Int2ObjectMap<TalkExecHandler> execHandlers = new Int2ObjectOpenHashMap<>();
|
||||
|
||||
public TalkSystem(GameServer server) {
|
||||
super(server);
|
||||
|
||||
this.registerHandlers(
|
||||
this.execHandlers, "emu.grasscutter.game.talk.exec", TalkExecHandler.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers all handlers with the required conditions.
|
||||
*
|
||||
* @param map The map to save handlers to.
|
||||
* @param packageName The full package domain.
|
||||
* @param clazz The class which handlers should derive from.
|
||||
*/
|
||||
public <T> void registerHandlers(Int2ObjectMap<T> map, String packageName, Class<T> clazz) {
|
||||
var reflections = new Reflections(packageName);
|
||||
var handlerClasses = reflections.getSubTypesOf(clazz);
|
||||
|
||||
for (var obj : handlerClasses) {
|
||||
this.registerTalkHandler(map, obj);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers the talk handler of the specified class.
|
||||
*
|
||||
* @param map The map to save the handler to.
|
||||
* @param handlerClass The class of the handler.
|
||||
*/
|
||||
public <T> void registerTalkHandler(Int2ObjectMap<T> map, Class<? extends T> handlerClass) {
|
||||
try {
|
||||
var value = 0;
|
||||
if (handlerClass.isAnnotationPresent(TalkValueExec.class)) {
|
||||
TalkValueExec opcode = handlerClass.getAnnotation(TalkValueExec.class);
|
||||
value = opcode.value().getValue();
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
if (value <= 0) return;
|
||||
map.put(value, handlerClass.getDeclaredConstructor().newInstance());
|
||||
} catch (Exception exception) {
|
||||
Grasscutter.getLogger().debug("Unable to register talk handler.", exception);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Notifies the associated handler of a talk being triggered.
|
||||
*
|
||||
* @param player The player which triggered the talk.
|
||||
* @param talkData The data associated with the talk.
|
||||
* @param execParam The talk parameter.
|
||||
*/
|
||||
public void triggerExec(Player player, TalkConfigData talkData, TalkExecParam execParam) {
|
||||
var handler = this.execHandlers.get(execParam.getType().getValue());
|
||||
if (handler == null) {
|
||||
Grasscutter.getLogger()
|
||||
.debug(
|
||||
"Could not execute talk handlers for {} ({}).",
|
||||
talkData.getId(),
|
||||
execParam.getType().getValue());
|
||||
return;
|
||||
}
|
||||
|
||||
// Execute the handler.
|
||||
handler.execute(player, talkData, execParam);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package emu.grasscutter.game.talk;
|
||||
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface TalkValueExec {
|
||||
TalkExec value();
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package emu.grasscutter.game.talk.exec;
|
||||
|
||||
import emu.grasscutter.data.excels.TalkConfigData;
|
||||
import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.talk.TalkExec;
|
||||
import emu.grasscutter.game.talk.TalkExecHandler;
|
||||
import emu.grasscutter.game.talk.TalkValueExec;
|
||||
|
||||
@TalkValueExec(TalkExec.TALK_EXEC_DEC_QUEST_GLOBAL_VAR)
|
||||
public final class ExecDecQuestGlobalVar extends TalkExecHandler {
|
||||
@Override
|
||||
public void execute(Player player, TalkConfigData talkData, TalkExecParam execParam) {
|
||||
if (execParam.getParam().length < 2) return;
|
||||
|
||||
player
|
||||
.getQuestManager()
|
||||
.decQuestGlobalVarValue(
|
||||
Integer.parseInt(execParam.getParam()[0]), Integer.parseInt(execParam.getParam()[1]));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package emu.grasscutter.game.talk.exec;
|
||||
|
||||
import emu.grasscutter.data.excels.TalkConfigData;
|
||||
import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.quest.GameMainQuest;
|
||||
import emu.grasscutter.game.talk.TalkExec;
|
||||
import emu.grasscutter.game.talk.TalkExecHandler;
|
||||
import emu.grasscutter.game.talk.TalkValueExec;
|
||||
|
||||
@TalkValueExec(TalkExec.TALK_EXEC_DEC_QUEST_VAR)
|
||||
public final class ExecDecQuestVar extends TalkExecHandler {
|
||||
@Override
|
||||
public void execute(Player player, TalkConfigData talkData, TalkExecParam execParam) {
|
||||
if (execParam.getParam().length < 3) return;
|
||||
|
||||
GameMainQuest mainQuest =
|
||||
player.getQuestManager().getMainQuestById(Integer.parseInt(execParam.getParam()[2]));
|
||||
if (mainQuest == null) return;
|
||||
|
||||
mainQuest.decQuestVar(
|
||||
Integer.parseInt(execParam.getParam()[0]), Integer.parseInt(execParam.getParam()[1]));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package emu.grasscutter.game.talk.exec;
|
||||
|
||||
import emu.grasscutter.data.excels.TalkConfigData;
|
||||
import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.talk.TalkExec;
|
||||
import emu.grasscutter.game.talk.TalkExecHandler;
|
||||
import emu.grasscutter.game.talk.TalkValueExec;
|
||||
|
||||
@TalkValueExec(TalkExec.TALK_EXEC_INC_QUEST_GLOBAL_VAR)
|
||||
public final class ExecIncQuestGlobalVar extends TalkExecHandler {
|
||||
@Override
|
||||
public void execute(Player player, TalkConfigData talkData, TalkExecParam execParam) {
|
||||
if (execParam.getParam().length < 2) return;
|
||||
|
||||
player
|
||||
.getQuestManager()
|
||||
.incQuestGlobalVarValue(
|
||||
Integer.parseInt(execParam.getParam()[0]), Integer.parseInt(execParam.getParam()[1]));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package emu.grasscutter.game.talk.exec;
|
||||
|
||||
import emu.grasscutter.data.excels.TalkConfigData;
|
||||
import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.quest.GameMainQuest;
|
||||
import emu.grasscutter.game.talk.TalkExec;
|
||||
import emu.grasscutter.game.talk.TalkExecHandler;
|
||||
import emu.grasscutter.game.talk.TalkValueExec;
|
||||
|
||||
@TalkValueExec(TalkExec.TALK_EXEC_INC_QUEST_VAR)
|
||||
public final class ExecIncQuestVar extends TalkExecHandler {
|
||||
@Override
|
||||
public void execute(Player player, TalkConfigData talkData, TalkExecParam execParam) {
|
||||
if (execParam.getParam().length < 3) return;
|
||||
|
||||
GameMainQuest mainQuest =
|
||||
player.getQuestManager().getMainQuestById(Integer.parseInt(execParam.getParam()[2]));
|
||||
if (mainQuest == null) return;
|
||||
|
||||
mainQuest.incQuestVar(
|
||||
Integer.parseInt(execParam.getParam()[0]), Integer.parseInt(execParam.getParam()[1]));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package emu.grasscutter.game.talk.exec;
|
||||
|
||||
import emu.grasscutter.data.excels.TalkConfigData;
|
||||
import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.talk.TalkExec;
|
||||
import emu.grasscutter.game.talk.TalkExecHandler;
|
||||
import emu.grasscutter.game.talk.TalkValueExec;
|
||||
|
||||
@TalkValueExec(TalkExec.TALK_EXEC_SET_GAME_TIME)
|
||||
public final class ExecSetGameTime extends TalkExecHandler {
|
||||
@Override
|
||||
public void execute(Player player, TalkConfigData talkData, TalkExecParam execParam) {
|
||||
if (execParam.getParam().length < 1) return;
|
||||
|
||||
player.getWorld().changeTime(Integer.parseInt(execParam.getParam()[0]), 0);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package emu.grasscutter.game.talk.exec;
|
||||
|
||||
import emu.grasscutter.data.excels.TalkConfigData;
|
||||
import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.talk.TalkExec;
|
||||
import emu.grasscutter.game.talk.TalkExecHandler;
|
||||
import emu.grasscutter.game.talk.TalkValueExec;
|
||||
|
||||
@TalkValueExec(TalkExec.TALK_EXEC_SET_QUEST_GLOBAL_VAR)
|
||||
public final class ExecSetQuestGlobalVar extends TalkExecHandler {
|
||||
@Override
|
||||
public void execute(Player player, TalkConfigData talkData, TalkExecParam execParam) {
|
||||
if (execParam.getParam().length < 2) return;
|
||||
|
||||
player
|
||||
.getQuestManager()
|
||||
.setQuestGlobalVarValue(
|
||||
Integer.parseInt(execParam.getParam()[0]), Integer.parseInt(execParam.getParam()[1]));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package emu.grasscutter.game.talk.exec;
|
||||
|
||||
import emu.grasscutter.data.excels.TalkConfigData;
|
||||
import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.talk.TalkExec;
|
||||
import emu.grasscutter.game.talk.TalkExecHandler;
|
||||
import emu.grasscutter.game.talk.TalkValueExec;
|
||||
|
||||
@TalkValueExec(TalkExec.TALK_EXEC_SET_QUEST_VAR)
|
||||
public final class ExecSetQuestVar extends TalkExecHandler {
|
||||
@Override
|
||||
public void execute(Player player, TalkConfigData talkData, TalkExecParam execParam) {
|
||||
if (execParam.getParam().length < 3) return;
|
||||
|
||||
var mainQuest =
|
||||
player.getQuestManager().getMainQuestById(Integer.parseInt(execParam.getParam()[2]));
|
||||
if (mainQuest == null) return;
|
||||
|
||||
mainQuest.setQuestVar(
|
||||
Integer.parseInt(execParam.getParam()[0]), Integer.parseInt(execParam.getParam()[1]));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
package emu.grasscutter.game.talk.exec;
|
||||
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.excels.TalkConfigData;
|
||||
import emu.grasscutter.data.excels.TalkConfigData.TalkExecParam;
|
||||
import emu.grasscutter.game.player.Player;
|
||||
import emu.grasscutter.game.talk.TalkExec;
|
||||
import emu.grasscutter.game.talk.TalkExecHandler;
|
||||
import emu.grasscutter.game.talk.TalkValueExec;
|
||||
import emu.grasscutter.game.world.Position;
|
||||
|
||||
@TalkValueExec(TalkExec.TALK_EXEC_TRANS_SCENE_DUMMY_POINT)
|
||||
public final class ExecTransSceneDummyPoint extends TalkExecHandler {
|
||||
@Override
|
||||
public void execute(Player player, TalkConfigData talkData, TalkExecParam execParam) {
|
||||
// param[0] == sceneid, param[1] == position
|
||||
if (execParam.getParam().length < 2) return;
|
||||
|
||||
var fullGlobals =
|
||||
GameData.getScriptSceneDataMap().get("flat.luas.scenes.full_globals.lua.json");
|
||||
if (fullGlobals == null) return;
|
||||
|
||||
var dummyPointScript =
|
||||
fullGlobals
|
||||
.getScriptObjectList()
|
||||
.get(
|
||||
execParam.getParam()[0] + "/scene" + execParam.getParam()[0] + "_dummy_points.lua");
|
||||
if (dummyPointScript == null) return;
|
||||
|
||||
var dummyPointMap = dummyPointScript.getDummyPoints();
|
||||
if (dummyPointMap == null) return;
|
||||
|
||||
var transmitPosPos = dummyPointMap.get(execParam.getParam()[1] + ".pos");
|
||||
// List<Float> transmitPosRot = dummyPointMap.get(e.getParam()[1] + ".rot"); would be useful
|
||||
// when transportation consider rotation
|
||||
if (transmitPosPos == null || transmitPosPos.isEmpty()) return;
|
||||
|
||||
player
|
||||
.getWorld()
|
||||
.transferPlayerToScene(
|
||||
player,
|
||||
Integer.parseInt(execParam.getParam()[0]),
|
||||
new Position(transmitPosPos.get(0), transmitPosPos.get(1), transmitPosPos.get(2)));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user