From 0ab7abb47d195e09d640a49a01d2fe4d512ff0ae Mon Sep 17 00:00:00 2001 From: GitHub Actions - Prettier Date: Thu, 10 Oct 2024 18:21:47 +0000 Subject: [PATCH] Run Prettier --- src/core/kaplay/gameObjects/index.js | 21 ++++++++--------- src/core/kaplay/interactions/index.js | 6 ++--- src/factories/player.factory.js | 2 +- src/gameObjects/map_arcade/index.js | 2 +- .../map_arcade/jessie.gameObject.js | 4 ++-- src/gameObjects/map_arcade/npcsOnmap.js | 12 ++++++---- src/gameObjects/map_campus_house_1/index.js | 3 +-- src/gameObjects/map_city/index.js | 4 +--- src/gameObjects/map_city/npcsOnmap_city.js | 7 +++--- src/gameObjects/map_forest/index.js | 1 - src/gameObjects/map_forest_junction/index.js | 3 +-- src/gameObjects/map_start/bruno.gameObject.js | 5 +++- src/gameObjects/map_start/cake.gameObject.js | 1 - .../map_start/computer.gameObject.js | 5 +--- .../map_start/misterFu.gameObject.js | 4 ++-- .../map_start/npcsOnChairs.gameObject.js | 5 +--- ...randNpcsOnRestroomSinkCounch.gameObject.js | 9 +++----- .../tv_main_room_video.gameObject.js | 5 +--- .../map_start/ztmTrailer.gameObject.js | 5 +--- src/interactions/map_arcade/index.js | 2 +- src/interactions/map_campus_house_1/index.js | 2 +- src/interactions/map_city/index.js | 2 +- src/interactions/map_forest/index.js | 3 +-- src/interactions/map_forest_junction/index.js | 2 +- src/interactions/map_start/index.js | 2 +- src/main.js | 10 ++++---- src/player.controls.js | 2 +- src/scenes/arcade.js | 2 +- src/scenes/bootstrap.js | 23 ++++++++++--------- src/scenes/campus_house_1.js | 2 +- src/scenes/city.js | 2 +- src/scenes/forest.js | 2 +- src/scenes/forest_junction.js | 2 +- src/scenes/start.js | 3 +-- src/utils.js | 4 ++-- 35 files changed, 77 insertions(+), 92 deletions(-) diff --git a/src/core/kaplay/gameObjects/index.js b/src/core/kaplay/gameObjects/index.js index 519fae19..8ca6db31 100644 --- a/src/core/kaplay/gameObjects/index.js +++ b/src/core/kaplay/gameObjects/index.js @@ -1,17 +1,16 @@ import { k } from '../../../kplayCtx'; - export const addGameObjects = (gameObjects, map, spawnpoints) => { - return gameObjects.reduce((gameObjAcc, cb) => { - const temp = cb(k, map, spawnpoints); + return gameObjects.reduce((gameObjAcc, cb) => { + const temp = cb(k, map, spawnpoints); - if (Array.isArray(temp)) { - gameObjAcc.push(...temp); - return gameObjAcc; - } + if (Array.isArray(temp)) { + gameObjAcc.push(...temp); + return gameObjAcc; + } - gameObjAcc.push(temp); + gameObjAcc.push(temp); - return gameObjAcc; - }, []); -}; \ No newline at end of file + return gameObjAcc; + }, []); +}; diff --git a/src/core/kaplay/interactions/index.js b/src/core/kaplay/interactions/index.js index 957bdbc2..7e05c3b2 100644 --- a/src/core/kaplay/interactions/index.js +++ b/src/core/kaplay/interactions/index.js @@ -1,8 +1,8 @@ import { k } from '../../../kplayCtx'; export const attachInteractions = (interactions, gameObjTag) => { - const map = k.get('main_map')[0]; - const gameObj = k.get(gameObjTag)[0]; + const map = k.get('main_map')[0]; + const gameObj = k.get(gameObjTag)[0]; - interactions.forEach((cb) => cb(gameObj, k, map)); + interactions.forEach((cb) => cb(gameObj, k, map)); }; diff --git a/src/factories/player.factory.js b/src/factories/player.factory.js index af5f51af..d6dbd6ec 100644 --- a/src/factories/player.factory.js +++ b/src/factories/player.factory.js @@ -94,7 +94,7 @@ export function makePlayer(playerProps = {}, customScale = scaleFactor) { changePlayer, }, k.layer('player'), - 'player' + 'player', ]); return player; diff --git a/src/gameObjects/map_arcade/index.js b/src/gameObjects/map_arcade/index.js index b34879f8..bff73a9d 100644 --- a/src/gameObjects/map_arcade/index.js +++ b/src/gameObjects/map_arcade/index.js @@ -8,4 +8,4 @@ const gameObjects = [ jessie, ]; -export default gameObjects; \ No newline at end of file +export default gameObjects; diff --git a/src/gameObjects/map_arcade/jessie.gameObject.js b/src/gameObjects/map_arcade/jessie.gameObject.js index 4d196022..ccb9f208 100644 --- a/src/gameObjects/map_arcade/jessie.gameObject.js +++ b/src/gameObjects/map_arcade/jessie.gameObject.js @@ -22,8 +22,8 @@ export const jessie = (k, map, spawnpoints) => { k.body({ isStatic: true }), k.anchor('center'), k.pos( - map.pos.x + (spawnpoints.player.x / scaleFactor) - 60, - map.pos.y + (spawnpoints.player.y / scaleFactor) - 20 + map.pos.x + spawnpoints.player.x / scaleFactor - 60, + map.pos.y + spawnpoints.player.y / scaleFactor - 20 ), k.offscreen({ hide: true, distance: 10 }), 'jessie', diff --git a/src/gameObjects/map_arcade/npcsOnmap.js b/src/gameObjects/map_arcade/npcsOnmap.js index cd848cc2..b8e5b069 100644 --- a/src/gameObjects/map_arcade/npcsOnmap.js +++ b/src/gameObjects/map_arcade/npcsOnmap.js @@ -25,8 +25,8 @@ export const npcsInArcadeMap = (k, map, spawnpoints) => { const npc = makeNpc( obj.name, k.vec2( - (map.pos.x + obj.pos.x + xAdjust), - (map.pos.y + obj.pos.y + yAdjust) + map.pos.x + obj.pos.x + xAdjust, + map.pos.y + obj.pos.y + yAdjust ), npcDirection, 'map_arcade' @@ -66,9 +66,11 @@ export const npcsInArcadeMap = (k, map, spawnpoints) => { ]; // Generate NPCs - npcPatterns.forEach(({ patterns, adjustments, direction, flipX = false }) => { - createNpcsForPattern(patterns, adjustments, direction, flipX); - }); + npcPatterns.forEach( + ({ patterns, adjustments, direction, flipX = false }) => { + createNpcsForPattern(patterns, adjustments, direction, flipX); + } + ); return npcStore; }; diff --git a/src/gameObjects/map_campus_house_1/index.js b/src/gameObjects/map_campus_house_1/index.js index 2ff22df0..94f437b5 100644 --- a/src/gameObjects/map_campus_house_1/index.js +++ b/src/gameObjects/map_campus_house_1/index.js @@ -1,6 +1,5 @@ - const gameObjects = [ // Add more game objects here ]; -export default gameObjects; \ No newline at end of file +export default gameObjects; diff --git a/src/gameObjects/map_city/index.js b/src/gameObjects/map_city/index.js index a5c80ee8..814014bd 100644 --- a/src/gameObjects/map_city/index.js +++ b/src/gameObjects/map_city/index.js @@ -1,9 +1,7 @@ - import { npcsInCityMap } from './npcsOnmap_city'; const gameObjects = [ npcsInCityMap, // Add more game objects here - ]; -export default gameObjects; \ No newline at end of file +export default gameObjects; diff --git a/src/gameObjects/map_city/npcsOnmap_city.js b/src/gameObjects/map_city/npcsOnmap_city.js index e4f53466..a565c2c1 100644 --- a/src/gameObjects/map_city/npcsOnmap_city.js +++ b/src/gameObjects/map_city/npcsOnmap_city.js @@ -15,7 +15,8 @@ export const npcsInCityMap = (k, map, spawnpoints) => { patterns.some((pattern) => obj.tags.some((tag) => pattern.test(tag)) ) - ).splice(0, 1); + ) + .splice(0, 1); objects.forEach((obj) => { const { xAdjust, yAdjust } = adjustments; @@ -24,8 +25,8 @@ export const npcsInCityMap = (k, map, spawnpoints) => { const npc = makeNpc( obj.name, k.vec2( - (map.pos.x + obj.pos.x + xAdjust), - (map.pos.y + obj.pos.y + yAdjust) + map.pos.x + obj.pos.x + xAdjust, + map.pos.y + obj.pos.y + yAdjust ), npcDirection, 'map_city' diff --git a/src/gameObjects/map_forest/index.js b/src/gameObjects/map_forest/index.js index 84871c93..f33ef20f 100644 --- a/src/gameObjects/map_forest/index.js +++ b/src/gameObjects/map_forest/index.js @@ -1,4 +1,3 @@ - import { butterfly } from './butterfly.gameObject'; const gameObjects = [butterfly]; diff --git a/src/gameObjects/map_forest_junction/index.js b/src/gameObjects/map_forest_junction/index.js index 058cced7..9e5525bd 100644 --- a/src/gameObjects/map_forest_junction/index.js +++ b/src/gameObjects/map_forest_junction/index.js @@ -1,4 +1,3 @@ const gameObjects = []; - -export default gameObjects; \ No newline at end of file +export default gameObjects; diff --git a/src/gameObjects/map_start/bruno.gameObject.js b/src/gameObjects/map_start/bruno.gameObject.js index e1d05247..a8d1ce9f 100644 --- a/src/gameObjects/map_start/bruno.gameObject.js +++ b/src/gameObjects/map_start/bruno.gameObject.js @@ -21,7 +21,10 @@ export const bruno = (k, map, spawnpoints) => { }), k.body({ isStatic: true }), k.anchor('center'), - k.pos(spawnpoints.bruno.x / scaleFactor, spawnpoints.bruno.y / scaleFactor), + k.pos( + spawnpoints.bruno.x / scaleFactor, + spawnpoints.bruno.y / scaleFactor + ), k.scale(1.1), k.offscreen({ hide: true, distance: 10 }), 'bruno', diff --git a/src/gameObjects/map_start/cake.gameObject.js b/src/gameObjects/map_start/cake.gameObject.js index 565819be..6e0c255f 100644 --- a/src/gameObjects/map_start/cake.gameObject.js +++ b/src/gameObjects/map_start/cake.gameObject.js @@ -1,4 +1,3 @@ - export const cake = (k, map, spawnpoints) => { k.loadSprite('cake', './assets/sprites/cake.png'); diff --git a/src/gameObjects/map_start/computer.gameObject.js b/src/gameObjects/map_start/computer.gameObject.js index 37d610bb..44f4ba7f 100644 --- a/src/gameObjects/map_start/computer.gameObject.js +++ b/src/gameObjects/map_start/computer.gameObject.js @@ -13,10 +13,7 @@ export const computer = (k, map, spawnpoints) => { return k.make([ k.sprite('computer', { frame: 2 }), k.area(), - k.pos( - (tableRoom1.pos.x + 3), - (tableRoom1.pos.y + 23) - ), + k.pos(tableRoom1.pos.x + 3, tableRoom1.pos.y + 23), k.scale(0.7), k.body({ isStatic: true }), k.offscreen({ hide: true, distance: 10 }), diff --git a/src/gameObjects/map_start/misterFu.gameObject.js b/src/gameObjects/map_start/misterFu.gameObject.js index d2c642e9..edb548c5 100644 --- a/src/gameObjects/map_start/misterFu.gameObject.js +++ b/src/gameObjects/map_start/misterFu.gameObject.js @@ -22,8 +22,8 @@ export const misterFu = (k, map, spawnpoints) => { k.body({ isStatic: true }), k.anchor('center'), k.pos( - map.pos.x + (spawnpoints.player.x / scaleFactor) + 25, - map.pos.y + (spawnpoints.player.y / scaleFactor) - 20 + map.pos.x + spawnpoints.player.x / scaleFactor + 25, + map.pos.y + spawnpoints.player.y / scaleFactor - 20 ), k.offscreen({ hide: true, distance: 10 }), 'misterFu', diff --git a/src/gameObjects/map_start/npcsOnChairs.gameObject.js b/src/gameObjects/map_start/npcsOnChairs.gameObject.js index 2af23340..3cd6ad3a 100644 --- a/src/gameObjects/map_start/npcsOnChairs.gameObject.js +++ b/src/gameObjects/map_start/npcsOnChairs.gameObject.js @@ -19,10 +19,7 @@ export const npcsOnChairs = (k, map, spawnpoints) => { // createa npc for each chair const npc = makeNpc( chair.name, - k.vec2( - (map.pos.x + chair.pos.x + 8), - (map.pos.y + chair.pos.y + 12) - ), + k.vec2(map.pos.x + chair.pos.x + 8, map.pos.y + chair.pos.y + 12), 'idle-side', 'map_start' ); diff --git a/src/gameObjects/map_start/randNpcsOnRestroomSinkCounch.gameObject.js b/src/gameObjects/map_start/randNpcsOnRestroomSinkCounch.gameObject.js index 52d3d407..979b7fa4 100644 --- a/src/gameObjects/map_start/randNpcsOnRestroomSinkCounch.gameObject.js +++ b/src/gameObjects/map_start/randNpcsOnRestroomSinkCounch.gameObject.js @@ -15,8 +15,8 @@ const createNpcs = (k, map, pattern, positionAdjustments, npcStore) => { const npc = makeNpc( obj.name, k.vec2( - (map.pos.x + obj.pos.x + adjustX), - (map.pos.y + obj.pos.y + adjustY) + map.pos.x + obj.pos.x + adjustX, + map.pos.y + obj.pos.y + adjustY ), 'idle-side', 'map_start' @@ -49,10 +49,7 @@ export const randNpcsOnRestroomSinkCounch = (k, map, spawnpoints) => { for (const restroom of selectedRestrooms) { const npc = makeNpc( restroom.name, - k.vec2( - (map.pos.x + restroom.pos.x), - (map.pos.y + restroom.pos.y) - ), + k.vec2(map.pos.x + restroom.pos.x, map.pos.y + restroom.pos.y), 'idle-down', 'map_start' ); diff --git a/src/gameObjects/map_start/tv_main_room_video.gameObject.js b/src/gameObjects/map_start/tv_main_room_video.gameObject.js index da18db32..31a9e286 100644 --- a/src/gameObjects/map_start/tv_main_room_video.gameObject.js +++ b/src/gameObjects/map_start/tv_main_room_video.gameObject.js @@ -21,10 +21,7 @@ export const tvVideo = (k, map, spawnpoints) => { ), }), k.body(), - k.pos( - (tv_main_room.pos.x + 2), - (tv_main_room.pos.y + 13) - ), + k.pos(tv_main_room.pos.x + 2, tv_main_room.pos.y + 13), k.scale(0.7), k.body({ isStatic: true }), `tv_video`, diff --git a/src/gameObjects/map_start/ztmTrailer.gameObject.js b/src/gameObjects/map_start/ztmTrailer.gameObject.js index 2394ab9b..637a1db2 100644 --- a/src/gameObjects/map_start/ztmTrailer.gameObject.js +++ b/src/gameObjects/map_start/ztmTrailer.gameObject.js @@ -20,10 +20,7 @@ export const ztmTrailer = (k, map, spawnpoints) => { ), }), k.body(), - k.pos( - (monitorLobby.pos.x + 2), - (monitorLobby.pos.y + 9) - ), + k.pos(monitorLobby.pos.x + 2, monitorLobby.pos.y + 9), k.scale(0.8), k.body({ isStatic: true }), `anim_monitor_lobby`, diff --git a/src/interactions/map_arcade/index.js b/src/interactions/map_arcade/index.js index 2cd1aa3d..f2bfd2af 100644 --- a/src/interactions/map_arcade/index.js +++ b/src/interactions/map_arcade/index.js @@ -22,4 +22,4 @@ const interactions = [ interactionWithGameMachine11, ]; -export default interactions; \ No newline at end of file +export default interactions; diff --git a/src/interactions/map_campus_house_1/index.js b/src/interactions/map_campus_house_1/index.js index 1850a883..91c00370 100644 --- a/src/interactions/map_campus_house_1/index.js +++ b/src/interactions/map_campus_house_1/index.js @@ -7,4 +7,4 @@ const interactions = [ bedInteractions, ]; -export default interactions; \ No newline at end of file +export default interactions; diff --git a/src/interactions/map_city/index.js b/src/interactions/map_city/index.js index 1679449e..f5c69a14 100644 --- a/src/interactions/map_city/index.js +++ b/src/interactions/map_city/index.js @@ -28,4 +28,4 @@ const interactions = [ enterMapCampusHouse1Interaction, ]; -export default interactions; \ No newline at end of file +export default interactions; diff --git a/src/interactions/map_forest/index.js b/src/interactions/map_forest/index.js index 445b3224..726144d1 100644 --- a/src/interactions/map_forest/index.js +++ b/src/interactions/map_forest/index.js @@ -1,4 +1,3 @@ - import { enterMapForestJunctionInteraction } from './enterMapForestJunction.interactions'; import { interactionWithTree } from './tree.interactions'; import { interactionWithSwampyLog } from './swampyLog.interactions'; @@ -21,4 +20,4 @@ const interactions = [ interactionWithFirepit, ]; -export default interactions; \ No newline at end of file +export default interactions; diff --git a/src/interactions/map_forest_junction/index.js b/src/interactions/map_forest_junction/index.js index 37ae6604..530d82e2 100644 --- a/src/interactions/map_forest_junction/index.js +++ b/src/interactions/map_forest_junction/index.js @@ -13,4 +13,4 @@ const interactions = [ interactionWithMushroom, ]; -export default interactions; \ No newline at end of file +export default interactions; diff --git a/src/interactions/map_start/index.js b/src/interactions/map_start/index.js index 395f36d4..6fec3943 100644 --- a/src/interactions/map_start/index.js +++ b/src/interactions/map_start/index.js @@ -28,4 +28,4 @@ const interactions = [ interactionWithLocker, ]; -export default interactions; \ No newline at end of file +export default interactions; diff --git a/src/main.js b/src/main.js index f77f44ba..5bb86ae8 100644 --- a/src/main.js +++ b/src/main.js @@ -12,14 +12,16 @@ import { forestJunction } from './scenes/forest_junction'; import { campusHouse1 } from './scenes/campus_house_1'; import { bootstrap } from './scenes/bootstrap'; - k.scene('start', (enter_tag) => bootstrap(start, { enter_tag })); k.scene('city', (enter_tag) => bootstrap(city, { enter_tag })); k.scene('arcade', (enter_tag) => bootstrap(arcade, { enter_tag })); k.scene('forest', (enter_tag) => bootstrap(forest, { enter_tag })); -k.scene('forest_junction', (enter_tag) => bootstrap(forestJunction, { enter_tag })); -k.scene('campus_house_1', (enter_tag) => bootstrap(campusHouse1, { enter_tag })); - +k.scene('forest_junction', (enter_tag) => + bootstrap(forestJunction, { enter_tag }) +); +k.scene('campus_house_1', (enter_tag) => + bootstrap(campusHouse1, { enter_tag }) +); k.go('start'); diff --git a/src/player.controls.js b/src/player.controls.js index 0bf6822d..ff539a25 100644 --- a/src/player.controls.js +++ b/src/player.controls.js @@ -65,7 +65,7 @@ export const addPlayerControls = (player) => { pressed.size === 1 ? player.speed : // Dot product for diagonal movement 45% - player.speed * 0.707106781188095; // 1 / sqrt(2) + player.speed * 0.707106781188095; // 1 / sqrt(2) player.move(moveDir.unit().scale(speed)); }); diff --git a/src/scenes/arcade.js b/src/scenes/arcade.js index e8e6a0d1..b1026cdc 100644 --- a/src/scenes/arcade.js +++ b/src/scenes/arcade.js @@ -21,5 +21,5 @@ export async function arcade() { k.vec2(29, 11) ); - return [map, spawnpoint, gameObjects, interactions] + return [map, spawnpoint, gameObjects, interactions]; } diff --git a/src/scenes/bootstrap.js b/src/scenes/bootstrap.js index 42bcaf0b..e1161f2b 100644 --- a/src/scenes/bootstrap.js +++ b/src/scenes/bootstrap.js @@ -6,19 +6,20 @@ import { getGameState } from '../utils/gameState'; import { addPlayerControls } from './../player.controls'; export async function bootstrap(bootMapCb, mapArgs) { + const gameState = getGameState(); + const player = makePlayer(gameState.player); - const gameState = getGameState(); - const player = makePlayer(gameState.player); + const [map, spawnpoint, gameObjects, interactions] = await bootMapCb(); - const [map, spawnpoint, gameObjects, interactions] = await bootMapCb(); + player.pos = + (mapArgs?.enter_tag && spawnpoint[mapArgs?.enter_tag]) || + spawnpoint.player; - player.pos = (mapArgs?.enter_tag && spawnpoint[mapArgs?.enter_tag]) || spawnpoint.player; + k.add(map); + k.add(player); + k.canvas.focus(); - k.add(map); - k.add(player); - k.canvas.focus(); - - addPlayerControls(player); - addGameObjects(gameObjects, map, spawnpoint).forEach((obj) => map.add(obj)); - attachInteractions(interactions, 'player'); + addPlayerControls(player); + addGameObjects(gameObjects, map, spawnpoint).forEach((obj) => map.add(obj)); + attachInteractions(interactions, 'player'); } diff --git a/src/scenes/campus_house_1.js b/src/scenes/campus_house_1.js index 4c03e59b..208d39bd 100644 --- a/src/scenes/campus_house_1.js +++ b/src/scenes/campus_house_1.js @@ -18,5 +18,5 @@ export async function campusHouse1() { './maps/map_campus_house_1.json' ); - return [map, spawnpoint, gameObjects, interactions] + return [map, spawnpoint, gameObjects, interactions]; } diff --git a/src/scenes/city.js b/src/scenes/city.js index 7a166e65..420e5f10 100644 --- a/src/scenes/city.js +++ b/src/scenes/city.js @@ -19,5 +19,5 @@ export async function city() { './maps/map_city.json' ); - return [map, spawnpoint, gameObjects, interactions] + return [map, spawnpoint, gameObjects, interactions]; } diff --git a/src/scenes/forest.js b/src/scenes/forest.js index d48c404d..ae1b89df 100644 --- a/src/scenes/forest.js +++ b/src/scenes/forest.js @@ -18,5 +18,5 @@ export async function forest() { './maps/map_forest.json' ); - return [map, spawnpoint, gameObjects, interactions] + return [map, spawnpoint, gameObjects, interactions]; } diff --git a/src/scenes/forest_junction.js b/src/scenes/forest_junction.js index a6a2393a..740cb043 100644 --- a/src/scenes/forest_junction.js +++ b/src/scenes/forest_junction.js @@ -18,5 +18,5 @@ export async function forestJunction() { './maps/map_forest_junction.json' ); - return [map, spawnpoint, gameObjects, interactions] + return [map, spawnpoint, gameObjects, interactions]; } diff --git a/src/scenes/start.js b/src/scenes/start.js index e49506e1..1daa396e 100644 --- a/src/scenes/start.js +++ b/src/scenes/start.js @@ -3,7 +3,6 @@ import { k } from '../kplayCtx'; import gameObjects from '../gameObjects/map_start'; import interactions from '../interactions/map_start'; - export async function start() { const objectConfig = { static: [ @@ -22,5 +21,5 @@ export async function start() { k.vec2(0, 11) ); - return [map, spawnpoint, gameObjects, interactions] + return [map, spawnpoint, gameObjects, interactions]; } diff --git a/src/utils.js b/src/utils.js index ae723e1a..00725019 100644 --- a/src/utils.js +++ b/src/utils.js @@ -37,7 +37,7 @@ export async function displayDialogue({ player, characterName, text, - onDisplayEnd = () => { }, + onDisplayEnd = () => {}, }) { const dialogUI = document.getElementById('textbox-container'); const dialog = document.getElementById('dialog'); @@ -98,7 +98,7 @@ export async function displayPermissionBox({ k, player, text, - onDisplayEnd = () => { }, + onDisplayEnd = () => {}, }) { const dialogUI = document.getElementById('textbox-container'); const dialog = document.getElementById('dialog');