From dc35e8d5b3ad9fec5d0ad3540ff6e988999d0cfb Mon Sep 17 00:00:00 2001 From: mattiefm Date: Thu, 29 Aug 2024 02:58:15 -0600 Subject: [PATCH] possible mahabre lag fix --- .../netControllerV2/baseNetController.js | 1 + .../netControllerV2/commandInterpreter.js | 22 +++++++++---------- www/mods/commonLibs/_common/static.js | 5 +++++ www/mods/devTools.js | 4 ++-- www/mods/mattieFMModLoader.js | 6 ++--- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/www/mods/_multiplayer/netControllerV2/baseNetController.js b/www/mods/_multiplayer/netControllerV2/baseNetController.js index 44c8ce50..c8537181 100644 --- a/www/mods/_multiplayer/netControllerV2/baseNetController.js +++ b/www/mods/_multiplayer/netControllerV2/baseNetController.js @@ -1307,6 +1307,7 @@ class BaseNetController extends EventEmitter { const _character = $gameMap.event(params[0] > 0 ? params[0] : cmd.eventId); console.log('character'); console.log(_character); + if(cmd === MATTIE.static.rpg.commands.setMovementRoute) if (_character) { const moveRoute = params[1]; const tempCanPass = _character.canPass; diff --git a/www/mods/_multiplayer/netControllerV2/commandInterpreter.js b/www/mods/_multiplayer/netControllerV2/commandInterpreter.js index a5eefd34..abbbd994 100644 --- a/www/mods/_multiplayer/netControllerV2/commandInterpreter.js +++ b/www/mods/_multiplayer/netControllerV2/commandInterpreter.js @@ -5,17 +5,17 @@ MATTIE.multiplayer = MATTIE.multiplayer || {}; MATTIE.multiplayer.enabledNetCommands = [ 205, // set movement route // 117, //common events. We will likely need to do more than just forward this. probs some filtering and stuff - 601, // battle win //send - 602, // battle escape //send? - 603, // battle loss //interpret - 313, // change state //interpret - 331, // change enemy hp //send? - // set event location - 333, // change enemy state //send? - 334, // enemy recover all //send? - 335, // enemy appear //send? - 336, // enemy transform //send? - 353, // game over //interpret + // 601, // battle win //send + // 602, // battle escape //send? + // 603, // battle loss //interpret + // 313, // change state //interpret + // 331, // change enemy hp //send? + // // set event location + // 333, // change enemy state //send? + // 334, // enemy recover all //send? + // 335, // enemy appear //send? + // 336, // enemy transform //send? + // 353, // game over //interpret // 355, //scripts //interpret? // 356, //plugin commands //interpret? diff --git a/www/mods/commonLibs/_common/static.js b/www/mods/commonLibs/_common/static.js index b745cf00..00e3a041 100644 --- a/www/mods/commonLibs/_common/static.js +++ b/www/mods/commonLibs/_common/static.js @@ -160,6 +160,11 @@ MATTIE.static.skills.enGarde = null; // RPGMaker Constants MATTIE.static.rpg.battleProcessingId = 301; +/** @description a dict of command ids*/ +MATTIE.static.rpg.commands = { + setMovementRoute:205 +} + // Variableids /** @description a list of sync variables for multiplayer */ MATTIE.static.variable.syncedVars = []; diff --git a/www/mods/devTools.js b/www/mods/devTools.js index 33b4c666..af19dc1e 100644 --- a/www/mods/devTools.js +++ b/www/mods/devTools.js @@ -209,10 +209,10 @@ function toggleGodMode() { } /** - * @description toggle on/off party health loss + * @description toggle on/off party hunger loss */ function toggleHunger() { - toggleMemberProp('changeExp', 'hungerDisabled', (member) => member.expForLevel()); + toggleMemberProp('changeExp', 'hungerDisabled', (member) => 99); } /** diff --git a/www/mods/mattieFMModLoader.js b/www/mods/mattieFMModLoader.js index 14efce67..6cdea13f 100644 --- a/www/mods/mattieFMModLoader.js +++ b/www/mods/mattieFMModLoader.js @@ -1190,11 +1190,11 @@ class ModManager { */ MATTIE_ModManager.overrideErrorLoggers = function () { SceneManager.onError = function (e) { - MATTIE.onError.call(this, e); + //MATTIE.onError.call(this, e); }; SceneManager.catchException = function (e) { - MATTIE.onError.call(this, e); + //MATTIE.onError.call(this, e); }; }; @@ -1350,7 +1350,7 @@ Graphics.displayFile = function (file) { Graphics.hideFile = function () { MATTIE_ModManager.updateConfigDisplay(); MATTIE_ModManager._configDisplay.hidden = true; - SceneManager.resume(); + if(SceneManager._stopped) SceneManager.resume(); }; /** @description load and render an html file into the config display */