diff --git a/src/gameObjects/map_arcade/index.js b/src/gameObjects/map_arcade/index.js index c1666db4..1ec2abc3 100644 --- a/src/gameObjects/map_arcade/index.js +++ b/src/gameObjects/map_arcade/index.js @@ -1,5 +1,9 @@ +import { storeMainAreaInteraction } from '../map_city/enterStoreMainArea.interaction'; +import { enterMapCityInteraction } from './enterMapCity.interactions'; const gameObjects = [ // Add more game objects here + storeMainAreaInteraction, + interactionWithArcadeArea ]; export const addGameObjects = (k, map, spawnpoints) => { diff --git a/src/interactions/map_arcade/index.js b/src/interactions/map_arcade/index.js index 5e7e7633..5d8d764d 100644 --- a/src/interactions/map_arcade/index.js +++ b/src/interactions/map_arcade/index.js @@ -1,16 +1,13 @@ +import { storeMainAreaInteraction } from '../map_city/enterStoreMainArea.interaction'; import { enterMapCityInteraction } from './enterMapCity.interactions'; -import { interactionWithGameMachine2 } from './game_machine_2.interactions'; -import { interactionWithGameMachine4 } from './game_machine_4.interactions'; -import { interactionWithGameMachine6 } from './game_machine_6.interactions'; const interactions = [ enterMapCityInteraction, // Add more interactions here - - // new interaction + storeMainAreaInteraction, + interactionWithArcadeArea, interactionWithGameMachine2, - interactionWithGameMachine4, - interactionWithGameMachine6, + interactionWithGameMachine6 ]; export const attachInteractions = (gameObj, k) => { diff --git a/src/interactions/map_city/enterMapArcade.interactions.js b/src/interactions/map_city/enterMapArcade.interactions.js deleted file mode 100644 index 157dbdb7..00000000 --- a/src/interactions/map_city/enterMapArcade.interactions.js +++ /dev/null @@ -1,7 +0,0 @@ -export const enterMapArcadeInteraction = (player, k) => { - player.onCollide('enter_map_arcade', () => { - import('../../scenes/arcade').then((_) => { - k.go('arcade'); - }); - }); -}; diff --git a/src/interactions/map_city/enterStoreMainArea.interaction.js b/src/interactions/map_city/enterStoreMainArea.interaction.js new file mode 100644 index 00000000..a87ce9ea --- /dev/null +++ b/src/interactions/map_city/enterStoreMainArea.interaction.js @@ -0,0 +1,41 @@ +import { displayDialogue } from '../../utils'; +import { sampleStoreInteraction, sampleArcadeInteraction } from './enterMapArcade.interactions'; + +//player interaction logic with arcade +function sampleArcadeInteraction() { + // sample of coins balance + var coinBal = 1000; + + return 'You have ${coinBal} coins to spend'; + +}; + +//player interaction logic with store +export const sampleStoreInteraction = () => { + // sample of coins balance + var coinBal = 1000; + + return 'You have ${coinBal} coins to spend'; + +}; + +//shows what happens when player is in arcade +export const storeMainAreaInteraction = (player, k, map) => { + //if user runs into the arcade, show them the balance + player.onCollide('enter_map_arcade', () => { + player.isInDialog = true; + displayDialogue(sampleStoreInteraction(), () => { + player.isInDialog = false; + }); + + + }); +}; + +player.onCollide('tiny_house_top_left_door', () => { + player.isInDialog = true; + displayDialogue(sampleTinyHouseInteraction(), () => { //sampleTinyHouseInteraction needs building + player.isInDialog = false; + }); + +}); diff --git a/src/interactions/map_start/index.js b/src/interactions/map_start/index.js index e250cc36..30e5ef3d 100644 --- a/src/interactions/map_start/index.js +++ b/src/interactions/map_start/index.js @@ -1,12 +1,10 @@ import { interactionWithBruno } from './bruno.interaction'; -import { enterMapCityLeftInteraction } from './enterMapCityLeft.interaction'; -import { enterMapCityRightInteraction } from './enterMapCityRight.interactions'; +import { enterMapCityInteraction } from './enterMapCity.interaction'; import { interactionWithMainboxMainArea } from './mailboxMainArea.interaction'; import { restroomInteractions } from './restroom.interactions'; import { interactionWithComputer } from './computer.interaction'; import { interactionWithJokeTeller } from './jokeTeller.interaction'; import { interactionWithDrinksMachine } from './drink_machine.interaction'; - import { interactionWithMisterFu } from './misterFu.interaction'; import { interactionWithTV } from './tv_main_room.interaction'; import { interactionWithCake } from './cake.interaction'; @@ -15,17 +13,17 @@ import { interactionWithLocker } from './locker.interaction'; const interactions = [ restroomInteractions, interactionWithBruno, - enterMapCityLeftInteraction, - enterMapCityRightInteraction, + enterMapCityInteraction, interactionWithMainboxMainArea, interactionWithComputer, + // Add more interactions here + interactionWithStoreMainArea, interactionWithJokeTeller, interactionWithDrinksMachine, - // Add more interactions here interactionWithMisterFu, interactionWithTV, interactionWithCake, - interactionWithLocker, + interactionWithLocker ]; export const attachInteractions = (gameObj, k) => {