Merge branch 'main' into add-ball-interaction

Author: r4pt0s

public/maps/map_city.json

@@ -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,

src/gameObjects/map_city/npcsOnmap_city.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/interactions/map_city/boundaryBurgerBar.interaction.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/snackBars.interactions.js

@@ -4,21 +4,22 @@ import { purchaseItem } from '../../utils/coinsUpdate';
 import { interactionHandler } from '../handler.interactions';
 
 export const snackBarGreenInteraction = (player, k) => {
-    interactionHandler(player, 'snack_bar_green', k, async () => {
+    interactionHandler(player, 'snack_bar_green_1', k, async () => {
         let ztmSnackDecision = await displayPermissionBox({
             k,
             player,
             text: [
                 'Welcome to Snack Bar Green! Ready to go from zero to snack mastery?',
             ],
+            purchaseCost: 15,
         });
 
         if (ztmSnackDecision) {
-            k.debug.log(
-                'Congratulations! You’ve mastered the art of snacking, ZTM style!'
-            );
             const purchaseStatus = purchaseItem(k, 15, 25);
             if (purchaseStatus === 'purchased') {
+                k.debug.log(
+                    'Congratulations! You’ve mastered the art of snacking, ZTM style!'
+                );
                 updateAchievements('Food enthusiast', 'Snack Bar Green');
             }
         } else {
@@ -28,14 +29,15 @@ export const snackBarGreenInteraction = (player, k) => {
                 text: [
                     'Are you sure? The path to snack mastery is only one bite away...',
                 ],
+                purchaseCost: 15,
             });
 
             if (secondSnackChance) {
-                k.debug.log(
-                    'Great choice! You’re on your way to becoming a Snack Sensei!'
-                );
                 const purchaseStatus = purchaseItem(k, 15, 25);
                 if (purchaseStatus === 'purchased') {
+                    k.debug.log(
+                        'Great choice! You’re on your way to becoming a Snack Sensei!'
+                    );
                     updateAchievements('Food enthusiast', 'Snack Bar Green');
                 }
             } else {
@@ -55,14 +57,15 @@ export const snackBarRedInteraction = (player, k) => {
             text: [
                 'Welcome to Snack Bar Red! The *real* masters of snacking... Unlike *ahem* some green wannabes across the street. Ready for the best snack experience?',
             ],
+            purchaseCost: 15,
         });
 
         if (snackOffer) {
-            k.debug.log(
-                'Excellent choice! You clearly have superior taste. Snack Bar Green can’t compete!'
-            );
             const purchaseStatus = purchaseItem(k, 15, 24);
             if (purchaseStatus === 'purchased') {
+                k.debug.log(
+                    'Excellent choice! You clearly have superior taste. Snack Bar Green can’t compete!'
+                );
                 updateAchievements('Food enthusiast', 'Snack Bar Red');
             }
         } else {
@@ -72,14 +75,15 @@ export const snackBarRedInteraction = (player, k) => {
                 text: [
                     'Are you sure? Don’t tell me you’re thinking of going to *that* green place... Their snacks are... well, let’s just say "unimpressive."',
                 ],
+                purchaseCost: 15,
             });
 
             if (changeMind) {
-                k.debug.log(
-                    'Wise move! Snack Bar Red – where the real snack mastery happens!'
-                );
                 const purchaseStatus = purchaseItem(k, 15, 24);
                 if (purchaseStatus === 'purchased') {
+                    k.debug.log(
+                        'Wise move! Snack Bar Red – where the real snack mastery happens!'
+                    );
                     updateAchievements('Food enthusiast', 'Snack Bar Red');
                 }
             } else {
@@ -99,14 +103,15 @@ export const snackBarStreetInteraction = (player, k) => {
             text: [
                 'Psst! You look hungry! How about a snack? It’s a secret recipe!',
             ],
+            purchaseCost: 15,
         });
 
         if (snackDecision) {
-            k.debug.log(
-                'Yum! You just ate the best mystery snack of your life!'
-            );
             const purchaseStatus = purchaseItem(k, 15, 24);
             if (purchaseStatus === 'purchased') {
+                k.debug.log(
+                    'Yum! You just ate the best mystery snack of your life!'
+                );
                 updateAchievements('Food enthusiast', 'Snack Bar Street');
             }
         } else {
@@ -116,14 +121,15 @@ export const snackBarStreetInteraction = (player, k) => {
                 text: [
                     'Are you sure? It’s low calorie and totally NOT haunted! Still no?',
                 ],
+                purchaseCost: 15,
             });
 
             if (secondChance) {
-                k.debug.log(
-                    'Ah, there we go! Enjoy your... totally normal snack.'
-                );
                 const purchaseStatus = purchaseItem(k, 15, 24);
                 if (purchaseStatus === 'purchased') {
+                    k.debug.log(
+                        'Ah, there we go! Enjoy your... totally normal snack.'
+                    );
                     updateAchievements('Food enthusiast', 'Snack Bar Street');
                 }
             } else {

src/interactions/map_city/stalls.interaction.js

@@ -11,14 +11,15 @@ export const stall1Interaction = (player, k) => {
             text: [
                 '🎉 Welcome to Stall 1! Our secret ingredient is... a sprinkle of **joy**! Ready to snack like a champ?',
             ],
+            purchaseCost: 20,
         });
 
         if (stall1Offer) {
-            k.debug.log(
-                '🚀 Awesome choice! Here’s your snack – made with love and just a hint of magic!'
-            );
             const purchaseStatus = purchaseItem(k, 20, 30);
             if (purchaseStatus === 'purchased') {
+                k.debug.log(
+                    '🚀 Awesome choice! Here’s your snack – made with love and just a hint of magic!'
+                );
                 updateAchievements('Food enthusiast', 'Snack Stall 1');
             }
         } else {
@@ -28,14 +29,15 @@ export const stall1Interaction = (player, k) => {
                 text: [
                     '🤔 Are you absolutely sure? Our snacks are scientifically proven to elevate your happiness levels! Or do you prefer sadness-flavored snacks?',
                 ],
+                purchaseCost: 20,
             });
 
             if (secondChance) {
-                k.debug.log(
-                    '😋 Yass! You’re now part of the snack elite! Enjoy your crispy delight!'
-                );
                 const purchaseStatus = purchaseItem(k, 20, 30);
                 if (purchaseStatus === 'purchased') {
+                    k.debug.log(
+                        '😋 Yass! You’re now part of the snack elite! Enjoy your crispy delight!'
+                    );
                     updateAchievements('Food enthusiast', 'Snack Stall 1');
                 }
             } else {
@@ -55,14 +57,15 @@ export const stall2Interaction = (player, k) => {
             text: [
                 '🎊 Ahoy! Welcome to Stall 2! We don’t just sell snacks; we sell **memories**! Care to join the flavor revolution?',
             ],
+            purchaseCost: 20,
         });
 
         if (stall2Offer) {
-            k.debug.log(
-                '🌈 Fantastic! Here’s a snack that might just change your life! Or at least your lunch!'
-            );
             const purchaseStatus = purchaseItem(k, 20, 28);
             if (purchaseStatus === 'purchased') {
+                k.debug.log(
+                    '🌈 Fantastic! Here’s a snack that might just change your life! Or at least your lunch!'
+                );
                 updateAchievements('Food enthusiast', 'Snack Stall 2');
             }
         } else {
@@ -72,14 +75,15 @@ export const stall2Interaction = (player, k) => {
                 text: [
                     '🚫 Wait a minute! Are you really about to miss the chance to munch on greatness? Don’t you want to be a snack legend?',
                 ],
+                purchaseCost: 20,
             });
 
             if (secondThoughts) {
-                k.debug.log(
-                    '🌟 You’ve made the right call! Enjoy the epic flavors of Stall 2! Snack on, my friend!'
-                );
                 const purchaseStatus = purchaseItem(k, 20, 28);
                 if (purchaseStatus === 'purchased') {
+                    k.debug.log(
+                        '🌟 You’ve made the right call! Enjoy the epic flavors of Stall 2! Snack on, my friend!'
+                    );
                     updateAchievements('Food enthusiast', 'Snack Stall 2');
                 }
             } else {

src/interactions/map_start/drink_machine.interaction.js

@@ -9,21 +9,26 @@ export const interactionWithDrinksMachine = (player, k, map) => {
         // Trigger the custom prompt when the player collides with the drinks machine
         showCustomPrompt(
             'What would you like to drink?', // Prompt message
-            ['Coke', 'Soda', 'Water', 'Sprite'], // Options
+            [
+                'Coke (8 coins)',
+                'Soda (8 coins)',
+                'Water (5 coins)',
+                'Sprite (8 coins)',
+            ], // Options
             (selectedOption) => {
                 // Callback when an option is selected
                 // Logic based on the selected option
                 const texts = {
-                    Coke: [
+                    'Coke (8 coins)': [
                         'Coke - "Taste the Feeling!" A cold refreshment is coming your way!',
                     ],
-                    Soda: [
+                    'Soda (8 coins)': [
                         'Soda - "Fizz up your life!" Time for some sparkling fun!',
                     ],
-                    Water: [
+                    'Water (5 coins)': [
                         'Water - "Pure as the mountain stream." Stay hydrated and fresh!',
                     ],
-                    Sprite: [
+                    'Sprite (8 coins)': [
                         'Sprite - "Obey Your Thirst!" Crisp and refreshing as ever!',
                     ],
                 };

src/utils.js

@@ -122,6 +122,7 @@ export async function displayPermissionBox({
     player,
     text,
     onDisplayEnd = () => {},
+    purchaseCost,
 }) {
     time.paused = true;
     player.state.isInDialog = true;
@@ -132,7 +133,10 @@ export async function displayPermissionBox({
     const statsUI = document.getElementById('stats-container');
     const miniMapUI = document.getElementById('minimap');
     closeBtn.innerHTML = 'No';
-    nextBtn.innerHTML = 'Yes';
+    nextBtn.innerHTML =
+        purchaseCost !== undefined
+            ? `Yes (${purchaseCost} coin${purchaseCost !== 1 ? 's' : ''})`
+            : 'Yes';
     statsUI.style.display = 'none';
     miniMapUI.style.display = 'none';
     dialogUI.style.display = 'block';