From b7a9874dbca46234b587241e424c31f4f07d6f61 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Mon, 18 Dec 2023 17:02:32 +0100 Subject: [PATCH 001/138] Map rename --- .../{Map1.scene => MapRiverCrossing.scene} | 4 ++-- .../scenes/{Map1.ts => MapRiverCrossing.ts} | 4 ++-- .../game/scenes/PreloadProbableWaffle.ts | 22 +++++++++---------- .../game/world/const/game-config.ts | 16 +++++++------- .../asset-pack-probable-waffle.json | 4 ++-- .../{tiles.json => river_crossing.json} | 0 .../{tiles.tmx => river_crossing.tmx} | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) rename apps/client/src/app/probable-waffle/game/scenes/{Map1.scene => MapRiverCrossing.scene} (99%) rename apps/client/src/app/probable-waffle/game/scenes/{Map1.ts => MapRiverCrossing.ts} (99%) rename apps/client/src/assets/probable-waffle/tilemaps/{tiles.json => river_crossing.json} (100%) rename apps/client/src/metadata/probable-waffle/tilemaps/{tiles.tmx => river_crossing.tmx} (98%) diff --git a/apps/client/src/app/probable-waffle/game/scenes/Map1.scene b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene similarity index 99% rename from apps/client/src/app/probable-waffle/game/scenes/Map1.scene rename to apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene index 94dfbdd7..b5cc2511 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/Map1.scene +++ b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene @@ -7,7 +7,7 @@ "autoImport": true, "preloadPackFiles": [], "createMethodName": "editorCreate", - "sceneKey": "Map1", + "sceneKey": "MapRiverCrossing", "compilerOutputLanguage": "TYPE_SCRIPT", "borderWidth": 1280, "borderHeight": 720 @@ -1160,4 +1160,4 @@ "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 } -} \ No newline at end of file +} diff --git a/apps/client/src/app/probable-waffle/game/scenes/Map1.ts b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts similarity index 99% rename from apps/client/src/app/probable-waffle/game/scenes/Map1.ts rename to apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts index 4e1b28e6..2d45898a 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/Map1.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts @@ -58,9 +58,9 @@ import ActorContainer from "../entity/actor/ActorContainer"; import { AnimatedTilemap } from "./AnimatedTile"; /* END-USER-IMPORTS */ -export default class Map1 extends Phaser.Scene { +export default class MapRiverCrossing extends Phaser.Scene { constructor() { - super("Map1"); + super("MapRiverCrossing"); /* START-USER-CTR-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.ts b/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.ts index bbad3367..9a551a90 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.ts @@ -2,15 +2,15 @@ /* START OF COMPILED CODE */ -import Phaser from 'phaser'; -import PreloadBarUpdaterScript from '../../../other/Template/script-nodes/PreloadBarUpdaterScript'; +import Phaser from "phaser"; +import PreloadBarUpdaterScript from "../../../other/Template/script-nodes/PreloadBarUpdaterScript"; /* START-USER-IMPORTS */ -import assetPackUrl from '../../../../assets/probable-waffle/asset-packers/asset-pack-probable-waffle.json'; +import assetPackUrl from "../../../../assets/probable-waffle/asset-packers/asset-pack-probable-waffle.json"; /* END-USER-IMPORTS */ export default class PreloadProbableWaffle extends Phaser.Scene { constructor() { - super('PreloadProbableWaffle'); + super("PreloadProbableWaffle"); /* START-USER-CTR-CODE */ // Write your code here. @@ -19,7 +19,7 @@ export default class PreloadProbableWaffle extends Phaser.Scene { editorCreate(): void { // guapen - const guapen = this.add.image(505.0120544433594, 360, 'guapen'); + const guapen = this.add.image(505.0120544433594, 360, "guapen"); guapen.scaleX = 0.32715486817515643; guapen.scaleY = 0.32715486817515643; @@ -39,11 +39,11 @@ export default class PreloadProbableWaffle extends Phaser.Scene { progressBarBg.isStroked = true; // loadingText - const loadingText = this.add.text(552.0120849609375, 329, '', {}); - loadingText.text = 'Loading...'; - loadingText.setStyle({ color: '#e0e0e0', fontFamily: 'arial', fontSize: '20px' }); + const loadingText = this.add.text(552.0120849609375, 329, "", {}); + loadingText.text = "Loading..."; + loadingText.setStyle({ color: "#e0e0e0", fontFamily: "arial", fontSize: "20px" }); - this.events.emit('scene-awake'); + this.events.emit("scene-awake"); } /* START-USER-CODE */ @@ -53,11 +53,11 @@ export default class PreloadProbableWaffle extends Phaser.Scene { preload() { this.editorCreate(); - this.load.pack('asset-pack', assetPackUrl as any); + this.load.pack("asset-pack", assetPackUrl as any); } create() { - this.scene.start('Map1'); + this.scene.start("MapRiverCrossing"); } /* END-USER-CODE */ diff --git a/apps/client/src/app/probable-waffle/game/world/const/game-config.ts b/apps/client/src/app/probable-waffle/game/world/const/game-config.ts index 24891338..620fb089 100644 --- a/apps/client/src/app/probable-waffle/game/world/const/game-config.ts +++ b/apps/client/src/app/probable-waffle/game/world/const/game-config.ts @@ -1,16 +1,16 @@ -import { environment } from '../../../../../environments/environment'; -import { Types } from 'phaser'; -import { baseGameConfig } from '../../../../shared/game/base-game.config'; -import Map1 from "../../scenes/Map1"; +import { environment } from "../../../../../environments/environment"; +import { Types } from "phaser"; +import { baseGameConfig } from "../../../../shared/game/base-game.config"; +import MapRiverCrossing from "../../scenes/MapRiverCrossing"; import PreloadProbableWaffle from "../../scenes/PreloadProbableWaffle"; -import {Boot} from "../../scenes/Boot"; +import { Boot } from "../../scenes/Boot"; export const probableWaffleGameConfig: Types.Core.GameConfig = { ...baseGameConfig, // scene: [GrasslandScene, PlaygroundScene], - scene: [Boot, PreloadProbableWaffle, Map1], + scene: [Boot, PreloadProbableWaffle, MapRiverCrossing], physics: { - default: 'arcade', + default: "arcade", arcade: { fps: 60, gravity: { y: 0 }, @@ -18,5 +18,5 @@ export const probableWaffleGameConfig: Types.Core.GameConfig = { } }, pixelArt: true, - backgroundColor: '#222' + backgroundColor: "#222" }; diff --git a/apps/client/src/assets/probable-waffle/asset-packers/asset-pack-probable-waffle.json b/apps/client/src/assets/probable-waffle/asset-packers/asset-pack-probable-waffle.json index 8ca7538c..1fde73b3 100644 --- a/apps/client/src/assets/probable-waffle/asset-packers/asset-pack-probable-waffle.json +++ b/apps/client/src/assets/probable-waffle/asset-packers/asset-pack-probable-waffle.json @@ -313,8 +313,8 @@ "key": "slingshot_female_walk" }, { - "url": "assets/probable-waffle/tilemaps/tiles.json", - "path": "assets/probable-waffle/tilemaps/tiles.json", + "url": "assets/probable-waffle/tilemaps/river_crossing.json", + "path": "assets/probable-waffle/tilemaps/river_crossing.json", "type": "tilemapTiledJSON", "key": "tiles" }, diff --git a/apps/client/src/assets/probable-waffle/tilemaps/tiles.json b/apps/client/src/assets/probable-waffle/tilemaps/river_crossing.json similarity index 100% rename from apps/client/src/assets/probable-waffle/tilemaps/tiles.json rename to apps/client/src/assets/probable-waffle/tilemaps/river_crossing.json diff --git a/apps/client/src/metadata/probable-waffle/tilemaps/tiles.tmx b/apps/client/src/metadata/probable-waffle/tilemaps/river_crossing.tmx similarity index 98% rename from apps/client/src/metadata/probable-waffle/tilemaps/tiles.tmx rename to apps/client/src/metadata/probable-waffle/tilemaps/river_crossing.tmx index b80e644a..7a1209e3 100644 --- a/apps/client/src/metadata/probable-waffle/tilemaps/tiles.tmx +++ b/apps/client/src/metadata/probable-waffle/tilemaps/river_crossing.tmx @@ -1,7 +1,7 @@ - + From 554393ee97ad8b45eb2449985f78a12a5100dbc6 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Mon, 18 Dec 2023 17:04:06 +0100 Subject: [PATCH 002/138] Map adjustment --- .../game/scenes/MapRiverCrossing.scene | 217 ++---------------- .../game/scenes/MapRiverCrossing.ts | 92 +------- 2 files changed, 19 insertions(+), 290 deletions(-) diff --git a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene index b5cc2511..2853e0a0 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene +++ b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene @@ -644,8 +644,8 @@ "y" ], "label": "tree_2", - "x": -304, - "y": 1040 + "x": -912, + "y": 848 }, { "prefabId": "ec58b20e-e04f-4bd4-8401-856efe433f36", @@ -655,8 +655,8 @@ "y" ], "label": "tree1", - "x": -448, - "y": 1200 + "x": -1184, + "y": 832 }, { "prefabId": "ec58b20e-e04f-4bd4-8401-856e1e433f36", @@ -666,8 +666,8 @@ "y" ], "label": "tree_3", - "x": -256, - "y": 1168 + "x": -896, + "y": 1056 }, { "prefabId": "ec58b20e-e04f-4bd4-8401-851ffe433f31", @@ -677,8 +677,8 @@ "y" ], "label": "treeTrunk_1", - "x": -384, - "y": 1200 + "x": -784, + "y": 880 }, { "prefabId": "ec58b20e-e04f-4bd4-8401-856efe433f30", @@ -721,8 +721,8 @@ "y" ], "label": "bushDry_1", - "x": -368, - "y": 1136 + "x": -1072, + "y": 944 }, { "prefabId": "ec58b20e-e04f-4bd4-8401-856ffe433f26", @@ -787,8 +787,8 @@ "y" ], "label": "bushDry_4", - "x": -80, - "y": 1072 + "x": -1024, + "y": 768 }, { "prefabId": "ec58b20e-e04f-4bd4-8401-856efe433f30", @@ -812,197 +812,6 @@ "x": -592, "y": 512 }, - { - "prefabId": "ec58b20e-e04f-4bd4-140f-856ffe433f22", - "id": "6e604eff-f979-479b-9b0e-4d48adf80f33", - "unlock": [ - "x", - "y" - ], - "label": "blockObsidian2", - "x": -1248, - "y": 640 - }, - { - "prefabId": "ec58b20e-e03f-4bd4-140e-856ffe433f25", - "id": "59df8861-9ffd-4d29-b9de-b3bdd35b320b", - "unlock": [ - "x", - "y" - ], - "label": "blockObsidian1", - "x": -1280, - "y": 656 - }, - { - "prefabId": "ec58b20e-e03f-4bd4-140e-856ffe433f25", - "id": "56ef28c7-c5b8-4b5e-86de-9215cc845daa", - "unlock": [ - "x", - "y" - ], - "label": "blockObsidian", - "x": -1248, - "y": 672 - }, - { - "prefabId": "ec58b20e-e04f-4bd4-140f-856ffe433f22", - "id": "4082867b-97ca-413b-aac2-a974144bc4d6", - "unlock": [ - "x", - "y" - ], - "label": "blockObsidian_1", - "x": -1312, - "y": 672 - }, - { - "prefabId": "ec58b20e-e04f-4bd4-140f-856ffe433f22", - "id": "b15b7931-4294-4077-b20f-947ba8eac60b", - "unlock": [ - "x", - "y" - ], - "label": "blockObsidian_3", - "x": -1344, - "y": 688 - }, - { - "prefabId": "ec58b20e-e03f-4bd4-140e-856ffe433f25", - "id": "37143707-273a-4983-803f-1bc5e99d0447", - "unlock": [ - "x", - "y" - ], - "label": "blockObsidian_2", - "x": -1296, - "y": 704 - }, - { - "prefabId": "ec58b20e-e03f-4bd4-140e-856ffe433f25", - "id": "9950edac-796a-412d-b9bd-9e7d9cb9dfb9", - "unlock": [ - "x", - "y" - ], - "label": "blockObsidian_5", - "x": -1376, - "y": 704 - }, - { - "prefabId": "ec58b20e-e03f-4bd4-140e-856ffe433f25", - "id": "7e8b7c3b-3201-4488-af0f-f575ca7bb04f", - "unlock": [ - "x", - "y" - ], - "label": "blockObsidian_4", - "x": -1344, - "y": 720 - }, - { - "prefabId": "ec58b20e-e03e-4bd4-140e-156ffe433f29", - "id": "c2cb02f7-9aab-45d6-96b0-2a25aec4f327", - "unlock": [ - "x", - "y" - ], - "label": "blockObsidianLava5", - "x": -1376, - "y": 736 - }, - { - "prefabId": "ec58b20e-e03e-4bd4-140e-156ffe433f27", - "id": "64f3d20d-eefb-4036-a698-92b58c89fca9", - "unlock": [ - "x", - "y", - "z" - ], - "label": "blockObsidianLava3", - "z": 32, - "x": -1408, - "y": 688 - }, - { - "prefabId": "ec58b20e-e03f-4bd4-140e-856ffe433f25", - "id": "df96bc37-9abb-496e-b8c2-c9911373ee2c", - "unlock": [ - "x", - "y" - ], - "label": "blockObsidian_7", - "x": -1440, - "y": 736 - }, - { - "prefabId": "ec58b20e-e03f-4bd4-140e-856ffe433f25", - "id": "37ede123-5a35-4fa5-8658-0e94d93976a0", - "unlock": [ - "x", - "y", - "z" - ], - "label": "blockObsidian_6", - "z": 32, - "x": -1440, - "y": 704 - }, - { - "prefabId": "ec58b20e-e03e-4bd4-140e-156ffe433f25", - "id": "22be42be-5e03-4d50-b7a0-3f5c5d5abea1", - "unlock": [ - "x", - "y" - ], - "label": "blockObsidianLava1", - "x": -1408, - "y": 752 - }, - { - "prefabId": "ec58b20e-e03f-4bd4-140e-856ffe433f25", - "id": "fb8b68e6-93f7-4371-85ac-5616732a0a9f", - "unlock": [ - "x", - "y" - ], - "label": "blockObsidian_8", - "x": -1472, - "y": 752 - }, - { - "prefabId": "ec58b20e-e04f-4bd4-140f-856ffe433f22", - "id": "48ac226b-afd5-41d1-b63a-357393b0a232", - "unlock": [ - "x", - "y" - ], - "label": "blockObsidian_9", - "x": -1440, - "y": 768 - }, - { - "prefabId": "ec58b20e-e03e-4bd4-140e-156ffe433f26", - "id": "eed9763a-d9c1-4b02-a9bf-ab8b067baee3", - "unlock": [ - "x", - "y" - ], - "label": "blockObsidianLava2", - "x": -1408, - "y": 784 - }, - { - "prefabId": "ec58b20e-e03f-4bd4-140e-856ffe433f25", - "id": "54fc667e-ee9c-4097-864a-7e551d3ae7be", - "unlock": [ - "x", - "y" - ], - "label": "blockObsidian_10", - "x": -1440, - "y": 800 - }, { "prefabId": "ec58b20e-e04f-4bd4-140e-856ffe433f21", "id": "7c34cacb-c700-4622-87d3-8663631f755d", @@ -1160,4 +969,4 @@ "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 } -} +} \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts index 2d45898a..f1863a27 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts @@ -44,12 +44,6 @@ import Tree1 from "../prefabs/outside/foliage/trees/resources/Tree1"; import BushDry from "../prefabs/outside/foliage/bushes/BushDry"; import BushUpwardsSmall from "../prefabs/outside/foliage/bushes/BushUpwardsSmall"; import WorkMill from "../prefabs/buildings/tivara/WorkMill"; -import BlockObsidian2 from "../prefabs/outside/nature/block_obsidian/BlockObsidian2"; -import BlockObsidian1 from "../prefabs/outside/nature/block_obsidian/BlockObsidian1"; -import BlockObsidianLava5 from "../prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava5"; -import BlockObsidianLava3 from "../prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava3"; -import BlockObsidianLava1 from "../prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava1"; -import BlockObsidianLava2 from "../prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava2"; import BlockStoneWater1 from "../prefabs/outside/nature/block_stone_water/BlockStoneWater1"; import BlockStoneWater4 from "../prefabs/outside/nature/block_stone_water/BlockStoneWater4"; import BlockStoneWater3 from "../prefabs/outside/nature/block_stone_water/BlockStoneWater3"; @@ -292,19 +286,19 @@ export default class MapRiverCrossing extends Phaser.Scene { this.add.existing(tree_1); // tree_2 - const tree_2 = new Tree4(this, -304, 1040); + const tree_2 = new Tree4(this, -912, 848); this.add.existing(tree_2); // tree1 - const tree1 = new Tree1(this, -448, 1200); + const tree1 = new Tree1(this, -1184, 832); this.add.existing(tree1); // tree_3 - const tree_3 = new Tree4(this, -256, 1168); + const tree_3 = new Tree4(this, -896, 1056); this.add.existing(tree_3); // treeTrunk_1 - const treeTrunk_1 = new TreeTrunk(this, -384, 1200); + const treeTrunk_1 = new TreeTrunk(this, -784, 880); this.add.existing(treeTrunk_1); // tree_4 @@ -320,7 +314,7 @@ export default class MapRiverCrossing extends Phaser.Scene { this.add.existing(bushDry); // bushDry_1 - const bushDry_1 = new BushDry(this, -368, 1136); + const bushDry_1 = new BushDry(this, -1072, 944); this.add.existing(bushDry_1); // bushDry_2 @@ -344,7 +338,7 @@ export default class MapRiverCrossing extends Phaser.Scene { this.add.existing(bushUpwardsSmall_1); // bushDry_4 - const bushDry_4 = new BushDry(this, -80, 1072); + const bushDry_4 = new BushDry(this, -1024, 768); this.add.existing(bushDry_4); // tree @@ -355,74 +349,6 @@ export default class MapRiverCrossing extends Phaser.Scene { const workMill = new WorkMill(this, -592, 512); this.add.existing(workMill); - // blockObsidian2 - const blockObsidian2 = new BlockObsidian2(this, -1248, 640); - this.add.existing(blockObsidian2); - - // blockObsidian1 - const blockObsidian1 = new BlockObsidian1(this, -1280, 656); - this.add.existing(blockObsidian1); - - // blockObsidian - const blockObsidian = new BlockObsidian1(this, -1248, 672); - this.add.existing(blockObsidian); - - // blockObsidian_1 - const blockObsidian_1 = new BlockObsidian2(this, -1312, 672); - this.add.existing(blockObsidian_1); - - // blockObsidian_3 - const blockObsidian_3 = new BlockObsidian2(this, -1344, 688); - this.add.existing(blockObsidian_3); - - // blockObsidian_2 - const blockObsidian_2 = new BlockObsidian1(this, -1296, 704); - this.add.existing(blockObsidian_2); - - // blockObsidian_5 - const blockObsidian_5 = new BlockObsidian1(this, -1376, 704); - this.add.existing(blockObsidian_5); - - // blockObsidian_4 - const blockObsidian_4 = new BlockObsidian1(this, -1344, 720); - this.add.existing(blockObsidian_4); - - // blockObsidianLava5 - const blockObsidianLava5 = new BlockObsidianLava5(this, -1376, 736); - this.add.existing(blockObsidianLava5); - - // blockObsidianLava3 - const blockObsidianLava3 = new BlockObsidianLava3(this, -1408, 688); - this.add.existing(blockObsidianLava3); - - // blockObsidian_7 - const blockObsidian_7 = new BlockObsidian1(this, -1440, 736); - this.add.existing(blockObsidian_7); - - // blockObsidian_6 - const blockObsidian_6 = new BlockObsidian1(this, -1440, 704); - this.add.existing(blockObsidian_6); - - // blockObsidianLava1 - const blockObsidianLava1 = new BlockObsidianLava1(this, -1408, 752); - this.add.existing(blockObsidianLava1); - - // blockObsidian_8 - const blockObsidian_8 = new BlockObsidian1(this, -1472, 752); - this.add.existing(blockObsidian_8); - - // blockObsidian_9 - const blockObsidian_9 = new BlockObsidian2(this, -1440, 768); - this.add.existing(blockObsidian_9); - - // blockObsidianLava2 - const blockObsidianLava2 = new BlockObsidianLava2(this, -1408, 784); - this.add.existing(blockObsidianLava2); - - // blockObsidian_10 - const blockObsidian_10 = new BlockObsidian1(this, -1440, 800); - this.add.existing(blockObsidian_10); - // blockStone_12 const blockStone_12 = new BlockStone1(this, 352, 976); this.add.existing(blockStone_12); @@ -498,12 +424,6 @@ export default class MapRiverCrossing extends Phaser.Scene { // tree4 (prefab fields) tree4.z = 160; - // blockObsidianLava3 (prefab fields) - blockObsidianLava3.z = 32; - - // blockObsidian_6 (prefab fields) - blockObsidian_6.z = 32; - // blockStoneWater1 (prefab fields) blockStoneWater1.z = 16; From 4395284f1b93f939bef88cee4f727625c7616513 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Mon, 18 Dec 2023 17:57:56 +0100 Subject: [PATCH 003/138] Ember enclave --- .../game/scenes/AnimatedTile.ts | 21 +- .../game/scenes/EmberEnclave.scene | 224 + .../game/scenes/EmberEnclave.ts | 124 + .../game/scenes/MapRiverCrossing.scene | 4 +- .../game/scenes/MapRiverCrossing.ts | 35 +- .../game/scenes/PreloadProbableWaffle.ts | 32 +- .../asset-pack-probable-waffle.json | 20 - ...et-pack-probable-waffle-ember-enclave.json | 33 + ...t-pack-probable-waffle-river-crossing.json | 33 + .../tilemaps/ember_enclave.json | 5815 +++++++++++++++++ .../tilemaps/ember_enclave.tmx | 62 + 11 files changed, 6359 insertions(+), 44 deletions(-) create mode 100644 apps/client/src/app/probable-waffle/game/scenes/EmberEnclave.scene create mode 100644 apps/client/src/app/probable-waffle/game/scenes/EmberEnclave.ts create mode 100644 apps/client/src/assets/probable-waffle/asset-packers/maps/asset-pack-probable-waffle-ember-enclave.json create mode 100644 apps/client/src/assets/probable-waffle/asset-packers/maps/asset-pack-probable-waffle-river-crossing.json create mode 100644 apps/client/src/assets/probable-waffle/tilemaps/ember_enclave.json create mode 100644 apps/client/src/metadata/probable-waffle/tilemaps/ember_enclave.tmx diff --git a/apps/client/src/app/probable-waffle/game/scenes/AnimatedTile.ts b/apps/client/src/app/probable-waffle/game/scenes/AnimatedTile.ts index 31d8a28e..7ca573b5 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/AnimatedTile.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/AnimatedTile.ts @@ -70,15 +70,19 @@ export class AnimatedTilemap { private readonly animatedTiles: AnimatedTile[]; constructor( + private readonly scene: Phaser.Scene, private readonly tilemap: Phaser.Tilemaps.Tilemap, - private readonly tileset: Phaser.Tilemaps.Tileset + private readonly tilesets: Phaser.Tilemaps.Tileset[] ) { this.animatedTiles = this.initAnimatedTiles(); + this.scene.events.on("update", this.update); + this.scene.events.on("shutdown", this.destroy); } - initAnimatedTiles = () => { + private initAnimatedTiles = () => { const animatedTiles: AnimatedTile[] = []; - const tileData = this.tileset.tileData as TilesetTileData; + const tileset = this.relevantTileset; + const tileData = tileset.tileData as TilesetTileData; for (const tileId in tileData) { this.tilemap.layers.forEach((layer) => { if (layer.tilemapLayer.type === "StaticTilemapLayer") return; @@ -86,9 +90,9 @@ export class AnimatedTilemap { tileRow.forEach((tile) => { // Typically `firstgid` is 1, which means tileId starts from 1. // TileId in Tiled starts from 0. - if (tile.index - this.tileset.firstgid === parseInt(tileId, 10)) { + if (tile.index - tileset.firstgid === parseInt(tileId, 10)) { if (!tileData[tileId].animation) return; - animatedTiles.push(new AnimatedTile(tile, tileData[tileId].animation!, this.tileset.firstgid)); + animatedTiles.push(new AnimatedTile(tile, tileData[tileId].animation!, tileset.firstgid)); } }) ); @@ -97,5 +101,10 @@ export class AnimatedTilemap { return animatedTiles; }; - update = (delta: number) => this.animatedTiles.forEach((tile) => tile.update(delta)); + private get relevantTileset() { + return this.tilesets[0]; + } + + private update = (delta: number) => this.animatedTiles.forEach((tile) => tile.update(delta)); + private destroy = () => this.scene.events.off("update", this.update); } diff --git a/apps/client/src/app/probable-waffle/game/scenes/EmberEnclave.scene b/apps/client/src/app/probable-waffle/game/scenes/EmberEnclave.scene new file mode 100644 index 00000000..fb78eac7 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/scenes/EmberEnclave.scene @@ -0,0 +1,224 @@ +{ + "id": "83b754e4-4d45-480d-923c-5b7fccee4e93", + "sceneType": "SCENE", + "settings": { + "snapEnabled": true, + "exportClass": true, + "autoImport": true, + "preloadPackFiles": [], + "createMethodName": "editorCreate", + "sceneKey": "EmberEnclave", + "compilerOutputLanguage": "TYPE_SCRIPT", + "borderWidth": 1280, + "borderHeight": 720 + }, + "displayList": [ + { + "type": "TilemapLayer", + "id": "9cdf4f18-3323-43bf-b105-00fddbdbc7e6", + "label": "tilemap_level_1", + "x": -32, + "tilemapId": "9cb0db04-e78b-4290-b950-d943f1631f3b", + "layerName": "TileMap_level_1", + "tilesets": [ + "tiles" + ] + }, + { + "prefabId": "ec58b20e-e03e-4bd4-140e-156ffe433f29", + "id": "5f2a21e3-1bc1-4f9b-9aa8-f4f1c035ff36", + "unlock": [ + "x", + "y" + ], + "label": "blockObsidianLava5", + "x": -48, + "y": 432 + }, + { + "prefabId": "ec58b20e-e04f-4bd4-8401-856ffe433f24", + "id": "d79386cf-ba61-42d8-8c8d-715db1cd97d7", + "unlock": [ + "x", + "y" + ], + "label": "bushDownwardsLarge", + "x": 32, + "y": 688 + }, + { + "prefabId": "ec58b20e-e03e-4bd4-140e-156ffe433f28", + "id": "10ef234e-96c6-4bd3-baf1-e49ab7c41f7e", + "unlock": [ + "x", + "y" + ], + "label": "blockObsidianLava4", + "x": 192, + "y": 560 + }, + { + "prefabId": "ec58b20e-e04f-4bd4-8401-856e1e433f46", + "id": "a0dfb8e4-473a-46b0-85b6-d919fe2458f1", + "unlock": [ + "x", + "y" + ], + "label": "tree6", + "x": 0, + "y": 736 + }, + { + "prefabId": "ec58b20e-e04f-4bd4-8401-856ffe433f27", + "id": "6c476ea2-631f-498b-8af5-d31c99b66da0", + "unlock": [ + "x", + "y" + ], + "label": "bushUpwardsLarge", + "x": -48, + "y": 768 + }, + { + "prefabId": "ec58b20e-e04f-4bd4-8401-856ffe433f25", + "id": "d8349901-94f9-4008-8d8c-f8dc5d1f766b", + "unlock": [ + "x", + "y" + ], + "label": "bushDownwardsSmall", + "x": 48, + "y": 768 + }, + { + "prefabId": "ec58b20e-e03e-4bd4-140e-856ffe433f55", + "id": "16d280f1-366a-4065-8f04-61ef49129355", + "unlock": [ + "x", + "y" + ], + "label": "blockStoneWater4", + "x": 0, + "y": 816 + }, + { + "prefabId": "99a75a7c-60b5-4368-a9af-0f16ddb21bbc", + "id": "c65a1b78-d6b8-47e8-b765-9cc671e38a24", + "unlock": [ + "x", + "y" + ], + "label": "ankGuard", + "x": 688, + "y": 752 + }, + { + "prefabId": "562c6656-92bb-49f3-b9f3-cd63b0b72e68", + "id": "30204112-523e-4d1c-8953-5094f5d57fb8", + "unlock": [ + "x", + "y" + ], + "label": "sandhold", + "x": 496, + "y": 880 + }, + { + "prefabId": "562c6656-92bb-49f3-b9f3-cd63b0b72e68", + "id": "d62f8d92-119e-4967-9b17-818a760244be", + "unlock": [ + "x", + "y" + ], + "label": "sandhold_1", + "x": -816, + "y": 720 + }, + { + "prefabId": "b425696b-ec20-4f72-9aaf-a4f2aaf3e65b", + "id": "0ff3f098-08a2-4666-8763-c1afe79db6b5", + "unlock": [ + "x", + "y" + ], + "label": "temple", + "x": -607, + "y": 882 + }, + { + "prefabId": "6c2cf0db-4461-4b32-b5d3-9882c5326e1b", + "id": "64572dc8-4d91-4fc7-8377-8faf3badd56c", + "unlock": [ + "x", + "y" + ], + "label": "tivaraSlingshotFemale", + "x": 457, + "y": 1095 + }, + { + "prefabId": "004276d5-437a-44f5-b7ca-161086c4ad5e", + "id": "dc62e88e-34d7-4855-913d-3646dbc09c94", + "unlock": [ + "x", + "y" + ], + "label": "tivaraWorkerFemale", + "x": -880, + "y": 880 + }, + { + "prefabId": "edf32147-e546-4f6e-91ba-1720c6b75ac9", + "id": "a111638e-956b-4d8a-aa9a-23473ad399d6", + "unlock": [ + "x", + "y" + ], + "label": "tivaraWorkerMale", + "x": -592, + "y": 688 + }, + { + "prefabId": "ec58b20e-e04f-4bd3-840e-856ffe433f23", + "id": "f691c685-3bd9-4749-a260-d260f400e25f", + "unlock": [ + "x", + "y" + ], + "label": "workMill", + "x": -160, + "y": 736 + }, + { + "prefabId": "ec58b20e-e04f-4bd3-840e-856ffe433f23", + "id": "a870b52f-ae30-481a-a246-8f132deca998", + "unlock": [ + "x", + "y" + ], + "label": "workMill_1", + "x": 192, + "y": 704 + } + ], + "plainObjects": [ + { + "id": "9cb0db04-e78b-4290-b950-d943f1631f3b", + "type": "Tilemap", + "label": "tilemap", + "key": "tiles_ember_enclave", + "tilesets": [ + { + "name": "tiles", + "imageKey": "tiles_1" + } + ] + } + ], + "meta": { + "app": "Phaser Editor 2D - Scene Editor", + "url": "https://phasereditor2d.com", + "contentType": "phasereditor2d.core.scene.SceneContentType", + "version": 5 + } +} \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/scenes/EmberEnclave.ts b/apps/client/src/app/probable-waffle/game/scenes/EmberEnclave.ts new file mode 100644 index 00000000..6b46a140 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/scenes/EmberEnclave.ts @@ -0,0 +1,124 @@ +// You can write more code here + +/* START OF COMPILED CODE */ + +import Phaser from "phaser"; +import BlockObsidianLava5 from "../prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava5"; +import BushDownwardsLarge from "../prefabs/outside/foliage/bushes/BushDownwardsLarge"; +import BlockObsidianLava4 from "../prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava4"; +import Tree6 from "../prefabs/outside/foliage/trees/resources/Tree6"; +import BushUpwardsLarge from "../prefabs/outside/foliage/bushes/BushUpwardsLarge"; +import BushDownwardsSmall from "../prefabs/outside/foliage/bushes/BushDownwardsSmall"; +import BlockStoneWater4 from "../prefabs/outside/nature/block_stone_water/BlockStoneWater4"; +import AnkGuard from "../prefabs/buildings/tivara/AnkGuard"; +import Sandhold from "../prefabs/buildings/tivara/Sandhold"; +import Temple from "../prefabs/buildings/tivara/Temple"; +import TivaraSlingshotFemale from "../prefabs/characters/tivara/TivaraSlingshotFemale"; +import TivaraWorkerFemale from "../prefabs/characters/tivara/TivaraWorkerFemale"; +import TivaraWorkerMale from "../prefabs/characters/tivara/TivaraWorkerMale"; +import WorkMill from "../prefabs/buildings/tivara/WorkMill"; +/* START-USER-IMPORTS */ +/* END-USER-IMPORTS */ + +export default class EmberEnclave extends Phaser.Scene { + constructor() { + super("EmberEnclave"); + + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } + + editorCreate(): void { + // tilemap + const tilemap = this.add.tilemap("tiles_ember_enclave"); + tilemap.addTilesetImage("tiles", "tiles_1"); + + // tilemap_level_1 + tilemap.createLayer("TileMap_level_1", ["tiles"], -32, 0); + + // blockObsidianLava5 + const blockObsidianLava5 = new BlockObsidianLava5(this, -48, 432); + this.add.existing(blockObsidianLava5); + + // bushDownwardsLarge + const bushDownwardsLarge = new BushDownwardsLarge(this, 32, 688); + this.add.existing(bushDownwardsLarge); + + // blockObsidianLava4 + const blockObsidianLava4 = new BlockObsidianLava4(this, 192, 560); + this.add.existing(blockObsidianLava4); + + // tree6 + const tree6 = new Tree6(this, 0, 736); + this.add.existing(tree6); + + // bushUpwardsLarge + const bushUpwardsLarge = new BushUpwardsLarge(this, -48, 768); + this.add.existing(bushUpwardsLarge); + + // bushDownwardsSmall + const bushDownwardsSmall = new BushDownwardsSmall(this, 48, 768); + this.add.existing(bushDownwardsSmall); + + // blockStoneWater4 + const blockStoneWater4 = new BlockStoneWater4(this, 0, 816); + this.add.existing(blockStoneWater4); + + // ankGuard + const ankGuard = new AnkGuard(this, 688, 752); + this.add.existing(ankGuard); + + // sandhold + const sandhold = new Sandhold(this, 496, 880); + this.add.existing(sandhold); + + // sandhold_1 + const sandhold_1 = new Sandhold(this, -816, 720); + this.add.existing(sandhold_1); + + // temple + const temple = new Temple(this, -607, 882); + this.add.existing(temple); + + // tivaraSlingshotFemale + const tivaraSlingshotFemale = new TivaraSlingshotFemale(this, 457, 1095); + this.add.existing(tivaraSlingshotFemale); + + // tivaraWorkerFemale + const tivaraWorkerFemale = new TivaraWorkerFemale(this, -880, 880); + this.add.existing(tivaraWorkerFemale); + + // tivaraWorkerMale + const tivaraWorkerMale = new TivaraWorkerMale(this, -592, 688); + this.add.existing(tivaraWorkerMale); + + // workMill + const workMill = new WorkMill(this, -160, 736); + this.add.existing(workMill); + + // workMill_1 + const workMill_1 = new WorkMill(this, 192, 704); + this.add.existing(workMill_1); + + this.tilemap = tilemap; + + this.events.emit("scene-awake"); + } + + private tilemap!: Phaser.Tilemaps.Tilemap; + + /* START-USER-CODE */ + + // Write your code here + + create() { + this.editorCreate(); + } + + /* END-USER-CODE */ +} + +/* END OF COMPILED CODE */ + +// You can write more code here diff --git a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene index 2853e0a0..da6c421e 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene +++ b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene @@ -667,7 +667,7 @@ ], "label": "tree_3", "x": -896, - "y": 1056 + "y": 1040 }, { "prefabId": "ec58b20e-e04f-4bd4-8401-851ffe433f31", @@ -954,7 +954,7 @@ "id": "9cb0db04-e78b-4290-b950-d943f1631f3b", "type": "Tilemap", "label": "tilemap", - "key": "tiles", + "key": "tiles_river_crossing", "tilesets": [ { "name": "tiles", diff --git a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts index f1863a27..32a64446 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts @@ -2,7 +2,7 @@ /* START OF COMPILED CODE */ -import Phaser from "phaser"; +import Phaser, { Input } from "phaser"; import Tree7 from "../prefabs/outside/foliage/trees/resources/Tree7"; import Sandhold from "../prefabs/buildings/tivara/Sandhold"; import Owlery from "../prefabs/buildings/skaduwee/Owlery"; @@ -50,6 +50,7 @@ import BlockStoneWater3 from "../prefabs/outside/nature/block_stone_water/BlockS /* START-USER-IMPORTS */ import ActorContainer from "../entity/actor/ActorContainer"; import { AnimatedTilemap } from "./AnimatedTile"; +import { InputHandler } from "../world/managers/controllers/input/input.handler"; /* END-USER-IMPORTS */ export default class MapRiverCrossing extends Phaser.Scene { @@ -63,7 +64,7 @@ export default class MapRiverCrossing extends Phaser.Scene { editorCreate(): void { // tilemap - const tilemap = this.add.tilemap("tiles"); + const tilemap = this.add.tilemap("tiles_river_crossing"); tilemap.addTilesetImage("tiles", "tiles_1"); // tilemap_level_1 @@ -294,7 +295,7 @@ export default class MapRiverCrossing extends Phaser.Scene { this.add.existing(tree1); // tree_3 - const tree_3 = new Tree4(this, -896, 1056); + const tree_3 = new Tree4(this, -896, 1040); this.add.existing(tree_3); // treeTrunk_1 @@ -441,14 +442,29 @@ export default class MapRiverCrossing extends Phaser.Scene { private cursors!: Phaser.Types.Input.Keyboard.CursorKeys; private controlConfig!: Phaser.Types.Cameras.Controls.FixedKeyControlConfig; private controls!: Phaser.Cameras.Controls.FixedKeyControl; - private animatedTilemap!: AnimatedTilemap; preload(): void { - this.cursors = this.input.keyboard!.createCursorKeys(); + this.preloadCursors(); } create() { this.editorCreate(); + this.handleCursors(); + this.handleCameraCenter(); + this.handleZSort(); + this.zoomWithScroll(); + // this.enableLights(); + new AnimatedTilemap(this, this.tilemap, this.tilemap.tilesets); + new InputHandler(this.input, this.cameras.main); + + this.events.once("shutdown", this.destroy, this); + } + + private preloadCursors() { + this.cursors = this.input.keyboard!.createCursorKeys(); + } + + private handleCursors() { this.controlConfig = { camera: this.cameras.main, left: this.cursors.left, @@ -458,12 +474,6 @@ export default class MapRiverCrossing extends Phaser.Scene { speed: 2 }; this.controls = new Phaser.Cameras.Controls.FixedKeyControl(this.controlConfig); - this.handleCameraCenter(); - this.handleZSort(); - this.zoomWithScroll(); - // this.enableLights(); - this.animatedTilemap = new AnimatedTilemap(this.tilemap, this.tilemap.tilesets[0]); - this.events.once("shutdown", this.destroy, this); } enableLights = () => { @@ -535,7 +545,7 @@ export default class MapRiverCrossing extends Phaser.Scene { }; zoomWithScroll = () => { - this.input.on("wheel", this.zoomWithScrollHandler); + this.input.on(Input.Events.POINTER_WHEEL, this.zoomWithScrollHandler); }; zoomWithScrollHandler = (pointer: any, gameObjects: any, deltaX: any, deltaY: any, deltaZ: any) => { @@ -555,7 +565,6 @@ export default class MapRiverCrossing extends Phaser.Scene { update(time: number, delta: number): void { this.controls.update(delta); - this.animatedTilemap.update(delta); } private destroy() { diff --git a/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.ts b/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.ts index 9a551a90..5f7c89b3 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.ts @@ -5,7 +5,6 @@ import Phaser from "phaser"; import PreloadBarUpdaterScript from "../../../other/Template/script-nodes/PreloadBarUpdaterScript"; /* START-USER-IMPORTS */ -import assetPackUrl from "../../../../assets/probable-waffle/asset-packers/asset-pack-probable-waffle.json"; /* END-USER-IMPORTS */ export default class PreloadProbableWaffle extends Phaser.Scene { @@ -53,16 +52,43 @@ export default class PreloadProbableWaffle extends Phaser.Scene { preload() { this.editorCreate(); - this.load.pack("asset-pack", assetPackUrl as any); + this.load.pack("asset-pack", "assets/probable-waffle/asset-packers/asset-pack-probable-waffle.json"); + const map = this.getMap(); + this.load.pack("asset-pack-map", map.assetPath); } create() { - this.scene.start("MapRiverCrossing"); + const map = this.getMap(); + this.scene.start(map.sceneKey); + } + + getMap(): MapType { + // eslint-disable-next-line prefer-const + let mapId = 1; // todo get from somewhere else + switch (mapId) { + case 1: + return { + sceneKey: "MapRiverCrossing", + assetPath: "assets/probable-waffle/asset-packers/maps/asset-pack-probable-waffle-river-crossing.json" + }; + case 2: + return { + sceneKey: "MapEmberEnclave", + assetPath: "assets/probable-waffle/asset-packers/maps/asset-pack-probable-waffle-ember-enclave.json" + }; + default: + throw new Error(`Map id ${mapId} not found`); + } } /* END-USER-CODE */ } +type MapType = { + sceneKey: string; + assetPath: string; +}; + /* END OF COMPILED CODE */ // You can write more code here diff --git a/apps/client/src/assets/probable-waffle/asset-packers/asset-pack-probable-waffle.json b/apps/client/src/assets/probable-waffle/asset-packers/asset-pack-probable-waffle.json index 1fde73b3..b863bc8c 100644 --- a/apps/client/src/assets/probable-waffle/asset-packers/asset-pack-probable-waffle.json +++ b/apps/client/src/assets/probable-waffle/asset-packers/asset-pack-probable-waffle.json @@ -312,26 +312,6 @@ "type": "spritesheet", "key": "slingshot_female_walk" }, - { - "url": "assets/probable-waffle/tilemaps/river_crossing.json", - "path": "assets/probable-waffle/tilemaps/river_crossing.json", - "type": "tilemapTiledJSON", - "key": "tiles" - }, - { - "url": "assets/probable-waffle/tilesets/tiles.png", - "path": "assets/probable-waffle/tilesets/tiles.png", - "frameConfig": { - "frameWidth": 64, - "frameHeight": 32, - "startFrame": 0, - "endFrame": -1, - "spacing": 0, - "margin": 0 - }, - "type": "spritesheet", - "key": "tiles_1" - }, { "url": "assets/probable-waffle/spritesheets/characters/general/warrior/warrior_anim.json", "path": "assets/probable-waffle/spritesheets/characters/general/warrior/warrior_anim.json", diff --git a/apps/client/src/assets/probable-waffle/asset-packers/maps/asset-pack-probable-waffle-ember-enclave.json b/apps/client/src/assets/probable-waffle/asset-packers/maps/asset-pack-probable-waffle-ember-enclave.json new file mode 100644 index 00000000..b7255d4e --- /dev/null +++ b/apps/client/src/assets/probable-waffle/asset-packers/maps/asset-pack-probable-waffle-ember-enclave.json @@ -0,0 +1,33 @@ +{ + "section1": { + "files": [ + { + "url": "assets/probable-waffle/tilemaps/ember_enclave.json", + "path": "assets/probable-waffle/tilemaps/ember_enclave.json", + "type": "tilemapTiledJSON", + "key": "tiles_ember_enclave" + }, + { + "url": "assets/probable-waffle/tilesets/tiles.png", + "path": "assets/probable-waffle/tilesets/tiles.png", + "frameConfig": { + "frameWidth": 64, + "frameHeight": 32, + "startFrame": 0, + "endFrame": -1, + "spacing": 0, + "margin": 0 + }, + "type": "spritesheet", + "key": "tiles_1" + } + ] + }, + "meta": { + "app": "Phaser Editor 2D - Asset Pack Editor", + "contentType": "phasereditor2d.pack.core.AssetContentType", + "url": "https://phasereditor2d.com", + "version": 2, + "showAllFilesInBlocks": false + } +} diff --git a/apps/client/src/assets/probable-waffle/asset-packers/maps/asset-pack-probable-waffle-river-crossing.json b/apps/client/src/assets/probable-waffle/asset-packers/maps/asset-pack-probable-waffle-river-crossing.json new file mode 100644 index 00000000..6db58a14 --- /dev/null +++ b/apps/client/src/assets/probable-waffle/asset-packers/maps/asset-pack-probable-waffle-river-crossing.json @@ -0,0 +1,33 @@ +{ + "section1": { + "files": [ + { + "url": "assets/probable-waffle/tilemaps/river_crossing.json", + "path": "assets/probable-waffle/tilemaps/river_crossing.json", + "type": "tilemapTiledJSON", + "key": "tiles_river_crossing" + }, + { + "url": "assets/probable-waffle/tilesets/tiles.png", + "path": "assets/probable-waffle/tilesets/tiles.png", + "frameConfig": { + "frameWidth": 64, + "frameHeight": 32, + "startFrame": 0, + "endFrame": -1, + "spacing": 0, + "margin": 0 + }, + "type": "spritesheet", + "key": "tiles_1" + } + ] + }, + "meta": { + "app": "Phaser Editor 2D - Asset Pack Editor", + "contentType": "phasereditor2d.pack.core.AssetContentType", + "url": "https://phasereditor2d.com", + "version": 2, + "showAllFilesInBlocks": false + } +} diff --git a/apps/client/src/assets/probable-waffle/tilemaps/ember_enclave.json b/apps/client/src/assets/probable-waffle/tilemaps/ember_enclave.json new file mode 100644 index 00000000..3584c714 --- /dev/null +++ b/apps/client/src/assets/probable-waffle/tilemaps/ember_enclave.json @@ -0,0 +1,5815 @@ +{ + "compressionlevel": -1, + "height": 50, + "infinite": false, + "layers": [ + { + "data": [ + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 6, + 7, + 7, + 7, + 7, + 7, + 7, + 8, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 6, + 22, + 145, + 146, + 146, + 146, + 146, + 147, + 20, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 18, + 145, + 161, + 12, + 12, + 12, + 12, + 159, + 21, + 8, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 18, + 157, + 12, + 12, + 12, + 12, + 12, + 160, + 147, + 20, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 18, + 169, + 149, + 12, + 12, + 12, + 12, + 12, + 159, + 20, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 30, + 10, + 169, + 149, + 12, + 12, + 12, + 12, + 159, + 20, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 30, + 10, + 169, + 149, + 12, + 12, + 12, + 159, + 20, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 30, + 10, + 157, + 12, + 12, + 12, + 159, + 20, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 18, + 169, + 149, + 148, + 170, + 171, + 20, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 30, + 10, + 169, + 171, + 9, + 43, + 32, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 30, + 31, + 31, + 32, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 40, + 41, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23, + 23 + ], + "height": 50, + "id": 1, + "name": "TileMap_level_1", + "opacity": 1, + "type": "tilelayer", + "visible": true, + "width": 50, + "x": 0, + "y": 0 + } + ], + "nextlayerid": 13, + "nextobjectid": 88, + "orientation": "isometric", + "renderorder": "right-down", + "tiledversion": "1.10.2", + "tileheight": 32, + "tilesets": [ + { + "columns": 12, + "firstgid": 1, + "grid": { + "height": 32, + "orientation": "isometric", + "width": 64 + }, + "image": "..\/tilesets\/tiles.png", + "imageheight": 768, + "imagewidth": 768, + "margin": 0, + "name": "tiles", + "spacing": 0, + "tilecount": 288, + "tileheight": 32, + "tiles": [ + { + "animation": [ + { + "duration": 1300, + "tileid": 23 + }, + { + "duration": 1300, + "tileid": 35 + }, + { + "duration": 1300, + "tileid": 34 + } + ], + "id": 23 + }, + { + "animation": [ + { + "duration": 1000, + "tileid": 34 + }, + { + "duration": 1000, + "tileid": 35 + }, + { + "duration": 1000, + "tileid": 23 + } + ], + "id": 34 + }, + { + "animation": [ + { + "duration": 1500, + "tileid": 35 + }, + { + "duration": 1500, + "tileid": 23 + }, + { + "duration": 1500, + "tileid": 34 + } + ], + "id": 35 + } + ], + "tilewidth": 64, + "wangsets": [ + { + "colors": [ + { + "color": "#ff0000", + "name": "Sand", + "probability": 1, + "tile": 10 + }, + { + "color": "#00ff00", + "name": "Stone", + "probability": 1, + "tile": 22 + }, + { + "color": "#0000ff", + "name": "Water", + "probability": 1, + "tile": 34 + }, + { + "color": "#ff7700", + "name": "Grass light", + "probability": 1, + "tile": 11 + }, + { + "color": "#00e9ff", + "name": "Open water", + "probability": 1, + "tile": 47 + }, + { + "color": "#ff00d8", + "name": "Snow", + "probability": 1, + "tile": 59 + }, + { + "color": "#ffff00", + "name": "Ice", + "probability": 1, + "tile": 71 + } + ], + "name": "Tiles terrain set", + "tile": -1, + "type": "corner", + "wangtiles": [ + { + "tileid": 0, + "wangid": [ + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0 + ] + }, + { + "tileid": 1, + "wangid": [ + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 0 + ] + }, + { + "tileid": 2, + "wangid": [ + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0 + ] + }, + { + "tileid": 3, + "wangid": [ + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 4, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 1 + ] + }, + { + "tileid": 5, + "wangid": [ + 0, + 2, + 0, + 1, + 0, + 2, + 0, + 2 + ] + }, + { + "tileid": 6, + "wangid": [ + 0, + 2, + 0, + 1, + 0, + 1, + 0, + 2 + ] + }, + { + "tileid": 7, + "wangid": [ + 0, + 2, + 0, + 2, + 0, + 1, + 0, + 2 + ] + }, + { + "tileid": 8, + "wangid": [ + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 9, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 2, + 0, + 1 + ] + }, + { + "tileid": 10, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 11, + "wangid": [ + 0, + 4, + 0, + 4, + 0, + 4, + 0, + 4 + ] + }, + { + "tileid": 12, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 0 + ] + }, + { + "tileid": 14, + "wangid": [ + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 15, + "wangid": [ + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 16, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 0 + ] + }, + { + "tileid": 17, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 2, + 0, + 2 + ] + }, + { + "tileid": 19, + "wangid": [ + 0, + 2, + 0, + 2, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 20, + "wangid": [ + 0, + 2, + 0, + 1, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 21, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 2 + ] + }, + { + "tileid": 22, + "wangid": [ + 0, + 2, + 0, + 2, + 0, + 2, + 0, + 2 + ] + }, + { + "tileid": 23, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 24, + "wangid": [ + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0 + ] + }, + { + "tileid": 25, + "wangid": [ + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 1 + ] + }, + { + "tileid": 26, + "wangid": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1 + ] + }, + { + "tileid": 27, + "wangid": [ + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 1 + ] + }, + { + "tileid": 28, + "wangid": [ + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 0 + ] + }, + { + "tileid": 29, + "wangid": [ + 0, + 1, + 0, + 2, + 0, + 2, + 0, + 2 + ] + }, + { + "tileid": 30, + "wangid": [ + 0, + 1, + 0, + 2, + 0, + 2, + 0, + 1 + ] + }, + { + "tileid": 31, + "wangid": [ + 0, + 2, + 0, + 2, + 0, + 2, + 0, + 1 + ] + }, + { + "tileid": 32, + "wangid": [ + 0, + 2, + 0, + 1, + 0, + 2, + 0, + 1 + ] + }, + { + "tileid": 33, + "wangid": [ + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 2 + ] + }, + { + "tileid": 34, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 35, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 36, + "wangid": [ + 0, + 0, + 0, + 2, + 0, + 0, + 0, + 0 + ] + }, + { + "tileid": 37, + "wangid": [ + 0, + 0, + 0, + 2, + 0, + 2, + 0, + 0 + ] + }, + { + "tileid": 38, + "wangid": [ + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 0 + ] + }, + { + "tileid": 39, + "wangid": [ + 0, + 2, + 0, + 0, + 0, + 2, + 0, + 2 + ] + }, + { + "tileid": 40, + "wangid": [ + 0, + 2, + 0, + 2, + 0, + 0, + 0, + 2 + ] + }, + { + "tileid": 41, + "wangid": [ + 0, + 1, + 0, + 2, + 0, + 0, + 0, + 1 + ] + }, + { + "tileid": 42, + "wangid": [ + 0, + 1, + 0, + 2, + 0, + 2, + 0, + 1 + ] + }, + { + "tileid": 43, + "wangid": [ + 0, + 2, + 0, + 1, + 0, + 0, + 0, + 1 + ] + }, + { + "tileid": 44, + "wangid": [ + 0, + 1, + 0, + 0, + 0, + 1, + 0, + 2 + ] + }, + { + "tileid": 45, + "wangid": [ + 0, + 2, + 0, + 2, + 0, + 0, + 0, + 1 + ] + }, + { + "tileid": 46, + "wangid": [ + 0, + 1, + 0, + 0, + 0, + 2, + 0, + 2 + ] + }, + { + "tileid": 47, + "wangid": [ + 0, + 5, + 0, + 5, + 0, + 5, + 0, + 5 + ] + }, + { + "tileid": 48, + "wangid": [ + 0, + 2, + 0, + 2, + 0, + 0, + 0, + 0 + ] + }, + { + "tileid": 50, + "wangid": [ + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 2 + ] + }, + { + "tileid": 51, + "wangid": [ + 0, + 0, + 0, + 2, + 0, + 2, + 0, + 2 + ] + }, + { + "tileid": 52, + "wangid": [ + 0, + 2, + 0, + 2, + 0, + 2, + 0, + 0 + ] + }, + { + "tileid": 53, + "wangid": [ + 0, + 2, + 0, + 1, + 0, + 1, + 0, + 0 + ] + }, + { + "tileid": 54, + "wangid": [ + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 2 + ] + }, + { + "tileid": 55, + "wangid": [ + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 0 + ] + }, + { + "tileid": 56, + "wangid": [ + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 1 + ] + }, + { + "tileid": 57, + "wangid": [ + 0, + 2, + 0, + 2, + 0, + 1, + 0, + 0 + ] + }, + { + "tileid": 58, + "wangid": [ + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 2 + ] + }, + { + "tileid": 59, + "wangid": [ + 0, + 6, + 0, + 6, + 0, + 6, + 0, + 6 + ] + }, + { + "tileid": 60, + "wangid": [ + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 0 + ] + }, + { + "tileid": 61, + "wangid": [ + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 2 + ] + }, + { + "tileid": 62, + "wangid": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2 + ] + }, + { + "tileid": 63, + "wangid": [ + 0, + 0, + 0, + 2, + 0, + 0, + 0, + 2 + ] + }, + { + "tileid": 64, + "wangid": [ + 0, + 2, + 0, + 0, + 0, + 2, + 0, + 0 + ] + }, + { + "tileid": 65, + "wangid": [ + 0, + 2, + 0, + 0, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 66, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 0, + 0, + 2 + ] + }, + { + "tileid": 67, + "wangid": [ + 0, + 2, + 0, + 0, + 0, + 2, + 0, + 1 + ] + }, + { + "tileid": 68, + "wangid": [ + 0, + 1, + 0, + 2, + 0, + 0, + 0, + 2 + ] + }, + { + "tileid": 69, + "wangid": [ + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 1 + ] + }, + { + "tileid": 70, + "wangid": [ + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 2 + ] + }, + { + "tileid": 71, + "wangid": [ + 0, + 7, + 0, + 7, + 0, + 7, + 0, + 7 + ] + }, + { + "tileid": 72, + "wangid": [ + 0, + 3, + 0, + 1, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 73, + "wangid": [ + 0, + 3, + 0, + 1, + 0, + 1, + 0, + 3 + ] + }, + { + "tileid": 74, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 1, + 0, + 3 + ] + }, + { + "tileid": 75, + "wangid": [ + 0, + 1, + 0, + 3, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 76, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 3, + 0, + 1 + ] + }, + { + "tileid": 77, + "wangid": [ + 0, + 0, + 0, + 2, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 78, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 2, + 0, + 0 + ] + }, + { + "tileid": 79, + "wangid": [ + 0, + 0, + 0, + 2, + 0, + 1, + 0, + 2 + ] + }, + { + "tileid": 80, + "wangid": [ + 0, + 2, + 0, + 1, + 0, + 2, + 0, + 0 + ] + }, + { + "tileid": 81, + "wangid": [ + 0, + 0, + 0, + 2, + 0, + 1, + 0, + 0 + ] + }, + { + "tileid": 82, + "wangid": [ + 0, + 0, + 0, + 1, + 0, + 2, + 0, + 0 + ] + }, + { + "tileid": 84, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 86, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 87, + "wangid": [ + 0, + 3, + 0, + 1, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 88, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 3 + ] + }, + { + "tileid": 89, + "wangid": [ + 0, + 0, + 0, + 2, + 0, + 2, + 0, + 1 + ] + }, + { + "tileid": 90, + "wangid": [ + 0, + 1, + 0, + 2, + 0, + 2, + 0, + 0 + ] + }, + { + "tileid": 91, + "wangid": [ + 0, + 0, + 0, + 2, + 0, + 0, + 0, + 1 + ] + }, + { + "tileid": 92, + "wangid": [ + 0, + 1, + 0, + 0, + 0, + 2, + 0, + 0 + ] + }, + { + "tileid": 93, + "wangid": [ + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 1 + ] + }, + { + "tileid": 94, + "wangid": [ + 0, + 1, + 0, + 2, + 0, + 0, + 0, + 0 + ] + }, + { + "tileid": 96, + "wangid": [ + 0, + 1, + 0, + 3, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 97, + "wangid": [ + 0, + 1, + 0, + 3, + 0, + 3, + 0, + 1 + ] + }, + { + "tileid": 98, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 3, + 0, + 1 + ] + }, + { + "tileid": 99, + "wangid": [ + 0, + 3, + 0, + 1, + 0, + 3, + 0, + 1 + ] + }, + { + "tileid": 100, + "wangid": [ + 0, + 1, + 0, + 3, + 0, + 1, + 0, + 3 + ] + }, + { + "tileid": 101, + "wangid": [ + 0, + 2, + 0, + 0, + 0, + 1, + 0, + 2 + ] + }, + { + "tileid": 102, + "wangid": [ + 0, + 2, + 0, + 1, + 0, + 0, + 0, + 2 + ] + }, + { + "tileid": 103, + "wangid": [ + 0, + 2, + 0, + 0, + 0, + 1, + 0, + 0 + ] + }, + { + "tileid": 104, + "wangid": [ + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 2 + ] + }, + { + "tileid": 105, + "wangid": [ + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 2 + ] + }, + { + "tileid": 106, + "wangid": [ + 0, + 2, + 0, + 1, + 0, + 0, + 0, + 0 + ] + }, + { + "tileid": 108, + "wangid": [ + 0, + 3, + 0, + 2, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 109, + "wangid": [ + 0, + 3, + 0, + 2, + 0, + 2, + 0, + 3 + ] + }, + { + "tileid": 110, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 2, + 0, + 3 + ] + }, + { + "tileid": 111, + "wangid": [ + 0, + 2, + 0, + 3, + 0, + 2, + 0, + 2 + ] + }, + { + "tileid": 112, + "wangid": [ + 0, + 2, + 0, + 2, + 0, + 3, + 0, + 2 + ] + }, + { + "tileid": 113, + "wangid": [ + 0, + 2, + 0, + 3, + 0, + 1, + 0, + 2 + ] + }, + { + "tileid": 114, + "wangid": [ + 0, + 2, + 0, + 1, + 0, + 3, + 0, + 2 + ] + }, + { + "tileid": 115, + "wangid": [ + 0, + 3, + 0, + 2, + 0, + 1, + 0, + 2 + ] + }, + { + "tileid": 116, + "wangid": [ + 0, + 2, + 0, + 1, + 0, + 2, + 0, + 3 + ] + }, + { + "tileid": 117, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 1, + 0, + 2 + ] + }, + { + "tileid": 118, + "wangid": [ + 0, + 2, + 0, + 1, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 120, + "wangid": [ + 0, + 2, + 0, + 2, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 122, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 2, + 0, + 2 + ] + }, + { + "tileid": 123, + "wangid": [ + 0, + 3, + 0, + 2, + 0, + 2, + 0, + 2 + ] + }, + { + "tileid": 124, + "wangid": [ + 0, + 2, + 0, + 2, + 0, + 2, + 0, + 3 + ] + }, + { + "tileid": 125, + "wangid": [ + 0, + 3, + 0, + 2, + 0, + 2, + 0, + 1 + ] + }, + { + "tileid": 126, + "wangid": [ + 0, + 1, + 0, + 2, + 0, + 2, + 0, + 3 + ] + }, + { + "tileid": 127, + "wangid": [ + 0, + 2, + 0, + 3, + 0, + 2, + 0, + 1 + ] + }, + { + "tileid": 128, + "wangid": [ + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 2 + ] + }, + { + "tileid": 129, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 2, + 0, + 1 + ] + }, + { + "tileid": 130, + "wangid": [ + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 132, + "wangid": [ + 0, + 2, + 0, + 3, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 133, + "wangid": [ + 0, + 2, + 0, + 3, + 0, + 3, + 0, + 2 + ] + }, + { + "tileid": 134, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 3, + 0, + 2 + ] + }, + { + "tileid": 135, + "wangid": [ + 0, + 3, + 0, + 2, + 0, + 3, + 0, + 2 + ] + }, + { + "tileid": 136, + "wangid": [ + 0, + 2, + 0, + 3, + 0, + 2, + 0, + 3 + ] + }, + { + "tileid": 137, + "wangid": [ + 0, + 3, + 0, + 1, + 0, + 2, + 0, + 2 + ] + }, + { + "tileid": 138, + "wangid": [ + 0, + 2, + 0, + 2, + 0, + 1, + 0, + 3 + ] + }, + { + "tileid": 139, + "wangid": [ + 0, + 3, + 0, + 1, + 0, + 3, + 0, + 2 + ] + }, + { + "tileid": 140, + "wangid": [ + 0, + 2, + 0, + 3, + 0, + 1, + 0, + 3 + ] + }, + { + "tileid": 141, + "wangid": [ + 0, + 3, + 0, + 1, + 0, + 1, + 0, + 2 + ] + }, + { + "tileid": 142, + "wangid": [ + 0, + 2, + 0, + 1, + 0, + 1, + 0, + 3 + ] + }, + { + "tileid": 144, + "wangid": [ + 0, + 1, + 0, + 4, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 145, + "wangid": [ + 0, + 1, + 0, + 4, + 0, + 4, + 0, + 1 + ] + }, + { + "tileid": 146, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 4, + 0, + 1 + ] + }, + { + "tileid": 147, + "wangid": [ + 0, + 4, + 0, + 1, + 0, + 4, + 0, + 4 + ] + }, + { + "tileid": 148, + "wangid": [ + 0, + 4, + 0, + 4, + 0, + 1, + 0, + 4 + ] + }, + { + "tileid": 149, + "wangid": [ + 0, + 1, + 0, + 3, + 0, + 2, + 0, + 2 + ] + }, + { + "tileid": 150, + "wangid": [ + 0, + 2, + 0, + 2, + 0, + 3, + 0, + 1 + ] + }, + { + "tileid": 151, + "wangid": [ + 0, + 1, + 0, + 3, + 0, + 2, + 0, + 3 + ] + }, + { + "tileid": 152, + "wangid": [ + 0, + 3, + 0, + 2, + 0, + 3, + 0, + 1 + ] + }, + { + "tileid": 153, + "wangid": [ + 0, + 1, + 0, + 3, + 0, + 2, + 0, + 1 + ] + }, + { + "tileid": 154, + "wangid": [ + 0, + 1, + 0, + 2, + 0, + 3, + 0, + 1 + ] + }, + { + "tileid": 156, + "wangid": [ + 0, + 4, + 0, + 4, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 158, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 4, + 0, + 4 + ] + }, + { + "tileid": 159, + "wangid": [ + 0, + 1, + 0, + 4, + 0, + 4, + 0, + 4 + ] + }, + { + "tileid": 160, + "wangid": [ + 0, + 4, + 0, + 4, + 0, + 4, + 0, + 1 + ] + }, + { + "tileid": 161, + "wangid": [ + 0, + 1, + 0, + 3, + 0, + 3, + 0, + 2 + ] + }, + { + "tileid": 162, + "wangid": [ + 0, + 2, + 0, + 3, + 0, + 3, + 0, + 1 + ] + }, + { + "tileid": 163, + "wangid": [ + 0, + 1, + 0, + 3, + 0, + 1, + 0, + 2 + ] + }, + { + "tileid": 164, + "wangid": [ + 0, + 2, + 0, + 1, + 0, + 3, + 0, + 1 + ] + }, + { + "tileid": 165, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 3, + 0, + 2 + ] + }, + { + "tileid": 166, + "wangid": [ + 0, + 2, + 0, + 3, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 168, + "wangid": [ + 0, + 4, + 0, + 1, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 169, + "wangid": [ + 0, + 4, + 0, + 1, + 0, + 1, + 0, + 4 + ] + }, + { + "tileid": 170, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 1, + 0, + 4 + ] + }, + { + "tileid": 171, + "wangid": [ + 0, + 1, + 0, + 4, + 0, + 1, + 0, + 4 + ] + }, + { + "tileid": 172, + "wangid": [ + 0, + 4, + 0, + 1, + 0, + 4, + 0, + 1 + ] + }, + { + "tileid": 173, + "wangid": [ + 0, + 3, + 0, + 1, + 0, + 2, + 0, + 3 + ] + }, + { + "tileid": 174, + "wangid": [ + 0, + 3, + 0, + 2, + 0, + 1, + 0, + 3 + ] + }, + { + "tileid": 175, + "wangid": [ + 0, + 3, + 0, + 1, + 0, + 2, + 0, + 1 + ] + }, + { + "tileid": 176, + "wangid": [ + 0, + 1, + 0, + 2, + 0, + 1, + 0, + 3 + ] + }, + { + "tileid": 177, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 2, + 0, + 3 + ] + }, + { + "tileid": 178, + "wangid": [ + 0, + 3, + 0, + 2, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 180, + "wangid": [ + 0, + 4, + 0, + 3, + 0, + 4, + 0, + 4 + ] + }, + { + "tileid": 181, + "wangid": [ + 0, + 4, + 0, + 3, + 0, + 3, + 0, + 4 + ] + }, + { + "tileid": 182, + "wangid": [ + 0, + 4, + 0, + 4, + 0, + 3, + 0, + 4 + ] + }, + { + "tileid": 183, + "wangid": [ + 0, + 3, + 0, + 4, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 184, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 4, + 0, + 3 + ] + }, + { + "tileid": 185, + "wangid": [ + 0, + 3, + 0, + 4, + 0, + 1, + 0, + 3 + ] + }, + { + "tileid": 186, + "wangid": [ + 0, + 3, + 0, + 1, + 0, + 4, + 0, + 3 + ] + }, + { + "tileid": 187, + "wangid": [ + 0, + 4, + 0, + 3, + 0, + 1, + 0, + 3 + ] + }, + { + "tileid": 188, + "wangid": [ + 0, + 3, + 0, + 1, + 0, + 3, + 0, + 4 + ] + }, + { + "tileid": 189, + "wangid": [ + 0, + 4, + 0, + 4, + 0, + 1, + 0, + 3 + ] + }, + { + "tileid": 190, + "wangid": [ + 0, + 3, + 0, + 1, + 0, + 4, + 0, + 4 + ] + }, + { + "tileid": 192, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 4, + 0, + 4 + ] + }, + { + "tileid": 194, + "wangid": [ + 0, + 4, + 0, + 4, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 195, + "wangid": [ + 0, + 4, + 0, + 3, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 196, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 3, + 0, + 4 + ] + }, + { + "tileid": 197, + "wangid": [ + 0, + 4, + 0, + 3, + 0, + 3, + 0, + 1 + ] + }, + { + "tileid": 198, + "wangid": [ + 0, + 1, + 0, + 3, + 0, + 3, + 0, + 4 + ] + }, + { + "tileid": 199, + "wangid": [ + 0, + 3, + 0, + 4, + 0, + 3, + 0, + 1 + ] + }, + { + "tileid": 200, + "wangid": [ + 0, + 1, + 0, + 3, + 0, + 4, + 0, + 3 + ] + }, + { + "tileid": 201, + "wangid": [ + 0, + 4, + 0, + 4, + 0, + 3, + 0, + 1 + ] + }, + { + "tileid": 202, + "wangid": [ + 0, + 1, + 0, + 3, + 0, + 4, + 0, + 4 + ] + }, + { + "tileid": 204, + "wangid": [ + 0, + 3, + 0, + 4, + 0, + 4, + 0, + 4 + ] + }, + { + "tileid": 205, + "wangid": [ + 0, + 3, + 0, + 4, + 0, + 4, + 0, + 3 + ] + }, + { + "tileid": 206, + "wangid": [ + 0, + 4, + 0, + 4, + 0, + 4, + 0, + 3 + ] + }, + { + "tileid": 207, + "wangid": [ + 0, + 4, + 0, + 3, + 0, + 4, + 0, + 3 + ] + }, + { + "tileid": 208, + "wangid": [ + 0, + 3, + 0, + 4, + 0, + 3, + 0, + 4 + ] + }, + { + "tileid": 209, + "wangid": [ + 0, + 4, + 0, + 1, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 210, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 1, + 0, + 4 + ] + }, + { + "tileid": 211, + "wangid": [ + 0, + 4, + 0, + 1, + 0, + 4, + 0, + 3 + ] + }, + { + "tileid": 212, + "wangid": [ + 0, + 3, + 0, + 4, + 0, + 1, + 0, + 4 + ] + }, + { + "tileid": 213, + "wangid": [ + 0, + 4, + 0, + 1, + 0, + 1, + 0, + 3 + ] + }, + { + "tileid": 214, + "wangid": [ + 0, + 3, + 0, + 1, + 0, + 1, + 0, + 4 + ] + }, + { + "tileid": 216, + "wangid": [ + 0, + 7, + 0, + 6, + 0, + 7, + 0, + 7 + ] + }, + { + "tileid": 217, + "wangid": [ + 0, + 7, + 0, + 6, + 0, + 6, + 0, + 7 + ] + }, + { + "tileid": 218, + "wangid": [ + 0, + 7, + 0, + 7, + 0, + 6, + 0, + 7 + ] + }, + { + "tileid": 219, + "wangid": [ + 0, + 6, + 0, + 7, + 0, + 6, + 0, + 6 + ] + }, + { + "tileid": 220, + "wangid": [ + 0, + 6, + 0, + 6, + 0, + 7, + 0, + 6 + ] + }, + { + "tileid": 221, + "wangid": [ + 0, + 1, + 0, + 4, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 222, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 4, + 0, + 1 + ] + }, + { + "tileid": 223, + "wangid": [ + 0, + 1, + 0, + 4, + 0, + 3, + 0, + 4 + ] + }, + { + "tileid": 224, + "wangid": [ + 0, + 4, + 0, + 3, + 0, + 4, + 0, + 1 + ] + }, + { + "tileid": 225, + "wangid": [ + 0, + 1, + 0, + 4, + 0, + 3, + 0, + 1 + ] + }, + { + "tileid": 226, + "wangid": [ + 0, + 1, + 0, + 3, + 0, + 4, + 0, + 1 + ] + }, + { + "tileid": 228, + "wangid": [ + 0, + 6, + 0, + 6, + 0, + 7, + 0, + 7 + ] + }, + { + "tileid": 230, + "wangid": [ + 0, + 7, + 0, + 7, + 0, + 6, + 0, + 6 + ] + }, + { + "tileid": 231, + "wangid": [ + 0, + 7, + 0, + 6, + 0, + 6, + 0, + 6 + ] + }, + { + "tileid": 232, + "wangid": [ + 0, + 6, + 0, + 6, + 0, + 6, + 0, + 7 + ] + }, + { + "tileid": 233, + "wangid": [ + 0, + 1, + 0, + 4, + 0, + 4, + 0, + 3 + ] + }, + { + "tileid": 234, + "wangid": [ + 0, + 3, + 0, + 4, + 0, + 4, + 0, + 1 + ] + }, + { + "tileid": 235, + "wangid": [ + 0, + 1, + 0, + 4, + 0, + 1, + 0, + 3 + ] + }, + { + "tileid": 236, + "wangid": [ + 0, + 3, + 0, + 1, + 0, + 4, + 0, + 1 + ] + }, + { + "tileid": 237, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 4, + 0, + 3 + ] + }, + { + "tileid": 238, + "wangid": [ + 0, + 3, + 0, + 4, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 240, + "wangid": [ + 0, + 6, + 0, + 7, + 0, + 7, + 0, + 7 + ] + }, + { + "tileid": 241, + "wangid": [ + 0, + 6, + 0, + 7, + 0, + 7, + 0, + 6 + ] + }, + { + "tileid": 242, + "wangid": [ + 0, + 7, + 0, + 7, + 0, + 7, + 0, + 6 + ] + }, + { + "tileid": 243, + "wangid": [ + 0, + 7, + 0, + 6, + 0, + 7, + 0, + 6 + ] + }, + { + "tileid": 244, + "wangid": [ + 0, + 6, + 0, + 7, + 0, + 6, + 0, + 7 + ] + }, + { + "tileid": 245, + "wangid": [ + 0, + 4, + 0, + 1, + 0, + 3, + 0, + 4 + ] + }, + { + "tileid": 246, + "wangid": [ + 0, + 4, + 0, + 3, + 0, + 1, + 0, + 4 + ] + }, + { + "tileid": 247, + "wangid": [ + 0, + 4, + 0, + 1, + 0, + 3, + 0, + 1 + ] + }, + { + "tileid": 248, + "wangid": [ + 0, + 1, + 0, + 3, + 0, + 1, + 0, + 4 + ] + }, + { + "tileid": 249, + "wangid": [ + 0, + 1, + 0, + 1, + 0, + 3, + 0, + 4 + ] + }, + { + "tileid": 250, + "wangid": [ + 0, + 4, + 0, + 3, + 0, + 1, + 0, + 1 + ] + }, + { + "tileid": 252, + "wangid": [ + 0, + 7, + 0, + 3, + 0, + 7, + 0, + 7 + ] + }, + { + "tileid": 253, + "wangid": [ + 0, + 7, + 0, + 3, + 0, + 3, + 0, + 7 + ] + }, + { + "tileid": 254, + "wangid": [ + 0, + 7, + 0, + 7, + 0, + 3, + 0, + 7 + ] + }, + { + "tileid": 255, + "wangid": [ + 0, + 3, + 0, + 7, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 256, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 7, + 0, + 3 + ] + }, + { + "tileid": 264, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 7, + 0, + 7 + ] + }, + { + "tileid": 266, + "wangid": [ + 0, + 7, + 0, + 7, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 267, + "wangid": [ + 0, + 7, + 0, + 3, + 0, + 3, + 0, + 3 + ] + }, + { + "tileid": 268, + "wangid": [ + 0, + 3, + 0, + 3, + 0, + 3, + 0, + 7 + ] + }, + { + "tileid": 276, + "wangid": [ + 0, + 3, + 0, + 7, + 0, + 7, + 0, + 7 + ] + }, + { + "tileid": 277, + "wangid": [ + 0, + 3, + 0, + 7, + 0, + 7, + 0, + 3 + ] + }, + { + "tileid": 278, + "wangid": [ + 0, + 7, + 0, + 7, + 0, + 7, + 0, + 3 + ] + }, + { + "tileid": 279, + "wangid": [ + 0, + 7, + 0, + 3, + 0, + 7, + 0, + 3 + ] + }, + { + "tileid": 280, + "wangid": [ + 0, + 3, + 0, + 7, + 0, + 3, + 0, + 7 + ] + } + ] + } + ] + } + ], + "tilewidth": 64, + "type": "map", + "version": "1.10", + "width": 50 +} diff --git a/apps/client/src/metadata/probable-waffle/tilemaps/ember_enclave.tmx b/apps/client/src/metadata/probable-waffle/tilemaps/ember_enclave.tmx new file mode 100644 index 00000000..fb29ae18 --- /dev/null +++ b/apps/client/src/metadata/probable-waffle/tilemaps/ember_enclave.tmx @@ -0,0 +1,62 @@ + + + + + + + + + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,6,7,7,7,7,7,7,8,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,6,22,145,146,146,146,146,147,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,18,145,161,12,12,12,12,159,21,8,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,18,157,12,12,12,12,12,160,147,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,18,169,149,12,12,12,12,12,159,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,30,10,169,149,12,12,12,12,159,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,30,10,169,149,12,12,12,159,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,30,10,157,12,12,12,159,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,18,169,149,148,170,171,20,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,30,10,169,171,9,43,32,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,30,31,31,32,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23, + 23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,40,41,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23 + + + From 4e2a5e19b9fd1c2c2dc2bfcc063c838cd29cabbb Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Mon, 18 Dec 2023 19:06:32 +0100 Subject: [PATCH 004/138] Handlers to separate classes --- ...berEnclave.scene => MapEmberEnclave.scene} | 6 +- .../{EmberEnclave.ts => MapEmberEnclave.ts} | 17 +- .../game/scenes/MapRiverCrossing.ts | 138 +------------ .../game/scenes/PreloadProbableWaffle.ts | 2 +- .../game/world/const/game-config.ts | 3 +- .../input/DEPRECATED_input.handler.ts | 182 ++++++++++++++++++ .../controllers/input/input.handler.ts | 92 ++++++--- .../world/map/DEPRECATED_scale.handler.ts | 47 +++++ .../game/world/map/depth.helper.ts | 20 ++ .../game/world/map/scale.handler.ts | 46 +++-- .../game/world/map/vision/lights.handler.ts | 62 ++++++ .../game/world/scenes/grassland.scene.ts | 12 +- 12 files changed, 442 insertions(+), 185 deletions(-) rename apps/client/src/app/probable-waffle/game/scenes/{EmberEnclave.scene => MapEmberEnclave.scene} (98%) rename apps/client/src/app/probable-waffle/game/scenes/{EmberEnclave.ts => MapEmberEnclave.ts} (83%) create mode 100644 apps/client/src/app/probable-waffle/game/world/managers/controllers/input/DEPRECATED_input.handler.ts create mode 100644 apps/client/src/app/probable-waffle/game/world/map/DEPRECATED_scale.handler.ts create mode 100644 apps/client/src/app/probable-waffle/game/world/map/depth.helper.ts create mode 100644 apps/client/src/app/probable-waffle/game/world/map/vision/lights.handler.ts diff --git a/apps/client/src/app/probable-waffle/game/scenes/EmberEnclave.scene b/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.scene similarity index 98% rename from apps/client/src/app/probable-waffle/game/scenes/EmberEnclave.scene rename to apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.scene index fb78eac7..08ccc78b 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/EmberEnclave.scene +++ b/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.scene @@ -7,7 +7,7 @@ "autoImport": true, "preloadPackFiles": [], "createMethodName": "editorCreate", - "sceneKey": "EmberEnclave", + "sceneKey": "MapEmberEnclave", "compilerOutputLanguage": "TYPE_SCRIPT", "borderWidth": 1280, "borderHeight": 720 @@ -54,8 +54,8 @@ "y" ], "label": "blockObsidianLava4", - "x": 192, - "y": 560 + "x": 208, + "y": 544 }, { "prefabId": "ec58b20e-e04f-4bd4-8401-856e1e433f46", diff --git a/apps/client/src/app/probable-waffle/game/scenes/EmberEnclave.ts b/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.ts similarity index 83% rename from apps/client/src/app/probable-waffle/game/scenes/EmberEnclave.ts rename to apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.ts index 6b46a140..ad1f4104 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/EmberEnclave.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.ts @@ -18,11 +18,16 @@ import TivaraWorkerFemale from "../prefabs/characters/tivara/TivaraWorkerFemale" import TivaraWorkerMale from "../prefabs/characters/tivara/TivaraWorkerMale"; import WorkMill from "../prefabs/buildings/tivara/WorkMill"; /* START-USER-IMPORTS */ +import { ScaleHandler } from "../world/map/scale.handler"; +import { InputHandler } from "../world/managers/controllers/input/input.handler"; +import { LightsHandler } from "../world/map/vision/lights.handler"; +import { DepthHelper } from "../world/map/depth.helper"; +import { AnimatedTilemap } from "./AnimatedTile"; /* END-USER-IMPORTS */ -export default class EmberEnclave extends Phaser.Scene { +export default class MapEmberEnclave extends Phaser.Scene { constructor() { - super("EmberEnclave"); + super("MapEmberEnclave"); /* START-USER-CTR-CODE */ // Write your code here. @@ -46,7 +51,7 @@ export default class EmberEnclave extends Phaser.Scene { this.add.existing(bushDownwardsLarge); // blockObsidianLava4 - const blockObsidianLava4 = new BlockObsidianLava4(this, 192, 560); + const blockObsidianLava4 = new BlockObsidianLava4(this, 208, 544); this.add.existing(blockObsidianLava4); // tree6 @@ -114,6 +119,12 @@ export default class EmberEnclave extends Phaser.Scene { create() { this.editorCreate(); + + new ScaleHandler(this, this.tilemap, { margins: { left: 150, bottom: 100 }, maxLayers: 8 }); + new InputHandler(this); + new LightsHandler(this, { enableLights: false }); + new DepthHelper(this); + new AnimatedTilemap(this, this.tilemap, this.tilemap.tilesets); } /* END-USER-CODE */ diff --git a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts index 32a64446..846279a2 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts @@ -2,7 +2,7 @@ /* START OF COMPILED CODE */ -import Phaser, { Input } from "phaser"; +import Phaser from "phaser"; import Tree7 from "../prefabs/outside/foliage/trees/resources/Tree7"; import Sandhold from "../prefabs/buildings/tivara/Sandhold"; import Owlery from "../prefabs/buildings/skaduwee/Owlery"; @@ -48,9 +48,11 @@ import BlockStoneWater1 from "../prefabs/outside/nature/block_stone_water/BlockS import BlockStoneWater4 from "../prefabs/outside/nature/block_stone_water/BlockStoneWater4"; import BlockStoneWater3 from "../prefabs/outside/nature/block_stone_water/BlockStoneWater3"; /* START-USER-IMPORTS */ -import ActorContainer from "../entity/actor/ActorContainer"; import { AnimatedTilemap } from "./AnimatedTile"; +import { ScaleHandler } from "../world/map/scale.handler"; import { InputHandler } from "../world/managers/controllers/input/input.handler"; +import { LightsHandler } from "../world/map/vision/lights.handler"; +import { DepthHelper } from "../world/map/depth.helper"; /* END-USER-IMPORTS */ export default class MapRiverCrossing extends Phaser.Scene { @@ -439,136 +441,14 @@ export default class MapRiverCrossing extends Phaser.Scene { private tilemap!: Phaser.Tilemaps.Tilemap; /* START-USER-CODE */ - private cursors!: Phaser.Types.Input.Keyboard.CursorKeys; - private controlConfig!: Phaser.Types.Cameras.Controls.FixedKeyControlConfig; - private controls!: Phaser.Cameras.Controls.FixedKeyControl; - - preload(): void { - this.preloadCursors(); - } - create() { this.editorCreate(); - this.handleCursors(); - this.handleCameraCenter(); - this.handleZSort(); - this.zoomWithScroll(); - // this.enableLights(); - new AnimatedTilemap(this, this.tilemap, this.tilemap.tilesets); - new InputHandler(this.input, this.cameras.main); - this.events.once("shutdown", this.destroy, this); - } - - private preloadCursors() { - this.cursors = this.input.keyboard!.createCursorKeys(); - } - - private handleCursors() { - this.controlConfig = { - camera: this.cameras.main, - left: this.cursors.left, - right: this.cursors.right, - up: this.cursors.up, - down: this.cursors.down, - speed: 2 - }; - this.controls = new Phaser.Cameras.Controls.FixedKeyControl(this.controlConfig); - } - - enableLights = () => { - // add lights2d pipeline to all children - this.children.each((child: any) => { - if (child.setPipeline) { - child.setPipeline("Light2D"); - } - // if instanceOf ActorContainer, then add lights2d pipeline to all children of the container - if (child instanceof ActorContainer) { - child.each((child: any) => { - if (child.setPipeline) { - child.setPipeline("Light2D"); - } - }); - } - }); - - this.lights.enable(); - this.lights.setAmbientColor(0x808080); - - const spotlight = this.lights.addLight(400, 300, 280).setIntensity(2); - - this.input.on("pointermove", (pointer: any) => { - const cameraX = this.cameras.main.scrollX; - const cameraY = this.cameras.main.scrollY; - const zoom = this.cameras.main.zoom; - - // Adjust the pointer position based on the inverse of the zoom - const adjustedPointerX = (pointer.x + cameraX) / zoom; - const adjustedPointerY = (pointer.y + cameraY) / zoom; - - spotlight.x = adjustedPointerX; - spotlight.y = adjustedPointerY; - }); - - spotlight.setColor(0xffffff); - }; - - handleZSort = () => { - this.children.each((child: any) => { - if (!child.setDepth) return; - child.setDepth(child.y); - if (child instanceof ActorContainer) { - const z = child.z; - child.setDepth(child.y + z * 2); - } - }); - }; - handleCameraCenter = () => { - // set camera to the center of isometric tilemap - - const maxMapLayers = 8; - // noinspection UnnecessaryLocalVariableJS - const topMarginDueToMapLayers = maxMapLayers * 32; - const topMargin = topMarginDueToMapLayers; - // noinspection UnnecessaryLocalVariableJS - const leftMarginDueToHud = 150; - const leftMargin = leftMarginDueToHud; - // noinspection UnnecessaryLocalVariableJS - const bottomMarginDueToHud = 100; - const bottomMargin = bottomMarginDueToHud; - const mapLeft = -this.tilemap.widthInPixels / 2 - leftMargin; - const mapRight = +this.tilemap.widthInPixels / 2; - const mapTop = -topMargin; - const mapBottom = this.tilemap.heightInPixels + bottomMargin; - - this.cameras.main.setBounds(mapLeft, mapTop, mapRight - mapLeft, mapBottom - mapTop, true); - }; - - zoomWithScroll = () => { - this.input.on(Input.Events.POINTER_WHEEL, this.zoomWithScrollHandler); - }; - - zoomWithScrollHandler = (pointer: any, gameObjects: any, deltaX: any, deltaY: any, deltaZ: any) => { - if (deltaY > 0) { - this.cameras.main.zoom -= 0.1; - } else { - this.cameras.main.zoom += 0.1; - } - // calculate min-zoom by map size - const minZoom = Math.min( - this.cameras.main.width / this.tilemap.widthInPixels, - this.cameras.main.height / this.tilemap.heightInPixels - ); - if (this.cameras.main.zoom < minZoom) this.cameras.main.zoom = minZoom; - if (this.cameras.main.zoom > 10) this.cameras.main.zoom = 10; - }; - - update(time: number, delta: number): void { - this.controls.update(delta); - } - - private destroy() { - this.input.off("wheel", this.zoomWithScrollHandler); + new ScaleHandler(this, this.tilemap, { margins: { left: 150, bottom: 100 }, maxLayers: 8 }); + new InputHandler(this); + new LightsHandler(this, { enableLights: false }); + new DepthHelper(this); + new AnimatedTilemap(this, this.tilemap, this.tilemap.tilesets); } /* END-USER-CODE */ diff --git a/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.ts b/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.ts index 5f7c89b3..918b9443 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.ts @@ -64,7 +64,7 @@ export default class PreloadProbableWaffle extends Phaser.Scene { getMap(): MapType { // eslint-disable-next-line prefer-const - let mapId = 1; // todo get from somewhere else + let mapId = 2; // todo get from somewhere else switch (mapId) { case 1: return { diff --git a/apps/client/src/app/probable-waffle/game/world/const/game-config.ts b/apps/client/src/app/probable-waffle/game/world/const/game-config.ts index 620fb089..317d8b9e 100644 --- a/apps/client/src/app/probable-waffle/game/world/const/game-config.ts +++ b/apps/client/src/app/probable-waffle/game/world/const/game-config.ts @@ -4,11 +4,12 @@ import { baseGameConfig } from "../../../../shared/game/base-game.config"; import MapRiverCrossing from "../../scenes/MapRiverCrossing"; import PreloadProbableWaffle from "../../scenes/PreloadProbableWaffle"; import { Boot } from "../../scenes/Boot"; +import MapEmberEnclave from "../../scenes/MapEmberEnclave"; export const probableWaffleGameConfig: Types.Core.GameConfig = { ...baseGameConfig, // scene: [GrasslandScene, PlaygroundScene], - scene: [Boot, PreloadProbableWaffle, MapRiverCrossing], + scene: [Boot, PreloadProbableWaffle, MapRiverCrossing, MapEmberEnclave], physics: { default: "arcade", arcade: { diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/DEPRECATED_input.handler.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/DEPRECATED_input.handler.ts new file mode 100644 index 00000000..d4844720 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/DEPRECATED_input.handler.ts @@ -0,0 +1,182 @@ +import { Cameras, Geom, Input, Types } from "phaser"; + +export class DEPRECATED_inputHandler { + private readonly enabledMouseCornerMovement = false; + private readonly input: Input.InputPlugin; + private readonly mainCamera: Cameras.Scene2D.Camera; + private cursorOverGameInstance = false; + private keyboardMovementControls: Cameras.Controls.FixedKeyControl | null = null; + private readonly cameraEdgeMovementSpeed = 5; + private readonly cameraEdgeMargin = 30; + private readonly cameraMinZoom = 30; + private readonly cameraMaxZoom = 0.3; + private readonly recommendedZoom = 1; + private readonly cameraZoomFactor = 0.1; + + constructor(input: Input.InputPlugin, mainCamera: Cameras.Scene2D.Camera) { + this.input = input; + this.mainCamera = mainCamera; + this.createKeyboardControls(); + this.zoomListener(); + this.zoomToDefault(); + this.screenEdgeListener(); + } + + /** + * Detect if camera is out of bounds + */ + get isCameraOutOfBounds(): boolean { + // detect if camera is out of bounds + const cameraBounds = this.mainCamera.getBounds(); + const cameraWorldView = this.recalculateCameraWorldView(); + return ( + cameraWorldView.right > cameraBounds.right || + cameraWorldView.bottom > cameraBounds.bottom || + cameraWorldView.left < cameraBounds.left || + cameraWorldView.top < cameraBounds.top + ); + } + + update(time: number, delta: number) { + this.keyboardMovementControls?.update(delta); + this.screenEdgeMovementUpdate(); + } + + destroy() { + this.input.off(Input.Events.POINTER_WHEEL); + this.input.off(Input.Events.GAME_OUT); + this.input.off(Input.Events.GAME_OVER); + this.keyboardMovementControls?.destroy(); + } + + private createKeyboardControls() { + if (!this.input.keyboard) return; + const cursors = this.input.keyboard.createCursorKeys(); + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const wasdKeys = this.input.keyboard.addKeys({ + up: Input.Keyboard.KeyCodes.W, + left: Input.Keyboard.KeyCodes.A, + down: Input.Keyboard.KeyCodes.S, + right: Input.Keyboard.KeyCodes.D + }) satisfies Partial; + + // wasdKey can also be used here + const controlConfig: Types.Cameras.Controls.FixedKeyControlConfig = { + camera: this.mainCamera, + left: cursors.left, + right: cursors.right, + up: cursors.up, + down: cursors.down, + speed: 1 + }; + + this.keyboardMovementControls = new Cameras.Controls.FixedKeyControl(controlConfig); + } + + private screenEdgeMovementUpdate() { + if (!this.enabledMouseCornerMovement) return; + if (!this.cursorOverGameInstance) return; + + const pointer = this.input.activePointer; + if (pointer.x < this.cameraEdgeMargin) { + this.mainCamera.scrollX -= this.cameraEdgeMovementSpeed; + } + if (pointer.x > this.mainCamera.width - this.cameraEdgeMargin) { + this.mainCamera.scrollX += this.cameraEdgeMovementSpeed; + } + if (pointer.y < this.cameraEdgeMargin) { + this.mainCamera.scrollY -= this.cameraEdgeMovementSpeed; + } + if (pointer.y > this.mainCamera.height - this.cameraEdgeMargin) { + this.mainCamera.scrollY += this.cameraEdgeMovementSpeed; + } + } + + private zoomListener() { + this.input.on( + Input.Events.POINTER_WHEEL, + (pointer: Input.Pointer, gameObjects: unknown, deltaX: number, deltaY: number, deltaZ: number) => { + if (deltaY > 0) { + this.zoomOutByFactor(); + } + + if (deltaY < 0) { + // zoom in + const newZoom = this.mainCamera.zoom + this.cameraZoomFactor; + if (newZoom < this.cameraMinZoom) { + this.mainCamera.zoom = newZoom; + } + } + } + ); + } + + /** + * @returns {boolean} true if camera is zoomed out + */ + private zoomOutByFactor(): boolean { + const newZoom = this.mainCamera.zoom - this.cameraZoomFactor; + if (newZoom > this.cameraMaxZoom) { + this.mainCamera.zoom = newZoom; + } + + if (this.isCameraOutOfBounds) { + // if out of bounds, zoom back in + this.mainCamera.zoom += this.cameraZoomFactor; + return false; + } + return true; + } + + /** + * Zoom related + * So when the camera is zoomed out, we re-calc camera "worldView" so bounds can be checked. + * This worldView is recalculated in Phaser.Cameras.Scene2D.Camera#preRender, but that is too late. + * This is where the code is taken from. + */ + private recalculateCameraWorldView(): Geom.Rectangle { + const width = this.mainCamera.width; + const height = this.mainCamera.height; + + const halfWidth = width * 0.5; + const halfHeight = height * 0.5; + + const zoomX = this.mainCamera.zoomX; + const zoomY = this.mainCamera.zoomY; + + let sx = this.mainCamera.scrollX; + let sy = this.mainCamera.scrollY; + + if (this.mainCamera.useBounds) { + sx = this.mainCamera.clampX(sx); + sy = this.mainCamera.clampY(sy); + } + + const midX = sx + halfWidth; + const midY = sy + halfHeight; + + const displayWidth = width / zoomX; + const displayHeight = height / zoomY; + + return new Geom.Rectangle(midX - displayWidth / 2, midY - displayHeight / 2, displayWidth, displayHeight); + } + + private screenEdgeListener() { + this.input.on(Input.Events.GAME_OUT, () => { + this.cursorOverGameInstance = false; + }); + this.input.on(Input.Events.GAME_OVER, () => { + this.cursorOverGameInstance = true; + }); + } + + /** + * Zooms to recommended zoom. It ensures that camera doesn't go out of bounds + */ + private zoomToDefault() { + this.mainCamera.setZoom(this.cameraMinZoom); + while (this.mainCamera.zoom > this.recommendedZoom && this.zoomOutByFactor()) { + // zoom out until camera is out of bounds or we reached recommended zoom + } + } +} diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/input.handler.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/input.handler.ts index e6fc2a7d..cfed7868 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/input.handler.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/input.handler.ts @@ -2,24 +2,36 @@ import { Cameras, Geom, Input, Types } from "phaser"; export class InputHandler { private readonly enabledMouseCornerMovement = false; + private readonly lockToScreen = false; // todo could be enabled later private readonly input: Input.InputPlugin; private readonly mainCamera: Cameras.Scene2D.Camera; private cursorOverGameInstance = false; private keyboardMovementControls: Cameras.Controls.FixedKeyControl | null = null; - private readonly cameraEdgeMovementSpeed = 5; private readonly cameraEdgeMargin = 30; private readonly cameraMinZoom = 30; private readonly cameraMaxZoom = 0.3; private readonly recommendedZoom = 1; private readonly cameraZoomFactor = 0.1; - constructor(input: Input.InputPlugin, mainCamera: Cameras.Scene2D.Camera) { - this.input = input; - this.mainCamera = mainCamera; + constructor( + private readonly scene: Phaser.Scene, + private readonly config: { + cameraEdgeMovementSpeed: number; + cameraKeyboardMovementSpeed: number; + } = { + cameraEdgeMovementSpeed: 5, + cameraKeyboardMovementSpeed: 2 + } + ) { + this.mainCamera = scene.cameras.main; + this.input = scene.input; this.createKeyboardControls(); this.zoomListener(); this.zoomToDefault(); this.screenEdgeListener(); + this.lockCursorToScreen(); + this.scene.events.on("update", this.update, this); + this.scene.events.on("shutdown", this.destroy, this); } /** @@ -43,9 +55,9 @@ export class InputHandler { } destroy() { - this.input.off(Input.Events.POINTER_WHEEL); this.input.off(Input.Events.GAME_OUT); this.input.off(Input.Events.GAME_OVER); + this.input.off(Input.Events.POINTER_WHEEL, this.zoomWithScrollHandler); this.keyboardMovementControls?.destroy(); } @@ -67,7 +79,7 @@ export class InputHandler { right: cursors.right, up: cursors.up, down: cursors.down, - speed: 1 + speed: this.config.cameraKeyboardMovementSpeed }; this.keyboardMovementControls = new Cameras.Controls.FixedKeyControl(controlConfig); @@ -79,36 +91,41 @@ export class InputHandler { const pointer = this.input.activePointer; if (pointer.x < this.cameraEdgeMargin) { - this.mainCamera.scrollX -= this.cameraEdgeMovementSpeed; + this.mainCamera.scrollX -= this.config.cameraEdgeMovementSpeed; } if (pointer.x > this.mainCamera.width - this.cameraEdgeMargin) { - this.mainCamera.scrollX += this.cameraEdgeMovementSpeed; + this.mainCamera.scrollX += this.config.cameraEdgeMovementSpeed; } if (pointer.y < this.cameraEdgeMargin) { - this.mainCamera.scrollY -= this.cameraEdgeMovementSpeed; + this.mainCamera.scrollY -= this.config.cameraEdgeMovementSpeed; } if (pointer.y > this.mainCamera.height - this.cameraEdgeMargin) { - this.mainCamera.scrollY += this.cameraEdgeMovementSpeed; + this.mainCamera.scrollY += this.config.cameraEdgeMovementSpeed; } } private zoomListener() { - this.input.on( - Input.Events.POINTER_WHEEL, - (pointer: Input.Pointer, gameObjects: unknown, deltaX: number, deltaY: number, deltaZ: number) => { - if (deltaY > 0) { - this.zoomOutByFactor(); - } + this.input.on(Input.Events.POINTER_WHEEL, this.zoomWithScrollHandler, this); + } - if (deltaY < 0) { - // zoom in - const newZoom = this.mainCamera.zoom + this.cameraZoomFactor; - if (newZoom < this.cameraMinZoom) { - this.mainCamera.zoom = newZoom; - } - } + private zoomWithScrollHandler( + pointer: Input.Pointer, + gameObjects: unknown, + deltaX: number, + deltaY: number, + deltaZ: number + ) { + if (deltaY > 0) { + this.zoomOutByFactor(); + } + + if (deltaY < 0) { + // zoom in + const newZoom = this.mainCamera.zoom + this.cameraZoomFactor; + if (newZoom < this.cameraMinZoom) { + this.mainCamera.zoom = newZoom; } - ); + } } /** @@ -179,4 +196,31 @@ export class InputHandler { // zoom out until camera is out of bounds or we reached recommended zoom } } + + /** + * https://phaser.io/examples/v3/view/input/mouse/pointer-lock + * https://web.dev/articles/pointerlock-intro + */ + private lockCursorToScreen() { + if (!this.lockToScreen) return; + if (this.input.keyboard && this.input.mouse) { + this.input.on("pointerdown", () => { + if (this.input.mouse && !this.input.mouse.locked) { + this.input.mouse?.requestPointerLock(); + } + }); + this.input.manager.events.on("pointerlockchange", (event: any) => { + const pointerIsLocked = this.input.mouse?.locked; + console.log("pointerIsLocked", pointerIsLocked); + }); + + // on esc, release pointer lock + this.input.keyboard.on("keydown_ESC", () => { + // todo maybe change this event + if (this.input.mouse?.locked) { + this.input.mouse.releasePointerLock(); + } + }); + } + } } diff --git a/apps/client/src/app/probable-waffle/game/world/map/DEPRECATED_scale.handler.ts b/apps/client/src/app/probable-waffle/game/world/map/DEPRECATED_scale.handler.ts new file mode 100644 index 00000000..8288e437 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/world/map/DEPRECATED_scale.handler.ts @@ -0,0 +1,47 @@ +import { MapDefinitions, MapSizeInfo } from "../const/map-size.info"; +import { Cameras, Scale, Structs } from "phaser"; + +export class DEPRECATED_scaleHandler { + private readonly mainCamera: Cameras.Scene2D.Camera; + private scaleManager: Scale.ScaleManager; + private cameras: Cameras.Scene2D.CameraManager; + + constructor(cameras: Cameras.Scene2D.CameraManager, scaleManager: Scale.ScaleManager) { + this.cameras = cameras; + this.mainCamera = cameras.main; + this.scaleManager = scaleManager; + this.setupBounds(true); // todo now center for dev + this.setupResizeListener(); + } + + setupResizeListener() { + this.scaleManager.on(Scale.Events.RESIZE, this.resize, this); + } + + setupBounds(centerOn: boolean = false) { + const xOffset = MapSizeInfo.info.tileWidthHalf; + const yOffset = MapSizeInfo.info.tileHeight; + + const layersOffsetY = MapSizeInfo.info.tileHeight * (MapDefinitions.nrLayers + 1); + + this.mainCamera.setBounds( + -MapSizeInfo.info.widthInPixels / 2 + xOffset, + yOffset - layersOffsetY, + MapSizeInfo.info.widthInPixels, + MapSizeInfo.info.heightInPixels + layersOffsetY, + centerOn + ); + } + + destroy() { + this.scaleManager.off(Scale.Events.RESIZE); + } + + /** + * * When the screen is resized + */ + private resize(gameSize: Structs.Size): void { + this.cameras.resize(gameSize.width, gameSize.height); + this.setupBounds(true); // todo now center for dev + } +} diff --git a/apps/client/src/app/probable-waffle/game/world/map/depth.helper.ts b/apps/client/src/app/probable-waffle/game/world/map/depth.helper.ts new file mode 100644 index 00000000..ca816195 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/world/map/depth.helper.ts @@ -0,0 +1,20 @@ +import ActorContainer from "../../entity/actor/ActorContainer"; + +export class DepthHelper { + constructor(private readonly scene: Phaser.Scene) { + this.handleSortOfStaticObjects(); + } + + private handleSortOfStaticObjects = () => { + const children = this.scene.children; + children.each((child: any) => { + if (!child.setDepth) return; + const childWithDepth = child as Phaser.GameObjects.Components.Depth; + childWithDepth.setDepth(child.y); + if (child instanceof ActorContainer) { + const z = child.z; + child.setDepth(child.y + z * 2); + } + }); + }; +} diff --git a/apps/client/src/app/probable-waffle/game/world/map/scale.handler.ts b/apps/client/src/app/probable-waffle/game/world/map/scale.handler.ts index e0b63445..6bb04254 100644 --- a/apps/client/src/app/probable-waffle/game/world/map/scale.handler.ts +++ b/apps/client/src/app/probable-waffle/game/world/map/scale.handler.ts @@ -1,15 +1,25 @@ -import { MapDefinitions, MapSizeInfo } from '../const/map-size.info'; -import { Cameras, Scale, Structs } from 'phaser'; +import { MapSizeInfo } from "../const/map-size.info"; +import { Cameras, Scale, Structs } from "phaser"; export class ScaleHandler { private readonly mainCamera: Cameras.Scene2D.Camera; private scaleManager: Scale.ScaleManager; private cameras: Cameras.Scene2D.CameraManager; - constructor(cameras: Cameras.Scene2D.CameraManager, scaleManager: Scale.ScaleManager) { - this.cameras = cameras; - this.mainCamera = cameras.main; - this.scaleManager = scaleManager; + constructor( + scene: Phaser.Scene, + private readonly tilemap: Phaser.Tilemaps.Tilemap, + private readonly config: { + margins: { + bottom: number; + left: number; + }; + maxLayers: number; + } + ) { + this.cameras = scene.cameras; + this.mainCamera = this.cameras.main; + this.scaleManager = scene.scale; this.setupBounds(true); // todo now center for dev this.setupResizeListener(); } @@ -19,18 +29,18 @@ export class ScaleHandler { } setupBounds(centerOn: boolean = false) { - const xOffset = MapSizeInfo.info.tileWidthHalf; - const yOffset = MapSizeInfo.info.tileHeight; - - const layersOffsetY = MapSizeInfo.info.tileHeight * (MapDefinitions.nrLayers + 1); - - this.mainCamera.setBounds( - -MapSizeInfo.info.widthInPixels / 2 + xOffset, - yOffset - layersOffsetY, - MapSizeInfo.info.widthInPixels, - MapSizeInfo.info.heightInPixels + layersOffsetY, - centerOn - ); + const maxMapLayers = this.config.maxLayers; + // noinspection UnnecessaryLocalVariableJS + const topMarginDueToMapLayers = maxMapLayers * MapSizeInfo.info.tileHeight; + const topMargin = topMarginDueToMapLayers; + const leftMargin = this.config.margins.left; + const bottomMargin = this.config.margins.bottom; + const mapLeft = -this.tilemap.widthInPixels / 2 - leftMargin; + const mapRight = +this.tilemap.widthInPixels / 2; + const mapTop = -topMargin; + const mapBottom = this.tilemap.heightInPixels + bottomMargin; + + this.mainCamera.setBounds(mapLeft, mapTop, mapRight - mapLeft, mapBottom - mapTop, centerOn); } destroy() { diff --git a/apps/client/src/app/probable-waffle/game/world/map/vision/lights.handler.ts b/apps/client/src/app/probable-waffle/game/world/map/vision/lights.handler.ts new file mode 100644 index 00000000..b7eb6471 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/world/map/vision/lights.handler.ts @@ -0,0 +1,62 @@ +import ActorContainer from "../../../entity/actor/ActorContainer"; + +export class LightsHandler { + private lights!: Phaser.GameObjects.LightsManager; + + constructor( + private readonly scene: Phaser.Scene, + config: { + enableLights: boolean; + } = { + enableLights: true + } + ) { + if (!config.enableLights) return; + this.lights = this.scene.lights; + + this.enableLights(); + this.moveLightToPointer(); + } + + enableLights = () => { + const children = this.scene.children; + + // add lights2d pipeline to all children + children.each((child: any) => { + if (child.setPipeline) { + child.setPipeline("Light2D"); + } + // if instanceOf ActorContainer, then add lights2d pipeline to all children of the container + if (child instanceof ActorContainer) { + child.each((child: any) => { + if (child.setPipeline) { + child.setPipeline("Light2D"); + } + }); + } + }); + + this.lights.enable(); + this.lights.setAmbientColor(0x808080); + }; + + moveLightToPointer = () => { + const spotlight = this.lights.addLight(0, 0, 280).setIntensity(2).setColor(0xffffff); + + const mainCamera = this.scene.cameras.main; + const input = this.scene.input; + + input.on("pointermove", (pointer: any) => { + const cameraX = mainCamera.scrollX; + const cameraY = mainCamera.scrollY; + const zoom = mainCamera.zoom; + + // Adjust the pointer position based on the inverse of the zoom + const adjustedPointerX = (pointer.x + cameraX) / zoom; + const adjustedPointerY = (pointer.y + cameraY) / zoom; + + spotlight.x = adjustedPointerX; + spotlight.y = adjustedPointerY; + }); + }; +} diff --git a/apps/client/src/app/probable-waffle/game/world/scenes/grassland.scene.ts b/apps/client/src/app/probable-waffle/game/world/scenes/grassland.scene.ts index 0fb25955..4b071d54 100644 --- a/apps/client/src/app/probable-waffle/game/world/scenes/grassland.scene.ts +++ b/apps/client/src/app/probable-waffle/game/world/scenes/grassland.scene.ts @@ -5,8 +5,8 @@ import { SceneCommunicatorService } from "../../../communicators/scene-communicator.service"; import { CreateSceneFromObjectConfig } from "../../../../shared/game/phaser/scene/scene-config.interface"; -import { InputHandler } from "../managers/controllers/input/input.handler"; -import { ScaleHandler } from "../map/scale.handler"; +import { DEPRECATED_inputHandler } from "../managers/controllers/input/DEPRECATED_input.handler"; +import { DEPRECATED_scaleHandler } from "../map/DEPRECATED_scale.handler"; import { MapDefinitions, TileDefinitions } from "../const/map-size.info"; import { CursorHandler } from "../managers/controllers/input/cursor.handler"; import { TilemapInputHandler, TilePlacementData } from "../managers/controllers/input/tilemap/tilemap-input.handler"; @@ -58,8 +58,8 @@ export interface TilemapToAtlasMap { } export class GrasslandScene extends Scene implements CreateSceneFromObjectConfig { - private inputHandler!: InputHandler; - private scaleHandler!: ScaleHandler; + private inputHandler!: DEPRECATED_inputHandler; + private scaleHandler!: DEPRECATED_scaleHandler; private cursorHandler!: CursorHandler; private tilemapInputHandler!: TilemapInputHandler; private manualTileInputHandler!: ManualTileInputHandler; @@ -177,8 +177,8 @@ export class GrasslandScene extends Scene implements CreateSceneFromObjectConfig this.dynamicObjectHelper.createDynamicObjectLayer(); // input handling - this.scaleHandler = new ScaleHandler(this.cameras, this.scale); - this.inputHandler = new InputHandler(this.input, this.cameras.main); + this.scaleHandler = new DEPRECATED_scaleHandler(this.cameras, this.scale); + this.inputHandler = new DEPRECATED_inputHandler(this.input, this.cameras.main); this.cursorHandler = new CursorHandler(this.input); this.tilemapInputHandler = new TilemapInputHandler(this.mapHelper.tilemapLayer); this.manualTileInputHandler = new ManualTileInputHandler(this, this.mapHelper.manualLayers); From 6accf97ecb6dd029966b791418f566b8c930dcc5 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Mon, 18 Dec 2023 19:08:15 +0100 Subject: [PATCH 005/138] Extend base scene --- .../src/app/probable-waffle/game/scenes/MapEmberEnclave.scene | 1 + .../src/app/probable-waffle/game/scenes/MapEmberEnclave.ts | 4 ++-- .../app/probable-waffle/game/scenes/MapRiverCrossing.scene | 1 + .../src/app/probable-waffle/game/scenes/MapRiverCrossing.ts | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.scene b/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.scene index 08ccc78b..505b802f 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.scene +++ b/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.scene @@ -5,6 +5,7 @@ "snapEnabled": true, "exportClass": true, "autoImport": true, + "superClassName": "BaseScene", "preloadPackFiles": [], "createMethodName": "editorCreate", "sceneKey": "MapEmberEnclave", diff --git a/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.ts b/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.ts index ad1f4104..efb19ef4 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.ts @@ -2,7 +2,6 @@ /* START OF COMPILED CODE */ -import Phaser from "phaser"; import BlockObsidianLava5 from "../prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava5"; import BushDownwardsLarge from "../prefabs/outside/foliage/bushes/BushDownwardsLarge"; import BlockObsidianLava4 from "../prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava4"; @@ -23,9 +22,10 @@ import { InputHandler } from "../world/managers/controllers/input/input.handler" import { LightsHandler } from "../world/map/vision/lights.handler"; import { DepthHelper } from "../world/map/depth.helper"; import { AnimatedTilemap } from "./AnimatedTile"; +import { BaseScene } from "../../../shared/game/phaser/scene/base.scene"; /* END-USER-IMPORTS */ -export default class MapEmberEnclave extends Phaser.Scene { +export default class MapEmberEnclave extends BaseScene { constructor() { super("MapEmberEnclave"); diff --git a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene index da6c421e..0144b417 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene +++ b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene @@ -5,6 +5,7 @@ "snapEnabled": true, "exportClass": true, "autoImport": true, + "superClassName": "BaseScene", "preloadPackFiles": [], "createMethodName": "editorCreate", "sceneKey": "MapRiverCrossing", diff --git a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts index 846279a2..a30916ea 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts @@ -2,7 +2,6 @@ /* START OF COMPILED CODE */ -import Phaser from "phaser"; import Tree7 from "../prefabs/outside/foliage/trees/resources/Tree7"; import Sandhold from "../prefabs/buildings/tivara/Sandhold"; import Owlery from "../prefabs/buildings/skaduwee/Owlery"; @@ -53,9 +52,10 @@ import { ScaleHandler } from "../world/map/scale.handler"; import { InputHandler } from "../world/managers/controllers/input/input.handler"; import { LightsHandler } from "../world/map/vision/lights.handler"; import { DepthHelper } from "../world/map/depth.helper"; +import { BaseScene } from "../../../shared/game/phaser/scene/base.scene"; /* END-USER-IMPORTS */ -export default class MapRiverCrossing extends Phaser.Scene { +export default class MapRiverCrossing extends BaseScene { constructor() { super("MapRiverCrossing"); From af0fca991de46aafc3e096330818ea167f2e1306 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Mon, 18 Dec 2023 20:25:27 +0100 Subject: [PATCH 006/138] Passing info to scene --- apps/client/src/app/app.module.ts | 34 +++++------ .../game/scenes/MapEmberEnclave.scene | 2 +- .../game/scenes/MapEmberEnclave.ts | 27 ++++++++- .../game/scenes/MapRiverCrossing.scene | 2 +- .../game/scenes/MapRiverCrossing.ts | 27 ++++++++- .../game/scenes/PreloadProbableWaffle.ts | 58 +++++++++++-------- .../probable-waffle-communicator.service.ts | 30 ++++++++++ .../game/scenes/probable-waffle-game-data.ts | 9 +++ .../gui/campaign/campaign.component.html | 2 +- .../gui/editor/editor.component.html | 20 ------- .../gui/editor/editor.component.scss | 20 ------- .../gui/editor/editor.component.spec.ts | 26 --------- .../gui/editor/editor.component.ts | 42 -------------- .../gui/game-interface/main/level.guard.ts | 21 +++++++ .../probable-waffle-game-routing.module.ts | 14 +++-- .../main/probable-waffle-game.component.ts | 25 +++++--- .../home-page-nav.component.html | 3 - .../main/probable-waffle-routing.module.ts | 43 ++++++-------- .../gui/main/probable-waffle.module.ts | 34 ++++++----- ...probable-waffle-coming-soon.component.html | 7 +++ ...probable-waffle-coming-soon.component.scss | 0 ...bable-waffle-coming-soon.component.spec.ts | 22 +++++++ .../probable-waffle-coming-soon.component.ts | 9 +++ libs/api-interfaces/src/fly-squasher.ts | 9 +++ libs/api-interfaces/src/game-instance.ts | 13 +++++ libs/api-interfaces/src/index.ts | 36 ++---------- .../fly-squasher/communicators.ts | 2 +- .../probable-waffle/communicators.ts | 13 +++++ .../src/lib/fly-squasher/fly-squasher.ts | 4 +- .../game-instance/fly-squasher/game-mode.ts | 4 +- .../lib/game-instance/probable-waffle/data.ts | 0 .../probable-waffle/game-instance-medatada.ts | 5 ++ .../probable-waffle/game-instance.ts | 52 +++++++++++++++++ .../probable-waffle/game-mode.ts | 13 +++++ .../probable-waffle/game-state.ts | 23 ++++++++ .../game-instance/probable-waffle/player.ts | 36 ++++++++++++ .../probable-waffle/spectator.ts | 9 +++ .../lib/probable-waffle/probable-waffle.ts | 33 +++++++++++ .../lib/user-info/fly-squasher/user-info.ts | 2 +- .../user-info/probable-waffle/user-info.ts | 3 + libs/api-interfaces/src/little-muncher.ts | 10 ++++ libs/api-interfaces/src/probable-waffle.ts | 9 +++ 42 files changed, 505 insertions(+), 248 deletions(-) create mode 100644 apps/client/src/app/probable-waffle/game/scenes/probable-waffle-communicator.service.ts create mode 100644 apps/client/src/app/probable-waffle/game/scenes/probable-waffle-game-data.ts delete mode 100644 apps/client/src/app/probable-waffle/gui/editor/editor.component.html delete mode 100644 apps/client/src/app/probable-waffle/gui/editor/editor.component.scss delete mode 100644 apps/client/src/app/probable-waffle/gui/editor/editor.component.spec.ts delete mode 100644 apps/client/src/app/probable-waffle/gui/editor/editor.component.ts create mode 100644 apps/client/src/app/probable-waffle/gui/game-interface/main/level.guard.ts create mode 100644 apps/client/src/app/probable-waffle/gui/probable-waffle-coming-soon/probable-waffle-coming-soon.component.html create mode 100644 apps/client/src/app/probable-waffle/gui/probable-waffle-coming-soon/probable-waffle-coming-soon.component.scss create mode 100644 apps/client/src/app/probable-waffle/gui/probable-waffle-coming-soon/probable-waffle-coming-soon.component.spec.ts create mode 100644 apps/client/src/app/probable-waffle/gui/probable-waffle-coming-soon/probable-waffle-coming-soon.component.ts create mode 100644 libs/api-interfaces/src/fly-squasher.ts create mode 100644 libs/api-interfaces/src/game-instance.ts create mode 100644 libs/api-interfaces/src/lib/communicators/probable-waffle/communicators.ts create mode 100644 libs/api-interfaces/src/lib/game-instance/probable-waffle/data.ts create mode 100644 libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance-medatada.ts create mode 100644 libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance.ts create mode 100644 libs/api-interfaces/src/lib/game-instance/probable-waffle/game-mode.ts create mode 100644 libs/api-interfaces/src/lib/game-instance/probable-waffle/game-state.ts create mode 100644 libs/api-interfaces/src/lib/game-instance/probable-waffle/player.ts create mode 100644 libs/api-interfaces/src/lib/game-instance/probable-waffle/spectator.ts create mode 100644 libs/api-interfaces/src/lib/probable-waffle/probable-waffle.ts create mode 100644 libs/api-interfaces/src/lib/user-info/probable-waffle/user-info.ts create mode 100644 libs/api-interfaces/src/little-muncher.ts create mode 100644 libs/api-interfaces/src/probable-waffle.ts diff --git a/apps/client/src/app/app.module.ts b/apps/client/src/app/app.module.ts index 5da24440..23b67832 100644 --- a/apps/client/src/app/app.module.ts +++ b/apps/client/src/app/app.module.ts @@ -1,18 +1,18 @@ -import { isDevMode, NgModule } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; -import { AppComponent } from './app.component'; -import { AppRoutingModule } from './app-routing.module'; -import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'; -import { ServiceWorkerModule } from '@angular/service-worker'; -import { HomeModule } from './home/home.module'; -import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { AuthGuard } from './auth/auth.guard'; -import { SocketIoModule } from 'ngx-socket-io'; -import { environment } from '../environments/environment'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { ComponentsModule } from './shared/components/components.module'; -import { AccessTokenInterceptor } from './auth/access-token.interceptor'; -import { LoaderComponent } from './shared/loader/loader.component'; +import { isDevMode, NgModule } from "@angular/core"; +import { BrowserModule } from "@angular/platform-browser"; +import { AppComponent } from "./app.component"; +import { AppRoutingModule } from "./app-routing.module"; +import { HTTP_INTERCEPTORS, HttpClientModule } from "@angular/common/http"; +import { ServiceWorkerModule } from "@angular/service-worker"; +import { HomeModule } from "./home/home.module"; +import { FontAwesomeModule } from "@fortawesome/angular-fontawesome"; +import { AuthGuard } from "./auth/auth.guard"; +import { SocketIoModule } from "ngx-socket-io"; +import { environment } from "../environments/environment"; +import { NgbModule } from "@ng-bootstrap/ng-bootstrap"; +import { ComponentsModule } from "./shared/components/components.module"; +import { AccessTokenInterceptor } from "./auth/access-token.interceptor"; +import { LoaderComponent } from "./shared/loader/loader.component"; @NgModule({ declarations: [AppComponent], @@ -22,11 +22,11 @@ import { LoaderComponent } from './shared/loader/loader.component'; HomeModule, // app routing module must be included last, as it contains the wildcard route AppRoutingModule, - ServiceWorkerModule.register('ngsw-worker.js', { + ServiceWorkerModule.register("ngsw-worker.js", { enabled: !isDevMode(), // Register the ServiceWorker as soon as the application is stable // or after 30 seconds (whichever comes first). - registrationStrategy: 'registerWhenStable:30000' + registrationStrategy: "registerWhenStable:30000" }), SocketIoModule.forRoot(environment.socketIoConfig), FontAwesomeModule, diff --git a/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.scene b/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.scene index 505b802f..e071b241 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.scene +++ b/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.scene @@ -5,7 +5,7 @@ "snapEnabled": true, "exportClass": true, "autoImport": true, - "superClassName": "BaseScene", + "superClassName": "BaseScene", "preloadPackFiles": [], "createMethodName": "editorCreate", "sceneKey": "MapEmberEnclave", diff --git a/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.ts b/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.ts index efb19ef4..a2a2ee88 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.ts @@ -23,9 +23,32 @@ import { LightsHandler } from "../world/map/vision/lights.handler"; import { DepthHelper } from "../world/map/depth.helper"; import { AnimatedTilemap } from "./AnimatedTile"; import { BaseScene } from "../../../shared/game/phaser/scene/base.scene"; +import { ProbableWaffleGameData } from "./probable-waffle-game-data"; +import { + ProbableWaffleGameMode, + ProbableWaffleGameModeData, + ProbableWaffleGameState, + ProbableWaffleGameStateData, + ProbableWafflePlayer, + ProbableWafflePlayerControllerData, + ProbableWafflePlayerStateData, + ProbableWaffleSpectator, + ProbableWaffleSpectatorData +} from "@fuzzy-waddle/api-interfaces"; /* END-USER-IMPORTS */ -export default class MapEmberEnclave extends BaseScene { +export default class MapEmberEnclave extends BaseScene< + ProbableWaffleGameData, + ProbableWaffleGameStateData, + ProbableWaffleGameState, + ProbableWaffleGameModeData, + ProbableWaffleGameMode, + ProbableWafflePlayerStateData, + ProbableWafflePlayerControllerData, + ProbableWafflePlayer, + ProbableWaffleSpectatorData, + ProbableWaffleSpectator +> { constructor() { super("MapEmberEnclave"); @@ -125,6 +148,8 @@ export default class MapEmberEnclave extends BaseScene { new LightsHandler(this, { enableLights: false }); new DepthHelper(this); new AnimatedTilemap(this, this.tilemap, this.tilemap.tilesets); + + console.log("playing level", this.baseGameData.gameInstance.data.gameModeData!.level!.id); } /* END-USER-CODE */ diff --git a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene index 0144b417..fffacc0b 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene +++ b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene @@ -5,7 +5,7 @@ "snapEnabled": true, "exportClass": true, "autoImport": true, - "superClassName": "BaseScene", + "superClassName": "BaseScene", "preloadPackFiles": [], "createMethodName": "editorCreate", "sceneKey": "MapRiverCrossing", diff --git a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts index a30916ea..9d118a33 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts @@ -53,9 +53,32 @@ import { InputHandler } from "../world/managers/controllers/input/input.handler" import { LightsHandler } from "../world/map/vision/lights.handler"; import { DepthHelper } from "../world/map/depth.helper"; import { BaseScene } from "../../../shared/game/phaser/scene/base.scene"; +import { + ProbableWaffleGameMode, + ProbableWaffleGameModeData, + ProbableWaffleGameState, + ProbableWaffleGameStateData, + ProbableWafflePlayer, + ProbableWafflePlayerControllerData, + ProbableWafflePlayerStateData, + ProbableWaffleSpectator, + ProbableWaffleSpectatorData +} from "@fuzzy-waddle/api-interfaces"; +import { ProbableWaffleGameData } from "./probable-waffle-game-data"; /* END-USER-IMPORTS */ -export default class MapRiverCrossing extends BaseScene { +export default class MapRiverCrossing extends BaseScene< + ProbableWaffleGameData, + ProbableWaffleGameStateData, + ProbableWaffleGameState, + ProbableWaffleGameModeData, + ProbableWaffleGameMode, + ProbableWafflePlayerStateData, + ProbableWafflePlayerControllerData, + ProbableWafflePlayer, + ProbableWaffleSpectatorData, + ProbableWaffleSpectator +> { constructor() { super("MapRiverCrossing"); @@ -449,6 +472,8 @@ export default class MapRiverCrossing extends BaseScene { new LightsHandler(this, { enableLights: false }); new DepthHelper(this); new AnimatedTilemap(this, this.tilemap, this.tilemap.tilesets); + + console.log("playing level", this.baseGameData.gameInstance.data.gameModeData!.level!.id); } /* END-USER-CODE */ diff --git a/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.ts b/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.ts index 918b9443..25d02a4c 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.ts @@ -5,9 +5,36 @@ import Phaser from "phaser"; import PreloadBarUpdaterScript from "../../../other/Template/script-nodes/PreloadBarUpdaterScript"; /* START-USER-IMPORTS */ + +import { + ProbableWaffleGameMode, + ProbableWaffleGameModeData, + ProbableWaffleGameState, + ProbableWaffleGameStateData, + ProbableWaffleLevelEnum, + ProbableWaffleLevels, + ProbableWafflePlayer, + ProbableWafflePlayerControllerData, + ProbableWafflePlayerStateData, + ProbableWaffleSpectator, + ProbableWaffleSpectatorData +} from "@fuzzy-waddle/api-interfaces"; +import { BaseScene } from "../../../shared/game/phaser/scene/base.scene"; +import { ProbableWaffleGameData } from "./probable-waffle-game-data"; /* END-USER-IMPORTS */ -export default class PreloadProbableWaffle extends Phaser.Scene { +export default class PreloadProbableWaffle extends BaseScene< + ProbableWaffleGameData, + ProbableWaffleGameStateData, + ProbableWaffleGameState, + ProbableWaffleGameModeData, + ProbableWaffleGameMode, + ProbableWafflePlayerStateData, + ProbableWafflePlayerControllerData, + ProbableWafflePlayer, + ProbableWaffleSpectatorData, + ProbableWaffleSpectator +> { constructor() { super("PreloadProbableWaffle"); @@ -54,7 +81,7 @@ export default class PreloadProbableWaffle extends Phaser.Scene { this.load.pack("asset-pack", "assets/probable-waffle/asset-packers/asset-pack-probable-waffle.json"); const map = this.getMap(); - this.load.pack("asset-pack-map", map.assetPath); + this.load.pack("asset-pack-map", "assets/probable-waffle/asset-packers/maps/" + map.assetPath); } create() { @@ -62,33 +89,14 @@ export default class PreloadProbableWaffle extends Phaser.Scene { this.scene.start(map.sceneKey); } - getMap(): MapType { - // eslint-disable-next-line prefer-const - let mapId = 2; // todo get from somewhere else - switch (mapId) { - case 1: - return { - sceneKey: "MapRiverCrossing", - assetPath: "assets/probable-waffle/asset-packers/maps/asset-pack-probable-waffle-river-crossing.json" - }; - case 2: - return { - sceneKey: "MapEmberEnclave", - assetPath: "assets/probable-waffle/asset-packers/maps/asset-pack-probable-waffle-ember-enclave.json" - }; - default: - throw new Error(`Map id ${mapId} not found`); - } + private getMap() { + const levelId = this.baseGameData.gameInstance.data.gameModeData!.level!.id; + const level = ProbableWaffleLevels[levelId]; + return level; } /* END-USER-CODE */ } - -type MapType = { - sceneKey: string; - assetPath: string; -}; - /* END OF COMPILED CODE */ // You can write more code here diff --git a/apps/client/src/app/probable-waffle/game/scenes/probable-waffle-communicator.service.ts b/apps/client/src/app/probable-waffle/game/scenes/probable-waffle-communicator.service.ts new file mode 100644 index 00000000..3d37faf5 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/scenes/probable-waffle-communicator.service.ts @@ -0,0 +1,30 @@ +import { Injectable, OnDestroy } from "@angular/core"; +import { ProbableWaffleCommunicatorScoreEvent, ProbableWaffleGatewayEvent } from "@fuzzy-waddle/api-interfaces"; +import { TwoWayCommunicator } from "../../../shared/game/communicators/two-way-communicator"; + +export const probableWaffleCommunicatorServiceStub = { + startCommunication: () => {}, + stopCommunication: () => {} +}; + +@Injectable({ + providedIn: "root" +}) +export class ProbableWaffleCommunicatorService implements OnDestroy { + score?: TwoWayCommunicator; + + startCommunication() { + this.score = new TwoWayCommunicator( + ProbableWaffleGatewayEvent.ProbableWaffleAction, + "score" + ); + } + + stopCommunication() { + this.score?.destroy(); + } + + ngOnDestroy(): void { + this.stopCommunication(); + } +} diff --git a/apps/client/src/app/probable-waffle/game/scenes/probable-waffle-game-data.ts b/apps/client/src/app/probable-waffle/game/scenes/probable-waffle-game-data.ts new file mode 100644 index 00000000..6ebf971e --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/scenes/probable-waffle-game-data.ts @@ -0,0 +1,9 @@ +import { ProbableWaffleGameInstance, ProbableWaffleUserInfo } from "@fuzzy-waddle/api-interfaces"; +import { ProbableWaffleCommunicatorService } from "./probable-waffle-communicator.service"; +import { BaseGameData } from "../../../shared/game/phaser/game/base-game-data"; + +export type ProbableWaffleGameData = BaseGameData< + ProbableWaffleCommunicatorService, + ProbableWaffleGameInstance, + ProbableWaffleUserInfo +>; diff --git a/apps/client/src/app/probable-waffle/gui/campaign/campaign.component.html b/apps/client/src/app/probable-waffle/gui/campaign/campaign.component.html index 2c598ce2..e3f2484e 100644 --- a/apps/client/src/app/probable-waffle/gui/campaign/campaign.component.html +++ b/apps/client/src/app/probable-waffle/gui/campaign/campaign.component.html @@ -1,2 +1,2 @@ -
Campaign
+ diff --git a/apps/client/src/app/probable-waffle/gui/editor/editor.component.html b/apps/client/src/app/probable-waffle/gui/editor/editor.component.html deleted file mode 100644 index 1df4506b..00000000 --- a/apps/client/src/app/probable-waffle/gui/editor/editor.component.html +++ /dev/null @@ -1,20 +0,0 @@ - -
-
-
Create a new map
- -
- -
-
-
-
Load your map
-
-
-
{{ map.name }}
- map preview - -
-
-
-
diff --git a/apps/client/src/app/probable-waffle/gui/editor/editor.component.scss b/apps/client/src/app/probable-waffle/gui/editor/editor.component.scss deleted file mode 100644 index 4de1cf49..00000000 --- a/apps/client/src/app/probable-waffle/gui/editor/editor.component.scss +++ /dev/null @@ -1,20 +0,0 @@ -@import '../../../../styles/_variables.scss'; - -:host { - display: flex; - flex-direction: column; - width: 100%; - height: 100%; - background-color: $tertiary; -} - -.editor { - display: flex; - margin-left: auto; - margin-right: auto; - - .map-tile { - border-radius: 10px; - border: 2px solid $primary; - } -} diff --git a/apps/client/src/app/probable-waffle/gui/editor/editor.component.spec.ts b/apps/client/src/app/probable-waffle/gui/editor/editor.component.spec.ts deleted file mode 100644 index 785275fe..00000000 --- a/apps/client/src/app/probable-waffle/gui/editor/editor.component.spec.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { EditorComponent } from './editor.component'; -import { provideRouter } from '@angular/router'; -import { MapSelectorTestingComponent } from '../skirmish/map-selector/map-selector.component.spec'; -import { HomeNavTestingComponent } from '../../../shared/components/home-nav/home-nav.component.spec'; - -describe('EditorComponent', () => { - let component: EditorComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [EditorComponent, MapSelectorTestingComponent, HomeNavTestingComponent], - providers: [provideRouter([])] - }).compileComponents(); - - fixture = TestBed.createComponent(EditorComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/probable-waffle/gui/editor/editor.component.ts b/apps/client/src/app/probable-waffle/gui/editor/editor.component.ts deleted file mode 100644 index 87561979..00000000 --- a/apps/client/src/app/probable-waffle/gui/editor/editor.component.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { Component } from '@angular/core'; -import { MapIds } from '../../game/world/scenes/scenes'; -import { MapPlayerDefinition } from '../skirmish/skirmish.component'; -import { Router } from '@angular/router'; - -type EditorMap = { name: string; id: MapIds; imageSrc?: string }; - -@Component({ - selector: 'fuzzy-waddle-editor', - templateUrl: './editor.component.html', - styleUrls: ['./editor.component.scss'] -}) -export class EditorComponent { - constructor(private readonly router: Router) {} - - maps: EditorMap[] = [ - { name: 'Grassland Small', id: MapIds.GrasslandSmall, imageSrc: 'assets/probable-waffle/tilemaps/start-small.png' }, - { name: 'Grassland Large', id: MapIds.GrasslandLarge, imageSrc: 'assets/probable-waffle/tilemaps/start-large.png' }, - { - name: 'Grassland Extra Large', - id: MapIds.GrasslandExtraLarge, - imageSrc: 'assets/probable-waffle/tilemaps/start-extra-large.png' - }, - { - name: 'Grassland Extra Extra Large', - id: MapIds.GrasslandExtraLarge, - imageSrc: 'assets/probable-waffle/tilemaps/start-extra-extra-large.png' - } - ]; - - loadMap(map: EditorMap) { - // todo - } - - startMap($event: MapPlayerDefinition) { - // todo - } - - leave() { - this.router.navigate(['/probable-waffle']); - } -} diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/main/level.guard.ts b/apps/client/src/app/probable-waffle/gui/game-interface/main/level.guard.ts new file mode 100644 index 00000000..3f4c4477 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/game-interface/main/level.guard.ts @@ -0,0 +1,21 @@ +import { Injectable } from "@angular/core"; +import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router"; + +@Injectable({ + providedIn: "root" +}) +export class LevelGuard implements CanActivate { + constructor(private router: Router) {} + + canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean { + const level = true; // todo read this from service instead from route + if (level) { + // Level exists, allow navigation + return true; + } else { + // Level doesn't exist, redirect to a fallback route or show an error page + this.router.navigate(["/probable-waffle"]); + return false; + } + } +} diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game-routing.module.ts b/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game-routing.module.ts index 5c8a14ef..4cef2a4e 100644 --- a/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game-routing.module.ts +++ b/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game-routing.module.ts @@ -1,13 +1,15 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { ProbableWaffleGameComponent } from './probable-waffle-game.component'; +import { NgModule } from "@angular/core"; +import { RouterModule, Routes } from "@angular/router"; +import { ProbableWaffleGameComponent } from "./probable-waffle-game.component"; +import { LevelGuard } from "./level.guard"; const routes: Routes = [ { - path: '', - component: ProbableWaffleGameComponent + path: "", + component: ProbableWaffleGameComponent, + canActivate: [LevelGuard] }, - { path: '**', redirectTo: '/' } + { path: "**", redirectTo: "/probable-waffle" } ]; @NgModule({ diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game.component.ts b/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game.component.ts index 80b89155..c4abb1d0 100644 --- a/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game.component.ts +++ b/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game.component.ts @@ -1,10 +1,15 @@ -import { Component, OnDestroy, OnInit } from "@angular/core"; +import { Component, Input, OnDestroy, OnInit } from "@angular/core"; import { SceneCommunicatorService } from "../../../communicators/scene-communicator.service"; import { probableWaffleGameConfig } from "../../../game/world/const/game-config"; import { BaseGameData } from "../../../../shared/game/phaser/game/base-game-data"; -import { LittleMuncherGameInstance, LittleMuncherUserInfo } from "@fuzzy-waddle/api-interfaces"; -import { LittleMuncherCommunicatorService } from "../../../../little-muncher/game/little-muncher-communicator.service"; +import { + ProbableWaffleGameInstance, + ProbableWaffleLevelEnum, + ProbableWaffleLevels, + ProbableWaffleUserInfo +} from "@fuzzy-waddle/api-interfaces"; import { AuthService } from "../../../../auth/auth.service"; +import { ProbableWaffleCommunicatorService } from "../../../game/scenes/probable-waffle-communicator.service"; @Component({ selector: "fuzzy-waddle-game", @@ -15,10 +20,10 @@ export class ProbableWaffleGameComponent implements OnInit, OnDestroy { protected readonly probableWaffleGameConfig = probableWaffleGameConfig; drawerWidth = "150px"; displayDrawers = true; // todo - gameData?: BaseGameData; // todo + gameData?: BaseGameData; constructor( - private readonly communicatorService: LittleMuncherCommunicatorService, + private readonly communicatorService: ProbableWaffleCommunicatorService, private readonly authService: AuthService ) {} @@ -28,12 +33,16 @@ export class ProbableWaffleGameComponent implements OnInit, OnDestroy { ngOnInit(): void { SceneCommunicatorService.setup(); - const gameSessionInstance = new LittleMuncherGameInstance(); // todo later use ProbableWaffleGameInstance + const gameSessionInstance = new ProbableWaffleGameInstance({ + gameModeData: { + level: ProbableWaffleLevels[ProbableWaffleLevelEnum.EmberEnclave] // todo read this from ID + } + }); this.gameData = { gameInstance: gameSessionInstance, communicator: this.communicatorService, - user: new LittleMuncherUserInfo(this.authService.userId) // todo later use ProbableWaffleUserInfo - }; + user: new ProbableWaffleUserInfo(this.authService.userId) + } as const; // todo properly listen with communicatorService diff --git a/apps/client/src/app/probable-waffle/gui/home/home-page-nav/home-page-nav.component.html b/apps/client/src/app/probable-waffle/gui/home/home-page-nav/home-page-nav.component.html index bc82842b..e2cdcf97 100644 --- a/apps/client/src/app/probable-waffle/gui/home/home-page-nav/home-page-nav.component.html +++ b/apps/client/src/app/probable-waffle/gui/home/home-page-nav/home-page-nav.component.html @@ -9,9 +9,6 @@
  • Skirmish
    • -
  • - Editor -
      • diff --git a/apps/client/src/app/probable-waffle/gui/instant-demo/instant-demo.component.spec.ts b/apps/client/src/app/probable-waffle/gui/instant-game/instant-game.component.spec.ts similarity index 52% rename from apps/client/src/app/probable-waffle/gui/instant-demo/instant-demo.component.spec.ts rename to apps/client/src/app/probable-waffle/gui/instant-game/instant-game.component.spec.ts index 2ce96a39..78c4ba89 100644 --- a/apps/client/src/app/probable-waffle/gui/instant-demo/instant-demo.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/instant-game/instant-game.component.spec.ts @@ -1,16 +1,16 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { InstantDemoComponent } from "./instant-demo.component"; +import { InstantGameComponent } from "./instant-game.component"; -describe("InstantDemoComponent", () => { - let component: InstantDemoComponent; - let fixture: ComponentFixture; +describe("InstantGameComponent", () => { + let component: InstantGameComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [InstantDemoComponent] + imports: [InstantGameComponent] }).compileComponents(); - fixture = TestBed.createComponent(InstantDemoComponent); + fixture = TestBed.createComponent(InstantGameComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/apps/client/src/app/probable-waffle/gui/instant-demo/instant-demo.component.ts b/apps/client/src/app/probable-waffle/gui/instant-game/instant-game.component.ts similarity index 78% rename from apps/client/src/app/probable-waffle/gui/instant-demo/instant-demo.component.ts rename to apps/client/src/app/probable-waffle/gui/instant-game/instant-game.component.ts index 7f2c785a..bae732d2 100644 --- a/apps/client/src/app/probable-waffle/gui/instant-demo/instant-demo.component.ts +++ b/apps/client/src/app/probable-waffle/gui/instant-game/instant-game.component.ts @@ -5,28 +5,31 @@ import { GameSessionState, ProbableWaffleGameInstanceType, ProbableWaffleGameInstanceVisibility, - ProbableWaffleMapEnum + ProbableWaffleLevels } from "@fuzzy-waddle/api-interfaces"; import { LoaderComponent } from "../../../shared/loader/loader.component"; @Component({ - selector: "fuzzy-waddle-instant-demo", + selector: "fuzzy-waddle-instant-game", standalone: true, imports: [CommonModule, LoaderComponent], template: `` }) -export class InstantDemoComponent implements OnInit { +export class InstantGameComponent implements OnInit { private readonly gameInstanceClientService = inject(GameInstanceClientService); async ngOnInit(): Promise { await this.gameInstanceClientService.createGameInstance( - "InstantDemo", + "InstantGame", ProbableWaffleGameInstanceVisibility.Private, - ProbableWaffleGameInstanceType.InstantDemo + ProbableWaffleGameInstanceType.InstantGame ); await this.gameInstanceClientService.addSelfAsPlayer(); await this.gameInstanceClientService.addAiPlayer(); - await this.gameInstanceClientService.gameModeChanged("map", { map: ProbableWaffleMapEnum.RiverCrossing }); + + const allMaps = Object.values(ProbableWaffleLevels); + const map = allMaps[Math.floor(Math.random() * allMaps.length)].id; + await this.gameInstanceClientService.gameModeChanged("map", { map }); await this.gameInstanceClientService.gameInstanceMetadataChanged("sessionState", { sessionState: GameSessionState.MovingPlayersToGame }); diff --git a/apps/client/src/app/probable-waffle/gui/load/load.component.html b/apps/client/src/app/probable-waffle/gui/load/load.component.html new file mode 100644 index 00000000..2d9bbd71 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/load/load.component.html @@ -0,0 +1,27 @@ +
      +
      + @if(gameInstanceDataRecords.length){ +
      +
      Save Name
      +
      Map Name
      +
      Last Played
      +
      + @for (rec of gameInstanceDataRecords;track rec) { +
      {{ rec.saveName }}
      +
      {{ getMapName(rec.gameInstanceData) }}
      +
      {{ rec.gameInstanceData.gameInstanceMetadataData!.updatedOn | date: "medium" }}
      +
      + + +
      + } +
      + }@else{ +
      No saved games found.
      + } + +
      + +
      +
      +
      diff --git a/apps/client/src/app/probable-waffle/gui/load/load.component.scss b/apps/client/src/app/probable-waffle/gui/load/load.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/apps/client/src/app/probable-waffle/gui/load/load.component.spec.ts b/apps/client/src/app/probable-waffle/gui/load/load.component.spec.ts new file mode 100644 index 00000000..e863b39d --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/load/load.component.spec.ts @@ -0,0 +1,29 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; +import { LoadComponent } from "./load.component"; +import { GameInstanceClientService } from "../../../little-muncher/main/communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../../little-muncher/main/communicators/game-instance-client.service.spec"; +import { GameInstanceStorageService } from "../../communicators/storage/game-instance-storage.service"; +import { gameInstanceStorageServiceStub } from "../../communicators/storage/game-instance-storage.service.spec"; + +describe("LoadComponent", () => { + let component: LoadComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [ + { provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }, + { provide: GameInstanceStorageService, useValue: gameInstanceStorageServiceStub } + ], + imports: [LoadComponent] + }).compileComponents(); + + fixture = TestBed.createComponent(LoadComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/load/load.component.ts b/apps/client/src/app/probable-waffle/gui/load/load.component.ts new file mode 100644 index 00000000..dde85b4f --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/load/load.component.ts @@ -0,0 +1,39 @@ +import { Component, inject, OnInit } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { GameInstanceStorageService } from "../../communicators/storage/game-instance-storage.service"; +import { + ProbableWaffleGameInstanceData, + ProbableWaffleGameInstanceSaveData, + ProbableWaffleLevels +} from "@fuzzy-waddle/api-interfaces"; +import { RouterLink } from "@angular/router"; +import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; + +@Component({ + selector: "fuzzy-waddle-load", + standalone: true, + imports: [CommonModule, RouterLink], + templateUrl: "./load.component.html", + styleUrls: ["./load.component.scss"] +}) +export class LoadComponent implements OnInit { + private readonly gameInstanceStorageService = inject(GameInstanceStorageService); + private readonly gameInstanceClientService = inject(GameInstanceClientService); + protected gameInstanceDataRecords: ProbableWaffleGameInstanceSaveData[] = []; + async ngOnInit(): Promise { + this.gameInstanceDataRecords = await this.gameInstanceStorageService.getFromStorage(); + } + + protected getMapName(gameInstanceData: ProbableWaffleGameInstanceData): string { + return ProbableWaffleLevels[gameInstanceData.gameModeData!.map!].name; + } + + protected async loadSave(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData) { + await this.gameInstanceClientService.loadGameInstance(gameInstanceSaveData); + } + + protected async deleteSave(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData) { + await this.gameInstanceStorageService.deleteFromStorage(gameInstanceSaveData); + this.gameInstanceDataRecords = await this.gameInstanceStorageService.getFromStorage(); + } +} diff --git a/apps/client/src/app/probable-waffle/gui/lobby-page/game-instance.guard.ts b/apps/client/src/app/probable-waffle/gui/online/lobby-page/game-instance.guard.ts similarity index 89% rename from apps/client/src/app/probable-waffle/gui/lobby-page/game-instance.guard.ts rename to apps/client/src/app/probable-waffle/gui/online/lobby-page/game-instance.guard.ts index dd9dbebd..baa7782d 100644 --- a/apps/client/src/app/probable-waffle/gui/lobby-page/game-instance.guard.ts +++ b/apps/client/src/app/probable-waffle/gui/online/lobby-page/game-instance.guard.ts @@ -1,6 +1,6 @@ import { Injectable } from "@angular/core"; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router"; -import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; @Injectable({ providedIn: "root" diff --git a/apps/client/src/app/probable-waffle/gui/lobby-page/lobby-page.component.html b/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.html similarity index 100% rename from apps/client/src/app/probable-waffle/gui/lobby-page/lobby-page.component.html rename to apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.html diff --git a/apps/client/src/app/probable-waffle/gui/lobby-page/lobby-page.component.scss b/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.scss similarity index 100% rename from apps/client/src/app/probable-waffle/gui/lobby-page/lobby-page.component.scss rename to apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.scss diff --git a/apps/client/src/app/probable-waffle/gui/lobby-page/lobby-page.component.spec.ts b/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.spec.ts similarity index 72% rename from apps/client/src/app/probable-waffle/gui/lobby-page/lobby-page.component.spec.ts rename to apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.spec.ts index 0483bb00..4433026f 100644 --- a/apps/client/src/app/probable-waffle/gui/lobby-page/lobby-page.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.spec.ts @@ -1,9 +1,9 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { LobbyPageComponent } from "./lobby-page.component"; -import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; -import { gameInstanceClientServiceStub } from "../../communicators/game-instance-client.service.spec"; -import { LobbyTestingComponent } from "../lobby/lobby.component.spec"; -import { LobbyComponent } from "../lobby/lobby.component"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../../communicators/game-instance-client.service.spec"; +import { LobbyTestingComponent } from "../../lobby/lobby.component.spec"; +import { LobbyComponent } from "../../lobby/lobby.component"; describe("LobbyPageComponent", () => { let component: LobbyPageComponent; diff --git a/apps/client/src/app/probable-waffle/gui/lobby-page/lobby-page.component.ts b/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.ts similarity index 84% rename from apps/client/src/app/probable-waffle/gui/lobby-page/lobby-page.component.ts rename to apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.ts index 84a00595..dc7ce5fd 100644 --- a/apps/client/src/app/probable-waffle/gui/lobby-page/lobby-page.component.ts +++ b/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; import { CommonModule } from "@angular/common"; -import { LobbyComponent } from "../lobby/lobby.component"; +import { LobbyComponent } from "../../lobby/lobby.component"; @Component({ selector: "fuzzy-waddle-lobby-page", diff --git a/apps/client/src/app/probable-waffle/gui/replay/replay.component.html b/apps/client/src/app/probable-waffle/gui/replay/replay.component.html new file mode 100644 index 00000000..ed885f1a --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/replay/replay.component.html @@ -0,0 +1,28 @@ +
      +
      + @if(gameInstanceDataRecords.length){ +
      +
      Map Name
      +
      Played
      +
      Game length
      +
      + @for (rec of gameInstanceDataRecords;track rec) { +
      {{ getMapName(rec.gameInstanceData) }}
      +
      {{ rec.gameInstanceData.gameInstanceMetadataData!.updatedOn | date: "medium" }}
      + +
      10min
      +
      + + +
      + } +
      + }@else{ +
      No replays found.
      + } + +
      + +
      +
      +
      diff --git a/apps/client/src/app/probable-waffle/gui/replay/replay.component.scss b/apps/client/src/app/probable-waffle/gui/replay/replay.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/apps/client/src/app/probable-waffle/gui/replay/replay.component.spec.ts b/apps/client/src/app/probable-waffle/gui/replay/replay.component.spec.ts new file mode 100644 index 00000000..dd8312fc --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/replay/replay.component.spec.ts @@ -0,0 +1,29 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; +import { ReplayComponent } from "./replay.component"; +import { GameInstanceClientService } from "../../../little-muncher/main/communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../../little-muncher/main/communicators/game-instance-client.service.spec"; +import { GameInstanceStorageService } from "../../communicators/storage/game-instance-storage.service"; +import { gameInstanceStorageServiceStub } from "../../communicators/storage/game-instance-storage.service.spec"; + +describe("ReplayComponent", () => { + let component: ReplayComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [ + { provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }, + { provide: GameInstanceStorageService, useValue: gameInstanceStorageServiceStub } + ], + imports: [ReplayComponent] + }).compileComponents(); + + fixture = TestBed.createComponent(ReplayComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/replay/replay.component.ts b/apps/client/src/app/probable-waffle/gui/replay/replay.component.ts new file mode 100644 index 00000000..967cdfa2 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/replay/replay.component.ts @@ -0,0 +1,39 @@ +import { Component, inject, OnInit } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { RouterLink } from "@angular/router"; +import { GameInstanceStorageService } from "../../communicators/storage/game-instance-storage.service"; +import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; +import { + ProbableWaffleGameInstanceData, + ProbableWaffleGameInstanceSaveData, + ProbableWaffleLevels +} from "@fuzzy-waddle/api-interfaces"; + +@Component({ + selector: "probable-waffle-replay", + standalone: true, + imports: [CommonModule, RouterLink], + templateUrl: "./replay.component.html", + styleUrls: ["./replay.component.scss"] +}) +export class ReplayComponent implements OnInit { + private readonly gameInstanceStorageService = inject(GameInstanceStorageService); + private readonly gameInstanceClientService = inject(GameInstanceClientService); + protected gameInstanceDataRecords: ProbableWaffleGameInstanceSaveData[] = []; + async ngOnInit(): Promise { + this.gameInstanceDataRecords = await this.gameInstanceStorageService.getFromStorage(); + } + + protected getMapName(gameInstanceData: ProbableWaffleGameInstanceData): string { + return ProbableWaffleLevels[gameInstanceData.gameModeData!.map!].name; + } + + protected startReplay = async (gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise => { + await this.gameInstanceClientService.startReplay(gameInstanceSaveData); + }; + + protected async deleteReplay(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData) { + await this.gameInstanceStorageService.deleteFromStorage(gameInstanceSaveData); + this.gameInstanceDataRecords = await this.gameInstanceStorageService.getFromStorage(); + } +} diff --git a/apps/client/src/app/probable-waffle/gui/score-screen/score-screen.component.html b/apps/client/src/app/probable-waffle/gui/score-screen/score-screen.component.html index 1b931643..679dc1a1 100644 --- a/apps/client/src/app/probable-waffle/gui/score-screen/score-screen.component.html +++ b/apps/client/src/app/probable-waffle/gui/score-screen/score-screen.component.html @@ -1,37 +1,41 @@
      -

      Score Screen

      +
      +

      Score Screen

      - + -
      -
      - +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      -
      - -
      -
      - -
      -
      - + +
      +
      - -
      - -
      diff --git a/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance-medatada.ts b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance-medatada.ts index 701d6a9a..25a117b1 100644 --- a/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance-medatada.ts +++ b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance-medatada.ts @@ -4,7 +4,7 @@ export enum ProbableWaffleGameInstanceType { Matchmaking, SelfHosted, Skirmish, - InstantDemo + InstantGame } export interface ProbableWaffleGameInstanceMetadataData extends GameInstanceMetadataData { diff --git a/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance.ts b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance.ts index b7647086..55f08bd1 100644 --- a/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance.ts +++ b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance.ts @@ -66,17 +66,3 @@ export class ProbableWaffleGameInstance extends GameInstance< }); } } - -export interface ProbableWaffleJoinDto extends GameInstanceDataDto { - gameInstanceId: string; - type: "player" | "spectator"; -} - -export interface ProbableWaffleLeaveDto extends GameInstanceDataDto { - gameInstanceId: string; -} - -export interface PendingMatchmakingGameInstance { - gameInstance: ProbableWaffleGameInstance; - commonMapPoolIds: number[]; -} diff --git a/libs/api-interfaces/src/lib/probable-waffle/probable-waffle-api.ts b/libs/api-interfaces/src/lib/probable-waffle/probable-waffle-api.ts index 6fdf2050..26d4a93f 100644 --- a/libs/api-interfaces/src/lib/probable-waffle/probable-waffle-api.ts +++ b/libs/api-interfaces/src/lib/probable-waffle/probable-waffle-api.ts @@ -7,6 +7,10 @@ import { import { ProbableWaffleMapEnum } from "./probable-waffle"; import { ProbableWaffleSpectatorData } from "../game-instance/probable-waffle/spectator"; import { GameInstanceDataDto } from "../game-instance/game-instance"; +import { + ProbableWaffleGameInstance, + ProbableWaffleGameInstanceData +} from "../game-instance/probable-waffle/game-instance"; export interface ProbableWaffleStartLevelDto extends GameInstanceDataDto { gameInstanceId: string; @@ -49,3 +53,13 @@ export interface RequestGameSearchForMatchMakingDto { export enum ProbableWaffleGatewayRoomTypes { ProbableWaffleGameInstance = "probable_waffle_gi_" } + +export interface PendingMatchmakingGameInstance { + gameInstance: ProbableWaffleGameInstance; + commonMapPoolIds: number[]; +} + +export interface ProbableWaffleGameInstanceSaveData { + saveName: string; + gameInstanceData: ProbableWaffleGameInstanceData; +} From 768a989f0ac068d9f741c6ac3acf9ab2ec49581e Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Sun, 7 Jan 2024 16:22:11 +0100 Subject: [PATCH 109/138] Button reposition --- .../gui/home/home-page-nav/home-page-nav.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/client/src/app/probable-waffle/gui/home/home-page-nav/home-page-nav.component.html b/apps/client/src/app/probable-waffle/gui/home/home-page-nav/home-page-nav.component.html index 16fedba6..81f0247b 100644 --- a/apps/client/src/app/probable-waffle/gui/home/home-page-nav/home-page-nav.component.html +++ b/apps/client/src/app/probable-waffle/gui/home/home-page-nav/home-page-nav.component.html @@ -9,15 +9,15 @@
    • Skirmish
      • -
    • - Instant -
    • Load
    • Replay
      • +
    • + Instant +
    • From 60f870d307d850ca70038b6a83c557a88b723a5d Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Sun, 7 Jan 2024 16:37:11 +0100 Subject: [PATCH 110/138] Button slicing in texturePacker --- .../prefabs/gui/buttons/ButtonLarge.scene | 54 -------- .../game/prefabs/gui/buttons/ButtonLarge.ts | 47 ------- .../game/scenes/HudProbableWaffle.scene | 22 ++-- .../game/scenes/HudProbableWaffle.ts | 35 ++--- .../src/assets/probable-waffle/atlas/gui.json | 120 +++++++++--------- .../src/assets/probable-waffle/atlas/gui.png | Bin 464 -> 393 bytes .../cryos_mini_gui/borders/border_wood.png | Bin 272 -> 253 bytes .../cryos_mini_gui/buttons/button_large.png | Bin 222 -> 0 bytes .../buttons/button_large_pressed.png | Bin 237 -> 0 bytes .../probable-waffle/texture-packer/gui.tps | 30 ++--- 10 files changed, 98 insertions(+), 210 deletions(-) delete mode 100644 apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonLarge.scene delete mode 100644 apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonLarge.ts delete mode 100644 apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/buttons/button_large.png delete mode 100644 apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/buttons/button_large_pressed.png diff --git a/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonLarge.scene b/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonLarge.scene deleted file mode 100644 index d5fa12db..00000000 --- a/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonLarge.scene +++ /dev/null @@ -1,54 +0,0 @@ -{ - "id": "31e2d0cd-3fec-4e93-92cf-ebe85c98f5e2", - "sceneType": "PREFAB", - "settings": { - "exportClass": true, - "autoImport": true, - "preloadMethodName": "", - "preloadPackFiles": [], - "createMethodName": "", - "compilerOutputLanguage": "TYPE_SCRIPT", - "borderWidth": 24, - "borderHeight": 16 - }, - "displayList": [ - { - "type": "Container", - "id": "e4d5ac3c-c8da-4dbc-9611-72f3b7dad1f9", - "label": "container_1", - "x": 9, - "y": 8, - "list": [ - { - "type": "Image", - "id": "33b432c3-e379-449c-bdc7-88f476865833", - "label": "button", - "texture": { - "key": "gui", - "frame": "cryos_mini_gui/buttons/button_large.png" - }, - "x": 3 - }, - { - "type": "Text", - "id": "303425a5-a829-4bc3-8d80-f67cba0624cd", - "label": "text_1", - "x": 3, - "originX": 0.5, - "originY": 0.5, - "text": "Quit", - "align": "center", - "fontSize": "8px", - "color": "#000000ff" - } - ] - } - ], - "plainObjects": [], - "meta": { - "app": "Phaser Editor 2D - Scene Editor", - "url": "https://phasereditor2d.com", - "contentType": "phasereditor2d.core.scene.SceneContentType", - "version": 5 - } -} \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonLarge.ts b/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonLarge.ts deleted file mode 100644 index e535967b..00000000 --- a/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonLarge.ts +++ /dev/null @@ -1,47 +0,0 @@ -// You can write more code here - -/* START OF COMPILED CODE */ - -import Phaser from "phaser"; -import { EventEmitter } from "@angular/core"; -/* START-USER-IMPORTS */ -/* END-USER-IMPORTS */ - -export default class ButtonLarge extends Phaser.GameObjects.Container { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 9, y ?? 8); - - // button - const button = scene.add.image(3, 0, "gui", "cryos_mini_gui/buttons/button_large.png"); - this.add(button); - - // text_1 - const text_1 = scene.add.text(3, 0, "", {}); - text_1.setOrigin(0.5, 0.5); - text_1.text = "Quit"; - text_1.setStyle({ align: "center", color: "#000000ff", fontSize: "8px" }); - this.add(text_1); - - /* START-USER-CTR-CODE */ - button.setInteractive(); - button.on("pointerdown", () => { - button.setTexture("gui", "cryos_mini_gui/buttons/button_large_pressed.png"); - this.clicked.emit(); - setTimeout(() => { - if (!scene.sys.textures) return; - button.setTexture("gui", "cryos_mini_gui/buttons/button_large.png"); - }, 100); - }); - /* END-USER-CTR-CODE */ - } - - /* START-USER-CODE */ - clicked = new EventEmitter(); - // Write your code here. - - /* END-USER-CODE */ -} - -/* END OF COMPILED CODE */ - -// You can write more code here diff --git a/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.scene b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.scene index c476bc9e..c536e55c 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.scene +++ b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.scene @@ -17,31 +17,27 @@ }, "displayList": [ { - "prefabId": "31e2d0cd-3fec-4e93-92cf-ebe85c98f5e2", - "id": "c16b264b-88b7-4583-bad4-e2cb3a636f0a", + "prefabId": "2c7a7ebf-6290-4eea-837b-ff0a8a70f4e8", + "id": "b042eaac-6d53-49e6-bfea-e1192a74a0b0", "unlock": [ "x", - "y", - "scaleX", - "scaleY" + "y" ], - "label": "buttonLarge", + "label": "buttonSave", "scope": "CLASS", - "x": 1226, - "y": 40, - "scaleX": 3, - "scaleY": 3 + "x": 1180, + "y": 38 }, { "prefabId": "2c7a7ebf-6290-4eea-837b-ff0a8a70f4e8", - "id": "b042eaac-6d53-49e6-bfea-e1192a74a0b0", + "id": "2b326e5b-e387-4267-a772-69d81569abd3", "unlock": [ "x", "y" ], - "label": "buttonSmall", + "label": "buttonQuit", "scope": "CLASS", - "x": 1180, + "x": 1201, "y": 38 } ], diff --git a/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts index b89057c6..a34b76c1 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts @@ -2,7 +2,6 @@ /* START OF COMPILED CODE */ -import ButtonLarge from "../prefabs/gui/buttons/ButtonLarge"; import ButtonSmall from "../prefabs/gui/buttons/ButtonSmall"; /* START-USER-IMPORTS */ import { ProbableWaffleScene } from "../core/probable-waffle.scene"; @@ -24,28 +23,26 @@ export default class HudProbableWaffle extends ProbableWaffleScene { } editorCreate(): void { - // buttonLarge - const buttonLarge = new ButtonLarge(this, 1226, 40); - this.add.existing(buttonLarge); - buttonLarge.scaleX = 3; - buttonLarge.scaleY = 3; + // buttonSave + const buttonSave = new ButtonSmall(this, 1180, 38); + this.add.existing(buttonSave); - // buttonSmall - const buttonSmall = new ButtonSmall(this, 1180, 38); - this.add.existing(buttonSmall); + // buttonQuit + const buttonQuit = new ButtonSmall(this, 1201, 38); + this.add.existing(buttonQuit); // lists const hudElements: Array = []; - this.buttonLarge = buttonLarge; - this.buttonSmall = buttonSmall; + this.buttonSave = buttonSave; + this.buttonQuit = buttonQuit; this.hudElements = hudElements; this.events.emit("scene-awake"); } - private buttonLarge!: ButtonLarge; - private buttonSmall!: ButtonSmall; + private buttonSave!: ButtonSmall; + private buttonQuit!: ButtonSmall; private hudElements!: Array; /* START-USER-CODE */ @@ -77,12 +74,16 @@ export default class HudProbableWaffle extends ProbableWaffleScene { private updatePositionOfUiElements() { // push button to top right (margin 40px) - this.buttonLarge.x = this.scale.width - this.buttonLarge.width - 40; - this.buttonLarge.y = 40; + this.buttonQuit.x = this.scale.width - this.buttonQuit.width - 40; + this.buttonQuit.y = 40; + + // set save button to the left of quit button by 20px + this.buttonSave.x = this.buttonQuit.x - this.buttonSave.width - 20; + this.buttonSave.y = this.buttonQuit.y; } private handleQuit() { - this.quitButtonSubscription = this.buttonLarge.clicked.subscribe(() => { + this.quitButtonSubscription = this.buttonQuit.clicked.subscribe(() => { // todo rather than this, change the player state session state to "to score screen" because only 1 player quits this.communicator.gameInstanceMetadataChanged?.send({ property: "sessionState", @@ -94,7 +95,7 @@ export default class HudProbableWaffle extends ProbableWaffleScene { } private handleSaveGame() { - this.saveGameSubscription = this.buttonSmall.clicked.subscribe(() => { + this.saveGameSubscription = this.buttonSave.clicked.subscribe(() => { this.communicator.saveGame.emit(); }); } diff --git a/apps/client/src/assets/probable-waffle/atlas/gui.json b/apps/client/src/assets/probable-waffle/atlas/gui.json index 7cc92e3c..21d059dc 100644 --- a/apps/client/src/assets/probable-waffle/atlas/gui.json +++ b/apps/client/src/assets/probable-waffle/atlas/gui.json @@ -4,32 +4,11 @@ "image": "gui.png", "format": "RGBA8888", "size": { - "w": 60, - "h": 57 + "w": 62, + "h": 32 }, "scale": 1, "frames": [ - { - "filename": "cryos_mini_gui/borders/border_wood.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 40, - "h": 12 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 40, - "h": 12 - }, - "frame": { - "x": 1, - "y": 1, - "w": 40, - "h": 12 - } - }, { "filename": "cryos_mini_gui/surfaces/surface_parchment.png", "rotated": false, @@ -46,30 +25,15 @@ }, "frame": { "x": 1, - "y": 15, - "w": 24, - "h": 24 - } - }, - { - "filename": "cryos_mini_gui/buttons/button_large_pressed.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 24, - "h": 16 - }, - "spriteSourceSize": { - "x": 0, "y": 1, "w": 24, - "h": 15 + "h": 24 }, - "frame": { - "x": 1, - "y": 41, - "w": 24, - "h": 15 + "scale9Borders": { + "x": 6, + "y": 6, + "w": 12, + "h": 12 } }, { @@ -87,52 +51,70 @@ "h": 16 }, "frame": { - "x": 43, + "x": 27, "y": 1, "w": 16, "h": 16 + }, + "scale9Borders": { + "x": 5, + "y": 5, + "w": 6, + "h": 6 } }, { - "filename": "cryos_mini_gui/buttons/button_large.png", + "filename": "cryos_mini_gui/borders/border_wood.png", "rotated": false, "trimmed": false, "sourceSize": { - "w": 24, - "h": 16 + "w": 12, + "h": 12 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 24, - "h": 16 + "w": 12, + "h": 12 }, "frame": { "x": 27, "y": 19, - "w": 24, - "h": 16 + "w": 12, + "h": 12 + }, + "scale9Borders": { + "x": 5, + "y": 5, + "w": 2, + "h": 2 } }, { "filename": "cryos_mini_gui/buttons/button_small_pressed.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { "w": 16, "h": 16 }, "spriteSourceSize": { "x": 0, - "y": 1, + "y": 0, "w": 16, - "h": 15 + "h": 16 }, "frame": { - "x": 27, - "y": 37, + "x": 45, + "y": 1, "w": 16, - "h": 15 + "h": 16 + }, + "scale9Borders": { + "x": 5, + "y": 5, + "w": 6, + "h": 6 } }, { @@ -150,10 +132,16 @@ "h": 8 }, "frame": { - "x": 45, - "y": 37, + "x": 41, + "y": 19, "w": 8, "h": 8 + }, + "scale9Borders": { + "x": 3, + "y": 3, + "w": 2, + "h": 2 } }, { @@ -171,10 +159,16 @@ "h": 8 }, "frame": { - "x": 45, - "y": 47, + "x": 51, + "y": 19, "w": 8, "h": 8 + }, + "scale9Borders": { + "x": 2, + "y": 2, + "w": 4, + "h": 4 } } ] @@ -183,6 +177,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:187f7eacccb0c4dfa735511cd7c84b01:225e1a5308fb4ed331caf097b7e7325b:788b34ed4e778d63c84b2c3df4d44949$" + "smartupdate": "$TexturePacker:SmartUpdate:d36e3d1ff91140febe4b707166e4eb53:d39a72ccda7a7f25046cca4558fa85e0:788b34ed4e778d63c84b2c3df4d44949$" } } diff --git a/apps/client/src/assets/probable-waffle/atlas/gui.png b/apps/client/src/assets/probable-waffle/atlas/gui.png index 4f330d671a3a2747612c8aa3c0713a185ad9dbec..b7302be4307ee17c593fdeb847b8b50950e39345 100644 GIT binary patch delta 328 zcmV-O0k{6p1BnA6iBL{Q4GJ0x0000DNk~Le0000!0000W2m=5B0DZ$dosl6-e+NlK zK~y-)wUmJtgCGb+qpA4+UpybMGL>d)y>oKSyx@7DOG=6HU??NoP_)eG4>%jboU;t_ z4_|4Mi(`2Pf>B=aBRJ(vAHE4_R43q6Pw4VCphNQ*?`GWOxA6Jw4$o7#mg{Hy5$kx? zI%%81)&;LVv4@X&#VaY^26S+-f3D`OY1iS^rt5i!=E(!g|Hn}{I%r*2EMIH6 z)?L88z9CAc7zE$+5*h9}UvNqhq5z*YJ2ueaykAoaXU!h4?-+a>2Nrjwn9XK-PPTb% zwRo02>Ak$))b?KRa0`zW?pWumWRC}YRJb!7rhlpXDPAgu5Qwr|6;UV^9>b&7UB+uY ag1-Scz8?rrxl17c00007_!wdLH`mZoqtz{vvVWO*{1iPc$yxemKZmHVr3Y z>FLALIebxpxpAqyO5jKmSeom1fA$RSH%0>+K)j|J>L<4sBmCv!098B06M|r227$23 zk_DDEZ-&wG$$q@xku?*k?451}`VwBH{UzL*1W8*>8iaM)0-Fr8xm{u98tn~x!HNL4 zTW|X{J28x~jWJ6boFsF%L6|-RsG;g42_anGWJ{I_SPdpI`jH8OW%NpvWwA?nFia>B z0{3SS7v5p3;fL+#@T?UOcse6{cra|W@f7%8s{e#dX&=Dd86rriJl002ovPDHLkV1kUYwY~rV diff --git a/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/borders/border_wood.png b/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/borders/border_wood.png index 146bb1c49e8ef48e7453c4d828c5184076973f55..d944a95d32487104ed95329a05c94ab35cd25845 100644 GIT binary patch literal 253 zcmVPx#w@E}nR49>^lCcegFc3wbQKVGqEWrXOg_|_lAX`9@ZCHbX41vT3G&C+yI;vQ5 zM@0n%GQo+2;CH_J?@s?@5y^PufKC8;qBc!cW2ntQYx@}hc)m1wqNp142Nc?Jm6z`Z zw zRLP}KXuAn4q1UJT9pK)Dwlh$h!8@J1$Xc!@j(&{^3%EeA*rwtv00000NkvXXu0mjf Di*#nq literal 272 zcmV+r0q_2aP)Px#%1J~)R5*>z)h!N#FaU<(7qVn(t_fU#Ow`Qm2D=4_-G*x*x5KbTR^5G5juMpV8yZcoL za5+VsqrGp-*Me9iLnehgP}+LreC9?npY|NQc1l}!ztVOD)}~)fds>jsCPT3GU)>81 Wfk3cxpHKq;0000Xor1CPy3%xi8G$mj*!6@JK(l&Y#|!N<@fe5GMUBx7js@qG24 z^Q3=#W>GlLl@)%eHS@YdcDR?g+O=G@-j9ZROlsub?W|W;s0?FR@i36ZK`8WVO8Emm z4K};S(Y(EDzr0$omE}ORa_Hq%3qvnIS}WKwZ|?TCx`+@U<@PHv@opOLyYGCaXY_I> Tzhe6WbR&bOtDnm{r-UW|97I!7 diff --git a/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/buttons/button_large_pressed.png b/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/buttons/button_large_pressed.png deleted file mode 100644 index 71c47c859f5067661badc99d9cd1e392419ec905..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^5vW*D=WUxXgz~9?Z-Oi@PF}E7raET zzqSndUtWA6F=op%GiK#0YO5ssQaBHTbkAIor6p#Nb#Mi1$d(7!mkNg%i`>)^V*>(l zW>2@td(Qqp@3W|nRjqQiWDJjr&8FD14^!o%p@&JQwi4=#!@ ZF#IlZIJ_s#K?mq$22WQ%mvv4FO#o{PQ``Um diff --git a/apps/client/src/metadata/probable-waffle/texture-packer/gui.tps b/apps/client/src/metadata/probable-waffle/texture-packer/gui.tps index a9428283..a1644c5a 100644 --- a/apps/client/src/metadata/probable-waffle/texture-packer/gui.tps +++ b/apps/client/src/metadata/probable-waffle/texture-packer/gui.tps @@ -174,16 +174,15 @@ individualSpriteSettings ../sprites/gui/cryos_mini_gui/borders/border_dark_outer.png - ../sprites/gui/cryos_mini_gui/surfaces/surface_dark.png pivotPoint 0.5,0.5 spriteScale 1 scale9Enabled - + scale9Borders - 2,2,4,4 + 3,3,2,2 scale9Paddings 2,2,4,4 scale9FromFile @@ -196,43 +195,42 @@ spriteScale 1 scale9Enabled - + scale9Borders - 10,3,20,6 + 5,5,2,2 scale9Paddings 10,3,20,6 scale9FromFile - ../sprites/gui/cryos_mini_gui/buttons/button_large.png - ../sprites/gui/cryos_mini_gui/buttons/button_large_pressed.png + ../sprites/gui/cryos_mini_gui/buttons/button_small.png + ../sprites/gui/cryos_mini_gui/buttons/button_small_pressed.png pivotPoint 0.5,0.5 spriteScale 1 scale9Enabled - + scale9Borders - 6,4,12,8 + 5,5,6,6 scale9Paddings - 6,4,12,8 + 4,4,8,8 scale9FromFile - ../sprites/gui/cryos_mini_gui/buttons/button_small.png - ../sprites/gui/cryos_mini_gui/buttons/button_small_pressed.png + ../sprites/gui/cryos_mini_gui/surfaces/surface_dark.png pivotPoint 0.5,0.5 spriteScale 1 scale9Enabled - + scale9Borders - 4,4,8,8 + 2,2,4,4 scale9Paddings - 4,4,8,8 + 2,2,4,4 scale9FromFile @@ -243,7 +241,7 @@ spriteScale 1 scale9Enabled - + scale9Borders 6,6,12,12 scale9Paddings From 6be0a37fc65275293aef4f9132c2f9e9791977ea Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Sun, 7 Jan 2024 16:49:03 +0100 Subject: [PATCH 111/138] Button slicing in Phaser editor --- .../prefabs/gui/buttons/ButtonSmall.scene | 16 ++-- .../game/prefabs/gui/buttons/ButtonSmall.ts | 17 ++--- .../game/scenes/HudProbableWaffle.ts | 2 + .../src/assets/probable-waffle/atlas/gui.json | 70 +++++------------- .../src/assets/probable-waffle/atlas/gui.png | Bin 393 -> 390 bytes .../probable-waffle/texture-packer/gui.tps | 10 +-- 6 files changed, 43 insertions(+), 72 deletions(-) diff --git a/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.scene b/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.scene index 1d35eb92..4f10b37f 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.scene @@ -8,20 +8,26 @@ "preloadPackFiles": [], "createMethodName": "", "compilerOutputLanguage": "TYPE_SCRIPT", - "borderWidth": 16, - "borderHeight": 16 + "borderWidth": 20, + "borderHeight": 20 }, "displayList": [ { - "type": "Image", + "type": "NineSlice", "id": "582e274c-83f4-49d2-9993-2678065be934", "label": "cryos_mini_gui_buttons_button_small_png", "texture": { "key": "gui", "frame": "cryos_mini_gui/buttons/button_small.png" }, - "x": 8, - "y": 8 + "x": 10, + "y": 10, + "width": 20, + "height": 20, + "leftWidth": 5, + "rightWidth": 5, + "topHeight": 5, + "bottomHeight": 5 } ], "plainObjects": [], diff --git a/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.ts b/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.ts index d0a5ee0e..32138494 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.ts @@ -3,18 +3,16 @@ /* START OF COMPILED CODE */ import Phaser from "phaser"; -import { EventEmitter } from "@angular/core"; /* START-USER-IMPORTS */ +import { EventEmitter } from "@angular/core"; /* END-USER-IMPORTS */ -export default class ButtonSmall extends Phaser.GameObjects.Image { - clicked = new EventEmitter(); +export default class ButtonSmall extends Phaser.GameObjects.NineSlice { - constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { - super(scene, x ?? 8, y ?? 8, texture || "gui", frame ?? "cryos_mini_gui/buttons/button_small.png"); - - /* START-USER-CTR-CODE */ + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string, width?: number, height?: number, leftWidth?: number, rightWidth?: number, topHeight?: number, bottomHeight?: number) { + super(scene, x ?? 10, y ?? 10, texture || "gui", frame ?? "cryos_mini_gui/buttons/button_small.png", width ?? 20, height ?? 20, leftWidth ?? 5, rightWidth ?? 5, topHeight ?? 5, bottomHeight ?? 5); + /* START-USER-CTR-CODE */ this.setInteractive(); this.on("pointerdown", () => { this.setTexture("gui", "cryos_mini_gui/buttons/button_small_pressed.png"); @@ -25,9 +23,10 @@ export default class ButtonSmall extends Phaser.GameObjects.Image { }, 100); }); /* END-USER-CTR-CODE */ - } + } - /* START-USER-CODE */ + /* START-USER-CODE */ + clicked = new EventEmitter(); // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts index a34b76c1..aa8b68bd 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts @@ -14,6 +14,7 @@ import { GameSessionState } from "@fuzzy-waddle/api-interfaces"; /* END-USER-IMPORTS */ export default class HudProbableWaffle extends ProbableWaffleScene { + constructor() { super("HudProbableWaffle"); @@ -23,6 +24,7 @@ export default class HudProbableWaffle extends ProbableWaffleScene { } editorCreate(): void { + // buttonSave const buttonSave = new ButtonSmall(this, 1180, 38); this.add.existing(buttonSave); diff --git a/apps/client/src/assets/probable-waffle/atlas/gui.json b/apps/client/src/assets/probable-waffle/atlas/gui.json index 21d059dc..e120e953 100644 --- a/apps/client/src/assets/probable-waffle/atlas/gui.json +++ b/apps/client/src/assets/probable-waffle/atlas/gui.json @@ -4,8 +4,8 @@ "image": "gui.png", "format": "RGBA8888", "size": { - "w": 62, - "h": 32 + "w": 32, + "h": 61 }, "scale": 1, "frames": [ @@ -28,12 +28,6 @@ "y": 1, "w": 24, "h": 24 - }, - "scale9Borders": { - "x": 6, - "y": 6, - "w": 12, - "h": 12 } }, { @@ -51,16 +45,10 @@ "h": 16 }, "frame": { - "x": 27, - "y": 1, + "x": 1, + "y": 27, "w": 16, "h": 16 - }, - "scale9Borders": { - "x": 5, - "y": 5, - "w": 6, - "h": 6 } }, { @@ -78,43 +66,31 @@ "h": 12 }, "frame": { - "x": 27, - "y": 19, + "x": 19, + "y": 27, "w": 12, "h": 12 - }, - "scale9Borders": { - "x": 5, - "y": 5, - "w": 2, - "h": 2 } }, { "filename": "cryos_mini_gui/buttons/button_small_pressed.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { "w": 16, "h": 16 }, "spriteSourceSize": { "x": 0, - "y": 0, + "y": 1, "w": 16, - "h": 16 + "h": 15 }, "frame": { - "x": 45, - "y": 1, + "x": 1, + "y": 45, "w": 16, - "h": 16 - }, - "scale9Borders": { - "x": 5, - "y": 5, - "w": 6, - "h": 6 + "h": 15 } }, { @@ -132,16 +108,10 @@ "h": 8 }, "frame": { - "x": 41, - "y": 19, + "x": 19, + "y": 41, "w": 8, "h": 8 - }, - "scale9Borders": { - "x": 3, - "y": 3, - "w": 2, - "h": 2 } }, { @@ -159,16 +129,10 @@ "h": 8 }, "frame": { - "x": 51, - "y": 19, + "x": 19, + "y": 51, "w": 8, "h": 8 - }, - "scale9Borders": { - "x": 2, - "y": 2, - "w": 4, - "h": 4 } } ] @@ -177,6 +141,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:d36e3d1ff91140febe4b707166e4eb53:d39a72ccda7a7f25046cca4558fa85e0:788b34ed4e778d63c84b2c3df4d44949$" + "smartupdate": "$TexturePacker:SmartUpdate:c98be47b1af7d86376ba7c18386b3f92:d39a72ccda7a7f25046cca4558fa85e0:788b34ed4e778d63c84b2c3df4d44949$" } } diff --git a/apps/client/src/assets/probable-waffle/atlas/gui.png b/apps/client/src/assets/probable-waffle/atlas/gui.png index b7302be4307ee17c593fdeb847b8b50950e39345..589912e6b296540bc63ed601913876bdb05997e0 100644 GIT binary patch delta 325 zcmV-L0lNN)1BL@3iBL{Q4GJ0x0000DNk~Le0000W0000z2m=5B0Q>BlgOMRje*{TH zK~y-)y^{eB!ypJni&OCaC!VOYh*-L2*-uKRdqKe80}+WI4kc0#MMu*ufchp;&NbB4 z0C*$wCdc}dUjyj-iv(c)Pac5ZWY`dNc0rfG!y@&dj02`oUmmdm+#>xht@&1!l^fqf04B9d+e5{^}E;ut6wm@`%d)y>oKSyx@7DOG=6HU??NoP_)eG4>%jboU;t_ z4_|4Mi(`2Pf>B=aBRJ(vAHE4_R43q6Pw4VCphNQ*?`GWOxA6Jw4$o7#mg{Hy5$kx? zI%%81)&;LVv4@X&#VaY^26S+-f3D`OY1iS^rt5i!=E(!g|Hn}{I%r*2EMIH6 z)?L88z9CAc7zE$+5*h9}UvNqhq5z*YJ2ueaykAoaXU!h4?-+a>2Nrjwn9XK-PPTb% zwRo02>Ak$))b?KRa0`zW?pWumWRC}YRJb!7rhlpXDPAgu5Qwr|6;UV^9>b&7UB+uY ag1-Scz8?rrxl17c0000spriteScale 1 scale9Enabled - + scale9Borders 3,3,2,2 scale9Paddings @@ -195,7 +195,7 @@ spriteScale 1 scale9Enabled - + scale9Borders 5,5,2,2 scale9Paddings @@ -211,7 +211,7 @@ spriteScale 1 scale9Enabled - + scale9Borders 5,5,6,6 scale9Paddings @@ -226,7 +226,7 @@ spriteScale 1 scale9Enabled - + scale9Borders 2,2,4,4 scale9Paddings @@ -241,7 +241,7 @@ spriteScale 1 scale9Enabled - + scale9Borders 6,6,12,12 scale9Paddings From 17edefe348329241eb720821640744765464bdc3 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Fri, 12 Jan 2024 08:46:11 +0100 Subject: [PATCH 112/138] Button nine slice --- .../prefabs/gui/buttons/ButtonSmall.scene | 95 +++++++++++++++---- .../game/prefabs/gui/buttons/ButtonSmall.ts | 64 ++++++++++--- .../game/scenes/HudProbableWaffle.scene | 20 +++- .../game/scenes/HudProbableWaffle.ts | 16 +++- 4 files changed, 161 insertions(+), 34 deletions(-) diff --git a/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.scene b/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.scene index 4f10b37f..db9e16b2 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.scene @@ -13,21 +13,42 @@ }, "displayList": [ { - "type": "NineSlice", - "id": "582e274c-83f4-49d2-9993-2678065be934", - "label": "cryos_mini_gui_buttons_button_small_png", - "texture": { - "key": "gui", - "frame": "cryos_mini_gui/buttons/button_small.png" - }, - "x": 10, - "y": 10, - "width": 20, - "height": 20, - "leftWidth": 5, - "rightWidth": 5, - "topHeight": 5, - "bottomHeight": 5 + "type": "Container", + "id": "a0cd022f-16aa-41e5-b945-46d19c19fdc9", + "label": "container_1", + "x": 4, + "y": 9, + "list": [ + { + "type": "NineSlice", + "id": "582e274c-83f4-49d2-9993-2678065be934", + "label": "btnEle", + "scope": "CLASS", + "texture": { + "key": "gui", + "frame": "cryos_mini_gui/buttons/button_small.png" + }, + "x": 6, + "y": 1, + "width": 20, + "height": 20, + "leftWidth": 3, + "rightWidth": 3, + "topHeight": 3, + "bottomHeight": 3 + }, + { + "type": "Text", + "id": "8908af01-bc37-4a82-8293-61573f0d4834", + "label": "textEle", + "scope": "CLASS", + "x": 6, + "y": 1, + "originX": 0.5, + "originY": 0.5, + "align": "center" + } + ] } ], "plainObjects": [], @@ -36,5 +57,47 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } + }, + "prefabProperties": [ + { + "name": "text", + "label": "Text", + "tooltip": "", + "defValue": "", + "customDefinition": false, + "type": { + "id": "string" + } + }, + { + "name": "w", + "label": "W", + "tooltip": "", + "defValue": 20, + "customDefinition": false, + "type": { + "id": "number" + } + }, + { + "name": "h", + "label": "H", + "tooltip": "", + "defValue": 20, + "customDefinition": false, + "type": { + "id": "number" + } + }, + { + "name": "fontSize", + "label": "FontSize", + "tooltip": "", + "defValue": 16, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] } \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.ts b/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.ts index 32138494..9b24e5c7 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.ts @@ -7,28 +7,64 @@ import Phaser from "phaser"; import { EventEmitter } from "@angular/core"; /* END-USER-IMPORTS */ -export default class ButtonSmall extends Phaser.GameObjects.NineSlice { +export default class ButtonSmall extends Phaser.GameObjects.Container { + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 4, y ?? 9); - constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string, width?: number, height?: number, leftWidth?: number, rightWidth?: number, topHeight?: number, bottomHeight?: number) { - super(scene, x ?? 10, y ?? 10, texture || "gui", frame ?? "cryos_mini_gui/buttons/button_small.png", width ?? 20, height ?? 20, leftWidth ?? 5, rightWidth ?? 5, topHeight ?? 5, bottomHeight ?? 5); + // btnEle + const btnEle = scene.add.nineslice(6, 1, "gui", "cryos_mini_gui/buttons/button_small.png", 20, 20, 3, 3, 3, 3); + this.add(btnEle); - /* START-USER-CTR-CODE */ - this.setInteractive(); - this.on("pointerdown", () => { - this.setTexture("gui", "cryos_mini_gui/buttons/button_small_pressed.png"); - this.clicked.emit(); - setTimeout(() => { - if (!scene.sys.textures) return; - this.setTexture("gui", "cryos_mini_gui/buttons/button_small.png"); - }, 100); + // textEle + const textEle = scene.add.text(6, 1, "", {}); + textEle.setOrigin(0.5, 0.5); + textEle.setStyle({ align: "center" }); + this.add(textEle); + + this.btnEle = btnEle; + this.textEle = textEle; + + /* START-USER-CTR-CODE */ + this.scene = scene; + scene.events.once(Phaser.Scenes.Events.CREATE, () => { + this.postCreate(); }); /* END-USER-CTR-CODE */ - } + } - /* START-USER-CODE */ + private btnEle: Phaser.GameObjects.NineSlice; + private textEle: Phaser.GameObjects.Text; + public text: string = ""; + public w: number = 20; + public h: number = 20; + public fontSize: number = 16; + + /* START-USER-CODE */ + scene: Phaser.Scene; clicked = new EventEmitter(); // Write your code here. + postCreate() { + this.textEle.text = this.text; + this.textEle.setFontSize(this.fontSize); + this.btnEle.width = this.w; + this.btnEle.height = this.h; + + this.btnEle.setInteractive(); + this.btnEle.on("pointerdown", () => { + this.btnEle.setTexture("gui", "cryos_mini_gui/buttons/button_small_pressed.png"); + }); + // button out + this.btnEle.on("pointerout", () => { + if (!this.scene.sys.textures) return; + this.btnEle.setTexture("gui", "cryos_mini_gui/buttons/button_small.png"); + }); + this.btnEle.on("pointerup", () => { + this.clicked.emit(); + if (!this.scene.sys.textures) return; + this.btnEle.setTexture("gui", "cryos_mini_gui/buttons/button_small.png"); + }); + } /* END-USER-CODE */ } diff --git a/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.scene b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.scene index c536e55c..46be3a59 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.scene +++ b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.scene @@ -21,10 +21,18 @@ "id": "b042eaac-6d53-49e6-bfea-e1192a74a0b0", "unlock": [ "x", - "y" + "y", + "text", + "w", + "h", + "fontSize" ], "label": "buttonSave", "scope": "CLASS", + "text": "S", + "w": 45, + "h": 45, + "fontSize": 30, "x": 1180, "y": 38 }, @@ -33,10 +41,18 @@ "id": "2b326e5b-e387-4267-a772-69d81569abd3", "unlock": [ "x", - "y" + "y", + "text", + "w", + "h", + "fontSize" ], "label": "buttonQuit", "scope": "CLASS", + "text": "Q", + "w": 45, + "h": 45, + "fontSize": 30, "x": 1201, "y": 38 } diff --git a/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts index aa8b68bd..9597da8e 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts @@ -36,6 +36,18 @@ export default class HudProbableWaffle extends ProbableWaffleScene { // lists const hudElements: Array = []; + // buttonSave (prefab fields) + buttonSave.text = "S"; + buttonSave.w = 45; + buttonSave.h = 45; + buttonSave.fontSize = 30; + + // buttonQuit (prefab fields) + buttonQuit.text = "Q"; + buttonQuit.w = 45; + buttonQuit.h = 45; + buttonQuit.fontSize = 30; + this.buttonSave = buttonSave; this.buttonQuit = buttonQuit; this.hudElements = hudElements; @@ -76,11 +88,11 @@ export default class HudProbableWaffle extends ProbableWaffleScene { private updatePositionOfUiElements() { // push button to top right (margin 40px) - this.buttonQuit.x = this.scale.width - this.buttonQuit.width - 40; + this.buttonQuit.x = this.scale.width - this.buttonQuit.w - 40; this.buttonQuit.y = 40; // set save button to the left of quit button by 20px - this.buttonSave.x = this.buttonQuit.x - this.buttonSave.width - 20; + this.buttonSave.x = this.buttonQuit.x - this.buttonSave.w - 40; this.buttonSave.y = this.buttonQuit.y; } From fb28fbaafeb849bfdcf5924b52318dddef09ea75 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Fri, 12 Jan 2024 09:44:34 +0100 Subject: [PATCH 113/138] Sheep shearing --- .../game/hud/hud-game-state.ts | 23 +- .../game/prefabs/animals/Sheep.ts | 67 +++- .../game/prefabs/animals/anims/animals.ts | 14 + .../managers/game-state/scene-game-state.ts | 11 +- .../assets/probable-waffle/atlas/animals.json | 332 ++++++++++++------ .../assets/probable-waffle/atlas/animals.png | Bin 2968 -> 3766 bytes .../probable-waffle/atlas/anims/animals.json | 107 +++++- .../sprites/animals/sheep/effects/wool_1.png | Bin 0 -> 97 bytes .../sprites/animals/sheep/effects/wool_2.png | Bin 0 -> 106 bytes .../animals/sheep/sheared/sheep_down.png | Bin 0 -> 688 bytes .../animals/sheep/sheared/sheep_left.png | Bin 0 -> 715 bytes .../animals/sheep/sheared/sheep_right.png | Bin 0 -> 701 bytes .../animals/sheep/sheared/sheep_up.png | Bin 0 -> 700 bytes 13 files changed, 427 insertions(+), 127 deletions(-) create mode 100644 apps/client/src/metadata/probable-waffle/sprites/animals/sheep/effects/wool_1.png create mode 100644 apps/client/src/metadata/probable-waffle/sprites/animals/sheep/effects/wool_2.png create mode 100644 apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheared/sheep_down.png create mode 100644 apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheared/sheep_left.png create mode 100644 apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheared/sheep_right.png create mode 100644 apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheared/sheep_up.png diff --git a/apps/client/src/app/probable-waffle/game/hud/hud-game-state.ts b/apps/client/src/app/probable-waffle/game/hud/hud-game-state.ts index 0a80c0a0..1c9f2a91 100644 --- a/apps/client/src/app/probable-waffle/game/hud/hud-game-state.ts +++ b/apps/client/src/app/probable-waffle/game/hud/hud-game-state.ts @@ -62,16 +62,23 @@ export class HudGameState { this.text.text = "3"; this.text.visible = true; this.overlay.visible = true; - setTimeout(() => { - this.text.text = "2"; - }, 1000); - setTimeout(() => { - this.text.text = "1"; - }, 2000); - setTimeout(() => { + + const handleCountdown = false; + if (handleCountdown) { + setTimeout(() => { + this.text.text = "2"; + }, 1000); + setTimeout(() => { + this.text.text = "1"; + }, 2000); + setTimeout(() => { + this.text.visible = false; + this.overlay.visible = false; + }, 3000); + } else { this.text.visible = false; this.overlay.visible = false; - }, 3000); + } break; case GameSessionState.InProgress: this.text.visible = false; diff --git a/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.ts b/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.ts index 6e5b4129..4f6c143e 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.ts @@ -1,31 +1,72 @@ - // You can write more code here /* START OF COMPILED CODE */ import Phaser from "phaser"; +import { ANIM_SHEEP_IDLE_DOWN, ANIM_SHEEP_IDLE_DOWN_SHEARED } from "./anims/animals"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ export default class Sheep extends Phaser.GameObjects.Sprite { + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 32, y ?? 49.42203448546586, texture || "animals", frame ?? "sheep/sheep_down.png"); + + this.setInteractive(new Phaser.Geom.Circle(29, 39, 17.805288050449516), Phaser.Geom.Circle.Contains); + this.setOrigin(0.5, 0.772219288835404); + this.play("sheep_idle_down"); + + /* START-USER-CTR-CODE */ + this.handleWoolParticles(scene); + /* END-USER-CTR-CODE */ + } + + /* START-USER-CODE */ + private woolParticles?: Phaser.GameObjects.Particles.ParticleEmitter; + + private handleWoolParticles(scene: Phaser.Scene) { + // Add wool particle emitter to the scene + this.woolParticles = scene.add.particles(0, 0, "animals", { + frame: ["sheep/effects/wool_1.png", "sheep/effects/wool_2.png"], + speed: { min: 20, max: 50 }, + lifespan: 1000, + quantity: 1, + gravityY: 50, + scale: { start: 2, end: 1 }, + rotate: { start: 0, end: 360 }, + frequency: 1, + emitting: false + }); - constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { - super(scene, x ?? 32, y ?? 49.42203448546586, texture || "animals", frame ?? "sheep/sheep_down.png"); + let shearedCount = 0; + const maxShearedCount = 5; - this.setInteractive(new Phaser.Geom.Circle(29, 39, 17.805288050449516), Phaser.Geom.Circle.Contains); - this.setOrigin(0.5, 0.772219288835404); - this.play("sheep_idle_down"); + this.on(Phaser.Input.Events.POINTER_DOWN, (pointer: Phaser.Input.Pointer) => { + if (shearedCount < maxShearedCount) { + this.woolParticles?.emitParticleAt(this.x, this.y - 25, Phaser.Math.Between(1, 4)); + } + shearedCount++; + if (shearedCount === maxShearedCount) { + this.play(ANIM_SHEEP_IDLE_DOWN_SHEARED); + this.woolParticles?.emitParticleAt(this.x, this.y - 20, 50); - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } + // start timer to reset sheep + scene.time.delayedCall(5000, () => { + shearedCount = 0; + this.play(ANIM_SHEEP_IDLE_DOWN); + this.woolParticles?.emitParticleAt(this.x, this.y - 20, 50); + }); + } + }); + } - /* START-USER-CODE */ + setDepth(value: number): this { + this.woolParticles?.setDepth(value + 1); + return super.setDepth(value); + } - // Write your code here. + // Write your code here. - /* END-USER-CODE */ + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/probable-waffle/game/prefabs/animals/anims/animals.ts b/apps/client/src/app/probable-waffle/game/prefabs/animals/anims/animals.ts index 07f37fac..f8b156a0 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/animals/anims/animals.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/animals/anims/animals.ts @@ -25,3 +25,17 @@ export const ANIM_HEDGEHOG_BALL_LEFT = "hedgehog_ball_left"; export const ANIM_HEDGEHOG_WALK_DOWN = "hedgehog_walk_down"; export const ANIM_SHEEP_IDLE_DOWN = "sheep_idle_down"; + +export const ANIM_SHEEP_IDLE_LEFT = "sheep_idle_left"; + +export const ANIM_SHEEP_IDLE_RIGHT = "sheep_idle_right"; + +export const ANIM_SHEEP_IDLE_TOP = "sheep_idle_top"; + +export const ANIM_SHEEP_IDLE_DOWN_SHEARED = "sheep_idle_down_sheared"; + +export const ANIM_SHEEP_IDLE_LEFT_SHEARED = "sheep_idle_left_sheared"; + +export const ANIM_SHEEP_IDLE_RIGHT_SHEARED = "sheep_idle_right_sheared"; + +export const ANIM_SHEEP_IDLE_UP_SHEARED = "sheep_idle_up_sheared"; diff --git a/apps/client/src/app/probable-waffle/game/world/managers/game-state/scene-game-state.ts b/apps/client/src/app/probable-waffle/game/world/managers/game-state/scene-game-state.ts index dd79d4eb..686cfb0d 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/game-state/scene-game-state.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/game-state/scene-game-state.ts @@ -49,14 +49,21 @@ export class SceneGameState { this.scene.scene.pause(); break; case GameSessionState.StartingTheGame: - setTimeout(() => { + const sendInProgress = () => { this.scene.baseGameData.communicator.gameInstanceMetadataChanged?.send({ property: "sessionState", gameInstanceId: this.scene.gameInstanceId, data: { sessionState: GameSessionState.InProgress }, emitterUserId: this.scene.userId }); - }, 3000); + }; + const handleCountdown = false; + if (handleCountdown) { + setTimeout(() => sendInProgress(), 3000); + } else { + sendInProgress(); + } + break; case GameSessionState.InProgress: this.scene.scene.resume(); diff --git a/apps/client/src/assets/probable-waffle/atlas/animals.json b/apps/client/src/assets/probable-waffle/atlas/animals.json index 8bf4046f..56c97012 100644 --- a/apps/client/src/assets/probable-waffle/atlas/animals.json +++ b/apps/client/src/assets/probable-waffle/atlas/animals.json @@ -4,8 +4,8 @@ "image": "animals.png", "format": "RGBA8888", "size": { - "w": 127, - "h": 191 + "w": 126, + "h": 235 }, "scale": 1, "frames": [ @@ -73,7 +73,7 @@ } }, { - "filename": "hedgehog/3.png", + "filename": "hedgehog/4.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -83,13 +83,13 @@ "spriteSourceSize": { "x": 0, "y": 4, - "w": 31, + "w": 30, "h": 26 }, "frame": { "x": 95, "y": 1, - "w": 31, + "w": 30, "h": 26 } }, @@ -115,7 +115,7 @@ } }, { - "filename": "hedgehog/15.png", + "filename": "hedgehog/16.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -123,41 +123,104 @@ "h": 32 }, "spriteSourceSize": { - "x": 1, + "x": 2, "y": 4, - "w": 31, + "w": 30, "h": 26 }, "frame": { "x": 95, "y": 29, - "w": 31, + "w": 30, "h": 26 } }, { - "filename": "hedgehog/1.png", + "filename": "sheep/sheared/sheep_left.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 32, - "h": 32 + "w": 64, + "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 32, - "h": 25 + "x": 7, + "y": 31, + "w": 47, + "h": 27 }, "frame": { "x": 1, "y": 113, + "w": 47, + "h": 27 + } + }, + { + "filename": "sheep/sheared/sheep_right.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 10, + "y": 31, + "w": 47, + "h": 27 + }, + "frame": { + "x": 1, + "y": 142, + "w": 47, + "h": 27 + } + }, + { + "filename": "sheep/sheared/sheep_up.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 19, + "y": 19, + "w": 23, + "h": 40 + }, + "frame": { + "x": 1, + "y": 171, + "w": 23, + "h": 40 + } + }, + { + "filename": "hedgehog/6.png", + "rotated": false, + "trimmed": true, + "sourceSize": { "w": 32, - "h": 25 + "h": 32 + }, + "spriteSourceSize": { + "x": 3, + "y": 8, + "w": 26, + "h": 21 + }, + "frame": { + "x": 1, + "y": 213, + "w": 26, + "h": 21 } }, { - "filename": "hedgehog/2.png", + "filename": "hedgehog/1.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -178,28 +241,28 @@ } }, { - "filename": "hedgehog/13.png", + "filename": "sheep/sheared/sheep_down.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 32, - "h": 32 + "w": 64, + "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 5, - "w": 32, - "h": 25 + "x": 18, + "y": 29, + "w": 25, + "h": 30 }, "frame": { - "x": 1, - "y": 140, - "w": 32, - "h": 25 + "x": 26, + "y": 171, + "w": 25, + "h": 30 } }, { - "filename": "hedgehog/8.png", + "filename": "hedgehog/0.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -207,20 +270,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 1, + "x": 0, "y": 6, - "w": 30, - "h": 23 + "w": 32, + "h": 24 }, "frame": { - "x": 1, - "y": 167, - "w": 30, - "h": 23 + "x": 90, + "y": 57, + "w": 32, + "h": 24 } }, { - "filename": "hedgehog/11.png", + "filename": "hedgehog/2.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -228,20 +291,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 30, - "h": 23 + "x": 0, + "y": 5, + "w": 32, + "h": 25 }, "frame": { - "x": 33, - "y": 167, - "w": 30, - "h": 23 + "x": 56, + "y": 72, + "w": 32, + "h": 25 } }, { - "filename": "hedgehog/0.png", + "filename": "hedgehog/12.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -256,13 +319,13 @@ }, "frame": { "x": 90, - "y": 57, + "y": 83, "w": 32, "h": 24 } }, { - "filename": "hedgehog/12.png", + "filename": "hedgehog/3.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -271,19 +334,19 @@ }, "spriteSourceSize": { "x": 0, - "y": 6, - "w": 32, - "h": 24 + "y": 4, + "w": 31, + "h": 26 }, "frame": { - "x": 56, - "y": 72, - "w": 32, - "h": 24 + "x": 29, + "y": 203, + "w": 31, + "h": 26 } }, { - "filename": "hedgehog/14.png", + "filename": "hedgehog/13.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -297,14 +360,14 @@ "h": 25 }, "frame": { - "x": 90, - "y": 83, + "x": 50, + "y": 99, "w": 32, "h": 25 } }, { - "filename": "hedgehog/4.png", + "filename": "hedgehog/14.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -313,19 +376,19 @@ }, "spriteSourceSize": { "x": 0, - "y": 4, - "w": 30, - "h": 26 + "y": 5, + "w": 32, + "h": 25 }, "frame": { - "x": 35, - "y": 113, - "w": 30, - "h": 26 + "x": 50, + "y": 126, + "w": 32, + "h": 25 } }, { - "filename": "hedgehog/7.png", + "filename": "hedgehog/15.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -333,20 +396,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 3, - "y": 7, - "w": 26, - "h": 22 + "x": 1, + "y": 4, + "w": 31, + "h": 26 }, "frame": { - "x": 35, - "y": 141, - "w": 26, - "h": 22 + "x": 84, + "y": 109, + "w": 31, + "h": 26 } }, { - "filename": "hedgehog/16.png", + "filename": "hedgehog/5.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -354,20 +417,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 2, + "x": 0, "y": 4, "w": 30, - "h": 26 + "h": 25 }, "frame": { - "x": 67, - "y": 110, + "x": 84, + "y": 137, "w": 30, - "h": 26 + "h": 25 } }, { - "filename": "hedgehog/10.png", + "filename": "hedgehog/7.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -381,14 +444,14 @@ "h": 22 }, "frame": { - "x": 99, - "y": 110, + "x": 53, + "y": 153, "w": 26, "h": 22 } }, { - "filename": "hedgehog/5.png", + "filename": "hedgehog/8.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -396,16 +459,16 @@ "h": 32 }, "spriteSourceSize": { - "x": 0, - "y": 4, + "x": 1, + "y": 6, "w": 30, - "h": 25 + "h": 23 }, "frame": { - "x": 67, - "y": 138, + "x": 53, + "y": 177, "w": 30, - "h": 25 + "h": 23 } }, { @@ -423,14 +486,35 @@ "h": 25 }, "frame": { - "x": 65, - "y": 165, + "x": 62, + "y": 202, "w": 30, "h": 25 } }, { - "filename": "hedgehog/6.png", + "filename": "hedgehog/11.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 1, + "y": 6, + "w": 30, + "h": 23 + }, + "frame": { + "x": 85, + "y": 164, + "w": 30, + "h": 23 + } + }, + { + "filename": "hedgehog/10.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -439,15 +523,15 @@ }, "spriteSourceSize": { "x": 3, - "y": 8, + "y": 7, "w": 26, - "h": 21 + "h": 22 }, "frame": { - "x": 99, - "y": 134, + "x": 94, + "y": 189, "w": 26, - "h": 21 + "h": 22 } }, { @@ -465,11 +549,53 @@ "h": 21 }, "frame": { - "x": 99, - "y": 157, + "x": 94, + "y": 213, "w": 26, "h": 21 } + }, + { + "filename": "sheep/effects/wool_2.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 2, + "h": 3 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 2, + "h": 3 + }, + "frame": { + "x": 29, + "y": 231, + "w": 2, + "h": 3 + } + }, + { + "filename": "sheep/effects/wool_1.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 2, + "h": 2 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 2, + "h": 2 + }, + "frame": { + "x": 81, + "y": 164, + "w": 2, + "h": 2 + } } ] } @@ -477,6 +603,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:e23af580288268463484ed1be48bc739:93017fa920e9acf53bcba0274a0b2d6b:b00d48b51f56eb7c81e25100fcce2828$" + "smartupdate": "$TexturePacker:SmartUpdate:a79f042c30c2b5fde2cdf0a970d75ff7:cf2c9a4cb3cbf871847bae8c8e67403d:b00d48b51f56eb7c81e25100fcce2828$" } } diff --git a/apps/client/src/assets/probable-waffle/atlas/animals.png b/apps/client/src/assets/probable-waffle/atlas/animals.png index e14e584a05f57a7bd46302f68bdea41092853588..ec97fcf8eb638a7df7b7aef99aca1f5f1765a82e 100644 GIT binary patch delta 3737 zcmV;K4rcL~7q%TGiBL{Q4GJ0x0000DNk~Le0001f0002%2m=5B0GL+NN&o-=KanLO zC6RWcZO|B!3PNNklEsi{lI!=R{YIq#KYX#9Q0#+YPdN_9~F1~L+ppC=F0axfI!@CcU|B5Gnn^iPE z2kIXoe7p5iuL^kZV|m@Txc`n*2S$I-gTI?Wd;q8MA3K&l7@DvG&B43J4%|oKQNsX# zPN`&QR6KO*b$_%4PT@T?W5)2AoswtYLVL4oxBul*!gFs#z%%GNnVmUqe0TONe2G7V zuCd>Wwx{0xcJ{Z7?>MKK{Q>OEDVT9AoCRog)hpUO4}ZA;_}dV=#?Upvj&Apb6F0w< zJq0cNO%8v%g~2Ba3kHvpv)}%&%=xcZt!Ee-lZGUf2C){EWMCj8HISlonaW(v;bjJP}_-R_x zBINnh5q-#1oP%FiunBUz6%#MPN2JcgYP{9q-)?0ej&G0GaZiIfu(j3@^r@b8O1ukobLCZ26!n=O8gROk~@^!*2#Nlsvh(S+{veoI3 zi7Z9+y-NEokKA{mD-|`2x1?7`cc${LZop2yzWYG=qqXC-B^PzTLIz)3MUe$nUhT4X z!yBXc;NZu8Tck#>FvuIcrpGB`maT}@<9Ln{YCH@RwyJjhkh&VZ3YJP<;$3*h!t+#4(K+t5#D)&_&U3bo${b0X5^CFzuBg^tgujRd_%rz|TJ z;DhN937s;mK$J@5jxb|q>9orVSY#^&NEv)7o$^VnH1*n#9rmLKFQ-#Z>1a)qi5zO_?*N{z5|h)ZAdy2wkg6h#7G6N7R3eAi z_748fpR$IjXLb8@DoErMOox_G(TvB@DKt)HA_oudU=>sh<#y;aE_OGOQ(C$ZKNDpz zI68GNx!vAL_SYvcvAgV~L!BB7ck%1sTB(_lxyJ zMHsEG)93L)ox>JkOm7urh-yISA`Dt&P&|GPp8mdZa}`sNG1izOj8Pu{UK87C-TE|15`i7)g(!sF9OmEIS4e7H()%^BMFd0bwlXH~5^KGw1><4qoyR_P^Wv99;K zeB~J)msaV4=W@K2d4E>z43EpJ^x$JbtMQ1Y{M#HKgFG%Kh2pWGCxG2kFREGKd0bwl zS3DN9mecOhZ8uD{3LK9MtMsPwu^^8YK1Fc*CoF=T$3<0o9zTm(JMA8RuQ#B5rSiGE z@Sc*oReHGtzCpBSgWnFn7jJe#d*(=?YzX2>c)K}&!`388p?`rl33SJ%V33rYO(v`K zu=rjEwR||=Z_3HMy=JORi5k%}zH$7Gcr<8AvM>~04>T(4HS z$O^Qu&{cW@XMg_@8shZxBCBQuC3+@-(iTnOw}4ND;_d|e7etmE{wpGD0RC$tO9U?$ zS?}sh^mVDo5?{9QC6Oh(Y~u?e>q`nx94wVouYW68%3ro2Yc{btEV7iaPEi1FwU-m1 z>wQ3E3F{OEqhD888!i!9g3C4}p6=7zoBF{3fyf%DQ-6#;uEEsh)2!HY2|bY|xNM^{ zYKyx^d1<9h`&&<+dOMfQ;3}AxddKeA(w5q zC!^4tex5|z{Yo^?B?#b~!U{zRJX5Mzq*c!)2;iy9HjuS9m7Lt`DHydB=w%z>_z4bs zIS=N^Ab(*AiuSUNumvgjoml)Qn?DZ&RCHlQvWzJ06(TZhdjnpZI;pIDy2^-Rec6UT zc=)MLvf6=~BC14->TFmMLTfJD*qk4X8y)oMMVZHC@zkuEQoZJ~jUMAXA`*ybSY@@Y zm8@)%Ioa9p7M&=pP+bYKIvgNs11OtHsu-noGk@EwHdNoWhl-Me-x9@ptE$esb23?n z<c7p*H^R6h6Ds>GZYm z3d*fFR3(;0jXOS?^a;r!enDlq;cq#tL7McMls?u2Z**UoPnz;@jFdh%0nw9*eQ1oT zLVro=lO0HI4fSk7LrT49cIihK{)jOM^&QT2+*oZkgD0gL{O8B~VA#RqeIoF5*e*m} zR7&S~Qc^wmcKjCGmo4uj@%%_i_2N^*_hYZ&pLN-?6nj#0sq$v#vJ-6ZZQ1h3xs2x` zcs|EMY~*v6g!qP$J=`cWs-5S^o{B(@*E8~oOrdw&pC zNboMi@(A+Udg8$JC{*VtLIx#;r%;u%7x9g3@GN|4<;m#loYX(h#qOubLua>q%-fr| zzY47v;q%szP)d)K3R2m3sIw8>zgKpF)j86Z;y7LSa%B{$bB24+s(X)-N*VnB+jmI& zl+GC+e~Mr3akcloI1;ILf=6_Y8V&-*y?=EaxP31< zuLrMqog)hZh)l3+!FKqXU(3 zT$=<+@3Mtac(*;SA?x`1{k_&l-#+%4;)##P1KPF^;5&CaI=rvzwT|n%6{Txb-iKH2 zLCK5z<6U0W*-+=;iArpx;(w!p3BEFpB6y|@fvyF2#&Pi#T=vsa8%G|VD?{j23aIp; z<|Pe&2%axP=+=UJ;~3!E5EMW9ei;H^3$9eU+YnJY%)OXw83JDm-u1V8woOomAgBdD zQM)B9LpXn9t1L#tl_7lN0U>c2!ayzf32eR$L0$_kiIFyi=4=^4IDb@3EjV}gChm%} z|K^8FmnH>I)vopY{GKb0mLb^tB~ac8yQ=_Tv@d}*BGjbtx`Z{D2E$G+{bK$(FWeL^fB`_`=!<(mVUfm0q5 zr}zxKfAauOc^sH4-u_#6Cz~X$-Zrg2Gy0S5`|$q)$}?9o+=6lB00000NkvXXu0mjf Djx0;K delta 2933 zcmV-*3ySo%9hes-iBL{Q4GJ0x0000DNk~Le0001g0002L2m=5B0N{)Bl>h($HjyPF z9H|l#!O6D~uEdLK;oNm1MMG*c2-S6?k>dnZnk-$N+ zz!rF$f1~7(lf`$iWzaqdfHi*lm6o4eg-;uB4Py)#|1ZGk_4b;wwJm=6$|=L2#OytI zM0fu{f4c}L_PIUlVXZK`%V#zkAAQ*R-k2jG8}|_yfT8(kkAEugZE&3*o$o!a`+xk< zm>nqi=ks}X!`AjN_%>KuSrD8LX7?7v58TIS1v2ROH-%q+Mx$3hS9u`7=f8gS-5MbH z?>L+TczlOMFMj1GTfi5Hn?5?e7?2$B{QmfMe}BCJC+mOz;V@pHML5y)_cZr7@8k$r zI(*syHXf4O1nmIi_jvpuZGbqw(U`|iQ*PkTg75zX1CD$Iw+-WeDe?OQkj<*_(T|n2 z-_s_%z_;UoZu^nDpEm&ES^CGW<&P03F2ZiMRG6%i2ONOmNYT&FKlmWyuT$`rg13Xa(r>|d@XX=N*a-Yp zkH4;Q`Z?I5>63SLI0Q$^0X+T{1MvP^f7kk@qci33`$RFnfQHA(Ul=ubGN5E%19*$3 zPc6VWRrvGg5Ak7R!D=nO!)Ww%v}ya-%@T+;nV^DSrY?#(6S~|ZxP_Vhi}07_k=LQP z)F$|;h1Eg}JYcmvk8Hsbp9`Z}F@jLvPxLR2O^63$wWe+Pj- z%oaN$qG5nx{BsTE*T?6?wwZdv|6qB=U=At@lZAsI4hRdp#DKzAZFNP|do|}DCZ?eV zR7!*ps(NI-XzgWpzxO2jBfrSX2^Jrx%O z7TBr-SvZ+%c6)tN-Sji<$`mjVf3VtwTI`|dq!2Oa&vW_{{g5266X+hSjDf*kRzYsnxY_^94_GEr z3Y*A;jsY$(i(gbCe6QeJf31(|Dgvma-bo}H3!7;>+^HMQYCnXq8FWRYENZjJTL!ek zrdKw$M%U3MvGxvrCu~Mx}?j z4Y7>zTTuun_N}m4WG#%ZxFI5mU<^p5rHWV7!X}p0kOLGqM3H_Ne>T@@FX313*nogv z?Euvcp)#Q3RIRXybWQJrkBJ)si(i!TLxIQHWnnWr0O3#E5Qs?@Ev-l&qs$fwn|sF3 z(&pR^(Mm3P**oEbJlbB>^kcbqLj>KYm7FNyg}&Chi*53TD8f@7B)yx!pSmF?gdZjE zdDRVZbLek~H{mO9e~9-Ppt>PmF;V)0RoxI&HZ;+9!zqi38=}hvaT!Is$c?f%b3<^6 zs6AEigtDl#A5H?{G?4RNfGz{*|><*#MQYs3?79@7pkYY=|)Z ze8ber;&ktvwIdQP1~?Fu#rqu0_U%-Suot8~R$2TVJ~#hZf5>&h!dO|Hhky8?Sbz-+ zD@*q^J9g*pP!&C4U|P)?FWe*kF0X!ei+Nl-s2~La^Y$tbk_j) zNFtYW!Lx5C>vcshEsm5$DMEM4|3vuXmNTp?;vLY>P*eLE$xKZn2f6wYA8KWBCPFX0 z%=PtEcSH5)e;-9x%+e;MENUWjb?=egSOWf*RyZk(lM&j|GMf+pqOR!i_kpsgi_mq< zi!z(0<`J*cMp>MW&;!D+OhdT)RTrTLlEW_>8MG1lU5yml2>m{MWrThszA8dbHge2N zUlXC{8ad`yUy9IkjU4KsjnFfV9JleA2tC!vF}VPWe+WI*$Z^XAK0;44a@-x9Mm5#Q z@fYx!MvnInp^@Y5Lu%yse~5Yr+utV~z!#u%Ery7Oy~PBf#SoJ~l7xu?YT=*Z<7sB8 zh0tXvMVXF!hEHfQEZ@AoOO=7-GM(&Rrp2(>7U$<5K&s)TG9Bw7o@V0ax7>;b&C0Q5 zI{q0xf2qYV6@p?N$TVj_EYpe4@bNUW6rn!D2t)w7tvM{y@g9;|4C5yb*=Hlp0_T!N zS*8=8;S*X6WBuhb=Au_l`iZuaGt+drjwuH^8ov>#SkEsA2NPnz;c;Re|&}yoj;mp`Yp4?=Z>y_wjI4#EYnfX z@ImNcgNp17TMQxBe?Ic`L0zV!p5faY7U{XB8MYXP$wmCVjviu}j(CQzeTFu0O*3vW zTmbU=^a>?crX!!>YfEV1HD=sm=riwhd(}y}T&C-u;WJGQGjcsMZZYI^BC$-@J;P_3 ze;Q`McLt7H45bn#SElQq;WK@k(Q%Z!|Cnv?m&$bQGkm6ffNtrZF`IhCf-lo`&+vii z@U?}uJ2K+ZJ;UcbFr7oQ`7MtRlz*quf0zIN&c9;*|NdqSF8_ZS2O{~2nE$^PygPbQ z{y#y%?$AFW|JRlYdE*#uI_$?4n{;zE0 z;LeZ0Pm)`9>|y|YBL{zeWPVbmFY%9=C=&|jN8%@G)epo>%tV=xJwJ-~7y)EFqznc0 zWkQiZ%lu?7^NI`w)MY~H{E+-)Z_;mkyqW}DDiccQhkTC_{}WJgY-B{e`-L*0e{_Bb zegdZNL&$l28$!i0p>TeN{G@^z=Kpe;kUc*nKj}{RugZkt`RVvc&$511CX~)k$4?Ah z=ek=aKTPEbsPtQ+wAH5X$gSt$}oFC#nM%uTy;_?S&nQ(Z1D1Jf-+)Vzh zDHF2kf6q^r1t#RZVlvi{%Z z-_0Cg%Doy{0D*zn7 z1Cjs9O`cHS&jbB^9G{_DnfCiLO`b`A&-go4-)iDB5Du>5H|VNwDgI*pe;-CYx^#Rd zzYkjWmKF%<|84%j#%Ex^uY7|Kx1%CHbw1em99aS60$2FHuKFhH@5A^ERs3!@K*c|H z=?y-_>#2{=P~y}^fK0T_KG9{p6m{cI$@BDpb5o}w~7 z=6A`#j;Xouxux#|F5eig`X;3c|J)JvqN;D2{J7zFE&YlP@YAn< zyN?e$TYXcW0nG1UKp!$U>&nl!s&Dyz9rL?%K?cY8jkXZ&H+QRVCmlg0Gc1n(L0^Ac f{&t1sKRNydMct&bk9ma800000NkvXXu0mjfe+|lj diff --git a/apps/client/src/assets/probable-waffle/atlas/anims/animals.json b/apps/client/src/assets/probable-waffle/atlas/anims/animals.json index 5ef645cb..d7653924 100644 --- a/apps/client/src/assets/probable-waffle/atlas/anims/animals.json +++ b/apps/client/src/assets/probable-waffle/atlas/anims/animals.json @@ -277,7 +277,112 @@ "keyframe": false } ], - "frameRate": 24, + "frameRate": 1, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "sheep_idle_left", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "sheep/sheep_left.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 1, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "sheep_idle_right", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "sheep/sheep_right.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 1, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "sheep_idle_top", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "sheep/sheep_up.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 1, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "sheep_idle_down_sheared", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "sheep/sheared/sheep_down.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 1, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "sheep_idle_left_sheared", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "sheep/sheared/sheep_left.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 1, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "sheep_idle_right_sheared", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "sheep/sheared/sheep_right.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 1, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "sheep_idle_up_sheared", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "sheep/sheared/sheep_up.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 1, "skipMissedFrames": true, "repeat": -1 } diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/effects/wool_1.png b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/effects/wool_1.png new file mode 100644 index 0000000000000000000000000000000000000000..1e5e9d33d0681cb20259232ff46dec713e76ce15 GIT binary patch literal 97 zcmeAS@N?(olHy`uVBq!ia0vp^Od!m`1|*BN@u~nR#^NA%Cx&(BWL^R}(w;7kAsjQ4 p|9ts-y`BvS)PT6{^K?A}1_tLvY~eLZcY!Ph22WQ%mvv4FO#r_m7dij{ literal 0 HcmV?d00001 diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/effects/wool_2.png b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/effects/wool_2.png new file mode 100644 index 0000000000000000000000000000000000000000..93e751a92462be3d1d6926953bcbe7836fb3366d GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^OhC-c!3HFEzPi^4q!^2X+?^QKos)S9}edua?b>-~p;<@O1TaS?83{1OPne97q5F literal 0 HcmV?d00001 diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheared/sheep_down.png b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheared/sheep_down.png new file mode 100644 index 0000000000000000000000000000000000000000..808c8cbff961a30914909dda934964c48b8fbc20 GIT binary patch literal 688 zcmV;h0#E&kP)Px%YDq*vRCt{2m_KXVKp4g!iFWB)NI!rf9U6)|+9|Y91f2@$cj#hVPlasROT9Gd zl&*ztF=#a@1Y&8F2+9zHKS12ALkbN@9pqP$ES;3Xy{FQ?KQNr-`}aJ4@9xzBf*=Tj zAP9mW2!bF8f*=TjAP9mW2*SUQWqQEC9Vb-oI3obSV!96ic=GC<@%h{_F-TrCuCIW* z_muTao4`I;;Et2L=-KqBvflRdmjz=?8NoJ4;Eogjc#?gODgr_zOZ*N!4d%^zV~7WKpF{u0<|*%TLjb*e%`4p11RhP0Dlx{H-OeZ zuCLOMf{Wb~T8`OJ5Ff*uhX=vd(kqj zbN^BHj50+|cp_kx_~Zrn;T&Fcu5ObPPJO7%)QNrrYEs>j$O?Mh&9u<4gmj_bfZW6v z)BP+8GGWBZC_kLn_g81A2H0PQlwrIQ)$4B7i)4<3R`P%nhQhrH76UrYC=LCFvplN@ zl=6ncZ;WVN0(4dfE|QKjs{UsyP6z;%b-#QV0ssbkhiq?!YPx%g-Jv~RCt{2mp^C}K@`Tn99|$-q}1Mn*od6v-3bbEtq^Omi$yS(MzpiAiju}N zTwyvJu@X|GIgkkXQ|1Us5n(%gR&fd=M&d$#6PL9Oy2glvcJl@UwX5M?V z03n1BLI@#*5JCtcgb+dqA%qY@t~*mjIa*t4xTVtA-Qvfc!hGB0Mq0z}a?>4+T>ts` zhb?@0{mB0YfX3aM0D#@YKgF)nBB^$%yWDg|a4NPBP5=Pn6kL@Ppk1U0zP9ik{q=bO zkbVadBE0;xEBW2uSal=D2Hb!0%9@y|Qy>iw?%l%n!3j>!&RwV1iM6S=+5iBPc_Co6 z)rQmS_}@hcqjk_a1dYHdV8RN?eG(E!U8 zX+FYm0N_GA@d=VA#k2whEBc-H54E<<)>C=VTYS=(a_5CzxdIFa@#1;xZ>+kfXXnO3 zr0xR1xXr~OgsMNjD2{$mn=8@|1CRsDL&%T#&)J#j)G1+=6vF5D(EC!&I$0?>;D1()N6C` zJ-=L$#uJ4M372K}0SjF~(0%v9?*^m4hXBSeNn);En=^A7(M>vvE9DUs>0d z8d6IPza;_*VuUYC-t*qkZ^=xEtMaeoQd1y~;I0Kvjm{Q`3Y>+B3lJpB5zdR1i_leq x0!(@Vljgq{z-kfv`opp5-nxH62qEN}^A9#l16!LV5|;n~002ovPDHLkV1hAoOo0FZ literal 0 HcmV?d00001 diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheared/sheep_right.png b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheared/sheep_right.png new file mode 100644 index 0000000000000000000000000000000000000000..2c36a8af495ae8fc54bfcb65a75dc53172e5c1ad GIT binary patch literal 701 zcmV;u0z&Px%cS%G+RCt{2n7wZkK@i2CEsTToMRAs)WzdGY<64(#>{ga!Jt57bNu=4tQrU0F}3DSabD!Bt7DQ+6mL@3Uya{wf6hj`$GrRH7qhC7M=U43~Yx=))6 z~G&l5Nu>U0{}h`LdvQEFbj{* zaj+k6jnk5=23)*w-v00`!fZjY?0J>it!L@>9q@7v$Rfas(h1URCKgUdoC2V=JA(kz z!Nw%O*gh>bi@;9?0M;x>TQw=F#^S2j9Ch2tThNi*2IUM;Yqq?%!~WnW0AR5`XB_uk z00GCN@WzV=(Lu=OtXA<8I)DgYdH%Kpoc!r2Uz(5R$e3@O+F-CdjPCmbeSEP#r;Ck! zj*Cuuj<1&=CZ;|I1iM4cK{Z266t$Wz6!J#sZxWb>zb9BB3-7K00000NkvXXu0mjfuy#Iq literal 0 HcmV?d00001 diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheared/sheep_up.png b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheared/sheep_up.png new file mode 100644 index 0000000000000000000000000000000000000000..c3da13c116dfbccae92b51ad38948732fb3406f9 GIT binary patch literal 700 zcmV;t0z>_YP)Px%c1c7*RCt{2nLTUUP!xvWlzQ>csQy5^X3FBlL!pzG(5)RxqA3JV88VgN$u=3< ztr$v|6g*@Rge*x$XUG(g|3J464#ZG(sC0d#D_yyX&bj?K4;br{d*An-d+w10D2k#e zilQirq9}@@D2nnwu_4{y_q+Q90Ope(0O0wXui|~6Je6vwD4ZUjPkP>rc;cf`O3@H$ z#0;2EdO5Mrw!cU<66?vndj(C}53%x>2R)<7f!9+O}cLuoz%v{X&AvguBH4&dTu^SR){ghI#R6 z*0+R{Yl2Q__9aY^DTQ0@mB^|UASIg$Qt%r<#iZN5GJY8>29ydc$@cVIl_}iQfGq;* zMmauxpWjdOLhe3VDKf!kfRzAKj6lacH;J&-M$qkZbrAqlA>=B3*Iws^5@F*8)WQgXTkbqs49z>Cb#9n zGULa$8;o~1lbz8eTNJS5fQ#q^Kz_7qNneIY*8yx1a1ov0_0c&1_i`o?<}O&Lz^DB! z0Km@Za^v{$ZRJzlyMqt85FhVuio6X11iua!MgA#x|2pg&HNbZVe4_^V?tpJtR)NoF ivDf<*MNt%GJ$?euY5Y?pj+z+&0000 Date: Fri, 12 Jan 2024 10:03:17 +0100 Subject: [PATCH 114/138] Sheep shearing --- .../game/prefabs/animals/Sheep.ts | 48 +++++++++++++++++-- .../game/scenes/MapRiverCrossing.scene | 22 +++++++++ .../game/scenes/MapRiverCrossing.ts | 8 ++++ .../instant-game/instant-game.component.ts | 7 +-- 4 files changed, 77 insertions(+), 8 deletions(-) diff --git a/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.ts b/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.ts index 4f6c143e..ecd5d83c 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.ts @@ -3,7 +3,6 @@ /* START OF COMPILED CODE */ import Phaser from "phaser"; -import { ANIM_SHEEP_IDLE_DOWN, ANIM_SHEEP_IDLE_DOWN_SHEARED } from "./anims/animals"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ @@ -17,12 +16,14 @@ export default class Sheep extends Phaser.GameObjects.Sprite { /* START-USER-CTR-CODE */ this.handleWoolParticles(scene); + this.handleSheepRandomRotation(); /* END-USER-CTR-CODE */ } /* START-USER-CODE */ private woolParticles?: Phaser.GameObjects.Particles.ParticleEmitter; - + private direction: "up" | "right" | "down" | "left" = "down"; + private sheared = false; private handleWoolParticles(scene: Phaser.Scene) { // Add wool particle emitter to the scene this.woolParticles = scene.add.particles(0, 0, "animals", { @@ -46,19 +47,56 @@ export default class Sheep extends Phaser.GameObjects.Sprite { } shearedCount++; if (shearedCount === maxShearedCount) { - this.play(ANIM_SHEEP_IDLE_DOWN_SHEARED); this.woolParticles?.emitParticleAt(this.x, this.y - 20, 50); - + this.sheared = true; + this.playSheepAnimation(); // start timer to reset sheep scene.time.delayedCall(5000, () => { shearedCount = 0; - this.play(ANIM_SHEEP_IDLE_DOWN); this.woolParticles?.emitParticleAt(this.x, this.y - 20, 50); + this.sheared = false; + this.playSheepAnimation(); }); } }); } + private handleSheepRandomRotation() { + this.rotateSheepToRandomDirection(); + this.playSheepAnimation(); + this.scene.time.addEvent({ + delay: Phaser.Math.Between(2000, 5000), + callback: () => { + this.rotateSheepToRandomDirection(); + this.playSheepAnimation(); + }, + loop: true + }); + } + + private rotateSheepToRandomDirection() { + const randomDirection = Phaser.Math.Between(0, 3); + switch (randomDirection) { + case 0: + this.direction = "up"; + break; + case 1: + this.direction = "right"; + break; + case 2: + this.direction = "down"; + break; + case 3: + this.direction = "left"; + break; + } + } + + private playSheepAnimation() { + const anim = "sheep_idle_" + this.direction + (this.sheared ? "_sheared" : ""); + this.play(anim, true); + } + setDepth(value: number): this { this.woolParticles?.setDepth(value + 1); return super.setDepth(value); diff --git a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene index fbeb0366..eb1e3830 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene +++ b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene @@ -1261,6 +1261,28 @@ "label": "sheep", "x": -208, "y": 1248 + }, + { + "prefabId": "2e708e33-ee95-41cc-b479-aaf17a1a8225", + "id": "7223c165-660d-4bac-b533-149fac06021e", + "unlock": [ + "x", + "y" + ], + "label": "sheep_1", + "x": -160, + "y": 1232 + }, + { + "prefabId": "2e708e33-ee95-41cc-b479-aaf17a1a8225", + "id": "cf8ae8e9-caf6-4f98-b413-65bc48e97b01", + "unlock": [ + "x", + "y" + ], + "label": "sheep_2", + "x": -144, + "y": 1280 } ], "plainObjects": [ diff --git a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts index 76915b20..80ab53ae 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.ts @@ -508,6 +508,14 @@ export default class MapRiverCrossing extends GameProbableWaffleScene { const sheep = new Sheep(this, -208, 1248); this.add.existing(sheep); + // sheep_1 + const sheep_1 = new Sheep(this, -160, 1232); + this.add.existing(sheep_1); + + // sheep_2 + const sheep_2 = new Sheep(this, -144, 1280); + this.add.existing(sheep_2); + // blockStone_5 (prefab fields) blockStone_5.z = 32; diff --git a/apps/client/src/app/probable-waffle/gui/instant-game/instant-game.component.ts b/apps/client/src/app/probable-waffle/gui/instant-game/instant-game.component.ts index bae732d2..f93c17b5 100644 --- a/apps/client/src/app/probable-waffle/gui/instant-game/instant-game.component.ts +++ b/apps/client/src/app/probable-waffle/gui/instant-game/instant-game.component.ts @@ -5,7 +5,7 @@ import { GameSessionState, ProbableWaffleGameInstanceType, ProbableWaffleGameInstanceVisibility, - ProbableWaffleLevels + ProbableWaffleMapEnum } from "@fuzzy-waddle/api-interfaces"; import { LoaderComponent } from "../../../shared/loader/loader.component"; @@ -27,8 +27,9 @@ export class InstantGameComponent implements OnInit { await this.gameInstanceClientService.addSelfAsPlayer(); await this.gameInstanceClientService.addAiPlayer(); - const allMaps = Object.values(ProbableWaffleLevels); - const map = allMaps[Math.floor(Math.random() * allMaps.length)].id; + // const allMaps = Object.values(ProbableWaffleLevels); + // const map = allMaps[Math.floor(Math.random() * allMaps.length)].id; + const map = ProbableWaffleMapEnum.RiverCrossing; await this.gameInstanceClientService.gameModeChanged("map", { map }); await this.gameInstanceClientService.gameInstanceMetadataChanged("sessionState", { sessionState: GameSessionState.MovingPlayersToGame From eb284481a8c1016e79082896d55cf787a44aaf8b Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Fri, 12 Jan 2024 10:22:55 +0100 Subject: [PATCH 115/138] Setting scene data to be passed to other prefabs --- .../game/scenes/GameProbableWaffleScene.ts | 17 +++++++++++++++++ .../gui/main/probable-waffle-game.component.ts | 2 +- .../app/shared/game/phaser/scene/base.scene.ts | 10 ++++++++++ .../lib/user-info/probable-waffle/user-info.ts | 8 +++++++- 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts index 1e77e631..6b352571 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts @@ -8,10 +8,27 @@ import { SingleSelectionHandler } from "../world/managers/controllers/input/sing import HudProbableWaffle from "./HudProbableWaffle"; import { GameObjectSelectionHandler } from "../world/managers/controllers/input/game-object-selection.handler"; import { SceneGameState } from "../world/managers/game-state/scene-game-state"; +import { ProbableWaffleGameData } from "./probable-waffle-game-data"; + +export interface GameProbableWaffleSceneData { + baseGameData: ProbableWaffleGameData; + systems: any[]; // todo use + components: any[]; // todo use + services: any[]; // todo use - for example navigation service, audioService... which you can access from anywhere where scene is passed to +} export class GameProbableWaffleScene extends ProbableWaffleScene { tilemap!: Phaser.Tilemaps.Tilemap; + override getSceneGameData() { + return { + baseGameData: this.baseGameData, + systems: [], // todo use + components: [], // todo use + services: [] // todo use + } satisfies GameProbableWaffleSceneData; + } + create() { super.create(); diff --git a/apps/client/src/app/probable-waffle/gui/main/probable-waffle-game.component.ts b/apps/client/src/app/probable-waffle/gui/main/probable-waffle-game.component.ts index 00006492..a75345b1 100644 --- a/apps/client/src/app/probable-waffle/gui/main/probable-waffle-game.component.ts +++ b/apps/client/src/app/probable-waffle/gui/main/probable-waffle-game.component.ts @@ -32,7 +32,7 @@ export class ProbableWaffleGameComponent implements OnInit { this.gameData = { gameInstance, communicator: this.communicatorService, - user: new ProbableWaffleUserInfo(this.authService.userId) + user: new ProbableWaffleUserInfo(this.authService.userId, this.gameInstanceClientService.currentPlayerNumber) } as const; } } diff --git a/apps/client/src/app/shared/game/phaser/scene/base.scene.ts b/apps/client/src/app/shared/game/phaser/scene/base.scene.ts index 407bfabb..a4987594 100644 --- a/apps/client/src/app/shared/game/phaser/scene/base.scene.ts +++ b/apps/client/src/app/shared/game/phaser/scene/base.scene.ts @@ -17,6 +17,7 @@ import { import { Loader } from "../../../../little-muncher/game/loader"; import { CommunicatorService } from "../../communicators/CommunicatorService"; +export const SceneGameDataKey = "SceneGameData"; export class BaseScene< TGameData extends BaseGameData = BaseGameData, TGameStateData extends BaseData = BaseData, @@ -79,12 +80,21 @@ export class BaseScene< this.game = this.sys.game as BaseGame; this.baseGameData = this.game.data; this.communicator = this.baseGameData.communicator as TCommunicatorService; + + this.data.set(SceneGameDataKey, this.getSceneGameData()); + this.registerSceneDestroy(); this.registerSceneResize(); this.registerScenePostCreate(); this._onInit.emit(); } + protected getSceneGameData() { + return { + baseGameData: this.baseGameData + }; + } + create() { this._onCreate.emit(); } diff --git a/libs/api-interfaces/src/lib/user-info/probable-waffle/user-info.ts b/libs/api-interfaces/src/lib/user-info/probable-waffle/user-info.ts index c6650a5c..de95ca2c 100644 --- a/libs/api-interfaces/src/lib/user-info/probable-waffle/user-info.ts +++ b/libs/api-interfaces/src/lib/user-info/probable-waffle/user-info.ts @@ -1,3 +1,9 @@ import { BaseUserInfo } from "../user-info"; -export class ProbableWaffleUserInfo extends BaseUserInfo {} +export class ProbableWaffleUserInfo extends BaseUserInfo { + playerNumber?: number; + constructor(userId: string | null, playerNumber?: number) { + super(userId); + this.playerNumber = playerNumber; + } +} From 501cb49b045f382587613828ea52db023aeb13a1 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Fri, 12 Jan 2024 11:28:20 +0100 Subject: [PATCH 116/138] Restoring actors from game wip part 1 --- .../game/scenes/GameProbableWaffleScene.ts | 58 ++++++++++++++++--- .../game/world/map/depth.helper.ts | 20 ++++--- 2 files changed, 60 insertions(+), 18 deletions(-) diff --git a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts index 6b352571..2903565d 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts @@ -9,24 +9,37 @@ import HudProbableWaffle from "./HudProbableWaffle"; import { GameObjectSelectionHandler } from "../world/managers/controllers/input/game-object-selection.handler"; import { SceneGameState } from "../world/managers/game-state/scene-game-state"; import { ProbableWaffleGameData } from "./probable-waffle-game-data"; +import TivaraMacemanMale from '../prefabs/characters/tivara/TivaraMacemanMale'; export interface GameProbableWaffleSceneData { baseGameData: ProbableWaffleGameData; - systems: any[]; // todo use - components: any[]; // todo use - services: any[]; // todo use - for example navigation service, audioService... which you can access from anywhere where scene is passed to + systems: Record; // todo use + components: Record; // todo use + services: Record; // todo use - for example navigation service, audioService... which you can access from anywhere where scene is passed to } export class GameProbableWaffleScene extends ProbableWaffleScene { tilemap!: Phaser.Tilemaps.Tilemap; override getSceneGameData() { - return { - baseGameData: this.baseGameData, - systems: [], // todo use - components: [], // todo use - services: [] // todo use - } satisfies GameProbableWaffleSceneData; + return this.sceneGameData; + } + + private sceneGameData: GameProbableWaffleSceneData = { + baseGameData: this.baseGameData, + systems: {}, // todo use + components: {}, // todo use + services: {} // todo use + } satisfies GameProbableWaffleSceneData; + + private readonly knownActorNames = ["tivaraMacemanMale"]; a b c // TODO + + init() { + super.init(); + + this.events.on(Phaser.GameObjects.Events.ADDED_TO_SCENE, (child: Phaser.GameObjects.GameObject) => { + console.log("added to scene", child); a b c // TODO + }); } create() { @@ -41,5 +54,32 @@ export class GameProbableWaffleScene extends ProbableWaffleScene { new AnimatedTilemap(this, this.tilemap, this.tilemap.tilesets); new SingleSelectionHandler(this, this.tilemap); new GameObjectSelectionHandler(this); // todo maybe this needs to be on individual game object? + + this.loadActorsFromSaveGame(); + } + + private loadActorsFromSaveGame(){ + this.knownActorNames.forEach((actorName) => { + // destroy all actors on scene with this name + // load them again from save file + this.scene.scene.children.each((child) => { + if (child.name === actorName) { + child.destroy(); a b c + } + }); + const saveFile = this.baseGameData.saveGameService.getSaveFile(); + const actor = saveFile.actors.find((actor) => actor.name === actorName); + if (actor) { + this.scene.add(this.getActor(actor)); + } + }); + } + private getActor(actor: any) { + + switch (actor.name) { + case "tivaraMacemanMale": + return new TivaraMacemanMale(this.scene.scene, actor.x, actor.y); + break; + } } } diff --git a/apps/client/src/app/probable-waffle/game/world/map/depth.helper.ts b/apps/client/src/app/probable-waffle/game/world/map/depth.helper.ts index ca816195..63b003c8 100644 --- a/apps/client/src/app/probable-waffle/game/world/map/depth.helper.ts +++ b/apps/client/src/app/probable-waffle/game/world/map/depth.helper.ts @@ -1,5 +1,3 @@ -import ActorContainer from "../../entity/actor/ActorContainer"; - export class DepthHelper { constructor(private readonly scene: Phaser.Scene) { this.handleSortOfStaticObjects(); @@ -8,13 +6,17 @@ export class DepthHelper { private handleSortOfStaticObjects = () => { const children = this.scene.children; children.each((child: any) => { - if (!child.setDepth) return; - const childWithDepth = child as Phaser.GameObjects.Components.Depth; - childWithDepth.setDepth(child.y); - if (child instanceof ActorContainer) { - const z = child.z; - child.setDepth(child.y + z * 2); - } + DepthHelper.setActorDepth(child); }); }; + + static setActorDepth(actor: any) { + if (!actor.setDepth) return; + const actorWithDepth = actor as Phaser.GameObjects.Components.Depth; + actorWithDepth.setDepth(actor.y); + if (actor.z) { + const z = actor.z; + actor.setDepth(actor.y + z * 2); + } + } } From 09d47efcb2a71a1dbb556a2573e619ed033cc743 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Wed, 17 Jan 2024 18:52:16 +0100 Subject: [PATCH 117/138] Fix communicators when logged out --- .../probable-waffle-communicator.service.ts | 10 +++++----- .../communicators/scene-communicator-client.service.ts | 2 -- .../shared/game/communicators/CommunicatorService.ts | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/apps/client/src/app/probable-waffle/communicators/probable-waffle-communicator.service.ts b/apps/client/src/app/probable-waffle/communicators/probable-waffle-communicator.service.ts index 25e4b22d..2e6d458c 100644 --- a/apps/client/src/app/probable-waffle/communicators/probable-waffle-communicator.service.ts +++ b/apps/client/src/app/probable-waffle/communicators/probable-waffle-communicator.service.ts @@ -36,7 +36,7 @@ export class ProbableWaffleCommunicatorService saveGame = new EventEmitter(); // todo just for test - startCommunication(gameInstanceId: string, socket: Socket) { + startCommunication(gameInstanceId: string, socket?: Socket) { this.gameInstanceMetadataChanged = new TwoWayCommunicator< ProbableWaffleGameInstanceMetadataChangeEvent, ProbableWaffleCommunicatorType @@ -68,13 +68,13 @@ export class ProbableWaffleCommunicatorService this.createGameEvents(gameInstanceId, socket); - socket.emit(ProbableWaffleGatewayEvent.ProbableWaffleWebsocketRoom, { + socket?.emit(ProbableWaffleGatewayEvent.ProbableWaffleWebsocketRoom, { gameInstanceId, type: "join" } satisfies ProbableWaffleWebsocketRoomEvent); } - private createGameEvents(gameInstanceId: string, socket: Socket) { + private createGameEvents(gameInstanceId: string, socket?: Socket) { this.selection = new TwoWayCommunicator( ProbableWaffleGatewayEvent.ProbableWaffleAction, "selection", @@ -83,9 +83,9 @@ export class ProbableWaffleCommunicatorService ); } - stopCommunication(gameInstanceId: string, socket: Socket) { + stopCommunication(gameInstanceId: string, socket?: Socket) { this.destroySubscriptions(); - socket.emit(ProbableWaffleGatewayRoomTypes.ProbableWaffleGameInstance, { + socket?.emit(ProbableWaffleGatewayRoomTypes.ProbableWaffleGameInstance, { gameInstanceId, type: "leave" } satisfies ProbableWaffleWebsocketRoomEvent); diff --git a/apps/client/src/app/probable-waffle/communicators/scene-communicator-client.service.ts b/apps/client/src/app/probable-waffle/communicators/scene-communicator-client.service.ts index 6937f1f0..9c144ebf 100644 --- a/apps/client/src/app/probable-waffle/communicators/scene-communicator-client.service.ts +++ b/apps/client/src/app/probable-waffle/communicators/scene-communicator-client.service.ts @@ -24,7 +24,6 @@ export class SceneCommunicatorClientService implements SceneCommunicatorClientSe private readonly communicator = inject(ProbableWaffleCommunicatorService); private readonly authenticatedSocketService = inject(AuthenticatedSocketService); createCommunicators(gameInstanceId: string): ProbableWaffleCommunicators { - if (!this.authenticatedSocketService.socket) return null; this.communicator.startCommunication(gameInstanceId, this.authenticatedSocketService.socket); return this.communicatorObservables; } @@ -46,7 +45,6 @@ export class SceneCommunicatorClientService implements SceneCommunicatorClientSe } destroyCommunicators(gameInstanceId: string, subscriptions: Subscription[]) { - if (!this.authenticatedSocketService.socket) return; this.communicator.stopCommunication(gameInstanceId, this.authenticatedSocketService.socket); subscriptions.forEach((subscription) => subscription.unsubscribe()); } diff --git a/apps/client/src/app/shared/game/communicators/CommunicatorService.ts b/apps/client/src/app/shared/game/communicators/CommunicatorService.ts index ed31f21a..4f6d61a7 100644 --- a/apps/client/src/app/shared/game/communicators/CommunicatorService.ts +++ b/apps/client/src/app/shared/game/communicators/CommunicatorService.ts @@ -2,5 +2,5 @@ import { Socket } from "ngx-socket-io"; export interface CommunicatorService { startCommunication(gameInstanceId: string, socket?: Socket): void; - stopCommunication(gameInstanceId: string, socket: Socket): void; + stopCommunication(gameInstanceId: string, socket?: Socket): void; } From 78428ccba28a1225deb698a7c470ea85a2e9bc70 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Wed, 17 Jan 2024 19:09:59 +0100 Subject: [PATCH 118/138] Create actor from constructor name --- .../game/scenes/GameProbableWaffleScene.ts | 54 ++++++++++++------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts index 2903565d..8c6f5685 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts @@ -9,7 +9,9 @@ import HudProbableWaffle from "./HudProbableWaffle"; import { GameObjectSelectionHandler } from "../world/managers/controllers/input/game-object-selection.handler"; import { SceneGameState } from "../world/managers/game-state/scene-game-state"; import { ProbableWaffleGameData } from "./probable-waffle-game-data"; -import TivaraMacemanMale from '../prefabs/characters/tivara/TivaraMacemanMale'; +import TivaraMacemanMale from "../prefabs/characters/tivara/TivaraMacemanMale"; +import GameObject = Phaser.GameObjects.GameObject; +import Transform = Phaser.GameObjects.Components.Transform; export interface GameProbableWaffleSceneData { baseGameData: ProbableWaffleGameData; @@ -32,14 +34,14 @@ export class GameProbableWaffleScene extends ProbableWaffleScene { services: {} // todo use } satisfies GameProbableWaffleSceneData; - private readonly knownActorNames = ["tivaraMacemanMale"]; a b c // TODO + private readonly knownActorNames = [TivaraMacemanMale.name]; // TODO init() { super.init(); - this.events.on(Phaser.GameObjects.Events.ADDED_TO_SCENE, (child: Phaser.GameObjects.GameObject) => { - console.log("added to scene", child); a b c // TODO - }); + // todo this.events.on(Phaser.GameObjects.Events.ADDED_TO_SCENE, (child: Phaser.GameObjects.GameObject) => { + // todo console.log("added to scene", child); // TODO + // todo }); } create() { @@ -58,28 +60,44 @@ export class GameProbableWaffleScene extends ProbableWaffleScene { this.loadActorsFromSaveGame(); } - private loadActorsFromSaveGame(){ + private loadActorsFromSaveGame() { + console.log("PRINTING KNOWN ACTOR NAMES", this.knownActorNames); this.knownActorNames.forEach((actorName) => { // destroy all actors on scene with this name // load them again from save file this.scene.scene.children.each((child) => { - if (child.name === actorName) { - child.destroy(); a b c + if (child.constructor.name === actorName) { + child.destroy(); // todo + + console.warn("FOUND ACTOR WITH NAME", actorName); } + console.log(child.constructor.name, "CONSTRUCTOR NAME"); + }); + // const saveFile = this.baseGameData.saveGameService.getSaveFile(); + + const maceman = this.getActor({ + name: TivaraMacemanMale.name, + x: 544, + y: 900, + z: 0 }); - const saveFile = this.baseGameData.saveGameService.getSaveFile(); - const actor = saveFile.actors.find((actor) => actor.name === actorName); - if (actor) { - this.scene.add(this.getActor(actor)); - } + this.scene.scene.add.existing(maceman); }); } - private getActor(actor: any) { - - switch (actor.name) { - case "tivaraMacemanMale": - return new TivaraMacemanMale(this.scene.scene, actor.x, actor.y); + private getActor(actorDefinition: { name: string; x: number; y: number; z: number }): GameObject { + let actor: GameObject | undefined = undefined; + switch (actorDefinition.name) { + case TivaraMacemanMale.name: + actor = new TivaraMacemanMale(this.scene.scene, actorDefinition.x, actorDefinition.y); break; } + + if (actor === undefined) { + console.error(`Actor ${actorDefinition.name} not found`); + throw new Error(`Actor ${actorDefinition.name} not found`); + } + (actor as any as Transform).z = actorDefinition.z; // todo? + DepthHelper.setActorDepth(actor); + return actor; } } From c10f4ebec9468423340fb5cf6b8c8796c8a1735b Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Wed, 17 Jan 2024 20:47:34 +0100 Subject: [PATCH 119/138] Save and load game state --- apps/client/src/app/app.module.ts | 8 +- .../game-instance-client.service.spec.ts | 7 +- .../game-instance-client.service.ts | 9 +- ...instance-indexeddb-storage.service.spec.ts | 30 +++ ...game-instance-indexeddb-storage.service.ts | 78 ++++++++ ...me-instance-local-storage.service.spec.ts} | 10 +- ...=> game-instance-local-storage.service.ts} | 2 +- ...game-instance-storage.service.interface.ts | 8 +- .../game/prefabs/animals/Hedgehog.ts | 18 +- .../game/prefabs/animals/Sheep.ts | 18 +- .../prefabs/buildings/skaduwee/FrostForge.ts | 167 ++++++++++------- .../prefabs/buildings/skaduwee/InfantryInn.ts | 117 +++++++----- .../game/prefabs/buildings/tivara/AnkGuard.ts | 97 ++++++---- .../prefabs/units/skaduwee/SkaduweeOwl.ts | 46 +++-- .../game/scenes/GameProbableWaffleScene.ts | 175 +++++++++++++++--- .../gui/load/load.component.spec.ts | 6 +- .../gui/load/load.component.ts | 4 +- .../gui/replay/replay.component.spec.ts | 6 +- .../gui/replay/replay.component.ts | 4 +- .../src/lib/game-instance/game-state.ts | 4 +- .../probable-waffle/game-instance-medatada.ts | 3 +- .../probable-waffle/game-state.ts | 9 +- 22 files changed, 597 insertions(+), 229 deletions(-) create mode 100644 apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.spec.ts create mode 100644 apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.ts rename apps/client/src/app/probable-waffle/communicators/storage/{game-instance-storage.service.spec.ts => game-instance-local-storage.service.spec.ts} (72%) rename apps/client/src/app/probable-waffle/communicators/storage/{game-instance-storage.service.ts => game-instance-local-storage.service.ts} (95%) diff --git a/apps/client/src/app/app.module.ts b/apps/client/src/app/app.module.ts index b8116263..f9c35bc2 100644 --- a/apps/client/src/app/app.module.ts +++ b/apps/client/src/app/app.module.ts @@ -9,6 +9,8 @@ import { SocketIoModule } from "ngx-socket-io"; import { environment } from "../environments/environment"; import { AccessTokenInterceptor } from "./auth/access-token.interceptor"; import { SwRefreshComponent } from "./shared/components/sw-refresh/sw-refresh.component"; +import { GameInstanceIndexeddbStorageService } from "./probable-waffle/communicators/storage/game-instance-indexeddb-storage.service"; +import { GameInstanceStorageServiceInterface } from "./probable-waffle/communicators/storage/game-instance-storage.service.interface"; @NgModule({ declarations: [AppComponent], @@ -26,7 +28,11 @@ import { SwRefreshComponent } from "./shared/components/sw-refresh/sw-refresh.co SocketIoModule.forRoot(environment.socketIoConfig), SwRefreshComponent ], - providers: [AuthGuard, { provide: HTTP_INTERCEPTORS, useClass: AccessTokenInterceptor, multi: true }], + providers: [ + AuthGuard, + { provide: HTTP_INTERCEPTORS, useClass: AccessTokenInterceptor, multi: true }, + { provide: GameInstanceStorageServiceInterface, useClass: GameInstanceIndexeddbStorageService } + ], bootstrap: [AppComponent] }) export class AppModule {} diff --git a/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.spec.ts b/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.spec.ts index d44b78b7..925ed91d 100644 --- a/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.spec.ts +++ b/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.spec.ts @@ -20,8 +20,9 @@ import { import { RouterTestingModule } from "@angular/router/testing"; import { Observable } from "rxjs"; import { MatchmakingOptions } from "../gui/online/matchmaking/matchmaking.component"; -import { GameInstanceStorageService } from "./storage/game-instance-storage.service"; -import { gameInstanceStorageServiceStub } from "./storage/game-instance-storage.service.spec"; +import { GameInstanceLocalStorageService } from "./storage/game-instance-local-storage.service"; +import { gameInstanceLocalStorageServiceStub } from "./storage/game-instance-local-storage.service.spec"; +import { GameInstanceStorageServiceInterface } from "./storage/game-instance-storage.service.interface"; export const gameInstanceClientServiceStub = { gameInstance: undefined as ProbableWaffleGameInstance | undefined, @@ -110,7 +111,7 @@ describe("GameInstanceClientService", () => { imports: [HttpClientTestingModule, RouterTestingModule], providers: [ { provide: AuthService, useValue: authServiceStub }, - { provide: GameInstanceStorageService, useValue: gameInstanceStorageServiceStub } + { provide: GameInstanceStorageServiceInterface, useValue: gameInstanceLocalStorageServiceStub } ] }); service = TestBed.inject(GameInstanceClientService); diff --git a/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.ts b/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.ts index 0a880f20..d3c85424 100644 --- a/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.ts +++ b/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.ts @@ -39,7 +39,7 @@ import { Router } from "@angular/router"; import { ProbableWaffleCommunicatorService } from "./probable-waffle-communicator.service"; import { map } from "rxjs/operators"; import { AuthenticatedSocketService } from "../../data-access/chat/authenticated-socket.service"; -import { GameInstanceStorageService } from "./storage/game-instance-storage.service"; +import { GameInstanceStorageServiceInterface } from "./storage/game-instance-storage.service.interface"; @Injectable({ providedIn: "root" @@ -57,7 +57,7 @@ export class GameInstanceClientService implements GameInstanceClientServiceInter private readonly sceneCommunicatorClientService = inject(SceneCommunicatorClientService); private readonly probableWaffleCommunicatorService = inject(ProbableWaffleCommunicatorService); private readonly authenticatedSocketService = inject(AuthenticatedSocketService); - private readonly gameInstanceStorageService = inject(GameInstanceStorageService); + private readonly gameInstanceStorageService = inject(GameInstanceStorageServiceInterface); private readonly router = inject(Router); private readonly ngZone = inject(NgZone); private communicators?: ProbableWaffleCommunicators; @@ -371,6 +371,10 @@ export class GameInstanceClientService implements GameInstanceClientServiceInter // directly to game await this.router.navigate(["probable-waffle/game"]); break; + case ProbableWaffleGameInstanceType.LoadFromSave: + // directly to game + await this.router.navigate(["probable-waffle/game"]); + break; default: throw new Error("Not implemented"); } @@ -459,6 +463,7 @@ export class GameInstanceClientService implements GameInstanceClientServiceInter * todo this is a prototype */ async loadGameInstance(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise { + gameInstanceSaveData.gameInstanceData.gameInstanceMetadataData!.type = ProbableWaffleGameInstanceType.LoadFromSave; this.gameInstance = new ProbableWaffleGameInstance(gameInstanceSaveData.gameInstanceData); this.startListeningToGameInstanceEvents(); await this.navigateToLobbyOrDirectlyToGame(); diff --git a/apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.spec.ts b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.spec.ts new file mode 100644 index 00000000..43a0877c --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.spec.ts @@ -0,0 +1,30 @@ +import { TestBed } from "@angular/core/testing"; + +import { GameInstanceLocalStorageService } from "./game-instance-local-storage.service"; +import { GameInstanceStorageServiceInterface } from "./game-instance-storage.service.interface"; +import { ProbableWaffleGameInstanceSaveData } from "@fuzzy-waddle/api-interfaces"; +import { GameInstanceIndexeddbStorageService } from "./game-instance-indexeddb-storage.service"; + +export const gameInstanceIndexeddbStorageServiceStub = { + async saveToStorage(gameInstance: ProbableWaffleGameInstanceSaveData): Promise { + return Promise.resolve(); + }, + async getFromStorage(): Promise { + return Promise.resolve([]); + }, + async deleteFromStorage(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise { + return Promise.resolve(); + } +} satisfies GameInstanceStorageServiceInterface; +describe("GameInstanceIndexeddbStorageService", () => { + let service: GameInstanceIndexeddbStorageService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(GameInstanceIndexeddbStorageService); + }); + + it("should be created", () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.ts b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.ts new file mode 100644 index 00000000..ae068c7b --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.ts @@ -0,0 +1,78 @@ +import { Injectable } from "@angular/core"; +import { GameInstanceStorageServiceInterface } from "./game-instance-storage.service.interface"; +import { ProbableWaffleGameInstanceSaveData } from "@fuzzy-waddle/api-interfaces"; + +@Injectable({ + providedIn: "root" +}) +export class GameInstanceIndexeddbStorageService implements GameInstanceStorageServiceInterface { + private readonly dbName = "probable-waffle-db"; + private readonly objectStoreName = "game-instances"; + private db: IDBDatabase | null = null; + + constructor() { + this.initializeDatabase(); + } + + private async initializeDatabase(): Promise { + return new Promise((resolve, reject) => { + const request = indexedDB.open(this.dbName); + + request.onerror = (event) => { + console.error("Error opening IndexedDB:", (event.target as IDBOpenDBRequest).error); + reject(); + }; + + request.onsuccess = (event) => { + this.db = (event.target as IDBOpenDBRequest).result; + resolve(); + }; + + request.onupgradeneeded = (event) => { + const db = (event.target as IDBOpenDBRequest).result; + db.createObjectStore(this.objectStoreName, { keyPath: "saveName" }); + }; + }); + } + + private getObjectStore(mode: IDBTransactionMode = "readwrite"): IDBObjectStore { + if (!this.db) { + throw new Error("Database not initialized"); + } + + const transaction = this.db.transaction(this.objectStoreName, mode); + return transaction.objectStore(this.objectStoreName); + } + + async saveToStorage(saveData: ProbableWaffleGameInstanceSaveData): Promise { + const objectStore = this.getObjectStore(); + await new Promise((resolve, reject) => { + const request = objectStore.add(saveData); + + request.onsuccess = () => resolve(); + request.onerror = (event) => reject((event.target as IDBRequest).error); + }); + } + + async getFromStorage(): Promise { + const objectStore = this.getObjectStore("readonly"); + return new Promise((resolve, reject) => { + const request = objectStore.getAll(); + + request.onsuccess = () => resolve(request.result as ProbableWaffleGameInstanceSaveData[]); + request.onerror = (event) => reject((event.target as IDBRequest).error); + }); + } + + async deleteFromStorage(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise { + const objectStore = this.getObjectStore(); + await new Promise((resolve, reject) => { + const request = objectStore.delete( + gameInstanceSaveData.gameInstanceData.gameInstanceMetadataData!.gameInstanceId! + ); + + request.onsuccess = () => resolve(); + request.onerror = (event) => reject((event.target as IDBRequest).error); + }); + } +} diff --git a/apps/client/src/app/probable-waffle/communicators/storage/game-instance-storage.service.spec.ts b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-local-storage.service.spec.ts similarity index 72% rename from apps/client/src/app/probable-waffle/communicators/storage/game-instance-storage.service.spec.ts rename to apps/client/src/app/probable-waffle/communicators/storage/game-instance-local-storage.service.spec.ts index 2720b1ae..39b1829e 100644 --- a/apps/client/src/app/probable-waffle/communicators/storage/game-instance-storage.service.spec.ts +++ b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-local-storage.service.spec.ts @@ -1,10 +1,10 @@ import { TestBed } from "@angular/core/testing"; -import { GameInstanceStorageService } from "./game-instance-storage.service"; +import { GameInstanceLocalStorageService } from "./game-instance-local-storage.service"; import { GameInstanceStorageServiceInterface } from "./game-instance-storage.service.interface"; import { ProbableWaffleGameInstanceSaveData } from "@fuzzy-waddle/api-interfaces"; -export const gameInstanceStorageServiceStub = { +export const gameInstanceLocalStorageServiceStub = { async saveToStorage(gameInstance: ProbableWaffleGameInstanceSaveData): Promise { return Promise.resolve(); }, @@ -15,12 +15,12 @@ export const gameInstanceStorageServiceStub = { return Promise.resolve(); } } satisfies GameInstanceStorageServiceInterface; -describe("GameInstanceStorageService", () => { - let service: GameInstanceStorageService; +describe("GameInstanceLocalStorageService", () => { + let service: GameInstanceLocalStorageService; beforeEach(() => { TestBed.configureTestingModule({}); - service = TestBed.inject(GameInstanceStorageService); + service = TestBed.inject(GameInstanceLocalStorageService); }); it("should be created", () => { diff --git a/apps/client/src/app/probable-waffle/communicators/storage/game-instance-storage.service.ts b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-local-storage.service.ts similarity index 95% rename from apps/client/src/app/probable-waffle/communicators/storage/game-instance-storage.service.ts rename to apps/client/src/app/probable-waffle/communicators/storage/game-instance-local-storage.service.ts index 02ff6537..c3f9f96b 100644 --- a/apps/client/src/app/probable-waffle/communicators/storage/game-instance-storage.service.ts +++ b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-local-storage.service.ts @@ -5,7 +5,7 @@ import { ProbableWaffleGameInstanceSaveData } from "@fuzzy-waddle/api-interfaces @Injectable({ providedIn: "root" }) -export class GameInstanceStorageService implements GameInstanceStorageServiceInterface { +export class GameInstanceLocalStorageService implements GameInstanceStorageServiceInterface { private readonly localStorageKey = "probable-waffle-game-instances"; async saveToStorage(saveData: ProbableWaffleGameInstanceSaveData): Promise { return this.saveToLocalStorage(saveData); diff --git a/apps/client/src/app/probable-waffle/communicators/storage/game-instance-storage.service.interface.ts b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-storage.service.interface.ts index 965e755f..ee4a1cad 100644 --- a/apps/client/src/app/probable-waffle/communicators/storage/game-instance-storage.service.interface.ts +++ b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-storage.service.interface.ts @@ -1,7 +1,7 @@ import { ProbableWaffleGameInstanceSaveData } from "@fuzzy-waddle/api-interfaces"; -export interface GameInstanceStorageServiceInterface { - saveToStorage(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise; - getFromStorage(): Promise; - deleteFromStorage(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise; +export abstract class GameInstanceStorageServiceInterface { + abstract saveToStorage(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise; + abstract getFromStorage(): Promise; + abstract deleteFromStorage(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise; } diff --git a/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.ts b/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.ts index f31bda35..5669661d 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.ts @@ -28,8 +28,6 @@ export default class Hedgehog extends Phaser.GameObjects.Sprite { this.setOrigin(0.5, 0.6748775087412171); /* START-USER-CTR-CODE */ - this.moveHedgehog(); - this.handleClick(); /* END-USER-CTR-CODE */ } @@ -37,6 +35,13 @@ export default class Hedgehog extends Phaser.GameObjects.Sprite { private currentDelay: Phaser.Time.TimerEvent | null = null; private currentTween: Phaser.Tweens.Tween | null = null; + override addedToScene() { + super.addedToScene(); + + this.moveHedgehog(); + this.handleClick(); + } + private handleClick() { this.on("pointerdown", () => { // Cancel the current delay if it exists @@ -74,6 +79,7 @@ export default class Hedgehog extends Phaser.GameObjects.Sprite { }); } moveHedgehog() { + if (!this.active) return; const startX = this.x; const startY = this.y; @@ -127,15 +133,23 @@ export default class Hedgehog extends Phaser.GameObjects.Sprite { y: targetY, duration: 2000, // adjust as needed onStart: () => { + if (!this.active) return; this.play(walkAnim); }, onComplete: () => { + if (!this.active) return; this.play(ballAnim); this.scene.time.delayedCall(5000, this.moveHedgehog, [], this); } }); } } + + override destroy(fromScene?: boolean) { + super.destroy(fromScene); + this.currentDelay?.remove(false); + this.currentTween?.stop(); + } /* END-USER-CODE */ } diff --git a/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.ts b/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.ts index ecd5d83c..6c20c2dc 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.ts @@ -15,13 +15,19 @@ export default class Sheep extends Phaser.GameObjects.Sprite { this.play("sheep_idle_down"); /* START-USER-CTR-CODE */ - this.handleWoolParticles(scene); - this.handleSheepRandomRotation(); /* END-USER-CTR-CODE */ } + override addedToScene() { + super.addedToScene(); + + this.handleWoolParticles(this.scene); + this.handleSheepRandomRotation(); + } + /* START-USER-CODE */ private woolParticles?: Phaser.GameObjects.Particles.ParticleEmitter; + private repeatingEvent?: Phaser.Time.TimerEvent; private direction: "up" | "right" | "down" | "left" = "down"; private sheared = false; private handleWoolParticles(scene: Phaser.Scene) { @@ -64,9 +70,10 @@ export default class Sheep extends Phaser.GameObjects.Sprite { private handleSheepRandomRotation() { this.rotateSheepToRandomDirection(); this.playSheepAnimation(); - this.scene.time.addEvent({ + this.repeatingEvent = this.scene.time.addEvent({ delay: Phaser.Math.Between(2000, 5000), callback: () => { + if (!this.active) return; this.rotateSheepToRandomDirection(); this.playSheepAnimation(); }, @@ -102,6 +109,11 @@ export default class Sheep extends Phaser.GameObjects.Sprite { return super.setDepth(value); } + override destroy(fromScene?: boolean) { + super.destroy(fromScene); + this.repeatingEvent?.remove(false); + } + // Write your code here. /* END-USER-CODE */ diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts index 981df7d7..e68775e2 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts @@ -7,50 +7,64 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class FrostForge extends Phaser.GameObjects.Container { - - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 129, y ?? 323.7847134131514); - - this.setInteractive(new Phaser.Geom.Polygon("-68.7545786628312 -214.43394506509725 -38.690327299456825 -228.69121890752223 -0.2576760720504012 -233.34032994309558 43.44396766233913 -227.14151522899778 69.16904872584504 -214.74388580080216 71.27223590831247 -192.47146282907468 60.98195252153286 -182.48068661227393 62.22171546435243 -148.38720568473596 69.97023385697469 -142.18839097063815 75.4034707557831 -79.55104366487666 85.32112237919412 -46.381415218517645 96.47898886457017 -37.703074618780704 106.60762571945156 11.039650145841563 74.37378920614296 32.73550164518389 36.251078714441434 42.65360518774037 6.371750760001362 44.99389139705903 -37.82475711902734 42.96354592344528 -76.25740834643375 32.73550164518389 -106.16641807554313 10.997986227988292 -98.7969319792297 -38.23869519017006 -87.09176657806283 -49.2553214500918 -75.38660117689597 -80.92812194736686 -73.32098375316063 -142.20810551818164 -65.05851405821932 -148.40495778938765 -60.82475661048905 -182.48068661227393 -70.74286015304554 -192.08884941912552"), Phaser.Geom.Polygon.Contains); - - // buildings_skaduwee_frost_forge_frost_forge_png - const buildings_skaduwee_frost_forge_frost_forge_png = scene.add.image(-1, -18.21845166634691, "factions", "buildings/skaduwee/frost_forge/frost_forge.png"); - buildings_skaduwee_frost_forge_frost_forge_png.setOrigin(0.5, 0.7957454759361422); - this.add(buildings_skaduwee_frost_forge_frost_forge_png); - - // frost_forge_flame - const frost_forge_flame = scene.add.sprite(2, -235, "factions", "buildings/skaduwee/frost_forge/flame/frost_forge_flame_1.png"); - frost_forge_flame.scaleX = 1.5; - frost_forge_flame.scaleY = 2; - frost_forge_flame.setOrigin(0.5, 0.5151570341464229); - frost_forge_flame.play("frost_forge_flame"); - this.add(frost_forge_flame); - - // cloud_3 - const cloud_3 = scene.add.image(-25, -215, "factions", "buildings/skaduwee/infantry_inn/cloud-vertical.png"); - cloud_3.scaleX = 2; - cloud_3.scaleY = 2; - cloud_3.angle = 180; - this.add(cloud_3); - - // cloud_2 - const cloud_2 = scene.add.image(26, -232, "factions", "buildings/skaduwee/infantry_inn/cloud-vertical.png"); - cloud_2.scaleX = 2; - cloud_2.scaleY = 2; - this.add(cloud_2); - - // cloud_1 - const cloud_1 = scene.add.image(2, -250, "factions", "buildings/skaduwee/infantry_inn/cloud-vertical.png"); - cloud_1.scaleX = 2.2; - cloud_1.scaleY = 2.2; - cloud_1.angle = 180; - this.add(cloud_1); - - this.cloud_3 = cloud_3; - this.cloud_2 = cloud_2; - this.cloud_1 = cloud_1; - - /* START-USER-CTR-CODE */ + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 129, y ?? 323.7847134131514); + + this.setInteractive( + new Phaser.Geom.Polygon( + "-68.7545786628312 -214.43394506509725 -38.690327299456825 -228.69121890752223 -0.2576760720504012 -233.34032994309558 43.44396766233913 -227.14151522899778 69.16904872584504 -214.74388580080216 71.27223590831247 -192.47146282907468 60.98195252153286 -182.48068661227393 62.22171546435243 -148.38720568473596 69.97023385697469 -142.18839097063815 75.4034707557831 -79.55104366487666 85.32112237919412 -46.381415218517645 96.47898886457017 -37.703074618780704 106.60762571945156 11.039650145841563 74.37378920614296 32.73550164518389 36.251078714441434 42.65360518774037 6.371750760001362 44.99389139705903 -37.82475711902734 42.96354592344528 -76.25740834643375 32.73550164518389 -106.16641807554313 10.997986227988292 -98.7969319792297 -38.23869519017006 -87.09176657806283 -49.2553214500918 -75.38660117689597 -80.92812194736686 -73.32098375316063 -142.20810551818164 -65.05851405821932 -148.40495778938765 -60.82475661048905 -182.48068661227393 -70.74286015304554 -192.08884941912552" + ), + Phaser.Geom.Polygon.Contains + ); + + // buildings_skaduwee_frost_forge_frost_forge_png + const buildings_skaduwee_frost_forge_frost_forge_png = scene.add.image( + -1, + -18.21845166634691, + "factions", + "buildings/skaduwee/frost_forge/frost_forge.png" + ); + buildings_skaduwee_frost_forge_frost_forge_png.setOrigin(0.5, 0.7957454759361422); + this.add(buildings_skaduwee_frost_forge_frost_forge_png); + + // frost_forge_flame + const frost_forge_flame = scene.add.sprite( + 2, + -235, + "factions", + "buildings/skaduwee/frost_forge/flame/frost_forge_flame_1.png" + ); + frost_forge_flame.scaleX = 1.5; + frost_forge_flame.scaleY = 2; + frost_forge_flame.setOrigin(0.5, 0.5151570341464229); + frost_forge_flame.play("frost_forge_flame"); + this.add(frost_forge_flame); + + // cloud_3 + const cloud_3 = scene.add.image(-25, -215, "factions", "buildings/skaduwee/infantry_inn/cloud-vertical.png"); + cloud_3.scaleX = 2; + cloud_3.scaleY = 2; + cloud_3.angle = 180; + this.add(cloud_3); + + // cloud_2 + const cloud_2 = scene.add.image(26, -232, "factions", "buildings/skaduwee/infantry_inn/cloud-vertical.png"); + cloud_2.scaleX = 2; + cloud_2.scaleY = 2; + this.add(cloud_2); + + // cloud_1 + const cloud_1 = scene.add.image(2, -250, "factions", "buildings/skaduwee/infantry_inn/cloud-vertical.png"); + cloud_1.scaleX = 2.2; + cloud_1.scaleY = 2.2; + cloud_1.angle = 180; + this.add(cloud_1); + + this.cloud_3 = cloud_3; + this.cloud_2 = cloud_2; + this.cloud_1 = cloud_1; + + /* START-USER-CTR-CODE */ this.setupCloudsTween(this.cloud_1); this.setupCloudsTween(this.cloud_2); this.setupCloudsTween(this.cloud_3); @@ -63,14 +77,15 @@ export default class FrostForge extends Phaser.GameObjects.Container { }, 1000); }); /* END-USER-CTR-CODE */ - } + } - private cloud_3: Phaser.GameObjects.Image; - private cloud_2: Phaser.GameObjects.Image; - private cloud_1: Phaser.GameObjects.Image; + private cloud_3: Phaser.GameObjects.Image; + private cloud_2: Phaser.GameObjects.Image; + private cloud_1: Phaser.GameObjects.Image; - /* START-USER-CODE */ + /* START-USER-CODE */ + private tweens: Phaser.Tweens.Tween[] = []; private setupCloudsTween(cloud: Phaser.GameObjects.Image) { cloud.alpha = 0; cloud.y = -215; @@ -81,30 +96,40 @@ export default class FrostForge extends Phaser.GameObjects.Container { } private moveAndFade(cloud: Phaser.GameObjects.Image) { + if (!this.active) return; // Moving up and disappearing - this.scene.tweens.add({ - targets: cloud, - y: -300, - alpha: 0, - duration: 2000, - onComplete: () => { - // Waiting for 2-4 seconds - this.scene.time.delayedCall(Phaser.Math.Between(1000, 8000), () => { - // Re-appearing and setting down - cloud.y = -215; - this.scene.tweens.add({ - targets: cloud, - y: -275, - alpha: 1, - duration: 3000, - onComplete: () => { - // Setting up the next upward movement - this.moveAndFade(cloud); - } + this.tweens.push( + this.scene.tweens.add({ + targets: cloud, + y: -300, + alpha: 0, + duration: 2000, + onComplete: () => { + if (!this.active) return; + // Waiting for 2-4 seconds + this.scene.time.delayedCall(Phaser.Math.Between(1000, 8000), () => { + if (!this.active) return; + // Re-appearing and setting down + cloud.y = -215; + this.scene.tweens.add({ + targets: cloud, + y: -275, + alpha: 1, + duration: 3000, + onComplete: () => { + // Setting up the next upward movement + this.moveAndFade(cloud); + } + }); }); - }); - } - }); + } + }) + ); + } + + override destroy(fromScene?: boolean) { + super.destroy(fromScene); + this.tweens.forEach((t) => t.destroy()); } /* END-USER-CODE */ diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.ts index 370968a2..94e43d70 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.ts @@ -7,30 +7,39 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class InfantryInn extends Phaser.GameObjects.Container { - - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 64, y ?? 128); - - this.setInteractive(new Phaser.Geom.Circle(0, -35, 59.91620797027979), Phaser.Geom.Circle.Contains); - - // infantry_inn_building - const infantry_inn_building = scene.add.image(-0.16910280030724323, -31.74029716298027, "factions", "buildings/skaduwee/infantry_inn/infantry_inn.png"); - this.add(infantry_inn_building); - - // cloud_1 - const cloud_1 = scene.add.image(24, -82, "factions", "buildings/skaduwee/infantry_inn/cloud-vertical.png"); - this.add(cloud_1); - - // cloud_2 - const cloud_2 = scene.add.image(13, -110, "factions", "buildings/skaduwee/infantry_inn/cloud-vertical.png"); - this.add(cloud_2); - - // skaduwee_buildings_infantry_inn_entrance - const skaduwee_buildings_infantry_inn_entrance = scene.add.sprite(24, -8, "factions", "buildings/skaduwee/infantry_inn/infantry_inn-entrance/infantry_inn-0.png"); - skaduwee_buildings_infantry_inn_entrance.play("skaduwee-buildings-infantry-inn-entrance"); - this.add(skaduwee_buildings_infantry_inn_entrance); - - /* START-USER-CTR-CODE */ + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 64, y ?? 128); + + this.setInteractive(new Phaser.Geom.Circle(0, -35, 59.91620797027979), Phaser.Geom.Circle.Contains); + + // infantry_inn_building + const infantry_inn_building = scene.add.image( + -0.16910280030724323, + -31.74029716298027, + "factions", + "buildings/skaduwee/infantry_inn/infantry_inn.png" + ); + this.add(infantry_inn_building); + + // cloud_1 + const cloud_1 = scene.add.image(24, -82, "factions", "buildings/skaduwee/infantry_inn/cloud-vertical.png"); + this.add(cloud_1); + + // cloud_2 + const cloud_2 = scene.add.image(13, -110, "factions", "buildings/skaduwee/infantry_inn/cloud-vertical.png"); + this.add(cloud_2); + + // skaduwee_buildings_infantry_inn_entrance + const skaduwee_buildings_infantry_inn_entrance = scene.add.sprite( + 24, + -8, + "factions", + "buildings/skaduwee/infantry_inn/infantry_inn-entrance/infantry_inn-0.png" + ); + skaduwee_buildings_infantry_inn_entrance.play("skaduwee-buildings-infantry-inn-entrance"); + this.add(skaduwee_buildings_infantry_inn_entrance); + + /* START-USER-CTR-CODE */ this.cloud1 = cloud_1; this.cloud2 = cloud_2; this.setupCloudsTween(this.cloud1); @@ -44,37 +53,47 @@ export default class InfantryInn extends Phaser.GameObjects.Container { }, 1000); }); /* END-USER-CTR-CODE */ - } + } - /* START-USER-CODE */ + /* START-USER-CODE */ private readonly cloud1: Phaser.GameObjects.Image; private readonly cloud2: Phaser.GameObjects.Image; - + private readonly tweens: Phaser.Tweens.Tween[] = []; private setupCloudsTween(cloud: Phaser.GameObjects.Image) { + if (!this.active) return; // Moving up and disappearing - this.scene.tweens.add({ - targets: cloud, - y: -128, - alpha: 0, - duration: 3000, - onComplete: () => { - // Waiting for 2-4 seconds - this.scene.time.delayedCall(Phaser.Math.Between(1000, 8000), () => { - // Re-appearing and setting down - cloud.y = -80; - this.scene.tweens.add({ - targets: cloud, - y: -100, - alpha: 1, - duration: 1000, - onComplete: () => { - // Setting up the next upward movement - this.setupCloudsTween(cloud); - } + this.tweens.push( + this.scene.tweens.add({ + targets: cloud, + y: -128, + alpha: 0, + duration: 3000, + onComplete: () => { + if (!this.active) return; + // Waiting for 2-4 seconds + this.scene.time.delayedCall(Phaser.Math.Between(1000, 8000), () => { + if (!this.active) return; + // Re-appearing and setting down + cloud.y = -80; + this.scene.tweens.add({ + targets: cloud, + y: -100, + alpha: 1, + duration: 1000, + onComplete: () => { + // Setting up the next upward movement + this.setupCloudsTween(cloud); + } + }); }); - }); - } - }); + } + }) + ); + } + + override destroy(fromScene?: boolean) { + super.destroy(fromScene); + this.tweens.forEach((tween) => tween.destroy()); } /* END-USER-CODE */ diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.ts index f5c72fb0..01111873 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.ts @@ -8,54 +8,85 @@ import { ANIM_TIVARA_BUILDINGS_ANKGUARD_FLAME_STICK } from "../../../../../../as /* END-USER-IMPORTS */ export default class AnkGuard extends Phaser.GameObjects.Container { - - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 128, y ?? 182.8318108210126); - - this.setInteractive(new Phaser.Geom.Polygon("-72.22985939462845 -86.73420955564553 0.01286537585883707 -123.56383394844298 68.9503674444284 -88.15073357075313 69.89471678783346 -63.12547597051896 110.02956388254862 -46.12718778922783 115.22348527127645 -20.62975551729116 114.75131059957391 17.616392890613866 51.95207926313728 47.835571879575866 0.48504004756136965 65.30603473256951 -101.97686371188792 14.7833448603987 -101.97686371188792 -13.074960770050666 -83.08987684378667 -13.547135441753198"), Phaser.Geom.Polygon.Contains); - - // ankguard-building - const ankguard_building = scene.add.image(0, -54.83180956776931, "factions", "buildings/tivara/ankguard/ankguard.png"); - this.add(ankguard_building); - - // tivara_buildings_aknguard_flame - const tivara_buildings_aknguard_flame = scene.add.sprite(-4, 41.16819043223069, "factions", "buildings/tivara/ankguard/ankguard-flame/ankguard-flame-0.png"); - tivara_buildings_aknguard_flame.play("tivara-buildings-aknguard-flame"); - this.add(tivara_buildings_aknguard_flame); - - // tivara_buildings_ankguard_flame_stick_right - const tivara_buildings_ankguard_flame_stick_right = scene.add.sprite(-43, 15, "factions", "buildings/tivara/ankguard/ankguard-flame-stick/flame-stick-1.png"); - tivara_buildings_ankguard_flame_stick_right.play("tivara-buildings-ankguard-flame-stick"); - this.add(tivara_buildings_ankguard_flame_stick_right); - - // tivara_buildings_ankguard_flame_stick_left - const tivara_buildings_ankguard_flame_stick_left = scene.add.sprite(-97, -11, "factions", "buildings/tivara/ankguard/ankguard-flame-stick/flame-stick-1.png"); - tivara_buildings_ankguard_flame_stick_left.play("tivara-buildings-ankguard-flame-stick"); - this.add(tivara_buildings_ankguard_flame_stick_left); - - // tivara_buildings_ankguard_flag - const tivara_buildings_ankguard_flag = scene.add.sprite(-29, -123, "factions", "buildings/tivara/ankguard/ankguard-flag/flag-0.png"); - tivara_buildings_ankguard_flag.play("tivara-buildings-ankguard-flag"); - this.add(tivara_buildings_ankguard_flag); - - /* START-USER-CTR-CODE */ + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 128, y ?? 182.8318108210126); + + this.setInteractive( + new Phaser.Geom.Polygon( + "-72.22985939462845 -86.73420955564553 0.01286537585883707 -123.56383394844298 68.9503674444284 -88.15073357075313 69.89471678783346 -63.12547597051896 110.02956388254862 -46.12718778922783 115.22348527127645 -20.62975551729116 114.75131059957391 17.616392890613866 51.95207926313728 47.835571879575866 0.48504004756136965 65.30603473256951 -101.97686371188792 14.7833448603987 -101.97686371188792 -13.074960770050666 -83.08987684378667 -13.547135441753198" + ), + Phaser.Geom.Polygon.Contains + ); + + // ankguard-building + const ankguard_building = scene.add.image( + 0, + -54.83180956776931, + "factions", + "buildings/tivara/ankguard/ankguard.png" + ); + this.add(ankguard_building); + + // tivara_buildings_aknguard_flame + const tivara_buildings_aknguard_flame = scene.add.sprite( + -4, + 41.16819043223069, + "factions", + "buildings/tivara/ankguard/ankguard-flame/ankguard-flame-0.png" + ); + tivara_buildings_aknguard_flame.play("tivara-buildings-aknguard-flame"); + this.add(tivara_buildings_aknguard_flame); + + // tivara_buildings_ankguard_flame_stick_right + const tivara_buildings_ankguard_flame_stick_right = scene.add.sprite( + -43, + 15, + "factions", + "buildings/tivara/ankguard/ankguard-flame-stick/flame-stick-1.png" + ); + tivara_buildings_ankguard_flame_stick_right.play("tivara-buildings-ankguard-flame-stick"); + this.add(tivara_buildings_ankguard_flame_stick_right); + + // tivara_buildings_ankguard_flame_stick_left + const tivara_buildings_ankguard_flame_stick_left = scene.add.sprite( + -97, + -11, + "factions", + "buildings/tivara/ankguard/ankguard-flame-stick/flame-stick-1.png" + ); + tivara_buildings_ankguard_flame_stick_left.play("tivara-buildings-ankguard-flame-stick"); + this.add(tivara_buildings_ankguard_flame_stick_left); + + // tivara_buildings_ankguard_flag + const tivara_buildings_ankguard_flag = scene.add.sprite( + -29, + -123, + "factions", + "buildings/tivara/ankguard/ankguard-flag/flag-0.png" + ); + tivara_buildings_ankguard_flag.play("tivara-buildings-ankguard-flag"); + this.add(tivara_buildings_ankguard_flag); + + /* START-USER-CTR-CODE */ // Write your code here. // delay playing of animation for one of flame stick setTimeout(() => { + if (!this.active) return; tivara_buildings_ankguard_flame_stick_left.play(ANIM_TIVARA_BUILDINGS_ANKGUARD_FLAME_STICK); }, 1000); this.on("pointerdown", () => { ankguard_building.setTint(0xff0000); // Tint to red // tint back to transparent after 1 second setTimeout(() => { + if (!this.active) return; ankguard_building.clearTint(); }, 1000); }); /* END-USER-CTR-CODE */ - } + } - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts b/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts index 180c8bb7..b03dd8e1 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts @@ -7,28 +7,33 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class SkaduweeOwl extends Phaser.GameObjects.Container { + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 33, y ?? 127.37785319200148); - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 33, y ?? 127.37785319200148); + this.setInteractive(new Phaser.Geom.Circle(1, 4, 11), Phaser.Geom.Circle.Contains); - this.setInteractive(new Phaser.Geom.Circle(1, 4, 11), Phaser.Geom.Circle.Contains); + // owl + const owl = scene.add.sprite(0, -108, "units", "skaduwee/owl/idle/down_1.png"); + owl.play("skaduwee/owl/idle/down"); + this.add(owl); - // owl - const owl = scene.add.sprite(0, -108, "units", "skaduwee/owl/idle/down_1.png"); - owl.play("skaduwee/owl/idle/down"); - this.add(owl); + this.owl = owl; - this.owl = owl; - - /* START-USER-CTR-CODE */ - this.drawFlyingUnitVerticalLine(); - this.moveOwl(); + /* START-USER-CTR-CODE */ /* END-USER-CTR-CODE */ - } + } + + private owl: Phaser.GameObjects.Sprite; + private delayedCaller?: Phaser.Time.TimerEvent; + + /* START-USER-CODE */ - private owl: Phaser.GameObjects.Sprite; + override addedToScene() { + super.addedToScene(); - /* START-USER-CODE */ + this.drawFlyingUnitVerticalLine(); + this.moveOwl(); + } /** * draw a vertical line from bottom of unit to bottom of current container. @@ -52,7 +57,8 @@ export default class SkaduweeOwl extends Phaser.GameObjects.Container { /** * move owl around randomly. After 3-5 seconds, move to a new random location. */ - private moveOwl() { + private moveOwl(): void { + if (!this.active) return; const startX = this.x; const startY = this.y; @@ -72,8 +78,14 @@ export default class SkaduweeOwl extends Phaser.GameObjects.Container { }); // after 3-5 seconds, move to a new random location - this.scene.time.delayedCall(duration, this.moveOwl, [], this); + this.delayedCaller = this.scene.time.delayedCall(duration, this.moveOwl, [], this); } + + override destroy(fromScene?: boolean) { + super.destroy(fromScene); + this.delayedCaller?.destroy(); + } + /* END-USER-CODE */ } diff --git a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts index 8c6f5685..f2c2324d 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts @@ -10,8 +10,39 @@ import { GameObjectSelectionHandler } from "../world/managers/controllers/input/ import { SceneGameState } from "../world/managers/game-state/scene-game-state"; import { ProbableWaffleGameData } from "./probable-waffle-game-data"; import TivaraMacemanMale from "../prefabs/characters/tivara/TivaraMacemanMale"; +import { ActorDefinition, ProbableWaffleGameInstanceType } from "@fuzzy-waddle/api-interfaces"; import GameObject = Phaser.GameObjects.GameObject; import Transform = Phaser.GameObjects.Components.Transform; +import TivaraSlingshotFemale from "../prefabs/characters/tivara/TivaraSlingshotFemale"; +import TivaraWorkerFemale from "../prefabs/characters/tivara/TivaraWorkerFemale"; +import TivaraWorkerMale from "../prefabs/characters/tivara/TivaraWorkerMale"; +import SkaduweeOwl from "../prefabs/units/skaduwee/SkaduweeOwl"; +import SkaduweeRangedFemale from "../prefabs/characters/skaduwee/SkaduweeRangedFemale"; +import SkaduweeMagicianFemale from "../prefabs/characters/skaduwee/SkaduweeMagicianFemale"; +import SkaduweeWarriorMale from "../prefabs/characters/skaduwee/SkaduweeWarriorMale"; +import SkaduweeWorkerMale from "../prefabs/characters/skaduwee/SkaduweeWorkerMale"; +import SkaduweeWorkerFemale from "../prefabs/characters/skaduwee/SkaduweeWorkerFemale"; +import FrostForge from "../prefabs/buildings/skaduwee/FrostForge"; +import InfantryInn from "../prefabs/buildings/skaduwee/InfantryInn"; +import Owlery from "../prefabs/buildings/skaduwee/Owlery"; +import AnkGuard from "../prefabs/buildings/tivara/AnkGuard"; +import Olival from "../prefabs/buildings/tivara/Olival"; +import Temple from "../prefabs/buildings/tivara/Temple"; +import WorkMill from "../prefabs/buildings/tivara/WorkMill"; +import Sandhold from "../prefabs/buildings/tivara/Sandhold"; +import GeneralWarrior from "../prefabs/characters/general/GeneralWarrior"; +import Hedgehog from "../prefabs/animals/Hedgehog"; +import Sheep from "../prefabs/animals/Sheep"; +import Tree1 from "../prefabs/outside/foliage/trees/resources/Tree1"; +import Tree6 from "../prefabs/outside/foliage/trees/resources/Tree6"; +import Tree4 from "../prefabs/outside/foliage/trees/resources/Tree4"; +import Tree5 from "../prefabs/outside/foliage/trees/resources/Tree5"; +import Tree7 from "../prefabs/outside/foliage/trees/resources/Tree7"; +import Tree10 from "../prefabs/outside/foliage/trees/resources/Tree10"; +import Tree9 from "../prefabs/outside/foliage/trees/resources/Tree9"; +import Tree11 from "../prefabs/outside/foliage/trees/resources/Tree11"; + +type ActorConstructor = new (scene: Phaser.Scene) => GameObject; export interface GameProbableWaffleSceneData { baseGameData: ProbableWaffleGameData; @@ -34,7 +65,51 @@ export class GameProbableWaffleScene extends ProbableWaffleScene { services: {} // todo use } satisfies GameProbableWaffleSceneData; - private readonly knownActorNames = [TivaraMacemanMale.name]; // TODO + private readonly actorMap: { [name: string]: ActorConstructor } = { + // ANIMALS + [Hedgehog.name]: Hedgehog, + [Sheep.name]: Sheep, + // END ANIMALS + + // GENERAL + [GeneralWarrior.name]: GeneralWarrior, + // END GENERAL + + // TIVARA + [TivaraMacemanMale.name]: TivaraMacemanMale, + [TivaraSlingshotFemale.name]: TivaraSlingshotFemale, + [TivaraWorkerFemale.name]: TivaraWorkerFemale, + [TivaraWorkerMale.name]: TivaraWorkerMale, + [AnkGuard.name]: AnkGuard, + [Olival.name]: Olival, + [Sandhold.name]: Sandhold, + [Temple.name]: Temple, + [WorkMill.name]: WorkMill, + // END TIVARA + + // SKADUWEE + [SkaduweeOwl.name]: SkaduweeOwl, + [SkaduweeRangedFemale.name]: SkaduweeRangedFemale, + [SkaduweeMagicianFemale.name]: SkaduweeMagicianFemale, + [SkaduweeWarriorMale.name]: SkaduweeWarriorMale, + [SkaduweeWorkerMale.name]: SkaduweeWorkerMale, + [SkaduweeWorkerFemale.name]: SkaduweeWorkerFemale, + [FrostForge.name]: FrostForge, + [InfantryInn.name]: InfantryInn, + [Owlery.name]: Owlery, + // END SKADUWEE + + // Trees + [Tree1.name]: Tree1, + [Tree4.name]: Tree4, + [Tree5.name]: Tree5, + [Tree6.name]: Tree6, + [Tree7.name]: Tree7, + [Tree9.name]: Tree9, + [Tree10.name]: Tree10, + [Tree11.name]: Tree11 + // END Trees + }; init() { super.init(); @@ -58,45 +133,97 @@ export class GameProbableWaffleScene extends ProbableWaffleScene { new GameObjectSelectionHandler(this); // todo maybe this needs to be on individual game object? this.loadActorsFromSaveGame(); + // this.demoFillStateForSaveGame(); + this.saveAllKnownActorsToSaveGame(); + } + + private demoFillStateForSaveGame() { + if (this.baseGameData.gameInstance.gameInstanceMetadata.data.type === ProbableWaffleGameInstanceType.LoadFromSave) + return; + this.baseGameData.gameInstance.gameState!.data.actors.push( + { + name: TivaraMacemanMale.name, + x: 544, + y: 900, + z: 0 + } as ActorDefinition, + // add hedgehog and sheep + { + name: Hedgehog.name, + x: 544, + y: 800, + z: 0 + } as ActorDefinition, + { + name: Sheep.name, + x: 544, + y: 850, + z: 0 + } as ActorDefinition + ); + } + + private saveAllKnownActorsToSaveGame() { + if (this.baseGameData.gameInstance.gameInstanceMetadata.data.type === ProbableWaffleGameInstanceType.LoadFromSave) + return; + + this.scene.scene.children.each((child) => { + const actorDefinition = this.getActorDefinitionFromActor(child); + if (actorDefinition) { + this.baseGameData.gameInstance.gameState!.data.actors.push(actorDefinition); + } + }); + } + + private getActorDefinitionFromActor(actor: GameObject): ActorDefinition | undefined { + const actorName = actor.constructor.name; + if (!this.actorMap[actorName]) { + // console.error(`Actor ${actorName} not found`); + return undefined; + } + const actorDefinition: ActorDefinition = { + name: actorName, + x: (actor as any as Transform).x, + y: (actor as any as Transform).y, + z: (actor as any as Transform).z + }; + return actorDefinition; } private loadActorsFromSaveGame() { - console.log("PRINTING KNOWN ACTOR NAMES", this.knownActorNames); - this.knownActorNames.forEach((actorName) => { + if (this.baseGameData.gameInstance.gameInstanceMetadata.data.type !== ProbableWaffleGameInstanceType.LoadFromSave) + return; + + Object.keys(this.actorMap).forEach((actorName) => { // destroy all actors on scene with this name // load them again from save file this.scene.scene.children.each((child) => { if (child.constructor.name === actorName) { - child.destroy(); // todo + child.destroy(); - console.warn("FOUND ACTOR WITH NAME", actorName); + console.log("Removed actor from scene on game load", actorName); } - console.log(child.constructor.name, "CONSTRUCTOR NAME"); }); - // const saveFile = this.baseGameData.saveGameService.getSaveFile(); + }); - const maceman = this.getActor({ - name: TivaraMacemanMale.name, - x: 544, - y: 900, - z: 0 - }); - this.scene.scene.add.existing(maceman); + this.baseGameData.gameInstance.gameState!.data.actors.forEach((actorDefinition) => { + const actor = this.getActor(actorDefinition.name, actorDefinition); + this.scene.scene.add.existing(actor); + console.log("Added actor to scene on game load", actor); }); } - private getActor(actorDefinition: { name: string; x: number; y: number; z: number }): GameObject { + private getActor(name: string, properties: any): GameObject { let actor: GameObject | undefined = undefined; - switch (actorDefinition.name) { - case TivaraMacemanMale.name: - actor = new TivaraMacemanMale(this.scene.scene, actorDefinition.x, actorDefinition.y); - break; + const actorConstructor = this.actorMap[name]; + if (!actorConstructor) { + console.error(`Actor ${name} not found`); + throw new Error(`Actor ${name} not found`); } + actor = new actorConstructor(this.scene.scene); - if (actor === undefined) { - console.error(`Actor ${actorDefinition.name} not found`); - throw new Error(`Actor ${actorDefinition.name} not found`); - } - (actor as any as Transform).z = actorDefinition.z; // todo? + (actor as any as Transform).x = properties.x; // todo? + (actor as any as Transform).y = properties.y; // todo? + (actor as any as Transform).z = properties.z; // todo? DepthHelper.setActorDepth(actor); return actor; } diff --git a/apps/client/src/app/probable-waffle/gui/load/load.component.spec.ts b/apps/client/src/app/probable-waffle/gui/load/load.component.spec.ts index e863b39d..26c0c6b8 100644 --- a/apps/client/src/app/probable-waffle/gui/load/load.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/load/load.component.spec.ts @@ -2,8 +2,8 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { LoadComponent } from "./load.component"; import { GameInstanceClientService } from "../../../little-muncher/main/communicators/game-instance-client.service"; import { gameInstanceClientServiceStub } from "../../../little-muncher/main/communicators/game-instance-client.service.spec"; -import { GameInstanceStorageService } from "../../communicators/storage/game-instance-storage.service"; -import { gameInstanceStorageServiceStub } from "../../communicators/storage/game-instance-storage.service.spec"; +import { gameInstanceLocalStorageServiceStub } from "../../communicators/storage/game-instance-local-storage.service.spec"; +import { GameInstanceStorageServiceInterface } from "../../communicators/storage/game-instance-storage.service.interface"; describe("LoadComponent", () => { let component: LoadComponent; @@ -13,7 +13,7 @@ describe("LoadComponent", () => { await TestBed.configureTestingModule({ providers: [ { provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }, - { provide: GameInstanceStorageService, useValue: gameInstanceStorageServiceStub } + { provide: GameInstanceStorageServiceInterface, useValue: gameInstanceLocalStorageServiceStub } ], imports: [LoadComponent] }).compileComponents(); diff --git a/apps/client/src/app/probable-waffle/gui/load/load.component.ts b/apps/client/src/app/probable-waffle/gui/load/load.component.ts index dde85b4f..e11b6e20 100644 --- a/apps/client/src/app/probable-waffle/gui/load/load.component.ts +++ b/apps/client/src/app/probable-waffle/gui/load/load.component.ts @@ -1,6 +1,5 @@ import { Component, inject, OnInit } from "@angular/core"; import { CommonModule } from "@angular/common"; -import { GameInstanceStorageService } from "../../communicators/storage/game-instance-storage.service"; import { ProbableWaffleGameInstanceData, ProbableWaffleGameInstanceSaveData, @@ -8,6 +7,7 @@ import { } from "@fuzzy-waddle/api-interfaces"; import { RouterLink } from "@angular/router"; import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; +import { GameInstanceStorageServiceInterface } from "../../communicators/storage/game-instance-storage.service.interface"; @Component({ selector: "fuzzy-waddle-load", @@ -17,7 +17,7 @@ import { GameInstanceClientService } from "../../communicators/game-instance-cli styleUrls: ["./load.component.scss"] }) export class LoadComponent implements OnInit { - private readonly gameInstanceStorageService = inject(GameInstanceStorageService); + private readonly gameInstanceStorageService = inject(GameInstanceStorageServiceInterface); private readonly gameInstanceClientService = inject(GameInstanceClientService); protected gameInstanceDataRecords: ProbableWaffleGameInstanceSaveData[] = []; async ngOnInit(): Promise { diff --git a/apps/client/src/app/probable-waffle/gui/replay/replay.component.spec.ts b/apps/client/src/app/probable-waffle/gui/replay/replay.component.spec.ts index dd8312fc..6e7e46d4 100644 --- a/apps/client/src/app/probable-waffle/gui/replay/replay.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/replay/replay.component.spec.ts @@ -2,8 +2,8 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { ReplayComponent } from "./replay.component"; import { GameInstanceClientService } from "../../../little-muncher/main/communicators/game-instance-client.service"; import { gameInstanceClientServiceStub } from "../../../little-muncher/main/communicators/game-instance-client.service.spec"; -import { GameInstanceStorageService } from "../../communicators/storage/game-instance-storage.service"; -import { gameInstanceStorageServiceStub } from "../../communicators/storage/game-instance-storage.service.spec"; +import { gameInstanceLocalStorageServiceStub } from "../../communicators/storage/game-instance-local-storage.service.spec"; +import { GameInstanceStorageServiceInterface } from "../../communicators/storage/game-instance-storage.service.interface"; describe("ReplayComponent", () => { let component: ReplayComponent; @@ -13,7 +13,7 @@ describe("ReplayComponent", () => { await TestBed.configureTestingModule({ providers: [ { provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }, - { provide: GameInstanceStorageService, useValue: gameInstanceStorageServiceStub } + { provide: GameInstanceStorageServiceInterface, useValue: gameInstanceLocalStorageServiceStub } ], imports: [ReplayComponent] }).compileComponents(); diff --git a/apps/client/src/app/probable-waffle/gui/replay/replay.component.ts b/apps/client/src/app/probable-waffle/gui/replay/replay.component.ts index 967cdfa2..122811a7 100644 --- a/apps/client/src/app/probable-waffle/gui/replay/replay.component.ts +++ b/apps/client/src/app/probable-waffle/gui/replay/replay.component.ts @@ -1,13 +1,13 @@ import { Component, inject, OnInit } from "@angular/core"; import { CommonModule } from "@angular/common"; import { RouterLink } from "@angular/router"; -import { GameInstanceStorageService } from "../../communicators/storage/game-instance-storage.service"; import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; import { ProbableWaffleGameInstanceData, ProbableWaffleGameInstanceSaveData, ProbableWaffleLevels } from "@fuzzy-waddle/api-interfaces"; +import { GameInstanceStorageServiceInterface } from "../../communicators/storage/game-instance-storage.service.interface"; @Component({ selector: "probable-waffle-replay", @@ -17,7 +17,7 @@ import { styleUrls: ["./replay.component.scss"] }) export class ReplayComponent implements OnInit { - private readonly gameInstanceStorageService = inject(GameInstanceStorageService); + private readonly gameInstanceStorageService = inject(GameInstanceStorageServiceInterface); private readonly gameInstanceClientService = inject(GameInstanceClientService); protected gameInstanceDataRecords: ProbableWaffleGameInstanceSaveData[] = []; async ngOnInit(): Promise { diff --git a/libs/api-interfaces/src/lib/game-instance/game-state.ts b/libs/api-interfaces/src/lib/game-instance/game-state.ts index 5cdb4a3d..a91b31b6 100644 --- a/libs/api-interfaces/src/lib/game-instance/game-state.ts +++ b/libs/api-interfaces/src/lib/game-instance/game-state.ts @@ -1,6 +1,8 @@ export abstract class BaseGameState { protected constructor(public data: TData) { - if (!data) this.resetData(); + if (!data || Object.keys(data).length === 0) { + this.resetData(); + } } resetData() { diff --git a/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance-medatada.ts b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance-medatada.ts index 25a117b1..d2996172 100644 --- a/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance-medatada.ts +++ b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance-medatada.ts @@ -4,7 +4,8 @@ export enum ProbableWaffleGameInstanceType { Matchmaking, SelfHosted, Skirmish, - InstantGame + InstantGame, + LoadFromSave } export interface ProbableWaffleGameInstanceMetadataData extends GameInstanceMetadataData { diff --git a/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-state.ts b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-state.ts index 7522109f..c0b4bbea 100644 --- a/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-state.ts +++ b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-state.ts @@ -9,7 +9,7 @@ export class ProbableWaffleGameState extends BaseGameState Date: Mon, 22 Jan 2024 17:37:50 +0100 Subject: [PATCH 120/138] Initialization fixes --- ...game-instance-indexeddb-storage.service.ts | 18 ++++++++++-- .../game/scenes/GameProbableWaffleScene.ts | 29 ++++++++++--------- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.ts b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.ts index ae068c7b..453da849 100644 --- a/apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.ts +++ b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.ts @@ -9,13 +9,21 @@ export class GameInstanceIndexeddbStorageService implements GameInstanceStorageS private readonly dbName = "probable-waffle-db"; private readonly objectStoreName = "game-instances"; private db: IDBDatabase | null = null; + private initializationPromise: Promise | null = null; + private isInitialized = false; constructor() { this.initializeDatabase(); } - private async initializeDatabase(): Promise { - return new Promise((resolve, reject) => { + private initializeDatabase(): Promise { + if (this.isInitialized) { + // Already initialized, return the existing promise + return this.initializationPromise as Promise; + } + + // Not initialized, create a new promise + this.initializationPromise = new Promise((resolve, reject) => { const request = indexedDB.open(this.dbName); request.onerror = (event) => { @@ -25,6 +33,7 @@ export class GameInstanceIndexeddbStorageService implements GameInstanceStorageS request.onsuccess = (event) => { this.db = (event.target as IDBOpenDBRequest).result; + this.isInitialized = true; resolve(); }; @@ -33,6 +42,8 @@ export class GameInstanceIndexeddbStorageService implements GameInstanceStorageS db.createObjectStore(this.objectStoreName, { keyPath: "saveName" }); }; }); + + return this.initializationPromise; } private getObjectStore(mode: IDBTransactionMode = "readwrite"): IDBObjectStore { @@ -45,6 +56,7 @@ export class GameInstanceIndexeddbStorageService implements GameInstanceStorageS } async saveToStorage(saveData: ProbableWaffleGameInstanceSaveData): Promise { + await this.initializeDatabase(); const objectStore = this.getObjectStore(); await new Promise((resolve, reject) => { const request = objectStore.add(saveData); @@ -55,6 +67,7 @@ export class GameInstanceIndexeddbStorageService implements GameInstanceStorageS } async getFromStorage(): Promise { + await this.initializeDatabase(); const objectStore = this.getObjectStore("readonly"); return new Promise((resolve, reject) => { const request = objectStore.getAll(); @@ -65,6 +78,7 @@ export class GameInstanceIndexeddbStorageService implements GameInstanceStorageS } async deleteFromStorage(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise { + await this.initializeDatabase(); const objectStore = this.getObjectStore(); await new Promise((resolve, reject) => { const request = objectStore.delete( diff --git a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts index f2c2324d..c252d368 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts @@ -131,6 +131,10 @@ export class GameProbableWaffleScene extends ProbableWaffleScene { new AnimatedTilemap(this, this.tilemap, this.tilemap.tilesets); new SingleSelectionHandler(this, this.tilemap); new GameObjectSelectionHandler(this); // todo maybe this needs to be on individual game object? + } + + protected postCreate() { + super.postCreate(); this.loadActorsFromSaveGame(); // this.demoFillStateForSaveGame(); @@ -194,25 +198,24 @@ export class GameProbableWaffleScene extends ProbableWaffleScene { if (this.baseGameData.gameInstance.gameInstanceMetadata.data.type !== ProbableWaffleGameInstanceType.LoadFromSave) return; - Object.keys(this.actorMap).forEach((actorName) => { - // destroy all actors on scene with this name - // load them again from save file - this.scene.scene.children.each((child) => { - if (child.constructor.name === actorName) { - child.destroy(); + // destroy all actors on scene with this name + // load them again from save file + this.scene.scene.children.each((child) => { + const knownActorName = this.actorMap[child.constructor.name]; + if (knownActorName) { + child.destroy(); - console.log("Removed actor from scene on game load", actorName); - } - }); + console.log("Removed actor from scene on game load", knownActorName); + } }); this.baseGameData.gameInstance.gameState!.data.actors.forEach((actorDefinition) => { - const actor = this.getActor(actorDefinition.name, actorDefinition); - this.scene.scene.add.existing(actor); - console.log("Added actor to scene on game load", actor); + // todo const actor = this.createActor(actorDefinition.name, actorDefinition); + // todo this.scene.scene.add.existing(actor); + // todo console.log("Added actor to scene on game load", actor); }); } - private getActor(name: string, properties: any): GameObject { + private createActor(name: string, properties: any): GameObject { let actor: GameObject | undefined = undefined; const actorConstructor = this.actorMap[name]; if (!actorConstructor) { From 2cab3bb0842c8a8f804ba1c3f15293ae0c25cc74 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Mon, 22 Jan 2024 17:38:00 +0100 Subject: [PATCH 121/138] Initialization fixes --- apps/client/src/app/shared/game/phaser/scene/base.scene.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/client/src/app/shared/game/phaser/scene/base.scene.ts b/apps/client/src/app/shared/game/phaser/scene/base.scene.ts index a4987594..58224bc3 100644 --- a/apps/client/src/app/shared/game/phaser/scene/base.scene.ts +++ b/apps/client/src/app/shared/game/phaser/scene/base.scene.ts @@ -113,6 +113,7 @@ export class BaseScene< private registerScenePostCreate() { this.events.once(Phaser.Scenes.Events.CREATE, () => { this._postCreate.emit(); + this.postCreate(); }); } @@ -133,6 +134,8 @@ export class BaseScene< this._onDestroy.emit(); } + protected postCreate(): void {} + get gameState(): TGameState { if (!this.baseGameData.gameInstance.gameState) throw new Error("GameState is not defined"); return this.baseGameData.gameInstance.gameState as TGameState; From f7ce262d0451e2b9c0c7180c268a0f4ecbe57db6 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Mon, 22 Jan 2024 17:46:58 +0100 Subject: [PATCH 122/138] Fix load and save --- .../game/scenes/GameProbableWaffleScene.ts | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts index c252d368..dc09e008 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts @@ -136,9 +136,11 @@ export class GameProbableWaffleScene extends ProbableWaffleScene { protected postCreate() { super.postCreate(); - this.loadActorsFromSaveGame(); - // this.demoFillStateForSaveGame(); - this.saveAllKnownActorsToSaveGame(); + setTimeout(() => { + this.loadActorsFromSaveGame(); + // this.demoFillStateForSaveGame(); + this.saveAllKnownActorsToSaveGame(); + }, 500); } private demoFillStateForSaveGame() { @@ -200,19 +202,24 @@ export class GameProbableWaffleScene extends ProbableWaffleScene { // destroy all actors on scene with this name // load them again from save file - this.scene.scene.children.each((child) => { - const knownActorName = this.actorMap[child.constructor.name]; + const toRemove: GameObject[] = []; + this.children.each((child) => { + const name = child.constructor.name; + console.log("Child", name); + const knownActorName = this.actorMap[name]; if (knownActorName) { - child.destroy(); - - console.log("Removed actor from scene on game load", knownActorName); + toRemove.push(child); + console.log("Removed actor from scene on game load", name); + } else { + console.log("Not removed actor from scene on game load", name); } }); + toRemove.forEach((child) => child.destroy()); this.baseGameData.gameInstance.gameState!.data.actors.forEach((actorDefinition) => { - // todo const actor = this.createActor(actorDefinition.name, actorDefinition); - // todo this.scene.scene.add.existing(actor); - // todo console.log("Added actor to scene on game load", actor); + const actor = this.createActor(actorDefinition.name, actorDefinition); + this.scene.scene.add.existing(actor); + console.log("Added actor to scene on game load", actor); }); } private createActor(name: string, properties: any): GameObject { From 042ce06a6644e05a153e18f40250523b1a89d350 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Mon, 22 Jan 2024 18:18:47 +0100 Subject: [PATCH 123/138] Properly saving new scene data on save --- .../game-instance-client.service.ts | 1 + .../probable-waffle-communicator.service.ts | 1 + ...game-instance-indexeddb-storage.service.ts | 4 +- .../game/data/actor-manager.ts | 114 +++++++++++ .../probable-waffle/game/data/save-game.ts | 112 +++++++++++ .../game/scenes/GameProbableWaffleScene.ts | 187 +----------------- .../game/scenes/HudProbableWaffle.ts | 5 +- .../gui/load/load.component.ts | 2 + .../probable-waffle/probable-waffle-api.ts | 1 + 9 files changed, 236 insertions(+), 191 deletions(-) create mode 100644 apps/client/src/app/probable-waffle/game/data/actor-manager.ts create mode 100644 apps/client/src/app/probable-waffle/game/data/save-game.ts diff --git a/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.ts b/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.ts index d3c85424..13015eed 100644 --- a/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.ts +++ b/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.ts @@ -472,6 +472,7 @@ export class GameInstanceClientService implements GameInstanceClientServiceInter async saveGameInstance(saveName: string): Promise { await this.gameInstanceStorageService.saveToStorage({ saveName, + created: Date.now(), gameInstanceData: this.gameInstance!.data }); } diff --git a/apps/client/src/app/probable-waffle/communicators/probable-waffle-communicator.service.ts b/apps/client/src/app/probable-waffle/communicators/probable-waffle-communicator.service.ts index 2e6d458c..eb9bc512 100644 --- a/apps/client/src/app/probable-waffle/communicators/probable-waffle-communicator.service.ts +++ b/apps/client/src/app/probable-waffle/communicators/probable-waffle-communicator.service.ts @@ -35,6 +35,7 @@ export class ProbableWaffleCommunicatorService selection?: TwoWayCommunicator; saveGame = new EventEmitter(); // todo just for test + allScenes = new EventEmitter<{ name: string; data?: any }>(); startCommunication(gameInstanceId: string, socket?: Socket) { this.gameInstanceMetadataChanged = new TwoWayCommunicator< diff --git a/apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.ts b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.ts index 453da849..e0fa65af 100644 --- a/apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.ts +++ b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.ts @@ -81,9 +81,7 @@ export class GameInstanceIndexeddbStorageService implements GameInstanceStorageS await this.initializeDatabase(); const objectStore = this.getObjectStore(); await new Promise((resolve, reject) => { - const request = objectStore.delete( - gameInstanceSaveData.gameInstanceData.gameInstanceMetadataData!.gameInstanceId! - ); + const request = objectStore.delete(gameInstanceSaveData.saveName); request.onsuccess = () => resolve(); request.onerror = (event) => reject((event.target as IDBRequest).error); diff --git a/apps/client/src/app/probable-waffle/game/data/actor-manager.ts b/apps/client/src/app/probable-waffle/game/data/actor-manager.ts new file mode 100644 index 00000000..dacf20c4 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/data/actor-manager.ts @@ -0,0 +1,114 @@ +import Hedgehog from "../prefabs/animals/Hedgehog"; +import Sheep from "../prefabs/animals/Sheep"; +import GeneralWarrior from "../prefabs/characters/general/GeneralWarrior"; +import TivaraMacemanMale from "../prefabs/characters/tivara/TivaraMacemanMale"; +import TivaraSlingshotFemale from "../prefabs/characters/tivara/TivaraSlingshotFemale"; +import TivaraWorkerFemale from "../prefabs/characters/tivara/TivaraWorkerFemale"; +import TivaraWorkerMale from "../prefabs/characters/tivara/TivaraWorkerMale"; +import AnkGuard from "../prefabs/buildings/tivara/AnkGuard"; +import Olival from "../prefabs/buildings/tivara/Olival"; +import Sandhold from "../prefabs/buildings/tivara/Sandhold"; +import Temple from "../prefabs/buildings/tivara/Temple"; +import WorkMill from "../prefabs/buildings/tivara/WorkMill"; +import SkaduweeOwl from "../prefabs/units/skaduwee/SkaduweeOwl"; +import SkaduweeRangedFemale from "../prefabs/characters/skaduwee/SkaduweeRangedFemale"; +import SkaduweeMagicianFemale from "../prefabs/characters/skaduwee/SkaduweeMagicianFemale"; +import SkaduweeWarriorMale from "../prefabs/characters/skaduwee/SkaduweeWarriorMale"; +import SkaduweeWorkerMale from "../prefabs/characters/skaduwee/SkaduweeWorkerMale"; +import SkaduweeWorkerFemale from "../prefabs/characters/skaduwee/SkaduweeWorkerFemale"; +import FrostForge from "../prefabs/buildings/skaduwee/FrostForge"; +import InfantryInn from "../prefabs/buildings/skaduwee/InfantryInn"; +import Owlery from "../prefabs/buildings/skaduwee/Owlery"; +import Tree1 from "../prefabs/outside/foliage/trees/resources/Tree1"; +import Tree4 from "../prefabs/outside/foliage/trees/resources/Tree4"; +import Tree5 from "../prefabs/outside/foliage/trees/resources/Tree5"; +import Tree6 from "../prefabs/outside/foliage/trees/resources/Tree6"; +import Tree7 from "../prefabs/outside/foliage/trees/resources/Tree7"; +import Tree9 from "../prefabs/outside/foliage/trees/resources/Tree9"; +import Tree10 from "../prefabs/outside/foliage/trees/resources/Tree10"; +import Tree11 from "../prefabs/outside/foliage/trees/resources/Tree11"; +import { ActorDefinition } from "@fuzzy-waddle/api-interfaces"; +import { DepthHelper } from "../world/map/depth.helper"; +import GameObject = Phaser.GameObjects.GameObject; +import Transform = Phaser.GameObjects.Components.Transform; + +export type ActorConstructor = new (scene: Phaser.Scene) => GameObject; + +export class ActorManager { + public static actorMap: { [name: string]: ActorConstructor } = { + // ANIMALS + [Hedgehog.name]: Hedgehog, + [Sheep.name]: Sheep, + // END ANIMALS + + // GENERAL + [GeneralWarrior.name]: GeneralWarrior, + // END GENERAL + + // TIVARA + [TivaraMacemanMale.name]: TivaraMacemanMale, + [TivaraSlingshotFemale.name]: TivaraSlingshotFemale, + [TivaraWorkerFemale.name]: TivaraWorkerFemale, + [TivaraWorkerMale.name]: TivaraWorkerMale, + [AnkGuard.name]: AnkGuard, + [Olival.name]: Olival, + [Sandhold.name]: Sandhold, + [Temple.name]: Temple, + [WorkMill.name]: WorkMill, + // END TIVARA + + // SKADUWEE + [SkaduweeOwl.name]: SkaduweeOwl, + [SkaduweeRangedFemale.name]: SkaduweeRangedFemale, + [SkaduweeMagicianFemale.name]: SkaduweeMagicianFemale, + [SkaduweeWarriorMale.name]: SkaduweeWarriorMale, + [SkaduweeWorkerMale.name]: SkaduweeWorkerMale, + [SkaduweeWorkerFemale.name]: SkaduweeWorkerFemale, + [FrostForge.name]: FrostForge, + [InfantryInn.name]: InfantryInn, + [Owlery.name]: Owlery, + // END SKADUWEE + + // Trees + [Tree1.name]: Tree1, + [Tree4.name]: Tree4, + [Tree5.name]: Tree5, + [Tree6.name]: Tree6, + [Tree7.name]: Tree7, + [Tree9.name]: Tree9, + [Tree10.name]: Tree10, + [Tree11.name]: Tree11 + // END Trees + } as const; + + static getActorDefinitionFromActor(actor: GameObject): ActorDefinition | undefined { + const actorName = actor.constructor.name; + if (!this.actorMap[actorName]) { + // console.error(`Actor ${actorName} not found`); + return undefined; + } + const actorDefinition: ActorDefinition = { + name: actorName, + x: (actor as any as Transform).x, + y: (actor as any as Transform).y, + z: (actor as any as Transform).z + }; + return actorDefinition; + } + + static createActor(scene: Phaser.Scene, name: string, properties: any): GameObject { + let actor: GameObject | undefined = undefined; + const actorConstructor = this.actorMap[name]; + if (!actorConstructor) { + console.error(`Actor ${name} not found`); + throw new Error(`Actor ${name} not found`); + } + actor = new actorConstructor(scene); + + (actor as any as Transform).x = properties.x; // todo? + (actor as any as Transform).y = properties.y; // todo? + (actor as any as Transform).z = properties.z; // todo? + DepthHelper.setActorDepth(actor); + return actor; + } +} diff --git a/apps/client/src/app/probable-waffle/game/data/save-game.ts b/apps/client/src/app/probable-waffle/game/data/save-game.ts new file mode 100644 index 00000000..187699a2 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/data/save-game.ts @@ -0,0 +1,112 @@ +import { ActorDefinition, ProbableWaffleGameInstanceType } from "@fuzzy-waddle/api-interfaces"; +import GameObject = Phaser.GameObjects.GameObject; +import { GameProbableWaffleScene } from "../scenes/GameProbableWaffleScene"; +import TivaraMacemanMale from "../prefabs/characters/tivara/TivaraMacemanMale"; +import Hedgehog from "../prefabs/animals/Hedgehog"; +import Sheep from "../prefabs/animals/Sheep"; +import { ActorManager } from "./actor-manager"; +import { filter } from "rxjs"; + +export class SaveGame { + static SaveGameEvent = "SaveGameEvent"; + + constructor(private scene: GameProbableWaffleScene) { + this.loadActorsFromSaveGame(); + scene.onPostCreate.subscribe(() => this.postCreate()); + // only ones that have name: SaveGame.SaveGameEvent + scene.communicator.allScenes + .pipe(filter((scene) => scene.name === SaveGame.SaveGameEvent)) + .subscribe(() => this.onSaveGame()); + scene.onDestroy.subscribe(() => this.destroy()); + } + + private postCreate() { + this.loadActorsFromSaveGame(); + // this.demoFillStateForSaveGame(); + this.saveAllKnownActorsToSaveGame(); + } + private loadActorsFromSaveGame() { + if ( + this.scene.baseGameData.gameInstance.gameInstanceMetadata.data.type !== + ProbableWaffleGameInstanceType.LoadFromSave + ) + return; + + // destroy all actors on scene with this name + // load them again from save file + const toRemove: GameObject[] = []; + this.scene.children.each((child) => { + const name = child.constructor.name; + console.log("Child", name); + const knownActorName = ActorManager.actorMap[name]; + if (knownActorName) { + toRemove.push(child); + console.log("Removed actor from scene on game load", name); + } else { + console.log("Not removed actor from scene on game load", name); + } + }); + toRemove.forEach((child) => child.destroy()); + + this.scene.baseGameData.gameInstance.gameState!.data.actors.forEach((actorDefinition) => { + const actor = ActorManager.createActor(this.scene, actorDefinition.name, actorDefinition); + this.scene.add.existing(actor); + console.log("Added actor to scene on game load", actor); + }); + } + + private saveAllKnownActorsToSaveGame() { + if ( + this.scene.baseGameData.gameInstance.gameInstanceMetadata.data.type === + ProbableWaffleGameInstanceType.LoadFromSave + ) + return; + + this.scene.baseGameData.gameInstance.gameState!.data.actors = []; + this.scene.children.each((child) => { + const actorDefinition = ActorManager.getActorDefinitionFromActor(child); + if (actorDefinition) { + this.scene.baseGameData.gameInstance.gameState!.data.actors.push(actorDefinition); + } + }); + } + + private demoFillStateForSaveGame() { + if ( + this.scene.baseGameData.gameInstance.gameInstanceMetadata.data.type === + ProbableWaffleGameInstanceType.LoadFromSave + ) + return; + this.scene.baseGameData.gameInstance.gameState!.data.actors.push( + { + name: TivaraMacemanMale.name, + x: 544, + y: 900, + z: 0 + } as ActorDefinition, + // add hedgehog and sheep + { + name: Hedgehog.name, + x: 544, + y: 800, + z: 0 + } as ActorDefinition, + { + name: Sheep.name, + x: 544, + y: 850, + z: 0 + } as ActorDefinition + ); + } + + private destroy() { + this.scene.events.off(SaveGame.SaveGameEvent); + } + + private onSaveGame() { + this.saveAllKnownActorsToSaveGame(); + this.scene.communicator.saveGame.emit(); + console.log("Saved game"); + } +} diff --git a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts index dc09e008..ba86aec3 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts @@ -9,40 +9,7 @@ import HudProbableWaffle from "./HudProbableWaffle"; import { GameObjectSelectionHandler } from "../world/managers/controllers/input/game-object-selection.handler"; import { SceneGameState } from "../world/managers/game-state/scene-game-state"; import { ProbableWaffleGameData } from "./probable-waffle-game-data"; -import TivaraMacemanMale from "../prefabs/characters/tivara/TivaraMacemanMale"; -import { ActorDefinition, ProbableWaffleGameInstanceType } from "@fuzzy-waddle/api-interfaces"; -import GameObject = Phaser.GameObjects.GameObject; -import Transform = Phaser.GameObjects.Components.Transform; -import TivaraSlingshotFemale from "../prefabs/characters/tivara/TivaraSlingshotFemale"; -import TivaraWorkerFemale from "../prefabs/characters/tivara/TivaraWorkerFemale"; -import TivaraWorkerMale from "../prefabs/characters/tivara/TivaraWorkerMale"; -import SkaduweeOwl from "../prefabs/units/skaduwee/SkaduweeOwl"; -import SkaduweeRangedFemale from "../prefabs/characters/skaduwee/SkaduweeRangedFemale"; -import SkaduweeMagicianFemale from "../prefabs/characters/skaduwee/SkaduweeMagicianFemale"; -import SkaduweeWarriorMale from "../prefabs/characters/skaduwee/SkaduweeWarriorMale"; -import SkaduweeWorkerMale from "../prefabs/characters/skaduwee/SkaduweeWorkerMale"; -import SkaduweeWorkerFemale from "../prefabs/characters/skaduwee/SkaduweeWorkerFemale"; -import FrostForge from "../prefabs/buildings/skaduwee/FrostForge"; -import InfantryInn from "../prefabs/buildings/skaduwee/InfantryInn"; -import Owlery from "../prefabs/buildings/skaduwee/Owlery"; -import AnkGuard from "../prefabs/buildings/tivara/AnkGuard"; -import Olival from "../prefabs/buildings/tivara/Olival"; -import Temple from "../prefabs/buildings/tivara/Temple"; -import WorkMill from "../prefabs/buildings/tivara/WorkMill"; -import Sandhold from "../prefabs/buildings/tivara/Sandhold"; -import GeneralWarrior from "../prefabs/characters/general/GeneralWarrior"; -import Hedgehog from "../prefabs/animals/Hedgehog"; -import Sheep from "../prefabs/animals/Sheep"; -import Tree1 from "../prefabs/outside/foliage/trees/resources/Tree1"; -import Tree6 from "../prefabs/outside/foliage/trees/resources/Tree6"; -import Tree4 from "../prefabs/outside/foliage/trees/resources/Tree4"; -import Tree5 from "../prefabs/outside/foliage/trees/resources/Tree5"; -import Tree7 from "../prefabs/outside/foliage/trees/resources/Tree7"; -import Tree10 from "../prefabs/outside/foliage/trees/resources/Tree10"; -import Tree9 from "../prefabs/outside/foliage/trees/resources/Tree9"; -import Tree11 from "../prefabs/outside/foliage/trees/resources/Tree11"; - -type ActorConstructor = new (scene: Phaser.Scene) => GameObject; +import { SaveGame } from "../data/save-game"; export interface GameProbableWaffleSceneData { baseGameData: ProbableWaffleGameData; @@ -65,52 +32,6 @@ export class GameProbableWaffleScene extends ProbableWaffleScene { services: {} // todo use } satisfies GameProbableWaffleSceneData; - private readonly actorMap: { [name: string]: ActorConstructor } = { - // ANIMALS - [Hedgehog.name]: Hedgehog, - [Sheep.name]: Sheep, - // END ANIMALS - - // GENERAL - [GeneralWarrior.name]: GeneralWarrior, - // END GENERAL - - // TIVARA - [TivaraMacemanMale.name]: TivaraMacemanMale, - [TivaraSlingshotFemale.name]: TivaraSlingshotFemale, - [TivaraWorkerFemale.name]: TivaraWorkerFemale, - [TivaraWorkerMale.name]: TivaraWorkerMale, - [AnkGuard.name]: AnkGuard, - [Olival.name]: Olival, - [Sandhold.name]: Sandhold, - [Temple.name]: Temple, - [WorkMill.name]: WorkMill, - // END TIVARA - - // SKADUWEE - [SkaduweeOwl.name]: SkaduweeOwl, - [SkaduweeRangedFemale.name]: SkaduweeRangedFemale, - [SkaduweeMagicianFemale.name]: SkaduweeMagicianFemale, - [SkaduweeWarriorMale.name]: SkaduweeWarriorMale, - [SkaduweeWorkerMale.name]: SkaduweeWorkerMale, - [SkaduweeWorkerFemale.name]: SkaduweeWorkerFemale, - [FrostForge.name]: FrostForge, - [InfantryInn.name]: InfantryInn, - [Owlery.name]: Owlery, - // END SKADUWEE - - // Trees - [Tree1.name]: Tree1, - [Tree4.name]: Tree4, - [Tree5.name]: Tree5, - [Tree6.name]: Tree6, - [Tree7.name]: Tree7, - [Tree9.name]: Tree9, - [Tree10.name]: Tree10, - [Tree11.name]: Tree11 - // END Trees - }; - init() { super.init(); @@ -131,110 +52,6 @@ export class GameProbableWaffleScene extends ProbableWaffleScene { new AnimatedTilemap(this, this.tilemap, this.tilemap.tilesets); new SingleSelectionHandler(this, this.tilemap); new GameObjectSelectionHandler(this); // todo maybe this needs to be on individual game object? - } - - protected postCreate() { - super.postCreate(); - - setTimeout(() => { - this.loadActorsFromSaveGame(); - // this.demoFillStateForSaveGame(); - this.saveAllKnownActorsToSaveGame(); - }, 500); - } - - private demoFillStateForSaveGame() { - if (this.baseGameData.gameInstance.gameInstanceMetadata.data.type === ProbableWaffleGameInstanceType.LoadFromSave) - return; - this.baseGameData.gameInstance.gameState!.data.actors.push( - { - name: TivaraMacemanMale.name, - x: 544, - y: 900, - z: 0 - } as ActorDefinition, - // add hedgehog and sheep - { - name: Hedgehog.name, - x: 544, - y: 800, - z: 0 - } as ActorDefinition, - { - name: Sheep.name, - x: 544, - y: 850, - z: 0 - } as ActorDefinition - ); - } - - private saveAllKnownActorsToSaveGame() { - if (this.baseGameData.gameInstance.gameInstanceMetadata.data.type === ProbableWaffleGameInstanceType.LoadFromSave) - return; - - this.scene.scene.children.each((child) => { - const actorDefinition = this.getActorDefinitionFromActor(child); - if (actorDefinition) { - this.baseGameData.gameInstance.gameState!.data.actors.push(actorDefinition); - } - }); - } - - private getActorDefinitionFromActor(actor: GameObject): ActorDefinition | undefined { - const actorName = actor.constructor.name; - if (!this.actorMap[actorName]) { - // console.error(`Actor ${actorName} not found`); - return undefined; - } - const actorDefinition: ActorDefinition = { - name: actorName, - x: (actor as any as Transform).x, - y: (actor as any as Transform).y, - z: (actor as any as Transform).z - }; - return actorDefinition; - } - - private loadActorsFromSaveGame() { - if (this.baseGameData.gameInstance.gameInstanceMetadata.data.type !== ProbableWaffleGameInstanceType.LoadFromSave) - return; - - // destroy all actors on scene with this name - // load them again from save file - const toRemove: GameObject[] = []; - this.children.each((child) => { - const name = child.constructor.name; - console.log("Child", name); - const knownActorName = this.actorMap[name]; - if (knownActorName) { - toRemove.push(child); - console.log("Removed actor from scene on game load", name); - } else { - console.log("Not removed actor from scene on game load", name); - } - }); - toRemove.forEach((child) => child.destroy()); - - this.baseGameData.gameInstance.gameState!.data.actors.forEach((actorDefinition) => { - const actor = this.createActor(actorDefinition.name, actorDefinition); - this.scene.scene.add.existing(actor); - console.log("Added actor to scene on game load", actor); - }); - } - private createActor(name: string, properties: any): GameObject { - let actor: GameObject | undefined = undefined; - const actorConstructor = this.actorMap[name]; - if (!actorConstructor) { - console.error(`Actor ${name} not found`); - throw new Error(`Actor ${name} not found`); - } - actor = new actorConstructor(this.scene.scene); - - (actor as any as Transform).x = properties.x; // todo? - (actor as any as Transform).y = properties.y; // todo? - (actor as any as Transform).z = properties.z; // todo? - DepthHelper.setActorDepth(actor); - return actor; + new SaveGame(this); } } diff --git a/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts index 9597da8e..f90464e1 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts @@ -11,10 +11,10 @@ import { CursorHandler } from "../world/managers/controllers/input/cursor.handle import { MultiSelectionHandler } from "../world/managers/controllers/input/multi-selection.handler"; import { Subscription } from "rxjs"; import { GameSessionState } from "@fuzzy-waddle/api-interfaces"; +import { SaveGame } from "../data/save-game"; /* END-USER-IMPORTS */ export default class HudProbableWaffle extends ProbableWaffleScene { - constructor() { super("HudProbableWaffle"); @@ -24,7 +24,6 @@ export default class HudProbableWaffle extends ProbableWaffleScene { } editorCreate(): void { - // buttonSave const buttonSave = new ButtonSmall(this, 1180, 38); this.add.existing(buttonSave); @@ -110,7 +109,7 @@ export default class HudProbableWaffle extends ProbableWaffleScene { private handleSaveGame() { this.saveGameSubscription = this.buttonSave.clicked.subscribe(() => { - this.communicator.saveGame.emit(); + this.communicator.allScenes.emit({ name: SaveGame.SaveGameEvent }); }); } diff --git a/apps/client/src/app/probable-waffle/gui/load/load.component.ts b/apps/client/src/app/probable-waffle/gui/load/load.component.ts index e11b6e20..50981ab2 100644 --- a/apps/client/src/app/probable-waffle/gui/load/load.component.ts +++ b/apps/client/src/app/probable-waffle/gui/load/load.component.ts @@ -22,6 +22,8 @@ export class LoadComponent implements OnInit { protected gameInstanceDataRecords: ProbableWaffleGameInstanceSaveData[] = []; async ngOnInit(): Promise { this.gameInstanceDataRecords = await this.gameInstanceStorageService.getFromStorage(); + // sort descending + this.gameInstanceDataRecords.sort((a, b) => b.created - a.created); } protected getMapName(gameInstanceData: ProbableWaffleGameInstanceData): string { diff --git a/libs/api-interfaces/src/lib/probable-waffle/probable-waffle-api.ts b/libs/api-interfaces/src/lib/probable-waffle/probable-waffle-api.ts index 26d4a93f..e21ae110 100644 --- a/libs/api-interfaces/src/lib/probable-waffle/probable-waffle-api.ts +++ b/libs/api-interfaces/src/lib/probable-waffle/probable-waffle-api.ts @@ -61,5 +61,6 @@ export interface PendingMatchmakingGameInstance { export interface ProbableWaffleGameInstanceSaveData { saveName: string; + created: number; gameInstanceData: ProbableWaffleGameInstanceData; } From 1c4517d272439638f6361377b8596a3d7059f21c Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Mon, 22 Jan 2024 18:21:39 +0100 Subject: [PATCH 124/138] Sheep anim up fix --- .../app/probable-waffle/game/prefabs/animals/anims/animals.ts | 2 +- apps/client/src/assets/probable-waffle/atlas/anims/animals.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/client/src/app/probable-waffle/game/prefabs/animals/anims/animals.ts b/apps/client/src/app/probable-waffle/game/prefabs/animals/anims/animals.ts index f8b156a0..c3a2de38 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/animals/anims/animals.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/animals/anims/animals.ts @@ -30,7 +30,7 @@ export const ANIM_SHEEP_IDLE_LEFT = "sheep_idle_left"; export const ANIM_SHEEP_IDLE_RIGHT = "sheep_idle_right"; -export const ANIM_SHEEP_IDLE_TOP = "sheep_idle_top"; +export const ANIM_SHEEP_IDLE_UP = "sheep_idle_up"; export const ANIM_SHEEP_IDLE_DOWN_SHEARED = "sheep_idle_down_sheared"; diff --git a/apps/client/src/assets/probable-waffle/atlas/anims/animals.json b/apps/client/src/assets/probable-waffle/atlas/anims/animals.json index d7653924..61250cc2 100644 --- a/apps/client/src/assets/probable-waffle/atlas/anims/animals.json +++ b/apps/client/src/assets/probable-waffle/atlas/anims/animals.json @@ -312,7 +312,7 @@ "repeat": -1 }, { - "key": "sheep_idle_top", + "key": "sheep_idle_up", "type": "frame", "frames": [ { From d05b7f5673df3fb274ce3ff88b134ecedae3446f Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Mon, 22 Jan 2024 18:32:08 +0100 Subject: [PATCH 125/138] Game length pipe --- .../gui/replay/replay.component.html | 3 +-- .../gui/replay/replay.component.ts | 3 ++- .../shared/pipes/game-length-pipe.module.ts | 8 ++++++++ .../src/app/shared/pipes/game-length.pipe.ts | 20 +++++++++++++++++++ 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 apps/client/src/app/shared/pipes/game-length-pipe.module.ts create mode 100644 apps/client/src/app/shared/pipes/game-length.pipe.ts diff --git a/apps/client/src/app/probable-waffle/gui/replay/replay.component.html b/apps/client/src/app/probable-waffle/gui/replay/replay.component.html index ed885f1a..8bf1581e 100644 --- a/apps/client/src/app/probable-waffle/gui/replay/replay.component.html +++ b/apps/client/src/app/probable-waffle/gui/replay/replay.component.html @@ -9,8 +9,7 @@ @for (rec of gameInstanceDataRecords;track rec) {
      {{ getMapName(rec.gameInstanceData) }}
      {{ rec.gameInstanceData.gameInstanceMetadataData!.updatedOn | date: "medium" }}
      - -
      10min
      +
      {{ rec.gameInstanceData | gameLength }}
      diff --git a/apps/client/src/app/probable-waffle/gui/replay/replay.component.ts b/apps/client/src/app/probable-waffle/gui/replay/replay.component.ts index 122811a7..b863a482 100644 --- a/apps/client/src/app/probable-waffle/gui/replay/replay.component.ts +++ b/apps/client/src/app/probable-waffle/gui/replay/replay.component.ts @@ -8,11 +8,12 @@ import { ProbableWaffleLevels } from "@fuzzy-waddle/api-interfaces"; import { GameInstanceStorageServiceInterface } from "../../communicators/storage/game-instance-storage.service.interface"; +import { GameLengthPipeModule } from "../../../shared/pipes/game-length-pipe.module"; @Component({ selector: "probable-waffle-replay", standalone: true, - imports: [CommonModule, RouterLink], + imports: [CommonModule, RouterLink, GameLengthPipeModule], templateUrl: "./replay.component.html", styleUrls: ["./replay.component.scss"] }) diff --git a/apps/client/src/app/shared/pipes/game-length-pipe.module.ts b/apps/client/src/app/shared/pipes/game-length-pipe.module.ts new file mode 100644 index 00000000..4213f2e1 --- /dev/null +++ b/apps/client/src/app/shared/pipes/game-length-pipe.module.ts @@ -0,0 +1,8 @@ +import { NgModule } from "@angular/core"; +import { GameLengthPipe } from "./game-length.pipe"; + +@NgModule({ + declarations: [GameLengthPipe], + exports: [GameLengthPipe] +}) +export class GameLengthPipeModule {} diff --git a/apps/client/src/app/shared/pipes/game-length.pipe.ts b/apps/client/src/app/shared/pipes/game-length.pipe.ts new file mode 100644 index 00000000..e9643576 --- /dev/null +++ b/apps/client/src/app/shared/pipes/game-length.pipe.ts @@ -0,0 +1,20 @@ +import { Pipe, PipeTransform } from "@angular/core"; +import { ProbableWaffleGameInstanceData } from "@fuzzy-waddle/api-interfaces"; + +@Pipe({ + name: "gameLength", + pure: true +}) +export class GameLengthPipe implements PipeTransform { + transform(value: ProbableWaffleGameInstanceData): string { + const created = value.gameInstanceMetadataData!.createdOn!.getMilliseconds(); + const ended = value.gameInstanceMetadataData!.updatedOn!.getMilliseconds(); + + // return h, m or s depending on the length of the game + const diff = ended - created; + const hours = Math.floor(diff / 3600000); + const minutes = Math.floor((diff % 3600000) / 60000); + const seconds = Math.floor((diff % 60000) / 1000); + return hours > 0 ? `${hours}h` : minutes > 0 ? `${minutes}m` : `${seconds}s`; + } +} From f32d15b1188a24c620b4ba3d384937c1fb694d67 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Mon, 22 Jan 2024 18:54:28 +0100 Subject: [PATCH 126/138] Replay hud handling --- .../matchmaking/matchmaking.service.ts | 3 +- .../game-instance-client.service.ts | 15 ++++------ .../probable-waffle/game/data/save-game.ts | 28 ++++--------------- .../game/scenes/GameProbableWaffleScene.ts | 4 --- .../game/scenes/HudProbableWaffle.ts | 9 ++++++ .../gui/load/load.component.html | 2 +- .../gui/load/load.component.ts | 2 +- .../probable-waffle/game-instance-medatada.ts | 17 +++++++++-- 8 files changed, 39 insertions(+), 41 deletions(-) diff --git a/apps/api/src/app/probable-waffle/matchmaking/matchmaking.service.ts b/apps/api/src/app/probable-waffle/matchmaking/matchmaking.service.ts index 7cfb2371..0543e89e 100644 --- a/apps/api/src/app/probable-waffle/matchmaking/matchmaking.service.ts +++ b/apps/api/src/app/probable-waffle/matchmaking/matchmaking.service.ts @@ -116,7 +116,8 @@ export class MatchmakingService implements MatchmakingServiceInterface { name: "Matchmaking", createdBy: user.id, type: ProbableWaffleGameInstanceType.Matchmaking, - visibility: ProbableWaffleGameInstanceVisibility.Public + visibility: ProbableWaffleGameInstanceVisibility.Public, + startOptions: {} }, gameModeData: { winConditions: {} satisfies WinConditions, diff --git a/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.ts b/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.ts index 13015eed..afd49342 100644 --- a/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.ts +++ b/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.ts @@ -73,7 +73,8 @@ export class GameInstanceClientService implements GameInstanceClientServiceInter name, createdBy: this.authService.userId, type, - visibility + visibility, + startOptions: {} } satisfies ProbableWaffleGameInstanceMetadataData, gameModeData: { winConditions: {} satisfies WinConditions, @@ -364,14 +365,8 @@ export class GameInstanceClientService implements GameInstanceClientServiceInter await this.router.navigate(["probable-waffle/lobby"], { replaceUrl: true }); break; case ProbableWaffleGameInstanceType.Matchmaking: - // directly to game - await this.router.navigate(["probable-waffle/game"]); - break; case ProbableWaffleGameInstanceType.InstantGame: - // directly to game - await this.router.navigate(["probable-waffle/game"]); - break; - case ProbableWaffleGameInstanceType.LoadFromSave: + case ProbableWaffleGameInstanceType.Replay: // directly to game await this.router.navigate(["probable-waffle/game"]); break; @@ -463,7 +458,7 @@ export class GameInstanceClientService implements GameInstanceClientServiceInter * todo this is a prototype */ async loadGameInstance(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise { - gameInstanceSaveData.gameInstanceData.gameInstanceMetadataData!.type = ProbableWaffleGameInstanceType.LoadFromSave; + gameInstanceSaveData.gameInstanceData.gameInstanceMetadataData!.startOptions.loadFromSave = true; this.gameInstance = new ProbableWaffleGameInstance(gameInstanceSaveData.gameInstanceData); this.startListeningToGameInstanceEvents(); await this.navigateToLobbyOrDirectlyToGame(); @@ -481,7 +476,7 @@ export class GameInstanceClientService implements GameInstanceClientServiceInter * todo this is a prototype */ async startReplay(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise { - // todo here should be initial game instance data + gameInstanceSaveData.gameInstanceData.gameInstanceMetadataData!.type = ProbableWaffleGameInstanceType.Replay; this.gameInstance = new ProbableWaffleGameInstance(gameInstanceSaveData.gameInstanceData); this.startListeningToGameInstanceEvents(); await this.navigateToLobbyOrDirectlyToGame(); diff --git a/apps/client/src/app/probable-waffle/game/data/save-game.ts b/apps/client/src/app/probable-waffle/game/data/save-game.ts index 187699a2..0d3427a5 100644 --- a/apps/client/src/app/probable-waffle/game/data/save-game.ts +++ b/apps/client/src/app/probable-waffle/game/data/save-game.ts @@ -11,7 +11,6 @@ export class SaveGame { static SaveGameEvent = "SaveGameEvent"; constructor(private scene: GameProbableWaffleScene) { - this.loadActorsFromSaveGame(); scene.onPostCreate.subscribe(() => this.postCreate()); // only ones that have name: SaveGame.SaveGameEvent scene.communicator.allScenes @@ -23,27 +22,21 @@ export class SaveGame { private postCreate() { this.loadActorsFromSaveGame(); // this.demoFillStateForSaveGame(); - this.saveAllKnownActorsToSaveGame(); } private loadActorsFromSaveGame() { - if ( - this.scene.baseGameData.gameInstance.gameInstanceMetadata.data.type !== - ProbableWaffleGameInstanceType.LoadFromSave - ) - return; + if (!this.scene.baseGameData.gameInstance.gameInstanceMetadata.isStartupLoad()) return; // destroy all actors on scene with this name // load them again from save file const toRemove: GameObject[] = []; this.scene.children.each((child) => { const name = child.constructor.name; - console.log("Child", name); const knownActorName = ActorManager.actorMap[name]; if (knownActorName) { toRemove.push(child); - console.log("Removed actor from scene on game load", name); + // console.log("Removed actor from scene on game load", name); } else { - console.log("Not removed actor from scene on game load", name); + // console.log("Not removed actor from scene on game load", name); } }); toRemove.forEach((child) => child.destroy()); @@ -51,17 +44,12 @@ export class SaveGame { this.scene.baseGameData.gameInstance.gameState!.data.actors.forEach((actorDefinition) => { const actor = ActorManager.createActor(this.scene, actorDefinition.name, actorDefinition); this.scene.add.existing(actor); - console.log("Added actor to scene on game load", actor); + // console.log("Added actor to scene on game load", actor); }); + console.log("Loaded game"); } private saveAllKnownActorsToSaveGame() { - if ( - this.scene.baseGameData.gameInstance.gameInstanceMetadata.data.type === - ProbableWaffleGameInstanceType.LoadFromSave - ) - return; - this.scene.baseGameData.gameInstance.gameState!.data.actors = []; this.scene.children.each((child) => { const actorDefinition = ActorManager.getActorDefinitionFromActor(child); @@ -72,11 +60,7 @@ export class SaveGame { } private demoFillStateForSaveGame() { - if ( - this.scene.baseGameData.gameInstance.gameInstanceMetadata.data.type === - ProbableWaffleGameInstanceType.LoadFromSave - ) - return; + if (this.scene.baseGameData.gameInstance.gameInstanceMetadata.isStartupLoad()) return; this.scene.baseGameData.gameInstance.gameState!.data.actors.push( { name: TivaraMacemanMale.name, diff --git a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts index ba86aec3..c4d1a46c 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts @@ -34,10 +34,6 @@ export class GameProbableWaffleScene extends ProbableWaffleScene { init() { super.init(); - - // todo this.events.on(Phaser.GameObjects.Events.ADDED_TO_SCENE, (child: Phaser.GameObjects.GameObject) => { - // todo console.log("added to scene", child); // TODO - // todo }); } create() { diff --git a/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts index f90464e1..839cf6ed 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts @@ -78,6 +78,7 @@ export default class HudProbableWaffle extends ProbableWaffleScene { new MultiSelectionHandler(this); this.handleQuit(); this.handleSaveGame(); + this.handleButtonVisibility(); } private resize(gameSize: { height: number; width: number }) { @@ -118,6 +119,14 @@ export default class HudProbableWaffle extends ProbableWaffleScene { this.saveGameSubscription?.unsubscribe(); super.destroy(); } + get isVisibleSaveButton() { + return !this.baseGameData.gameInstance.gameInstanceMetadata.isReplay(); + } + + private handleButtonVisibility() { + const saveButtonVisibile = this.isVisibleSaveButton; + this.buttonSave.visible = saveButtonVisibile; + } /* END-USER-CODE */ } diff --git a/apps/client/src/app/probable-waffle/gui/load/load.component.html b/apps/client/src/app/probable-waffle/gui/load/load.component.html index 2d9bbd71..dabd0951 100644 --- a/apps/client/src/app/probable-waffle/gui/load/load.component.html +++ b/apps/client/src/app/probable-waffle/gui/load/load.component.html @@ -9,7 +9,7 @@ @for (rec of gameInstanceDataRecords;track rec) {
      {{ rec.saveName }}
      {{ getMapName(rec.gameInstanceData) }}
      -
      {{ rec.gameInstanceData.gameInstanceMetadataData!.updatedOn | date: "medium" }}
      +
      {{ rec.created | date: "medium" }}
      diff --git a/apps/client/src/app/probable-waffle/gui/load/load.component.ts b/apps/client/src/app/probable-waffle/gui/load/load.component.ts index 50981ab2..56f6c152 100644 --- a/apps/client/src/app/probable-waffle/gui/load/load.component.ts +++ b/apps/client/src/app/probable-waffle/gui/load/load.component.ts @@ -23,7 +23,7 @@ export class LoadComponent implements OnInit { async ngOnInit(): Promise { this.gameInstanceDataRecords = await this.gameInstanceStorageService.getFromStorage(); // sort descending - this.gameInstanceDataRecords.sort((a, b) => b.created - a.created); + this.gameInstanceDataRecords.sort((a, b) => a.created - b.created); } protected getMapName(gameInstanceData: ProbableWaffleGameInstanceData): string { diff --git a/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance-medatada.ts b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance-medatada.ts index d2996172..e3838adb 100644 --- a/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance-medatada.ts +++ b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance-medatada.ts @@ -5,16 +5,29 @@ export enum ProbableWaffleGameInstanceType { SelfHosted, Skirmish, InstantGame, - LoadFromSave + Replay +} + +export interface GameInstanceMetadataStartOptions { + loadFromSave?: boolean; } export interface ProbableWaffleGameInstanceMetadataData extends GameInstanceMetadataData { type: ProbableWaffleGameInstanceType; visibility: ProbableWaffleGameInstanceVisibility; name: string; + startOptions: GameInstanceMetadataStartOptions; } -export class ProbableWaffleGameInstanceMetadata extends GameInstanceMetadata {} +export class ProbableWaffleGameInstanceMetadata extends GameInstanceMetadata { + isReplay(): boolean { + return this.data.type === ProbableWaffleGameInstanceType.Replay; + } + + isStartupLoad(): boolean { + return this.data.startOptions.loadFromSave ?? false; + } +} export enum ProbableWaffleGameInstanceVisibility { Public = "public", From 7b2a83a93d35c101e9a8f5e41d47e1a803bfee89 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Mon, 22 Jan 2024 18:57:39 +0100 Subject: [PATCH 127/138] Depth sort on move --- .../app/probable-waffle/game/prefabs/animals/Hedgehog.ts | 4 ++++ .../game/prefabs/units/skaduwee/SkaduweeOwl.ts | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.ts b/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.ts index 5669661d..a3fba394 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.ts @@ -18,6 +18,7 @@ import { ANIM_HEDGEHOG_WALK_RIGHT, ANIM_HEDGEHOG_WALK_TOP } from "./anims/animals"; +import { DepthHelper } from "../../world/map/depth.helper"; /* END-USER-IMPORTS */ export default class Hedgehog extends Phaser.GameObjects.Sprite { @@ -136,6 +137,9 @@ export default class Hedgehog extends Phaser.GameObjects.Sprite { if (!this.active) return; this.play(walkAnim); }, + onUpdate: () => { + DepthHelper.setActorDepth(this); + }, onComplete: () => { if (!this.active) return; this.play(ballAnim); diff --git a/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts b/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts index b03dd8e1..247c7392 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts @@ -3,6 +3,7 @@ /* START OF COMPILED CODE */ import Phaser from "phaser"; +import { DepthHelper } from "../../../world/map/depth.helper"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ @@ -74,7 +75,10 @@ export default class SkaduweeOwl extends Phaser.GameObjects.Container { duration, ease: "Sine.easeInOut", yoyo: false, - repeat: 0 + repeat: 0, + onUpdate: () => { + DepthHelper.setActorDepth(this); + } }); // after 3-5 seconds, move to a new random location From 31fbe72e3ed9eaba5b91b3627a45f9af8497036b Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Mon, 22 Jan 2024 19:27:40 +0100 Subject: [PATCH 128/138] Throttle on tween update --- .../probable-waffle/game/library/throttle.ts | 29 +++++++++++++++++++ .../game/prefabs/animals/Hedgehog.ts | 8 +++-- .../prefabs/units/skaduwee/SkaduweeOwl.ts | 10 +++++-- 3 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 apps/client/src/app/probable-waffle/game/library/throttle.ts diff --git a/apps/client/src/app/probable-waffle/game/library/throttle.ts b/apps/client/src/app/probable-waffle/game/library/throttle.ts new file mode 100644 index 00000000..f3701a83 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/library/throttle.ts @@ -0,0 +1,29 @@ +// from https://github.com/bameyrick/throttle-typescript + +/* eslint-disable @typescript-eslint/no-this-alias */ +export type ThrottledFunction any> = (...args: Parameters) => ReturnType; + +/** + * Creates a throttled function that only invokes the provided function (`func`) at most once per within a given number of milliseconds + * (`limit`) + */ +export function throttle any>(func: T, limit: number): ThrottledFunction { + let inThrottle: boolean; + let lastResult: ReturnType; + + return function (this: any): ReturnType { + // eslint-disable-next-line prefer-rest-params + const args = arguments; + const context = this; + + if (!inThrottle) { + inThrottle = true; + + setTimeout(() => (inThrottle = false), limit); + + lastResult = func.apply(context, args); + } + + return lastResult; + }; +} diff --git a/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.ts b/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.ts index a3fba394..f5425cc1 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.ts @@ -19,6 +19,7 @@ import { ANIM_HEDGEHOG_WALK_TOP } from "./anims/animals"; import { DepthHelper } from "../../world/map/depth.helper"; +import { throttle } from "../../library/throttle"; /* END-USER-IMPORTS */ export default class Hedgehog extends Phaser.GameObjects.Sprite { @@ -128,6 +129,7 @@ export default class Hedgehog extends Phaser.GameObjects.Sprite { this ); } else { + const throttledSetActorDepth = throttle(this.setActorDepth, 360); this.currentTween = this.scene.tweens.add({ targets: this, x: targetX, @@ -138,7 +140,7 @@ export default class Hedgehog extends Phaser.GameObjects.Sprite { this.play(walkAnim); }, onUpdate: () => { - DepthHelper.setActorDepth(this); + throttledSetActorDepth(); }, onComplete: () => { if (!this.active) return; @@ -148,7 +150,9 @@ export default class Hedgehog extends Phaser.GameObjects.Sprite { }); } } - + private setActorDepth = () => { + DepthHelper.setActorDepth(this); + }; override destroy(fromScene?: boolean) { super.destroy(fromScene); this.currentDelay?.remove(false); diff --git a/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts b/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts index 247c7392..16e2de13 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts @@ -3,8 +3,9 @@ /* START OF COMPILED CODE */ import Phaser from "phaser"; -import { DepthHelper } from "../../../world/map/depth.helper"; /* START-USER-IMPORTS */ +import { DepthHelper } from "../../../world/map/depth.helper"; +import { throttle } from "../../../library/throttle"; /* END-USER-IMPORTS */ export default class SkaduweeOwl extends Phaser.GameObjects.Container { @@ -68,6 +69,7 @@ export default class SkaduweeOwl extends Phaser.GameObjects.Container { const duration = Phaser.Math.Between(3000, 5000); + const throttledSetActorDepth = throttle(this.setActorDepth, 360); this.scene.tweens.add({ targets: this, x: targetX, @@ -77,7 +79,7 @@ export default class SkaduweeOwl extends Phaser.GameObjects.Container { yoyo: false, repeat: 0, onUpdate: () => { - DepthHelper.setActorDepth(this); + throttledSetActorDepth(); } }); @@ -85,6 +87,10 @@ export default class SkaduweeOwl extends Phaser.GameObjects.Container { this.delayedCaller = this.scene.time.delayedCall(duration, this.moveOwl, [], this); } + private setActorDepth = () => { + DepthHelper.setActorDepth(this); + }; + override destroy(fromScene?: boolean) { super.destroy(fromScene); this.delayedCaller?.destroy(); From 083c524a5b0417785558f0f5b7bd746ee967ca0c Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Mon, 22 Jan 2024 20:00:07 +0100 Subject: [PATCH 129/138] Owner component --- .../probable-waffle/game/data/actor-data.ts | 9 +++++ .../game/data/actor-manager.ts | 1 - .../components/DEPRECATEDowner-component.ts | 33 +++++++++++++++++ .../actor/components/builder-component.ts | 4 +-- .../actor/components/gatherer-component.ts | 4 +-- .../actor/components/owner-component.ts | 36 ++++++------------- .../game/entity/actor/player-character.ts | 6 ++-- .../game/entity/assets/buildings/building.ts | 6 ++-- .../construction-site-component.ts | 6 ++-- .../production/production-component.ts | 6 ++-- .../resource/resource-drain-component.ts | 4 +-- .../game/library/gameplay-library.ts | 4 +-- .../game/prefabs/buildings/tivara/Sandhold.ts | 7 ++++ 13 files changed, 80 insertions(+), 46 deletions(-) create mode 100644 apps/client/src/app/probable-waffle/game/data/actor-data.ts create mode 100644 apps/client/src/app/probable-waffle/game/entity/actor/components/DEPRECATEDowner-component.ts diff --git a/apps/client/src/app/probable-waffle/game/data/actor-data.ts b/apps/client/src/app/probable-waffle/game/data/actor-data.ts new file mode 100644 index 00000000..6f844476 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/data/actor-data.ts @@ -0,0 +1,9 @@ +import { IComponent } from "../core/component.service"; + +export const ActorDataKey = "actorData"; +export class ActorData { + constructor( + public readonly components: any[], + public readonly systems: any[] + ) {} +} diff --git a/apps/client/src/app/probable-waffle/game/data/actor-manager.ts b/apps/client/src/app/probable-waffle/game/data/actor-manager.ts index dacf20c4..2a0fef78 100644 --- a/apps/client/src/app/probable-waffle/game/data/actor-manager.ts +++ b/apps/client/src/app/probable-waffle/game/data/actor-manager.ts @@ -33,7 +33,6 @@ import GameObject = Phaser.GameObjects.GameObject; import Transform = Phaser.GameObjects.Components.Transform; export type ActorConstructor = new (scene: Phaser.Scene) => GameObject; - export class ActorManager { public static actorMap: { [name: string]: ActorConstructor } = { // ANIMALS diff --git a/apps/client/src/app/probable-waffle/game/entity/actor/components/DEPRECATEDowner-component.ts b/apps/client/src/app/probable-waffle/game/entity/actor/components/DEPRECATEDowner-component.ts new file mode 100644 index 00000000..034c2e79 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/entity/actor/components/DEPRECATEDowner-component.ts @@ -0,0 +1,33 @@ +import { PlayerController } from "../../../world/managers/controllers/player-controller"; +import { IComponent } from "../../../core/component.service"; +import { Actor } from "../actor"; + +export class DEPRECATEDownerComponent implements IComponent { + public playerController?: PlayerController; + + constructor(playerController?: PlayerController) { + this.playerController = playerController; + } + + init(): void { + // pass + } + + isSameTeamAsActor(actor: Actor): boolean { + const ownerComponent = actor.components.findComponentOrNull(DEPRECATEDownerComponent); + if (!ownerComponent) return false; + if (!this.playerController || !ownerComponent.playerController) return false; + return ( + ownerComponent.playerController.playerState.teamInfo.teamId === this.playerController.playerState.teamInfo.teamId + ); + } + + isSameTeamAsController(controller?: PlayerController): boolean { + if (!controller || !this.playerController) return false; + return controller.playerState.teamInfo.teamId === this.playerController.playerState.teamInfo.teamId; + } + + possess(playerController: PlayerController) { + this.playerController = playerController; + } +} diff --git a/apps/client/src/app/probable-waffle/game/entity/actor/components/builder-component.ts b/apps/client/src/app/probable-waffle/game/entity/actor/components/builder-component.ts index 5d93875a..2d2fe449 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/components/builder-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/actor/components/builder-component.ts @@ -10,7 +10,7 @@ import { GameMode } from "../../../world/managers/game-mode/game-mode"; import { GameModeSkirmish } from "../../../world/managers/game-mode/game-modes/game-mode-skirmish"; import { GameplayLibrary } from "../../../library/gameplay-library"; import { TilePlacementData } from "../../../world/managers/controllers/input/tilemap/tilemap-input.handler"; -import { OwnerComponent } from "./owner-component"; +import { DEPRECATEDownerComponent } from "./DEPRECATEDowner-component"; import { SpriteRepresentationComponent } from "./sprite-representable-component"; export type ActorAbleToBeBuilt = Barracks | Mine; @@ -86,7 +86,7 @@ export class BuilderComponent implements IComponent { // todo // spawn building - const ownerController = this.actor.components.findComponent(OwnerComponent); + const ownerController = this.actor.components.findComponent(DEPRECATEDownerComponent); const scene = this.actor.components.findComponent(SpriteRepresentationComponent).scene; const building = gameMode.spawnActorForPlayer( scene, diff --git a/apps/client/src/app/probable-waffle/game/entity/actor/components/gatherer-component.ts b/apps/client/src/app/probable-waffle/game/entity/actor/components/gatherer-component.ts index 35a56a58..2ea875e3 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/components/gatherer-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/actor/components/gatherer-component.ts @@ -9,7 +9,7 @@ import { PlayerController } from "../../../world/managers/controllers/player-con import { PlayerResourcesComponent } from "../../../world/managers/controllers/player-resources-component"; import { ContainerComponent } from "../../building/container-component"; import { ResourceDrainComponent } from "../../economy/resource/resource-drain-component"; -import { OwnerComponent } from "./owner-component"; +import { DEPRECATEDownerComponent } from "./DEPRECATEDowner-component"; import { ResourceTypeDefinition } from "@fuzzy-waddle/api-interfaces"; export type GathererClasses = typeof Mine; @@ -106,7 +106,7 @@ export class GathererComponent implements IComponent { let closestResourceDrainDistance = 0; const gatherer = this.actor; - const gatherOwnerComponent = gatherer.components.findComponent(OwnerComponent); + const gatherOwnerComponent = gatherer.components.findComponent(DEPRECATEDownerComponent); const actors: Actor[] = []; // todo get all actors in the world for (const resourceDrain of actors) { diff --git a/apps/client/src/app/probable-waffle/game/entity/actor/components/owner-component.ts b/apps/client/src/app/probable-waffle/game/entity/actor/components/owner-component.ts index e6c04d09..9df3bccd 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/components/owner-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/actor/components/owner-component.ts @@ -1,33 +1,19 @@ -import { PlayerController } from "../../../world/managers/controllers/player-controller"; -import { IComponent } from "../../../core/component.service"; -import { Actor } from "../actor"; +import GameObject = Phaser.GameObjects.GameObject; -export class OwnerComponent implements IComponent { - public playerController?: PlayerController; +export class OwnerComponent { + private owner?: number; + constructor(private readonly gameObject: GameObject) {} - constructor(playerController?: PlayerController) { - this.playerController = playerController; + setOwner(playerNumber: number) { + this.owner = playerNumber; + console.warn(`Owner set to ${playerNumber} for ${this.gameObject.constructor.name}`); } - init(): void { - // pass + clearOwner() { + this.owner = undefined; } - isSameTeamAsActor(actor: Actor): boolean { - const ownerComponent = actor.components.findComponentOrNull(OwnerComponent); - if (!ownerComponent) return false; - if (!this.playerController || !ownerComponent.playerController) return false; - return ( - ownerComponent.playerController.playerState.teamInfo.teamId === this.playerController.playerState.teamInfo.teamId - ); - } - - isSameTeamAsController(controller?: PlayerController): boolean { - if (!controller || !this.playerController) return false; - return controller.playerState.teamInfo.teamId === this.playerController.playerState.teamInfo.teamId; - } - - possess(playerController: PlayerController) { - this.playerController = playerController; + getOwner(): number | undefined { + return this.owner; } } diff --git a/apps/client/src/app/probable-waffle/game/entity/actor/player-character.ts b/apps/client/src/app/probable-waffle/game/entity/actor/player-character.ts index 95ce2e0b..ae6fe451 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/player-character.ts +++ b/apps/client/src/app/probable-waffle/game/entity/actor/player-character.ts @@ -1,6 +1,6 @@ import { Character } from "./character"; import { TilePlacementData } from "../../world/managers/controllers/input/tilemap/tilemap-input.handler"; -import { OwnerComponent } from "./components/owner-component"; +import { DEPRECATEDownerComponent } from "./components/DEPRECATEDowner-component"; import { CostData, ProductionCostComponent } from "../building/production/production-cost-component"; import { Scene } from "phaser"; import { PlayerController } from "../../world/managers/controllers/player-controller"; @@ -22,12 +22,12 @@ export abstract class PlayerCharacter extends Character { override initComponents() { super.initComponents(); - this.components.addComponent(new OwnerComponent()); + this.components.addComponent(new DEPRECATEDownerComponent()); this.components.addComponent(new ProductionCostComponent(this.cost)); } possess(playerController?: PlayerController) { if (!playerController) return; - this.components.findComponent(OwnerComponent).possess(playerController); + this.components.findComponent(DEPRECATEDownerComponent).possess(playerController); } } diff --git a/apps/client/src/app/probable-waffle/game/entity/assets/buildings/building.ts b/apps/client/src/app/probable-waffle/game/entity/assets/buildings/building.ts index c5293126..373e978b 100644 --- a/apps/client/src/app/probable-waffle/game/entity/assets/buildings/building.ts +++ b/apps/client/src/app/probable-waffle/game/entity/assets/buildings/building.ts @@ -1,6 +1,6 @@ import { RepresentableActor, RepresentableActorDefinition } from "../../actor/representable-actor"; import { TilePlacementData } from "../../../world/managers/controllers/input/tilemap/tilemap-input.handler"; -import { OwnerComponent } from "../../actor/components/owner-component"; +import { DEPRECATEDownerComponent } from "../../actor/components/DEPRECATEDowner-component"; import { PlayerController } from "../../../world/managers/controllers/player-controller"; import { CostData, ProductionCostComponent } from "../../building/production/production-cost-component"; import { PawnInfoDefinition } from "../../actor/character"; @@ -36,7 +36,7 @@ export abstract class Building extends RepresentableActor { override initComponents(): void { super.initComponents(); - this.components.addComponent(new OwnerComponent()); + this.components.addComponent(new DEPRECATEDownerComponent()); this.components.addComponent( new ConstructionSiteComponent(this, this.buildingInfoDefinition.constructionSiteDefinition) ); @@ -45,6 +45,6 @@ export abstract class Building extends RepresentableActor { possess(playerController?: PlayerController) { if (!playerController) return; - this.components.findComponent(OwnerComponent).possess(playerController); + this.components.findComponent(DEPRECATEDownerComponent).possess(playerController); } } diff --git a/apps/client/src/app/probable-waffle/game/entity/building/construction/construction-site-component.ts b/apps/client/src/app/probable-waffle/game/entity/building/construction/construction-site-component.ts index 35aef18e..c4945580 100644 --- a/apps/client/src/app/probable-waffle/game/entity/building/construction/construction-site-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/building/construction/construction-site-component.ts @@ -2,7 +2,7 @@ import { IComponent } from "../../../core/component.service"; import { PaymentType } from "../payment-type"; import { ResourceTypeDefinition } from "@fuzzy-waddle/api-interfaces"; import { Actor } from "../../actor/actor"; -import { OwnerComponent } from "../../actor/components/owner-component"; +import { DEPRECATEDownerComponent } from "../../actor/components/DEPRECATEDowner-component"; import { PlayerResourcesComponent } from "../../../world/managers/controllers/player-resources-component"; import { ConstructionStateEnum } from "./construction-state-enum"; import { HealthComponent } from "../../combat/components/health-component"; @@ -86,7 +86,7 @@ export class ConstructionSiteComponent implements IComponent { throw new Error("ConstructionSiteComponent can only be started once"); } if (this.constructionSiteDefinition.constructionCostType === PaymentType.PayImmediately) { - const ownerComponent = this.owner.components.findComponent(OwnerComponent); + const ownerComponent = this.owner.components.findComponent(DEPRECATEDownerComponent); if (!ownerComponent.playerController) throw new Error("PlayerController not found"); const playerResourcesComponent = ownerComponent.playerController.components.findComponent(PlayerResourcesComponent); @@ -119,7 +119,7 @@ export class ConstructionSiteComponent implements IComponent { } // refund resources - const ownerComponent = this.owner.components.findComponent(OwnerComponent); + const ownerComponent = this.owner.components.findComponent(DEPRECATEDownerComponent); if (!ownerComponent.playerController) throw new Error("PlayerController not found"); const playerResourcesComponent = ownerComponent.playerController.components.findComponent(PlayerResourcesComponent); diff --git a/apps/client/src/app/probable-waffle/game/entity/building/production/production-component.ts b/apps/client/src/app/probable-waffle/game/entity/building/production/production-component.ts index 74c64c1d..bd8e571a 100644 --- a/apps/client/src/app/probable-waffle/game/entity/building/production/production-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/building/production/production-component.ts @@ -4,7 +4,7 @@ import { ActorAbleToBeProduced, ActorAbleToBeProducedClass, ProductionQueue } fr import { CostData } from "./production-cost-component"; import { PaymentType } from "../payment-type"; import { PlayerResourcesComponent } from "../../../world/managers/controllers/player-resources-component"; -import { OwnerComponent } from "../../actor/components/owner-component"; +import { DEPRECATEDownerComponent } from "../../actor/components/DEPRECATEDowner-component"; import { Actor } from "../../actor/actor"; import { SpriteRepresentationComponent } from "../../actor/components/sprite-representable-component"; import { TransformComponent } from "../../actor/components/transformable-component"; @@ -18,7 +18,7 @@ export type ProductionQueueItem = { export class ProductionComponent implements IComponent { productionQueues: ProductionQueue[] = []; rallyPoint?: RallyPoint; - private ownerComponent!: OwnerComponent; + private ownerComponent!: DEPRECATEDownerComponent; private spriteRepresentationComponent!: SpriteRepresentationComponent; private transformComponent!: TransformComponent; @@ -31,7 +31,7 @@ export class ProductionComponent implements IComponent { ) {} init() { - this.ownerComponent = this.owner.components.findComponent(OwnerComponent); + this.ownerComponent = this.owner.components.findComponent(DEPRECATEDownerComponent); this.spriteRepresentationComponent = this.owner.components.findComponent(SpriteRepresentationComponent); this.transformComponent = this.owner.components.findComponent(TransformComponent); // setup queues diff --git a/apps/client/src/app/probable-waffle/game/entity/economy/resource/resource-drain-component.ts b/apps/client/src/app/probable-waffle/game/entity/economy/resource/resource-drain-component.ts index f7d07b9f..42892bf5 100644 --- a/apps/client/src/app/probable-waffle/game/entity/economy/resource/resource-drain-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/economy/resource/resource-drain-component.ts @@ -2,7 +2,7 @@ import { IComponent } from "../../../core/component.service"; import { Actor } from "../../actor/actor"; import { ResourceTypeDefinition } from "@fuzzy-waddle/api-interfaces"; import { ContainerComponent } from "../../building/container-component"; -import { OwnerComponent } from "../../actor/components/owner-component"; +import { DEPRECATEDownerComponent } from "../../actor/components/DEPRECATEDowner-component"; import { PlayerResourcesComponent } from "../../../world/managers/controllers/player-resources-component"; import { Subject } from "rxjs"; @@ -30,7 +30,7 @@ export class ResourceDrainComponent implements IComponent { * returns resources to player controller */ returnResources(gatherer: Actor, resourceType: ResourceTypeDefinition, amount: number): number { - const ownerComponent = this.actor.components.findComponent(OwnerComponent); + const ownerComponent = this.actor.components.findComponent(DEPRECATEDownerComponent); if (!ownerComponent.playerController) throw new Error("ownerComponent.playerController is null"); const playerResourcesComponent = ownerComponent.playerController.components.findComponent(PlayerResourcesComponent); diff --git a/apps/client/src/app/probable-waffle/game/library/gameplay-library.ts b/apps/client/src/app/probable-waffle/game/library/gameplay-library.ts index 11a5633e..2765605f 100644 --- a/apps/client/src/app/probable-waffle/game/library/gameplay-library.ts +++ b/apps/client/src/app/probable-waffle/game/library/gameplay-library.ts @@ -1,12 +1,12 @@ import { Actor } from "../entity/actor/actor"; -import { OwnerComponent } from "../entity/actor/components/owner-component"; +import { DEPRECATEDownerComponent } from "../entity/actor/components/DEPRECATEDowner-component"; import { ActorAbleToBeBuiltClass } from "../entity/actor/components/builder-component"; import { TransformComponent } from "../entity/actor/components/transformable-component"; import { ConstructionSiteComponent } from "../entity/building/construction/construction-site-component"; export class GameplayLibrary { static getMissingRequirementsFor(ownedActor: Actor, desiredProduct: ActorAbleToBeBuiltClass): Actor | false { - const ownerComponent = ownedActor.components.findComponentOrNull(OwnerComponent); + const ownerComponent = ownedActor.components.findComponentOrNull(DEPRECATEDownerComponent); if (!ownerComponent) { return false; diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts index 82bc5805..5a50a623 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts @@ -5,6 +5,8 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { ANIM_TIVARA_BUILDINGS_OLIVAL_SMALL } from "../../../../../../assets/probable-waffle/atlas/anims/tivara/buildings"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { ActorData, ActorDataKey } from "../../../data/actor-data"; /* END-USER-IMPORTS */ export default class Sandhold extends Phaser.GameObjects.Container { @@ -25,6 +27,11 @@ export default class Sandhold extends Phaser.GameObjects.Container { this.add(hover_crystal); /* START-USER-CTR-CODE */ + + this.setData(ActorDataKey, new ActorData([new OwnerComponent(this)], [])); + + (this.getData(ActorDataKey) as ActorData).components.find((c) => c instanceof OwnerComponent)?.setOwner(1); + // Create a continuous hover effect for hover_crystal scene.tweens.add({ targets: hover_crystal, From 0884203572a734cf000ec1dee5d4207998a4502d Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Tue, 23 Jan 2024 07:49:59 +0100 Subject: [PATCH 130/138] Owner component --- .../app/probable-waffle/game/data/actor-component.ts | 10 ++++++++++ .../src/app/probable-waffle/game/data/actor-data.ts | 6 ++++-- .../src/app/probable-waffle/game/data/actor-system.ts | 10 ++++++++++ .../game/prefabs/buildings/tivara/Sandhold.ts | 8 ++++---- 4 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 apps/client/src/app/probable-waffle/game/data/actor-component.ts create mode 100644 apps/client/src/app/probable-waffle/game/data/actor-system.ts diff --git a/apps/client/src/app/probable-waffle/game/data/actor-component.ts b/apps/client/src/app/probable-waffle/game/data/actor-component.ts new file mode 100644 index 00000000..e3be7f2d --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/data/actor-component.ts @@ -0,0 +1,10 @@ +import GameObject = Phaser.GameObjects.GameObject; +import { ActorData, ActorDataKey } from "./actor-data"; + +export function getActorComponent(actor: GameObject, componentClass: new (...args: any[]) => T): T | undefined { + const component = (actor.getData(ActorDataKey) as ActorData)?.components?.find((c) => c instanceof componentClass); + if (!component) { + return undefined; + } + return component; +} diff --git a/apps/client/src/app/probable-waffle/game/data/actor-data.ts b/apps/client/src/app/probable-waffle/game/data/actor-data.ts index 6f844476..aca0f45a 100644 --- a/apps/client/src/app/probable-waffle/game/data/actor-data.ts +++ b/apps/client/src/app/probable-waffle/game/data/actor-data.ts @@ -1,5 +1,3 @@ -import { IComponent } from "../core/component.service"; - export const ActorDataKey = "actorData"; export class ActorData { constructor( @@ -7,3 +5,7 @@ export class ActorData { public readonly systems: any[] ) {} } + +export function setActorData(actor: Phaser.GameObjects.GameObject, components: any[], systems: any[]) { + actor.setData(ActorDataKey, new ActorData(components, systems)); +} diff --git a/apps/client/src/app/probable-waffle/game/data/actor-system.ts b/apps/client/src/app/probable-waffle/game/data/actor-system.ts new file mode 100644 index 00000000..329ee707 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/data/actor-system.ts @@ -0,0 +1,10 @@ +import GameObject = Phaser.GameObjects.GameObject; +import { ActorData, ActorDataKey } from "./actor-data"; + +export function getActorSystem(actor: GameObject, systemClass: new (...args: any[]) => T): T | undefined { + const component = (actor.getData(ActorDataKey) as ActorData)?.systems?.find((c) => c instanceof systemClass); + if (!component) { + return undefined; + } + return component; +} diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts index 5a50a623..f0ba518e 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts @@ -6,7 +6,8 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { ANIM_TIVARA_BUILDINGS_OLIVAL_SMALL } from "../../../../../../assets/probable-waffle/atlas/anims/tivara/buildings"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; -import { ActorData, ActorDataKey } from "../../../data/actor-data"; +import { setActorData } from "../../../data/actor-data"; +import { getActorComponent } from "../../../data/actor-component"; /* END-USER-IMPORTS */ export default class Sandhold extends Phaser.GameObjects.Container { @@ -28,9 +29,8 @@ export default class Sandhold extends Phaser.GameObjects.Container { /* START-USER-CTR-CODE */ - this.setData(ActorDataKey, new ActorData([new OwnerComponent(this)], [])); - - (this.getData(ActorDataKey) as ActorData).components.find((c) => c instanceof OwnerComponent)?.setOwner(1); + setActorData(this, [new OwnerComponent(this)], []); + getActorComponent(this, OwnerComponent)?.setOwner(1); // Create a continuous hover effect for hover_crystal scene.tweens.add({ From 3a8c853fcea7fd79032024eb3b64f1caddd58648 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Tue, 23 Jan 2024 08:13:16 +0100 Subject: [PATCH 131/138] Owner component --- .../game/data/actor-manager.ts | 22 +++++--- .../probable-waffle/game/data/save-game.ts | 28 ++++++---- .../prefabs/buildings/skaduwee/FrostForge.ts | 4 ++ .../prefabs/buildings/skaduwee/InfantryInn.ts | 4 ++ .../game/prefabs/buildings/skaduwee/Owlery.ts | 39 +++++++++----- .../game/prefabs/buildings/tivara/AnkGuard.ts | 4 +- .../game/prefabs/buildings/tivara/Olival.ts | 37 +++++++++----- .../game/prefabs/buildings/tivara/Sandhold.ts | 2 - .../game/prefabs/buildings/tivara/Temple.ts | 51 ++++++++++++------- .../game/prefabs/buildings/tivara/WorkMill.ts | 37 +++++++++----- .../characters/general/GeneralWarrior.ts | 4 ++ .../skaduwee/SkaduweeMagicianFemale.ts | 4 ++ .../skaduwee/SkaduweeRangedFemale.ts | 5 +- .../skaduwee/SkaduweeWarriorMale.ts | 5 +- .../skaduwee/SkaduweeWorkerFemale.ts | 4 ++ .../characters/skaduwee/SkaduweeWorkerMale.ts | 4 ++ .../characters/tivara/TivaraMacemanMale.ts | 4 ++ .../tivara/TivaraSlingshotFemale.ts | 4 ++ .../characters/tivara/TivaraWorkerFemale.ts | 4 ++ .../characters/tivara/TivaraWorkerMale.ts | 4 ++ .../prefabs/units/skaduwee/SkaduweeOwl.ts | 4 ++ .../probable-waffle/game-state.ts | 3 +- 22 files changed, 197 insertions(+), 80 deletions(-) diff --git a/apps/client/src/app/probable-waffle/game/data/actor-manager.ts b/apps/client/src/app/probable-waffle/game/data/actor-manager.ts index 2a0fef78..f85cc113 100644 --- a/apps/client/src/app/probable-waffle/game/data/actor-manager.ts +++ b/apps/client/src/app/probable-waffle/game/data/actor-manager.ts @@ -31,6 +31,8 @@ import { ActorDefinition } from "@fuzzy-waddle/api-interfaces"; import { DepthHelper } from "../world/map/depth.helper"; import GameObject = Phaser.GameObjects.GameObject; import Transform = Phaser.GameObjects.Components.Transform; +import { getActorComponent } from "./actor-component"; +import { OwnerComponent } from "../entity/actor/components/owner-component"; export type ActorConstructor = new (scene: Phaser.Scene) => GameObject; export class ActorManager { @@ -87,11 +89,14 @@ export class ActorManager { return undefined; } const actorDefinition: ActorDefinition = { - name: actorName, - x: (actor as any as Transform).x, - y: (actor as any as Transform).y, - z: (actor as any as Transform).z + name: actorName }; + const transform = actor as any as Transform; + if (transform.x !== undefined) actorDefinition["x"] = transform.x; + if (transform.y !== undefined) actorDefinition["y"] = transform.y; + if (transform.z !== undefined) actorDefinition["z"] = transform.z; + const ownerComponent = getActorComponent(actor, OwnerComponent); + if (ownerComponent) actorDefinition["owner"] = ownerComponent.getOwner(); return actorDefinition; } @@ -104,9 +109,12 @@ export class ActorManager { } actor = new actorConstructor(scene); - (actor as any as Transform).x = properties.x; // todo? - (actor as any as Transform).y = properties.y; // todo? - (actor as any as Transform).z = properties.z; // todo? + const transform = actor as any as Transform; + if (transform.x !== undefined) transform.x = properties.x; + if (transform.y !== undefined) transform.y = properties.y; + if (transform.z !== undefined) transform.z = properties.z; + if (properties.owner) getActorComponent(actor, OwnerComponent)?.setOwner(properties.owner); + DepthHelper.setActorDepth(actor); return actor; } diff --git a/apps/client/src/app/probable-waffle/game/data/save-game.ts b/apps/client/src/app/probable-waffle/game/data/save-game.ts index 0d3427a5..3b993948 100644 --- a/apps/client/src/app/probable-waffle/game/data/save-game.ts +++ b/apps/client/src/app/probable-waffle/game/data/save-game.ts @@ -1,11 +1,11 @@ -import { ActorDefinition, ProbableWaffleGameInstanceType } from "@fuzzy-waddle/api-interfaces"; -import GameObject = Phaser.GameObjects.GameObject; +import { ActorDefinition } from "@fuzzy-waddle/api-interfaces"; import { GameProbableWaffleScene } from "../scenes/GameProbableWaffleScene"; import TivaraMacemanMale from "../prefabs/characters/tivara/TivaraMacemanMale"; import Hedgehog from "../prefabs/animals/Hedgehog"; import Sheep from "../prefabs/animals/Sheep"; import { ActorManager } from "./actor-manager"; import { filter } from "rxjs"; +import GameObject = Phaser.GameObjects.GameObject; export class SaveGame { static SaveGameEvent = "SaveGameEvent"; @@ -21,7 +21,7 @@ export class SaveGame { private postCreate() { this.loadActorsFromSaveGame(); - // this.demoFillStateForSaveGame(); + this.demoPostNewActors(); } private loadActorsFromSaveGame() { if (!this.scene.baseGameData.gameInstance.gameInstanceMetadata.isStartupLoad()) return; @@ -42,13 +42,16 @@ export class SaveGame { toRemove.forEach((child) => child.destroy()); this.scene.baseGameData.gameInstance.gameState!.data.actors.forEach((actorDefinition) => { - const actor = ActorManager.createActor(this.scene, actorDefinition.name, actorDefinition); - this.scene.add.existing(actor); - // console.log("Added actor to scene on game load", actor); + this.createActorFromDefinition(actorDefinition); }); console.log("Loaded game"); } + private createActorFromDefinition(actorDefinition: ActorDefinition) { + const actor = ActorManager.createActor(this.scene, actorDefinition.name, actorDefinition); + this.scene.add.existing(actor); + } + private saveAllKnownActorsToSaveGame() { this.scene.baseGameData.gameInstance.gameState!.data.actors = []; this.scene.children.each((child) => { @@ -59,14 +62,14 @@ export class SaveGame { }); } - private demoFillStateForSaveGame() { - if (this.scene.baseGameData.gameInstance.gameInstanceMetadata.isStartupLoad()) return; - this.scene.baseGameData.gameInstance.gameState!.data.actors.push( + private demoPostNewActors() { + const actors = [ { name: TivaraMacemanMale.name, x: 544, y: 900, - z: 0 + z: 0, + owner: 1 } as ActorDefinition, // add hedgehog and sheep { @@ -81,7 +84,10 @@ export class SaveGame { y: 850, z: 0 } as ActorDefinition - ); + ]; + actors.forEach((actor) => { + this.createActorFromDefinition(actor); + }); } private destroy() { diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts index e68775e2..efb692ef 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts @@ -4,6 +4,8 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class FrostForge extends Phaser.GameObjects.Container { @@ -65,6 +67,8 @@ export default class FrostForge extends Phaser.GameObjects.Container { this.cloud_1 = cloud_1; /* START-USER-CTR-CODE */ + setActorData(this, [new OwnerComponent(this)], []); + this.setupCloudsTween(this.cloud_1); this.setupCloudsTween(this.cloud_2); this.setupCloudsTween(this.cloud_3); diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.ts index 94e43d70..eff28baf 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.ts @@ -4,6 +4,8 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class InfantryInn extends Phaser.GameObjects.Container { @@ -40,6 +42,8 @@ export default class InfantryInn extends Phaser.GameObjects.Container { this.add(skaduwee_buildings_infantry_inn_entrance); /* START-USER-CTR-CODE */ + setActorData(this, [new OwnerComponent(this)], []); + this.cloud1 = cloud_1; this.cloud2 = cloud_2; this.setupCloudsTween(this.cloud1); diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/Owlery.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/Owlery.ts index 2b98817a..7f9ca2df 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/Owlery.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/Owlery.ts @@ -8,25 +8,38 @@ import { ANIM_SKADUWEE_BUILDINGS_OWLERY_OWL, ANIM_SKADUWEE_BUILDINGS_OWLERY_OWL_FLAP } from "../../../../../../assets/probable-waffle/atlas/anims/skaduwee/buildings"; +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class Owlery extends Phaser.GameObjects.Container { + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 32, y ?? 176); - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 176); + this.setInteractive( + new Phaser.Geom.Polygon( + "-29.198913756532136 -132.13554367686658 -29.393053965807688 -151.14078501381945 -19.073855503242058 -165.58766286141133 1.0485814987609317 -172.81110178520728 21.686978423892192 -164.8137229767189 30.20031715550884 -150.36684512912703 30.45829711707298 -133.34016766589374 26.008798018194 -123.10624502212163 25.82529643447679 4.115500961156727 20.519498822728373 11.61680103293898 10.456779214239987 14.910054722989713 -8.387950234383709 15.093013261325865 -21.926882071258987 9.60425711124131 -25.22013576130973 3.749583884484423 -24.81325440994174 -123.10624502212163" + ), + Phaser.Geom.Polygon.Contains + ); - this.setInteractive(new Phaser.Geom.Polygon("-29.198913756532136 -132.13554367686658 -29.393053965807688 -151.14078501381945 -19.073855503242058 -165.58766286141133 1.0485814987609317 -172.81110178520728 21.686978423892192 -164.8137229767189 30.20031715550884 -150.36684512912703 30.45829711707298 -133.34016766589374 26.008798018194 -123.10624502212163 25.82529643447679 4.115500961156727 20.519498822728373 11.61680103293898 10.456779214239987 14.910054722989713 -8.387950234383709 15.093013261325865 -21.926882071258987 9.60425711124131 -25.22013576130973 3.749583884484423 -24.81325440994174 -123.10624502212163"), Phaser.Geom.Polygon.Contains); + // owlery_building + const owlery_building = scene.add.image(0, -80, "factions", "buildings/skaduwee/owlery/owlery.png"); + this.add(owlery_building); - // owlery_building - const owlery_building = scene.add.image(0, -80, "factions", "buildings/skaduwee/owlery/owlery.png"); - this.add(owlery_building); + // skaduwee_buildings_owlery_owl + const skaduwee_buildings_owlery_owl = scene.add.sprite( + 3, + -134, + "factions", + "buildings/skaduwee/owlery/owlery-owl/owlery-owl-0.png" + ); + skaduwee_buildings_owlery_owl.play("skaduwee-buildings-owlery-owl"); + this.add(skaduwee_buildings_owlery_owl); - // skaduwee_buildings_owlery_owl - const skaduwee_buildings_owlery_owl = scene.add.sprite(3, -134, "factions", "buildings/skaduwee/owlery/owlery-owl/owlery-owl-0.png"); - skaduwee_buildings_owlery_owl.play("skaduwee-buildings-owlery-owl"); - this.add(skaduwee_buildings_owlery_owl); + /* START-USER-CTR-CODE */ + setActorData(this, [new OwnerComponent(this)], []); - /* START-USER-CTR-CODE */ this.on("pointerdown", () => { owlery_building.setTint(0xff0000); // Tint to red // tint back to transparent after 1 second @@ -38,9 +51,9 @@ export default class Owlery extends Phaser.GameObjects.Container { this.flapRandomly(skaduwee_buildings_owlery_owl); /* END-USER-CTR-CODE */ - } + } - /* START-USER-CODE */ + /* START-USER-CODE */ private flapRandomly = (owlSprite: Phaser.GameObjects.Sprite) => { if (!this.active) return; diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.ts index 01111873..6b5c1e4c 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.ts @@ -5,6 +5,8 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { ANIM_TIVARA_BUILDINGS_ANKGUARD_FLAME_STICK } from "../../../../../../assets/probable-waffle/atlas/anims/tivara/buildings"; +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class AnkGuard extends Phaser.GameObjects.Container { @@ -68,7 +70,7 @@ export default class AnkGuard extends Phaser.GameObjects.Container { this.add(tivara_buildings_ankguard_flag); /* START-USER-CTR-CODE */ - // Write your code here. + setActorData(this, [new OwnerComponent(this)], []); // delay playing of animation for one of flame stick setTimeout(() => { diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Olival.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Olival.ts index d09a89fc..26ca28ce 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Olival.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Olival.ts @@ -5,24 +5,37 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { Vector2Simple } from "@fuzzy-waddle/api-interfaces"; +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class Olival extends Phaser.GameObjects.Container { + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 15.99154048826449, y ?? 54.535253459978904); - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 15.99154048826449, y ?? 54.535253459978904); + this.setInteractive( + new Phaser.Geom.Polygon( + "-12.788011962835393 -30.360902541923828 0.5188883965774025 -42.99403579453091 13.657346979288771 -31.70843675553525 15.004881192900193 -10.484772891155345 13.994230532691624 5.854079448883155 -14.809313283252527 5.685637672181727 -15.819963943461094 -10.484772891155345" + ), + Phaser.Geom.Polygon.Contains + ); - this.setInteractive(new Phaser.Geom.Polygon("-12.788011962835393 -30.360902541923828 0.5188883965774025 -42.99403579453091 13.657346979288771 -31.70843675553525 15.004881192900193 -10.484772891155345 13.994230532691624 5.854079448883155 -14.809313283252527 5.685637672181727 -15.819963943461094 -10.484772891155345"), Phaser.Geom.Polygon.Contains); + // buildings_tivara_olival_floor + const buildings_tivara_olival_floor = scene.add.image( + 0.008459511735509295, + 4.464746540021096, + "factions", + "buildings/tivara/olival/olival-floor.png" + ); + this.add(buildings_tivara_olival_floor); - // buildings_tivara_olival_floor - const buildings_tivara_olival_floor = scene.add.image(0.008459511735509295, 4.464746540021096, "factions", "buildings/tivara/olival/olival-floor.png"); - this.add(buildings_tivara_olival_floor); + // buildings_tivara_olival + const buildings_tivara_olival = scene.add.image(0, -22, "factions", "buildings/tivara/olival/olival.png"); + this.add(buildings_tivara_olival); - // buildings_tivara_olival - const buildings_tivara_olival = scene.add.image(0, -22, "factions", "buildings/tivara/olival/olival.png"); - this.add(buildings_tivara_olival); + /* START-USER-CTR-CODE */ + setActorData(this, [new OwnerComponent(this)], []); - /* START-USER-CTR-CODE */ this.bounce(buildings_tivara_olival); this.on("pointerdown", () => { @@ -34,9 +47,9 @@ export default class Olival extends Phaser.GameObjects.Container { this.tintTilemapAroundTransform(this.scene, { x: this.x, y: this.y }, 0x8f788f, 100); }); /* END-USER-CTR-CODE */ - } + } - /* START-USER-CODE */ + /* START-USER-CODE */ private bounce = (image: Phaser.GameObjects.Image) => { // bounce the sprite up and down forever with a 2 seconds duration this.scene.tweens.add({ diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts index f0ba518e..653e7ce6 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts @@ -7,7 +7,6 @@ import Phaser from "phaser"; import { ANIM_TIVARA_BUILDINGS_OLIVAL_SMALL } from "../../../../../../assets/probable-waffle/atlas/anims/tivara/buildings"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { setActorData } from "../../../data/actor-data"; -import { getActorComponent } from "../../../data/actor-component"; /* END-USER-IMPORTS */ export default class Sandhold extends Phaser.GameObjects.Container { @@ -30,7 +29,6 @@ export default class Sandhold extends Phaser.GameObjects.Container { /* START-USER-CTR-CODE */ setActorData(this, [new OwnerComponent(this)], []); - getActorComponent(this, OwnerComponent)?.setOwner(1); // Create a continuous hover effect for hover_crystal scene.tweens.add({ diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Temple.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Temple.ts index 36dd1dac..4e976611 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Temple.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Temple.ts @@ -4,24 +4,41 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class Temple extends Phaser.GameObjects.Container { - - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 96.3076677868738, y ?? 132.66656040978646); - - this.setInteractive(new Phaser.Geom.Polygon("-87.4233523303501 -76.75060092556245 -16.50738820893966 -110.3423734041253 -8.36392821413655 -103.21684590867258 0.11884261378335736 -107.28857590607413 10.298167607287255 -101.52029174308859 19.459560101440744 -108.98513007165812 87.32172672479999 -74.71473592686168 87.66103755791679 10.791594018571004 0.45815344690015536 53.544758991287324 -89.11990649593407 9.095039852987014"), Phaser.Geom.Polygon.Contains); - - // buildings_tivara_temple - const buildings_tivara_temple = scene.add.image(-0.30766778687379315, -36.666560409786456, "factions", "buildings/tivara/temple/temple.png"); - this.add(buildings_tivara_temple); - - // buildings_tivara_temple_temple_olival - const buildings_tivara_temple_temple_olival = scene.add.image(-2, -13, "factions", "buildings/tivara/temple/temple-olival.png"); - this.add(buildings_tivara_temple_temple_olival); - - /* START-USER-CTR-CODE */ + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 96.3076677868738, y ?? 132.66656040978646); + + this.setInteractive( + new Phaser.Geom.Polygon( + "-87.4233523303501 -76.75060092556245 -16.50738820893966 -110.3423734041253 -8.36392821413655 -103.21684590867258 0.11884261378335736 -107.28857590607413 10.298167607287255 -101.52029174308859 19.459560101440744 -108.98513007165812 87.32172672479999 -74.71473592686168 87.66103755791679 10.791594018571004 0.45815344690015536 53.544758991287324 -89.11990649593407 9.095039852987014" + ), + Phaser.Geom.Polygon.Contains + ); + + // buildings_tivara_temple + const buildings_tivara_temple = scene.add.image( + -0.30766778687379315, + -36.666560409786456, + "factions", + "buildings/tivara/temple/temple.png" + ); + this.add(buildings_tivara_temple); + + // buildings_tivara_temple_temple_olival + const buildings_tivara_temple_temple_olival = scene.add.image( + -2, + -13, + "factions", + "buildings/tivara/temple/temple-olival.png" + ); + this.add(buildings_tivara_temple_temple_olival); + + /* START-USER-CTR-CODE */ + setActorData(this, [new OwnerComponent(this)], []); this.bounce(buildings_tivara_temple_temple_olival); setTimeout(() => { @@ -36,9 +53,9 @@ export default class Temple extends Phaser.GameObjects.Container { }); /* END-USER-CTR-CODE */ - } + } - /* START-USER-CODE */ + /* START-USER-CODE */ private addGlow = (scene: Phaser.Scene, image: Phaser.GameObjects.Image) => { // https://labs.phaser.io/view.html?src=src\fx\glow\glow%20fx.js diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/WorkMill.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/WorkMill.ts index 01b0e450..aaba7243 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/WorkMill.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/WorkMill.ts @@ -4,20 +4,33 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class WorkMill extends Phaser.GameObjects.Container { + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 64, y ?? 96.29342343955079); + + this.setInteractive( + new Phaser.Geom.Polygon( + "-63.89974877636719 -65.64818497632388 -36.35219201632184 -96.09548455321611 16.32646915639647 -69.99779920159419 16.568114391133705 -48.974663779454325 41.215928334332176 -61.781861220528036 51.60667342803349 -53.80756847419912 52.33160913224522 -20.460526080460014 62.72235422594652 -9.103200047809736 60.30590187857412 0.07931887220537703 7.385595471118592 31.25155415330933 -49.64267992687003 27.62687563225073 -59.79177978583411 7.570321149059822 -58.82519884688515 -61.781861220528036" + ), + Phaser.Geom.Polygon.Contains + ); + + // buildings_tivara_workmill_png_1 + const buildings_tivara_workmill_png_1 = scene.add.image( + 0, + -32.29342343955079, + "factions", + "buildings/tivara/workmill.png" + ); + this.add(buildings_tivara_workmill_png_1); + + /* START-USER-CTR-CODE */ + setActorData(this, [new OwnerComponent(this)], []); - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 64, y ?? 96.29342343955079); - - this.setInteractive(new Phaser.Geom.Polygon("-63.89974877636719 -65.64818497632388 -36.35219201632184 -96.09548455321611 16.32646915639647 -69.99779920159419 16.568114391133705 -48.974663779454325 41.215928334332176 -61.781861220528036 51.60667342803349 -53.80756847419912 52.33160913224522 -20.460526080460014 62.72235422594652 -9.103200047809736 60.30590187857412 0.07931887220537703 7.385595471118592 31.25155415330933 -49.64267992687003 27.62687563225073 -59.79177978583411 7.570321149059822 -58.82519884688515 -61.781861220528036"), Phaser.Geom.Polygon.Contains); - - // buildings_tivara_workmill_png_1 - const buildings_tivara_workmill_png_1 = scene.add.image(0, -32.29342343955079, "factions", "buildings/tivara/workmill.png"); - this.add(buildings_tivara_workmill_png_1); - - /* START-USER-CTR-CODE */ this.on("pointerdown", () => { buildings_tivara_workmill_png_1.setTint(0xff0000); // Tint to red // tint back to transparent after 1 second @@ -27,9 +40,9 @@ export default class WorkMill extends Phaser.GameObjects.Container { }); /* END-USER-CTR-CODE */ - } + } - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/general/GeneralWarrior.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/general/GeneralWarrior.ts index 6f544807..6ff549c4 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/general/GeneralWarrior.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/general/GeneralWarrior.ts @@ -4,6 +4,8 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class GeneralWarrior extends Phaser.GameObjects.Sprite { @@ -15,6 +17,8 @@ export default class GeneralWarrior extends Phaser.GameObjects.Sprite { this.play("general_warrior_idle_down"); /* START-USER-CTR-CODE */ + setActorData(this, [new OwnerComponent(this)], []); + this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red // tint back to transparent after 1 second diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeMagicianFemale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeMagicianFemale.ts index abe7677d..6a2295b9 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeMagicianFemale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeMagicianFemale.ts @@ -4,6 +4,8 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class SkaduweeMagicianFemale extends Phaser.GameObjects.Container { @@ -18,6 +20,8 @@ export default class SkaduweeMagicianFemale extends Phaser.GameObjects.Container this.add(skaduwee_magician_female_idle_down); /* START-USER-CTR-CODE */ + setActorData(this, [new OwnerComponent(this)], []); + this.skaduwee_magician_female_idle_down = skaduwee_magician_female_idle_down; this.on("pointerdown", () => { skaduwee_magician_female_idle_down.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeRangedFemale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeRangedFemale.ts index 044bebf9..6688faa0 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeRangedFemale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeRangedFemale.ts @@ -4,7 +4,8 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ - +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class SkaduweeRangedFemale extends Phaser.GameObjects.Sprite { @@ -16,7 +17,7 @@ export default class SkaduweeRangedFemale extends Phaser.GameObjects.Sprite { this.play("skaduwee_ranged_female_idle_down"); /* START-USER-CTR-CODE */ - // Write your code here. + setActorData(this, [new OwnerComponent(this)], []); this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWarriorMale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWarriorMale.ts index d9a950d7..09a051da 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWarriorMale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWarriorMale.ts @@ -4,6 +4,8 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class SkaduweeWarriorMale extends Phaser.GameObjects.Container { @@ -18,7 +20,8 @@ export default class SkaduweeWarriorMale extends Phaser.GameObjects.Container { this.add(skaduwee_warrior_male_idle_down); /* START-USER-CTR-CODE */ - // Write your code here. + setActorData(this, [new OwnerComponent(this)], []); + this.on("pointerdown", () => { skaduwee_warrior_male_idle_down.setTint(0xff0000); // Tint to red // tint back to transparent after 1 second diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerFemale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerFemale.ts index e5a97004..d70fc02e 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerFemale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerFemale.ts @@ -4,6 +4,8 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class SkaduweeWorkerFemale extends Phaser.GameObjects.Sprite { @@ -15,6 +17,8 @@ export default class SkaduweeWorkerFemale extends Phaser.GameObjects.Sprite { this.play("skaduwee_worker_female_idle_down"); /* START-USER-CTR-CODE */ + setActorData(this, [new OwnerComponent(this)], []); + this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red // tint back to transparent after 1 second diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerMale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerMale.ts index 02e0accf..3589a2be 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerMale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerMale.ts @@ -4,6 +4,8 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class SkaduweeWorkerMale extends Phaser.GameObjects.Sprite { @@ -15,6 +17,8 @@ export default class SkaduweeWorkerMale extends Phaser.GameObjects.Sprite { this.play("skaduwee_worker_male_idle_down"); /* START-USER-CTR-CODE */ + setActorData(this, [new OwnerComponent(this)], []); + this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red // tint back to transparent after 1 second diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraMacemanMale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraMacemanMale.ts index 53b9c11a..95470140 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraMacemanMale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraMacemanMale.ts @@ -4,6 +4,8 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class TivaraMacemanMale extends Phaser.GameObjects.Container { @@ -18,6 +20,8 @@ export default class TivaraMacemanMale extends Phaser.GameObjects.Container { this.add(tivara_maceman_male_idle_down); /* START-USER-CTR-CODE */ + setActorData(this, [new OwnerComponent(this)], []); + this.on("pointerdown", () => { tivara_maceman_male_idle_down.setTint(0xff0000); // Tint to red // tint back to transparent after 1 second diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraSlingshotFemale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraSlingshotFemale.ts index f256603f..633de032 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraSlingshotFemale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraSlingshotFemale.ts @@ -4,6 +4,8 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class TivaraSlingshotFemale extends Phaser.GameObjects.Sprite { @@ -15,6 +17,8 @@ export default class TivaraSlingshotFemale extends Phaser.GameObjects.Sprite { this.play("tivara_slingshot_female_idle_down"); /* START-USER-CTR-CODE */ + setActorData(this, [new OwnerComponent(this)], []); + this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red // tint back to transparent after 1 second diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerFemale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerFemale.ts index 0653dd99..89e89c4b 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerFemale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerFemale.ts @@ -4,6 +4,8 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class TivaraWorkerFemale extends Phaser.GameObjects.Sprite { @@ -15,6 +17,8 @@ export default class TivaraWorkerFemale extends Phaser.GameObjects.Sprite { this.play("tivara_worker_female_idle_down"); /* START-USER-CTR-CODE */ + setActorData(this, [new OwnerComponent(this)], []); + this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red // tint back to transparent after 1 second diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerMale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerMale.ts index 58b4b143..3a3b75ee 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerMale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerMale.ts @@ -4,6 +4,8 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class TivaraWorkerMale extends Phaser.GameObjects.Sprite { @@ -15,6 +17,8 @@ export default class TivaraWorkerMale extends Phaser.GameObjects.Sprite { this.play("tivara_worker_male_idle_down"); /* START-USER-CTR-CODE */ + setActorData(this, [new OwnerComponent(this)], []); + this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red // tint back to transparent after 1 second diff --git a/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts b/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts index 16e2de13..9801cac4 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts @@ -6,6 +6,8 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { DepthHelper } from "../../../world/map/depth.helper"; import { throttle } from "../../../library/throttle"; +import { setActorData } from "../../../data/actor-data"; +import { OwnerComponent } from "../../../entity/actor/components/owner-component"; /* END-USER-IMPORTS */ export default class SkaduweeOwl extends Phaser.GameObjects.Container { @@ -22,6 +24,8 @@ export default class SkaduweeOwl extends Phaser.GameObjects.Container { this.owl = owl; /* START-USER-CTR-CODE */ + setActorData(this, [new OwnerComponent(this)], []); + /* END-USER-CTR-CODE */ } diff --git a/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-state.ts b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-state.ts index c0b4bbea..78d90539 100644 --- a/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-state.ts +++ b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-state.ts @@ -22,7 +22,6 @@ export interface ProbableWaffleGameStateData extends BaseData { score: number; } -export interface ActorDefinition { +export interface ActorDefinition extends Record { name: string; - [key: string]: any; // TODO } From 7f92e46ff9abeb50c38f388ad730bd5e91106a48 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Tue, 23 Jan 2024 09:57:47 +0100 Subject: [PATCH 132/138] Multi selection --- .../game/data/actor-manager.ts | 5 +- .../actor/components/selectable-component.ts | 55 ++++++++++++++++++ .../prefabs/buildings/skaduwee/FrostForge.ts | 3 +- .../prefabs/buildings/skaduwee/InfantryInn.ts | 3 +- .../game/prefabs/buildings/skaduwee/Owlery.ts | 3 +- .../game/prefabs/buildings/tivara/AnkGuard.ts | 3 +- .../game/prefabs/buildings/tivara/Olival.ts | 3 +- .../game/prefabs/buildings/tivara/Sandhold.ts | 3 +- .../game/prefabs/buildings/tivara/Temple.ts | 3 +- .../game/prefabs/buildings/tivara/WorkMill.ts | 3 +- .../characters/general/GeneralWarrior.ts | 3 +- .../skaduwee/SkaduweeMagicianFemale.ts | 3 +- .../skaduwee/SkaduweeRangedFemale.ts | 3 +- .../skaduwee/SkaduweeWarriorMale.ts | 3 +- .../skaduwee/SkaduweeWorkerFemale.ts | 3 +- .../characters/skaduwee/SkaduweeWorkerMale.ts | 3 +- .../characters/tivara/TivaraMacemanMale.ts | 3 +- .../tivara/TivaraSlingshotFemale.ts | 3 +- .../characters/tivara/TivaraWorkerFemale.ts | 3 +- .../characters/tivara/TivaraWorkerMale.ts | 3 +- .../prefabs/units/skaduwee/SkaduweeOwl.ts | 3 +- .../input/game-object-selection.handler.ts | 56 ++++++++++++++++++- .../input/multi-selection.handler.ts | 8 +-- 23 files changed, 156 insertions(+), 25 deletions(-) create mode 100644 apps/client/src/app/probable-waffle/game/entity/actor/components/selectable-component.ts diff --git a/apps/client/src/app/probable-waffle/game/data/actor-manager.ts b/apps/client/src/app/probable-waffle/game/data/actor-manager.ts index f85cc113..4c356540 100644 --- a/apps/client/src/app/probable-waffle/game/data/actor-manager.ts +++ b/apps/client/src/app/probable-waffle/game/data/actor-manager.ts @@ -33,6 +33,7 @@ import GameObject = Phaser.GameObjects.GameObject; import Transform = Phaser.GameObjects.Components.Transform; import { getActorComponent } from "./actor-component"; import { OwnerComponent } from "../entity/actor/components/owner-component"; +import { SelectableComponent } from "../entity/actor/components/selectable-component"; export type ActorConstructor = new (scene: Phaser.Scene) => GameObject; export class ActorManager { @@ -97,6 +98,8 @@ export class ActorManager { if (transform.z !== undefined) actorDefinition["z"] = transform.z; const ownerComponent = getActorComponent(actor, OwnerComponent); if (ownerComponent) actorDefinition["owner"] = ownerComponent.getOwner(); + const selectableComponent = getActorComponent(actor, SelectableComponent); + if (selectableComponent) actorDefinition["selectable"] = selectableComponent.getSelected(); return actorDefinition; } @@ -114,7 +117,7 @@ export class ActorManager { if (transform.y !== undefined) transform.y = properties.y; if (transform.z !== undefined) transform.z = properties.z; if (properties.owner) getActorComponent(actor, OwnerComponent)?.setOwner(properties.owner); - + if (properties.selectable) getActorComponent(actor, SelectableComponent)?.setSelected(properties.selectable); DepthHelper.setActorDepth(actor); return actor; } diff --git a/apps/client/src/app/probable-waffle/game/entity/actor/components/selectable-component.ts b/apps/client/src/app/probable-waffle/game/entity/actor/components/selectable-component.ts new file mode 100644 index 00000000..fa54665a --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/entity/actor/components/selectable-component.ts @@ -0,0 +1,55 @@ +import GameObject = Phaser.GameObjects.GameObject; + +export class SelectableComponent { + private selected: boolean = false; + private selectionCircle!: any; + constructor(private readonly gameObject: GameObject) { + this.createSelectionCircle(); + gameObject.once(Phaser.GameObjects.Events.DESTROY, this.destroy); + } + + private createSelectionCircle() { + const boundsComponent = this.gameObject as any as Phaser.GameObjects.Components.GetBounds; + if (boundsComponent.getBounds === undefined) return; + const bounds = boundsComponent.getBounds(); + const ellipse = new Phaser.Geom.Ellipse(0, 0, bounds.width, bounds.width / 2); + const graphics = this.gameObject.scene.add.graphics(); + graphics.lineStyle(2, 0xffffff); // todo color from player + graphics.strokeEllipseShape(ellipse); + graphics.visible = false; + this.selectionCircle = graphics; + this.gameObject.scene.add.existing(graphics); + } + setSelected(selected: boolean) { + if (this.selected === selected) return; + this.selected = selected; + this.selectionCircle.visible = selected; + if (selected) this.update(); + console.warn(`Selected set to ${selected} for ${this.gameObject.constructor.name}`); + } + + getSelected(): boolean { + return this.selected; + } + + update() { + // todo use + this.setPosition(); + this.setDepth(); + } + + private setPosition() { + const transform = this.gameObject as any as Phaser.GameObjects.Components.Transform; + if (transform.x === undefined || transform.y === undefined) return; + this.selectionCircle.setPosition(transform.x, transform.y); // todo + } + + private setDepth() { + const actorDepth = (this.gameObject as any).depth; + if (actorDepth !== undefined) this.selectionCircle.depth = actorDepth - 1; + } + + private destroy = () => { + this.selectionCircle.destroy(); + }; +} diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts index efb692ef..5f64f118 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts @@ -6,6 +6,7 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class FrostForge extends Phaser.GameObjects.Container { @@ -67,7 +68,7 @@ export default class FrostForge extends Phaser.GameObjects.Container { this.cloud_1 = cloud_1; /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); this.setupCloudsTween(this.cloud_1); this.setupCloudsTween(this.cloud_2); diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.ts index eff28baf..813d880f 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.ts @@ -6,6 +6,7 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class InfantryInn extends Phaser.GameObjects.Container { @@ -42,7 +43,7 @@ export default class InfantryInn extends Phaser.GameObjects.Container { this.add(skaduwee_buildings_infantry_inn_entrance); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); this.cloud1 = cloud_1; this.cloud2 = cloud_2; diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/Owlery.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/Owlery.ts index 7f9ca2df..865e6943 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/Owlery.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/Owlery.ts @@ -10,6 +10,7 @@ import { } from "../../../../../../assets/probable-waffle/atlas/anims/skaduwee/buildings"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class Owlery extends Phaser.GameObjects.Container { @@ -38,7 +39,7 @@ export default class Owlery extends Phaser.GameObjects.Container { this.add(skaduwee_buildings_owlery_owl); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); this.on("pointerdown", () => { owlery_building.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.ts index 6b5c1e4c..e44a95d8 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { ANIM_TIVARA_BUILDINGS_ANKGUARD_FLAME_STICK } from "../../../../../../assets/probable-waffle/atlas/anims/tivara/buildings"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class AnkGuard extends Phaser.GameObjects.Container { @@ -70,7 +71,7 @@ export default class AnkGuard extends Phaser.GameObjects.Container { this.add(tivara_buildings_ankguard_flag); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); // delay playing of animation for one of flame stick setTimeout(() => { diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Olival.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Olival.ts index 26ca28ce..562f9700 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Olival.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Olival.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { Vector2Simple } from "@fuzzy-waddle/api-interfaces"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class Olival extends Phaser.GameObjects.Container { @@ -34,7 +35,7 @@ export default class Olival extends Phaser.GameObjects.Container { this.add(buildings_tivara_olival); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); this.bounce(buildings_tivara_olival); diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts index 653e7ce6..342f1f43 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { ANIM_TIVARA_BUILDINGS_OLIVAL_SMALL } from "../../../../../../assets/probable-waffle/atlas/anims/tivara/buildings"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { setActorData } from "../../../data/actor-data"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class Sandhold extends Phaser.GameObjects.Container { @@ -28,7 +29,7 @@ export default class Sandhold extends Phaser.GameObjects.Container { /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); // Create a continuous hover effect for hover_crystal scene.tweens.add({ diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Temple.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Temple.ts index 4e976611..3dc615f3 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Temple.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Temple.ts @@ -6,6 +6,7 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class Temple extends Phaser.GameObjects.Container { @@ -38,7 +39,7 @@ export default class Temple extends Phaser.GameObjects.Container { this.add(buildings_tivara_temple_temple_olival); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); this.bounce(buildings_tivara_temple_temple_olival); setTimeout(() => { diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/WorkMill.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/WorkMill.ts index aaba7243..e00d20e6 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/WorkMill.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/WorkMill.ts @@ -6,6 +6,7 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class WorkMill extends Phaser.GameObjects.Container { @@ -29,7 +30,7 @@ export default class WorkMill extends Phaser.GameObjects.Container { this.add(buildings_tivara_workmill_png_1); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); this.on("pointerdown", () => { buildings_tivara_workmill_png_1.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/general/GeneralWarrior.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/general/GeneralWarrior.ts index 6ff549c4..6d830636 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/general/GeneralWarrior.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/general/GeneralWarrior.ts @@ -6,6 +6,7 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class GeneralWarrior extends Phaser.GameObjects.Sprite { @@ -17,7 +18,7 @@ export default class GeneralWarrior extends Phaser.GameObjects.Sprite { this.play("general_warrior_idle_down"); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeMagicianFemale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeMagicianFemale.ts index 6a2295b9..93c17b94 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeMagicianFemale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeMagicianFemale.ts @@ -6,6 +6,7 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class SkaduweeMagicianFemale extends Phaser.GameObjects.Container { @@ -20,7 +21,7 @@ export default class SkaduweeMagicianFemale extends Phaser.GameObjects.Container this.add(skaduwee_magician_female_idle_down); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); this.skaduwee_magician_female_idle_down = skaduwee_magician_female_idle_down; this.on("pointerdown", () => { diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeRangedFemale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeRangedFemale.ts index 6688faa0..b12f6a61 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeRangedFemale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeRangedFemale.ts @@ -6,6 +6,7 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class SkaduweeRangedFemale extends Phaser.GameObjects.Sprite { @@ -17,7 +18,7 @@ export default class SkaduweeRangedFemale extends Phaser.GameObjects.Sprite { this.play("skaduwee_ranged_female_idle_down"); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWarriorMale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWarriorMale.ts index 09a051da..18def4cf 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWarriorMale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWarriorMale.ts @@ -6,6 +6,7 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class SkaduweeWarriorMale extends Phaser.GameObjects.Container { @@ -20,7 +21,7 @@ export default class SkaduweeWarriorMale extends Phaser.GameObjects.Container { this.add(skaduwee_warrior_male_idle_down); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); this.on("pointerdown", () => { skaduwee_warrior_male_idle_down.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerFemale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerFemale.ts index d70fc02e..b6c066a1 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerFemale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerFemale.ts @@ -6,6 +6,7 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class SkaduweeWorkerFemale extends Phaser.GameObjects.Sprite { @@ -17,7 +18,7 @@ export default class SkaduweeWorkerFemale extends Phaser.GameObjects.Sprite { this.play("skaduwee_worker_female_idle_down"); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerMale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerMale.ts index 3589a2be..e348e9d9 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerMale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerMale.ts @@ -6,6 +6,7 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class SkaduweeWorkerMale extends Phaser.GameObjects.Sprite { @@ -17,7 +18,7 @@ export default class SkaduweeWorkerMale extends Phaser.GameObjects.Sprite { this.play("skaduwee_worker_male_idle_down"); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraMacemanMale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraMacemanMale.ts index 95470140..38906c82 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraMacemanMale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraMacemanMale.ts @@ -6,6 +6,7 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class TivaraMacemanMale extends Phaser.GameObjects.Container { @@ -20,7 +21,7 @@ export default class TivaraMacemanMale extends Phaser.GameObjects.Container { this.add(tivara_maceman_male_idle_down); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); this.on("pointerdown", () => { tivara_maceman_male_idle_down.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraSlingshotFemale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraSlingshotFemale.ts index 633de032..4498e02e 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraSlingshotFemale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraSlingshotFemale.ts @@ -6,6 +6,7 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class TivaraSlingshotFemale extends Phaser.GameObjects.Sprite { @@ -17,7 +18,7 @@ export default class TivaraSlingshotFemale extends Phaser.GameObjects.Sprite { this.play("tivara_slingshot_female_idle_down"); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerFemale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerFemale.ts index 89e89c4b..6ac28fed 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerFemale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerFemale.ts @@ -6,6 +6,7 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class TivaraWorkerFemale extends Phaser.GameObjects.Sprite { @@ -17,7 +18,7 @@ export default class TivaraWorkerFemale extends Phaser.GameObjects.Sprite { this.play("tivara_worker_female_idle_down"); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerMale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerMale.ts index 3a3b75ee..10c40e3c 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerMale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerMale.ts @@ -6,6 +6,7 @@ import Phaser from "phaser"; /* START-USER-IMPORTS */ import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class TivaraWorkerMale extends Phaser.GameObjects.Sprite { @@ -17,7 +18,7 @@ export default class TivaraWorkerMale extends Phaser.GameObjects.Sprite { this.play("tivara_worker_male_idle_down"); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts b/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts index 9801cac4..3eca465d 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts @@ -8,6 +8,7 @@ import { DepthHelper } from "../../../world/map/depth.helper"; import { throttle } from "../../../library/throttle"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; +import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; /* END-USER-IMPORTS */ export default class SkaduweeOwl extends Phaser.GameObjects.Container { @@ -24,7 +25,7 @@ export default class SkaduweeOwl extends Phaser.GameObjects.Container { this.owl = owl; /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this)], []); + setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); /* END-USER-CTR-CODE */ } diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/game-object-selection.handler.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/game-object-selection.handler.ts index 44c97e33..46219dbf 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/game-object-selection.handler.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/game-object-selection.handler.ts @@ -1,5 +1,7 @@ import { ProbableWaffleScene } from "../../../../core/probable-waffle.scene"; import { Subscription } from "rxjs"; +import { getActorComponent } from "../../../../data/actor-component"; +import { SelectableComponent } from "../../../../entity/actor/components/selectable-component"; export class GameObjectSelectionHandler { private sub!: Subscription; @@ -13,15 +15,23 @@ export class GameObjectSelectionHandler { switch (selection.type) { case "deselect": console.log("deselect"); + this.getSelectableComponents().forEach((selectable) => selectable.setSelected(false)); break; case "singleSelect": console.log("singleSelect", selection.data!.selected); + // todo find actor by name? - then they need Name component as well break; case "terrainSelect": console.log("terrainSelect", selection.data!.terrainSelected); + this.getSelectableComponents().forEach((selectable) => selectable.setSelected(false)); break; case "multiSelect": - console.log("multiSelect", selection.data!.selectedArea); + const area = selection.data!.selectedArea!; + console.log("multiSelect", area); + this.getSelectableComponents().forEach((selectable) => selectable.setSelected(false)); + this.getSelectableComponentsUnderSelectedArea(area).forEach((actor) => + getActorComponent(actor, SelectableComponent)!.setSelected(true) + ); break; case "multiSelectPreview": // not logging as it's too many log events console.log("multiSelectPreview"); @@ -32,6 +42,50 @@ export class GameObjectSelectionHandler { }); } + private getSelectableComponents() { + return this.getSelectableChildren().map((actor) => getActorComponent(actor, SelectableComponent)!); + } + + private getSelectableChildren() { + return this.scene.children.list.filter((actor) => !!getActorComponent(actor, SelectableComponent)); + } + + private getSelectableComponentsUnderSelectedArea(selectedArea: { + x: number; + y: number; + width: number; + height: number; + }) { + const selectableChildren = this.getSelectableChildren(); + + // Apply camera offset and scale + const selectedAreaBounds = new Phaser.Geom.Rectangle( + selectedArea.x * this.scene.cameras.main.zoom + this.scene.cameras.main.scrollX, + selectedArea.y * this.scene.cameras.main.zoom + this.scene.cameras.main.scrollY, + selectedArea.width * this.scene.cameras.main.zoom, + selectedArea.height * this.scene.cameras.main.zoom + ); + + return selectableChildren.filter((selectableChild) => { + const boundsComponent = selectableChild as any as Phaser.GameObjects.Components.GetBounds; + if (boundsComponent.getBounds === undefined) return false; + + const bounds = boundsComponent.getBounds(); + const actorBounds = new Phaser.Geom.Rectangle(bounds.x, bounds.y, bounds.width, bounds.height); + + // Calculate intersection rectangle + const intersection = Phaser.Geom.Rectangle.Intersection(selectedAreaBounds, actorBounds); + + // Check if more than half of actor's width and height overlap the selectedArea + const actorOverlapPercentageWidth = intersection.width / actorBounds.width; + const actorOverlapPercentageHeight = intersection.height / actorBounds.height; + + const minOverlapPercentage = 0.2; // configurable overlap percentage - this is so we don't accidentally select actors that are only slightly overlapping the selection area + + return actorOverlapPercentageWidth > minOverlapPercentage && actorOverlapPercentageHeight > minOverlapPercentage; + }); + } + private destroy() { this.sub.unsubscribe(); } diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/multi-selection.handler.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/multi-selection.handler.ts index 57788790..7ff16ebb 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/multi-selection.handler.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/multi-selection.handler.ts @@ -57,7 +57,7 @@ export class MultiSelectionHandler { private handlePointerUp(pointer: Input.Pointer) { if (!pointer.rightButtonReleased()) { - this.sendSelection(); + this.sendSelection("multiSelect"); this.hideSelectionRectangle(); } @@ -95,15 +95,15 @@ export class MultiSelectionHandler { } // use the new Rectangle to check for overlap - this.sendSelection(); + this.sendSelection("multiSelectPreview"); } - private sendSelection() { + private sendSelection(type: "multiSelectPreview" | "multiSelect") { if (!this.selectionRect) return; this.hudScene.communicator.selection!.sendLocally({ gameInstanceId: this.hudScene.gameInstanceId, emitterUserId: this.hudScene.userId, - type: "multiSelectPreview", + type, data: { selectedArea: { x: this.selectionRect.x, From a5c659f6c9e7d083d14cfefec69595140d69a91c Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Tue, 23 Jan 2024 19:22:46 +0100 Subject: [PATCH 133/138] Separating fly squasher health component --- .../fly/components/fly-health-component.ts | 86 +++++++++++++ .../fly/components/fly-health-ui-component.ts | 113 ++++++++++++++++++ .../game/fly/components/fly-health.system.ts | 6 +- .../app/fly-squasher/game/fly/fly.factory.ts | 4 +- .../src/app/fly-squasher/game/fly/fly.ts | 4 +- 5 files changed, 206 insertions(+), 7 deletions(-) create mode 100644 apps/client/src/app/fly-squasher/game/fly/components/fly-health-component.ts create mode 100644 apps/client/src/app/fly-squasher/game/fly/components/fly-health-ui-component.ts diff --git a/apps/client/src/app/fly-squasher/game/fly/components/fly-health-component.ts b/apps/client/src/app/fly-squasher/game/fly/components/fly-health-component.ts new file mode 100644 index 00000000..1c5cb489 --- /dev/null +++ b/apps/client/src/app/fly-squasher/game/fly/components/fly-health-component.ts @@ -0,0 +1,86 @@ +import { FlyHealthBarOptions, FlyHealthUiComponent } from "./fly-health-ui-component"; +import { EventEmitter } from "@angular/core"; +import { IComponent } from "../../../../probable-waffle/game/core/component.service"; +import { ActorDeathType } from "../../../../probable-waffle/game/entity/combat/actor-death-type"; +import { DamageType } from "../../../../probable-waffle/game/entity/combat/damage-type"; +import { Actor } from "../../../../probable-waffle/game/entity/actor/actor"; + +export type HealthDefinition = { + maxHealth: number; + // todo maybe armor type.. +}; + +export class FlyHealthComponent implements IComponent { + healthChanged: EventEmitter = new EventEmitter(); + private currentHealth: number; + private healthUiComponent!: FlyHealthUiComponent; + + constructor( + private readonly actor: Actor, + private readonly scene: Phaser.Scene, + public readonly healthDefinition: HealthDefinition, + private readonly barOptions: () => FlyHealthBarOptions, + regenerateHealth: boolean = false, + private regenerateHealthRate: number = 0, + private actorDeathType?: ActorDeathType, + private actorDeathSound?: string + ) { + this.currentHealth = healthDefinition.maxHealth; + } + + init() { + this.healthUiComponent = new FlyHealthUiComponent(this.actor, this.scene, this.barOptions); + } + + start() { + this.healthUiComponent.start(); + } + + update(time: number, delta: number) { + if (!this.actor.destroyed) { + this.healthUiComponent.update(time, delta); + } + } + + takeDamage(damage: number, damageType: DamageType, damageInitiator?: Actor) { + this.setCurrentHealth(this.currentHealth - damage, damageInitiator); + } + + killActor() { + this.setCurrentHealth(0); + this.healthUiComponent.destroy(); + this.actor.kill(); + // todo something else as well + } + + setCurrentHealth(newHealth: number, damageInitiator?: Actor) { + if (this.currentHealth <= 0) { + return; + } + this.currentHealth = newHealth; + this.healthChanged.emit(this.currentHealth); + if (this.currentHealth <= 0) { + this.killActor(); + } + } + + setVisibilityUiComponent(visibility: boolean) { + this.healthUiComponent.setVisibility(visibility); + } + + getCurrentHealth() { + return this.currentHealth; + } + + isAlive() { + return this.currentHealth > 0; + } + + resetHealth() { + this.setCurrentHealth(this.healthDefinition.maxHealth); + } + + destroy() { + this.healthUiComponent.destroy(); + } +} diff --git a/apps/client/src/app/fly-squasher/game/fly/components/fly-health-ui-component.ts b/apps/client/src/app/fly-squasher/game/fly/components/fly-health-ui-component.ts new file mode 100644 index 00000000..ff4f0938 --- /dev/null +++ b/apps/client/src/app/fly-squasher/game/fly/components/fly-health-ui-component.ts @@ -0,0 +1,113 @@ +import { GameObjects } from "phaser"; +import { FlyHealthComponent } from "./fly-health-component"; +import { IComponent } from "../../../../probable-waffle/game/core/component.service"; +import { Actor } from "../../../../probable-waffle/game/entity/actor/actor"; + +export type FlyHealthBarOptions = { + spriteDepth: number; + spriteWidth: number; + spriteHeight: number; + spriteObjectCenterX: number; + spriteObjectCenterY: number; +}; + +export class FlyHealthUiComponent implements IComponent { + private healthComponent!: FlyHealthComponent; + private bar!: GameObjects.Graphics; + private barWidth = 25; + private barHeight = 8; + private barBorder = 2; + + private redThreshold = 0.3; + private orangeThreshold = 0.5; + private yellowThreshold = 0.7; + + constructor( + private readonly actor: Actor, + private readonly scene: Phaser.Scene, + private readonly barOptions: () => FlyHealthBarOptions + ) {} + + private get healthPercentage() { + return this.healthComponent.getCurrentHealth() / this.healthComponent.healthDefinition.maxHealth; + } + + private get barXY() { + if (!this.bar) { + throw new Error("Bar not initialized"); + } + + // set this health-bar to be above the player center horizontally + // get gameObject width + const options = this.barOptions(); + + // set bar x to be half of gameObject width + const x = options.spriteObjectCenterX - this.barWidth / 2; + + return [x, options.spriteObjectCenterY - options.spriteHeight / 2]; + } + + private get barDepth() { + // set depth to be above player + return this.barOptions().spriteDepth + 1; + } + + start() { + this.healthComponent = this.actor.components.findComponent(FlyHealthComponent); + this.bar = this.scene.add.graphics(); + } + + /** + * move bar with player + */ + update(time: number, delta: number) { + this.draw(); + this.bar.depth = this.barDepth; + } + + destroy() { + this.bar.destroy(); + } + + private draw() { + if (!this.bar) { + return; + } + + this.bar.clear(); + + const [x, y] = this.barXY; + + // BG + this.bar.fillStyle(0x000000); + this.bar.fillRect(x, y, this.barWidth, this.barHeight); + + // Health + + this.bar.fillStyle(0xffffff); + this.bar.fillRect( + x + this.barBorder, + y + this.barBorder, + this.barWidth - 2 * this.barBorder, + this.barHeight - 2 * this.barBorder + ); + + if (this.healthPercentage < this.redThreshold) { + this.bar.fillStyle(0xff0000); + } else if (this.healthPercentage < this.orangeThreshold) { + this.bar.fillStyle(0xffa500); + } else if (this.healthPercentage < this.yellowThreshold) { + this.bar.fillStyle(0xffff00); + } else { + this.bar.fillStyle(0x00ff00); + } + + const barFilledWidth = Math.floor((this.barWidth - 2 * this.barBorder) * this.healthPercentage); + + this.bar.fillRect(x + this.barBorder, y + this.barBorder, barFilledWidth, this.barHeight - 2 * this.barBorder); + } + + setVisibility(visibility: boolean) { + this.bar.setVisible(visibility); + } +} diff --git a/apps/client/src/app/fly-squasher/game/fly/components/fly-health.system.ts b/apps/client/src/app/fly-squasher/game/fly/components/fly-health.system.ts index f7f93ca7..984a527c 100644 --- a/apps/client/src/app/fly-squasher/game/fly/components/fly-health.system.ts +++ b/apps/client/src/app/fly-squasher/game/fly/components/fly-health.system.ts @@ -3,7 +3,7 @@ import { FlyRepresentableComponent } from "./fly-representable-component"; import { Subject, Subscription } from "rxjs"; import { FlyMovementComponent } from "./fly-movement-component"; import { FlySoundComponent } from "./fly-sound-component"; -import { HealthComponent } from "../../../../probable-waffle/game/entity/combat/components/health-component"; +import { FlyHealthComponent } from "./fly-health-component"; import { Fly } from "../fly"; import { DamageTypes } from "../../../../probable-waffle/game/entity/combat/damage-types"; @@ -13,7 +13,7 @@ export class FlyHealthSystem implements IComponent { private flyRepresentableComponent!: FlyRepresentableComponent; private flyMovementComponent!: FlyMovementComponent; private flySoundComponent!: FlySoundComponent; - private healthComponent!: HealthComponent; + private healthComponent!: FlyHealthComponent; constructor(private readonly fly: Fly) {} @@ -21,7 +21,7 @@ export class FlyHealthSystem implements IComponent { this.flyRepresentableComponent = this.fly.components.findComponent(FlyRepresentableComponent); this.flyMovementComponent = this.fly.components.findComponent(FlyMovementComponent); this.flySoundComponent = this.fly.components.findComponent(FlySoundComponent); - this.healthComponent = this.fly.components.findComponent(HealthComponent); + this.healthComponent = this.fly.components.findComponent(FlyHealthComponent); this.flyPrefabPointerHitSubscription = this.flyRepresentableComponent.pointerDown.subscribe(this.flyHit); } diff --git a/apps/client/src/app/fly-squasher/game/fly/fly.factory.ts b/apps/client/src/app/fly-squasher/game/fly/fly.factory.ts index 1dfed3f0..dbbbfcdc 100644 --- a/apps/client/src/app/fly-squasher/game/fly/fly.factory.ts +++ b/apps/client/src/app/fly-squasher/game/fly/fly.factory.ts @@ -1,6 +1,6 @@ import { BaseScene } from "../../../shared/game/phaser/scene/base.scene"; import { Fly } from "./fly"; -import { HealthComponent } from "../../../probable-waffle/game/entity/combat/components/health-component"; +import { FlyHealthComponent } from "./components/fly-health-component"; import { WorldSpeedState } from "./components/fly-movement-component"; import { FlySquasherAudio } from "../audio"; @@ -8,7 +8,7 @@ export class FlyFactory { static spawnFly(scene: BaseScene, worldSpeedState: WorldSpeedState, audio: FlySquasherAudio): Fly { const fly = new Fly(scene, worldSpeedState, audio); fly.registerGameObject(); - fly.components.findComponent(HealthComponent).setVisibilityUiComponent(false); + fly.components.findComponent(FlyHealthComponent).setVisibilityUiComponent(false); return fly; } diff --git a/apps/client/src/app/fly-squasher/game/fly/fly.ts b/apps/client/src/app/fly-squasher/game/fly/fly.ts index ffc42db4..92a0e1f6 100644 --- a/apps/client/src/app/fly-squasher/game/fly/fly.ts +++ b/apps/client/src/app/fly-squasher/game/fly/fly.ts @@ -5,7 +5,7 @@ import { FlySoundComponent } from "./components/fly-sound-component"; import { FlyMovementComponent, WorldSpeedState } from "./components/fly-movement-component"; import { FlyHealthSystem } from "./components/fly-health.system"; import { FlyRepresentableComponent } from "./components/fly-representable-component"; -import { HealthComponent } from "../../../probable-waffle/game/entity/combat/components/health-component"; +import { FlyHealthComponent } from "./components/fly-health-component"; import { FlySquasherAudio } from "../audio"; export type FlyOptions = { @@ -39,7 +39,7 @@ export class Fly extends Actor { new FlyRepresentableComponent(this, scene, actorOptions) ); this.components.addComponent( - new HealthComponent(this, scene, { maxHealth: this.maxHealth }, this.healthBarOptions) + new FlyHealthComponent(this, scene, { maxHealth: this.maxHealth }, this.healthBarOptions) ); this.flyHealthSystem = this.components.addComponent(new FlyHealthSystem(this)); // todo add system? From 7fe290345a1eb0aa240673317bb69574e680249b Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Tue, 23 Jan 2024 20:23:29 +0100 Subject: [PATCH 134/138] Health component --- .../game/data/game-object-helper.ts | 11 ++ .../actor/components/selectable-component.ts | 10 +- .../combat/components/health-component.ts | 61 ++++---- .../combat/components/health-ui-component.ts | 136 ++++++++++++------ .../prefabs/buildings/skaduwee/FrostForge.ts | 13 +- .../prefabs/buildings/skaduwee/InfantryInn.ts | 13 +- .../game/prefabs/buildings/skaduwee/Owlery.ts | 13 +- .../game/prefabs/buildings/tivara/AnkGuard.ts | 13 +- .../game/prefabs/buildings/tivara/Olival.ts | 13 +- .../game/prefabs/buildings/tivara/Sandhold.ts | 14 +- .../game/prefabs/buildings/tivara/Temple.ts | 13 +- .../game/prefabs/buildings/tivara/WorkMill.ts | 13 +- .../characters/general/GeneralWarrior.ts | 13 +- .../skaduwee/SkaduweeMagicianFemale.ts | 13 +- .../skaduwee/SkaduweeRangedFemale.ts | 13 +- .../skaduwee/SkaduweeWarriorMale.ts | 13 +- .../skaduwee/SkaduweeWorkerFemale.ts | 13 +- .../characters/skaduwee/SkaduweeWorkerMale.ts | 13 +- .../characters/tivara/TivaraMacemanMale.ts | 13 +- .../tivara/TivaraSlingshotFemale.ts | 13 +- .../characters/tivara/TivaraWorkerFemale.ts | 13 +- .../characters/tivara/TivaraWorkerMale.ts | 13 +- .../prefabs/units/skaduwee/SkaduweeOwl.ts | 13 +- .../input/game-object-selection.handler.ts | 7 +- 24 files changed, 368 insertions(+), 105 deletions(-) create mode 100644 apps/client/src/app/probable-waffle/game/data/game-object-helper.ts diff --git a/apps/client/src/app/probable-waffle/game/data/game-object-helper.ts b/apps/client/src/app/probable-waffle/game/data/game-object-helper.ts new file mode 100644 index 00000000..1851ea77 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/data/game-object-helper.ts @@ -0,0 +1,11 @@ +export function getGameObjectBounds(gameObject: Phaser.GameObjects.GameObject): Phaser.Geom.Rectangle | null { + const boundsComponent = gameObject as any as Phaser.GameObjects.Components.GetBounds; + if (boundsComponent.getBounds === undefined) return null; + return boundsComponent.getBounds(); +} + +export function getGameObjectDepth(gameObject: Phaser.GameObjects.GameObject): number | null { + const depthComponent = gameObject as any as Phaser.GameObjects.Components.Depth; + if (depthComponent.depth === undefined) return null; + return depthComponent.depth; +} diff --git a/apps/client/src/app/probable-waffle/game/entity/actor/components/selectable-component.ts b/apps/client/src/app/probable-waffle/game/entity/actor/components/selectable-component.ts index fa54665a..04932d20 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/components/selectable-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/actor/components/selectable-component.ts @@ -1,4 +1,5 @@ import GameObject = Phaser.GameObjects.GameObject; +import { getGameObjectBounds, getGameObjectDepth } from "../../../data/game-object-helper"; export class SelectableComponent { private selected: boolean = false; @@ -9,9 +10,8 @@ export class SelectableComponent { } private createSelectionCircle() { - const boundsComponent = this.gameObject as any as Phaser.GameObjects.Components.GetBounds; - if (boundsComponent.getBounds === undefined) return; - const bounds = boundsComponent.getBounds(); + const bounds = getGameObjectBounds(this.gameObject); + if (!bounds) return; const ellipse = new Phaser.Geom.Ellipse(0, 0, bounds.width, bounds.width / 2); const graphics = this.gameObject.scene.add.graphics(); graphics.lineStyle(2, 0xffffff); // todo color from player @@ -45,8 +45,8 @@ export class SelectableComponent { } private setDepth() { - const actorDepth = (this.gameObject as any).depth; - if (actorDepth !== undefined) this.selectionCircle.depth = actorDepth - 1; + const gameObjectDepth = getGameObjectDepth(this.gameObject); + if (gameObjectDepth !== null) this.selectionCircle.depth = gameObjectDepth - 1; } private destroy = () => { diff --git a/apps/client/src/app/probable-waffle/game/entity/combat/components/health-component.ts b/apps/client/src/app/probable-waffle/game/entity/combat/components/health-component.ts index 9eba0ba6..c7d12faf 100644 --- a/apps/client/src/app/probable-waffle/game/entity/combat/components/health-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/combat/components/health-component.ts @@ -1,59 +1,48 @@ -import { IComponent } from "../../../core/component.service"; -import { Actor } from "../../actor/actor"; import { DamageType } from "../damage-type"; import { EventEmitter } from "@angular/core"; -import { ActorDeathType } from "../actor-death-type"; -import { HealthBarOptions, HealthUiComponent } from "./health-ui-component"; +import { HealthUiComponent } from "./health-ui-component"; export type HealthDefinition = { maxHealth: number; + maxArmor?: number; + regenerateHealthRate?: number; + // todo maybe armor type.. }; -export class HealthComponent implements IComponent { +export class HealthComponent { healthChanged: EventEmitter = new EventEmitter(); + armorChanged: EventEmitter = new EventEmitter(); private currentHealth: number; + private currentArmor: number; private healthUiComponent!: HealthUiComponent; + private armorUiComponent?: HealthUiComponent; constructor( - private readonly actor: Actor, - private readonly scene: Phaser.Scene, - public readonly healthDefinition: HealthDefinition, - private readonly barOptions: () => HealthBarOptions, - regenerateHealth: boolean = false, - private regenerateHealthRate: number = 0, - private actorDeathType?: ActorDeathType, - private actorDeathSound?: string + private readonly gameObject: Phaser.GameObjects.GameObject, + public readonly healthDefinition: HealthDefinition ) { this.currentHealth = healthDefinition.maxHealth; - } - - init() { - this.healthUiComponent = new HealthUiComponent(this.actor, this.scene, this.barOptions); - } - - start() { - this.healthUiComponent.start(); - } - - update(time: number, delta: number) { - if (!this.actor.destroyed) { - this.healthUiComponent.update(time, delta); + this.currentArmor = healthDefinition.maxArmor ?? 0; + this.healthUiComponent = new HealthUiComponent(this.gameObject, "health"); + if (healthDefinition.maxArmor) { + this.armorUiComponent = new HealthUiComponent(this.gameObject, "armor"); } } - takeDamage(damage: number, damageType: DamageType, damageInitiator?: Actor) { + takeDamage(damage: number, damageType: DamageType, damageInitiator?: Phaser.GameObjects.GameObject) { this.setCurrentHealth(this.currentHealth - damage, damageInitiator); } killActor() { this.setCurrentHealth(0); this.healthUiComponent.destroy(); - this.actor.kill(); + this.armorUiComponent?.destroy(); + this.gameObject.destroy(); // todo kill? // todo something else as well } - setCurrentHealth(newHealth: number, damageInitiator?: Actor) { + setCurrentHealth(newHealth: number, damageInitiator?: Phaser.GameObjects.GameObject) { if (this.currentHealth <= 0) { return; } @@ -66,6 +55,7 @@ export class HealthComponent implements IComponent { setVisibilityUiComponent(visibility: boolean) { this.healthUiComponent.setVisibility(visibility); + this.armorUiComponent?.setVisibility(visibility); } getCurrentHealth() { @@ -80,7 +70,16 @@ export class HealthComponent implements IComponent { this.setCurrentHealth(this.healthDefinition.maxHealth); } - destroy() { - this.healthUiComponent.destroy(); + getCurrentArmor() { + return this.currentArmor; + } + + resetArmor() { + this.setCurrentArmor(this.healthDefinition.maxArmor ?? 0); + } + + setCurrentArmor(newArmor: number) { + this.currentArmor = newArmor; + this.armorChanged.emit(this.currentArmor); } } diff --git a/apps/client/src/app/probable-waffle/game/entity/combat/components/health-ui-component.ts b/apps/client/src/app/probable-waffle/game/entity/combat/components/health-ui-component.ts index 9799e784..133f2ff2 100644 --- a/apps/client/src/app/probable-waffle/game/entity/combat/components/health-ui-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/combat/components/health-ui-component.ts @@ -1,19 +1,12 @@ import { GameObjects } from "phaser"; -import { IComponent } from "../../../core/component.service"; -import { Actor } from "../../actor/actor"; import { HealthComponent } from "./health-component"; +import { getActorComponent } from "../../../data/actor-component"; +import { Subscription } from "rxjs"; +import { getGameObjectBounds, getGameObjectDepth } from "../../../data/game-object-helper"; -export type HealthBarOptions = { - spriteDepth: number; - spriteWidth: number; - spriteHeight: number; - spriteObjectCenterX: number; - spriteObjectCenterY: number; -}; - -export class HealthUiComponent implements IComponent { - private healthComponent!: HealthComponent; - private bar!: GameObjects.Graphics; +export class HealthUiComponent { + private healthComponent?: HealthComponent; + private readonly bar: GameObjects.Graphics; private barWidth = 25; private barHeight = 8; private barBorder = 2; @@ -21,59 +14,99 @@ export class HealthUiComponent implements IComponent { private redThreshold = 0.3; private orangeThreshold = 0.5; private yellowThreshold = 0.7; + private changedSubscription?: Subscription; + + private readonly healthColors = { + red: 0xff0000, + orange: 0xffa500, + yellow: 0xffff00, + green: 0x00ff00 + }; + + private readonly armorColors = { + // more white-ish colors + red: 0xff0000, + orange: 0xffa500, + yellow: 0xffff00, + green: 0xffffff + }; constructor( - private readonly actor: Actor, - private readonly scene: Phaser.Scene, - private readonly barOptions: () => HealthBarOptions - ) {} + private readonly gameObject: Phaser.GameObjects.GameObject, + private readonly type: "health" | "armor" + ) { + this.bar = this.gameObject.scene.add.graphics(); + gameObject.once(Phaser.GameObjects.Events.DESTROY, this.destroy, this); + gameObject.once(Phaser.GameObjects.Events.ADDED_TO_SCENE, this.init, this); + } + + private init() { + this.healthComponent = getActorComponent(this.gameObject, HealthComponent)!; + switch (this.type) { + case "health": + this.changedSubscription = this.healthComponent.healthChanged.subscribe(() => this.draw()); + break; + case "armor": + this.changedSubscription = this.healthComponent.armorChanged.subscribe(() => this.draw()); + break; + } + + //bar width should be 50% of gameObject width or min 25px + const bounds = getGameObjectBounds(this.gameObject); + if (bounds) { + this.barWidth = Math.max(Math.round(bounds.width / 3), 25); + } - private get healthPercentage() { - return this.healthComponent.getCurrentHealth() / this.healthComponent.healthDefinition.maxHealth; + this.draw(); } - private get barXY() { - if (!this.bar) { - throw new Error("Bar not initialized"); + private get percentage() { + if (!this.healthComponent) return 0; + switch (this.type) { + case "health": + return this.healthComponent.getCurrentHealth() / this.healthComponent.healthDefinition.maxHealth; + case "armor": + return this.healthComponent.getCurrentArmor() / this.healthComponent.healthDefinition.maxArmor!; } + } + + private get barXY() { + const bounds = getGameObjectBounds(this.gameObject); + if (!bounds) return [0, 0]; // set this health-bar to be above the player center horizontally - // get gameObject width - const options = this.barOptions(); // set bar x to be half of gameObject width - const x = options.spriteObjectCenterX - this.barWidth / 2; + const x = bounds.centerX - this.barWidth / 2; + let y = bounds.centerY - bounds.height / 2; + if (this.type === "armor") { + y += this.barHeight - this.barBorder; + } - return [x, options.spriteObjectCenterY - options.spriteHeight / 2]; + return [x, y]; } private get barDepth() { // set depth to be above player - return this.barOptions().spriteDepth + 1; - } - - start() { - this.healthComponent = this.actor.components.findComponent(HealthComponent); - this.bar = this.scene.add.graphics(); + return (getGameObjectDepth(this.gameObject) ?? 0) + 1; } /** * move bar with player + * todo - listen to some event instead of updating every frame */ - update(time: number, delta: number) { - this.draw(); + update() { this.bar.depth = this.barDepth; + const [x, y] = this.barXY; + this.bar.setPosition(x, y); } destroy() { this.bar.destroy(); + this.changedSubscription?.unsubscribe(); } private draw() { - if (!this.bar) { - return; - } - this.bar.clear(); const [x, y] = this.barXY; @@ -92,22 +125,33 @@ export class HealthUiComponent implements IComponent { this.barHeight - 2 * this.barBorder ); - if (this.healthPercentage < this.redThreshold) { - this.bar.fillStyle(0xff0000); - } else if (this.healthPercentage < this.orangeThreshold) { - this.bar.fillStyle(0xffa500); - } else if (this.healthPercentage < this.yellowThreshold) { - this.bar.fillStyle(0xffff00); + let colors; + switch (this.type) { + case "health": + colors = this.healthColors; + break; + case "armor": + colors = this.armorColors; + break; + } + + if (this.percentage < this.redThreshold) { + this.bar.fillStyle(colors.red); + } else if (this.percentage < this.orangeThreshold) { + this.bar.fillStyle(colors.orange); + } else if (this.percentage < this.yellowThreshold) { + this.bar.fillStyle(colors.yellow); } else { - this.bar.fillStyle(0x00ff00); + this.bar.fillStyle(colors.green); } - const barFilledWidth = Math.floor((this.barWidth - 2 * this.barBorder) * this.healthPercentage); + const barFilledWidth = Math.floor((this.barWidth - 2 * this.barBorder) * this.percentage); this.bar.fillRect(x + this.barBorder, y + this.barBorder, barFilledWidth, this.barHeight - 2 * this.barBorder); } setVisibility(visibility: boolean) { this.bar.setVisible(visibility); + this.draw(); } } diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts index 5f64f118..a6ce1d89 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class FrostForge extends Phaser.GameObjects.Container { @@ -68,7 +69,17 @@ export default class FrostForge extends Phaser.GameObjects.Container { this.cloud_1 = cloud_1; /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); this.setupCloudsTween(this.cloud_1); this.setupCloudsTween(this.cloud_2); diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.ts index 813d880f..e4e7517c 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class InfantryInn extends Phaser.GameObjects.Container { @@ -43,7 +44,17 @@ export default class InfantryInn extends Phaser.GameObjects.Container { this.add(skaduwee_buildings_infantry_inn_entrance); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); this.cloud1 = cloud_1; this.cloud2 = cloud_2; diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/Owlery.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/Owlery.ts index 865e6943..799caef9 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/Owlery.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/Owlery.ts @@ -11,6 +11,7 @@ import { import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class Owlery extends Phaser.GameObjects.Container { @@ -39,7 +40,17 @@ export default class Owlery extends Phaser.GameObjects.Container { this.add(skaduwee_buildings_owlery_owl); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); this.on("pointerdown", () => { owlery_building.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.ts index e44a95d8..4c61af81 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.ts @@ -8,6 +8,7 @@ import { ANIM_TIVARA_BUILDINGS_ANKGUARD_FLAME_STICK } from "../../../../../../as import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class AnkGuard extends Phaser.GameObjects.Container { @@ -71,7 +72,17 @@ export default class AnkGuard extends Phaser.GameObjects.Container { this.add(tivara_buildings_ankguard_flag); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); // delay playing of animation for one of flame stick setTimeout(() => { diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Olival.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Olival.ts index 562f9700..312b6f0b 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Olival.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Olival.ts @@ -8,6 +8,7 @@ import { Vector2Simple } from "@fuzzy-waddle/api-interfaces"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class Olival extends Phaser.GameObjects.Container { @@ -35,7 +36,17 @@ export default class Olival extends Phaser.GameObjects.Container { this.add(buildings_tivara_olival); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); this.bounce(buildings_tivara_olival); diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts index 342f1f43..087f1584 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.ts @@ -8,6 +8,7 @@ import { ANIM_TIVARA_BUILDINGS_OLIVAL_SMALL } from "../../../../../../assets/pro import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { setActorData } from "../../../data/actor-data"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class Sandhold extends Phaser.GameObjects.Container { @@ -29,7 +30,18 @@ export default class Sandhold extends Phaser.GameObjects.Container { /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100, + maxArmor: 50 + } satisfies HealthDefinition) + ], + [] + ); // Create a continuous hover effect for hover_crystal scene.tweens.add({ diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Temple.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Temple.ts index 3dc615f3..e862ea0b 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Temple.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Temple.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class Temple extends Phaser.GameObjects.Container { @@ -39,7 +40,17 @@ export default class Temple extends Phaser.GameObjects.Container { this.add(buildings_tivara_temple_temple_olival); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); this.bounce(buildings_tivara_temple_temple_olival); setTimeout(() => { diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/WorkMill.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/WorkMill.ts index e00d20e6..99b82396 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/WorkMill.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/WorkMill.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class WorkMill extends Phaser.GameObjects.Container { @@ -30,7 +31,17 @@ export default class WorkMill extends Phaser.GameObjects.Container { this.add(buildings_tivara_workmill_png_1); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); this.on("pointerdown", () => { buildings_tivara_workmill_png_1.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/general/GeneralWarrior.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/general/GeneralWarrior.ts index 6d830636..6e1be201 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/general/GeneralWarrior.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/general/GeneralWarrior.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class GeneralWarrior extends Phaser.GameObjects.Sprite { @@ -18,7 +19,17 @@ export default class GeneralWarrior extends Phaser.GameObjects.Sprite { this.play("general_warrior_idle_down"); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeMagicianFemale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeMagicianFemale.ts index 93c17b94..88977750 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeMagicianFemale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeMagicianFemale.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class SkaduweeMagicianFemale extends Phaser.GameObjects.Container { @@ -21,7 +22,17 @@ export default class SkaduweeMagicianFemale extends Phaser.GameObjects.Container this.add(skaduwee_magician_female_idle_down); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); this.skaduwee_magician_female_idle_down = skaduwee_magician_female_idle_down; this.on("pointerdown", () => { diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeRangedFemale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeRangedFemale.ts index b12f6a61..1608930c 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeRangedFemale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeRangedFemale.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class SkaduweeRangedFemale extends Phaser.GameObjects.Sprite { @@ -18,7 +19,17 @@ export default class SkaduweeRangedFemale extends Phaser.GameObjects.Sprite { this.play("skaduwee_ranged_female_idle_down"); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWarriorMale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWarriorMale.ts index 18def4cf..2c21e48b 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWarriorMale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWarriorMale.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class SkaduweeWarriorMale extends Phaser.GameObjects.Container { @@ -21,7 +22,17 @@ export default class SkaduweeWarriorMale extends Phaser.GameObjects.Container { this.add(skaduwee_warrior_male_idle_down); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); this.on("pointerdown", () => { skaduwee_warrior_male_idle_down.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerFemale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerFemale.ts index b6c066a1..14df5561 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerFemale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerFemale.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class SkaduweeWorkerFemale extends Phaser.GameObjects.Sprite { @@ -18,7 +19,17 @@ export default class SkaduweeWorkerFemale extends Phaser.GameObjects.Sprite { this.play("skaduwee_worker_female_idle_down"); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerMale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerMale.ts index e348e9d9..8105c527 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerMale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/skaduwee/SkaduweeWorkerMale.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class SkaduweeWorkerMale extends Phaser.GameObjects.Sprite { @@ -18,7 +19,17 @@ export default class SkaduweeWorkerMale extends Phaser.GameObjects.Sprite { this.play("skaduwee_worker_male_idle_down"); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraMacemanMale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraMacemanMale.ts index 38906c82..f8fee7eb 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraMacemanMale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraMacemanMale.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class TivaraMacemanMale extends Phaser.GameObjects.Container { @@ -21,7 +22,17 @@ export default class TivaraMacemanMale extends Phaser.GameObjects.Container { this.add(tivara_maceman_male_idle_down); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); this.on("pointerdown", () => { tivara_maceman_male_idle_down.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraSlingshotFemale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraSlingshotFemale.ts index 4498e02e..dd1a95ba 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraSlingshotFemale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraSlingshotFemale.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class TivaraSlingshotFemale extends Phaser.GameObjects.Sprite { @@ -18,7 +19,17 @@ export default class TivaraSlingshotFemale extends Phaser.GameObjects.Sprite { this.play("tivara_slingshot_female_idle_down"); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerFemale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerFemale.ts index 6ac28fed..66d196e0 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerFemale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerFemale.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class TivaraWorkerFemale extends Phaser.GameObjects.Sprite { @@ -18,7 +19,17 @@ export default class TivaraWorkerFemale extends Phaser.GameObjects.Sprite { this.play("tivara_worker_female_idle_down"); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerMale.ts b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerMale.ts index 10c40e3c..6ed53982 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerMale.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/characters/tivara/TivaraWorkerMale.ts @@ -7,6 +7,7 @@ import Phaser from "phaser"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class TivaraWorkerMale extends Phaser.GameObjects.Sprite { @@ -18,7 +19,17 @@ export default class TivaraWorkerMale extends Phaser.GameObjects.Sprite { this.play("tivara_worker_male_idle_down"); /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); this.on("pointerdown", () => { this.setTint(0xff0000); // Tint to red diff --git a/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts b/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts index 3eca465d..5e04877b 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts @@ -9,6 +9,7 @@ import { throttle } from "../../../library/throttle"; import { setActorData } from "../../../data/actor-data"; import { OwnerComponent } from "../../../entity/actor/components/owner-component"; import { SelectableComponent } from "../../../entity/actor/components/selectable-component"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class SkaduweeOwl extends Phaser.GameObjects.Container { @@ -25,7 +26,17 @@ export default class SkaduweeOwl extends Phaser.GameObjects.Container { this.owl = owl; /* START-USER-CTR-CODE */ - setActorData(this, [new OwnerComponent(this), new SelectableComponent(this)], []); + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); /* END-USER-CTR-CODE */ } diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/game-object-selection.handler.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/game-object-selection.handler.ts index 46219dbf..55f51ecb 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/game-object-selection.handler.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/game-object-selection.handler.ts @@ -2,6 +2,7 @@ import { ProbableWaffleScene } from "../../../../core/probable-waffle.scene"; import { Subscription } from "rxjs"; import { getActorComponent } from "../../../../data/actor-component"; import { SelectableComponent } from "../../../../entity/actor/components/selectable-component"; +import { getGameObjectBounds } from "../../../../data/game-object-helper"; export class GameObjectSelectionHandler { private sub!: Subscription; @@ -67,10 +68,8 @@ export class GameObjectSelectionHandler { ); return selectableChildren.filter((selectableChild) => { - const boundsComponent = selectableChild as any as Phaser.GameObjects.Components.GetBounds; - if (boundsComponent.getBounds === undefined) return false; - - const bounds = boundsComponent.getBounds(); + const bounds = getGameObjectBounds(selectableChild); + if (!bounds) return false; const actorBounds = new Phaser.Geom.Rectangle(bounds.x, bounds.y, bounds.width, bounds.height); // Calculate intersection rectangle From 9089a7c3cb2511ee5a9a379d903e0431eab74a3b Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Sun, 28 Jan 2024 09:11:27 +0100 Subject: [PATCH 135/138] 58 - bleeding tiles fixes --- .../input/cameraMovementHandler.ts | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/cameraMovementHandler.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/cameraMovementHandler.ts index 61347e2a..b71d1334 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/cameraMovementHandler.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/cameraMovementHandler.ts @@ -27,7 +27,6 @@ export class CameraMovementHandler { this.input = scene.input; this.createKeyboardControls(); this.zoomListener(); - this.zoomToDefault(); this.screenEdgeListener(); this.lockCursorToScreen(); this.scene.events.on("update", this.update, this); @@ -116,33 +115,44 @@ export class CameraMovementHandler { deltaZ: number ) { if (deltaY > 0) { - this.zoomOutByFactor(); + this.zoomOut(); } if (deltaY < 0) { - // zoom in - const newZoom = this.mainCamera.zoom + this.cameraZoomFactor; - if (newZoom < this.cameraMinZoom) { - this.mainCamera.zoom = newZoom; - } + this.zoomIn(); } } - /** - * @returns {boolean} true if camera is zoomed out - */ - private zoomOutByFactor(): boolean { - const newZoom = this.mainCamera.zoom - this.cameraZoomFactor; - if (newZoom > this.cameraMaxZoom) { - this.mainCamera.zoom = newZoom; + private zoomIn(): void { + const newZoom = this.mainCamera.zoom * 2; + const validZoom = this.findNearestValidZoom(newZoom); + + if (validZoom <= this.cameraMinZoom) { + this.mainCamera.zoom = validZoom; } + } + + private zoomOut(): void { + const newZoom = this.mainCamera.zoom * 0.5; + const validZoom = this.findNearestValidZoom(newZoom); + if (validZoom >= this.cameraMaxZoom) { + this.mainCamera.zoom = validZoom; + } if (this.isCameraOutOfBounds) { - // if out of bounds, zoom back in - this.mainCamera.zoom += this.cameraZoomFactor; - return false; + this.zoomIn(); + } + } + + private findNearestValidZoom(zoom: number): number { + const powersOfTwo = [0.5, 1, 2, 4, 8]; + let nearest = powersOfTwo[0]; + for (const power of powersOfTwo) { + if (Math.abs(zoom - power) < Math.abs(zoom - nearest)) { + nearest = power; + } } - return true; + return nearest; } /** @@ -187,16 +197,6 @@ export class CameraMovementHandler { }); } - /** - * Zooms to recommended zoom. It ensures that camera doesn't go out of bounds - */ - private zoomToDefault() { - this.mainCamera.setZoom(this.cameraMinZoom); - while (this.mainCamera.zoom > this.recommendedZoom && this.zoomOutByFactor()) { - // zoom out until camera is out of bounds or we reached recommended zoom - } - } - /** * https://phaser.io/examples/v3/view/input/mouse/pointer-lock * https://web.dev/articles/pointerlock-intro From ee1ec838c9e971433b38e029939fb7e87f164c59 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Sun, 28 Jan 2024 09:18:52 +0100 Subject: [PATCH 136/138] 153 - Angular standalone migration --- apps/client/src/app/app.component.ts | 10 +++-- apps/client/src/app/app.module.ts | 38 ------------------ .../game-interface.component.ts | 4 +- .../gui/replay/replay.component.ts | 4 +- .../shared/pipes/game-length-pipe.module.ts | 8 ---- .../src/app/shared/pipes/game-length.pipe.ts | 5 ++- .../src/app/shared/pipes/wrap-pipe.module.ts | 8 ---- apps/client/src/app/shared/pipes/wrap.pipe.ts | 3 +- apps/client/src/main.ts | 39 +++++++++++++++---- 9 files changed, 48 insertions(+), 71 deletions(-) delete mode 100644 apps/client/src/app/app.module.ts delete mode 100644 apps/client/src/app/shared/pipes/game-length-pipe.module.ts delete mode 100644 apps/client/src/app/shared/pipes/wrap-pipe.module.ts diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts index d6573cbd..215aec33 100644 --- a/apps/client/src/app/app.component.ts +++ b/apps/client/src/app/app.component.ts @@ -1,11 +1,15 @@ import { Component, inject, OnInit } from "@angular/core"; import { AuthService } from "./auth/auth.service"; import { ServerHealthService } from "./shared/services/server-health.service"; +import { SwRefreshComponent } from "./shared/components/sw-refresh/sw-refresh.component"; +import { RouterOutlet } from "@angular/router"; @Component({ - selector: "fuzzy-waddle-root", - templateUrl: "./app.component.html", - styleUrls: ["./app.component.scss"] + selector: "fuzzy-waddle-root", + templateUrl: "./app.component.html", + styleUrls: ["./app.component.scss"], + standalone: true, + imports: [RouterOutlet, SwRefreshComponent] }) export class AppComponent implements OnInit { protected readonly authService = inject(AuthService); diff --git a/apps/client/src/app/app.module.ts b/apps/client/src/app/app.module.ts deleted file mode 100644 index f9c35bc2..00000000 --- a/apps/client/src/app/app.module.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { isDevMode, NgModule } from "@angular/core"; -import { BrowserModule } from "@angular/platform-browser"; -import { AppComponent } from "./app.component"; -import { AppRoutingModule } from "./app-routing.module"; -import { HTTP_INTERCEPTORS, HttpClientModule } from "@angular/common/http"; -import { ServiceWorkerModule } from "@angular/service-worker"; -import { AuthGuard } from "./auth/auth.guard"; -import { SocketIoModule } from "ngx-socket-io"; -import { environment } from "../environments/environment"; -import { AccessTokenInterceptor } from "./auth/access-token.interceptor"; -import { SwRefreshComponent } from "./shared/components/sw-refresh/sw-refresh.component"; -import { GameInstanceIndexeddbStorageService } from "./probable-waffle/communicators/storage/game-instance-indexeddb-storage.service"; -import { GameInstanceStorageServiceInterface } from "./probable-waffle/communicators/storage/game-instance-storage.service.interface"; - -@NgModule({ - declarations: [AppComponent], - imports: [ - BrowserModule, - HttpClientModule, - // app routing module must be included last, as it contains the wildcard route - AppRoutingModule, - ServiceWorkerModule.register("ngsw-worker.js", { - enabled: !isDevMode(), - // Register the ServiceWorker as soon as the application is stable - // or after 30 seconds (whichever comes first). - registrationStrategy: "registerWhenStable:30000" - }), - SocketIoModule.forRoot(environment.socketIoConfig), - SwRefreshComponent - ], - providers: [ - AuthGuard, - { provide: HTTP_INTERCEPTORS, useClass: AccessTokenInterceptor, multi: true }, - { provide: GameInstanceStorageServiceInterface, useClass: GameInstanceIndexeddbStorageService } - ], - bootstrap: [AppComponent] -}) -export class AppModule {} diff --git a/apps/client/src/app/little-muncher/main/game-interface/game-interface.component.ts b/apps/client/src/app/little-muncher/main/game-interface/game-interface.component.ts index 679d590c..d81f1bc7 100644 --- a/apps/client/src/app/little-muncher/main/game-interface/game-interface.component.ts +++ b/apps/client/src/app/little-muncher/main/game-interface/game-interface.component.ts @@ -11,14 +11,14 @@ import { GameInstanceClientService } from "../communicators/game-instance-client import { LittleMuncherCommunicatorService } from "../communicators/little-muncher-communicator.service"; import { CommonModule } from "@angular/common"; import { FaIconComponent } from "@fortawesome/angular-fontawesome"; -import { WrapPipeModule } from "../../../shared/pipes/wrap-pipe.module"; +import { WrapPipe } from "../../../shared/pipes/wrap.pipe"; @Component({ selector: "little-muncher-game-interface", templateUrl: "./game-interface.component.html", styleUrls: ["./game-interface.component.scss"], standalone: true, - imports: [CommonModule, ModalComponent, FaIconComponent, WrapPipeModule] + imports: [CommonModule, ModalComponent, FaIconComponent, WrapPipe] }) export class GameInterfaceComponent implements OnInit, OnDestroy { private readonly authService = inject(AuthService); diff --git a/apps/client/src/app/probable-waffle/gui/replay/replay.component.ts b/apps/client/src/app/probable-waffle/gui/replay/replay.component.ts index b863a482..99511236 100644 --- a/apps/client/src/app/probable-waffle/gui/replay/replay.component.ts +++ b/apps/client/src/app/probable-waffle/gui/replay/replay.component.ts @@ -8,12 +8,12 @@ import { ProbableWaffleLevels } from "@fuzzy-waddle/api-interfaces"; import { GameInstanceStorageServiceInterface } from "../../communicators/storage/game-instance-storage.service.interface"; -import { GameLengthPipeModule } from "../../../shared/pipes/game-length-pipe.module"; +import { GameLengthPipe } from "../../../shared/pipes/game-length.pipe"; @Component({ selector: "probable-waffle-replay", standalone: true, - imports: [CommonModule, RouterLink, GameLengthPipeModule], + imports: [CommonModule, RouterLink, GameLengthPipe], templateUrl: "./replay.component.html", styleUrls: ["./replay.component.scss"] }) diff --git a/apps/client/src/app/shared/pipes/game-length-pipe.module.ts b/apps/client/src/app/shared/pipes/game-length-pipe.module.ts deleted file mode 100644 index 4213f2e1..00000000 --- a/apps/client/src/app/shared/pipes/game-length-pipe.module.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { NgModule } from "@angular/core"; -import { GameLengthPipe } from "./game-length.pipe"; - -@NgModule({ - declarations: [GameLengthPipe], - exports: [GameLengthPipe] -}) -export class GameLengthPipeModule {} diff --git a/apps/client/src/app/shared/pipes/game-length.pipe.ts b/apps/client/src/app/shared/pipes/game-length.pipe.ts index e9643576..4c5ca4ad 100644 --- a/apps/client/src/app/shared/pipes/game-length.pipe.ts +++ b/apps/client/src/app/shared/pipes/game-length.pipe.ts @@ -2,8 +2,9 @@ import { Pipe, PipeTransform } from "@angular/core"; import { ProbableWaffleGameInstanceData } from "@fuzzy-waddle/api-interfaces"; @Pipe({ - name: "gameLength", - pure: true + name: "gameLength", + pure: true, + standalone: true }) export class GameLengthPipe implements PipeTransform { transform(value: ProbableWaffleGameInstanceData): string { diff --git a/apps/client/src/app/shared/pipes/wrap-pipe.module.ts b/apps/client/src/app/shared/pipes/wrap-pipe.module.ts deleted file mode 100644 index f00a033d..00000000 --- a/apps/client/src/app/shared/pipes/wrap-pipe.module.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { NgModule } from "@angular/core"; -import { WrapPipe } from "./wrap.pipe"; - -@NgModule({ - declarations: [WrapPipe], - exports: [WrapPipe] -}) -export class WrapPipeModule {} diff --git a/apps/client/src/app/shared/pipes/wrap.pipe.ts b/apps/client/src/app/shared/pipes/wrap.pipe.ts index 57fede85..6b8d2100 100644 --- a/apps/client/src/app/shared/pipes/wrap.pipe.ts +++ b/apps/client/src/app/shared/pipes/wrap.pipe.ts @@ -1,7 +1,8 @@ import { Pipe, PipeTransform } from "@angular/core"; @Pipe({ - name: "wrap" + name: "wrap", + standalone: true }) export class WrapPipe implements PipeTransform { transform(value: number, wrapBy = 200): number { diff --git a/apps/client/src/main.ts b/apps/client/src/main.ts index 52b836c1..e08885fd 100644 --- a/apps/client/src/main.ts +++ b/apps/client/src/main.ts @@ -1,15 +1,40 @@ /// -import { enableProdMode } from '@angular/core'; -import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; +import { enableProdMode, importProvidersFrom, isDevMode } from "@angular/core"; -import { AppModule } from './app/app.module'; -import { environment } from './environments/environment'; +import { environment } from "./environments/environment"; +import { AppComponent } from "./app/app.component"; +import { SocketIoModule } from "ngx-socket-io"; +import { ServiceWorkerModule } from "@angular/service-worker"; +import { AppRoutingModule } from "./app/app-routing.module"; +import { bootstrapApplication, BrowserModule } from "@angular/platform-browser"; +import { GameInstanceIndexeddbStorageService } from "./app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service"; +import { GameInstanceStorageServiceInterface } from "./app/probable-waffle/communicators/storage/game-instance-storage.service.interface"; +import { AccessTokenInterceptor } from "./app/auth/access-token.interceptor"; +import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from "@angular/common/http"; +import { AuthGuard } from "./app/auth/auth.guard"; if (environment.production) { enableProdMode(); } -platformBrowserDynamic() - .bootstrapModule(AppModule) - .catch((err) => console.error(err)); +bootstrapApplication(AppComponent, { + providers: [ + importProvidersFrom( + BrowserModule, + // app routing module must be included last, as it contains the wildcard route + AppRoutingModule, + ServiceWorkerModule.register("ngsw-worker.js", { + enabled: !isDevMode(), + // Register the ServiceWorker as soon as the application is stable + // or after 30 seconds (whichever comes first). + registrationStrategy: "registerWhenStable:30000" + }), + SocketIoModule.forRoot(environment.socketIoConfig) + ), + AuthGuard, + { provide: HTTP_INTERCEPTORS, useClass: AccessTokenInterceptor, multi: true }, + { provide: GameInstanceStorageServiceInterface, useClass: GameInstanceIndexeddbStorageService }, + provideHttpClient(withInterceptorsFromDi()) + ] +}).catch((err) => console.error(err)); From 00f22797d88524422bf3cfddeb7624cda9f93a68 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Sun, 28 Jan 2024 09:48:50 +0100 Subject: [PATCH 137/138] Fixing some tests --- apps/client/src/app/app.component.spec.ts | 16 +++++++++++--- .../game-interface.component.spec.ts | 4 ++-- .../instant-game.component.spec.ts | 10 ++++++++- .../gui/load/load.component.spec.ts | 7 +++--- .../gui/replay/replay.component.spec.ts | 8 ++++--- .../table/score-table.component.spec.ts | 22 +++++++++++++++++-- 6 files changed, 53 insertions(+), 14 deletions(-) diff --git a/apps/client/src/app/app.component.spec.ts b/apps/client/src/app/app.component.spec.ts index c7053b76..f91f22dc 100644 --- a/apps/client/src/app/app.component.spec.ts +++ b/apps/client/src/app/app.component.spec.ts @@ -6,12 +6,13 @@ import { serverHealthServiceStub } from "./shared/services/server-health.service import { AuthService } from "./auth/auth.service"; import { authServiceStub } from "./auth/auth.service.spec"; import { SwRefreshTestingComponent } from "./shared/components/sw-refresh/sw-refresh.component.spec"; +import { HomeComponent } from "./little-muncher/home/home.component"; +import { SwRefreshComponent } from "./shared/components/sw-refresh/sw-refresh.component"; describe("AppComponent", () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [AppComponent], - imports: [RouterTestingModule, SwRefreshTestingComponent], + imports: [AppComponent, RouterTestingModule, SwRefreshTestingComponent], providers: [ { provide: ServerHealthService, @@ -22,7 +23,16 @@ describe("AppComponent", () => { useValue: authServiceStub } ] - }).compileComponents(); + }) + .overrideComponent(AppComponent, { + remove: { + imports: [SwRefreshComponent] + }, + add: { + imports: [SwRefreshTestingComponent] + } + }) + .compileComponents(); })); it("should create the app", () => { diff --git a/apps/client/src/app/little-muncher/main/game-interface/game-interface.component.spec.ts b/apps/client/src/app/little-muncher/main/game-interface/game-interface.component.spec.ts index d1a47afe..5083bcf2 100644 --- a/apps/client/src/app/little-muncher/main/game-interface/game-interface.component.spec.ts +++ b/apps/client/src/app/little-muncher/main/game-interface/game-interface.component.spec.ts @@ -8,9 +8,9 @@ import { AuthService } from "../../../auth/auth.service"; import { authServiceStub } from "../../../auth/auth.service.spec"; import { GameInstanceClientService } from "../communicators/game-instance-client.service"; import { gameInstanceClientServiceStub } from "../communicators/game-instance-client.service.spec"; -import { WrapPipeModule } from "../../../shared/pipes/wrap-pipe.module"; import { ModalComponent } from "../../../shared/components/modal/modal.component"; import { CommonModule } from "@angular/common"; +import { WrapPipe } from "../../../shared/pipes/wrap.pipe"; @Component({ selector: "little-muncher-game-interface", template: "", standalone: true, imports: [CommonModule] }) export class GameInterfaceTestingComponent {} @@ -26,7 +26,7 @@ describe("GameInterfaceComponent", () => { { provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }, { provide: AuthService, useValue: authServiceStub } ], - imports: [GameInterfaceComponent, WrapPipeModule] + imports: [GameInterfaceComponent, WrapPipe] }) .overrideComponent(GameInterfaceComponent, { remove: { diff --git a/apps/client/src/app/probable-waffle/gui/instant-game/instant-game.component.spec.ts b/apps/client/src/app/probable-waffle/gui/instant-game/instant-game.component.spec.ts index 78c4ba89..6a9537d1 100644 --- a/apps/client/src/app/probable-waffle/gui/instant-game/instant-game.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/instant-game/instant-game.component.spec.ts @@ -1,5 +1,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { InstantGameComponent } from "./instant-game.component"; +import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../communicators/game-instance-client.service.spec"; describe("InstantGameComponent", () => { let component: InstantGameComponent; @@ -7,7 +9,13 @@ describe("InstantGameComponent", () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [InstantGameComponent] + imports: [InstantGameComponent], + providers: [ + { + provide: GameInstanceClientService, + useValue: gameInstanceClientServiceStub + } + ] }).compileComponents(); fixture = TestBed.createComponent(InstantGameComponent); diff --git a/apps/client/src/app/probable-waffle/gui/load/load.component.spec.ts b/apps/client/src/app/probable-waffle/gui/load/load.component.spec.ts index 26c0c6b8..c0f7f072 100644 --- a/apps/client/src/app/probable-waffle/gui/load/load.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/load/load.component.spec.ts @@ -1,9 +1,10 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { LoadComponent } from "./load.component"; -import { GameInstanceClientService } from "../../../little-muncher/main/communicators/game-instance-client.service"; -import { gameInstanceClientServiceStub } from "../../../little-muncher/main/communicators/game-instance-client.service.spec"; import { gameInstanceLocalStorageServiceStub } from "../../communicators/storage/game-instance-local-storage.service.spec"; import { GameInstanceStorageServiceInterface } from "../../communicators/storage/game-instance-storage.service.interface"; +import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../communicators/game-instance-client.service.spec"; +import { RouterTestingModule } from "@angular/router/testing"; describe("LoadComponent", () => { let component: LoadComponent; @@ -15,7 +16,7 @@ describe("LoadComponent", () => { { provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }, { provide: GameInstanceStorageServiceInterface, useValue: gameInstanceLocalStorageServiceStub } ], - imports: [LoadComponent] + imports: [LoadComponent, RouterTestingModule] }).compileComponents(); fixture = TestBed.createComponent(LoadComponent); diff --git a/apps/client/src/app/probable-waffle/gui/replay/replay.component.spec.ts b/apps/client/src/app/probable-waffle/gui/replay/replay.component.spec.ts index 6e7e46d4..c387b568 100644 --- a/apps/client/src/app/probable-waffle/gui/replay/replay.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/replay/replay.component.spec.ts @@ -1,9 +1,11 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { ReplayComponent } from "./replay.component"; -import { GameInstanceClientService } from "../../../little-muncher/main/communicators/game-instance-client.service"; -import { gameInstanceClientServiceStub } from "../../../little-muncher/main/communicators/game-instance-client.service.spec"; import { gameInstanceLocalStorageServiceStub } from "../../communicators/storage/game-instance-local-storage.service.spec"; import { GameInstanceStorageServiceInterface } from "../../communicators/storage/game-instance-storage.service.interface"; +import { GameLengthPipe } from "../../../shared/pipes/game-length.pipe"; +import { gameInstanceClientServiceStub } from "../../communicators/game-instance-client.service.spec"; +import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; +import { RouterTestingModule } from "@angular/router/testing"; describe("ReplayComponent", () => { let component: ReplayComponent; @@ -15,7 +17,7 @@ describe("ReplayComponent", () => { { provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }, { provide: GameInstanceStorageServiceInterface, useValue: gameInstanceLocalStorageServiceStub } ], - imports: [ReplayComponent] + imports: [ReplayComponent, GameLengthPipe, RouterTestingModule] }).compileComponents(); fixture = TestBed.createComponent(ReplayComponent); diff --git a/apps/client/src/app/probable-waffle/gui/score-screen/table/score-table.component.spec.ts b/apps/client/src/app/probable-waffle/gui/score-screen/table/score-table.component.spec.ts index 418b8368..769874d0 100644 --- a/apps/client/src/app/probable-waffle/gui/score-screen/table/score-table.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/score-screen/table/score-table.component.spec.ts @@ -1,7 +1,13 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { PlayerSummary, ScoreTableComponent } from "./score-table.component"; -import { RouterTestingModule } from "@angular/router/testing"; -import { ProbableWaffleGameInstanceType, ProbableWaffleGameInstanceVisibility } from "@fuzzy-waddle/api-interfaces"; +import { + FactionType, + PlayerLobbyDefinition, + PositionPlayerDefinition, + ProbableWaffleGameInstanceType, + ProbableWaffleGameInstanceVisibility, + ProbableWafflePlayerType +} from "@fuzzy-waddle/api-interfaces"; import { DebugElement } from "@angular/core"; import { By } from "@angular/platform-browser"; import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; @@ -36,6 +42,18 @@ describe("ScoreTableComponent", () => { ); gameInstanceClientServiceStub.addAiPlayer(); + const gameInstance = gameInstanceClientServiceStub.gameInstance!; + const playerDefinition = { + player: { + playerNumber: gameInstance.players.length, + playerName: "Player " + (gameInstance.players.length + 1), + playerPosition: gameInstance.players.length, + joined: true + } satisfies PlayerLobbyDefinition, // TODO THIS IS DUPLICATED EVERYWHERE + factionType: FactionType.Skaduwee, + playerType: ProbableWafflePlayerType.AI + } satisfies PositionPlayerDefinition; + gameInstance.players[0].playerController.data.playerDefinition = playerDefinition; component.ngOnInit(); expect(component["players"].length).toBe(1); From af2763ab982b47dd36be700d294c36354ab90f53 Mon Sep 17 00:00:00 2001 From: Jernej Habjan Date: Sun, 28 Jan 2024 10:14:53 +0100 Subject: [PATCH 138/138] Fixing tests --- apps/client/jest.config.ts | 5 +++- .../score-through-time.component.spec.ts | 24 ++++++++++++++++--- .../score-screen.component.spec.ts | 5 +++- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/apps/client/jest.config.ts b/apps/client/jest.config.ts index ea2653ca..5b54f8c7 100644 --- a/apps/client/jest.config.ts +++ b/apps/client/jest.config.ts @@ -18,5 +18,8 @@ export default { "jest-preset-angular/build/serializers/no-ng-attributes", "jest-preset-angular/build/serializers/ng-snapshot", "jest-preset-angular/build/serializers/html-comment" - ] + ], + moduleNameMapper: { + "^lodash-es$": "lodash" + } }; diff --git a/apps/client/src/app/probable-waffle/gui/score-screen/chart/score-through-time.component.spec.ts b/apps/client/src/app/probable-waffle/gui/score-screen/chart/score-through-time.component.spec.ts index 00bc2c9d..cc2b0493 100644 --- a/apps/client/src/app/probable-waffle/gui/score-screen/chart/score-through-time.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/score-screen/chart/score-through-time.component.spec.ts @@ -3,15 +3,20 @@ import { ScoreThroughTimeComponent } from "./score-through-time.component"; import { Component, Input } from "@angular/core"; import { CommonModule } from "@angular/common"; import { + FactionType, + PlayerLobbyDefinition, PlayerStateActionBuildingConstructed, PlayerStateActionBuildingDestroyed, PlayerStateActionUnitKilled, PlayerStateActionUnitProduced, + PositionPlayerDefinition, ProbableWaffleGameInstanceType, - ProbableWaffleGameInstanceVisibility + ProbableWaffleGameInstanceVisibility, + ProbableWafflePlayerType } from "@fuzzy-waddle/api-interfaces"; import { gameInstanceClientServiceStub } from "../../../communicators/game-instance-client.service.spec"; import { NgChartsModule } from "ng2-charts"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; @Component({ selector: "probable-waffle-score-through-time", @@ -29,7 +34,8 @@ describe("ScoreThroughTimeComponent", () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ScoreThroughTimeComponent] + imports: [ScoreThroughTimeComponent], + providers: [{ provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }] }).compileComponents(); fixture = TestBed.createComponent(ScoreThroughTimeComponent); @@ -52,8 +58,20 @@ describe("ScoreThroughTimeComponent", () => { await gameInstanceService.addAiPlayer(); await gameInstanceService.addAiPlayer(); - + const gameInstance = gameInstanceClientServiceStub.gameInstance!; + const playerDefinition = { + player: { + playerNumber: gameInstance.players.length, + playerName: "Player " + (gameInstance.players.length + 1), + playerPosition: gameInstance.players.length, + joined: true + } satisfies PlayerLobbyDefinition, // TODO THIS IS DUPLICATED EVERYWHERE + factionType: FactionType.Skaduwee, + playerType: ProbableWafflePlayerType.AI + } satisfies PositionPlayerDefinition; const players = gameInstanceService.gameInstance!.players!; + players[0].playerController.data.playerDefinition = playerDefinition; + players[1].playerController.data.playerDefinition = playerDefinition; players[0].playerState.data.summary.push( { diff --git a/apps/client/src/app/probable-waffle/gui/score-screen/score-screen.component.spec.ts b/apps/client/src/app/probable-waffle/gui/score-screen/score-screen.component.spec.ts index ddbf5987..d87ebc4a 100644 --- a/apps/client/src/app/probable-waffle/gui/score-screen/score-screen.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/score-screen/score-screen.component.spec.ts @@ -3,6 +3,8 @@ import { ScoreScreenComponent } from "./score-screen.component"; import { RouterTestingModule } from "@angular/router/testing"; import { ScoreThroughTimeComponent } from "./chart/score-through-time.component"; import { ScoreThroughTimeTestingComponent } from "./chart/score-through-time.component.spec"; +import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../communicators/game-instance-client.service.spec"; describe("ScoreScreenComponent", () => { let component: ScoreScreenComponent; @@ -10,7 +12,8 @@ describe("ScoreScreenComponent", () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ScoreScreenComponent, RouterTestingModule] + imports: [ScoreScreenComponent, RouterTestingModule], + providers: [{ provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }] }) .overrideComponent(ScoreScreenComponent, { remove: {