From c5c811b690324375d8428e096d8cf286eeb6dba3 Mon Sep 17 00:00:00 2001
From: Ihliana <Ihnatco@protonmail.com>
Date: Wed, 2 Oct 2024 14:17:04 +0200
Subject: [PATCH 1/2] Adding misterFu game object

---
 package-lock.json                             |  7 +++-
 package.json                                  |  3 +-
 src/gameObjects/map_start/index.js            |  3 ++
 .../map_start/misterFu.gameObject.js          | 33 +++++++++++++++++++
 4 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 src/gameObjects/map_start/misterFu.gameObject.js

diff --git a/package-lock.json b/package-lock.json
index 452cacec..1a1856f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,8 @@
       "name": "project",
       "version": "1.0.0",
       "dependencies": {
-        "kaplay": "^3001.0.0-beta.1"
+        "kaplay": "^3001.0.0-beta.1",
+        "project": "file:"
       },
       "devDependencies": {
         "@eslint/js": "^9.11.1",
@@ -1814,6 +1815,10 @@
         "url": "https://github.com/prettier/prettier?sponsor=1"
       }
     },
+    "node_modules/project": {
+      "resolved": "",
+      "link": true
+    },
     "node_modules/punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
diff --git a/package.json b/package.json
index e54027c6..fb9f44bc 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "vite": "^5.4.1"
   },
   "dependencies": {
-    "kaplay": "^3001.0.0-beta.1"
+    "kaplay": "^3001.0.0-beta.1",
+    "project": "file:"
   }
 }
diff --git a/src/gameObjects/map_start/index.js b/src/gameObjects/map_start/index.js
index 7ad75589..f1855b5b 100644
--- a/src/gameObjects/map_start/index.js
+++ b/src/gameObjects/map_start/index.js
@@ -4,6 +4,8 @@ import { npcsOnChairs } from './npcsOnChairs.gameObject';
 import { ztmTrailer } from './ztmTrailer.gameObject';
 import { computer } from './computer.gameObject';
 
+import { misterFu } from './misterFu.gameObject';
+
 const gameObjects = [
     bruno,
     npcsOnChairs,
@@ -11,6 +13,7 @@ const gameObjects = [
     computer,
     cake,
     // Add more game objects here
+    misterFu,
 ];
 
 export const addGameObjects = (k, map, spawnpoints) => {
diff --git a/src/gameObjects/map_start/misterFu.gameObject.js b/src/gameObjects/map_start/misterFu.gameObject.js
new file mode 100644
index 00000000..23e5db12
--- /dev/null
+++ b/src/gameObjects/map_start/misterFu.gameObject.js
@@ -0,0 +1,33 @@
+import { scaleFactor } from '../../constants';
+
+export const misterFu = (k, map, spawnpoints) => {
+    k.loadSprite('misterFu', './misterFu.png', {
+        sliceX: 9,
+        sliceY: 1,
+        anims: {
+            'idle-down': 0,
+            'walk-down': { from: 3, to: 4, loop: true, speed: 4 },
+            'idle-side': 2,
+            'walk-side': { from: 7, to: 8, loop: true, speed: 4 },
+            'idle-up': 1,
+            'walk-up': { from: 5, to: 26, loop: true, speed: 4 },
+        },
+    });
+
+    const misterFuObj = k.make([
+        k.sprite('misterFu', { anim: 'idle-down' }),
+        k.area({
+            shape: new k.Rect(k.vec2(0), 16, 16),
+        }),
+        k.body({ isStatic: true }),
+        k.anchor('center'),
+        k.pos(
+            map.pos.x + spawnpoints.misterFu.x,
+            map.pos.y + spawnpoints.misterFu.y
+        ),
+        k.scale(scaleFactor + 0.5),
+        'misterFu',
+    ]);
+
+    return misterFuObj;
+};

From 707da95d0c5f72c41a82d2d9eed336b4cc220de3 Mon Sep 17 00:00:00 2001
From: Ihliana <Ihnatco@protonmail.com>
Date: Thu, 3 Oct 2024 13:15:57 +0200
Subject: [PATCH 2/2] removing mistakes

---
 src/gameObjects/map_start/index.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gameObjects/map_start/index.js b/src/gameObjects/map_start/index.js
index ae90dfa7..9a3827a6 100644
--- a/src/gameObjects/map_start/index.js
+++ b/src/gameObjects/map_start/index.js
@@ -3,13 +3,12 @@ import { cake } from './cake.gameObject';
 import { npcsOnChairs } from './npcsOnChairs.gameObject';
 import { ztmTrailer } from './ztmTrailer.gameObject';
 import { computer } from './computer.gameObject';
-<<<<<<< HEAD
 
 import { misterFu } from './misterFu.gameObject';
 
-=======
+
 import { jokeTellerNPC } from './jokeTellerNPC.gameObject';
->>>>>>> 512ce3f3184bdde96d1833cf9540cc3559345b00
+
 const gameObjects = [
     bruno,
     npcsOnChairs,