Merge branch 'main' into pleomorph-map_campus_house_1

zero-to-mastery · Oct 11, 2024 · f25f347 · f25f347
2 parents c8839ed + 148b2f7
commit f25f347
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git 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),
-            (tableHeight + diningRoomTable.pos.y - 20)
+            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
@@ -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');
     });
 };