Skip to content

Commit

Permalink
tempp
Browse files Browse the repository at this point in the history
  • Loading branch information
mattieFM committed Dec 8, 2023
1 parent 3ec4c38 commit 1ccdbbc
Show file tree
Hide file tree
Showing 156 changed files with 2,851 additions and 17,248 deletions.
31 changes: 17 additions & 14 deletions www/mods/commonLibs/_common/API_CORE/troopAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/-_.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

20 changes: 16 additions & 4 deletions www/mods/commonLibs/docs/-_multiplayer_hostMenu.js.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/-_multiplayer_joinMenu.js.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/-_multiplayer_lobby.js.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions www/mods/commonLibs/docs/-_multiplayer_scaleing.js.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/Asset.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/CORE_API.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/GameEmitter.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/HostController.html

Large diffs are not rendered by default.

91 changes: 90 additions & 1 deletion www/mods/commonLibs/docs/Input.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.DataManager.global.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.DataManager.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.GameInfo.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

1,768 changes: 96 additions & 1,672 deletions www/mods/commonLibs/docs/MATTIE.actorAPI.Data_Actor.html

Large diffs are not rendered by default.

1,140 changes: 42 additions & 1,098 deletions www/mods/commonLibs/docs/MATTIE.actorAPI.Data_Actor_Wrapper.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.actorAPI.Data_Class.html

Large diffs are not rendered by default.

442 changes: 1 addition & 441 deletions www/mods/commonLibs/docs/MATTIE.actorAPI.html

Large diffs are not rendered by default.

91 changes: 1 addition & 90 deletions www/mods/commonLibs/docs/MATTIE.bbgirlAPI.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.betterSaves.config.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.betterSaves.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.clipboard.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.compat.html

Large diffs are not rendered by default.

637 changes: 3 additions & 634 deletions www/mods/commonLibs/docs/MATTIE.eventAPI.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.fxAPI.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.global.html

Large diffs are not rendered by default.

42 changes: 41 additions & 1 deletion www/mods/commonLibs/docs/MATTIE.html

Large diffs are not rendered by default.

198 changes: 197 additions & 1 deletion www/mods/commonLibs/docs/MATTIE.infoAPI.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.itemAPI.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.menus.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.menus.mainMenu.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

850 changes: 49 additions & 801 deletions www/mods/commonLibs/docs/MATTIE.msgAPI.html

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions www/mods/commonLibs/docs/MATTIE.multiplayer.config.html

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions www/mods/commonLibs/docs/MATTIE.multiplayer.config.scaling.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.randomiser.config.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.randomiser.html

Large diffs are not rendered by default.

170 changes: 170 additions & 0 deletions www/mods/commonLibs/docs/MATTIE.sceneOverlapAPI.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.scenes.Scene_DevItems.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.scenes.Scene_Misc.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.scenes.base.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.scenes.emptyScroll.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.scenes.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.static.actors.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.static.commands.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.static.commonEvents.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.static.events.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.static.events.images.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.static.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.static.items.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.static.maps.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.static.rpg.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.static.skills.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.static.states.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.static.switch.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.static.variable.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

208 changes: 2 additions & 206 deletions www/mods/commonLibs/docs/MATTIE.troopAPI.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/MATTIE.unstuckAPI.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions www/mods/commonLibs/docs/MATTIE.windows.List.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions www/mods/commonLibs/docs/MATTIE.windows.TextDisplay.html

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions www/mods/commonLibs/docs/MATTIE.windows.TextInput.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions www/mods/commonLibs/docs/MATTIE.windows.html

Large diffs are not rendered by default.

12,351 changes: 550 additions & 11,801 deletions www/mods/commonLibs/docs/MapEvent.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/Math.seedrandom.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/Mod.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/ModManager.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/betterSaves.js.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/bossRushOfTheEndless.js.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/commonLibs__common.js.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

140 changes: 140 additions & 0 deletions www/mods/commonLibs/docs/commonLibs__common_API_CORE_inputAPI.js.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

346 changes: 167 additions & 179 deletions www/mods/commonLibs/docs/commonLibs__common_items.js.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/commonLibs__common_lodash.js.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/commonLibs__common_static.js.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/commonLibs__common_util.js.html

Large diffs are not rendered by default.

Large diffs are not rendered by default.

27 changes: 23 additions & 4 deletions www/mods/commonLibs/docs/devTools.js.html

Large diffs are not rendered by default.

346 changes: 335 additions & 11 deletions www/mods/commonLibs/docs/global.html

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions www/mods/commonLibs/docs/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/mattieFMModLoader.js.html

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion www/mods/commonLibs/docs/multiplayer.js.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/randomiser.js.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/trepidationAndFamine.js.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/tutorial-about.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/tutorial-devSetup.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/tutorial-install.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/tutorial-overhaulMigration.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/mods/commonLibs/docs/tutorial-support.html

Large diffs are not rendered by default.

0 comments on commit 1ccdbbc

Please sign in to comment.