From 7e7b3854469a4e32e2401a9b96ebee779f6daf62 Mon Sep 17 00:00:00 2001 From: poschuler Date: Thu, 10 Oct 2024 15:38:21 -0500 Subject: [PATCH] fix: change object location and iteraction --- src/gameObjects/map_campus_house_1/computer.gameObject.js | 6 +++--- .../map_campus_house_1/computer.interaction.js | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/gameObjects/map_campus_house_1/computer.gameObject.js b/src/gameObjects/map_campus_house_1/computer.gameObject.js index c3c190c..5ae341b 100644 --- a/src/gameObjects/map_campus_house_1/computer.gameObject.js +++ b/src/gameObjects/map_campus_house_1/computer.gameObject.js @@ -18,11 +18,11 @@ export const computer = (k, map, spawnpoints) => { k.sprite('computer', { frame: 4 }), k.area(), k.pos( - (tableWidth + diningRoomTable.pos.x - 20) * scaleFactor, - (tableHeight + diningRoomTable.pos.y - 20) * scaleFactor + tableWidth + diningRoomTable.pos.x - 20, + tableHeight + diningRoomTable.pos.y - 20 ), k.body({ isStatic: true }), - k.scale(scaleFactor - 0.7), + k.scale(scaleFactor * 0.4), k.offscreen({ hide: true, distance: 10 }), 'computer', ]); diff --git a/src/interactions/map_campus_house_1/computer.interaction.js b/src/interactions/map_campus_house_1/computer.interaction.js index 641b6e0..b459330 100644 --- a/src/interactions/map_campus_house_1/computer.interaction.js +++ b/src/interactions/map_campus_house_1/computer.interaction.js @@ -27,12 +27,14 @@ const options = [ ]; export const computerInteractions = async (player, k, map) => { + const [computer] = map.query({ include: 'computer' }); + player.onCollide('computer', async () => { const energyUI = document.getElementById('energy-container'); energyUI.style.display = 'none'; - const [computer] = k.query({ include: 'computer' }); - computer.play('on'); + player.isInDialog = true; + computer.play('on'); showCustomPrompt(challengeText, options, async (selectedOption) => { const response = []; @@ -65,7 +67,6 @@ export const computerInteractions = async (player, k, map) => { player.onCollideEnd('computer', () => { const energyUI = document.getElementById('energy-container'); energyUI.style.display = 'flex'; - const [computer] = k.query({ include: 'computer' }); computer.play('off'); }); };