Merge branch 'main' of https://github.com/zero-to-mastery/ZTM-Quest

Author: Karine91

public/assets/sprites/flashdrive.png

@@ -2762,7 +2762,7 @@
                  "y":591.594703333333
                 }, 
                 {
-                 "height":6.47251215874179,
+                 "height":9.14406044557266,
                  "id":400,
                  "name":"campus_house_door_1",
                  "rotation":0,
@@ -2819,7 +2819,7 @@
                 {
                  "height":21.1875,
                  "id":405,
-                 "name":"snack_bar_green",
+                 "name":"snack_bar_green_1",
                  "rotation":0,
                  "type":"",
                  "visible":true,
@@ -2841,7 +2841,7 @@
                 {
                  "height":25,
                  "id":407,
-                 "name":"snack_bar_green",
+                 "name":"snack_bar_green_2",
                  "rotation":0,
                  "type":"",
                  "visible":true,
@@ -3477,28 +3477,6 @@
                  "x":923,
                  "y":295.466
                 }, 
-                {
-                 "height":24.1818,
-                 "id":434,
-                 "name":"boundary_park_bench",
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":3.81818,
-                 "x":594.432,
-                 "y":215.534
-                }, 
-                {
-                 "height":23.6364,
-                 "id":435,
-                 "name":"boundary_park_bench",
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":3.27273,
-                 "x":634.614,
-                 "y":215.898
-                }, 
                 {
                  "height":14.25,
                  "id":436,

public/maps/map_city.json

@@ -3,6 +3,7 @@ import { flyingBirds } from './flyingBirds';
 import { npcsInCityMap } from './npcsOnmap_city';
 import { soccerBall } from './soccerBall.gameObject';
 import { americanFootball } from './americanFootball.gameObject';
+import { jessica } from './jessica.gameObject';
 
 const gameObjects = [
     npcsInCityMap,
@@ -11,6 +12,7 @@ const gameObjects = [
     flyingBirds,
     soccerBall,
     americanFootball,
+    jessica,
 ];
 
 export default gameObjects;

src/gameObjects/map_city/index.js

@@ -0,0 +1,31 @@
+import { scaleFactor } from '../../constants';
+
+const characterRow = 17;
+const sliceX = 10;
+const sliceY = 20;
+const spritePosition = (characterRow - 1) * sliceX;
+
+export const jessica = (k, map, spawnpoints) => {
+    k.loadSprite('jessica', './assets/sprites/characters.png', {
+        sliceX: sliceX,
+        sliceY: sliceY,
+        anims: {
+            'idle-down': spritePosition + 0,
+        },
+    });
+
+    const jessicaObj = k.make([
+        k.sprite('jessica', { 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 + 390, map.pos.y + 520),
+        k.scale(scaleFactor * 0.5),
+        k.offscreen({ hide: true, distance: 10 }),
+        'jessica',
+    ]);
+
+    return jessicaObj;
+};

src/gameObjects/map_city/jessica.gameObject.js

@@ -39,12 +39,17 @@ export const npcsInCityMap = (k, map, spawnpoints) => {
     // Define patterns and their corresponding adjustments
     const npcPatterns = [
         {
-            patterns: [/stall_/],
+            patterns: [/stall_1/],
             adjustments: { xAdjust: 12, yAdjust: 18 },
             direction: 'idle-down',
         },
         {
-            patterns: [/snack_bar_/],
+            patterns: [/stall_2/],
+            adjustments: { xAdjust: 12, yAdjust: 18 },
+            direction: 'idle-down',
+        },
+        {
+            patterns: [/snack_bar_green_1/],
             adjustments: { xAdjust: 12, yAdjust: 18 },
             direction: 'idle-down',
         },

src/gameObjects/map_city/npcsOnmap_city.js

@@ -0,0 +1,18 @@
+export const flashDrive = (k, map, spawnpoints) => {
+    k.loadSprite('flashDrive', './assets/sprites/flashdrive.png');
+
+    const flashDriveObj = k.make([
+        k.sprite('flashDrive'),
+        k.area({
+            shape: new k.Rect(k.vec2(0), 16, 16),
+        }),
+        k.body({ isStatic: true }),
+        k.anchor('center'),
+        k.pos(map.pos.x + 52, map.pos.y + 150),
+        k.scale(0.5),
+        k.offscreen({ hide: true, distance: 10 }),
+        'flashDrive',
+    ]);
+
+    return flashDriveObj;
+};

src/gameObjects/map_forest/flashdrive.gameObject.js

@@ -1,5 +1,6 @@
 import { butterfly } from './butterfly.gameObject';
+import { flashDrive } from './flashdrive.gameObject';
 
-const gameObjects = [butterfly];
+const gameObjects = [butterfly, flashDrive];
 
 export default gameObjects;

src/gameObjects/map_forest/index.js

@@ -8,12 +8,13 @@ export const boundaryBurgerBarInteraction = (player, k) => {
             k,
             player,
             text: ['Hello! Would you like a burger?'],
+            purchaseCost: 25,
         });
 
         if (wantBurger) {
-            k.debug.log('Enjoy your burger!'); //testing purposes you may uncomment it or add displayPermission box your wish
             const purchaseStatus = purchaseItem(k, 25, 40);
             if (purchaseStatus === 'purchased') {
+                k.debug.log('Enjoy your burger!'); //testing purposes you may uncomment it or add displayPermission box your wish
                 updateAchievements('Food enthusiast', 'Burger Store');
             }
         } else {

src/interactions/map_city/boundaryBurgerBar.interaction.js

@@ -16,6 +16,8 @@ import { enterMapSeasideInteraction } from './enterMapSeasideInteraction.interac
 import { enterMapExtendedCampus } from './enterMapExtendedCampus.interactions';
 import { enterMapExtendedCampusTop } from './enterMapExtendCampusTop.interactions';
 import { interactionWithBin } from './bin.interaction';
+import { jessicaInteraction } from './jessica.interation';
+import { interactionWithSoccerBall } from './soccerBall.interaction';
 
 const interactions = [
     enterMapArcadeInteraction,
@@ -36,6 +38,8 @@ const interactions = [
     // Add more interactions here
     enterMapCampusHouse1Interaction,
     interactionWithBin,
+    jessicaInteraction,
+    interactionWithSoccerBall,
 ];
 
 export default interactions;

src/interactions/map_city/index.js

@@ -0,0 +1,15 @@
+import { interactionHandler } from '../handler.interactions';
+import { displayDialogue } from '../../utils';
+
+export const jessicaInteraction = (player, k) => {
+    interactionHandler(player, 'jessica', k, async () => {
+        await displayDialogue({
+            k,
+            player,
+            characterName: 'Jessica',
+            text: [
+                "Hi, I'm Jessica! I'm learning Javascript! It's a lot of work, but I'm excited to get better at it.",
+            ],
+        });
+    });
+};