From 1ccdbbcbf8b39644dda911bd48fd504ec2391a85 Mon Sep 17 00:00:00 2001 From: MATTIE_FM Date: Thu, 7 Dec 2023 21:01:28 -0700 Subject: [PATCH] tempp --- .../commonLibs/_common/API_CORE/troopAPI.js | 31 +- www/mods/commonLibs/docs/-_.html | 2 +- ...tiplayer_charCreationMultiRenderer.js.html | 2 +- .../docs/-_multiplayer_hostMenu.js.html | 20 +- .../docs/-_multiplayer_joinMenu.js.html | 2 +- .../docs/-_multiplayer_lobby.js.html | 2 +- .../-_multiplayer_multiplayerMenu.js.html | 2 +- ..._netControllerV2_baseNetController.js.html | 335 +- ...ntrollerV2_battle_battleController.js.html | 2 +- ...tControllerV2_battle_pvpController.js.html | 10 +- ...multiplayer_netControllerV2_client.js.html | 2 +- ...ayer_netControllerV2_combatEmitter.js.html | 27 +- ...netControllerV2_commandInterpreter.js.html | 2 +- ...layer_netControllerV2_enemyEmitter.js.html | 2 +- ...ControllerV2_enemyTransformEmitter.js.html | 2 +- ...-_multiplayer_netControllerV2_host.js.html | 2 +- ...er_netControllerV2_marriageHandler.js.html | 184 + ...r_netControllerV2_models_netActors.js.html | 2 +- ...ollerV2_models_playerFollowerModel.js.html | 2 +- ...rollerV2_models_playerInteractions.js.html | 25 +- ...netControllerV2_models_playerModel.js.html | 31 +- ...ayer_netControllerV2_playerEmitter.js.html | 16 +- ...yer_netControllerV2_playerRenderer.js.html | 6 +- ...ayer_netControllerV2_switchEmitter.js.html | 2 +- ...yer_netControllerV2_variableSyncer.js.html | 2 +- ...tControllerV2_yanflyChaseOverrider.js.html | 2 +- .../docs/-_multiplayer_scaleing.js.html | 7 +- .../docs/-_multiplayer_spectateScene.js.html | 2 +- .../docs/-_multiplayer_startGameMenu.js.html | 2 +- .../-_trepidationAndFamine_config.js.html | 2 +- ...trepidationAndFamine_scripts_items.js.html | 2 +- www/mods/commonLibs/docs/Asset.html | 2 +- www/mods/commonLibs/docs/CORE_API.html | 2 +- www/mods/commonLibs/docs/GameEmitter.html | 2 +- www/mods/commonLibs/docs/HostController.html | 2 +- www/mods/commonLibs/docs/Input.html | 91 +- .../docs/MATTIE.DataManager.global.html | 2 +- .../commonLibs/docs/MATTIE.DataManager.html | 2 +- www/mods/commonLibs/docs/MATTIE.GameInfo.html | 2 +- ...20for%20trepidation%20and%20famine%20.html | 2 +- ...repidation%20and%20famine%20config%20.html | 2 +- ...s%20added%20by%20these%20difficulties.html | 2 +- .../docs/MATTIE.actorAPI.Data_Actor.html | 1768 +-- .../MATTIE.actorAPI.Data_Actor_Wrapper.html | 1140 +- .../docs/MATTIE.actorAPI.Data_Class.html | 2 +- www/mods/commonLibs/docs/MATTIE.actorAPI.html | 442 +- .../commonLibs/docs/MATTIE.bbgirlAPI.html | 91 +- ...ATTIE.betterCrowMauler.CrowController.html | 2 +- .../docs/MATTIE.betterSaves.config.html | 2 +- .../commonLibs/docs/MATTIE.betterSaves.html | 2 +- .../commonLibs/docs/MATTIE.clipboard.html | 2 +- www/mods/commonLibs/docs/MATTIE.compat.html | 2 +- www/mods/commonLibs/docs/MATTIE.eventAPI.html | 637 +- www/mods/commonLibs/docs/MATTIE.fxAPI.html | 2 +- www/mods/commonLibs/docs/MATTIE.global.html | 2 +- www/mods/commonLibs/docs/MATTIE.html | 42 +- www/mods/commonLibs/docs/MATTIE.infoAPI.html | 198 +- ...IE.itemAPI-MATTIE.itemAPI.RunTimeItem.html | 2 +- www/mods/commonLibs/docs/MATTIE.itemAPI.html | 2 +- ...ormation%20about%20additional%20items.html | 2 +- www/mods/commonLibs/docs/MATTIE.menus.html | 2 +- .../docs/MATTIE.menus.mainMenu.html | 2 +- ...ace%20containing%20all%20misc%20stuff.html | 2 +- www/mods/commonLibs/docs/MATTIE.msgAPI.html | 850 +- .../docs/MATTIE.multiplayer.config.html | 6 +- .../MATTIE.multiplayer.config.scaling.html | 38 +- ...ng%20all%20the%20code%20for%20prefabs.html | 2 +- .../docs/MATTIE.randomiser.config.html | 2 +- .../commonLibs/docs/MATTIE.randomiser.html | 2 +- .../docs/MATTIE.sceneOverlapAPI.html | 170 + .../docs/MATTIE.scenes.Scene_DevActors.html | 2 +- .../docs/MATTIE.scenes.Scene_DevItems.html | 2 +- .../docs/MATTIE.scenes.Scene_ForceActors.html | 2 +- .../docs/MATTIE.scenes.Scene_Misc.html | 2 +- .../commonLibs/docs/MATTIE.scenes.base.html | 2 +- .../docs/MATTIE.scenes.emptyScroll.html | 2 +- www/mods/commonLibs/docs/MATTIE.scenes.html | 2 +- .../commonLibs/docs/MATTIE.static.actors.html | 2 +- .../docs/MATTIE.static.commands.html | 2 +- .../docs/MATTIE.static.commonEvents.html | 2 +- .../commonLibs/docs/MATTIE.static.events.html | 2 +- .../docs/MATTIE.static.events.images.html | 2 +- www/mods/commonLibs/docs/MATTIE.static.html | 2 +- .../commonLibs/docs/MATTIE.static.items.html | 2 +- .../commonLibs/docs/MATTIE.static.maps.html | 2 +- .../commonLibs/docs/MATTIE.static.rpg.html | 2 +- .../commonLibs/docs/MATTIE.static.skills.html | 2 +- .../commonLibs/docs/MATTIE.static.states.html | 2 +- .../commonLibs/docs/MATTIE.static.switch.html | 2 +- .../docs/MATTIE.static.variable.html | 2 +- ...ll%20tps%20for%20funger%201%20and%202.html | 2 +- www/mods/commonLibs/docs/MATTIE.troopAPI.html | 208 +- .../commonLibs/docs/MATTIE.unstuckAPI.html | 2 +- .../docs/MATTIE.windows.HorizontalBtns.html | 2 +- .../commonLibs/docs/MATTIE.windows.List.html | 4 +- .../docs/MATTIE.windows.TextDisplay.html | 4 +- .../docs/MATTIE.windows.TextInput.html | 6 +- .../docs/MATTIE.windows.Window_AllStatus.html | 2 +- .../docs/MATTIE.windows.Window_CheatItem.html | 2 +- www/mods/commonLibs/docs/MATTIE.windows.html | 6 +- www/mods/commonLibs/docs/MapEvent.html | 12351 +--------------- www/mods/commonLibs/docs/Math.seedrandom.html | 2 +- www/mods/commonLibs/docs/Mod.html | 2 +- www/mods/commonLibs/docs/ModManager.html | 2 +- www/mods/commonLibs/docs/betterSaves.js.html | 2 +- .../docs/bossRushOfTheEndless.js.html | 2 +- .../docs/commonLibs__common.js.html | 2 +- ...mmonLibs__common_API_CORE_actorAPI.js.html | 2 +- ...ommonLibs__common_API_CORE_apiDOCS.js.html | 2 +- ...mmonLibs__common_API_CORE_eventAPI.js.html | 18 +- ...Libs__common_API_CORE_eventWrapper.js.html | 63 +- ...ibs__common_API_CORE_heSoBBGirlAPI.js.html | 2 +- ...ommonLibs__common_API_CORE_infoAPI.js.html | 2 +- ...mmonLibs__common_API_CORE_inputAPI.js.html | 140 + ...ommonLibs__common_API_CORE_itemAPI.js.html | 9 +- ...ommonLibs__common_API_CORE_miscAPI.js.html | 2 +- ...commonLibs__common_API_CORE_msgAPI.js.html | 2 +- ...monLibs__common_API_CORE_preFabAPI.js.html | 2 +- ...__common_API_CORE_sceneOverlappAPI.js.html | 102 + ...Libs__common_API_CORE_teleportsAPI.js.html | 2 +- ...mmonLibs__common_API_CORE_troopAPI.js.html | 57 +- ...onLibs__common_API_CORE_unstuckAPI.js.html | 2 +- ...commonLibs__common_API_CORE_vfxAPI.js.html | 2 +- ...ommonLibs__common_betterCrowMauler.js.html | 2 +- ...commonLibs__common_betterDebugMenu.js.html | 2 +- .../docs/commonLibs__common_clipboard.js.html | 2 +- ...nLibs__common_commonitems_costumes.js.html | 2 +- .../commonLibs__common_compatibility.js.html | 2 +- .../commonLibs__common_dataManager.js.html | 2 +- .../commonLibs__common_gameEmitter.js.html | 2 +- .../docs/commonLibs__common_items.js.html | 346 +- .../docs/commonLibs__common_lodash.js.html | 2 +- ...commonLibs__common_menus_cheatMenu.js.html | 2 +- .../commonLibs__common_menus_mainMenu.js.html | 2 +- .../commonLibs__common_menus_menu.js.html | 2 +- .../commonLibs__common_menus_scenes.js.html | 2 +- .../commonLibs__common_menus_windows.js.html | 4 +- .../commonLibs__common_saveProtector.js.html | 2 +- .../commonLibs__common_seedRandom.js.html | 2 +- .../docs/commonLibs__common_static.js.html | 2 +- .../commonLibs__common_supporters.js.html | 2 +- .../commonLibs__common_systemEvents.js.html | 2 +- .../docs/commonLibs__common_util.js.html | 2 +- .../commonLibs__common_yanflyChecker.js.html | 2 +- www/mods/commonLibs/docs/devTools.js.html | 27 +- www/mods/commonLibs/docs/global.html | 346 +- www/mods/commonLibs/docs/index.html | 5 +- .../commonLibs/docs/mattieFMModLoader.js.html | 2 +- www/mods/commonLibs/docs/multiplayer.js.html | 8 +- www/mods/commonLibs/docs/randomiser.js.html | 2 +- .../docs/trepidationAndFamine.js.html | 2 +- www/mods/commonLibs/docs/tutorial-about.html | 2 +- .../commonLibs/docs/tutorial-devSetup.html | 2 +- .../commonLibs/docs/tutorial-install.html | 2 +- .../docs/tutorial-overhaulMigration.html | 2 +- .../commonLibs/docs/tutorial-support.html | 2 +- 156 files changed, 2851 insertions(+), 17248 deletions(-) create mode 100644 www/mods/commonLibs/docs/-_multiplayer_netControllerV2_marriageHandler.js.html create mode 100644 www/mods/commonLibs/docs/MATTIE.sceneOverlapAPI.html create mode 100644 www/mods/commonLibs/docs/commonLibs__common_API_CORE_inputAPI.js.html create mode 100644 www/mods/commonLibs/docs/commonLibs__common_API_CORE_sceneOverlappAPI.js.html diff --git a/www/mods/commonLibs/_common/API_CORE/troopAPI.js b/www/mods/commonLibs/_common/API_CORE/troopAPI.js index 2b64877e..702252e3 100644 --- a/www/mods/commonLibs/_common/API_CORE/troopAPI.js +++ b/www/mods/commonLibs/_common/API_CORE/troopAPI.js @@ -876,7 +876,8 @@ Spriteset_Battle.prototype.refreshSpacing = function (shouldAffectBase = true) { for (let index = 0; index < keys.length; index++) { const key = keys[index]; const enemyList = dict[key]; // a list of sprites - const actorId = MATTIE.multiplayer.pvp.PvpController.mapTroopToActor(key); + let actorId; + if (MATTIE.multiplayer.pvp) { actorId = MATTIE.multiplayer.pvp.PvpController.mapTroopToActor(key); } let xOffset = bestX(index); let yOffset = 0; @@ -888,19 +889,21 @@ Spriteset_Battle.prototype.refreshSpacing = function (shouldAffectBase = true) { if (!sprite.baseY) sprite.baseY = sprite._homeY; // handle pvp spacing for leaders - if (MATTIE.multiplayer.pvp.inPVP) { - if (MATTIE.multiplayer.getCurrentNetController().player.pvpCombatArr.some( - (netKey) => { - const netCont = MATTIE.multiplayer.getCurrentNetController(); - - const player = MATTIE.multiplayer.getCurrentNetController().netPlayers[netKey]; - if (player) return player.actorId == actorId; - return false; - }, - - )) { - yOffset -= 35; - xOffset = 20; + if (MATTIE.multiplayer.pvp) { + if (MATTIE.multiplayer.pvp.inPVP) { + if (MATTIE.multiplayer.getCurrentNetController().player.pvpCombatArr.some( + (netKey) => { + const netCont = MATTIE.multiplayer.getCurrentNetController(); + + const player = MATTIE.multiplayer.getCurrentNetController().netPlayers[netKey]; + if (player) return player.actorId == actorId; + return false; + }, + + )) { + yOffset -= 35; + xOffset = 20; + } } } diff --git a/www/mods/commonLibs/docs/-_.html b/www/mods/commonLibs/docs/-_.html index 65d89f3d..40528fe0 100644 --- a/www/mods/commonLibs/docs/-_.html +++ b/www/mods/commonLibs/docs/-_.html @@ -49,7 +49,7 @@

Class: _

- +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_charCreationMultiRenderer.js.html b/www/mods/commonLibs/docs/-_multiplayer_charCreationMultiRenderer.js.html index 49518e02..f501e5ee 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_charCreationMultiRenderer.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_charCreationMultiRenderer.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/charCreationMultiRend - +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_hostMenu.js.html b/www/mods/commonLibs/docs/-_multiplayer_hostMenu.js.html index bbf99440..d2fca846 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_hostMenu.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_hostMenu.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/hostMenu.js

- +
@@ -94,9 +94,15 @@

Source: _multiplayer/hostMenu.js

MATTIE.multiplayer.hostController.open(); this.addPlayerListWindow(); this.addOptionsBtns(); + this.addPeerDisplayWindow(); + const loadingAnimInterval = setInterval(() => { + this.animateTick(); + }, 500); + MATTIE.multiplayer.hostController.self.on('open', () => { - this.addPeerDisplayWindow(); this.initListController(); + clearInterval(loadingAnimInterval); + this.showHideCode(true); }); }; @@ -132,11 +138,17 @@

Source: _multiplayer/hostMenu.js

if (this._peerWindow) this._peerWindow.updateText(text); }; +MATTIE.scenes.multiplayer.host.prototype.animateTick = function () { + const text = this._peerWindow.text; + text[1] = text[1].endsWith('...') ? text[1].replace('...', '') : `${text[1]}.`; + + if (this._peerWindow) this._peerWindow.updateText(text); +}; + MATTIE.scenes.multiplayer.host.prototype.addPeerDisplayWindow = function () { const text = [ 'People can join using this number:', - '*'.repeat(MATTIE.multiplayer.hostController.peerId.length), - + 'Please wait for connection to broker', ]; this._peerWindow = new MATTIE.windows.TextDisplay((Graphics.boxWidth - 600) / 2 + 100, 0, 600, 100, text); this.addWindow(this._peerWindow); diff --git a/www/mods/commonLibs/docs/-_multiplayer_joinMenu.js.html b/www/mods/commonLibs/docs/-_multiplayer_joinMenu.js.html index 2ba86180..dd552be2 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_joinMenu.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_joinMenu.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/joinMenu.js

- +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_lobby.js.html b/www/mods/commonLibs/docs/-_multiplayer_lobby.js.html index d344ae49..5d4e246c 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_lobby.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_lobby.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/lobby.js

- +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_multiplayerMenu.js.html b/www/mods/commonLibs/docs/-_multiplayer_multiplayerMenu.js.html index 51a8d174..092d2494 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_multiplayerMenu.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_multiplayerMenu.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/multiplayerMenu.js - +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_baseNetController.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_baseNetController.js.html index 5847b9bd..923c621c 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_baseNetController.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_baseNetController.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/baseN - +
@@ -90,6 +90,10 @@

Source: _multiplayer/netControllerV2/baseN class BaseNetController extends EventEmitter { constructor() { super(); + /** the player on the local machine + * @type {PlayerModel} + */ + this.player = null; /** @description the id of this peer */ this.peerId = null; /** @description has the game started? */ @@ -294,6 +298,12 @@

Source: _multiplayer/netControllerV2/baseN if (data.moveSpeedEvent) { this.onSpeedEventData(data.moveSpeedEvent, data.id); } + if (data.marriageReq) { + this.onMarriageRequestData(data.marriageReq, data.id); + } + if (data.marriageResponse) { + this.onMarriageResponseData(data.marriageResponse, data.id); + } } //----------------------------------------------------- @@ -352,6 +362,28 @@

Source: _multiplayer/netControllerV2/baseN actor.setHp(newActorHealth); actor.setMp(newActorMana); } + + // handle despawning chars for pvp + if (MATTIE.multiplayer.pvp.inPVP) { + // despawn dead chars + Object.keys(this.netPlayers).forEach((key) => { + /** @type {PlayerModel} */ + const player = this.netPlayers[key]; + player.battleMembers().forEach((member) => { + console.log(member); + if (member.isDead()) { + const netActor = player.$netActors.netActor(member.actorId()); + const troopId = MATTIE.multiplayer.pvp.PvpController.mapActorToTroop( + netActor.baseActorId || member.actorId(), + ); // get the troop for this actor + const troop = $gameTroop._additionalTroops[troopId]; + console.log(troop); + console.log(member.actorId()); + if (troop) { troop.despawn(); } + } + }); + }); + } } syncEnemyStates(enemyStatesArr) { @@ -507,88 +539,104 @@

Source: _multiplayer/netControllerV2/baseN * @param {UUID} senderId id of the net user that sent these actions */ processPvpAction(actor, action, isExtraTurn, senderId) { - const targetActor = $gameActors.actor(action.targetActorId); + let targetActor = $gameActors.actor(action.targetActorId); let legCut = false; let armCut = false; /** @type {Game_Enemy} */ - const originalTarget = $gameTroop.members()[action._targetIndex]; + + const originalTargetName = action.targetName; action.forcedTargets = []; const netActor = this.netPlayers[senderId].$netActors.netActor(actor.actorId()); const troopId = MATTIE.multiplayer.pvp.PvpController.mapActorToTroop(netActor.baseActorId || actor.actorId()); // get the troop for this actor + // const originalTarget = $dataTroops[troopId].members.find((member) => $dataEnemies[member.enemyId].name.includes(originalTargetName)) + // || $dataEnemies[$dataTroops[troopId].members[2].enemyId]; if (troopId) { let targetActorIndex = 0; /** @type {Game_Enemy} */ - const battler = $gameTroop._additionalTroops[troopId].baseMembers()[2]; // just grab the first member for now + const i = 2; + const enemies = $gameTroop._additionalTroops[troopId].baseMembers(); + let battler = enemies[i]; // just grab the first member for now + for (let i = 2; battler.isDead() && i < enemies.length; i++) battler = enemies[i]; actor.partyIndex = () => this.netPlayers[senderId].battleMembers().indexOf(actor); // just say thye go first for now to test action._netTarget = false; - if (originalTarget) { // if the original target was a game troop then scale dmg appropriately - let atkScaler = actor.mhp / originalTarget.mhp; - atkScaler = MATTIE.util.clamp(atkScaler, 0, 1); // clamp the atk scaler between .5 and 1 - - if (originalTarget.name().toLowerCase().includes('torso')) { - battler.enemy().params[2] = MATTIE.util.clamp(actor.atk * atkScaler, 4, 100);// min damage 10 - } else if (originalTarget.name().toLowerCase().includes('head')) { - battler.enemy().params[2] = MATTIE.util.clamp(actor.atk / 7, 4, 100);// more dmg to head - } else if (originalTarget.name().toLowerCase().includes('arm')) { - armCut = true; - battler.enemy().params[2] = 1; - targetActor.addState(MATTIE.static.states.armCut); - } else if (originalTarget.name().toLowerCase().includes('leg')) { - legCut = true; - battler.enemy().params[2] = 1; - targetActor.addState(MATTIE.static.states.legCut); - } else { - battler.enemy().params[2] = 0; + if (targetActor) { + // handle replacements + // that is leader can only be killed if all members have been killed first + if ($gameParty.leader().actorId() === targetActor.actorId() && $gameParty.battleMembers().length > 1) { + const battlers = $gameParty.battleMembers(); + const oldTarget = targetActor; + targetActor = battlers[MATTIE.util.randBetween(1, battlers.length - 1)] || battlers[0]; + console.log(targetActor); + action.cb = () => { + BattleManager._logWindow.displaySubstitute(targetActor, oldTarget); + MATTIE.msgAPI.footerMsg('Your loyal followers protect you!'); + }; } - } - - battler.setCurrentAction(action); - // change the damage formula to be raw damage stat. - /** @type {rm.types.Item} */ - const clonedItem = JsonEx.makeDeepCopy(battler._actions[battler._actions.length - 1].item()); - clonedItem.damage.formula = 'a.atk'; - - battler._actions[battler._actions.length - 1].item = function () { - return clonedItem; - }; - targetActorIndex = $gameParty._actors.indexOf(parseInt(action.targetActorId, 10)); + battler.setCurrentAction(action); + // change the damage formula to be raw damage stat. + /** @type {rm.types.Item} */ + const clonedItem = JsonEx.makeDeepCopy(battler._actions[battler._actions.length - 1].item()); + clonedItem.damage.formula = 'a.atk'; + + battler._actions[battler._actions.length - 1].item = function () { + return clonedItem; + }; + + targetActorIndex = $gameParty._actors.indexOf(parseInt(targetActor.actorId(), 10)); + + battler._actions[battler._actions.length - 1]._netTarget = false; + battler._actions[battler._actions.length - 1].setSubject(battler); + battler._actions[battler._actions.length - 1].setTarget(targetActorIndex); + + Object.keys(action.targetResults).forEach((key) => { + const actor = targetActor; + // handle damage + if (originalTargetName.toLowerCase().includes('arm') && action.isKillingBlow) { + armCut = true; + battler.enemy().params[2] = 1; + targetActor.addState(MATTIE.static.states.armCut); + } else if (originalTargetName.toLowerCase().includes('leg') && action.isKillingBlow) { + legCut = true; + battler.enemy().params[2] = 1; + targetActor.addState(MATTIE.static.states.legCut); + } else { + battler.enemy().params[2] = 0; + } - battler._actions[battler._actions.length - 1]._netTarget = false; - battler._actions[battler._actions.length - 1].setSubject(battler); - battler._actions[battler._actions.length - 1].setTarget(targetActorIndex); + if (actor) { + action.targetResults[battler._actions[battler._actions.length - 1] + .makeTargetResultsId(actor, this.netPlayers[senderId].peerId)] = action.targetResults[key]; + action.targetResults[battler._actions[battler._actions.length - 1] + .makeTargetResultsId(actor)] = action.targetResults[key]; + } + }); - Object.keys(action.targetResults).forEach((key) => { - const actor = $gameActors.actor(action.targetActorId); - if (actor) { - const newKey = actor.name(); - action.targetResults[newKey] = action.targetResults[key]; + if (armCut || legCut) { + /** @type {rm.types.Effect} */ + const effect = {}; + effect.code = 21; + effect.dataId = MATTIE.static.states.bleeding; + effect.value1 = 1; + effect.value2 = 0; + battler._actions[battler._actions.length - 1].item().effects.push(effect); + effect.code = 21; + effect.dataId = 3; + effect.value1 = 1; + effect.value2 = 0; + battler._actions[battler._actions.length - 1].item().effects.push(effect); + effect.code = 44; + effect.dataId = 240; + effect.value1 = 1; + effect.value2 = 0; + battler._actions[battler._actions.length - 1].item().effects.push(effect); } - }); - if (armCut || legCut) { - /** @type {rm.types.Effect} */ - const effect = {}; - effect.code = 21; - effect.dataId = MATTIE.static.states.bleeding; - effect.value1 = 1; - effect.value2 = 0; - battler._actions[battler._actions.length - 1].item().effects.push(effect); - effect.code = 21; - effect.dataId = 3; - effect.value1 = 1; - effect.value2 = 0; - battler._actions[battler._actions.length - 1].item().effects.push(effect); - effect.code = 44; - effect.dataId = 240; - effect.value1 = 1; - effect.value2 = 0; - battler._actions[battler._actions.length - 1].item().effects.push(effect); + battler._actions[battler._actions.length - 1].loadRng(action.targetResults); } - battler._actions[battler._actions.length - 1].loadRng(action.targetResults); - + battler.partyIndex = () => action.userBattlerIndex + 1; BattleManager.addNetActionBattler(battler, isExtraTurn); } } @@ -629,7 +677,30 @@

Source: _multiplayer/netControllerV2/baseN * @param {*} id the peer id of the player who moved */ onMoveData(moveData, id) { - this.moveNetPlayer(moveData, id); + if (this.netPlayers[id].isMarried) { + MATTIE.marriageAPI.handleMove.call(this, moveData, id); + } else { + this.moveNetPlayer(moveData, id); + } + } + + /** + * @description smoothly move a net player to a location + * @param {*} numSteps number of steps to take + * @param {*} player the game char to move + * @param {*} delayPerStep the delay between each step + * @param {*} location {x:x, y:y} the location obj + */ + smoothMoveNetPlayer(numSteps, player, location, delayPerStep = 150) { + for (let index = 0; index < numSteps; index++) { + setTimeout(() => { + try { + if (SceneManager._scene instanceof Scene_Map) { player.moveTowardCharacter(location); } + } catch (error) { + console.warn('player smooth move being bad'); + } + }, delayPerStep * index); + } } /** @@ -638,18 +709,24 @@

Source: _multiplayer/netControllerV2/baseN * @param {*} id the id of the peer who's player moved */ moveNetPlayer(moveData, id) { - if (this.netPlayers[id].map === $gameMap.mapId()) { // only call if on same map + if (this.netPlayers[id].map === $gameMap.mapId() && SceneManager._scene instanceof Scene_Map) { + // only call if on same map and the local player is looking at scene_map IE: not in menu if (moveData.x) { const dist = Math.sqrt((moveData.x - $gamePlayer._x) ** 2 + (moveData.y - $gamePlayer._y) ** 2); if (moveData.t) { + console.log('transfered char (due to request)'); moveData.map = $gameMap.mapId(); this.transferNetPlayer(moveData, id, false); - } else if (dist > 4) { + } else if (dist > 10) { + console.log('transfered char (due to dist)'); moveData.map = $gameMap.mapId(); this.transferNetPlayer(moveData, id, false); } else { - this.netPlayers[id].$gamePlayer._x = moveData.x; - this.netPlayers[id].$gamePlayer._y = moveData.y; + console.log('tried to move char smoothly'); + const deltaX = moveData.x - this.netPlayers[id].$gamePlayer._x; + const deltaY = moveData.y - this.netPlayers[id].$gamePlayer._y; + const numSteps = Math.abs(deltaX) + Math.abs(deltaY); + this.smoothMoveNetPlayer(numSteps, this.netPlayers[id].$gamePlayer, moveData, 75); } } else { try { @@ -658,7 +735,8 @@

Source: _multiplayer/netControllerV2/baseN console.warn(`something went wrong when moving the character${error}`); } } - } else if (moveData.x) { // if player not on map update pos ONLY + } else if (moveData.x) { + // if player not on map or local player is in menu update pos ONLY this.netPlayers[id].$gamePlayer._x = moveData.x; // update pos only this.netPlayers[id].$gamePlayer._y = moveData.y; // update pos only } @@ -696,6 +774,20 @@

Source: _multiplayer/netControllerV2/baseN * @param {*} id the id of the peer who's player moved */ transferNetPlayer(transData, id, shouldSync = true) { + const map = transData.map; + this.netPlayers[id].setMap(map); + + // if not on the map try again later + if (!(SceneManager._scene instanceof Scene_Map)) { + console.log('waiting to transfer'); + setTimeout(() => { + console.log('transfering'); + this.transferNetPlayer(transData, id, shouldSync); + }, 1000); + return; + } + + // if on the correct scene if (this.transferRetries <= this.maxTransferRetries) { try { const x = transData.x; @@ -705,8 +797,21 @@

Source: _multiplayer/netControllerV2/baseN try { SceneManager._scene.updateCharacters(); try { - this.netPlayers[id].$gamePlayer.reserveTransfer(map, x, y, 0, 0); - this.netPlayers[id].$gamePlayer.performTransfer(shouldSync); + const deltaX = transData.x - this.netPlayers[id].$gamePlayer._x; + const deltaY = transData.y - this.netPlayers[id].$gamePlayer._y; + const numSteps = Math.abs(deltaX) + Math.abs(deltaY); + let delay = 0; + + if (numSteps < 5) { + const delayBetweenStep = 150; + this.smoothMoveNetPlayer(numSteps, this.netPlayers[id].$gamePlayer, transData, delayBetweenStep); + delay = numSteps * delayBetweenStep; + } + + setTimeout(() => { + this.netPlayers[id].$gamePlayer.reserveTransfer(map, x, y, 0, 0); + this.netPlayers[id].$gamePlayer.performTransfer(shouldSync); + }, delay); } catch (error) { console.warn('player was not on the map when transfer was called'); } @@ -1206,6 +1311,93 @@

Source: _multiplayer/netControllerV2/baseN } } + //----------------------------------------------------- + // Marriage Event + //----------------------------------------------------- + /** + * @description emits the event for changing equipment + * @emits marriageReq + * @param targetIds an array of the peerIds of all persons (excluding host involved in this request) + * @param response whether this is emitting a response to the request + * @param responseBool whether this player says yes or no to the response + * */ + emitMarriageRequest(targetIds, response = false, responseBool = false) { + if (!(typeof targetIds == 'object')) targetIds = [targetIds]; + const obj = {}; + obj.marriageReq = {}; + obj.marriageReq.targetIds = targetIds; + this.sendViaMainRoute(obj); + this.emit('marriageReq', obj); + } + + /** + * @description process the data of a marriage request + * @param {*} marriageReqObj the net obj for marriagereq change + */ + onMarriageRequestData(marriageReqObj, id) { + const targetIds = marriageReqObj.targetIds; + const hostId = id; + if (targetIds.includes(this.peerId)) { + MATTIE.msgAPI.showChoices(['Yes', 'NO'], 0, 0, (n) => { + // emit a marraige response to everyone, 0 is yes as shown above in the choices + this.emitMarriageResponse(n == 0, hostId, targetIds); + }, `show love to ${this.netPlayers[id].name}?`); + } + } + + /** + * @description send the marraige response to all clients + * @emits marriageResponse + * @param {boolean} consent whether the local player said yes or no + * @param {boolean} hostId the id of the person who initiated the marriage request + */ + emitMarriageResponse(consent, hostId, targetIds) { + const obj = {}; + obj.marriageResponse = {}; + obj.marriageResponse.consent = consent; + obj.marriageResponse.hostId = hostId; + obj.marriageResponse.targetIds = targetIds; + this.emit('marriageResponse', obj); + + this.sendViaMainRoute(obj); + // lock player in place and make them invisible while it forms + this.player.conversationModel.marry(consent, false); + if (consent) { + this.player.marriedTo = targetIds; + this.player.marriedTo.push(hostId); + this.player.marriageHost = hostId; + this.player.isMarried = true; + this.player.isMarriageHost = false; + this.updatePlayerInfo(); + } + } + + /** + * @description process a marriage response + */ + onMarriageResponseData(marriageResponse, id) { + const sender = this.netPlayers[id]; + const consent = marriageResponse.consent; + // the id of the person who initialized the marriage + const hostId = marriageResponse.hostId; + const targetIds = marriageResponse.targetIds; + if (consent) { + if (hostId === this.peerId) { + // if this is the host + this.player.isMarried = true; + this.player.marriedTo = targetIds; + this.player.marriedTo.push(hostId); + this.player.marriageHost = hostId; + this.player.isMarriageHost = true; + this.updatePlayerInfo(); + + // display marriage event + this.player.conversationModel.target = sender; + this.player.conversationModel.marry(consent, true); + } + } + } + //----------------------------------------------------- // Spawned events (handles item drops and any event spawned at run time) //----------------------------------------------------- @@ -1229,7 +1421,6 @@

Source: _multiplayer/netControllerV2/baseN onEventSpawn(data, id) { const event = new MapEvent(); event.data = data; - event.setPersist(true); try { event.spawn(data.x, data.y, true); } catch (error) { diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_battle_battleController.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_battle_battleController.js.html index 2807db64..bdf15de3 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_battle_battleController.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_battle_battleController.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/battl - +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_battle_pvpController.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_battle_pvpController.js.html index c41bb93c..9303805d 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_battle_pvpController.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_battle_pvpController.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/battl - +
@@ -188,13 +188,17 @@

Source: _multiplayer/netControllerV2/battl }; if (enemy.name().includes('head') || enemy.name().includes('torso')) { enemy.addState(MATTIE.static.states.resistDeath); // make torso and head invincible + forceParamValue(enemy, 0, 10000); // doubly make sure by setting hp to 10,000 + enemy.recoverAll(); } else { - enemy.setHp(30); // all limbs die in one hit + // set limb max hp to 750 or 400 in easy + forceParamValue(enemy, 0, MATTIE.GameInfo.isHardMode() || MATTIE.GameInfo.isTerrorAndStarvation() ? 750 : 400); + enemy.setHp(750); } enemy.addState(MATTIE.static.states.cantDoShit); }); $gameTroop.clearAllPages(); - }); + }, true); }; setTimeout(() => { diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_client.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_client.js.html index 86f1791e..ddc0d1df 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_client.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_client.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/clien - +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_combatEmitter.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_combatEmitter.js.html index aa49b560..0bc039eb 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_combatEmitter.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_combatEmitter.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/comba - +
@@ -154,6 +154,7 @@

Source: _multiplayer/netControllerV2/comba const targetTroopId = $gameTroop.mapMemberIndexToTroopId(action._targetIndex); const targetActorId = MATTIE.multiplayer.pvp.PvpController.mapTroopToActor(targetTroopId); action.targetActorId = targetActorId; + action.userBattlerIndex = battler.partyIndex(); } arr.push(action); } @@ -194,6 +195,29 @@

Source: _multiplayer/netControllerV2/comba this.targetResults[this.makeTargetResultsId(target)].miss = this._preloadMissed; this.targetResults[this.makeTargetResultsId(target)].res = (!this._preloadMissed && !this._preloadEvade); this.targetResults[this.makeTargetResultsId(target)].dmg = this.makeDamageValue(target, crit); + + if (MATTIE.multiplayer.pvp.inPVP) { + if (this.targetResults[this.makeTargetResultsId(target)].dmg >= target.hp) this.killingBlow = true; + this.targetName = target.name(); + // update dmg vals for pvp + + const originalTarget = target; + const originalTargetName = target.name(); + const baseDmg = this.targetResults[this.makeTargetResultsId(target)].dmg; + atkScaler = 0.05; + + // limbs only do 40% dmg + this.targetResults[this.makeTargetResultsId(target)].dmg = Math.ceil(MATTIE.util.clamp(baseDmg * atkScaler * 0.4, 6, 89)); + + if (originalTargetName.toLowerCase().includes('torso')) { + this.targetResults[this.makeTargetResultsId(target)].dmg = Math.ceil(MATTIE.util.clamp(baseDmg * atkScaler, 6, 89)); + // battler.enemy().params[2] = MATTIE.util.clamp(actor.atk * atkScaler, 4, 100);// min damage 4 + } else if (originalTargetName.toLowerCase().includes('head')) { + // battler.enemy().params[2] = MATTIE.util.clamp(actor.atk * atkScaler * 3, 4, 100);// 1.5x dmg to head + // head does 3x dmg + this.targetResults[this.makeTargetResultsId(target)].dmg = Math.ceil(MATTIE.util.clamp(baseDmg * atkScaler * 3, 6, 99)); + } + } }); BattleManager.targetResults = Object.assign(BattleManager.targetResults || {}, this.targetResults); }; @@ -378,6 +402,7 @@

Source: _multiplayer/netControllerV2/comba this.forceAction(action._item._itemId, action._targetIndex, action.forcedTargets); this._actions[this._actions.length - 1]._netTarget = action._netTarget; this._actions[this._actions.length - 1].loadRng(action.targetResults); + this._actions[this._actions.length - 1].cb = action.cb; console.log(action.forcedTargets); if (action._item._dataClass === 'item') this._actions[this._actions.length - 1].setItem(action._item._itemId); diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_commandInterpreter.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_commandInterpreter.js.html index a5302d9e..15552617 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_commandInterpreter.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_commandInterpreter.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/comma - +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_enemyEmitter.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_enemyEmitter.js.html index b672d746..31d01274 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_enemyEmitter.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_enemyEmitter.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/enemy - +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_enemyTransformEmitter.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_enemyTransformEmitter.js.html index 4fffc3ca..79869d4e 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_enemyTransformEmitter.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_enemyTransformEmitter.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/enemy - +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_host.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_host.js.html index 2bc2088a..e7f6b4ca 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_host.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_host.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/host. - +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_marriageHandler.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_marriageHandler.js.html new file mode 100644 index 00000000..bd562c8b --- /dev/null +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_marriageHandler.js.html @@ -0,0 +1,184 @@ + + + + + + + Source: _multiplayer/netControllerV2/marriageHandler.js | Source: _multiplayer/netControllerV2/marriageHandler.js + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+
+
MATTIE.marriageAPI = {};
+
+// override inputupdate direction to choose from an array of dirs
+
+(() => {
+	const InputUpdateDir = Input._updateDirection;
+	/**
+     * @static
+     * @method _updateDirection
+     * @private
+     */
+	Input._updateDirection = function () {
+		InputUpdateDir.call(this);
+		const originalDir = this._dir4;
+
+		// override once for forcedDir4
+		if (this.forcedDir4) {
+			this._dir4 = this.forcedDir4;
+			this.forcedDir4 = undefined;
+		}
+	};
+})();
+
+MATTIE.marriageAPI.setup = function (targetIds) {
+	const netCont = MATTIE.multiplayer.getCurrentNetController();
+	const player = netCont.player;
+	if ($gameSystem.isMarried) {
+		player.marriedTo = $gameSystem.marriageIds;
+		if ($gameSystem.marriageHost) {
+			//
+		} else {
+			// permanently hide player
+			$gamePlayer.isTransparent = () => true;
+		}
+	}
+};
+/**
+ * @description set the local player as married.
+ * NOTE: this does nothing without setup being called
+ * @param {*} bool whether they are married or not
+ * @param {*} isHost whether they are the host of the marriage
+ * @param {string[]} targetIds the ids of all the players this player is married to
+ */
+MATTIE.marriageAPI.setMarried = function (bool, targetIds, host = false) {
+	$gameSystem.isMarried = bool;
+	$gameSystem.marriageHost = host;
+	$gameSystem.marriageIds = targetIds;
+};
+
+MATTIE.marriageAPI.transferCount = 0;
+MATTIE.marriageAPI.transferEveryX = 25;
+
+/**
+ * @description the handler for married movement, ment to be called while bound to a net controller
+ * @param {*} moveData the net movedata obj
+ * @param {*} id the net id of the sender
+ */
+MATTIE.marriageAPI.handleMove = function (moveData, id) {
+	const netPlayer = this.netPlayers[id];
+	let player = null;
+
+	// if this player is a part of the marriage trying to move
+	if (this.player.marriedTo.includes(id)) {
+		console.log('a player you are married to is moving');
+		MATTIE.marriageAPI.transferCount++;
+		if (MATTIE.marriageAPI.transferCount >= MATTIE.marriageAPI.transferEveryX && !this.player.marriageHost) {
+			MATTIE.marriageAPI.transferCount = 0;
+			const otherPlayer = this.netPlayers[netPlayer.marriageHost].$gamePlayer;
+			$gamePlayer.reserveTransfer(this.netPlayers[netPlayer.marriageHost].map, otherPlayer.x, otherPlayer.y, 0);
+			$gamePlayer.performTransfer();
+		}
+		player = $gamePlayer;
+	} else if (netPlayer.marriageHost != this.peerId) {
+		// if this player is just a normal player not associated with this marriage
+		player = this.netPlayers[netPlayer.marriageHost].$gamePlayer;
+	}
+	if (player) {
+		if (moveData.x) {
+			const deltaX = moveData.x - $gamePlayer._x;
+			const deltaY = moveData.y - $gamePlayer._y;
+			const numSteps = Math.abs(deltaX) + Math.abs(deltaY);
+			this.smoothMoveNetPlayer(numSteps, player, moveData, 75);
+		} else if (this.player.isMarried) {
+			Input.forcedDir4 = moveData.d;
+		} else {
+			this.moveNetPlayer(moveData, netPlayer.marriageHost);
+		}
+	}
+};
+
+
+
+ + + + +
+ +
+ + +
+ + + + + + + + + diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_models_netActors.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_models_netActors.js.html index d3c5ad2c..9a06d570 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_models_netActors.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_models_netActors.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/model - +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_models_playerFollowerModel.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_models_playerFollowerModel.js.html index 9435acab..2a4b3ab1 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_models_playerFollowerModel.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_models_playerFollowerModel.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/model - +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_models_playerInteractions.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_models_playerInteractions.js.html index dd4eedbe..34418562 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_models_playerInteractions.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_models_playerInteractions.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/model - +
@@ -82,7 +82,7 @@

Source: _multiplayer/netControllerV2/model /** * @description the main talk option that handles all conversation * @param {int} localId the id of the local player - * @param {PlayerModel} target the id of the target player + * @param {PlayerModel} target the target player */ MATTIE.multiplayer.Conversations.prototype.talk = function (localId, target) { this.targetName = target.name; @@ -128,14 +128,22 @@

Source: _multiplayer/netControllerV2/model /** * @description form a marriage with the target player or display they are not willing if they don't concent * @param {*} otherPlayerIsWilling whether the other player concents or not. + * @param {boolean} isHost whether this player initiated the conversation + * @param {boolean} spawn whether to spawn the marriage event or not */ -MATTIE.multiplayer.Conversations.prototype.marry = function (otherPlayerIsWilling) { +MATTIE.multiplayer.Conversations.prototype.marry = function (otherPlayerIsWilling, spawn = false) { if (otherPlayerIsWilling) { - MATTIE.fxAPI.hidePlayer(8000); - MATTIE.fxAPI.lockPlayer(8000); - MATTIE.eventAPI.marriageAPI.displayMarriage($gameParty.leader().actorId(), this.target.$gamePlayer.actorId, true, $gamePlayer.x, $gamePlayer.y); + MATTIE.msgAPI.displayMsg('They are willing.'); + MATTIE.fxAPI.hidePlayer(10000); + MATTIE.fxAPI.lockPlayer(10000); + if (spawn) { + // eslint-disable-next-line max-len + MATTIE.eventAPI.marriageAPI.displayMarriage($gameParty.leader().actorId(), this.target.$gamePlayer.actorId, true, $gamePlayer.x, $gamePlayer.y); + } + + MATTIE.actorAPI.changePartyLeader(MATTIE.static.actors.marriageId); } else { - MATTIE.msgAPI.displayMsg(`${this.targetName} is NOT willing.`); + MATTIE.msgAPI.displayMsg('They are NOT willing.'); } }; @@ -174,8 +182,7 @@

Source: _multiplayer/netControllerV2/model case 4: // Show Love // trigger net event for proccessing marriage concent // eslint-disable-next-line no-case-declarations - const otherPlayerIsWilling = true; - this.marry(otherPlayerIsWilling); + MATTIE.multiplayer.getCurrentNetController().emitMarriageRequest([this.target.peerId]); break; case 5: // cancel break; diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_models_playerModel.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_models_playerModel.js.html index ff8bd27d..2db349b1 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_models_playerModel.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_models_playerModel.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/model - +
@@ -98,6 +98,21 @@

Source: _multiplayer/netControllerV2/model /** @description an array of all player's ids who currently in combat with this player */ this.pvpCombatArr = []; + + /** @description whether this play is part of a marriage */ + this.isMarried = false; + + /** @description an array of all peerId's this player is married to */ + this.marriedTo = []; + + /** @description whether marriage has been initalized or not */ + this.marriageSetup = false; + + /** @description whether this player is the host of a marriage */ + this.isMarriageHost = false; + + /** @description the peerid of the host of this marriage */ + this.marriageHost = null; } /** @description add an id to the pvp arr if it does not already exist */ @@ -249,6 +264,7 @@

Source: _multiplayer/netControllerV2/model const displayMembers = this.displayMembers(); const followers = []; for (let index = 0; index < displayMembers.length; index++) { + /** @type {Game_Actor} */ const actor = displayMembers[index]; if (actor.actorId() != this.actorId) { followers.push(actor); @@ -311,6 +327,10 @@

Source: _multiplayer/netControllerV2/model obj.actorId = this.actorId; obj.peerId = this.peerId; obj.followerIds = this.followerIds; + obj.isMarriageHost = this.isMarriageHost; + obj.marriageHost = this.marriageHost; + obj.isMarried = this.isMarried; + obj.marriedTo = this.marriedTo; return obj; } @@ -320,6 +340,11 @@

Source: _multiplayer/netControllerV2/model } } +/** set the dir4 current control. dir4 is the direction on the arrow keys. */ +Game_Player.prototype.moveOneTile = function (dir4) { + this.ctrlDir4 = dir4; +}; + /** * @description a class that represents any player that is not the one the user is actively controlling. * @extends Game_Player @@ -361,10 +386,6 @@

Source: _multiplayer/netControllerV2/model this._followers = new MATTIE.multiplayer.NetFollowers(this); }; -/** set the dir4 current control. dir4 is the direction on the arrow keys. */ -MATTIE.multiplayer.Secondary_Player.prototype.moveOneTile = function (dir4) { - this.ctrlDir4 = dir4; -}; MATTIE.multiplayer.Secondary_Player.prototype.performTransfer = function () { // I dont want to full override this function so instead we can just make the game // think that the new player never travels to new maps so that the $gameMap.setup() is never called diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_playerEmitter.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_playerEmitter.js.html index 5e07dbcb..0395eb4a 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_playerEmitter.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_playerEmitter.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/playe - +
@@ -81,7 +81,7 @@

Source: _multiplayer/netControllerV2/playe // every x moves send player x and y to move MATTIE.multiplayer.selfMoveCount = 0; -MATTIE.multiplayer.selfMax = 15; +MATTIE.multiplayer.selfMax = 5; // every x moves send player x and y to transfer MATTIE.multiplayer.selfTransMoveCount = 0; MATTIE.multiplayer.selfTransMax = 100; @@ -309,6 +309,18 @@

Source: _multiplayer/netControllerV2/playe } MATTIE_RPG.Game_Player_SetMoveSpeed.call(this, moveSpeed); }; + + // setup a move event to trigger when player stops moving + MATTIE.inputAPI.onLongNoInput((() => { + if (MATTIE.multiplayer.hasController()) { + const netController = MATTIE.multiplayer.getCurrentNetController(); + if (SceneManager._scene.isActive() && SceneManager._scene instanceof Scene_Map) { + console.log(MATTIE.multiplayer.getCurrentNetController()); + console.log(netController.emitMoveEvent); + netController.emitMoveEvent(0, $gamePlayer.x, $gamePlayer.y); + } + } + })); }; diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_playerRenderer.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_playerRenderer.js.html index e5c3bb07..95ba9dae 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_playerRenderer.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_playerRenderer.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/playe - +
@@ -84,7 +84,9 @@

Source: _multiplayer/netControllerV2/playe if (key) { /** @type {PlayerModel} */ const netPlayer = players[key]; - if ($gameMap.mapId() === netPlayer.map) { // only render players on same map + if ($gameMap.mapId() === netPlayer.map + && (!netPlayer.isMarried || netPlayer.isMarriageHost) + ) { // only render players on same map that are not married unless they are the host netPlayer.$gamePlayer.setActor(netPlayer.actorId); netPlayer.$gamePlayer.refresh(); const p2 = netPlayer.$gamePlayer; diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_switchEmitter.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_switchEmitter.js.html index 7c56955b..a24748cc 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_switchEmitter.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_switchEmitter.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/switc - +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_variableSyncer.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_variableSyncer.js.html index 5752f7f9..91a54807 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_variableSyncer.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_variableSyncer.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/varia - +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_yanflyChaseOverrider.js.html b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_yanflyChaseOverrider.js.html index 7eb0f61d..ccfa1dee 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_yanflyChaseOverrider.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_netControllerV2_yanflyChaseOverrider.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/netControllerV2/yanfl - +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_scaleing.js.html b/www/mods/commonLibs/docs/-_multiplayer_scaleing.js.html index b3ef6140..b9f18d7f 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_scaleing.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_scaleing.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/scaleing.js

- +
@@ -103,8 +103,9 @@

Source: _multiplayer/scaleing.js

* !!DANGER!! don't touch this unless you know what you are doing. * @param {Game_Battler} battler */ -MATTIE.multiplayer.config.scaling.enemyBattleIndex = (battler) => (( - ($gameParty.maxBattleMembers() / $gameTroop.totalCombatants())) * (battler.agi / 10) * MATTIE.multiplayer.config.scaling.enemyBattleIndexScaler +MATTIE.multiplayer.config.scaling.enemyBattleIndex = (battler) => ( + battler.forcedIndex || ( + ($gameParty.maxBattleMembers() / $gameTroop.totalCombatants())) * (battler.agi / 10) * MATTIE.multiplayer.config.scaling.enemyBattleIndexScaler ); //--------------------------------------------------------- diff --git a/www/mods/commonLibs/docs/-_multiplayer_spectateScene.js.html b/www/mods/commonLibs/docs/-_multiplayer_spectateScene.js.html index ba0b096c..d84d4dd2 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_spectateScene.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_spectateScene.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/spectateScene.js< - +
diff --git a/www/mods/commonLibs/docs/-_multiplayer_startGameMenu.js.html b/www/mods/commonLibs/docs/-_multiplayer_startGameMenu.js.html index d8131b37..bb40523b 100644 --- a/www/mods/commonLibs/docs/-_multiplayer_startGameMenu.js.html +++ b/www/mods/commonLibs/docs/-_multiplayer_startGameMenu.js.html @@ -51,7 +51,7 @@

Source: _multiplayer/startGameMenu.js< - +
diff --git a/www/mods/commonLibs/docs/-_trepidationAndFamine_config.js.html b/www/mods/commonLibs/docs/-_trepidationAndFamine_config.js.html index bf547719..40dbfd9e 100644 --- a/www/mods/commonLibs/docs/-_trepidationAndFamine_config.js.html +++ b/www/mods/commonLibs/docs/-_trepidationAndFamine_config.js.html @@ -51,7 +51,7 @@

Source: _trepidationAndFamine/config.js - +
diff --git a/www/mods/commonLibs/docs/-_trepidationAndFamine_scripts_items.js.html b/www/mods/commonLibs/docs/-_trepidationAndFamine_scripts_items.js.html index 02e08ea0..a47dd311 100644 --- a/www/mods/commonLibs/docs/-_trepidationAndFamine_scripts_items.js.html +++ b/www/mods/commonLibs/docs/-_trepidationAndFamine_scripts_items.js.html @@ -51,7 +51,7 @@

Source: _trepidationAndFamine/scripts/item - +
diff --git a/www/mods/commonLibs/docs/Asset.html b/www/mods/commonLibs/docs/Asset.html index 64c7323b..2120a4d4 100644 --- a/www/mods/commonLibs/docs/Asset.html +++ b/www/mods/commonLibs/docs/Asset.html @@ -49,7 +49,7 @@

Class: Asset

- +
diff --git a/www/mods/commonLibs/docs/CORE_API.html b/www/mods/commonLibs/docs/CORE_API.html index 821ee36f..1edaeaa3 100644 --- a/www/mods/commonLibs/docs/CORE_API.html +++ b/www/mods/commonLibs/docs/CORE_API.html @@ -49,7 +49,7 @@

Namespace: CORE_API

- +
diff --git a/www/mods/commonLibs/docs/GameEmitter.html b/www/mods/commonLibs/docs/GameEmitter.html index e9e336a8..52880adc 100644 --- a/www/mods/commonLibs/docs/GameEmitter.html +++ b/www/mods/commonLibs/docs/GameEmitter.html @@ -49,7 +49,7 @@

Class: GameEmitter

- +
diff --git a/www/mods/commonLibs/docs/HostController.html b/www/mods/commonLibs/docs/HostController.html index 4c07e4ef..414b505e 100644 --- a/www/mods/commonLibs/docs/HostController.html +++ b/www/mods/commonLibs/docs/HostController.html @@ -49,7 +49,7 @@

Class: HostController

- +
diff --git a/www/mods/commonLibs/docs/Input.html b/www/mods/commonLibs/docs/Input.html index ccebad29..4e60f37b 100644 --- a/www/mods/commonLibs/docs/Input.html +++ b/www/mods/commonLibs/docs/Input.html @@ -49,7 +49,7 @@

Namespace: Input

- +
@@ -509,6 +509,95 @@

Parameters:
+ + + + + + + + + + + + + + + + + + + + +
+ +

+ + static onLongNoInput() + + + + +

+ + + +
+
+ + +
+

meant to be overridden by other mods. called when no input is held for half a second

+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + diff --git a/www/mods/commonLibs/docs/MATTIE.DataManager.global.html b/www/mods/commonLibs/docs/MATTIE.DataManager.global.html index 9396175a..b4875570 100644 --- a/www/mods/commonLibs/docs/MATTIE.DataManager.global.html +++ b/www/mods/commonLibs/docs/MATTIE.DataManager.global.html @@ -49,7 +49,7 @@

Class: global

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.DataManager.html b/www/mods/commonLibs/docs/MATTIE.DataManager.html index ab292411..4754077a 100644 --- a/www/mods/commonLibs/docs/MATTIE.DataManager.html +++ b/www/mods/commonLibs/docs/MATTIE.DataManager.html @@ -49,7 +49,7 @@

Namespace: DataManager

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.GameInfo.html b/www/mods/commonLibs/docs/MATTIE.GameInfo.html index 12a03fa6..8b6c5705 100644 --- a/www/mods/commonLibs/docs/MATTIE.GameInfo.html +++ b/www/mods/commonLibs/docs/MATTIE.GameInfo.html @@ -49,7 +49,7 @@

Namespace: GameInfo

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.TaF%20the%20namespace%20for%20trepidation%20and%20famine%20.html b/www/mods/commonLibs/docs/MATTIE.TaF%20the%20namespace%20for%20trepidation%20and%20famine%20.html index 3d37928b..31870710 100644 --- a/www/mods/commonLibs/docs/MATTIE.TaF%20the%20namespace%20for%20trepidation%20and%20famine%20.html +++ b/www/mods/commonLibs/docs/MATTIE.TaF%20the%20namespace%20for%20trepidation%20and%20famine%20.html @@ -49,7 +49,7 @@

Namespace: TaF the namespace for trepidati - +
diff --git a/www/mods/commonLibs/docs/MATTIE.TaF.config%20the%20namespace%20for%20trepidation%20and%20famine%20config%20.html b/www/mods/commonLibs/docs/MATTIE.TaF.config%20the%20namespace%20for%20trepidation%20and%20famine%20config%20.html index cde1886a..f4bcd882 100644 --- a/www/mods/commonLibs/docs/MATTIE.TaF.config%20the%20namespace%20for%20trepidation%20and%20famine%20config%20.html +++ b/www/mods/commonLibs/docs/MATTIE.TaF.config%20the%20namespace%20for%20trepidation%20and%20famine%20config%20.html @@ -49,7 +49,7 @@

Namespace: config the namespace for trepid - +
diff --git a/www/mods/commonLibs/docs/MATTIE.TaF.items%20the%20namespace%20containing%20all%20items%20added%20by%20these%20difficulties.html b/www/mods/commonLibs/docs/MATTIE.TaF.items%20the%20namespace%20containing%20all%20items%20added%20by%20these%20difficulties.html index d773672a..082900bd 100644 --- a/www/mods/commonLibs/docs/MATTIE.TaF.items%20the%20namespace%20containing%20all%20items%20added%20by%20these%20difficulties.html +++ b/www/mods/commonLibs/docs/MATTIE.TaF.items%20the%20namespace%20containing%20all%20items%20added%20by%20these%20difficulties.html @@ -49,7 +49,7 @@

Namespace: items the namespace containing - +
diff --git a/www/mods/commonLibs/docs/MATTIE.actorAPI.Data_Actor.html b/www/mods/commonLibs/docs/MATTIE.actorAPI.Data_Actor.html index bd257ab6..5cbcdeba 100644 --- a/www/mods/commonLibs/docs/MATTIE.actorAPI.Data_Actor.html +++ b/www/mods/commonLibs/docs/MATTIE.actorAPI.Data_Actor.html @@ -49,7 +49,7 @@

Class: Data_Actor

- +
@@ -187,1502 +187,9 @@

Members

battlerName :string - - -

- - - -
- -
-

The file name of the actor's battler graphic.

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- battlerName :string - - - -

- - -
-
- -
-

The file name of the actor's battler graphic.

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- characterIndex :int - - - -

- - -
-
- -
-

The index (0..7) of the actor's walking graphic.

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- characterIndex :int - - - -

- - -
-
- -
-

The index (0..7) of the actor's walking graphic.

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- characterName :string - - - -

- - -
-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- characterName :string - - - -

- - -
-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- classId :int - - - -

- - -
-
- -
-

The actor's class ID.

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- classId :int - - - -

- - -
-
- -
-

The actor's class ID.

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- doc :string - - - -

- - -
-
- -
-

appears to be optional

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- doc :string - - - -

- - -
-
- -
-

appears to be optional

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- equips :Array.<number> - - - -

- - -
-
- -
-

The actor's initial equipment. An array of weapon IDs or armor IDs with the following subscripts:

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- equips :Array.<number> - - - -

- - -
-
- -
-

The actor's initial equipment. An array of weapon IDs or armor IDs with the following subscripts:

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- faceIndex :number - - - -

- - -
-
- -
-

The index (0..7) of the actor's face graphic.

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- faceIndex :number - - - -

- - -
-
- -
-

The index (0..7) of the actor's face graphic.

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- faceName :string - - - -

- - -
-
- -
-

The file name of the actor's face graphic.

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- faceName :string - - - -

- - -
-
- -
-

The file name of the actor's face graphic.

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- id :string - - - -

- - -
-
- -
-

The ID.

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- id :int - - - -

- - -
-
- -
-

the id of this dataActor

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- id :string - - - -

- - -
-
- -
-

The ID.

-
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - -
-

- id :int -

@@ -1692,7 +199,7 @@

-

the id of this dataActor

+

The file name of the actor's battler graphic.

@@ -1702,7 +209,7 @@
Type:

+ + + + +
+ + + + + + + + + + + + + + + + + +
+ +
+ +

+ MATTIE.infoAPI

+ + +
+ +
+ +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ + + + + + + + + + + + + + + + + +

Methods

+ +
+ + +
+ +

+ + static getCurrentLocationName() + + + + +

+ + + +
+
+ + +
+

Get the current name of the location.

+
+ + + + + + + + + + + + + + + + + + + + + +
+
Returns:
+ + + + + + +-

the display name of the map the player is currently on.

+ + + + + +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + diff --git a/www/mods/commonLibs/docs/MATTIE.itemAPI-MATTIE.itemAPI.RunTimeItem.html b/www/mods/commonLibs/docs/MATTIE.itemAPI-MATTIE.itemAPI.RunTimeItem.html index 3fbab8c8..18896fbc 100644 --- a/www/mods/commonLibs/docs/MATTIE.itemAPI-MATTIE.itemAPI.RunTimeItem.html +++ b/www/mods/commonLibs/docs/MATTIE.itemAPI-MATTIE.itemAPI.RunTimeItem.html @@ -49,7 +49,7 @@

Class: RunTimeItem

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.itemAPI.html b/www/mods/commonLibs/docs/MATTIE.itemAPI.html index 699b290e..3de7f042 100644 --- a/www/mods/commonLibs/docs/MATTIE.itemAPI.html +++ b/www/mods/commonLibs/docs/MATTIE.itemAPI.html @@ -49,7 +49,7 @@

Namespace: itemAPI

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.items%20a%20name%20space%20containing%20information%20about%20additional%20items.html b/www/mods/commonLibs/docs/MATTIE.items%20a%20name%20space%20containing%20information%20about%20additional%20items.html index c031d0a2..b0ef1c00 100644 --- a/www/mods/commonLibs/docs/MATTIE.items%20a%20name%20space%20containing%20information%20about%20additional%20items.html +++ b/www/mods/commonLibs/docs/MATTIE.items%20a%20name%20space%20containing%20information%20about%20additional%20items.html @@ -49,7 +49,7 @@

Namespace: items a name space containing i - +
diff --git a/www/mods/commonLibs/docs/MATTIE.menus.html b/www/mods/commonLibs/docs/MATTIE.menus.html index 95e12dab..7f367eed 100644 --- a/www/mods/commonLibs/docs/MATTIE.menus.html +++ b/www/mods/commonLibs/docs/MATTIE.menus.html @@ -49,7 +49,7 @@

Namespace: menus

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.menus.mainMenu.html b/www/mods/commonLibs/docs/MATTIE.menus.mainMenu.html index 02cd56c7..aba6b218 100644 --- a/www/mods/commonLibs/docs/MATTIE.menus.mainMenu.html +++ b/www/mods/commonLibs/docs/MATTIE.menus.mainMenu.html @@ -49,7 +49,7 @@

Namespace: mainMenu

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.miscAPI%20the%20namespace%20containing%20all%20misc%20stuff.html b/www/mods/commonLibs/docs/MATTIE.miscAPI%20the%20namespace%20containing%20all%20misc%20stuff.html index 3bf6f731..953427c4 100644 --- a/www/mods/commonLibs/docs/MATTIE.miscAPI%20the%20namespace%20containing%20all%20misc%20stuff.html +++ b/www/mods/commonLibs/docs/MATTIE.miscAPI%20the%20namespace%20containing%20all%20misc%20stuff.html @@ -49,7 +49,7 @@

Namespace: miscAPI the namespace containin - +
diff --git a/www/mods/commonLibs/docs/MATTIE.msgAPI.html b/www/mods/commonLibs/docs/MATTIE.msgAPI.html index c1dde458..3b4c9759 100644 --- a/www/mods/commonLibs/docs/MATTIE.msgAPI.html +++ b/www/mods/commonLibs/docs/MATTIE.msgAPI.html @@ -49,7 +49,7 @@

Namespace: msgAPI

- +
@@ -208,95 +208,6 @@

- - - - - - - - - - -

- - - - -
- - - - -
- -

- - static _dreamXCompat() - - - - -

- - - -
-
- - -
-

add compatibility for dreamX choice help plugin

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - @@ -672,14 +583,14 @@
Parameters:
-

+

- static displayMsgWithTitle(title, msg) + static doOnceNotBusy(cb)

@@ -691,7 +602,7 @@

-

display a msg in the way funger handles speech

+

que a callback to trigger once the gameMessage is no longer busy

@@ -727,36 +638,13 @@

Parameters:
- title - - - - - -string - - - - - - - - - -

the title/char name to display in darkened text

- - - - - - - msg + cb -string +function @@ -766,7 +654,7 @@
Parameters:
-

the string msg

+ @@ -834,14 +722,14 @@
Parameters:
-

+

- static doOnceNotBusy(cb) + static footerMsg(msg, ms)

@@ -853,7 +741,7 @@

-

que a callback to trigger once the gameMessage is no longer busy

+

show a msg at the footer of the screen, using the gab text plugin

@@ -889,13 +777,13 @@

Parameters:
- cb + msg -function +string @@ -905,7 +793,30 @@
Parameters:
- +

message to display

+ + + + + + + ms + + + + + +int + + + + + + + + + +

the milliseconds till the event is hidden

@@ -973,14 +884,14 @@
Parameters:
-

+

- static footerMsg(msg, ms) + static formatMsgAndTitle()

@@ -992,7 +903,7 @@

-

show a msg at the footer of the screen, using the gab text plugin

+

format a string into the form title msg, as though speaking

@@ -1003,79 +914,6 @@

-
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
msg - - -string - - - -

message to display

ms - - -int - - - -

the milliseconds till the event is hidden

- -
- @@ -1135,14 +973,14 @@

Parameters:
-

+

- static footerMsg(msg, ms) + static showChoices(choices, defaultChoice, cancelChoice, cb, msgs, helps)

@@ -1153,10 +991,6 @@

-
-

show a msg at the footer of the screen, using the gab text plugin

-
- @@ -1190,349 +1024,13 @@
Parameters:
- msg + choices -string - - - - - - - - - -

message to display

- - - - - - - ms - - - - - -int - - - - - - - - - -

the milliseconds till the event is hidden

- - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - static formatMsgAndTitle() - - - - -

- - - -
-
- - -
-

format a string into the form title msg, as though speaking

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - static formatMsgAndTitle() - - - - -

- - - -
-
- - -
-

format a string into the form title msg, as though speaking

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - static showChoices(choices, defaultChoice, cancelChoice, cb, msgs, helps) - - - - -

- - - -
-
- - - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -457,20 +461,20 @@
Parameters:
- + - + + @@ -548,14 +552,14 @@
Parameters:
-

+

- addCommandAfterIndex(index, command, pageIndex) + addMoveRoute(pageId, route)

@@ -567,7 +571,7 @@

-

add

+

add the move route command to a page

@@ -603,7 +607,7 @@

Parameters:
- + + - + - - - - - - - - - - - - - - - - + @@ -733,14 +714,14 @@
Parameters:
-

+

- addCommandAfterIndex(index, command, pageIndex) + addPage()

@@ -752,7 +733,7 @@

-

add

+

Add a new page for the event's actions.

@@ -763,102 +744,6 @@

-
-
Parameters:
- -

NameTypeDescription
choices - - -* +* @@ -1706,256 +1204,6 @@
Parameters:
- - - - - - - - - - - - - - - - - - - - -
- -

- - static showChoices(choices, defaultChoice, cancelChoice, cb, msgs, helps) - - - - -

- - - -
-
- - - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
choices - - -* - - - -

array of string msgs

defaultChoice - - -* - - - -

what index does the user start on

cancelChoice - - -* - - - -

which index cancels the menu

cb - - -* - - - -

a function that takes the index response of the use

msgs - - -string - - - -

displays at the bottom of the screen

helps - - -string - - - -

displays at top of screen (String or String Arr)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - diff --git a/www/mods/commonLibs/docs/MATTIE.multiplayer.config.html b/www/mods/commonLibs/docs/MATTIE.multiplayer.config.html index 60cb85c5..d81d54d8 100644 --- a/www/mods/commonLibs/docs/MATTIE.multiplayer.config.html +++ b/www/mods/commonLibs/docs/MATTIE.multiplayer.config.html @@ -49,7 +49,7 @@

Namespace: config

- +
@@ -160,7 +160,7 @@

@@ -247,7 +247,7 @@

diff --git a/www/mods/commonLibs/docs/MATTIE.multiplayer.config.scaling.html b/www/mods/commonLibs/docs/MATTIE.multiplayer.config.scaling.html index fa6faca6..98a5f19f 100644 --- a/www/mods/commonLibs/docs/MATTIE.multiplayer.config.scaling.html +++ b/www/mods/commonLibs/docs/MATTIE.multiplayer.config.scaling.html @@ -49,7 +49,7 @@

Namespace: scaling

- +
@@ -144,7 +144,7 @@

@@ -231,7 +231,7 @@

@@ -318,7 +318,7 @@

@@ -474,7 +474,7 @@

@@ -563,7 +563,7 @@

@@ -651,7 +651,7 @@

@@ -738,7 +738,7 @@

@@ -825,7 +825,7 @@

@@ -912,7 +912,7 @@

@@ -999,7 +999,7 @@

@@ -1086,7 +1086,7 @@

@@ -1173,7 +1173,7 @@

@@ -1260,7 +1260,7 @@

@@ -1347,7 +1347,7 @@

@@ -1434,7 +1434,7 @@

@@ -1671,7 +1671,7 @@

@@ -1761,7 +1761,7 @@

@@ -1872,7 +1872,7 @@

diff --git a/www/mods/commonLibs/docs/MATTIE.preFabAPI%20a%20namespace%20containing%20all%20the%20code%20for%20prefabs.html b/www/mods/commonLibs/docs/MATTIE.preFabAPI%20a%20namespace%20containing%20all%20the%20code%20for%20prefabs.html index ac253a28..1f068578 100644 --- a/www/mods/commonLibs/docs/MATTIE.preFabAPI%20a%20namespace%20containing%20all%20the%20code%20for%20prefabs.html +++ b/www/mods/commonLibs/docs/MATTIE.preFabAPI%20a%20namespace%20containing%20all%20the%20code%20for%20prefabs.html @@ -49,7 +49,7 @@

Namespace: preFabAPI a namespace containin - +
diff --git a/www/mods/commonLibs/docs/MATTIE.randomiser.config.html b/www/mods/commonLibs/docs/MATTIE.randomiser.config.html index 63de1e52..8dc19068 100644 --- a/www/mods/commonLibs/docs/MATTIE.randomiser.config.html +++ b/www/mods/commonLibs/docs/MATTIE.randomiser.config.html @@ -49,7 +49,7 @@

Namespace: config

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.randomiser.html b/www/mods/commonLibs/docs/MATTIE.randomiser.html index b88e8946..aaa7ab59 100644 --- a/www/mods/commonLibs/docs/MATTIE.randomiser.html +++ b/www/mods/commonLibs/docs/MATTIE.randomiser.html @@ -49,7 +49,7 @@

Namespace: randomiser

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.sceneOverlapAPI.html b/www/mods/commonLibs/docs/MATTIE.sceneOverlapAPI.html new file mode 100644 index 00000000..83144da2 --- /dev/null +++ b/www/mods/commonLibs/docs/MATTIE.sceneOverlapAPI.html @@ -0,0 +1,170 @@ + + + + + Namespace: sceneOverlapAPI | Namespace: sceneOverlapAPI + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+ +
+ +

+ MATTIE.sceneOverlapAPI

+ + +
+ +
+ +
+ + +

the api responsible for allowing scenes to overlap

+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + +
+ +
+ + +
+ + + + + + + + + \ No newline at end of file diff --git a/www/mods/commonLibs/docs/MATTIE.scenes.Scene_DevActors.html b/www/mods/commonLibs/docs/MATTIE.scenes.Scene_DevActors.html index f7819d9b..340a9518 100644 --- a/www/mods/commonLibs/docs/MATTIE.scenes.Scene_DevActors.html +++ b/www/mods/commonLibs/docs/MATTIE.scenes.Scene_DevActors.html @@ -49,7 +49,7 @@

Class: Scene_DevActors

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.scenes.Scene_DevItems.html b/www/mods/commonLibs/docs/MATTIE.scenes.Scene_DevItems.html index aa599968..9565e87d 100644 --- a/www/mods/commonLibs/docs/MATTIE.scenes.Scene_DevItems.html +++ b/www/mods/commonLibs/docs/MATTIE.scenes.Scene_DevItems.html @@ -49,7 +49,7 @@

Class: Scene_DevItems

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.scenes.Scene_ForceActors.html b/www/mods/commonLibs/docs/MATTIE.scenes.Scene_ForceActors.html index ad71006d..df69a96d 100644 --- a/www/mods/commonLibs/docs/MATTIE.scenes.Scene_ForceActors.html +++ b/www/mods/commonLibs/docs/MATTIE.scenes.Scene_ForceActors.html @@ -49,7 +49,7 @@

Class: Scene_ForceActors

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.scenes.Scene_Misc.html b/www/mods/commonLibs/docs/MATTIE.scenes.Scene_Misc.html index 66bcf1fa..8727f17e 100644 --- a/www/mods/commonLibs/docs/MATTIE.scenes.Scene_Misc.html +++ b/www/mods/commonLibs/docs/MATTIE.scenes.Scene_Misc.html @@ -49,7 +49,7 @@

Class: Scene_Misc

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.scenes.base.html b/www/mods/commonLibs/docs/MATTIE.scenes.base.html index 758630ab..2eee1f0f 100644 --- a/www/mods/commonLibs/docs/MATTIE.scenes.base.html +++ b/www/mods/commonLibs/docs/MATTIE.scenes.base.html @@ -49,7 +49,7 @@

Class: base

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.scenes.emptyScroll.html b/www/mods/commonLibs/docs/MATTIE.scenes.emptyScroll.html index 3ee76d32..1ee198a5 100644 --- a/www/mods/commonLibs/docs/MATTIE.scenes.emptyScroll.html +++ b/www/mods/commonLibs/docs/MATTIE.scenes.emptyScroll.html @@ -49,7 +49,7 @@

Class: emptyScroll

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.scenes.html b/www/mods/commonLibs/docs/MATTIE.scenes.html index 221e6bba..33dbfb83 100644 --- a/www/mods/commonLibs/docs/MATTIE.scenes.html +++ b/www/mods/commonLibs/docs/MATTIE.scenes.html @@ -49,7 +49,7 @@

Namespace: scenes

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.static.actors.html b/www/mods/commonLibs/docs/MATTIE.static.actors.html index 750262b5..21580bcc 100644 --- a/www/mods/commonLibs/docs/MATTIE.static.actors.html +++ b/www/mods/commonLibs/docs/MATTIE.static.actors.html @@ -49,7 +49,7 @@

Namespace: actors

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.static.commands.html b/www/mods/commonLibs/docs/MATTIE.static.commands.html index e635644b..b5ac7790 100644 --- a/www/mods/commonLibs/docs/MATTIE.static.commands.html +++ b/www/mods/commonLibs/docs/MATTIE.static.commands.html @@ -49,7 +49,7 @@

Namespace: commands

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.static.commonEvents.html b/www/mods/commonLibs/docs/MATTIE.static.commonEvents.html index fbb2a08f..0c0a1d4c 100644 --- a/www/mods/commonLibs/docs/MATTIE.static.commonEvents.html +++ b/www/mods/commonLibs/docs/MATTIE.static.commonEvents.html @@ -49,7 +49,7 @@

Namespace: commonEvents

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.static.events.html b/www/mods/commonLibs/docs/MATTIE.static.events.html index d171e731..2d0788ed 100644 --- a/www/mods/commonLibs/docs/MATTIE.static.events.html +++ b/www/mods/commonLibs/docs/MATTIE.static.events.html @@ -49,7 +49,7 @@

Namespace: events

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.static.events.images.html b/www/mods/commonLibs/docs/MATTIE.static.events.images.html index e53a380b..ed23e0ff 100644 --- a/www/mods/commonLibs/docs/MATTIE.static.events.images.html +++ b/www/mods/commonLibs/docs/MATTIE.static.events.images.html @@ -49,7 +49,7 @@

Namespace: images

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.static.html b/www/mods/commonLibs/docs/MATTIE.static.html index 3f6ef508..06db9780 100644 --- a/www/mods/commonLibs/docs/MATTIE.static.html +++ b/www/mods/commonLibs/docs/MATTIE.static.html @@ -49,7 +49,7 @@

Namespace: static

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.static.items.html b/www/mods/commonLibs/docs/MATTIE.static.items.html index 9e8b5204..b8e2bae6 100644 --- a/www/mods/commonLibs/docs/MATTIE.static.items.html +++ b/www/mods/commonLibs/docs/MATTIE.static.items.html @@ -49,7 +49,7 @@

Namespace: items

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.static.maps.html b/www/mods/commonLibs/docs/MATTIE.static.maps.html index 202b9c8c..b9199a96 100644 --- a/www/mods/commonLibs/docs/MATTIE.static.maps.html +++ b/www/mods/commonLibs/docs/MATTIE.static.maps.html @@ -49,7 +49,7 @@

Namespace: maps

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.static.rpg.html b/www/mods/commonLibs/docs/MATTIE.static.rpg.html index 7f31e565..17f62f13 100644 --- a/www/mods/commonLibs/docs/MATTIE.static.rpg.html +++ b/www/mods/commonLibs/docs/MATTIE.static.rpg.html @@ -49,7 +49,7 @@

Namespace: rpg

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.static.skills.html b/www/mods/commonLibs/docs/MATTIE.static.skills.html index 78c57163..645f0862 100644 --- a/www/mods/commonLibs/docs/MATTIE.static.skills.html +++ b/www/mods/commonLibs/docs/MATTIE.static.skills.html @@ -49,7 +49,7 @@

Namespace: skills

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.static.states.html b/www/mods/commonLibs/docs/MATTIE.static.states.html index 70f43520..8e689636 100644 --- a/www/mods/commonLibs/docs/MATTIE.static.states.html +++ b/www/mods/commonLibs/docs/MATTIE.static.states.html @@ -49,7 +49,7 @@

Namespace: states

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.static.switch.html b/www/mods/commonLibs/docs/MATTIE.static.switch.html index 2d91ee3b..08905b68 100644 --- a/www/mods/commonLibs/docs/MATTIE.static.switch.html +++ b/www/mods/commonLibs/docs/MATTIE.static.switch.html @@ -49,7 +49,7 @@

Namespace: switch

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.static.variable.html b/www/mods/commonLibs/docs/MATTIE.static.variable.html index 1f62ef44..3f74a6cc 100644 --- a/www/mods/commonLibs/docs/MATTIE.static.variable.html +++ b/www/mods/commonLibs/docs/MATTIE.static.variable.html @@ -49,7 +49,7 @@

Namespace: variable

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.tpAPI%20an%20api%20containing%20all%20tps%20for%20funger%201%20and%202.html b/www/mods/commonLibs/docs/MATTIE.tpAPI%20an%20api%20containing%20all%20tps%20for%20funger%201%20and%202.html index 4dffe1dc..b57cdc0b 100644 --- a/www/mods/commonLibs/docs/MATTIE.tpAPI%20an%20api%20containing%20all%20tps%20for%20funger%201%20and%202.html +++ b/www/mods/commonLibs/docs/MATTIE.tpAPI%20an%20api%20containing%20all%20tps%20for%20funger%201%20and%202.html @@ -49,7 +49,7 @@

Namespace: tpAPI an api containing all tps - +
diff --git a/www/mods/commonLibs/docs/MATTIE.troopAPI.html b/www/mods/commonLibs/docs/MATTIE.troopAPI.html index 33db138b..2257b34c 100644 --- a/www/mods/commonLibs/docs/MATTIE.troopAPI.html +++ b/www/mods/commonLibs/docs/MATTIE.troopAPI.html @@ -49,7 +49,7 @@

Namespace: troopAPI

- +
@@ -148,7 +148,7 @@

@@ -323,210 +323,6 @@
Returns:
- - - - - - - - - - -
- - - - -
- - - - -
- -

- - static runtimeTroop(troopId,, xOffset,, yOffset,) → {MATTIE.troopAPI.runtimeTroop} - - - - -

- - - -
-
- - -
-

a class that handles adding troops to the current combat at runtime

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
troopId, - - -int - - - -

the id of the troop this class represents

xOffset, - - -int - - - -

screen x offset for entire troop

yOffset, - - -int - - - -

screen y offset for entire troop

- -
- - - - - - - - - - - - - -
-
Returns:
- - - - - -MATTIE.troopAPI.runtimeTroop - - - - - - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - diff --git a/www/mods/commonLibs/docs/MATTIE.unstuckAPI.html b/www/mods/commonLibs/docs/MATTIE.unstuckAPI.html index 888cd307..7a5f0dcb 100644 --- a/www/mods/commonLibs/docs/MATTIE.unstuckAPI.html +++ b/www/mods/commonLibs/docs/MATTIE.unstuckAPI.html @@ -49,7 +49,7 @@

Namespace: unstuckAPI

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.windows.HorizontalBtns.html b/www/mods/commonLibs/docs/MATTIE.windows.HorizontalBtns.html index d7f20c77..1474547b 100644 --- a/www/mods/commonLibs/docs/MATTIE.windows.HorizontalBtns.html +++ b/www/mods/commonLibs/docs/MATTIE.windows.HorizontalBtns.html @@ -49,7 +49,7 @@

Class: HorizontalBtns

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.windows.List.html b/www/mods/commonLibs/docs/MATTIE.windows.List.html index e605fb12..4e0cff21 100644 --- a/www/mods/commonLibs/docs/MATTIE.windows.List.html +++ b/www/mods/commonLibs/docs/MATTIE.windows.List.html @@ -49,7 +49,7 @@

Class: List

- +
@@ -84,7 +84,7 @@

diff --git a/www/mods/commonLibs/docs/MATTIE.windows.TextDisplay.html b/www/mods/commonLibs/docs/MATTIE.windows.TextDisplay.html index 0b1b12df..0c1a4854 100644 --- a/www/mods/commonLibs/docs/MATTIE.windows.TextDisplay.html +++ b/www/mods/commonLibs/docs/MATTIE.windows.TextDisplay.html @@ -49,7 +49,7 @@

Class: TextDisplay

- +
@@ -299,7 +299,7 @@

diff --git a/www/mods/commonLibs/docs/MATTIE.windows.TextInput.html b/www/mods/commonLibs/docs/MATTIE.windows.TextInput.html index 384f8d03..cc69b36e 100644 --- a/www/mods/commonLibs/docs/MATTIE.windows.TextInput.html +++ b/www/mods/commonLibs/docs/MATTIE.windows.TextInput.html @@ -49,7 +49,7 @@

Class: TextInput

- +
@@ -84,7 +84,7 @@

@@ -299,7 +299,7 @@

diff --git a/www/mods/commonLibs/docs/MATTIE.windows.Window_AllStatus.html b/www/mods/commonLibs/docs/MATTIE.windows.Window_AllStatus.html index 0a7b675d..0591fde0 100644 --- a/www/mods/commonLibs/docs/MATTIE.windows.Window_AllStatus.html +++ b/www/mods/commonLibs/docs/MATTIE.windows.Window_AllStatus.html @@ -49,7 +49,7 @@

Class: Window_AllStatus

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.windows.Window_CheatItem.html b/www/mods/commonLibs/docs/MATTIE.windows.Window_CheatItem.html index 1c587f99..62934393 100644 --- a/www/mods/commonLibs/docs/MATTIE.windows.Window_CheatItem.html +++ b/www/mods/commonLibs/docs/MATTIE.windows.Window_CheatItem.html @@ -49,7 +49,7 @@

Class: Window_CheatItem

- +
diff --git a/www/mods/commonLibs/docs/MATTIE.windows.html b/www/mods/commonLibs/docs/MATTIE.windows.html index 81a630dc..830b4f0c 100644 --- a/www/mods/commonLibs/docs/MATTIE.windows.html +++ b/www/mods/commonLibs/docs/MATTIE.windows.html @@ -49,7 +49,7 @@

Namespace: windows

- +
@@ -216,7 +216,7 @@

@@ -305,7 +305,7 @@

diff --git a/www/mods/commonLibs/docs/MapEvent.html b/www/mods/commonLibs/docs/MapEvent.html index d108a410..69c91ab1 100644 --- a/www/mods/commonLibs/docs/MapEvent.html +++ b/www/mods/commonLibs/docs/MapEvent.html @@ -49,7 +49,7 @@

Class: MapEvent

- +
@@ -367,14 +367,14 @@
Parameters:
-

+

- addCommand(pageId, command, parameters) + addCommandAfterIndex(index, command, pageIndex)

@@ -385,6 +385,10 @@

+
+

add

+
+ @@ -418,7 +422,7 @@
Parameters:

pageIdindex @@ -434,7 +438,7 @@
Parameters:
-

the index in the list of commands to add this command after

the command obj to add

parameterspageIndex -* +int @@ -480,7 +484,7 @@
Parameters:
-

the page index of the page to add the command to

indexpageId @@ -619,14 +623,14 @@
Parameters:
-

the index in the list of commands to add this command after

the id of the page to add the command to

commandroute @@ -642,30 +646,7 @@
Parameters:
-

the command obj to add

pageIndex - - -int - - - -

the page index of the page to add the command to

the id of the action

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
index - - -* - - - -

the index in the list of commands to add this command after

command - - -* - - - -

the command obj to add

pageIndex - - -int - - - -

the page index of the page to add the command to

- -
- @@ -918,14 +803,14 @@
Parameters:
-

+

- addMoveRoute(pageId, route) + addSpokenText(pageId, text)

@@ -937,7 +822,7 @@

-

add the move route command to a page

+

add text command to page with a speaker

@@ -989,14 +874,14 @@

Parameters:
-

the id of the page to add the command to

+ - route + text @@ -1012,7 +897,7 @@
Parameters:
-

the id of the action

+ @@ -1080,14 +965,14 @@
Parameters:
-

+

- addPage() + addSpriteToTilemap(sprite)

@@ -1099,7 +984,7 @@

-

Add a new page for the event's actions.

+

Add a sprite to the current scene's Tilemap.

@@ -1110,6 +995,51 @@

+
+
Parameters:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
sprite + +

(Sprite_Character)

+ +
+ @@ -1169,14 +1099,14 @@

-

+

- addPage() + addText(pageId, text)

@@ -1188,7 +1118,7 @@

-

Add a new page for the event's actions.

+

add text command to page

@@ -1199,16 +1129,89 @@

+
+
Parameters:
+ + + + + + + - - - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
pageId + + +* + + + +
text + + +* + + + +
+ +
+ + + + + + + + + + + @@ -1258,14 +1261,14 @@

-

+

- addSpokenText(pageId, text) + addTintScreen(pageId, tint, frames)

@@ -1276,10 +1279,6 @@

-
-

add text command to page with a speaker

-
- @@ -1329,14 +1328,14 @@
Parameters:
- +

the page Id to add the command to

- text + tint @@ -1352,7 +1351,30 @@
Parameters:
- +

the tint object

+ + + + + + + frames + + + + + +* + + + + + + + + + +

who many frames to tint for

@@ -1420,14 +1442,14 @@
Parameters:
-

+

- addSpriteToTilemap(sprite) + addWait(pageId, frames)

@@ -1439,7 +1461,7 @@

-

Add a sprite to the current scene's Tilemap.

+

add a wait command to a page

@@ -1475,18 +1497,46 @@

Parameters:
- sprite + pageId + +* + + + -

(Sprite_Character)

+

the page id to add the command to

+ + + + + + + frames + + + + + +* + + + + + + + + + +

the number of frames to wait

@@ -1554,14 +1604,14 @@
Parameters:
-

+

- addSpriteToTilemap(sprite) + checkSelfSwitch(letter) → {boolean}

@@ -1573,7 +1623,7 @@

-

Add a sprite to the current scene's Tilemap.

+

check a self switch of this event

@@ -1609,18 +1659,23 @@

Parameters:
- sprite + letter + +* + + + -

(Sprite_Character)

+

the letter of the self switch

@@ -1641,6 +1696,27 @@
Parameters:
+
+
Returns:
+ + + + + +boolean + + + + + +-

whether the switch is true or false

+ + + + + +
+ @@ -1688,14 +1764,14 @@
Parameters:
-

+

- addText(pageId, text) + copyActionsFromCommonEvent(id)

@@ -1707,7 +1783,7 @@

-

add text command to page

+

Copy actions from a Common Event with the specified id.

@@ -1743,46 +1819,18 @@

Parameters:
- pageId - - - - - -* - - - - - - - - - - - - - - - - - text + id - -* - - - - +

(int)

@@ -1850,14 +1898,14 @@
Parameters:
-

+

- addTintScreen(pageId, tint, frames) + copyActionsFromEvent(id)

@@ -1868,6 +1916,10 @@

+
+

Copy actions from another event on the same map with the specified id.

+
+ @@ -1901,81 +1953,30 @@
Parameters:
- pageId + id - -* - - - -

the page Id to add the command to

+

(int)

+ + - - - tint - + + - - - -* + - - - - - - - - -

the tint object

- - - - - - - frames - - - - - -* - - - - - - - - - -

who many frames to tint for

- - - - - - - - - - - - + @@ -2031,14 +2032,14 @@
Parameters:
-

+

- addWait(pageId, frames) + copyActionsFromEventOnMap(id, mapId)

@@ -2050,7 +2051,7 @@

-

add a wait command to a page

+

Copy actions from another event on map with the specified id.

@@ -2086,46 +2087,36 @@

Parameters:
- pageId + id - -* - - - -

the page id to add the command to

+

(int)

- frames + mapId - -* - - - -

the number of frames to wait

+

(int)

@@ -2146,6 +2137,22 @@
Parameters:
+
+
Returns:
+ + + + + + +-

self for cmd chaining

+ + + + + +
+ @@ -2193,14 +2200,14 @@
Parameters:
-

+

- checkSelfSwitch(letter) → {boolean} + createCharacterSprite(event)

@@ -2212,7 +2219,7 @@

-

check a self switch of this event

+

Create a new Sprite_Character and store it in the current scene's Spriteset_Map.

@@ -2248,23 +2255,18 @@

Parameters:
- letter + event - -* - - - -

the letter of the self switch

+

(Game_Event)

@@ -2285,27 +2287,6 @@
Parameters:
-
-
Returns:
- - - - - -boolean - - - - - --

whether the switch is true or false

- - - - - -
- @@ -2353,14 +2334,14 @@
Returns:
-

+

- checkSelfSwitch(letter) → {boolean} + createCommand(command, parameters, indent) → {rm.types.Event}

@@ -2372,7 +2353,7 @@

-

check a self switch of this event

+

create a command obj from these params

@@ -2398,6 +2379,8 @@

Parameters:
+ Default + Description @@ -2408,7 +2391,7 @@
Parameters:
- letter + command @@ -2423,8 +2406,68 @@
Parameters:
+ + + + -

the letter of the self switch

+

the command code

+ + + + + + + parameters + + + + + +* + + + + + + + + + + + + + +

array of params

+ + + + + + + indent + + + + + +* + + + + + + + + + + + 0 + + + + +

optional

@@ -2452,13 +2495,11 @@
Returns:
-boolean - +rm.types.Event --

whether the switch is true or false

@@ -2513,14 +2554,14 @@
Returns:
-

+

- copyActionsFromCommonEvent(id) + createGameEvent()

@@ -2532,7 +2573,7 @@

-

Copy actions from a Common Event with the specified id.

+

Create a new Game_Event object and store it in $gameMap.

@@ -2543,51 +2584,6 @@

-
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
id - -

(int)

- -
- @@ -2647,14 +2643,14 @@

Parameters:
-

+

- copyActionsFromCommonEvent(id) + getLastEvent()

@@ -2666,7 +2662,7 @@

-

Copy actions from a Common Event with the specified id.

+

Get the last Event object stored in $dataMap.

@@ -2677,51 +2673,6 @@

-
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
id - -

(int)

- -
- @@ -2781,14 +2732,14 @@

Parameters:
-

+

- copyActionsFromEvent(id) + getListOfCommandCodesOnPage(page)

@@ -2800,7 +2751,7 @@

-

Copy actions from another event on the same map with the specified id.

+

return an array of all command codes on page

@@ -2836,18 +2787,23 @@

Parameters:
- id + page + +* + + + -

(int)

+

page index

@@ -2915,14 +2871,14 @@
Parameters:
-

+

- copyActionsFromEvent(id) + indexOfCommandOnPage(commandCode, page)

@@ -2934,7 +2890,7 @@

-

Copy actions from another event on the same map with the specified id.

+

returns the index of the first occurence of the command code on the page

@@ -2970,18 +2926,46 @@

Parameters:
- id + commandCode + +* + + + -

(int)

+

command code

+ + + + + + + page + + + + + +* + + + + + + + + + +

page index

@@ -3049,14 +3033,14 @@
Parameters:
-

+

- copyActionsFromEventOnMap(id, mapId) + setChar(pageId, name)

@@ -3068,7 +3052,7 @@

-

Copy actions from another event on map with the specified id.

+

change the charecter of a page

@@ -3104,36 +3088,46 @@

Parameters:
- id + pageId + +* + + + -

(int)

+ - mapId + name + +string + + + -

(int)

+

string

@@ -3154,22 +3148,6 @@
Parameters:
-
-
Returns:
- - - - - - --

self for cmd chaining

- - - - - -
- @@ -3217,14 +3195,14 @@
Returns:
-

+

- copyActionsFromEventOnMap(id, mapId) + setDefaultConditions()

@@ -3236,7 +3214,7 @@

-

Copy actions from another event on map with the specified id.

+

Set the default event conditions for a page of actions.

@@ -3247,69 +3225,6 @@

-
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
id - -

(int)

mapId - -

(int)

- -
- @@ -3369,14 +3284,14 @@

Parameters:
-

+

- createCharacterSprite(event) + setDefaultMoveRoute()

@@ -3388,7 +3303,7 @@

-

Create a new Sprite_Character and store it in the current scene's Spriteset_Map.

+

Set the default move route for a page of actions.

@@ -3399,10902 +3314,20 @@

-
-
Parameters:
- - - - - - - - + - + - + - - - + - - - - - + - - - - - - - - - - - -
NameTypeDescription
event - -

(Game_Event)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -

- - - - -
- -

- - createCharacterSprite(event) - - - - -

- - - -
-
- - -
-

Create a new Sprite_Character and store it in the current scene's Spriteset_Map.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
event - -

(Game_Event)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - createCommand(command, parameters, indent) → {rm.types.Event} - - - - -

- - - -
-
- - -
-

create a command obj from these params

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDefaultDescription
command - - -* - - - - - -

the command code

parameters - - -* - - - - - -

array of params

indent - - -* - - - - - - 0 - -

optional

- -
- - - - - - - - - - - - - -
-
Returns:
- - - - - -rm.types.Event - - - - - - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - createCommand(command, parameters, indent) → {rm.types.Event} - - - - -

- - - -
-
- - -
-

create a command obj from these params

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDefaultDescription
command - - -* - - - - - -

the command code

parameters - - -* - - - - - -

array of params

indent - - -* - - - - - - 0 - -

optional

- -
- - - - - - - - - - - - - -
-
Returns:
- - - - - -rm.types.Event - - - - - - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - createGameEvent() - - - - -

- - - -
-
- - -
-

Create a new Game_Event object and store it in $gameMap.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - createGameEvent() - - - - -

- - - -
-
- - -
-

Create a new Game_Event object and store it in $gameMap.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - getLastEvent() - - - - -

- - - -
-
- - -
-

Get the last Event object stored in $dataMap.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - getLastEvent() - - - - -

- - - -
-
- - -
-

Get the last Event object stored in $dataMap.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - getListOfCommandCodesOnPage(page) - - - - -

- - - -
-
- - -
-

return an array of all command codes on page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
page - - -* - - - -

page index

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - getListOfCommandCodesOnPage(page) - - - - -

- - - -
-
- - -
-

return an array of all command codes on page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
page - - -* - - - -

page index

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - indexOfCommandOnPage(commandCode, page) - - - - -

- - - -
-
- - -
-

returns the index of the first occurence of the command code on the page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
commandCode - - -* - - - -

command code

page - - -* - - - -

page index

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - indexOfCommandOnPage(commandCode, page) - - - - -

- - - -
-
- - -
-

returns the index of the first occurence of the command code on the page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
commandCode - - -* - - - -

command code

page - - -* - - - -

page index

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setChar(pageId, name) - - - - -

- - - -
-
- - -
-

change the charecter of a page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
pageId - - -* - - - -
name - - -string - - - -

string

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setDefaultConditions() - - - - -

- - - -
-
- - -
-

Set the default event conditions for a page of actions.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setDefaultConditions() - - - - -

- - - -
-
- - -
-

Set the default event conditions for a page of actions.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setDefaultMoveRoute() - - - - -

- - - -
-
- - -
-

Set the default move route for a page of actions.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setDefaultMoveRoute() - - - - -

- - - -
-
- - -
-

Set the default move route for a page of actions.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setDefaultPage() - - - - -

- - - -
-
- - - - - - - - - - - - - - - - - - - - - - -
-
Returns:
- - - - - - --

the default page objectt

- - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setId() - - - - -

- - - -
-
- - -
-

Automatically set the id for the event.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setId() - - - - -

- - - -
-
- - -
-

Automatically set the id for the event.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setImage(pageId, imageObj) - - - - -

- - - -
-
- - -
-

change the image of a page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
pageId - - -* - - - -
imageObj - - -* - - - -
- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setImage(pageId, imageObj) - - - - -

- - - -
-
- - -
-

change the image of a page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
pageId - - -* - - - -
imageObj - - -* - - - -
- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setName(name) - - - - -

- - - -
-
- - -
-

Set the name of the event.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
name - -

(string)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setName(name) - - - - -

- - - -
-
- - -
-

Set the name of the event.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
name - -

(string)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setNote(note) - - - - -

- - - -
-
- - -
-

Set the note of the event.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
note - -

(string)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setNote(note) - - - - -

- - - -
-
- - -
-

Set the note of the event.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
note - -

(string)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setPosition(x, y) - - - - -

- - - -
-
- - -
-

Set the map coordinates of the event.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
x - -

(int)

y - -

(int)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setPosition(x, y) - - - - -

- - - -
-
- - -
-

Set the map coordinates of the event.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
x - -

(int)

y - -

(int)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - spawn(x, y) - - - - -

- - - -
-
- - -
-

Place the event on the map at the specified coordinates.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
x - -

(int)

y - -

(int)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - spawn(x, y) - - - - -

- - - -
-
- - -
-

Place the event on the map at the specified coordinates.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
x - -

(int)

y - -

(int)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - static generateImage(index, name, dir, pattern, tile) - - - - -

- - - -
-
- - - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
index - - -* - - - -

the index of the char, 3 cols per index

name - - -* - - - -

the name of the char sheet to use

dir - - -* - - - -

the dir they are facing, 2,4,6,8

pattern - - -* - - - -
tile - - -* - - - -

tile id not sure

- -
- - - - - - - - - - - - - -
-
Returns:
- - - - - - --

obj

- - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - static generateImage(index, name, dir, pattern, tile) - - - - -

- - - -
-
- - - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
index - - -* - - - -

the index of the char, 3 cols per index

name - - -* - - - -

the name of the char sheet to use

dir - - -* - - - -

the dir they are facing, 2,4,6,8

pattern - - -* - - - -
tile - - -* - - - -

tile id not sure

- -
- - - - - - - - - - - - - -
-
Returns:
- - - - - - --

obj

- - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - static setDefaultImage() - - - - -

- - - -
-
- - -
-

Set the default event image for a page of actions.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - static setDefaultImage() - - - - -

- - - -
-
- - -
-

Set the default event image for a page of actions.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- -
- - - - - -
- -
- - - - - - - -
- -
- -

MapEvent()

- - -
- -
- -
- - - -
- -

- - new MapEvent() - - - - -

- - - -
-
- - -
-

The constructor for a new map event.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - -
- - - - - - - - - - - - - - - - - -

Methods

- -
- - -
- -

- - addCommand(pageId, command, parameters) - - - - -

- - - -
-
- - - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
pageId - - -* - - - -
command - - -* - - - -
parameters - - -* - - - -
- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - addCommand(pageId, command, parameters) - - - - -

- - - -
-
- - - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
pageId - - -* - - - -
command - - -* - - - -
parameters - - -* - - - -
- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - addCommandAfterIndex(index, command, pageIndex) - - - - -

- - - -
-
- - -
-

add

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
index - - -* - - - -

the index in the list of commands to add this command after

command - - -* - - - -

the command obj to add

pageIndex - - -int - - - -

the page index of the page to add the command to

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - addCommandAfterIndex(index, command, pageIndex) - - - - -

- - - -
-
- - -
-

add

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
index - - -* - - - -

the index in the list of commands to add this command after

command - - -* - - - -

the command obj to add

pageIndex - - -int - - - -

the page index of the page to add the command to

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - addMoveRoute(pageId, route) - - - - -

- - - -
-
- - -
-

add the move route command to a page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
pageId - - -* - - - -

the id of the page to add the command to

route - - -* - - - -

the id of the action

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - addPage() - - - - -

- - - -
-
- - -
-

Add a new page for the event's actions.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - addPage() - - - - -

- - - -
-
- - -
-

Add a new page for the event's actions.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - addSpokenText(pageId, text) - - - - -

- - - -
-
- - -
-

add text command to page with a speaker

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
pageId - - -* - - - -
text - - -* - - - -
- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - addSpriteToTilemap(sprite) - - - - -

- - - -
-
- - -
-

Add a sprite to the current scene's Tilemap.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
sprite - -

(Sprite_Character)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - addSpriteToTilemap(sprite) - - - - -

- - - -
-
- - -
-

Add a sprite to the current scene's Tilemap.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
sprite - -

(Sprite_Character)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - addText(pageId, text) - - - - -

- - - -
-
- - -
-

add text command to page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
pageId - - -* - - - -
text - - -* - - - -
- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - addTintScreen(pageId, tint, frames) - - - - -

- - - -
-
- - - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
pageId - - -* - - - -

the page Id to add the command to

tint - - -* - - - -

the tint object

frames - - -* - - - -

who many frames to tint for

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - addWait(pageId, frames) - - - - -

- - - -
-
- - -
-

add a wait command to a page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
pageId - - -* - - - -

the page id to add the command to

frames - - -* - - - -

the number of frames to wait

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - checkSelfSwitch(letter) → {boolean} - - - - -

- - - -
-
- - -
-

check a self switch of this event

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
letter - - -* - - - -

the letter of the self switch

- -
- - - - - - - - - - - - - -
-
Returns:
- - - - - -boolean - - - - - --

whether the switch is true or false

- - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - checkSelfSwitch(letter) → {boolean} - - - - -

- - - -
-
- - -
-

check a self switch of this event

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
letter - - -* - - - -

the letter of the self switch

- -
- - - - - - - - - - - - - -
-
Returns:
- - - - - -boolean - - - - - --

whether the switch is true or false

- - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - copyActionsFromCommonEvent(id) - - - - -

- - - -
-
- - -
-

Copy actions from a Common Event with the specified id.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
id - -

(int)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - copyActionsFromCommonEvent(id) - - - - -

- - - -
-
- - -
-

Copy actions from a Common Event with the specified id.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
id - -

(int)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - copyActionsFromEvent(id) - - - - -

- - - -
-
- - -
-

Copy actions from another event on the same map with the specified id.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
id - -

(int)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - copyActionsFromEvent(id) - - - - -

- - - -
-
- - -
-

Copy actions from another event on the same map with the specified id.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
id - -

(int)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - copyActionsFromEventOnMap(id, mapId) - - - - -

- - - -
-
- - -
-

Copy actions from another event on map with the specified id.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
id - -

(int)

mapId - -

(int)

- -
- - - - - - - - - - - - - -
-
Returns:
- - - - - - --

self for cmd chaining

- - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - copyActionsFromEventOnMap(id, mapId) - - - - -

- - - -
-
- - -
-

Copy actions from another event on map with the specified id.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
id - -

(int)

mapId - -

(int)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - createCharacterSprite(event) - - - - -

- - - -
-
- - -
-

Create a new Sprite_Character and store it in the current scene's Spriteset_Map.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
event - -

(Game_Event)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - createCharacterSprite(event) - - - - -

- - - -
-
- - -
-

Create a new Sprite_Character and store it in the current scene's Spriteset_Map.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
event - -

(Game_Event)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - createCommand(command, parameters, indent) → {rm.types.Event} - - - - -

- - - -
-
- - -
-

create a command obj from these params

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDefaultDescription
command - - -* - - - - - -

the command code

parameters - - -* - - - - - -

array of params

indent - - -* - - - - - - 0 - -

optional

- -
- - - - - - - - - - - - - -
-
Returns:
- - - - - -rm.types.Event - - - - - - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - createCommand(command, parameters, indent) → {rm.types.Event} - - - - -

- - - -
-
- - -
-

create a command obj from these params

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDefaultDescription
command - - -* - - - - - -

the command code

parameters - - -* - - - - - -

array of params

indent - - -* - - - - - - 0 - -

optional

- -
- - - - - - - - - - - - - -
-
Returns:
- - - - - -rm.types.Event - - - - - - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - createGameEvent() - - - - -

- - - -
-
- - -
-

Create a new Game_Event object and store it in $gameMap.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - createGameEvent() - - - - -

- - - -
-
- - -
-

Create a new Game_Event object and store it in $gameMap.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - getLastEvent() - - - - -

- - - -
-
- - -
-

Get the last Event object stored in $dataMap.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - getLastEvent() - - - - -

- - - -
-
- - -
-

Get the last Event object stored in $dataMap.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - getListOfCommandCodesOnPage(page) - - - - -

- - - -
-
- - -
-

return an array of all command codes on page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
page - - -* - - - -

page index

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - getListOfCommandCodesOnPage(page) - - - - -

- - - -
-
- - -
-

return an array of all command codes on page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
page - - -* - - - -

page index

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - indexOfCommandOnPage(commandCode, page) - - - - -

- - - -
-
- - -
-

returns the index of the first occurence of the command code on the page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
commandCode - - -* - - - -

command code

page - - -* - - - -

page index

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - indexOfCommandOnPage(commandCode, page) - - - - -

- - - -
-
- - -
-

returns the index of the first occurence of the command code on the page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
commandCode - - -* - - - -

command code

page - - -* - - - -

page index

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setChar(pageId, name) - - - - -

- - - -
-
- - -
-

change the charecter of a page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
pageId - - -* - - - -
name - - -string - - - -

string

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setDefaultConditions() - - - - -

- - - -
-
- - -
-

Set the default event conditions for a page of actions.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setDefaultConditions() - - - - -

- - - -
-
- - -
-

Set the default event conditions for a page of actions.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setDefaultMoveRoute() - - - - -

- - - -
-
- - -
-

Set the default move route for a page of actions.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setDefaultMoveRoute() - - - - -

- - - -
-
- - -
-

Set the default move route for a page of actions.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setDefaultPage() - - - - -

- - - -
-
- - - - - - - - - - - - - - - - - - - - - - -
-
Returns:
- - - - - - --

the default page objectt

- - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setId() - - - - -

- - - -
-
- - -
-

Automatically set the id for the event.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setId() - - - - -

- - - -
-
- - -
-

Automatically set the id for the event.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setImage(pageId, imageObj) - - - - -

- - - -
-
- - -
-

change the image of a page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
pageId - - -* - - - -
imageObj - - -* - - - -
- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setImage(pageId, imageObj) - - - - -

- - - -
-
- - -
-

change the image of a page

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
pageId - - -* - - - -
imageObj - - -* - - - -
- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setName(name) - - - - -

- - - -
-
- - -
-

Set the name of the event.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
name - -

(string)

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- -

- - setName(name) - - - - -

- - - -
-
- - -
-

Set the name of the event.

-
- - - - - - - - - -
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
name - -

(string)

- -
- - - - - - - - - - - - - - - +
@@ -14340,14 +3373,14 @@
Parameters:
-

+

- setNote(note) + setDefaultPage()

@@ -14358,10 +3391,6 @@

-
-

Set the note of the event.

-
- @@ -14370,50 +3399,11 @@

-
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
note - -

(string)

-
@@ -14421,11 +3411,21 @@

Parameters:
+
+
Returns:
+ + + + + + +-

the default page objectt

- - + + +
@@ -14474,14 +3474,14 @@
Parameters:
-

+

- setNote(note) + setId()

@@ -14493,7 +3493,7 @@

-

Set the note of the event.

+

Automatically set the id for the event.

@@ -14504,51 +3504,6 @@

-
-
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
note - -

(string)

- -
- @@ -14608,14 +3563,14 @@

Parameters:
-

+

- setPosition(x, y) + setImage(pageId, imageObj)

@@ -14627,7 +3582,7 @@

-

Set the map coordinates of the event.

+

change the image of a page

@@ -14663,36 +3618,46 @@

Parameters:
- x + pageId + +* + + + -

(int)

+ - y + imageObj + +* + + + -

(int)

+ @@ -14760,14 +3725,14 @@
Parameters:
-

+

- setPosition(x, y) + setName(name)

@@ -14779,7 +3744,7 @@

-

Set the map coordinates of the event.

+

Set the name of the event.

@@ -14800,40 +3765,22 @@

Parameters:
Name - Type - - - - - - Description - - - - - - - - - x - - - - - - - + Type - + -

(int)

- + + + Description + + + - y + name @@ -14844,7 +3791,7 @@
Parameters:
-

(int)

+

(string)

@@ -14912,14 +3859,14 @@
Parameters:
-

+

- spawn(x, y) + setNote(note)

@@ -14931,7 +3878,7 @@

-

Place the event on the map at the specified coordinates.

+

Set the note of the event.

@@ -14967,25 +3914,7 @@

Parameters:
- x - - - - - - - - - - -

(int)

- - - - - - - y + note @@ -14996,7 +3925,7 @@
Parameters:
-

(int)

+

(string)

@@ -15064,14 +3993,14 @@
Parameters:
-

+

- spawn(x, y) + setPosition(x, y)

@@ -15083,7 +4012,7 @@

-

Place the event on the map at the specified coordinates.

+

Set the map coordinates of the event.

@@ -15216,14 +4145,14 @@

Parameters:
-

+

- static generateImage(index, name, dir, pattern, tile) + spawn(x, y)

@@ -15234,6 +4163,10 @@

+
+

Place the event on the map at the specified coordinates.

+
+ @@ -15267,115 +4200,36 @@
Parameters:
- index - - - - - -* - - - - - - - - - -

the index of the char, 3 cols per index

- - - - - - - name - - - - - -* - - - - - - - - - -

the name of the char sheet to use

- - - - - - - dir - - - - - -* - - - - - - - - - -

the dir they are facing, 2,4,6,8

- - - - - - - pattern + x - -* - - - - +

(int)

- tile + y - -* - - - -

tile id not sure

+

(int)

@@ -15396,22 +4250,6 @@
Parameters:
-
-
Returns:
- - - - - - --

obj

- - - - - -
- @@ -15465,8 +4303,8 @@

@@ -15769,95 +4607,6 @@

- - - - - - - - - - -

- - - - -
- - - - -
- -

- - static setDefaultImage() - - - - -

- - - -
-
- - -
-

Set the default event image for a page of actions.

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - diff --git a/www/mods/commonLibs/docs/Math.seedrandom.html b/www/mods/commonLibs/docs/Math.seedrandom.html index c567e4e1..6ac9f81e 100644 --- a/www/mods/commonLibs/docs/Math.seedrandom.html +++ b/www/mods/commonLibs/docs/Math.seedrandom.html @@ -49,7 +49,7 @@

Class: seedrandom

- +
diff --git a/www/mods/commonLibs/docs/Mod.html b/www/mods/commonLibs/docs/Mod.html index 212fad7e..15576a1e 100644 --- a/www/mods/commonLibs/docs/Mod.html +++ b/www/mods/commonLibs/docs/Mod.html @@ -49,7 +49,7 @@

Class: Mod

- +
diff --git a/www/mods/commonLibs/docs/ModManager.html b/www/mods/commonLibs/docs/ModManager.html index e1651c76..0f1068e6 100644 --- a/www/mods/commonLibs/docs/ModManager.html +++ b/www/mods/commonLibs/docs/ModManager.html @@ -49,7 +49,7 @@

Class: ModManager

- +
diff --git a/www/mods/commonLibs/docs/betterSaves.js.html b/www/mods/commonLibs/docs/betterSaves.js.html index d3ebdce9..bb92d59c 100644 --- a/www/mods/commonLibs/docs/betterSaves.js.html +++ b/www/mods/commonLibs/docs/betterSaves.js.html @@ -51,7 +51,7 @@

Source: betterSaves.js

- +
diff --git a/www/mods/commonLibs/docs/bossRushOfTheEndless.js.html b/www/mods/commonLibs/docs/bossRushOfTheEndless.js.html index 166ac7e8..ebf07b54 100644 --- a/www/mods/commonLibs/docs/bossRushOfTheEndless.js.html +++ b/www/mods/commonLibs/docs/bossRushOfTheEndless.js.html @@ -51,7 +51,7 @@

Source: bossRushOfTheEndless.js

- +
diff --git a/www/mods/commonLibs/docs/commonLibs__common.js.html b/www/mods/commonLibs/docs/commonLibs__common.js.html index 9d577ea7..d34cad24 100644 --- a/www/mods/commonLibs/docs/commonLibs__common.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common.js

- +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_actorAPI.js.html b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_actorAPI.js.html index 0d6d591b..bb96a472 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_actorAPI.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_actorAPI.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/API_CORE/actorA - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_apiDOCS.js.html b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_apiDOCS.js.html index 2ea961ee..2d534cde 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_apiDOCS.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_apiDOCS.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/API_CORE/apiDOC - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_eventAPI.js.html b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_eventAPI.js.html index 54f10fcd..4a50a7dd 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_eventAPI.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_eventAPI.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/API_CORE/eventA - +
@@ -117,9 +117,9 @@

Source: commonLibs/_common/API_CORE/eventA Game_Event.prototype.event = function () { let val = MATTIE.eventAPI.orgEvent.call(this); if (MATTIE.eventAPI.dataEvents[this._eventId]) { - val = MATTIE.eventAPI.dataEvents[this._eventId]; + val = MATTIE.eventAPI.dataEvents[this._eventId].data; } - if (!val) val = MATTIE.eventAPI.dataEvents[this._eventId]; + if (!val) val = MATTIE.eventAPI.dataEvents[this._eventId].data; return val; }; @@ -128,14 +128,14 @@

Source: commonLibs/_common/API_CORE/eventA for (let index = 0; index < keys.length; index++) { /** @type {rm.types.Event} */ const eventId = keys[index]; - const dataEvent = MATTIE.eventAPI.dataEvents[keys[index]]; + const dataEvent = MATTIE.eventAPI.dataEvents[keys[index]].data; if (dataEvent) { if (dataEvent.mapId === $gameMap.mapId() && dataEvent.persist) { - MATTIE.eventAPI.dataEvents[eventId] = $dataMap.events[eventId] ? $dataMap.events[eventId] : MATTIE.eventAPI.dataEvents[eventId]; + MATTIE.eventAPI.dataEvents[eventId].data = $dataMap.events[eventId] ? $dataMap.events[eventId] : MATTIE.eventAPI.dataEvents[eventId].data; const event = $gameMap.event(eventId); if (event) { - MATTIE.eventAPI.dataEvents[eventId].x = event.x; - MATTIE.eventAPI.dataEvents[eventId].y = event.y; + MATTIE.eventAPI.dataEvents[eventId].data.x = event.x; + MATTIE.eventAPI.dataEvents[eventId].data.y = event.y; } } } @@ -145,7 +145,7 @@

Source: commonLibs/_common/API_CORE/eventA MATTIE.eventAPI.setupRunTimeDataEvents = function () { for (let index = 0; index < keys.length; index++) { /** @type {rm.types.Event} */ - const dataEvent = MATTIE.eventAPI.dataEvents[keys[index]]; + const dataEvent = MATTIE.eventAPI.dataEvents[keys[index]].data; if (dataEvent.mapId === $gameMap.mapId() && dataEvent.persist) { // console.log('persited event spawned'); // console.log(dataEvent); @@ -161,7 +161,7 @@

Source: commonLibs/_common/API_CORE/eventA const keys = Object.keys(MATTIE.eventAPI.dataEvents); for (let index = 0; index < keys.length; index++) { /** @type {rm.types.Event} */ - const dataEvent = MATTIE.eventAPI.dataEvents[keys[index]]; + const dataEvent = MATTIE.eventAPI.dataEvents[keys[index]].data; if (dataEvent.mapId === $gameMap.mapId() && dataEvent.persist) { if (!$dataMap.events[dataEvent.id]) { console.log(dataEvent); diff --git a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_eventWrapper.js.html b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_eventWrapper.js.html index ffa9bf11..ed719478 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_eventWrapper.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_eventWrapper.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/API_CORE/eventW - +
@@ -363,7 +363,7 @@

Source: commonLibs/_common/API_CORE/eventW */ createGameEvent() { console.log(MATTIE.eventAPI.dataEvents[this.data.id]); - $dataMap.events[this.data.id] = MATTIE.eventAPI.dataEvents[this.data.id]; + $dataMap.events[this.data.id] = this.data; $gameMap._events[this.data.id] = (new Game_Event($gameMap.mapId(), this.data.id)); if (!$dataMap.events[this.data.id]) $dataMap.events[this.data.id] = undefined; // if data is null set it to undefined instead return $gameMap.event(this.data.id); @@ -451,7 +451,7 @@

Source: commonLibs/_common/API_CORE/eventW * @param y (int) */ spawn(x, y) { - MATTIE.eventAPI.dataEvents[this.data.id] = (this.data); + MATTIE.eventAPI.dataEvents[this.data.id] = this; if (this.data.mapId === $gameMap.mapId()) { this.setPosition(x, y); this.refresh(); @@ -460,6 +460,10 @@

Source: commonLibs/_common/API_CORE/eventW } removeThisEvent() { + if (this.data.mapId === $gameMap.mapId()) { + $gameMap._events[this.data.id] = null; + $dataMap.events[this.data.id] = null; + } MATTIE.eventAPI.dataEvents[this.data.id] = undefined; delete MATTIE.eventAPI.dataEvents[this.data.id]; } @@ -517,27 +521,39 @@

Source: commonLibs/_common/API_CORE/eventW } } -/** - * Hook into original functions. - */ (function () { - // Extend the clearTransferInfo function - const { clearTransferInfo } = Game_Player.prototype; + // override the function that triggers when the scene map is fully loaded - // When a transfer is complete and info is being cleared - Game_Player.prototype.clearTransferInfo = function () { - clearTransferInfo.call(this); + MATTIE.eventAPI.cleanup = function () { + if (!$dataMap) return; // Get all existing event ids const eventIds = []; const persistingIds = []; - Object.keys(MATTIE.eventAPI.dataEvents).forEach((key) => { + const eventsForDeletion = []; + const keys = Object.keys(MATTIE.eventAPI.dataEvents); + for (let index = 0; index < keys.length; index++) { + const key = keys[index]; const event = MATTIE.eventAPI.dataEvents[key]; - if (event.id === $gameMap.mapId()) { - if (event && !event.persist) eventIds.push(event.id); - if (event && event.persist) persistingIds.push(event.id); + console.log(event); + console.log(`map = ${$gameMap.mapId()}`); + if (event) { + if (event.data.mapId == $gameMap.mapId()) { + console.log('event on map'); + if (!event.data.persist) { + eventIds.push(event.data.id); + eventsForDeletion.push(event); + } + if (event.data.persist) { + persistingIds.push(event.data.id); + } + } } - }); + } + + console.log('persisding ids'); + console.log(persistingIds); + $dataMap.events.forEach((object) => { if (object === null) { return; } @@ -555,12 +571,23 @@

Source: commonLibs/_common/API_CORE/eventW // eslint-disable-next-line no-continue if (mapId != $gameMap._mapId) { continue; } - if (!eventIds.contains(eventId) && !persistingIds.contains(eventId)) { + if (eventIds.contains(eventId) && !persistingIds.contains(eventId)) { delete $gameSelfSwitches._data[key]; - console.log('cleaned up switch'); + console.log(`cleaned up switch:${key} from event: ${eventId}`); } } } + + // remove all events qued for deletion + eventsForDeletion.forEach((evd) => { + evd.removeThisEvent(); + }); + }; + + const onMapLoaded = Scene_Map.prototype.onMapLoaded; + Scene_Map.prototype.onMapLoaded = function () { + onMapLoaded.call(this); + MATTIE.eventAPI.cleanup(); }; }()); diff --git a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_heSoBBGirlAPI.js.html b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_heSoBBGirlAPI.js.html index 2fdf6382..97a711fc 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_heSoBBGirlAPI.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_heSoBBGirlAPI.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/API_CORE/heSoBB - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_infoAPI.js.html b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_infoAPI.js.html index cc633c7c..4b4564ad 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_infoAPI.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_infoAPI.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/API_CORE/infoAP - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_inputAPI.js.html b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_inputAPI.js.html new file mode 100644 index 00000000..db384d8d --- /dev/null +++ b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_inputAPI.js.html @@ -0,0 +1,140 @@ + + + + + + + Source: commonLibs/_common/API_CORE/inputAPI.js | Source: commonLibs/_common/API_CORE/inputAPI.js + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+
+
var MATTIE = MATTIE || {};
+// an api for some input related tasks
+/**
+ * @namespace MATTIE.infoAPI
+ */
+
+MATTIE.inputAPI = {};
+/** @description the threshold (in milliseconds) for input to not be held for onLongNoInput to be called */
+MATTIE.inputAPI.thresholdForNotInputtingRecently = 500;
+
+/**
+ * @description meant to be overridden by other mods. called when no input is held for half a second
+ */
+Input.onLongNoInput = function () {
+	this.hasNotInputtedRecently = true;
+};
+
+/**
+ * @description add a callback to occur when onlongnoInput is triggered
+ */
+MATTIE.inputAPI.onLongNoInput = function (cb) {
+	const prevFunc = Input.onLongNoInput;
+	Input.onLongNoInput = function () {
+		prevFunc.call(this);
+		cb();
+	};
+};
+
+// override the update method to check and call on long no input
+MATTIE_RPG.Input_Update = Input.update;
+Input.update = function () {
+	MATTIE_RPG.Input_Update.call(this);
+	if (Date.now() - this._date >= MATTIE.inputAPI.thresholdForNotInputtingRecently && !Input.isPressed(this._latestButton)) {
+		if (!this.hasNotInputtedRecently) { this.onLongNoInput(); }
+	} else {
+		this.hasNotInputtedRecently = false;
+	}
+};
+
+// override the clear method to update hasNotInputtedRecently
+MATTIE_RPG.Input_Clear = Input.clear;
+Input.clear = function () {
+	MATTIE_RPG.Input_Clear.call(this);
+	this.hasNotInputtedRecently = false;
+};
+
+
+
+ + + + +
+ +
+ + +
+ + + + + + + + + diff --git a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_itemAPI.js.html b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_itemAPI.js.html index 933e50bc..9537f10b 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_itemAPI.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_itemAPI.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/API_CORE/itemAP - +
@@ -630,6 +630,13 @@

Source: commonLibs/_common/API_CORE/itemAP MATTIE_RPG.Window_Base_drawIcon.call(this, iconIndex, x, y); } }; + +// override actions to have callbacks +MATTIE_RPG.GameActionApply = Game_Action.prototype.apply; +Game_Action.prototype.apply = function (target) { + MATTIE_RPG.GameActionApply.call(this, target); + if (this.cb) this.cb(); +};

diff --git a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_miscAPI.js.html b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_miscAPI.js.html index 31b2256e..2b31bd3e 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_miscAPI.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_miscAPI.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/API_CORE/miscAP - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_msgAPI.js.html b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_msgAPI.js.html index a8a4f185..10ff7154 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_msgAPI.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_msgAPI.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/API_CORE/msgAPI - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_preFabAPI.js.html b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_preFabAPI.js.html index a7376751..a83da678 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_preFabAPI.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_preFabAPI.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/API_CORE/preFab - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_sceneOverlappAPI.js.html b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_sceneOverlappAPI.js.html new file mode 100644 index 00000000..d0bc18a1 --- /dev/null +++ b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_sceneOverlappAPI.js.html @@ -0,0 +1,102 @@ + + + + + + + Source: commonLibs/_common/API_CORE/sceneOverlappAPI.js | Source: commonLibs/_common/API_CORE/sceneOverlappAPI.js + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+
+
/**
+ * @namespace MATTIE.sceneOverlapAPI
+ * @description the api responsible for allowing scenes to overlap
+ */
+MATTIE.sceneOverlapAPI = {};
+
+// this is a ton of work but I might do it sometime
+
+
+
+ + + + +
+ +
+ + +
+ + + + + + + + + diff --git a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_teleportsAPI.js.html b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_teleportsAPI.js.html index 8835315e..fa83544c 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_teleportsAPI.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_teleportsAPI.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/API_CORE/telepo - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_troopAPI.js.html b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_troopAPI.js.html index 3b1b022d..594b98b6 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_troopAPI.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_troopAPI.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/API_CORE/troopA - +
@@ -135,7 +135,7 @@

Source: commonLibs/_common/API_CORE/troopA * @description an array of all additional troops * @type {MATTIE.troopAPI.RuntimeTroop[]} * */ - this._additionalTroops = {}; + if (!this._additionalTroops) this._additionalTroops = {}; if (typeof troopId === 'number') { MATTIE_RPG.TroopApi_Game_Troop_Setup.call(this, troopId); @@ -151,7 +151,7 @@

Source: commonLibs/_common/API_CORE/troopA * @param {function} cb the callback to call when the fight ends * @param {function} afterSetupCb the callback that triggers when the combat is ready */ -Game_Troop.prototype.setupMultiCombat = function (arr, cb = () => {}, afterSetupCb = () => {}) { +Game_Troop.prototype.setupMultiCombat = function (arr, cb = () => {}, afterSetupCb = () => {}, spiderMode = false) { $gameTemp.reserveCommonEvent(74); // before battle let turn = 0; BattleManager.setCantStartInputting(true); @@ -183,7 +183,11 @@

Source: commonLibs/_common/API_CORE/troopA default: break; } - BattleManager.setup(first, false, true); + if (!spiderMode) { + BattleManager.setup(first, false, true); + } else { + BattleManager.setup(142, false, true); + } $gamePlayer.makeEncounterCount(); SceneManager.push(Scene_Battle); @@ -193,15 +197,16 @@

Source: commonLibs/_common/API_CORE/troopA MATTIE.msgAPI.footerMsg('True Ambush Round --All Enemies cannot attack this round.'); } setTimeout(() => { - /** @type {Game_Enemy} */ - // const spider = $gameTroop.baseMembers()[0]; + if (spiderMode) { + /** @type {Game_Enemy} */ + const spider = $gameTroop.baseMembers()[0]; - // spider.performDamage(); - // spider.die(); - - // spider.hide(); + spider.performDamage(); + spider.die(); + spider.hide(); + } - for (let index = 1; index < roundIds.length; index++) { + for (let index = spiderMode ? 0 : 1; index < roundIds.length; index++) { $gameSwitches.setValue(MATTIE.static.switch.backstab, true); const additionalId = roundIds[index]; const additionalTroop = new MATTIE.troopAPI.RuntimeTroop(additionalId); @@ -557,7 +562,9 @@

Source: commonLibs/_common/API_CORE/troopA if (this.spriteSet.additionalEnemyTroops) { this.spriteSet.additionalEnemyTroops[troop.getMId()].forEach((sprite) => { this.spriteSet._battleField.removeChild(sprite); + this.spriteSet.additionalEnemySprites.splice(this.spriteSet.additionalEnemySprites.indexOf(sprite), 1); }); + delete this.spriteSet.additionalEnemyTroops[troop.getMId()]; this.spriteSet.visualSort(); if (MATTIE.troopAPI.config.shouldSort) { this.spriteSet.refreshSpacing(true); } @@ -932,15 +939,37 @@

Source: commonLibs/_common/API_CORE/troopA }); for (let index = 0; index < keys.length; index++) { - const enemyList = dict[keys[index]]; // a list of sprites - const xOffset = bestX(index); + const key = keys[index]; + const enemyList = dict[key]; // a list of sprites + const actorId = MATTIE.multiplayer.pvp.PvpController.mapTroopToActor(key); + let xOffset = bestX(index); + let yOffset = 0; /** @type {Sprite_Battler} */ enemyList.forEach((sprite) => { + yOffset = 0; if (sprite) { if (!sprite.baseX) sprite.baseX = sprite._homeX; if (!sprite.baseY) sprite.baseY = sprite._homeY; - sprite.setHome((sprite.baseX + xOffset), sprite._homeY); + + // handle pvp spacing for leaders + if (MATTIE.multiplayer.pvp.inPVP) { + if (MATTIE.multiplayer.getCurrentNetController().player.pvpCombatArr.some( + (netKey) => { + const netCont = MATTIE.multiplayer.getCurrentNetController(); + + const player = MATTIE.multiplayer.getCurrentNetController().netPlayers[netKey]; + if (player) return player.actorId == actorId; + return false; + }, + + )) { + yOffset -= 35; + xOffset = 20; + } + } + + sprite.setHome((sprite.baseX + xOffset), sprite._homeY + yOffset); } }); } diff --git a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_unstuckAPI.js.html b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_unstuckAPI.js.html index a58be89e..985c9d79 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_unstuckAPI.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_unstuckAPI.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/API_CORE/unstuc - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_vfxAPI.js.html b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_vfxAPI.js.html index 9c56c76c..31578740 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_API_CORE_vfxAPI.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_API_CORE_vfxAPI.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/API_CORE/vfxAPI - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_betterCrowMauler.js.html b/www/mods/commonLibs/docs/commonLibs__common_betterCrowMauler.js.html index 26c7dc1a..879fd01f 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_betterCrowMauler.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_betterCrowMauler.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/betterCrowMaule - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_betterDebugMenu.js.html b/www/mods/commonLibs/docs/commonLibs__common_betterDebugMenu.js.html index 342d572a..999d142e 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_betterDebugMenu.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_betterDebugMenu.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/betterDebugMenu - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_clipboard.js.html b/www/mods/commonLibs/docs/commonLibs__common_clipboard.js.html index 5992ebea..7013c29d 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_clipboard.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_clipboard.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/clipboard.js - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_commonitems_costumes.js.html b/www/mods/commonLibs/docs/commonLibs__common_commonitems_costumes.js.html index b886c6b9..9c062b36 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_commonitems_costumes.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_commonitems_costumes.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/commonitems/cos - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_compatibility.js.html b/www/mods/commonLibs/docs/commonLibs__common_compatibility.js.html index 92b8de0a..d5b08d0e 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_compatibility.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_compatibility.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/compatibility.j - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_dataManager.js.html b/www/mods/commonLibs/docs/commonLibs__common_dataManager.js.html index f3233637..2242e5ac 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_dataManager.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_dataManager.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/dataManager.js< - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_gameEmitter.js.html b/www/mods/commonLibs/docs/commonLibs__common_gameEmitter.js.html index 661a7403..938eaef3 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_gameEmitter.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_gameEmitter.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/gameEmitter.js< - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_items.js.html b/www/mods/commonLibs/docs/commonLibs__common_items.js.html index d491f700..e4d53ade 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_items.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_items.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/items.js - +
@@ -65,279 +65,267 @@

Source: commonLibs/_common/items.js
var MATTIE_ModManager = MATTIE_ModManager || {};
 var MATTIE = MATTIE || {};
-MATTIE.items = MATTIE.items  || {};
+MATTIE.items = MATTIE.items || {};
 MATTIE.global = MATTIE.global || {};
 MATTIE.static = MATTIE.static || {};
 
 var Yanfly = Yanfly || {};
 
-
 const EffectCodes = {
-    RECOVER_HP:  11,
-    RECOVER_MP: 12,
-    GAIN_TP: 13,
-    ADD_STATE: 21,
-    REMOVE_STATE: 22,
-    ADD_BUFF: 31,
-    ADD_DEBUFF: 32,
-    REMOVE_BUFF: 33,
-    REMOVE_DEBUFF: 34,
-    SPECIAL: 41,
-    GROW: 42,
-    LEARN_SKILL: 43,
-    COMMON_EVENT: 44,
-    SPECIAL_ESCAPE:  0,  
-}
-
+	RECOVER_HP: 11,
+	RECOVER_MP: 12,
+	GAIN_TP: 13,
+	ADD_STATE: 21,
+	REMOVE_STATE: 22,
+	ADD_BUFF: 31,
+	ADD_DEBUFF: 32,
+	REMOVE_BUFF: 33,
+	REMOVE_DEBUFF: 34,
+	SPECIAL: 41,
+	GROW: 42,
+	LEARN_SKILL: 43,
+	COMMON_EVENT: 44,
+	SPECIAL_ESCAPE: 0,
+};
 
 /**
- * 
- * @param {EffectCodes} code what type of effect is this? refer to game action effects 
+ *
+ * @param {EffectCodes} code what type of effect is this? refer to game action effects
  * @param {int} dataId the dataid, mostly used for status effects and common events
  * @param {int} scalar multiplicitive value?
  * @param {int} value addative value?
  */
-DataManager.buildEffect = function(code,dataId,scalar,value){
-    let effect = {};
-    effect.code = code;
-    effect.dataId = dataId;
-    effect.value1 = scalar;
-    effect.value2 = value;
-    return effect
-}
-
-DataManager.buildCommonEventEffect = function(commonEventId){
-    return DataManager.buildEffect(EffectCodes.COMMON_EVENT, commonEventId, 0, 0)
-}
+DataManager.buildEffect = function (code, dataId, scalar, value) {
+	const effect = {};
+	effect.code = code;
+	effect.dataId = dataId;
+	effect.value1 = scalar;
+	effect.value2 = value;
+	return effect;
+};
+
+DataManager.buildCommonEventEffect = function (commonEventId) {
+	return DataManager.buildEffect(EffectCodes.COMMON_EVENT, commonEventId, 0, 0);
+};
 
 /**
  * @description change the activation condition of an item
- * @param {*} x 
+ * @param {*} x
  * 0: always
  * 1: in battle
  * 2: in menu
  * 3: never
  */
-DataManager.changeActivationCondition = function(obj,x) {
-    obj.occasion = x;
-}
+DataManager.changeActivationCondition = function (obj, x) {
+	obj.occasion = x;
+};
 
 /**
  * @description call a callback when the item is consumed
  * @param {*} id the item id
  * @param {*} cb the function to call when the item is consumed
  */
-DataManager.setCallbackOnItem = function(id,cb) {
-    $dataItems[id].hasCallback = true;
-    $dataItems[id].cb = cb;
-}
+DataManager.setCallbackOnItem = function (id, cb) {
+	$dataItems[id].hasCallback = true;
+	$dataItems[id].cb = cb;
+};
 
 /**
  * @description call a callback when the item is consumed
  * @param {*} id the item id
  * @param {*} cb the function to call when the item is consumed
  */
-DataManager.setCallbackOnObj = function(obj,cb) {
-    obj.hasCallback = true;
-    obj.cb = cb;
-}
+DataManager.setCallbackOnObj = function (obj, cb) {
+	obj.hasCallback = true;
+	obj.cb = cb;
+};
 
 /**
  * @description clear all effects of the item, basically make it do nothing when used
  * @param {*} id the item id
  */
-DataManager.disableBaseItem = function(id) {
-    $dataItems[id].disableBase = true; //this is my var to know if base is diabled
-    $dataItems[id].effects = []; //this is what stops the item effects
-    $dataItems[id].repeats = 0; //probs not needed
-}
+DataManager.disableBaseItem = function (id) {
+	$dataItems[id].disableBase = true; // this is my var to know if base is diabled
+	$dataItems[id].effects = []; // this is what stops the item effects
+	$dataItems[id].repeats = 0; // probs not needed
+};
 
-DataManager.clearEffects = function(obj){
-    obj.effect = [];
-}
+DataManager.clearEffects = function (obj) {
+	obj.effect = [];
+};
 
 /**
  * @description add an effect to an item
  * @param {*} id the id of the item
  * @param {*} effect the effect to add
  */
-DataManager.addItemEffect = function(id,effect) {
-    $dataItems[id].effects.push(effect);
-}
+DataManager.addItemEffect = function (id, effect) {
+	$dataItems[id].effects.push(effect);
+};
 
 /**
  * @description add an effect to an item
  * @param {*} id the id of the item
  * @param {*} effect the effect to add
  */
-DataManager.addEffect = function(obj,effect) {
-    obj.effects.push(effect);
-}
+DataManager.addEffect = function (obj, effect) {
+	obj.effects.push(effect);
+};
 MATTIE.items.object = Game_Item.prototype.object;
-Game_Item.prototype.object = function() {
-    return MATTIE.items.object.call(this);
-    //else return null;
+Game_Item.prototype.object = function () {
+	return MATTIE.items.object.call(this);
+	// else return null;
 };
 
 MATTIE.items.setObject = Game_Item.prototype.setObject;
-Game_Item.prototype.setObject = function(item) {
-    MATTIE.items.setObject.call(this,item);
-    if(item){
-        if(item.hasCallback){
-            this.setCb(item.cb)
-        }
-        this.disableBase = item.disableBase;
-    }
-    
-
+Game_Item.prototype.setObject = function (item) {
+	MATTIE.items.setObject.call(this, item);
+	if (item) {
+		if (item.hasCallback) {
+			this.setCb(item.cb);
+		}
+		this.disableBase = item.disableBase;
+	}
 };
 
-/** @param {*} cb the callback to call*/
-Game_Item.prototype.setCb = function(cb) {
-    this.cb = cb;
+/** @param {*} cb the callback to call */
+Game_Item.prototype.setCb = function (cb) {
+	this.cb = cb;
 };
 
-Game_Item.prototype.clearCb = function() {
-    this.cb = null;
+Game_Item.prototype.clearCb = function () {
+	this.cb = null;
 };
 
-Game_Item.prototype.getCb = function() {
-    return this.cb;
+Game_Item.prototype.getCb = function () {
+	return this.cb;
 };
 
-Game_Item.prototype.useItem = function() {
-    if(this.cb)this.cb();
+Game_Item.prototype.useItem = function () {
+	if (this.cb) this.cb();
 };
 
-//this is called anytime any battler uses a action/skill/...etc...
-MATTIE.items.apply = Game_Battler.prototype.useItem ;
-Game_Battler.prototype.useItem  = function(item) {
-    MATTIE.items.apply.call(this,item);
-    if(item.cb) item.cb();
+// this is called anytime any battler uses a action/skill/...etc...
+MATTIE.items.apply = Game_Battler.prototype.useItem;
+Game_Battler.prototype.useItem = function (item) {
+	MATTIE.items.apply.call(this, item);
+	if (item.cb) item.cb();
 };
 
-
 MATTIE.items.runtimeItems = [];
 
 MATTIE.items.runTimeItem = class {
-    
-    constructor(params) {
-        /**
-         * @description the actual data item of this class 
+	constructor(params) {
+		/**
+         * @description the actual data item of this class
          * @type {rm.types.Item}
          * */
-        this._data  = this.buildDefaultParams();
-        this.setId();
-        this.cb = ()=>{};
-    }
+		this._data = this.buildDefaultParams();
+		this.setId();
+		this.cb = () => {};
+	}
 
-    /**
+	/**
      * @description create the default data item
      * @returns the default dataItem obj
      */
-    buildDefaultParams (){
-        let obj = {};
-        obj.name = "generic name"
-        obj.animationId = 0;
-        obj.consumable = 0;
-        obj.damage = 1;
-        obj.description = "A generic Item";
-        obj.effects = [];
-        obj.hitType = 0;
-        obj.iconIndex = 0;
-        obj.itypeId = 1;
-        obj.meta = "";
-        obj.note = "";
-        obj.occasion = 0;
-        obj.price = 0;
-        obj.repeats = 0;
-        obj.scope = 0; 
-        obj.speed = 1;
-        obj.successRate = 100;
-        obj.tpGain = 0;
-        return obj;
-        
-    }
-
-    /** @description 1: normal, 0: weapon, 0: armor?, 2: book */
-    setItemType(type){
-        this._data.itypeId = type;
-    }
-
-    setIconIndex(index){
-        this._data.iconIndex = index;
-    }
-
-    setId(){
-        this._data.id = $dataItems.length;
-    }
-
-    /**
+	buildDefaultParams() {
+		const obj = {};
+		obj.name = 'generic name';
+		obj.animationId = 0;
+		obj.consumable = 0;
+		obj.damage = 1;
+		obj.description = 'A generic Item';
+		obj.effects = [];
+		obj.hitType = 0;
+		obj.iconIndex = 0;
+		obj.itypeId = 1;
+		obj.meta = '';
+		obj.note = '';
+		obj.occasion = 0;
+		obj.price = 0;
+		obj.repeats = 0;
+		obj.scope = 0;
+		obj.speed = 1;
+		obj.successRate = 100;
+		obj.tpGain = 0;
+		return obj;
+	}
+
+	/** @description 1: normal, 0: weapon, 0: armor?, 2: book */
+	setItemType(type) {
+		this._data.itypeId = type;
+	}
+
+	setIconIndex(index) {
+		this._data.iconIndex = index;
+	}
+
+	setId() {
+		this._data.id = $dataItems.length;
+	}
+
+	/**
      * @description set the name of this item
      * @param {String} name the new name
      */
-    setName(name){
-        this._data.name = name;
-    }
+	setName(name) {
+		this._data.name = name;
+	}
 
-     /**
+	/**
      * @description set the desc of this item
      * @param {String} desc the new desc
      */
-     setDescription(desc){
-        this._data.description = desc;
-    }
+	setDescription(desc) {
+		this._data.description = desc;
+	}
 
-    /**
+	/**
      * @description set a callback to occur when this item is crafted
-     * @param {Function} cb the callback to be called 
+     * @param {Function} cb the callback to be called
      */
-    setCraftingCallback(cb){
-        let openingTag = "<Custom Synthesis Effect>";
-        let closingTag = "</Custom Synthesis Effect>";
-        this._data.craftingCb = cb;
-        let script = `$dataItems[${this._data.id}].craftingCb()`
-        this._data.customSynthEval = script;
-    }
-
-    /**
+	setCraftingCallback(cb) {
+		const openingTag = '<Custom Synthesis Effect>';
+		const closingTag = '</Custom Synthesis Effect>';
+		this._data.craftingCb = cb;
+		const script = `$dataItems[${this._data.id}].craftingCb()`;
+		this._data.customSynthEval = script;
+	}
+
+	/**
      * @description add a recipe to the current item
      * @param {id[]} itemIds array of items needed for this recipe
      * @param {id}unlockItemId, the item that will unlock the recipe for this item
      */
-    addRecipe (itemIds,unlockItemId){
-        let openingTag = "<Synthesis Ingredients>\n";
-        let closingTag = "</Synthesis Ingredients>\n";
-        let items = itemIds.map(itemId=>("item "+itemId)).join("\n");
-        let recipeString = openingTag + items + closingTag;
-
-        let recipeUnlock = `\n<Item Recipe: ${this._data.id}>\n`
-        $dataItems[unlockItemId].note += recipeUnlock;
+	addRecipe(itemIds, unlockItemId) {
+		const openingTag = '<Synthesis Ingredients>\n';
+		const closingTag = '</Synthesis Ingredients>\n';
+		const items = itemIds.map((itemId) => (`item ${itemId}`)).join('\n');
+		const recipeString = openingTag + items + closingTag;
 
-        DataManager.processISNotetags1([null,this._data,$dataItems[unlockItemId]],0)
+		const recipeUnlock = `\n<Item Recipe: ${this._data.id}>\n`;
+		$dataItems[unlockItemId].note += recipeUnlock;
 
-        this._data.note += recipeString;
+		DataManager.processISNotetags1([null, this._data, $dataItems[unlockItemId]], 0);
 
-        
+		this._data.note += recipeString;
 
-        
-        itemIds.map(itemId=>DataManager.addSynthesisIngredient(this._data, "item "+itemId))
-       
-    }
+		itemIds.map((itemId) => DataManager.addSynthesisIngredient(this._data, `item ${itemId}`));
+	}
 
-    /** @description set a callback to be called when this item is used */
-    setCallback(cb){
-        this.cb = cb;
-    }
+	/** @description set a callback to be called when this item is used */
+	setCallback(cb) {
+		this.cb = cb;
+	}
 
-    spawn (){
-        MATTIE.items.runtimeItems.push(this);
-        $dataItems[this._data.id] = this._data;
-        DataManager.setCallbackOnItem(this._data.id,this.cb);
-    }
-
-    
-}
+ spawn() { + MATTIE.items.runtimeItems.push(this); + $dataItems[this._data.id] = this._data; + DataManager.setCallbackOnItem(this._data.id, this.cb); + } +}; + diff --git a/www/mods/commonLibs/docs/commonLibs__common_lodash.js.html b/www/mods/commonLibs/docs/commonLibs__common_lodash.js.html index f4ff6acc..52bff707 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_lodash.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_lodash.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/lodash.js - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_menus_cheatMenu.js.html b/www/mods/commonLibs/docs/commonLibs__common_menus_cheatMenu.js.html index 27895f92..758c3885 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_menus_cheatMenu.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_menus_cheatMenu.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/menus/cheatMenu - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_menus_mainMenu.js.html b/www/mods/commonLibs/docs/commonLibs__common_menus_mainMenu.js.html index 0c296077..6db479e5 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_menus_mainMenu.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_menus_mainMenu.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/menus/mainMenu. - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_menus_menu.js.html b/www/mods/commonLibs/docs/commonLibs__common_menus_menu.js.html index 4c8325e1..9a1f5a52 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_menus_menu.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_menus_menu.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/menus/menu.js - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_menus_scenes.js.html b/www/mods/commonLibs/docs/commonLibs__common_menus_scenes.js.html index f1074652..5e85b771 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_menus_scenes.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_menus_scenes.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/menus/scenes.js - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_menus_windows.js.html b/www/mods/commonLibs/docs/commonLibs__common_menus_windows.js.html index 0fba368a..75d0333f 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_menus_windows.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_menus_windows.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/menus/windows.j - +
@@ -136,6 +136,7 @@

Source: commonLibs/_common/menus/windows.j MATTIE.windows.TextDisplay.prototype.constructor = MATTIE.windows.TextDisplay; MATTIE.windows.TextDisplay.prototype.initialize = function (x, y, width, height, text) { + this.text = text; Window_Base.prototype.initialize.call(this, x, y, width, height); this.mattieWidth = width; this.resetTextColor(); @@ -155,6 +156,7 @@

Source: commonLibs/_common/menus/windows.j MATTIE.windows.TextDisplay.prototype.updateText = function (text) { this.contents.clear(); + this.text = text; if (typeof text === typeof 'string') { text += '\n'; text = text.split('\n'); diff --git a/www/mods/commonLibs/docs/commonLibs__common_saveProtector.js.html b/www/mods/commonLibs/docs/commonLibs__common_saveProtector.js.html index 0406c4f5..7a055895 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_saveProtector.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_saveProtector.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/saveProtector.j - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_seedRandom.js.html b/www/mods/commonLibs/docs/commonLibs__common_seedRandom.js.html index 32fa303b..c3f9a748 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_seedRandom.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_seedRandom.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/seedRandom.js - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_static.js.html b/www/mods/commonLibs/docs/commonLibs__common_static.js.html index 8e23fe10..523c1bc5 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_static.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_static.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/static.js - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_supporters.js.html b/www/mods/commonLibs/docs/commonLibs__common_supporters.js.html index 903de13e..c2d6d523 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_supporters.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_supporters.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/supporters.js - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_systemEvents.js.html b/www/mods/commonLibs/docs/commonLibs__common_systemEvents.js.html index 0169d42c..7c8cea63 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_systemEvents.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_systemEvents.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/systemEvents.js - +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_util.js.html b/www/mods/commonLibs/docs/commonLibs__common_util.js.html index 051f04d9..5c0c377c 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_util.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_util.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/util.js

- +
diff --git a/www/mods/commonLibs/docs/commonLibs__common_yanflyChecker.js.html b/www/mods/commonLibs/docs/commonLibs__common_yanflyChecker.js.html index 5798540d..2641b88a 100644 --- a/www/mods/commonLibs/docs/commonLibs__common_yanflyChecker.js.html +++ b/www/mods/commonLibs/docs/commonLibs__common_yanflyChecker.js.html @@ -51,7 +51,7 @@

Source: commonLibs/_common/yanflyChecker.j - +
diff --git a/www/mods/commonLibs/docs/devTools.js.html b/www/mods/commonLibs/docs/devTools.js.html index cf6e761d..0fa82f15 100644 --- a/www/mods/commonLibs/docs/devTools.js.html +++ b/www/mods/commonLibs/docs/devTools.js.html @@ -51,7 +51,7 @@

Source: devTools.js

- +
@@ -199,14 +199,33 @@

Source: devTools.js

} }; +/** + * @description force a specific prarm to be a specific value + * @param {Game_BattlerBase} target the target game battler + * @param {int} targetId the target paramid + * @param {int} val the value to set it to + */ +function forceParamValue(target, targetId, val) { + if (!target.prevParam) target.prevParam = target.param; + target.param = (id) => (id != targetId ? target.prevParam(id) : val); +} + +/** + * @description turn on god mode for an enemy (set parameters to 10,000) + * @param {Game_BattlerBase} enemy + */ +function targetedGodMode(enemy) { + if (!enemy.prevParam) enemy.prevParam = enemy.param; + enemy.param = () => 10000; + enemy.recoverAll(); +} + /** * @description set all character parameters to 10,000 */ function godMode() { $gameParty.members().forEach((member) => { - if (!member.prevParam) member.prevParam = member.param; - member.param = () => 10000; - member.recoverAll(); + targetedGodMode(member); }); } /** diff --git a/www/mods/commonLibs/docs/global.html b/www/mods/commonLibs/docs/global.html index cf7d54b4..77190ff6 100644 --- a/www/mods/commonLibs/docs/global.html +++ b/www/mods/commonLibs/docs/global.html @@ -49,7 +49,7 @@

Global

- +
@@ -330,7 +330,7 @@

@@ -390,6 +390,191 @@

+ + + + + + + + + + + + + + + + + + + + +
+ +

+ + forceParamValue(target, targetId, val) + + + + +

+ + + +
+
+ + +
+

force a specific prarm to be a specific value

+
+ + + + + + + + + +
+
Parameters:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
target + + +Game_BattlerBase + + + +

the target game battler

targetId + + +int + + + +

the target paramid

val + + +int + + + +

the value to set it to

+ +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + @@ -419,7 +604,7 @@

@@ -875,7 +1060,7 @@

@@ -935,6 +1120,145 @@

+ + + + + + + + + + +

+ + + + +
+ + + + +
+ +

+ + targetedGodMode(enemy) + + + + +

+ + + +
+
+ + +
+

turn on god mode for an enemy (set parameters to 10,000)

+
+ + + + + + + + + +
+
Parameters:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
enemy + + +Game_BattlerBase + + + +
+ +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + @@ -964,7 +1288,7 @@

@@ -1053,7 +1377,7 @@

@@ -1142,7 +1466,7 @@

@@ -1231,7 +1555,7 @@

@@ -1320,7 +1644,7 @@

@@ -1409,7 +1733,7 @@

@@ -1498,7 +1822,7 @@

diff --git a/www/mods/commonLibs/docs/index.html b/www/mods/commonLibs/docs/index.html index e9439b85..6aa34096 100644 --- a/www/mods/commonLibs/docs/index.html +++ b/www/mods/commonLibs/docs/index.html @@ -49,7 +49,7 @@

Home

- +
@@ -77,7 +77,8 @@

Home

Status

Documenation
Windows Installer
-Testcases

+Testcases
+Currently we rely on peerjs broker servers, so these must also be up: https://status.peerjs.com/ib0l

Mod Loader Features

-Abiltiy to toggle on and off any and all mods you have installed.
image

diff --git a/www/mods/commonLibs/docs/mattieFMModLoader.js.html b/www/mods/commonLibs/docs/mattieFMModLoader.js.html index a8aa0c6f..3f9c40a1 100644 --- a/www/mods/commonLibs/docs/mattieFMModLoader.js.html +++ b/www/mods/commonLibs/docs/mattieFMModLoader.js.html @@ -51,7 +51,7 @@

Source: mattieFMModLoader.js

- +
diff --git a/www/mods/commonLibs/docs/multiplayer.js.html b/www/mods/commonLibs/docs/multiplayer.js.html index 87e0d247..03a5650d 100644 --- a/www/mods/commonLibs/docs/multiplayer.js.html +++ b/www/mods/commonLibs/docs/multiplayer.js.html @@ -51,7 +51,7 @@

Source: multiplayer.js

- +
@@ -218,6 +218,12 @@

Source: multiplayer.js

return MATTIE.multiplayer.hostController; }; +/** + * @description check if this client has a net controller yet + * @returns {boolean} + */ +MATTIE.multiplayer.hasController = () => MATTIE.multiplayer.isClient || MATTIE.multiplayer.isHost; + (() => { MATTIE.menus.mainMenu.addBtnToMainMenu('Multiplayer', 'multiplayer', MATTIE.menus.multiplayer.openMultiplayer.bind(this)); // eslint-disable-next-line max-len diff --git a/www/mods/commonLibs/docs/randomiser.js.html b/www/mods/commonLibs/docs/randomiser.js.html index 27214365..2b48351e 100644 --- a/www/mods/commonLibs/docs/randomiser.js.html +++ b/www/mods/commonLibs/docs/randomiser.js.html @@ -51,7 +51,7 @@

Source: randomiser.js

- +
diff --git a/www/mods/commonLibs/docs/trepidationAndFamine.js.html b/www/mods/commonLibs/docs/trepidationAndFamine.js.html index 9abfadbb..f5bb3017 100644 --- a/www/mods/commonLibs/docs/trepidationAndFamine.js.html +++ b/www/mods/commonLibs/docs/trepidationAndFamine.js.html @@ -51,7 +51,7 @@

Source: trepidationAndFamine.js

- +
diff --git a/www/mods/commonLibs/docs/tutorial-about.html b/www/mods/commonLibs/docs/tutorial-about.html index 38ae4e21..3d8e20b8 100644 --- a/www/mods/commonLibs/docs/tutorial-about.html +++ b/www/mods/commonLibs/docs/tutorial-about.html @@ -49,7 +49,7 @@

Tutorial: What Is This Project

- +
diff --git a/www/mods/commonLibs/docs/tutorial-devSetup.html b/www/mods/commonLibs/docs/tutorial-devSetup.html index c91ab023..dc6107e9 100644 --- a/www/mods/commonLibs/docs/tutorial-devSetup.html +++ b/www/mods/commonLibs/docs/tutorial-devSetup.html @@ -49,7 +49,7 @@

Tutorial: Dev Onboarding

- +
diff --git a/www/mods/commonLibs/docs/tutorial-install.html b/www/mods/commonLibs/docs/tutorial-install.html index 696fecdc..dbb67ec3 100644 --- a/www/mods/commonLibs/docs/tutorial-install.html +++ b/www/mods/commonLibs/docs/tutorial-install.html @@ -49,7 +49,7 @@

Tutorial: INSTALL

- +
diff --git a/www/mods/commonLibs/docs/tutorial-overhaulMigration.html b/www/mods/commonLibs/docs/tutorial-overhaulMigration.html index 06fe19db..2df9666f 100644 --- a/www/mods/commonLibs/docs/tutorial-overhaulMigration.html +++ b/www/mods/commonLibs/docs/tutorial-overhaulMigration.html @@ -49,7 +49,7 @@

Tutorial: overhaulMigration

- +
diff --git a/www/mods/commonLibs/docs/tutorial-support.html b/www/mods/commonLibs/docs/tutorial-support.html index ade4d7cc..595a0aab 100644 --- a/www/mods/commonLibs/docs/tutorial-support.html +++ b/www/mods/commonLibs/docs/tutorial-support.html @@ -49,7 +49,7 @@

Tutorial: Support The Project

- +