From 7a2d5ba11aa9a6c8c5a8212eb7d361b46948e8ee Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Sat, 29 Apr 2023 14:07:47 -0400 Subject: [PATCH] Add notes; format; clean-up --- .../java/emu/grasscutter/game/ability/AbilityManager.java | 4 ++-- .../java/emu/grasscutter/scripts/SceneScriptManager.java | 6 +++--- src/main/java/emu/grasscutter/scripts/ScriptLib.java | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/emu/grasscutter/game/ability/AbilityManager.java b/src/main/java/emu/grasscutter/game/ability/AbilityManager.java index 78e110624..094138a92 100644 --- a/src/main/java/emu/grasscutter/game/ability/AbilityManager.java +++ b/src/main/java/emu/grasscutter/game/ability/AbilityManager.java @@ -440,10 +440,10 @@ public final class AbilityManager extends BasePlayerManager { var abilityName = ability.getAbilityName(); if (abilityName.getHash() != 0) Grasscutter.getLogger() - .warn("Instancing {} in to {}", abilityName.getHash(), ability.getInstancedAbilityId()); + .trace("Instancing {} in to {}", abilityName.getHash(), ability.getInstancedAbilityId()); else Grasscutter.getLogger() - .warn("Instancing {} in to {}", abilityName.getStr(), ability.getInstancedAbilityId()); + .trace("Instancing {} in to {}", abilityName.getStr(), ability.getInstancedAbilityId()); var target = this.player.getScene().getEntityById(invoke.getEntityId()); if (target == null) { diff --git a/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java b/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java index 05316ac06..92e76d3eb 100644 --- a/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java +++ b/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java @@ -1116,14 +1116,14 @@ public class SceneScriptManager { var group = getGroupById(groupID); if (group == null || group.triggers == null) { Grasscutter.getLogger() - .warn( + .debug( "trying to create a timer for unknown group with id {} and source {}", groupID, source); return 1; } Grasscutter.getLogger() - .info( + .debug( "creating group timer event for group {} with source {} and time {}", groupID, source, @@ -1131,7 +1131,7 @@ public class SceneScriptManager { for (SceneTrigger trigger : group.triggers.values()) { if (trigger.getEvent() == EVENT_TIMER_EVENT && trigger.getSource().equals(source)) { Grasscutter.getLogger() - .warn( + .debug( "[LUA] Found timer trigger with source {} for group {} : {}", source, groupID, diff --git a/src/main/java/emu/grasscutter/scripts/ScriptLib.java b/src/main/java/emu/grasscutter/scripts/ScriptLib.java index 2beedd96b..36bdee759 100644 --- a/src/main/java/emu/grasscutter/scripts/ScriptLib.java +++ b/src/main/java/emu/grasscutter/scripts/ScriptLib.java @@ -1124,6 +1124,10 @@ public class ScriptLib { public int BeginCameraSceneLook(LuaTable sceneLookParams){ logger.debug("[LUA] Call BeginCameraSceneLook with {}", printTable(sceneLookParams)); + + // INVESTIGATE: Sniff the content for 'BeginCameraSceneLookNotify'. + // This packet is known as 260 (3.5) or 215 (3.6). + // Compare data to ones found in Lua, then de-obfuscate. // var luaLookPos = sceneLookParams.get("look_pos"); // var luaFollowPos = sceneLookParams.get("follow_pos"); // var luaDuration = sceneLookParams.get("duration");