Merge branch 'main' into feature/add-mage-object-hose-1

zero-to-mastery · Oct 11, 2024 · 0f16506 · 0f16506
2 parents 839ba56 + db79ea6
commit 0f16506
Show file tree

Hide file tree

Showing 23 changed files with 346 additions and 495 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "project",
   "homepage": "https://zero-to-mastery.github.io/ZTM-Quest",
   "private": true,
-  "version": "1.0.0",
+  "version": "0.4.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -19,9 +19,9 @@
     "globals": "^15.9.0",
     "prettier": "^3.3.3",
     "terser": "^5.32.0",
-    "vite": "^5.4.1"
+    "vite": "^5.4.8"
   },
   "dependencies": {
-    "kaplay": "^3001.0.0-beta.1"
+    "kaplay": "^3001.0.0-beta.2"
   }
 }
diff --git a/public/maps/map_arcade.json b/public/maps/map_arcade.json
@@ -567,7 +567,7 @@
          "name":"map_sprites",
          "opacity":1,
          "type":"group",
-         "visible":false,
+         "visible":true,
          "x":0,
          "y":0
         }, 
@@ -1297,13 +1297,13 @@
                 {
                  "height":13.5,
                  "id":105,
-                 "name":"game_machine_12",
+                 "name":"game_machine_13",
                  "rotation":0,
                  "type":"",
                  "visible":true,
                  "width":10.5,
-                 "x":106.916666666667,
-                 "y":163.25
+                 "x":105.916666666667,
+                 "y":117.5
                 }, 
                 {
                  "height":6.75,
@@ -1382,6 +1382,17 @@
                  "width":21.2727272727273,
                  "x":253.212121212121,
                  "y":272.727272727273
+                }, 
+                {
+                 "height":13.5,
+                 "id":114,
+                 "name":"game_machine_12",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":10.5,
+                 "x":109,
+                 "y":162.75
                 }],
          "opacity":1,
          "properties":[
@@ -1391,7 +1402,7 @@
                  "value":true
                 }],
          "type":"objectgroup",
-         "visible":false,
+         "visible":true,
          "x":0,
          "y":0
         }, 
@@ -1437,7 +1448,7 @@
          "y":0
         }],
  "nextlayerid":24,
- "nextobjectid":114,
+ "nextobjectid":115,
  "orientation":"orthogonal",
  "renderorder":"right-down",
  "tiledversion":"1.11.0",

diff --git a/src/gameObjects/map_arcade/npcsOnmap.js b/src/gameObjects/map_arcade/npcsOnmap.js
@@ -59,7 +59,7 @@ export const npcsInArcadeMap = (k, map, spawnpoints) => {
             direction: 'idle-up',
         },
         {
-            patterns: [/painting_/],
+            patterns: [/painting_near_game_machine_10/],
             adjustments: { xAdjust: 35, yAdjust: 25 },
             direction: 'idle-up',
         },

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/.../map_arcade/game_machine_1.intercation.js → ...map_arcade/game_machine_1.interactions.js b/.../map_arcade/game_machine_1.intercation.js → ...map_arcade/game_machine_1.interactions.js
@@ -165,73 +165,7 @@ function startNumberGuessingGame(k) {
 
     k.go('numberGuessing');
 }
-
-function injectCSS() {
-    const style = document.createElement('style');
-    style.innerHTML = `
-    #custom-prompt {
-        display: none;
-        position: fixed;
-        top: 0;
-        left: 0;
-        width: 100vw;
-        height: 100vh;
-        background-color: rgba(0, 0, 0, 0.6);
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        z-index: 1000;
-    }
-
-    #prompt-message {
-        font-size: 1.5rem;
-        color: white;
-        text-align: center;
-        margin-bottom: 20px;
-    }
-
-    #options-container {
-        display: flex;
-        justify-content: center;
-        gap: 10px;
-    }
-
-    .option-btn {
-        padding: 10px 20px;
-        background-color: #007BFF;
-        color: white;
-        border: none;
-        border-radius: 5px;
-        font-size: 1.2rem;
-        cursor: pointer;
-        transition: background-color 0.3s ease;
-    }
-
-    .option-btn:hover {
-        background-color: #0056b3;
-    }
-
-    .option-btn:focus {
-        outline: none;
-        box-shadow: 0 0 5px 2px rgba(0, 123, 255, 0.8);
-    }
-
-    @media (max-width: 600px) {
-        #options-container {
-            flex-direction: column;
-        }
-
-        .option-btn {
-            width: 100%;
-            text-align: center;
-        }
-    }
-    `;
-    document.head.appendChild(style);
-}
-
 function showCustomPrompt(message, options, callback) {
-    injectCSS(); // Inject the CSS styles
     document.getElementById('prompt-message').textContent = message;
     const optionsContainer = document.getElementById('options-container');
     optionsContainer.innerHTML = '';