diff --git a/.gitignore b/.gitignore index 6661960e..8ab5370a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ node_modules /.idea/* !/.idea/dataSources.xml !/.idea/sqldialects.xml +!/.idea/icon.svg .project .classpath .c9/ diff --git a/.idea/icon.svg b/.idea/icon.svg new file mode 100644 index 00000000..526d19f0 --- /dev/null +++ b/.idea/icon.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.skip b/.skip index 737179ea..a16b1d51 100644 --- a/.skip +++ b/.skip @@ -43,7 +43,9 @@ apps/client/src/manifest.webmanifest apps/client/src/polyfills.ts apps/client/src/test-setup.ts apps/client/ngsw-config.json -apps/client/src/assets/icons +apps/client/src/assets/icons/pwa +apps/client/src/assets/icons/fuzzy-waddle.svg +apps/client/src/assets/icons/social-preview.png apps/client/src/**/*.html apps/client/src/**/*.scss apps/client/src/**/*.spec.ts diff --git a/apps/api/.eslintrc.json b/apps/api/.eslintrc.json index 2ec50b22..7eaffdf1 100644 --- a/apps/api/.eslintrc.json +++ b/apps/api/.eslintrc.json @@ -3,12 +3,11 @@ "ignorePatterns": ["!**/*"], "overrides": [ { - "files": [ - "*.ts" - ], + "files": ["*.ts"], "rules": { "@typescript-eslint/no-explicit-any": "warn", - "@typescript-eslint/no-unused-vars": "warn" + "@typescript-eslint/no-unused-vars": "warn", + "no-case-declarations": "off" } } ] diff --git a/apps/api/jest.config.ts b/apps/api/jest.config.ts index 055496fa..37748264 100644 --- a/apps/api/jest.config.ts +++ b/apps/api/jest.config.ts @@ -1,11 +1,11 @@ /* eslint-disable */ export default { - displayName: 'api', - preset: '../../jest.preset.js', - testEnvironment: 'node', + displayName: "api", + preset: "../../jest.preset.js", + testEnvironment: "node", transform: { - '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '/tsconfig.spec.json' }] + "^.+\\.[tj]s$": ["ts-jest", { tsconfig: "/tsconfig.spec.json" }] }, - moduleFileExtensions: ['ts', 'js', 'html'], - coverageDirectory: '../../coverage/apps/api' + moduleFileExtensions: ["ts", "js", "html"], + coverageDirectory: "../../coverage/apps/api" }; diff --git a/apps/api/src/app/app.controller.spec.ts b/apps/api/src/app/app.controller.spec.ts index 9d1e93ac..0872c20f 100644 --- a/apps/api/src/app/app.controller.spec.ts +++ b/apps/api/src/app/app.controller.spec.ts @@ -1,8 +1,8 @@ -import { Test, TestingModule } from '@nestjs/testing'; +import { Test, TestingModule } from "@nestjs/testing"; -import { AppController } from './app.controller'; +import { AppController } from "./app.controller"; -describe('AppController', () => { +describe("AppController", () => { let app: TestingModule; beforeAll(async () => { @@ -11,10 +11,10 @@ describe('AppController', () => { }).compile(); }); - describe('getHealth', () => { + describe("getHealth", () => { it('should return "OK"', () => { const appController = app.get(AppController); - expect(appController.getHealth()).toBe('OK'); + expect(appController.getHealth()).toBe("OK"); }); }); }); diff --git a/apps/api/src/app/app.controller.ts b/apps/api/src/app/app.controller.ts index d3f7ddf1..2cd3daaf 100644 --- a/apps/api/src/app/app.controller.ts +++ b/apps/api/src/app/app.controller.ts @@ -1,10 +1,10 @@ -import { Controller, Get } from '@nestjs/common'; +import { Controller, Get } from "@nestjs/common"; @Controller() export class AppController { // health endpoint always returns OK used for monitoring for zero downtime deploys - @Get('health') + @Get("health") getHealth(): string { - return 'OK'; + return "OK"; } } diff --git a/apps/api/src/app/app.module.ts b/apps/api/src/app/app.module.ts index 75c0e36f..f073000a 100644 --- a/apps/api/src/app/app.module.ts +++ b/apps/api/src/app/app.module.ts @@ -3,13 +3,13 @@ import { Module } from "@nestjs/common"; import { AppController } from "./app.controller"; import { AuthModule } from "../auth/auth.module"; import { ConfigModule } from "@nestjs/config"; -import { EventsModule } from "./events/events.module"; import { ChatModule } from "./chat/chat.module"; import { GameSessionModule } from "./game-session/game-session.module"; import { LittleMuncherModule } from "./little-muncher/little-muncher.module"; import { APP_GUARD } from "@nestjs/core"; import { ThrottlerGuard, ThrottlerModule } from "@nestjs/throttler"; import { FlySquasherModule } from "./fly-squasher/fly-squasher.module"; +import { ProbableWaffleModule } from "./probable-waffle/probable-waffle.module"; @Module({ imports: [ @@ -23,11 +23,11 @@ import { FlySquasherModule } from "./fly-squasher/fly-squasher.module"; } ]), AuthModule, - EventsModule, ChatModule, GameSessionModule, LittleMuncherModule, - FlySquasherModule + FlySquasherModule, + ProbableWaffleModule ], controllers: [AppController], providers: [ diff --git a/apps/api/src/app/chat/chat.controller.spec.ts b/apps/api/src/app/chat/chat.controller.spec.ts index ce1f803d..4497acb1 100644 --- a/apps/api/src/app/chat/chat.controller.spec.ts +++ b/apps/api/src/app/chat/chat.controller.spec.ts @@ -1,11 +1,11 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { ChatService } from './chat.service'; -import { chatServiceStub } from './chat.service.spec'; -import { ChatController } from './chat.controller'; -import { MessageDto } from './message.dto'; -import { authUserStub } from '../../auth/auth.service.spec'; +import { Test, TestingModule } from "@nestjs/testing"; +import { ChatService } from "./chat.service"; +import { chatServiceStub } from "./chat.service.spec"; +import { ChatController } from "./chat.controller"; +import { MessageDto } from "./message.dto"; +import { authUserStub } from "../../auth/auth.service.spec"; -describe('ChatController', () => { +describe("ChatController", () => { let app: TestingModule; beforeAll(async () => { @@ -15,11 +15,11 @@ describe('ChatController', () => { }).compile(); }); - describe('postMessage', () => { - it('should return void', async () => { + describe("postMessage", () => { + it("should return void", async () => { const chatController = app.get(ChatController); const user = authUserStub; - const messageDto: MessageDto = { message: 'test' }; + const messageDto: MessageDto = { message: "test" }; const result = await chatController.postMessage(user, messageDto); expect(result).toBeUndefined(); }); diff --git a/apps/api/src/app/chat/chat.controller.ts b/apps/api/src/app/chat/chat.controller.ts index 2c28d507..10907166 100644 --- a/apps/api/src/app/chat/chat.controller.ts +++ b/apps/api/src/app/chat/chat.controller.ts @@ -1,15 +1,14 @@ -import { Body, Controller, Post, UseGuards } from '@nestjs/common'; -import { ChatService } from './chat.service'; -import { SupabaseAuthGuard } from '../../auth/guards/supabase-auth.guard'; -import { CurrentUser } from '../../auth/current-user'; -import { AuthUser } from '@supabase/supabase-js'; -import { MessageDto } from './message.dto'; +import { Body, Controller, Post, UseGuards } from "@nestjs/common"; +import { ChatService } from "./chat.service"; +import { SupabaseAuthGuard } from "../../auth/guards/supabase-auth.guard"; +import { CurrentUser } from "../../auth/current-user"; +import { AuthUser } from "@supabase/supabase-js"; +import { MessageDto } from "./message.dto"; @Controller() export class ChatController { constructor(private readonly chatService: ChatService) {} - - @Post('message') + @Post("message") @UseGuards(SupabaseAuthGuard) async postMessage(@CurrentUser() user: AuthUser, @Body() body: MessageDto): Promise { await this.chatService.postMessage(body.message, user); diff --git a/apps/api/src/app/events/events.gateway.ts b/apps/api/src/app/chat/chat.gateway.ts similarity index 51% rename from apps/api/src/app/events/events.gateway.ts rename to apps/api/src/app/chat/chat.gateway.ts index 2bd115ed..7e65ea83 100644 --- a/apps/api/src/app/events/events.gateway.ts +++ b/apps/api/src/app/chat/chat.gateway.ts @@ -1,41 +1,34 @@ -import { ConnectedSocket, MessageBody, SubscribeMessage, WebSocketGateway, WebSocketServer } from '@nestjs/websockets'; -import { CurrentUser } from '../../auth/current-user'; -import { AuthUser } from '@supabase/supabase-js'; -import { UseGuards } from '@nestjs/common'; -import { SupabaseAuthGuard } from '../../auth/guards/supabase-auth.guard'; -import { ChatService } from '../chat/chat.service'; -import { Server } from 'net'; -import { ChatMessage, GatewayChatEvent } from '@fuzzy-waddle/api-interfaces'; -import { MyConnectedSocket } from '../little-muncher/game-instance/game-state.gateway'; +import { ConnectedSocket, MessageBody, SubscribeMessage, WebSocketGateway, WebSocketServer } from "@nestjs/websockets"; +import { CurrentUser } from "../../auth/current-user"; +import { AuthUser } from "@supabase/supabase-js"; +import { UseGuards } from "@nestjs/common"; +import { SupabaseAuthGuard } from "../../auth/guards/supabase-auth.guard"; +import { ChatService } from "../chat/chat.service"; +import { ChatMessage, GatewayChatEvent } from "@fuzzy-waddle/api-interfaces"; +import { Server, Socket } from "socket.io"; @WebSocketGateway({ cors: { - origin: process.env.CORS_ORIGIN?.split(',') + origin: process.env.CORS_ORIGIN?.split(",") } }) -export class EventsGateway { - @WebSocketServer() - private server: Server; +export class ChatGateway { + @WebSocketServer() private readonly server: Server; constructor(private readonly chatService: ChatService) {} - - // @SubscribeMessage(GatewayEvent.CHAT_MESSAGE) - // findAll(@MessageBody() data: ChatMessage): Observable> { - // return from([data]).pipe(map(item => ({ event: GatewayEvent.CHAT_MESSAGE, data: item }))); - // } - //subscribe to chat message and broadcast to all clients @UseGuards(SupabaseAuthGuard) @SubscribeMessage(GatewayChatEvent.CHAT_MESSAGE) async broadcastMessage( @CurrentUser() user: AuthUser, @MessageBody() payload: ChatMessage, - @ConnectedSocket() client: MyConnectedSocket + @ConnectedSocket() socket: Socket ) { // clone the payload const newPayload = { ...payload }; // post to supabase + // noinspection UnnecessaryLocalVariableJS const sanitizedMessage = await this.chatService.postMessage(newPayload.text, user); // todo for demo newPayload.text = sanitizedMessage; diff --git a/apps/api/src/app/chat/chat.module.ts b/apps/api/src/app/chat/chat.module.ts index b1d0f382..ebf0c045 100644 --- a/apps/api/src/app/chat/chat.module.ts +++ b/apps/api/src/app/chat/chat.module.ts @@ -1,11 +1,12 @@ -import { Module } from '@nestjs/common'; -import { ChatService } from './chat.service'; -import { ChatController } from './chat.controller'; -import { SupabaseProviderService } from '../../core/supabase-provider/supabase-provider.service'; -import { TextSanitizationService } from '../../core/content-filters/text-sanitization.service'; +import { Module } from "@nestjs/common"; +import { ChatService } from "./chat.service"; +import { ChatController } from "./chat.controller"; +import { SupabaseProviderService } from "../../core/supabase-provider/supabase-provider.service"; +import { TextSanitizationService } from "../../core/content-filters/text-sanitization.service"; +import { ChatGateway } from "./chat.gateway"; @Module({ - providers: [ChatService, SupabaseProviderService, TextSanitizationService], + providers: [ChatService, SupabaseProviderService, TextSanitizationService, ChatGateway], controllers: [ChatController], exports: [ChatService] }) diff --git a/apps/api/src/app/chat/chat.service.interface.ts b/apps/api/src/app/chat/chat.service.interface.ts index c50a2b43..49edae00 100644 --- a/apps/api/src/app/chat/chat.service.interface.ts +++ b/apps/api/src/app/chat/chat.service.interface.ts @@ -1,4 +1,4 @@ -import { AuthUser } from '@supabase/supabase-js'; +import { AuthUser } from "@supabase/supabase-js"; export interface IChatService { postMessage(text: string, user: AuthUser): Promise; diff --git a/apps/api/src/app/chat/chat.service.ts b/apps/api/src/app/chat/chat.service.ts index 1a34d907..d524d6a4 100644 --- a/apps/api/src/app/chat/chat.service.ts +++ b/apps/api/src/app/chat/chat.service.ts @@ -1,14 +1,14 @@ -import { Injectable } from '@nestjs/common'; -import { IChatService } from './chat.service.interface'; -import { AuthUser } from '@supabase/supabase-js'; -import { SupabaseProviderService } from '../../core/supabase-provider/supabase-provider.service'; -import { TextSanitizationService } from '../../core/content-filters/text-sanitization.service'; +import { Injectable } from "@nestjs/common"; +import { IChatService } from "./chat.service.interface"; +import { AuthUser } from "@supabase/supabase-js"; +import { SupabaseProviderService } from "../../core/supabase-provider/supabase-provider.service"; +import { TextSanitizationService } from "../../core/content-filters/text-sanitization.service"; @Injectable() export class ChatService implements IChatService { constructor( - private supabaseProviderService: SupabaseProviderService, - private textSanitizationService: TextSanitizationService + private readonly supabaseProviderService: SupabaseProviderService, + private readonly textSanitizationService: TextSanitizationService ) {} /** @@ -17,7 +17,7 @@ export class ChatService implements IChatService { async postMessage(text: string, user: AuthUser): Promise { const sanitizedMessage = this.textSanitizationService.cleanBadWords(text); // Insert sanitized message into Messages table - const { data, error } = await this.supabaseProviderService.supabaseClient.from('test').insert({ + const { data, error } = await this.supabaseProviderService.supabaseClient.from("test").insert({ text: sanitizedMessage, user_id: user.id }); diff --git a/apps/api/src/app/chat/message.dto.ts b/apps/api/src/app/chat/message.dto.ts index c517721f..a59d8ed2 100644 --- a/apps/api/src/app/chat/message.dto.ts +++ b/apps/api/src/app/chat/message.dto.ts @@ -1,4 +1,4 @@ -import { IsNotEmpty, IsString } from 'class-validator'; +import { IsNotEmpty, IsString } from "class-validator"; export class MessageDto { @IsString() diff --git a/apps/api/src/app/events/events.module.ts b/apps/api/src/app/events/events.module.ts deleted file mode 100644 index 0bb51f85..00000000 --- a/apps/api/src/app/events/events.module.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Module } from '@nestjs/common'; -import { EventsGateway } from './events.gateway'; -import { ChatModule } from '../chat/chat.module'; - -@Module({ - providers: [EventsGateway], - imports: [ChatModule] -}) -export class EventsModule {} diff --git a/apps/api/src/app/game-session/game-session.module.ts b/apps/api/src/app/game-session/game-session.module.ts index 580c8114..34d1bdfb 100644 --- a/apps/api/src/app/game-session/game-session.module.ts +++ b/apps/api/src/app/game-session/game-session.module.ts @@ -1,5 +1,5 @@ -import { Module } from '@nestjs/common'; -import { RoomModule } from './room/room.module'; +import { Module } from "@nestjs/common"; +import { RoomModule } from "./room/room.module"; @Module({ imports: [RoomModule] diff --git a/apps/api/src/app/game-session/room/room.controller.spec.ts b/apps/api/src/app/game-session/room/room.controller.spec.ts index 68088d24..211e5192 100644 --- a/apps/api/src/app/game-session/room/room.controller.spec.ts +++ b/apps/api/src/app/game-session/room/room.controller.spec.ts @@ -1,8 +1,8 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { RoomController } from './room.controller'; -import { RoomService, roomServiceStub } from './room.service'; +import { Test, TestingModule } from "@nestjs/testing"; +import { RoomController } from "./room.controller"; +import { RoomService, roomServiceStub } from "./room.service"; -describe('RoomController', () => { +describe("RoomController", () => { let controller: RoomController; beforeEach(async () => { @@ -14,7 +14,7 @@ describe('RoomController', () => { controller = module.get(RoomController); }); - it('should be defined', () => { + it("should be defined", () => { expect(controller).toBeDefined(); }); }); diff --git a/apps/api/src/app/game-session/room/room.controller.ts b/apps/api/src/app/game-session/room/room.controller.ts index ea80c653..88bc0921 100644 --- a/apps/api/src/app/game-session/room/room.controller.ts +++ b/apps/api/src/app/game-session/room/room.controller.ts @@ -1,15 +1,15 @@ -import { Body, Controller, Post, UseGuards } from '@nestjs/common'; -import { RoomService } from './room.service'; -import { RoomDto } from './room.dto'; -import { CurrentUser } from '../../../auth/current-user'; -import { AuthUser } from '@supabase/supabase-js'; -import { SupabaseAuthGuard } from '../../../auth/guards/supabase-auth.guard'; +import { Body, Controller, Post, UseGuards } from "@nestjs/common"; +import { RoomService } from "./room.service"; +import { RoomDto } from "./room.dto"; +import { CurrentUser } from "../../../auth/current-user"; +import { AuthUser } from "@supabase/supabase-js"; +import { SupabaseAuthGuard } from "../../../auth/guards/supabase-auth.guard"; -@Controller('room') +@Controller("room") export class RoomController { constructor(private readonly roomService: RoomService) {} - @Post('room') + @Post("room") @UseGuards(SupabaseAuthGuard) async createRoom(@CurrentUser() user: AuthUser, @Body() body: RoomDto): Promise { return this.roomService.createRoom(body, user); diff --git a/apps/api/src/app/game-session/room/room.dto.ts b/apps/api/src/app/game-session/room/room.dto.ts index c421d525..ac46251f 100644 --- a/apps/api/src/app/game-session/room/room.dto.ts +++ b/apps/api/src/app/game-session/room/room.dto.ts @@ -1,4 +1,4 @@ -import { IsNotEmpty, IsString } from 'class-validator'; +import { IsNotEmpty, IsString } from "class-validator"; export class RoomDto { @IsString() diff --git a/apps/api/src/app/game-session/room/room.module.ts b/apps/api/src/app/game-session/room/room.module.ts index c22bbc87..48d98242 100644 --- a/apps/api/src/app/game-session/room/room.module.ts +++ b/apps/api/src/app/game-session/room/room.module.ts @@ -1,6 +1,6 @@ -import { Module } from '@nestjs/common'; -import { RoomService } from './room.service'; -import { SupabaseProviderService } from '../../../core/supabase-provider/supabase-provider.service'; +import { Module } from "@nestjs/common"; +import { RoomService } from "./room.service"; +import { SupabaseProviderService } from "../../../core/supabase-provider/supabase-provider.service"; @Module({ providers: [RoomService, SupabaseProviderService] }) export class RoomModule {} diff --git a/apps/api/src/app/game-session/room/room.service.interface.ts b/apps/api/src/app/game-session/room/room.service.interface.ts index e1ec16d6..0fa13460 100644 --- a/apps/api/src/app/game-session/room/room.service.interface.ts +++ b/apps/api/src/app/game-session/room/room.service.interface.ts @@ -1,5 +1,5 @@ -import { RoomDto } from './room.dto'; -import { AuthUser } from '@supabase/supabase-js'; +import { RoomDto } from "./room.dto"; +import { AuthUser } from "@supabase/supabase-js"; export interface IRoomService { createRoom(body: RoomDto, user: AuthUser): Promise; diff --git a/apps/api/src/app/game-session/room/room.service.spec.ts b/apps/api/src/app/game-session/room/room.service.spec.ts index 9d350b04..04d8dd8f 100644 --- a/apps/api/src/app/game-session/room/room.service.spec.ts +++ b/apps/api/src/app/game-session/room/room.service.spec.ts @@ -1,9 +1,9 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { RoomService } from './room.service'; -import { SupabaseProviderService } from '../../../core/supabase-provider/supabase-provider.service'; -import { supabaseProviderServiceStub } from '../../../core/supabase-provider/supabase-provider.service.spec'; +import { Test, TestingModule } from "@nestjs/testing"; +import { RoomService } from "./room.service"; +import { SupabaseProviderService } from "../../../core/supabase-provider/supabase-provider.service"; +import { supabaseProviderServiceStub } from "../../../core/supabase-provider/supabase-provider.service.spec"; -describe('RoomService', () => { +describe("RoomService", () => { let service: RoomService; beforeEach(async () => { @@ -14,7 +14,7 @@ describe('RoomService', () => { service = module.get(RoomService); }); - it('should be defined', () => { + it("should be defined", () => { expect(service).toBeDefined(); }); }); diff --git a/apps/api/src/app/little-muncher/game-instance/game-instance.controller.spec.ts b/apps/api/src/app/little-muncher/game-instance/game-instance.controller.spec.ts index 8a5427ed..b1b4ce67 100644 --- a/apps/api/src/app/little-muncher/game-instance/game-instance.controller.spec.ts +++ b/apps/api/src/app/little-muncher/game-instance/game-instance.controller.spec.ts @@ -1,9 +1,9 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { GameInstanceController } from './game-instance.controller'; -import { GameInstanceService } from './game-instance.service'; -import { GameInstanceServiceStub } from './game-instance.service.spec'; +import { Test, TestingModule } from "@nestjs/testing"; +import { GameInstanceController } from "./game-instance.controller"; +import { GameInstanceService } from "./game-instance.service"; +import { GameInstanceServiceStub } from "./game-instance.service.spec"; -describe('GameInstanceController', () => { +describe("GameInstanceController", () => { let controller: GameInstanceController; beforeEach(async () => { @@ -15,7 +15,7 @@ describe('GameInstanceController', () => { controller = module.get(GameInstanceController); }); - it('should be defined', () => { + it("should be defined", () => { expect(controller).toBeDefined(); }); }); diff --git a/apps/api/src/app/little-muncher/game-instance/game-instance.controller.ts b/apps/api/src/app/little-muncher/game-instance/game-instance.controller.ts index e1d4226b..e4603a84 100644 --- a/apps/api/src/app/little-muncher/game-instance/game-instance.controller.ts +++ b/apps/api/src/app/little-muncher/game-instance/game-instance.controller.ts @@ -1,44 +1,44 @@ -import { Body, Controller, Delete, Get, Post, UseGuards } from '@nestjs/common'; -import { SupabaseAuthGuard } from '../../../auth/guards/supabase-auth.guard'; -import { CurrentUser } from '../../../auth/current-user'; -import { AuthUser } from '@supabase/supabase-js'; -import { GameInstanceService } from './game-instance.service'; +import { Body, Controller, Delete, Get, Post, UseGuards } from "@nestjs/common"; +import { SupabaseAuthGuard } from "../../../auth/guards/supabase-auth.guard"; +import { CurrentUser } from "../../../auth/current-user"; +import { AuthUser } from "@supabase/supabase-js"; +import { GameInstanceService } from "./game-instance.service"; import { GameInstanceDataDto, LittleMuncherGameCreateDto, LittleMuncherGameInstanceData, - Room -} from '@fuzzy-waddle/api-interfaces'; + LittleMuncherRoom +} from "@fuzzy-waddle/api-interfaces"; -@Controller('little-muncher') +@Controller("little-muncher") export class GameInstanceController { constructor(private readonly gameInstanceService: GameInstanceService) {} - @Post('start-game') + @Post("start-game") @UseGuards(SupabaseAuthGuard) async startGame(@CurrentUser() user: AuthUser, @Body() body: GameInstanceDataDto): Promise { await this.gameInstanceService.startGame(body, user); } - @Delete('stop-game') + @Delete("stop-game") @UseGuards(SupabaseAuthGuard) async stopGame(@CurrentUser() user: AuthUser, @Body() body: GameInstanceDataDto): Promise { await this.gameInstanceService.stopGame(body, user); } - @Post('start-level') + @Post("start-level") @UseGuards(SupabaseAuthGuard) async createGameMode(@CurrentUser() user: AuthUser, @Body() body: LittleMuncherGameCreateDto): Promise { await this.gameInstanceService.startLevel(body, user); } - @Delete('stop-level') + @Delete("stop-level") @UseGuards(SupabaseAuthGuard) async deleteGameMode(@CurrentUser() user: AuthUser, @Body() body: GameInstanceDataDto): Promise { await this.gameInstanceService.stopLevel(body, user); } - @Post('spectator-join') + @Post("spectator-join") @UseGuards(SupabaseAuthGuard) async spectatorJoin( @CurrentUser() user: AuthUser, @@ -47,15 +47,15 @@ export class GameInstanceController { return await this.gameInstanceService.spectatorJoined(body, user); } - @Delete('spectator-leave') + @Delete("spectator-leave") @UseGuards(SupabaseAuthGuard) async spectatorLeave(@CurrentUser() user: AuthUser, @Body() body: GameInstanceDataDto): Promise { await this.gameInstanceService.spectatorLeft(body, user); } - @Get('get-rooms') + @Get("get-rooms") @UseGuards(SupabaseAuthGuard) - async getRooms(@CurrentUser() user: AuthUser): Promise { + async getRooms(@CurrentUser() user: AuthUser): Promise { return await this.gameInstanceService.getSpectatorRooms(user); } } diff --git a/apps/api/src/app/little-muncher/game-instance/game-instance.gateway.interface.ts b/apps/api/src/app/little-muncher/game-instance/game-instance.gateway.interface.ts index 969c151b..18e7de75 100644 --- a/apps/api/src/app/little-muncher/game-instance/game-instance.gateway.interface.ts +++ b/apps/api/src/app/little-muncher/game-instance/game-instance.gateway.interface.ts @@ -1,7 +1,7 @@ -import { RoomEvent, SpectatorEvent } from '@fuzzy-waddle/api-interfaces'; +import { LittleMuncherRoomEvent, LittleMuncherSpectatorEvent } from "@fuzzy-waddle/api-interfaces"; export interface GameInstanceGatewayInterface { - emitRoom(roomEvent: RoomEvent); + emitRoom(roomEvent: LittleMuncherRoomEvent); - emitSpectator(spectatorEvent: SpectatorEvent); + emitSpectator(spectatorEvent: LittleMuncherSpectatorEvent); } diff --git a/apps/api/src/app/little-muncher/game-instance/game-instance.gateway.ts b/apps/api/src/app/little-muncher/game-instance/game-instance.gateway.ts index 7673873c..829bad11 100644 --- a/apps/api/src/app/little-muncher/game-instance/game-instance.gateway.ts +++ b/apps/api/src/app/little-muncher/game-instance/game-instance.gateway.ts @@ -1,18 +1,17 @@ import { WebSocketGateway, WebSocketServer } from "@nestjs/websockets"; import { Server } from "net"; import { - GatewaySpectatorEvent, LittleMuncherGatewayEvent, - RoomEvent, - SpectatorEvent + LittleMuncherRoomEvent, + LittleMuncherSpectatorEvent } from "@fuzzy-waddle/api-interfaces"; import { GameInstanceGatewayInterface } from "./game-instance.gateway.interface"; export const GameInstanceGatewayStub = { - emitRoom(roomEvent: RoomEvent) { + emitRoom(roomEvent: LittleMuncherRoomEvent) { // }, - emitSpectator(spectatorEvent: SpectatorEvent) { + emitSpectator(spectatorEvent: LittleMuncherSpectatorEvent) { // } } satisfies GameInstanceGatewayInterface; @@ -23,14 +22,13 @@ export const GameInstanceGatewayStub = { } }) export class GameInstanceGateway implements GameInstanceGatewayInterface { - @WebSocketServer() - private server: Server; + @WebSocketServer() private readonly server: Server; - emitRoom(roomEvent: RoomEvent) { + emitRoom(roomEvent: LittleMuncherRoomEvent) { this.server.emit(LittleMuncherGatewayEvent.LittleMuncherRoom, roomEvent); } - emitSpectator(spectatorEvent: SpectatorEvent) { - this.server.emit(GatewaySpectatorEvent.Spectator, spectatorEvent); + emitSpectator(spectatorEvent: LittleMuncherSpectatorEvent) { + // todo??? this.server.emit(LittleMuncherGatewayEvent.Spectator, spectatorEvent); } } diff --git a/apps/api/src/app/little-muncher/game-instance/game-instance.service.interface.ts b/apps/api/src/app/little-muncher/game-instance/game-instance.service.interface.ts index ee3f6e8f..80747058 100644 --- a/apps/api/src/app/little-muncher/game-instance/game-instance.service.interface.ts +++ b/apps/api/src/app/little-muncher/game-instance/game-instance.service.interface.ts @@ -3,13 +3,13 @@ import { LittleMuncherGameCreateDto, LittleMuncherGameInstance, LittleMuncherGameInstanceData, - Room, + LittleMuncherRoom, + LittleMuncherRoomEvent, + LittleMuncherSpectatorEvent, RoomAction, - RoomEvent, - SpectatorAction, - SpectatorEvent -} from '@fuzzy-waddle/api-interfaces'; -import { User } from '@supabase/supabase-js'; + SpectatorAction +} from "@fuzzy-waddle/api-interfaces"; +import { User } from "@supabase/supabase-js"; export interface GameInstanceServiceInterface { startGame(body: GameInstanceDataDto, user: User); @@ -18,9 +18,18 @@ export interface GameInstanceServiceInterface { spectatorJoined(body: GameInstanceDataDto, user: User): Promise; spectatorLeft(body: GameInstanceDataDto, user: User); stopLevel(body: GameInstanceDataDto, user: User); - getSpectatorRooms(user: User): Promise; - getGameInstanceToRoom(gameInstance: LittleMuncherGameInstance): Room; - getRoomEvent(gameInstance: LittleMuncherGameInstance, action: RoomAction): RoomEvent; - getSpectatorEvent(user: User, room: Room, action: SpectatorAction): SpectatorEvent; + + getSpectatorRooms(user: User): Promise; + + getGameInstanceToRoom(gameInstance: LittleMuncherGameInstance): LittleMuncherRoom; + + getRoomEvent(gameInstance: LittleMuncherGameInstance, action: RoomAction): LittleMuncherRoomEvent; + + getSpectatorEvent( + user: User, + room: LittleMuncherRoom, + gameInstanceId: string, + action: SpectatorAction + ): LittleMuncherSpectatorEvent; findGameInstance(gameInstanceId: string): LittleMuncherGameInstance | undefined; } diff --git a/apps/api/src/app/little-muncher/game-instance/game-instance.service.spec.ts b/apps/api/src/app/little-muncher/game-instance/game-instance.service.spec.ts index e717ad43..0ee080df 100644 --- a/apps/api/src/app/little-muncher/game-instance/game-instance.service.spec.ts +++ b/apps/api/src/app/little-muncher/game-instance/game-instance.service.spec.ts @@ -5,11 +5,11 @@ import { LittleMuncherGameCreateDto, LittleMuncherGameInstance, LittleMuncherGameInstanceData, - Room, + LittleMuncherRoom, + LittleMuncherRoomEvent, + LittleMuncherSpectatorEvent, RoomAction, - RoomEvent, - SpectatorAction, - SpectatorEvent + SpectatorAction } from "@fuzzy-waddle/api-interfaces"; import { GameInstanceServiceInterface } from "./game-instance.service.interface"; import { User } from "../../../users/users.service"; @@ -25,16 +25,16 @@ export const GameInstanceServiceStub = { stopGame(body: GameInstanceDataDto, user: User) { // }, - getGameInstanceToRoom(gameInstance: LittleMuncherGameInstance): Room { + getGameInstanceToRoom(gameInstance: LittleMuncherGameInstance): LittleMuncherRoom { return undefined; }, - getRoomEvent(gameInstance: LittleMuncherGameInstance, action: RoomAction): RoomEvent { + getRoomEvent(gameInstance: LittleMuncherGameInstance, action: RoomAction): LittleMuncherRoomEvent { return undefined; }, - getSpectatorEvent(user: User, room: Room, action: SpectatorAction): SpectatorEvent { + getSpectatorEvent(user: User, room: LittleMuncherRoom, action: SpectatorAction): LittleMuncherSpectatorEvent { return undefined; }, - getSpectatorRooms(user: User): Promise { + getSpectatorRooms(user: User): Promise { return undefined; }, spectatorJoined(body: GameInstanceDataDto, user: User): Promise { diff --git a/apps/api/src/app/little-muncher/game-instance/game-instance.service.ts b/apps/api/src/app/little-muncher/game-instance/game-instance.service.ts index 74b32deb..76d6cb6d 100644 --- a/apps/api/src/app/little-muncher/game-instance/game-instance.service.ts +++ b/apps/api/src/app/little-muncher/game-instance/game-instance.service.ts @@ -1,20 +1,20 @@ -import { Injectable } from '@nestjs/common'; -import { User } from '@supabase/supabase-js'; +import { Injectable } from "@nestjs/common"; +import { User } from "@supabase/supabase-js"; import { GameInstanceDataDto, GameSessionState, LittleMuncherGameCreateDto, LittleMuncherGameInstance, LittleMuncherGameInstanceData, - Room, + LittleMuncherRoom, + LittleMuncherRoomEvent, + LittleMuncherSpectatorEvent, RoomAction, - RoomEvent, - SpectatorAction, - SpectatorEvent -} from '@fuzzy-waddle/api-interfaces'; -import { Cron, CronExpression } from '@nestjs/schedule'; -import { GameInstanceGateway } from './game-instance.gateway'; -import { GameInstanceServiceInterface } from './game-instance.service.interface'; + SpectatorAction +} from "@fuzzy-waddle/api-interfaces"; +import { Cron, CronExpression } from "@nestjs/schedule"; +import { GameInstanceGateway } from "./game-instance.gateway"; +import { GameInstanceServiceInterface } from "./game-instance.service.interface"; @Injectable() export class GameInstanceService implements GameInstanceServiceInterface { @@ -25,10 +25,10 @@ export class GameInstanceService implements GameInstanceServiceInterface { async startGame(body: GameInstanceDataDto, user: User) { const newGameInstance = new LittleMuncherGameInstance({ gameInstanceMetadataData: { gameInstanceId: body.gameInstanceId, createdBy: user.id }, - players: [{ userId: user.id }] + players: [{ playerControllerData: { userId: user.id } }] }); this.openGameInstances.push(newGameInstance); - console.log('game instance created on server', this.openGameInstances.length); + console.log("Little Muncher - Game instance created on server. Open instances: " + this.openGameInstances.length); } async stopGame(body: GameInstanceDataDto, user: User) { @@ -38,7 +38,7 @@ export class GameInstanceService implements GameInstanceServiceInterface { this.openGameInstances = this.openGameInstances.filter( (gameInstance) => gameInstance.gameInstanceMetadata.data.gameInstanceId !== body.gameInstanceId ); - console.log('game instance deleted on server', this.openGameInstances.length); + console.log("Little Muncher - Game instance deleted on server. Remaining: " + this.openGameInstances.length); } async startLevel(body: LittleMuncherGameCreateDto, user: User) { @@ -48,9 +48,9 @@ export class GameInstanceService implements GameInstanceServiceInterface { gameInstance.initGame({ hill: body.level.hill }); - gameInstance.gameInstanceMetadata.data.sessionState = GameSessionState.Playing; - console.log('game mode set on server', body.level.hill); - this.gameInstanceGateway.emitRoom(this.getRoomEvent(gameInstance, 'added')); + gameInstance.gameInstanceMetadata.data.sessionState = GameSessionState.InProgress; + console.log("Little Muncher - Game mode set on server", body.level.hill); + this.gameInstanceGateway.emitRoom(this.getRoomEvent(gameInstance, "added")); } async spectatorJoined(body: GameInstanceDataDto, user: User): Promise { @@ -59,9 +59,9 @@ export class GameInstanceService implements GameInstanceServiceInterface { gameInstance.initSpectator({ userId: user.id }); - console.log('spectator joined', user.id); + console.log("Little Muncher - Spectator joined", user.id); this.gameInstanceGateway.emitSpectator( - this.getSpectatorEvent(user, this.getGameInstanceToRoom(gameInstance), 'joined') + this.getSpectatorEvent(user, this.getGameInstanceToRoom(gameInstance), body.gameInstanceId, "joined") ); return gameInstance.data; } @@ -70,9 +70,9 @@ export class GameInstanceService implements GameInstanceServiceInterface { const gameInstance = this.findGameInstance(body.gameInstanceId); if (!gameInstance) return; gameInstance.removeSpectator(user.id); - console.log('spectator left', user.id); + console.log("Little Muncher - spectator left", user.id); this.gameInstanceGateway.emitSpectator( - this.getSpectatorEvent(user, this.getGameInstanceToRoom(gameInstance), 'left') + this.getSpectatorEvent(user, this.getGameInstanceToRoom(gameInstance), body.gameInstanceId, "left") ); } @@ -81,40 +81,46 @@ export class GameInstanceService implements GameInstanceServiceInterface { if (!gameInstance) return; if (!this.checkIfPlayerIsCreator(gameInstance, user)) return; gameInstance.stopLevel(); - console.log('game mode deleted on server'); + console.log("Little Muncher - Game mode deleted on server"); - this.gameInstanceGateway.emitRoom(this.getRoomEvent(gameInstance, 'removed')); + this.gameInstanceGateway.emitRoom(this.getRoomEvent(gameInstance, "removed")); } - async getSpectatorRooms(user: User): Promise { + async getSpectatorRooms(user: User): Promise { return this.openGameInstances .filter( (gi) => - gi.gameInstanceMetadata.data.sessionState === GameSessionState.Playing && + gi.gameInstanceMetadata.data.sessionState === GameSessionState.InProgress && gi.gameInstanceMetadata.data.createdBy !== user.id ) .map((gameInstance) => this.getGameInstanceToRoom(gameInstance)); } - getGameInstanceToRoom(gameInstance: LittleMuncherGameInstance): Room { + getGameInstanceToRoom(gameInstance: LittleMuncherGameInstance): LittleMuncherRoom { return { - gameInstanceId: gameInstance.gameInstanceMetadata.data.gameInstanceId + gameInstanceMetadataData: gameInstance.gameInstanceMetadata.data, + gameModeData: gameInstance.gameMode }; } - getRoomEvent(gameInstance: LittleMuncherGameInstance, action: RoomAction): RoomEvent { + getRoomEvent(gameInstance: LittleMuncherGameInstance, action: RoomAction): LittleMuncherRoomEvent { return { room: this.getGameInstanceToRoom(gameInstance), - action, - gameInstanceMetadataData: gameInstance.gameInstanceMetadata.data + action }; } - getSpectatorEvent(user: User, room: Room, action: SpectatorAction): SpectatorEvent { + getSpectatorEvent( + user: User, + room: LittleMuncherRoom, + gameInstanceId: string, + action: SpectatorAction + ): LittleMuncherSpectatorEvent { return { user_id: user.id, room, - action + action, + gameInstanceId }; } @@ -133,7 +139,7 @@ export class GameInstanceService implements GameInstanceServiceInterface { const lastUpdatedMoreThanNMinutesAgo = !lastUpdated || lastUpdated.getTime() + minutesAgo < now.getTime(); const isOld = startedMoreThanNMinutesAgo && lastUpdatedMoreThanNMinutesAgo; if (isOld) { - this.gameInstanceGateway.emitRoom(this.getRoomEvent(gi, 'removed')); + this.gameInstanceGateway.emitRoom(this.getRoomEvent(gi, "removed")); } return !isOld; }); diff --git a/apps/api/src/app/little-muncher/game-instance/game-state-server.service.spec.ts b/apps/api/src/app/little-muncher/game-instance/game-state-server.service.spec.ts index ca3ce96e..3eedda20 100644 --- a/apps/api/src/app/little-muncher/game-instance/game-state-server.service.spec.ts +++ b/apps/api/src/app/little-muncher/game-instance/game-state-server.service.spec.ts @@ -1,9 +1,9 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { GameStateServerService } from './game-state-server.service'; -import { GameInstanceService } from './game-instance.service'; -import { GameInstanceServiceStub } from './game-instance.service.spec'; +import { Test, TestingModule } from "@nestjs/testing"; +import { GameStateServerService } from "./game-state-server.service"; +import { GameInstanceService } from "./game-instance.service"; +import { GameInstanceServiceStub } from "./game-instance.service.spec"; -describe('GameStateServerService', () => { +describe("GameStateServerService", () => { let service: GameStateServerService; beforeEach(async () => { @@ -14,7 +14,7 @@ describe('GameStateServerService', () => { service = module.get(GameStateServerService); }); - it('should be defined', () => { + it("should be defined", () => { expect(service).toBeDefined(); }); }); diff --git a/apps/api/src/app/little-muncher/game-instance/game-state-server.service.ts b/apps/api/src/app/little-muncher/game-instance/game-state-server.service.ts index f4d91205..91666769 100644 --- a/apps/api/src/app/little-muncher/game-instance/game-state-server.service.ts +++ b/apps/api/src/app/little-muncher/game-instance/game-state-server.service.ts @@ -1,7 +1,7 @@ import { Injectable } from "@nestjs/common"; import { - LittleMuncherCommunicatorClimbingEvent, CommunicatorEvent, + LittleMuncherCommunicatorClimbingEvent, LittleMuncherCommunicatorPauseEvent, LittleMuncherCommunicatorScoreEvent, LittleMuncherCommunicatorType, @@ -13,7 +13,6 @@ import { User } from "@supabase/supabase-js"; @Injectable() export class GameStateServerService { constructor(private readonly gameInstanceService: GameInstanceService) {} - updateGameState(body: CommunicatorEvent, user: User): boolean { const gameInstance = this.gameInstanceService.findGameInstance(body.gameInstanceId); if (!gameInstance) { @@ -35,16 +34,18 @@ export class GameStateServerService { console.log("User is not a player in this game instance"); return false; } - gameInstance.gameState.data.climbedHeight = (body.data as LittleMuncherCommunicatorClimbingEvent).timeClimbing; - console.log("updating time climbing", body.data); + gameInstance.gameState.data.climbedHeight = ( + body.payload as LittleMuncherCommunicatorClimbingEvent + ).timeClimbing; + console.log("updating time climbing", body.payload); break; case "pause": if (!authUserPlayer) { console.log("User is not a player in this game instance"); return false; } - gameInstance.gameState.data.pause = (body.data as LittleMuncherCommunicatorPauseEvent).pause; - console.log("updating pause", body.data); + gameInstance.gameState.data.pause = (body.payload as LittleMuncherCommunicatorPauseEvent).pause; + console.log("updating pause", body.payload); console.log("pausing game"); break; case "reset": @@ -61,16 +62,16 @@ export class GameStateServerService { console.log("User is not a player in this game instance"); return false; } - player.playerState.data.score = (body.data as LittleMuncherCommunicatorScoreEvent).score; - console.log("updating score", body.data); + player.playerState.data.score = (body.payload as LittleMuncherCommunicatorScoreEvent).score; + console.log("updating score", body.payload); break; case "move": if (!authUserPlayer) { console.log("User is not a player in this game instance"); return false; } - player.playerState.data.position = body.data as LittleMuncherPosition; - console.log("updating position", body.data); + player.playerState.data.position = body.payload as LittleMuncherPosition; + console.log("updating position", body.payload); break; default: throw new Error("Unknown communicator"); diff --git a/apps/api/src/app/little-muncher/game-instance/game-state.gateway.ts b/apps/api/src/app/little-muncher/game-instance/game-state.gateway.ts index 6d6de300..1195f94b 100644 --- a/apps/api/src/app/little-muncher/game-instance/game-state.gateway.ts +++ b/apps/api/src/app/little-muncher/game-instance/game-state.gateway.ts @@ -1,26 +1,23 @@ -import { ConnectedSocket, MessageBody, SubscribeMessage, WebSocketGateway, WebSocketServer } from '@nestjs/websockets'; -import { Server, Socket } from 'net'; -import { UseGuards } from '@nestjs/common'; -import { SupabaseAuthGuard } from '../../../auth/guards/supabase-auth.guard'; -import { CurrentUser } from '../../../auth/current-user'; -import { AuthUser } from '@supabase/supabase-js'; +import { ConnectedSocket, MessageBody, SubscribeMessage, WebSocketGateway, WebSocketServer } from "@nestjs/websockets"; +import { UseGuards } from "@nestjs/common"; +import { SupabaseAuthGuard } from "../../../auth/guards/supabase-auth.guard"; +import { CurrentUser } from "../../../auth/current-user"; +import { AuthUser } from "@supabase/supabase-js"; import { CommunicatorEvent, LittleMuncherCommunicatorType, LittleMuncherGatewayEvent -} from '@fuzzy-waddle/api-interfaces'; -import { GameStateServerService } from './game-state-server.service'; - -export type MyConnectedSocket = Socket & { broadcast: { emit: (event: string, data: any) => void } }; +} from "@fuzzy-waddle/api-interfaces"; +import { GameStateServerService } from "./game-state-server.service"; +import { Server, Socket } from "socket.io"; @WebSocketGateway({ cors: { - origin: process.env.CORS_ORIGIN?.split(',') + origin: process.env.CORS_ORIGIN?.split(",") } }) export class GameStateGateway { - @WebSocketServer() - private server: Server; + @WebSocketServer() private readonly server: Server; constructor(private readonly gameStateServerService: GameStateServerService) {} @@ -29,13 +26,13 @@ export class GameStateGateway { async broadcastLittleMuncherAction( @CurrentUser() user: AuthUser, @MessageBody() payload: CommunicatorEvent, - @ConnectedSocket() client: MyConnectedSocket + @ConnectedSocket() socket: Socket ) { - console.log('broadcasting little muncher action', payload.communicator); + console.log("Little Muncher - Action", payload.communicator); const success = this.gameStateServerService.updateGameState(payload, user); if (success) { - client.broadcast.emit(LittleMuncherGatewayEvent.LittleMuncherAction, payload); + socket.broadcast.emit(LittleMuncherGatewayEvent.LittleMuncherAction, payload); } else { // 400 error } diff --git a/apps/api/src/app/little-muncher/little-muncher.module.ts b/apps/api/src/app/little-muncher/little-muncher.module.ts index 7ed49e39..4fd24ab1 100644 --- a/apps/api/src/app/little-muncher/little-muncher.module.ts +++ b/apps/api/src/app/little-muncher/little-muncher.module.ts @@ -1,9 +1,9 @@ -import { Module } from '@nestjs/common'; -import { GameInstanceController } from './game-instance/game-instance.controller'; -import { GameInstanceService } from './game-instance/game-instance.service'; -import { GameInstanceGateway } from './game-instance/game-instance.gateway'; -import { GameStateServerService } from './game-instance/game-state-server.service'; -import { GameStateGateway } from './game-instance/game-state.gateway'; +import { Module } from "@nestjs/common"; +import { GameInstanceController } from "./game-instance/game-instance.controller"; +import { GameInstanceService } from "./game-instance/game-instance.service"; +import { GameInstanceGateway } from "./game-instance/game-instance.gateway"; +import { GameStateServerService } from "./game-instance/game-state-server.service"; +import { GameStateGateway } from "./game-instance/game-state.gateway"; @Module({ providers: [GameInstanceGateway, GameStateGateway, GameInstanceService, GameStateServerService], diff --git a/apps/api/src/app/probable-waffle/chat/probable-waffle-chat.service.spec.ts b/apps/api/src/app/probable-waffle/chat/probable-waffle-chat.service.spec.ts new file mode 100644 index 00000000..84f7551c --- /dev/null +++ b/apps/api/src/app/probable-waffle/chat/probable-waffle-chat.service.spec.ts @@ -0,0 +1,23 @@ +import { Test, TestingModule } from "@nestjs/testing"; +import { ProbableWaffleChatService } from "./probable-waffle-chat.service"; +import { TextSanitizationService } from "../../../core/content-filters/text-sanitization.service"; +import { textSanitizationServiceStub } from "../../../core/content-filters/text-sanitization.service.spec"; + +describe("ProbableWaffleChatService", () => { + let service: ProbableWaffleChatService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [ + ProbableWaffleChatService, + { provide: TextSanitizationService, useValue: textSanitizationServiceStub } + ] + }).compile(); + + service = module.get(ProbableWaffleChatService); + }); + + it("should be defined", () => { + expect(service).toBeDefined(); + }); +}); diff --git a/apps/api/src/app/probable-waffle/chat/probable-waffle-chat.service.ts b/apps/api/src/app/probable-waffle/chat/probable-waffle-chat.service.ts new file mode 100644 index 00000000..8ecae764 --- /dev/null +++ b/apps/api/src/app/probable-waffle/chat/probable-waffle-chat.service.ts @@ -0,0 +1,11 @@ +import { Injectable } from "@nestjs/common"; +import { TextSanitizationService } from "../../../core/content-filters/text-sanitization.service"; + +@Injectable() +export class ProbableWaffleChatService { + constructor(private readonly textSanitizationService: TextSanitizationService) {} + + cleanMessage(message: string): string { + return this.textSanitizationService.cleanBadWords(message); + } +} diff --git a/apps/api/src/app/probable-waffle/game-instance/game-instance-holder.service.spec.ts b/apps/api/src/app/probable-waffle/game-instance/game-instance-holder.service.spec.ts new file mode 100644 index 00000000..33eb8439 --- /dev/null +++ b/apps/api/src/app/probable-waffle/game-instance/game-instance-holder.service.spec.ts @@ -0,0 +1,18 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { GameInstanceHolderService } from './game-instance-holder.service'; + +describe('GameInstanceHolderService', () => { + let service: GameInstanceHolderService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [GameInstanceHolderService], + }).compile(); + + service = module.get(GameInstanceHolderService); + }); + + it('should be defined', () => { + expect(service).toBeDefined(); + }); +}); diff --git a/apps/api/src/app/probable-waffle/game-instance/game-instance-holder.service.ts b/apps/api/src/app/probable-waffle/game-instance/game-instance-holder.service.ts new file mode 100644 index 00000000..b85e63e5 --- /dev/null +++ b/apps/api/src/app/probable-waffle/game-instance/game-instance-holder.service.ts @@ -0,0 +1,27 @@ +import { Injectable } from "@nestjs/common"; +import { ProbableWaffleGameInstance } from "@fuzzy-waddle/api-interfaces"; + +@Injectable() +export class GameInstanceHolderService { + private _openGameInstances: ProbableWaffleGameInstance[] = []; + + get openGameInstances(): ProbableWaffleGameInstance[] { + return this._openGameInstances; + } + + removeGameInstance(gameInstanceId: string) { + this._openGameInstances = this.openGameInstances.filter( + (gi) => gi.gameInstanceMetadata.data.gameInstanceId !== gameInstanceId + ); + } + + addGameInstance(gameInstance: ProbableWaffleGameInstance) { + this._openGameInstances.push(gameInstance); + } + + findGameInstance(gameInstanceId: string): ProbableWaffleGameInstance | undefined { + return this.openGameInstances.find( + (gameInstance) => gameInstance.gameInstanceMetadata.data.gameInstanceId === gameInstanceId + ); + } +} diff --git a/apps/api/src/app/probable-waffle/game-instance/game-instance.controller.spec.ts b/apps/api/src/app/probable-waffle/game-instance/game-instance.controller.spec.ts new file mode 100644 index 00000000..047a7997 --- /dev/null +++ b/apps/api/src/app/probable-waffle/game-instance/game-instance.controller.spec.ts @@ -0,0 +1,26 @@ +import { Test, TestingModule } from "@nestjs/testing"; +import { GameInstanceController } from "./game-instance.controller"; +import { GameInstanceService } from "./game-instance.service"; +import { GameInstanceServiceStub } from "./game-instance.service.spec"; +import { MatchmakingService } from "../matchmaking/matchmaking.service"; +import { matchmakingServiceStub } from "../matchmaking/matchmaking.service.spec"; + +describe("GameInstanceController", () => { + let controller: GameInstanceController; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [ + { provide: GameInstanceService, useValue: GameInstanceServiceStub }, + { provide: MatchmakingService, useValue: matchmakingServiceStub } + ], + controllers: [GameInstanceController] + }).compile(); + + controller = module.get(GameInstanceController); + }); + + it("should be defined", () => { + expect(controller).toBeDefined(); + }); +}); diff --git a/apps/api/src/app/probable-waffle/game-instance/game-instance.controller.ts b/apps/api/src/app/probable-waffle/game-instance/game-instance.controller.ts new file mode 100644 index 00000000..8ec292e6 --- /dev/null +++ b/apps/api/src/app/probable-waffle/game-instance/game-instance.controller.ts @@ -0,0 +1,25 @@ +import { Body, Controller, Get, Post, Query, UseGuards } from "@nestjs/common"; +import { SupabaseAuthGuard } from "../../../auth/guards/supabase-auth.guard"; +import { CurrentUser } from "../../../auth/current-user"; +import { AuthUser } from "@supabase/supabase-js"; +import { GameInstanceService } from "./game-instance.service"; +import { ProbableWaffleGameInstanceData, ProbableWaffleGameInstanceMetadataData } from "@fuzzy-waddle/api-interfaces"; + +@Controller("probable-waffle") +export class GameInstanceController { + constructor(private readonly gameInstanceService: GameInstanceService) {} + @Post("start-game") + @UseGuards(SupabaseAuthGuard) + async startGame(@CurrentUser() user: AuthUser, @Body() body: ProbableWaffleGameInstanceMetadataData): Promise { + await this.gameInstanceService.createGameInstance(body, user); + } + + @Get("get-game-instance") + @UseGuards(SupabaseAuthGuard) + async getGameInstance( + @CurrentUser() user: AuthUser, + @Query("gameInstanceId") gameInstanceId: string + ): Promise { + return this.gameInstanceService.getGameInstanceData(gameInstanceId); + } +} diff --git a/apps/api/src/app/probable-waffle/game-instance/game-instance.gateway.ts b/apps/api/src/app/probable-waffle/game-instance/game-instance.gateway.ts new file mode 100644 index 00000000..fec8d571 --- /dev/null +++ b/apps/api/src/app/probable-waffle/game-instance/game-instance.gateway.ts @@ -0,0 +1,117 @@ +import { ConnectedSocket, MessageBody, SubscribeMessage, WebSocketGateway, WebSocketServer } from "@nestjs/websockets"; +import { Server, Socket } from "socket.io"; +import { + CommunicatorEvent, + ProbableWaffleCommunicatorMessageEvent, + ProbableWaffleCommunicatorType, + ProbableWaffleGameFoundEvent, + ProbableWaffleGameInstanceEvent, + ProbableWaffleGatewayEvent, + ProbableWaffleGatewayRoomTypes, + ProbableWaffleWebsocketRoomEvent +} from "@fuzzy-waddle/api-interfaces"; +import { ProbableWaffleChatService } from "../chat/probable-waffle-chat.service"; +import { UseGuards } from "@nestjs/common"; +import { AuthUser } from "@supabase/supabase-js"; +import { SupabaseAuthGuard } from "../../../auth/guards/supabase-auth.guard"; +import { CurrentUser } from "../../../auth/current-user"; +import { GameStateServerService } from "./game-state-server.service"; +import { RoomServerService } from "../game-room/room-server.service"; + +@WebSocketGateway({ + cors: { + origin: process.env.CORS_ORIGIN?.split(",") + } +}) +export class GameInstanceGateway { + @WebSocketServer() private readonly server: Server; + + constructor( + private readonly gameStateServerService: GameStateServerService, + private readonly probableWaffleChatService: ProbableWaffleChatService, + private readonly roomServerService: RoomServerService + ) {} + + emitGameFound(probableWaffleGameFoundEvent: ProbableWaffleGameFoundEvent) { + this.server.emit(ProbableWaffleGameInstanceEvent.GameFound, probableWaffleGameFoundEvent); + } + + @UseGuards(SupabaseAuthGuard) + @SubscribeMessage(ProbableWaffleGatewayEvent.ProbableWaffleAction) + async broadcastProbableWaffleAction( + @CurrentUser() user: AuthUser, + @MessageBody() body: CommunicatorEvent, + @ConnectedSocket() socket: Socket + ) { + console.log("Probable Waffle - GI action:", body.communicator, body.payload); + + const success = this.gameStateServerService.updateGameState(body, user); + if (success) { + // https://socket.io/docs/v3/emit-cheatsheet/ + socket + .to(`${ProbableWaffleGatewayRoomTypes.ProbableWaffleGameInstance}${body.gameInstanceId}`) + .emit(ProbableWaffleGatewayEvent.ProbableWaffleAction, body); + + this.roomServerService.emitCertainGameInstanceEventsToAllUsers(body, user); + } else { + // 400 error + } + } + + @UseGuards(SupabaseAuthGuard) + @SubscribeMessage(ProbableWaffleGatewayEvent.ProbableWaffleMessage) + async broadcastProbableWaffleMessage( + @CurrentUser() user: AuthUser, + @MessageBody() body: CommunicatorEvent, + @ConnectedSocket() socket: Socket + ) { + console.log(`Probable Waffle - GI chat message ${body.gameInstanceId}`); + + // clone the payload + const newPayload = { ...body }; + + switch (newPayload.communicator) { + case "message": + const body = newPayload.payload as ProbableWaffleCommunicatorMessageEvent; + const sanitizedMessage = this.probableWaffleChatService.cleanMessage(body.chatMessage.text); + body.chatMessage.text = sanitizedMessage; + + // https://socket.io/docs/v3/emit-cheatsheet/ + socket + .to(`${ProbableWaffleGatewayRoomTypes.ProbableWaffleGameInstance}${body.gameInstanceId}`) + .emit(ProbableWaffleGatewayEvent.ProbableWaffleMessage, newPayload); + break; + default: + throw new Error("Probable Waffle - Message broadcast - unknown communicator"); + } + } + + @UseGuards(SupabaseAuthGuard) + @SubscribeMessage(ProbableWaffleGatewayEvent.ProbableWaffleWebsocketRoom) + async broadcastProbableWaffleWebsocketRoom( + @CurrentUser() user: AuthUser, + @MessageBody() body: ProbableWaffleWebsocketRoomEvent, + @ConnectedSocket() socket: Socket + ) { + switch (body.type) { + case "join": + socket.join(`${ProbableWaffleGatewayRoomTypes.ProbableWaffleGameInstance}${body.gameInstanceId}`); + console.log( + user.id, + "joined room", + `${ProbableWaffleGatewayRoomTypes.ProbableWaffleGameInstance}${body.gameInstanceId}` + ); + break; + case "leave": + socket.leave(`${ProbableWaffleGatewayRoomTypes.ProbableWaffleGameInstance}${body.gameInstanceId}`); + console.log( + user.id, + "left room", + `${ProbableWaffleGatewayRoomTypes.ProbableWaffleGameInstance}${body.gameInstanceId}` + ); + break; + default: + throw new Error("Probable Waffle - Web socket room broadcast - unknown communicator"); + } + } +} diff --git a/apps/api/src/app/probable-waffle/game-instance/game-instance.service.interface.ts b/apps/api/src/app/probable-waffle/game-instance/game-instance.service.interface.ts new file mode 100644 index 00000000..2d115c80 --- /dev/null +++ b/apps/api/src/app/probable-waffle/game-instance/game-instance.service.interface.ts @@ -0,0 +1,19 @@ +import { + GameInstanceDataDto, + ProbableWaffleAddPlayerDto, + ProbableWaffleAddSpectatorDto, + ProbableWaffleChangeGameModeDto, + ProbableWaffleGameInstance, + ProbableWaffleGameInstanceData, + ProbableWaffleGameInstanceMetadataData, + ProbableWafflePlayerLeftDto, + ProbableWaffleStartLevelDto +} from "@fuzzy-waddle/api-interfaces"; +import { User } from "@supabase/supabase-js"; + +export interface GameInstanceServiceInterface { + createGameInstance(gameInstanceMetadataData: ProbableWaffleGameInstanceMetadataData, user: User); + stopGameInstance(gameInstanceId: string, user: User); + findGameInstance(gameInstanceId: string): ProbableWaffleGameInstance | undefined; + getGameInstanceData(gameInstanceId: string): ProbableWaffleGameInstanceData | null; +} diff --git a/apps/api/src/app/probable-waffle/game-instance/game-instance.service.spec.ts b/apps/api/src/app/probable-waffle/game-instance/game-instance.service.spec.ts new file mode 100644 index 00000000..4db569f4 --- /dev/null +++ b/apps/api/src/app/probable-waffle/game-instance/game-instance.service.spec.ts @@ -0,0 +1,58 @@ +import { Test, TestingModule } from "@nestjs/testing"; +import { GameInstanceService } from "./game-instance.service"; +import { + ProbableWaffleGameInstance, + ProbableWaffleGameInstanceData, + ProbableWaffleGameInstanceMetadataData +} from "@fuzzy-waddle/api-interfaces"; +import { GameInstanceServiceInterface } from "./game-instance.service.interface"; +import { User } from "../../../users/users.service"; +import { GameInstanceGateway } from "./game-instance.gateway"; +import { TextSanitizationService } from "../../../core/content-filters/text-sanitization.service"; +import { GameInstanceGatewayStub } from "../../little-muncher/game-instance/game-instance.gateway"; +import { RoomServerService } from "../game-room/room-server.service"; +import { roomServerServiceStub } from "../game-room/room-server.service.spec"; +import { GameInstanceHolderService } from "./game-instance-holder.service"; + +export const GameInstanceServiceStub = { + findGameInstance(gameInstanceId: string): ProbableWaffleGameInstance | undefined { + return undefined; + }, + createGameInstance(gameInstanceMetadataData: ProbableWaffleGameInstanceMetadataData, user: User) { + // + }, + getGameInstanceData(gameInstanceId: string): ProbableWaffleGameInstanceData | null { + return null; + }, + async stopGameInstance(gameInstanceId: string, user: User) { + // + } +} satisfies GameInstanceServiceInterface; + +describe("GameInstanceService", () => { + let service: GameInstanceService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [ + GameInstanceHolderService, + GameInstanceService, + { + provide: GameInstanceGateway, + useValue: GameInstanceGatewayStub + }, + { + provide: RoomServerService, + useValue: roomServerServiceStub + }, + TextSanitizationService + ] + }).compile(); + + service = module.get(GameInstanceService); + }); + + it("should be defined", () => { + expect(service).toBeDefined(); + }); +}); diff --git a/apps/api/src/app/probable-waffle/game-instance/game-instance.service.ts b/apps/api/src/app/probable-waffle/game-instance/game-instance.service.ts new file mode 100644 index 00000000..059150bc --- /dev/null +++ b/apps/api/src/app/probable-waffle/game-instance/game-instance.service.ts @@ -0,0 +1,114 @@ +import { Injectable } from "@nestjs/common"; +import { User } from "@supabase/supabase-js"; +import { + DifficultyModifiers, + MapTuning, + ProbableWaffleGameInstance, + ProbableWaffleGameInstanceData, + ProbableWaffleGameInstanceMetadataData, + ProbableWaffleGameModeData, + ProbableWaffleGameStateData, + WinConditions +} from "@fuzzy-waddle/api-interfaces"; +import { Cron, CronExpression } from "@nestjs/schedule"; +import { GameInstanceServiceInterface } from "./game-instance.service.interface"; +import { TextSanitizationService } from "../../../core/content-filters/text-sanitization.service"; +import { RoomServerService } from "../game-room/room-server.service"; +import { GameInstanceHolderService } from "./game-instance-holder.service"; + +@Injectable() +export class GameInstanceService implements GameInstanceServiceInterface { + constructor( + private readonly roomServerService: RoomServerService, + private readonly gameInstanceHolderService: GameInstanceHolderService, + private readonly textSanitizationService: TextSanitizationService + ) {} + + addGameInstance(gameInstance: ProbableWaffleGameInstance, user: User): void { + this.gameInstanceHolderService.addGameInstance(gameInstance); + this.roomServerService.roomEvent("added", gameInstance, user); + console.log( + "Probable Waffle - Game instance added. Open instances: " + + this.gameInstanceHolderService.openGameInstances.length + ); + } + + async createGameInstance(gameInstanceMetadataData: ProbableWaffleGameInstanceMetadataData, user: User) { + if (gameInstanceMetadataData.createdBy !== user.id) + throw new Error("Probable Waffle - createGameInstance - createdBy must be the same as user id"); + const newGameInstance = new ProbableWaffleGameInstance({ + gameInstanceMetadataData: this.sanitizeGameInstanceMetadataData(gameInstanceMetadataData), + gameModeData: { + winConditions: {} satisfies WinConditions, + mapTuning: {} satisfies MapTuning, + difficultyModifiers: {} satisfies DifficultyModifiers + } satisfies ProbableWaffleGameModeData, + gameStateData: {} as ProbableWaffleGameStateData + }); + this.addGameInstance(newGameInstance, user); + + console.log( + "Probable Waffle - game instance created. Open instances: " + + this.gameInstanceHolderService.openGameInstances.length + ); + } + + stopGameInstance(gameInstanceId: string, user: User) { + const gameInstance = this.findGameInstance(gameInstanceId); + if (!gameInstance) return; + if (!this.checkIfPlayerIsCreator(gameInstance, user)) return; + this.gameInstanceHolderService.removeGameInstance(gameInstanceId); + this.roomServerService.roomEvent("removed", gameInstance, user); + console.log( + "Probable Waffle - game instance deleted. Remaining: " + this.gameInstanceHolderService.openGameInstances.length + ); + } + + /** + * remove game instances that have been started more than N time ago + */ + @Cron(CronExpression.EVERY_2_HOURS) + handleCron() { + const toRemove = this.gameInstanceHolderService.openGameInstances.filter((gi) => { + const minutesAgo = 1000 * 60 * 15; // 15 minutes + const started = gi.gameInstanceMetadata.data.createdOn; + const lastUpdated = gi.gameInstanceMetadata.data.updatedOn; + const now = new Date(); + // is old if started is more than N minutes ago and lastUpdated is null or more than N minutes ago + const startedMoreThanNMinutesAgo = started.getTime() + minutesAgo < now.getTime(); + const lastUpdatedMoreThanNMinutesAgo = !lastUpdated || lastUpdated.getTime() + minutesAgo < now.getTime(); + const isOld = startedMoreThanNMinutesAgo && lastUpdatedMoreThanNMinutesAgo; + if (isOld) { + this.roomServerService.roomEvent("removed", gi, null); + console.log("Probable Waffle - Cron - Game instance removed"); + } + return !isOld; + }); + toRemove.forEach((gi) => + this.gameInstanceHolderService.removeGameInstance(gi.gameInstanceMetadata.data.gameInstanceId) + ); + } + + findGameInstance(gameInstanceId: string): ProbableWaffleGameInstance | undefined { + return this.gameInstanceHolderService.findGameInstance(gameInstanceId); + } + + private checkIfPlayerIsCreator(gameInstance: ProbableWaffleGameInstance, user: User) { + return gameInstance.gameInstanceMetadata.data.createdBy === user.id; + } + + getGameInstanceData(gameInstanceId: string): ProbableWaffleGameInstanceData | null { + const gameInstance = this.findGameInstance(gameInstanceId); + if (!gameInstance) return; + return gameInstance.data; + } + + private sanitizeGameInstanceMetadataData( + gameInstanceMetadataData: ProbableWaffleGameInstanceMetadataData + ): ProbableWaffleGameInstanceMetadataData { + return { + ...gameInstanceMetadataData, + name: this.textSanitizationService.cleanBadWords(gameInstanceMetadataData.name) + }; + } +} diff --git a/apps/api/src/app/probable-waffle/game-instance/game-state-server.service.spec.ts b/apps/api/src/app/probable-waffle/game-instance/game-state-server.service.spec.ts new file mode 100644 index 00000000..3eedda20 --- /dev/null +++ b/apps/api/src/app/probable-waffle/game-instance/game-state-server.service.spec.ts @@ -0,0 +1,20 @@ +import { Test, TestingModule } from "@nestjs/testing"; +import { GameStateServerService } from "./game-state-server.service"; +import { GameInstanceService } from "./game-instance.service"; +import { GameInstanceServiceStub } from "./game-instance.service.spec"; + +describe("GameStateServerService", () => { + let service: GameStateServerService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [GameStateServerService, { provide: GameInstanceService, useValue: GameInstanceServiceStub }] + }).compile(); + + service = module.get(GameStateServerService); + }); + + it("should be defined", () => { + expect(service).toBeDefined(); + }); +}); diff --git a/apps/api/src/app/probable-waffle/game-instance/game-state-server.service.ts b/apps/api/src/app/probable-waffle/game-instance/game-state-server.service.ts new file mode 100644 index 00000000..3c0ff065 --- /dev/null +++ b/apps/api/src/app/probable-waffle/game-instance/game-state-server.service.ts @@ -0,0 +1,59 @@ +import { Injectable } from "@nestjs/common"; +import { + CommunicatorEvent, + GameSessionState, + ProbableWaffleCommunicatorType, + ProbableWaffleGameInstanceMetadataChangeEvent, + ProbableWaffleGameModeDataChangeEvent, + ProbableWaffleListeners, + ProbableWafflePlayerDataChangeEvent, + ProbableWaffleSpectatorDataChangeEvent +} from "@fuzzy-waddle/api-interfaces"; +import { GameInstanceService } from "./game-instance.service"; +import { User } from "@supabase/supabase-js"; + +@Injectable() +export class GameStateServerService { + constructor(private readonly gameInstanceService: GameInstanceService) {} + + updateGameState(body: CommunicatorEvent, user: User): boolean { + const gameInstance = this.gameInstanceService.findGameInstance(body.gameInstanceId); + if (!gameInstance) { + console.log("game instance not found"); + return false; + } + + gameInstance.gameInstanceMetadata.data.updatedOn = new Date(); + + switch (body.communicator) { + case "gameInstanceMetadataDataChange": + const giMetadata = body.payload as ProbableWaffleGameInstanceMetadataChangeEvent; + ProbableWaffleListeners.gameInstanceMetadataChanged(gameInstance, giMetadata); + switch (giMetadata.property) { + case "sessionState": + switch (giMetadata.data.sessionState) { + case GameSessionState.Stopped: + this.gameInstanceService.stopGameInstance(body.gameInstanceId, user); + break; + } + break; + } + break; + case "gameModeDataChange": + const gmData = body.payload as ProbableWaffleGameModeDataChangeEvent; + ProbableWaffleListeners.gameModeChanged(gameInstance, gmData); + break; + case "playerDataChange": + const playerData = body.payload as ProbableWafflePlayerDataChangeEvent; + ProbableWaffleListeners.playerChanged(gameInstance, playerData); + break; + case "spectatorDataChange": + const spectatorData = body.payload as ProbableWaffleSpectatorDataChangeEvent; + ProbableWaffleListeners.spectatorChanged(gameInstance, spectatorData); + break; + default: + throw new Error("Unknown communicator"); + } + return true; + } +} diff --git a/apps/api/src/app/probable-waffle/game-room/room-server.service.interface.ts b/apps/api/src/app/probable-waffle/game-room/room-server.service.interface.ts new file mode 100644 index 00000000..9a8fbcfe --- /dev/null +++ b/apps/api/src/app/probable-waffle/game-room/room-server.service.interface.ts @@ -0,0 +1,18 @@ +import { User } from "@supabase/supabase-js"; +import { + CommunicatorEvent, + ProbableWaffleCommunicatorType, + ProbableWaffleGameInstance, + ProbableWaffleGetRoomsDto, + ProbableWaffleRoom, + RoomAction +} from "@fuzzy-waddle/api-interfaces"; + +export interface RoomServerServiceInterface { + getVisibleRooms(user: User, body: ProbableWaffleGetRoomsDto): Promise; + roomEvent(type: RoomAction, gameInstance: ProbableWaffleGameInstance, user: User | null): void; + emitCertainGameInstanceEventsToAllUsers( + body: CommunicatorEvent, + user: User + ): void; +} diff --git a/apps/api/src/app/probable-waffle/game-room/room-server.service.spec.ts b/apps/api/src/app/probable-waffle/game-room/room-server.service.spec.ts new file mode 100644 index 00000000..9084f036 --- /dev/null +++ b/apps/api/src/app/probable-waffle/game-room/room-server.service.spec.ts @@ -0,0 +1,45 @@ +import { Test, TestingModule } from "@nestjs/testing"; +import { RoomServerService } from "./room-server.service"; +import { + CommunicatorEvent, + ProbableWaffleCommunicatorType, + ProbableWaffleGameInstance, + ProbableWaffleGetRoomsDto, + ProbableWaffleRoom, + RoomAction +} from "@fuzzy-waddle/api-interfaces"; +import { User } from "@supabase/supabase-js"; +import { RoomServerServiceInterface } from "./room-server.service.interface"; +import { RoomGateway } from "./room.gateway"; +import { GameInstanceHolderService } from "../game-instance/game-instance-holder.service"; + +export const roomServerServiceStub = { + getVisibleRooms(user: User, body: ProbableWaffleGetRoomsDto): Promise { + return Promise.resolve([]); + }, + roomEvent(type: RoomAction, gameInstance: ProbableWaffleGameInstance, user: User | null): void { + // + }, + emitCertainGameInstanceEventsToAllUsers( + body: CommunicatorEvent, + user: User + ): void { + // + } +} satisfies RoomServerServiceInterface; + +describe("RoomServerService", () => { + let service: RoomServerService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [RoomServerService, RoomGateway, GameInstanceHolderService] + }).compile(); + + service = module.get(RoomServerService); + }); + + it("should be defined", () => { + expect(service).toBeDefined(); + }); +}); diff --git a/apps/api/src/app/probable-waffle/game-room/room-server.service.ts b/apps/api/src/app/probable-waffle/game-room/room-server.service.ts new file mode 100644 index 00000000..d9a74b79 --- /dev/null +++ b/apps/api/src/app/probable-waffle/game-room/room-server.service.ts @@ -0,0 +1,98 @@ +import { Injectable } from "@nestjs/common"; +import { RoomGateway } from "./room.gateway"; +import { + CommunicatorEvent, + GameSessionState, + ProbableWaffleCommunicatorType, + ProbableWaffleGameInstance, + ProbableWaffleGameInstanceVisibility, + ProbableWaffleGetRoomsDto, + ProbableWafflePlayerDataChangeEvent, + ProbableWaffleRoom, + ProbableWaffleRoomEvent, + ProbableWaffleSpectatorDataChangeEvent, + RoomAction +} from "@fuzzy-waddle/api-interfaces"; +import { User } from "@supabase/supabase-js"; +import { GameInstanceHolderService } from "../game-instance/game-instance-holder.service"; +import { RoomServerServiceInterface } from "./room-server.service.interface"; + +@Injectable() +export class RoomServerService implements RoomServerServiceInterface { + constructor( + private readonly roomGateway: RoomGateway, + private readonly gameInstanceHolderService: GameInstanceHolderService + ) {} + + async getVisibleRooms(user: User, body: ProbableWaffleGetRoomsDto): Promise { + const notStarted = this.gameInstanceHolderService.openGameInstances.filter( + (gi) => gi.gameInstanceMetadata.data.sessionState === GameSessionState.NotStarted + ); + const visible = notStarted.filter( + (gi) => gi.gameInstanceMetadata.data.visibility === ProbableWaffleGameInstanceVisibility.Public + ); + const notCreatedByUser = visible.filter((gi) => gi.gameInstanceMetadata.data.createdBy !== user.id); + const filteredByMap = notCreatedByUser.filter( + (gi) => !gi.gameMode || (body.maps?.includes(gi.gameMode.data.map) ?? true) + ); + // noinspection UnnecessaryLocalVariableJS + const gameInstanceToRoom = filteredByMap.map((gameInstance) => this.getGameInstanceToRoom(gameInstance)); + return gameInstanceToRoom; + } + + roomEvent(type: RoomAction, gameInstance: ProbableWaffleGameInstance, user: User | null) { + this.roomGateway.emitRoom({ + room: this.getGameInstanceToRoom(gameInstance), + action: type + } satisfies ProbableWaffleRoomEvent); + } + + private getGameInstanceToRoom(gameInstance: ProbableWaffleGameInstance): ProbableWaffleRoom { + return { + gameInstanceMetadataData: gameInstance.gameInstanceMetadata.data, + gameModeData: gameInstance.gameMode?.data, + players: gameInstance.players.map((player) => ({ + controllerData: player.playerController.data + })), + spectators: gameInstance.spectators.map((spectator) => spectator.data) + }; + } + + emitCertainGameInstanceEventsToAllUsers(body: CommunicatorEvent, user: User) { + const gameInstance = this.gameInstanceHolderService.findGameInstance(body.gameInstanceId); + if (!gameInstance) { + console.log("game instance not found"); + return false; + } + switch (body.communicator) { + case "gameInstanceMetadataDataChange": + this.roomEvent("game_instance_metadata", gameInstance, user); + break; + case "gameModeDataChange": + this.roomEvent("game_mode", gameInstance, user); + break; + case "playerDataChange": + const playerData = body.payload as ProbableWafflePlayerDataChangeEvent; + switch (playerData.property) { + case "joined": + this.roomEvent("player.joined", gameInstance, user); + break; + case "left": + this.roomEvent("player.left", gameInstance, user); + break; + } + break; + case "spectatorDataChange": + const spectatorData = body.payload as ProbableWaffleSpectatorDataChangeEvent; + switch (spectatorData.property) { + case "joined": + this.roomEvent("spectator.joined", gameInstance, user); + break; + case "left": + this.roomEvent("spectator.left", gameInstance, user); + break; + } + break; + } + } +} diff --git a/apps/api/src/app/probable-waffle/game-room/room.controller.spec.ts b/apps/api/src/app/probable-waffle/game-room/room.controller.spec.ts new file mode 100644 index 00000000..8fb5a4f1 --- /dev/null +++ b/apps/api/src/app/probable-waffle/game-room/room.controller.spec.ts @@ -0,0 +1,25 @@ +import { Test, TestingModule } from "@nestjs/testing"; +import { RoomController } from "./room.controller"; +import { RoomService, roomServiceStub } from "../../game-session/room/room.service"; +import { RoomServerService } from "./room-server.service"; +import { roomServerServiceStub } from "./room-server.service.spec"; + +describe("RoomController", () => { + let controller: RoomController; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + controllers: [RoomController], + providers: [ + { provide: RoomService, useValue: roomServiceStub }, + { provide: RoomServerService, useValue: roomServerServiceStub } + ] + }).compile(); + + controller = module.get(RoomController); + }); + + it("should be defined", () => { + expect(controller).toBeDefined(); + }); +}); diff --git a/apps/api/src/app/probable-waffle/game-room/room.controller.ts b/apps/api/src/app/probable-waffle/game-room/room.controller.ts new file mode 100644 index 00000000..a8a763ad --- /dev/null +++ b/apps/api/src/app/probable-waffle/game-room/room.controller.ts @@ -0,0 +1,29 @@ +import { Body, Controller, Post, UseGuards } from "@nestjs/common"; +import { SupabaseAuthGuard } from "../../../auth/guards/supabase-auth.guard"; +import { CurrentUser } from "../../../auth/current-user"; +import { AuthUser } from "@supabase/supabase-js"; +import { ProbableWaffleGetRoomsDto, ProbableWaffleRoom } from "@fuzzy-waddle/api-interfaces"; +import { RoomServerService } from "./room-server.service"; + +@Controller("probable-waffle") +export class RoomController { + constructor(private readonly roomServerService: RoomServerService) {} + + // @Post("join-room") + // @UseGuards(SupabaseAuthGuard) + // async joinRoom( + // @CurrentUser() user: AuthUser, + // @Body() body: ProbableWaffleJoinDto + // ): Promise { + // return await this.roomServerService.joinRoom(body, user); + // } + + @Post("get-rooms") + @UseGuards(SupabaseAuthGuard) + async getRooms( + @CurrentUser() user: AuthUser, + @Body() body: ProbableWaffleGetRoomsDto + ): Promise { + return await this.roomServerService.getVisibleRooms(user, body); + } +} diff --git a/apps/api/src/app/probable-waffle/game-room/room.gateway.ts b/apps/api/src/app/probable-waffle/game-room/room.gateway.ts new file mode 100644 index 00000000..300e8090 --- /dev/null +++ b/apps/api/src/app/probable-waffle/game-room/room.gateway.ts @@ -0,0 +1,16 @@ +import { WebSocketGateway, WebSocketServer } from "@nestjs/websockets"; +import { ProbableWaffleGatewayEvent, ProbableWaffleRoomEvent } from "@fuzzy-waddle/api-interfaces"; +import { Server } from "socket.io"; + +@WebSocketGateway({ + cors: { + origin: process.env.CORS_ORIGIN?.split(",") + } +}) +export class RoomGateway { + @WebSocketServer() private readonly server: Server; + + emitRoom(roomEvent: ProbableWaffleRoomEvent) { + this.server.emit(ProbableWaffleGatewayEvent.ProbableWaffleRoom, roomEvent); + } +} diff --git a/apps/api/src/app/probable-waffle/matchmaking/matchmaking.controller.spec.ts b/apps/api/src/app/probable-waffle/matchmaking/matchmaking.controller.spec.ts new file mode 100644 index 00000000..7d84c343 --- /dev/null +++ b/apps/api/src/app/probable-waffle/matchmaking/matchmaking.controller.spec.ts @@ -0,0 +1,21 @@ +import { Test, TestingModule } from "@nestjs/testing"; +import { MatchmakingController } from "./matchmaking.controller"; +import { MatchmakingService } from "./matchmaking.service"; +import { matchmakingServiceStub } from "./matchmaking.service.spec"; + +describe("MatchmakingController", () => { + let controller: MatchmakingController; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + controllers: [MatchmakingController], + providers: [{ provide: MatchmakingService, useValue: matchmakingServiceStub }] + }).compile(); + + controller = module.get(MatchmakingController); + }); + + it("should be defined", () => { + expect(controller).toBeDefined(); + }); +}); diff --git a/apps/api/src/app/probable-waffle/matchmaking/matchmaking.controller.ts b/apps/api/src/app/probable-waffle/matchmaking/matchmaking.controller.ts new file mode 100644 index 00000000..80970b52 --- /dev/null +++ b/apps/api/src/app/probable-waffle/matchmaking/matchmaking.controller.ts @@ -0,0 +1,26 @@ +import { Body, Controller, Delete, Post, UseGuards } from "@nestjs/common"; +import { SupabaseAuthGuard } from "../../../auth/guards/supabase-auth.guard"; +import { CurrentUser } from "../../../auth/current-user"; +import { AuthUser } from "@supabase/supabase-js"; +import { RequestGameSearchForMatchMakingDto } from "@fuzzy-waddle/api-interfaces"; +import { MatchmakingService } from "./matchmaking.service"; + +@Controller("probable-waffle/matchmaking") +export class MatchmakingController { + constructor(private readonly matchmakingService: MatchmakingService) {} + + @Post("request-game-search-for-matchmaking") + @UseGuards(SupabaseAuthGuard) + async requestGameSearchForMatchmaking( + @CurrentUser() user: AuthUser, + @Body() body: RequestGameSearchForMatchMakingDto + ): Promise { + await this.matchmakingService.requestGameSearchForMatchMaking(body, user); + } + + @Delete("stop-request-game-search-for-matchmaking") + @UseGuards(SupabaseAuthGuard) + async stopRequestGameSearchForMatchmaking(@CurrentUser() user: AuthUser): Promise { + await this.matchmakingService.stopRequestGameSearchForMatchmaking(user); + } +} diff --git a/apps/api/src/app/probable-waffle/matchmaking/matchmaking.service.interface.ts b/apps/api/src/app/probable-waffle/matchmaking/matchmaking.service.interface.ts new file mode 100644 index 00000000..ed5a5a42 --- /dev/null +++ b/apps/api/src/app/probable-waffle/matchmaking/matchmaking.service.interface.ts @@ -0,0 +1,7 @@ +import { RequestGameSearchForMatchMakingDto } from "@fuzzy-waddle/api-interfaces"; +import { User } from "@supabase/supabase-js"; + +export interface MatchmakingServiceInterface { + requestGameSearchForMatchMaking(body: RequestGameSearchForMatchMakingDto, user: User): Promise; + stopRequestGameSearchForMatchmaking(user: User): Promise; +} diff --git a/apps/api/src/app/probable-waffle/matchmaking/matchmaking.service.spec.ts b/apps/api/src/app/probable-waffle/matchmaking/matchmaking.service.spec.ts new file mode 100644 index 00000000..917a2db3 --- /dev/null +++ b/apps/api/src/app/probable-waffle/matchmaking/matchmaking.service.spec.ts @@ -0,0 +1,46 @@ +import { Test, TestingModule } from "@nestjs/testing"; +import { MatchmakingService } from "./matchmaking.service"; +import { MatchmakingServiceInterface } from "./matchmaking.service.interface"; +import { RequestGameSearchForMatchMakingDto } from "@fuzzy-waddle/api-interfaces"; +import { User } from "@supabase/supabase-js"; +import { GameInstanceService } from "../game-instance/game-instance.service"; +import { GameInstanceServiceStub } from "../game-instance/game-instance.service.spec"; +import { GameInstanceGateway } from "../game-instance/game-instance.gateway"; +import { GameInstanceGatewayStub } from "../../little-muncher/game-instance/game-instance.gateway"; +import { RoomServerService } from "../game-room/room-server.service"; +import { roomServerServiceStub } from "../game-room/room-server.service.spec"; + +export const matchmakingServiceStub = { + async requestGameSearchForMatchMaking(body: RequestGameSearchForMatchMakingDto, user: User): Promise { + return Promise.resolve(); + }, + async stopRequestGameSearchForMatchmaking(user: User): Promise { + return Promise.resolve(); + } +} satisfies MatchmakingServiceInterface; +describe("MatchmakingService", () => { + let service: MatchmakingService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + providers: [ + MatchmakingService, + { provide: GameInstanceService, useValue: GameInstanceServiceStub }, + { + provide: GameInstanceGateway, + useValue: GameInstanceGatewayStub + }, + { + provide: RoomServerService, + useValue: roomServerServiceStub + } + ] + }).compile(); + + service = module.get(MatchmakingService); + }); + + it("should be defined", () => { + expect(service).toBeDefined(); + }); +}); diff --git a/apps/api/src/app/probable-waffle/matchmaking/matchmaking.service.ts b/apps/api/src/app/probable-waffle/matchmaking/matchmaking.service.ts new file mode 100644 index 00000000..0543e89e --- /dev/null +++ b/apps/api/src/app/probable-waffle/matchmaking/matchmaking.service.ts @@ -0,0 +1,236 @@ +import { Injectable } from "@nestjs/common"; +import { + DifficultyModifiers, + FactionType, + GameSessionState, + GameSetupHelpers, + MapTuning, + PendingMatchmakingGameInstance, + PlayerLobbyDefinition, + PositionPlayerDefinition, + ProbableWaffleGameInstance, + ProbableWaffleGameInstanceType, + ProbableWaffleGameInstanceVisibility, + ProbableWaffleGameMode, + ProbableWaffleGameModeData, + ProbableWaffleGameStateData, + ProbableWaffleLevels, + ProbableWaffleMapEnum, + ProbableWafflePlayerControllerData, + ProbableWafflePlayerType, + RequestGameSearchForMatchMakingDto, + WinConditions +} from "@fuzzy-waddle/api-interfaces"; +import { User } from "@supabase/supabase-js"; +import { Cron, CronExpression } from "@nestjs/schedule"; +import { MatchmakingServiceInterface } from "./matchmaking.service.interface"; +import { GameInstanceService } from "../game-instance/game-instance.service"; +import { RoomServerService } from "../game-room/room-server.service"; +import { GameInstanceGateway } from "../game-instance/game-instance.gateway"; + +@Injectable() +export class MatchmakingService implements MatchmakingServiceInterface { + private pendingMatchmakingGameInstances: PendingMatchmakingGameInstance[] = []; + + constructor( + private readonly gameInstanceService: GameInstanceService, + private readonly roomServerService: RoomServerService, + private readonly gameInstanceGateway: GameInstanceGateway + ) {} + /** + * remove game instances that have been started more than N time ago + */ + @Cron(CronExpression.EVERY_2_HOURS) + handleCron() { + this.pendingMatchmakingGameInstances = this.pendingMatchmakingGameInstances.filter((gi) => { + const minutesAgo = 1000 * 60 * 15; // 15 minutes + const started = gi.gameInstance.gameInstanceMetadata.data.createdOn; + const lastUpdated = gi.gameInstance.gameInstanceMetadata.data.updatedOn; + const now = new Date(); + // is old if started is more than N minutes ago and lastUpdated is null or more than N minutes ago + const startedMoreThanNMinutesAgo = started.getTime() + minutesAgo < now.getTime(); + const lastUpdatedMoreThanNMinutesAgo = !lastUpdated || lastUpdated.getTime() + minutesAgo < now.getTime(); + const isOld = startedMoreThanNMinutesAgo && lastUpdatedMoreThanNMinutesAgo; + if (isOld) { + this.roomServerService.roomEvent("removed", gi.gameInstance, null); + console.log("Probable Waffle - Cron - Pending matchmaking instance removed"); + } + return !isOld; + }); + } + + async requestGameSearchForMatchMaking(matchMakingDto: RequestGameSearchForMatchMakingDto, user: User): Promise { + const pendingMatchmakingGameInstance = this.findGameInstanceForMatchMaking(matchMakingDto); + if (pendingMatchmakingGameInstance) { + await this.joinGameInstanceForMatchmaking(pendingMatchmakingGameInstance, matchMakingDto, user); + return; + } else { + this.createGameInstanceForMatchmaking(matchMakingDto, user); + } + } + + private promoteGameInstanceToLoaded(gameInstance: ProbableWaffleGameInstance, user: User) { + const gameInstanceId = gameInstance.gameInstanceMetadata.data.gameInstanceId; + this.pendingMatchmakingGameInstances = this.pendingMatchmakingGameInstances.filter( + (gi) => + gi.gameInstance.gameInstanceMetadata.data.gameInstanceId !== + gameInstance.gameInstanceMetadata.data.gameInstanceId + ); + gameInstance.gameInstanceMetadata.data.sessionState = GameSessionState.MovingPlayersToGame; + this.gameInstanceGateway.emitGameFound({ + userIds: gameInstance.players.map((p) => p.playerController.data.userId), + gameInstanceId + }); + this.roomServerService.roomEvent("game_instance_metadata", gameInstance, user); + console.log("Probable Waffle - Matchmaking game fully loaded", gameInstanceId); + } + + private async joinGameInstanceForMatchmaking( + pendingMatchmakingGameInstance: PendingMatchmakingGameInstance, + matchMakingDto: RequestGameSearchForMatchMakingDto, + user: User + ) { + const gameInstance = pendingMatchmakingGameInstance.gameInstance; + // PLAYER: + const player = this.getNewPlayer(gameInstance, user.id, matchMakingDto.factionType); + gameInstance.addPlayer(player); + this.roomServerService.roomEvent("player.joined", gameInstance, user); + + // GAME MODE + const mapPoolIds = pendingMatchmakingGameInstance.commonMapPoolIds; + const randomMapId = mapPoolIds[Math.floor(Math.random() * mapPoolIds.length)]; + gameInstance.gameMode = this.getNewMatchmakingGameMode(randomMapId); + this.roomServerService.roomEvent("game_mode", gameInstance, user); + + // emit game found event when all players have joined + const maxPlayers = ProbableWaffleLevels[randomMapId].mapInfo.startPositionsOnTile.length; + if (gameInstance.players.length === maxPlayers) { + // GAME METADATA + this.promoteGameInstanceToLoaded(gameInstance, user); + } + } + private createGameInstanceForMatchmaking(matchMakingDto: RequestGameSearchForMatchMakingDto, user: User) { + // create new one + const newGameInstance = new ProbableWaffleGameInstance({ + gameInstanceMetadataData: { + name: "Matchmaking", + createdBy: user.id, + type: ProbableWaffleGameInstanceType.Matchmaking, + visibility: ProbableWaffleGameInstanceVisibility.Public, + startOptions: {} + }, + gameModeData: { + winConditions: {} satisfies WinConditions, + mapTuning: {} satisfies MapTuning, + difficultyModifiers: {} satisfies DifficultyModifiers + } satisfies ProbableWaffleGameModeData, + gameStateData: {} as ProbableWaffleGameStateData + }); + + const player = this.getNewPlayer(newGameInstance, user.id, matchMakingDto.factionType); + newGameInstance.addPlayer(player); + + this.pendingMatchmakingGameInstances.push({ + gameInstance: newGameInstance, + commonMapPoolIds: matchMakingDto.mapPoolIds + }); + this.gameInstanceService.addGameInstance(newGameInstance, user); + + console.log("Probable Waffle - Game instance created for matchmaking", this.pendingMatchmakingGameInstances.length); + } + + private findGameInstanceForMatchMaking( + matchMakingDto: RequestGameSearchForMatchMakingDto + ): PendingMatchmakingGameInstance | null { + const availableMatchmakingGameInstances = this.pendingMatchmakingGameInstances.filter( + (gi) => + gi.gameInstance.gameInstanceMetadata.data.sessionState === GameSessionState.NotStarted && + gi.gameInstance.gameInstanceMetadata.data.type === ProbableWaffleGameInstanceType.Matchmaking + ); + + // find game instance that has at least 1 map in common + // noinspection UnnecessaryLocalVariableJS + const foundGameInstanceWithCommonMap = availableMatchmakingGameInstances.find((gi) => { + const mapPoolIds = gi.commonMapPoolIds; + // noinspection UnnecessaryLocalVariableJS + const hasCommonMap = matchMakingDto.mapPoolIds.some((mapId) => mapPoolIds.includes(mapId)); + return hasCommonMap; + }); + + // if found, then remove commonMapPoolIds that are not in matchMakingDto.mapPoolIds + if (foundGameInstanceWithCommonMap) { + foundGameInstanceWithCommonMap.commonMapPoolIds = foundGameInstanceWithCommonMap.commonMapPoolIds.filter( + (mapId) => matchMakingDto.mapPoolIds.includes(mapId) + ); + } + + return foundGameInstanceWithCommonMap ?? null; + } + + private getNewPlayer(gameInstance: ProbableWaffleGameInstance, userId: string, factionType: FactionType | null) { + const allFactions = Object.values(FactionType); + const randomFactionType = allFactions[Math.floor(Math.random() * allFactions.length)] as FactionType; + + 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 ?? randomFactionType, + playerType: ProbableWafflePlayerType.Human + } satisfies PositionPlayerDefinition; + // noinspection UnnecessaryLocalVariableJS + const player = gameInstance.initPlayer({ + userId, + playerDefinition + } satisfies ProbableWafflePlayerControllerData); + return player; + } + + private getNewMatchmakingGameMode(mapId: ProbableWaffleMapEnum): ProbableWaffleGameMode { + const gameModeData = { + map: mapId, + difficultyModifiers: {} satisfies DifficultyModifiers, + winConditions: { + timeLimit: 60 + } satisfies WinConditions, + mapTuning: { + unitCap: 20 + } satisfies MapTuning + } satisfies ProbableWaffleGameModeData; + return new ProbableWaffleGameMode(gameModeData); + } + + async stopRequestGameSearchForMatchmaking(user: User): Promise { + // remove self as player from pending matchmaking game instances + // if game instance has no players left, then remove it + const pendingMatchMakingGameInstance = this.pendingMatchmakingGameInstances.find((gi) => + gi.gameInstance.players.some((p) => p.playerController.data.userId === user.id) + ); + if (!pendingMatchMakingGameInstance) return; + const gameInstanceId = pendingMatchMakingGameInstance.gameInstance.gameInstanceMetadata.data.gameInstanceId; + const player = pendingMatchMakingGameInstance.gameInstance.players.find( + (p) => p.playerController.data.userId === user.id + ); + if (!player) return; + + this.roomServerService.roomEvent("player.left", pendingMatchMakingGameInstance.gameInstance, user); + pendingMatchMakingGameInstance.gameInstance.players = pendingMatchMakingGameInstance.gameInstance.players.filter( + (p) => p.playerController.data.userId !== user.id + ); + console.log("Probable Waffle - Player left pending matchmaking instance", user.id); + + if (pendingMatchMakingGameInstance.gameInstance.players.length === 0) { + this.removePendingMatchmakingGameInstance(gameInstanceId); + this.gameInstanceService.stopGameInstance(gameInstanceId, user); + } + } + + private removePendingMatchmakingGameInstance(gameInstanceId: string) { + this.pendingMatchmakingGameInstances = this.pendingMatchmakingGameInstances.filter( + (gi) => gi.gameInstance.gameInstanceMetadata.data.gameInstanceId !== gameInstanceId + ); + } +} diff --git a/apps/api/src/app/probable-waffle/probable-waffle.module.ts b/apps/api/src/app/probable-waffle/probable-waffle.module.ts new file mode 100644 index 00000000..0342a319 --- /dev/null +++ b/apps/api/src/app/probable-waffle/probable-waffle.module.ts @@ -0,0 +1,29 @@ +import { Module } from "@nestjs/common"; +import { GameInstanceController } from "./game-instance/game-instance.controller"; +import { GameInstanceService } from "./game-instance/game-instance.service"; +import { GameStateServerService } from "./game-instance/game-state-server.service"; +import { TextSanitizationService } from "../../core/content-filters/text-sanitization.service"; +import { RoomController } from "./game-room/room.controller"; +import { GameInstanceHolderService } from "./game-instance/game-instance-holder.service"; +import { RoomGateway } from "./game-room/room.gateway"; +import { GameInstanceGateway } from "./game-instance/game-instance.gateway"; +import { MatchmakingService } from "./matchmaking/matchmaking.service"; +import { ProbableWaffleChatService } from "./chat/probable-waffle-chat.service"; +import { MatchmakingController } from "./matchmaking/matchmaking.controller"; +import { RoomServerService } from "./game-room/room-server.service"; + +@Module({ + providers: [ + GameInstanceGateway, + RoomGateway, + GameInstanceHolderService, + GameInstanceService, + GameStateServerService, + MatchmakingService, + TextSanitizationService, + ProbableWaffleChatService, + RoomServerService + ], + controllers: [GameInstanceController, RoomController, MatchmakingController] +}) +export class ProbableWaffleModule {} diff --git a/apps/api/src/auth/auth.controller.ts b/apps/api/src/auth/auth.controller.ts deleted file mode 100644 index 1326b9a5..00000000 --- a/apps/api/src/auth/auth.controller.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { Controller, Get, Headers, UseGuards } from '@nestjs/common'; -import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; -import { AuthService } from './auth.service'; -import { SupabaseAuthGuard } from './guards/supabase-auth.guard'; - -@Controller('auth') -@ApiTags('authentication') -export class AuthController { - constructor(private readonly authService: AuthService) {} - - // @UseGuards(LocalAuthGuard) - // @Post('auth/login') - // async login(@Req() req) { - // return this.authService.loginJwt(req.user); - // } - - // @UseGuards(JwtAuthGuard) - // @Get('profile') - // getProfile(@Req() req) { - // return req.user; - // } - - @Get('test') - @UseGuards(SupabaseAuthGuard) - @ApiBearerAuth('access-token') - async test(@Headers() headers) { - // let x = 1 - return true; - } - - // @Post('signIn') - // @ApiOperation({ - // summary: 'Acquires an access token', - // description: 'This endpoint will provide an access token.' - // }) - // async signIn(@Body() dto: CreateUserDto) { - // return this.authService.signInUser(dto); - // } - - // @Post('signUp') - // @ApiOperation({ - // summary: 'Signs up the user in the system', - // description: - // 'This endpoint signs up the user in the system. It will return the user details. You will use this user to interact with the rest of the endpoints.' - // }) - // async signUp(@Body() dto: CreateUserDto) { - // return this.authService.signupUser(dto); - // } -} diff --git a/apps/api/src/auth/auth.module.ts b/apps/api/src/auth/auth.module.ts index de9d7a26..7c60b664 100644 --- a/apps/api/src/auth/auth.module.ts +++ b/apps/api/src/auth/auth.module.ts @@ -1,16 +1,15 @@ -import { Module } from '@nestjs/common'; -import { AuthService } from './auth.service'; -import { PassportModule } from '@nestjs/passport'; -import { SupabaseStrategy } from './strategies/supabase.strategy'; -import { AuthController } from './auth.controller'; -import { UsersModule } from '../users/users.module'; -import { jwtConstants } from './constants'; +import { Module } from "@nestjs/common"; +import { AuthService } from "./auth.service"; +import { PassportModule } from "@nestjs/passport"; +import { SupabaseStrategy } from "./strategies/supabase.strategy"; +import { UsersModule } from "../users/users.module"; +import { jwtConstants } from "./constants"; // import { JwtStrategy } from './strategies/jwt.strategy'; // import { LocalStrategy } from './strategies/local.strategy'; -import { ScheduleModule } from '@nestjs/schedule'; -import { JwtModule } from '@nestjs/jwt'; -import { UserAuthCacheService } from '../core/cache/user-auth-cache.service.ts/user-auth-cache.service'; -import { SupabaseProviderService } from '../core/supabase-provider/supabase-provider.service'; +import { ScheduleModule } from "@nestjs/schedule"; +import { JwtModule } from "@nestjs/jwt"; +import { UserAuthCacheService } from "../core/cache/user-auth-cache.service.ts/user-auth-cache.service"; +import { SupabaseProviderService } from "../core/supabase-provider/supabase-provider.service"; @Module({ imports: [ @@ -18,11 +17,10 @@ import { SupabaseProviderService } from '../core/supabase-provider/supabase-prov PassportModule, JwtModule.register({ secret: jwtConstants.secret, - signOptions: { expiresIn: '60s' } + signOptions: { expiresIn: "60s" } }), ScheduleModule.forRoot() ], - controllers: [AuthController], providers: [ AuthService, /*LocalStrategy, JwtStrategy,*/ SupabaseStrategy, diff --git a/apps/api/src/auth/auth.service.ts b/apps/api/src/auth/auth.service.ts index 190606e8..569dfd42 100644 --- a/apps/api/src/auth/auth.service.ts +++ b/apps/api/src/auth/auth.service.ts @@ -1,5 +1,5 @@ -import { Injectable } from '@nestjs/common'; -import { IAuthService } from './auth.service.interface'; +import { Injectable } from "@nestjs/common"; +import { IAuthService } from "./auth.service.interface"; @Injectable() export class AuthService implements IAuthService { diff --git a/apps/api/src/auth/constants.ts b/apps/api/src/auth/constants.ts index 2bdf50ed..b9294f06 100644 --- a/apps/api/src/auth/constants.ts +++ b/apps/api/src/auth/constants.ts @@ -1,3 +1,3 @@ export const jwtConstants = { - secret: 'secretKey' // not really a key - for demo purposes only + secret: "secretKey" // not really a key - for demo purposes only }; diff --git a/apps/api/src/auth/current-user.ts b/apps/api/src/auth/current-user.ts index ca7f1b7c..4377ace3 100644 --- a/apps/api/src/auth/current-user.ts +++ b/apps/api/src/auth/current-user.ts @@ -1,10 +1,10 @@ -import { createParamDecorator, ExecutionContext } from '@nestjs/common'; -import { GqlExecutionContext } from '@nestjs/graphql'; -import { AuthUser } from '@supabase/supabase-js'; +import { createParamDecorator, ExecutionContext } from "@nestjs/common"; +import { GqlExecutionContext } from "@nestjs/graphql"; +import { AuthUser } from "@supabase/supabase-js"; export const CurrentUser = createParamDecorator((_data: unknown, context: ExecutionContext): AuthUser => { const contextType = context.getType(); - if (contextType === 'ws') { + if (contextType === "ws") { // for socket-io, extract user from first index return context.getArgByIndex(0).user as AuthUser; } diff --git a/apps/api/src/auth/dto/create-user.dto.ts b/apps/api/src/auth/dto/create-user.dto.ts index 7649c61c..e551b5aa 100644 --- a/apps/api/src/auth/dto/create-user.dto.ts +++ b/apps/api/src/auth/dto/create-user.dto.ts @@ -1,4 +1,4 @@ -import { ApiProperty } from '@nestjs/swagger'; +import { ApiProperty } from "@nestjs/swagger"; export class CreateUserDto { @ApiProperty() diff --git a/apps/api/src/auth/guards/supabase-auth.guard.ts b/apps/api/src/auth/guards/supabase-auth.guard.ts index 541bdbca..5b33d26f 100644 --- a/apps/api/src/auth/guards/supabase-auth.guard.ts +++ b/apps/api/src/auth/guards/supabase-auth.guard.ts @@ -1,6 +1,6 @@ -import { Injectable } from '@nestjs/common'; -import { AuthGuard } from '@nestjs/passport'; -import { AuthStrategies } from '../strategies/auth-strategies'; +import { Injectable } from "@nestjs/common"; +import { AuthGuard } from "@nestjs/passport"; +import { AuthStrategies } from "../strategies/auth-strategies"; @Injectable() export class SupabaseAuthGuard extends AuthGuard(AuthStrategies.supabase) {} diff --git a/apps/api/src/auth/strategies/auth-strategies.ts b/apps/api/src/auth/strategies/auth-strategies.ts index 8d6cd823..50ef3312 100644 --- a/apps/api/src/auth/strategies/auth-strategies.ts +++ b/apps/api/src/auth/strategies/auth-strategies.ts @@ -1,5 +1,5 @@ export enum AuthStrategies { // local = 'local', // jwt = 'jwt', - supabase = 'supabase' + supabase = "supabase" } diff --git a/apps/api/src/auth/strategies/supabase-auth-strategy/constants.ts b/apps/api/src/auth/strategies/supabase-auth-strategy/constants.ts index e0a67123..2458109b 100644 --- a/apps/api/src/auth/strategies/supabase-auth-strategy/constants.ts +++ b/apps/api/src/auth/strategies/supabase-auth-strategy/constants.ts @@ -1,4 +1,4 @@ -const UNAUTHORIZED = 'Unauthorized'; -const SUPABASE_AUTH = 'SUPABASE_AUTH'; +const UNAUTHORIZED = "Unauthorized"; +const SUPABASE_AUTH = "SUPABASE_AUTH"; export { UNAUTHORIZED, SUPABASE_AUTH }; diff --git a/apps/api/src/auth/strategies/supabase-auth-strategy/options.interface.ts b/apps/api/src/auth/strategies/supabase-auth-strategy/options.interface.ts index 72c98e88..124dfc8a 100644 --- a/apps/api/src/auth/strategies/supabase-auth-strategy/options.interface.ts +++ b/apps/api/src/auth/strategies/supabase-auth-strategy/options.interface.ts @@ -1,6 +1,6 @@ -import { JwtFromRequestFunction } from 'passport-jwt'; -import { SupabaseClient } from '@supabase/supabase-js'; -import { UserAuthCacheService } from '../../../core/cache/user-auth-cache.service.ts/user-auth-cache.service'; +import { JwtFromRequestFunction } from "passport-jwt"; +import { SupabaseClient } from "@supabase/supabase-js"; +import { UserAuthCacheService } from "../../../core/cache/user-auth-cache.service.ts/user-auth-cache.service"; export interface SupabaseAuthStrategyOptions { supabaseClient: SupabaseClient; diff --git a/apps/api/src/auth/strategies/supabase-auth-strategy/supabase-v2-auth.strategy.ts b/apps/api/src/auth/strategies/supabase-auth-strategy/supabase-v2-auth.strategy.ts index 7faf9177..75ea534c 100644 --- a/apps/api/src/auth/strategies/supabase-auth-strategy/supabase-v2-auth.strategy.ts +++ b/apps/api/src/auth/strategies/supabase-auth-strategy/supabase-v2-auth.strategy.ts @@ -1,9 +1,9 @@ -import { JwtFromRequestFunction } from 'passport-jwt'; -import { Strategy } from 'passport-strategy'; -import { AuthUser, SupabaseClient } from '@supabase/supabase-js'; -import { SUPABASE_AUTH, UNAUTHORIZED } from './constants'; -import { SupabaseAuthStrategyOptions } from './options.interface'; -import { UserAuthCacheService } from '../../../core/cache/user-auth-cache.service.ts/user-auth-cache.service'; +import { JwtFromRequestFunction } from "passport-jwt"; +import { Strategy } from "passport-strategy"; +import { AuthUser, SupabaseClient } from "@supabase/supabase-js"; +import { SUPABASE_AUTH, UNAUTHORIZED } from "./constants"; +import { SupabaseAuthStrategyOptions } from "./options.interface"; +import { UserAuthCacheService } from "../../../core/cache/user-auth-cache.service.ts/user-auth-cache.service"; // fixes https://github.com/hiro1107/nestjs-supabase-auth/issues/7 // uses node-cache to cache users for 1 hour @@ -12,7 +12,7 @@ export class SupabaseV2AuthStrategy extends Strategy { private extractor: JwtFromRequestFunction; success: (user: any, info: any) => void; // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types - fail: Strategy['fail']; + fail: Strategy["fail"]; private readonly userAuthCacheService: UserAuthCacheService; private supabaseClient: SupabaseClient; @@ -22,7 +22,7 @@ export class SupabaseV2AuthStrategy extends Strategy { this.supabaseClient = options.supabaseClient; if (!options.extractor) { throw new Error( - '\n Extractor is not a function. You should provide an extractor. \n Read the docs: https://github.com/tfarras/nestjs-firebase-auth#readme' + "\n Extractor is not a function. You should provide an extractor. \n Read the docs: https://github.com/tfarras/nestjs-firebase-auth#readme" ); } this.extractor = options.extractor; diff --git a/apps/api/src/core/cache/user-auth-cache.service.ts/user-auth-cache.service.spec.ts b/apps/api/src/core/cache/user-auth-cache.service.ts/user-auth-cache.service.spec.ts index 9185cf7d..0fb47706 100644 --- a/apps/api/src/core/cache/user-auth-cache.service.ts/user-auth-cache.service.spec.ts +++ b/apps/api/src/core/cache/user-auth-cache.service.ts/user-auth-cache.service.spec.ts @@ -1,8 +1,8 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { UserAuthCacheService } from './user-auth-cache.service'; -import { authUserStub } from '../../../auth/auth.service.spec'; +import { Test, TestingModule } from "@nestjs/testing"; +import { UserAuthCacheService } from "./user-auth-cache.service"; +import { authUserStub } from "../../../auth/auth.service.spec"; -describe('UserAuthCacheService', () => { +describe("UserAuthCacheService", () => { let service: UserAuthCacheService; beforeEach(async () => { @@ -13,13 +13,13 @@ describe('UserAuthCacheService', () => { service = module.get(UserAuthCacheService); }); - it('should be defined', () => { + it("should be defined", () => { expect(service).toBeDefined(); }); - it('should set and get user', () => { + it("should set and get user", () => { const user = authUserStub; - const idToken = 'idToken'; + const idToken = "idToken"; service.setUser(idToken, user); expect(service.getUser(idToken)).toEqual(user); }); diff --git a/apps/api/src/core/cache/user-auth-cache.service.ts/user-auth-cache.service.ts b/apps/api/src/core/cache/user-auth-cache.service.ts/user-auth-cache.service.ts index f6794355..f37934a8 100644 --- a/apps/api/src/core/cache/user-auth-cache.service.ts/user-auth-cache.service.ts +++ b/apps/api/src/core/cache/user-auth-cache.service.ts/user-auth-cache.service.ts @@ -1,6 +1,6 @@ -import { Injectable } from '@nestjs/common'; -import NodeCache from 'node-cache'; -import { AuthUser } from '@supabase/supabase-js'; +import { Injectable } from "@nestjs/common"; +import NodeCache from "node-cache"; +import { AuthUser } from "@supabase/supabase-js"; @Injectable() export class UserAuthCacheService { diff --git a/apps/api/src/core/content-filters/slovenian-bad-words.ts b/apps/api/src/core/content-filters/slovenian-bad-words.ts index 72a60691..bb0b7406 100644 --- a/apps/api/src/core/content-filters/slovenian-bad-words.ts +++ b/apps/api/src/core/content-filters/slovenian-bad-words.ts @@ -1,208 +1,208 @@ export const slovenianBadWords = [ - 'bes te plentaj', - 'bingala bongala', - 'bog te nima rad', - 'cepec', - 'da bi te koklja brcnila', - 'drek', - 'drekec pekec', - 'drkati', - 'frdaman', - 'fuk', - 'holtnahamol', - 'hop cefizelj', - 'hudič', - 'hudičevka', - 'iti v maloro', - 'jeba', - 'jebat ga', - 'Jebela cesta', - 'jebemti mater kosmato', - 'jebemti uha', - 'jebo ti pas mater kad te napravio', - 'jejtena', - 'ježešna', - 'klinc te gleda', - 'ko ga šiša', - 'konjski kurac', - 'kot da bi konj v senco rital', - 'Krucefiks', - 'krucinalbanda', - 'krščen duš', - 'kuga salamenska', - 'kurac', - 'kurac palac', - 'kurenk', - 'madona', - 'mandi mandi', - 'mater', - 'mašinca', - 'moj bog', - 'naj te strela udari', - 'ne biti vreden počenega groša', - 'ne jebati', - 'obrisati si šobe', - 'pejd u tri pirovske', - 'pejt v rit', - 'pismo', - 'pizda', - 'pišuka', - 'pička', - 'pička ti materina', - 'pičkin dim', - 'pičkuračku', - 'poslati v kurilnico', - 'poslati v picerijo', - 'poslati v pisarno', - 'pribijati', - 'prmejdun', - 'tri krasne', - 'vrag te pocitraj', - 'čka', - 'čri čri', - 'aškrc', - 'bes te plentaj', - 'bingala bongala', - 'bog te nima rad', - 'cepec', - 'da bi te koklja brcnila', - 'da bi te pes povohal', - 'drek', - 'drekec pekec', - 'drkati', - 'fakof', - 'fekalc', - 'frdaman', - 'fuk', - 'holtnahamol', - 'hop cefizelj', - 'hudič', - 'hudičevka', - 'hvala za rože', - 'iti na š', - 'iti v maloro', - 'jeba', - 'jebat ga', - 'Jebela cesta', - 'jebemti mater kosmato', - 'jebemti uha', - 'jebi ga - original', - 'jebo ti pas mater kad te napravio', - 'jejtena', - 'ježešna', - 'joj prejoj', - 'klinc te gleda', - 'ko ga šiša', - 'ko jebe Bosance', - 'konjski kurac', - 'kot da bi konj v senco rital', - 'krizus', - 'Krucefiks', - 'krucinalbanda', - 'krščen duš', - 'krščen matiček', - 'kuga salamenska', - 'kurac', - 'kurac palac', - 'kurenk', - 'madona', - 'mandi mandi', - 'mater', - 'mašinca', - 'mička', - 'moj bog', - 'naj te strela udari', - 'ne biti vreden počenega groša', - 'ne jebati', - 'obrisati si šobe', - 'Ojdip', - 'orkadibigoli', - 'pejd u tri pirovske', - 'pejt v rit', - 'pismo', - 'pizda', - 'Pizda mi greš na kurac tip mona ej', - 'pizda na robu gozda', - 'pišuka', - 'pička', - 'pička ti materina', - 'pička ti žlička', - 'pičkin dim', - 'Pičkopeja', - 'pičkuračku', - 'pojdi v pisarno', - 'porkadindijo', - 'poslati v kurilnico', - 'poslati v picerijo', - 'poslati v pisarno', - 'preklezakurnk', - 'Preklinc', - 'pribijati', - 'primaruha', - 'prmejdun', - 'ps ti brado lizu', - 'Svija', - 'tri krasne', - 'vrag te pocitraj', - 'Vragu na roge', - 'včeraj sem juho jedel', - 'za poflancat', - 'zajebati', - 'šajeta te hitla u laštrigo od bandant', - 'čka', - 'čkapi', - 'čri čri', - 'bes te plentaj', - 'bingala bongala', - 'bog te nima rad', - 'cepec', - 'da bi te koklja brcnila', - 'drek', - 'drekec pekec', - 'frdaman', - 'fuk', - 'holtnahamol', - 'hop cefizelj', - 'hudič', - 'hudičevka', - 'iti v maloro', - 'jebat ga', - 'jebemti mater kosmato', - 'jebo ti pas mater kad te napravio', - 'jejtena', - 'ježešna', - 'klinc te gleda', - 'ko ga šiša', - 'konjski kurac', - 'kot da bi konj v senco rital', - 'Krucefiks', - 'krucinalbanda', - 'krščen duš', - 'kuga salamenska', - 'kurac palac', - 'madona', - 'mandi mandi', - 'mater', - 'mašinca', - 'moj bog', - 'naj te strela udari', - 'ne biti vreden počenega groša', - 'ne jebati', - 'obrisati si šobe', - 'pejt v rit', - 'pismo', - 'pizda', - 'pišuka', - 'pička', - 'pička ti materina', - 'pičkuračku', - 'poslati v kurilnico', - 'poslati v picerijo', - 'poslati v pisarno', - 'Preklinc', - 'pribijati', - 'prmejdun', - 'tri krasne', - 'čka', - 'tristo kosmatih medvedov' + "bes te plentaj", + "bingala bongala", + "bog te nima rad", + "cepec", + "da bi te koklja brcnila", + "drek", + "drekec pekec", + "drkati", + "frdaman", + "fuk", + "holtnahamol", + "hop cefizelj", + "hudič", + "hudičevka", + "iti v maloro", + "jeba", + "jebat ga", + "Jebela cesta", + "jebemti mater kosmato", + "jebemti uha", + "jebo ti pas mater kad te napravio", + "jejtena", + "ježešna", + "klinc te gleda", + "ko ga šiša", + "konjski kurac", + "kot da bi konj v senco rital", + "Krucefiks", + "krucinalbanda", + "krščen duš", + "kuga salamenska", + "kurac", + "kurac palac", + "kurenk", + "madona", + "mandi mandi", + "mater", + "mašinca", + "moj bog", + "naj te strela udari", + "ne biti vreden počenega groša", + "ne jebati", + "obrisati si šobe", + "pejd u tri pirovske", + "pejt v rit", + "pismo", + "pizda", + "pišuka", + "pička", + "pička ti materina", + "pičkin dim", + "pičkuračku", + "poslati v kurilnico", + "poslati v picerijo", + "poslati v pisarno", + "pribijati", + "prmejdun", + "tri krasne", + "vrag te pocitraj", + "čka", + "čri čri", + "aškrc", + "bes te plentaj", + "bingala bongala", + "bog te nima rad", + "cepec", + "da bi te koklja brcnila", + "da bi te pes povohal", + "drek", + "drekec pekec", + "drkati", + "fakof", + "fekalc", + "frdaman", + "fuk", + "holtnahamol", + "hop cefizelj", + "hudič", + "hudičevka", + "hvala za rože", + "iti na š", + "iti v maloro", + "jeba", + "jebat ga", + "Jebela cesta", + "jebemti mater kosmato", + "jebemti uha", + "jebi ga - original", + "jebo ti pas mater kad te napravio", + "jejtena", + "ježešna", + "joj prejoj", + "klinc te gleda", + "ko ga šiša", + "ko jebe Bosance", + "konjski kurac", + "kot da bi konj v senco rital", + "krizus", + "Krucefiks", + "krucinalbanda", + "krščen duš", + "krščen matiček", + "kuga salamenska", + "kurac", + "kurac palac", + "kurenk", + "madona", + "mandi mandi", + "mater", + "mašinca", + "mička", + "moj bog", + "naj te strela udari", + "ne biti vreden počenega groša", + "ne jebati", + "obrisati si šobe", + "Ojdip", + "orkadibigoli", + "pejd u tri pirovske", + "pejt v rit", + "pismo", + "pizda", + "Pizda mi greš na kurac tip mona ej", + "pizda na robu gozda", + "pišuka", + "pička", + "pička ti materina", + "pička ti žlička", + "pičkin dim", + "Pičkopeja", + "pičkuračku", + "pojdi v pisarno", + "porkadindijo", + "poslati v kurilnico", + "poslati v picerijo", + "poslati v pisarno", + "preklezakurnk", + "Preklinc", + "pribijati", + "primaruha", + "prmejdun", + "ps ti brado lizu", + "Svija", + "tri krasne", + "vrag te pocitraj", + "Vragu na roge", + "včeraj sem juho jedel", + "za poflancat", + "zajebati", + "šajeta te hitla u laštrigo od bandant", + "čka", + "čkapi", + "čri čri", + "bes te plentaj", + "bingala bongala", + "bog te nima rad", + "cepec", + "da bi te koklja brcnila", + "drek", + "drekec pekec", + "frdaman", + "fuk", + "holtnahamol", + "hop cefizelj", + "hudič", + "hudičevka", + "iti v maloro", + "jebat ga", + "jebemti mater kosmato", + "jebo ti pas mater kad te napravio", + "jejtena", + "ježešna", + "klinc te gleda", + "ko ga šiša", + "konjski kurac", + "kot da bi konj v senco rital", + "Krucefiks", + "krucinalbanda", + "krščen duš", + "kuga salamenska", + "kurac palac", + "madona", + "mandi mandi", + "mater", + "mašinca", + "moj bog", + "naj te strela udari", + "ne biti vreden počenega groša", + "ne jebati", + "obrisati si šobe", + "pejt v rit", + "pismo", + "pizda", + "pišuka", + "pička", + "pička ti materina", + "pičkuračku", + "poslati v kurilnico", + "poslati v picerijo", + "poslati v pisarno", + "Preklinc", + "pribijati", + "prmejdun", + "tri krasne", + "čka", + "tristo kosmatih medvedov" ]; diff --git a/apps/api/src/core/content-filters/text-sanitization.service.ts b/apps/api/src/core/content-filters/text-sanitization.service.ts index 7aef534c..6968a537 100644 --- a/apps/api/src/core/content-filters/text-sanitization.service.ts +++ b/apps/api/src/core/content-filters/text-sanitization.service.ts @@ -1,7 +1,7 @@ -import { Injectable } from '@nestjs/common'; -import { ITextSanitizationService } from './text-sanitization.service.interface'; -import { clean } from 'profanity-cleaner'; -import { slovenianBadWords } from './slovenian-bad-words'; +import { Injectable } from "@nestjs/common"; +import { ITextSanitizationService } from "./text-sanitization.service.interface"; +import { clean } from "profanity-cleaner"; +import { slovenianBadWords } from "./slovenian-bad-words"; @Injectable() export class TextSanitizationService implements ITextSanitizationService { diff --git a/apps/api/src/core/supabase-provider/supabase-provider.service.interface.ts b/apps/api/src/core/supabase-provider/supabase-provider.service.interface.ts index 0e776873..7f629686 100644 --- a/apps/api/src/core/supabase-provider/supabase-provider.service.interface.ts +++ b/apps/api/src/core/supabase-provider/supabase-provider.service.interface.ts @@ -1,4 +1,4 @@ -import { SupabaseClient } from '@supabase/supabase-js'; +import { SupabaseClient } from "@supabase/supabase-js"; export interface ISupabaseProviderService { get supabaseClient(): SupabaseClient; diff --git a/apps/api/src/core/supabase-provider/supabase-provider.service.ts b/apps/api/src/core/supabase-provider/supabase-provider.service.ts index 22706591..d1fc10c9 100644 --- a/apps/api/src/core/supabase-provider/supabase-provider.service.ts +++ b/apps/api/src/core/supabase-provider/supabase-provider.service.ts @@ -1,6 +1,6 @@ -import { Injectable } from '@nestjs/common'; -import { createClient, SupabaseClient } from '@supabase/supabase-js'; -import { ISupabaseProviderService } from './supabase-provider.service.interface'; +import { Injectable } from "@nestjs/common"; +import { createClient, SupabaseClient } from "@supabase/supabase-js"; +import { ISupabaseProviderService } from "./supabase-provider.service.interface"; @Injectable() export class SupabaseProviderService implements ISupabaseProviderService { diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts index d525d9ad..fc18fc99 100644 --- a/apps/api/src/main.ts +++ b/apps/api/src/main.ts @@ -3,36 +3,35 @@ * This is only a minimal backend to get started. */ -import { Logger, ValidationPipe } from '@nestjs/common'; -import { NestFactory } from '@nestjs/core'; +import { Logger, ValidationPipe } from "@nestjs/common"; +import { NestFactory } from "@nestjs/core"; -import { AppModule } from './app/app.module'; -import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger'; -import helmet from 'helmet'; +import { AppModule } from "./app/app.module"; +import { DocumentBuilder, SwaggerModule } from "@nestjs/swagger"; +import helmet from "helmet"; async function bootstrap() { const app = await NestFactory.create(AppModule); - const globalPrefix = 'api'; + const globalPrefix = "api"; app.setGlobalPrefix(globalPrefix); const port = process.env.PORT || 3333; app.useGlobalPipes(new ValidationPipe()); - if (process.env.NODE_ENV === 'development') { + if (process.env.NODE_ENV === "development") { // swagger setup const config = new DocumentBuilder() - .setTitle('Fuzzy waddle API') - .setDescription('This API helps you manage fuzzy waddle data!') - .setVersion('1.0') - .addTag('calendar') - .addBearerAuth({ in: 'header', type: 'http', scheme: 'bearer', bearerFormat: 'JWT' }, 'access-token') + .setTitle("Fuzzy waddle API") + .setDescription("This API helps you manage fuzzy waddle data!") + .setVersion("1.0") + .addBearerAuth({ in: "header", type: "http", scheme: "bearer", bearerFormat: "JWT" }, "access-token") .build(); const document = SwaggerModule.createDocument(app, config); - SwaggerModule.setup('docs', app, document); + SwaggerModule.setup("docs", app, document); // navigate to /docs to see the swagger docs } app.enableCors({ - origin: process.env.CORS_ORIGIN?.split(',') + origin: process.env.CORS_ORIGIN?.split(",") }); // https://docs.nestjs.com/security/helmet app.use(helmet()); diff --git a/apps/api/src/users/users.module.ts b/apps/api/src/users/users.module.ts index bd425994..1f1ce3bb 100644 --- a/apps/api/src/users/users.module.ts +++ b/apps/api/src/users/users.module.ts @@ -1,5 +1,5 @@ -import { Module } from '@nestjs/common'; -import { UsersService } from './users.service'; +import { Module } from "@nestjs/common"; +import { UsersService } from "./users.service"; @Module({ providers: [UsersService], diff --git a/apps/api/src/users/users.service.interface.ts b/apps/api/src/users/users.service.interface.ts index f586f31c..2529e28f 100644 --- a/apps/api/src/users/users.service.interface.ts +++ b/apps/api/src/users/users.service.interface.ts @@ -1,4 +1,4 @@ -import { User } from './users.service'; +import { User } from "./users.service"; export interface IUsersService { findOne(username: string): Promise; diff --git a/apps/api/src/users/users.service.ts b/apps/api/src/users/users.service.ts index 89eee8fb..a432d2bf 100644 --- a/apps/api/src/users/users.service.ts +++ b/apps/api/src/users/users.service.ts @@ -1,5 +1,5 @@ -import { Injectable } from '@nestjs/common'; -import { IUsersService } from './users.service.interface'; +import { Injectable } from "@nestjs/common"; +import { IUsersService } from "./users.service.interface"; // This should be a real class/interface representing a user entity export type User = any; @@ -9,13 +9,13 @@ export class UsersService implements IUsersService { private readonly users = [ { userId: 1, - username: 'john', - password: 'changeme' + username: "john", + password: "changeme" }, { userId: 2, - username: 'maria', - password: 'guess' + username: "maria", + password: "guess" } ]; diff --git a/apps/client/.eslintrc.json b/apps/client/.eslintrc.json index 7760bf44..1565f06c 100644 --- a/apps/client/.eslintrc.json +++ b/apps/client/.eslintrc.json @@ -29,7 +29,8 @@ "@typescript-eslint/no-inferrable-types": "off", "@typescript-eslint/no-unused-vars": "warn", "@typescript-eslint/no-unsafe-declaration-merging": "warn", - "@typescript-eslint/triple-slash-reference": "warn" + "@typescript-eslint/triple-slash-reference": "warn", + "no-case-declarations": "off" } }, { diff --git a/apps/client/jest.config.ts b/apps/client/jest.config.ts index b308a8f4..5b54f8c7 100644 --- a/apps/client/jest.config.ts +++ b/apps/client/jest.config.ts @@ -1,22 +1,25 @@ /* eslint-disable */ export default { - displayName: 'client', - preset: '../../jest.preset.js', - setupFilesAfterEnv: ['/src/test-setup.ts'], - coverageDirectory: '../../coverage/apps/client', + displayName: "client", + preset: "../../jest.preset.js", + setupFilesAfterEnv: ["/src/test-setup.ts"], + coverageDirectory: "../../coverage/apps/client", transform: { - '^.+\\.(ts|mjs|js|html)$': [ - 'jest-preset-angular', + "^.+\\.(ts|mjs|js|html)$": [ + "jest-preset-angular", { - tsconfig: '/tsconfig.spec.json', - stringifyContentPathRegex: '\\.(html|svg)$' + tsconfig: "/tsconfig.spec.json", + stringifyContentPathRegex: "\\.(html|svg)$" } ] }, - transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'], + transformIgnorePatterns: ["node_modules/(?!.*\\.mjs$)"], snapshotSerializers: [ - 'jest-preset-angular/build/serializers/no-ng-attributes', - 'jest-preset-angular/build/serializers/ng-snapshot', - 'jest-preset-angular/build/serializers/html-comment' - ] + "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/app-routing.module.ts b/apps/client/src/app/app-routing.module.ts index fd1d641e..2bbdbc09 100644 --- a/apps/client/src/app/app-routing.module.ts +++ b/apps/client/src/app/app-routing.module.ts @@ -1,36 +1,149 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { HomePageComponent } from './home/page/home-page.component'; -import { ProfileComponent } from './home/profile/profile.component'; -import { AuthGuard } from './auth/auth.guard'; +import { NgModule } from "@angular/core"; +import { RouterModule, Routes } from "@angular/router"; +import { AuthGuard } from "./auth/auth.guard"; +import { LevelGuard } from "./fly-squasher/choose-level/level.guard"; +import { environment } from "../environments/environment"; +import { GameInstanceGuard } from "./probable-waffle/gui/online/lobby-page/game-instance.guard"; -const routes: Routes = [ +const littleMuncherRoutes = [ { - path: '', - component: HomePageComponent - }, + path: "little-muncher", + children: [ + { + path: "", + loadComponent: () => import("./little-muncher/little-muncher.component").then((m) => m.LittleMuncherComponent) + }, + { path: "**", redirectTo: "" } + ] + } +] satisfies Routes; + +const probableWaffleRoutes = [ { - path: 'profile', - component: ProfileComponent, - canActivate: [AuthGuard] - }, + path: "probable-waffle", + children: [ + { + path: "", + loadComponent: () => + import("./probable-waffle/gui/router/probable-waffle.component").then((m) => m.ProbableWaffleComponent), + children: [ + { + path: "", + loadComponent: () => import("./probable-waffle/gui/home/home.component").then((m) => m.HomeComponent) + }, + { + path: "campaign", + loadComponent: () => + import("./probable-waffle/gui/campaign/campaign.component").then((m) => m.CampaignComponent) + }, + { + path: "online", + loadComponent: () => import("./probable-waffle/gui/online/online.component").then((m) => m.OnlineComponent) + }, + { + path: "skirmish", + loadComponent: () => + import("./probable-waffle/gui/skirmish/skirmish.component").then((m) => m.SkirmishComponent) + }, + { + path: "instant-game", + loadComponent: () => + import("./probable-waffle/gui/instant-game/instant-game.component").then((m) => m.InstantGameComponent), + canActivate: [() => !environment.production] + }, + { + path: "load", + loadComponent: () => import("./probable-waffle/gui/load/load.component").then((m) => m.LoadComponent) + }, + { + path: "replay", + loadComponent: () => import("./probable-waffle/gui/replay/replay.component").then((m) => m.ReplayComponent) + }, + { + path: "progress", + loadComponent: () => + import("./probable-waffle/gui/progress/progress.component").then((m) => m.ProgressComponent) + }, + { + path: "options", + loadComponent: () => + import("./probable-waffle/gui/options/options.component").then((m) => m.OptionsComponent) + }, + { + path: "lobby", + loadComponent: () => import("./probable-waffle/gui/lobby/lobby.component").then((m) => m.LobbyComponent), + canActivate: [GameInstanceGuard] + }, + { + path: "score-screen", + loadComponent: () => + import("./probable-waffle/gui/score-screen/score-screen.component").then((m) => m.ScoreScreenComponent), + canActivate: [GameInstanceGuard] + }, + { + path: "game", + loadComponent: () => + import("./probable-waffle/gui/main/probable-waffle-game.component").then( + (m) => m.ProbableWaffleGameComponent + ), + canActivate: [GameInstanceGuard] + } + ] + }, + { path: "**", redirectTo: "home" } + ] + } +] satisfies Routes; + +const flySquasherRoutes = [ { - path: 'little-muncher', - loadChildren: () => import('./little-muncher/little-muncher.module').then((m) => m.LittleMuncherModule) - }, + path: "fly-squasher", + children: [ + { + path: "", + loadComponent: () => import("./fly-squasher/home/home.component").then((m) => m.HomeComponent) + }, + { + path: "choose-level", + loadComponent: () => + import("./fly-squasher/choose-level/choose-level.component").then((m) => m.ChooseLevelComponent) + }, + { + path: "play/:level", + loadComponent: () => import("./fly-squasher/main/main.component").then((m) => m.MainComponent), + canActivate: [LevelGuard] + }, + { + path: "high-score", + loadComponent: () => import("./fly-squasher/high-score/high-score.component").then((m) => m.HighScoreComponent) + }, + { + path: "options", + loadComponent: () => import("./fly-squasher/options/options.component").then((m) => m.OptionsComponent) + }, + { path: "**", redirectTo: "" } + ] + } +] satisfies Routes; + +const routes = [ { - path: 'probable-waffle', - loadChildren: () => import('./probable-waffle/gui/main/probable-waffle.module').then((m) => m.ProbableWaffleModule) + path: "", + loadComponent: () => import("./home/page/home-page.component").then((m) => m.HomePageComponent) }, { - path: 'fly-squasher', - loadChildren: () => import('./fly-squasher/fly-squasher.module').then((m) => m.FlySquasherModule) + path: "profile", + loadComponent: () => import("./home/profile/profile.component").then((m) => m.ProfileComponent), + canActivate: [AuthGuard] }, + ...littleMuncherRoutes, + ...probableWaffleRoutes, + ...flySquasherRoutes, { - path: '**', - redirectTo: '' + path: "**", + redirectTo: "" } -]; +] satisfies Routes; @NgModule({ imports: [ diff --git a/apps/client/src/app/app.component.html b/apps/client/src/app/app.component.html index 74069010..08ea6929 100644 --- a/apps/client/src/app/app.component.html +++ b/apps/client/src/app/app.component.html @@ -1,3 +1,3 @@ - + - + diff --git a/apps/client/src/app/app.component.spec.ts b/apps/client/src/app/app.component.spec.ts index d9ff90fe..f91f22dc 100644 --- a/apps/client/src/app/app.component.spec.ts +++ b/apps/client/src/app/app.component.spec.ts @@ -1,17 +1,18 @@ -import { TestBed, waitForAsync } from '@angular/core/testing'; -import { AppComponent } from './app.component'; -import { RouterTestingModule } from '@angular/router/testing'; -import { ServerHealthService } from './shared/services/server-health.service'; -import { serverHealthServiceStub } from './shared/services/server-health.service.spec'; -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 { TestBed, waitForAsync } from "@angular/core/testing"; +import { AppComponent } from "./app.component"; +import { RouterTestingModule } from "@angular/router/testing"; +import { ServerHealthService } from "./shared/services/server-health.service"; +import { serverHealthServiceStub } from "./shared/services/server-health.service.spec"; +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', () => { +describe("AppComponent", () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [AppComponent, SwRefreshTestingComponent], - imports: [RouterTestingModule], + imports: [AppComponent, RouterTestingModule, SwRefreshTestingComponent], providers: [ { provide: ServerHealthService, @@ -22,10 +23,19 @@ describe('AppComponent', () => { useValue: authServiceStub } ] - }).compileComponents(); + }) + .overrideComponent(AppComponent, { + remove: { + imports: [SwRefreshComponent] + }, + add: { + imports: [SwRefreshTestingComponent] + } + }) + .compileComponents(); })); - it('should create the app', () => { + it("should create the app", () => { const fixture = TestBed.createComponent(AppComponent); const app = fixture.debugElement.componentInstance; expect(app).toBeTruthy(); diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts index 7287becc..215aec33 100644 --- a/apps/client/src/app/app.component.ts +++ b/apps/client/src/app/app.component.ts @@ -1,14 +1,19 @@ -import { Component, OnInit } from '@angular/core'; -import { AuthService } from './auth/auth.service'; -import { ServerHealthService } from './shared/services/server-health.service'; +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 { - constructor(protected readonly authService: AuthService, private readonly serverHealthService: ServerHealthService) {} + protected readonly authService = inject(AuthService); + private readonly serverHealthService = inject(ServerHealthService); async ngOnInit() { await Promise.all([this.serverHealthService.checkHealth(), this.authService.autoSignIn()]); diff --git a/apps/client/src/app/app.module.ts b/apps/client/src/app/app.module.ts deleted file mode 100644 index 5da24440..00000000 --- a/apps/client/src/app/app.module.ts +++ /dev/null @@ -1,40 +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 { 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], - imports: [ - BrowserModule, - HttpClientModule, - HomeModule, - // 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), - FontAwesomeModule, - NgbModule, - ComponentsModule, - LoaderComponent - ], - providers: [AuthGuard, { provide: HTTP_INTERCEPTORS, useClass: AccessTokenInterceptor, multi: true }], - bootstrap: [AppComponent] -}) -export class AppModule {} diff --git a/apps/client/src/app/auth/access-token.interceptor.ts b/apps/client/src/app/auth/access-token.interceptor.ts index d0edec5b..56d5de8a 100644 --- a/apps/client/src/app/auth/access-token.interceptor.ts +++ b/apps/client/src/app/auth/access-token.interceptor.ts @@ -1,13 +1,13 @@ -import { Injectable } from '@angular/core'; -import { AuthService } from './auth.service'; -import { HttpEvent, HttpHandler, HttpHeaders, HttpInterceptor, HttpRequest } from '@angular/common/http'; -import { Observable } from 'rxjs'; +import { inject, Injectable } from "@angular/core"; +import { AuthService } from "./auth.service"; +import { HttpEvent, HttpHandler, HttpHeaders, HttpInterceptor, HttpRequest } from "@angular/common/http"; +import { Observable } from "rxjs"; @Injectable({ - providedIn: 'root' + providedIn: "root" }) export class AccessTokenInterceptor implements HttpInterceptor { - constructor(private authService: AuthService) {} + private readonly authService = inject(AuthService); intercept(request: HttpRequest, next: HttpHandler): Observable> { let _request = request; diff --git a/apps/client/src/app/auth/auth.guard.ts b/apps/client/src/app/auth/auth.guard.ts index e18bd8b7..45d3f8f0 100644 --- a/apps/client/src/app/auth/auth.guard.ts +++ b/apps/client/src/app/auth/auth.guard.ts @@ -1,10 +1,11 @@ -import { Injectable } from '@angular/core'; -import { CanActivate, Router } from '@angular/router'; -import { AuthService } from './auth.service'; +import { inject, Injectable } from "@angular/core"; +import { CanActivate, Router } from "@angular/router"; +import { AuthService } from "./auth.service"; @Injectable() export class AuthGuard implements CanActivate { - constructor(private authService: AuthService, private router: Router) {} + private readonly authService = inject(AuthService); + private readonly router = inject(Router); async canActivate(): Promise { if (this.authService.processing) { @@ -12,7 +13,7 @@ export class AuthGuard implements CanActivate { } const isAuthenticated = this.authService.isAuthenticated; if (!isAuthenticated) { - await this.router.navigate(['/']); + await this.router.navigate(["/"]); } return isAuthenticated; } diff --git a/apps/client/src/app/auth/auth.service.interface.ts b/apps/client/src/app/auth/auth.service.interface.ts index 812b5013..44509c64 100644 --- a/apps/client/src/app/auth/auth.service.interface.ts +++ b/apps/client/src/app/auth/auth.service.interface.ts @@ -1,4 +1,4 @@ -import { Session } from '@supabase/supabase-js'; +import { Session } from "@supabase/supabase-js"; export interface AuthServiceInterface { processing: Promise | null; diff --git a/apps/client/src/app/auth/auth.service.spec.ts b/apps/client/src/app/auth/auth.service.spec.ts index 3e4ac20a..f433faa1 100644 --- a/apps/client/src/app/auth/auth.service.spec.ts +++ b/apps/client/src/app/auth/auth.service.spec.ts @@ -1,10 +1,10 @@ -import { TestBed } from '@angular/core/testing'; +import { TestBed } from "@angular/core/testing"; -import { AuthService } from './auth.service'; -import { AuthServiceInterface } from './auth.service.interface'; -import { Session } from '@supabase/supabase-js'; -import { DataAccessService } from '../data-access/data-access.service'; -import { dataAccessServiceStub } from '../data-access/data-access.service.spec'; +import { AuthService } from "./auth.service"; +import { AuthServiceInterface } from "./auth.service.interface"; +import { Session } from "@supabase/supabase-js"; +import { DataAccessService } from "../data-access/data-access.service"; +import { dataAccessServiceStub } from "../data-access/data-access.service.spec"; export const authServiceStub = { get session(): Session | null { @@ -33,7 +33,7 @@ export const authServiceStub = { }, processing: null } satisfies AuthServiceInterface; -describe('AuthService', () => { +describe("AuthService", () => { let service: AuthService; beforeEach(() => { @@ -41,7 +41,7 @@ describe('AuthService', () => { service = TestBed.inject(AuthService); }); - it('should be created', () => { + it("should be created", () => { expect(service).toBeTruthy(); }); }); diff --git a/apps/client/src/app/auth/auth.service.ts b/apps/client/src/app/auth/auth.service.ts index 0a7c2729..931bd631 100644 --- a/apps/client/src/app/auth/auth.service.ts +++ b/apps/client/src/app/auth/auth.service.ts @@ -1,15 +1,15 @@ -import { Injectable } from '@angular/core'; -import { Session } from '@supabase/supabase-js'; -import { DataAccessService } from '../data-access/data-access.service'; -import { AuthServiceInterface } from './auth.service.interface'; +import { inject, Injectable } from "@angular/core"; +import { Session } from "@supabase/supabase-js"; +import { DataAccessService } from "../data-access/data-access.service"; +import { AuthServiceInterface } from "./auth.service.interface"; @Injectable({ - providedIn: 'root' + providedIn: "root" }) export class AuthService implements AuthServiceInterface { processing: Promise | null = null; - constructor(private dataAccessService: DataAccessService) {} + private readonly dataAccessService = inject(DataAccessService); private _session: Session | null = null; @@ -19,8 +19,8 @@ export class AuthService implements AuthServiceInterface { get fullName(): string | null { return ( - this.session?.user?.identities?.find((identity) => identity.provider === 'google')?.identity_data?.[ - 'full_name' + this.session?.user?.identities?.find((identity) => identity.provider === "google")?.identity_data?.[ + "full_name" ] ?? null ); } @@ -39,13 +39,13 @@ export class AuthService implements AuthServiceInterface { async signInWithGoogle() { const signInPromise = (this.processing = this.dataAccessService.supabase.auth.signInWithOAuth({ - provider: 'google', + provider: "google", options: { redirectTo: window.location.href } })); const { error } = await signInPromise; if (error) { - console.error('error', error); + console.error("error", error); } this.processing = null; } @@ -54,7 +54,7 @@ export class AuthService implements AuthServiceInterface { const signOutPromise = (this.processing = this.dataAccessService.supabase.auth.signOut()); const { error } = await signOutPromise; if (error) { - console.error('error', error); + console.error("error", error); } else { this._session = null; } @@ -66,7 +66,7 @@ export class AuthService implements AuthServiceInterface { const { data, error } = await signInPromise; if (error) { - console.error('error', error); + console.error("error", error); } this._session = data.session; this.processing = null; diff --git a/apps/client/src/app/data-access/chat/authenticated-socket.service.interface.ts b/apps/client/src/app/data-access/chat/authenticated-socket.service.interface.ts index 88a7ca26..dff6382d 100644 --- a/apps/client/src/app/data-access/chat/authenticated-socket.service.interface.ts +++ b/apps/client/src/app/data-access/chat/authenticated-socket.service.interface.ts @@ -1,4 +1,4 @@ -import { Socket } from 'ngx-socket-io'; +import { Socket } from "ngx-socket-io"; export interface IAuthenticatedSocketService { get socket(): Socket | undefined; diff --git a/apps/client/src/app/data-access/chat/authenticated-socket.service.ts b/apps/client/src/app/data-access/chat/authenticated-socket.service.ts index 23a6ab6c..6c84fa65 100644 --- a/apps/client/src/app/data-access/chat/authenticated-socket.service.ts +++ b/apps/client/src/app/data-access/chat/authenticated-socket.service.ts @@ -1,11 +1,11 @@ -import { Socket } from 'ngx-socket-io'; -import { AuthService } from '../../auth/auth.service'; -import { environment } from '../../../environments/environment'; -import { Injectable } from '@angular/core'; -import { IAuthenticatedSocketService } from './authenticated-socket.service.interface'; +import { Socket } from "ngx-socket-io"; +import { AuthService } from "../../auth/auth.service"; +import { environment } from "../../../environments/environment"; +import { Injectable } from "@angular/core"; +import { IAuthenticatedSocketService } from "./authenticated-socket.service.interface"; @Injectable({ - providedIn: 'root' + providedIn: "root" }) export class AuthenticatedSocketService implements IAuthenticatedSocketService { private authenticatedSocket?: Socket; @@ -13,7 +13,7 @@ export class AuthenticatedSocketService implements IAuthenticatedSocketService { constructor(private readonly authService: AuthService) {} get socket(): Socket | undefined { - if (!this.authenticatedSocket && this.authService.accessToken) { + if (!this.authenticatedSocket && this.authService.isAuthenticated) { this.authenticatedSocket = this.createAuthSocket(); } diff --git a/apps/client/src/app/data-access/chat/chat.service.interface.ts b/apps/client/src/app/data-access/chat/chat.service.interface.ts index 02d1a3b8..ec40eb2b 100644 --- a/apps/client/src/app/data-access/chat/chat.service.interface.ts +++ b/apps/client/src/app/data-access/chat/chat.service.interface.ts @@ -1,10 +1,7 @@ -import { ChatMessage } from '@fuzzy-waddle/api-interfaces'; -import { Observable } from 'rxjs'; +import { ChatMessage } from "@fuzzy-waddle/api-interfaces"; +import { Observable } from "rxjs"; export interface IChatService { sendMessage(msg: ChatMessage): void; - - getMessage(): Observable | undefined; - - createMessage(message: string): ChatMessage; + get listenToMessages(): Observable | undefined; } diff --git a/apps/client/src/app/data-access/chat/chat.service.spec.ts b/apps/client/src/app/data-access/chat/chat.service.spec.ts index bf67dd49..010f017f 100644 --- a/apps/client/src/app/data-access/chat/chat.service.spec.ts +++ b/apps/client/src/app/data-access/chat/chat.service.spec.ts @@ -4,24 +4,14 @@ import { AuthenticatedSocketService } from "./authenticated-socket.service"; import { createAuthenticatedSocketServiceStub } from "./authenticated-socket.service.spec"; import { ChatMessage } from "@fuzzy-waddle/api-interfaces"; import { IChatService } from "./chat.service.interface"; -import { AuthService } from "../../auth/auth.service"; -import { authServiceStub } from "../../auth/auth.service.spec"; import { Observable } from "rxjs"; export const chatServiceStub = { sendMessage(msg: ChatMessage) { // do nothing }, - getMessage() { - return new Observable(); - }, - createMessage(message: string): ChatMessage { - return { - text: message, - userId: "123", - fullName: "test", - createdAt: new Date() - }; + get listenToMessages(): Observable | undefined { + return undefined; } } satisfies IChatService; @@ -35,8 +25,7 @@ describe("Chat", () => { { provide: AuthenticatedSocketService, useValue: createAuthenticatedSocketServiceStub - }, - { provide: AuthService, useValue: authServiceStub } + } ] }); service = TestBed.inject(ChatService); diff --git a/apps/client/src/app/data-access/chat/chat.service.ts b/apps/client/src/app/data-access/chat/chat.service.ts index 202ba44a..09726cd8 100644 --- a/apps/client/src/app/data-access/chat/chat.service.ts +++ b/apps/client/src/app/data-access/chat/chat.service.ts @@ -1,33 +1,23 @@ -import { Injectable } from '@angular/core'; -import { map } from 'rxjs/operators'; -import { Observable } from 'rxjs'; -import { IChatService } from './chat.service.interface'; -import { AuthenticatedSocketService } from './authenticated-socket.service'; -import { AuthService } from '../../auth/auth.service'; -import { ChatMessage, GatewayChatEvent } from '@fuzzy-waddle/api-interfaces'; +import { Injectable } from "@angular/core"; +import { map } from "rxjs/operators"; +import { Observable } from "rxjs"; +import { IChatService } from "./chat.service.interface"; +import { AuthenticatedSocketService } from "./authenticated-socket.service"; +import { ChatMessage, GatewayChatEvent } from "@fuzzy-waddle/api-interfaces"; @Injectable({ - providedIn: 'root' + providedIn: "root" }) export class ChatService implements IChatService { - constructor(private authenticatedSocketService: AuthenticatedSocketService, private authService: AuthService) {} + constructor(private authenticatedSocketService: AuthenticatedSocketService) {} sendMessage(msg: ChatMessage): void { const socket = this.authenticatedSocketService.socket; socket?.emit(GatewayChatEvent.CHAT_MESSAGE, msg); } - getMessage(): Observable | undefined { + get listenToMessages(): Observable | undefined { const socket = this.authenticatedSocketService.socket; return socket?.fromEvent(GatewayChatEvent.CHAT_MESSAGE).pipe(map((data: ChatMessage) => data)); } - - createMessage(message: string): ChatMessage { - return { - text: message, - userId: this.authService.userId as string, - fullName: this.authService.fullName as string, - createdAt: new Date() - }; - } } diff --git a/apps/client/src/app/data-access/data-access.service.interface.ts b/apps/client/src/app/data-access/data-access.service.interface.ts index c67ff358..2a748016 100644 --- a/apps/client/src/app/data-access/data-access.service.interface.ts +++ b/apps/client/src/app/data-access/data-access.service.interface.ts @@ -1,4 +1,4 @@ -import { SupabaseClient } from '@supabase/supabase-js'; +import { SupabaseClient } from "@supabase/supabase-js"; export interface DataAccessServiceInterface { get supabase(): SupabaseClient; diff --git a/apps/client/src/app/data-access/data-access.service.spec.ts b/apps/client/src/app/data-access/data-access.service.spec.ts index 3e87bb57..d5311988 100644 --- a/apps/client/src/app/data-access/data-access.service.spec.ts +++ b/apps/client/src/app/data-access/data-access.service.spec.ts @@ -1,15 +1,15 @@ -import { TestBed } from '@angular/core/testing'; +import { TestBed } from "@angular/core/testing"; -import { DataAccessService } from './data-access.service'; -import { SupabaseClient } from '@supabase/supabase-js'; -import { DataAccessServiceInterface } from './data-access.service.interface'; +import { DataAccessService } from "./data-access.service"; +import { SupabaseClient } from "@supabase/supabase-js"; +import { DataAccessServiceInterface } from "./data-access.service.interface"; export const dataAccessServiceStub = { get supabase(): SupabaseClient { - return new SupabaseClient('http://localhost:4200', '123'); + return new SupabaseClient("http://localhost:4200", "123"); } } satisfies DataAccessServiceInterface; -describe('DataAccess', () => { +describe("DataAccess", () => { let service: DataAccessService; beforeEach(() => { @@ -17,7 +17,7 @@ describe('DataAccess', () => { service = TestBed.inject(DataAccessService); }); - it('should be created', () => { + it("should be created", () => { expect(service).toBeTruthy(); }); }); diff --git a/apps/client/src/app/data-access/data-access.service.ts b/apps/client/src/app/data-access/data-access.service.ts index 654f0821..2be04978 100644 --- a/apps/client/src/app/data-access/data-access.service.ts +++ b/apps/client/src/app/data-access/data-access.service.ts @@ -1,10 +1,10 @@ -import { Injectable } from '@angular/core'; -import { createClient, SupabaseClient } from '@supabase/supabase-js'; -import { environment } from '../../environments/environment'; -import { DataAccessServiceInterface } from './data-access.service.interface'; +import { Injectable } from "@angular/core"; +import { createClient, SupabaseClient } from "@supabase/supabase-js"; +import { environment } from "../../environments/environment"; +import { DataAccessServiceInterface } from "./data-access.service.interface"; @Injectable({ - providedIn: 'root' + providedIn: "root" }) export class DataAccessService implements DataAccessServiceInterface { constructor() { diff --git a/apps/client/src/app/data-access/db-access-test/db-access-test.service.spec.ts b/apps/client/src/app/data-access/db-access-test/db-access-test.service.spec.ts index fedd66c3..1f9b1aa6 100644 --- a/apps/client/src/app/data-access/db-access-test/db-access-test.service.spec.ts +++ b/apps/client/src/app/data-access/db-access-test/db-access-test.service.spec.ts @@ -1,21 +1,21 @@ -import { TestBed } from '@angular/core/testing'; +import { TestBed } from "@angular/core/testing"; -import { DbAccessTestService } from './db-access-test.service'; -import { DataAccessService } from '../data-access.service'; -import { dataAccessServiceStub } from '../data-access.service.spec'; +import { DbAccessTestService } from "./db-access-test.service"; +import { DataAccessService } from "../data-access.service"; +import { dataAccessServiceStub } from "../data-access.service.spec"; export const dbAccessTestServiceStub = { get(): void { - console.log('test'); + console.log("test"); }, add(): void { - console.log('test'); + console.log("test"); }, async getStorageEntry(): Promise { - console.log('test'); + console.log("test"); } }; -describe('DbAccessTest', () => { +describe("DbAccessTest", () => { let service: DbAccessTestService; beforeEach(() => { @@ -23,7 +23,7 @@ describe('DbAccessTest', () => { service = TestBed.inject(DbAccessTestService); }); - it('should be created', () => { + it("should be created", () => { expect(service).toBeTruthy(); }); }); diff --git a/apps/client/src/app/data-access/db-access-test/db-access-test.service.ts b/apps/client/src/app/data-access/db-access-test/db-access-test.service.ts index a225dc0e..99d07e2d 100644 --- a/apps/client/src/app/data-access/db-access-test/db-access-test.service.ts +++ b/apps/client/src/app/data-access/db-access-test/db-access-test.service.ts @@ -1,16 +1,16 @@ -import { Injectable } from '@angular/core'; -import { DataAccessService } from '../data-access.service'; +import { inject, Injectable } from "@angular/core"; +import { DataAccessService } from "../data-access.service"; @Injectable({ - providedIn: 'root' + providedIn: "root" }) export class DbAccessTestService { - constructor(private dataAccessService: DataAccessService) {} + private readonly dataAccessService = inject(DataAccessService); get(): void { this.dataAccessService.supabase - .from('test') - .select('*') + .from("test") + .select("*") .then((data) => { console.table(data.data); }); @@ -18,15 +18,15 @@ export class DbAccessTestService { add(): void { this.dataAccessService.supabase - .from('test') - .insert({ text: 'test from frontend' }) + .from("test") + .insert({ text: "test from frontend" }) .then((data) => { console.log(data); }); } async getStorageEntry(): Promise { - const bucket1 = await this.dataAccessService.supabase.storage.from('test-bucket').download('probable-waffle.webp'); + const bucket1 = await this.dataAccessService.supabase.storage.from("test-bucket").download("probable-waffle.webp"); console.log(bucket1); } } diff --git a/apps/client/src/app/fly-squasher/choose-level/choose-level.component.html b/apps/client/src/app/fly-squasher/choose-level/choose-level.component.html index 0fecedd8..400473b6 100644 --- a/apps/client/src/app/fly-squasher/choose-level/choose-level.component.html +++ b/apps/client/src/app/fly-squasher/choose-level/choose-level.component.html @@ -1,5 +1,9 @@ - @@ -8,9 +12,9 @@
-
{{level.value.name}}
-
{{level.value.description}}
- +
{{ level.value.name }}
+
{{ level.value.description }}
+
diff --git a/apps/client/src/app/fly-squasher/choose-level/choose-level.component.spec.ts b/apps/client/src/app/fly-squasher/choose-level/choose-level.component.spec.ts index 245cf44c..b77be6bd 100644 --- a/apps/client/src/app/fly-squasher/choose-level/choose-level.component.spec.ts +++ b/apps/client/src/app/fly-squasher/choose-level/choose-level.component.spec.ts @@ -1,16 +1,15 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { ChooseLevelComponent } from './choose-level.component'; -import { RouterTestingModule } from '@angular/router/testing'; +import { ChooseLevelComponent } from "./choose-level.component"; +import { RouterTestingModule } from "@angular/router/testing"; -describe('ChooseLevelComponent', () => { +describe("ChooseLevelComponent", () => { let component: ChooseLevelComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ChooseLevelComponent], - imports: [RouterTestingModule] + imports: [ChooseLevelComponent, RouterTestingModule] }).compileComponents(); fixture = TestBed.createComponent(ChooseLevelComponent); @@ -18,7 +17,7 @@ describe('ChooseLevelComponent', () => { fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/fly-squasher/choose-level/choose-level.component.ts b/apps/client/src/app/fly-squasher/choose-level/choose-level.component.ts index da4cc130..d908d1bb 100644 --- a/apps/client/src/app/fly-squasher/choose-level/choose-level.component.ts +++ b/apps/client/src/app/fly-squasher/choose-level/choose-level.component.ts @@ -1,10 +1,14 @@ import { Component } from "@angular/core"; import { FlySquasherLevels } from "@fuzzy-waddle/api-interfaces"; +import { CommonModule } from "@angular/common"; +import { RouterLink } from "@angular/router"; @Component({ selector: "fly-squasher-choose-level", templateUrl: "./choose-level.component.html", - styleUrls: ["./choose-level.component.scss"] + styleUrls: ["./choose-level.component.scss"], + standalone: true, + imports: [CommonModule, RouterLink] }) export class ChooseLevelComponent { protected readonly flySquasherLevels = FlySquasherLevels; diff --git a/apps/client/src/app/fly-squasher/choose-level/level.guard.ts b/apps/client/src/app/fly-squasher/choose-level/level.guard.ts index 904039f2..fb59a4ff 100644 --- a/apps/client/src/app/fly-squasher/choose-level/level.guard.ts +++ b/apps/client/src/app/fly-squasher/choose-level/level.guard.ts @@ -1,4 +1,4 @@ -import { Injectable } from "@angular/core"; +import { inject, Injectable } from "@angular/core"; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router"; import { FlySquasherLevels } from "@fuzzy-waddle/api-interfaces"; @@ -6,7 +6,7 @@ import { FlySquasherLevels } from "@fuzzy-waddle/api-interfaces"; providedIn: "root" }) export class LevelGuard implements CanActivate { - constructor(private router: Router) {} + private readonly router = inject(Router); canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean { const levelId = route.paramMap.get("level"); // Get the level ID from the route parameter diff --git a/apps/client/src/app/fly-squasher/fly-squasher-routing.module.ts b/apps/client/src/app/fly-squasher/fly-squasher-routing.module.ts deleted file mode 100644 index 347c5d1c..00000000 --- a/apps/client/src/app/fly-squasher/fly-squasher-routing.module.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { NgModule } from "@angular/core"; -import { RouterModule, Routes } from "@angular/router"; -import { HomeComponent } from "./home/home.component"; -import { HighScoreComponent } from "./high-score/high-score.component"; -import { MainComponent } from "./main/main.component"; -import { ChooseLevelComponent } from "./choose-level/choose-level.component"; -import { LevelGuard } from "./choose-level/level.guard"; -import { OptionsComponent } from "./options/options.component"; - -const routes: Routes = [ - { - path: "", - component: HomeComponent - }, - { - path: "choose-level", - component: ChooseLevelComponent - }, - { - path: "play/:level", - component: MainComponent, - canActivate: [LevelGuard] - }, - { - path: "high-score", - component: HighScoreComponent - }, - { - path: "options", - component: OptionsComponent - }, - { path: "**", redirectTo: "" } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class FlySquasherRoutingModule {} diff --git a/apps/client/src/app/fly-squasher/fly-squasher.component.html b/apps/client/src/app/fly-squasher/fly-squasher.component.html index 0680b43f..67e7bd4c 100644 --- a/apps/client/src/app/fly-squasher/fly-squasher.component.html +++ b/apps/client/src/app/fly-squasher/fly-squasher.component.html @@ -1 +1 @@ - + diff --git a/apps/client/src/app/fly-squasher/fly-squasher.component.spec.ts b/apps/client/src/app/fly-squasher/fly-squasher.component.spec.ts index a9d6527c..54e450cd 100644 --- a/apps/client/src/app/fly-squasher/fly-squasher.component.spec.ts +++ b/apps/client/src/app/fly-squasher/fly-squasher.component.spec.ts @@ -1,16 +1,15 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { FlySquasherComponent } from './fly-squasher.component'; -import { RouterTestingModule } from '@angular/router/testing'; +import { FlySquasherComponent } from "./fly-squasher.component"; +import { RouterTestingModule } from "@angular/router/testing"; -describe('FlySquasherComponent', () => { +describe("FlySquasherComponent", () => { let component: FlySquasherComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [FlySquasherComponent], - imports: [RouterTestingModule] + imports: [FlySquasherComponent, RouterTestingModule] }).compileComponents(); fixture = TestBed.createComponent(FlySquasherComponent); @@ -18,7 +17,7 @@ describe('FlySquasherComponent', () => { fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/fly-squasher/fly-squasher.component.ts b/apps/client/src/app/fly-squasher/fly-squasher.component.ts index 3011b48d..30cbd293 100644 --- a/apps/client/src/app/fly-squasher/fly-squasher.component.ts +++ b/apps/client/src/app/fly-squasher/fly-squasher.component.ts @@ -1,7 +1,17 @@ -import { Component } from '@angular/core'; +import { Component, inject, OnInit } from "@angular/core"; +import { UserInstanceService } from "../home/profile/user-instance.service"; +import { CommonModule } from "@angular/common"; +import { RouterOutlet } from "@angular/router"; @Component({ - templateUrl: './fly-squasher.component.html', - styleUrls: ['./fly-squasher.component.scss'] + templateUrl: "./fly-squasher.component.html", + styleUrls: ["./fly-squasher.component.scss"], + standalone: true, + imports: [CommonModule, RouterOutlet] }) -export class FlySquasherComponent {} +export class FlySquasherComponent implements OnInit { + protected readonly userInstanceService = inject(UserInstanceService); + ngOnInit(): void { + this.userInstanceService.setVisitedGame("fly-squasher"); + } +} diff --git a/apps/client/src/app/fly-squasher/fly-squasher.module.ts b/apps/client/src/app/fly-squasher/fly-squasher.module.ts deleted file mode 100644 index b132946b..00000000 --- a/apps/client/src/app/fly-squasher/fly-squasher.module.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { NgModule } from "@angular/core"; -import { CommonModule } from "@angular/common"; -import { FlySquasherRoutingModule } from "./fly-squasher-routing.module"; -import { FlySquasherComponent } from "./fly-squasher.component"; -import { MainModule } from "./main/main.module"; -import { ChooseLevelComponent } from "./choose-level/choose-level.component"; -import { HighScoreComponent } from "./high-score/high-score.component"; -import { HomeComponent } from "./home/home.component"; -import { OptionsComponent } from "./options/options.component"; -import { FaIconComponent } from "@fortawesome/angular-fontawesome"; - -@NgModule({ - declarations: [FlySquasherComponent, ChooseLevelComponent, HighScoreComponent, HomeComponent], - imports: [CommonModule, FlySquasherRoutingModule, MainModule, OptionsComponent, FaIconComponent] -}) -export class FlySquasherModule {} diff --git a/apps/client/src/app/fly-squasher/game/consts/game-config.ts b/apps/client/src/app/fly-squasher/game/consts/game-config.ts index 2e304308..987126f4 100644 --- a/apps/client/src/app/fly-squasher/game/consts/game-config.ts +++ b/apps/client/src/app/fly-squasher/game/consts/game-config.ts @@ -1,12 +1,12 @@ -import { Types } from 'phaser'; -import { FlySquasherScene } from '../fly-squasher-scene'; -import { baseGameConfig } from '../../../shared/game/base-game.config'; +import { Types } from "phaser"; +import { FlySquasherScene } from "../fly-squasher-scene"; +import { baseGameConfig } from "../../../shared/game/base-game.config"; export const flySquasherGameConfig: Types.Core.GameConfig = { ...baseGameConfig, scene: [FlySquasherScene], physics: { - default: 'arcade', + default: "arcade", arcade: { fps: 60, gravity: { y: 0 } @@ -14,5 +14,5 @@ export const flySquasherGameConfig: Types.Core.GameConfig = { } }, pixelArt: true, - backgroundColor: '#D1C4E9' + backgroundColor: "#D1C4E9" }; diff --git a/apps/client/src/app/fly-squasher/game/consts/scenes.ts b/apps/client/src/app/fly-squasher/game/consts/scenes.ts index 4e4e2c0f..c59170e9 100644 --- a/apps/client/src/app/fly-squasher/game/consts/scenes.ts +++ b/apps/client/src/app/fly-squasher/game/consts/scenes.ts @@ -1,3 +1,3 @@ export enum Scenes { - 'MainScene' = 'MainScene' + "MainScene" = "MainScene" } diff --git a/apps/client/src/app/fly-squasher/game/fly-squasher-communicator.service.ts b/apps/client/src/app/fly-squasher/game/fly-squasher-communicator.service.ts index 69add3df..d717f07d 100644 --- a/apps/client/src/app/fly-squasher/game/fly-squasher-communicator.service.ts +++ b/apps/client/src/app/fly-squasher/game/fly-squasher-communicator.service.ts @@ -1,6 +1,11 @@ import { Injectable, OnDestroy } from "@angular/core"; import { TwoWayCommunicator } from "../../shared/game/communicators/two-way-communicator"; -import { FlySquasherCommunicatorScoreEvent, FlySquasherGatewayEvent } from "@fuzzy-waddle/api-interfaces"; +import { + FlySquasherCommunicatorScoreEvent, + FlySquasherGatewayEvent, + LittleMuncherCommunicatorType +} from "@fuzzy-waddle/api-interfaces"; +import { CommunicatorService } from "../../shared/game/communicators/CommunicatorService"; export const flySquasherCommunicatorServiceStub = { startCommunication: () => {}, @@ -10,11 +15,11 @@ export const flySquasherCommunicatorServiceStub = { @Injectable({ providedIn: "root" }) -export class FlySquasherCommunicatorService implements OnDestroy { - score?: TwoWayCommunicator; +export class FlySquasherCommunicatorService implements CommunicatorService, OnDestroy { + score?: TwoWayCommunicator; startCommunication() { - this.score = new TwoWayCommunicator( + this.score = new TwoWayCommunicator( FlySquasherGatewayEvent.FlySquasherAction, "score" ); diff --git a/apps/client/src/app/fly-squasher/game/fly-squasher-scene.ts b/apps/client/src/app/fly-squasher/game/fly-squasher-scene.ts index 5d5c1b6f..8d1b4bd7 100644 --- a/apps/client/src/app/fly-squasher/game/fly-squasher-scene.ts +++ b/apps/client/src/app/fly-squasher/game/fly-squasher-scene.ts @@ -17,6 +17,7 @@ import { Scenery } from "./scenery/Scenery"; import { FlyFactory } from "./fly/fly.factory"; import { FlySquasherGameData } from "./fly-squasher-game-data"; import { FlySquasherAudio } from "./audio"; +import { FlySquasherCommunicatorService } from "./fly-squasher-communicator.service"; export class FlySquasherScene extends BaseScene< FlySquasherGameData, @@ -28,7 +29,8 @@ export class FlySquasherScene extends BaseScene< FlySquasherPlayerControllerData, FlySquasherPlayer, FlySquasherSpectatorData, - FlySquasherSpectator + FlySquasherSpectator, + FlySquasherCommunicatorService > { private readonly worldSpeedState = { initialWorldSpeedPerFrame: 0.2, 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? diff --git a/apps/client/src/app/fly-squasher/game/prefabs/Croissants.ts b/apps/client/src/app/fly-squasher/game/prefabs/Croissants.ts index ece7786f..08ceb081 100644 --- a/apps/client/src/app/fly-squasher/game/prefabs/Croissants.ts +++ b/apps/client/src/app/fly-squasher/game/prefabs/Croissants.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -8,37 +7,46 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class Croissants extends Phaser.GameObjects.Container { - - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 2.221526863075212, y ?? 1.6450976306480243); - - // towel - const towel = scene.add.image(124.77847146244132, 103.35489880789905, "croissants-spritesheet", "croissants/towel"); - this.add(towel); - - // plate - const plate = scene.add.image(129.7784714624413, 91.35489880789905, "croissants-spritesheet", "croissants/plate"); - this.add(plate); - - // croissant_bottom - const croissant_bottom = scene.add.image(153.7784714624413, 65.35489880789905, "croissants-spritesheet", "croissants/croissant"); - croissant_bottom.angle = 132; - this.add(croissant_bottom); - - // croissant_top - const croissant_top = scene.add.image(99.77847146244132, 66.35489880789905, "croissants-spritesheet", "croissants/croissant"); - this.add(croissant_top); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - /* START-USER-CODE */ - - // Write your code here. - - /* END-USER-CODE */ + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 2.221526863075212, y ?? 1.6450976306480243); + + // towel + const towel = scene.add.image(124.77847146244132, 103.35489880789905, "croissants-spritesheet", "croissants/towel"); + this.add(towel); + + // plate + const plate = scene.add.image(129.7784714624413, 91.35489880789905, "croissants-spritesheet", "croissants/plate"); + this.add(plate); + + // croissant_bottom + const croissant_bottom = scene.add.image( + 153.7784714624413, + 65.35489880789905, + "croissants-spritesheet", + "croissants/croissant" + ); + croissant_bottom.angle = 132; + this.add(croissant_bottom); + + // croissant_top + const croissant_top = scene.add.image( + 99.77847146244132, + 66.35489880789905, + "croissants-spritesheet", + "croissants/croissant" + ); + this.add(croissant_top); + + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } + + /* START-USER-CODE */ + + // Write your code here. + + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/fly-squasher/game/prefabs/Fly.ts b/apps/client/src/app/fly-squasher/game/prefabs/Fly.ts index 78745697..f63816ff 100644 --- a/apps/client/src/app/fly-squasher/game/prefabs/Fly.ts +++ b/apps/client/src/app/fly-squasher/game/prefabs/Fly.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -8,82 +7,111 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class Fly extends Phaser.GameObjects.Container { - - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 60, y ?? 57); - - // leg_back_right - const leg_back_right = scene.add.image(14.450684318372382, -0.6341442773239621, "fly-squasher-spritesheet", "fly/leg-back"); - leg_back_right.setOrigin(0, 1); - this.add(leg_back_right); - - // leg_back_left - const leg_back_left = scene.add.image(-15.549315681627625, -2.634144277323962, "fly-squasher-spritesheet", "fly/leg-back"); - leg_back_left.setOrigin(1, 1); - leg_back_left.flipX = true; - this.add(leg_back_left); - - // leg_front_right - const leg_front_right = scene.add.image(12.450684318372382, 31.365855722676038, "fly-squasher-spritesheet", "fly/leg-front"); - leg_front_right.setOrigin(0, 0); - this.add(leg_front_right); - - // leg_front_left - const leg_front_left = scene.add.image(-13.549315681627625, 31.365855722676038, "fly-squasher-spritesheet", "fly/leg-front"); - leg_front_left.setOrigin(1, 0); - leg_front_left.flipX = true; - this.add(leg_front_left); - - // leg_middle_right - const leg_middle_right = scene.add.image(12.450684318372382, 8.365855722676038, "fly-squasher-spritesheet", "fly/leg-middle"); - leg_middle_right.setOrigin(0, 0.5); - this.add(leg_middle_right); - - // leg_middle_left - const leg_middle_left = scene.add.image(-13.549315681627625, 7.365855722676038, "fly-squasher-spritesheet", "fly/leg-middle"); - leg_middle_left.setOrigin(1, 0.5); - leg_middle_left.flipX = true; - this.add(leg_middle_left); - - // body - const body = scene.add.image(0, -4, "fly-squasher-spritesheet", "fly/body"); - this.add(body); - - // wing_left - const wing_left = scene.add.image(-16, 21, "fly-squasher-spritesheet", "fly/wing"); - wing_left.setOrigin(0.27, 0.98); - this.add(wing_left); - - // wing_right - const wing_right = scene.add.image(15.770684318372375, 22.39585572267604, "fly-squasher-spritesheet", "fly/wing"); - wing_right.setOrigin(0.7, 0.99); - wing_right.flipX = true; - this.add(wing_right); - - // head_container - const head_container = scene.add.container(-0.949315681627624, 35.59585572267604); - this.add(head_container); - - // fly_head - const fly_head = scene.add.image(0.4, 0, "fly-squasher-spritesheet", "fly/head"); - fly_head.setOrigin(0.5, 0); - head_container.add(fly_head); - - // fly_suckler - const fly_suckler = scene.add.image(0, 19.8, "fly-squasher-spritesheet", "fly/suckler"); - fly_suckler.setOrigin(0.58, 0); - head_container.add(fly_suckler); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - /* START-USER-CODE */ - - // Write your code here. - - /* END-USER-CODE */ + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 60, y ?? 57); + + // leg_back_right + const leg_back_right = scene.add.image( + 14.450684318372382, + -0.6341442773239621, + "fly-squasher-spritesheet", + "fly/leg-back" + ); + leg_back_right.setOrigin(0, 1); + this.add(leg_back_right); + + // leg_back_left + const leg_back_left = scene.add.image( + -15.549315681627625, + -2.634144277323962, + "fly-squasher-spritesheet", + "fly/leg-back" + ); + leg_back_left.setOrigin(1, 1); + leg_back_left.flipX = true; + this.add(leg_back_left); + + // leg_front_right + const leg_front_right = scene.add.image( + 12.450684318372382, + 31.365855722676038, + "fly-squasher-spritesheet", + "fly/leg-front" + ); + leg_front_right.setOrigin(0, 0); + this.add(leg_front_right); + + // leg_front_left + const leg_front_left = scene.add.image( + -13.549315681627625, + 31.365855722676038, + "fly-squasher-spritesheet", + "fly/leg-front" + ); + leg_front_left.setOrigin(1, 0); + leg_front_left.flipX = true; + this.add(leg_front_left); + + // leg_middle_right + const leg_middle_right = scene.add.image( + 12.450684318372382, + 8.365855722676038, + "fly-squasher-spritesheet", + "fly/leg-middle" + ); + leg_middle_right.setOrigin(0, 0.5); + this.add(leg_middle_right); + + // leg_middle_left + const leg_middle_left = scene.add.image( + -13.549315681627625, + 7.365855722676038, + "fly-squasher-spritesheet", + "fly/leg-middle" + ); + leg_middle_left.setOrigin(1, 0.5); + leg_middle_left.flipX = true; + this.add(leg_middle_left); + + // body + const body = scene.add.image(0, -4, "fly-squasher-spritesheet", "fly/body"); + this.add(body); + + // wing_left + const wing_left = scene.add.image(-16, 21, "fly-squasher-spritesheet", "fly/wing"); + wing_left.setOrigin(0.27, 0.98); + this.add(wing_left); + + // wing_right + const wing_right = scene.add.image(15.770684318372375, 22.39585572267604, "fly-squasher-spritesheet", "fly/wing"); + wing_right.setOrigin(0.7, 0.99); + wing_right.flipX = true; + this.add(wing_right); + + // head_container + const head_container = scene.add.container(-0.949315681627624, 35.59585572267604); + this.add(head_container); + + // fly_head + const fly_head = scene.add.image(0.4, 0, "fly-squasher-spritesheet", "fly/head"); + fly_head.setOrigin(0.5, 0); + head_container.add(fly_head); + + // fly_suckler + const fly_suckler = scene.add.image(0, 19.8, "fly-squasher-spritesheet", "fly/suckler"); + fly_suckler.setOrigin(0.58, 0); + head_container.add(fly_suckler); + + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } + + /* START-USER-CODE */ + + // Write your code here. + + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/fly-squasher/game/scenery/Croissants.ts b/apps/client/src/app/fly-squasher/game/scenery/Croissants.ts index 9bfd1236..6eeb0a41 100644 --- a/apps/client/src/app/fly-squasher/game/scenery/Croissants.ts +++ b/apps/client/src/app/fly-squasher/game/scenery/Croissants.ts @@ -1,4 +1,4 @@ -import { BaseScene } from '../../../shared/game/phaser/scene/base.scene'; +import { BaseScene } from "../../../shared/game/phaser/scene/base.scene"; // prefab combined in Phaser Editor 2D export class Croissants extends Phaser.GameObjects.Container { @@ -13,20 +13,20 @@ export class Croissants extends Phaser.GameObjects.Container { this.height = 190; // towel - this.towel = scene.add.image(25, 38, 'croissants-spritesheet', 'croissants/towel'); + this.towel = scene.add.image(25, 38, "croissants-spritesheet", "croissants/towel"); this.add(this.towel); // plate - this.plate = scene.add.image(30, 26, 'croissants-spritesheet', 'croissants/plate'); + this.plate = scene.add.image(30, 26, "croissants-spritesheet", "croissants/plate"); this.add(this.plate); // croissant_bottom - this.croissant_bottom = scene.add.image(54, 0, 'croissants-spritesheet', 'croissants/croissant'); + this.croissant_bottom = scene.add.image(54, 0, "croissants-spritesheet", "croissants/croissant"); this.croissant_bottom.angle = 132; this.add(this.croissant_bottom); // croissant_top - this.croissant_top = scene.add.image(0, 1, 'croissants-spritesheet', 'croissants/croissant'); + this.croissant_top = scene.add.image(0, 1, "croissants-spritesheet", "croissants/croissant"); this.add(this.croissant_top); this.tween(); diff --git a/apps/client/src/app/fly-squasher/game/scenes/FlySquasher.ts b/apps/client/src/app/fly-squasher/game/scenes/FlySquasher.ts index 3c31e33f..68a8a7da 100644 --- a/apps/client/src/app/fly-squasher/game/scenes/FlySquasher.ts +++ b/apps/client/src/app/fly-squasher/game/scenes/FlySquasher.ts @@ -2,15 +2,15 @@ /* START OF COMPILED CODE */ -import Phaser from 'phaser'; -import Croissants from '../prefabs/Croissants'; -import Fly from '../prefabs/Fly'; +import Phaser from "phaser"; +import Croissants from "../prefabs/Croissants"; +import Fly from "../prefabs/Fly"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ export default class FlySquasher extends Phaser.Scene { constructor() { - super('FlySquasher'); + super("FlySquasher"); /* START-USER-CTR-CODE */ // Write your code here. @@ -26,7 +26,7 @@ export default class FlySquasher extends Phaser.Scene { const fly = new Fly(this, 299, 150); this.add.existing(fly); - this.events.emit('scene-awake'); + this.events.emit("scene-awake"); } /* START-USER-CODE */ diff --git a/apps/client/src/app/fly-squasher/game/scenes/PreloadFlySquasher.scene b/apps/client/src/app/fly-squasher/game/scenes/PreloadFlySquasher.scene index fb4832ff..18f5c6ff 100644 --- a/apps/client/src/app/fly-squasher/game/scenes/PreloadFlySquasher.scene +++ b/apps/client/src/app/fly-squasher/game/scenes/PreloadFlySquasher.scene @@ -16,22 +16,19 @@ { "type": "Image", "id": "e413cbbf-ce25-4dad-a117-b7cf0791f655", - "label": "guapen", - "components": [], + "label": "probable-waffle-loader", "texture": { - "key": "guapen" + "key": "probable-waffle-loader" }, "x": 505.0120544433594, "y": 360, - "scaleX": 0.32715486817515643, - "scaleY": 0.32715486817515643, - "list": [] + "scaleX": 2, + "scaleY": 2 }, { "type": "Rectangle", "id": "845d4ca6-7417-44fc-97e3-a3bb2fbbdd03", "label": "progressBar", - "components": [], "x": 553.0120849609375, "y": 361, "originX": 0, @@ -44,10 +41,7 @@ { "prefabId": "ca949479-ab4d-45d5-b856-2cbecbd8d127", "id": "250eaa8f-b143-4e41-9ddf-052dfd99672c", - "label": "preloadUpdater", - "components": [], - "nestedPrefabs": [], - "list": [] + "label": "preloadUpdater" } ] }, @@ -55,7 +49,6 @@ "type": "Rectangle", "id": "10e175a4-81b6-449e-9561-6d8ba54d3812", "label": "progressBarBg", - "components": [], "x": 553.0120849609375, "y": 361, "originX": 0, @@ -63,21 +56,18 @@ "fillColor": "#e0e0e0", "isStroked": true, "width": 256, - "height": 20, - "list": [] + "height": 20 }, { "type": "Text", "id": "c4092661-6339-47cf-9fea-8abff3a46e0c", "label": "loadingText", - "components": [], "x": 552.0120849609375, "y": 329, "text": "Loading...", "fontFamily": "arial", "fontSize": "20px", - "color": "#e0e0e0", - "list": [] + "color": "#e0e0e0" } ], "plainObjects": [], @@ -85,6 +75,6 @@ "app": "Phaser Editor 2D - Scene Editor", "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", - "version": 3 + "version": 5 } -} +} \ No newline at end of file diff --git a/apps/client/src/app/fly-squasher/game/scenes/PreloadFlySquasher.ts b/apps/client/src/app/fly-squasher/game/scenes/PreloadFlySquasher.ts index cdc011e9..bcc7df8d 100644 --- a/apps/client/src/app/fly-squasher/game/scenes/PreloadFlySquasher.ts +++ b/apps/client/src/app/fly-squasher/game/scenes/PreloadFlySquasher.ts @@ -2,15 +2,14 @@ /* 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/fly-squasher/asset-packers/asset-pack-fly-squasher.json'; /* END-USER-IMPORTS */ export default class PreloadFlySquasher extends Phaser.Scene { constructor() { - super('PreloadFlySquasher'); + super("PreloadFlySquasher"); /* START-USER-CTR-CODE */ // Write your code here. @@ -18,10 +17,10 @@ export default class PreloadFlySquasher extends Phaser.Scene { } editorCreate(): void { - // guapen - const guapen = this.add.image(505.0120544433594, 360, 'guapen'); - guapen.scaleX = 0.32715486817515643; - guapen.scaleY = 0.32715486817515643; + // probable-waffle-loader + const probable_waffle_loader = this.add.image(505.0120544433594, 360, "probable-waffle-loader"); + probable_waffle_loader.scaleX = 2; + probable_waffle_loader.scaleY = 2; // progressBar const progressBar = this.add.rectangle(553.0120849609375, 361, 256, 20); @@ -39,11 +38,11 @@ export default class PreloadFlySquasher 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 +52,11 @@ export default class PreloadFlySquasher extends Phaser.Scene { preload() { this.editorCreate(); - this.load.pack('asset-pack', assetPackUrl as any); + this.load.pack("asset-pack", "assets/fly-squasher/asset-packers/asset-pack-fly-squasher.json"); } create() { - this.scene.start('FlySquasher'); + this.scene.start("FlySquasher"); } /* END-USER-CODE */ diff --git a/apps/client/src/app/fly-squasher/high-score/high-score.component.html b/apps/client/src/app/fly-squasher/high-score/high-score.component.html index b5a509c9..d39e947b 100644 --- a/apps/client/src/app/fly-squasher/high-score/high-score.component.html +++ b/apps/client/src/app/fly-squasher/high-score/high-score.component.html @@ -27,7 +27,7 @@

{{ level.name }}

- +
@@ -41,7 +41,7 @@

{{ level.name }}

Server unavailable
Try again later
- + diff --git a/apps/client/src/app/fly-squasher/high-score/high-score.component.spec.ts b/apps/client/src/app/fly-squasher/high-score/high-score.component.spec.ts index 7e38a9a4..633ba0f0 100644 --- a/apps/client/src/app/fly-squasher/high-score/high-score.component.spec.ts +++ b/apps/client/src/app/fly-squasher/high-score/high-score.component.spec.ts @@ -8,6 +8,7 @@ import { authServiceStub } from "../../auth/auth.service.spec"; import { HighScoreService } from "./high-score.service"; import { highScoreServiceStub } from "./high-score.service.spec"; import { FontAwesomeTestingModule } from "@fortawesome/angular-fontawesome/testing"; +import { RouterTestingModule } from "@angular/router/testing"; describe("HighScoreComponent", () => { let component: HighScoreComponent; @@ -15,7 +16,6 @@ describe("HighScoreComponent", () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [HighScoreComponent], providers: [ { provide: ServerHealthService, @@ -30,7 +30,7 @@ describe("HighScoreComponent", () => { useValue: highScoreServiceStub } ], - imports: [FontAwesomeTestingModule] + imports: [HighScoreComponent, FontAwesomeTestingModule, RouterTestingModule] }).compileComponents(); fixture = TestBed.createComponent(HighScoreComponent); diff --git a/apps/client/src/app/fly-squasher/high-score/high-score.component.ts b/apps/client/src/app/fly-squasher/high-score/high-score.component.ts index dacb5221..18e90d2f 100644 --- a/apps/client/src/app/fly-squasher/high-score/high-score.component.ts +++ b/apps/client/src/app/fly-squasher/high-score/high-score.component.ts @@ -1,14 +1,18 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, inject, OnInit } from "@angular/core"; import { HighScoreService } from "./high-score.service"; import { FlySquasherLevelEnum, FlySquasherLevels, ScoreDto } from "@fuzzy-waddle/api-interfaces"; import { faExclamationTriangle, faSpinner } from "@fortawesome/free-solid-svg-icons"; import { ServerHealthService } from "../../shared/services/server-health.service"; -import { AuthService } from "../../auth/auth.service"; +import { CommonModule } from "@angular/common"; +import { FaIconComponent } from "@fortawesome/angular-fontawesome"; +import { RouterLink } from "@angular/router"; @Component({ selector: "fly-squasher-high-score", templateUrl: "./high-score.component.html", - styleUrls: ["./high-score.component.scss"] + styleUrls: ["./high-score.component.scss"], + standalone: true, + imports: [CommonModule, FaIconComponent, RouterLink] }) export class HighScoreComponent implements OnInit { protected readonly faSpinner = faSpinner; @@ -16,10 +20,8 @@ export class HighScoreComponent implements OnInit { protected loading = true; protected highScores: ScoreDto[] = []; - constructor( - private readonly highScoreService: HighScoreService, - protected readonly serverHealthService: ServerHealthService - ) {} + private readonly highScoreService = inject(HighScoreService); + protected readonly serverHealthService = inject(ServerHealthService); async ngOnInit(): Promise { await this.serverHealthService.checkHealth(); diff --git a/apps/client/src/app/fly-squasher/home/home.component.html b/apps/client/src/app/fly-squasher/home/home.component.html index 2f1301bf..d7554c8d 100644 --- a/apps/client/src/app/fly-squasher/home/home.component.html +++ b/apps/client/src/app/fly-squasher/home/home.component.html @@ -3,8 +3,11 @@
- diff --git a/apps/client/src/app/fly-squasher/options/options.component.ts b/apps/client/src/app/fly-squasher/options/options.component.ts index a5678aa6..0eb3afd9 100644 --- a/apps/client/src/app/fly-squasher/options/options.component.ts +++ b/apps/client/src/app/fly-squasher/options/options.component.ts @@ -5,7 +5,6 @@ import { FormsModule } from "@angular/forms"; import { VolumeSettings } from "../shared/volumeSettings"; @Component({ - selector: "fuzzy-waddle-options", standalone: true, imports: [CommonModule, RouterLink, FormsModule], templateUrl: "./options.component.html", diff --git a/apps/client/src/app/home/chat/chat-float/chat-float.component.html b/apps/client/src/app/home/chat/chat-float/chat-float.component.html index 3f64bc39..00647f9d 100644 --- a/apps/client/src/app/home/chat/chat-float/chat-float.component.html +++ b/apps/client/src/app/home/chat/chat-float/chat-float.component.html @@ -8,6 +8,10 @@
- + diff --git a/apps/client/src/app/home/chat/chat-float/chat-float.component.scss b/apps/client/src/app/home/chat/chat-float/chat-float.component.scss index 349524d0..db13ac1c 100644 --- a/apps/client/src/app/home/chat/chat-float/chat-float.component.scss +++ b/apps/client/src/app/home/chat/chat-float/chat-float.component.scss @@ -1,4 +1,4 @@ -@import '../../../../styles/_variables'; +@import "../../../../styles/_variables"; .chat-container { position: fixed; @@ -44,7 +44,9 @@ background-color: white; cursor: pointer; color: $dark; - transition: background-color 0.1s ease-in-out, color 0.1s ease-in-out; + transition: + background-color 0.1s ease-in-out, + color 0.1s ease-in-out; &:hover { background-color: $primary; diff --git a/apps/client/src/app/home/chat/chat-float/chat-float.component.spec.ts b/apps/client/src/app/home/chat/chat-float/chat-float.component.spec.ts index 0b4f696b..11bbc245 100644 --- a/apps/client/src/app/home/chat/chat-float/chat-float.component.spec.ts +++ b/apps/client/src/app/home/chat/chat-float/chat-float.component.spec.ts @@ -1,16 +1,15 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { ChatFloatComponent } from './chat-float.component'; -import { FontAwesomeTestingModule } from '@fortawesome/angular-fontawesome/testing'; +import { ChatFloatComponent } from "./chat-float.component"; +import { FontAwesomeTestingModule } from "@fortawesome/angular-fontawesome/testing"; -describe('ChatFloatComponent', () => { +describe("ChatFloatComponent", () => { let component: ChatFloatComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ChatFloatComponent], - imports: [FontAwesomeTestingModule] + imports: [ChatFloatComponent, FontAwesomeTestingModule] }).compileComponents(); fixture = TestBed.createComponent(ChatFloatComponent); @@ -18,7 +17,7 @@ describe('ChatFloatComponent', () => { fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/home/chat/chat-float/chat-float.component.ts b/apps/client/src/app/home/chat/chat-float/chat-float.component.ts index 0a3db910..a10b19b3 100644 --- a/apps/client/src/app/home/chat/chat-float/chat-float.component.ts +++ b/apps/client/src/app/home/chat/chat-float/chat-float.component.ts @@ -1,18 +1,25 @@ -import { Component } from '@angular/core'; -import { faWindowMaximize, faWindowMinimize } from '@fortawesome/free-solid-svg-icons'; +import { Component, inject } from "@angular/core"; +import { faWindowMaximize, faWindowMinimize } from "@fortawesome/free-solid-svg-icons"; +import { ChatService } from "../../../data-access/chat/chat.service"; +import { CommonModule } from "@angular/common"; +import { ChatComponent } from "../../../shared/components/chat/chat.component"; +import { FaIconComponent } from "@fortawesome/angular-fontawesome"; @Component({ - selector: 'fuzzy-waddle-chat-float', - templateUrl: './chat-float.component.html', - styleUrls: ['./chat-float.component.scss'] + selector: "fuzzy-waddle-chat-float", + templateUrl: "./chat-float.component.html", + styleUrls: ["./chat-float.component.scss"], + standalone: true, + imports: [CommonModule, ChatComponent, FaIconComponent] }) export class ChatFloatComponent { - faWindowMinimize = faWindowMinimize; - faWindowMaximize = faWindowMaximize; + protected readonly faWindowMinimize = faWindowMinimize; + protected readonly faWindowMaximize = faWindowMaximize; + protected readonly chatService = inject(ChatService); - maximized = false; + protected maximized = false; - toggleChatVisibility() { + protected toggleChatVisibility() { this.maximized = !this.maximized; } } diff --git a/apps/client/src/app/home/chat/chat/avatar-provider/avatar-provider.service.ts b/apps/client/src/app/home/chat/chat/avatar-provider/avatar-provider.service.ts deleted file mode 100644 index 48970f33..00000000 --- a/apps/client/src/app/home/chat/chat/avatar-provider/avatar-provider.service.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Injectable } from '@angular/core'; -import { createAvatar } from '@dicebear/core'; -import * as pixelArt from '@dicebear/pixel-art'; -import { IAvatarProviderService } from './avatar-provider.service.interface'; - -@Injectable({ - providedIn: 'root' -}) -export class AvatarProviderService implements IAvatarProviderService { - getAvatar(seed: string) { - const avatar = createAvatar(pixelArt, { seed }); - return avatar.toDataUriSync(); - } -} diff --git a/apps/client/src/app/home/chat/chat/chat.component.spec.ts b/apps/client/src/app/home/chat/chat/chat.component.spec.ts deleted file mode 100644 index 160e0ae8..00000000 --- a/apps/client/src/app/home/chat/chat/chat.component.spec.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ChatComponent } from './chat.component'; -import { ChatService } from '../../../data-access/chat/chat.service'; -import { FormsModule } from '@angular/forms'; -import { AvatarProviderService } from './avatar-provider/avatar-provider.service'; -import { avatarProviderServiceStub } from './avatar-provider/avatar-provider.service.spec'; -import { chatServiceStub } from '../../../data-access/chat/chat.service.spec'; - -describe('ChatComponent', () => { - let component: ChatComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ChatComponent], - providers: [ - { provide: ChatService, useValue: chatServiceStub }, - { - provide: AvatarProviderService, - useValue: avatarProviderServiceStub - } - ], - imports: [FormsModule] - }).compileComponents(); - - fixture = TestBed.createComponent(ChatComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/home/chat/chat/chat.component.ts b/apps/client/src/app/home/chat/chat/chat.component.ts deleted file mode 100644 index 79ce9c99..00000000 --- a/apps/client/src/app/home/chat/chat/chat.component.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { ChatService } from '../../../data-access/chat/chat.service'; -import { ChatMessage } from '@fuzzy-waddle/api-interfaces'; -import { AvatarProviderService } from './avatar-provider/avatar-provider.service'; -import { Subscription } from 'rxjs'; - -@Component({ - selector: 'fuzzy-waddle-chat', - templateUrl: './chat.component.html', - styleUrls: ['./chat.component.scss'] -}) -export class ChatComponent implements OnInit, OnDestroy { - @ViewChild('chatBody') chatBody!: ElementRef; - message = ''; - messages: ChatMessage[] = []; - private messageSubscription?: Subscription; - - constructor(private chatService: ChatService, protected avatarProviderService: AvatarProviderService) {} - - ngOnInit(): void { - this.messageSubscription = this.chatService.getMessage()?.subscribe((msg: ChatMessage) => { - this.messages.push(msg); - // scroll to bottom - setTimeout(() => { - this.chatBody.nativeElement.scrollTop = this.chatBody.nativeElement.scrollHeight; - }, 0); - }); - - this.chatService.sendMessage(this.chatService.createMessage('Joined the chat')); - } - - sendMessage() { - if (!this.message) { - return; - } - this.chatService.sendMessage(this.chatService.createMessage(this.message)); - this.message = ''; - } - - ngOnDestroy(): void { - this.chatService.sendMessage(this.chatService.createMessage('Left the chat')); - this.messageSubscription?.unsubscribe(); - } -} diff --git a/apps/client/src/app/home/home.module.ts b/apps/client/src/app/home/home.module.ts deleted file mode 100644 index e462b385..00000000 --- a/apps/client/src/app/home/home.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { HomePageComponent } from './page/home-page.component'; -import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { ProfileComponent } from './profile/profile.component'; -import { ChatComponent } from './chat/chat/chat.component'; -import { FormsModule } from '@angular/forms'; -import { ChatFloatComponent } from './chat/chat-float/chat-float.component'; -import { ProfileNavComponent } from './profile/profile-nav/profile-nav.component'; -import { ComponentsModule } from '../shared/components/components.module'; -import { HomePageNavModule } from './page/home-page-nav/home-page-nav.module'; - -@NgModule({ - declarations: [HomePageComponent, ProfileComponent, ChatComponent, ChatFloatComponent, ProfileNavComponent], - imports: [CommonModule, RouterModule, FontAwesomeModule, FormsModule, ComponentsModule, HomePageNavModule], - exports: [HomePageComponent] -}) -export class HomeModule {} diff --git a/apps/client/src/app/home/page/home-page-nav/home-page-nav.component.html b/apps/client/src/app/home/page/home-page-nav/home-page-nav.component.html index 92cecd2b..2cea3b6b 100644 --- a/apps/client/src/app/home/page/home-page-nav/home-page-nav.component.html +++ b/apps/client/src/app/home/page/home-page-nav/home-page-nav.component.html @@ -6,13 +6,13 @@ class="nav-item" > - + Sign In
  • - + Profile
    • diff --git a/apps/client/src/app/home/page/home-page-nav/home-page-nav.component.spec.ts b/apps/client/src/app/home/page/home-page-nav/home-page-nav.component.spec.ts index d7f8e450..9a37c46e 100644 --- a/apps/client/src/app/home/page/home-page-nav/home-page-nav.component.spec.ts +++ b/apps/client/src/app/home/page/home-page-nav/home-page-nav.component.spec.ts @@ -1,30 +1,39 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { HomePageNavComponent } from './home-page-nav.component'; -import { FontAwesomeTestingModule } from '@fortawesome/angular-fontawesome/testing'; -import { provideRouter } from '@angular/router'; -import { Component } from '@angular/core'; -import { HomeNavTestingComponent } from '../../../shared/components/home-nav/home-nav.component.spec'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; +import { HomePageNavComponent } from "./home-page-nav.component"; +import { FontAwesomeTestingModule } from "@fortawesome/angular-fontawesome/testing"; +import { provideRouter } from "@angular/router"; +import { Component } from "@angular/core"; +import { HomeNavTestingComponent } from "../../../shared/components/home-nav/home-nav.component.spec"; +import { CommonModule } from "@angular/common"; -@Component({ selector: 'fuzzy-waddle-home-page-nav', template: '' }) +@Component({ selector: "probable-waffle-home-page-nav", template: "", standalone: true, imports: [CommonModule] }) export class HomePageNavTestingComponent {} -describe('HomePageNavComponent', () => { +describe("HomePageNavComponent", () => { let component: HomePageNavComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [HomePageNavComponent, HomeNavTestingComponent], - imports: [FontAwesomeTestingModule], + imports: [HomePageNavComponent, FontAwesomeTestingModule], providers: [provideRouter([])] - }).compileComponents(); + }) + .overrideComponent(HomePageNavComponent, { + remove: { + imports: [HomePageNavComponent] + }, + add: { + imports: [HomePageNavTestingComponent] + } + }) + .compileComponents(); fixture = TestBed.createComponent(HomePageNavComponent); component = fixture.componentInstance; fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/home/page/home-page-nav/home-page-nav.component.ts b/apps/client/src/app/home/page/home-page-nav/home-page-nav.component.ts index 5681252d..01191d64 100644 --- a/apps/client/src/app/home/page/home-page-nav/home-page-nav.component.ts +++ b/apps/client/src/app/home/page/home-page-nav/home-page-nav.component.ts @@ -1,16 +1,22 @@ -import { Component } from '@angular/core'; -import { AuthService } from '../../../auth/auth.service'; -import { faUser } from '@fortawesome/free-solid-svg-icons'; -import { faGoogle } from '@fortawesome/free-brands-svg-icons'; +import { Component, inject } from "@angular/core"; +import { AuthService } from "../../../auth/auth.service"; +import { faUser } from "@fortawesome/free-solid-svg-icons"; +import { faGoogle } from "@fortawesome/free-brands-svg-icons"; +import { CommonModule } from "@angular/common"; +import { FaIconComponent } from "@fortawesome/angular-fontawesome"; +import { HomeNavComponent } from "../../../shared/components/home-nav/home-nav.component"; +import { RouterLink } from "@angular/router"; @Component({ - selector: 'fuzzy-waddle-home-page-nav', - templateUrl: './home-page-nav.component.html', - styleUrls: ['./home-page-nav.component.scss'] + selector: "probable-waffle-home-page-nav", + templateUrl: "./home-page-nav.component.html", + styleUrls: ["./home-page-nav.component.scss"], + standalone: true, + imports: [CommonModule, FaIconComponent, HomeNavComponent, RouterLink] }) export class HomePageNavComponent { - faUser = faUser; - faGoogle = faGoogle; + protected readonly faUser = faUser; + protected readonly faGoogle = faGoogle; - constructor(protected authService: AuthService) {} + protected readonly authService = inject(AuthService); } diff --git a/apps/client/src/app/home/page/home-page-nav/home-page-nav.module.ts b/apps/client/src/app/home/page/home-page-nav/home-page-nav.module.ts deleted file mode 100644 index 71e64d2e..00000000 --- a/apps/client/src/app/home/page/home-page-nav/home-page-nav.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { HomePageNavComponent } from './home-page-nav.component'; -import { ComponentsModule } from '../../../shared/components/components.module'; -import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { RouterLink } from '@angular/router'; - -@NgModule({ - declarations: [HomePageNavComponent], - imports: [CommonModule, ComponentsModule, FontAwesomeModule, RouterLink], - exports: [HomePageNavComponent] -}) -export class HomePageNavModule {} diff --git a/apps/client/src/app/home/page/home-page.component.html b/apps/client/src/app/home/page/home-page.component.html index 6ec3adf4..25719eef 100644 --- a/apps/client/src/app/home/page/home-page.component.html +++ b/apps/client/src/app/home/page/home-page.component.html @@ -1,7 +1,7 @@ - + - +
    Featured
    {{ featuredGame.name }}
    @@ -10,7 +10,7 @@
    - +

    {{ game.name }}

    In Development
    @@ -20,12 +20,10 @@

    {{ game.name }}
    - +
    - - - - + + + +
    diff --git a/apps/client/src/app/home/page/home-page.component.scss b/apps/client/src/app/home/page/home-page.component.scss index 131d687a..24b8bc2d 100644 --- a/apps/client/src/app/home/page/home-page.component.scss +++ b/apps/client/src/app/home/page/home-page.component.scss @@ -1,4 +1,4 @@ -@import '../../../styles/_variables.scss'; +@import "../../../styles/_variables.scss"; :host { display: flex; @@ -32,7 +32,9 @@ align-items: baseline; font-family: $app-font-bold; font-size: 1.4em; - transition: background-color 0.1s ease-in-out, color 0.1s ease-in-out; + transition: + background-color 0.1s ease-in-out, + color 0.1s ease-in-out; &:hover { background-color: $primary; @@ -57,7 +59,9 @@ border-radius: 10px; transform: translate(0, 0); width: 300px; - transition: box-shadow 0.1s ease-in-out, transform 0.1s ease-in-out; + transition: + box-shadow 0.1s ease-in-out, + transform 0.1s ease-in-out; @media (max-width: 520px) { width: 100%; } diff --git a/apps/client/src/app/home/page/home-page.component.spec.ts b/apps/client/src/app/home/page/home-page.component.spec.ts index ae36adb2..defbbd15 100644 --- a/apps/client/src/app/home/page/home-page.component.spec.ts +++ b/apps/client/src/app/home/page/home-page.component.spec.ts @@ -1,41 +1,49 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { HomePageComponent } from './home-page.component'; -import { FontAwesomeTestingModule } from '@fortawesome/angular-fontawesome/testing'; -import { HomePageNavTestingComponent } from './home-page-nav/home-page-nav.component.spec'; -import { provideRouter } from '@angular/router'; -import { RouterTestingModule } from '@angular/router/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { AuthService } from '../../auth/auth.service'; -import { authServiceStub } from '../../auth/auth.service.spec'; -import { DbAccessTestService } from '../../data-access/db-access-test/db-access-test.service'; -import { dbAccessTestServiceStub } from '../../data-access/db-access-test/db-access-test.service.spec'; +import { HomePageComponent } from "./home-page.component"; +import { FontAwesomeTestingModule } from "@fortawesome/angular-fontawesome/testing"; +import { HomePageNavTestingComponent } from "./home-page-nav/home-page-nav.component.spec"; +import { provideRouter } from "@angular/router"; +import { RouterTestingModule } from "@angular/router/testing"; +import { AuthService } from "../../auth/auth.service"; +import { authServiceStub } from "../../auth/auth.service.spec"; +import { DbAccessTestService } from "../../data-access/db-access-test/db-access-test.service"; +import { dbAccessTestServiceStub } from "../../data-access/db-access-test/db-access-test.service.spec"; +import { HomePageNavComponent } from "./home-page-nav/home-page-nav.component"; +import { ServerHealthService } from "../../shared/services/server-health.service"; +import { serverHealthServiceStub } from "../../shared/services/server-health.service.spec"; +import { HttpClientTestingModule } from "@angular/common/http/testing"; -describe('HomePageComponent', () => { +describe("HomePageComponent", () => { let component: HomePageComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [HomePageComponent, HomePageNavTestingComponent], - imports: [ - FontAwesomeTestingModule, - RouterTestingModule, - HttpClientTestingModule // todo remove httpClient from view! - ], + imports: [HomePageComponent, FontAwesomeTestingModule, RouterTestingModule, HttpClientTestingModule], providers: [ provideRouter([]), { provide: AuthService, useValue: authServiceStub }, - { provide: DbAccessTestService, useValue: dbAccessTestServiceStub } + { provide: DbAccessTestService, useValue: dbAccessTestServiceStub }, + { provide: ServerHealthService, useValue: serverHealthServiceStub } ] - }).compileComponents(); + }) + .overrideComponent(HomePageComponent, { + remove: { + imports: [HomePageNavComponent] + }, + add: { + imports: [HomePageNavTestingComponent] + } + }) + .compileComponents(); fixture = TestBed.createComponent(HomePageComponent); component = fixture.componentInstance; fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/home/page/home-page.component.ts b/apps/client/src/app/home/page/home-page.component.ts index bd8cee5a..53295956 100644 --- a/apps/client/src/app/home/page/home-page.component.ts +++ b/apps/client/src/app/home/page/home-page.component.ts @@ -1,10 +1,14 @@ -import { Component } from '@angular/core'; -import { AuthService } from '../../auth/auth.service'; -import { DbAccessTestService } from '../../data-access/db-access-test/db-access-test.service'; -import { HttpClient } from '@angular/common/http'; -import { environment } from '../../../environments/environment'; -import { firstValueFrom } from 'rxjs'; -import { ServerHealthService } from '../../shared/services/server-health.service'; +import { Component, inject } from "@angular/core"; +import { AuthService } from "../../auth/auth.service"; +import { DbAccessTestService } from "../../data-access/db-access-test/db-access-test.service"; +import { HttpClient } from "@angular/common/http"; +import { environment } from "../../../environments/environment"; +import { firstValueFrom } from "rxjs"; +import { ServerHealthService } from "../../shared/services/server-health.service"; +import { CommonModule } from "@angular/common"; +import { ChatFloatComponent } from "../chat/chat-float/chat-float.component"; +import { RouterLink } from "@angular/router"; +import { HomePageNavComponent } from "./home-page-nav/home-page-nav.component"; export type DisplayGame = { name: string; @@ -16,35 +20,37 @@ export type DisplayGame = { }; @Component({ - templateUrl: './home-page.component.html', - styleUrls: ['./home-page.component.scss'] + templateUrl: "./home-page.component.html", + styleUrls: ["./home-page.component.scss"], + standalone: true, + imports: [CommonModule, ChatFloatComponent, RouterLink, HomePageNavComponent] }) export class HomePageComponent { protected readonly environment = environment; - private readonly currentlyFeaturedGame = 'fly-squasher'; + private readonly currentlyFeaturedGame = "fly-squasher"; displayGames: DisplayGame[] = [ { - name: 'Probable Waffle', - description: 'A real-time strategy game', - image: 'probable-waffle.webp', - bannerImage: 'probable-waffle-banner.webp', - route: 'probable-waffle', + name: "Probable Waffle", + description: "A real-time strategy game", + image: "probable-waffle.webp", + bannerImage: "probable-waffle-banner.webp", + route: "probable-waffle", inDevelopment: true }, { - name: 'Little Muncher', - description: 'Infinite scroller', - image: 'little-muncher.webp', - bannerImage: 'probable-waffle-banner.webp', + name: "Little Muncher", + description: "Infinite scroller", + image: "little-muncher.webp", + bannerImage: "probable-waffle-banner.webp", - route: 'little-muncher' + route: "little-muncher" }, { - name: 'Fly Squasher', - description: 'Squash dem bugs', - image: 'fly-squasher.webp', - bannerImage: 'fly-squasher-banner.webp', - route: 'fly-squasher' + name: "Fly Squasher", + description: "Squash dem bugs", + image: "fly-squasher.webp", + bannerImage: "fly-squasher-banner.webp", + route: "fly-squasher" } ]; @@ -52,16 +58,14 @@ export class HomePageComponent { return this.displayGames.find((g) => g.route === this.currentlyFeaturedGame)!; } - constructor( - protected readonly authService: AuthService, - protected readonly dbAccessTestService: DbAccessTestService, - protected readonly serverHealthService: ServerHealthService, - private readonly httpClient: HttpClient // todo remove httpClient from view! - ) {} + protected readonly authService = inject(AuthService); + protected readonly dbAccessTestService = inject(DbAccessTestService); + protected readonly serverHealthService = inject(ServerHealthService); + private readonly httpClient = inject(HttpClient); // todo remove httpClient from view! async addViaMw(): Promise { // todo remove this - this is just for testing - const url = environment.api + 'api/message'; - return await firstValueFrom(this.httpClient.post(url, { message: 'test123' })); + const url = environment.api + "api/message"; + return await firstValueFrom(this.httpClient.post(url, { message: "test123" })); } } diff --git a/apps/client/src/app/home/profile/profile-nav/profile-nav.component.spec.ts b/apps/client/src/app/home/profile/profile-nav/profile-nav.component.spec.ts index a4c3f296..89b14100 100644 --- a/apps/client/src/app/home/profile/profile-nav/profile-nav.component.spec.ts +++ b/apps/client/src/app/home/profile/profile-nav/profile-nav.component.spec.ts @@ -1,29 +1,41 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { ProfileNavComponent } from './profile-nav.component'; -import { provideRouter } from '@angular/router'; -import { Component } from '@angular/core'; -import { HomeNavTestingComponent } from '../../../shared/components/home-nav/home-nav.component.spec'; +import { ProfileNavComponent } from "./profile-nav.component"; +import { provideRouter } from "@angular/router"; +import { Component } from "@angular/core"; +import { HomeNavTestingComponent } from "../../../shared/components/home-nav/home-nav.component.spec"; +import { CommonModule } from "@angular/common"; +import { HomeNavComponent } from "../../../shared/components/home-nav/home-nav.component"; +import { RouterTestingModule } from "@angular/router/testing"; -@Component({ selector: 'fuzzy-waddle-profile-nav', template: '' }) +@Component({ selector: "fuzzy-waddle-profile-nav", template: "", standalone: true, imports: [CommonModule] }) export class ProfileNavTestingComponent {} -describe('ProfileNavComponent', () => { +describe("ProfileNavComponent", () => { let component: ProfileNavComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ProfileNavComponent, HomeNavTestingComponent], + imports: [ProfileNavComponent, RouterTestingModule], providers: [provideRouter([])] - }).compileComponents(); + }) + .overrideComponent(ProfileNavComponent, { + remove: { + imports: [HomeNavComponent] + }, + add: { + imports: [HomeNavTestingComponent] + } + }) + .compileComponents(); fixture = TestBed.createComponent(ProfileNavComponent); component = fixture.componentInstance; fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/home/profile/profile-nav/profile-nav.component.ts b/apps/client/src/app/home/profile/profile-nav/profile-nav.component.ts index 00b9d19c..6fabcac8 100644 --- a/apps/client/src/app/home/profile/profile-nav/profile-nav.component.ts +++ b/apps/client/src/app/home/profile/profile-nav/profile-nav.component.ts @@ -1,17 +1,22 @@ -import { Component } from '@angular/core'; -import { Router } from '@angular/router'; -import { AuthService } from '../../../auth/auth.service'; +import { Component, inject } from "@angular/core"; +import { Router } from "@angular/router"; +import { AuthService } from "../../../auth/auth.service"; +import { CommonModule } from "@angular/common"; +import { HomeNavComponent } from "../../../shared/components/home-nav/home-nav.component"; @Component({ - selector: 'fuzzy-waddle-profile-nav', - templateUrl: './profile-nav.component.html', - styleUrls: ['./profile-nav.component.scss'] + selector: "fuzzy-waddle-profile-nav", + templateUrl: "./profile-nav.component.html", + styleUrls: ["./profile-nav.component.scss"], + standalone: true, + imports: [CommonModule, HomeNavComponent] }) export class ProfileNavComponent { - constructor(private router: Router, protected authService: AuthService) {} + protected readonly authService = inject(AuthService); + protected readonly router = inject(Router); async toHome() { - await this.router.navigate(['/']); + await this.router.navigate(["/"]); } async signOut() { diff --git a/apps/client/src/app/home/profile/profile.component.html b/apps/client/src/app/home/profile/profile.component.html index f0ec9044..bf263e4c 100644 --- a/apps/client/src/app/home/profile/profile.component.html +++ b/apps/client/src/app/home/profile/profile.component.html @@ -1,20 +1,24 @@ - +

    Profile Info

    -
    -

    Email:

    -

    {{ authService.session?.user?.email }}

    + @if(identityData){ +
    + avatar +

    {{ identityData.full_name }}

    + }

    Joined:

    -

    {{ authService.session?.user?.created_at | date : 'medium' }}

    +

    {{ authService.session?.user?.created_at | date: "medium" }}

    + @if(userInstanceService.getPreferredGame()){

    Preferred Game:

    -

    {{ userInstanceService.getPreferredGames() }}

    +

    {{ userInstanceService.getPreferredGame() }}

    + }
    diff --git a/apps/client/src/app/home/profile/profile.component.spec.ts b/apps/client/src/app/home/profile/profile.component.spec.ts index b226c86e..f9e547cf 100644 --- a/apps/client/src/app/home/profile/profile.component.spec.ts +++ b/apps/client/src/app/home/profile/profile.component.spec.ts @@ -1,26 +1,36 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { ProfileComponent } from './profile.component'; -import { ProfileNavTestingComponent } from './profile-nav/profile-nav.component.spec'; -import { AuthService } from '../../auth/auth.service'; -import { authServiceStub } from '../../auth/auth.service.spec'; +import { ProfileComponent } from "./profile.component"; +import { ProfileNavTestingComponent } from "./profile-nav/profile-nav.component.spec"; +import { AuthService } from "../../auth/auth.service"; +import { authServiceStub } from "../../auth/auth.service.spec"; +import { ProfileNavComponent } from "./profile-nav/profile-nav.component"; -describe('ProfileComponent', () => { +describe("ProfileComponent", () => { let component: ProfileComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ProfileComponent, ProfileNavTestingComponent], + imports: [ProfileComponent], providers: [{ provide: AuthService, useValue: authServiceStub }] - }).compileComponents(); + }) + .overrideComponent(ProfileComponent, { + remove: { + imports: [ProfileNavComponent] + }, + add: { + imports: [ProfileNavTestingComponent] + } + }) + .compileComponents(); fixture = TestBed.createComponent(ProfileComponent); component = fixture.componentInstance; fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/home/profile/profile.component.ts b/apps/client/src/app/home/profile/profile.component.ts index 3e1de68c..efa44eb8 100644 --- a/apps/client/src/app/home/profile/profile.component.ts +++ b/apps/client/src/app/home/profile/profile.component.ts @@ -1,12 +1,26 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { AuthService } from '../../auth/auth.service'; -import { UserInstanceService } from './user-instance.service'; +import { ChangeDetectionStrategy, Component, inject } from "@angular/core"; +import { AuthService } from "../../auth/auth.service"; +import { UserInstanceService } from "./user-instance.service"; +import { CommonModule } from "@angular/common"; +import { ProfileNavComponent } from "./profile-nav/profile-nav.component"; @Component({ - templateUrl: './profile.component.html', - styleUrls: ['./profile.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + templateUrl: "./profile.component.html", + styleUrls: ["./profile.component.scss"], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: true, + imports: [CommonModule, ProfileNavComponent] }) export class ProfileComponent { - constructor(protected authService: AuthService, protected userInstanceService: UserInstanceService) {} + protected readonly authService = inject(AuthService); + protected readonly userInstanceService = inject(UserInstanceService); + + protected get identityData(): { + avatar_url: string | null; + full_name: string | null; + } | null { + return ( + (this.authService.session?.user?.identities?.find((i) => i.provider === "google")?.identity_data as any) ?? null + ); + } } diff --git a/apps/client/src/app/home/profile/user-instance.service.interface.ts b/apps/client/src/app/home/profile/user-instance.service.interface.ts new file mode 100644 index 00000000..2f36ad2b --- /dev/null +++ b/apps/client/src/app/home/profile/user-instance.service.interface.ts @@ -0,0 +1,4 @@ +export interface UserInstanceServiceInterface { + getPreferredGame(): string | null; + setVisitedGame(game: "probable-waffle" | "little-muncher" | "fly-squasher"): void; +} diff --git a/apps/client/src/app/home/profile/user-instance.service.spec.ts b/apps/client/src/app/home/profile/user-instance.service.spec.ts index c7bf5292..f52a19d3 100644 --- a/apps/client/src/app/home/profile/user-instance.service.spec.ts +++ b/apps/client/src/app/home/profile/user-instance.service.spec.ts @@ -1,8 +1,15 @@ -import { TestBed } from '@angular/core/testing'; +import { TestBed } from "@angular/core/testing"; -import { UserInstanceService } from './user-instance.service'; +import { UserInstanceService } from "./user-instance.service"; +import { UserInstanceServiceInterface } from "./user-instance.service.interface"; -describe('UserInstance', () => { +export const userInstanceServiceStub = { + setVisitedGame(game: "probable-waffle" | "little-muncher" | "fly-squasher") {}, + getPreferredGame(): string | null { + return null; + } +} satisfies UserInstanceServiceInterface; +describe("UserInstance", () => { let service: UserInstanceService; beforeEach(() => { @@ -10,7 +17,7 @@ describe('UserInstance', () => { service = TestBed.inject(UserInstanceService); }); - it('should be created', () => { + it("should be created", () => { expect(service).toBeTruthy(); }); }); diff --git a/apps/client/src/app/home/profile/user-instance.service.ts b/apps/client/src/app/home/profile/user-instance.service.ts index 8773904e..8adc7835 100644 --- a/apps/client/src/app/home/profile/user-instance.service.ts +++ b/apps/client/src/app/home/profile/user-instance.service.ts @@ -1,9 +1,59 @@ -import { Injectable } from '@angular/core'; +import { Injectable } from "@angular/core"; +import { UserInstanceServiceInterface } from "./user-instance.service.interface"; + +export interface GamesVisited { + name: string; + count: number; +} @Injectable({ - providedIn: 'root' + providedIn: "root" }) -export class UserInstanceService { - getPageTheme = () => 'light'; - getPreferredGames = () => ['probable-waffle']; +export class UserInstanceService implements UserInstanceServiceInterface { + getPageTheme = () => "light"; + private readonly gamesVisitedKey = "games-visited"; + + private getGamesVisited(): GamesVisited[] { + // get it from local storage + const gamesVisited = localStorage.getItem(this.gamesVisitedKey); + if (gamesVisited === null) { + return []; + } + try { + return JSON.parse(gamesVisited) as GamesVisited[]; + } catch (e) { + return []; + } + } + + private saveGamesVisited(gamesVisited: GamesVisited[]): void { + // save it to local storage + localStorage.setItem(this.gamesVisitedKey, JSON.stringify(gamesVisited)); + } + + getPreferredGame(): string | null { + // get it from local storage + const gamesVisited = this.getGamesVisited(); + if (gamesVisited.length === 0) { + return null; + } + const preferredGame = gamesVisited.sort((a, b) => b.count - a.count)[0]; + return preferredGame.name; + } + + setVisitedGame(game: "probable-waffle" | "little-muncher" | "fly-squasher"): void { + const gamesVisited = this.getGamesVisited(); + const existingGame = gamesVisited.find((g) => g.name === game); + + if (existingGame) { + // Increment the count if the game is already in the list + existingGame.count++; + } else { + // Add the game to the list if not present + gamesVisited.push({ name: game, count: 1 }); + } + + // Save the updated gamesVisited array + this.saveGamesVisited(gamesVisited); + } } diff --git a/apps/client/src/app/little-muncher/game/const/game-config.ts b/apps/client/src/app/little-muncher/game/const/game-config.ts index 34c6d22e..c679e636 100644 --- a/apps/client/src/app/little-muncher/game/const/game-config.ts +++ b/apps/client/src/app/little-muncher/game/const/game-config.ts @@ -1,13 +1,13 @@ -import { Types } from 'phaser'; -import { LittleMuncherScene } from '../little-muncher-scene'; -import { baseGameConfig } from '../../../shared/game/base-game.config'; -import { LittleMuncherUiScene } from '../little-muncher-ui-scene'; +import { Types } from "phaser"; +import { LittleMuncherScene } from "../little-muncher-scene"; +import { baseGameConfig } from "../../../shared/game/base-game.config"; +import { LittleMuncherUiScene } from "../little-muncher-ui-scene"; export const littleMuncherGameConfig: Types.Core.GameConfig = { ...baseGameConfig, scene: [LittleMuncherScene, LittleMuncherUiScene], physics: { - default: 'arcade', + default: "arcade", arcade: { fps: 60, gravity: { y: 0 } @@ -15,5 +15,5 @@ export const littleMuncherGameConfig: Types.Core.GameConfig = { } }, pixelArt: true, - backgroundColor: '#8bc34a' + backgroundColor: "#8bc34a" }; diff --git a/apps/client/src/app/little-muncher/game/const/scenes.ts b/apps/client/src/app/little-muncher/game/const/scenes.ts index a6411ddc..17b5a0fe 100644 --- a/apps/client/src/app/little-muncher/game/const/scenes.ts +++ b/apps/client/src/app/little-muncher/game/const/scenes.ts @@ -1,5 +1,5 @@ export enum Scenes { - 'PreloadScene' = 'PreloadScene', - 'MainScene' = 'MainScene', - 'UiScene' = 'UiScene' + "PreloadScene" = "PreloadScene", + "MainScene" = "MainScene", + "UiScene" = "UiScene" } diff --git a/apps/client/src/app/little-muncher/game/little-muncher-game-data.ts b/apps/client/src/app/little-muncher/game/little-muncher-game-data.ts index 9b214f31..9db9ea7f 100644 --- a/apps/client/src/app/little-muncher/game/little-muncher-game-data.ts +++ b/apps/client/src/app/little-muncher/game/little-muncher-game-data.ts @@ -1,6 +1,6 @@ import { BaseGameData } from "../../shared/game/phaser/game/base-game-data"; -import { LittleMuncherCommunicatorService } from "./little-muncher-communicator.service"; import { LittleMuncherGameInstance, LittleMuncherUserInfo } from "@fuzzy-waddle/api-interfaces"; +import { LittleMuncherCommunicatorService } from "../main/communicators/little-muncher-communicator.service"; export type LittleMuncherGameData = BaseGameData< LittleMuncherCommunicatorService, diff --git a/apps/client/src/app/little-muncher/game/little-muncher-scene.ts b/apps/client/src/app/little-muncher/game/little-muncher-scene.ts index bc82cf2e..afffd28b 100644 --- a/apps/client/src/app/little-muncher/game/little-muncher-scene.ts +++ b/apps/client/src/app/little-muncher/game/little-muncher-scene.ts @@ -1,4 +1,4 @@ -import { Scenes } from './const/scenes'; +import { Scenes } from "./const/scenes"; import { LittleMuncherGameMode, LittleMuncherGameModeData, @@ -10,32 +10,33 @@ import { LittleMuncherPlayerStateData, LittleMuncherSpectator, LittleMuncherSpectatorData -} from '@fuzzy-waddle/api-interfaces'; -import { BaseScene } from '../../shared/game/phaser/scene/base.scene'; -import { LittleMuncherGameData } from './little-muncher-game-data'; -import { Pause } from './pause'; -import { PlayerInputController } from './player-input-controller'; -import { UiCommunicator, UiCommunicatorData } from './ui-communicator'; -import { Fireworks } from '../../shared/game/phaser/components/fireworks'; +} from "@fuzzy-waddle/api-interfaces"; +import { BaseScene } from "../../shared/game/phaser/scene/base.scene"; +import { LittleMuncherGameData } from "./little-muncher-game-data"; +import { Pause } from "./pause"; +import { PlayerInputController } from "./player-input-controller"; +import { UiCommunicator, UiCommunicatorData } from "./ui-communicator"; +import { Fireworks } from "../../shared/game/phaser/components/fireworks"; +import { LittleMuncherCommunicatorService } from "../main/communicators/little-muncher-communicator.service"; export enum ObjectName { - 'obstacle' = 'obstacle', - 'powerUp' = 'powerUp' + "obstacle" = "obstacle", + "powerUp" = "powerUp" } export enum ObjectProperty { - 'type' = 'type', - 'bounced' = 'bounced' + "type" = "type", + "bounced" = "bounced" } export enum ObjectType { - 'bird' = 'bird', - 'tree' = 'tree', - 'rock' = 'rock', - 'cake1' = 'cake1', - 'cake2' = 'cake2', - 'cake3' = 'cake3', - 'cake4' = 'cake4' + "bird" = "bird", + "tree" = "tree", + "rock" = "rock", + "cake1" = "cake1", + "cake2" = "cake2", + "cake3" = "cake3", + "cake4" = "cake4" } export class LittleMuncherScene extends BaseScene< @@ -48,7 +49,8 @@ export class LittleMuncherScene extends BaseScene< LittleMuncherPlayerControllerData, LittleMuncherPlayer, LittleMuncherSpectatorData, - LittleMuncherSpectator + LittleMuncherSpectator, + LittleMuncherCommunicatorService > { private playerInputController!: PlayerInputController; @@ -99,13 +101,13 @@ export class LittleMuncherScene extends BaseScene< override preload() { super.preload(); this.load.multiatlas( - 'lm-atlas', - 'assets/little-muncher/spritesheets/little-muncher-spritesheet.json', - 'assets/little-muncher/spritesheets' + "lm-atlas", + "assets/little-muncher/spritesheets/little-muncher-spritesheet.json", + "assets/little-muncher/spritesheets" ); - this.load.audio('hit', 'assets/probable-waffle/sfx/character/death/death1.mp3'); - this.load.audio('bird', 'assets/little-muncher/sfx/bird.mp3'); - this.load.audio('ost-little-muncher', 'assets/little-muncher/ost/little-muncher.m4a'); + this.load.audio("hit", "assets/probable-waffle/sfx/character/death/death1.mp3"); + this.load.audio("bird", "assets/little-muncher/sfx/bird.mp3"); + this.load.audio("ost-little-muncher", "assets/little-muncher/ost/little-muncher.m4a"); } override init() { @@ -135,9 +137,9 @@ export class LittleMuncherScene extends BaseScene< this.createCharacter(); this.playerInputController.init(this.character); - console.log('hill to climb on:', this.gameMode.data.hill); - console.log('time climbing:', this.gameState.data.climbedHeight); - console.log('should be paused:', this.gameState.data.pause); + console.log("hill to climb on:", this.gameMode.data.hill); + console.log("time climbing:", this.gameState.data.climbedHeight); + console.log("should be paused:", this.gameState.data.pause); // todo console.log('game started at:', this.baseGameData.gameInstance.data.gameInstanceMetadataData!.createdOn); this.setupTimers(); @@ -145,14 +147,14 @@ export class LittleMuncherScene extends BaseScene< this.setupUiScene(); this.subscribe( - this.communicator.timeClimbing?.onWithInitial( + this.communicator.timeClimbing?.onWithInitialStateChange( this.manageTimeClimbing, (event) => (this.gameState.data.climbedHeight = event.timeClimbing) ) ); this.subscribe(this.communicator.reset?.on.subscribe(() => this.resetGame(false))); - this.sound.play('ost-little-muncher', { + this.sound.play("ost-little-muncher", { loop: true }); } @@ -192,49 +194,49 @@ export class LittleMuncherScene extends BaseScene< } private createCharacterAnim(end: number, prefix: string) { - return this.anims.generateFrameNames('lm-atlas', { start: 1, end, prefix }); + return this.anims.generateFrameNames("lm-atlas", { start: 1, end, prefix }); } private createAnims = () => { - const characterDeath = this.createCharacterAnim(6, 'character/death/'); - const characterVictoryFront = this.createCharacterAnim(6, 'character/victory/front/'); - const characterVictoryBack = this.createCharacterAnim(6, 'character/victory/back/'); - const characterWalkBack = this.createCharacterAnim(9, 'character/walk/back/'); - const characterWalkFront = this.createCharacterAnim(9, 'character/walk/front/'); - const characterWalkLeft = this.createCharacterAnim(9, 'character/walk/left/'); - const characterWalkRight = this.createCharacterAnim(9, 'character/walk/right/'); - const characterIdleBack = this.createCharacterAnim(1, 'character/idle/'); - const characterIdleFront = this.createCharacterAnim(2, 'character/idle/'); - const characterIdleLeft = this.createCharacterAnim(3, 'character/idle/'); - const characterIdleRight = this.createCharacterAnim(4, 'character/idle/'); - - const birdIdle = this.anims.generateFrameNames('lm-atlas', { prefix: 'bird/', frames: [1, 0, 2, 0] }); - const birdIdleFlap = this.anims.generateFrameNames('lm-atlas', { prefix: 'bird/', frames: [1, 3, 4, 3] }); - const birdFlyOff = this.anims.generateFrameNames('lm-atlas', { prefix: 'bird/', frames: [1, 3, 4, 5, 6, 7] }); - const birdFly = this.anims.generateFrameNames('lm-atlas', { prefix: 'bird/', frames: [8, 9] }); + const characterDeath = this.createCharacterAnim(6, "character/death/"); + const characterVictoryFront = this.createCharacterAnim(6, "character/victory/front/"); + const characterVictoryBack = this.createCharacterAnim(6, "character/victory/back/"); + const characterWalkBack = this.createCharacterAnim(9, "character/walk/back/"); + const characterWalkFront = this.createCharacterAnim(9, "character/walk/front/"); + const characterWalkLeft = this.createCharacterAnim(9, "character/walk/left/"); + const characterWalkRight = this.createCharacterAnim(9, "character/walk/right/"); + const characterIdleBack = this.createCharacterAnim(1, "character/idle/"); + const characterIdleFront = this.createCharacterAnim(2, "character/idle/"); + const characterIdleLeft = this.createCharacterAnim(3, "character/idle/"); + const characterIdleRight = this.createCharacterAnim(4, "character/idle/"); + + const birdIdle = this.anims.generateFrameNames("lm-atlas", { prefix: "bird/", frames: [1, 0, 2, 0] }); + const birdIdleFlap = this.anims.generateFrameNames("lm-atlas", { prefix: "bird/", frames: [1, 3, 4, 3] }); + const birdFlyOff = this.anims.generateFrameNames("lm-atlas", { prefix: "bird/", frames: [1, 3, 4, 5, 6, 7] }); + const birdFly = this.anims.generateFrameNames("lm-atlas", { prefix: "bird/", frames: [8, 9] }); // create anims for the character - this.anims.create({ key: 'character-death', frames: characterDeath, frameRate: 10, repeat: 0 }); - this.anims.create({ key: 'character-victory-front', frames: characterVictoryFront, frameRate: 10, repeat: -1 }); - this.anims.create({ key: 'character-victory-back', frames: characterVictoryBack, frameRate: 10, repeat: -1 }); - this.anims.create({ key: 'character-walk-back', frames: characterWalkBack, frameRate: 10, repeat: -1 }); - this.anims.create({ key: 'character-walk-front', frames: characterWalkFront, frameRate: 10, repeat: -1 }); - this.anims.create({ key: 'character-walk-left', frames: characterWalkLeft, frameRate: 10, repeat: -1 }); - this.anims.create({ key: 'character-walk-right', frames: characterWalkRight, frameRate: 10, repeat: -1 }); - this.anims.create({ key: 'character-idle-back', frames: characterIdleBack, frameRate: 10, repeat: -1 }); - this.anims.create({ key: 'character-idle-front', frames: characterIdleFront, frameRate: 10, repeat: -1 }); - this.anims.create({ key: 'character-idle-left', frames: characterIdleLeft, frameRate: 10, repeat: -1 }); - this.anims.create({ key: 'character-idle-right', frames: characterIdleRight, frameRate: 10, repeat: -1 }); + this.anims.create({ key: "character-death", frames: characterDeath, frameRate: 10, repeat: 0 }); + this.anims.create({ key: "character-victory-front", frames: characterVictoryFront, frameRate: 10, repeat: -1 }); + this.anims.create({ key: "character-victory-back", frames: characterVictoryBack, frameRate: 10, repeat: -1 }); + this.anims.create({ key: "character-walk-back", frames: characterWalkBack, frameRate: 10, repeat: -1 }); + this.anims.create({ key: "character-walk-front", frames: characterWalkFront, frameRate: 10, repeat: -1 }); + this.anims.create({ key: "character-walk-left", frames: characterWalkLeft, frameRate: 10, repeat: -1 }); + this.anims.create({ key: "character-walk-right", frames: characterWalkRight, frameRate: 10, repeat: -1 }); + this.anims.create({ key: "character-idle-back", frames: characterIdleBack, frameRate: 10, repeat: -1 }); + this.anims.create({ key: "character-idle-front", frames: characterIdleFront, frameRate: 10, repeat: -1 }); + this.anims.create({ key: "character-idle-left", frames: characterIdleLeft, frameRate: 10, repeat: -1 }); + this.anims.create({ key: "character-idle-right", frames: characterIdleRight, frameRate: 10, repeat: -1 }); // create anims for the bird - this.anims.create({ key: 'bird-idle', frames: birdIdle, frameRate: 10, repeat: -1 }); - this.anims.create({ key: 'bird-idle-flap', frames: birdIdleFlap, frameRate: 10, repeat: -1 }); - this.anims.create({ key: 'bird-fly-off', frames: birdFlyOff, frameRate: 10, repeat: 0 }); - this.anims.create({ key: 'bird-fly', frames: birdFly, frameRate: 10, repeat: -1 }); + this.anims.create({ key: "bird-idle", frames: birdIdle, frameRate: 10, repeat: -1 }); + this.anims.create({ key: "bird-idle-flap", frames: birdIdleFlap, frameRate: 10, repeat: -1 }); + this.anims.create({ key: "bird-fly-off", frames: birdFlyOff, frameRate: 10, repeat: 0 }); + this.anims.create({ key: "bird-fly", frames: birdFly, frameRate: 10, repeat: -1 }); }; private drawBackground = () => { - this.background = this.add.tileSprite(0, 0, 0, 0, 'lm-atlas', 'background'); + this.background = this.add.tileSprite(0, 0, 0, 0, "lm-atlas", "background"); this.background.setScrollFactor(0); // make the background stationary this.background.setOrigin(0, 0); // set the origin of the sprite to the top-left corner this.background.setSize(this.worldWidth, this.cameras.main.height); @@ -246,9 +248,9 @@ export class LittleMuncherScene extends BaseScene< private createCharacter = () => { // create the character sprite - this.character = this.physics.add.sprite(0, 0, 'lm-atlas', 'character/idle/1'); + this.character = this.physics.add.sprite(0, 0, "lm-atlas", "character/idle/1"); this.handleResizeCharacter(); - this.character.anims.play('character-walk-back', true); + this.character.anims.play("character-walk-back", true); // change hitbox size this.character.setSize(24, 36); @@ -276,7 +278,7 @@ export class LittleMuncherScene extends BaseScene< // move world objects down this.objectGroup.forEach((sprite) => { - const bounced = sprite.getData('bounced'); // todo static type + const bounced = sprite.getData("bounced"); // todo static type if (!bounced) { sprite.y += worldSpeedThisFrame; } @@ -382,7 +384,7 @@ export class LittleMuncherScene extends BaseScene< x = column * columnWidth + columnWidth / 2; } - const object = this.physics.add.sprite(x, y, 'lm-atlas', key); + const object = this.physics.add.sprite(x, y, "lm-atlas", key); object.setScale(this.objectScale); const objectBounds = object.getBounds(); @@ -414,9 +416,9 @@ export class LittleMuncherScene extends BaseScene< const rnd = this.seededRandomByTime(); if (rnd > 0.3) return; // 30% chance of spawning a bird - const bird = this.physics.add.sprite(object.x, object.y - 40 * object.scale, 'lm-atlas', 'bird/0'); + const bird = this.physics.add.sprite(object.x, object.y - 40 * object.scale, "lm-atlas", "bird/0"); bird.setDepth(1); - bird.anims.play('bird-idle', true); + bird.anims.play("bird-idle", true); object.setScale(this.objectScale); bird.setOrigin(0.5, 0.5); object.setData(ObjectType.bird, bird); @@ -476,21 +478,21 @@ export class LittleMuncherScene extends BaseScene< bird.setVelocityX(birdXVelocity * 4); bird.setVelocityY(birdYVelocity * 4); // play sound effect - this.sound.play('bird'); + this.sound.play("bird"); // set bird animation - const flyOffAnim = bird.play('bird-fly-off', true); + const flyOffAnim = bird.play("bird-fly-off", true); // when the animation ends, play different animation flyOffAnim.once(Phaser.Animations.Events.ANIMATION_COMPLETE, () => { - bird?.play('bird-fly', true); + bird?.play("bird-fly", true); }); }; private readonly crashCharacter = (character: Phaser.Physics.Arcade.Sprite, object: Phaser.Physics.Arcade.Sprite) => { object.destroy(); // todo play explosion animation - this.sound.play('hit'); + this.sound.play("hit"); // shake screen this.cameras.main.shake(100, 0.003); @@ -533,34 +535,34 @@ export class LittleMuncherScene extends BaseScene< if (success) { // play victory animation - const victoryAnimations = ['character-victory-front', 'character-victory-back']; + const victoryAnimations = ["character-victory-front", "character-victory-back"]; this.character.anims.play(victoryAnimations[Math.floor(this.seededRandomByTime() * victoryAnimations.length)]); } else { - this.character.anims.play('character-death'); + this.character.anims.play("character-death"); } const keyboardAvailable = this.input.keyboard?.isActive() && this.game.device.os.desktop; let text: string; if (success) { - text = 'Victory!'; + text = "Victory!"; } else { - text = 'Game Over'; + text = "Game Over"; } if (keyboardAvailable) { text += ' - press "Space" to restart'; } else { - text += ' - tap to restart'; + text += " - tap to restart"; } // show a game over message - this.gameOverText = this.add.text(0, 0, text, { font: '32px Arial', color: '#000000' }); + this.gameOverText = this.add.text(0, 0, text, { font: "32px Arial", color: "#000000" }); this.handlePositionGameOverText(); this.gameOverText.setOrigin(0.5); // allow the player to restart the game by pressing a key if (keyboardAvailable) { - this.input.keyboard!.once('keydown', () => this.resetGame(), this); + this.input.keyboard!.once("keydown", () => this.resetGame(), this); } else { - this.input.once('pointerdown', () => this.resetGame(), this); + this.input.once("pointerdown", () => this.resetGame(), this); } }; @@ -586,7 +588,7 @@ export class LittleMuncherScene extends BaseScene< this.gameOverFlag = false; this.characterHealth = this.maxCharacterHealth; - this.character.anims.play('character-walk-back', true); + this.character.anims.play("character-walk-back", true); this.character.clearTint(); this.uiCommunicator.setHealth.next(this.characterHealth); diff --git a/apps/client/src/app/little-muncher/game/little-muncher-ui-scene.ts b/apps/client/src/app/little-muncher/game/little-muncher-ui-scene.ts index f471e00a..990d6e83 100644 --- a/apps/client/src/app/little-muncher/game/little-muncher-ui-scene.ts +++ b/apps/client/src/app/little-muncher/game/little-muncher-ui-scene.ts @@ -1,8 +1,8 @@ -import { Scene } from 'phaser'; -import { CreateSceneFromObjectConfig } from '../../shared/game/phaser/scene/scene-config.interface'; -import { Scenes } from './const/scenes'; -import { UiCommunicatorData } from './ui-communicator'; -import { Subscription } from 'rxjs'; +import { Scene } from "phaser"; +import { CreateSceneFromObjectConfig } from "../../shared/game/phaser/scene/scene-config.interface"; +import { Scenes } from "./const/scenes"; +import { UiCommunicatorData } from "./ui-communicator"; +import { Subscription } from "rxjs"; export class LittleMuncherUiScene extends Scene implements CreateSceneFromObjectConfig { private healthSubscription!: Subscription; @@ -30,7 +30,7 @@ export class LittleMuncherUiScene extends Scene implements CreateSceneFromObject private drawCharacterHealth() { for (let i = 0; i < this.maxCharacterHealth; i++) { - const healthDisplay = this.add.image(40 + i * 30, 100, 'lm-atlas', 'health'); + const healthDisplay = this.add.image(40 + i * 30, 100, "lm-atlas", "health"); this.healthDisplays.push(healthDisplay); } } diff --git a/apps/client/src/app/little-muncher/game/loader.ts b/apps/client/src/app/little-muncher/game/loader.ts index 8dabeb92..d1c62db9 100644 --- a/apps/client/src/app/little-muncher/game/loader.ts +++ b/apps/client/src/app/little-muncher/game/loader.ts @@ -1,4 +1,4 @@ -import { BaseScene } from '../../shared/game/phaser/scene/base.scene'; +import { BaseScene } from "../../shared/game/phaser/scene/base.scene"; export class Loader { constructor(scene: BaseScene) { @@ -17,10 +17,10 @@ export class Loader { const loadingText = scene.make.text({ x: width / 2, y: height / 2 - progressBarHeight, - text: 'Loading...', + text: "Loading...", style: { - font: '20px monospace', - color: '#ffffff' + font: "20px monospace", + color: "#ffffff" } }); loadingText.setOrigin(0.5, 0.5); @@ -28,10 +28,10 @@ export class Loader { const percentText = scene.make.text({ x: width / 2, y: height / 2, - text: '0%', + text: "0%", style: { - font: '18px monospace', - color: '#ffffff' + font: "18px monospace", + color: "#ffffff" } }); percentText.setOrigin(0.5, 0.5); @@ -39,16 +39,16 @@ export class Loader { const assetText = scene.make.text({ x: width / 2, y: height / 2 + 50, - text: '', + text: "", style: { - font: '18px monospace', - color: '#ffffff' + font: "18px monospace", + color: "#ffffff" } }); assetText.setOrigin(0.5, 0.5); scene.load.on(Phaser.Loader.Events.PROGRESS, (value: number) => { - percentText.setText(Math.round(value * 100) + '%'); + percentText.setText(Math.round(value * 100) + "%"); progressBar.clear(); progressBar.fillStyle(0xffffff, 1); progressBar.fillRect( @@ -60,7 +60,7 @@ export class Loader { }); scene.load.on(Phaser.Loader.Events.FILE_PROGRESS, (file: Phaser.Loader.File) => { - assetText.setText('Loading asset: ' + file.key); + assetText.setText("Loading asset: " + file.key); }); scene.load.on(Phaser.Loader.Events.COMPLETE, function () { diff --git a/apps/client/src/app/little-muncher/game/pause.ts b/apps/client/src/app/little-muncher/game/pause.ts index 8510c836..f2477a23 100644 --- a/apps/client/src/app/little-muncher/game/pause.ts +++ b/apps/client/src/app/little-muncher/game/pause.ts @@ -1,4 +1,4 @@ -import { LittleMuncherScene } from './little-muncher-scene'; +import { LittleMuncherScene } from "./little-muncher-scene"; export class Pause { constructor(private readonly littleMuncherScene: LittleMuncherScene) { @@ -8,7 +8,7 @@ export class Pause { private init() { this.manageGamePause(); this.littleMuncherScene.subscribe( - this.littleMuncherScene.communicator.pause?.onWithInitial( + this.littleMuncherScene.communicator.pause?.onWithInitialStateChange( this.manageGamePause, (event) => (this.littleMuncherScene.gameState.data.pause = event.pause) ) diff --git a/apps/client/src/app/little-muncher/game/player-input-controller.ts b/apps/client/src/app/little-muncher/game/player-input-controller.ts index 845d83cf..3301c9ba 100644 --- a/apps/client/src/app/little-muncher/game/player-input-controller.ts +++ b/apps/client/src/app/little-muncher/game/player-input-controller.ts @@ -1,6 +1,6 @@ -import { LittleMuncherScene } from './little-muncher-scene'; -import { Subscription } from 'rxjs'; -import Swipe from 'phaser3-rex-plugins/plugins/input/gestures/swipe/Swipe'; +import { LittleMuncherScene } from "./little-muncher-scene"; +import { Subscription } from "rxjs"; +import Swipe from "phaser3-rex-plugins/plugins/input/gestures/swipe/Swipe"; export class PlayerInputController { private subscriptions: Subscription[] = []; @@ -10,7 +10,7 @@ export class PlayerInputController { private worldWidth = 0; constructor(private readonly littleMuncherScene: LittleMuncherScene) { - this.swipeInput = new Swipe(littleMuncherScene, { velocityThreshold: 500, dir: 'left&right' }) as Swipe & { + this.swipeInput = new Swipe(littleMuncherScene, { velocityThreshold: 500, dir: "left&right" }) as Swipe & { left: boolean; right: boolean; }; @@ -22,7 +22,7 @@ export class PlayerInputController { this.character = character; this.resetPosition(); this.littleMuncherScene.subscribe( - this.littleMuncherScene.communicator.move?.onWithInitial( + this.littleMuncherScene.communicator.move?.onWithInitialStateChange( this.setPosition, (position) => (this.littleMuncherScene.player.playerState.data.position = position) ) @@ -58,18 +58,18 @@ export class PlayerInputController { // move the character left or right based on the arrow keys if (this.cursors.left.isDown) { // move left - this.character.anims.play('character-walk-left', true); + this.character.anims.play("character-walk-left", true); this.character.x -= this.characterSpeed * worldSpeed; position.x = this.character.x; this.send(); } else if (this.cursors.right.isDown) { // move right - this.character.anims.play('character-walk-right', true); + this.character.anims.play("character-walk-right", true); this.character.x += this.characterSpeed * worldSpeed; position.x = this.character.x; this.send(); } else { - this.character.anims.play('character-walk-back', true); + this.character.anims.play("character-walk-back", true); } }; diff --git a/apps/client/src/app/little-muncher/game/ui-communicator.ts b/apps/client/src/app/little-muncher/game/ui-communicator.ts index a7ee7dc7..4b7e36d6 100644 --- a/apps/client/src/app/little-muncher/game/ui-communicator.ts +++ b/apps/client/src/app/little-muncher/game/ui-communicator.ts @@ -1,4 +1,4 @@ -import { Subject } from 'rxjs'; +import { Subject } from "rxjs"; export type UiCommunicatorData = { communicator: UiCommunicator; diff --git a/apps/client/src/app/little-muncher/home/home.component.html b/apps/client/src/app/little-muncher/home/home.component.html index 3f306bba..ad65c2c5 100644 --- a/apps/client/src/app/little-muncher/home/home.component.html +++ b/apps/client/src/app/little-muncher/home/home.component.html @@ -4,15 +4,15 @@
    Hill to climb on:
    -
    -
    - - - - - + diff --git a/apps/client/src/app/little-muncher/home/home.component.spec.ts b/apps/client/src/app/little-muncher/home/home.component.spec.ts index b221e9fe..5980e132 100644 --- a/apps/client/src/app/little-muncher/home/home.component.spec.ts +++ b/apps/client/src/app/little-muncher/home/home.component.spec.ts @@ -1,19 +1,24 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { HomeComponent } from './home.component'; -import { ServerHealthService } from '../../shared/services/server-health.service'; -import { serverHealthServiceStub } from '../../shared/services/server-health.service.spec'; -import { AuthService } from '../../auth/auth.service'; -import { authServiceStub } from '../../auth/auth.service.spec'; -import { SpectateTestComponent } from './spectate/spectate.component.spec'; +import { HomeComponent } from "./home.component"; +import { ServerHealthService } from "../../shared/services/server-health.service"; +import { serverHealthServiceStub } from "../../shared/services/server-health.service.spec"; +import { AuthService } from "../../auth/auth.service"; +import { authServiceStub } from "../../auth/auth.service.spec"; +import { SpectateTestComponent } from "./spectate/spectate.component.spec"; +import { RouterTestingModule } from "@angular/router/testing"; +import { SpectateComponent } from "./spectate/spectate.component"; +import { CommonModule } from "@angular/common"; +import { Component } from "@angular/core"; +@Component({ selector: "little-muncher-home", template: "", standalone: true, imports: [CommonModule] }) +export class HomeTestingComponent {} -describe('HomeComponent', () => { +describe("HomeComponent", () => { let component: HomeComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [HomeComponent, SpectateTestComponent], providers: [ { provide: ServerHealthService, @@ -23,15 +28,25 @@ describe('HomeComponent', () => { provide: AuthService, useValue: authServiceStub } - ] - }).compileComponents(); + ], + imports: [HomeComponent, RouterTestingModule] + }) + .overrideComponent(HomeComponent, { + remove: { + imports: [SpectateComponent] + }, + add: { + imports: [SpectateTestComponent] + } + }) + .compileComponents(); fixture = TestBed.createComponent(HomeComponent); component = fixture.componentInstance; fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/little-muncher/home/home.component.ts b/apps/client/src/app/little-muncher/home/home.component.ts index 6e5a0973..3e199b0e 100644 --- a/apps/client/src/app/little-muncher/home/home.component.ts +++ b/apps/client/src/app/little-muncher/home/home.component.ts @@ -1,27 +1,29 @@ -import { Component, EventEmitter, Output } from '@angular/core'; +import { Component, EventEmitter, inject, Output } from "@angular/core"; import { HillData, LittleMuncherGameCreate, LittleMuncherHillEnum, LittleMuncherHills -} from '@fuzzy-waddle/api-interfaces'; -import { ServerHealthService } from '../../shared/services/server-health.service'; -import { AuthService } from '../../auth/auth.service'; +} from "@fuzzy-waddle/api-interfaces"; +import { ServerHealthService } from "../../shared/services/server-health.service"; +import { AuthService } from "../../auth/auth.service"; +import { CommonModule } from "@angular/common"; +import { SpectateComponent } from "./spectate/spectate.component"; +import { LoaderComponent } from "../../shared/loader/loader.component"; +import { RouterLink } from "@angular/router"; @Component({ - selector: 'little-muncher-home', - templateUrl: './home.component.html', - styleUrls: ['./home.component.scss'] + selector: "little-muncher-home", + templateUrl: "./home.component.html", + styleUrls: ["./home.component.scss"], + standalone: true, + imports: [CommonModule, SpectateComponent, LoaderComponent, RouterLink] }) export class HomeComponent { protected readonly LittleMuncherHills = LittleMuncherHills; - protected readonly LittleMuncherHill = LittleMuncherHillEnum; @Output() startLevel: EventEmitter = new EventEmitter(); - - constructor( - protected readonly serverHealthService: ServerHealthService, - protected readonly authService: AuthService - ) {} + protected readonly serverHealthService = inject(ServerHealthService); + private readonly authService = inject(AuthService); climbOn(hillKey: unknown) { this.startLevel.next({ @@ -30,5 +32,5 @@ export class HomeComponent { }); } - getHillName = (hill: HillData) => hill.name + ' ' + hill.height + 'm'; + getHillName = (hill: HillData) => hill.name + " " + hill.height + "m"; } diff --git a/apps/client/src/app/little-muncher/home/spectate/spectate.component.html b/apps/client/src/app/little-muncher/home/spectate/spectate.component.html index fc521ea6..019f6871 100644 --- a/apps/client/src/app/little-muncher/home/spectate/spectate.component.html +++ b/apps/client/src/app/little-muncher/home/spectate/spectate.component.html @@ -1,9 +1,9 @@ -
    -
    Spectate current games:
    +
    +
    Spectate current games:
    -
    -
    Room id: {{ room.gameInstanceId }}
    - +
    +
    Room id: {{ room.gameInstanceMetadataData.gameInstanceId }}
    +
    diff --git a/apps/client/src/app/little-muncher/home/spectate/spectate.component.spec.ts b/apps/client/src/app/little-muncher/home/spectate/spectate.component.spec.ts index 015cdbc1..73db6b40 100644 --- a/apps/client/src/app/little-muncher/home/spectate/spectate.component.spec.ts +++ b/apps/client/src/app/little-muncher/home/spectate/spectate.component.spec.ts @@ -1,22 +1,23 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { SpectateComponent } from './spectate.component'; -import { SpectateService } from './spectate.service'; -import { spectateServiceStub } from './spectate.service.spec'; -import { ServerHealthService } from '../../../shared/services/server-health.service'; -import { serverHealthServiceStub } from '../../../shared/services/server-health.service.spec'; -import { Component } from '@angular/core'; +import { SpectateComponent } from "./spectate.component"; +import { SpectateService } from "./spectate.service"; +import { spectateServiceStub } from "./spectate.service.spec"; +import { ServerHealthService } from "../../../shared/services/server-health.service"; +import { serverHealthServiceStub } from "../../../shared/services/server-health.service.spec"; +import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; -@Component({ selector: 'little-muncher-spectate', template: '' }) +@Component({ selector: "little-muncher-spectate", template: "", standalone: true, imports: [CommonModule] }) export class SpectateTestComponent {} -describe('SpectateComponent', () => { +describe("SpectateComponent", () => { let component: SpectateComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [SpectateComponent], + imports: [SpectateComponent], providers: [ { provide: ServerHealthService, useValue: serverHealthServiceStub }, { provide: SpectateService, useValue: spectateServiceStub } @@ -28,7 +29,7 @@ describe('SpectateComponent', () => { fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/little-muncher/home/spectate/spectate.component.ts b/apps/client/src/app/little-muncher/home/spectate/spectate.component.ts index 087d627f..3ae59048 100644 --- a/apps/client/src/app/little-muncher/home/spectate/spectate.component.ts +++ b/apps/client/src/app/little-muncher/home/spectate/spectate.component.ts @@ -1,24 +1,25 @@ -import { Component, OnInit } from '@angular/core'; -import { SpectateService } from './spectate.service'; -import { Room } from '@fuzzy-waddle/api-interfaces'; -import { ServerHealthService } from '../../../shared/services/server-health.service'; +import { Component, inject, OnInit } from "@angular/core"; +import { SpectateService } from "./spectate.service"; +import { LittleMuncherRoom } from "@fuzzy-waddle/api-interfaces"; +import { ServerHealthService } from "../../../shared/services/server-health.service"; +import { CommonModule } from "@angular/common"; @Component({ - selector: 'little-muncher-spectate', - templateUrl: './spectate.component.html', - styleUrls: ['./spectate.component.scss'] + selector: "little-muncher-spectate", + templateUrl: "./spectate.component.html", + styleUrls: ["./spectate.component.scss"], + standalone: true, + imports: [CommonModule] }) export class SpectateComponent implements OnInit { - constructor( - protected readonly spectateService: SpectateService, - protected readonly serverHealthService: ServerHealthService - ) {} + protected readonly spectateService = inject(SpectateService); + protected readonly serverHealthService = inject(ServerHealthService); async ngOnInit(): Promise { await this.spectateService.initiallyPullRooms(); } - async spectate(room: Room) { - await this.spectateService.joinRoom(room.gameInstanceId); + async spectate(room: LittleMuncherRoom) { + await this.spectateService.joinRoom(room.gameInstanceMetadataData.gameInstanceId!); } } diff --git a/apps/client/src/app/little-muncher/home/spectate/spectate.service.interface.ts b/apps/client/src/app/little-muncher/home/spectate/spectate.service.interface.ts index ffea6161..ba6883fa 100644 --- a/apps/client/src/app/little-muncher/home/spectate/spectate.service.interface.ts +++ b/apps/client/src/app/little-muncher/home/spectate/spectate.service.interface.ts @@ -1,17 +1,17 @@ -import { Room, RoomEvent } from '@fuzzy-waddle/api-interfaces'; -import { Observable, Subject } from 'rxjs'; +import { LittleMuncherRoom, LittleMuncherRoomEvent } from "@fuzzy-waddle/api-interfaces"; +import { Observable, Subject } from "rxjs"; export interface SpectateServiceInterface { - rooms: Room[]; + rooms: LittleMuncherRoom[]; spectatorDisconnected: Subject; listenToRoomEvents(): void; - getRooms(): Promise; + getRooms(): Promise; initiallyPullRooms(): Promise; - get roomEvent(): Observable | undefined; + get roomEvent(): Observable | undefined; joinRoom(gameInstanceId: string): void; diff --git a/apps/client/src/app/little-muncher/home/spectate/spectate.service.spec.ts b/apps/client/src/app/little-muncher/home/spectate/spectate.service.spec.ts index 658e04a4..c1cd590d 100644 --- a/apps/client/src/app/little-muncher/home/spectate/spectate.service.spec.ts +++ b/apps/client/src/app/little-muncher/home/spectate/spectate.service.spec.ts @@ -3,10 +3,10 @@ import { TestBed } from "@angular/core/testing"; import { SpectateService } from "./spectate.service"; import { HttpClientTestingModule } from "@angular/common/http/testing"; import { SpectateServiceInterface } from "./spectate.service.interface"; -import { RoomEvent } from "@fuzzy-waddle/api-interfaces"; import { Observable, Subject } from "rxjs"; import { AuthService } from "../../../auth/auth.service"; import { authServiceStub } from "../../../auth/auth.service.spec"; +import { LittleMuncherRoomEvent } from "@fuzzy-waddle/api-interfaces"; export const spectateServiceStub = { rooms: [], @@ -17,7 +17,7 @@ export const spectateServiceStub = { destroy() { // }, - get roomEvent(): Observable | undefined { + get roomEvent(): Observable | undefined { return undefined; }, getRooms() { diff --git a/apps/client/src/app/little-muncher/home/spectate/spectate.service.ts b/apps/client/src/app/little-muncher/home/spectate/spectate.service.ts index 42d8a48b..99476485 100644 --- a/apps/client/src/app/little-muncher/home/spectate/spectate.service.ts +++ b/apps/client/src/app/little-muncher/home/spectate/spectate.service.ts @@ -5,23 +5,23 @@ import { GameInstanceDataDto, LittleMuncherGameInstanceData, LittleMuncherGatewayEvent, - Room, - RoomEvent + LittleMuncherRoom, + LittleMuncherRoomEvent } from "@fuzzy-waddle/api-interfaces"; import { firstValueFrom, Observable, Subject, Subscription } from "rxjs"; import { AuthenticatedSocketService } from "../../../data-access/chat/authenticated-socket.service"; import { map } from "rxjs/operators"; -import { GameInstanceClientService } from "../../main/game-instance-client.service"; import { AuthService } from "../../../auth/auth.service"; import { ServerHealthService } from "../../../shared/services/server-health.service"; import { SpectateServiceInterface } from "./spectate.service.interface"; +import { GameInstanceClientService } from "../../main/communicators/game-instance-client.service"; @Injectable({ providedIn: "root" }) export class SpectateService implements SpectateServiceInterface { private spectateRoomsSubscription?: Subscription; - rooms: Room[] = []; + rooms: LittleMuncherRoom[] = []; spectatorDisconnected: Subject = new Subject(); constructor( @@ -39,16 +39,19 @@ export class SpectateService implements SpectateServiceInterface { this.spectateRoomsSubscription = this.roomEvent?.subscribe(async (roomEvent) => { const room = roomEvent.room; if (roomEvent.action === "added") { - if (roomEvent.gameInstanceMetadataData.createdBy === this.authService.userId) return; + if (roomEvent.room.gameInstanceMetadataData.createdBy === this.authService.userId) return; this.rooms.push(room); } else if (roomEvent.action === "removed") { - this.rooms = this.rooms.filter((room) => room.gameInstanceId !== room.gameInstanceId); + this.rooms = this.rooms.filter( + (room) => + room.gameInstanceMetadataData.gameInstanceId !== roomEvent.room.gameInstanceMetadataData.gameInstanceId + ); await this.handleRemovalOfSpectatedRoom(room); } }); } - private async handleRemovalOfSpectatedRoom(room: Room) { + private async handleRemovalOfSpectatedRoom(room: LittleMuncherRoom) { const currentGameInstanceId = this.gameInstanceClientService.gameInstance?.gameInstanceMetadata?.data.gameInstanceId; if (!currentGameInstanceId) return; @@ -58,7 +61,7 @@ export class SpectateService implements SpectateServiceInterface { if (!currentlySpectating) return; // check if spectated room is the same as the room that was removed - if (room.gameInstanceId !== currentGameInstanceId) return; + if (room.gameInstanceMetadataData.gameInstanceId !== currentGameInstanceId) return; await this.gameInstanceClientService.stopLevel("local"); @@ -68,18 +71,18 @@ export class SpectateService implements SpectateServiceInterface { async getRooms() { if (!this.authService.isAuthenticated || !this.serverHealthService.serverAvailable) return []; const url = environment.api + "api/little-muncher/get-rooms"; - return await firstValueFrom(this.httpClient.get(url)); + return await firstValueFrom(this.httpClient.get(url)); } async initiallyPullRooms(): Promise { this.rooms = await this.getRooms(); } - get roomEvent(): Observable | undefined { + get roomEvent(): Observable | undefined { const socket = this.authenticatedSocketService.socket; return socket - ?.fromEvent(LittleMuncherGatewayEvent.LittleMuncherRoom) - .pipe(map((data: RoomEvent) => data)); + ?.fromEvent(LittleMuncherGatewayEvent.LittleMuncherRoom) + .pipe(map((data: LittleMuncherRoomEvent) => data)); } async joinRoom(gameInstanceId: string) { diff --git a/apps/client/src/app/little-muncher/little-muncher-routing.module.ts b/apps/client/src/app/little-muncher/little-muncher-routing.module.ts deleted file mode 100644 index 275f8d16..00000000 --- a/apps/client/src/app/little-muncher/little-muncher-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { LittleMuncherComponent } from './little-muncher.component'; - -const routes: Routes = [ - { - path: '', - component: LittleMuncherComponent - }, - { path: '**', redirectTo: '' } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class LittleMuncherRoutingModule {} diff --git a/apps/client/src/app/little-muncher/little-muncher.component.html b/apps/client/src/app/little-muncher/little-muncher.component.html index 8beec0ed..8f9ae62f 100644 --- a/apps/client/src/app/little-muncher/little-muncher.component.html +++ b/apps/client/src/app/little-muncher/little-muncher.component.html @@ -1,26 +1,26 @@
    - +
    - - + + - + {{ toastData.text }} diff --git a/apps/client/src/app/little-muncher/little-muncher.component.spec.ts b/apps/client/src/app/little-muncher/little-muncher.component.spec.ts index 20905393..c640d9c3 100644 --- a/apps/client/src/app/little-muncher/little-muncher.component.spec.ts +++ b/apps/client/src/app/little-muncher/little-muncher.component.spec.ts @@ -1,32 +1,51 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { LittleMuncherComponent } from './little-muncher.component'; -import { GameInstanceClientService } from './main/game-instance-client.service'; -import { gameInstanceClientServiceStub } from './main/game-instance-client.service.spec'; -import { SpectateService } from './home/spectate/spectate.service'; -import { spectateServiceStub } from './home/spectate/spectate.service.spec'; -import { FontAwesomeTestingModule } from '@fortawesome/angular-fontawesome/testing'; +import { LittleMuncherComponent } from "./little-muncher.component"; +import { SpectateService } from "./home/spectate/spectate.service"; +import { spectateServiceStub } from "./home/spectate/spectate.service.spec"; +import { FontAwesomeTestingModule } from "@fortawesome/angular-fontawesome/testing"; +import { GameInstanceClientService } from "./main/communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "./main/communicators/game-instance-client.service.spec"; +import { MainComponent } from "./main/main.component"; +import { HomeComponent } from "./home/home.component"; +import { MainTestingComponent } from "./main/main.component.spec"; +import { HomeTestingComponent } from "./home/home.component.spec"; +import { UserInstanceService } from "../home/profile/user-instance.service"; +import { userInstanceServiceStub } from "../home/profile/user-instance.service.spec"; -describe('LittleMuncherComponent', () => { +jest.mock("./game/const/game-config", () => ({ + littleMuncherGameConfig: {} +})); + +describe("LittleMuncherComponent", () => { let component: LittleMuncherComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [LittleMuncherComponent], - imports: [FontAwesomeTestingModule], + imports: [LittleMuncherComponent, FontAwesomeTestingModule], providers: [ + { provide: UserInstanceService, useValue: userInstanceServiceStub }, { provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }, { provide: SpectateService, useValue: spectateServiceStub } ] - }).compileComponents(); + }) + .overrideComponent(LittleMuncherComponent, { + remove: { + imports: [MainComponent, HomeComponent] + }, + add: { + imports: [MainTestingComponent, HomeTestingComponent] + } + }) + .compileComponents(); fixture = TestBed.createComponent(LittleMuncherComponent); component = fixture.componentInstance; fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/little-muncher/little-muncher.component.ts b/apps/client/src/app/little-muncher/little-muncher.component.ts index 6846cb32..e332ca98 100644 --- a/apps/client/src/app/little-muncher/little-muncher.component.ts +++ b/apps/client/src/app/little-muncher/little-muncher.component.ts @@ -1,13 +1,21 @@ -import { Component, HostListener, OnDestroy, OnInit } from '@angular/core'; -import { GameSessionState, LittleMuncherGameCreate } from '@fuzzy-waddle/api-interfaces'; -import { GameInstanceClientService } from './main/game-instance-client.service'; -import { faSpinner } from '@fortawesome/free-solid-svg-icons'; -import { SpectateService } from './home/spectate/spectate.service'; -import { Subscription } from 'rxjs'; +import { Component, HostListener, inject, OnDestroy, OnInit } from "@angular/core"; +import { GameSessionState, LittleMuncherGameCreate } from "@fuzzy-waddle/api-interfaces"; +import { faSpinner } from "@fortawesome/free-solid-svg-icons"; +import { SpectateService } from "./home/spectate/spectate.service"; +import { Subscription } from "rxjs"; +import { GameInstanceClientService } from "./main/communicators/game-instance-client.service"; +import { UserInstanceService } from "../home/profile/user-instance.service"; +import { CommonModule } from "@angular/common"; +import { FaIconComponent } from "@fortawesome/angular-fontawesome"; +import { HomeComponent } from "./home/home.component"; +import { MainComponent } from "./main/main.component"; +import { NgbToast } from "@ng-bootstrap/ng-bootstrap"; @Component({ - templateUrl: './little-muncher.component.html', - styleUrls: ['./little-muncher.component.scss'] + templateUrl: "./little-muncher.component.html", + styleUrls: ["./little-muncher.component.scss"], + standalone: true, + imports: [CommonModule, FaIconComponent, HomeComponent, MainComponent, NgbToast] }) export class LittleMuncherComponent implements OnInit, OnDestroy { protected readonly faSpinner = faSpinner; @@ -15,16 +23,14 @@ export class LittleMuncherComponent implements OnInit, OnDestroy { private spectatorDisconnectedSubscription?: Subscription; protected toastData = { show: false, - title: '', - text: '' + title: "", + text: "" }; + protected readonly userInstanceService = inject(UserInstanceService); + protected readonly gameInstanceClientService = inject(GameInstanceClientService); + private readonly spectateService = inject(SpectateService); - constructor( - protected readonly gameInstanceClientService: GameInstanceClientService, - private readonly spectateService: SpectateService - ) {} - - @HostListener('window:beforeunload') + @HostListener("window:beforeunload") async onBeforeUnload() { await this.gameInstanceClientService.stopGame(); } @@ -45,19 +51,20 @@ export class LittleMuncherComponent implements OnInit, OnDestroy { } async ngOnInit(): Promise { + this.userInstanceService.setVisitedGame("little-muncher"); await this.gameInstanceClientService.startGame(); - await this.spectateService.listenToRoomEvents(); + this.spectateService.listenToRoomEvents(); this.spectatorDisconnectedSubscription = this.spectateService.spectatorDisconnected.subscribe(() => { this.toastData = { show: true, - title: 'Game Disconnected', - text: 'You have been disconnected from the game' + title: "Game Disconnected", + text: "You have been disconnected from the game" }; }); } get notPlaying() { const currentState = this.gameInstanceClientService.gameInstance!.gameInstanceMetadata!.data.sessionState!; - return currentState === GameSessionState.NotPlaying; + return currentState === GameSessionState.NotStarted; } } diff --git a/apps/client/src/app/little-muncher/little-muncher.module.ts b/apps/client/src/app/little-muncher/little-muncher.module.ts deleted file mode 100644 index 742bf9c3..00000000 --- a/apps/client/src/app/little-muncher/little-muncher.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { LittleMuncherRoutingModule } from './little-muncher-routing.module'; -import { LittleMuncherComponent } from './little-muncher.component'; -import { MainModule } from './main/main.module'; -import { HomeComponent } from './home/home.component'; -import { SpectateComponent } from './home/spectate/spectate.component'; -import { LoaderComponent } from '../shared/loader/loader.component'; -import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { NgbToast } from '@ng-bootstrap/ng-bootstrap'; - -@NgModule({ - declarations: [LittleMuncherComponent, HomeComponent, SpectateComponent], - imports: [CommonModule, LittleMuncherRoutingModule, MainModule, LoaderComponent, FontAwesomeModule, NgbToast] -}) -export class LittleMuncherModule {} diff --git a/apps/client/src/app/little-muncher/main/game-instance-client.service.interface.ts b/apps/client/src/app/little-muncher/main/communicators/game-instance-client.service.interface.ts similarity index 65% rename from apps/client/src/app/little-muncher/main/game-instance-client.service.interface.ts rename to apps/client/src/app/little-muncher/main/communicators/game-instance-client.service.interface.ts index c809b363..90335a5c 100644 --- a/apps/client/src/app/little-muncher/main/game-instance-client.service.interface.ts +++ b/apps/client/src/app/little-muncher/main/communicators/game-instance-client.service.interface.ts @@ -3,7 +3,7 @@ import { LittleMuncherGameInstance, LittleMuncherGameInstanceData, LittleMuncherLevel -} from '@fuzzy-waddle/api-interfaces'; +} from "@fuzzy-waddle/api-interfaces"; export interface GameInstanceClientServiceInterface { gameInstance?: LittleMuncherGameInstance; @@ -12,13 +12,21 @@ export interface GameInstanceClientServiceInterface { stopGame(): void; + /** + * updates level on server and calls openLevel + * @param gameCreate + */ startLevel(gameCreate: LittleMuncherGameCreate): void; + /** + * @private + * Initializes game and opens level communicators + */ openLevel(littleMuncherLevel: LittleMuncherLevel): void; openLevelSpectator(gameInstanceData: LittleMuncherGameInstanceData): void; - stopLevel(removeFrom: 'local' | 'localAndRemote'): Promise; + stopLevel(removeFrom: "local" | "localAndRemote"): Promise; get gameInstanceId(): string | null; } diff --git a/apps/client/src/app/little-muncher/main/game-instance-client.service.spec.ts b/apps/client/src/app/little-muncher/main/communicators/game-instance-client.service.spec.ts similarity index 89% rename from apps/client/src/app/little-muncher/main/game-instance-client.service.spec.ts rename to apps/client/src/app/little-muncher/main/communicators/game-instance-client.service.spec.ts index 921cd7cd..8c737042 100644 --- a/apps/client/src/app/little-muncher/main/game-instance-client.service.spec.ts +++ b/apps/client/src/app/little-muncher/main/communicators/game-instance-client.service.spec.ts @@ -3,8 +3,8 @@ import { TestBed } from "@angular/core/testing"; import { GameInstanceClientService } from "./game-instance-client.service"; import { HttpClientTestingModule } from "@angular/common/http/testing"; import { GameInstanceClientServiceInterface } from "./game-instance-client.service.interface"; -import { AuthService } from "../../auth/auth.service"; -import { authServiceStub } from "../../auth/auth.service.spec"; +import { AuthService } from "../../../auth/auth.service"; +import { authServiceStub } from "../../../auth/auth.service.spec"; export const gameInstanceClientServiceStub = { get gameInstanceId(): string | null { diff --git a/apps/client/src/app/little-muncher/main/game-instance-client.service.ts b/apps/client/src/app/little-muncher/main/communicators/game-instance-client.service.ts similarity index 74% rename from apps/client/src/app/little-muncher/main/game-instance-client.service.ts rename to apps/client/src/app/little-muncher/main/communicators/game-instance-client.service.ts index b244952b..bd9da8ab 100644 --- a/apps/client/src/app/little-muncher/main/game-instance-client.service.ts +++ b/apps/client/src/app/little-muncher/main/communicators/game-instance-client.service.ts @@ -1,7 +1,6 @@ -import { Injectable } from '@angular/core'; -import { firstValueFrom } from 'rxjs'; -import { environment } from '../../../environments/environment'; -import { HttpClient } from '@angular/common/http'; +import { Injectable } from "@angular/core"; +import { firstValueFrom } from "rxjs"; +import { HttpClient } from "@angular/common/http"; import { GameInstanceDataDto, LittleMuncherGameCreate, @@ -9,14 +8,15 @@ import { LittleMuncherGameInstance, LittleMuncherGameInstanceData, LittleMuncherLevel -} from '@fuzzy-waddle/api-interfaces'; -import { ServerHealthService } from '../../shared/services/server-health.service'; -import { SceneCommunicatorClientService } from './scene-communicator-client.service'; -import { AuthService } from '../../auth/auth.service'; -import { GameInstanceClientServiceInterface } from './game-instance-client.service.interface'; +} from "@fuzzy-waddle/api-interfaces"; +import { SceneCommunicatorClientService } from "./scene-communicator-client.service"; +import { GameInstanceClientServiceInterface } from "./game-instance-client.service.interface"; +import { AuthService } from "../../../auth/auth.service"; +import { ServerHealthService } from "../../../shared/services/server-health.service"; +import { environment } from "../../../../environments/environment"; @Injectable({ - providedIn: 'root' + providedIn: "root" }) export class GameInstanceClientService implements GameInstanceClientServiceInterface { gameInstance?: LittleMuncherGameInstance; @@ -31,10 +31,10 @@ export class GameInstanceClientService implements GameInstanceClientServiceInter async startGame(): Promise { this.gameInstance = new LittleMuncherGameInstance({ gameInstanceMetadataData: { createdBy: this.authService.userId }, - players: [{ userId: this.authService.userId }] + players: [{ playerControllerData: { userId: this.authService.userId } }] }); if (this.authService.isAuthenticated && this.serverHealthService.serverAvailable) { - const url = environment.api + 'api/little-muncher/start-game'; + const url = environment.api + "api/little-muncher/start-game"; const body: GameInstanceDataDto = { gameInstanceId: this.gameInstanceId! }; await firstValueFrom(this.httpClient.post(url, body)); } @@ -43,17 +43,17 @@ export class GameInstanceClientService implements GameInstanceClientServiceInter async stopGame() { if (!this.gameInstanceId) return; if (this.authService.isAuthenticated && this.serverHealthService.serverAvailable) { - const url = environment.api + 'api/little-muncher/stop-game'; + const url = environment.api + "api/little-muncher/stop-game"; const body: GameInstanceDataDto = { gameInstanceId: this.gameInstanceId }; await firstValueFrom(this.httpClient.delete(url, { body })); } - await this.stopLevel('local'); + await this.stopLevel("local"); } async startLevel(gameCreate: LittleMuncherGameCreate) { if (!this.gameInstanceId) return; if (this.authService.isAuthenticated && this.serverHealthService.serverAvailable) { - const url = environment.api + 'api/little-muncher/start-level'; + const url = environment.api + "api/little-muncher/start-level"; const body: LittleMuncherGameCreateDto = { gameInstanceId: this.gameInstanceId, ...gameCreate @@ -84,14 +84,14 @@ export class GameInstanceClientService implements GameInstanceClientServiceInter /** * @param removeFrom - if we destroy whole game instance, we don't need to remove game mode from remote again */ - async stopLevel(removeFrom: 'local' | 'localAndRemote'): Promise { + async stopLevel(removeFrom: "local" | "localAndRemote"): Promise { if (!this.gameInstanceId) return; if ( this.authService.isAuthenticated && this.serverHealthService.serverAvailable && - removeFrom === 'localAndRemote' + removeFrom === "localAndRemote" ) { - const url = environment.api + 'api/little-muncher/stop-level'; + const url = environment.api + "api/little-muncher/stop-level"; const body: GameInstanceDataDto = { gameInstanceId: this.gameInstanceId }; diff --git a/apps/client/src/app/little-muncher/game/little-muncher-communicator.service.ts b/apps/client/src/app/little-muncher/main/communicators/little-muncher-communicator.service.ts similarity index 67% rename from apps/client/src/app/little-muncher/game/little-muncher-communicator.service.ts rename to apps/client/src/app/little-muncher/main/communicators/little-muncher-communicator.service.ts index 498c12ee..5bf1ba7a 100644 --- a/apps/client/src/app/little-muncher/game/little-muncher-communicator.service.ts +++ b/apps/client/src/app/little-muncher/main/communicators/little-muncher-communicator.service.ts @@ -1,51 +1,53 @@ import { Injectable, OnDestroy } from "@angular/core"; -import { TwoWayCommunicator } from "../../shared/game/communicators/two-way-communicator"; import { Socket } from "ngx-socket-io"; import { LittleMuncherCommunicatorClimbingEvent, LittleMuncherCommunicatorPauseEvent, LittleMuncherCommunicatorResetEvent, LittleMuncherCommunicatorScoreEvent, + LittleMuncherCommunicatorType, LittleMuncherGatewayEvent, LittleMuncherPosition } from "@fuzzy-waddle/api-interfaces"; +import { TwoWayCommunicator } from "../../../shared/game/communicators/two-way-communicator"; +import { CommunicatorService } from "../../../shared/game/communicators/CommunicatorService"; @Injectable({ providedIn: "root" }) -export class LittleMuncherCommunicatorService implements OnDestroy { - move?: TwoWayCommunicator; - score?: TwoWayCommunicator; - timeClimbing?: TwoWayCommunicator; - pause?: TwoWayCommunicator; - reset?: TwoWayCommunicator; +export class LittleMuncherCommunicatorService implements CommunicatorService, OnDestroy { + move?: TwoWayCommunicator; + score?: TwoWayCommunicator; + timeClimbing?: TwoWayCommunicator; + pause?: TwoWayCommunicator; + reset?: TwoWayCommunicator; startCommunication(gameInstanceId: string, socket?: Socket) { - this.move = new TwoWayCommunicator( + this.move = new TwoWayCommunicator( LittleMuncherGatewayEvent.LittleMuncherAction, "move", gameInstanceId, socket ); - this.score = new TwoWayCommunicator( + this.score = new TwoWayCommunicator( LittleMuncherGatewayEvent.LittleMuncherAction, "score", gameInstanceId, socket ); - this.timeClimbing = new TwoWayCommunicator( + this.timeClimbing = new TwoWayCommunicator( LittleMuncherGatewayEvent.LittleMuncherAction, "timeClimbing", gameInstanceId, socket ); - this.pause = new TwoWayCommunicator( + this.pause = new TwoWayCommunicator( LittleMuncherGatewayEvent.LittleMuncherAction, "pause", gameInstanceId, socket ); - this.reset = new TwoWayCommunicator( + this.reset = new TwoWayCommunicator( LittleMuncherGatewayEvent.LittleMuncherAction, "reset", gameInstanceId, diff --git a/apps/client/src/app/little-muncher/main/scene-communicator-client.service.interface.ts b/apps/client/src/app/little-muncher/main/communicators/scene-communicator-client.service.interface.ts similarity index 100% rename from apps/client/src/app/little-muncher/main/scene-communicator-client.service.interface.ts rename to apps/client/src/app/little-muncher/main/communicators/scene-communicator-client.service.interface.ts diff --git a/apps/client/src/app/little-muncher/main/scene-communicator-client.service.spec.ts b/apps/client/src/app/little-muncher/main/communicators/scene-communicator-client.service.spec.ts similarity index 100% rename from apps/client/src/app/little-muncher/main/scene-communicator-client.service.spec.ts rename to apps/client/src/app/little-muncher/main/communicators/scene-communicator-client.service.spec.ts diff --git a/apps/client/src/app/little-muncher/main/scene-communicator-client.service.ts b/apps/client/src/app/little-muncher/main/communicators/scene-communicator-client.service.ts similarity index 80% rename from apps/client/src/app/little-muncher/main/scene-communicator-client.service.ts rename to apps/client/src/app/little-muncher/main/communicators/scene-communicator-client.service.ts index 8beded55..7ad7de68 100644 --- a/apps/client/src/app/little-muncher/main/scene-communicator-client.service.ts +++ b/apps/client/src/app/little-muncher/main/communicators/scene-communicator-client.service.ts @@ -1,8 +1,8 @@ import { Injectable } from "@angular/core"; -import { LittleMuncherCommunicatorService } from "../game/little-muncher-communicator.service"; import { HttpClient } from "@angular/common/http"; -import { AuthenticatedSocketService } from "../../data-access/chat/authenticated-socket.service"; import { SceneCommunicatorClientServiceInterface } from "./scene-communicator-client.service.interface"; +import { LittleMuncherCommunicatorService } from "./little-muncher-communicator.service"; +import { AuthenticatedSocketService } from "../../../data-access/chat/authenticated-socket.service"; @Injectable({ providedIn: "root" diff --git a/apps/client/src/app/little-muncher/main/game-interface/game-interface.component.html b/apps/client/src/app/little-muncher/main/game-interface/game-interface.component.html index a876b797..579fd35a 100644 --- a/apps/client/src/app/little-muncher/main/game-interface/game-interface.component.html +++ b/apps/client/src/app/little-muncher/main/game-interface/game-interface.component.html @@ -16,6 +16,6 @@
    -
    Score: {{ score | wrap : 1 }}
    -
    Remaining: {{ remaining | wrap : 1 }}
    +
    Score: {{ score | wrap: 1 }}
    +
    Remaining: {{ remaining | wrap: 1 }}
    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 c389f48f..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 @@ -1,31 +1,42 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { GameInterfaceComponent } from './game-interface.component'; -import { GameInstanceClientService } from '../game-instance-client.service'; -import { gameInstanceClientServiceStub } from '../game-instance-client.service.spec'; -import { LittleMuncherGameInstance } from '@fuzzy-waddle/api-interfaces'; -import { ModalTestComponent } from '../../../shared/components/modal/modal.component.spec'; -import { Component } from '@angular/core'; -import { WrapPipe } from './wrap.pipe'; -import { AuthService } from '../../../auth/auth.service'; -import { authServiceStub } from '../../../auth/auth.service.spec'; - -@Component({ selector: 'fuzzy-waddle-game-interface', template: '' }) +import { ComponentFixture, TestBed } from "@angular/core/testing"; + +import { GameInterfaceComponent } from "./game-interface.component"; +import { LittleMuncherGameInstance } from "@fuzzy-waddle/api-interfaces"; +import { ModalTestComponent } from "../../../shared/components/modal/modal.component.spec"; +import { Component } from "@angular/core"; +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 { 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 {} -describe('GameInterfaceComponent', () => { +describe("GameInterfaceComponent", () => { let component: GameInterfaceComponent; let fixture: ComponentFixture; beforeEach(async () => { // provide also WrapPipe await TestBed.configureTestingModule({ - declarations: [GameInterfaceComponent, ModalTestComponent, WrapPipe], providers: [ { provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }, { provide: AuthService, useValue: authServiceStub } - ] - }).compileComponents(); + ], + imports: [GameInterfaceComponent, WrapPipe] + }) + .overrideComponent(GameInterfaceComponent, { + remove: { + imports: [ModalComponent] + }, + add: { + imports: [ModalTestComponent] + } + }) + .compileComponents(); fixture = TestBed.createComponent(GameInterfaceComponent); component = fixture.componentInstance; @@ -37,7 +48,7 @@ describe('GameInterfaceComponent', () => { fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); 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 741b10ca..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 @@ -1,23 +1,34 @@ -import { ChangeDetectorRef, Component, OnDestroy, OnInit, ViewChild } from "@angular/core"; +import { ChangeDetectorRef, Component, inject, OnDestroy, OnInit, ViewChild } from "@angular/core"; import { ModalConfig } from "../../../shared/components/modal/modal-config"; import { ModalComponent } from "../../../shared/components/modal/modal.component"; -import { GameInstanceClientService } from "../game-instance-client.service"; -import { LittleMuncherCommunicatorService } from "../../game/little-muncher-communicator.service"; import { Subscription } from "rxjs"; import { faPause, faPlay } from "@fortawesome/free-solid-svg-icons"; import { AuthService } from "../../../auth/auth.service"; import { LittleMuncherHillEnum, LittleMuncherHills } from "@fuzzy-waddle/api-interfaces"; import { PreventNavigateBack } from "../../../shared/handlers/prevent-navigate-back"; import { Router } from "@angular/router"; +import { GameInstanceClientService } from "../communicators/game-instance-client.service"; +import { LittleMuncherCommunicatorService } from "../communicators/little-muncher-communicator.service"; +import { CommonModule } from "@angular/common"; +import { FaIconComponent } from "@fortawesome/angular-fontawesome"; +import { WrapPipe } from "../../../shared/pipes/wrap.pipe"; @Component({ - selector: "fuzzy-waddle-game-interface", + selector: "little-muncher-game-interface", templateUrl: "./game-interface.component.html", - styleUrls: ["./game-interface.component.scss"] + styleUrls: ["./game-interface.component.scss"], + standalone: true, + imports: [CommonModule, ModalComponent, FaIconComponent, WrapPipe] }) export class GameInterfaceComponent implements OnInit, OnDestroy { - score = 0; - remaining = 0; + private readonly authService = inject(AuthService); + private readonly gameInstanceClientService = inject(GameInstanceClientService); + private readonly communicatorService = inject(LittleMuncherCommunicatorService); + private readonly changeDetectorRef = inject(ChangeDetectorRef); + private readonly router = inject(Router); + + protected score = 0; + protected remaining = 0; @ViewChild("modal") private modalComponent!: ModalComponent; protected readonly faPause = faPause; protected readonly faPlay = faPlay; @@ -36,14 +47,6 @@ export class GameInterfaceComponent implements OnInit, OnDestroy { private scoreSubscription?: Subscription; private pauseSubscription?: Subscription; - constructor( - private readonly authService: AuthService, - private readonly gameInstanceClientService: GameInstanceClientService, - private readonly communicatorService: LittleMuncherCommunicatorService, - private readonly changeDetectorRef: ChangeDetectorRef, - private readonly router: Router - ) {} - protected async leave() { await this.openModal(); } @@ -79,25 +82,18 @@ export class GameInterfaceComponent implements OnInit, OnDestroy { } private manageRemaining() { - if ( - !this.gameInstanceClientService.gameInstance?.gameMode?.data.hill || - !this.gameInstanceClientService.gameInstance?.gameState - ) { + const hill = this.gameInstanceClientService.gameInstance?.gameMode?.data.hill; + const gameState = this.gameInstanceClientService.gameInstance?.gameState; + if (!hill || !gameState) { return; } // set initial remaining: - this.remaining = this.getRemaining( - this.gameInstanceClientService.gameInstance.gameMode.data.hill, - this.gameInstanceClientService.gameInstance.gameState.data.climbedHeight - ); + this.remaining = this.getRemaining(hill, gameState.data.climbedHeight); this.scoreSubscription = this.communicatorService.timeClimbing?.on.subscribe((event) => { if (!this.gameInstanceClientService.gameInstance?.gameMode?.data.hill) { return; } - this.remaining = this.getRemaining( - this.gameInstanceClientService.gameInstance.gameMode.data.hill, - event.timeClimbing - ); + this.remaining = this.getRemaining(hill, event.timeClimbing); this.changeDetectorRef.detectChanges(); }); } diff --git a/apps/client/src/app/little-muncher/main/game-interface/score.pipe.spec.ts b/apps/client/src/app/little-muncher/main/game-interface/score.pipe.spec.ts index ce52e8ca..63e2b063 100644 --- a/apps/client/src/app/little-muncher/main/game-interface/score.pipe.spec.ts +++ b/apps/client/src/app/little-muncher/main/game-interface/score.pipe.spec.ts @@ -1,7 +1,7 @@ -import { WrapPipe } from './wrap.pipe'; +import { WrapPipe } from "../../../shared/pipes/wrap.pipe"; -describe('ScorePipe', () => { - it('create an instance', () => { +describe("ScorePipe", () => { + it("create an instance", () => { const pipe = new WrapPipe(); expect(pipe).toBeTruthy(); }); diff --git a/apps/client/src/app/little-muncher/main/main.component.html b/apps/client/src/app/little-muncher/main/main.component.html index 2ef11003..43d34df1 100644 --- a/apps/client/src/app/little-muncher/main/main.component.html +++ b/apps/client/src/app/little-muncher/main/main.component.html @@ -1,4 +1,4 @@ - + diff --git a/apps/client/src/app/little-muncher/main/main.component.spec.ts b/apps/client/src/app/little-muncher/main/main.component.spec.ts index e63221e3..b3596e71 100644 --- a/apps/client/src/app/little-muncher/main/main.component.spec.ts +++ b/apps/client/src/app/little-muncher/main/main.component.spec.ts @@ -1,36 +1,52 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { MainComponent } from './main.component'; -import { GameContainerTestingComponent } from '../../shared/game/game-container/game-container.component.spec'; -import { GameInstanceClientService } from './game-instance-client.service'; -import { gameInstanceClientServiceStub } from './game-instance-client.service.spec'; -import { AuthService } from '../../auth/auth.service'; -import { authServiceStub } from '../../auth/auth.service.spec'; -import { GameInterfaceTestingComponent } from './game-interface/game-interface.component.spec'; +import { MainComponent } from "./main.component"; +import { GameContainerTestingComponent } from "../../shared/game/game-container/game-container.component.spec"; +import { AuthService } from "../../auth/auth.service"; +import { authServiceStub } from "../../auth/auth.service.spec"; +import { GameInterfaceTestingComponent } from "./game-interface/game-interface.component.spec"; +import { GameInstanceClientService } from "./communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "./communicators/game-instance-client.service.spec"; +import { GameContainerComponent } from "../../shared/game/game-container/game-container.component"; +import { GameInterfaceComponent } from "./game-interface/game-interface.component"; +import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; -jest.mock('../game/const/game-config', () => ({ +jest.mock("../game/const/game-config", () => ({ littleMuncherGameConfig: {} })); -describe('MainComponent', () => { +@Component({ selector: "little-muncher-main", template: "", standalone: true, imports: [CommonModule] }) +export class MainTestingComponent {} + +describe("MainComponent", () => { let component: MainComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [MainComponent, GameContainerTestingComponent, GameInterfaceTestingComponent], + imports: [MainComponent], providers: [ { provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }, { provide: AuthService, useValue: authServiceStub } ] - }).compileComponents(); + }) + .overrideComponent(MainComponent, { + remove: { + imports: [GameContainerComponent, GameInterfaceComponent] + }, + add: { + imports: [GameContainerTestingComponent, GameInterfaceTestingComponent] + } + }) + .compileComponents(); fixture = TestBed.createComponent(MainComponent); component = fixture.componentInstance; fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/little-muncher/main/main.component.ts b/apps/client/src/app/little-muncher/main/main.component.ts index d69c5198..72d1c3a7 100644 --- a/apps/client/src/app/little-muncher/main/main.component.ts +++ b/apps/client/src/app/little-muncher/main/main.component.ts @@ -1,25 +1,28 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, inject, OnInit } from "@angular/core"; import { littleMuncherGameConfig } from "../game/const/game-config"; import { LittleMuncherGameData } from "../game/little-muncher-game-data"; -import { LittleMuncherCommunicatorService } from "../game/little-muncher-communicator.service"; -import { GameInstanceClientService } from "./game-instance-client.service"; import { AuthService } from "../../auth/auth.service"; import { LittleMuncherUserInfo } from "@fuzzy-waddle/api-interfaces"; +import { LittleMuncherCommunicatorService } from "./communicators/little-muncher-communicator.service"; +import { GameInstanceClientService } from "./communicators/game-instance-client.service"; +import { CommonModule } from "@angular/common"; +import { GameContainerComponent } from "../../shared/game/game-container/game-container.component"; +import { GameInterfaceComponent } from "./game-interface/game-interface.component"; @Component({ selector: "little-muncher-main", templateUrl: "./main.component.html", - styleUrls: ["./main.component.scss"] + styleUrls: ["./main.component.scss"], + standalone: true, + imports: [CommonModule, GameContainerComponent, GameInterfaceComponent] }) export class MainComponent implements OnInit { protected readonly littleMuncherGameConfig = littleMuncherGameConfig; protected gameData?: LittleMuncherGameData; - constructor( - private readonly communicator: LittleMuncherCommunicatorService, - protected readonly gameInstanceClientService: GameInstanceClientService, - private readonly authService: AuthService - ) {} + protected readonly communicator = inject(LittleMuncherCommunicatorService); + protected readonly gameInstanceClientService = inject(GameInstanceClientService); + protected readonly authService = inject(AuthService); ngOnInit(): void { this.gameData = { diff --git a/apps/client/src/app/little-muncher/main/main.module.ts b/apps/client/src/app/little-muncher/main/main.module.ts deleted file mode 100644 index 8461707b..00000000 --- a/apps/client/src/app/little-muncher/main/main.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MainComponent } from './main.component'; -import { GameInterfaceComponent } from './game-interface/game-interface.component'; -import { ComponentsModule } from '../../shared/components/components.module'; -import { GameContainerModule } from '../../shared/game/game-container/game-container.module'; -import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { WrapPipe } from './game-interface/wrap.pipe'; - -@NgModule({ - declarations: [MainComponent, GameInterfaceComponent, WrapPipe], - exports: [MainComponent], - imports: [CommonModule, ComponentsModule, GameContainerModule, FontAwesomeModule] -}) -export class MainModule {} diff --git a/apps/client/src/app/other/Template/prefabs/Apple.ts b/apps/client/src/app/other/Template/prefabs/Apple.ts index d44b8c7b..6dd8a3c3 100644 --- a/apps/client/src/app/other/Template/prefabs/Apple.ts +++ b/apps/client/src/app/other/Template/prefabs/Apple.ts @@ -7,23 +7,22 @@ import FoodItem from "./FoodItem"; /* END-USER-IMPORTS */ export default class Apple extends FoodItem { + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 359, y ?? 153, texture || "volcano", frame ?? "Tiny Caveman_Game Object - Apple.png"); - constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { - super(scene, x ?? 359, y ?? 153, texture || "volcano", frame ?? "Tiny Caveman_Game Object - Apple.png"); + this.body.setOffset(7, 15); + this.body.setSize(67, 62, false); - this.body.setOffset(7, 15); - this.body.setSize(67, 62, false); + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } + /* START-USER-CODE */ - /* START-USER-CODE */ + // 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/other/Template/prefabs/Banana.ts b/apps/client/src/app/other/Template/prefabs/Banana.ts index 5faddc0e..7ac1110e 100644 --- a/apps/client/src/app/other/Template/prefabs/Banana.ts +++ b/apps/client/src/app/other/Template/prefabs/Banana.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -8,23 +7,22 @@ import FoodItem from "./FoodItem"; /* END-USER-IMPORTS */ export default class Banana extends FoodItem { + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 441, y ?? 147, texture || "volcano", frame ?? "Tiny Caveman_Game Object - Banana.png"); - constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { - super(scene, x ?? 441, y ?? 147, texture || "volcano", frame ?? "Tiny Caveman_Game Object - Banana.png"); - - this.body.setOffset(4, 8); - this.body.setSize(73, 68, false); + this.body.setOffset(4, 8); + this.body.setSize(73, 68, false); - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } - /* START-USER-CODE */ + /* START-USER-CODE */ - // 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/other/Template/prefabs/Cherry.ts b/apps/client/src/app/other/Template/prefabs/Cherry.ts index d12824cd..8b7b66fc 100644 --- a/apps/client/src/app/other/Template/prefabs/Cherry.ts +++ b/apps/client/src/app/other/Template/prefabs/Cherry.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -8,23 +7,22 @@ import FoodItem from "./FoodItem"; /* END-USER-IMPORTS */ export default class Cherry extends FoodItem { + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 394, y ?? 197, texture || "volcano", frame ?? "Tiny Caveman_Game Object - Cherry.png"); - constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { - super(scene, x ?? 394, y ?? 197, texture || "volcano", frame ?? "Tiny Caveman_Game Object - Cherry.png"); - - this.body.setOffset(7, 3); - this.body.setSize(65, 75, false); + this.body.setOffset(7, 3); + this.body.setSize(65, 75, false); - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } - /* START-USER-CODE */ + /* START-USER-CODE */ - // 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/other/Template/prefabs/FoodItem.ts b/apps/client/src/app/other/Template/prefabs/FoodItem.ts index f5dee24c..5d6b0503 100644 --- a/apps/client/src/app/other/Template/prefabs/FoodItem.ts +++ b/apps/client/src/app/other/Template/prefabs/FoodItem.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -8,60 +7,57 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default interface FoodItem { - - body: Phaser.Physics.Arcade.Body; + body: Phaser.Physics.Arcade.Body; } export default class FoodItem extends Phaser.GameObjects.Image { - - constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { - super(scene, x ?? 72, y ?? 70, texture || "volcano", frame ?? "Volcano Level Set_Collectable Object - Meat.png"); - - scene.physics.add.existing(this, false); - this.body.setSize(128, 128, false); - - /* START-USER-CTR-CODE */ - - this.idleTween = this.scene.tweens.add({ - targets: this, - scaleX: 0.8, - scaleY: 0.8, - angle: "-= 30", - yoyo: true, - repeat: -1, - duration: 1000 + Math.random() * 1000 - }); - - /* END-USER-CTR-CODE */ - } - - /* START-USER-CODE */ - - private idleTween: Phaser.Tweens.Tween; - - taken() { - - this.body.setEnable(false); - - this.idleTween.remove(); - - this.scene.add.tween({ - targets: this, - duration: 500, - scaleX: 0.6, - scaleY: 0.6, - angle: 360, - alpha: 0, - y: "-=50", - ease: Phaser.Math.Easing.Linear, - onComplete: () => { - this.destroy(); - }, - onCompleteScope: this - }); - } - - /* END-USER-CODE */ + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 72, y ?? 70, texture || "volcano", frame ?? "Volcano Level Set_Collectable Object - Meat.png"); + + scene.physics.add.existing(this, false); + this.body.setSize(128, 128, false); + + /* START-USER-CTR-CODE */ + + this.idleTween = this.scene.tweens.add({ + targets: this, + scaleX: 0.8, + scaleY: 0.8, + angle: "-= 30", + yoyo: true, + repeat: -1, + duration: 1000 + Math.random() * 1000 + }); + + /* END-USER-CTR-CODE */ + } + + /* START-USER-CODE */ + + private idleTween: Phaser.Tweens.Tween; + + taken() { + this.body.setEnable(false); + + this.idleTween.remove(); + + this.scene.add.tween({ + targets: this, + duration: 500, + scaleX: 0.6, + scaleY: 0.6, + angle: 360, + alpha: 0, + y: "-=50", + ease: Phaser.Math.Easing.Linear, + onComplete: () => { + this.destroy(); + }, + onCompleteScope: this + }); + } + + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/prefabs/Ladder.ts b/apps/client/src/app/other/Template/prefabs/Ladder.ts index 4a1bf798..e3977624 100644 --- a/apps/client/src/app/other/Template/prefabs/Ladder.ts +++ b/apps/client/src/app/other/Template/prefabs/Ladder.ts @@ -7,24 +7,23 @@ import Platform from "./Platform"; /* END-USER-IMPORTS */ export default class Ladder extends Platform { + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 251, y ?? 128, texture || "volcano", frame ?? "Volcano Level Set_Platformer - Ladder.png"); - constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { - super(scene, x ?? 251, y ?? 128, texture || "volcano", frame ?? "Volcano Level Set_Platformer - Ladder.png"); + this.setOrigin(0, 0); + this.body.setOffset(7, 80); + this.body.setSize(113, 48, false); - this.setOrigin(0, 0); - this.body.setOffset(7, 80); - this.body.setSize(113, 48, false); + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } + /* START-USER-CODE */ - /* START-USER-CODE */ + // 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/other/Template/prefabs/MovingPlatform1.ts b/apps/client/src/app/other/Template/prefabs/MovingPlatform1.ts index fbb42ae5..f8a50935 100644 --- a/apps/client/src/app/other/Template/prefabs/MovingPlatform1.ts +++ b/apps/client/src/app/other/Template/prefabs/MovingPlatform1.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -8,44 +7,42 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default interface MovingPlatform1 { - - body: Phaser.Physics.Arcade.Body; + body: Phaser.Physics.Arcade.Body; } export default class MovingPlatform1 extends Phaser.GameObjects.Container { - - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 0, y ?? 0); - - scene.physics.add.existing(this, false); - this.body.checkCollision.down = false; - this.body.checkCollision.left = false; - this.body.checkCollision.right = false; - this.body.pushable = false; - this.body.immovable = true; - this.body.setOffset(14, 8); - this.body.setSize(227, 112, false); - - // p2 - const p2 = scene.add.image(0, 0, "volcano", "Volcano Level Set_Platformer - Ground 10.png"); - p2.setOrigin(0, 0); - this.add(p2); - - // p1 - const p1 = scene.add.image(128, 0, "volcano", "Volcano Level Set_Platformer - Ground 12.png"); - p1.setOrigin(0, 0); - this.add(p1); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - /* START-USER-CODE */ - - // Write your code here. - - /* END-USER-CODE */ + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 0, y ?? 0); + + scene.physics.add.existing(this, false); + this.body.checkCollision.down = false; + this.body.checkCollision.left = false; + this.body.checkCollision.right = false; + this.body.pushable = false; + this.body.immovable = true; + this.body.setOffset(14, 8); + this.body.setSize(227, 112, false); + + // p2 + const p2 = scene.add.image(0, 0, "volcano", "Volcano Level Set_Platformer - Ground 10.png"); + p2.setOrigin(0, 0); + this.add(p2); + + // p1 + const p1 = scene.add.image(128, 0, "volcano", "Volcano Level Set_Platformer - Ground 12.png"); + p1.setOrigin(0, 0); + this.add(p1); + + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } + + /* START-USER-CODE */ + + // Write your code here. + + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/prefabs/MovingPlatform2.ts b/apps/client/src/app/other/Template/prefabs/MovingPlatform2.ts index feb0839a..f58c7e3d 100644 --- a/apps/client/src/app/other/Template/prefabs/MovingPlatform2.ts +++ b/apps/client/src/app/other/Template/prefabs/MovingPlatform2.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -8,49 +7,47 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default interface MovingPlatform2 { - - body: Phaser.Physics.Arcade.Body; + body: Phaser.Physics.Arcade.Body; } export default class MovingPlatform2 extends Phaser.GameObjects.Container { - - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 0, y ?? 0); - - scene.physics.add.existing(this, false); - this.body.checkCollision.down = false; - this.body.checkCollision.left = false; - this.body.checkCollision.right = false; - this.body.pushable = false; - this.body.immovable = true; - this.body.setOffset(7, 8); - this.body.setSize(368, 17, false); - - // p3 - const p3 = scene.add.image(0, 0, "volcano", "Volcano Level Set_Platformer - Wooden Bridge.png"); - p3.setOrigin(0, 0); - this.add(p3); - - // p2 - const p2 = scene.add.image(128, 0, "volcano", "Volcano Level Set_Platformer - Wooden Bridge.png"); - p2.setOrigin(0, 0); - this.add(p2); - - // p1 - const p1 = scene.add.image(256, 0, "volcano", "Volcano Level Set_Platformer - Wooden Bridge.png"); - p1.setOrigin(0, 0); - this.add(p1); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - /* START-USER-CODE */ - - // Write your code here. - - /* END-USER-CODE */ + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 0, y ?? 0); + + scene.physics.add.existing(this, false); + this.body.checkCollision.down = false; + this.body.checkCollision.left = false; + this.body.checkCollision.right = false; + this.body.pushable = false; + this.body.immovable = true; + this.body.setOffset(7, 8); + this.body.setSize(368, 17, false); + + // p3 + const p3 = scene.add.image(0, 0, "volcano", "Volcano Level Set_Platformer - Wooden Bridge.png"); + p3.setOrigin(0, 0); + this.add(p3); + + // p2 + const p2 = scene.add.image(128, 0, "volcano", "Volcano Level Set_Platformer - Wooden Bridge.png"); + p2.setOrigin(0, 0); + this.add(p2); + + // p1 + const p1 = scene.add.image(256, 0, "volcano", "Volcano Level Set_Platformer - Wooden Bridge.png"); + p1.setOrigin(0, 0); + this.add(p1); + + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } + + /* START-USER-CODE */ + + // Write your code here. + + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/prefabs/Platform.ts b/apps/client/src/app/other/Template/prefabs/Platform.ts index 226df319..b082fffa 100644 --- a/apps/client/src/app/other/Template/prefabs/Platform.ts +++ b/apps/client/src/app/other/Template/prefabs/Platform.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -8,33 +7,31 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default interface Platform { - - body: Phaser.Physics.Arcade.Body; + body: Phaser.Physics.Arcade.Body; } export default class Platform extends Phaser.GameObjects.Image { + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 399, y ?? 147, texture || "volcano", frame ?? "Volcano Level Set_Platformer - Stone.png"); - constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { - super(scene, x ?? 399, y ?? 147, texture || "volcano", frame ?? "Volcano Level Set_Platformer - Stone.png"); - - scene.physics.add.existing(this, false); - this.body.checkCollision.down = false; - this.body.checkCollision.left = false; - this.body.checkCollision.right = false; - this.body.pushable = false; - this.body.immovable = true; - this.body.setSize(128, 128, false); + scene.physics.add.existing(this, false); + this.body.checkCollision.down = false; + this.body.checkCollision.left = false; + this.body.checkCollision.right = false; + this.body.pushable = false; + this.body.immovable = true; + this.body.setSize(128, 128, false); - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } - /* START-USER-CODE */ + /* START-USER-CODE */ - // 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/other/Template/prefabs/Player.ts b/apps/client/src/app/other/Template/prefabs/Player.ts index 98dc328a..21d4be55 100644 --- a/apps/client/src/app/other/Template/prefabs/Player.ts +++ b/apps/client/src/app/other/Template/prefabs/Player.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -9,244 +8,212 @@ import FoodItem from "./FoodItem"; /* END-USER-IMPORTS */ export default interface Player { - - body: Phaser.Physics.Arcade.Body; + body: Phaser.Physics.Arcade.Body; } export default class Player extends Phaser.GameObjects.Sprite { + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 290.96234741048465, y ?? 207.0022148582068, texture || "player", frame ?? "Idle_001"); - constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { - super(scene, x ?? 290.96234741048465, y ?? 207.0022148582068, texture || "player", frame ?? "Idle_001"); - - this.setOrigin(0.5, 0.8096661022845779); - scene.physics.add.existing(this, false); - this.body.gravity.y = 1400; - this.body.allowDrag = false; - this.body.setOffset(99.5, 124); - this.body.setSize(81, 87, false); - - // leftKey - const leftKey = this.scene.input.keyboard!.addKey(Phaser.Input.Keyboard.KeyCodes.LEFT); - - // rightKey - const rightKey = this.scene.input.keyboard!.addKey(Phaser.Input.Keyboard.KeyCodes.RIGHT); - - // upKey - const upKey = this.scene.input.keyboard!.addKey(Phaser.Input.Keyboard.KeyCodes.UP); - - // spaceKey - const spaceKey = this.scene.input.keyboard!.addKey(Phaser.Input.Keyboard.KeyCodes.SPACE); - - // platformsCollider - const platformsCollider = scene.physics.add.collider(this, []); - - // foodsCollider - const foodsCollider = scene.physics.add.overlap(this, [], this.playerVsFood, undefined, this); - - this.platformsCollider = platformsCollider; - this.foodsCollider = foodsCollider; - this.leftKey = leftKey; - this.rightKey = rightKey; - this.upKey = upKey; - this.spaceKey = spaceKey; - - /* START-USER-CTR-CODE */ - - this.scene.events.once(Phaser.Scenes.Events.UPDATE, this.start, this); - this.scene.events.on(Phaser.Scenes.Events.UPDATE, this.updatePlayer, this); - - /* END-USER-CTR-CODE */ - } - - private platformsCollider: Phaser.Physics.Arcade.Collider; - private foodsCollider: Phaser.Physics.Arcade.Collider; - private leftKey: Phaser.Input.Keyboard.Key; - private rightKey: Phaser.Input.Keyboard.Key; - private upKey: Phaser.Input.Keyboard.Key; - private spaceKey: Phaser.Input.Keyboard.Key; - public platforms: Phaser.GameObjects.GameObject[] = []; - public foodItems: FoodItem[] = []; - - /* START-USER-CODE */ - - private leftDown = false; - private rightDown = false; - private upDown = false; - private jumpsCount = 0; - private lastWalkTime = 0; - - start() { - - // physics - - this.platformsCollider.object2 = this.platforms; - this.foodsCollider.object2 = this.foodItems; - - // animation - - this.play("player-Idle"); - - // controller - - this.jumpsCount = 0; - - this.lastWalkTime = 0; - - // sound - } - - private playerVsFood(player: any, foodItem: any): void { - - (foodItem as FoodItem).taken(); - } - - private isKeyDown(key?: Phaser.Input.Keyboard.Key) { - - if (key) { - - return key.isDown; - } - - return false; - } - - updatePlayer(time: number, delta: number) { - - this.leftDown = this.leftDown || this.isKeyDown(this.leftKey); - this.rightDown = this.rightDown || this.isKeyDown(this.rightKey); - this.upDown = this.upDown || this.isKeyDown(this.upKey) || this.isKeyDown(this.spaceKey); - - const body = this.body; - - const xVelocity = 300; - const yVelocity = -820; - - const touchingDown = body.touching.down; - - if (touchingDown) { - - this.jumpsCount = 0; - - if (time - this.lastWalkTime > 400) { + this.setOrigin(0.5, 0.8096661022845779); + scene.physics.add.existing(this, false); + this.body.gravity.y = 1400; + this.body.allowDrag = false; + this.body.setOffset(99.5, 124); + this.body.setSize(81, 87, false); - body.velocity.x = 0; - } - } + // leftKey + const leftKey = this.scene.input.keyboard!.addKey(Phaser.Input.Keyboard.KeyCodes.LEFT); - if (this.leftDown) { + // rightKey + const rightKey = this.scene.input.keyboard!.addKey(Phaser.Input.Keyboard.KeyCodes.RIGHT); - body.velocity.x = -xVelocity; + // upKey + const upKey = this.scene.input.keyboard!.addKey(Phaser.Input.Keyboard.KeyCodes.UP); - if (touchingDown) { + // spaceKey + const spaceKey = this.scene.input.keyboard!.addKey(Phaser.Input.Keyboard.KeyCodes.SPACE); - this.lastWalkTime = time; - } + // platformsCollider + const platformsCollider = scene.physics.add.collider(this, []); - this.flipX = true; - } + // foodsCollider + const foodsCollider = scene.physics.add.overlap(this, [], this.playerVsFood, undefined, this); - if (this.rightDown) { + this.platformsCollider = platformsCollider; + this.foodsCollider = foodsCollider; + this.leftKey = leftKey; + this.rightKey = rightKey; + this.upKey = upKey; + this.spaceKey = spaceKey; - body.velocity.x = xVelocity; + /* START-USER-CTR-CODE */ - if (touchingDown) { + this.scene.events.once(Phaser.Scenes.Events.UPDATE, this.start, this); + this.scene.events.on(Phaser.Scenes.Events.UPDATE, this.updatePlayer, this); - this.lastWalkTime = time; - } + /* END-USER-CTR-CODE */ + } - this.flipX = false; - } + private platformsCollider: Phaser.Physics.Arcade.Collider; + private foodsCollider: Phaser.Physics.Arcade.Collider; + private leftKey: Phaser.Input.Keyboard.Key; + private rightKey: Phaser.Input.Keyboard.Key; + private upKey: Phaser.Input.Keyboard.Key; + private spaceKey: Phaser.Input.Keyboard.Key; + public platforms: Phaser.GameObjects.GameObject[] = []; + public foodItems: FoodItem[] = []; + /* START-USER-CODE */ - if (this.upDown) { + private leftDown = false; + private rightDown = false; + private upDown = false; + private jumpsCount = 0; + private lastWalkTime = 0; - if (touchingDown || body.velocity.y > 0) { + start() { + // physics - if (this.jumpsCount < 2) { + this.platformsCollider.object2 = this.platforms; + this.foodsCollider.object2 = this.foodItems; - this.jumpsCount++; - body.velocity.y = yVelocity; - } - } - } + // animation - if (body.touching.down) { + this.play("player-Idle"); - if (body.velocity.x === 0) { + // controller - this.play("player-Idle", true); + this.jumpsCount = 0; - } else { + this.lastWalkTime = 0; - this.play("player-Running", true); - } - } else { + // sound + } - const current = this.anims.currentAnim; + private playerVsFood(player: any, foodItem: any): void { + (foodItem as FoodItem).taken(); + } - if (current) { + private isKeyDown(key?: Phaser.Input.Keyboard.Key) { + if (key) { + return key.isDown; + } - if (current.key === "player-Jump Start") { + return false; + } - if (!this.anims.isPlaying) { + updatePlayer(time: number, delta: number) { + this.leftDown = this.leftDown || this.isKeyDown(this.leftKey); + this.rightDown = this.rightDown || this.isKeyDown(this.rightKey); + this.upDown = this.upDown || this.isKeyDown(this.upKey) || this.isKeyDown(this.spaceKey); - this.play("player-Jump Loop", true); - } - } else { + const body = this.body; - if (current.key !== "player-Jump Loop") { + const xVelocity = 300; + const yVelocity = -820; - this.play("player-Jump Start", true); - } - } - } - } + const touchingDown = body.touching.down; - this.leftDown = this.rightDown = this.upDown = false; + if (touchingDown) { + this.jumpsCount = 0; - // check bounds + if (time - this.lastWalkTime > 400) { + body.velocity.x = 0; + } + } - const bounds = this.scene.cameras.main.getBounds(); + if (this.leftDown) { + body.velocity.x = -xVelocity; - if (this.x < bounds.x) { + if (touchingDown) { + this.lastWalkTime = time; + } - this.x = 0; - } + this.flipX = true; + } - if (this.x > bounds.x + bounds.width) { + if (this.rightDown) { + body.velocity.x = xVelocity; - this.x = bounds.x + bounds.width; - } + if (touchingDown) { + this.lastWalkTime = time; + } - if (this.y < bounds.y) { + this.flipX = false; + } - this.y = bounds.y; - } + if (this.upDown) { + if (touchingDown || body.velocity.y > 0) { + if (this.jumpsCount < 2) { + this.jumpsCount++; + body.velocity.y = yVelocity; + } + } + } - if (this.y > bounds.y + bounds.height + 200) { + if (body.touching.down) { + if (body.velocity.x === 0) { + this.play("player-Idle", true); + } else { + this.play("player-Running", true); + } + } else { + const current = this.anims.currentAnim; - this.setPosition(130, 360); - } - } + if (current) { + if (current.key === "player-Jump Start") { + if (!this.anims.isPlaying) { + this.play("player-Jump Loop", true); + } + } else { + if (current.key !== "player-Jump Loop") { + this.play("player-Jump Start", true); + } + } + } + } - pressButton(direction: "left" | "right" | "up") { + this.leftDown = this.rightDown = this.upDown = false; - switch (direction) { - case "left": - this.leftDown = true; - break; + // check bounds - case "right": - this.rightDown = true; - break; + const bounds = this.scene.cameras.main.getBounds(); - case "up": - this.upDown = true; - break; - } - } + if (this.x < bounds.x) { + this.x = 0; + } - /* END-USER-CODE */ + if (this.x > bounds.x + bounds.width) { + this.x = bounds.x + bounds.width; + } + + if (this.y < bounds.y) { + this.y = bounds.y; + } + + if (this.y > bounds.y + bounds.height + 200) { + this.setPosition(130, 360); + } + } + + pressButton(direction: "left" | "right" | "up") { + switch (direction) { + case "left": + this.leftDown = true; + break; + + case "right": + this.rightDown = true; + break; + + case "up": + this.upDown = true; + break; + } + } + + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/prefabs/PlayerButton.ts b/apps/client/src/app/other/Template/prefabs/PlayerButton.ts index 34c52e7d..5a744102 100644 --- a/apps/client/src/app/other/Template/prefabs/PlayerButton.ts +++ b/apps/client/src/app/other/Template/prefabs/PlayerButton.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -10,32 +9,31 @@ import PlayerControllerScript from "../script-nodes/PlayerControllerScript"; /* END-USER-IMPORTS */ export default class PlayerButton extends Phaser.GameObjects.Image { + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 81, y ?? 72, texture || "ui", frame ?? "btn-up"); - constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { - super(scene, x ?? 81, y ?? 72, texture || "ui", frame ?? "btn-up"); - - // scrollFactorScript - new ScrollFactorScript(this); + // scrollFactorScript + new ScrollFactorScript(this); - // playerControllerScript - const playerControllerScript = new PlayerControllerScript(this); + // playerControllerScript + const playerControllerScript = new PlayerControllerScript(this); - this.playerControllerScript = playerControllerScript; + this.playerControllerScript = playerControllerScript; - /* START-USER-CTR-CODE */ + /* START-USER-CTR-CODE */ - this.setInteractive(); + this.setInteractive(); - /* END-USER-CTR-CODE */ - } + /* END-USER-CTR-CODE */ + } - public playerControllerScript: PlayerControllerScript; + public playerControllerScript: PlayerControllerScript; - /* START-USER-CODE */ + /* START-USER-CODE */ - // 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/other/Template/prefabs/Stone.ts b/apps/client/src/app/other/Template/prefabs/Stone.ts index b80b9690..a8e99c17 100644 --- a/apps/client/src/app/other/Template/prefabs/Stone.ts +++ b/apps/client/src/app/other/Template/prefabs/Stone.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -8,23 +7,22 @@ import Platform from "./Platform"; /* END-USER-IMPORTS */ export default class Stone extends Platform { + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 393, y ?? 213, texture || "volcano", frame ?? "Volcano Level Set_Platformer - Stone.png"); - constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { - super(scene, x ?? 393, y ?? 213, texture || "volcano", frame ?? "Volcano Level Set_Platformer - Stone.png"); - - this.body.setOffset(0, 8); - this.body.setSize(128, 120, false); + this.body.setOffset(0, 8); + this.body.setSize(128, 120, false); - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } - /* START-USER-CODE */ + /* START-USER-CODE */ - // 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/other/Template/scenes/Level.ts b/apps/client/src/app/other/Template/scenes/Level.ts index 2376b875..2fc907c6 100644 --- a/apps/client/src/app/other/Template/scenes/Level.ts +++ b/apps/client/src/app/other/Template/scenes/Level.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -18,320 +17,344 @@ import PlayerButton from "../prefabs/PlayerButton"; /* END-USER-IMPORTS */ export default class Level extends Phaser.Scene { + constructor() { + super("Level"); + + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } + + editorCreate(): void { + // backgroundLayer + const backgroundLayer = this.add.layer(); + + // background + const background = this.add.image(0, 1, "Volcano Level Set_Background - Layer 00"); + background.scaleX = 1.1; + background.scaleY = 1.1; + background.setOrigin(0, 0); + background.tintTopLeft = 16777215; + background.tintTopRight = 16777215; + background.tintBottomLeft = 16777215; + background.tintBottomRight = 16777215; + backgroundLayer.add(background); + + // scrollFactorScript_1 + const scrollFactorScript_1 = new ScrollFactorScript(background); + + // platformBottomItemsLayer + const platformBottomItemsLayer = this.add.layer(); + + // signpost1 + const signpost1 = this.add.image(1536, -344, "volcano", "Volcano Level Set_Environment - Signpost 01.png"); + platformBottomItemsLayer.add(signpost1); + + // platformsLayer + const platformsLayer = this.add.layer(); + + // movingPlatform2 + const movingPlatform2 = new MovingPlatform1(this, 890, 256); + platformsLayer.add(movingPlatform2); + + // horizontalMoveScript_3 + const horizontalMoveScript_3 = new HorizontalMoveScript(movingPlatform2); + + // movingPlatform1 + const movingPlatform1 = new MovingPlatform2(this, 311, 577); + platformsLayer.add(movingPlatform1); + + // horizontalMoveScript_2 + const horizontalMoveScript_2 = new HorizontalMoveScript(movingPlatform1); + + // p4 + const p4 = this.add.image(128, 768, "volcano", "Volcano Level Set_Platformer - Ground Additional 03.png"); + platformsLayer.add(p4); + + // p3 + const p3 = this.add.image(256, 640, "volcano", "Volcano Level Set_Platformer - Ground 12.png"); + platformsLayer.add(p3); + + // p2 + const p2 = this.add.image(128, 640, "volcano", "Volcano Level Set_Platformer - Ground 11.png"); + platformsLayer.add(p2); + + // p1 + const p1 = this.add.image( + 0, + 640, + "volcano", + "Volcano Level Set_Platformer - Ground 11.png" + ) as Phaser.GameObjects.Image & { body: Phaser.Physics.Arcade.Body }; + this.physics.add.existing(p1, false); + p1.body.checkCollision.down = false; + p1.body.checkCollision.left = false; + p1.body.checkCollision.right = false; + p1.body.pushable = false; + p1.body.immovable = true; + p1.body.setOffset(0, 8); + p1.body.setSize(374, 32, false); + platformsLayer.add(p1); + + // movingPlatform3 + const movingPlatform3 = new MovingPlatform1(this, 1920, 0); + platformsLayer.add(movingPlatform3); + + // horizontalMoveScript_1 + const horizontalMoveScript_1 = new HorizontalMoveScript(movingPlatform3); + + // movingPlatform4 + const movingPlatform4 = new MovingPlatform2(this, 1882, 590); + platformsLayer.add(movingPlatform4); + + // horizontalMoveScript + const horizontalMoveScript = new HorizontalMoveScript(movingPlatform4); + + // p9 + const p9 = this.add.image(2880, 640, "volcano", "Volcano Level Set_Platformer - Ground Additional 03.png"); + p9.setOrigin(0, 0); + platformsLayer.add(p9); + + // p8 + const p8 = this.add.image( + 2816, + 640, + "volcano", + "Volcano Level Set_Platformer - Ground 10.png" + ) as Phaser.GameObjects.Image & { body: Phaser.Physics.Arcade.Body }; + this.physics.add.existing(p8, false); + p8.body.checkCollision.down = false; + p8.body.checkCollision.left = false; + p8.body.checkCollision.right = false; + p8.body.pushable = false; + p8.body.immovable = true; + p8.body.setOffset(10, 8); + p8.body.setSize(541, 27, false); + platformsLayer.add(p8); + + // p7 + const p7 = this.add.image(2944, 640, "volcano", "Volcano Level Set_Platformer - Ground 11.png"); + platformsLayer.add(p7); + + // p6 + const p6 = this.add.image(3073, 640, "volcano", "Volcano Level Set_Platformer - Ground 11.png"); + platformsLayer.add(p6); + + // p5 + const p5 = this.add.image(3200, 640, "volcano", "Volcano Level Set_Platformer - Ground 11.png"); + platformsLayer.add(p5); + + // p12 + const p12 = new Stone(this, 1536, 384); + platformsLayer.add(p12); + + // p11 + const p11 = new Stone(this, 1536, -256); + platformsLayer.add(p11); + + // p10 + const p10 = new Stone(this, 1664, -256); + platformsLayer.add(p10); + + // p13 + const p13 = new Stone(this, 1792, -256); + platformsLayer.add(p13); + + // platformTopItemsLayer + const platformTopItemsLayer = this.add.layer(); + + // endFlag + const endFlag = this.add.image(2944, 526, "volcano", "Volcano Level Set_Environment - White Flag.png"); + platformTopItemsLayer.add(endFlag); + + // signpost + const signpost = this.add.image(131, 519, "volcano", "Volcano Level Set_Environment - Signpost 01.png"); + platformTopItemsLayer.add(signpost); + + // skull1 + const skull1 = this.add.image(2093, -28, "volcano", "Volcano Level Set_Environment - Skull.png"); + platformTopItemsLayer.add(skull1); + + // followObjectScript_3 + const followObjectScript_3 = new FollowObjectScript(skull1); + + // lava2 + const lava2 = this.add.image(1059, 250, "volcano", "Volcano Level Set_Environment - Lava 02.png"); + platformTopItemsLayer.add(lava2); + + // followObjectScript_2 + const followObjectScript_2 = new FollowObjectScript(lava2); + + // lava1 + const lava1 = this.add.image(599, 576, "volcano", "Volcano Level Set_Environment - Lava 02.png"); + platformTopItemsLayer.add(lava1); + + // followObjectScript_1 + const followObjectScript_1 = new FollowObjectScript(lava1); + + // lava3 + const lava3 = this.add.image(233, 571, "volcano", "Volcano Level Set_Environment - Lava 02.png"); + platformTopItemsLayer.add(lava3); + + // laddersLayer + const laddersLayer = this.add.layer(); + + // ladder5 + const ladder5 = new Ladder(this, 1468, -150, "volcano", "Volcano Level Set_Platformer - Ladder.png"); + laddersLayer.add(ladder5); + + // ladder4 + const ladder4 = new Ladder(this, 1472, -272, "volcano", "Volcano Level Set_Platformer - Ladder.png"); + laddersLayer.add(ladder4); + + // ladder3 + const ladder3 = new Ladder(this, 1475, -22, "volcano", "Volcano Level Set_Platformer - Ladder.png"); + laddersLayer.add(ladder3); + + // ladder2 + const ladder2 = new Ladder(this, 1467, 106, "volcano", "Volcano Level Set_Platformer - Ladder.png"); + laddersLayer.add(ladder2); + + // ladder1 + const ladder1 = new Ladder(this, 1475, 208); + laddersLayer.add(ladder1); + + // ladder6 + const ladder6 = new Ladder(this, 952, 321); + laddersLayer.add(ladder6); + + // followObjectScript + const followObjectScript = new FollowObjectScript(ladder6); + + // playerLayer + const playerLayer = this.add.layer(); + + // player + const player = new Player(this, 104, 482, "player", "Idle_001"); + playerLayer.add(player); + + // pickItemsLayer + const pickItemsLayer = this.add.layer(); + + // meet3 + const meet3 = new FoodItem(this, 1232, 33, "volcano", "Volcano Level Set_Collectable Object - Meat.png"); + pickItemsLayer.add(meet3); - constructor() { - super("Level"); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - editorCreate(): void { - - // backgroundLayer - const backgroundLayer = this.add.layer(); - - // background - const background = this.add.image(0, 1, "Volcano Level Set_Background - Layer 00"); - background.scaleX = 1.1; - background.scaleY = 1.1; - background.setOrigin(0, 0); - background.tintTopLeft = 16777215; - background.tintTopRight = 16777215; - background.tintBottomLeft = 16777215; - background.tintBottomRight = 16777215; - backgroundLayer.add(background); - - // scrollFactorScript_1 - const scrollFactorScript_1 = new ScrollFactorScript(background); - - // platformBottomItemsLayer - const platformBottomItemsLayer = this.add.layer(); - - // signpost1 - const signpost1 = this.add.image(1536, -344, "volcano", "Volcano Level Set_Environment - Signpost 01.png"); - platformBottomItemsLayer.add(signpost1); - - // platformsLayer - const platformsLayer = this.add.layer(); - - // movingPlatform2 - const movingPlatform2 = new MovingPlatform1(this, 890, 256); - platformsLayer.add(movingPlatform2); - - // horizontalMoveScript_3 - const horizontalMoveScript_3 = new HorizontalMoveScript(movingPlatform2); - - // movingPlatform1 - const movingPlatform1 = new MovingPlatform2(this, 311, 577); - platformsLayer.add(movingPlatform1); - - // horizontalMoveScript_2 - const horizontalMoveScript_2 = new HorizontalMoveScript(movingPlatform1); - - // p4 - const p4 = this.add.image(128, 768, "volcano", "Volcano Level Set_Platformer - Ground Additional 03.png"); - platformsLayer.add(p4); - - // p3 - const p3 = this.add.image(256, 640, "volcano", "Volcano Level Set_Platformer - Ground 12.png"); - platformsLayer.add(p3); - - // p2 - const p2 = this.add.image(128, 640, "volcano", "Volcano Level Set_Platformer - Ground 11.png"); - platformsLayer.add(p2); - - // p1 - const p1 = this.add.image(0, 640, "volcano", "Volcano Level Set_Platformer - Ground 11.png") as Phaser.GameObjects.Image & { body: Phaser.Physics.Arcade.Body }; - this.physics.add.existing(p1, false); - p1.body.checkCollision.down = false; - p1.body.checkCollision.left = false; - p1.body.checkCollision.right = false; - p1.body.pushable = false; - p1.body.immovable = true; - p1.body.setOffset(0, 8); - p1.body.setSize(374, 32, false); - platformsLayer.add(p1); - - // movingPlatform3 - const movingPlatform3 = new MovingPlatform1(this, 1920, 0); - platformsLayer.add(movingPlatform3); - - // horizontalMoveScript_1 - const horizontalMoveScript_1 = new HorizontalMoveScript(movingPlatform3); - - // movingPlatform4 - const movingPlatform4 = new MovingPlatform2(this, 1882, 590); - platformsLayer.add(movingPlatform4); - - // horizontalMoveScript - const horizontalMoveScript = new HorizontalMoveScript(movingPlatform4); - - // p9 - const p9 = this.add.image(2880, 640, "volcano", "Volcano Level Set_Platformer - Ground Additional 03.png"); - p9.setOrigin(0, 0); - platformsLayer.add(p9); - - // p8 - const p8 = this.add.image(2816, 640, "volcano", "Volcano Level Set_Platformer - Ground 10.png") as Phaser.GameObjects.Image & { body: Phaser.Physics.Arcade.Body }; - this.physics.add.existing(p8, false); - p8.body.checkCollision.down = false; - p8.body.checkCollision.left = false; - p8.body.checkCollision.right = false; - p8.body.pushable = false; - p8.body.immovable = true; - p8.body.setOffset(10, 8); - p8.body.setSize(541, 27, false); - platformsLayer.add(p8); - - // p7 - const p7 = this.add.image(2944, 640, "volcano", "Volcano Level Set_Platformer - Ground 11.png"); - platformsLayer.add(p7); - - // p6 - const p6 = this.add.image(3073, 640, "volcano", "Volcano Level Set_Platformer - Ground 11.png"); - platformsLayer.add(p6); - - // p5 - const p5 = this.add.image(3200, 640, "volcano", "Volcano Level Set_Platformer - Ground 11.png"); - platformsLayer.add(p5); - - // p12 - const p12 = new Stone(this, 1536, 384); - platformsLayer.add(p12); - - // p11 - const p11 = new Stone(this, 1536, -256); - platformsLayer.add(p11); - - // p10 - const p10 = new Stone(this, 1664, -256); - platformsLayer.add(p10); - - // p13 - const p13 = new Stone(this, 1792, -256); - platformsLayer.add(p13); - - // platformTopItemsLayer - const platformTopItemsLayer = this.add.layer(); - - // endFlag - const endFlag = this.add.image(2944, 526, "volcano", "Volcano Level Set_Environment - White Flag.png"); - platformTopItemsLayer.add(endFlag); - - // signpost - const signpost = this.add.image(131, 519, "volcano", "Volcano Level Set_Environment - Signpost 01.png"); - platformTopItemsLayer.add(signpost); - - // skull1 - const skull1 = this.add.image(2093, -28, "volcano", "Volcano Level Set_Environment - Skull.png"); - platformTopItemsLayer.add(skull1); - - // followObjectScript_3 - const followObjectScript_3 = new FollowObjectScript(skull1); - - // lava2 - const lava2 = this.add.image(1059, 250, "volcano", "Volcano Level Set_Environment - Lava 02.png"); - platformTopItemsLayer.add(lava2); - - // followObjectScript_2 - const followObjectScript_2 = new FollowObjectScript(lava2); - - // lava1 - const lava1 = this.add.image(599, 576, "volcano", "Volcano Level Set_Environment - Lava 02.png"); - platformTopItemsLayer.add(lava1); - - // followObjectScript_1 - const followObjectScript_1 = new FollowObjectScript(lava1); - - // lava3 - const lava3 = this.add.image(233, 571, "volcano", "Volcano Level Set_Environment - Lava 02.png"); - platformTopItemsLayer.add(lava3); - - // laddersLayer - const laddersLayer = this.add.layer(); - - // ladder5 - const ladder5 = new Ladder(this, 1468, -150, "volcano", "Volcano Level Set_Platformer - Ladder.png"); - laddersLayer.add(ladder5); - - // ladder4 - const ladder4 = new Ladder(this, 1472, -272, "volcano", "Volcano Level Set_Platformer - Ladder.png"); - laddersLayer.add(ladder4); - - // ladder3 - const ladder3 = new Ladder(this, 1475, -22, "volcano", "Volcano Level Set_Platformer - Ladder.png"); - laddersLayer.add(ladder3); - - // ladder2 - const ladder2 = new Ladder(this, 1467, 106, "volcano", "Volcano Level Set_Platformer - Ladder.png"); - laddersLayer.add(ladder2); - - // ladder1 - const ladder1 = new Ladder(this, 1475, 208); - laddersLayer.add(ladder1); - - // ladder6 - const ladder6 = new Ladder(this, 952, 321); - laddersLayer.add(ladder6); - - // followObjectScript - const followObjectScript = new FollowObjectScript(ladder6); - - // playerLayer - const playerLayer = this.add.layer(); - - // player - const player = new Player(this, 104, 482, "player", "Idle_001"); - playerLayer.add(player); - - // pickItemsLayer - const pickItemsLayer = this.add.layer(); - - // meet3 - const meet3 = new FoodItem(this, 1232, 33, "volcano", "Volcano Level Set_Collectable Object - Meat.png"); - pickItemsLayer.add(meet3); - - // meet2 - const meet2 = new FoodItem(this, 2250, 278, "volcano", "Volcano Level Set_Collectable Object - Meat.png"); - pickItemsLayer.add(meet2); - - // meet1 - const meet1 = new FoodItem(this, 747, 386); - pickItemsLayer.add(meet1); - - // controlsLayer - const controlsLayer = this.add.layer(); - - // btn_left - const btn_left = new PlayerButton(this, 880, 640, "ui", "btn-left"); - controlsLayer.add(btn_left); - - // btn_right - const btn_right = new PlayerButton(this, 1080, 640, "ui", "btn-right"); - controlsLayer.add(btn_right); - - // btn_up - const btn_up = new PlayerButton(this, 126, 640); - controlsLayer.add(btn_up); - - // debugLayer - this.add.layer(); - - // lists - const platforms = [p1, movingPlatform1, movingPlatform2, movingPlatform3, movingPlatform4, p8, p12, p13, p10, p11, ladder1, ladder2, ladder3, ladder5, ladder4, ladder6]; - const foodItems = [meet1, meet3, meet2]; - - // scrollFactorScript_1 (prefab fields) - scrollFactorScript_1.x = 0.1; - - // horizontalMoveScript_3 (prefab fields) - horizontalMoveScript_3.horizVelocity = -50; - horizontalMoveScript_3.minX = 540; - horizontalMoveScript_3.maxX = 1170; - - // horizontalMoveScript_2 (prefab fields) - horizontalMoveScript_2.horizVelocity = 100; - horizontalMoveScript_2.minX = 310; - horizontalMoveScript_2.maxX = 924; - - // horizontalMoveScript_1 (prefab fields) - horizontalMoveScript_1.horizVelocity = -50; - horizontalMoveScript_1.minX = 1900; - horizontalMoveScript_1.maxX = 2224; - - // horizontalMoveScript (prefab fields) - horizontalMoveScript.horizVelocity = 100; - horizontalMoveScript.minX = 1720; - horizontalMoveScript.maxX = 2360; + // meet2 + const meet2 = new FoodItem(this, 2250, 278, "volcano", "Volcano Level Set_Collectable Object - Meat.png"); + pickItemsLayer.add(meet2); - // followObjectScript_3 (prefab fields) - followObjectScript_3.target = movingPlatform3; + // meet1 + const meet1 = new FoodItem(this, 747, 386); + pickItemsLayer.add(meet1); - // followObjectScript_2 (prefab fields) - followObjectScript_2.target = movingPlatform2; + // controlsLayer + const controlsLayer = this.add.layer(); - // followObjectScript_1 (prefab fields) - followObjectScript_1.target = movingPlatform1; + // btn_left + const btn_left = new PlayerButton(this, 880, 640, "ui", "btn-left"); + controlsLayer.add(btn_left); - // followObjectScript (prefab fields) - followObjectScript.target = movingPlatform2; + // btn_right + const btn_right = new PlayerButton(this, 1080, 640, "ui", "btn-right"); + controlsLayer.add(btn_right); - // player (prefab fields) - player.platforms = platforms; - player.foodItems = foodItems; + // btn_up + const btn_up = new PlayerButton(this, 126, 640); + controlsLayer.add(btn_up); - // btn_left.playerControllerScript (prefab fields) - btn_left.playerControllerScript.player = player; - btn_left.playerControllerScript.direction = "left"; + // debugLayer + this.add.layer(); - // btn_right.playerControllerScript (prefab fields) - btn_right.playerControllerScript.player = player; - btn_right.playerControllerScript.direction = "right"; + // lists + const platforms = [ + p1, + movingPlatform1, + movingPlatform2, + movingPlatform3, + movingPlatform4, + p8, + p12, + p13, + p10, + p11, + ladder1, + ladder2, + ladder3, + ladder5, + ladder4, + ladder6 + ]; + const foodItems = [meet1, meet3, meet2]; - // btn_up.playerControllerScript (prefab fields) - btn_up.playerControllerScript.player = player; - btn_up.playerControllerScript.direction = "up"; + // scrollFactorScript_1 (prefab fields) + scrollFactorScript_1.x = 0.1; - this.player = player; + // horizontalMoveScript_3 (prefab fields) + horizontalMoveScript_3.horizVelocity = -50; + horizontalMoveScript_3.minX = 540; + horizontalMoveScript_3.maxX = 1170; - this.events.emit("scene-awake"); - } + // horizontalMoveScript_2 (prefab fields) + horizontalMoveScript_2.horizVelocity = 100; + horizontalMoveScript_2.minX = 310; + horizontalMoveScript_2.maxX = 924; + + // horizontalMoveScript_1 (prefab fields) + horizontalMoveScript_1.horizVelocity = -50; + horizontalMoveScript_1.minX = 1900; + horizontalMoveScript_1.maxX = 2224; - private player!: Player; + // horizontalMoveScript (prefab fields) + horizontalMoveScript.horizVelocity = 100; + horizontalMoveScript.minX = 1720; + horizontalMoveScript.maxX = 2360; - /* START-USER-CODE */ + // followObjectScript_3 (prefab fields) + followObjectScript_3.target = movingPlatform3; - create() { + // followObjectScript_2 (prefab fields) + followObjectScript_2.target = movingPlatform2; + + // followObjectScript_1 (prefab fields) + followObjectScript_1.target = movingPlatform1; - this.editorCreate(); + // followObjectScript (prefab fields) + followObjectScript.target = movingPlatform2; - this.cameras.main.setBounds(0, -800, 3000, 750 + 800); - this.cameras.main.startFollow(this.player); - } + // player (prefab fields) + player.platforms = platforms; + player.foodItems = foodItems; - /* END-USER-CODE */ + // btn_left.playerControllerScript (prefab fields) + btn_left.playerControllerScript.player = player; + btn_left.playerControllerScript.direction = "left"; + + // btn_right.playerControllerScript (prefab fields) + btn_right.playerControllerScript.player = player; + btn_right.playerControllerScript.direction = "right"; + + // btn_up.playerControllerScript (prefab fields) + btn_up.playerControllerScript.player = player; + btn_up.playerControllerScript.direction = "up"; + + this.player = player; + + this.events.emit("scene-awake"); + } + + private player!: Player; + + /* START-USER-CODE */ + + create() { + this.editorCreate(); + + this.cameras.main.setBounds(0, -800, 3000, 750 + 800); + this.cameras.main.startFollow(this.player); + } + + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/scenes/Preload.scene b/apps/client/src/app/other/Template/scenes/Preload.scene index 294274ab..4227a58a 100644 --- a/apps/client/src/app/other/Template/scenes/Preload.scene +++ b/apps/client/src/app/other/Template/scenes/Preload.scene @@ -16,10 +16,10 @@ { "type": "Image", "id": "e413cbbf-ce25-4dad-a117-b7cf0791f655", - "label": "guapen", + "label": "probable-waffle-loader", "components": [], "texture": { - "key": "guapen" + "key": "probable-waffle-loader" }, "x": 505.0120544433594, "y": 360, diff --git a/apps/client/src/app/other/Template/scenes/Preload.ts b/apps/client/src/app/other/Template/scenes/Preload.ts index 766f2c60..dab017e0 100644 --- a/apps/client/src/app/other/Template/scenes/Preload.ts +++ b/apps/client/src/app/other/Template/scenes/Preload.ts @@ -2,15 +2,14 @@ /* START OF COMPILED CODE */ -import Phaser from 'phaser'; -import PreloadBarUpdaterScript from '../script-nodes/PreloadBarUpdaterScript'; +import Phaser from "phaser"; +import PreloadBarUpdaterScript from "../script-nodes/PreloadBarUpdaterScript"; /* START-USER-IMPORTS */ -import assetPackUrl from '../../../../assets/other/asset-packers/asset-pack.json'; /* END-USER-IMPORTS */ export default class Preload extends Phaser.Scene { constructor() { - super('Preload'); + super("Preload"); /* START-USER-CTR-CODE */ // Write your code here. @@ -18,10 +17,10 @@ export default class Preload extends Phaser.Scene { } editorCreate(): void { - // guapen - const guapen = this.add.image(505.0120544433594, 360, 'guapen'); - guapen.scaleX = 0.32715486817515643; - guapen.scaleY = 0.32715486817515643; + // probableWaffleLoader + const probableWaffleLoader = this.add.image(505.0120544433594, 360, "probable-waffle-loader"); + probableWaffleLoader.scaleX = 0.32715486817515643; + probableWaffleLoader.scaleY = 0.32715486817515643; // progressBar const progressBar = this.add.rectangle(553.0120849609375, 361, 256, 20); @@ -39,11 +38,11 @@ export default class Preload 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 +52,11 @@ export default class Preload extends Phaser.Scene { preload() { this.editorCreate(); - this.load.pack('asset-pack', assetPackUrl as any); + this.load.pack("asset-pack", "assets/other/asset-packers/asset-pack.json"); } create() { - this.scene.start('Level'); + this.scene.start("Level"); } /* END-USER-CODE */ diff --git a/apps/client/src/app/other/Template/script-nodes-basic/CHANGELOG.md b/apps/client/src/app/other/Template/script-nodes-basic/CHANGELOG.md index 3f32e8cf..8530f681 100644 --- a/apps/client/src/app/other/Template/script-nodes-basic/CHANGELOG.md +++ b/apps/client/src/app/other/Template/script-nodes-basic/CHANGELOG.md @@ -1,18 +1,18 @@ ## v1.0.3 - Apr 24, 2023 -* Fixes `update()` and `awake()` events management. -* Improves `OnEventScript`, it now can registers into different emitters: `scene.events`, `scene.input`, `scene.keyboard`, `gameObject`, etc... -* Adds `EmitEventActionScript`, an action node for emitting an event to different emitters. -* Removes `OnKeyboardEventScript` and `OnSceneAwakeScript`. -* Allows passing multiple arguments to the `execute()` method. +- Fixes `update()` and `awake()` events management. +- Improves `OnEventScript`, it now can registers into different emitters: `scene.events`, `scene.input`, `scene.keyboard`, `gameObject`, etc... +- Adds `EmitEventActionScript`, an action node for emitting an event to different emitters. +- Removes `OnKeyboardEventScript` and `OnSceneAwakeScript`. +- Allows passing multiple arguments to the `execute()` method. ## v1.0.2 - Mar 28, 2023 -* Fixes **RootScriptNode** typo. +- Fixes **RootScriptNode** typo. ## v1.0.1 - Mar 22, 2023 -* Adds the **RootScriptNode**. +- Adds the **RootScriptNode**. ## v1.0.0 - Mar 21, 2023 diff --git a/apps/client/src/app/other/Template/script-nodes-basic/CallbackActionScript.ts b/apps/client/src/app/other/Template/script-nodes-basic/CallbackActionScript.ts index 2b03e625..134fdfd5 100644 --- a/apps/client/src/app/other/Template/script-nodes-basic/CallbackActionScript.ts +++ b/apps/client/src/app/other/Template/script-nodes-basic/CallbackActionScript.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -9,28 +8,25 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class CallbackActionScript extends ScriptNode { + constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { + super(parent); - constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { - super(parent); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - public callback!: (...args: any[]) => void; - - /* START-USER-CODE */ + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } - execute(...args: any[]) { + public callback!: (...args: any[]) => void; - if (this.callback) { + /* START-USER-CODE */ - this.callback(...args); - } - } + execute(...args: any[]) { + if (this.callback) { + this.callback(...args); + } + } - /* END-USER-CODE */ + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/script-nodes-basic/EmitEventActionScript.ts b/apps/client/src/app/other/Template/script-nodes-basic/EmitEventActionScript.ts index 334ff9c8..5c78952d 100644 --- a/apps/client/src/app/other/Template/script-nodes-basic/EmitEventActionScript.ts +++ b/apps/client/src/app/other/Template/script-nodes-basic/EmitEventActionScript.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -9,68 +8,65 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class EmitEventActionScript extends ScriptNode { - - constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { - super(parent); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - public eventName: string = ""; - public eventEmitter: "game.events"|"scene.events"|"scene.loader"|"scene.input"|"scene.input.keyboard"|"scene.anims"|"gameObject" = "gameObject"; - - /* START-USER-CODE */ - - execute(...args: any[]): void { - - let emitter: Phaser.Events.EventEmitter | null | undefined; - - switch (this.eventEmitter) { - case "game.events": - - emitter = this.scene.game.events; - break; - - case "scene.events": - - emitter = this.scene.events; - break; - - case "scene.loader": - - emitter = this.scene.load; - break; - - case "scene.input": - - emitter = this.scene.input; - break; - - case "scene.input.keyboard": - - emitter = this.scene.input.keyboard; - break; - - case "scene.anims": - - emitter = this.scene.anims; - break; - - case "gameObject": - - emitter = this.gameObject; - break; - } - - if (emitter) { - - emitter.emit(this.eventName, ...args); - } - } - - /* END-USER-CODE */ + constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { + super(parent); + + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } + + public eventName: string = ""; + public eventEmitter: + | "game.events" + | "scene.events" + | "scene.loader" + | "scene.input" + | "scene.input.keyboard" + | "scene.anims" + | "gameObject" = "gameObject"; + + /* START-USER-CODE */ + + execute(...args: any[]): void { + let emitter: Phaser.Events.EventEmitter | null | undefined; + + switch (this.eventEmitter) { + case "game.events": + emitter = this.scene.game.events; + break; + + case "scene.events": + emitter = this.scene.events; + break; + + case "scene.loader": + emitter = this.scene.load; + break; + + case "scene.input": + emitter = this.scene.input; + break; + + case "scene.input.keyboard": + emitter = this.scene.input.keyboard; + break; + + case "scene.anims": + emitter = this.scene.anims; + break; + + case "gameObject": + emitter = this.gameObject; + break; + } + + if (emitter) { + emitter.emit(this.eventName, ...args); + } + } + + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/script-nodes-basic/ExecActionScript.ts b/apps/client/src/app/other/Template/script-nodes-basic/ExecActionScript.ts index 2da5173c..41b6bb5a 100644 --- a/apps/client/src/app/other/Template/script-nodes-basic/ExecActionScript.ts +++ b/apps/client/src/app/other/Template/script-nodes-basic/ExecActionScript.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -9,28 +8,25 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class ExecActionScript extends ScriptNode { + constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { + super(parent); - constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { - super(parent); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - public targetAction!: ScriptNode; - - /* START-USER-CODE */ + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } - override execute(...args: any[]): void { + public targetAction!: ScriptNode; - if (this.targetAction) { + /* START-USER-CODE */ - this.targetAction.execute(...args); - } - } + override execute(...args: any[]): void { + if (this.targetAction) { + this.targetAction.execute(...args); + } + } - /* END-USER-CODE */ + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/script-nodes-basic/OnEventScript.ts b/apps/client/src/app/other/Template/script-nodes-basic/OnEventScript.ts index 557b0a03..71de1a41 100644 --- a/apps/client/src/app/other/Template/script-nodes-basic/OnEventScript.ts +++ b/apps/client/src/app/other/Template/script-nodes-basic/OnEventScript.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -9,89 +8,81 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class OnEventScript extends ScriptNode { - - constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { - super(parent); - - /* START-USER-CTR-CODE */ - /* END-USER-CTR-CODE */ - } - - public eventName: string = ""; - public eventEmitter: "game.events"|"scene.events"|"scene.loader"|"scene.input"|"scene.input.keyboard"|"scene.anims"|"gameObject" = "gameObject"; - public once: boolean = false; - - /* START-USER-CODE */ - - awake() { - - let emitter: Phaser.Events.EventEmitter | null | undefined; - - switch (this.eventEmitter) { - case "game.events": - - emitter = this.scene.game.events; - break; - - case "scene.events": - - emitter = this.scene.events; - break; - - case "scene.loader": - - emitter = this.scene.load; - break; - - case "scene.input": - - emitter = this.scene.input; - break; - - case "scene.input.keyboard": - - emitter = this.scene.input.keyboard; - break; - - case "scene.anims": - - emitter = this.scene.anims; - break; - - case "gameObject": - - emitter = this.gameObject; - break; - } - - if (emitter) { - - if (this.once) { - - emitter.once(this.eventName, this.executeChildren, this); - - } else { - - emitter.on(this.eventName, this.executeChildren, this); - } - - switch (this.eventEmitter) { - case "scene.anims": - case "scene.events": - case "scene.input": - case "scene.input.keyboard": - case "scene.loader": - - this.scene.events.on(Phaser.Scenes.Events.SHUTDOWN, () => { - - emitter?.off(this.eventName, this.executeChildren, this); - }); - break; - } - } - } - - /* END-USER-CODE */ + constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { + super(parent); + + /* START-USER-CTR-CODE */ + /* END-USER-CTR-CODE */ + } + + public eventName: string = ""; + public eventEmitter: + | "game.events" + | "scene.events" + | "scene.loader" + | "scene.input" + | "scene.input.keyboard" + | "scene.anims" + | "gameObject" = "gameObject"; + public once: boolean = false; + + /* START-USER-CODE */ + + awake() { + let emitter: Phaser.Events.EventEmitter | null | undefined; + + switch (this.eventEmitter) { + case "game.events": + emitter = this.scene.game.events; + break; + + case "scene.events": + emitter = this.scene.events; + break; + + case "scene.loader": + emitter = this.scene.load; + break; + + case "scene.input": + emitter = this.scene.input; + break; + + case "scene.input.keyboard": + emitter = this.scene.input.keyboard; + break; + + case "scene.anims": + emitter = this.scene.anims; + break; + + case "gameObject": + emitter = this.gameObject; + break; + } + + if (emitter) { + if (this.once) { + emitter.once(this.eventName, this.executeChildren, this); + } else { + emitter.on(this.eventName, this.executeChildren, this); + } + + switch (this.eventEmitter) { + case "scene.anims": + case "scene.events": + case "scene.input": + case "scene.input.keyboard": + case "scene.loader": + this.scene.events.on(Phaser.Scenes.Events.SHUTDOWN, () => { + emitter?.off(this.eventName, this.executeChildren, this); + }); + break; + } + } + } + + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/script-nodes-basic/OnPointerDownScript.ts b/apps/client/src/app/other/Template/script-nodes-basic/OnPointerDownScript.ts index 54ed29c6..e9d373ca 100644 --- a/apps/client/src/app/other/Template/script-nodes-basic/OnPointerDownScript.ts +++ b/apps/client/src/app/other/Template/script-nodes-basic/OnPointerDownScript.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -10,36 +9,32 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class OnPointerDownScript extends OnEventScript { + constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { + super(parent); - constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { - super(parent); - - // this (prefab fields) - this.eventName = "pointerdown"; - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - /* START-USER-CODE */ - - override awake(): void { + // this (prefab fields) + this.eventName = "pointerdown"; - if (!this.gameObject) { + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } - return; - } + /* START-USER-CODE */ - if (!this.gameObject.input) { + override awake(): void { + if (!this.gameObject) { + return; + } - this.gameObject.setInteractive(); - } + if (!this.gameObject.input) { + this.gameObject.setInteractive(); + } - super.awake(); - } + super.awake(); + } - /* END-USER-CODE */ + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/script-nodes-basic/README.md b/apps/client/src/app/other/Template/script-nodes-basic/README.md index 9c07f98b..1b1a32cd 100644 --- a/apps/client/src/app/other/Template/script-nodes-basic/README.md +++ b/apps/client/src/app/other/Template/script-nodes-basic/README.md @@ -18,25 +18,25 @@ There are three groups of scripts: **Base**, **Triggers**, and **Actions**. Contain basic/abstract functionallity. Often, you will create prefab variants of them (extend them). -* **ScriptNode** - the base class for all the scripts. -* **SpriteScriptNode** - base prefab for script nodes accessing sprite objects. -* **RootScriptNode** - a script node that registers itself into the game object and can be used as container of other scripts. +- **ScriptNode** - the base class for all the scripts. +- **SpriteScriptNode** - base prefab for script nodes accessing sprite objects. +- **RootScriptNode** - a script node that registers itself into the game object and can be used as container of other scripts. ### Trigger scripts These scripts listen certain event. When the event is triggered, then execute the children, which are actions. -* **OnEventScript** - registers to the given `eventEmitter` and listens the given `eventName` event. -* **OnPointerDownScript** - listens the `pointerdown` event of the game object. +- **OnEventScript** - registers to the given `eventEmitter` and listens the given `eventName` event. +- **OnPointerDownScript** - listens the `pointerdown` event of the game object. ### Action scripts Actions are script that are executed manually or by other nodes, like triggers or other actions. -* **CallbackActionScript** - executes the given `callback` expression. -* **StartSceneActionScript** - starts the given `sceneKey` scene. -* **ExecActionScript** - executes the given `targetAction`. -* **EmitEventActionScript** - the given `eventEmitter` emits the given `eventName`. +- **CallbackActionScript** - executes the given `callback` expression. +- **StartSceneActionScript** - starts the given `sceneKey` scene. +- **ExecActionScript** - executes the given `targetAction`. +- **EmitEventActionScript** - the given `eventEmitter` emits the given `eventName`. ## ScriptNode @@ -91,19 +91,19 @@ You can create variants of the **RootScriptNode** and use different keys. ## OnEventScript -A trigger-like script node. It registers to the given `eventEmitter` and listens the given `eventName`. When the event is fired, it executes the children action nodes. +A trigger-like script node. It registers to the given `eventEmitter` and listens the given `eventName`. When the event is fired, it executes the children action nodes. You can create handy prefab variants for different events, like the `OnPointerDownScript` prefab. You can select an `eventEmitter` from the following list: -* `game.events` -* `scene.events` -* `scene.loader` -* `scene.input` -* `scene.input.keyboard` -* `scene.anims` -* `gameObject` (by default) +- `game.events` +- `scene.events` +- `scene.loader` +- `scene.input` +- `scene.input.keyboard` +- `scene.anims` +- `gameObject` (by default) ## OnPointerDownScript @@ -137,10 +137,10 @@ An action like script. It calls the emit method of the given `eventEmitter` with Like in the **OnEventScript**, you can select an `eventEmitter` from a list: -* `game.events` -* `scene.events` -* `scene.loader` -* `scene.input` -* `scene.input.keyboard` -* `scene.anims` -* `gameObject` (by default) +- `game.events` +- `scene.events` +- `scene.loader` +- `scene.input` +- `scene.input.keyboard` +- `scene.anims` +- `gameObject` (by default) diff --git a/apps/client/src/app/other/Template/script-nodes-basic/RootScriptNode.ts b/apps/client/src/app/other/Template/script-nodes-basic/RootScriptNode.ts index 658fae62..4be11bb4 100644 --- a/apps/client/src/app/other/Template/script-nodes-basic/RootScriptNode.ts +++ b/apps/client/src/app/other/Template/script-nodes-basic/RootScriptNode.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -9,71 +8,65 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class RootScriptNode extends ScriptNode { - - constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { - super(parent); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - public key: string = "scripts"; - - /* START-USER-CODE */ - - /** - * Gets the RootScript object set into the game object. - * It lookups the script node in using the `key` parameter as attribute of the game object. - * - * @param gameObject The game object where the root script is set. - * @param key The key used to set root script into the game object. It is `"scripts"` by default. - * @returns The root script. - */ - static getRoot(gameObject: Phaser.GameObjects.GameObject, key = "scripts") { - - return (gameObject as any)[`RootScript__${key}`] as RootScriptNode; - } - - /** - * Gets the children of the root script registered in the given game object, using the given key. - * - * @param gameObject The game object containing the root script. - * @param key The key used to register the root script in the game object. - * @returns The chidlren of the root script. - */ - static getChildren(gameObject: Phaser.GameObjects.GameObject, key = "scripts") { - - const root = this.getRoot(gameObject, key); - - if (root) { - - return root.children; - } - - return []; - } - - /** - * Gets the root script associated to the game object, using the given key. - * - * @param gameObject The game object where the root script is set. - * @param key The key used for registering the root script in the game object. - * @returns The root script. - */ - static hasRoot(gameObject: Phaser.GameObjects.GameObject, key = "scripts") { - - const script = this.getRoot(gameObject, key); - - return script !== undefined; - } - - protected override awake(): void { - - (this.gameObject as any)[`RootScript__${this.key}`] = this; - } - - /* END-USER-CODE */ + constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { + super(parent); + + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } + + public key: string = "scripts"; + + /* START-USER-CODE */ + + /** + * Gets the RootScript object set into the game object. + * It lookups the script node in using the `key` parameter as attribute of the game object. + * + * @param gameObject The game object where the root script is set. + * @param key The key used to set root script into the game object. It is `"scripts"` by default. + * @returns The root script. + */ + static getRoot(gameObject: Phaser.GameObjects.GameObject, key = "scripts") { + return (gameObject as any)[`RootScript__${key}`] as RootScriptNode; + } + + /** + * Gets the children of the root script registered in the given game object, using the given key. + * + * @param gameObject The game object containing the root script. + * @param key The key used to register the root script in the game object. + * @returns The chidlren of the root script. + */ + static getChildren(gameObject: Phaser.GameObjects.GameObject, key = "scripts") { + const root = this.getRoot(gameObject, key); + + if (root) { + return root.children; + } + + return []; + } + + /** + * Gets the root script associated to the game object, using the given key. + * + * @param gameObject The game object where the root script is set. + * @param key The key used for registering the root script in the game object. + * @returns The root script. + */ + static hasRoot(gameObject: Phaser.GameObjects.GameObject, key = "scripts") { + const script = this.getRoot(gameObject, key); + + return script !== undefined; + } + + protected override awake(): void { + (this.gameObject as any)[`RootScript__${this.key}`] = this; + } + + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/script-nodes-basic/ScriptNode.ts b/apps/client/src/app/other/Template/script-nodes-basic/ScriptNode.ts index f392f128..73404c73 100644 --- a/apps/client/src/app/other/Template/script-nodes-basic/ScriptNode.ts +++ b/apps/client/src/app/other/Template/script-nodes-basic/ScriptNode.ts @@ -1,136 +1,111 @@ import Phaser from "phaser"; export default class ScriptNode { - - private _scene: Phaser.Scene; - private _gameObject?: Phaser.GameObjects.GameObject; - private _parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene; - private _children?: ScriptNode[]; - - constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { - - this._parent = parent; - - if (parent instanceof ScriptNode) { - - this._scene = parent.scene; - this._gameObject = parent.gameObject; - - parent.add(this); - - } else if (parent instanceof Phaser.GameObjects.GameObject) { - - this._scene = parent.scene; - this._gameObject = parent; - - } else { - - this._scene = parent; - } - - const listenAwake = this.awake !== ScriptNode.prototype.awake; - const listenStart = this.start !== ScriptNode.prototype.start; - const listenUpdate = this.update !== ScriptNode.prototype.update; - const listenDestroy = this.destroy !== ScriptNode.prototype.destroy; - - if (listenAwake) { - - this.scene.events.once("scene-awake", this.awake, this); - } - - if (listenStart) { - - this.scene.events.once(Phaser.Scenes.Events.UPDATE, this.start, this); - } - - if (listenUpdate) { - - this.scene.events.on(Phaser.Scenes.Events.UPDATE, this.update, this); - } - - if (listenAwake || listenStart || listenUpdate || listenDestroy) { - - const destroyCallback = () => { - - this.scene.events.off("scene-awake", this.awake, this); - this.scene.events.off(Phaser.Scenes.Events.UPDATE, this.start, this); - this.scene.events.off(Phaser.Scenes.Events.UPDATE, this.update, this); - - if (listenDestroy) { - - this.destroy(); - } - }; - - if (this.gameObject) { - - this.gameObject.on(Phaser.GameObjects.Events.DESTROY, destroyCallback); - - } else { - - this.scene.events.on(Phaser.Scenes.Events.SHUTDOWN, destroyCallback); - } - } + private _scene: Phaser.Scene; + private _gameObject?: Phaser.GameObjects.GameObject; + private _parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene; + private _children?: ScriptNode[]; + + constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { + this._parent = parent; + + if (parent instanceof ScriptNode) { + this._scene = parent.scene; + this._gameObject = parent.gameObject; + + parent.add(this); + } else if (parent instanceof Phaser.GameObjects.GameObject) { + this._scene = parent.scene; + this._gameObject = parent; + } else { + this._scene = parent; } - get scene() { + const listenAwake = this.awake !== ScriptNode.prototype.awake; + const listenStart = this.start !== ScriptNode.prototype.start; + const listenUpdate = this.update !== ScriptNode.prototype.update; + const listenDestroy = this.destroy !== ScriptNode.prototype.destroy; - return this._scene; + if (listenAwake) { + this.scene.events.once("scene-awake", this.awake, this); } - get gameObject() { - - return this._gameObject; + if (listenStart) { + this.scene.events.once(Phaser.Scenes.Events.UPDATE, this.start, this); } - get parent() { - - return this._parent; + if (listenUpdate) { + this.scene.events.on(Phaser.Scenes.Events.UPDATE, this.update, this); } - get children(): ScriptNode[] { + if (listenAwake || listenStart || listenUpdate || listenDestroy) { + const destroyCallback = () => { + this.scene.events.off("scene-awake", this.awake, this); + this.scene.events.off(Phaser.Scenes.Events.UPDATE, this.start, this); + this.scene.events.off(Phaser.Scenes.Events.UPDATE, this.update, this); - if (!this._children) { - - this._children = []; + if (listenDestroy) { + this.destroy(); } + }; - return this._children; + if (this.gameObject) { + this.gameObject.on(Phaser.GameObjects.Events.DESTROY, destroyCallback); + } else { + this.scene.events.on(Phaser.Scenes.Events.SHUTDOWN, destroyCallback); + } } + } - add(child: ScriptNode) { + get scene() { + return this._scene; + } - this.children.push(child); - } + get gameObject() { + return this._gameObject; + } - executeChildren(...args: any[]) { + get parent() { + return this._parent; + } - if (this._children) { + get children(): ScriptNode[] { + if (!this._children) { + this._children = []; + } - for(const child of this._children) { + return this._children; + } - child.execute(...args); - } - } - } + add(child: ScriptNode) { + this.children.push(child); + } - execute(...args: any[]): void { - // override this on executable nodes + executeChildren(...args: any[]) { + if (this._children) { + for (const child of this._children) { + child.execute(...args); + } } + } - protected awake() { - // override this - } + execute(...args: any[]): void { + // override this on executable nodes + } - protected start() { - // override this - } + protected awake() { + // override this + } - protected update() { - // override this - } + protected start() { + // override this + } - protected destroy() { - // override this - } -} \ No newline at end of file + protected update() { + // override this + } + + protected destroy() { + // override this + } +} diff --git a/apps/client/src/app/other/Template/script-nodes-basic/SpriteScriptNode.ts b/apps/client/src/app/other/Template/script-nodes-basic/SpriteScriptNode.ts index 0962dd7c..6220fb60 100644 --- a/apps/client/src/app/other/Template/script-nodes-basic/SpriteScriptNode.ts +++ b/apps/client/src/app/other/Template/script-nodes-basic/SpriteScriptNode.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -9,23 +8,21 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class SpriteScriptNode extends ScriptNode { + constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { + super(parent); - constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { - super(parent); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - /* START-USER-CODE */ + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } - get gameObject() { + /* START-USER-CODE */ - return super.gameObject as Phaser.GameObjects.Sprite; - } + get gameObject() { + return super.gameObject as Phaser.GameObjects.Sprite; + } - /* END-USER-CODE */ + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/script-nodes-basic/StartSceneActionScript.ts b/apps/client/src/app/other/Template/script-nodes-basic/StartSceneActionScript.ts index 9384b6c4..cc170a5a 100644 --- a/apps/client/src/app/other/Template/script-nodes-basic/StartSceneActionScript.ts +++ b/apps/client/src/app/other/Template/script-nodes-basic/StartSceneActionScript.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -9,25 +8,23 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class StartSceneActionScript extends ScriptNode { + constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { + super(parent); - constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { - super(parent); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - public sceneKey: string = ""; + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } - /* START-USER-CODE */ + public sceneKey: string = ""; - override execute(...args: any[]): void { + /* START-USER-CODE */ - this.scene.scene.start(this.sceneKey, ...args); - } + override execute(...args: any[]): void { + this.scene.scene.start(this.sceneKey, ...args); + } - /* END-USER-CODE */ + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/script-nodes/FollowObjectScript.ts b/apps/client/src/app/other/Template/script-nodes/FollowObjectScript.ts index 10fc8d22..3436bb5c 100644 --- a/apps/client/src/app/other/Template/script-nodes/FollowObjectScript.ts +++ b/apps/client/src/app/other/Template/script-nodes/FollowObjectScript.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -10,47 +9,41 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class FollowObjectScript extends SpriteScriptNode { + constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { + super(parent); - constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { - super(parent); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - public target!: Phaser.GameObjects.Image|Phaser.GameObjects.Container|Phaser.GameObjects.Sprite; - - /* START-USER-CODE */ - - private offsetX = 0; - private offsetY = 0; - - start() { - - if (this.target) { + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } - this.offsetX = this.gameObject.x - this.target.x; - this.offsetY = this.gameObject.y - this.target.y; - } - } + public target!: Phaser.GameObjects.Image | Phaser.GameObjects.Container | Phaser.GameObjects.Sprite; - update() { + /* START-USER-CODE */ - if (this.target) { + private offsetX = 0; + private offsetY = 0; - this.gameObject.x = this.target.x + this.offsetX; - this.gameObject.y = this.target.y + this.offsetY; + start() { + if (this.target) { + this.offsetX = this.gameObject.x - this.target.x; + this.offsetY = this.gameObject.y - this.target.y; + } + } - if (this.gameObject.body && this.target.body) { + update() { + if (this.target) { + this.gameObject.x = this.target.x + this.offsetX; + this.gameObject.y = this.target.y + this.offsetY; - this.gameObject.body.velocity.x = this.target.body.velocity.x; - this.gameObject.body.velocity.y = this.target.body.velocity.y; - } - } - } + if (this.gameObject.body && this.target.body) { + this.gameObject.body.velocity.x = this.target.body.velocity.x; + this.gameObject.body.velocity.y = this.target.body.velocity.y; + } + } + } - /* END-USER-CODE */ + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/script-nodes/HorizontalMoveScript.ts b/apps/client/src/app/other/Template/script-nodes/HorizontalMoveScript.ts index 90c9b593..9f5d6201 100644 --- a/apps/client/src/app/other/Template/script-nodes/HorizontalMoveScript.ts +++ b/apps/client/src/app/other/Template/script-nodes/HorizontalMoveScript.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -10,45 +9,39 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class HorizontalMoveScript extends SpriteScriptNode { + constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { + super(parent); - constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { - super(parent); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - public horizVelocity: number = 0; - public minX: number = 0; - public maxX: number = 3070; - - /* START-USER-CODE */ - - start() { - - this.body.velocity.x = this.horizVelocity; - } - - private get body() { + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } - return this.gameObject.body as Phaser.Physics.Arcade.Body; - } + public horizVelocity: number = 0; + public minX: number = 0; + public maxX: number = 3070; - update() { + /* START-USER-CODE */ - if (this.gameObject.x < this.minX) { + start() { + this.body.velocity.x = this.horizVelocity; + } - this.body.velocity.x = Math.abs(this.horizVelocity); - } + private get body() { + return this.gameObject.body as Phaser.Physics.Arcade.Body; + } - if (this.gameObject.x > this.maxX) { + update() { + if (this.gameObject.x < this.minX) { + this.body.velocity.x = Math.abs(this.horizVelocity); + } - this.body.velocity.x = -Math.abs(this.horizVelocity); - } - } + if (this.gameObject.x > this.maxX) { + this.body.velocity.x = -Math.abs(this.horizVelocity); + } + } - /* END-USER-CODE */ + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/script-nodes/PlayerControllerScript.ts b/apps/client/src/app/other/Template/script-nodes/PlayerControllerScript.ts index f88115f6..1cedc797 100644 --- a/apps/client/src/app/other/Template/script-nodes/PlayerControllerScript.ts +++ b/apps/client/src/app/other/Template/script-nodes/PlayerControllerScript.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -11,39 +10,35 @@ import Player from "../prefabs/Player"; /* END-USER-IMPORTS */ export default class PlayerControllerScript extends SpriteScriptNode { + constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { + super(parent); - constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { - super(parent); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - public player!: Player|undefined; - public direction: "left"|"right"|"up" = "left"; - - /* START-USER-CODE */ - - update() { + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } - const input = this.gameObject.scene.input; + public player!: Player | undefined; + public direction: "left" | "right" | "up" = "left"; - if (!input.activePointer.isDown) { + /* START-USER-CODE */ - return; - } + update() { + const input = this.gameObject.scene.input; - const objects = input.hitTestPointer(input.activePointer); + if (!input.activePointer.isDown) { + return; + } - if (objects.indexOf(this.gameObject) >= 0) { + const objects = input.hitTestPointer(input.activePointer); - console.log("pressButton", this.direction); - this.player?.pressButton(this.direction); - } - } + if (objects.indexOf(this.gameObject) >= 0) { + console.log("pressButton", this.direction); + this.player?.pressButton(this.direction); + } + } - /* END-USER-CODE */ + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/script-nodes/PreloadBarUpdaterScript.ts b/apps/client/src/app/other/Template/script-nodes/PreloadBarUpdaterScript.ts index 02588587..a33b4651 100644 --- a/apps/client/src/app/other/Template/script-nodes/PreloadBarUpdaterScript.ts +++ b/apps/client/src/app/other/Template/script-nodes/PreloadBarUpdaterScript.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -9,33 +8,29 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class PreloadBarUpdaterScript extends ScriptNode { + constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { + super(parent); - constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { - super(parent); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - /* START-USER-CODE */ - - override get gameObject() { - - return super.gameObject as Phaser.GameObjects.Rectangle; - } + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } - protected override awake(): void { + /* START-USER-CODE */ - const fullWidth = this.gameObject.width; + override get gameObject() { + return super.gameObject as Phaser.GameObjects.Rectangle; + } - this.scene.load.on(Phaser.Loader.Events.PROGRESS, (p:number) => { + protected override awake(): void { + const fullWidth = this.gameObject.width; - this.gameObject.width = fullWidth * p; - }); - } + this.scene.load.on(Phaser.Loader.Events.PROGRESS, (p: number) => { + this.gameObject.width = fullWidth * p; + }); + } - /* END-USER-CODE */ + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/script-nodes/PushActionScript.ts b/apps/client/src/app/other/Template/script-nodes/PushActionScript.ts index 4a1ead96..e53c450b 100644 --- a/apps/client/src/app/other/Template/script-nodes/PushActionScript.ts +++ b/apps/client/src/app/other/Template/script-nodes/PushActionScript.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -9,34 +8,30 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class PushActionScript extends ScriptNode { - - constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { - super(parent); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - /* START-USER-CODE */ - - - override execute(args?: any): void { - - this.scene.add.tween({ - targets: this.gameObject, - scaleX: "*=0.8", - scaleY: "*=0.8", - duration: 80, - yoyo: true, - onYoyo: () => { - - this.executeChildren(args); - } - }); - } - - /* END-USER-CODE */ + constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { + super(parent); + + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } + + /* START-USER-CODE */ + + override execute(args?: any): void { + this.scene.add.tween({ + targets: this.gameObject, + scaleX: "*=0.8", + scaleY: "*=0.8", + duration: 80, + yoyo: true, + onYoyo: () => { + this.executeChildren(args); + } + }); + } + + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/other/Template/script-nodes/ScrollFactorScript.ts b/apps/client/src/app/other/Template/script-nodes/ScrollFactorScript.ts index a9e841ac..a773a124 100644 --- a/apps/client/src/app/other/Template/script-nodes/ScrollFactorScript.ts +++ b/apps/client/src/app/other/Template/script-nodes/ScrollFactorScript.ts @@ -1,4 +1,3 @@ - // You can write more code here /* START OF COMPILED CODE */ @@ -10,26 +9,24 @@ import Phaser from "phaser"; /* END-USER-IMPORTS */ export default class ScrollFactorScript extends SpriteScriptNode { + constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { + super(parent); - constructor(parent: ScriptNode | Phaser.GameObjects.GameObject | Phaser.Scene) { - super(parent); - - /* START-USER-CTR-CODE */ - // Write your code here. - /* END-USER-CTR-CODE */ - } - - public x: number = 0; - public y: number = 0; + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } - /* START-USER-CODE */ + public x: number = 0; + public y: number = 0; - override awake() { + /* START-USER-CODE */ - this.gameObject.setScrollFactor(this.x, this.y); - } + override awake() { + this.gameObject.setScrollFactor(this.x, this.y); + } - /* END-USER-CODE */ + /* END-USER-CODE */ } /* END OF COMPILED CODE */ diff --git a/apps/client/src/app/probable-waffle/communicators/DEPRECATED_game-instance.service.spec.ts b/apps/client/src/app/probable-waffle/communicators/DEPRECATED_game-instance.service.spec.ts new file mode 100644 index 00000000..b6f42479 --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/DEPRECATED_game-instance.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from "@angular/core/testing"; + +import { DEPRECATED_gameInstanceService } from "./DEPRECATED_game-instance.service"; + +describe("DEPRECATED_GameInstanceService", () => { + let service: DEPRECATED_gameInstanceService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(DEPRECATED_gameInstanceService); + }); + + it("should be created", () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/communicators/DEPRECATED_game-instance.service.ts b/apps/client/src/app/probable-waffle/communicators/DEPRECATED_game-instance.service.ts new file mode 100644 index 00000000..b9dff335 --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/DEPRECATED_game-instance.service.ts @@ -0,0 +1,34 @@ +import { Injectable } from "@angular/core"; + +export type Achievement = { + name: string; + description: string; + image: string; + unlocked: boolean; +}; + +@Injectable({ + providedIn: "root" +}) +export class DEPRECATED_gameInstanceService { + getPlayerProgress = () => ["level1"]; + getAchievements = (): Achievement[] => [ + { + name: "Level 1", + description: "Complete level 1", + image: "https://cdn4.iconfinder.com/data/icons/flat-design-security-set-one/24/security-level-1-512.png", + unlocked: true + }, + { + name: "Level 2", + description: "Complete level 2", + image: "https://cdn-icons-png.flaticon.com/512/3640/3640595.png", + unlocked: false + } + ]; + getSettings = () => [ + { + toolbarHeight: 50 + } + ]; +} diff --git a/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.interface.ts b/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.interface.ts new file mode 100644 index 00000000..23543028 --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.interface.ts @@ -0,0 +1,51 @@ +import { + PositionPlayerDefinition, + ProbableWaffleDataChangeEventProperty, + ProbableWaffleGameFoundEvent, + ProbableWaffleGameInstance, + ProbableWaffleGameInstanceData, + ProbableWaffleGameInstanceMetadataData, + ProbableWaffleGameInstanceSaveData, + ProbableWaffleGameInstanceType, + ProbableWaffleGameInstanceVisibility, + ProbableWaffleGameModeData +} from "@fuzzy-waddle/api-interfaces"; +import { MatchmakingOptions } from "../gui/online/matchmaking/matchmaking.component"; +import { Observable } from "rxjs"; + +export interface GameInstanceClientServiceInterface { + gameInstance?: ProbableWaffleGameInstance; + + createGameInstance( + name: string, + visibility: ProbableWaffleGameInstanceVisibility, + type: ProbableWaffleGameInstanceType + ): Promise; + stopGameInstance(): Promise; + startGame(): Promise; + joinGameInstanceAsPlayerForMatchmaking(gameInstanceId: string): Promise; + joinGameInstanceAsPlayer(gameInstanceId: string): Promise; + joinGameInstanceAsSpectator(gameInstanceId: string): Promise; + get currentGameInstanceId(): string | null; + gameInstanceMetadataChanged( + property: ProbableWaffleDataChangeEventProperty, + data: Partial + ): Promise; + gameModeChanged( + property: ProbableWaffleDataChangeEventProperty, + gameModeData: ProbableWaffleGameModeData + ): Promise; + playerSlotOpened(playerDefinition: PositionPlayerDefinition): Promise; + removePlayer(playerNumber: number): Promise; + addSelfAsSpectator(): Promise; + listenToGameFound(): Observable; + requestGameSearchForMatchmaking(matchmakingOptions: MatchmakingOptions): Promise; + stopRequestGameSearchForMatchmaking(): Promise; + navigateToLobbyOrDirectlyToGame(): Promise; + getGameInstanceData(gameInstanceId: string): Promise; + addAiPlayer(): Promise; + addSelfAsPlayer(): Promise; + loadGameInstance(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise; + saveGameInstance(saveName: string): Promise; + startReplay(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise; +} 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 new file mode 100644 index 00000000..925ed91d --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.spec.ts @@ -0,0 +1,123 @@ +import { TestBed } from "@angular/core/testing"; + +import { GameInstanceClientService } from "./game-instance-client.service"; +import { HttpClientTestingModule } from "@angular/common/http/testing"; +import { GameInstanceClientServiceInterface } from "./game-instance-client.service.interface"; +import { AuthService } from "../../auth/auth.service"; +import { authServiceStub } from "../../auth/auth.service.spec"; +import { + PositionPlayerDefinition, + ProbableWaffleDataChangeEventProperty, + ProbableWaffleGameFoundEvent, + ProbableWaffleGameInstance, + ProbableWaffleGameInstanceData, + ProbableWaffleGameInstanceMetadataData, + ProbableWaffleGameInstanceSaveData, + ProbableWaffleGameInstanceType, + ProbableWaffleGameInstanceVisibility, + ProbableWaffleGameModeData +} from "@fuzzy-waddle/api-interfaces"; +import { RouterTestingModule } from "@angular/router/testing"; +import { Observable } from "rxjs"; +import { MatchmakingOptions } from "../gui/online/matchmaking/matchmaking.component"; +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, + get currentGameInstanceId(): string | null { + return null; + }, + async createGameInstance( + name: string, + visibility: ProbableWaffleGameInstanceVisibility, + type: ProbableWaffleGameInstanceType + ): Promise { + this.gameInstance = new ProbableWaffleGameInstance(); + }, + async stopGameInstance(): Promise { + return Promise.resolve(); + }, + async startGame(): Promise { + return Promise.resolve(); + }, + async joinGameInstanceAsSpectator(): Promise { + return Promise.resolve(); + }, + async joinGameInstanceAsPlayerForMatchmaking(gameInstanceId: string): Promise { + return Promise.resolve(); + }, + async joinGameInstanceAsPlayer(): Promise { + return Promise.resolve(); + }, + async gameModeChanged( + property: ProbableWaffleDataChangeEventProperty, + gameModeData: ProbableWaffleGameModeData + ): Promise { + return Promise.resolve(); + }, + async playerSlotOpened(playerDefinition: PositionPlayerDefinition): Promise { + return Promise.resolve(); + }, + async removePlayer(playerNumber: number): Promise { + return Promise.resolve(); + }, + async addSelfAsSpectator(): Promise { + return Promise.resolve(); + }, + listenToGameFound(): Observable { + return new Observable(); + }, + async requestGameSearchForMatchmaking(matchmakingOptions: MatchmakingOptions): Promise { + return Promise.resolve(); + }, + async stopRequestGameSearchForMatchmaking(): Promise { + return Promise.resolve(); + }, + async navigateToLobbyOrDirectlyToGame(): Promise { + return Promise.resolve(); + }, + async getGameInstanceData(gameInstanceId: string): Promise { + return Promise.resolve(null); + }, + async addAiPlayer(): Promise { + this.gameInstance?.addPlayer(this.gameInstance?.initPlayer({} as any)); + }, + async addSelfAsPlayer(): Promise { + return Promise.resolve(); + }, + async gameInstanceMetadataChanged( + property: ProbableWaffleDataChangeEventProperty, + data: Partial + ): Promise { + return Promise.resolve(); + }, + async loadGameInstance(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise { + return Promise.resolve(); + }, + async saveGameInstance(saveName: string): Promise { + return Promise.resolve(); + }, + async startReplay(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise { + return Promise.resolve(); + } +} satisfies GameInstanceClientServiceInterface; +describe("GameInstanceClientService", () => { + let service: GameInstanceClientService; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule, RouterTestingModule], + providers: [ + { provide: AuthService, useValue: authServiceStub }, + { provide: GameInstanceStorageServiceInterface, useValue: gameInstanceLocalStorageServiceStub } + ] + }); + service = TestBed.inject(GameInstanceClientService); + }); + + it("should be created", () => { + expect(service).toBeTruthy(); + }); +}); 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 new file mode 100644 index 00000000..afd49342 --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/game-instance-client.service.ts @@ -0,0 +1,484 @@ +import { inject, Injectable, NgZone } from "@angular/core"; +import { filter, firstValueFrom, Observable, Subscription } from "rxjs"; +import { environment } from "../../../environments/environment"; +import { HttpClient } from "@angular/common/http"; +import { + DifficultyModifiers, + GameSessionState, + GameSetupHelpers, + MapTuning, + PlayerLobbyDefinition, + PositionPlayerDefinition, + ProbableWaffleAiDifficulty, + ProbableWaffleDataChangeEventProperty, + ProbableWaffleGameFoundEvent, + ProbableWaffleGameInstance, + ProbableWaffleGameInstanceData, + ProbableWaffleGameInstanceEvent, + ProbableWaffleGameInstanceMetadataData, + ProbableWaffleGameInstanceSaveData, + ProbableWaffleGameInstanceType, + ProbableWaffleGameInstanceVisibility, + ProbableWaffleGameModeData, + ProbableWaffleGameStateData, + ProbableWaffleListeners, + ProbableWafflePlayerDataChangeEventPayload, + ProbableWafflePlayerDataChangeEventProperty, + ProbableWafflePlayerType, + ProbableWaffleSpectatorData, + ProbableWaffleSpectatorDataChangeEventProperty, + RequestGameSearchForMatchMakingDto, + WinConditions +} from "@fuzzy-waddle/api-interfaces"; +import { ServerHealthService } from "../../shared/services/server-health.service"; +import { ProbableWaffleCommunicators, SceneCommunicatorClientService } from "./scene-communicator-client.service"; +import { AuthService } from "../../auth/auth.service"; +import { GameInstanceClientServiceInterface } from "./game-instance-client.service.interface"; +import { MatchmakingOptions } from "../gui/online/matchmaking/matchmaking.component"; +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 { GameInstanceStorageServiceInterface } from "./storage/game-instance-storage.service.interface"; + +@Injectable({ + providedIn: "root" +}) +export class GameInstanceClientService implements GameInstanceClientServiceInterface { + gameInstance?: ProbableWaffleGameInstance; + /** + * used to track which player number are we in the game + */ + currentPlayerNumber?: number; + + private readonly authService = inject(AuthService); + private readonly httpClient = inject(HttpClient); + private readonly serverHealthService = inject(ServerHealthService); + private readonly sceneCommunicatorClientService = inject(SceneCommunicatorClientService); + private readonly probableWaffleCommunicatorService = inject(ProbableWaffleCommunicatorService); + private readonly authenticatedSocketService = inject(AuthenticatedSocketService); + private readonly gameInstanceStorageService = inject(GameInstanceStorageServiceInterface); + private readonly router = inject(Router); + private readonly ngZone = inject(NgZone); + private communicators?: ProbableWaffleCommunicators; + private communicatorSubscriptions: Subscription[] = []; + + async createGameInstance( + name: string, + visibility: ProbableWaffleGameInstanceVisibility, + type: ProbableWaffleGameInstanceType + ): Promise { + this.gameInstance = new ProbableWaffleGameInstance({ + gameInstanceMetadataData: { + name, + createdBy: this.authService.userId, + type, + visibility, + startOptions: {} + } satisfies ProbableWaffleGameInstanceMetadataData, + gameModeData: { + winConditions: {} satisfies WinConditions, + mapTuning: {} satisfies MapTuning, + difficultyModifiers: {} satisfies DifficultyModifiers + } satisfies ProbableWaffleGameModeData, + gameStateData: {} as ProbableWaffleGameStateData + }); + if (this.authService.isAuthenticated && this.serverHealthService.serverAvailable) { + const url = environment.api + "api/probable-waffle/start-game"; + const body: ProbableWaffleGameInstanceMetadataData = this.gameInstance.gameInstanceMetadata!.data; + await firstValueFrom(this.httpClient.post(url, body)); + } + + this.startListeningToGameInstanceEvents(); + } + + async stopGameInstance(): Promise { + await this.gameInstanceMetadataChanged("sessionState", { sessionState: GameSessionState.Stopped }); + } + + listenToGameInstanceMetadataEvents(): void { + if (!this.communicators) return; + this.communicatorSubscriptions.push( + this.communicators.gameInstanceObservable.subscribe(async (payload) => { + ProbableWaffleListeners.gameInstanceMetadataChanged(this.gameInstance, payload); + switch (payload.property) { + case "sessionState": + switch (payload.data.sessionState) { + case GameSessionState.MovingPlayersToGame: + await this.router.navigate(["probable-waffle/game"]); + break; + case GameSessionState.ToScoreScreen: + await this.ngZone.run(async () => { + await this.router.navigate(["probable-waffle/score-screen"]); + }); + break; + case GameSessionState.Stopped: + this.stopListeningToGameInstanceEvents(); + this.gameInstance = undefined; + break; + } + break; + } + }) + ); + } + + /** + * todo just for test + */ + listenToSaveGameEvents(): void { + this.communicatorSubscriptions.push( + this.probableWaffleCommunicatorService.saveGame.subscribe(async () => { + await this.saveGameInstance("test" + Math.random()); + }) + ); + } + + listenToGameModeDataEvents(): void { + if (!this.communicators) return; + this.communicatorSubscriptions.push( + this.communicators.gameModeObservable.subscribe((payload) => + ProbableWaffleListeners.gameModeChanged(this.gameInstance, payload) + ) + ); + } + + listenToPlayerEvents(): void { + if (!this.communicators) return; + this.communicatorSubscriptions.push( + this.communicators.playerObservable.subscribe((payload) => { + ProbableWaffleListeners.playerChanged(this.gameInstance, payload); + let currentUserHasJoined = false; + switch (payload.property) { + case "joined": + currentUserHasJoined = + !!this.authService.userId && payload.data.playerControllerData!.userId === this.authService.userId; + if (currentUserHasJoined) { + this.currentPlayerNumber = payload.data.playerControllerData!.playerDefinition!.player.playerNumber; + } + break; + case "joinedFromNetwork": + const player = this.gameInstance!.players.find( + (p) => p.playerController.data.userId === this.authService.userId + ); + if (player) { + this.currentPlayerNumber = player.playerNumber; + } + break; + case "left": + if (payload.data.playerControllerData!.playerDefinition!.player.playerNumber === this.currentPlayerNumber) { + this.currentPlayerNumber = undefined; + } + break; + } + }) + ); + } + + listenToSpectatorEvents(): void { + if (!this.communicators) return; + this.communicatorSubscriptions.push( + this.communicators.spectatorObservable.subscribe((payload) => + ProbableWaffleListeners.spectatorChanged(this.gameInstance, payload) + ) + ); + } + + private startListeningToGameInstanceEvents() { + if (!this.currentGameInstanceId) throw new Error("Game instance not found"); + this.communicators = this.sceneCommunicatorClientService.createCommunicators(this.currentGameInstanceId); + this.listenToGameInstanceMetadataEvents(); + this.listenToGameModeDataEvents(); + this.listenToPlayerEvents(); + this.listenToSpectatorEvents(); + this.listenToSaveGameEvents(); + } + + private stopListeningToGameInstanceEvents() { + if (!this.currentGameInstanceId) throw new Error("Game instance not found"); + this.sceneCommunicatorClientService.destroyCommunicators( + this.currentGameInstanceId, + this.communicatorSubscriptions + ); + } + + async startGame(): Promise { + await this.gameInstanceMetadataChanged("sessionState", { sessionState: GameSessionState.MovingPlayersToGame }); + } + + async gameInstanceMetadataChanged( + property: ProbableWaffleDataChangeEventProperty, + data: Partial + ): Promise { + if (!this.currentGameInstanceId) return; + + this.probableWaffleCommunicatorService.gameInstanceMetadataChanged?.send({ + property: property, + gameInstanceId: this.currentGameInstanceId, + emitterUserId: this.authService.userId, + data + }); + } + + async gameModeChanged( + property: ProbableWaffleDataChangeEventProperty, + gameModeData: Partial + ): Promise { + if (!this.currentGameInstanceId) return; + + this.probableWaffleCommunicatorService.gameModeChanged?.send({ + property: property, + gameInstanceId: this.currentGameInstanceId, + emitterUserId: this.authService.userId, + data: gameModeData + }); + } + + async playerChanged( + property: ProbableWafflePlayerDataChangeEventProperty, + data: ProbableWafflePlayerDataChangeEventPayload + ) { + if (!this.currentGameInstanceId) return; + + this.probableWaffleCommunicatorService.playerChanged?.send({ + property: property, + gameInstanceId: this.currentGameInstanceId, + emitterUserId: this.authService.userId, + data + }); + } + + private async spectatorChanged( + property: ProbableWaffleSpectatorDataChangeEventProperty, + data: Partial + ) { + if (!this.currentGameInstanceId) return; + + this.probableWaffleCommunicatorService.spectatorChanged?.send({ + property: property, + gameInstanceId: this.currentGameInstanceId, + emitterUserId: this.authService.userId, + data + }); + } + + /** + * game instance is fully prepared on server, we're just joining it + */ + async joinGameInstanceAsPlayerForMatchmaking(gameInstanceId: string): Promise { + const gameInstanceData = (await this.getGameInstanceData(gameInstanceId))!; + this.gameInstance = new ProbableWaffleGameInstance(gameInstanceData); + this.startListeningToGameInstanceEvents(); + } + + /** + * owner only + */ + async joinGameInstanceAsPlayer(gameInstanceId: string): Promise { + if (this.currentGameInstanceId) throw new Error("Game instance already exists"); + if (!this.authService.isAuthenticated || !this.serverHealthService.serverAvailable) + throw new Error("Not authenticated or server not available"); + + const gameInstanceData = await this.getGameInstanceData(gameInstanceId); + if (!gameInstanceData) throw new Error("Game instance not found"); + this.gameInstance = new ProbableWaffleGameInstance(gameInstanceData); + this.startListeningToGameInstanceEvents(); + + const userId = this.authService.userId; + + await this.playerChanged("joinedFromNetwork", { + playerControllerData: { userId } + }); + console.log("joined game instance as player"); + } + + async addSelfAsPlayer(): Promise { + const gameInstance = this.gameInstance; + if (!gameInstance) throw new Error("Game instance not found"); + const firstFreePlayerNumber = GameSetupHelpers.getFirstFreePlayerNumber(gameInstance.players); + const firstFreePosition = GameSetupHelpers.getFirstFreePosition(gameInstance.players); + const playerDefinition = { + // todo move this to single place + player: { + playerNumber: firstFreePlayerNumber, + playerName: "Player " + (firstFreePlayerNumber + 1), + playerPosition: firstFreePosition, + joined: true + } satisfies PlayerLobbyDefinition, + playerType: ProbableWafflePlayerType.Human + } satisfies PositionPlayerDefinition; + + await this.addSelfOrAiPlayer(playerDefinition); + } + + async addAiPlayer(position?: number): Promise { + const gameInstance = this.gameInstance; + if (!gameInstance) throw new Error("Game instance not found"); + const firstFreePlayerNumber = GameSetupHelpers.getFirstFreePlayerNumber(gameInstance.players); + const firstFreePosition = GameSetupHelpers.getFirstFreePosition(gameInstance.players); + const playerDefinition = { + // todo move this to single place + player: { + playerNumber: firstFreePlayerNumber, + playerName: "Player " + (firstFreePlayerNumber + 1), + playerPosition: position ?? firstFreePosition, + joined: true + } satisfies PlayerLobbyDefinition, + playerType: ProbableWafflePlayerType.AI, + difficulty: ProbableWaffleAiDifficulty.Medium + } satisfies PositionPlayerDefinition; + + await this.addSelfOrAiPlayer(playerDefinition); + } + + async joinGameInstanceAsSpectator(gameInstanceId: string): Promise { + if (this.currentGameInstanceId) throw new Error("Game instance already exists"); + if (!this.authService.isAuthenticated || !this.serverHealthService.serverAvailable) + throw new Error("Not authenticated or server not available"); + + const gameInstanceData = await this.getGameInstanceData(gameInstanceId); + if (!gameInstanceData) throw new Error("Game instance not found"); + this.gameInstance = new ProbableWaffleGameInstance(gameInstanceData); + this.startListeningToGameInstanceEvents(); + await this.addSelfAsSpectator(); + } + + async getGameInstanceData(gameInstanceId: string): Promise { + if (!this.authService.isAuthenticated || !this.serverHealthService.serverAvailable) + throw new Error("Not authenticated or server not available"); + + const url = environment.api + "api/probable-waffle/get-game-instance"; + return await firstValueFrom( + this.httpClient.get(url, { params: { gameInstanceId } }) + ); + } + + async navigateToLobbyOrDirectlyToGame(): Promise { + if (!this.gameInstance) throw new Error("Game instance not found"); + switch (this.gameInstance.gameInstanceMetadata!.data.type) { + case ProbableWaffleGameInstanceType.SelfHosted: + // join lobby + await this.router.navigate(["probable-waffle/lobby"]); + break; + case ProbableWaffleGameInstanceType.Skirmish: + // replaceUrl: true - we don't want to go back to skirmish page + await this.router.navigate(["probable-waffle/lobby"], { replaceUrl: true }); + break; + case ProbableWaffleGameInstanceType.Matchmaking: + case ProbableWaffleGameInstanceType.InstantGame: + case ProbableWaffleGameInstanceType.Replay: + // directly to game + await this.router.navigate(["probable-waffle/game"]); + break; + default: + throw new Error("Not implemented"); + } + } + + get currentGameInstanceId(): string | null { + return this.gameInstance?.gameInstanceMetadata?.data.gameInstanceId ?? null; + } + + async playerSlotOpened(): Promise { + const firstFreePlayerNumber = GameSetupHelpers.getFirstFreePlayerNumber(this.gameInstance!.players); + const firstFreePosition = GameSetupHelpers.getFirstFreePosition(this.gameInstance!.players); + await this.playerChanged("joined", { + playerControllerData: { + playerDefinition: { + player: { + playerNumber: firstFreePlayerNumber, + playerName: "Player " + (firstFreePlayerNumber + 1), + playerPosition: firstFreePosition, + joined: false + } satisfies PlayerLobbyDefinition, + playerType: ProbableWafflePlayerType.NetworkOpen + } satisfies PositionPlayerDefinition + } + }); + } + + async removePlayer(playerNumber: number): Promise { + await this.playerChanged("left", { + playerControllerData: { + playerDefinition: { + player: { + playerNumber + } as PlayerLobbyDefinition + } as PositionPlayerDefinition + } + }); + } + + private async addSelfOrAiPlayer(playerDefinition: PositionPlayerDefinition): Promise { + if (!this.currentGameInstanceId) return; + + const playerNumber = playerDefinition.player.playerNumber; + const player = this.gameInstance!.players.find((p) => p.playerNumber === playerNumber); + if (player) throw new Error("Player already exists"); + const userId = playerDefinition.playerType === ProbableWafflePlayerType.Human ? this.authService.userId : null; + await this.playerChanged("joined", { + playerControllerData: { + playerDefinition, + userId + } + }); + } + + async addSelfAsSpectator(): Promise { + await this.spectatorChanged("joined", { userId: this.authService.userId! }); + } + + listenToGameFound(): Observable { + return this.authenticatedSocketService + .socket!.fromEvent(ProbableWaffleGameInstanceEvent.GameFound) + .pipe( + filter((data) => data.userIds.includes(this.authService.userId!)), + map((data) => data) + ); + } + + async requestGameSearchForMatchmaking(matchmakingOptions: MatchmakingOptions): Promise { + if (this.currentGameInstanceId) throw new Error("Game instance already exists"); + if (!this.authService.isAuthenticated || !this.serverHealthService.serverAvailable) return; + const url = environment.api + "api/probable-waffle/matchmaking/request-game-search-for-matchmaking"; + const body: RequestGameSearchForMatchMakingDto = { + mapPoolIds: matchmakingOptions.levels.filter((l) => l.checked).map((l) => l.id), + factionType: matchmakingOptions.factionType + }; + await firstValueFrom(this.httpClient.post(url, body)); + } + + async stopRequestGameSearchForMatchmaking(): Promise { + if (!this.authService.isAuthenticated || !this.serverHealthService.serverAvailable) return; + const url = environment.api + "api/probable-waffle/matchmaking/stop-request-game-search-for-matchmaking"; + await firstValueFrom(this.httpClient.delete(url, {})); + } + + /** + * todo this is a prototype + */ + async loadGameInstance(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise { + gameInstanceSaveData.gameInstanceData.gameInstanceMetadataData!.startOptions.loadFromSave = true; + this.gameInstance = new ProbableWaffleGameInstance(gameInstanceSaveData.gameInstanceData); + this.startListeningToGameInstanceEvents(); + await this.navigateToLobbyOrDirectlyToGame(); + } + + async saveGameInstance(saveName: string): Promise { + await this.gameInstanceStorageService.saveToStorage({ + saveName, + created: Date.now(), + gameInstanceData: this.gameInstance!.data + }); + } + + /** + * todo this is a prototype + */ + async startReplay(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise { + 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/communicators/game-instance.service.spec.ts b/apps/client/src/app/probable-waffle/communicators/game-instance.service.spec.ts deleted file mode 100644 index a6d7fc44..00000000 --- a/apps/client/src/app/probable-waffle/communicators/game-instance.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { GameInstanceService } from './game-instance.service'; - -describe('GameInstanceService', () => { - let service: GameInstanceService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(GameInstanceService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/probable-waffle/communicators/game-instance.service.ts b/apps/client/src/app/probable-waffle/communicators/game-instance.service.ts deleted file mode 100644 index 825d3b61..00000000 --- a/apps/client/src/app/probable-waffle/communicators/game-instance.service.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Injectable } from '@angular/core'; - -export type Achievement = { - name: string; - description: string; - image: string; - unlocked: boolean; -}; - -@Injectable({ - providedIn: 'root' -}) -export class GameInstanceService { - getPlayerProgress = () => ['level1']; - getAchievements = (): Achievement[] => [ - { - name: 'Level 1', - description: 'Complete level 1', - image: 'https://cdn4.iconfinder.com/data/icons/flat-design-security-set-one/24/security-level-1-512.png', - unlocked: true - }, - { - name: 'Level 2', - description: 'Complete level 2', - image: 'https://cdn-icons-png.flaticon.com/512/3640/3640595.png', - unlocked: false - } - ]; - getSettings = () => [ - { - toolbarHeight: 50 - } - ]; -} diff --git a/apps/client/src/app/probable-waffle/communicators/game-statistics.ts b/apps/client/src/app/probable-waffle/communicators/game-statistics.ts index 42fae831..a8a3cfed 100644 --- a/apps/client/src/app/probable-waffle/communicators/game-statistics.ts +++ b/apps/client/src/app/probable-waffle/communicators/game-statistics.ts @@ -1,24 +1,42 @@ -import { PlayerState } from '../game/player/player-state'; -import { GameMode } from '../game/world/managers/game-mode/game-mode'; -import { Building } from '../game/entity/assets/buildings/building'; -import { Character } from '../game/entity/actor/character'; +import { PlayerState } from "../game/player/player-state"; +import { GameMode } from "../game/world/managers/game-mode/game-mode"; +import { Building } from "../game/entity/assets/buildings/building"; +import { Character } from "../game/entity/actor/character"; export class GameStatistics { - constructor(public players: PlayerStatistics[], public gameInfoStatistics: GameInfoStatistics) {} + constructor( + public players: PlayerStatistics[], + public gameInfoStatistics: GameInfoStatistics + ) {} } export class PlayerStatistics { - constructor(public player: PlayerState, public units: UnitStatistics[], public buildings: BuildingStatistics[]) {} + constructor( + public player: PlayerState, + public units: UnitStatistics[], + public buildings: BuildingStatistics[] + ) {} } export class UnitStatistics { - constructor(public unit: Character, public kills: number, public deaths: number) {} + constructor( + public unit: Character, + public kills: number, + public deaths: number + ) {} } export class BuildingStatistics { - constructor(public building: Building, public kills: number, public deaths: number) {} + constructor( + public building: Building, + public kills: number, + public deaths: number + ) {} } export class GameInfoStatistics { - constructor(public gameTime: number, public gameMode: GameMode) {} + constructor( + public gameTime: number, + public gameMode: GameMode + ) {} } diff --git a/apps/client/src/app/probable-waffle/communicators/match-instance.ts b/apps/client/src/app/probable-waffle/communicators/match-instance.ts deleted file mode 100644 index 5ba1b19c..00000000 --- a/apps/client/src/app/probable-waffle/communicators/match-instance.ts +++ /dev/null @@ -1,3 +0,0 @@ -export class MatchInstance { - // todo -} diff --git a/apps/client/src/app/probable-waffle/communicators/probable-waffle-communicator.service.interface.ts b/apps/client/src/app/probable-waffle/communicators/probable-waffle-communicator.service.interface.ts new file mode 100644 index 00000000..5b2b700e --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/probable-waffle-communicator.service.interface.ts @@ -0,0 +1,28 @@ +import { TwoWayCommunicator } from "../../shared/game/communicators/two-way-communicator"; +import { + ProbableWaffleCommunicatorMessageEvent, + ProbableWaffleCommunicatorSelectionEvent, + ProbableWaffleCommunicatorType, + ProbableWaffleGameInstanceMetadataChangeEvent, + ProbableWaffleGameModeDataChangeEvent, + ProbableWafflePlayerDataChangeEvent, + ProbableWaffleSpectatorDataChangeEvent +} from "@fuzzy-waddle/api-interfaces"; +import { Socket } from "ngx-socket-io"; + +export interface ProbableWaffleCommunicatorServiceInterface { + gameInstanceMetadataChanged?: TwoWayCommunicator< + ProbableWaffleGameInstanceMetadataChangeEvent, + ProbableWaffleCommunicatorType + >; + gameModeChanged?: TwoWayCommunicator; + playerChanged?: TwoWayCommunicator; + spectatorChanged?: TwoWayCommunicator; + message?: TwoWayCommunicator; + + // game events + selection?: TwoWayCommunicator; + + startCommunication(gameInstanceId: string, socket: Socket): void; + stopCommunication(gameInstanceId: string, socket: Socket): void; +} diff --git a/apps/client/src/app/probable-waffle/communicators/probable-waffle-communicator.service.spec.ts b/apps/client/src/app/probable-waffle/communicators/probable-waffle-communicator.service.spec.ts new file mode 100644 index 00000000..ca181d46 --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/probable-waffle-communicator.service.spec.ts @@ -0,0 +1,20 @@ +import { TestBed } from "@angular/core/testing"; +import { ProbableWaffleCommunicatorServiceInterface } from "./probable-waffle-communicator.service.interface"; +import { ProbableWaffleCommunicatorService } from "./probable-waffle-communicator.service"; + +export const probableWaffleCommunicatorServiceStub = { + startCommunication: () => {}, + stopCommunication: () => {} +} satisfies ProbableWaffleCommunicatorServiceInterface; +describe("ProbableWaffleCommunicatorService", () => { + let service: ProbableWaffleCommunicatorService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ProbableWaffleCommunicatorService); + }); + + it("should be created", () => { + expect(service).toBeTruthy(); + }); +}); 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 new file mode 100644 index 00000000..eb9bc512 --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/probable-waffle-communicator.service.ts @@ -0,0 +1,107 @@ +import { EventEmitter, Injectable, OnDestroy } from "@angular/core"; +import { + ProbableWaffleCommunicatorMessageEvent, + ProbableWaffleCommunicatorSelectionEvent, + ProbableWaffleCommunicatorType, + ProbableWaffleGameInstanceMetadataChangeEvent, + ProbableWaffleGameModeDataChangeEvent, + ProbableWaffleGatewayEvent, + ProbableWaffleGatewayRoomTypes, + ProbableWafflePlayerDataChangeEvent, + ProbableWaffleSpectatorDataChangeEvent, + ProbableWaffleWebsocketRoomEvent +} from "@fuzzy-waddle/api-interfaces"; +import { TwoWayCommunicator } from "../../shared/game/communicators/two-way-communicator"; +import { Socket } from "ngx-socket-io"; +import { CommunicatorService } from "../../shared/game/communicators/CommunicatorService"; +import { ProbableWaffleCommunicatorServiceInterface } from "./probable-waffle-communicator.service.interface"; + +@Injectable({ + providedIn: "root" +}) +export class ProbableWaffleCommunicatorService + implements CommunicatorService, OnDestroy, ProbableWaffleCommunicatorServiceInterface +{ + gameInstanceMetadataChanged?: TwoWayCommunicator< + ProbableWaffleGameInstanceMetadataChangeEvent, + ProbableWaffleCommunicatorType + >; + gameModeChanged?: TwoWayCommunicator; + playerChanged?: TwoWayCommunicator; + spectatorChanged?: TwoWayCommunicator; + message?: TwoWayCommunicator; + + // game events + 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< + ProbableWaffleGameInstanceMetadataChangeEvent, + ProbableWaffleCommunicatorType + >(ProbableWaffleGatewayEvent.ProbableWaffleAction, "gameInstanceMetadataDataChange", gameInstanceId, socket); + + this.gameModeChanged = new TwoWayCommunicator< + ProbableWaffleGameModeDataChangeEvent, + ProbableWaffleCommunicatorType + >(ProbableWaffleGatewayEvent.ProbableWaffleAction, "gameModeDataChange", gameInstanceId, socket); + + this.playerChanged = new TwoWayCommunicator( + ProbableWaffleGatewayEvent.ProbableWaffleAction, + "playerDataChange", + gameInstanceId, + socket + ); + + this.spectatorChanged = new TwoWayCommunicator< + ProbableWaffleSpectatorDataChangeEvent, + ProbableWaffleCommunicatorType + >(ProbableWaffleGatewayEvent.ProbableWaffleAction, "spectatorDataChange", gameInstanceId, socket); + + this.message = new TwoWayCommunicator( + ProbableWaffleGatewayEvent.ProbableWaffleMessage, + "message", + gameInstanceId, + socket + ); + + this.createGameEvents(gameInstanceId, socket); + + socket?.emit(ProbableWaffleGatewayEvent.ProbableWaffleWebsocketRoom, { + gameInstanceId, + type: "join" + } satisfies ProbableWaffleWebsocketRoomEvent); + } + + private createGameEvents(gameInstanceId: string, socket?: Socket) { + this.selection = new TwoWayCommunicator( + ProbableWaffleGatewayEvent.ProbableWaffleAction, + "selection", + gameInstanceId, + socket + ); + } + + stopCommunication(gameInstanceId: string, socket?: Socket) { + this.destroySubscriptions(); + socket?.emit(ProbableWaffleGatewayRoomTypes.ProbableWaffleGameInstance, { + gameInstanceId, + type: "leave" + } satisfies ProbableWaffleWebsocketRoomEvent); + } + + ngOnDestroy(): void { + this.destroySubscriptions(); + } + + private destroySubscriptions() { + this.gameInstanceMetadataChanged?.destroy(); + this.gameModeChanged?.destroy(); + this.playerChanged?.destroy(); + this.spectatorChanged?.destroy(); + this.message?.destroy(); + this.selection?.destroy(); + } +} diff --git a/apps/client/src/app/probable-waffle/communicators/rooms/rooms.service.interface.ts b/apps/client/src/app/probable-waffle/communicators/rooms/rooms.service.interface.ts new file mode 100644 index 00000000..ae0d669a --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/rooms/rooms.service.interface.ts @@ -0,0 +1,19 @@ +import { Observable } from "rxjs"; +import { ProbableWaffleMapEnum, ProbableWaffleRoom, ProbableWaffleRoomEvent } from "@fuzzy-waddle/api-interfaces"; +import { computed, Signal, WritableSignal } from "@angular/core"; + +export interface RoomsServiceInterface { + rooms: WritableSignal; + playersSearchingForMatchmakingGame: Signal; + matchmakingGamesInProgress: Signal; + init(): Promise; + listenToRoomEvents(): void; + + getRooms(maps: ProbableWaffleMapEnum[] | null): Promise; + + initiallyPullRooms(): Promise; + + get roomEvent(): Observable | undefined; + + destroy(): void; +} diff --git a/apps/client/src/app/probable-waffle/communicators/rooms/rooms.service.spec.ts b/apps/client/src/app/probable-waffle/communicators/rooms/rooms.service.spec.ts new file mode 100644 index 00000000..8c8e4eaa --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/rooms/rooms.service.spec.ts @@ -0,0 +1,49 @@ +import { TestBed } from "@angular/core/testing"; + +import { RoomsService } from "./rooms.service"; +import { HttpClientTestingModule } from "@angular/common/http/testing"; +import { RoomsServiceInterface } from "./rooms.service.interface"; +import { Observable } from "rxjs"; +import { AuthService } from "../../../auth/auth.service"; +import { authServiceStub } from "../../../auth/auth.service.spec"; +import { ProbableWaffleRoom, ProbableWaffleRoomEvent } from "@fuzzy-waddle/api-interfaces"; +import { computed, signal } from "@angular/core"; + +export const roomsServiceStub = { + rooms: signal([]), + playersSearchingForMatchmakingGame: computed(() => 0), + matchmakingGamesInProgress: computed(() => 0), + init(): Promise { + return Promise.resolve(); + }, + listenToRoomEvents() { + // + }, + destroy() { + // + }, + get roomEvent(): Observable | undefined { + return undefined; + }, + getRooms(): Promise { + return Promise.resolve([]); + }, + initiallyPullRooms(): Promise { + return Promise.resolve(); + } +} satisfies RoomsServiceInterface; +describe("RoomsService", () => { + let service: RoomsService; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + providers: [{ provide: AuthService, useValue: authServiceStub }] + }); + service = TestBed.inject(RoomsService); + }); + + it("should be created", () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/communicators/rooms/rooms.service.ts b/apps/client/src/app/probable-waffle/communicators/rooms/rooms.service.ts new file mode 100644 index 00000000..7b1a016f --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/rooms/rooms.service.ts @@ -0,0 +1,124 @@ +import { computed, inject, Injectable, Signal, signal } from "@angular/core"; +import { HttpClient } from "@angular/common/http"; +import { environment } from "../../../../environments/environment"; +import { + GameSessionState, + ProbableWaffleGameInstanceType, + ProbableWaffleGatewayEvent, + ProbableWaffleGetRoomsDto, + ProbableWaffleMapEnum, + ProbableWaffleRoom, + ProbableWaffleRoomEvent +} from "@fuzzy-waddle/api-interfaces"; +import { firstValueFrom, Observable, Subscription } from "rxjs"; +import { AuthenticatedSocketService } from "../../../data-access/chat/authenticated-socket.service"; +import { map } from "rxjs/operators"; +import { AuthService } from "../../../auth/auth.service"; +import { ServerHealthService } from "../../../shared/services/server-health.service"; +import { RoomsServiceInterface } from "./rooms.service.interface"; + +@Injectable({ + providedIn: "root" +}) +export class RoomsService implements RoomsServiceInterface { + private roomsSubscription?: Subscription; + rooms = signal([]); + + private readonly authService = inject(AuthService); + private readonly httpClient = inject(HttpClient); + private readonly serverHealthService = inject(ServerHealthService); + private readonly authenticatedSocketService = inject(AuthenticatedSocketService); + + playersSearchingForMatchmakingGame: Signal = computed(() => { + // noinspection UnnecessaryLocalVariableJS + const rooms = this.rooms().filter( + (room) => + room.gameInstanceMetadataData.type === ProbableWaffleGameInstanceType.Matchmaking && + room.gameInstanceMetadataData.sessionState === GameSessionState.NotStarted + ).length; + return rooms; + }); + + matchmakingGamesInProgress: Signal = computed(() => { + // noinspection UnnecessaryLocalVariableJS + const rooms = this.rooms().filter( + (room) => + room.gameInstanceMetadataData.type === ProbableWaffleGameInstanceType.Matchmaking && + room.gameInstanceMetadataData.createdBy !== this.authService.userId && + room.gameInstanceMetadataData.sessionState !== GameSessionState.NotStarted && + room.gameInstanceMetadataData.sessionState !== GameSessionState.Stopped + ).length; + return rooms; + }); + + /** + * we need to listen to room events, so we know if we're spectating a room that is removed + */ + listenToRoomEvents() { + this.roomsSubscription = this.roomEvent?.subscribe(async (roomEvent) => { + const room = roomEvent.room; + const rooms = this.rooms(); + const roomLocally = rooms.find( + (r) => r.gameInstanceMetadataData.gameInstanceId === roomEvent.room.gameInstanceMetadataData.gameInstanceId + ); + switch (roomEvent.action) { + case "added": + this.rooms.update((rooms) => [...rooms, room]); + break; + case "removed": + this.rooms.update((rooms) => + rooms.filter( + (room) => + room.gameInstanceMetadataData.gameInstanceId !== roomEvent.room.gameInstanceMetadataData.gameInstanceId + ) + ); + break; + case "player.joined": + case "player.left": + case "spectator.joined": + case "spectator.left": + case "game_instance_metadata": + case "game_mode": + if (!roomLocally) return; + roomLocally.gameInstanceMetadataData = roomEvent.room.gameInstanceMetadataData; + roomLocally.gameModeData = roomEvent.room.gameModeData; + roomLocally.players = roomEvent.room.players; + roomLocally.spectators = roomEvent.room.spectators; + this.rooms.update((rooms) => [...rooms]); + break; + default: + throw new Error("Unknown room event action: " + roomEvent.action); + } + }); + } + + async getRooms(maps: ProbableWaffleMapEnum[] | null = null): Promise { + if (!this.authService.isAuthenticated || !this.serverHealthService.serverAvailable) return []; + const url = environment.api + "api/probable-waffle/get-rooms"; + const body: ProbableWaffleGetRoomsDto = { + maps: maps + }; + return await firstValueFrom(this.httpClient.post(url, body)); + } + + async init(): Promise { + await this.initiallyPullRooms(); + this.listenToRoomEvents(); + } + + async initiallyPullRooms(): Promise { + this.rooms.set(await this.getRooms()); + } + + get roomEvent(): Observable | undefined { + const socket = this.authenticatedSocketService.socket; + return socket + ?.fromEvent(ProbableWaffleGatewayEvent.ProbableWaffleRoom) + .pipe(map((roomEvent: ProbableWaffleRoomEvent) => roomEvent)); + } + + destroy(): void { + this.roomsSubscription?.unsubscribe(); + this.rooms.set([]); + } +} diff --git a/apps/client/src/app/probable-waffle/communicators/scene-communicator-client.service.interface.ts b/apps/client/src/app/probable-waffle/communicators/scene-communicator-client.service.interface.ts new file mode 100644 index 00000000..aa16db3b --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/scene-communicator-client.service.interface.ts @@ -0,0 +1,7 @@ +import { Subscription } from "rxjs"; +import { ProbableWaffleCommunicators } from "./scene-communicator-client.service"; + +export interface SceneCommunicatorClientServiceInterface { + createCommunicators(gameInstanceId: string): ProbableWaffleCommunicators; + destroyCommunicators(gameInstanceId: string, subscriptions: Subscription[]): void; +} diff --git a/apps/client/src/app/probable-waffle/communicators/scene-communicator-client.service.spec.ts b/apps/client/src/app/probable-waffle/communicators/scene-communicator-client.service.spec.ts new file mode 100644 index 00000000..6d888c21 --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/scene-communicator-client.service.spec.ts @@ -0,0 +1,25 @@ +import { TestBed } from "@angular/core/testing"; + +import { ProbableWaffleCommunicators, SceneCommunicatorClientService } from "./scene-communicator-client.service"; +import { SceneCommunicatorClientServiceInterface } from "./scene-communicator-client.service.interface"; + +export const SceneCommunicatorClientServiceStub = { + createCommunicators(gameInstanceId: string): ProbableWaffleCommunicators { + return {} as ProbableWaffleCommunicators; + }, + destroyCommunicators() { + // + } +} satisfies SceneCommunicatorClientServiceInterface; +describe("SceneCommunicatorClientService", () => { + let service: SceneCommunicatorClientService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(SceneCommunicatorClientService); + }); + + it("should be created", () => { + expect(service).toBeTruthy(); + }); +}); 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 new file mode 100644 index 00000000..9c144ebf --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/scene-communicator-client.service.ts @@ -0,0 +1,51 @@ +import { inject, Injectable } from "@angular/core"; +import { AuthenticatedSocketService } from "../../data-access/chat/authenticated-socket.service"; +import { SceneCommunicatorClientServiceInterface } from "./scene-communicator-client.service.interface"; +import { ProbableWaffleCommunicatorService } from "./probable-waffle-communicator.service"; +import { Observable, Subscription } from "rxjs"; +import { + ProbableWaffleGameInstanceMetadataChangeEvent, + ProbableWaffleGameModeDataChangeEvent, + ProbableWafflePlayerDataChangeEvent, + ProbableWaffleSpectatorDataChangeEvent +} from "@fuzzy-waddle/api-interfaces"; + +export type ProbableWaffleCommunicators = { + gameInstanceObservable: Observable; + gameModeObservable: Observable; + playerObservable: Observable; + spectatorObservable: Observable; +} | null; + +@Injectable({ + providedIn: "root" +}) +export class SceneCommunicatorClientService implements SceneCommunicatorClientServiceInterface { + private readonly communicator = inject(ProbableWaffleCommunicatorService); + private readonly authenticatedSocketService = inject(AuthenticatedSocketService); + createCommunicators(gameInstanceId: string): ProbableWaffleCommunicators { + this.communicator.startCommunication(gameInstanceId, this.authenticatedSocketService.socket); + return this.communicatorObservables; + } + + get communicatorObservables(): ProbableWaffleCommunicators { + if ( + !this.communicator.gameInstanceMetadataChanged || + !this.communicator.gameModeChanged || + !this.communicator.playerChanged || + !this.communicator.spectatorChanged + ) + return null; + return { + gameInstanceObservable: this.communicator.gameInstanceMetadataChanged!.on, + gameModeObservable: this.communicator.gameModeChanged!.on, + playerObservable: this.communicator.playerChanged!.on, + spectatorObservable: this.communicator.spectatorChanged!.on + }; + } + + destroyCommunicators(gameInstanceId: string, subscriptions: Subscription[]) { + this.communicator.stopCommunication(gameInstanceId, this.authenticatedSocketService.socket); + subscriptions.forEach((subscription) => subscription.unsubscribe()); + } +} diff --git a/apps/client/src/app/probable-waffle/communicators/scene-communicator.service.ts b/apps/client/src/app/probable-waffle/communicators/scene-communicator.service.ts deleted file mode 100644 index cc3086aa..00000000 --- a/apps/client/src/app/probable-waffle/communicators/scene-communicator.service.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { BehaviorSubject, Subject, Subscription } from 'rxjs'; -import { AtlasFrame } from '../gui/game-interface/editor-drawer/atlas-loader.service'; - -// for communication of selected sprite atlas in gui to scene -export interface AtlasEmitValue { - tilesetName: string; - atlasFrame: AtlasFrame; -} - -// for communication of selection between GUI and Scene -export interface GameObjectSelection { - name: string; // todo this needs to change!!! -} - -export class SceneCommunicatorService { - static DEFAULT_LAYER = 0; - static DEFAULT_TILE_REPLACE = 1; - - static atlasEmitterSubject: Subject; - static tileEmitterSubject: Subject; - static tileEmitterNrSubject: BehaviorSubject; - static layerEmitterSubject: BehaviorSubject; - static selectionChangedSubject: Subject = new Subject(); - - private static subscriptions: Subscription[] = []; - - static addSubscription(...sub: Subscription[]) { - SceneCommunicatorService.subscriptions.push(...sub); - } - - static setup() { - SceneCommunicatorService.unsubscribe(); - SceneCommunicatorService.tileEmitterSubject = new Subject(); - SceneCommunicatorService.atlasEmitterSubject = new Subject(); - SceneCommunicatorService.tileEmitterNrSubject = new BehaviorSubject( - SceneCommunicatorService.DEFAULT_TILE_REPLACE - ); - SceneCommunicatorService.layerEmitterSubject = new BehaviorSubject(SceneCommunicatorService.DEFAULT_LAYER); - } - - static unsubscribe() { - SceneCommunicatorService.subscriptions.forEach((sub) => sub.unsubscribe()); - SceneCommunicatorService.subscriptions = []; - } -} 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..e0fa65af --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-indexeddb-storage.service.ts @@ -0,0 +1,90 @@ +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; + private initializationPromise: Promise | null = null; + private isInitialized = false; + + constructor() { + this.initializeDatabase(); + } + + 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) => { + console.error("Error opening IndexedDB:", (event.target as IDBOpenDBRequest).error); + reject(); + }; + + request.onsuccess = (event) => { + this.db = (event.target as IDBOpenDBRequest).result; + this.isInitialized = true; + resolve(); + }; + + request.onupgradeneeded = (event) => { + const db = (event.target as IDBOpenDBRequest).result; + db.createObjectStore(this.objectStoreName, { keyPath: "saveName" }); + }; + }); + + return this.initializationPromise; + } + + 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 { + await this.initializeDatabase(); + 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 { + await this.initializeDatabase(); + 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 { + await this.initializeDatabase(); + const objectStore = this.getObjectStore(); + await new Promise((resolve, reject) => { + 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/communicators/storage/game-instance-local-storage.service.spec.ts b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-local-storage.service.spec.ts new file mode 100644 index 00000000..39b1829e --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-local-storage.service.spec.ts @@ -0,0 +1,29 @@ +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"; + +export const gameInstanceLocalStorageServiceStub = { + 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("GameInstanceLocalStorageService", () => { + let service: GameInstanceLocalStorageService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(GameInstanceLocalStorageService); + }); + + it("should be created", () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/communicators/storage/game-instance-local-storage.service.ts b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-local-storage.service.ts new file mode 100644 index 00000000..c3f9f96b --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-local-storage.service.ts @@ -0,0 +1,49 @@ +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 GameInstanceLocalStorageService implements GameInstanceStorageServiceInterface { + private readonly localStorageKey = "probable-waffle-game-instances"; + async saveToStorage(saveData: ProbableWaffleGameInstanceSaveData): Promise { + return this.saveToLocalStorage(saveData); + } + + async getFromStorage(): Promise { + return this.loadFromLocalStorage(); + } + + async deleteFromStorage(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData): Promise { + this.deleteFromLocalStorage(gameInstanceSaveData); + } + + private loadFromLocalStorage(): ProbableWaffleGameInstanceSaveData[] { + try { + return JSON.parse(localStorage.getItem(this.localStorageKey) || "[]"); + } catch (e) { + console.error("Load from local storage", e); + return []; + } + } + + private saveToLocalStorage(gameInstance: ProbableWaffleGameInstanceSaveData): void { + const existingGameInstances = this.loadFromLocalStorage(); + existingGameInstances.push(gameInstance); + localStorage.setItem(this.localStorageKey, JSON.stringify(existingGameInstances)); + } + + private deleteFromLocalStorage(gameInstanceSaveData: ProbableWaffleGameInstanceSaveData) { + const existingGameInstances = this.loadFromLocalStorage(); + const index = existingGameInstances.findIndex( + (gameInstance) => + gameInstance.gameInstanceData.gameInstanceMetadataData!.gameInstanceId === + gameInstanceSaveData.gameInstanceData.gameInstanceMetadataData!.gameInstanceId + ); + if (index !== -1) { + existingGameInstances.splice(index, 1); + localStorage.setItem(this.localStorageKey, JSON.stringify(existingGameInstances)); + } + } +} 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 new file mode 100644 index 00000000..ee4a1cad --- /dev/null +++ b/apps/client/src/app/probable-waffle/communicators/storage/game-instance-storage.service.interface.ts @@ -0,0 +1,7 @@ +import { ProbableWaffleGameInstanceSaveData } from "@fuzzy-waddle/api-interfaces"; + +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/core/probable-waffle.scene.ts b/apps/client/src/app/probable-waffle/game/core/probable-waffle.scene.ts new file mode 100644 index 00000000..992d14c0 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/core/probable-waffle.scene.ts @@ -0,0 +1,34 @@ +import { BaseScene } from "../../../shared/game/phaser/scene/base.scene"; +import { ProbableWaffleGameData } from "../scenes/probable-waffle-game-data"; +import { + ProbableWaffleGameMode, + ProbableWaffleGameModeData, + ProbableWaffleGameState, + ProbableWaffleGameStateData, + ProbableWaffleLevels, + ProbableWaffleMapData, + ProbableWafflePlayer, + ProbableWafflePlayerControllerData, + ProbableWafflePlayerStateData, + ProbableWaffleSpectator, + ProbableWaffleSpectatorData +} from "@fuzzy-waddle/api-interfaces"; +import { ProbableWaffleCommunicatorService } from "../../communicators/probable-waffle-communicator.service"; + +export class ProbableWaffleScene extends BaseScene< + ProbableWaffleGameData, + ProbableWaffleGameStateData, + ProbableWaffleGameState, + ProbableWaffleGameModeData, + ProbableWaffleGameMode, + ProbableWafflePlayerStateData, + ProbableWafflePlayerControllerData, + ProbableWafflePlayer, + ProbableWaffleSpectatorData, + ProbableWaffleSpectator, + ProbableWaffleCommunicatorService +> { + get mapInfo(): ProbableWaffleMapData { + return ProbableWaffleLevels[this.baseGameData.gameInstance.data.gameModeData!.map!]; + } +} 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 new file mode 100644 index 00000000..aca0f45a --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/data/actor-data.ts @@ -0,0 +1,11 @@ +export const ActorDataKey = "actorData"; +export class ActorData { + constructor( + public readonly components: any[], + 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-manager.ts b/apps/client/src/app/probable-waffle/game/data/actor-manager.ts new file mode 100644 index 00000000..4c356540 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/data/actor-manager.ts @@ -0,0 +1,124 @@ +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; +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 { + 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 + }; + 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(); + const selectableComponent = getActorComponent(actor, SelectableComponent); + if (selectableComponent) actorDefinition["selectable"] = selectableComponent.getSelected(); + 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); + + 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); + if (properties.selectable) getActorComponent(actor, SelectableComponent)?.setSelected(properties.selectable); + DepthHelper.setActorDepth(actor); + return actor; + } +} 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/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/data/save-game.ts b/apps/client/src/app/probable-waffle/game/data/save-game.ts new file mode 100644 index 00000000..3b993948 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/data/save-game.ts @@ -0,0 +1,102 @@ +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"; + + constructor(private scene: GameProbableWaffleScene) { + 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.demoPostNewActors(); + } + private loadActorsFromSaveGame() { + 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; + 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) => { + 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) => { + const actorDefinition = ActorManager.getActorDefinitionFromActor(child); + if (actorDefinition) { + this.scene.baseGameData.gameInstance.gameState!.data.actors.push(actorDefinition); + } + }); + } + + private demoPostNewActors() { + const actors = [ + { + name: TivaraMacemanMale.name, + x: 544, + y: 900, + z: 0, + owner: 1 + } 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 + ]; + actors.forEach((actor) => { + this.createActorFromDefinition(actor); + }); + } + + 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/entity/actor/ActorContainer.scene b/apps/client/src/app/probable-waffle/game/entity/actor/ActorContainer.scene index 59de9a8c..7ec06789 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/ActorContainer.scene +++ b/apps/client/src/app/probable-waffle/game/entity/actor/ActorContainer.scene @@ -4,6 +4,7 @@ "settings": { "exportClass": true, "autoImport": true, + "superClassName": "Phaser.GameObjects.Container implements IComponent", "preloadMethodName": "", "preloadPackFiles": [], "createMethodName": "", diff --git a/apps/client/src/app/probable-waffle/game/entity/actor/ActorContainer.ts b/apps/client/src/app/probable-waffle/game/entity/actor/ActorContainer.ts index 9f02af13..5321eadb 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/ActorContainer.ts +++ b/apps/client/src/app/probable-waffle/game/entity/actor/ActorContainer.ts @@ -2,13 +2,12 @@ /* START OF COMPILED CODE */ -import Phaser from "phaser"; /* START-USER-IMPORTS */ -import { Utils } from "phaser"; -import { ComponentService } from "../../../../../app/probable-waffle/game/core/component.service"; +import Phaser, { Utils } from "phaser"; +import { ComponentService, IComponent } from "../../../../../app/probable-waffle/game/core/component.service"; /* END-USER-IMPORTS */ -export default class ActorContainer extends Phaser.GameObjects.Container { +export default class ActorContainer extends Phaser.GameObjects.Container implements IComponent { constructor(scene: Phaser.Scene, x?: number, y?: number) { super(scene, x ?? 0, y ?? 0); @@ -85,8 +84,8 @@ export default class ActorContainer extends Phaser.GameObjects.Container { } override destroy(fromScene?: boolean): void { - this.scene.events.off(Phaser.Scenes.Events.UPDATE, this.update, this); - this.scene.events.off(Phaser.Scenes.Events.DESTROY, this.destroy, this); + this.scene?.events.off(Phaser.Scenes.Events.UPDATE, this.update, this); + this.scene?.events.off(Phaser.Scenes.Events.DESTROY, this.destroy, this); super.destroy(fromScene); this.destroyed = true; this.components.destroy(); diff --git a/apps/client/src/app/probable-waffle/game/entity/actor/character.ts b/apps/client/src/app/probable-waffle/game/entity/actor/character.ts index a048e684..a1dd70d2 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/character.ts +++ b/apps/client/src/app/probable-waffle/game/entity/actor/character.ts @@ -3,21 +3,21 @@ import { AnimDirectionEnum, IsoAngleToAnimDirectionEnum, LPCAnimTypeEnum -} from '../character/animation/lpc-animation-helper'; -import { HealthComponent, HealthDefinition } from '../combat/components/health-component'; -import { StateMachine } from '../character/animation/state-machine'; -import { CharacterMovementComponent, MoveEventTypeEnum } from './components/character-movement-component'; -import { CharacterSoundComponent, SoundDefinition } from './components/character-sound-component'; -import { MovableActor } from './movable-actor'; -import { Blackboard } from '../character/ai/blackboard'; -import { DefaultPawnBehaviorTree } from '../character/ai/default-pawn-behavior-tree'; -import { PawnBehaviorTreeClasses } from '../character/ai/behavior-trees'; -import { SpriteAnimationHelper } from '../character/animation/sprite-animation-helper'; -import { TilePlacementData } from '../../world/managers/controllers/input/tilemap/tilemap-input.handler'; -import { CostData } from '../building/production/production-cost-component'; -import { RepresentableActorDefinition } from './representable-actor'; -import { Animations, Scene, Scenes } from 'phaser'; -import { SpriteRepresentationComponent } from './components/sprite-representable-component'; +} from "../character/animation/lpc-animation-helper"; +import { HealthComponent, HealthDefinition } from "../combat/components/health-component"; +import { StateMachine } from "../character/animation/state-machine"; +import { CharacterMovementComponent, MoveEventTypeEnum } from "./components/character-movement-component"; +import { CharacterSoundComponent, SoundDefinition } from "./components/character-sound-component"; +import { MovableActor } from "./movable-actor"; +import { Blackboard } from "../character/ai/blackboard"; +import { DefaultPawnBehaviorTree } from "../character/ai/default-pawn-behavior-tree"; +import { PawnBehaviorTreeClasses } from "../character/ai/behavior-trees"; +import { SpriteAnimationHelper } from "../character/animation/sprite-animation-helper"; +import { TilePlacementData } from "../../world/managers/controllers/input/tilemap/tilemap-input.handler"; +import { CostData } from "../building/production/production-cost-component"; +import { RepresentableActorDefinition } from "./representable-actor"; +import { Animations, Scene, Scenes } from "phaser"; +import { SpriteRepresentationComponent } from "./components/sprite-representable-component"; export type PawnInfoDefinition = RepresentableActorDefinition & { healthDefinition: HealthDefinition; @@ -83,7 +83,7 @@ export abstract class Character extends MovableActor { } override kill() { - this.warriorStateMachine.setState('dead'); + this.warriorStateMachine.setState("dead"); super.kill(); } @@ -91,10 +91,10 @@ export abstract class Character extends MovableActor { const prevDir = this.currentDir; this.currentDir = dir; // if state is "run" and currentDir is different, then change direction - if (this.warriorStateMachine.isCurrentState('run') && prevDir !== dir) { + if (this.warriorStateMachine.isCurrentState("run") && prevDir !== dir) { this.warriorRunEnter(); } - this.warriorStateMachine.setState('run'); + this.warriorStateMachine.setState("run"); } private subscribeToEvents() { @@ -114,24 +114,24 @@ export abstract class Character extends MovableActor { } private initStateMachine() { - this.warriorStateMachine = new StateMachine(this, 'warrior') // todo some unique id? - .addState('idle', { + this.warriorStateMachine = new StateMachine(this, "warrior") // todo some unique id? + .addState("idle", { onEnter: this.warriorIdleEnter, onUpdate: this.warriorIdleUpdate }) - .addState('run', { + .addState("run", { onEnter: this.warriorRunEnter, onUpdate: this.warriorRunUpdate, onExit: this.warriorRunExit }) - .addState('attack', { + .addState("attack", { onEnter: this.warriorAttackEnter }) - .addState('dead', { + .addState("dead", { onEnter: this.warriorDeadEnter }); - this.warriorStateMachine.setState('idle'); + this.warriorStateMachine.setState("idle"); } private lateUpdate(time: number, delta: number) { @@ -171,9 +171,9 @@ export abstract class Character extends MovableActor { } const isAttacking = false; // todo if (isAttacking) { - this.warriorStateMachine.setState('attack'); + this.warriorStateMachine.setState("attack"); } else { - this.warriorStateMachine.setState('idle'); + this.warriorStateMachine.setState("idle"); } } @@ -200,15 +200,15 @@ export abstract class Character extends MovableActor { sprite.off(Animations.Events.ANIMATION_UPDATE, startHit); - console.log('attacked'); + console.log("attacked"); }; sprite.on(Animations.Events.ANIMATION_UPDATE, startHit); sprite.once(Animations.Events.ANIMATION_COMPLETE_KEY, (a: unknown, b: unknown) => { // todo - console.log('animation complete', a, b); - this.warriorStateMachine.setState('idle'); + console.log("animation complete", a, b); + this.warriorStateMachine.setState("idle"); // TODO: hide and remove the sword swing hitbox // this.swordHitbox.body.enable = false; 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 3dc79626..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 @@ -1,17 +1,17 @@ -import { IComponent } from '../../../core/component.service'; -import { Actor } from '../actor'; -import { Barracks } from '../../assets/buildings/barracks'; -import { Mine } from '../../assets/buildings/mine'; -import { ConstructionSiteComponent } from '../../building/construction/construction-site-component'; -import { ContainerComponent } from '../../building/container-component'; -import { Subject } from 'rxjs'; -import { PawnAiControllerComponent } from '../../../world/managers/controllers/pawn-ai-controller-component'; -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 { SpriteRepresentationComponent } from './sprite-representable-component'; +import { IComponent } from "../../../core/component.service"; +import { Actor } from "../actor"; +import { Barracks } from "../../assets/buildings/barracks"; +import { Mine } from "../../assets/buildings/mine"; +import { ConstructionSiteComponent } from "../../building/construction/construction-site-component"; +import { ContainerComponent } from "../../building/container-component"; +import { Subject } from "rxjs"; +import { PawnAiControllerComponent } from "../../../world/managers/controllers/pawn-ai-controller-component"; +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 { DEPRECATEDownerComponent } from "./DEPRECATEDowner-component"; +import { SpriteRepresentationComponent } from "./sprite-representable-component"; export type ActorAbleToBeBuilt = Barracks | Mine; export type ActorAbleToBeBuiltClass = typeof Barracks | typeof Mine; @@ -75,7 +75,7 @@ export class BuilderComponent implements IComponent { // check requirements const missingRequirement = GameplayLibrary.getMissingRequirementsFor(this.actor, buildingClass); if (missingRequirement) { - console.log('missing requirement', missingRequirement); + console.log("missing requirement", missingRequirement); // player is missing a required actor. stop pawnAiController.issueStopOrder(); @@ -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, @@ -96,7 +96,7 @@ export class BuilderComponent implements IComponent { ); if (!building) { - console.log('building could not be spawned'); + console.log("building could not be spawned"); return false; } @@ -124,7 +124,7 @@ export class BuilderComponent implements IComponent { // notify listeners this.onRemovedFromConstructionSite.next([this.actor, constructionSite]); - console.log('builder left building site'); + console.log("builder left building site"); if (this.enterConstructionSite) { // leave building site const containerComponent = constructionSite.components.findComponentOrNull(ContainerComponent); diff --git a/apps/client/src/app/probable-waffle/game/entity/actor/components/character-movement-component.ts b/apps/client/src/app/probable-waffle/game/entity/actor/components/character-movement-component.ts index 8e6fdd2b..86e6c748 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/components/character-movement-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/actor/components/character-movement-component.ts @@ -1,20 +1,20 @@ import { ManualTilesHelper, TilePlacementWorldWithProperties -} from '../../../world/map/tile/manual-tiles/manual-tiles.helper'; -import { TilemapHelper } from '../../../world/map/tile/tilemap.helper'; -import { MapSizeInfo } from '../../../world/const/map-size.info'; -import { Vector2Simple } from '../../../library/math/intersection'; -import { IComponent } from '../../../core/component.service'; -import { Actor } from '../actor'; -import { Events, GameObjects, Tweens } from 'phaser'; -import { SpriteRepresentationComponent } from './sprite-representable-component'; -import { TransformComponent } from './transformable-component'; +} from "../../../world/map/tile/manual-tiles/manual-tiles.helper"; +import { TilemapHelper } from "../../../world/map/tile/tilemap.helper"; +import { MapSizeInfo } from "../../../world/const/map-size.info"; +import { IComponent } from "../../../core/component.service"; +import { Actor } from "../actor"; +import { Events, GameObjects, Tweens } from "phaser"; +import { SpriteRepresentationComponent } from "./sprite-representable-component"; +import { TransformComponent } from "./transformable-component"; +import { Vector2Simple } from "@fuzzy-waddle/api-interfaces"; export enum MoveEventTypeEnum { - MOVE_START = 'move-start', - MOVE_END = 'move-end', - MOVE_PROGRESS = 'move-progress' + MOVE_START = "move-start", + MOVE_END = "move-end", + MOVE_PROGRESS = "move-progress" } export class CharacterMovementComponent implements IComponent { diff --git a/apps/client/src/app/probable-waffle/game/entity/actor/components/character-sound-component.ts b/apps/client/src/app/probable-waffle/game/entity/actor/components/character-sound-component.ts index d6d16a2d..dc5c882a 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/components/character-sound-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/actor/components/character-sound-component.ts @@ -1,5 +1,5 @@ -import { GameObjects } from 'phaser'; -import { IComponent } from '../../../core/component.service'; +import { GameObjects } from "phaser"; +import { IComponent } from "../../../core/component.service"; export type SoundDefinition = { move?: string; diff --git a/apps/client/src/app/probable-waffle/game/entity/actor/components/containable-component.ts b/apps/client/src/app/probable-waffle/game/entity/actor/components/containable-component.ts index 312e4beb..04515203 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/components/containable-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/actor/components/containable-component.ts @@ -1,6 +1,6 @@ -import { Actor } from '../actor'; -import { ContainerComponent } from '../../building/container-component'; -import { IComponent } from '../../../core/component.service'; +import { Actor } from "../actor"; +import { ContainerComponent } from "../../building/container-component"; +import { IComponent } from "../../../core/component.service"; /** * Apply on actor that can be loaded into a container - for example enter a mine to gather resources or enter a tower to repair or shoot 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 092a7699..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 @@ -1,16 +1,16 @@ -import { IComponent } from '../../../core/component.service'; -import { GatherData } from '../../economy/gather-data'; -import { Actor } from '../actor'; -import { ResourceType } from '../../economy/resource/resource-type'; -import { ResourceSourceComponent } from '../../economy/resource/resource-source-component'; -import { Mine } from '../../assets/buildings/mine'; -import { GameplayLibrary } from '../../../library/gameplay-library'; -import { Subject } from 'rxjs'; -import { PlayerController } from '../../../world/managers/controllers/player-controller'; -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 { IComponent } from "../../../core/component.service"; +import { GatherData } from "../../economy/gather-data"; +import { Actor } from "../actor"; +import { ResourceSourceComponent } from "../../economy/resource/resource-source-component"; +import { Mine } from "../../assets/buildings/mine"; +import { GameplayLibrary } from "../../../library/gameplay-library"; +import { Subject } from "rxjs"; +import { PlayerController } from "../../../world/managers/controllers/player-controller"; +import { PlayerResourcesComponent } from "../../../world/managers/controllers/player-resources-component"; +import { ContainerComponent } from "../../building/container-component"; +import { ResourceDrainComponent } from "../../economy/resource/resource-drain-component"; +import { DEPRECATEDownerComponent } from "./DEPRECATEDowner-component"; +import { ResourceTypeDefinition } from "@fuzzy-waddle/api-interfaces"; export type GathererClasses = typeof Mine; @@ -18,14 +18,16 @@ export class GathererComponent implements IComponent { gatheredResources: GatherData[] = []; // amount the actor is carrying carriedResourceAmount = 0; - carriedResourceType: ResourceType | null = null; + carriedResourceType: ResourceTypeDefinition | null = null; currentResourceSource: Actor | null = null; previousResourceSource: Actor | null = null; - previousResourceType: ResourceType | null = null; + previousResourceType: ResourceTypeDefinition | null = null; remainingCooldown = 0; onResourceGathered: Subject<[Actor, Actor, GatherData, number]> = new Subject<[Actor, Actor, GatherData, number]>(); - onResourcesReturned: Subject<[Actor, ResourceType, number]> = new Subject<[Actor, ResourceType, number]>(); + onResourcesReturned: Subject<[Actor, ResourceTypeDefinition, number]> = new Subject< + [Actor, ResourceTypeDefinition, number] + >(); constructor( private readonly actor: Actor, @@ -96,7 +98,7 @@ export class GathererComponent implements IComponent { findClosestResourceDrain(): Actor | null { if (this.carriedResourceType === null) { - throw new Error('Gatherer is not carrying any resources'); + throw new Error("Gatherer is not carrying any resources"); } // find nearby actors @@ -104,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) { @@ -148,7 +150,7 @@ export class GathererComponent implements IComponent { return this.getClosestResourceSource(this.previousResourceType, this.resourceSweepRadius); } - getClosestResourceSource(resourceType: ResourceType | null, maxDistance: number): Actor | null { + getClosestResourceSource(resourceType: ResourceTypeDefinition | null, maxDistance: number): Actor | null { let closestResourceSource: Actor | null = null; let closestResourceSourceDistance = 0; @@ -193,7 +195,7 @@ export class GathererComponent implements IComponent { return 0; } if (!this.carriedResourceType) { - throw new Error('Gatherer is not carrying any resources'); + throw new Error("Gatherer is not carrying any resources"); } // check resource type @@ -256,7 +258,7 @@ export class GathererComponent implements IComponent { returnResources(resourceDrain: Actor): number { if (!this.carriedResourceType) { - throw new Error('Gatherer is not carrying any resources'); + throw new Error("Gatherer is not carrying any resources"); } // return resources const resourceDrainComponent = resourceDrain.components.findComponent(ResourceDrainComponent); @@ -295,7 +297,7 @@ export class GathererComponent implements IComponent { return gatherData.range; } - private getGatherDataForResourceType(carriedResourceType: ResourceType): GatherData | null { + private getGatherDataForResourceType(carriedResourceType: ResourceTypeDefinition): GatherData | null { return this.gatheredResources.find((gatherData) => gatherData.resourceType === carriedResourceType) ?? null; } 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 f5c48829..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/components/requirements-component.ts b/apps/client/src/app/probable-waffle/game/entity/actor/components/requirements-component.ts index cc6faece..f53719cb 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/components/requirements-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/actor/components/requirements-component.ts @@ -1,4 +1,4 @@ -import { Actor } from '../actor'; +import { Actor } from "../actor"; export class RequirementsComponent { // todo should use techTreeComponent maybe? 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..04932d20 --- /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; +import { getGameObjectBounds, getGameObjectDepth } from "../../../data/game-object-helper"; + +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 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 + 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 gameObjectDepth = getGameObjectDepth(this.gameObject); + if (gameObjectDepth !== null) this.selectionCircle.depth = gameObjectDepth - 1; + } + + private destroy = () => { + this.selectionCircle.destroy(); + }; +} diff --git a/apps/client/src/app/probable-waffle/game/entity/actor/components/sprite-representable-component.ts b/apps/client/src/app/probable-waffle/game/entity/actor/components/sprite-representable-component.ts index 1e25d488..1bc8b890 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/components/sprite-representable-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/actor/components/sprite-representable-component.ts @@ -1,16 +1,20 @@ -import { IComponent } from '../../../core/component.service'; -import { Subscription } from 'rxjs'; -import { SpriteHelper, SpritePlacementData } from '../sprite-helper'; -import { TransformComponent } from './transformable-component'; -import { Actor } from '../actor'; -import { GameObjects, Scene } from 'phaser'; +import { IComponent } from "../../../core/component.service"; +import { Subscription } from "rxjs"; +import { SpriteHelper, SpritePlacementData } from "../sprite-helper"; +import { TransformComponent } from "./transformable-component"; +import { Actor } from "../actor"; +import { GameObjects, Scene } from "phaser"; export class SpriteRepresentationComponent implements IComponent { scene: Scene; sprite: GameObjects.Sprite; private transformSubscription?: Subscription; - constructor(private actor: Actor, scene: Scene, spritePlacementData: SpritePlacementData) { + constructor( + private actor: Actor, + scene: Scene, + spritePlacementData: SpritePlacementData + ) { this.scene = scene; const spriteWorldPlacementInfo = SpriteHelper.getSpriteWorldPlacementInfo(spritePlacementData.tilePlacementData); this.sprite = this.scene.add.sprite( diff --git a/apps/client/src/app/probable-waffle/game/entity/actor/components/transformable-component.ts b/apps/client/src/app/probable-waffle/game/entity/actor/components/transformable-component.ts index dc4dac37..d57a5715 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/components/transformable-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/actor/components/transformable-component.ts @@ -1,7 +1,7 @@ -import { TilePlacementData } from '../../../world/managers/controllers/input/tilemap/tilemap-input.handler'; -import { SpriteHelper, SpriteWorldPlacementInfo } from '../sprite-helper'; -import { IComponent } from '../../../core/component.service'; -import { EventEmitter } from '@angular/core'; +import { TilePlacementData } from "../../../world/managers/controllers/input/tilemap/tilemap-input.handler"; +import { SpriteHelper, SpriteWorldPlacementInfo } from "../sprite-helper"; +import { IComponent } from "../../../core/component.service"; +import { EventEmitter } from "@angular/core"; export type TransformChange = [TilePlacementData, SpriteWorldPlacementInfo]; diff --git a/apps/client/src/app/probable-waffle/game/entity/actor/movable-actor.ts b/apps/client/src/app/probable-waffle/game/entity/actor/movable-actor.ts index 66ef7291..a8d7ecae 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/movable-actor.ts +++ b/apps/client/src/app/probable-waffle/game/entity/actor/movable-actor.ts @@ -1,8 +1,8 @@ -import { CharacterMovementComponent } from './components/character-movement-component'; -import { PawnAiControllerComponent } from '../../world/managers/controllers/pawn-ai-controller-component'; -import { Blackboard } from '../character/ai/blackboard'; -import { RepresentableActor } from './representable-actor'; -import { PawnBehaviorTree, PawnBehaviorTreeClasses } from '../character/ai/behavior-trees'; +import { CharacterMovementComponent } from "./components/character-movement-component"; +import { PawnAiControllerComponent } from "../../world/managers/controllers/pawn-ai-controller-component"; +import { Blackboard } from "../character/ai/blackboard"; +import { RepresentableActor } from "./representable-actor"; +import { PawnBehaviorTree, PawnBehaviorTreeClasses } from "../character/ai/behavior-trees"; /* * pawn includes AI controller and move component, so it can move around 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 ddcf2850..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,9 +1,9 @@ -import { Character } from './character'; -import { TilePlacementData } from '../../world/managers/controllers/input/tilemap/tilemap-input.handler'; -import { OwnerComponent } from './components/owner-component'; -import { CostData, ProductionCostComponent } from '../building/production/production-cost-component'; -import { Scene } from 'phaser'; -import { PlayerController } from '../../world/managers/controllers/player-controller'; +import { Character } from "./character"; +import { TilePlacementData } from "../../world/managers/controllers/input/tilemap/tilemap-input.handler"; +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"; export abstract class PlayerCharacter extends Character { cost!: CostData; @@ -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/actor/representable-actor.ts b/apps/client/src/app/probable-waffle/game/entity/actor/representable-actor.ts index 245f6398..140f8203 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/representable-actor.ts +++ b/apps/client/src/app/probable-waffle/game/entity/actor/representable-actor.ts @@ -1,8 +1,8 @@ -import { Actor } from './actor'; -import { SpriteRepresentationComponent } from './components/sprite-representable-component'; -import { TransformComponent } from './components/transformable-component'; -import { TilePlacementData } from '../../world/managers/controllers/input/tilemap/tilemap-input.handler'; -import { Scene, Scenes } from 'phaser'; +import { Actor } from "./actor"; +import { SpriteRepresentationComponent } from "./components/sprite-representable-component"; +import { TransformComponent } from "./components/transformable-component"; +import { TilePlacementData } from "../../world/managers/controllers/input/tilemap/tilemap-input.handler"; +import { Scene } from "phaser"; export type RepresentableActorDefinition = { textureMapDefinition: TextureMapDefinition; diff --git a/apps/client/src/app/probable-waffle/game/entity/actor/sprite-helper.ts b/apps/client/src/app/probable-waffle/game/entity/actor/sprite-helper.ts index 37c779dc..efde7ee4 100644 --- a/apps/client/src/app/probable-waffle/game/entity/actor/sprite-helper.ts +++ b/apps/client/src/app/probable-waffle/game/entity/actor/sprite-helper.ts @@ -1,12 +1,12 @@ -import { GameObjects, Scene } from 'phaser'; -import { IsoHelper } from '../../world/map/tile/iso-helper'; -import { MapSizeInfo } from '../../world/const/map-size.info'; -import { ManualTilesHelper } from '../../world/map/tile/manual-tiles/manual-tiles.helper'; -import { TilemapHelper } from '../../world/map/tile/tilemap.helper'; -import { TilePlacementData } from '../../world/managers/controllers/input/tilemap/tilemap-input.handler'; -import { PlaceableAtlasProperties } from '../placable-objects/static-object'; -import { WarriorDefinition } from '../assets/characters/warrior'; -import { Vector2Simple } from '../../library/math/intersection'; +import { GameObjects, Scene } from "phaser"; +import { IsoHelper } from "../../world/map/tile/iso-helper"; +import { MapSizeInfo } from "../../world/const/map-size.info"; +import { ManualTilesHelper } from "../../world/map/tile/manual-tiles/manual-tiles.helper"; +import { TilemapHelper } from "../../world/map/tile/tilemap.helper"; +import { TilePlacementData } from "../../world/managers/controllers/input/tilemap/tilemap-input.handler"; +import { PlaceableAtlasProperties } from "../placable-objects/static-object"; +import { WarriorDefinition } from "../assets/characters/warrior"; +import { Vector2Simple } from "@fuzzy-waddle/api-interfaces"; export type SpritePlacementData = { textureName: string; @@ -50,11 +50,11 @@ export class SpriteHelper { sprite.setInteractive(); sprite.depth = spriteWorldPlacementInfo.depth; - const [imageName] = frame.split('.'); + const [imageName] = frame.split("."); if (imageName === WarriorDefinition.textureMapDefinition.textureName) { // todo this.placeSpriteAsIs(sprite); - } else if (imageName === 'barracks') { + } else if (imageName === "barracks") { // todo just for test this.rescaleSpriteToFitTwoTiles(sprite); } else { diff --git a/apps/client/src/app/probable-waffle/game/entity/assets/buildings/barracks.ts b/apps/client/src/app/probable-waffle/game/entity/assets/buildings/barracks.ts index 203878e5..3fa89feb 100644 --- a/apps/client/src/app/probable-waffle/game/entity/assets/buildings/barracks.ts +++ b/apps/client/src/app/probable-waffle/game/entity/assets/buildings/barracks.ts @@ -1,18 +1,18 @@ -import { Building, BuildingInfoDefinition } from './building'; -import { ProductionComponent } from '../../building/production/production-component'; -import { Warrior, WarriorDefinition } from '../characters/warrior'; -import { Worker } from '../characters/worker'; -import { CostData } from '../../building/production/production-cost-component'; -import { PaymentType } from '../../building/payment-type'; -import { Resources, ResourceType } from '../../economy/resource/resource-type'; -import { ContainerComponent } from '../../building/container-component'; +import { Building, BuildingInfoDefinition } from "./building"; +import { ProductionComponent } from "../../building/production/production-component"; +import { Warrior, WarriorDefinition } from "../characters/warrior"; +import { Worker } from "../characters/worker"; +import { CostData } from "../../building/production/production-cost-component"; +import { PaymentType } from "../../building/payment-type"; +import { ContainerComponent } from "../../building/container-component"; +import { Resources, ResourceTypeDefinition } from "@fuzzy-waddle/api-interfaces"; export const BarracksDefinition: BuildingInfoDefinition = { textureMapDefinition: { - textureName: 'warrior', + textureName: "warrior", spriteSheet: { - name: 'barracks', - path: 'general/barracks/', + name: "barracks", + path: "general/barracks/", frameConfig: { frameWidth: 64, frameHeight: 64 @@ -22,7 +22,7 @@ export const BarracksDefinition: BuildingInfoDefinition = { cost: new CostData( PaymentType.PayOverTime, 100, - new Map([ + new Map([ [Resources.wood, 100], [Resources.stone, 100] ]), @@ -33,7 +33,7 @@ export const BarracksDefinition: BuildingInfoDefinition = { }, soundDefinition: {}, constructionSiteDefinition: { - constructionCosts: new Map([ + constructionCosts: new Map([ [Resources.wood, 100], [Resources.stone, 100] ]), @@ -48,7 +48,7 @@ export const BarracksDefinition: BuildingInfoDefinition = { refundFactor: 0.5, startImmediately: false, gridWidthAndHeight: { width: 2, height: 2 }, - finishedSound: 'building-finished' // todo + finishedSound: "building-finished" // todo } }; @@ -68,7 +68,7 @@ export class Barracks extends Building { setTimeout(() => { this.productionComponent.startProduction({ actorClass: Warrior, costData: WarriorDefinition.cost as CostData }); - console.log('started production of 1 warrior'); + console.log("started production of 1 warrior"); }, 1000); } } 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 961c6c6c..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,14 +1,14 @@ -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 { PlayerController } from '../../../world/managers/controllers/player-controller'; -import { CostData, ProductionCostComponent } from '../../building/production/production-cost-component'; -import { PawnInfoDefinition } from '../../actor/character'; +import { RepresentableActor, RepresentableActorDefinition } from "../../actor/representable-actor"; +import { TilePlacementData } from "../../../world/managers/controllers/input/tilemap/tilemap-input.handler"; +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"; import { ConstructionSiteComponent, ConstructionSiteDefinition -} from '../../building/construction/construction-site-component'; -import { Scene } from 'phaser'; +} from "../../building/construction/construction-site-component"; +import { Scene } from "phaser"; export type BuildingInfoDefinition = PawnInfoDefinition & { constructionSiteDefinition: ConstructionSiteDefinition; @@ -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/assets/buildings/mine.ts b/apps/client/src/app/probable-waffle/game/entity/assets/buildings/mine.ts index 65e245ab..287a1c1c 100644 --- a/apps/client/src/app/probable-waffle/game/entity/assets/buildings/mine.ts +++ b/apps/client/src/app/probable-waffle/game/entity/assets/buildings/mine.ts @@ -1,18 +1,18 @@ -import { ContainerComponent } from '../../building/container-component'; -import { Resources, ResourceType } from '../../economy/resource/resource-type'; -import { ResourceDrainComponent } from '../../economy/resource/resource-drain-component'; -import { PlacementRestrictionComponent } from '../../building/placement-restriction-component'; -import { Minerals } from '../resources/minerals'; -import { Building, BuildingInfoDefinition } from './building'; -import { CostData } from '../../building/production/production-cost-component'; -import { PaymentType } from '../../building/payment-type'; +import { ContainerComponent } from "../../building/container-component"; +import { ResourceDrainComponent } from "../../economy/resource/resource-drain-component"; +import { PlacementRestrictionComponent } from "../../building/placement-restriction-component"; +import { Minerals } from "../resources/minerals"; +import { Building, BuildingInfoDefinition } from "./building"; +import { CostData } from "../../building/production/production-cost-component"; +import { PaymentType } from "../../building/payment-type"; +import { Resources, ResourceTypeDefinition } from "@fuzzy-waddle/api-interfaces"; export const MineDefinitions: BuildingInfoDefinition = { textureMapDefinition: { - textureName: 'warrior', + textureName: "warrior", spriteSheet: { - name: 'mine', - path: 'general/mine/', + name: "mine", + path: "general/mine/", frameConfig: { frameWidth: 64, frameHeight: 64 @@ -22,7 +22,7 @@ export const MineDefinitions: BuildingInfoDefinition = { cost: new CostData( PaymentType.PayOverTime, 100, - new Map([ + new Map([ [Resources.wood, 100], [Resources.stone, 100] ]), @@ -33,7 +33,7 @@ export const MineDefinitions: BuildingInfoDefinition = { }, soundDefinition: {}, constructionSiteDefinition: { - constructionCosts: new Map([ + constructionCosts: new Map([ [Resources.wood, 100], [Resources.stone, 100] ]), @@ -48,7 +48,7 @@ export const MineDefinitions: BuildingInfoDefinition = { refundFactor: 0.5, startImmediately: false, gridWidthAndHeight: { width: 2, height: 2 }, - finishedSound: 'building-finished' // todo + finishedSound: "building-finished" // todo } }; diff --git a/apps/client/src/app/probable-waffle/game/entity/assets/buildings/town-hall.ts b/apps/client/src/app/probable-waffle/game/entity/assets/buildings/town-hall.ts index 9aae9f10..04ff976e 100644 --- a/apps/client/src/app/probable-waffle/game/entity/assets/buildings/town-hall.ts +++ b/apps/client/src/app/probable-waffle/game/entity/assets/buildings/town-hall.ts @@ -1,19 +1,19 @@ -import { Building, BuildingInfoDefinition } from './building'; -import { ProductionComponent } from '../../building/production/production-component'; -import { Warrior } from '../characters/warrior'; -import { Worker } from '../characters/worker'; -import { CostData } from '../../building/production/production-cost-component'; -import { PaymentType } from '../../building/payment-type'; -import { Resources, ResourceType } from '../../economy/resource/resource-type'; -import { ContainerComponent } from '../../building/container-component'; -import { ResourceDrainComponent } from '../../economy/resource/resource-drain-component'; +import { Building, BuildingInfoDefinition } from "./building"; +import { ProductionComponent } from "../../building/production/production-component"; +import { Warrior } from "../characters/warrior"; +import { Worker } from "../characters/worker"; +import { CostData } from "../../building/production/production-cost-component"; +import { PaymentType } from "../../building/payment-type"; +import { Resources, ResourceTypeDefinition } from "@fuzzy-waddle/api-interfaces"; +import { ContainerComponent } from "../../building/container-component"; +import { ResourceDrainComponent } from "../../economy/resource/resource-drain-component"; export const TownHallDefinition: BuildingInfoDefinition = { textureMapDefinition: { - textureName: 'warrior', + textureName: "warrior", spriteSheet: { - name: 'warrior', - path: 'general/town-hall/', + name: "warrior", + path: "general/town-hall/", frameConfig: { frameWidth: 64, frameHeight: 64 @@ -23,7 +23,7 @@ export const TownHallDefinition: BuildingInfoDefinition = { cost: new CostData( PaymentType.PayOverTime, 100, - new Map([ + new Map([ [Resources.wood, 100], [Resources.stone, 100] ]), @@ -34,7 +34,7 @@ export const TownHallDefinition: BuildingInfoDefinition = { }, soundDefinition: {}, constructionSiteDefinition: { - constructionCosts: new Map([ + constructionCosts: new Map([ [Resources.wood, 100], [Resources.stone, 100] ]), @@ -49,7 +49,7 @@ export const TownHallDefinition: BuildingInfoDefinition = { refundFactor: 0.5, startImmediately: false, gridWidthAndHeight: { width: 2, height: 2 }, - finishedSound: 'building-finished' // todo + finishedSound: "building-finished" // todo } }; diff --git a/apps/client/src/app/probable-waffle/game/entity/assets/characters/warrior.ts b/apps/client/src/app/probable-waffle/game/entity/assets/characters/warrior.ts index 02fa4ff5..0b8d4c38 100644 --- a/apps/client/src/app/probable-waffle/game/entity/assets/characters/warrior.ts +++ b/apps/client/src/app/probable-waffle/game/entity/assets/characters/warrior.ts @@ -1,22 +1,22 @@ -import { PawnInfoDefinition } from '../../actor/character'; -import { AttackComponent } from '../../combat/components/attack-component'; -import { AttackData } from '../../combat/attack-data'; -import { DamageTypes } from '../../combat/damage-types'; -import { PlayerCharacter } from '../../actor/player-character'; -import { CostData } from '../../building/production/production-cost-component'; -import { PaymentType } from '../../building/payment-type'; -import { Resources, ResourceType } from '../../economy/resource/resource-type'; -import { ContainableComponent } from '../../actor/components/containable-component'; +import { PawnInfoDefinition } from "../../actor/character"; +import { AttackComponent } from "../../combat/components/attack-component"; +import { AttackData } from "../../combat/attack-data"; +import { DamageTypes } from "../../combat/damage-types"; +import { PlayerCharacter } from "../../actor/player-character"; +import { CostData } from "../../building/production/production-cost-component"; +import { PaymentType } from "../../building/payment-type"; +import { Resources, ResourceTypeDefinition } from "@fuzzy-waddle/api-interfaces"; +import { ContainableComponent } from "../../actor/components/containable-component"; export const WarriorDefinition: PawnInfoDefinition = { healthDefinition: { maxHealth: 100 }, textureMapDefinition: { - textureName: 'warrior', + textureName: "warrior", spriteSheet: { - name: 'warrior', - path: 'characters/general/warrior/', + name: "warrior", + path: "characters/general/warrior/", frameConfig: { frameWidth: 64, frameHeight: 64 @@ -24,10 +24,15 @@ export const WarriorDefinition: PawnInfoDefinition = { } }, soundDefinition: { - move: 'move', - death: 'death' + move: "move", + death: "death" }, - cost: new CostData(PaymentType.PayOverTime, 20, new Map([[Resources.ambrosia, 50]]), 0.5) + cost: new CostData( + PaymentType.PayOverTime, + 20, + new Map([[Resources.ambrosia, 50]]), + 0.5 + ) }; export class Warrior extends PlayerCharacter { diff --git a/apps/client/src/app/probable-waffle/game/entity/assets/characters/worker.ts b/apps/client/src/app/probable-waffle/game/entity/assets/characters/worker.ts index 4138d41d..98685c85 100644 --- a/apps/client/src/app/probable-waffle/game/entity/assets/characters/worker.ts +++ b/apps/client/src/app/probable-waffle/game/entity/assets/characters/worker.ts @@ -1,19 +1,19 @@ -import { PawnInfoDefinition } from '../../actor/character'; -import { GathererComponent } from '../../actor/components/gatherer-component'; -import { PlayerCharacter } from '../../actor/player-character'; -import { BuilderComponent } from '../../actor/components/builder-component'; -import { Barracks } from '../buildings/barracks'; -import { Mine } from '../buildings/mine'; +import { PawnInfoDefinition } from "../../actor/character"; +import { GathererComponent } from "../../actor/components/gatherer-component"; +import { PlayerCharacter } from "../../actor/player-character"; +import { BuilderComponent } from "../../actor/components/builder-component"; +import { Barracks } from "../buildings/barracks"; +import { Mine } from "../buildings/mine"; export const WorkerDefinition: PawnInfoDefinition = { healthDefinition: { maxHealth: 100 }, textureMapDefinition: { - textureName: 'warrior', + textureName: "warrior", spriteSheet: { - name: 'worker', - path: 'general/worker/', + name: "worker", + path: "general/worker/", frameConfig: { frameWidth: 64, frameHeight: 64 @@ -21,7 +21,7 @@ export const WorkerDefinition: PawnInfoDefinition = { } }, soundDefinition: { - move: 'move' + move: "move" } }; diff --git a/apps/client/src/app/probable-waffle/game/entity/assets/projectiles/arrow.ts b/apps/client/src/app/probable-waffle/game/entity/assets/projectiles/arrow.ts index 26aba082..0de3f354 100644 --- a/apps/client/src/app/probable-waffle/game/entity/assets/projectiles/arrow.ts +++ b/apps/client/src/app/probable-waffle/game/entity/assets/projectiles/arrow.ts @@ -1,15 +1,15 @@ -import { Projectile } from '../../combat/projectiles/projectile'; -import { DamageTypes } from '../../combat/damage-types'; -import { ProjectileData } from '../../combat/projectiles/projectile-data'; -import { RepresentableActor, RepresentableActorDefinition } from '../../actor/representable-actor'; -import { Scene } from 'phaser'; +import { Projectile } from "../../combat/projectiles/projectile"; +import { DamageTypes } from "../../combat/damage-types"; +import { ProjectileData } from "../../combat/projectiles/projectile-data"; +import { RepresentableActor, RepresentableActorDefinition } from "../../actor/representable-actor"; +import { Scene } from "phaser"; export const ArrowTextureMapDefinition: RepresentableActorDefinition = { textureMapDefinition: { - textureName: 'arrow', + textureName: "arrow", spriteSheet: { - name: 'arrow', - path: 'general/arrow/', + name: "arrow", + path: "general/arrow/", frameConfig: { frameWidth: 64, frameHeight: 64 diff --git a/apps/client/src/app/probable-waffle/game/entity/assets/projectiles/fire-ball.ts b/apps/client/src/app/probable-waffle/game/entity/assets/projectiles/fire-ball.ts index 40b3dee0..1b6147a9 100644 --- a/apps/client/src/app/probable-waffle/game/entity/assets/projectiles/fire-ball.ts +++ b/apps/client/src/app/probable-waffle/game/entity/assets/projectiles/fire-ball.ts @@ -1,15 +1,15 @@ -import { Projectile } from '../../combat/projectiles/projectile'; -import { DamageTypes } from '../../combat/damage-types'; -import { ProjectileData } from '../../combat/projectiles/projectile-data'; -import { RepresentableActor, RepresentableActorDefinition } from '../../actor/representable-actor'; -import { Scene } from 'phaser'; +import { Projectile } from "../../combat/projectiles/projectile"; +import { DamageTypes } from "../../combat/damage-types"; +import { ProjectileData } from "../../combat/projectiles/projectile-data"; +import { RepresentableActor, RepresentableActorDefinition } from "../../actor/representable-actor"; +import { Scene } from "phaser"; export const FireBallTextureMapDefinition: RepresentableActorDefinition = { textureMapDefinition: { - textureName: 'fireball', + textureName: "fireball", spriteSheet: { - name: 'fireball', - path: 'general/fireball/', + name: "fireball", + path: "general/fireball/", frameConfig: { frameWidth: 64, frameHeight: 64 diff --git a/apps/client/src/app/probable-waffle/game/entity/assets/resources/minerals.ts b/apps/client/src/app/probable-waffle/game/entity/assets/resources/minerals.ts index c207addd..3a64939b 100644 --- a/apps/client/src/app/probable-waffle/game/entity/assets/resources/minerals.ts +++ b/apps/client/src/app/probable-waffle/game/entity/assets/resources/minerals.ts @@ -1,16 +1,16 @@ -import { RepresentableActor, RepresentableActorDefinition } from '../../actor/representable-actor'; -import { TilePlacementData } from '../../../world/managers/controllers/input/tilemap/tilemap-input.handler'; -import { ResourceSourceComponent } from '../../economy/resource/resource-source-component'; -import { ContainerComponent } from '../../building/container-component'; -import { Resources } from '../../economy/resource/resource-type'; -import { Scene } from 'phaser'; +import { RepresentableActor, RepresentableActorDefinition } from "../../actor/representable-actor"; +import { TilePlacementData } from "../../../world/managers/controllers/input/tilemap/tilemap-input.handler"; +import { ResourceSourceComponent } from "../../economy/resource/resource-source-component"; +import { ContainerComponent } from "../../building/container-component"; +import { Resources } from "@fuzzy-waddle/api-interfaces"; +import { Scene } from "phaser"; export const MineralsDefinitions: RepresentableActorDefinition = { textureMapDefinition: { - textureName: 'warrior', + textureName: "warrior", spriteSheet: { - name: 'minerals', - path: 'general/minerals/', + name: "minerals", + path: "general/minerals/", frameConfig: { frameWidth: 64, frameHeight: 64 diff --git a/apps/client/src/app/probable-waffle/game/entity/assets/types/actor-type-lookup.ts b/apps/client/src/app/probable-waffle/game/entity/assets/types/actor-type-lookup.ts index b4f0c55c..d2893630 100644 --- a/apps/client/src/app/probable-waffle/game/entity/assets/types/actor-type-lookup.ts +++ b/apps/client/src/app/probable-waffle/game/entity/assets/types/actor-type-lookup.ts @@ -1,9 +1,9 @@ -import { ActorType } from './actor-type'; -import { Warrior } from '../characters/warrior'; -import { TownHall } from '../buildings/town-hall'; -import { ActorAbleToBeCreatedClass } from '../../building/production/production-queue'; -import { Barracks } from '../buildings/barracks'; -import { Worker } from '../characters/worker'; +import { ActorType } from "./actor-type"; +import { Warrior } from "../characters/warrior"; +import { TownHall } from "../buildings/town-hall"; +import { ActorAbleToBeCreatedClass } from "../../building/production/production-queue"; +import { Barracks } from "../buildings/barracks"; +import { Worker } from "../characters/worker"; export const ActorTypeLookup: Record = { [ActorType.Worker]: Worker, diff --git a/apps/client/src/app/probable-waffle/game/entity/assets/types/actor-type.ts b/apps/client/src/app/probable-waffle/game/entity/assets/types/actor-type.ts index dfad8b91..b3539087 100644 --- a/apps/client/src/app/probable-waffle/game/entity/assets/types/actor-type.ts +++ b/apps/client/src/app/probable-waffle/game/entity/assets/types/actor-type.ts @@ -1,6 +1,6 @@ export enum ActorType { - Worker = 'Worker', - TownHall = 'TownHall', - Barracks = 'Barracks', - Warrior = 'Warrior' + Worker = "Worker", + TownHall = "TownHall", + Barracks = "Barracks", + Warrior = "Warrior" } 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 696c0391..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 @@ -1,15 +1,15 @@ -import { IComponent } from '../../../core/component.service'; -import { PaymentType } from '../payment-type'; -import { ResourceType } from '../../economy/resource/resource-type'; -import { Actor } from '../../actor/actor'; -import { OwnerComponent } from '../../actor/components/owner-component'; -import { PlayerResourcesComponent } from '../../../world/managers/controllers/player-resources-component'; -import { ConstructionStateEnum } from './construction-state-enum'; -import { HealthComponent } from '../../combat/components/health-component'; -import { EventEmitter } from '@angular/core'; +import { IComponent } from "../../../core/component.service"; +import { PaymentType } from "../payment-type"; +import { ResourceTypeDefinition } from "@fuzzy-waddle/api-interfaces"; +import { Actor } from "../../actor/actor"; +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"; +import { EventEmitter } from "@angular/core"; export type ConstructionSiteDefinition = { - constructionCosts: Map; + constructionCosts: Map; // Whether to check collision for each grid cell checkCollision: boolean; constructionCostType: PaymentType; @@ -35,7 +35,10 @@ export class ConstructionSiteComponent implements IComponent { private assignedBuilders: Actor[] = []; private onConstructionFinished: EventEmitter = new EventEmitter(); - constructor(private owner: Actor, private constructionSiteDefinition: ConstructionSiteDefinition) {} + constructor( + private owner: Actor, + private constructionSiteDefinition: ConstructionSiteDefinition + ) {} init(): void { // pass @@ -80,18 +83,18 @@ export class ConstructionSiteComponent implements IComponent { startConstruction() { if (this.state !== ConstructionStateEnum.NotStarted) { - throw new Error('ConstructionSiteComponent can only be started once'); + throw new Error("ConstructionSiteComponent can only be started once"); } if (this.constructionSiteDefinition.constructionCostType === PaymentType.PayImmediately) { - const ownerComponent = this.owner.components.findComponent(OwnerComponent); - if (!ownerComponent.playerController) throw new Error('PlayerController not found'); + const ownerComponent = this.owner.components.findComponent(DEPRECATEDownerComponent); + if (!ownerComponent.playerController) throw new Error("PlayerController not found"); const playerResourcesComponent = ownerComponent.playerController.components.findComponent(PlayerResourcesComponent); const canAfford = playerResourcesComponent.canPayAllResources(this.constructionSiteDefinition.constructionCosts); if (canAfford) { playerResourcesComponent.payAllResources(this.constructionSiteDefinition.constructionCosts); } else { - throw new Error('Cannot afford building costs'); + throw new Error("Cannot afford building costs"); } } @@ -116,8 +119,8 @@ export class ConstructionSiteComponent implements IComponent { } // refund resources - const ownerComponent = this.owner.components.findComponent(OwnerComponent); - if (!ownerComponent.playerController) throw new Error('PlayerController not found'); + const ownerComponent = this.owner.components.findComponent(DEPRECATEDownerComponent); + if (!ownerComponent.playerController) throw new Error("PlayerController not found"); const playerResourcesComponent = ownerComponent.playerController.components.findComponent(PlayerResourcesComponent); const TimeRefundFactor = @@ -127,7 +130,7 @@ export class ConstructionSiteComponent implements IComponent { const actualRefundFactor = this.constructionSiteDefinition.refundFactor * TimeRefundFactor; // refund costs - const refundCosts = new Map(); + const refundCosts = new Map(); this.constructionSiteDefinition.constructionCosts.forEach((value, key) => { refundCosts.set(key, value * actualRefundFactor); }); diff --git a/apps/client/src/app/probable-waffle/game/entity/building/container-component.ts b/apps/client/src/app/probable-waffle/game/entity/building/container-component.ts index 292308ef..29196988 100644 --- a/apps/client/src/app/probable-waffle/game/entity/building/container-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/building/container-component.ts @@ -1,6 +1,6 @@ -import { IComponent } from '../../core/component.service'; -import { Actor } from '../actor/actor'; -import { SpriteRepresentationComponent } from '../actor/components/sprite-representable-component'; +import { IComponent } from "../../core/component.service"; +import { Actor } from "../actor/actor"; +import { SpriteRepresentationComponent } from "../actor/components/sprite-representable-component"; // apply to resource source that needs actors to enter to gather export class ContainerComponent implements IComponent { diff --git a/apps/client/src/app/probable-waffle/game/entity/building/placement-restriction-component.ts b/apps/client/src/app/probable-waffle/game/entity/building/placement-restriction-component.ts index 1825d132..7e6fb31c 100644 --- a/apps/client/src/app/probable-waffle/game/entity/building/placement-restriction-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/building/placement-restriction-component.ts @@ -1,13 +1,16 @@ -import { IComponent } from '../../core/component.service'; -import { Actor } from '../actor/actor'; -import { Minerals } from '../assets/resources/minerals'; -import { Vector2Simple } from '../../library/math/intersection'; +import { IComponent } from "../../core/component.service"; +import { Actor } from "../actor/actor"; +import { Minerals } from "../assets/resources/minerals"; +import { Vector2Simple } from "@fuzzy-waddle/api-interfaces"; export type CanPlaceOnClasses = typeof Minerals; // makes sure that the actor can only be placed on a certain class (on minerals) export class PlacementRestrictionComponent implements IComponent { - constructor(private readonly actor: Actor, private readonly canPlaceOnClasses: CanPlaceOnClasses[]) {} + constructor( + private readonly actor: Actor, + private readonly canPlaceOnClasses: CanPlaceOnClasses[] + ) {} init(): void { // todo 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 c8589db4..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 @@ -1,14 +1,14 @@ -import { IComponent } from '../../../core/component.service'; -import { RallyPoint } from '../../../player/rally-point'; -import { ActorAbleToBeProduced, ActorAbleToBeProducedClass, ProductionQueue } from './production-queue'; -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 { Actor } from '../../actor/actor'; -import { SpriteRepresentationComponent } from '../../actor/components/sprite-representable-component'; -import { TransformComponent } from '../../actor/components/transformable-component'; -import { TilePlacementData } from '../../../world/managers/controllers/input/tilemap/tilemap-input.handler'; +import { IComponent } from "../../../core/component.service"; +import { RallyPoint } from "../../../player/rally-point"; +import { ActorAbleToBeProduced, ActorAbleToBeProducedClass, ProductionQueue } from "./production-queue"; +import { CostData } from "./production-cost-component"; +import { PaymentType } from "../payment-type"; +import { PlayerResourcesComponent } from "../../../world/managers/controllers/player-resources-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"; +import { TilePlacementData } from "../../../world/managers/controllers/input/tilemap/tilemap-input.handler"; export type ProductionQueueItem = { actorClass: ActorAbleToBeProducedClass; @@ -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 @@ -54,7 +54,7 @@ export class ProductionComponent implements IComponent { let productionCostPaid = false; if (costData.costType == PaymentType.PayOverTime) { if (!this.ownerComponent.playerController) { - throw new Error('Player controller not found'); + throw new Error("Player controller not found"); } // get player resources and pay for production const playerResourcesComponent = @@ -98,13 +98,13 @@ export class ProductionComponent implements IComponent { startProduction(queueItem: ProductionQueueItem): void { // check production state if (!this.canAssignProduction(queueItem)) { - throw new Error('Cannot assign production'); + throw new Error("Cannot assign production"); } // find queue const queue = this.findQueueForProduct(); if (!queue) { - throw new Error('No queue found'); + throw new Error("No queue found"); } // add to queue @@ -117,7 +117,7 @@ export class ProductionComponent implements IComponent { private finishProduction(queue: ProductionQueue, queueIndex: number) { if (queueIndex >= queue.queuedActors.length) { - throw new Error('Invalid queue index'); + throw new Error("Invalid queue index"); } const { actorClass } = queue.queuedActors[queueIndex]; @@ -177,7 +177,7 @@ export class ProductionComponent implements IComponent { } // check if player has enough resources - if (!this.ownerComponent.playerController) throw new Error('Player controller not found'); + if (!this.ownerComponent.playerController) throw new Error("Player controller not found"); const playerResourcesComponent = this.ownerComponent.playerController.components.findComponent(PlayerResourcesComponent); return playerResourcesComponent.canPayAllResources(item.costData.resources); @@ -185,7 +185,7 @@ export class ProductionComponent implements IComponent { private startProductionInQueue(queue: ProductionQueue) { if (queue.queuedActors.length <= 0) { - throw new Error('No actor in queue'); + throw new Error("No actor in queue"); } const { costData } = queue.queuedActors[0]; diff --git a/apps/client/src/app/probable-waffle/game/entity/building/production/production-cost-component.ts b/apps/client/src/app/probable-waffle/game/entity/building/production/production-cost-component.ts index 13eb9186..72c79d5e 100644 --- a/apps/client/src/app/probable-waffle/game/entity/building/production/production-cost-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/building/production/production-cost-component.ts @@ -1,6 +1,6 @@ -import { IComponent } from '../../../core/component.service'; -import { PaymentType } from '../payment-type'; -import { ResourceType } from '../../economy/resource/resource-type'; +import { IComponent } from "../../../core/component.service"; +import { PaymentType } from "../payment-type"; +import { ResourceTypeDefinition } from "@fuzzy-waddle/api-interfaces"; export class CostData { static NoCost: CostData = { @@ -13,7 +13,7 @@ export class CostData { constructor( public costType: PaymentType, public productionTime: number, - public resources: Map, + public resources: Map, public refundFactor: number ) {} } diff --git a/apps/client/src/app/probable-waffle/game/entity/building/production/production-queue.ts b/apps/client/src/app/probable-waffle/game/entity/building/production/production-queue.ts index c6cbd86a..793c65f1 100644 --- a/apps/client/src/app/probable-waffle/game/entity/building/production/production-queue.ts +++ b/apps/client/src/app/probable-waffle/game/entity/building/production/production-queue.ts @@ -1,7 +1,7 @@ -import { Warrior } from '../../assets/characters/warrior'; -import { Worker } from '../../assets/characters/worker'; -import { ProductionQueueItem } from './production-component'; -import { ActorAbleToBeBuilt, ActorAbleToBeBuiltClass } from '../../actor/components/builder-component'; +import { Warrior } from "../../assets/characters/warrior"; +import { Worker } from "../../assets/characters/worker"; +import { ProductionQueueItem } from "./production-component"; +import { ActorAbleToBeBuilt, ActorAbleToBeBuiltClass } from "../../actor/components/builder-component"; export type ActorAbleToBeProduced = Warrior | Worker; export type ActorAbleToBeProducedClass = typeof Warrior | typeof Worker; @@ -17,14 +17,14 @@ export class ProductionQueue { add(actor: ProductionQueueItem) { if (this.queuedActors.length >= this.capacityPerQueue) { - throw new Error('Queue is full'); + throw new Error("Queue is full"); } this.queuedActors.push(actor); } removeAt(index: number) { if (index < 0 || index >= this.queuedActors.length) { - throw new Error('Index out of bounds'); + throw new Error("Index out of bounds"); } this.queuedActors.splice(index, 1); } diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior-tree.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior-tree.ts index 03cd397b..8b71e80a 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior-tree.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior-tree.ts @@ -1,5 +1,5 @@ -import { Blackboard } from './blackboard'; -import { Actor } from '../../actor/actor'; +import { Blackboard } from "./blackboard"; +import { Actor } from "../../actor/actor"; export abstract class BehaviorTree { abstract name: string; diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior-trees.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior-trees.ts index ec506ba3..cd63bc38 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior-trees.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior-trees.ts @@ -1,4 +1,4 @@ -import { DefaultPawnBehaviorTree } from './default-pawn-behavior-tree'; +import { DefaultPawnBehaviorTree } from "./default-pawn-behavior-tree"; export type PawnBehaviorTreeClasses = typeof DefaultPawnBehaviorTree; export type PawnBehaviorTree = DefaultPawnBehaviorTree; diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/can-gather-from.decorator.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/can-gather-from.decorator.ts index 1c4a0d40..fb391b95 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/can-gather-from.decorator.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/can-gather-from.decorator.ts @@ -1,5 +1,5 @@ -import { DecoratorData, IDecorator } from './decorator.interface'; -import { GathererComponent } from '../../../../actor/components/gatherer-component'; +import { DecoratorData, IDecorator } from "./decorator.interface"; +import { GathererComponent } from "../../../../actor/components/gatherer-component"; export class CanGatherFromDecorator implements IDecorator { calculateRawConditionValue(decoratorData: DecoratorData): boolean { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/can-move.decorator.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/can-move.decorator.ts index 88cfec23..51660a50 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/can-move.decorator.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/can-move.decorator.ts @@ -1,5 +1,5 @@ -import { DecoratorData, IDecorator } from './decorator.interface'; -import { CharacterMovementComponent } from '../../../../actor/components/character-movement-component'; +import { DecoratorData, IDecorator } from "./decorator.interface"; +import { CharacterMovementComponent } from "../../../../actor/components/character-movement-component"; export class CanMoveDecorator implements IDecorator { calculateRawConditionValue(decoratorData: DecoratorData): boolean { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/decorator.interface.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/decorator.interface.ts index fdf8dacc..b29b9825 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/decorator.interface.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/decorator.interface.ts @@ -1,8 +1,11 @@ -import { Actor } from '../../../../actor/actor'; -import { PawnAiBlackboard } from '../../pawn-ai-blackboard'; +import { Actor } from "../../../../actor/actor"; +import { PawnAiBlackboard } from "../../pawn-ai-blackboard"; export class DecoratorData { - constructor(public owner: Actor, public blackboard: PawnAiBlackboard) {} + constructor( + public owner: Actor, + public blackboard: PawnAiBlackboard + ) {} } export interface IDecorator { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/has-left-chase-radius.decorator.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/has-left-chase-radius.decorator.ts index 91f56c13..e70cb12e 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/has-left-chase-radius.decorator.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/has-left-chase-radius.decorator.ts @@ -1,4 +1,4 @@ -import { DecoratorData, IDecorator } from './decorator.interface'; +import { DecoratorData, IDecorator } from "./decorator.interface"; export class HasLeftChaseRadiusDecorator implements IDecorator { calculateRawConditionValue(decoratorData: DecoratorData): boolean { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/has-order.decorator.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/has-order.decorator.ts index d99e2680..e671e454 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/has-order.decorator.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/has-order.decorator.ts @@ -1,4 +1,4 @@ -import { DecoratorData, IDecorator } from './decorator.interface'; +import { DecoratorData, IDecorator } from "./decorator.interface"; export class HasOrderDecorator implements IDecorator { calculateRawConditionValue(decoratorData: DecoratorData): boolean { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-at-construction-site.decorator.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-at-construction-site.decorator.ts index 67c719eb..053e421d 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-at-construction-site.decorator.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-at-construction-site.decorator.ts @@ -1,5 +1,5 @@ -import { DecoratorData, IDecorator } from './decorator.interface'; -import { BuilderComponent } from '../../../../actor/components/builder-component'; +import { DecoratorData, IDecorator } from "./decorator.interface"; +import { BuilderComponent } from "../../../../actor/components/builder-component"; export class IsAtConstructionSiteDecorator implements IDecorator { calculateRawConditionValue(decoratorData: DecoratorData): boolean { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-carrying-resources.decorator.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-carrying-resources.decorator.ts index 39f4a460..5811728d 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-carrying-resources.decorator.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-carrying-resources.decorator.ts @@ -1,5 +1,5 @@ -import { DecoratorData, IDecorator } from './decorator.interface'; -import { GathererComponent } from '../../../../actor/components/gatherer-component'; +import { DecoratorData, IDecorator } from "./decorator.interface"; +import { GathererComponent } from "../../../../actor/components/gatherer-component"; export class IsCarryingResourcesDecorator implements IDecorator { calculateRawConditionValue(decoratorData: DecoratorData): boolean { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-construction-finished.decorator.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-construction-finished.decorator.ts index 3f8fbff8..104f6b2b 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-construction-finished.decorator.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-construction-finished.decorator.ts @@ -1,5 +1,5 @@ -import { DecoratorData, IDecorator } from './decorator.interface'; -import { ConstructionSiteComponent } from '../../../../building/construction/construction-site-component'; +import { DecoratorData, IDecorator } from "./decorator.interface"; +import { ConstructionSiteComponent } from "../../../../building/construction/construction-site-component"; export class IsConstructionFinishedDecorator implements IDecorator { calculateRawConditionValue(decoratorData: DecoratorData): boolean { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-gathering-resources.decorator.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-gathering-resources.decorator.ts index 6cbfa3a7..e7ec15fc 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-gathering-resources.decorator.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-gathering-resources.decorator.ts @@ -1,5 +1,5 @@ -import { DecoratorData, IDecorator } from './decorator.interface'; -import { GathererComponent } from '../../../../actor/components/gatherer-component'; +import { DecoratorData, IDecorator } from "./decorator.interface"; +import { GathererComponent } from "../../../../actor/components/gatherer-component"; export class IsGatheringResourcesDecorator implements IDecorator { calculateRawConditionValue(decoratorData: DecoratorData): boolean { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-in-range.decorator.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-in-range.decorator.ts index 24e00ade..b4fb108a 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-in-range.decorator.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-in-range.decorator.ts @@ -1,5 +1,5 @@ -import { DecoratorData, IDecorator } from './decorator.interface'; -import { GameplayLibrary } from '../../../../../library/gameplay-library'; +import { DecoratorData, IDecorator } from "./decorator.interface"; +import { GameplayLibrary } from "../../../../../library/gameplay-library"; export class IsInRangeDecorator implements IDecorator { calculateRawConditionValue(decoratorData: DecoratorData): boolean { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-order-queue-empty.decorator.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-order-queue-empty.decorator.ts index 0e23d855..80a2985a 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-order-queue-empty.decorator.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/is-order-queue-empty.decorator.ts @@ -1,5 +1,5 @@ -import { DecoratorData, IDecorator } from './decorator.interface'; -import { PawnAiControllerComponent } from '../../../../../world/managers/controllers/pawn-ai-controller-component'; +import { DecoratorData, IDecorator } from "./decorator.interface"; +import { PawnAiControllerComponent } from "../../../../../world/managers/controllers/pawn-ai-controller-component"; export class IsOrderQueueEmptyDecorator implements IDecorator { calculateRawConditionValue(decoratorData: DecoratorData): boolean { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/resource-is-ready.decorator.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/resource-is-ready.decorator.ts index 8621c34e..e08b5a72 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/resource-is-ready.decorator.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/resource-is-ready.decorator.ts @@ -1,5 +1,5 @@ -import { DecoratorData, IDecorator } from './decorator.interface'; -import { ResourceSourceComponent } from '../../../../economy/resource/resource-source-component'; +import { DecoratorData, IDecorator } from "./decorator.interface"; +import { ResourceSourceComponent } from "../../../../economy/resource/resource-source-component"; export class ResourceIsReadyDecorator implements IDecorator { calculateRawConditionValue(decoratorData: DecoratorData): boolean { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/target-is-alive.decorator.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/target-is-alive.decorator.ts index c3b4b853..c5179f5b 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/target-is-alive.decorator.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/decorators/target-is-alive.decorator.ts @@ -1,4 +1,4 @@ -import { DecoratorData, IDecorator } from './decorator.interface'; +import { DecoratorData, IDecorator } from "./decorator.interface"; export class TargetIsAliveDecorator implements IDecorator { calculateRawConditionValue(decoratorData: DecoratorData): boolean { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/assign-to-construction-site.task.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/assign-to-construction-site.task.ts index aeed4727..f2598d73 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/assign-to-construction-site.task.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/assign-to-construction-site.task.ts @@ -1,5 +1,5 @@ -import { ITask, TaskData, TaskResultType } from './task.interface'; -import { BuilderComponent } from '../../../../actor/components/builder-component'; +import { ITask, TaskData, TaskResultType } from "./task.interface"; +import { BuilderComponent } from "../../../../actor/components/builder-component"; export class AssignToConstructionSiteTask implements ITask { executeTask(taskData: TaskData): TaskResultType { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/attack.task.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/attack.task.ts index a3fd0eb9..33783a76 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/attack.task.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/attack.task.ts @@ -1,5 +1,5 @@ -import { ITask, TaskData, TaskResultType } from './task.interface'; -import { AttackComponent } from '../../../../combat/components/attack-component'; +import { ITask, TaskData, TaskResultType } from "./task.interface"; +import { AttackComponent } from "../../../../combat/components/attack-component"; export class AttackTask implements ITask { executeTask(taskData: TaskData): TaskResultType { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/begin-construction.task.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/begin-construction.task.ts index 0034e64a..c70d0e2b 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/begin-construction.task.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/begin-construction.task.ts @@ -1,6 +1,6 @@ -import { ITask, TaskData, TaskResultType } from './task.interface'; -import { BuilderComponent } from '../../../../actor/components/builder-component'; -import { TransformComponent } from '../../../../actor/components/transformable-component'; +import { ITask, TaskData, TaskResultType } from "./task.interface"; +import { BuilderComponent } from "../../../../actor/components/builder-component"; +import { TransformComponent } from "../../../../actor/components/transformable-component"; export class BeginConstructionTask implements ITask { executeTask(taskData: TaskData): TaskResultType { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/face-target.task.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/face-target.task.ts index c3a45056..ac6ee698 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/face-target.task.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/face-target.task.ts @@ -1,5 +1,5 @@ -import { ITask, TaskData, TaskResultType } from './task.interface'; -import { TransformComponent } from '../../../../actor/components/transformable-component'; +import { ITask, TaskData, TaskResultType } from "./task.interface"; +import { TransformComponent } from "../../../../actor/components/transformable-component"; export class FaceTargetTask implements ITask { executeTask(taskData: TaskData): TaskResultType { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/gather-resources.task.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/gather-resources.task.ts index 4ac05e0f..26d68e00 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/gather-resources.task.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/gather-resources.task.ts @@ -1,5 +1,5 @@ -import { ITask, TaskData, TaskResultType } from './task.interface'; -import { GathererComponent } from '../../../../actor/components/gatherer-component'; +import { ITask, TaskData, TaskResultType } from "./task.interface"; +import { GathererComponent } from "../../../../actor/components/gatherer-component"; export class GatherResourcesTask implements ITask { executeTask(taskData: TaskData): TaskResultType { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/issue-return-resources.task.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/issue-return-resources.task.ts index f91185eb..2825d282 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/issue-return-resources.task.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/issue-return-resources.task.ts @@ -1,6 +1,6 @@ -import { ITask, TaskData, TaskResultType } from './task.interface'; -import { GathererComponent } from '../../../../actor/components/gatherer-component'; -import { PawnAiControllerComponent } from '../../../../../world/managers/controllers/pawn-ai-controller-component'; +import { ITask, TaskData, TaskResultType } from "./task.interface"; +import { GathererComponent } from "../../../../actor/components/gatherer-component"; +import { PawnAiControllerComponent } from "../../../../../world/managers/controllers/pawn-ai-controller-component"; export class IssueReturnResourcesTask implements ITask { executeTask(taskData: TaskData): TaskResultType { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/leave-construction-site.task.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/leave-construction-site.task.ts index fdabe0b6..6f2673cf 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/leave-construction-site.task.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/leave-construction-site.task.ts @@ -1,5 +1,5 @@ -import { ITask, TaskData, TaskResultType } from './task.interface'; -import { BuilderComponent } from '../../../../actor/components/builder-component'; +import { ITask, TaskData, TaskResultType } from "./task.interface"; +import { BuilderComponent } from "../../../../actor/components/builder-component"; export class LeaveConstructionSiteTask implements ITask { executeTask(taskData: TaskData): TaskResultType { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/move-in-range.task.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/move-in-range.task.ts index a2e2797d..1a5e2702 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/move-in-range.task.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/move-in-range.task.ts @@ -1,4 +1,4 @@ -import { ITask, TaskData, TaskResultType } from './task.interface'; +import { ITask, TaskData, TaskResultType } from "./task.interface"; export class MoveInRangeTask implements ITask { executeTask(taskData: TaskData): TaskResultType { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/move-to.task.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/move-to.task.ts index ab023b4f..241467bf 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/move-to.task.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/move-to.task.ts @@ -1,6 +1,6 @@ -import { ITask, TaskData, TaskResultType } from './task.interface'; -import { TransformComponent } from '../../../../actor/components/transformable-component'; -import { PawnAiControllerComponent } from '../../../../../world/managers/controllers/pawn-ai-controller-component'; +import { ITask, TaskData, TaskResultType } from "./task.interface"; +import { TransformComponent } from "../../../../actor/components/transformable-component"; +import { PawnAiControllerComponent } from "../../../../../world/managers/controllers/pawn-ai-controller-component"; export class MoveToTask implements ITask { executeTask(taskData: TaskData): TaskResultType { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/obtain-next-order.task.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/obtain-next-order.task.ts index 233756ba..900e820c 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/obtain-next-order.task.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/obtain-next-order.task.ts @@ -1,5 +1,5 @@ -import { ITask, TaskData, TaskResultType } from './task.interface'; -import { PawnAiControllerComponent } from '../../../../../world/managers/controllers/pawn-ai-controller-component'; +import { ITask, TaskData, TaskResultType } from "./task.interface"; +import { PawnAiControllerComponent } from "../../../../../world/managers/controllers/pawn-ai-controller-component"; export class ObtainNextOrderTask implements ITask { executeTask(taskData: TaskData): TaskResultType { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/return-resources.task.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/return-resources.task.ts index f323d2b1..deb725ac 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/return-resources.task.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/return-resources.task.ts @@ -1,5 +1,5 @@ -import { ITask, TaskData, TaskResultType } from './task.interface'; -import { GathererComponent } from '../../../../actor/components/gatherer-component'; +import { ITask, TaskData, TaskResultType } from "./task.interface"; +import { GathererComponent } from "../../../../actor/components/gatherer-component"; export class ReturnResourcesTask implements ITask { executeTask(taskData: TaskData): TaskResultType { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/set-attack-range.task.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/set-attack-range.task.ts index 875a0e95..f3518ed4 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/set-attack-range.task.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/set-attack-range.task.ts @@ -1,5 +1,5 @@ -import { ITask, TaskData, TaskResultType } from './task.interface'; -import { AttackComponent } from '../../../../combat/components/attack-component'; +import { ITask, TaskData, TaskResultType } from "./task.interface"; +import { AttackComponent } from "../../../../combat/components/attack-component"; export class SetAttackRangeTask implements ITask { executeTask(taskData: TaskData): TaskResultType { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/set-construction-range.task.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/set-construction-range.task.ts index 3064a149..83fe06aa 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/set-construction-range.task.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/set-construction-range.task.ts @@ -1,5 +1,5 @@ -import { ITask, TaskData, TaskResultType } from './task.interface'; -import { BuilderComponent } from '../../../../actor/components/builder-component'; +import { ITask, TaskData, TaskResultType } from "./task.interface"; +import { BuilderComponent } from "../../../../actor/components/builder-component"; export class SetConstructionRangeTask implements ITask { executeTask(taskData: TaskData): TaskResultType { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/set-gather-range.task.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/set-gather-range.task.ts index c1f3dbff..cf047ff8 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/set-gather-range.task.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/set-gather-range.task.ts @@ -1,5 +1,5 @@ -import { ITask, TaskData, TaskResultType } from './task.interface'; -import { GathererComponent } from '../../../../actor/components/gatherer-component'; +import { ITask, TaskData, TaskResultType } from "./task.interface"; +import { GathererComponent } from "../../../../actor/components/gatherer-component"; export class SetGatherRangeTask implements ITask { executeTask(taskData: TaskData): TaskResultType { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/set-idle.task.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/set-idle.task.ts index e5d0454d..3a3adbb0 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/set-idle.task.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/set-idle.task.ts @@ -1,5 +1,5 @@ -import { ITask, TaskData, TaskResultType } from './task.interface'; -import { PawnAiControllerComponent } from '../../../../../world/managers/controllers/pawn-ai-controller-component'; +import { ITask, TaskData, TaskResultType } from "./task.interface"; +import { PawnAiControllerComponent } from "../../../../../world/managers/controllers/pawn-ai-controller-component"; export class SetIdleTask implements ITask { executeTask(taskData: TaskData): TaskResultType { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/task.interface.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/task.interface.ts index d154cadf..636fa88f 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/task.interface.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/behavior/tasks/task.interface.ts @@ -1,8 +1,11 @@ -import { Actor } from '../../../../actor/actor'; -import { PawnAiBlackboard } from '../../pawn-ai-blackboard'; +import { Actor } from "../../../../actor/actor"; +import { PawnAiBlackboard } from "../../pawn-ai-blackboard"; export class TaskData { - constructor(public owner: Actor, public blackboard: PawnAiBlackboard) {} + constructor( + public owner: Actor, + public blackboard: PawnAiBlackboard + ) {} } export enum TaskResultType { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/default-pawn-behavior-tree.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/default-pawn-behavior-tree.ts index f38cb2ea..a5185467 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/default-pawn-behavior-tree.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/default-pawn-behavior-tree.ts @@ -1,6 +1,6 @@ -import { BehaviorTree } from './behavior-tree'; -import { DecoratorData } from './behavior/decorators/decorator.interface'; -import { TaskData } from './behavior/tasks/task.interface'; +import { BehaviorTree } from "./behavior-tree"; +import { DecoratorData } from "./behavior/decorators/decorator.interface"; +import { TaskData } from "./behavior/tasks/task.interface"; export class DefaultPawnBehaviorTree extends BehaviorTree { name: string; @@ -9,7 +9,7 @@ export class DefaultPawnBehaviorTree extends BehaviorTree { constructor() { super(); - this.name = 'DefaultPawnBehaviorTree'; + this.name = "DefaultPawnBehaviorTree"; this.decoratorData = new DecoratorData(this.owner, this.blackboard); this.taskData = new TaskData(this.owner, this.blackboard); diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/order-data.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/order-data.ts index 21d377cb..9e847911 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/order-data.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/order-data.ts @@ -1,6 +1,6 @@ -import { OrderType } from './order-type'; -import { Actor } from '../../actor/actor'; -import { TilePlacementData } from '../../../world/managers/controllers/input/tilemap/tilemap-input.handler'; +import { OrderType } from "./order-type"; +import { Actor } from "../../actor/actor"; +import { TilePlacementData } from "../../../world/managers/controllers/input/tilemap/tilemap-input.handler"; export class OrderData { constructor( diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/order-type.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/order-type.ts index de8c4c52..59ee6f5b 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/order-type.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/order-type.ts @@ -1,4 +1,4 @@ -import { ActorAbleToBeBuiltClass } from '../../actor/components/builder-component'; +import { ActorAbleToBeBuiltClass } from "../../actor/components/builder-component"; export type BeginConstructionArgs = [ActorAbleToBeBuiltClass]; diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/pawn-ai-blackboard.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/pawn-ai-blackboard.ts index cd1018dd..f99dbf93 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/pawn-ai-blackboard.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/pawn-ai-blackboard.ts @@ -1,8 +1,8 @@ -import { Blackboard } from './blackboard'; -import { OrderType } from './order-type'; -import { Actor } from '../../actor/actor'; -import { TilePlacementData } from '../../../world/managers/controllers/input/tilemap/tilemap-input.handler'; -import { ActorAbleToBeBuiltClass } from '../../actor/components/builder-component'; +import { Blackboard } from "./blackboard"; +import { OrderType } from "./order-type"; +import { Actor } from "../../actor/actor"; +import { TilePlacementData } from "../../../world/managers/controllers/input/tilemap/tilemap-input.handler"; +import { ActorAbleToBeBuiltClass } from "../../actor/components/builder-component"; export class PawnAiBlackboard extends Blackboard { orderType?: OrderType; diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/player-ai/default-player-ai-behavior-tree.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/player-ai/default-player-ai-behavior-tree.ts index 0003fdc4..65d5b0ad 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/player-ai/default-player-ai-behavior-tree.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/player-ai/default-player-ai-behavior-tree.ts @@ -1,11 +1,11 @@ -import { BehaviorTree } from '../behavior-tree'; +import { BehaviorTree } from "../behavior-tree"; export class DefaultPlayerAiBehaviorTree extends BehaviorTree { name: string; constructor() { super(); - this.name = 'DefaultPlayerAiBehaviorTree'; + this.name = "DefaultPlayerAiBehaviorTree"; } protected runDecisionTree(): void { diff --git a/apps/client/src/app/probable-waffle/game/entity/character/ai/player-ai/player-ai-blackboard.ts b/apps/client/src/app/probable-waffle/game/entity/character/ai/player-ai/player-ai-blackboard.ts index b0b48058..98030c33 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/ai/player-ai/player-ai-blackboard.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/ai/player-ai/player-ai-blackboard.ts @@ -1,3 +1,3 @@ -import { Blackboard } from '../blackboard'; +import { Blackboard } from "../blackboard"; export class PlayerAiBlackboard extends Blackboard {} diff --git a/apps/client/src/app/probable-waffle/game/entity/character/animation/lpc-animation-helper.ts b/apps/client/src/app/probable-waffle/game/entity/character/animation/lpc-animation-helper.ts index faf85b9f..d9b0037b 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/animation/lpc-animation-helper.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/animation/lpc-animation-helper.ts @@ -1,30 +1,30 @@ -import { Animations } from 'phaser'; +import { Animations } from "phaser"; export enum AnimDirectionEnum { - north = 'north', - east = 'east', - south = 'south', - west = 'west' + north = "north", + east = "east", + south = "south", + west = "west" } export const IsoAngleToAnimDirectionEnum: Record = { - '-135': AnimDirectionEnum.north, // up - '-90': AnimDirectionEnum.east, // right up - '-45': AnimDirectionEnum.east, // right - '0': AnimDirectionEnum.east, // right down - '45': AnimDirectionEnum.south, // down - '90': AnimDirectionEnum.west, // left down - '135': AnimDirectionEnum.west, // left - '180': AnimDirectionEnum.west // left up + "-135": AnimDirectionEnum.north, // up + "-90": AnimDirectionEnum.east, // right up + "-45": AnimDirectionEnum.east, // right + "0": AnimDirectionEnum.east, // right down + "45": AnimDirectionEnum.south, // down + "90": AnimDirectionEnum.west, // left down + "135": AnimDirectionEnum.west, // left + "180": AnimDirectionEnum.west // left up }; export enum LPCAnimTypeEnum { - spellCast = 'spellCast', - thrust = 'thrust', - walk = 'walk', - slash = 'slash', - shoot = 'shoot', - hurt = 'hurt' + spellCast = "spellCast", + thrust = "thrust", + walk = "walk", + slash = "slash", + shoot = "shoot", + hurt = "hurt" } export type AnimDirection = diff --git a/apps/client/src/app/probable-waffle/game/entity/character/animation/sprite-animation-helper.ts b/apps/client/src/app/probable-waffle/game/entity/character/animation/sprite-animation-helper.ts index 67211e1b..cbb2f759 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/animation/sprite-animation-helper.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/animation/sprite-animation-helper.ts @@ -1,8 +1,8 @@ -import { AnimDirection, LPCAnimType } from './lpc-animation-helper'; -import { GameObjects } from 'phaser'; +import { AnimDirection, LPCAnimType } from "./lpc-animation-helper"; +import { GameObjects } from "phaser"; export class SpriteAnimationHelper { static playAnimation(sprite: GameObjects.Sprite, animName: LPCAnimType, dir: AnimDirection, idle: boolean) { - sprite.play(`${animName}-${dir}` + (idle ? '-idle' : '')); + sprite.play(`${animName}-${dir}` + (idle ? "-idle" : "")); } } diff --git a/apps/client/src/app/probable-waffle/game/entity/character/animation/state-machine.ts b/apps/client/src/app/probable-waffle/game/entity/character/animation/state-machine.ts index 8b091c1c..c1b580f5 100644 --- a/apps/client/src/app/probable-waffle/game/entity/character/animation/state-machine.ts +++ b/apps/client/src/app/probable-waffle/game/entity/character/animation/state-machine.ts @@ -24,7 +24,7 @@ export class StateMachine { get previousStateName() { if (!this.previousState) { - return ''; + return ""; } return this.previousState.name; @@ -68,7 +68,7 @@ export class StateMachine { this.isChangingState = true; - console.log(`[StateMachine (${this.id})] change from ${this.currentState?.name ?? 'none'} to ${name}`); + console.log(`[StateMachine (${this.id})] change from ${this.currentState?.name ?? "none"} to ${name}`); if (this.currentState && this.currentState.onExit) { this.currentState.onExit(); diff --git a/apps/client/src/app/probable-waffle/game/entity/combat/attack-data.ts b/apps/client/src/app/probable-waffle/game/entity/combat/attack-data.ts index fbfa7eb9..b5fdfa1b 100644 --- a/apps/client/src/app/probable-waffle/game/entity/combat/attack-data.ts +++ b/apps/client/src/app/probable-waffle/game/entity/combat/attack-data.ts @@ -1,5 +1,5 @@ -import { DamageType } from './damage-type'; -import { ProjectileClass } from './projectiles/projectiles'; +import { DamageType } from "./damage-type"; +import { ProjectileClass } from "./projectiles/projectiles"; export class AttackData { constructor( diff --git a/apps/client/src/app/probable-waffle/game/entity/combat/components/attack-component.ts b/apps/client/src/app/probable-waffle/game/entity/combat/components/attack-component.ts index 37e2ef18..9b909415 100644 --- a/apps/client/src/app/probable-waffle/game/entity/combat/components/attack-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/combat/components/attack-component.ts @@ -1,10 +1,10 @@ -import { IComponent } from '../../../core/component.service'; -import { Actor } from '../../actor/actor'; -import { AttackData } from '../attack-data'; -import { EventEmitter } from '@angular/core'; -import { HealthComponent } from './health-component'; -import { RepresentableActor } from '../../actor/representable-actor'; -import { SpriteRepresentationComponent } from '../../actor/components/sprite-representable-component'; +import { IComponent } from "../../../core/component.service"; +import { Actor } from "../../actor/actor"; +import { AttackData } from "../attack-data"; +import { EventEmitter } from "@angular/core"; +import { HealthComponent } from "./health-component"; +import { RepresentableActor } from "../../actor/representable-actor"; +import { SpriteRepresentationComponent } from "../../actor/components/sprite-representable-component"; export class AttackComponent implements IComponent { // when cooldown has expired @@ -14,7 +14,10 @@ export class AttackComponent implements IComponent { remainingCooldown = 0; private spriteRepresentationComponent!: SpriteRepresentationComponent; - constructor(private owner: RepresentableActor, private attacks: AttackData[]) {} + constructor( + private owner: RepresentableActor, + private attacks: AttackData[] + ) {} init(): void { this.spriteRepresentationComponent = this.owner.components.findComponent(SpriteRepresentationComponent); @@ -35,7 +38,7 @@ export class AttackComponent implements IComponent { return; } if (attackIndex >= this.attacks.length) { - throw new Error('Invalid attack index'); + throw new Error("Invalid attack index"); } const attack = this.attacks[attackIndex]; 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 00203172..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'; - -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; +import { GameObjects } from "phaser"; +import { HealthComponent } from "./health-component"; +import { getActorComponent } from "../../../data/actor-component"; +import { Subscription } from "rxjs"; +import { getGameObjectBounds, getGameObjectDepth } from "../../../data/game-object-helper"; + +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/entity/combat/damage-types.ts b/apps/client/src/app/probable-waffle/game/entity/combat/damage-types.ts index 14b1c530..a8d02326 100644 --- a/apps/client/src/app/probable-waffle/game/entity/combat/damage-types.ts +++ b/apps/client/src/app/probable-waffle/game/entity/combat/damage-types.ts @@ -1,6 +1,6 @@ -import { DamageType } from './damage-type'; +import { DamageType } from "./damage-type"; export class DamageTypes { - static DamageTypeNormal = new DamageType('Normal'); - static DamageTypeFire = new DamageType('Fire'); + static DamageTypeNormal = new DamageType("Normal"); + static DamageTypeFire = new DamageType("Fire"); } diff --git a/apps/client/src/app/probable-waffle/game/entity/combat/projectiles/projectile-data.ts b/apps/client/src/app/probable-waffle/game/entity/combat/projectiles/projectile-data.ts index f0f05a3e..75e8bcfc 100644 --- a/apps/client/src/app/probable-waffle/game/entity/combat/projectiles/projectile-data.ts +++ b/apps/client/src/app/probable-waffle/game/entity/combat/projectiles/projectile-data.ts @@ -1,5 +1,10 @@ -import { DamageType } from '../damage-type'; +import { DamageType } from "../damage-type"; export class ProjectileData { - constructor(public damage: number, public damageType: DamageType, public speed: number, public range: number) {} + constructor( + public damage: number, + public damageType: DamageType, + public speed: number, + public range: number + ) {} } diff --git a/apps/client/src/app/probable-waffle/game/entity/combat/projectiles/projectile.ts b/apps/client/src/app/probable-waffle/game/entity/combat/projectiles/projectile.ts index c76ae9dd..b02ad118 100644 --- a/apps/client/src/app/probable-waffle/game/entity/combat/projectiles/projectile.ts +++ b/apps/client/src/app/probable-waffle/game/entity/combat/projectiles/projectile.ts @@ -1,15 +1,18 @@ -import { Actor } from '../../actor/actor'; -import { ProjectileData } from './projectile-data'; -import { RepresentableActor } from '../../actor/representable-actor'; -import { Scene } from 'phaser'; -import { TransformComponent } from '../../actor/components/transformable-component'; +import { Actor } from "../../actor/actor"; +import { ProjectileData } from "./projectile-data"; +import { RepresentableActor } from "../../actor/representable-actor"; +import { Scene } from "phaser"; +import { TransformComponent } from "../../actor/components/transformable-component"; export abstract class Projectile extends RepresentableActor { public abstract projectileData: ProjectileData; private targetActor: Actor | null = null; private targetLocation: Phaser.Math.Vector3 | null = null; - protected constructor(scene: Scene, public damageCauser: RepresentableActor) { + protected constructor( + scene: Scene, + public damageCauser: RepresentableActor + ) { const tilePlacementData = damageCauser.components.findComponent(TransformComponent).tilePlacementData; super(scene, tilePlacementData); } diff --git a/apps/client/src/app/probable-waffle/game/entity/combat/projectiles/projectiles.ts b/apps/client/src/app/probable-waffle/game/entity/combat/projectiles/projectiles.ts index a334ded7..563e9dd9 100644 --- a/apps/client/src/app/probable-waffle/game/entity/combat/projectiles/projectiles.ts +++ b/apps/client/src/app/probable-waffle/game/entity/combat/projectiles/projectiles.ts @@ -1,4 +1,4 @@ -import { Arrow } from '../../assets/projectiles/arrow'; -import { FireBall } from '../../assets/projectiles/fire-ball'; +import { Arrow } from "../../assets/projectiles/arrow"; +import { FireBall } from "../../assets/projectiles/fire-ball"; export type ProjectileClass = typeof Arrow | typeof FireBall; diff --git a/apps/client/src/app/probable-waffle/game/entity/economy/gather-data.ts b/apps/client/src/app/probable-waffle/game/entity/economy/gather-data.ts index 293d56bf..c3347152 100644 --- a/apps/client/src/app/probable-waffle/game/entity/economy/gather-data.ts +++ b/apps/client/src/app/probable-waffle/game/entity/economy/gather-data.ts @@ -1,8 +1,8 @@ -import { ResourceType } from './resource/resource-type'; +import { ResourceTypeDefinition } from "@fuzzy-waddle/api-interfaces"; export class GatherData { constructor( - public resourceType: ResourceType, + public resourceType: ResourceTypeDefinition, public amountPerGathering: number, public capacity: number, public cooldown: number, 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 1d9f8c8a..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 @@ -1,19 +1,24 @@ -import { IComponent } from '../../../core/component.service'; -import { Actor } from '../../actor/actor'; -import { ResourceType } from './resource-type'; -import { ContainerComponent } from '../../building/container-component'; -import { OwnerComponent } from '../../actor/components/owner-component'; -import { PlayerResourcesComponent } from '../../../world/managers/controllers/player-resources-component'; -import { Subject } from 'rxjs'; +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 { DEPRECATEDownerComponent } from "../../actor/components/DEPRECATEDowner-component"; +import { PlayerResourcesComponent } from "../../../world/managers/controllers/player-resources-component"; +import { Subject } from "rxjs"; // this is to be applied to townHall/mine/lodge where resources can be returned to export class ResourceDrainComponent implements IComponent { - onResourcesReturned: Subject<[ResourceType, number, Actor]> = new Subject<[ResourceType, number, Actor]>(); + onResourcesReturned: Subject<[ResourceTypeDefinition, number, Actor]> = new Subject< + [ResourceTypeDefinition, number, Actor] + >(); private containerComponent: ContainerComponent | null = null; private gathererMustEnter = false; private gathererCapacity = 0; - constructor(private readonly actor: Actor, private readonly resourceTypes: ResourceType[]) {} + constructor( + private readonly actor: Actor, + private readonly resourceTypes: ResourceTypeDefinition[] + ) {} init(): void { this.containerComponent = this.actor.components.findComponentOrNull(ContainerComponent); @@ -24,9 +29,9 @@ export class ResourceDrainComponent implements IComponent { /** * returns resources to player controller */ - returnResources(gatherer: Actor, resourceType: ResourceType, amount: number): number { - const ownerComponent = this.actor.components.findComponent(OwnerComponent); - if (!ownerComponent.playerController) throw new Error('ownerComponent.playerController is null'); + returnResources(gatherer: Actor, resourceType: ResourceTypeDefinition, amount: number): number { + const ownerComponent = this.actor.components.findComponent(DEPRECATEDownerComponent); + if (!ownerComponent.playerController) throw new Error("ownerComponent.playerController is null"); const playerResourcesComponent = ownerComponent.playerController.components.findComponent(PlayerResourcesComponent); const returnedResources = playerResourcesComponent.addResource(resourceType, amount); @@ -45,7 +50,7 @@ export class ResourceDrainComponent implements IComponent { return this.gathererMustEnter; } - getResourceTypes(): ResourceType[] { + getResourceTypes(): ResourceTypeDefinition[] { return this.resourceTypes; } } diff --git a/apps/client/src/app/probable-waffle/game/entity/economy/resource/resource-source-component.ts b/apps/client/src/app/probable-waffle/game/entity/economy/resource/resource-source-component.ts index 92f5ae61..43d81c28 100644 --- a/apps/client/src/app/probable-waffle/game/entity/economy/resource/resource-source-component.ts +++ b/apps/client/src/app/probable-waffle/game/entity/economy/resource/resource-source-component.ts @@ -1,11 +1,13 @@ -import { IComponent } from '../../../core/component.service'; -import { ResourceType } from './resource-type'; -import { Actor } from '../../actor/actor'; -import { ContainerComponent } from '../../building/container-component'; -import { Subject } from 'rxjs'; +import { IComponent } from "../../../core/component.service"; +import { ResourceTypeDefinition } from "@fuzzy-waddle/api-interfaces"; +import { Actor } from "../../actor/actor"; +import { ContainerComponent } from "../../building/container-component"; +import { Subject } from "rxjs"; export class ResourceSourceComponent implements IComponent { - onResourcesChanged: Subject<[ResourceType, number, Actor]> = new Subject<[ResourceType, number, Actor]>(); + onResourcesChanged: Subject<[ResourceTypeDefinition, number, Actor]> = new Subject< + [ResourceTypeDefinition, number, Actor] + >(); onDepleted: Subject = new Subject(); private currentResources: number; private containerComponent: ContainerComponent | null = null; @@ -14,7 +16,7 @@ export class ResourceSourceComponent implements IComponent { constructor( private readonly actor: Actor, - private resourceType: ResourceType, + private resourceType: ResourceTypeDefinition, private maximumResources: number, private gatheringFactor: number ) { @@ -40,16 +42,16 @@ export class ResourceSourceComponent implements IComponent { const newResources = this.currentResources; console.log( - 'gatherer', + "gatherer", gatherer, - 'extracted', + "extracted", gatheredAmount, this.resourceType, - 'from', + "from", this.actor, - 'oldResources', + "oldResources", oldResources, - 'newResources', + "newResources", newResources ); @@ -66,7 +68,7 @@ export class ResourceSourceComponent implements IComponent { return this.containerComponent?.canLoadActor(gatherer) ?? true; } - getResourceType(): ResourceType { + getResourceType(): ResourceTypeDefinition { return this.resourceType; } diff --git a/apps/client/src/app/probable-waffle/game/entity/economy/resource/resource-type.ts b/apps/client/src/app/probable-waffle/game/entity/economy/resource/resource-type.ts deleted file mode 100644 index 37a15fb2..00000000 --- a/apps/client/src/app/probable-waffle/game/entity/economy/resource/resource-type.ts +++ /dev/null @@ -1,10 +0,0 @@ -export class ResourceType { - constructor(public name: string, public icon: string, public color: string) {} -} - -export class Resources { - static readonly ambrosia = new ResourceType('Ambrosia', 'ambrosia', 'gold'); - static readonly wood = new ResourceType('Wood', 'wood', 'brown'); - static readonly stone = new ResourceType('Stone', 'stone', 'grey'); - static readonly minerals = new ResourceType('Minerals', 'minerals', 'blue'); -} diff --git a/apps/client/src/app/probable-waffle/game/entity/placable-objects/dynamic-object.ts b/apps/client/src/app/probable-waffle/game/entity/placable-objects/dynamic-object.ts index 2d0a6ca3..1e9b8555 100644 --- a/apps/client/src/app/probable-waffle/game/entity/placable-objects/dynamic-object.ts +++ b/apps/client/src/app/probable-waffle/game/entity/placable-objects/dynamic-object.ts @@ -1,11 +1,14 @@ -import { Scene } from 'phaser'; -import { PlayerPlaceableGameObject } from './static-object'; -import { SpriteHelper } from '../actor/sprite-helper'; -import { IsoHelper } from '../../world/map/tile/iso-helper'; -import { GameObjectsHelper } from '../../world/map/game-objects-helper'; +import { Scene } from "phaser"; +import { PlayerPlaceableGameObject } from "./static-object"; +import { SpriteHelper } from "../actor/sprite-helper"; +import { IsoHelper } from "../../world/map/tile/iso-helper"; +import { GameObjectsHelper } from "../../world/map/game-objects-helper"; export class DynamicObjectHelper { - constructor(private readonly gameObjectsHelper: GameObjectsHelper, private readonly scene: Scene) {} + constructor( + private readonly gameObjectsHelper: GameObjectsHelper, + private readonly scene: Scene + ) {} createDynamicObjectLayer() { this.gameObjectsHelper.dynamicObjects = []; diff --git a/apps/client/src/app/probable-waffle/game/entity/placable-objects/static-object.ts b/apps/client/src/app/probable-waffle/game/entity/placable-objects/static-object.ts index df87d822..fe36cbea 100644 --- a/apps/client/src/app/probable-waffle/game/entity/placable-objects/static-object.ts +++ b/apps/client/src/app/probable-waffle/game/entity/placable-objects/static-object.ts @@ -1,6 +1,6 @@ -import { GameObjects, Scene } from 'phaser'; -import { TilePlacementData, TileWorldData } from '../../world/managers/controllers/input/tilemap/tilemap-input.handler'; -import { GameObjectsHelper } from '../../world/map/game-objects-helper'; +import { GameObjects, Scene } from "phaser"; +import { TilePlacementData, TileWorldData } from "../../world/managers/controllers/input/tilemap/tilemap-input.handler"; +import { GameObjectsHelper } from "../../world/map/game-objects-helper"; export interface GameObjectPlayer { playerNumber: number; @@ -35,7 +35,10 @@ export interface PlayerPlaceableGameObject extends PlaceableGameObject { } export class StaticObjectHelper { - constructor(private readonly gameObjectsHelper: GameObjectsHelper, private readonly scene: Scene) {} + constructor( + private readonly gameObjectsHelper: GameObjectsHelper, + private readonly scene: Scene + ) {} createStaticObjectLayer() { this.gameObjectsHelper.staticObjects = []; diff --git a/apps/client/src/app/probable-waffle/game/hud/hud-element-visibility.handler.ts b/apps/client/src/app/probable-waffle/game/hud/hud-element-visibility.handler.ts new file mode 100644 index 00000000..3b5c3cf5 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/hud/hud-element-visibility.handler.ts @@ -0,0 +1,35 @@ +import { ProbableWaffleScene } from "../core/probable-waffle.scene"; +import { GameSessionState } from "@fuzzy-waddle/api-interfaces"; + +export class HudElementVisibilityHandler { + private sessionStateSubscription?: { unsubscribe(): void }; + constructor( + private readonly scene: ProbableWaffleScene, + private readonly hudElements: Phaser.GameObjects.Components.Visible[] + ) { + scene.onDestroy.subscribe(() => this.destroy()); + scene.onPostCreate.subscribe(() => this.handleHudElements()); + } + + private handleHudElements() { + this.handleCurrentSessionState(this.scene.baseGameData.gameInstance.gameInstanceMetadata.data.sessionState!); + this.sessionStateSubscription = this.scene.communicator.gameInstanceMetadataChanged?.on.subscribe( + (metadataEvent) => { + switch (metadataEvent.property) { + case "sessionState": + this.handleCurrentSessionState(metadataEvent.data.sessionState!); + break; + } + } + ); + } + + private handleCurrentSessionState(sessionState: GameSessionState) { + const visible = sessionState === GameSessionState.InProgress; + this.hudElements.forEach((element) => element.setVisible(visible)); + } + + private destroy() { + this.sessionStateSubscription?.unsubscribe(); + } +} 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 new file mode 100644 index 00000000..1c9f2a91 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/hud/hud-game-state.ts @@ -0,0 +1,102 @@ +import { GameSessionState } from "@fuzzy-waddle/api-interfaces"; +import { ProbableWaffleScene } from "../core/probable-waffle.scene"; +import { Subscription } from "rxjs"; + +export class HudGameState { + private sessionStateSubscription?: Subscription; + private onResizeSubscription: Subscription; + private readonly text: Phaser.GameObjects.Text; + private readonly overlay: Phaser.GameObjects.Rectangle; + constructor(private readonly scene: ProbableWaffleScene) { + scene.onDestroy.subscribe(() => this.destroy()); + scene.onPostCreate.subscribe(() => this.listen()); + this.overlay = this.scene.add.rectangle(0, 0, 0, 0, 0x000000, 0.5); + this.text = this.scene.add.text(0, 0, "", { align: "center", fontSize: "32px" }).setOrigin(0.5, 0.5); + this.handleResize(); + this.onResizeSubscription = this.scene.onResize.subscribe(() => { + this.handleResize(); + }); + } + + private handleResize() { + this.overlay.setPosition( + this.scene.cameras.main.centerX + this.scene.cameras.main.scrollX, + this.scene.cameras.main.centerY + this.scene.cameras.main.scrollY + ); + this.overlay.setSize(this.scene.cameras.main.width, this.scene.cameras.main.height); + + this.text.setPosition( + this.scene.cameras.main.centerX + this.scene.cameras.main.scrollX, + this.scene.cameras.main.centerY + this.scene.cameras.main.scrollY + ); + } + + private listen() { + this.pauseUntilAllPlayersAreReady(); + } + + pauseUntilAllPlayersAreReady() { + this.handleCurrentSessionState(this.scene.baseGameData.gameInstance.gameInstanceMetadata.data.sessionState!); + this.sessionStateSubscription = this.scene.communicator.gameInstanceMetadataChanged?.on.subscribe( + (metadataEvent) => { + switch (metadataEvent.property) { + case "sessionState": + this.handleCurrentSessionState(metadataEvent.data.sessionState!); + break; + } + } + ); + } + + private handleCurrentSessionState(sessionState: GameSessionState) { + switch (sessionState) { + case GameSessionState.NotStarted: + throw new Error("Game should not be in this state " + sessionState); + case GameSessionState.MovingPlayersToGame: + // set it in the center of the screen (include scroll + this.text.text = "Waiting for players to join..."; + this.text.visible = true; + this.overlay.visible = true; + break; + case GameSessionState.StartingTheGame: + this.text.text = "3"; + this.text.visible = true; + this.overlay.visible = true; + + 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; + } + break; + case GameSessionState.InProgress: + this.text.visible = false; + this.overlay.visible = false; + break; + case GameSessionState.ToScoreScreen: + this.scene.scene.stop(); + this.scene.destroy(); + break; + case GameSessionState.Stopped: + throw new Error("HUD should be destroyed at this point"); + } + } + + private destroy() { + this.text.destroy(); + this.overlay.destroy(); + this.sessionStateSubscription?.unsubscribe(); + this.onResizeSubscription.unsubscribe(); + } +} 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 115c31fc..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 { ActorAbleToBeBuiltClass } from '../entity/actor/components/builder-component'; -import { TransformComponent } from '../entity/actor/components/transformable-component'; -import { ConstructionSiteComponent } from '../entity/building/construction/construction-site-component'; +import { Actor } from "../entity/actor/actor"; +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/library/math/intersection.ts b/apps/client/src/app/probable-waffle/game/library/math/intersection.ts index db08409e..e7a70f07 100644 --- a/apps/client/src/app/probable-waffle/game/library/math/intersection.ts +++ b/apps/client/src/app/probable-waffle/game/library/math/intersection.ts @@ -1,9 +1,5 @@ -import { Geom } from 'phaser'; - -export interface Vector2Simple { - x: number; - y: number; -} +import { Geom } from "phaser"; +import { Vector2Simple } from "@fuzzy-waddle/api-interfaces"; export class Intersection { static intersectsWithRectangle = (M: Vector2Simple, rectangleForIntersection: Geom.Polygon) => { diff --git a/apps/client/src/app/probable-waffle/game/library/queue.ts b/apps/client/src/app/probable-waffle/game/library/queue.ts index f0cc4367..c3491ed2 100644 --- a/apps/client/src/app/probable-waffle/game/library/queue.ts +++ b/apps/client/src/app/probable-waffle/game/library/queue.ts @@ -23,7 +23,7 @@ export class Queue implements IQueue { enqueueBack(item: T): void { if (this.size() === this.capacity) { - throw Error('Queue has reached max capacity, you cannot add more items'); + throw Error("Queue has reached max capacity, you cannot add more items"); } this.storage.push(item); } @@ -46,7 +46,7 @@ export class Queue implements IQueue { enqueueFront(item: T): void { if (this.size() === this.capacity) { - throw Error('Queue has reached max capacity, you cannot add more items'); + throw Error("Queue has reached max capacity, you cannot add more items"); } this.storage.unshift(item); } 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/player/faction-definitions.ts b/apps/client/src/app/probable-waffle/game/player/faction-definitions.ts index f12f7f8f..74fe8f41 100644 --- a/apps/client/src/app/probable-waffle/game/player/faction-definitions.ts +++ b/apps/client/src/app/probable-waffle/game/player/faction-definitions.ts @@ -1,72 +1,40 @@ -import { TechTreeComponent } from './tech-tree'; -import { FactionInfo } from './faction-info'; -import { ActorType } from '../entity/assets/types/actor-type'; - -export enum FactionType { - IceMarauders = 'IceMarauders', - FireBoosters = 'FireBoosters', - SandDwellers = 'SandDwellers', - ForestShadows = 'ForestShadows' -} +import { TechTreeComponent } from "./tech-tree"; +import { FactionInfo } from "./faction-info"; +import { ActorType } from "../entity/assets/types/actor-type"; +import { FactionType } from "@fuzzy-waddle/api-interfaces"; export class FactionDefinitions { - static iceMarauders: FactionInfo = new FactionInfo( - FactionType.IceMarauders, - new TechTreeComponent(), - [ActorType.TownHall, ActorType.Worker, ActorType.Worker], - [ - { x: 0, y: 0 }, - { x: 1, y: 0 }, - { x: 2, y: 0 } - ], - [ActorType.TownHall], - [ActorType.TownHall], // todo - true - ); - static fireBoosters: FactionInfo = new FactionInfo( - FactionType.FireBoosters, - new TechTreeComponent(), - [ActorType.TownHall, ActorType.Worker, ActorType.Worker], - [ - { x: 0, y: 0 }, - { x: 1, y: 0 }, - { x: 2, y: 0 } - ], - [ActorType.TownHall], - [ActorType.TownHall], // todo - true - ); - static sandDwellers: FactionInfo = new FactionInfo( - FactionType.SandDwellers, + static tivara: FactionInfo = new FactionInfo( + FactionType.Tivara, + "Tivara", new TechTreeComponent(), [ActorType.TownHall, ActorType.Worker, ActorType.Worker], [ - { x: 0, y: 0 }, - { x: 1, y: 0 }, - { x: 2, y: 0 } + { x: 0, y: 0, z: 0 }, + { x: 1, y: 0, z: 0 }, + { x: 2, y: 0, z: 0 } ], [ActorType.TownHall], [ActorType.TownHall], // todo true ); - static forestShadows: FactionInfo = new FactionInfo( - FactionType.ForestShadows, + static skaduwee: FactionInfo = new FactionInfo( + FactionType.Skaduwee, + "Skaduwee", new TechTreeComponent(), [ActorType.TownHall, ActorType.Worker, ActorType.Worker], [ - { x: 0, y: 0 }, - { x: 1, y: 0 }, - { x: 2, y: 0 } + { x: 0, y: 0, z: 0 }, + { x: 1, y: 0, z: 0 }, + { x: 2, y: 0, z: 0 } ], [ActorType.TownHall], [ActorType.TownHall], // todo true ); - static factionTypes: { name: string; value: FactionType }[] = [ - { name: 'Ice Marauders', value: FactionType.IceMarauders }, - { name: 'Fire Boosters', value: FactionType.FireBoosters }, - { name: 'Sand Dwellers', value: FactionType.SandDwellers }, - { name: 'Forest Shadows', value: FactionType.ForestShadows } + static factions: { type: FactionType; value: FactionInfo }[] = [ + { type: FactionType.Tivara, value: FactionDefinitions.tivara }, + { type: FactionType.Skaduwee, value: FactionDefinitions.skaduwee } ]; } diff --git a/apps/client/src/app/probable-waffle/game/player/faction-info.ts b/apps/client/src/app/probable-waffle/game/player/faction-info.ts index 042b9a97..35b019b8 100644 --- a/apps/client/src/app/probable-waffle/game/player/faction-info.ts +++ b/apps/client/src/app/probable-waffle/game/player/faction-info.ts @@ -1,11 +1,11 @@ -import {TechTreeComponent} from './tech-tree'; -import {Vector2Simple} from '../library/math/intersection'; -import {FactionType} from './faction-definitions'; -import {ActorType} from '../entity/assets/types/actor-type'; +import { TechTreeComponent } from "./tech-tree"; +import { ActorType } from "../entity/assets/types/actor-type"; +import { FactionType, Vector3Simple } from "@fuzzy-waddle/api-interfaces"; export class FactionInfo { constructor( public factionType: FactionType, + public name: string, public techTreeComponent: TechTreeComponent, /** * Actors to spawn for each player in the game @@ -15,7 +15,7 @@ export class FactionInfo { /** * Relative locations of the actors to spawn for each player in the game, relative to their respective start spot */ - public readonly initialActorLocations: Vector2Simple[] = [], + public readonly initialActorLocations: Vector3Simple[] = [], /** * Optional types of actors that are required for a player to be alive. As soon as no actor of the specified type is alive, the player is defeated */ @@ -26,8 +26,7 @@ export class FactionInfo { */ public readonly buildOrder: ActorType[] = [], // todo query then ActorTypeLookup constant public readonly includeInitialActorsInBuildOrder = true - ) { - } + ) {} getBuildOrder(): ActorType[] { const classes: any[] = []; diff --git a/apps/client/src/app/probable-waffle/game/player/player-start.ts b/apps/client/src/app/probable-waffle/game/player/player-start.ts index 2fa50ec6..20042f0f 100644 --- a/apps/client/src/app/probable-waffle/game/player/player-start.ts +++ b/apps/client/src/app/probable-waffle/game/player/player-start.ts @@ -1,4 +1,4 @@ -import { Types } from 'phaser'; +import { Types } from "phaser"; export class PlayerStart { constructor(public position: Types.Math.Vector3Like) {} diff --git a/apps/client/src/app/probable-waffle/game/player/player-state.ts b/apps/client/src/app/probable-waffle/game/player/player-state.ts index e2d1e68b..fd195c3f 100644 --- a/apps/client/src/app/probable-waffle/game/player/player-state.ts +++ b/apps/client/src/app/probable-waffle/game/player/player-state.ts @@ -1,8 +1,8 @@ -import { FactionInfo } from './faction-info'; -import { TeamInfo } from './team-info'; -import { PlayerStart } from './player-start'; -import { PlayerResourcesComponent } from '../world/managers/controllers/player-resources-component'; -import { Actor } from '../entity/actor/actor'; +import { FactionInfo } from "./faction-info"; +import { TeamInfo } from "./team-info"; +import { PlayerStart } from "./player-start"; +import { PlayerResourcesComponent } from "../world/managers/controllers/player-resources-component"; +import { Actor } from "../entity/actor/actor"; export type PlayerActors = Actor; // todo remove? diff --git a/apps/client/src/app/probable-waffle/game/player/rally-point.ts b/apps/client/src/app/probable-waffle/game/player/rally-point.ts index bcc93ff7..c5e74607 100644 --- a/apps/client/src/app/probable-waffle/game/player/rally-point.ts +++ b/apps/client/src/app/probable-waffle/game/player/rally-point.ts @@ -1,5 +1,5 @@ -import { TilePlacementData } from '../world/managers/controllers/input/tilemap/tilemap-input.handler'; -import { RepresentableActor } from '../entity/actor/representable-actor'; +import { TilePlacementData } from "../world/managers/controllers/input/tilemap/tilemap-input.handler"; +import { RepresentableActor } from "../entity/actor/representable-actor"; export class RallyPoint { constructor( diff --git a/apps/client/src/app/probable-waffle/game/player/team-info.ts b/apps/client/src/app/probable-waffle/game/player/team-info.ts index 2499653f..4f8291be 100644 --- a/apps/client/src/app/probable-waffle/game/player/team-info.ts +++ b/apps/client/src/app/probable-waffle/game/player/team-info.ts @@ -1,4 +1,4 @@ -import { PlayerController } from '../world/managers/controllers/player-controller'; +import { PlayerController } from "../world/managers/controllers/player-controller"; export class TeamInfo { constructor( diff --git a/apps/client/src/app/probable-waffle/game/player/tech-tree.ts b/apps/client/src/app/probable-waffle/game/player/tech-tree.ts index b44ba680..6efbfcb5 100644 --- a/apps/client/src/app/probable-waffle/game/player/tech-tree.ts +++ b/apps/client/src/app/probable-waffle/game/player/tech-tree.ts @@ -39,7 +39,11 @@ export enum TechTreeEffectType { } export class TechTree { - constructor(public techTreeId: string, public name: string, public techTreeNodes: TechTreeNode[]) {} + constructor( + public techTreeId: string, + public name: string, + public techTreeNodes: TechTreeNode[] + ) {} } export class TechTreeNode { @@ -61,45 +65,45 @@ export class TechTreeComponent { // 2. requires previous tech tree node // 3. increases unit production speed by 10% // 2. Militia unit - techTreeBarracks = new TechTree('12313', 'Barracks', [ + techTreeBarracks = new TechTree("12313", "Barracks", [ new TechTreeNode( - '134343', - 'Unit Production Speed', - 'Unit Production Speed', + "134343", + "Unit Production Speed", + "Unit Production Speed", TechTreeNodeType.TechTreeNodeType_Research, [ new TechTreeDependency( - '434343', + "434343", null, - 'Requires 10 units of resource X', + "Requires 10 units of resource X", TechTreeDependencyType.TechTreeDependencyType_Resource, 10 ), new TechTreeDependency( - '434', - '434343', - 'requires previous tech tree node', + "434", + "434343", + "requires previous tech tree node", TechTreeDependencyType.TechTreeDependencyType_TechTreeNode, null ) ], [ new TechTreeEffect( - '4344343', - 'Increases unit production speed by 10%', + "4344343", + "Increases unit production speed by 10%", TechTreeEffectType.TechTreeEffectType_TechTreeNode, 10 ) ] ), - new TechTreeNode('4343', 'Militia', 'Militia', TechTreeNodeType.TechTreeNodeType_Unit, [], []) + new TechTreeNode("4343", "Militia", "Militia", TechTreeNodeType.TechTreeNodeType_Unit, [], []) ]); // below techTree specifies what alien structures are available // it attaches to playerController and is used to determine what structures are available to build // 1. Alien Barracks structure - techTreeAlien = new TechTree('12313', 'Alien', [ - new TechTreeNode('432', 'Alien Barracks', 'Alien Barracks', TechTreeNodeType.TechTreeNodeType_Structure, [], []) + techTreeAlien = new TechTree("12313", "Alien", [ + new TechTreeNode("432", "Alien Barracks", "Alien Barracks", TechTreeNodeType.TechTreeNodeType_Structure, [], []) ]); checkHasAllTechTreeDependencies = (techTreeDependencies: TechTreeDependency[], techTree: TechTree) => { diff --git a/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.scene b/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.scene new file mode 100644 index 00000000..fe8d6f84 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.scene @@ -0,0 +1,40 @@ +{ + "id": "5c78ee6f-43a6-47f4-ac21-0e536a65936a", + "sceneType": "PREFAB", + "settings": { + "exportClass": true, + "autoImport": true, + "preloadMethodName": "", + "preloadPackFiles": [], + "createMethodName": "", + "compilerOutputLanguage": "TYPE_SCRIPT", + "borderWidth": 32, + "borderHeight": 32 + }, + "displayList": [ + { + "type": "Sprite", + "id": "eab19788-7d28-4ba0-9229-78de0b9e37e1", + "label": "hedgehog", + "scope": "CLASS", + "hitArea.shape": "CIRCLE", + "hitArea.x": 16, + "hitArea.y": 18, + "hitArea.radius": 11.323425464509395, + "texture": { + "key": "animals", + "frame": "hedgehog/10.png" + }, + "x": 16, + "y": 21.596080279718947, + "originY": 0.6748775087412171 + } + ], + "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/animals/Hedgehog.ts b/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.ts new file mode 100644 index 00000000..f5425cc1 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/animals/Hedgehog.ts @@ -0,0 +1,166 @@ +// You can write more code here + +/* START OF COMPILED CODE */ + +import Phaser from "phaser"; +/* START-USER-IMPORTS */ +import { + ANIM_HEDGEHOG_BALL_DOWN, + ANIM_HEDGEHOG_BALL_LEFT, + ANIM_HEDGEHOG_BALL_RIGHT, + ANIM_HEDGEHOG_BALL_TOP, + ANIM_HEDGEHOG_IDLE_DOWN, + ANIM_HEDGEHOG_IDLE_LEFT, + ANIM_HEDGEHOG_IDLE_RIGHT, + ANIM_HEDGEHOG_IDLE_TOP, + ANIM_HEDGEHOG_WALK_DOWN, + ANIM_HEDGEHOG_WALK_LEFT, + ANIM_HEDGEHOG_WALK_RIGHT, + 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 { + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 16, y ?? 21.596080279718947, texture || "animals", frame ?? "hedgehog/10.png"); + + this.setInteractive(new Phaser.Geom.Circle(16, 18, 11.323425464509395), Phaser.Geom.Circle.Contains); + this.setOrigin(0.5, 0.6748775087412171); + + /* START-USER-CTR-CODE */ + /* END-USER-CTR-CODE */ + } + + /* START-USER-CODE */ + 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 + if (this.currentDelay) { + this.currentDelay.remove(false); + this.currentDelay = null; + } + + // Stop the current tween if it exists + if (this.currentTween) { + this.currentTween.stop(); + this.currentTween = null; + } + + // get appropriate ball animation + let ballAnim: string; + switch (this.anims.currentAnim?.key) { + case ANIM_HEDGEHOG_WALK_DOWN: + ballAnim = ANIM_HEDGEHOG_BALL_DOWN; + break; + case ANIM_HEDGEHOG_WALK_LEFT: + ballAnim = ANIM_HEDGEHOG_BALL_LEFT; + break; + case ANIM_HEDGEHOG_WALK_RIGHT: + ballAnim = ANIM_HEDGEHOG_BALL_RIGHT; + break; + case ANIM_HEDGEHOG_WALK_TOP: + ballAnim = ANIM_HEDGEHOG_BALL_TOP; + break; + default: + ballAnim = ANIM_HEDGEHOG_BALL_DOWN; + } + this.play(ballAnim); + this.scene.time.delayedCall(5000, this.moveHedgehog, [], this); + }); + } + moveHedgehog() { + if (!this.active) return; + const startX = this.x; + const startY = this.y; + + const targetX = startX + Phaser.Math.Between(-200, 200); + const targetY = startY + Phaser.Math.Between(-100, 100); + + const directionX = targetX - startX; + const directionY = targetY - startY; + + let walkAnim: string; + let ballAnim: string; + let idleAnim: string; + + if (Math.abs(directionX) > Math.abs(directionY)) { + if (directionX > 0) { + walkAnim = ANIM_HEDGEHOG_WALK_RIGHT; + ballAnim = ANIM_HEDGEHOG_BALL_RIGHT; + idleAnim = ANIM_HEDGEHOG_IDLE_RIGHT; + } else { + walkAnim = ANIM_HEDGEHOG_WALK_LEFT; + ballAnim = ANIM_HEDGEHOG_BALL_LEFT; + idleAnim = ANIM_HEDGEHOG_IDLE_LEFT; + } + } else { + if (directionY > 0) { + walkAnim = ANIM_HEDGEHOG_WALK_DOWN; + ballAnim = ANIM_HEDGEHOG_BALL_DOWN; + idleAnim = ANIM_HEDGEHOG_IDLE_DOWN; + } else { + walkAnim = ANIM_HEDGEHOG_WALK_TOP; + ballAnim = ANIM_HEDGEHOG_BALL_TOP; + idleAnim = ANIM_HEDGEHOG_IDLE_TOP; + } + } + + // Randomly decide if the hedgehog should pause and play an idle animation + if (Phaser.Math.Between(0, 10) < 3) { + this.play(idleAnim); + this.currentDelay = this.scene.time.delayedCall( + 5000, + () => { + this.moveHedgehog(); + }, + [], + this + ); + } else { + const throttledSetActorDepth = throttle(this.setActorDepth, 360); + this.currentTween = this.scene.tweens.add({ + targets: this, + x: targetX, + y: targetY, + duration: 2000, // adjust as needed + onStart: () => { + if (!this.active) return; + this.play(walkAnim); + }, + onUpdate: () => { + throttledSetActorDepth(); + }, + onComplete: () => { + if (!this.active) return; + this.play(ballAnim); + this.scene.time.delayedCall(5000, this.moveHedgehog, [], this); + } + }); + } + } + private setActorDepth = () => { + DepthHelper.setActorDepth(this); + }; + override destroy(fromScene?: boolean) { + super.destroy(fromScene); + this.currentDelay?.remove(false); + this.currentTween?.stop(); + } + /* END-USER-CODE */ +} + +/* END OF COMPILED CODE */ + +// You can write more code here diff --git a/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.scene b/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.scene new file mode 100644 index 00000000..a16011fe --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.scene @@ -0,0 +1,41 @@ +{ + "id": "2e708e33-ee95-41cc-b479-aaf17a1a8225", + "sceneType": "PREFAB", + "settings": { + "exportClass": true, + "autoImport": true, + "preloadMethodName": "", + "preloadPackFiles": [], + "createMethodName": "", + "compilerOutputLanguage": "TYPE_SCRIPT", + "borderWidth": 64, + "borderHeight": 64 + }, + "displayList": [ + { + "type": "Sprite", + "id": "ffe7a2b6-a747-4ad0-817a-8eec166e1274", + "label": "sheep_idle_down", + "hitArea.shape": "CIRCLE", + "hitArea.x": 29, + "hitArea.y": 39, + "hitArea.radius": 17.805288050449516, + "texture": { + "key": "animals", + "frame": "sheep/sheep_down.png" + }, + "x": 32, + "y": 49.42203448546586, + "originY": 0.772219288835404, + "animationPlayMethod": 1, + "animationKey": "sheep_idle_down" + } + ], + "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/animals/Sheep.ts b/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.ts new file mode 100644 index 00000000..6c20c2dc --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/animals/Sheep.ts @@ -0,0 +1,124 @@ +// You can write more code here + +/* START OF COMPILED CODE */ + +import Phaser from "phaser"; +/* 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 */ + /* 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) { + // 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 + }); + + let shearedCount = 0; + const maxShearedCount = 5; + + 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.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.woolParticles?.emitParticleAt(this.x, this.y - 20, 50); + this.sheared = false; + this.playSheepAnimation(); + }); + } + }); + } + + private handleSheepRandomRotation() { + this.rotateSheepToRandomDirection(); + this.playSheepAnimation(); + this.repeatingEvent = this.scene.time.addEvent({ + delay: Phaser.Math.Between(2000, 5000), + callback: () => { + if (!this.active) return; + 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); + } + + override destroy(fromScene?: boolean) { + super.destroy(fromScene); + this.repeatingEvent?.remove(false); + } + + // 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/prefabs/animals/anims/animals.ts b/apps/client/src/app/probable-waffle/game/prefabs/animals/anims/animals.ts new file mode 100644 index 00000000..c3a2de38 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/animals/anims/animals.ts @@ -0,0 +1,41 @@ +// The constants with the animation keys. + +export const ANIM_HEDGEHOG_IDLE_RIGHT = "hedgehog_idle_right"; + +export const ANIM_HEDGEHOG_IDLE_DOWN = "hedgehog_idle_down"; + +export const ANIM_HEDGEHOG_IDLE_TOP = "hedgehog_idle_top"; + +export const ANIM_HEDGEHOG_WALK_RIGHT = "hedgehog_walk_right"; + +export const ANIM_HEDGEHOG_WALK_TOP = "hedgehog_walk_top"; + +export const ANIM_HEDGEHOG_BALL_RIGHT = "hedgehog_ball_right"; + +export const ANIM_HEDGEHOG_BALL_DOWN = "hedgehog_ball_down"; + +export const ANIM_HEDGEHOG_BALL_TOP = "hedgehog_ball_top"; + +export const ANIM_HEDGEHOG_IDLE_LEFT = "hedgehog_idle_left"; + +export const ANIM_HEDGEHOG_WALK_LEFT = "hedgehog_walk_left"; + +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_UP = "sheep_idle_up"; + +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/prefabs/buildings/skaduwee/FrostForge.scene b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.scene new file mode 100644 index 00000000..4af35142 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.scene @@ -0,0 +1,106 @@ +{ + "id": "56d62d59-15b0-4017-b986-1f24c1040cb6", + "sceneType": "PREFAB", + "settings": { + "exportClass": true, + "autoImport": true, + "preloadMethodName": "", + "preloadPackFiles": [], + "createMethodName": "", + "compilerOutputLanguage": "TYPE_SCRIPT", + "borderWidth": 256, + "borderHeight": 384 + }, + "displayList": [ + { + "type": "Container", + "id": "51a74127-fc61-4363-9137-f1c924917688", + "label": "container_1", + "hitArea.shape": "POLYGON", + "hitArea.points": "-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", + "x": 129, + "y": 323.7847134131514, + "list": [ + { + "type": "Image", + "id": "4931a4ee-4853-470b-a5e8-23f12bc49758", + "label": "buildings_skaduwee_frost_forge_frost_forge_png", + "texture": { + "key": "factions", + "frame": "buildings/skaduwee/frost_forge/frost_forge.png" + }, + "x": -1, + "y": -18.21845166634691, + "originY": 0.7957454759361422 + }, + { + "type": "Sprite", + "id": "84271ac3-461a-40c4-8f9e-7074a0bde613", + "label": "frost_forge_flame", + "texture": { + "key": "factions", + "frame": "buildings/skaduwee/frost_forge/flame/frost_forge_flame_1.png" + }, + "x": 2, + "y": -235, + "scaleX": 1.5, + "scaleY": 2, + "originY": 0.5151570341464229, + "animationPlayMethod": 1, + "animationKey": "frost_forge_flame" + }, + { + "type": "Image", + "id": "b6b700a5-583c-4afa-8802-2f71e737d073", + "label": "cloud_3", + "scope": "CLASS", + "texture": { + "key": "factions", + "frame": "buildings/skaduwee/infantry_inn/cloud-vertical.png" + }, + "x": -25, + "y": -215, + "scaleX": 2, + "scaleY": 2, + "angle": 180 + }, + { + "type": "Image", + "id": "b35727b7-1b04-4197-8824-734e4f9a8fd0", + "label": "cloud_2", + "scope": "CLASS", + "texture": { + "key": "factions", + "frame": "buildings/skaduwee/infantry_inn/cloud-vertical.png" + }, + "x": 26, + "y": -232, + "scaleX": 2, + "scaleY": 2 + }, + { + "type": "Image", + "id": "6f2f9d75-27ce-4b6c-a769-bb3366be1538", + "label": "cloud_1", + "scope": "CLASS", + "texture": { + "key": "factions", + "frame": "buildings/skaduwee/infantry_inn/cloud-vertical.png" + }, + "x": 2, + "y": -250, + "scaleX": 2.2, + "scaleY": 2.2, + "angle": 180 + } + ] + } + ], + "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/buildings/skaduwee/FrostForge.ts b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts new file mode 100644 index 00000000..a6ce1d89 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/FrostForge.ts @@ -0,0 +1,156 @@ +// You can write more code here + +/* START OF COMPILED CODE */ + +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"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; +/* 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 */ + 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); + this.setupCloudsTween(this.cloud_3); + + this.on("pointerdown", () => { + buildings_skaduwee_frost_forge_frost_forge_png.setTint(0xff0000); // Tint to red + // tint back to transparent after 1 second + setTimeout(() => { + buildings_skaduwee_frost_forge_frost_forge_png.clearTint(); + }, 1000); + }); + /* END-USER-CTR-CODE */ + } + + private cloud_3: Phaser.GameObjects.Image; + private cloud_2: Phaser.GameObjects.Image; + private cloud_1: Phaser.GameObjects.Image; + + /* START-USER-CODE */ + + private tweens: Phaser.Tweens.Tween[] = []; + private setupCloudsTween(cloud: Phaser.GameObjects.Image) { + cloud.alpha = 0; + cloud.y = -215; + // Waiting for 2-4 seconds, then appear it in 1 second + this.scene.time.delayedCall(Phaser.Math.Between(1000, 8000), () => { + this.moveAndFade(cloud); + }); + } + + private moveAndFade(cloud: Phaser.GameObjects.Image) { + if (!this.active) return; + // Moving up and disappearing + 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 */ +} + +/* END OF COMPILED CODE */ + +// You can write more code here diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.scene b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.scene index 480a0f9b..82baea97 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/InfantryInn.scene @@ -13,25 +13,10 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", + "type": "Container", "id": "c586f07d-1ddf-4bc1-8a74-83b89a5f7988", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], "label": "container_1", - "z": 0, "hitArea.shape": "CIRCLE", - "hitArea.x": 0, "hitArea.y": -35, "hitArea.radius": 59.91620797027979, "x": 64, 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 7fd819f0..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 @@ -2,15 +2,18 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../entity/actor/ActorContainer"; +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"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ -export default class InfantryInn extends ActorContainer { +export default class InfantryInn extends Phaser.GameObjects.Container { constructor(scene: Phaser.Scene, x?: number, y?: number) { super(scene, x ?? 64, y ?? 128); - this.removeInteractive(); this.setInteractive(new Phaser.Geom.Circle(0, -35, 59.91620797027979), Phaser.Geom.Circle.Contains); // infantry_inn_building @@ -40,10 +43,19 @@ export default class InfantryInn extends ActorContainer { skaduwee_buildings_infantry_inn_entrance.play("skaduwee-buildings-infantry-inn-entrance"); this.add(skaduwee_buildings_infantry_inn_entrance); - // this (prefab fields) - this.z = 0; - /* START-USER-CTR-CODE */ + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); + this.cloud1 = cloud_1; this.cloud2 = cloud_2; this.setupCloudsTween(this.cloud1); @@ -62,32 +74,42 @@ export default class InfantryInn extends ActorContainer { /* 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/skaduwee/Owlery.scene b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/Owlery.scene index e6636c91..8d3e1dfe 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/Owlery.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/skaduwee/Owlery.scene @@ -13,23 +13,9 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", + "type": "Container", "id": "2b215193-38dc-4b1b-a858-aad59668b550", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], "label": "container_1", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-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", "x": 32, 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 cae96c94..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 @@ -2,19 +2,22 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ 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"; +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 ActorContainer { +export default class Owlery extends Phaser.GameObjects.Container { constructor(scene: Phaser.Scene, x?: number, y?: number) { super(scene, x ?? 32, y ?? 176); - this.removeInteractive(); 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" @@ -36,10 +39,19 @@ export default class Owlery extends ActorContainer { skaduwee_buildings_owlery_owl.play("skaduwee-buildings-owlery-owl"); this.add(skaduwee_buildings_owlery_owl); - // this (prefab fields) - this.z = 0; - /* START-USER-CTR-CODE */ + 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 // tint back to transparent after 1 second diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.scene b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.scene index 25e2ead0..8de612e8 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/AnkGuard.scene @@ -13,23 +13,9 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", + "type": "Container", "id": "ab4a54ef-0776-45f7-bcd8-d3bd1467a5ae", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], "label": "buildings_tivara_ankguard_png", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-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", "x": 128, 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 822ca7b0..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 @@ -2,16 +2,19 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../entity/actor/ActorContainer"; +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"; +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 ActorContainer { +export default class AnkGuard extends Phaser.GameObjects.Container { constructor(scene: Phaser.Scene, x?: number, y?: number) { super(scene, x ?? 128, y ?? 182.8318108210126); - this.removeInteractive(); 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" @@ -68,20 +71,29 @@ export default class AnkGuard extends ActorContainer { tivara_buildings_ankguard_flag.play("tivara-buildings-ankguard-flag"); this.add(tivara_buildings_ankguard_flag); - // this (prefab fields) - this.z = 0; - /* START-USER-CTR-CODE */ - // Write your code here. + 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(() => { + 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); }); diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Olival.scene b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Olival.scene index 74ee6d66..ca90506c 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Olival.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Olival.scene @@ -13,23 +13,9 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", + "type": "Container", "id": "d41c62a4-6a00-44db-a1c6-30b7bebef470", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], "label": "container_1", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-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", "x": 15.99154048826449, 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 e2ea9cea..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 @@ -2,16 +2,19 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ -import { Vector2Simple } from "../../../library/math/intersection"; +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 ActorContainer { +export default class Olival extends Phaser.GameObjects.Container { constructor(scene: Phaser.Scene, x?: number, y?: number) { super(scene, x ?? 15.99154048826449, y ?? 54.535253459978904); - this.removeInteractive(); 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" @@ -32,10 +35,19 @@ export default class Olival extends ActorContainer { const buildings_tivara_olival = scene.add.image(0, -22, "factions", "buildings/tivara/olival/olival.png"); this.add(buildings_tivara_olival); - // this (prefab fields) - this.z = 0; - /* START-USER-CTR-CODE */ + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); + this.bounce(buildings_tivara_olival); this.on("pointerdown", () => { diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.scene b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.scene index ef8a103a..109df010 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Sandhold.scene @@ -14,23 +14,9 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", + "type": "Container", "id": "75d98e32-5bb9-40eb-b3dc-40dff0670310", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], "label": "container_1", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-154 2 -1 -219 153 0 123 24 119 47 82 64 60 53 5 79 -56 53 -81 58 -119 42 -120 22", "x": 160, 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 33cf8c1d..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 @@ -2,15 +2,19 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../entity/actor/ActorContainer"; +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 { 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 ActorContainer { +export default class Sandhold extends Phaser.GameObjects.Container { constructor(scene: Phaser.Scene, x?: number, y?: number) { super(scene, x ?? 160, y ?? 240); - this.removeInteractive(); this.setInteractive( new Phaser.Geom.Polygon("-154 2 -1 -219 153 0 123 24 119 47 82 64 60 53 5 79 -56 53 -81 58 -119 42 -120 22"), Phaser.Geom.Polygon.Contains @@ -24,10 +28,21 @@ export default class Sandhold extends ActorContainer { const hover_crystal = scene.add.image(0, -192, "factions", "buildings/tivara/sandhold/sandhold-crystal.png"); this.add(hover_crystal); - // this (prefab fields) - this.z = 0; - /* START-USER-CTR-CODE */ + + 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({ targets: hover_crystal, @@ -63,7 +78,7 @@ export default class Sandhold extends ActorContainer { span.scaleX = 0.5; span.scaleY = 0.5; span.angle = -70; - span.play("anim-tivara-buildings-olival-small"); + span.play(ANIM_TIVARA_BUILDINGS_OLIVAL_SMALL); this.add(span); scene.tweens.add({ diff --git a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Temple.scene b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Temple.scene index ac43eb76..1497b67c 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Temple.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/Temple.scene @@ -13,23 +13,9 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", + "type": "Container", "id": "f61b468d-f09c-4eeb-b80e-059f01e4db7d", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], "label": "buildings_tivara_temple_png", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-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", "x": 96.3076677868738, 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 b75d865b..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 @@ -2,15 +2,18 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../entity/actor/ActorContainer"; +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"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ -export default class Temple extends ActorContainer { +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.removeInteractive(); 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" @@ -36,10 +39,18 @@ export default class Temple extends ActorContainer { ); this.add(buildings_tivara_temple_temple_olival); - // this (prefab fields) - this.z = 0; - /* START-USER-CTR-CODE */ + 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.scene b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/WorkMill.scene index ec2f39ba..1d9ea75d 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/WorkMill.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/buildings/tivara/WorkMill.scene @@ -14,22 +14,8 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], + "type": "Container", "label": "container_1", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-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", "x": 64, 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 8eb45c42..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 @@ -2,15 +2,18 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../entity/actor/ActorContainer"; +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"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ -export default class WorkMill extends ActorContainer { +export default class WorkMill extends Phaser.GameObjects.Container { constructor(scene: Phaser.Scene, x?: number, y?: number) { super(scene, x ?? 64, y ?? 96.29342343955079); - this.removeInteractive(); 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" @@ -27,10 +30,19 @@ export default class WorkMill extends ActorContainer { ); this.add(buildings_tivara_workmill_png_1); - // this (prefab fields) - this.z = 0; - /* START-USER-CTR-CODE */ + 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 // tint back to transparent after 1 second 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..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 @@ -4,6 +4,10 @@ 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"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class GeneralWarrior extends Phaser.GameObjects.Sprite { @@ -15,6 +19,18 @@ 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), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); + 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..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 @@ -4,6 +4,10 @@ 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"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class SkaduweeMagicianFemale extends Phaser.GameObjects.Container { @@ -18,6 +22,18 @@ 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), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); + 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..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 @@ -4,7 +4,10 @@ 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"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class SkaduweeRangedFemale extends Phaser.GameObjects.Sprite { @@ -16,7 +19,17 @@ 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), + 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 d9a950d7..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 @@ -4,6 +4,10 @@ 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"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class SkaduweeWarriorMale extends Phaser.GameObjects.Container { @@ -18,7 +22,18 @@ 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), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); + 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..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 @@ -4,6 +4,10 @@ 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"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class SkaduweeWorkerFemale extends Phaser.GameObjects.Sprite { @@ -15,6 +19,18 @@ 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), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); + 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..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 @@ -4,6 +4,10 @@ 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"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class SkaduweeWorkerMale extends Phaser.GameObjects.Sprite { @@ -15,6 +19,18 @@ 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), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); + 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..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 @@ -4,6 +4,10 @@ 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"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class TivaraMacemanMale extends Phaser.GameObjects.Container { @@ -18,6 +22,18 @@ 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), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); + 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..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 @@ -4,6 +4,10 @@ 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"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class TivaraSlingshotFemale extends Phaser.GameObjects.Sprite { @@ -15,6 +19,18 @@ 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), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); + 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..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 @@ -4,6 +4,10 @@ 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"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class TivaraWorkerFemale extends Phaser.GameObjects.Sprite { @@ -15,6 +19,18 @@ 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), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); + 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..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 @@ -4,6 +4,10 @@ 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"; +import { HealthComponent, HealthDefinition } from "../../../entity/combat/components/health-component"; /* END-USER-IMPORTS */ export default class TivaraWorkerMale extends Phaser.GameObjects.Sprite { @@ -15,6 +19,18 @@ 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), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); + 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/gui/buttons/ButtonSmall.scene b/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.scene new file mode 100644 index 00000000..db9e16b2 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.scene @@ -0,0 +1,103 @@ +{ + "id": "2c7a7ebf-6290-4eea-837b-ff0a8a70f4e8", + "sceneType": "PREFAB", + "settings": { + "exportClass": true, + "autoImport": true, + "preloadMethodName": "", + "preloadPackFiles": [], + "createMethodName": "", + "compilerOutputLanguage": "TYPE_SCRIPT", + "borderWidth": 20, + "borderHeight": 20 + }, + "displayList": [ + { + "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": [], + "meta": { + "app": "Phaser Editor 2D - Scene Editor", + "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 new file mode 100644 index 00000000..9b24e5c7 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/gui/buttons/ButtonSmall.ts @@ -0,0 +1,74 @@ +// You can write more code here + +/* START OF COMPILED CODE */ + +import Phaser from "phaser"; +/* START-USER-IMPORTS */ +import { EventEmitter } from "@angular/core"; +/* END-USER-IMPORTS */ + +export default class ButtonSmall extends Phaser.GameObjects.Container { + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 4, y ?? 9); + + // 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); + + // 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 */ + } + + 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 */ +} + +/* END OF COMPILED CODE */ + +// You can write more code here diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/foliage/trees/resources/Tree10.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/foliage/trees/resources/Tree10.scene new file mode 100644 index 00000000..0b784a09 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/foliage/trees/resources/Tree10.scene @@ -0,0 +1,37 @@ +{ + "id": "c0d76b4e-4215-46c7-a7f6-4e52c672fdb1", + "sceneType": "PREFAB", + "settings": { + "exportClass": true, + "autoImport": true, + "preloadMethodName": "", + "preloadPackFiles": [], + "createMethodName": "", + "compilerOutputLanguage": "TYPE_SCRIPT", + "borderWidth": 92, + "borderHeight": 92 + }, + "displayList": [ + { + "type": "Image", + "id": "8f65c36c-7456-4ad7-a318-7f35f495c48b", + "label": "foliage_trees_resources_tree10_png", + "hitArea.shape": "POLYGON", + "hitArea.points": "4.193840323421412 29.447687344756716 47.028453916909534 15.89999560356047 87.87075990139822 30.443841149256443 84.88229848789904 47.77691734755164 63.365376310705 73.27845474274457 53.20460750480782 76.66537767804363 51.411530656708315 86.62691572304087 37.26614663281224 86.02922344034103 35.67230054561268 64.31307050224704 3.596148040721573 42.19845604235318", + "texture": { + "key": "outside", + "frame": "foliage/trees/resources/tree10.png" + }, + "x": 46, + "y": 81.26384417939924, + "originY": 0.8833026541239049 + } + ], + "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/outside/foliage/trees/resources/Tree10.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/foliage/trees/resources/Tree10.ts new file mode 100644 index 00000000..4baf0f75 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/foliage/trees/resources/Tree10.ts @@ -0,0 +1,32 @@ + +// You can write more code here + +/* START OF COMPILED CODE */ + +import Phaser from "phaser"; +/* START-USER-IMPORTS */ +/* END-USER-IMPORTS */ + +export default class Tree10 extends Phaser.GameObjects.Image { + + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 46, y ?? 81.26384417939924, texture || "outside", frame ?? "foliage/trees/resources/tree10.png"); + + this.setInteractive(new Phaser.Geom.Polygon("4.193840323421412 29.447687344756716 47.028453916909534 15.89999560356047 87.87075990139822 30.443841149256443 84.88229848789904 47.77691734755164 63.365376310705 73.27845474274457 53.20460750480782 76.66537767804363 51.411530656708315 86.62691572304087 37.26614663281224 86.02922344034103 35.67230054561268 64.31307050224704 3.596148040721573 42.19845604235318"), Phaser.Geom.Polygon.Contains); + this.setOrigin(0.5, 0.8833026541239049); + + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } + + /* START-USER-CODE */ + + // 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/prefabs/outside/foliage/trees/resources/Tree11.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/foliage/trees/resources/Tree11.scene new file mode 100644 index 00000000..e1fee198 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/foliage/trees/resources/Tree11.scene @@ -0,0 +1,37 @@ +{ + "id": "f09568ca-4e05-4ddd-ba4f-3ad6c515d28b", + "sceneType": "PREFAB", + "settings": { + "exportClass": true, + "autoImport": true, + "preloadMethodName": "", + "preloadPackFiles": [], + "createMethodName": "", + "compilerOutputLanguage": "TYPE_SCRIPT", + "borderWidth": 92, + "borderHeight": 92 + }, + "displayList": [ + { + "type": "Image", + "id": "6fa3b318-5e1b-484d-aedb-62be0a74f353", + "label": "foliage_trees_resources_tree11_png", + "hitArea.shape": "POLYGON", + "hitArea.points": "3.784376857318719 27.45468445486062 20.869663472802703 17.062602905236346 48.523168613328316 11.073945741046074 91.1483166643296 21.289890315252997 88.15398808223446 46.12520384910084 57.33001738419635 60.04002490707233 59.795935040039396 89.80717375260627 35.66516940786099 90.5117216542757 30.733334096174897 84.52306449008546 40.24473076871237 63.73890139083691 29.32423829283601 46.301340824518206 7.307116365665934 36.43767020114601", + "texture": { + "key": "outside", + "frame": "foliage/trees/resources/tree11.png" + }, + "x": 46, + "y": 84.39785986873036, + "originY": 0.917368042051417 + } + ], + "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/outside/foliage/trees/resources/Tree11.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/foliage/trees/resources/Tree11.ts new file mode 100644 index 00000000..ee5d6111 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/foliage/trees/resources/Tree11.ts @@ -0,0 +1,32 @@ + +// You can write more code here + +/* START OF COMPILED CODE */ + +import Phaser from "phaser"; +/* START-USER-IMPORTS */ +/* END-USER-IMPORTS */ + +export default class Tree11 extends Phaser.GameObjects.Image { + + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 46, y ?? 84.39785986873036, texture || "outside", frame ?? "foliage/trees/resources/tree11.png"); + + this.setInteractive(new Phaser.Geom.Polygon("3.784376857318719 27.45468445486062 20.869663472802703 17.062602905236346 48.523168613328316 11.073945741046074 91.1483166643296 21.289890315252997 88.15398808223446 46.12520384910084 57.33001738419635 60.04002490707233 59.795935040039396 89.80717375260627 35.66516940786099 90.5117216542757 30.733334096174897 84.52306449008546 40.24473076871237 63.73890139083691 29.32423829283601 46.301340824518206 7.307116365665934 36.43767020114601"), Phaser.Geom.Polygon.Contains); + this.setOrigin(0.5, 0.917368042051417); + + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } + + /* START-USER-CODE */ + + // 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/prefabs/outside/foliage/trees/resources/Tree9.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/foliage/trees/resources/Tree9.scene new file mode 100644 index 00000000..edc25bb8 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/foliage/trees/resources/Tree9.scene @@ -0,0 +1,37 @@ +{ + "id": "e5ae5fa0-6dc1-48d5-b040-80ec53ee9f1b", + "sceneType": "PREFAB", + "settings": { + "exportClass": true, + "autoImport": true, + "preloadMethodName": "", + "preloadPackFiles": [], + "createMethodName": "", + "compilerOutputLanguage": "TYPE_SCRIPT", + "borderWidth": 128, + "borderHeight": 192 + }, + "displayList": [ + { + "type": "Image", + "id": "d1e029d1-1ed6-4f1a-ab98-def4d723246c", + "label": "foliage_trees_resources_tree9_png", + "hitArea.shape": "POLYGON", + "hitArea.points": "7.082902511161393 1.2876334322518659 64 0 119.42461645248203 1.9747387162966419 125.26501136686261 31.520265930221953 111.17935304394473 43.201055758983124 99.84211585720595 68.96750391066216 121.82948494663874 88.20645186391585 76.13698355766124 109.50671566930386 84.03869432417613 180.27855992591563 61.70777259272097 185.43184955625145 42.81237728148967 180.9656652099604 48.30921955384787 116.72132115177399 9.144218363295714 99.88724169267701 8.113560437228557 86.83224129582631 32.50579802081805 69.99816183672932 6.395797227116617 46.29302953718461", + "texture": { + "key": "outside", + "frame": "foliage/trees/resources/tree9.png" + }, + "x": 64, + "y": 172.95579279773938, + "originY": 0.9008114208215593 + } + ], + "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/outside/foliage/trees/resources/Tree9.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/foliage/trees/resources/Tree9.ts new file mode 100644 index 00000000..930bfb14 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/foliage/trees/resources/Tree9.ts @@ -0,0 +1,32 @@ + +// You can write more code here + +/* START OF COMPILED CODE */ + +import Phaser from "phaser"; +/* START-USER-IMPORTS */ +/* END-USER-IMPORTS */ + +export default class Tree9 extends Phaser.GameObjects.Image { + + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 64, y ?? 172.95579279773938, texture || "outside", frame ?? "foliage/trees/resources/tree9.png"); + + this.setInteractive(new Phaser.Geom.Polygon("7.082902511161393 1.2876334322518659 64 0 119.42461645248203 1.9747387162966419 125.26501136686261 31.520265930221953 111.17935304394473 43.201055758983124 99.84211585720595 68.96750391066216 121.82948494663874 88.20645186391585 76.13698355766124 109.50671566930386 84.03869432417613 180.27855992591563 61.70777259272097 185.43184955625145 42.81237728148967 180.9656652099604 48.30921955384787 116.72132115177399 9.144218363295714 99.88724169267701 8.113560437228557 86.83224129582631 32.50579802081805 69.99816183672932 6.395797227116617 46.29302953718461"), Phaser.Geom.Polygon.Contains); + this.setOrigin(0.5, 0.9008114208215593); + + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } + + /* START-USER-CODE */ + + // 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/prefabs/outside/nature/block_obsidian/BlockObsidian1.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian/BlockObsidian1.scene index 56b0db9e..d501c33e 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian/BlockObsidian1.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian/BlockObsidian1.scene @@ -14,39 +14,18 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], - "label": "container_1", - "z": 0, + "type": "Image", + "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eac", + "label": "block", "hitArea.shape": "POLYGON", - "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", + "hitArea.points": "0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735", + "texture": { + "key": "outside", + "frame": "nature/block_obsidian/1.png" + }, "x": 32, - "y": 48, - "list": [ - { - "type": "Image", - "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eac", - "label": "outside_nature_block_obsidian_1", - "texture": { - "key": "outside", - "frame": "nature/block_obsidian/1.png" - }, - "y": -17.87410141979456, - "originY": 0.470717165742086 - } - ] + "y": 48.14660195684367, + "originY": 0.7522906265785319 } ], "plainObjects": [], @@ -55,5 +34,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] } \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian/BlockObsidian1.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian/BlockObsidian1.ts index 4cf41e49..782b8189 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian/BlockObsidian1.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian/BlockObsidian1.ts @@ -2,41 +2,26 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockObsidian1 extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // outside_nature_block_obsidian_1 - const outside_nature_block_obsidian_1 = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_obsidian/1.png" - ); - outside_nature_block_obsidian_1.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_obsidian_1); - - // this (prefab fields) - this.z = 0; - - /* START-USER-CTR-CODE */ +export default class BlockObsidian1 extends Phaser.GameObjects.Image { + + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 32, y ?? 48.14660195684367, texture || "outside", frame ?? "nature/block_obsidian/1.png"); + + this.setInteractive(new Phaser.Geom.Polygon("0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735"), Phaser.Geom.Polygon.Contains); + this.setOrigin(0.5, 0.7522906265785319); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian/BlockObsidian2.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian/BlockObsidian2.scene index 9415975e..e39a123d 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian/BlockObsidian2.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian/BlockObsidian2.scene @@ -14,39 +14,18 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], - "label": "container_1", - "z": 0, + "type": "Image", + "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6ead", + "label": "block", "hitArea.shape": "POLYGON", - "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", + "hitArea.points": "0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735", + "texture": { + "key": "outside", + "frame": "nature/block_obsidian/2.png" + }, "x": 32, - "y": 48, - "list": [ - { - "type": "Image", - "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eac", - "label": "outside_nature_block_obsidian_2", - "texture": { - "key": "outside", - "frame": "nature/block_obsidian/2.png" - }, - "y": -17.87410141979456, - "originY": 0.470717165742086 - } - ] + "y": 48.14660195684367, + "originY": 0.7522906265785319 } ], "plainObjects": [], @@ -55,5 +34,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] } \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian/BlockObsidian2.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian/BlockObsidian2.ts index b52d1853..80d85657 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian/BlockObsidian2.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian/BlockObsidian2.ts @@ -2,41 +2,26 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockObsidian2 extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // outside_nature_block_obsidian_2 - const outside_nature_block_obsidian_2 = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_obsidian/2.png" - ); - outside_nature_block_obsidian_2.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_obsidian_2); - - // this (prefab fields) - this.z = 0; - - /* START-USER-CTR-CODE */ +export default class BlockObsidian2 extends Phaser.GameObjects.Image { + + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 32, y ?? 48.14660195684367, texture || "outside", frame ?? "nature/block_obsidian/2.png"); + + this.setInteractive(new Phaser.Geom.Polygon("0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735"), Phaser.Geom.Polygon.Contains); + this.setOrigin(0.5, 0.7522906265785319); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava1.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava1.scene index f06a4108..988a5419 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava1.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava1.scene @@ -14,22 +14,8 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], + "type": "Container", "label": "container_1", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", "x": 32, @@ -65,5 +51,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] } \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava1.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava1.ts index 46322970..bedb541d 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava1.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava1.ts @@ -2,17 +2,15 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; -import { time } from "cron"; -import { LavaParticles } from "../../../../effects/particles/LavaParticles"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { LavaParticles } from "../../../../effects/particles/LavaParticles"; /* END-USER-IMPORTS */ -export default class BlockObsidianLava1 extends ActorContainer { +export default class BlockObsidianLava1 extends Phaser.GameObjects.Container { constructor(scene: Phaser.Scene, x?: number, y?: number) { super(scene, x ?? 32, y ?? 48); - this.removeInteractive(); this.setInteractive( new Phaser.Geom.Polygon( "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" @@ -34,14 +32,13 @@ export default class BlockObsidianLava1 extends ActorContainer { outside_nature_block_obsidian_lava_1.setOrigin(0.5, 0.470717165742086); this.add(outside_nature_block_obsidian_lava_1); - // this (prefab fields) - this.z = 0; - /* START-USER-CTR-CODE */ this.particles = new LavaParticles(scene, this.x, this.y); /* END-USER-CTR-CODE */ } + public z: number = 0; + /* START-USER-CODE */ private particles: LavaParticles; diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava2.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava2.scene index d151c95a..d52a7471 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava2.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava2.scene @@ -14,22 +14,8 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], + "type": "Container", "label": "container_1", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", "x": 32, @@ -65,5 +51,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] } \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava2.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava2.ts index bfab6e9d..018a1d83 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava2.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava2.ts @@ -2,16 +2,15 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; -import { LavaParticles } from "../../../../effects/particles/LavaParticles"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { LavaParticles } from "../../../../effects/particles/LavaParticles"; /* END-USER-IMPORTS */ -export default class BlockObsidianLava2 extends ActorContainer { +export default class BlockObsidianLava2 extends Phaser.GameObjects.Container { constructor(scene: Phaser.Scene, x?: number, y?: number) { super(scene, x ?? 32, y ?? 48); - this.removeInteractive(); this.setInteractive( new Phaser.Geom.Polygon( "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" @@ -33,14 +32,13 @@ export default class BlockObsidianLava2 extends ActorContainer { outside_nature_block_obsidian_lava_2.setOrigin(0.5, 0.470717165742086); this.add(outside_nature_block_obsidian_lava_2); - // this (prefab fields) - this.z = 0; - /* START-USER-CTR-CODE */ this.particles = new LavaParticles(scene, this.x, this.y); /* END-USER-CTR-CODE */ } + public z: number = 0; + /* START-USER-CODE */ private particles: LavaParticles; diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava3.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava3.scene index 159b7d94..a091c63a 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava3.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava3.scene @@ -14,22 +14,8 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], + "type": "Container", "label": "container_1", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", "x": 32, @@ -65,5 +51,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] } \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava3.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava3.ts index 11d05d57..ca12af74 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava3.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava3.ts @@ -2,16 +2,15 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; -import { LavaParticles } from "../../../../effects/particles/LavaParticles"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { LavaParticles } from "../../../../effects/particles/LavaParticles"; /* END-USER-IMPORTS */ -export default class BlockObsidianLava3 extends ActorContainer { +export default class BlockObsidianLava3 extends Phaser.GameObjects.Container { constructor(scene: Phaser.Scene, x?: number, y?: number) { super(scene, x ?? 32, y ?? 48); - this.removeInteractive(); this.setInteractive( new Phaser.Geom.Polygon( "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" @@ -33,14 +32,13 @@ export default class BlockObsidianLava3 extends ActorContainer { outside_nature_block_obsidian_lava_3.setOrigin(0.5, 0.470717165742086); this.add(outside_nature_block_obsidian_lava_3); - // this (prefab fields) - this.z = 0; - /* START-USER-CTR-CODE */ this.particles = new LavaParticles(scene, this.x, this.y); /* END-USER-CTR-CODE */ } + public z: number = 0; + /* START-USER-CODE */ private particles: LavaParticles; diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava4.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava4.scene index 9c5bf826..868cd4fb 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava4.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava4.scene @@ -14,22 +14,8 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], + "type": "Container", "label": "container_1", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", "x": 32, @@ -65,5 +51,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] } \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava4.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava4.ts index 7d46f8d0..7e704ca1 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava4.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava4.ts @@ -2,16 +2,15 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; -import { LavaParticles } from "../../../../effects/particles/LavaParticles"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { LavaParticles } from "../../../../effects/particles/LavaParticles"; /* END-USER-IMPORTS */ -export default class BlockObsidianLava4 extends ActorContainer { +export default class BlockObsidianLava4 extends Phaser.GameObjects.Container { constructor(scene: Phaser.Scene, x?: number, y?: number) { super(scene, x ?? 32, y ?? 48); - this.removeInteractive(); this.setInteractive( new Phaser.Geom.Polygon( "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" @@ -33,14 +32,13 @@ export default class BlockObsidianLava4 extends ActorContainer { outside_nature_block_obsidian_lava_4.setOrigin(0.5, 0.470717165742086); this.add(outside_nature_block_obsidian_lava_4); - // this (prefab fields) - this.z = 0; - /* START-USER-CTR-CODE */ this.particles = new LavaParticles(scene, this.x, this.y); /* END-USER-CTR-CODE */ } + public z: number = 0; + /* START-USER-CODE */ private particles: LavaParticles; diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava5.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava5.scene index 41d79df4..74ea2f3b 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava5.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava5.scene @@ -14,22 +14,8 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], + "type": "Container", "label": "container_1", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", "x": 32, @@ -65,5 +51,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] } \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava5.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava5.ts index 189b8be9..a85f82bf 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava5.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_obsidian_lava/BlockObsidianLava5.ts @@ -2,16 +2,15 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; -import { LavaParticles } from "../../../../effects/particles/LavaParticles"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ +import { LavaParticles } from "../../../../effects/particles/LavaParticles"; /* END-USER-IMPORTS */ -export default class BlockObsidianLava5 extends ActorContainer { +export default class BlockObsidianLava5 extends Phaser.GameObjects.Container { constructor(scene: Phaser.Scene, x?: number, y?: number) { super(scene, x ?? 32, y ?? 48); - this.removeInteractive(); this.setInteractive( new Phaser.Geom.Polygon( "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" @@ -33,14 +32,13 @@ export default class BlockObsidianLava5 extends ActorContainer { outside_nature_block_obsidian_lava_5.setOrigin(0.5, 0.470717165742086); this.add(outside_nature_block_obsidian_lava_5); - // this (prefab fields) - this.z = 0; - /* START-USER-CTR-CODE */ this.particles = new LavaParticles(scene, this.x, this.y); /* END-USER-CTR-CODE */ } + public z: number = 0; + /* START-USER-CODE */ private particles: LavaParticles; diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone/BlockStone1.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone/BlockStone1.scene index 497796ec..f60fbe94 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone/BlockStone1.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone/BlockStone1.scene @@ -14,38 +14,18 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], - "label": "container_1", + "type": "Image", + "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eae", + "label": "block", "hitArea.shape": "POLYGON", - "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", + "hitArea.points": "0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735", + "texture": { + "key": "outside", + "frame": "nature/block_stone/1.png" + }, "x": 32, - "y": 48, - "list": [ - { - "type": "Image", - "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eac", - "label": "outside_nature_block_stone_1", - "texture": { - "key": "outside", - "frame": "nature/block_stone/1.png" - }, - "y": -17.87410141979456, - "originY": 0.470717165742086 - } - ] + "y": 48.14660195684367, + "originY": 0.7522906265785319 } ], "plainObjects": [], @@ -54,5 +34,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } -} + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] +} \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone/BlockStone1.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone/BlockStone1.ts index 0b3561ee..df57df50 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone/BlockStone1.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone/BlockStone1.ts @@ -2,33 +2,26 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStone1 extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); +export default class BlockStone1 extends Phaser.GameObjects.Image { - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 32, y ?? 48.14660195684367, texture || "outside", frame ?? "nature/block_stone/1.png"); - // outside_nature_block_stone_1 - const outside_nature_block_stone_1 = scene.add.image(0, -17.87410141979456, "outside", "nature/block_stone/1.png"); - outside_nature_block_stone_1.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_1); + this.setInteractive(new Phaser.Geom.Polygon("0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735"), Phaser.Geom.Polygon.Contains); + this.setOrigin(0.5, 0.7522906265785319); - /* START-USER-CTR-CODE */ + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } - /* START-USER-CODE */ + public z: number = 0; + + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone/BlockStone2.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone/BlockStone2.scene index ed619337..920aa5a6 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone/BlockStone2.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone/BlockStone2.scene @@ -14,38 +14,18 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], - "label": "container_1", + "type": "Image", + "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eaf", + "label": "block", "hitArea.shape": "POLYGON", - "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", + "hitArea.points": "0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735", + "texture": { + "key": "outside", + "frame": "nature/block_stone/2.png" + }, "x": 32, - "y": 48, - "list": [ - { - "type": "Image", - "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eac", - "label": "outside_nature_block_stone_2", - "texture": { - "key": "outside", - "frame": "nature/block_stone/2.png" - }, - "y": -17.87410141979456, - "originY": 0.470717165742086 - } - ] + "y": 48.14660195684367, + "originY": 0.7522906265785319 } ], "plainObjects": [], @@ -54,5 +34,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } -} + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] +} \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone/BlockStone2.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone/BlockStone2.ts index 2a5a9ba4..b81f5a26 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone/BlockStone2.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone/BlockStone2.ts @@ -2,33 +2,26 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStone2 extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); +export default class BlockStone2 extends Phaser.GameObjects.Image { - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 32, y ?? 48.14660195684367, texture || "outside", frame ?? "nature/block_stone/2.png"); - // outside_nature_block_stone_2 - const outside_nature_block_stone_2 = scene.add.image(0, -17.87410141979456, "outside", "nature/block_stone/2.png"); - outside_nature_block_stone_2.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_2); + this.setInteractive(new Phaser.Geom.Polygon("0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735"), Phaser.Geom.Polygon.Contains); + this.setOrigin(0.5, 0.7522906265785319); - /* START-USER-CTR-CODE */ + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } - /* START-USER-CODE */ + public z: number = 0; + + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneEmpty.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneEmpty.scene index b3d0ff51..da195e94 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneEmpty.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneEmpty.scene @@ -14,38 +14,18 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], - "label": "container_1", + "type": "Image", + "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eaf", + "label": "block", "hitArea.shape": "POLYGON", - "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", + "hitArea.points": "0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735", + "texture": { + "key": "outside", + "frame": "nature/block_stone_grass/empty.png" + }, "x": 32, - "y": 48, - "list": [ - { - "type": "Image", - "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eac", - "label": "outside_nature_block_stone_grass_empty", - "texture": { - "key": "outside", - "frame": "nature/block_stone_grass/empty.png" - }, - "y": -17.87410141979456, - "originY": 0.470717165742086 - } - ] + "y": 48.14660195684367, + "originY": 0.7522906265785319 } ], "plainObjects": [], @@ -54,5 +34,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } -} + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] +} \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneEmpty.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneEmpty.ts index 5450bfe6..05276f65 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneEmpty.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneEmpty.ts @@ -2,38 +2,26 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStoneEmpty extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // outside_nature_block_stone_grass_empty - const outside_nature_block_stone_grass_empty = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_stone_grass/empty.png" - ); - outside_nature_block_stone_grass_empty.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_grass_empty); - - /* START-USER-CTR-CODE */ +export default class BlockStoneEmpty extends Phaser.GameObjects.Image { + + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 32, y ?? 48.14660195684367, texture || "outside", frame ?? "nature/block_stone_grass/empty.png"); + + this.setInteractive(new Phaser.Geom.Polygon("0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735"), Phaser.Geom.Polygon.Contains); + this.setOrigin(0.5, 0.7522906265785319); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomLeft.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomLeft.scene index 77dffecf..a184d799 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomLeft.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomLeft.scene @@ -14,38 +14,18 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], - "label": "container_1", + "type": "Image", + "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eaf", + "label": "block", "hitArea.shape": "POLYGON", - "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", + "hitArea.points": "0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735", + "texture": { + "key": "outside", + "frame": "nature/block_stone_grass/bottom_left.png" + }, "x": 32, - "y": 48, - "list": [ - { - "type": "Image", - "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eac", - "label": "outside_nature_block_stone_grass_bottom_lefts", - "texture": { - "key": "outside", - "frame": "nature/block_stone_grass/bottom_left.png" - }, - "y": -17.87410141979456, - "originY": 0.470717165742086 - } - ] + "y": 48.14660195684367, + "originY": 0.7522906265785319 } ], "plainObjects": [], @@ -54,5 +34,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } -} + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] +} \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomLeft.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomLeft.ts index aa8b3699..38d7afd1 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomLeft.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomLeft.ts @@ -2,38 +2,26 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStoneGrassBottomLeft extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // outside_nature_block_stone_grass_bottom_lefts - const outside_nature_block_stone_grass_bottom_lefts = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_stone_grass/bottom_left.png" - ); - outside_nature_block_stone_grass_bottom_lefts.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_grass_bottom_lefts); - - /* START-USER-CTR-CODE */ +export default class BlockStoneGrassBottomLeft extends Phaser.GameObjects.Image { + + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 32, y ?? 48.14660195684367, texture || "outside", frame ?? "nature/block_stone_grass/bottom_left.png"); + + this.setInteractive(new Phaser.Geom.Polygon("0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735"), Phaser.Geom.Polygon.Contains); + this.setOrigin(0.5, 0.7522906265785319); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomLeftBottomRight.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomLeftBottomRight.scene index dca6d0ed..04877b1d 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomLeftBottomRight.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomLeftBottomRight.scene @@ -14,38 +14,18 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], - "label": "container_1", + "type": "Image", + "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eaf", + "label": "block", "hitArea.shape": "POLYGON", - "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", + "hitArea.points": "0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735", + "texture": { + "key": "outside", + "frame": "nature/block_stone_grass/bottom_left_bottom_right.png" + }, "x": 32, - "y": 48, - "list": [ - { - "type": "Image", - "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eac", - "label": "outside_nature_block_stone_grass_bottom_left_bottom_right", - "texture": { - "key": "outside", - "frame": "nature/block_stone_grass/bottom_left_bottom_right.png" - }, - "y": -17.87410141979456, - "originY": 0.470717165742086 - } - ] + "y": 48.14660195684367, + "originY": 0.7522906265785319 } ], "plainObjects": [], @@ -54,5 +34,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } -} + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] +} \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomLeftBottomRight.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomLeftBottomRight.ts index 1e705cd7..cd222b00 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomLeftBottomRight.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomLeftBottomRight.ts @@ -2,38 +2,26 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStoneGrassBottomLeftBottomRight extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // outside_nature_block_stone_grass_bottom_left_bottom_right - const outside_nature_block_stone_grass_bottom_left_bottom_right = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_stone_grass/bottom_left_bottom_right.png" - ); - outside_nature_block_stone_grass_bottom_left_bottom_right.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_grass_bottom_left_bottom_right); - - /* START-USER-CTR-CODE */ +export default class BlockStoneGrassBottomLeftBottomRight extends Phaser.GameObjects.Image { + + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 32, y ?? 48.14660195684367, texture || "outside", frame ?? "nature/block_stone_grass/bottom_left_bottom_right.png"); + + this.setInteractive(new Phaser.Geom.Polygon("0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735"), Phaser.Geom.Polygon.Contains); + this.setOrigin(0.5, 0.7522906265785319); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomRight.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomRight.scene index d6ebca2f..9e4a6f16 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomRight.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomRight.scene @@ -14,38 +14,18 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], - "label": "container_1", + "type": "Image", + "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eaf", + "label": "block", "hitArea.shape": "POLYGON", - "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", + "hitArea.points": "0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735", + "texture": { + "key": "outside", + "frame": "nature/block_stone_grass/bottom_right.png" + }, "x": 32, - "y": 48, - "list": [ - { - "type": "Image", - "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eac", - "label": "outside_nature_block_stone_grass_bottom_right", - "texture": { - "key": "outside", - "frame": "nature/block_stone_grass/bottom_right.png" - }, - "y": -17.87410141979456, - "originY": 0.470717165742086 - } - ] + "y": 48.14660195684367, + "originY": 0.7522906265785319 } ], "plainObjects": [], @@ -54,5 +34,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } -} + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] +} \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomRight.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomRight.ts index 1fef20d3..6b7ac49c 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomRight.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneGrassBottomRight.ts @@ -2,38 +2,26 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStoneGrassBottomRight extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // outside_nature_block_stone_grass_bottom_right - const outside_nature_block_stone_grass_bottom_right = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_stone_grass/bottom_right.png" - ); - outside_nature_block_stone_grass_bottom_right.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_grass_bottom_right); - - /* START-USER-CTR-CODE */ +export default class BlockStoneGrassBottomRight extends Phaser.GameObjects.Image { + + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 32, y ?? 48.14660195684367, texture || "outside", frame ?? "nature/block_stone_grass/bottom_right.png"); + + this.setInteractive(new Phaser.Geom.Polygon("0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735"), Phaser.Geom.Polygon.Contains); + this.setOrigin(0.5, 0.7522906265785319); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeft.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeft.scene index fe0baa97..9ffa1ef6 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeft.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeft.scene @@ -14,38 +14,18 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], - "label": "container_1", + "type": "Image", + "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eaf", + "label": "block", "hitArea.shape": "POLYGON", - "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", + "hitArea.points": "0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735", + "texture": { + "key": "outside", + "frame": "nature/block_stone_grass/top_left.png" + }, "x": 32, - "y": 48, - "list": [ - { - "type": "Image", - "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eac", - "label": "outside_nature_block_stone_grass_top_left", - "texture": { - "key": "outside", - "frame": "nature/block_stone_grass/top_left.png" - }, - "y": -17.87410141979456, - "originY": 0.470717165742086 - } - ] + "y": 48.14660195684367, + "originY": 0.7522906265785319 } ], "plainObjects": [], @@ -54,5 +34,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } -} + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] +} \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeft.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeft.ts index e013bd4c..5efa343b 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeft.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeft.ts @@ -2,38 +2,26 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStoneTopLeft extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // outside_nature_block_stone_grass_top_left - const outside_nature_block_stone_grass_top_left = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_stone_grass/top_left.png" - ); - outside_nature_block_stone_grass_top_left.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_grass_top_left); - - /* START-USER-CTR-CODE */ +export default class BlockStoneTopLeft extends Phaser.GameObjects.Image { + + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 32, y ?? 48.14660195684367, texture || "outside", frame ?? "nature/block_stone_grass/top_left.png"); + + this.setInteractive(new Phaser.Geom.Polygon("0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735"), Phaser.Geom.Polygon.Contains); + this.setOrigin(0.5, 0.7522906265785319); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeftBottomLeft.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeftBottomLeft.scene index 2ec79d4f..6b7cf068 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeftBottomLeft.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeftBottomLeft.scene @@ -14,38 +14,18 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], - "label": "container_1", + "type": "Image", + "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eaf", + "label": "block", "hitArea.shape": "POLYGON", - "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", + "hitArea.points": "0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735", + "texture": { + "key": "outside", + "frame": "nature/block_stone_grass/top_left_bottom_left.png" + }, "x": 32, - "y": 48, - "list": [ - { - "type": "Image", - "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eac", - "label": "outside_nature_block_stone_grass_top_left_bottom_left", - "texture": { - "key": "outside", - "frame": "nature/block_stone_grass/top_left_bottom_left.png" - }, - "y": -17.87410141979456, - "originY": 0.470717165742086 - } - ] + "y": 48.14660195684367, + "originY": 0.7522906265785319 } ], "plainObjects": [], @@ -54,5 +34,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } -} + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] +} \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeftBottomLeft.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeftBottomLeft.ts index a41cd7b2..48c6c24a 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeftBottomLeft.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeftBottomLeft.ts @@ -2,38 +2,26 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStoneTopLeftBottomLeft extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // outside_nature_block_stone_grass_top_left_bottom_left - const outside_nature_block_stone_grass_top_left_bottom_left = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_stone_grass/top_left_bottom_left.png" - ); - outside_nature_block_stone_grass_top_left_bottom_left.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_grass_top_left_bottom_left); - - /* START-USER-CTR-CODE */ +export default class BlockStoneTopLeftBottomLeft extends Phaser.GameObjects.Image { + + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 32, y ?? 48.14660195684367, texture || "outside", frame ?? "nature/block_stone_grass/top_left_bottom_left.png"); + + this.setInteractive(new Phaser.Geom.Polygon("0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735"), Phaser.Geom.Polygon.Contains); + this.setOrigin(0.5, 0.7522906265785319); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeftTopRight.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeftTopRight.scene index f99bf63b..9d479073 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeftTopRight.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeftTopRight.scene @@ -14,38 +14,18 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], - "label": "container_1", + "type": "Image", + "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eaf", + "label": "block", "hitArea.shape": "POLYGON", - "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", + "hitArea.points": "0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735", + "texture": { + "key": "outside", + "frame": "nature/block_stone_grass/top_left_top_right.png" + }, "x": 32, - "y": 48, - "list": [ - { - "type": "Image", - "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eac", - "label": "outside_nature_block_stone_grass_top_left_top_right", - "texture": { - "key": "outside", - "frame": "nature/block_stone_grass/top_left_top_right.png" - }, - "y": -17.87410141979456, - "originY": 0.470717165742086 - } - ] + "y": 48.14660195684367, + "originY": 0.7522906265785319 } ], "plainObjects": [], @@ -54,5 +34,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } -} + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] +} \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeftTopRight.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeftTopRight.ts index b3bc25e2..1bdfa3d0 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeftTopRight.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopLeftTopRight.ts @@ -2,38 +2,26 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStoneTopLeftTopRight extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // outside_nature_block_stone_grass_top_left_top_right - const outside_nature_block_stone_grass_top_left_top_right = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_stone_grass/top_left_top_right.png" - ); - outside_nature_block_stone_grass_top_left_top_right.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_grass_top_left_top_right); - - /* START-USER-CTR-CODE */ +export default class BlockStoneTopLeftTopRight extends Phaser.GameObjects.Image { + + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 32, y ?? 48.14660195684367, texture || "outside", frame ?? "nature/block_stone_grass/top_left_top_right.png"); + + this.setInteractive(new Phaser.Geom.Polygon("0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735"), Phaser.Geom.Polygon.Contains); + this.setOrigin(0.5, 0.7522906265785319); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopRight.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopRight.scene index 9c19219b..920e3017 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopRight.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopRight.scene @@ -14,38 +14,18 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], - "label": "container_1", + "type": "Image", + "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eaf", + "label": "block", "hitArea.shape": "POLYGON", - "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", + "hitArea.points": "0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735", + "texture": { + "key": "outside", + "frame": "nature/block_stone_grass/top_right.png" + }, "x": 32, - "y": 48, - "list": [ - { - "type": "Image", - "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eac", - "label": "outside_nature_block_stone_grass_top_right", - "texture": { - "key": "outside", - "frame": "nature/block_stone_grass/top_right.png" - }, - "y": -17.87410141979456, - "originY": 0.470717165742086 - } - ] + "y": 48.14660195684367, + "originY": 0.7522906265785319 } ], "plainObjects": [], @@ -54,5 +34,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } -} + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] +} \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopRight.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopRight.ts index a5e78d30..f20c1620 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopRight.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopRight.ts @@ -2,38 +2,26 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStoneTopRight extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // outside_nature_block_stone_grass_top_right - const outside_nature_block_stone_grass_top_right = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_stone_grass/top_right.png" - ); - outside_nature_block_stone_grass_top_right.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_grass_top_right); - - /* START-USER-CTR-CODE */ +export default class BlockStoneTopRight extends Phaser.GameObjects.Image { + + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 32, y ?? 48.14660195684367, texture || "outside", frame ?? "nature/block_stone_grass/top_right.png"); + + this.setInteractive(new Phaser.Geom.Polygon("0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735"), Phaser.Geom.Polygon.Contains); + this.setOrigin(0.5, 0.7522906265785319); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopRightBottomRight.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopRightBottomRight.scene index 400333e8..d8ee81b5 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopRightBottomRight.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopRightBottomRight.scene @@ -14,38 +14,18 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], - "label": "container_1", + "type": "Image", + "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eaf", + "label": "block", "hitArea.shape": "POLYGON", - "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", + "hitArea.points": "0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735", + "texture": { + "key": "outside", + "frame": "nature/block_stone_grass/top_right_bottom_right.png" + }, "x": 32, - "y": 48, - "list": [ - { - "type": "Image", - "id": "e5b08a8f-d604-469b-9d8d-7f3367fe6eac", - "label": "outside_nature_block_stone_grass_top_right_bottom_right", - "texture": { - "key": "outside", - "frame": "nature/block_stone_grass/top_right_bottom_right.png" - }, - "y": -17.87410141979456, - "originY": 0.470717165742086 - } - ] + "y": 48.14660195684367, + "originY": 0.7522906265785319 } ], "plainObjects": [], @@ -54,5 +34,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } -} + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] +} \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopRightBottomRight.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopRightBottomRight.ts index d45bd5f1..b4d0cc96 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopRightBottomRight.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_grass/BlockStoneTopRightBottomRight.ts @@ -2,38 +2,26 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStoneTopRightBottomRight extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // outside_nature_block_stone_grass_top_right_bottom_right - const outside_nature_block_stone_grass_top_right_bottom_right = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_stone_grass/top_right_bottom_right.png" - ); - outside_nature_block_stone_grass_top_right_bottom_right.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_grass_top_right_bottom_right); - - /* START-USER-CTR-CODE */ +export default class BlockStoneTopRightBottomRight extends Phaser.GameObjects.Image { + + constructor(scene: Phaser.Scene, x?: number, y?: number, texture?: string, frame?: number | string) { + super(scene, x ?? 32, y ?? 48.14660195684367, texture || "outside", frame ?? "nature/block_stone_grass/top_right_bottom_right.png"); + + this.setInteractive(new Phaser.Geom.Polygon("0 16 32 0 64 16 63.87692032463579 48.25256512899465 32.007514849696626 64.03752963689782 0.012200041952727503 47.373360474054735"), Phaser.Geom.Polygon.Contains); + this.setOrigin(0.5, 0.7522906265785319); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater1.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater1.scene index ccf556c3..aa0fe28d 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater1.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater1.scene @@ -13,22 +13,8 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], + "type": "Container", "label": "container_1", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", "x": 32, @@ -65,5 +51,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] } \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater1.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater1.ts index 52b91cb2..d3549dd6 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater1.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater1.ts @@ -2,46 +2,35 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStoneWater1 extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // image_1 - const image_1 = scene.add.image(0, -16.700665658808425, "outside", "nature/block_stone/1.png"); - image_1.setOrigin(0.5, 0.4890520868394787); - this.add(image_1); - - // outside_nature_block_stone_water_1 - const outside_nature_block_stone_water_1 = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_stone_water/1.png" - ); - outside_nature_block_stone_water_1.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_water_1); - - // this (prefab fields) - this.z = 0; - - /* START-USER-CTR-CODE */ +export default class BlockStoneWater1 extends Phaser.GameObjects.Container { + + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 32, y ?? 48); + + this.setInteractive(new Phaser.Geom.Polygon("-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516"), Phaser.Geom.Polygon.Contains); + + // image_1 + const image_1 = scene.add.image(0, -16.700665658808425, "outside", "nature/block_stone/1.png"); + image_1.setOrigin(0.5, 0.4890520868394787); + this.add(image_1); + + // outside_nature_block_stone_water_1 + const outside_nature_block_stone_water_1 = scene.add.image(0, -17.87410141979456, "outside", "nature/block_stone_water/1.png"); + outside_nature_block_stone_water_1.setOrigin(0.5, 0.470717165742086); + this.add(outside_nature_block_stone_water_1); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater2.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater2.scene index a7aa9347..6066045c 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater2.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater2.scene @@ -14,22 +14,8 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], + "type": "Container", "label": "container_1", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", "x": 32, @@ -66,5 +52,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] } \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater2.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater2.ts index bfe5bcc8..c2fcfb29 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater2.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater2.ts @@ -2,46 +2,35 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStoneWater2 extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // image_1 - const image_1 = scene.add.image(0, -16.629518870973754, "outside", "nature/block_stone/1.png"); - image_1.setOrigin(0.5, 0.4901637676410351); - this.add(image_1); - - // outside_nature_block_stone_water_2 - const outside_nature_block_stone_water_2 = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_stone_water/2.png" - ); - outside_nature_block_stone_water_2.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_water_2); - - // this (prefab fields) - this.z = 0; - - /* START-USER-CTR-CODE */ +export default class BlockStoneWater2 extends Phaser.GameObjects.Container { + + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 32, y ?? 48); + + this.setInteractive(new Phaser.Geom.Polygon("-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516"), Phaser.Geom.Polygon.Contains); + + // image_1 + const image_1 = scene.add.image(0, -16.629518870973754, "outside", "nature/block_stone/1.png"); + image_1.setOrigin(0.5, 0.4901637676410351); + this.add(image_1); + + // outside_nature_block_stone_water_2 + const outside_nature_block_stone_water_2 = scene.add.image(0, -17.87410141979456, "outside", "nature/block_stone_water/2.png"); + outside_nature_block_stone_water_2.setOrigin(0.5, 0.470717165742086); + this.add(outside_nature_block_stone_water_2); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater3.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater3.scene index 4401435f..02c21ba7 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater3.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater3.scene @@ -14,22 +14,8 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], + "type": "Container", "label": "container_1", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", "x": 32, @@ -66,5 +52,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] } \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater3.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater3.ts index a9da9cbd..0e23c3d4 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater3.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater3.ts @@ -2,46 +2,35 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStoneWater3 extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // image_1 - const image_1 = scene.add.image(0, -15.884868160150127, "outside", "nature/block_stone/1.png"); - image_1.setOrigin(0.5, 0.5017989349976543); - this.add(image_1); - - // outside_nature_block_stone_water_3 - const outside_nature_block_stone_water_3 = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_stone_water/3.png" - ); - outside_nature_block_stone_water_3.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_water_3); - - // this (prefab fields) - this.z = 0; - - /* START-USER-CTR-CODE */ +export default class BlockStoneWater3 extends Phaser.GameObjects.Container { + + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 32, y ?? 48); + + this.setInteractive(new Phaser.Geom.Polygon("-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516"), Phaser.Geom.Polygon.Contains); + + // image_1 + const image_1 = scene.add.image(0, -15.884868160150127, "outside", "nature/block_stone/1.png"); + image_1.setOrigin(0.5, 0.5017989349976543); + this.add(image_1); + + // outside_nature_block_stone_water_3 + const outside_nature_block_stone_water_3 = scene.add.image(0, -17.87410141979456, "outside", "nature/block_stone_water/3.png"); + outside_nature_block_stone_water_3.setOrigin(0.5, 0.470717165742086); + this.add(outside_nature_block_stone_water_3); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater4.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater4.scene index 09b7997d..4757aec4 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater4.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater4.scene @@ -14,22 +14,8 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], + "type": "Container", "label": "container_1", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", "x": 32, @@ -66,5 +52,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] } \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater4.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater4.ts index 1c866c77..621c2723 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater4.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater4.ts @@ -2,46 +2,35 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStoneWater4 extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // image_1 - const image_1 = scene.add.image(0, -17.141785509715838, "outside", "nature/block_stone/1.png"); - image_1.setOrigin(0.5, 0.48215960141069003); - this.add(image_1); - - // outside_nature_block_stone_water_4 - const outside_nature_block_stone_water_4 = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_stone_water/4.png" - ); - outside_nature_block_stone_water_4.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_water_4); - - // this (prefab fields) - this.z = 0; - - /* START-USER-CTR-CODE */ +export default class BlockStoneWater4 extends Phaser.GameObjects.Container { + + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 32, y ?? 48); + + this.setInteractive(new Phaser.Geom.Polygon("-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516"), Phaser.Geom.Polygon.Contains); + + // image_1 + const image_1 = scene.add.image(0, -17.141785509715838, "outside", "nature/block_stone/1.png"); + image_1.setOrigin(0.5, 0.48215960141069003); + this.add(image_1); + + // outside_nature_block_stone_water_4 + const outside_nature_block_stone_water_4 = scene.add.image(0, -17.87410141979456, "outside", "nature/block_stone_water/4.png"); + outside_nature_block_stone_water_4.setOrigin(0.5, 0.470717165742086); + this.add(outside_nature_block_stone_water_4); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater5.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater5.scene index 53816ab3..b78d5848 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater5.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater5.scene @@ -14,22 +14,8 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], + "type": "Container", "label": "container_1", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", "x": 32, @@ -66,5 +52,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] } \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater5.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater5.ts index 4045d4d7..162942f8 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater5.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater5.ts @@ -2,46 +2,35 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStoneWater5 extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // image_1 - const image_1 = scene.add.image(0, -15.784860365688374, "outside", "nature/block_stone/1.png"); - image_1.setOrigin(0.5, 0.5033615567861192); - this.add(image_1); - - // outside_nature_block_stone_water_5 - const outside_nature_block_stone_water_5 = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_stone_water/5.png" - ); - outside_nature_block_stone_water_5.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_water_5); - - // this (prefab fields) - this.z = 0; - - /* START-USER-CTR-CODE */ +export default class BlockStoneWater5 extends Phaser.GameObjects.Container { + + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 32, y ?? 48); + + this.setInteractive(new Phaser.Geom.Polygon("-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516"), Phaser.Geom.Polygon.Contains); + + // image_1 + const image_1 = scene.add.image(0, -15.784860365688374, "outside", "nature/block_stone/1.png"); + image_1.setOrigin(0.5, 0.5033615567861192); + this.add(image_1); + + // outside_nature_block_stone_water_5 + const outside_nature_block_stone_water_5 = scene.add.image(0, -17.87410141979456, "outside", "nature/block_stone_water/5.png"); + outside_nature_block_stone_water_5.setOrigin(0.5, 0.470717165742086); + this.add(outside_nature_block_stone_water_5); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater6.scene b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater6.scene index 1a4a1418..a6b46207 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater6.scene +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater6.scene @@ -14,22 +14,8 @@ }, "displayList": [ { - "prefabId": "9cd01380-cd4d-4b82-aeab-d2af9c7f111b", - "unlock": [ - "x", - "y", - "hitArea.shape", - "hitArea.x", - "hitArea.y", - "hitArea.width", - "hitArea.height", - "hitArea.radius", - "hitArea.points", - "hitArea.alphaTolerance", - "z" - ], + "type": "Container", "label": "container_1", - "z": 0, "hitArea.shape": "POLYGON", "hitArea.points": "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516", "x": 32, @@ -66,5 +52,17 @@ "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", "version": 5 - } + }, + "prefabProperties": [ + { + "name": "z", + "label": "Z", + "tooltip": "", + "defValue": 0, + "customDefinition": false, + "type": { + "id": "number" + } + } + ] } \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater6.ts b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater6.ts index 9744e32d..ad186263 100644 --- a/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater6.ts +++ b/apps/client/src/app/probable-waffle/game/prefabs/outside/nature/block_stone_water/BlockStoneWater6.ts @@ -2,46 +2,35 @@ /* START OF COMPILED CODE */ -import ActorContainer from "../../../../entity/actor/ActorContainer"; +import Phaser from "phaser"; /* START-USER-IMPORTS */ /* END-USER-IMPORTS */ -export default class BlockStoneWater6 extends ActorContainer { - constructor(scene: Phaser.Scene, x?: number, y?: number) { - super(scene, x ?? 32, y ?? 48); - - this.removeInteractive(); - this.setInteractive( - new Phaser.Geom.Polygon( - "-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516" - ), - Phaser.Geom.Polygon.Contains - ); - - // image_1 - const image_1 = scene.add.image(0, -15.81877943301675, "outside", "nature/block_stone/1.png"); - image_1.setOrigin(0.5, 0.5028315713591133); - this.add(image_1); - - // outside_nature_block_stone_water_6 - const outside_nature_block_stone_water_6 = scene.add.image( - 0, - -17.87410141979456, - "outside", - "nature/block_stone_water/6.png" - ); - outside_nature_block_stone_water_6.setOrigin(0.5, 0.470717165742086); - this.add(outside_nature_block_stone_water_6); - - // this (prefab fields) - this.z = 0; - - /* START-USER-CTR-CODE */ +export default class BlockStoneWater6 extends Phaser.GameObjects.Container { + + constructor(scene: Phaser.Scene, x?: number, y?: number) { + super(scene, x ?? 32, y ?? 48); + + this.setInteractive(new Phaser.Geom.Polygon("-32 -32 0 -48 32 -32 31.94308756244577 1.2220034195229061 0.28628033313970036 16 -31.98714686381638 0.6221098782742516"), Phaser.Geom.Polygon.Contains); + + // image_1 + const image_1 = scene.add.image(0, -15.81877943301675, "outside", "nature/block_stone/1.png"); + image_1.setOrigin(0.5, 0.5028315713591133); + this.add(image_1); + + // outside_nature_block_stone_water_6 + const outside_nature_block_stone_water_6 = scene.add.image(0, -17.87410141979456, "outside", "nature/block_stone_water/6.png"); + outside_nature_block_stone_water_6.setOrigin(0.5, 0.470717165742086); + this.add(outside_nature_block_stone_water_6); + + /* START-USER-CTR-CODE */ // Write your code here. /* END-USER-CTR-CODE */ - } + } + + public z: number = 0; - /* START-USER-CODE */ + /* START-USER-CODE */ // Write your code here. diff --git a/apps/client/src/app/probable-waffle/game/prefabs/units/anims/units.ts b/apps/client/src/app/probable-waffle/game/prefabs/units/anims/units.ts new file mode 100644 index 00000000..017ecd2b --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/units/anims/units.ts @@ -0,0 +1,27 @@ +// The constants with the animation keys. + +export const ANIM_SKADUWEE_OWL_IDLE_DOWN = "skaduwee/owl/idle/down"; + +export const ANIM_SKADUWEE_OWL_IDLE_RIGHT = "skaduwee/owl/idle/right"; + +export const ANIM_SKADUWEE_OWL_IDLE_UP = "skaduwee/owl/idle/up"; + +export const ANIM_SKADUWEE_OWL_IDLE_RIGHT_1 = "skaduwee/owl/idle/right_1"; + +export const ANIM_SKADUWEE_OWL_MOVE_DOWN = "skaduwee/owl/move/down"; + +export const ANIM_SKADUWEE_OWL_MOVE_LEFT = "skaduwee/owl/move/left"; + +export const ANIM_SKADUWEE_OWL_MOVE_UP = "skaduwee/owl/move/up"; + +export const ANIM_SKADUWEE_OWL_MOVE_RIGHT = "skaduwee/owl/move/right"; + +export const ANIM_SKADUWEE_OWL_ATTACK_UP = "skaduwee/owl/attack/up"; + +export const ANIM_SKADUWEE_OWL_ATTACK_DOWN = "skaduwee/owl/attack/down"; + +export const ANIM_SKADUWEE_OWL_ATTACK_LEFT = "skaduwee/owl/attack/left"; + +export const ANIM_SKADUWEE_OWL_ATTACK_RIGHT = "skaduwee/owl/attack/right"; + +export const ANIM_SKADUWEE_OWL_DIE_DOWN = "skaduwee/owl/die/down"; diff --git a/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.scene b/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.scene new file mode 100644 index 00000000..c0bf9e38 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.scene @@ -0,0 +1,49 @@ +{ + "id": "c06632b7-0afd-49c5-8129-a5051bf0f87d", + "sceneType": "PREFAB", + "settings": { + "exportClass": true, + "autoImport": true, + "preloadMethodName": "", + "preloadPackFiles": [], + "createMethodName": "", + "compilerOutputLanguage": "TYPE_SCRIPT", + "borderWidth": 64, + "borderHeight": 128 + }, + "displayList": [ + { + "type": "Container", + "id": "081b7121-ec3e-46d4-942e-5206fe180c80", + "label": "units_skaduwee_owl_idle_down_png", + "hitArea.shape": "CIRCLE", + "hitArea.x": 1, + "hitArea.y": 4, + "hitArea.radius": 11, + "x": 33, + "y": 127.37785319200148, + "list": [ + { + "type": "Sprite", + "id": "f2d7c1b1-44b1-4f62-872f-326616bccb71", + "label": "owl", + "scope": "CLASS", + "texture": { + "key": "units", + "frame": "skaduwee/owl/idle/down_1.png" + }, + "y": -108, + "animationPlayMethod": 1, + "animationKey": "skaduwee/owl/idle/down" + } + ] + } + ], + "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/units/skaduwee/SkaduweeOwl.ts b/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts new file mode 100644 index 00000000..5e04877b --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/prefabs/units/skaduwee/SkaduweeOwl.ts @@ -0,0 +1,120 @@ +// You can write more code here + +/* START OF COMPILED CODE */ + +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"; +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 { + 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); + + // 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; + + /* START-USER-CTR-CODE */ + setActorData( + this, + [ + new OwnerComponent(this), + new SelectableComponent(this), + new HealthComponent(this, { + maxHealth: 100 + } satisfies HealthDefinition) + ], + [] + ); + + /* END-USER-CTR-CODE */ + } + + private owl: Phaser.GameObjects.Sprite; + private delayedCaller?: Phaser.Time.TimerEvent; + + /* START-USER-CODE */ + + override addedToScene() { + super.addedToScene(); + + this.drawFlyingUnitVerticalLine(); + this.moveOwl(); + } + + /** + * draw a vertical line from bottom of unit to bottom of current container. + * at the bottom of the line, draw a dot. + */ + private drawFlyingUnitVerticalLine() { + const owl = this.owl; + const graphics = this.scene.add.graphics(); + graphics.lineStyle(1, 0xffffff, 1); + graphics.beginPath(); + graphics.moveTo(owl.x, owl.y + owl.height / 2); + graphics.lineTo(owl.x, this.height); + graphics.closePath(); + graphics.strokePath(); + graphics.fillStyle(0xffffff, 1); + graphics.fillCircle(owl.x, this.height, 2); + graphics.setDepth(100); + this.add(graphics); + } + + /** + * move owl around randomly. After 3-5 seconds, move to a new random location. + */ + private moveOwl(): void { + if (!this.active) return; + const startX = this.x; + const startY = this.y; + + const targetX = startX + Phaser.Math.Between(-200, 200); + const targetY = startY + Phaser.Math.Between(-100, 100); + + const duration = Phaser.Math.Between(3000, 5000); + + const throttledSetActorDepth = throttle(this.setActorDepth, 360); + this.scene.tweens.add({ + targets: this, + x: targetX, + y: targetY, + duration, + ease: "Sine.easeInOut", + yoyo: false, + repeat: 0, + onUpdate: () => { + throttledSetActorDepth(); + } + }); + + // after 3-5 seconds, move to a new random location + 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(); + } + + /* END-USER-CODE */ +} + +/* END OF COMPILED CODE */ + +// You can write more code here diff --git a/apps/client/src/app/probable-waffle/game/scenes/Boot.ts b/apps/client/src/app/probable-waffle/game/scenes/Boot.ts index 10c9370b..6d979cb7 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/Boot.ts +++ b/apps/client/src/app/probable-waffle/game/scenes/Boot.ts @@ -1,14 +1,13 @@ -import preloadAssetPackUrl from '../../../../assets/probable-waffle/asset-packers/preload-asset-pack.json'; export class Boot extends Phaser.Scene { constructor() { - super('Boot'); + super("Boot"); } preload() { - this.load.pack('pack', preloadAssetPackUrl as any); + this.load.pack("pack", "assets/probable-waffle/asset-packers/preload-asset-pack.json"); } create() { - this.scene.start('PreloadProbableWaffle'); + this.scene.start("PreloadProbableWaffle"); } } diff --git a/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts new file mode 100644 index 00000000..c4d1a46c --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/scenes/GameProbableWaffleScene.ts @@ -0,0 +1,53 @@ +import { ProbableWaffleScene } from "../core/probable-waffle.scene"; +import { ScaleHandler } from "../world/map/scale.handler"; +import { CameraMovementHandler } from "../world/managers/controllers/input/cameraMovementHandler"; +import { LightsHandler } from "../world/map/vision/lights.handler"; +import { DepthHelper } from "../world/map/depth.helper"; +import { AnimatedTilemap } from "../world/map/animated-tile.helper"; +import { SingleSelectionHandler } from "../world/managers/controllers/input/single-selection.handler"; +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 { SaveGame } from "../data/save-game"; + +export interface GameProbableWaffleSceneData { + baseGameData: ProbableWaffleGameData; + 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 this.sceneGameData; + } + + private sceneGameData: GameProbableWaffleSceneData = { + baseGameData: this.baseGameData, + systems: {}, // todo use + components: {}, // todo use + services: {} // todo use + } satisfies GameProbableWaffleSceneData; + + init() { + super.init(); + } + + create() { + super.create(); + + this.scene.get("HudProbableWaffle").scene.start(); + new SceneGameState(this); + new ScaleHandler(this, this.tilemap, { margins: { left: 150, bottom: 100 }, maxLayers: 8 }); + new CameraMovementHandler(this); + new LightsHandler(this, { enableLights: false }); + new DepthHelper(this); + 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? + new SaveGame(this); + } +} diff --git a/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.scene b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.scene new file mode 100644 index 00000000..46be3a59 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.scene @@ -0,0 +1,73 @@ +{ + "id": "04311eb6-ed91-4d74-b6e9-4bfe0fcfb458", + "sceneType": "SCENE", + "settings": { + "compilerInsertSpaces": true, + "compilerTabSize": 2, + "exportClass": true, + "autoImport": true, + "superClassName": "ProbableWaffleScene", + "preloadMethodName": "editorPreload", + "preloadPackFiles": [], + "createMethodName": "editorCreate", + "sceneKey": "HudProbableWaffle", + "compilerOutputLanguage": "TYPE_SCRIPT", + "borderWidth": 1280, + "borderHeight": 720 + }, + "displayList": [ + { + "prefabId": "2c7a7ebf-6290-4eea-837b-ff0a8a70f4e8", + "id": "b042eaac-6d53-49e6-bfea-e1192a74a0b0", + "unlock": [ + "x", + "y", + "text", + "w", + "h", + "fontSize" + ], + "label": "buttonSave", + "scope": "CLASS", + "text": "S", + "w": 45, + "h": 45, + "fontSize": 30, + "x": 1180, + "y": 38 + }, + { + "prefabId": "2c7a7ebf-6290-4eea-837b-ff0a8a70f4e8", + "id": "2b326e5b-e387-4267-a772-69d81569abd3", + "unlock": [ + "x", + "y", + "text", + "w", + "h", + "fontSize" + ], + "label": "buttonQuit", + "scope": "CLASS", + "text": "Q", + "w": 45, + "h": 45, + "fontSize": 30, + "x": 1201, + "y": 38 + } + ], + "plainObjects": [], + "meta": { + "app": "Phaser Editor 2D - Scene Editor", + "url": "https://phasereditor2d.com", + "contentType": "phasereditor2d.core.scene.SceneContentType", + "version": 5 + }, + "lists": [ + { + "id": "a9e1809e-2eca-4d40-8c83-7c158f629362", + "label": "hudElements" + } + ] +} \ No newline at end of file diff --git a/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts new file mode 100644 index 00000000..839cf6ed --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/scenes/HudProbableWaffle.ts @@ -0,0 +1,136 @@ +// You can write more code here + +/* START OF COMPILED CODE */ + +import ButtonSmall from "../prefabs/gui/buttons/ButtonSmall"; +/* START-USER-IMPORTS */ +import { ProbableWaffleScene } from "../core/probable-waffle.scene"; +import { HudGameState } from "../hud/hud-game-state"; +import { HudElementVisibilityHandler } from "../hud/hud-element-visibility.handler"; +import { CursorHandler } from "../world/managers/controllers/input/cursor.handler"; +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"); + + /* START-USER-CTR-CODE */ + // Write your code here. + /* END-USER-CTR-CODE */ + } + + editorCreate(): void { + // buttonSave + const buttonSave = new ButtonSmall(this, 1180, 38); + this.add.existing(buttonSave); + + // buttonQuit + const buttonQuit = new ButtonSmall(this, 1201, 38); + this.add.existing(buttonQuit); + + // 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; + + this.events.emit("scene-awake"); + } + + private buttonSave!: ButtonSmall; + private buttonQuit!: ButtonSmall; + private hudElements!: Array; + + /* START-USER-CODE */ + private quitButtonSubscription?: Subscription; + private saveGameSubscription?: Subscription; + preload() { + this.load.pack("asset-pack-gui", "assets/probable-waffle/asset-packers/asset-pack-probable-waffle-gui.json"); + } + + create() { + this.editorCreate(); + + // resize the scene to match the screen size + this.scale.on("resize", this.resize, this); + this.resize({ height: this.scale.height, width: this.scale.width }); + + new CursorHandler(this); + new HudGameState(this); + new HudElementVisibilityHandler(this, this.hudElements); + new MultiSelectionHandler(this); + this.handleQuit(); + this.handleSaveGame(); + this.handleButtonVisibility(); + } + + private resize(gameSize: { height: number; width: number }) { + this.cameras.resize(gameSize.width, gameSize.height); + this.updatePositionOfUiElements(); + } + + private updatePositionOfUiElements() { + // push button to top right (margin 40px) + 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.w - 40; + this.buttonSave.y = this.buttonQuit.y; + } + + private handleQuit() { + 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", + gameInstanceId: this.baseGameData.gameInstance.gameInstanceMetadata.data.gameInstanceId!, + data: { sessionState: GameSessionState.ToScoreScreen }, + emitterUserId: this.baseGameData.user.userId + }); + }); + } + + private handleSaveGame() { + this.saveGameSubscription = this.buttonSave.clicked.subscribe(() => { + this.communicator.allScenes.emit({ name: SaveGame.SaveGameEvent }); + }); + } + + destroy() { + this.quitButtonSubscription?.unsubscribe(); + 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 */ +} + +/* END OF COMPILED CODE */ + +// You can write more code here diff --git a/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.scene b/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.scene new file mode 100644 index 00000000..0a905d74 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.scene @@ -0,0 +1,233 @@ +{ + "id": "83b754e4-4d45-480d-923c-5b7fccee4e93", + "sceneType": "SCENE", + "settings": { + "compilerInsertSpaces": true, + "compilerTabSize": 2, + "snapEnabled": true, + "exportClass": true, + "autoImport": true, + "superClassName": "GameProbableWaffleScene", + "preloadPackFiles": [], + "createMethodName": "editorCreate", + "sceneKey": "MapEmberEnclave", + "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", + "tiles_2" + ] + }, + { + "prefabId": "ec58b20e-e03e-4bd4-140e-156ffe433f29", + "id": "5f2a21e3-1bc1-4f9b-9aa8-f4f1c035ff36", + "unlock": [ + "x", + "y" + ], + "label": "blockObsidianLava5", + "x": -992, + "y": 800 + }, + { + "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": 208, + "y": 544 + }, + { + "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": -880, + "y": 592 + }, + { + "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": -992, + "y": 736 + }, + { + "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", + "scope": "PUBLIC", + "key": "tiles_ember_enclave", + "tilesets": [ + { + "name": "tiles", + "imageKey": "tiles_1" + }, + { + "name": "tiles_2", + "imageKey": "tiles_2" + } + ] + } + ], + "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/MapEmberEnclave.ts b/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.ts new file mode 100644 index 00000000..b09c09c2 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/scenes/MapEmberEnclave.ts @@ -0,0 +1,127 @@ +// You can write more code here + +/* START OF COMPILED CODE */ + +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 */ +import { GameProbableWaffleScene } from "./GameProbableWaffleScene"; +/* END-USER-IMPORTS */ + +export default class MapEmberEnclave extends GameProbableWaffleScene { + constructor() { + super("MapEmberEnclave"); + + /* 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.addTilesetImage("tiles_2", "tiles_2"); + + // tilemap_level_1 + tilemap.createLayer("TileMap_level_1", ["tiles_2", "tiles"], -32, 0); + + // blockObsidianLava5 + const blockObsidianLava5 = new BlockObsidianLava5(this, -992, 800); + this.add.existing(blockObsidianLava5); + + // bushDownwardsLarge + const bushDownwardsLarge = new BushDownwardsLarge(this, 32, 688); + this.add.existing(bushDownwardsLarge); + + // blockObsidianLava4 + const blockObsidianLava4 = new BlockObsidianLava4(this, 208, 544); + 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, -880, 592); + 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, -992, 736); + 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"); + } + + public tilemap!: Phaser.Tilemaps.Tilemap; + + /* START-USER-CODE */ + + // Write your code here + + create() { + this.editorCreate(); + + super.create(); + } + + /* END-USER-CODE */ +} + +/* END OF COMPILED CODE */ + +// You can write more code here 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 72% 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..eb1e3830 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/Map1.scene +++ b/apps/client/src/app/probable-waffle/game/scenes/MapRiverCrossing.scene @@ -2,17 +2,31 @@ "id": "dba459ed-b5e7-4548-9d60-a8837740d253", "sceneType": "SCENE", "settings": { + "compilerInsertSpaces": true, + "compilerTabSize": 2, "snapEnabled": true, "exportClass": true, "autoImport": true, + "superClassName": "GameProbableWaffleScene", "preloadPackFiles": [], "createMethodName": "editorCreate", - "sceneKey": "Map1", + "sceneKey": "MapRiverCrossing", "compilerOutputLanguage": "TYPE_SCRIPT", "borderWidth": 1280, "borderHeight": 720 }, "displayList": [ + { + "type": "Image", + "id": "0cc1306a-c2b8-4f06-b28e-8b16a5ff75db", + "label": "architecture_obstruction_fence_top_left_png_3", + "texture": { + "key": "outside", + "frame": "architecture/obstruction/fence/top_left.png" + }, + "x": -195, + "y": 1187 + }, { "type": "TilemapLayer", "id": "9cdf4f18-3323-43bf-b105-00fddbdbc7e6", @@ -21,9 +35,199 @@ "tilemapId": "9cb0db04-e78b-4290-b950-d943f1631f3b", "layerName": "TileMap_level_1", "tilesets": [ - "tiles" + "tiles", + "tiles_2" ] }, + { + "prefabId": "5c78ee6f-43a6-47f4-ac21-0e536a65936a", + "id": "be48f7ce-f66c-403f-8dc9-64875869a8a8", + "unlock": [ + "x", + "y" + ], + "label": "hedgehog", + "x": 96, + "y": 1360 + }, + { + "type": "Image", + "id": "72371380-06d8-4654-a5fa-edb6ea1308a1", + "label": "nature_grass_grass_0_png", + "texture": { + "key": "outside", + "frame": "nature/grass/grass_0.png" + }, + "x": -92, + "y": 1266, + "originY": 0.75 + }, + { + "type": "Image", + "id": "3429ce0c-7fcf-402a-a36b-6fb2ddc2539d", + "label": "architecture_obstruction_fence_left_png", + "texture": { + "key": "outside", + "frame": "architecture/obstruction/fence/left.png" + }, + "x": -297, + "y": 1233 + }, + { + "type": "Image", + "id": "d513086d-6eac-4b19-8b73-75a850bc1c2e", + "label": "foliage_trees_resources_special_tree_christmas_png", + "texture": { + "key": "outside", + "frame": "foliage/trees/resources/special/tree_christmas.png" + }, + "x": -284, + "y": 1174 + }, + { + "type": "Image", + "id": "e9ed2d21-ca39-488f-a035-472850960757", + "label": "architecture_obstruction_fence_top_left_png_1", + "texture": { + "key": "outside", + "frame": "architecture/obstruction/fence/top_left.png" + }, + "x": -261, + "y": 1219 + }, + { + "type": "Image", + "id": "cc89c32e-7f83-4a80-9e65-f5f8ad0e2787", + "label": "foliage_tall_grass_tall_grass_7_png", + "texture": { + "key": "outside", + "frame": "foliage/tall_grass/tall_grass_7.png" + }, + "x": -261, + "y": 1256, + "originY": 0.75 + }, + { + "type": "Image", + "id": "b0ca54c2-dcb2-49f9-a08e-8bea2c24c2d4", + "label": "foliage_trees_resources_special_tree_christmas_png_1", + "texture": { + "key": "outside", + "frame": "foliage/trees/resources/special/tree_christmas.png" + }, + "x": -110, + "y": 1166 + }, + { + "type": "Image", + "id": "80521525-c678-4c87-bae8-c2c1247d161e", + "label": "architecture_obstruction_fence_top_right_png_2", + "texture": { + "key": "outside", + "frame": "architecture/obstruction/fence/top_right.png" + }, + "x": -95, + "y": 1234 + }, + { + "type": "Image", + "id": "bf279a50-0ed7-485b-91c6-21ba7a6eb635", + "label": "architecture_obstruction_fence_right_png", + "texture": { + "key": "outside", + "frame": "architecture/obstruction/fence/right.png" + }, + "x": -61, + "y": 1249 + }, + { + "type": "Image", + "id": "e855255d-18de-4fc4-ba11-9a0bf0e1f60d", + "label": "architecture_obstruction_fence_bottom_left_png_2", + "texture": { + "key": "outside", + "frame": "architecture/obstruction/fence/bottom_left.png" + }, + "x": -263, + "y": 1250 + }, + { + "type": "Image", + "id": "24aa2023-2f8b-4e8a-b165-d5e99d66e40f", + "label": "architecture_obstruction_fence_bottom_left_png_1", + "texture": { + "key": "outside", + "frame": "architecture/obstruction/fence/bottom_left.png" + }, + "x": -229, + "y": 1266 + }, + { + "type": "Image", + "id": "6a55c840-26b3-4c04-aa78-132519c72c69", + "label": "architecture_obstruction_fence_bottom_left_png", + "texture": { + "key": "outside", + "frame": "architecture/obstruction/fence/bottom_left.png" + }, + "x": -196, + "y": 1281 + }, + { + "type": "Image", + "id": "aa077662-01c0-49d9-af91-a65beefe6b47", + "label": "architecture_obstruction_fence_bottom_right_png_1", + "texture": { + "key": "outside", + "frame": "architecture/obstruction/fence/bottom_right.png" + }, + "x": -95, + "y": 1266 + }, + { + "type": "Image", + "id": "36c12f69-502e-4dc3-84a1-ba76f0185b3a", + "label": "architecture_obstruction_fence_bottom_right_png", + "texture": { + "key": "outside", + "frame": "architecture/obstruction/fence/bottom_right.png" + }, + "x": -128, + "y": 1281 + }, + { + "type": "Image", + "id": "4da6b673-2264-4a5e-aa16-53293d0fbb76", + "label": "architecture_obstruction_fence_top_png", + "texture": { + "key": "outside", + "frame": "architecture/obstruction/fence/top.png" + }, + "x": -195, + "y": 1187 + }, + { + "type": "Image", + "id": "81db0c37-14bc-4779-a6e7-346037187c6a", + "label": "architecture_obstruction_fence_top_right_png_4", + "texture": { + "key": "outside", + "frame": "architecture/obstruction/fence/top_right.png" + }, + "x": -163, + "y": 1202 + }, + { + "type": "Image", + "id": "9aafdd85-56ed-44e8-a4ae-f907cad603b6", + "label": "architecture_obstruction_fence_top_right_png_3", + "texture": { + "key": "outside", + "frame": "architecture/obstruction/fence/top_right.png" + }, + "x": -131, + "y": 1217 + }, { "prefabId": "ec58b20e-e04f-4bd4-8401-856e1e433f47", "id": "f13d64e4-bb69-443f-9fc2-c69fdd6a360e", @@ -65,8 +269,8 @@ "y" ], "label": "owlery", - "x": 1184, - "y": 880 + "x": 1056, + "y": 896 }, { "prefabId": "56d62d59-15b0-4007-b986-1f24c1040cb6", @@ -77,7 +281,6 @@ "z" ], "label": "infantryInn", - "z": 0, "x": 1360, "y": 800 }, @@ -114,6 +317,18 @@ "x": 1472, "y": 800 }, + { + "type": "Image", + "id": "5fc1a945-a4e3-44f4-af67-cd9e929d3935", + "label": "foliage_tall_grass_tall_grass_8_png", + "texture": { + "key": "outside", + "frame": "foliage/tall_grass/tall_grass_8.png" + }, + "x": -162, + "y": 1305, + "originY": 0.75 + }, { "prefabId": "415773de-cdc9-4a20-afd1-61fd57044e8a", "id": "760d4176-106c-41b8-8c22-351f6f8456a0", @@ -122,8 +337,8 @@ "y" ], "label": "skaduweeWorkerFemale", - "x": 1136, - "y": 960 + "x": 1088, + "y": 1024 }, { "prefabId": "5d25d138-1fca-431c-b1f9-45f8ba5c96a0", @@ -133,7 +348,7 @@ "y" ], "label": "skaduweeRangedFemale", - "x": 1264, + "x": 1280, "y": 720 }, { @@ -155,8 +370,8 @@ "y" ], "label": "skaduweeWarriorMale", - "x": 1216, - "y": 784 + "x": 1424, + "y": 864 }, { "prefabId": "1457b917-a97a-463b-9989-e0ec3446c7a8", @@ -232,8 +447,8 @@ "y" ], "label": "wallTopLeftTopRight", - "x": -560, - "y": 368 + "x": -480, + "y": 256 }, { "prefabId": "ec58b20e-e04f-4bd3-840e-856ffe433f36", @@ -243,8 +458,8 @@ "y" ], "label": "wallTopRight", - "x": -528, - "y": 384 + "x": -448, + "y": 272 }, { "prefabId": "ec58b20e-e04f-4bd3-840e-856ffe433f37", @@ -254,8 +469,8 @@ "y" ], "label": "watchTower", - "x": -480, - "y": 400 + "x": -400, + "y": 288 }, { "prefabId": "ec58b20e-e04f-4bd4-8401-856ffe433f25", @@ -287,19 +502,8 @@ "y" ], "label": "bridgeStone", - "x": -64, - "y": 896 - }, - { - "prefabId": "ec58b20e-e04f-4bd4-8401-856efe433f30", - "id": "2d3db8c9-4a78-4954-9259-5a4aa775ba82", - "unlock": [ - "x", - "y" - ], - "label": "tree5", - "x": -448, - "y": 288 + "x": -99, + "y": 882 }, { "prefabId": "ec58b20e-e04f-4bd4-140e-856ffe433f22", @@ -408,8 +612,8 @@ "y" ], "label": "treeTrunk", - "x": -405, - "y": 277 + "x": -681, + "y": 537 }, { "prefabId": "ec58b20e-e04f-4bd4-140e-8561fe432f32", @@ -644,8 +848,8 @@ "y" ], "label": "tree_2", - "x": -304, - "y": 1040 + "x": -912, + "y": 848 }, { "prefabId": "ec58b20e-e04f-4bd4-8401-856efe433f36", @@ -655,8 +859,8 @@ "y" ], "label": "tree1", - "x": -448, - "y": 1200 + "x": -1184, + "y": 832 }, { "prefabId": "ec58b20e-e04f-4bd4-8401-856e1e433f36", @@ -666,8 +870,8 @@ "y" ], "label": "tree_3", - "x": -256, - "y": 1168 + "x": -896, + "y": 1040 }, { "prefabId": "ec58b20e-e04f-4bd4-8401-851ffe433f31", @@ -677,8 +881,8 @@ "y" ], "label": "treeTrunk_1", - "x": -384, - "y": 1200 + "x": -784, + "y": 880 }, { "prefabId": "ec58b20e-e04f-4bd4-8401-856efe433f30", @@ -721,8 +925,8 @@ "y" ], "label": "bushDry_1", - "x": -368, - "y": 1136 + "x": -1072, + "y": 944 }, { "prefabId": "ec58b20e-e04f-4bd4-8401-856ffe433f26", @@ -787,8 +991,8 @@ "y" ], "label": "bushDry_4", - "x": -80, - "y": 1072 + "x": -1024, + "y": 768 }, { "prefabId": "ec58b20e-e04f-4bd4-8401-856efe433f30", @@ -798,8 +1002,8 @@ "y" ], "label": "tree", - "x": -704, - "y": 512 + "x": -706, + "y": 468 }, { "prefabId": "ec58b20e-e04f-4bd3-840e-856ffe433f23", @@ -809,199 +1013,8 @@ "y" ], "label": "workMill", - "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 + "x": -566, + "y": 516 }, { "prefabId": "ec58b20e-e04f-4bd4-140e-856ffe433f21", @@ -1138,6 +1151,138 @@ "label": "tree_13", "x": 112, "y": 1520 + }, + { + "type": "Image", + "id": "40f23690-190e-4c1c-a984-5b7b0ef10758", + "label": "architecture_obstruction_fence_bottom_png", + "texture": { + "key": "outside", + "frame": "architecture/obstruction/fence/bottom.png" + }, + "x": -162, + "y": 1297 + }, + { + "type": "Image", + "id": "cd687eaa-f95b-476b-aef5-ff50b03231c5", + "label": "architecture_obstruction_fence_top_left_png", + "texture": { + "key": "outside", + "frame": "architecture/obstruction/fence/top_left.png" + }, + "x": -229, + "y": 1203 + }, + { + "prefabId": "ec58b20e-e04f-4bd4-8401-856efe433f30", + "id": "2d3db8c9-4a78-4954-9259-5a4aa775ba82", + "unlock": [ + "x", + "y" + ], + "label": "tree5", + "x": -788, + "y": 484 + }, + { + "prefabId": "56d62d59-15b0-4017-b986-1f24c1040cb6", + "id": "91881092-74df-4d32-be1d-608a71ca46db", + "unlock": [ + "x", + "y" + ], + "label": "frostForge", + "x": 1184, + "y": 848 + }, + { + "prefabId": "c06632b7-0afd-49c5-8129-a5051bf0f87d", + "id": "00c01700-2b3a-48e9-becf-a6d7a18b9508", + "unlock": [ + "x", + "y" + ], + "label": "skaduweeOwl", + "x": 1056, + "y": 912 + }, + { + "prefabId": "f09568ca-4e05-4ddd-ba4f-3ad6c515d28b", + "id": "87c33251-6292-4e79-b7ac-c7b653a31a36", + "unlock": [ + "x", + "y" + ], + "label": "tree11", + "x": -160, + "y": 736 + }, + { + "prefabId": "c0d76b4e-4215-46c7-a7f6-4e52c672fdb1", + "id": "7a7f6799-04cd-428d-9fce-af267c0719ab", + "unlock": [ + "x", + "y" + ], + "label": "tree10", + "x": 672, + "y": 576 + }, + { + "prefabId": "e5ae5fa0-6dc1-48d5-b040-80ec53ee9f1b", + "id": "c38368fc-9d11-4699-b6c8-0bda3c0ee90b", + "unlock": [ + "x", + "y" + ], + "label": "tree9", + "x": 320, + "y": 544 + }, + { + "prefabId": "f09568ca-4e05-4ddd-ba4f-3ad6c515d28b", + "id": "94768911-2d2f-4013-aad9-8c89492072a7", + "unlock": [ + "x", + "y" + ], + "label": "tree_14", + "x": 272, + "y": 560 + }, + { + "prefabId": "2e708e33-ee95-41cc-b479-aaf17a1a8225", + "id": "30a33dd1-5dd0-4566-91c4-cdd2841e17d3", + "unlock": [ + "x", + "y" + ], + "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": [ @@ -1145,11 +1290,16 @@ "id": "9cb0db04-e78b-4290-b950-d943f1631f3b", "type": "Tilemap", "label": "tilemap", - "key": "tiles", + "scope": "PUBLIC", + "key": "tiles_river_crossing", "tilesets": [ { "name": "tiles", "imageKey": "tiles_1" + }, + { + "name": "tiles_2", + "imageKey": "tiles_2" } ] } 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 61% 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..80ab53ae 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/Map1.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 Hedgehog from "../prefabs/animals/Hedgehog"; import Tree7 from "../prefabs/outside/foliage/trees/resources/Tree7"; import Sandhold from "../prefabs/buildings/tivara/Sandhold"; import Owlery from "../prefabs/buildings/skaduwee/Owlery"; @@ -26,7 +26,6 @@ import WatchTower from "../prefabs/buildings/tivara/wall/WatchTower"; import BushDownwardsSmall from "../prefabs/outside/foliage/bushes/BushDownwardsSmall"; import BushDownwardsLarge from "../prefabs/outside/foliage/bushes/BushDownwardsLarge"; import BridgeStone from "../prefabs/outside/architecture/river/BridgeStone"; -import Tree5 from "../prefabs/outside/foliage/trees/resources/Tree5"; import BlockStone2 from "../prefabs/outside/nature/block_stone/BlockStone2"; import BlockStone1 from "../prefabs/outside/nature/block_stone/BlockStone1"; import BlockStoneTopRight from "../prefabs/outside/nature/block_stone_grass/BlockStoneTopRight"; @@ -41,26 +40,26 @@ import RockPiles3 from "../prefabs/outside/nature/rock_piles/RockPiles3"; import Tree4 from "../prefabs/outside/foliage/trees/resources/Tree4"; import Tree6 from "../prefabs/outside/foliage/trees/resources/Tree6"; import Tree1 from "../prefabs/outside/foliage/trees/resources/Tree1"; +import Tree5 from "../prefabs/outside/foliage/trees/resources/Tree5"; 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"; +import FrostForge from "../prefabs/buildings/skaduwee/FrostForge"; +import SkaduweeOwl from "../prefabs/units/skaduwee/SkaduweeOwl"; +import Tree11 from "../prefabs/outside/foliage/trees/resources/Tree11"; +import Tree10 from "../prefabs/outside/foliage/trees/resources/Tree10"; +import Tree9 from "../prefabs/outside/foliage/trees/resources/Tree9"; +import Sheep from "../prefabs/animals/Sheep"; /* START-USER-IMPORTS */ -import ActorContainer from "../entity/actor/ActorContainer"; -import { AnimatedTilemap } from "./AnimatedTile"; +import { GameProbableWaffleScene } from "./GameProbableWaffleScene"; /* END-USER-IMPORTS */ -export default class Map1 extends Phaser.Scene { +export default class MapRiverCrossing extends GameProbableWaffleScene { constructor() { - super("Map1"); + super("MapRiverCrossing"); /* START-USER-CTR-CODE */ // Write your code here. @@ -69,11 +68,74 @@ export default class Map1 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.addTilesetImage("tiles_2", "tiles_2"); + + // architecture_obstruction_fence_top_left_png_3 + this.add.image(-195, 1187, "outside", "architecture/obstruction/fence/top_left.png"); // tilemap_level_1 - tilemap.createLayer("TileMap_level_1", ["tiles"], -32, 0); + tilemap.createLayer("TileMap_level_1", ["tiles", "tiles_2"], -32, 0); + + // hedgehog + const hedgehog = new Hedgehog(this, 96, 1360); + this.add.existing(hedgehog); + + // nature_grass_grass_0_png + const nature_grass_grass_0_png = this.add.image(-92, 1266, "outside", "nature/grass/grass_0.png"); + nature_grass_grass_0_png.setOrigin(0.5, 0.75); + + // architecture_obstruction_fence_left_png + this.add.image(-297, 1233, "outside", "architecture/obstruction/fence/left.png"); + + // foliage_trees_resources_special_tree_christmas_png + this.add.image(-284, 1174, "outside", "foliage/trees/resources/special/tree_christmas.png"); + + // architecture_obstruction_fence_top_left_png_1 + this.add.image(-261, 1219, "outside", "architecture/obstruction/fence/top_left.png"); + + // foliage_tall_grass_tall_grass_7_png + const foliage_tall_grass_tall_grass_7_png = this.add.image( + -261, + 1256, + "outside", + "foliage/tall_grass/tall_grass_7.png" + ); + foliage_tall_grass_tall_grass_7_png.setOrigin(0.5, 0.75); + + // foliage_trees_resources_special_tree_christmas_png_1 + this.add.image(-110, 1166, "outside", "foliage/trees/resources/special/tree_christmas.png"); + + // architecture_obstruction_fence_top_right_png_2 + this.add.image(-95, 1234, "outside", "architecture/obstruction/fence/top_right.png"); + + // architecture_obstruction_fence_right_png + this.add.image(-61, 1249, "outside", "architecture/obstruction/fence/right.png"); + + // architecture_obstruction_fence_bottom_left_png_2 + this.add.image(-263, 1250, "outside", "architecture/obstruction/fence/bottom_left.png"); + + // architecture_obstruction_fence_bottom_left_png_1 + this.add.image(-229, 1266, "outside", "architecture/obstruction/fence/bottom_left.png"); + + // architecture_obstruction_fence_bottom_left_png + this.add.image(-196, 1281, "outside", "architecture/obstruction/fence/bottom_left.png"); + + // architecture_obstruction_fence_bottom_right_png_1 + this.add.image(-95, 1266, "outside", "architecture/obstruction/fence/bottom_right.png"); + + // architecture_obstruction_fence_bottom_right_png + this.add.image(-128, 1281, "outside", "architecture/obstruction/fence/bottom_right.png"); + + // architecture_obstruction_fence_top_png + this.add.image(-195, 1187, "outside", "architecture/obstruction/fence/top.png"); + + // architecture_obstruction_fence_top_right_png_4 + this.add.image(-163, 1202, "outside", "architecture/obstruction/fence/top_right.png"); + + // architecture_obstruction_fence_top_right_png_3 + this.add.image(-131, 1217, "outside", "architecture/obstruction/fence/top_right.png"); // tree_12 const tree_12 = new Tree7(this, -16, 1376); @@ -88,7 +150,7 @@ export default class Map1 extends Phaser.Scene { this.add.existing(sandhold); // owlery - const owlery = new Owlery(this, 1184, 880); + const owlery = new Owlery(this, 1056, 896); this.add.existing(owlery); // infantryInn @@ -107,12 +169,21 @@ export default class Map1 extends Phaser.Scene { const skaduweeWorkerMale = new SkaduweeWorkerMale(this, 1472, 800); this.add.existing(skaduweeWorkerMale); + // foliage_tall_grass_tall_grass_8_png + const foliage_tall_grass_tall_grass_8_png = this.add.image( + -162, + 1305, + "outside", + "foliage/tall_grass/tall_grass_8.png" + ); + foliage_tall_grass_tall_grass_8_png.setOrigin(0.5, 0.75); + // skaduweeWorkerFemale - const skaduweeWorkerFemale = new SkaduweeWorkerFemale(this, 1136, 960); + const skaduweeWorkerFemale = new SkaduweeWorkerFemale(this, 1088, 1024); this.add.existing(skaduweeWorkerFemale); // skaduweeRangedFemale - const skaduweeRangedFemale = new SkaduweeRangedFemale(this, 1264, 720); + const skaduweeRangedFemale = new SkaduweeRangedFemale(this, 1280, 720); this.add.existing(skaduweeRangedFemale); // skaduweeMagicianFemale @@ -120,7 +191,7 @@ export default class Map1 extends Phaser.Scene { this.add.existing(skaduweeMagicianFemale); // skaduweeWarriorMale - const skaduweeWarriorMale = new SkaduweeWarriorMale(this, 1216, 784); + const skaduweeWarriorMale = new SkaduweeWarriorMale(this, 1424, 864); this.add.existing(skaduweeWarriorMale); // generalWarrior @@ -148,15 +219,15 @@ export default class Map1 extends Phaser.Scene { this.add.existing(olival); // wallTopLeftTopRight - const wallTopLeftTopRight = new WallTopLeftTopRight(this, -560, 368); + const wallTopLeftTopRight = new WallTopLeftTopRight(this, -480, 256); this.add.existing(wallTopLeftTopRight); // wallTopRight - const wallTopRight = new WallTopRight(this, -528, 384); + const wallTopRight = new WallTopRight(this, -448, 272); this.add.existing(wallTopRight); // watchTower - const watchTower = new WatchTower(this, -480, 400); + const watchTower = new WatchTower(this, -400, 288); this.add.existing(watchTower); // bushDownwardsSmall @@ -168,13 +239,9 @@ export default class Map1 extends Phaser.Scene { this.add.existing(bushDownwardsLarge); // bridgeStone - const bridgeStone = new BridgeStone(this, -64, 896); + const bridgeStone = new BridgeStone(this, -99, 882); this.add.existing(bridgeStone); - // tree5 - const tree5 = new Tree5(this, -448, 288); - this.add.existing(tree5); - // blockStone2 const blockStone2 = new BlockStone2(this, 0, 16); this.add.existing(blockStone2); @@ -212,7 +279,7 @@ export default class Map1 extends Phaser.Scene { this.add.existing(blockStone_4); // treeTrunk - const treeTrunk = new TreeTrunk(this, -405, 277); + const treeTrunk = new TreeTrunk(this, -681, 537); this.add.existing(treeTrunk); // rampStoneTopRight @@ -292,19 +359,19 @@ export default class Map1 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, 1040); 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 +387,7 @@ export default class Map1 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,85 +411,17 @@ export default class Map1 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 - const tree = new Tree5(this, -704, 512); + const tree = new Tree5(this, -706, 468); this.add.existing(tree); // workMill - const workMill = new WorkMill(this, -592, 512); + const workMill = new WorkMill(this, -566, 516); 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); @@ -471,8 +470,51 @@ export default class Map1 extends Phaser.Scene { const tree_13 = new Tree7(this, 112, 1520); this.add.existing(tree_13); - // infantryInn (prefab fields) - infantryInn.z = 0; + // architecture_obstruction_fence_bottom_png + this.add.image(-162, 1297, "outside", "architecture/obstruction/fence/bottom.png"); + + // architecture_obstruction_fence_top_left_png + this.add.image(-229, 1203, "outside", "architecture/obstruction/fence/top_left.png"); + + // tree5 + const tree5 = new Tree5(this, -788, 484); + this.add.existing(tree5); + + // frostForge + const frostForge = new FrostForge(this, 1184, 848); + this.add.existing(frostForge); + + // skaduweeOwl + const skaduweeOwl = new SkaduweeOwl(this, 1056, 912); + this.add.existing(skaduweeOwl); + + // tree11 + const tree11 = new Tree11(this, -160, 736); + this.add.existing(tree11); + + // tree10 + const tree10 = new Tree10(this, 672, 576); + this.add.existing(tree10); + + // tree9 + const tree9 = new Tree9(this, 320, 544); + this.add.existing(tree9); + + // tree_14 + const tree_14 = new Tree11(this, 272, 560); + this.add.existing(tree_14); + + // sheep + 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; @@ -498,12 +540,6 @@ export default class Map1 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; @@ -515,133 +551,14 @@ export default class Map1 extends Phaser.Scene { this.events.emit("scene-awake"); } - private tilemap!: Phaser.Tilemaps.Tilemap; + public 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; - private animatedTilemap!: AnimatedTilemap; - - preload(): void { - this.cursors = this.input.keyboard!.createCursorKeys(); - } - create() { this.editorCreate(); - 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); - 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 = () => { - // 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("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); - this.animatedTilemap.update(delta); - } - private destroy() { - this.input.off("wheel", this.zoomWithScrollHandler); + super.create(); } - /* END-USER-CODE */ } diff --git a/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.scene b/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.scene index 10d1e8dc..aa71ecc3 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.scene +++ b/apps/client/src/app/probable-waffle/game/scenes/PreloadProbableWaffle.scene @@ -4,6 +4,7 @@ "settings": { "exportClass": true, "autoImport": true, + "superClassName": "ProbableWaffleScene", "preloadMethodName": "editorPreload", "preloadPackFiles": [], "createMethodName": "editorCreate", @@ -16,22 +17,21 @@ { "type": "Image", "id": "e413cbbf-ce25-4dad-a117-b7cf0791f655", - "label": "guapen", - "components": [], + "label": "probable-waffle-loader", + "scope": "CLASS", "texture": { - "key": "guapen" + "key": "probable-waffle-loader" }, "x": 505.0120544433594, "y": 360, - "scaleX": 0.32715486817515643, - "scaleY": 0.32715486817515643, - "list": [] + "scaleX": 2, + "scaleY": 2 }, { "type": "Rectangle", "id": "845d4ca6-7417-44fc-97e3-a3bb2fbbdd03", "label": "progressBar", - "components": [], + "scope": "CLASS", "x": 553.0120849609375, "y": 361, "originX": 0, @@ -44,10 +44,7 @@ { "prefabId": "ca949479-ab4d-45d5-b856-2cbecbd8d127", "id": "250eaa8f-b143-4e41-9ddf-052dfd99672c", - "label": "preloadUpdater", - "components": [], - "nestedPrefabs": [], - "list": [] + "label": "preloadUpdater" } ] }, @@ -55,7 +52,7 @@ "type": "Rectangle", "id": "10e175a4-81b6-449e-9561-6d8ba54d3812", "label": "progressBarBg", - "components": [], + "scope": "CLASS", "x": 553.0120849609375, "y": 361, "originX": 0, @@ -63,21 +60,32 @@ "fillColor": "#e0e0e0", "isStroked": true, "width": 256, - "height": 20, - "list": [] + "height": 20 }, { "type": "Text", "id": "c4092661-6339-47cf-9fea-8abff3a46e0c", "label": "loadingText", - "components": [], + "scope": "CLASS", "x": 552.0120849609375, "y": 329, "text": "Loading...", "fontFamily": "arial", "fontSize": "20px", - "color": "#e0e0e0", - "list": [] + "color": "#e0e0e0" + }, + { + "type": "Image", + "id": "dcdf4273-7526-450f-ab08-ba20c427f8d3", + "label": "probable-waffle-loader_1", + "scope": "CLASS", + "texture": { + "key": "probable-waffle-loader" + }, + "x": 847, + "y": 364, + "scaleX": 2, + "scaleY": 2 } ], "plainObjects": [], @@ -85,6 +93,6 @@ "app": "Phaser Editor 2D - Scene Editor", "url": "https://phasereditor2d.com", "contentType": "phasereditor2d.core.scene.SceneContentType", - "version": 3 + "version": 5 } } 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..4a3cefe3 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,14 @@ /* START OF COMPILED CODE */ -import Phaser from 'phaser'; -import PreloadBarUpdaterScript from '../../../other/Template/script-nodes/PreloadBarUpdaterScript'; +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 { ProbableWaffleScene } from "../core/probable-waffle.scene"; /* END-USER-IMPORTS */ -export default class PreloadProbableWaffle extends Phaser.Scene { +export default class PreloadProbableWaffle extends ProbableWaffleScene { constructor() { - super('PreloadProbableWaffle'); + super("PreloadProbableWaffle"); /* START-USER-CTR-CODE */ // Write your code here. @@ -18,10 +17,10 @@ export default class PreloadProbableWaffle extends Phaser.Scene { } editorCreate(): void { - // guapen - const guapen = this.add.image(505.0120544433594, 360, 'guapen'); - guapen.scaleX = 0.32715486817515643; - guapen.scaleY = 0.32715486817515643; + // probable-waffle-loader + const probable_waffle_loader = this.add.image(505.0120544433594, 360, "probable-waffle-loader"); + probable_waffle_loader.scaleX = 2; + probable_waffle_loader.scaleY = 2; // progressBar const progressBar = this.add.rectangle(553.0120849609375, 361, 256, 20); @@ -39,25 +38,63 @@ 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' }); - - this.events.emit('scene-awake'); + const loadingText = this.add.text(552.0120849609375, 329, "", {}); + loadingText.text = "Loading..."; + loadingText.setStyle({ color: "#e0e0e0", fontFamily: "arial", fontSize: "20px" }); + + // probable-waffle-loader_1 + const probable_waffle_loader_1 = this.add.image(847, 364, "probable-waffle-loader"); + probable_waffle_loader_1.scaleX = 2; + probable_waffle_loader_1.scaleY = 2; + + this.probable_waffle_loader = probable_waffle_loader; + this.progressBar = progressBar; + this.progressBarBg = progressBarBg; + this.loadingText = loadingText; + this.probable_waffle_loader_1 = probable_waffle_loader_1; + + this.events.emit("scene-awake"); } + private probable_waffle_loader!: Phaser.GameObjects.Image; + private progressBar!: Phaser.GameObjects.Rectangle; + private progressBarBg!: Phaser.GameObjects.Rectangle; + private loadingText!: Phaser.GameObjects.Text; + private probable_waffle_loader_1!: Phaser.GameObjects.Image; + /* START-USER-CODE */ // Write your code here preload() { this.editorCreate(); + this.center(); + this.load.pack("asset-pack", "assets/probable-waffle/asset-packers/asset-pack-probable-waffle.json"); + this.load.pack( + "asset-pack-map", + "assets/probable-waffle/asset-packers/maps/" + this.mapInfo.loader.mapLoaderAssetPackPath + ); + } - this.load.pack('asset-pack', assetPackUrl as any); + center() { + this.progressBar.x = this.cameras.main.centerX - this.progressBar.width / 2; + this.progressBar.y = this.cameras.main.centerY - this.progressBar.height / 2; + this.progressBarBg.x = this.cameras.main.centerX - this.progressBarBg.width / 2; + this.progressBarBg.y = this.cameras.main.centerY - this.progressBarBg.height / 2; + // set loading text above progress bar on y + this.loadingText.x = this.cameras.main.centerX - this.loadingText.width / 2; + this.loadingText.y = this.progressBar.y - this.loadingText.height - 10; + // set probable_waffle_loader left of progress bar on x + this.probable_waffle_loader.x = this.progressBar.x - this.probable_waffle_loader.width - 10; + this.probable_waffle_loader.y = this.cameras.main.centerY; + // set probable_waffle_loader_1 right of progress bar on x + this.probable_waffle_loader_1.x = + this.progressBar.x + this.progressBar.width + 10 + this.probable_waffle_loader_1.width; + this.probable_waffle_loader_1.y = this.cameras.main.centerY; } create() { - this.scene.start('Map1'); + this.scene.start(this.mapInfo.loader.mapSceneKey); } /* END-USER-CODE */ 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..b2c99948 --- /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 { BaseGameData } from "../../../shared/game/phaser/game/base-game-data"; +import { ProbableWaffleCommunicatorService } from "../../communicators/probable-waffle-communicator.service"; + +export type ProbableWaffleGameData = BaseGameData< + ProbableWaffleCommunicatorService, + ProbableWaffleGameInstance, + ProbableWaffleUserInfo +>; 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..43431c44 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,19 @@ -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"; +import MapEmberEnclave from "../../scenes/MapEmberEnclave"; +import { HudGameState } from "../../hud/hud-game-state"; +import HudProbableWaffle from "../../scenes/HudProbableWaffle"; export const probableWaffleGameConfig: Types.Core.GameConfig = { ...baseGameConfig, // scene: [GrasslandScene, PlaygroundScene], - scene: [Boot, PreloadProbableWaffle, Map1], + scene: [Boot, PreloadProbableWaffle, MapRiverCrossing, MapEmberEnclave, HudProbableWaffle], physics: { - default: 'arcade', + default: "arcade", arcade: { fps: 60, gravity: { y: 0 }, @@ -18,5 +21,5 @@ export const probableWaffleGameConfig: Types.Core.GameConfig = { } }, pixelArt: true, - backgroundColor: '#222' + backgroundColor: "#222" }; diff --git a/apps/client/src/app/probable-waffle/game/world/const/map-size.info.ts b/apps/client/src/app/probable-waffle/game/world/const/map-size.info.ts index aa418501..a0be190f 100644 --- a/apps/client/src/app/probable-waffle/game/world/const/map-size.info.ts +++ b/apps/client/src/app/probable-waffle/game/world/const/map-size.info.ts @@ -32,20 +32,6 @@ export class MapSizeInfo { export class MapDefinitions { static nrLayers = 3; - - static tilemapMapName = 'map'; - static tilemapMapJson = 'assets/probable-waffle/tilemaps/start-small.json'; - // static tilemapMapJson = 'assets/probable-waffle/tilemaps/start-large.json'; // big map - // static tilemapMapJson = 'assets/probable-waffle/tilemaps/start-extra-large.json'; // perf testing map - // static tilemapMapJson = 'assets/probable-waffle/tilemaps/start-extra-extra-large.json'; // perf testing map - - static atlasSuffix = '-atlas'; - static atlasMegaset = 'megaset-0'; - static atlasBuildings = 'buildings'; - static atlasCharacters = 'characters'; - static atlasOutside = 'iso-64x64-outside'; - static atlasBuilding = 'iso-64x64-building'; - static mapAtlases = [MapDefinitions.atlasOutside, MapDefinitions.atlasBuilding]; } export class TileDefinitions { diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/building-cursor.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/building-cursor.ts index 40cac553..6bd579f2 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/controllers/building-cursor.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/building-cursor.ts @@ -1,10 +1,10 @@ // when placing new building -import { MapSizeInfo } from '../../const/map-size.info'; -import { Vector2Simple } from '../../../library/math/intersection'; -import { AttackComponent } from '../../../entity/combat/components/attack-component'; -import { ConstructionSiteComponent } from '../../../entity/building/construction/construction-site-component'; -import { RepresentableActor } from '../../../entity/actor/representable-actor'; -import { Scene, Types } from 'phaser'; +import { MapSizeInfo } from "../../const/map-size.info"; +import { AttackComponent } from "../../../entity/combat/components/attack-component"; +import { ConstructionSiteComponent } from "../../../entity/building/construction/construction-site-component"; +import { RepresentableActor } from "../../../entity/actor/representable-actor"; +import { Scene, Types } from "phaser"; +import { Vector2Simple } from "@fuzzy-waddle/api-interfaces"; export class BuildingCursor { placementGrid: unknown; // todo @@ -37,7 +37,7 @@ export class BuildingCursor { const constructionSiteComponent = building.components.findComponent(ConstructionSiteComponent); const attackComponent = building.components.findComponent(AttackComponent); - this.gridWidthAndHeight = constructionSiteComponent.gridWidthAndHeight; + this.gridWidthAndHeight = { height: 3, width: 2 }; // todo constructionSiteComponent.gridWidthAndHeight; this.previewAttackRange = !!attackComponent; } @@ -90,9 +90,9 @@ export class BuildingCursor { if (!this.building || !this.pointerLocation) { return; } - const buildingSprite = this.building.spriteRepresentationComponent.sprite; - buildingSprite.setPosition(this.pointerLocation.x, this.pointerLocation.y); - buildingSprite.setAlpha(0.5); - buildingSprite.setVisible(true); + // todo const buildingSprite = this.building.spriteRepresentationComponent.sprite; + // todo buildingSprite.setPosition(this.pointerLocation.x, this.pointerLocation.y); + // todo buildingSprite.setAlpha(0.5); + // todo buildingSprite.setVisible(true); } } diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/control-group.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/control-group.ts index 2936ff92..5681651b 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/controllers/control-group.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/control-group.ts @@ -1,4 +1,4 @@ -import { Actor } from '../../../entity/actor/actor'; +import { Actor } from "../../../entity/actor/actor"; export class ControlGroup { actors: Actor[] = []; diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/human-player-controller.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/human-player-controller.ts index ce4aadb2..bef4da36 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/controllers/human-player-controller.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/human-player-controller.ts @@ -1,10 +1,10 @@ -import { PlayerController } from './player-controller'; -import { Scale } from 'phaser'; -import { Building } from '../../../entity/assets/buildings/building'; -import { BuildingCursor } from './building-cursor'; -import { Actor } from '../../../entity/actor/actor'; -import { TilePlacementData } from './input/tilemap/tilemap-input.handler'; -import { ControlGroup } from './control-group'; +import { PlayerController } from "./player-controller"; +import { Scale } from "phaser"; +import { Building } from "../../../entity/assets/buildings/building"; +import { BuildingCursor } from "./building-cursor"; +import { Actor } from "../../../entity/actor/actor"; +import { TilePlacementData } from "./input/tilemap/tilemap-input.handler"; +import { ControlGroup } from "./control-group"; export class HumanPlayerController extends PlayerController { scaleManager!: Scale.ScaleManager; @@ -19,7 +19,7 @@ export class HumanPlayerController extends PlayerController { buildingCursor?: BuildingCursor; cancelBuildingPlacement() { - throw new Error('Not implemented'); + throw new Error("Not implemented"); } confirmBuildingPlacement() { @@ -29,6 +29,6 @@ export class HumanPlayerController extends PlayerController { beginBuildingPlacement() { // spawn preview building with BuildingCursor - throw new Error('Not implemented'); + throw new Error("Not implemented"); } } 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/DEPRECATED_input.handler.ts similarity index 99% rename from apps/client/src/app/probable-waffle/game/world/managers/controllers/input/input.handler.ts rename to apps/client/src/app/probable-waffle/game/world/managers/controllers/input/DEPRECATED_input.handler.ts index e6fc2a7d..d4844720 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/DEPRECATED_input.handler.ts @@ -1,6 +1,6 @@ import { Cameras, Geom, Input, Types } from "phaser"; -export class InputHandler { +export class DEPRECATED_inputHandler { private readonly enabledMouseCornerMovement = false; private readonly input: Input.InputPlugin; private readonly mainCamera: Cameras.Scene2D.Camera; diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/DEPRECATED_multi-selection.handler.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/DEPRECATED_multi-selection.handler.ts new file mode 100644 index 00000000..0c441588 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/DEPRECATED_multi-selection.handler.ts @@ -0,0 +1,98 @@ +import { Subject } from "rxjs"; +import { Cameras, GameObjects, Geom, Input, Scene } from "phaser"; + +export class DEPRECATED_multiSelectionHandler { + onSelect: Subject = new Subject(); + onPreview: Subject = new Subject(); + private selection: GameObjects.Rectangle; + private selectionRect: Geom.Rectangle | null = null; + + constructor( + scene: Scene, + private readonly input: Input.InputPlugin, + private readonly mainCamera: Cameras.Scene2D.Camera + ) { + this.selection = scene.add.rectangle(0, 0, 0, 0, 0x1d7196, 0.5).setDepth(Phaser.Math.MAX_SAFE_INTEGER); + this.setupEvents(); + } + + overlapsBounds(rect: Geom.Rectangle, bounds: Geom.Rectangle): boolean { + if (!this.selectionRect) return false; + return Geom.Rectangle.Overlaps(rect, bounds); + } + + destroy() { + this.input.off(Input.Events.POINTER_DOWN); + this.input.off(Input.Events.POINTER_MOVE); + this.input.off(Input.Events.POINTER_UP); + this.input.off(Input.Events.GAME_OUT); + } + + private setupEvents() { + this.input.on(Input.Events.POINTER_DOWN, this.handlePointerDown, this); + this.input.on(Input.Events.POINTER_MOVE, this.handlePointerMove, this); + this.input.on(Input.Events.POINTER_UP, this.handlePointerUp, this); + this.input.on(Input.Events.GAME_OUT, () => { + this.hideSelectionRectangle(); + }); + } + + private handlePointerDown(pointer: Input.Pointer) { + if (!pointer.leftButtonDown()) { + return; + } + + this.selection.x = pointer.worldX; + this.selection.y = pointer.worldY; + this.selectionRect = null; + } + + private hideSelectionRectangle() { + this.selection.width = 0; + this.selection.height = 0; + this.selectionRect = null; + } + + private handlePointerUp(pointer: Input.Pointer) { + if (!pointer.rightButtonReleased()) { + this.onSelect.next(this.selectionRect as Geom.Rectangle); + + this.hideSelectionRectangle(); + } + } + + private handlePointerMove(pointer: Input.Pointer) { + if (!pointer.leftButtonDown()) { + return; + } + + const prevWorldPosition = this.mainCamera.getWorldPoint(pointer.prevPosition.x, pointer.prevPosition.y); + const dx = pointer.worldX - prevWorldPosition.x; + const dy = pointer.worldY - prevWorldPosition.y; + + this.selection.width += dx; + this.selection.height += dy; + + // create a new Rectangle + this.selectionRect = new Geom.Rectangle( + this.selection.x, + this.selection.y, + this.selection.width, + this.selection.height + ); + + // check if width or height is negative + // and then adjust + if (this.selectionRect.width < 0) { + this.selectionRect.x += this.selectionRect.width; + this.selectionRect.width *= -1; + } + if (this.selectionRect.height < 0) { + this.selectionRect.y += this.selectionRect.height; + this.selectionRect.height *= -1; + } + + // use the new Rectangle to check for overlap + this.onPreview.next(this.selectionRect); + } +} 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 new file mode 100644 index 00000000..b71d1334 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/cameraMovementHandler.ts @@ -0,0 +1,226 @@ +import { Cameras, Geom, Input, Types } from "phaser"; + +export class CameraMovementHandler { + 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 cameraEdgeMargin = 30; + private readonly cameraMinZoom = 30; + private readonly cameraMaxZoom = 0.3; + private readonly recommendedZoom = 1; + private readonly cameraZoomFactor = 0.1; + + 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.screenEdgeListener(); + this.lockCursorToScreen(); + this.scene.events.on("update", this.update, this); + this.scene.events.on("shutdown", this.destroy, this); + } + + /** + * 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.GAME_OUT); + this.input.off(Input.Events.GAME_OVER); + this.input.off(Input.Events.POINTER_WHEEL, this.zoomWithScrollHandler); + 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: this.config.cameraKeyboardMovementSpeed + }; + + 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.config.cameraEdgeMovementSpeed; + } + if (pointer.x > this.mainCamera.width - this.cameraEdgeMargin) { + this.mainCamera.scrollX += this.config.cameraEdgeMovementSpeed; + } + if (pointer.y < this.cameraEdgeMargin) { + this.mainCamera.scrollY -= this.config.cameraEdgeMovementSpeed; + } + if (pointer.y > this.mainCamera.height - this.cameraEdgeMargin) { + this.mainCamera.scrollY += this.config.cameraEdgeMovementSpeed; + } + } + + private zoomListener() { + this.input.on(Input.Events.POINTER_WHEEL, this.zoomWithScrollHandler, this); + } + + private zoomWithScrollHandler( + pointer: Input.Pointer, + gameObjects: unknown, + deltaX: number, + deltaY: number, + deltaZ: number + ) { + if (deltaY > 0) { + this.zoomOut(); + } + + if (deltaY < 0) { + this.zoomIn(); + } + } + + 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) { + 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 nearest; + } + + /** + * 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; + }); + } + + /** + * 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/managers/controllers/input/cursor.handler.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/cursor.handler.ts index d11d2f61..21d2e63a 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/cursor.handler.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/cursor.handler.ts @@ -1,19 +1,11 @@ -import { Input } from 'phaser'; - export class CursorHandler { - public static readonly penCursor = 'url(assets/probable-waffle/input/cursors/pen.cur), pointer'; - private input: Input.InputPlugin; + public static readonly penCursor = "url(assets/probable-waffle/input/cursors/pen.cur), pointer"; - constructor(input: Input.InputPlugin) { - this.input = input; + constructor(private readonly scene: Phaser.Scene) { this.setupCursor(); } - destroy() { - this.input.setDefaultCursor('default'); - } - private setupCursor() { - this.input.setDefaultCursor('url(assets/probable-waffle/input/cursors/sc2/SC2-cursor.cur), pointer'); + this.scene.input.setDefaultCursor("url(assets/probable-waffle/input/cursors/sc2/SC2-cursor.cur), pointer"); } } 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 new file mode 100644 index 00000000..55f51ecb --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/game-object-selection.handler.ts @@ -0,0 +1,91 @@ +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; + constructor(private readonly scene: ProbableWaffleScene) { + this.bindSelectionInput(); + this.scene.onDestroy.subscribe(() => this.destroy()); + } + + private bindSelectionInput() { + this.sub = this.scene.communicator.selection!.on.subscribe((selection) => { + 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": + 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"); + break; + default: + throw new Error("unknown selection type"); + } + }); + } + + 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 bounds = getGameObjectBounds(selectableChild); + if (!bounds) return false; + 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/manual-tiles/manual-tile-input.handler.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/manual-tiles/manual-tile-input.handler.ts index 93ee4bfa..fbc65f03 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/manual-tiles/manual-tile-input.handler.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/manual-tiles/manual-tile-input.handler.ts @@ -1,8 +1,9 @@ -import { MapSizeInfo } from '../../../../const/map-size.info'; -import { Intersection, Vector2Simple } from '../../../../../library/math/intersection'; -import { ManualTile, ManualTileLayer } from '../../../../map/tile/manual-tiles/manual-tiles.helper'; -import { IsoHelper } from '../../../../map/tile/iso-helper'; -import { Scene } from 'phaser'; +import { MapSizeInfo } from "../../../../const/map-size.info"; +import { Intersection } from "../../../../../library/math/intersection"; +import { ManualTile, ManualTileLayer } from "../../../../map/tile/manual-tiles/manual-tiles.helper"; +import { IsoHelper } from "../../../../map/tile/iso-helper"; +import { Scene } from "phaser"; +import { Vector2Simple } from "@fuzzy-waddle/api-interfaces"; export interface PossibleClickCoords { z: number; @@ -10,7 +11,10 @@ export interface PossibleClickCoords { } export class ManualTileInputHandler { - constructor(private readonly scene: Scene, private readonly manualLayers: ManualTileLayer[]) {} + constructor( + private readonly scene: Scene, + private readonly manualLayers: ManualTileLayer[] + ) {} /** * returns true if the tile was found and selected @@ -32,7 +36,7 @@ export class ManualTileInputHandler { const searchedWorldX = worldXY.x - MapSizeInfo.info.tileWidthHalf; const searchedWorldY = worldXY.y - MapSizeInfo.info.tileWidthHalf; // note tileWidth and not height - const pointerToTileXY = IsoHelper.isometricWorldToTileXY(searchedWorldX, searchedWorldY, true); + const pointerToTileXY = IsoHelper.DEPRECATED_isometricWorldToTileXY(searchedWorldX, searchedWorldY, true); const possibleCoords: PossibleClickCoords[] = []; for (const manualLayer of this.manualLayers) { @@ -59,7 +63,7 @@ export class ManualTileInputHandler { } private geExistingManualTileAtWorldXY(worldX: number, worldY: number): ManualTile | null { - const pointerToTileXY = IsoHelper.isometricWorldToTileXY(worldX, worldY, true); + const pointerToTileXY = IsoHelper.DEPRECATED_isometricWorldToTileXY(worldX, worldY, true); const clickPointToTileWorldXY = { x: worldX + MapSizeInfo.info.tileWidthHalf, y: worldY + MapSizeInfo.info.tileWidthHalf 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 d71e64f3..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 @@ -1,46 +1,48 @@ -import { Subject } from 'rxjs'; -import { Cameras, GameObjects, Geom, Input, Scene } from 'phaser'; +import { GameObjects, Geom, Input } from "phaser"; +import HudProbableWaffle from "../../../../scenes/HudProbableWaffle"; export class MultiSelectionHandler { - onSelect: Subject = new Subject(); - onPreview: Subject = new Subject(); private selection: GameObjects.Rectangle; private selectionRect: Geom.Rectangle | null = null; - constructor( - scene: Scene, - private readonly input: Input.InputPlugin, - private readonly mainCamera: Cameras.Scene2D.Camera - ) { - this.selection = scene.add.rectangle(0, 0, 0, 0, 0x1d7196, 0.5).setDepth(Phaser.Math.MAX_SAFE_INTEGER); + constructor(private readonly hudScene: HudProbableWaffle) { + this.selection = hudScene.add.rectangle(0, 0, 0, 0, 0x1d7196, 0.5); + this.hudScene.onDestroy.subscribe(() => this.destroy()); this.setupEvents(); } - overlapsBounds(rect: Geom.Rectangle, bounds: Geom.Rectangle): boolean { - if (!this.selectionRect) return false; - return Geom.Rectangle.Overlaps(rect, bounds); + static gameObjectOverlapsBounds( + gameObject: Phaser.GameObjects.Components.Transform & Phaser.GameObjects.Components.Size, + bounds: Geom.Rectangle + ): boolean { + const boundsRect = new Geom.Rectangle(bounds.x, bounds.y, bounds.width, bounds.height); + const gameObjectRect = new Geom.Rectangle( + gameObject.x - gameObject.width / 2, + gameObject.y - gameObject.height / 2, + gameObject.width, + gameObject.height + ); + return Geom.Intersects.RectangleToRectangle(boundsRect, gameObjectRect); } destroy() { - this.input.off(Input.Events.POINTER_DOWN); - this.input.off(Input.Events.POINTER_MOVE); - this.input.off(Input.Events.POINTER_UP); - this.input.off(Input.Events.GAME_OUT); + this.hudScene.input.off(Input.Events.POINTER_DOWN); + this.hudScene.input.off(Input.Events.POINTER_MOVE); + this.hudScene.input.off(Input.Events.POINTER_UP); + this.hudScene.input.off(Input.Events.GAME_OUT); } private setupEvents() { - this.input.on(Input.Events.POINTER_DOWN, this.handlePointerDown, this); - this.input.on(Input.Events.POINTER_MOVE, this.handlePointerMove, this); - this.input.on(Input.Events.POINTER_UP, this.handlePointerUp, this); - this.input.on(Input.Events.GAME_OUT, () => { + this.hudScene.input.on(Input.Events.POINTER_DOWN, this.handlePointerDown, this); + this.hudScene.input.on(Input.Events.POINTER_MOVE, this.handlePointerMove, this); + this.hudScene.input.on(Input.Events.POINTER_UP, this.handlePointerUp, this); + this.hudScene.input.on(Input.Events.GAME_OUT, () => { this.hideSelectionRectangle(); }); } private handlePointerDown(pointer: Input.Pointer) { - if (!pointer.leftButtonDown()) { - return; - } + if (!pointer.leftButtonDown()) return; this.selection.x = pointer.worldX; this.selection.y = pointer.worldY; @@ -55,7 +57,7 @@ export class MultiSelectionHandler { private handlePointerUp(pointer: Input.Pointer) { if (!pointer.rightButtonReleased()) { - this.onSelect.next(this.selectionRect as Geom.Rectangle); + this.sendSelection("multiSelect"); this.hideSelectionRectangle(); } @@ -66,7 +68,7 @@ export class MultiSelectionHandler { return; } - const prevWorldPosition = this.mainCamera.getWorldPoint(pointer.prevPosition.x, pointer.prevPosition.y); + const prevWorldPosition = this.hudScene.cameras.main.getWorldPoint(pointer.prevPosition.x, pointer.prevPosition.y); const dx = pointer.worldX - prevWorldPosition.x; const dy = pointer.worldY - prevWorldPosition.y; @@ -93,6 +95,23 @@ export class MultiSelectionHandler { } // use the new Rectangle to check for overlap - this.onPreview.next(this.selectionRect); + this.sendSelection("multiSelectPreview"); + } + + private sendSelection(type: "multiSelectPreview" | "multiSelect") { + if (!this.selectionRect) return; + this.hudScene.communicator.selection!.sendLocally({ + gameInstanceId: this.hudScene.gameInstanceId, + emitterUserId: this.hudScene.userId, + type, + data: { + selectedArea: { + x: this.selectionRect.x, + y: this.selectionRect.y, + width: this.selectionRect.width, + height: this.selectionRect.height + } + } + }); } } diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/nav-input.handler.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/nav-input.handler.ts index 67aa71a4..4ad03159 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/nav-input.handler.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/nav-input.handler.ts @@ -1,12 +1,12 @@ -import { Pathfinder } from '../../../map/pathfinder'; -import { MapSizeInfo } from '../../../const/map-size.info'; -import { TilePlacementWorldWithProperties } from '../../../map/tile/manual-tiles/manual-tiles.helper'; -import { Vector2Simple } from '../../../../library/math/intersection'; -import { MapNavHelper } from '../../../map/map-nav-helper'; -import { CharacterMovementComponent } from '../../../../entity/actor/components/character-movement-component'; -import { RepresentableActor } from '../../../../entity/actor/representable-actor'; -import { Scene } from 'phaser'; -import { TransformComponent } from '../../../../entity/actor/components/transformable-component'; +import { Pathfinder } from "../../../map/pathfinder"; +import { MapSizeInfo } from "../../../const/map-size.info"; +import { TilePlacementWorldWithProperties } from "../../../map/tile/manual-tiles/manual-tiles.helper"; +import { MapNavHelper } from "../../../map/map-nav-helper"; +import { CharacterMovementComponent } from "../../../../entity/actor/components/character-movement-component"; +import { RepresentableActor } from "../../../../entity/actor/representable-actor"; +import { Scene } from "phaser"; +import { TransformComponent } from "../../../../entity/actor/components/transformable-component"; +import { Vector2Simple } from "@fuzzy-waddle/api-interfaces"; export class NavInputHandler { constructor( diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/single-selection.handler.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/single-selection.handler.ts new file mode 100644 index 00000000..a1a5ae80 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/single-selection.handler.ts @@ -0,0 +1,100 @@ +import { GameObjects, Input } from "phaser"; +import { ProbableWaffleScene } from "../../../../core/probable-waffle.scene"; + +export class SingleSelectionHandler { + constructor( + private readonly scene: ProbableWaffleScene, + private readonly tilemap: Phaser.Tilemaps.Tilemap + ) { + this.bindSceneInput(); + } + + private bindSceneInput() { + this.scene.input.on( + Phaser.Input.Events.POINTER_DOWN, + (pointer: Input.Pointer, gameObjectsUnderCursor: GameObjects.GameObject[]) => { + // Check if an interactive object was clicked + if (gameObjectsUnderCursor.length > 0) { + // An interactive object was clicked + const objects = gameObjectsUnderCursor.map((go) => go.name); + console.log("clicked on interactive objects", gameObjectsUnderCursor.length, objects); + // if we clicked on top of terrain object, then emit terrain selection + const clickedOnTopOfTerrain = false; // TODO + if (clickedOnTopOfTerrain) { + this.sendTerrainSelection(0, 0, 0); // todo? + } else { + this.sendSelection(objects); + } + } else { + // No interactive object was clicked, handle tilemap click + + // offset pointer by camera position + const pointerX = pointer.x + this.scene.cameras.main.scrollX; + const pointerY = pointer.y + this.scene.cameras.main.scrollY + this.tilemap.tileHeight; + + const clickedTileXY = new Phaser.Math.Vector2(); + Phaser.Tilemaps.Components.IsometricWorldToTileXY( + pointerX, + pointerY, + true, + clickedTileXY, + this.scene.cameras.main, + this.tilemap.layer + ); + + const maxTileX = this.tilemap.width; + const maxTileY = this.tilemap.height; + const minTileX = 0; + const minTileY = 0; + if ( + clickedTileXY.x < minTileX || + clickedTileXY.x > maxTileX || + clickedTileXY.y < minTileY || + clickedTileXY.y > maxTileY + ) { + this.sendDeselect(); + return; + } + console.log("clicked on tile", clickedTileXY.x, clickedTileXY.y); + + this.sendTerrainSelection(clickedTileXY.x, clickedTileXY.y, 0); + } + }, + this + ); + } + + private sendSelection(selected: string[]) { + this.scene.communicator.selection!.sendLocally({ + gameInstanceId: this.scene.gameInstanceId, + emitterUserId: this.scene.userId, + type: "singleSelect", + data: { + selected + } + }); + } + + private sendDeselect() { + this.scene.communicator.selection!.sendLocally({ + gameInstanceId: this.scene.gameInstanceId, + emitterUserId: this.scene.userId, + type: "deselect" + }); + } + + private sendTerrainSelection(x: number, y: number, z: number) { + this.scene.communicator.selection!.sendLocally({ + gameInstanceId: this.scene.gameInstanceId, + emitterUserId: this.scene.userId, + type: "terrainSelect", + data: { + terrainSelected: { + x, + y, + z + } + } + }); + } +} diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/tilemap/tilemap-input.handler.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/tilemap/tilemap-input.handler.ts index eaae9862..97802e01 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/tilemap/tilemap-input.handler.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/input/tilemap/tilemap-input.handler.ts @@ -1,9 +1,9 @@ -import { Vector2Simple } from '../../../../../library/math/intersection'; -import { TilePlacementWorldWithProperties } from '../../../../map/tile/manual-tiles/manual-tiles.helper'; -import { MapSizeInfo } from '../../../../const/map-size.info'; -import { IsoHelper } from '../../../../map/tile/iso-helper'; -import { TileLayerProperties } from '../../../../map/tile/types/tile-types'; -import { Tilemaps } from 'phaser'; +import { TilePlacementWorldWithProperties } from "../../../../map/tile/manual-tiles/manual-tiles.helper"; +import { MapSizeInfo } from "../../../../const/map-size.info"; +import { IsoHelper } from "../../../../map/tile/iso-helper"; +import { TileLayerProperties } from "../../../../map/tile/types/tile-types"; +import { Tilemaps } from "phaser"; +import { Vector2Simple } from "@fuzzy-waddle/api-interfaces"; export interface TilePlacementData { tileXY: Vector2Simple; @@ -32,7 +32,7 @@ export class TilemapInputHandler { const searchedWorldX = worldXY.x - MapSizeInfo.info.tileWidthHalf; const searchedWorldY = worldXY.y - MapSizeInfo.info.tileWidthHalf; // note tileWidth and not height - const tileXY = IsoHelper.isometricWorldToTileXY(searchedWorldX, searchedWorldY, true); + const tileXY = IsoHelper.DEPRECATED_isometricWorldToTileXY(searchedWorldX, searchedWorldY, true); const foundTile = this.tilemapLayer.getTileAt(tileXY.x, tileXY.y) as Tilemaps.Tile; diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/pawn-ai-controller-component.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/pawn-ai-controller-component.ts index c2517270..3f2487bf 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/controllers/pawn-ai-controller-component.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/pawn-ai-controller-component.ts @@ -1,19 +1,23 @@ -import { IComponent } from '../../../core/component.service'; -import { Actor } from '../../../entity/actor/actor'; -import { TilePlacementData } from './input/tilemap/tilemap-input.handler'; -import { OrderData } from '../../../entity/character/ai/order-data'; -import { Queue } from '../../../library/queue'; -import { BeginConstructionArgs, OrderType } from '../../../entity/character/ai/order-type'; -import { ActorAbleToBeBuiltClass } from '../../../entity/actor/components/builder-component'; -import { GathererComponent } from '../../../entity/actor/components/gatherer-component'; -import { PawnAiBlackboard } from '../../../entity/character/ai/pawn-ai-blackboard'; -import { PawnBehaviorTree } from '../../../entity/character/ai/behavior-trees'; +import { IComponent } from "../../../core/component.service"; +import { Actor } from "../../../entity/actor/actor"; +import { TilePlacementData } from "./input/tilemap/tilemap-input.handler"; +import { OrderData } from "../../../entity/character/ai/order-data"; +import { Queue } from "../../../library/queue"; +import { BeginConstructionArgs, OrderType } from "../../../entity/character/ai/order-type"; +import { ActorAbleToBeBuiltClass } from "../../../entity/actor/components/builder-component"; +import { GathererComponent } from "../../../entity/actor/components/gatherer-component"; +import { PawnAiBlackboard } from "../../../entity/character/ai/pawn-ai-blackboard"; +import { PawnBehaviorTree } from "../../../entity/character/ai/behavior-trees"; export class PawnAiControllerComponent implements IComponent { // declare queue of OrderData orders: Queue = new Queue(); - constructor(private owner: Actor, public blackboard: PawnAiBlackboard, public behaviorTree: PawnBehaviorTree) {} + constructor( + private owner: Actor, + public blackboard: PawnAiBlackboard, + public behaviorTree: PawnBehaviorTree + ) {} init(): void { this.behaviorTree.run(); @@ -56,7 +60,7 @@ export class PawnAiControllerComponent implements IComponent { } issueOrder(orderData: OrderData) { - console.log('issueOrder', orderData); + console.log("issueOrder", orderData); this.orders.empty(); this.addOrder(orderData); this.obtainNextOrder(); diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/player-ai-controller.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/player-ai-controller.ts index 4e2b21e8..be7565c1 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/controllers/player-ai-controller.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/player-ai-controller.ts @@ -1,16 +1,16 @@ -import { PlayerController } from './player-controller'; +import { PlayerController } from "./player-controller"; import { ActorAbleToBeCreatedClass, ActorAbleToBeProducedClass -} from '../../../entity/building/production/production-queue'; -import { Actor } from '../../../entity/actor/actor'; -import { ResourceDrainComponent } from '../../../entity/economy/resource/resource-drain-component'; -import { GameplayLibrary } from '../../../library/gameplay-library'; -import { ResourceSourceComponent } from '../../../entity/economy/resource/resource-source-component'; -import { ResourceType } from '../../../entity/economy/resource/resource-type'; -import { PlayerAiBlackboard } from '../../../entity/character/ai/player-ai/player-ai-blackboard'; -import { DefaultPlayerAiBehaviorTree } from '../../../entity/character/ai/player-ai/default-player-ai-behavior-tree'; -import { ProductionComponent } from '../../../entity/building/production/production-component'; +} from "../../../entity/building/production/production-queue"; +import { Actor } from "../../../entity/actor/actor"; +import { ResourceDrainComponent } from "../../../entity/economy/resource/resource-drain-component"; +import { GameplayLibrary } from "../../../library/gameplay-library"; +import { ResourceSourceComponent } from "../../../entity/economy/resource/resource-source-component"; +import { ResourceTypeDefinition } from "@fuzzy-waddle/api-interfaces"; +import { PlayerAiBlackboard } from "../../../entity/character/ai/player-ai/player-ai-blackboard"; +import { DefaultPlayerAiBehaviorTree } from "../../../entity/character/ai/player-ai/default-player-ai-behavior-tree"; +import { ProductionComponent } from "../../../entity/building/production/production-component"; export class PlayerAiController extends PlayerController { /** @@ -38,7 +38,7 @@ export class PlayerAiController extends PlayerController { /** * Type of the primary resource for the ai to gather (e.g. used for placing resource drains) */ - private primaryResourceType?: ResourceType; + private primaryResourceType?: ResourceTypeDefinition; constructor() { super(); @@ -132,7 +132,7 @@ export class PlayerAiController extends PlayerController { continue; } - console.log('starting production of ' + pawnClass.name); + console.log("starting production of " + pawnClass.name); // todo productionComponent.startProduction(pawnClass as ActorsAbleToBeProducedClass); // todo ... diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/player-controller.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/player-controller.ts index cd035987..c0f67167 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/controllers/player-controller.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/player-controller.ts @@ -1,9 +1,9 @@ -import { RepresentableActor } from '../../../entity/actor/representable-actor'; -import { Actor } from '../../../entity/actor/actor'; -import { OrderData } from '../../../entity/character/ai/order-data'; -import { PlayerResourcesComponent } from './player-resources-component'; -import { GameState } from '../game-state/game-state'; -import { PlayerState } from '../../../player/player-state'; +import { RepresentableActor } from "../../../entity/actor/representable-actor"; +import { Actor } from "../../../entity/actor/actor"; +import { OrderData } from "../../../entity/character/ai/order-data"; +import { PlayerResourcesComponent } from "./player-resources-component"; +import { GameState } from "../game-state/game-state"; +import { PlayerState } from "../../../player/player-state"; export class PlayerController extends Actor { readonly gameState!: GameState; // todo @@ -16,18 +16,18 @@ export class PlayerController extends Actor { } issueOrder(orderData: OrderData, issueTo: RepresentableActor) { - throw new Error('Not implemented'); + throw new Error("Not implemented"); } surrender() { - throw new Error('Not implemented'); + throw new Error("Not implemented"); } cancelProduction(productionActor: Actor) { - throw new Error('Not implemented'); + throw new Error("Not implemented"); } cancelConstruction(constructionActor: Actor) { - throw new Error('Not implemented'); + throw new Error("Not implemented"); } } diff --git a/apps/client/src/app/probable-waffle/game/world/managers/controllers/player-resources-component.ts b/apps/client/src/app/probable-waffle/game/world/managers/controllers/player-resources-component.ts index b93660cf..5cfc4b01 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/controllers/player-resources-component.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/controllers/player-resources-component.ts @@ -1,44 +1,44 @@ -import { IComponent } from '../../../core/component.service'; -import { ResourceType } from '../../../entity/economy/resource/resource-type'; +import { IComponent } from "../../../core/component.service"; +import { ResourceTypeDefinition } from "@fuzzy-waddle/api-interfaces"; export class PlayerResourcesComponent implements IComponent { - resources: Map = new Map(); + resources: Map = new Map(); init(): void { // pass } - getResources(): Map { + getResources(): Map { return this.resources; } - addResources(resources: Map): void { + addResources(resources: Map): void { resources.forEach((value, resourceType) => { this.addResource(resourceType, value); }); } - addResource(resourceType: ResourceType, amount: number): number { + addResource(resourceType: ResourceTypeDefinition, amount: number): number { const resourceAmount = this.resources.get(resourceType) || 0; this.resources.set(resourceType, resourceAmount + amount); return resourceAmount; } - payAllResources(resources: Map): void { + payAllResources(resources: Map): void { resources.forEach((value, resourceType) => { this.payResources(resourceType, value); }); } - payResources(resourceType: ResourceType, amount: number): void { + payResources(resourceType: ResourceTypeDefinition, amount: number): void { const resourceAmount = this.resources.get(resourceType) || 0; if (resourceAmount - amount < 0) { - throw new Error('Not enough resources'); + throw new Error("Not enough resources"); } this.resources.set(resourceType, resourceAmount - amount); } - canPayAllResources(constructionCosts: Map) { + canPayAllResources(constructionCosts: Map) { // noinspection UnnecessaryLocalVariableJS const canAfford = Array.from(constructionCosts.entries()).every(([resourceType, amount]) => { const resourceAmount = this.resources.get(resourceType) || 0; diff --git a/apps/client/src/app/probable-waffle/game/world/managers/game-mode/game-mode.ts b/apps/client/src/app/probable-waffle/game/world/managers/game-mode/game-mode.ts index c5210730..a0103e1d 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/game-mode/game-mode.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/game-mode/game-mode.ts @@ -1,9 +1,9 @@ -import { GameState } from '../game-state/game-state'; -import { VisionManager } from '../../map/vision/vision-manager'; -import { ActorAbleToBeBuilt, ActorAbleToBeBuiltClass } from '../../../entity/actor/components/builder-component'; -import { PlayerController } from '../controllers/player-controller'; -import { TilePlacementData } from '../controllers/input/tilemap/tilemap-input.handler'; -import { Scene } from 'phaser'; +import { GameState } from "../game-state/game-state"; +import { VisionManager } from "../../map/vision/vision-manager"; +import { ActorAbleToBeBuilt, ActorAbleToBeBuiltClass } from "../../../entity/actor/components/builder-component"; +import { PlayerController } from "../controllers/player-controller"; +import { TilePlacementData } from "../controllers/input/tilemap/tilemap-input.handler"; +import { Scene } from "phaser"; export enum GameModeState { // https://docs.unrealengine.com/4.27/en-US/InteractiveExperiences/Framework/GameMode/ diff --git a/apps/client/src/app/probable-waffle/game/world/managers/game-mode/game-modes/game-mode-editor.ts b/apps/client/src/app/probable-waffle/game/world/managers/game-mode/game-modes/game-mode-editor.ts deleted file mode 100644 index 3f972083..00000000 --- a/apps/client/src/app/probable-waffle/game/world/managers/game-mode/game-modes/game-mode-editor.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { GameStateEditor } from '../../game-state/game-states/game-state-editor'; -import { GameMode } from '../game-mode'; - -export interface EditableGameMode { - isEditor: boolean; -} - -export class GameModeEditor extends GameMode implements EditableGameMode { - isEditor = true; - - startNewGame(): void { - this.gameState = new GameStateEditor(); // todo - } - - endGame(): void { - // todo - } - - handleStartingNewPlayer(): void { - // todo - } -} diff --git a/apps/client/src/app/probable-waffle/game/world/managers/game-mode/game-modes/game-mode-skirmish.ts b/apps/client/src/app/probable-waffle/game/world/managers/game-mode/game-modes/game-mode-skirmish.ts index 4377e0f3..46a7ac0d 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/game-mode/game-modes/game-mode-skirmish.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/game-mode/game-modes/game-mode-skirmish.ts @@ -1,9 +1,9 @@ -import { GameMode } from '../game-mode'; -import { Limitations } from '../limitations'; -import { VictoryCondition, VictoryConditions } from '../victory-conditions'; -import { PlayerController } from '../../controllers/player-controller'; -import { EventEmitter } from '@angular/core'; -import { PlayerAiController } from '../../controllers/player-ai-controller'; +import { GameMode } from "../game-mode"; +import { Limitations } from "../limitations"; +import { VictoryCondition, VictoryConditions } from "../victory-conditions"; +import { PlayerController } from "../../controllers/player-controller"; +import { EventEmitter } from "@angular/core"; +import { PlayerAiController } from "../../controllers/player-ai-controller"; export class GameModeSkirmish extends GameMode { // events: diff --git a/apps/client/src/app/probable-waffle/game/world/managers/game-mode/limitations.ts b/apps/client/src/app/probable-waffle/game/world/managers/game-mode/limitations.ts index f18e34f8..00c61732 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/game-mode/limitations.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/game-mode/limitations.ts @@ -1,4 +1,4 @@ -import { Actor } from '../../../entity/actor/actor'; +import { Actor } from "../../../entity/actor/actor"; export class Limitations { constructor(public actorLimitation: (typeof Actor)[] = []) {} diff --git a/apps/client/src/app/probable-waffle/game/world/managers/game-mode/victory-conditions.ts b/apps/client/src/app/probable-waffle/game/world/managers/game-mode/victory-conditions.ts index 9d443ee0..6fe653d4 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/game-mode/victory-conditions.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/game-mode/victory-conditions.ts @@ -1,20 +1,23 @@ export class VictoryCondition { - static readonly TIME = new VictoryCondition('Time'); - static readonly KILLS = new VictoryCondition('Kills'); - static readonly RESOURCES = new VictoryCondition('Resources'); - static readonly UNITS = new VictoryCondition('Units'); - static readonly BUILDINGS = new VictoryCondition('Buildings'); - static readonly UPGRADES = new VictoryCondition('Upgrades'); - static readonly ALLIES = new VictoryCondition('Allies'); - static readonly ENEMIES = new VictoryCondition('Enemies'); - static readonly ALL = new VictoryCondition('All'); - static readonly NONE = new VictoryCondition('None'); - static readonly CUSTOM = new VictoryCondition('Custom'); - static readonly UNKNOWN = new VictoryCondition('Unknown'); + static readonly TIME = new VictoryCondition("Time"); + static readonly KILLS = new VictoryCondition("Kills"); + static readonly RESOURCES = new VictoryCondition("Resources"); + static readonly UNITS = new VictoryCondition("Units"); + static readonly BUILDINGS = new VictoryCondition("Buildings"); + static readonly UPGRADES = new VictoryCondition("Upgrades"); + static readonly ALLIES = new VictoryCondition("Allies"); + static readonly ENEMIES = new VictoryCondition("Enemies"); + static readonly ALL = new VictoryCondition("All"); + static readonly NONE = new VictoryCondition("None"); + static readonly CUSTOM = new VictoryCondition("Custom"); + static readonly UNKNOWN = new VictoryCondition("Unknown"); constructor(public name: string) {} } export class VictoryConditions { - constructor(public victoryCondition: VictoryCondition, public value: number) {} + constructor( + public victoryCondition: VictoryCondition, + public value: number + ) {} } diff --git a/apps/client/src/app/probable-waffle/game/world/managers/game-state/game-state.ts b/apps/client/src/app/probable-waffle/game/world/managers/game-state/game-state.ts index 5bb4883a..3fb2a407 100644 --- a/apps/client/src/app/probable-waffle/game/world/managers/game-state/game-state.ts +++ b/apps/client/src/app/probable-waffle/game/world/managers/game-state/game-state.ts @@ -1,7 +1,7 @@ -import { PlayerState } from '../../../player/player-state'; -import { GameMode } from '../game-mode/game-mode'; -import { VisionManager } from '../../map/vision/vision-manager'; -import { Actor } from '../../../entity/actor/actor'; +import { PlayerState } from "../../../player/player-state"; +import { GameMode } from "../game-mode/game-mode"; +import { VisionManager } from "../../map/vision/vision-manager"; +import { Actor } from "../../../entity/actor/actor"; export class MapObject { // todo diff --git a/apps/client/src/app/probable-waffle/game/world/managers/game-state/game-states/game-state-editor.ts b/apps/client/src/app/probable-waffle/game/world/managers/game-state/game-states/game-state-editor.ts deleted file mode 100644 index ee5722ed..00000000 --- a/apps/client/src/app/probable-waffle/game/world/managers/game-state/game-states/game-state-editor.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { GameState } from '../game-state'; - -export class GameStateEditor extends GameState {} diff --git a/apps/client/src/app/probable-waffle/game/world/managers/game-state/game-states/game-state-skirmish.ts b/apps/client/src/app/probable-waffle/game/world/managers/game-state/game-states/game-state-skirmish.ts deleted file mode 100644 index 6736a5f1..00000000 --- a/apps/client/src/app/probable-waffle/game/world/managers/game-state/game-states/game-state-skirmish.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { GameState } from '../game-state'; - -export class GameStateSkirmish extends GameState {} 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 new file mode 100644 index 00000000..686cfb0d --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/world/managers/game-state/scene-game-state.ts @@ -0,0 +1,82 @@ +import { ProbableWaffleScene } from "../../../core/probable-waffle.scene"; +import { GameSessionState } from "@fuzzy-waddle/api-interfaces"; + +export class MapObject { + // todo +} + +export class SceneGameState { + private sessionStateSubscription?: { unsubscribe(): void }; + constructor(private readonly scene: ProbableWaffleScene) { + scene.onDestroy.subscribe(() => this.destroy()); + scene.onPostCreate.subscribe(() => this.listen()); + } + + private listen() { + this.pauseUntilAllPlayersAreReady(); + + console.log("playing level", this.scene.mapInfo.name); + + // after 3 seconds, change state to StartingTheGame + setTimeout(() => { + this.scene.baseGameData.communicator.gameInstanceMetadataChanged?.send({ + property: "sessionState", + gameInstanceId: this.scene.baseGameData.gameInstance.gameInstanceMetadata.data.gameInstanceId!, + data: { sessionState: GameSessionState.StartingTheGame }, + emitterUserId: this.scene.baseGameData.user.userId + }); + }, 100); // todo for test - later call this when all players have loaded the game + } + + pauseUntilAllPlayersAreReady() { + this.handleCurrentSessionState(this.scene.baseGameData.gameInstance.gameInstanceMetadata.data.sessionState!); + this.sessionStateSubscription = this.scene.baseGameData.communicator.gameInstanceMetadataChanged?.on.subscribe( + (metadataEvent) => { + switch (metadataEvent.property) { + case "sessionState": + this.handleCurrentSessionState(metadataEvent.data.sessionState!); + break; + } + } + ); + } + + private handleCurrentSessionState(sessionState: GameSessionState) { + switch (sessionState) { + case GameSessionState.NotStarted: + throw new Error("Game should not be in this state " + sessionState); + case GameSessionState.MovingPlayersToGame: + this.scene.scene.pause(); + break; + case GameSessionState.StartingTheGame: + const sendInProgress = () => { + this.scene.baseGameData.communicator.gameInstanceMetadataChanged?.send({ + property: "sessionState", + gameInstanceId: this.scene.gameInstanceId, + data: { sessionState: GameSessionState.InProgress }, + emitterUserId: this.scene.userId + }); + }; + const handleCountdown = false; + if (handleCountdown) { + setTimeout(() => sendInProgress(), 3000); + } else { + sendInProgress(); + } + + break; + case GameSessionState.InProgress: + this.scene.scene.resume(); + break; + case GameSessionState.ToScoreScreen: + this.scene.scene.stop(); + break; + case GameSessionState.Stopped: + throw new Error("HUD should be destroyed at this point"); + } + } + + private destroy() { + this.sessionStateSubscription?.unsubscribe(); + } +} 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/scenes/AnimatedTile.ts b/apps/client/src/app/probable-waffle/game/world/map/animated-tile.helper.ts similarity index 82% rename from apps/client/src/app/probable-waffle/game/scenes/AnimatedTile.ts rename to apps/client/src/app/probable-waffle/game/world/map/animated-tile.helper.ts index 31d8a28e..ab39d4d5 100644 --- a/apps/client/src/app/probable-waffle/game/scenes/AnimatedTile.ts +++ b/apps/client/src/app/probable-waffle/game/world/map/animated-tile.helper.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 = (_: number, 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/world/map/debug/debug-shapes.ts b/apps/client/src/app/probable-waffle/game/world/map/debug/debug-shapes.ts index 56285b78..a34d4efb 100644 --- a/apps/client/src/app/probable-waffle/game/world/map/debug/debug-shapes.ts +++ b/apps/client/src/app/probable-waffle/game/world/map/debug/debug-shapes.ts @@ -1,5 +1,5 @@ -import { Vector2Simple } from '../../../library/math/intersection'; -import { Geom, Scene } from 'phaser'; +import { Vector2Simple } from "@fuzzy-waddle/api-interfaces"; +import { Geom, Scene } from "phaser"; export class DebugShapes { static drawDebugPoint(scene: Scene, clickPoint: Vector2Simple) { 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..63b003c8 --- /dev/null +++ b/apps/client/src/app/probable-waffle/game/world/map/depth.helper.ts @@ -0,0 +1,22 @@ +export class DepthHelper { + constructor(private readonly scene: Phaser.Scene) { + this.handleSortOfStaticObjects(); + } + + private handleSortOfStaticObjects = () => { + const children = this.scene.children; + children.each((child: any) => { + 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); + } + } +} diff --git a/apps/client/src/app/probable-waffle/game/world/map/game-objects-helper.ts b/apps/client/src/app/probable-waffle/game/world/map/game-objects-helper.ts index ffc00fa2..5266c64f 100644 --- a/apps/client/src/app/probable-waffle/game/world/map/game-objects-helper.ts +++ b/apps/client/src/app/probable-waffle/game/world/map/game-objects-helper.ts @@ -1,4 +1,4 @@ -import { PlacedGameObject } from '../../entity/placable-objects/static-object'; +import { PlacedGameObject } from "../../entity/placable-objects/static-object"; export class GameObjectsHelper { staticObjects!: PlacedGameObject[]; diff --git a/apps/client/src/app/probable-waffle/game/world/map/minimap-texture.helper.ts b/apps/client/src/app/probable-waffle/game/world/map/minimap-texture.helper.ts index 3243b811..e71d9d3c 100644 --- a/apps/client/src/app/probable-waffle/game/world/map/minimap-texture.helper.ts +++ b/apps/client/src/app/probable-waffle/game/world/map/minimap-texture.helper.ts @@ -1,5 +1,5 @@ -import { Cameras, Scene } from 'phaser'; -import { MapSizeInfo } from '../const/map-size.info'; +import { Cameras, Scene } from "phaser"; +import { MapSizeInfo } from "../const/map-size.info"; export class MinimapTextureHelper { private scene: Scene; @@ -52,7 +52,7 @@ export class MinimapTextureHelper { const worldWidthInPx = MapSizeInfo.info.tileWidth * mapWidth; const worldHeightInPx = MapSizeInfo.info.tileHeight * mapHeight; - this.minimap = cameras.add(200, 10, minimapWidthInPx, minimapHeightInPx).setName('mini'); + this.minimap = cameras.add(200, 10, minimapWidthInPx, minimapHeightInPx).setName("mini"); // set minimap zoom, so whole world fits in const zoom = Math.min(minimapWidthInPx / worldWidthInPx, minimapHeightInPx / worldHeightInPx); diff --git a/apps/client/src/app/probable-waffle/game/world/map/pathfinder.ts b/apps/client/src/app/probable-waffle/game/world/map/pathfinder.ts index a26b059c..4fed59d2 100644 --- a/apps/client/src/app/probable-waffle/game/world/map/pathfinder.ts +++ b/apps/client/src/app/probable-waffle/game/world/map/pathfinder.ts @@ -9,13 +9,13 @@ import { TOP as EasyStar_TOP, TOP_LEFT as EasyStar_TOP_LEFT, TOP_RIGHT as EasyStar_TOP_RIGHT -} from 'easystarjs'; -import { TilemapHelper } from './tile/tilemap.helper'; -import { Vector2Simple } from '../../library/math/intersection'; -import { TilePlacementWorldWithProperties } from './tile/manual-tiles/manual-tiles.helper'; -import { MapSizeInfo, TileDefinitions } from '../const/map-size.info'; -import { SlopeDirection } from './tile/types/tile-types'; -import { Scene } from 'phaser'; +} from "easystarjs"; +import { TilemapHelper } from "./tile/tilemap.helper"; +import { TilePlacementWorldWithProperties } from "./tile/manual-tiles/manual-tiles.helper"; +import { MapSizeInfo, TileDefinitions } from "../const/map-size.info"; +import { SlopeDirection } from "./tile/types/tile-types"; +import { Scene } from "phaser"; +import { Vector2Simple } from "@fuzzy-waddle/api-interfaces"; export class Pathfinder { private readonly enableDiagonals = true; @@ -60,8 +60,8 @@ export class Pathfinder { } easyStar.findPath(from.x, from.y, to.x, to.y, (path) => { if (!path) { - console.log('Path was not found.'); - reject('Path was not found.'); + console.log("Path was not found."); + reject("Path was not found."); } else { if (path.length === 0) { resolve([]); 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/tile/iso-helper.ts b/apps/client/src/app/probable-waffle/game/world/map/tile/iso-helper.ts index 51dc4328..7f2dc8ce 100644 --- a/apps/client/src/app/probable-waffle/game/world/map/tile/iso-helper.ts +++ b/apps/client/src/app/probable-waffle/game/world/map/tile/iso-helper.ts @@ -1,8 +1,11 @@ -import { MapSizeInfo } from '../../const/map-size.info'; -import { Vector2Simple } from '../../../library/math/intersection'; +import { Vector2Simple } from "@fuzzy-waddle/api-interfaces"; +import { MapSizeInfo } from "../../const/map-size.info"; export class IsoHelper { - static isometricWorldToTileXY(worldX: number, worldY: number, snapToFloor: boolean): Vector2Simple { + /** + * @deprecated USE RATHER Phaser.Tilemaps.Components.IsometricWorldToTileXY + */ + static DEPRECATED_isometricWorldToTileXY(worldX: number, worldY: number, snapToFloor: boolean): Vector2Simple { const tileWidthHalf = MapSizeInfo.info.tileWidthHalf; const tileHeightHalf = MapSizeInfo.info.tileHeightHalf; diff --git a/apps/client/src/app/probable-waffle/game/world/map/tile/layer-lines.ts b/apps/client/src/app/probable-waffle/game/world/map/tile/layer-lines.ts deleted file mode 100644 index 1a3bf1a2..00000000 --- a/apps/client/src/app/probable-waffle/game/world/map/tile/layer-lines.ts +++ /dev/null @@ -1,98 +0,0 @@ -import { Display, GameObjects, Scene } from 'phaser'; -import { MapSizeInfo } from '../../const/map-size.info'; -import { TilemapHelper } from './tilemap.helper'; -import { Vector2Simple } from '../../../library/math/intersection'; -import { ManualTilesHelper } from './manual-tiles/manual-tiles.helper'; - -export class LayerLines { - private currentLayerLinesGroup: GameObjects.Group | null = null; - - constructor(private readonly scene: Scene) {} - - drawLayerLines(layer: number) { - if (this.currentLayerLinesGroup !== null) { - // remove all lines from group - this.currentLayerLinesGroup.clear(true, true); - this.currentLayerLinesGroup.destroy(); - this.currentLayerLinesGroup = null; - } - - this.currentLayerLinesGroup = this.createLinesGroup(layer); - } - - private createLinesGroup(layer: number): GameObjects.Group { - const byLayerOffset = layer * MapSizeInfo.info.tileHeight; - const tileWidth = MapSizeInfo.info.tileWidth; - const tileHeight = MapSizeInfo.info.tileHeight; - - const tileWidthHalf = tileWidth / 2; - const tileHeightHalf = tileHeight / 2; - - const mapWidth = MapSizeInfo.info.width; - const mapHeight = MapSizeInfo.info.height; - - // not offsetting, because we're placing block tiles there - const tileCenterOffset = TilemapHelper.adjustTileWorldWithVerticalOffset( - { x: MapSizeInfo.info.tileWidthHalf, y: MapSizeInfo.info.tileHeight }, - { - offsetInPx: byLayerOffset - } - ); - - const linesGroup = this.scene.add.group(); - - this.drawLayerGridLines( - linesGroup, - -1, - mapWidth, - mapHeight, - tileWidthHalf, - tileHeightHalf, - tileCenterOffset, - layer - ); - this.drawLayerGridLines(linesGroup, 1, mapHeight, mapWidth, tileWidthHalf, tileHeightHalf, tileCenterOffset, layer); - return linesGroup; - } - - /** - * Working drawing so z index works on correct plane. - * This means have to draw short lines and set their z index correctly (same way as in {@link placeTileOnLayer}) - */ - private drawLayerGridLines( - group: GameObjects.Group, - axisModifier: 1 | -1, - firstAxis: number, - secondAxis: number, - tileWidthHalf: number, - tileHeightHalf: number, - tileCenterOffset: Vector2Simple, - layer: number - ): void { - const color = new Display.Color(); - - for (let y = 0; y < firstAxis + 1; y++) { - // draw line secondAxis times - for (let x = 1; x < secondAxis + 1; x++) { - const txStart = -1 * axisModifier * (x - y - 1) * tileWidthHalf; - const tyStart = (x + y - 1) * tileHeightHalf; - - const txEnd = -1 * axisModifier * (x - y) * tileWidthHalf; - const tyEnd = (x + y) * tileHeightHalf; - - const worldStart: Vector2Simple = { x: tileCenterOffset.x + txStart, y: tileCenterOffset.y + tyStart }; - const worldEnd: Vector2Simple = { x: tileCenterOffset.x + txEnd, y: tileCenterOffset.y + tyEnd }; - - const graphics = this.scene.add.graphics(); - color.random(50); - graphics.lineStyle(1, color.color, 1); - graphics.lineBetween(worldStart.x, worldStart.y, worldEnd.x, worldEnd.y); - - // minus 1 because we're starting for loops from top of the layer (+1 tile width and height) - graphics.depth = ManualTilesHelper.getDepth({ x: x - 1, y: y - 1 }, tileCenterOffset, layer); - - group.add(graphics); - } - } - } -} diff --git a/apps/client/src/app/probable-waffle/game/world/map/tile/manual-tiles/manual-tiles.helper.ts b/apps/client/src/app/probable-waffle/game/world/map/tile/manual-tiles/manual-tiles.helper.ts index 979c3ee7..97550171 100644 --- a/apps/client/src/app/probable-waffle/game/world/map/tile/manual-tiles/manual-tiles.helper.ts +++ b/apps/client/src/app/probable-waffle/game/world/map/tile/manual-tiles/manual-tiles.helper.ts @@ -1,12 +1,12 @@ -import { MapDefinitions, MapSizeInfo, TileDefinitions } from '../../../const/map-size.info'; -import { SlopeDirection, TileIndexProperties, TileLayerProperties } from '../types/tile-types'; -import { TilemapHelper } from '../tilemap.helper'; -import { Vector2Simple } from '../../../../library/math/intersection'; -import { TilemapToAtlasMap } from '../../../scenes/grassland.scene'; -import { TilePlacementData, TileWorldData } from '../../../managers/controllers/input/tilemap/tilemap-input.handler'; -import { PossibleClickCoords } from '../../../managers/controllers/input/manual-tiles/manual-tile-input.handler'; -import { MapHelper } from '../map-helper'; -import { GameObjects, Geom, Scene } from 'phaser'; +import { MapDefinitions, MapSizeInfo, TileDefinitions } from "../../../const/map-size.info"; +import { SlopeDirection, TileIndexProperties, TileLayerProperties } from "../types/tile-types"; +import { TilemapHelper } from "../tilemap.helper"; +import { TilemapToAtlasMap } from "../../../scenes/grassland.scene"; +import { TilePlacementData, TileWorldData } from "../../../managers/controllers/input/tilemap/tilemap-input.handler"; +import { PossibleClickCoords } from "../../../managers/controllers/input/manual-tiles/manual-tile-input.handler"; +import { MapHelper } from "../map-helper"; +import { GameObjects, Geom, Scene } from "phaser"; +import { Vector2Simple } from "@fuzzy-waddle/api-interfaces"; export interface ManualTile extends TilePlacementWorldWithProperties { gameObjectImage: GameObjects.Image; @@ -50,15 +50,6 @@ export class ManualTilesHelper { this.mapHelper.manualLayers = layers; } - placeTilesOnLayer( - tilemapToAtlasMap: TilemapToAtlasMap[], - data: { tilePlacementData: TilePlacementData; tileIndexProperties: TileIndexProperties }[] - ): void { - data.forEach((d) => { - this.placeTileOnManualLayer(tilemapToAtlasMap, d.tilePlacementData, d.tileIndexProperties); - }); - } - placeTileOnManualLayer( tilemapToAtlasMap: TilemapToAtlasMap[], tilePlacementData: TilePlacementData, @@ -189,7 +180,7 @@ export class ManualTilesHelper { break; case SlopeDirection.NorthWest: case SlopeDirection.NorthEast: - throw new Error('Not implemented'); + throw new Error("Not implemented"); } if (manualRectangleInputInterceptor !== null) { this.applyPositionModifierToRectangleInputInterceptor(worldXY, manualRectangleInputInterceptor); diff --git a/apps/client/src/app/probable-waffle/game/world/map/tile/manual-tiles/tile-types.ts b/apps/client/src/app/probable-waffle/game/world/map/tile/manual-tiles/tile-types.ts deleted file mode 100644 index 834181f3..00000000 --- a/apps/client/src/app/probable-waffle/game/world/map/tile/manual-tiles/tile-types.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { TileFrame } from '../../../../../gui/game-interface/editor-drawer/atlas-loader.service'; -import { TileDefinitions } from '../../../const/map-size.info'; - -export class TileTypes { - static getWalkableHeight0(frameWithMeta: TileFrame): boolean { - return frameWithMeta.tileProperties.stepHeight === 0; - } - - static getWalkableWater(frameWithMeta: TileFrame): boolean { - return frameWithMeta.tileProperties.stepHeight === TileDefinitions.waterHeight; - } - - static getWalkableHeightBlock(frameWithMeta: TileFrame): boolean { - return ( - frameWithMeta.tileProperties.stepHeight !== undefined && - frameWithMeta.tileProperties.stepHeight !== null && - frameWithMeta.tileProperties.stepHeight > 0 && - frameWithMeta.tileProperties.slopeDir === undefined - ); - } - - static getWalkableSlopes(frameWithMeta: TileFrame): boolean { - return frameWithMeta.tileProperties.slopeDir !== undefined; - } - - static getOtherTiles(frameWithMeta: TileFrame): boolean { - return ( - !TileTypes.getWalkableHeight0(frameWithMeta) && - !TileTypes.getWalkableWater(frameWithMeta) && - !TileTypes.getWalkableHeightBlock(frameWithMeta) && - !TileTypes.getWalkableSlopes(frameWithMeta) - ); - } -} diff --git a/apps/client/src/app/probable-waffle/game/world/map/tile/map-helper.ts b/apps/client/src/app/probable-waffle/game/world/map/tile/map-helper.ts index 46b74669..7bc114fc 100644 --- a/apps/client/src/app/probable-waffle/game/world/map/tile/map-helper.ts +++ b/apps/client/src/app/probable-waffle/game/world/map/tile/map-helper.ts @@ -1,6 +1,6 @@ -import { TilemapToAtlasMap } from '../../scenes/grassland.scene'; -import { ManualTileLayer } from './manual-tiles/manual-tiles.helper'; -import { Tilemaps } from 'phaser'; +import { TilemapToAtlasMap } from "../../scenes/grassland.scene"; +import { ManualTileLayer } from "./manual-tiles/manual-tiles.helper"; +import { Tilemaps } from "phaser"; export class MapHelper { tilemapLayer!: Tilemaps.TilemapLayer; diff --git a/apps/client/src/app/probable-waffle/game/world/map/tile/map-properties-helper.ts b/apps/client/src/app/probable-waffle/game/world/map/tile/map-properties-helper.ts index 1f6fcc06..fbddd867 100644 --- a/apps/client/src/app/probable-waffle/game/world/map/tile/map-properties-helper.ts +++ b/apps/client/src/app/probable-waffle/game/world/map/tile/map-properties-helper.ts @@ -1,11 +1,14 @@ -import { MapDefinitions } from '../../const/map-size.info'; -import { TilePossibleProperties } from './types/tile-types'; -import { TilemapToAtlasMap } from '../../scenes/grassland.scene'; -import { MapHelper } from './map-helper'; -import { Textures } from 'phaser'; +import { MapDefinitions } from "../../const/map-size.info"; +import { TilePossibleProperties } from "./types/tile-types"; +import { TilemapToAtlasMap } from "../../scenes/grassland.scene"; +import { MapHelper } from "./map-helper"; +import { Textures } from "phaser"; export class MapPropertiesHelper { - constructor(private readonly mapHelper: MapHelper, private readonly textures: Textures.TextureManager) {} + constructor( + private readonly mapHelper: MapHelper, + private readonly textures: Textures.TextureManager + ) {} mapLayerTilesetsToAtlasesAndExtractProperties() { const tilesetAtlasNameMapper: TilemapToAtlasMap[] = []; @@ -20,7 +23,7 @@ export class MapPropertiesHelper { // push to array frames.forEach((frameName: string, i: number) => { // split frameName by "." and get 2 variables - const [imageName, imageSuffix] = frameName.split('.'); + const [imageName, imageSuffix] = frameName.split("."); const tileProperties = (tileset.tileProperties as TilePossibleProperties[])[i]; tilesetAtlasNameMapper.push({ imageName, imageSuffix, atlasName: tileset.name, tileProperties }); }); diff --git a/apps/client/src/app/probable-waffle/game/world/map/tile/tilemap.helper.ts b/apps/client/src/app/probable-waffle/game/world/map/tile/tilemap.helper.ts index d7465708..3dba0bc0 100644 --- a/apps/client/src/app/probable-waffle/game/world/map/tile/tilemap.helper.ts +++ b/apps/client/src/app/probable-waffle/game/world/map/tile/tilemap.helper.ts @@ -1,14 +1,16 @@ -import { MapDefinitions, MapSizeInfo } from '../../const/map-size.info'; -import { TileCenterOptions, TileIndexProperties, TilePossibleProperties } from './types/tile-types'; -import { Vector2Simple } from '../../../library/math/intersection'; -import { IsoHelper } from './iso-helper'; -import { TilePlacementData } from '../../managers/controllers/input/tilemap/tilemap-input.handler'; -import { SceneCommunicatorService } from '../../../../communicators/scene-communicator.service'; -import { MapHelper } from './map-helper'; -import { Scene, Tilemaps } from 'phaser'; +import { MapDefinitions, MapSizeInfo } from "../../const/map-size.info"; +import { TileCenterOptions, TileIndexProperties, TilePossibleProperties } from "./types/tile-types"; +import { IsoHelper } from "./iso-helper"; +import { TilePlacementData } from "../../managers/controllers/input/tilemap/tilemap-input.handler"; +import { MapHelper } from "./map-helper"; +import { Scene, Tilemaps } from "phaser"; +import { Vector2Simple } from "@fuzzy-waddle/api-interfaces"; export class TilemapHelper { - constructor(private readonly mapHelper: MapHelper, private readonly scene: Scene) {} + constructor( + private readonly mapHelper: MapHelper, + private readonly scene: Scene + ) {} static get tileCenterOffset(): number { // todo move to IsoHelper @@ -16,7 +18,7 @@ export class TilemapHelper { } private get nrTilesToReplace(): number { - return SceneCommunicatorService.tileEmitterNrSubject.getValue(); + return 0; // return Deprecated_SceneCommunicatorService.tileEmitterNrSubject.getValue(); } static adjustTileWorldWithVerticalOffset( @@ -54,7 +56,7 @@ export class TilemapHelper { createTilemap() { const createBlankLayer = false; // https://github.com/photonstorm/phaser/issues/6262 let tilemap: Tilemaps.Tilemap; - const tilemapWithLayers = (tilemap = this.scene.make.tilemap({ key: MapDefinitions.tilemapMapName })); + const tilemapWithLayers = (tilemap = this.scene.make.tilemap({ key: "MapDefinitions.tilemapMapName" })); if (createBlankLayer) { const mapData = new Tilemaps.MapData({ width: MapSizeInfo.info.width, @@ -75,7 +77,7 @@ export class TilemapHelper { let tilemapLayer: Tilemaps.TilemapLayer; if (createBlankLayer) { - tilemapLayer = tilemap.createBlankLayer('layer-blank-layer-0', tileSetImages) as Tilemaps.TilemapLayer; + tilemapLayer = tilemap.createBlankLayer("layer-blank-layer-0", tileSetImages) as Tilemaps.TilemapLayer; tilemapLayer.fill(1); // todo here mappedTilesetsToAtlasesWithProperties aren't set correctly - because different this.mapHelper.tilemapLayer is set and tilesets from it retrieved wrong } else { 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/map/vision/vision-info.ts b/apps/client/src/app/probable-waffle/game/world/map/vision/vision-info.ts index 81c4086d..9b2266d8 100644 --- a/apps/client/src/app/probable-waffle/game/world/map/vision/vision-info.ts +++ b/apps/client/src/app/probable-waffle/game/world/map/vision/vision-info.ts @@ -1,5 +1,5 @@ -import { VisionStateEnum } from './vision-state-enum'; -import { Actor } from '../../../entity/actor/actor'; +import { VisionStateEnum } from "./vision-state-enum"; +import { Actor } from "../../../entity/actor/actor"; export class VisionInfo { visibleTiles: Phaser.Math.Vector3[] = []; diff --git a/apps/client/src/app/probable-waffle/game/world/map/vision/vision-manager.ts b/apps/client/src/app/probable-waffle/game/world/map/vision/vision-manager.ts index f52a9bb9..95ea5652 100644 --- a/apps/client/src/app/probable-waffle/game/world/map/vision/vision-manager.ts +++ b/apps/client/src/app/probable-waffle/game/world/map/vision/vision-manager.ts @@ -1,5 +1,5 @@ -import { VisionInfo } from './vision-info'; -import { Actor } from '../../../entity/actor/actor'; +import { VisionInfo } from "./vision-info"; +import { Actor } from "../../../entity/actor/actor"; export class VisionManager { private visionInfo?: VisionInfo; 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..603983e2 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 @@ -1,16 +1,10 @@ -import { Scenes } from "./scenes"; -import { - AtlasEmitValue, - GameObjectSelection, - 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"; -import { MultiSelectionHandler } from "../managers/controllers/input/multi-selection.handler"; +import { DEPRECATED_multiSelectionHandler } from "../managers/controllers/input/DEPRECATED_multi-selection.handler"; import { Subscription } from "rxjs"; import { TilemapHelper } from "../map/tile/tilemap.helper"; import { Pathfinder } from "../map/pathfinder"; @@ -21,10 +15,8 @@ import { } from "../managers/controllers/input/manual-tiles/manual-tile-input.handler"; import { ManualTile, ManualTilesHelper } from "../map/tile/manual-tiles/manual-tiles.helper"; import { TileIndexProperties, TilePossibleProperties } from "../map/tile/types/tile-types"; -import { Vector2Simple } from "../../library/math/intersection"; import { MapPropertiesHelper } from "../map/tile/map-properties-helper"; import { MapHelper } from "../map/tile/map-helper"; -import { LayerLines } from "../map/tile/layer-lines"; import { StaticObjectHelper } from "../../entity/placable-objects/static-object"; import { DynamicObjectHelper } from "../../entity/placable-objects/dynamic-object"; import { MapNavHelper } from "../map/map-nav-helper"; @@ -38,7 +30,6 @@ import { SpriteRepresentationComponent } from "../../entity/actor/components/spr import { PlayerController } from "../managers/controllers/player-controller"; import { Barracks } from "../../entity/assets/buildings/barracks"; import { PlayerResourcesComponent } from "../managers/controllers/player-resources-component"; -import { Resources, ResourceType } from "../../entity/economy/resource/resource-type"; import { TownHall } from "../../entity/assets/buildings/town-hall"; import { Minerals } from "../../entity/assets/resources/minerals"; import { Worker } from "../../entity/assets/characters/worker"; @@ -49,6 +40,7 @@ import { GathererComponent } from "../../entity/actor/components/gatherer-compon import { HealthComponent } from "../../entity/combat/components/health-component"; import { DamageTypes } from "../../entity/combat/damage-types"; import { BuilderComponent } from "../../entity/actor/components/builder-component"; +import { Resources, ResourceTypeDefinition, Vector2Simple } from "@fuzzy-waddle/api-interfaces"; export interface TilemapToAtlasMap { imageSuffix: string | null; @@ -58,12 +50,12 @@ 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; - private multiSelectionHandler!: MultiSelectionHandler; + private multiSelectionHandler!: DEPRECATED_multiSelectionHandler; private tilemapHelper!: TilemapHelper; private manualTilesHelper!: ManualTilesHelper; private staticObjectHelper!: StaticObjectHelper; @@ -80,14 +72,13 @@ export class GrasslandScene extends Scene implements CreateSceneFromObjectConfig private manualTileSelectedSub!: Subscription; private onEditorTileSelectedSub!: Subscription; private tileToBeReplaced: number | null = null; // todo should be moved - private editorLayerNr = SceneCommunicatorService.DEFAULT_LAYER; + private editorLayerNr = Deprecated_SceneCommunicatorService.DEFAULT_LAYER; private selected: Actor[] = []; private atlasToBePlaced: AtlasEmitValue | null = null; private warningText: GameObjects.Text | null = null; private mapPropertiesHelper!: MapPropertiesHelper; private mapHelper!: MapHelper; private gameObjectsHelper!: GameObjectsHelper; - private layerLines!: LayerLines; private playerNumber = 1; // todo private mapNavHelper!: MapNavHelper; private warriorGroup: RepresentableActor[] = []; @@ -96,7 +87,7 @@ export class GrasslandScene extends Scene implements CreateSceneFromObjectConfig private playerController!: PlayerController; // todo temp constructor() { - super({ key: Scenes.GrasslandScene }); + super({ key: "GrasslandScene" }); } init(data: unknown) { @@ -104,30 +95,6 @@ export class GrasslandScene extends Scene implements CreateSceneFromObjectConfig } preload() { - this.load.atlas( - MapDefinitions.atlasBuildings + MapDefinitions.atlasSuffix, - `assets/probable-waffle/atlas/${MapDefinitions.atlasBuildings}.png`, - `assets/probable-waffle/atlas/${MapDefinitions.atlasBuildings}.json` - ); - this.load.atlas( - MapDefinitions.atlasCharacters + MapDefinitions.atlasSuffix, - `assets/probable-waffle/atlas/${MapDefinitions.atlasCharacters}.png`, - `assets/probable-waffle/atlas/${MapDefinitions.atlasCharacters}.json` - ); - - MapDefinitions.mapAtlases.forEach((atlas) => { - // used by this.scene.add.image(... - this.load.atlas( - `${atlas}${MapDefinitions.atlasSuffix}`, - `assets/probable-waffle/atlas/${atlas}.png`, - `assets/probable-waffle/atlas/${atlas}.json` - ); - // used by addTilesetImage - this.load.image(atlas, `assets/probable-waffle/atlas/${atlas}.png`); - }); - - this.load.tilemapTiledJSON(MapDefinitions.tilemapMapName, MapDefinitions.tilemapMapJson); - this.load.spritesheet( WarriorDefinition.textureMapDefinition.textureName, "assets/probable-waffle/spritesheets/" + @@ -164,7 +131,6 @@ export class GrasslandScene extends Scene implements CreateSceneFromObjectConfig this.manualTilesHelper = new ManualTilesHelper(this.mapHelper, this, this.tilemapHelper); this.staticObjectHelper = new StaticObjectHelper(this.gameObjectsHelper, this); this.dynamicObjectHelper = new DynamicObjectHelper(this.gameObjectsHelper, this); - this.layerLines = new LayerLines(this); this.pathfinder = new Pathfinder(this); this.bindSceneCommunicator(); @@ -177,9 +143,9 @@ 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.cursorHandler = new CursorHandler(this.input); + this.scaleHandler = new DEPRECATED_scaleHandler(this.cameras, this.scale); + this.inputHandler = new DEPRECATED_inputHandler(this.input, this.cameras.main); + this.cursorHandler = new CursorHandler(this); this.tilemapInputHandler = new TilemapInputHandler(this.mapHelper.tilemapLayer); this.manualTileInputHandler = new ManualTileInputHandler(this, this.mapHelper.manualLayers); this.mapNavHelper = new MapNavHelper( @@ -189,7 +155,7 @@ export class GrasslandScene extends Scene implements CreateSceneFromObjectConfig this.manualTileInputHandler ); this.navInputHandler = new NavInputHandler(this, this.pathfinder, this.mapNavHelper); - this.multiSelectionHandler = new MultiSelectionHandler(this, this.input, this.cameras.main); + this.multiSelectionHandler = new DEPRECATED_multiSelectionHandler(this, this.input, this.cameras.main); this.minimapTextureHelper = new MinimapTextureHelper(this); this.subscribeToSelectionEvents(); @@ -200,9 +166,7 @@ export class GrasslandScene extends Scene implements CreateSceneFromObjectConfig // this.minimapTextureHelper.createRenderTexture(); // todo temp // placing objects on map - this.placeAdditionalItemsOnManualLayers(); - this.placeRawSpriteStaticObjectsOnMap(); - this.placeRawSpriteDynamicObjectsOnMap(); + this.placeActors(); } override update(time: number, delta: number) { @@ -304,42 +268,14 @@ export class GrasslandScene extends Scene implements CreateSceneFromObjectConfig private deselectPlacementInEditor() { // deselect in editor if (this.atlasToBePlaced) { - SceneCommunicatorService.atlasEmitterSubject.next(null); + Deprecated_SceneCommunicatorService.atlasEmitterSubject.next(null); } // deselect in editor if (this.tileToBeReplaced) { - SceneCommunicatorService.tileEmitterSubject.next(null); + Deprecated_SceneCommunicatorService.tileEmitterSubject.next(null); } } - private placeAdditionalItemsOnManualLayers(): void { - const buildingCubeIndex = 137; - const buildingStairsSouthWestIndex = 191; - const buildingStairsSouthEastIndex = 192; - const waterIndex = 63; - this.manualTilesHelper.placeTilesOnLayer(this.mapHelper.mappedTilesetsToAtlasesWithProperties, [ - { tilePlacementData: { tileXY: { x: 3, y: 7 }, z: 0 }, tileIndexProperties: { tileIndex: buildingCubeIndex } }, - { tilePlacementData: { tileXY: { x: 5, y: 4 }, z: 0 }, tileIndexProperties: { tileIndex: buildingCubeIndex } }, - { tilePlacementData: { tileXY: { x: 6, y: 4 }, z: 0 }, tileIndexProperties: { tileIndex: buildingCubeIndex } }, - { - tilePlacementData: { tileXY: { x: 7, y: 4 }, z: 0 }, - tileIndexProperties: { tileIndex: buildingStairsSouthEastIndex } - }, - { - tilePlacementData: { tileXY: { x: 4, y: 6 }, z: 0 }, - tileIndexProperties: { tileIndex: buildingStairsSouthWestIndex } - }, - { tilePlacementData: { tileXY: { x: 0, y: 2 }, z: 0 }, tileIndexProperties: { tileIndex: waterIndex } }, - - // layer 1 - { tilePlacementData: { tileXY: { x: 5, y: 4 }, z: 1 }, tileIndexProperties: { tileIndex: buildingCubeIndex } }, - { - tilePlacementData: { tileXY: { x: 6, y: 4 }, z: 1 }, - tileIndexProperties: { tileIndex: buildingStairsSouthEastIndex } - } - ]); - } - private destroyListener() { this.events.on(Phaser.Scenes.Events.SHUTDOWN, () => { this.scale.off(Scale.Events.RESIZE); @@ -352,7 +288,6 @@ export class GrasslandScene extends Scene implements CreateSceneFromObjectConfig this.inputHandler.destroy(); this.navInputHandler.destroy(); this.scaleHandler.destroy(); - this.cursorHandler.destroy(); this.tilemapInputHandler.destroy(); this.manualTileInputHandler.destroy(); this.multiSelectionHandler.destroy(); @@ -406,7 +341,7 @@ export class GrasslandScene extends Scene implements CreateSceneFromObjectConfig const gameObjectSelection: GameObjectSelection[] = this.selected.map((s) => ({ name: s.name })); - SceneCommunicatorService.selectionChangedSubject.next(gameObjectSelection); // todo + Deprecated_SceneCommunicatorService.selectionChangedSubject.next(gameObjectSelection); // todo }); } @@ -461,60 +396,27 @@ export class GrasslandScene extends Scene implements CreateSceneFromObjectConfig } private bindSceneCommunicator() { - SceneCommunicatorService.addSubscription( - SceneCommunicatorService.tileEmitterSubject.subscribe((tileNr) => { + Deprecated_SceneCommunicatorService.addSubscription( + Deprecated_SceneCommunicatorService.tileEmitterSubject.subscribe((tileNr) => { this.tileToBeReplaced = tileNr; this.atlasToBePlaced = null; // stop placing atlas this.selected = []; - this.conditionallyDrawLayerLines(); }), - SceneCommunicatorService.layerEmitterSubject.subscribe((layerNr) => { + Deprecated_SceneCommunicatorService.layerEmitterSubject.subscribe((layerNr) => { this.editorLayerNr = layerNr; - this.conditionallyDrawLayerLines(); }), - SceneCommunicatorService.atlasEmitterSubject.subscribe((atlas) => { + Deprecated_SceneCommunicatorService.atlasEmitterSubject.subscribe((atlas) => { this.atlasToBePlaced = atlas; this.tileToBeReplaced = null; // stop placing tile this.selected = []; - this.conditionallyDrawLayerLines(); }) ); } - private conditionallyDrawLayerLines() { - if (this.tileToBeReplaced === null && this.atlasToBePlaced === null) return; - this.layerLines.drawLayerLines(this.editorLayerNr); - } - - private placeRawSpriteStaticObjectsOnMap(): void { - this.staticObjectHelper.placeRawSpriteObjectsOnMap([ - // { - // tilePlacementData: { tileXY: { x: 5, y: 4 }, z: 1 }, - // placeableObjectProperties: { - // placeableAtlasProperties: { - // texture: 'house1', - // frame: 'house1_1' - // } - // } - // } - ]); - } - - private placeRawSpriteDynamicObjectsOnMap() { - this.dynamicObjectHelper.placeRawSpriteObjectsOnMap([ - // { - // tilePlacementData: { tileXY: { x: 1, y: 1 }, z: 0 }, - // placeableObjectProperties: { - // placeableAtlasProperties: { - // texture: MapDefinitions.atlasCharacters + MapDefinitions.atlasSuffix, - // frame: Warrior.textureName - // } - // } - // } - ]); + private placeActors() { this.playerController = new PlayerController(); // todo temp this.playerController.components.findComponent(PlayerResourcesComponent).addResources( - new Map([ + new Map([ [Resources.ambrosia, 5000], [Resources.stone, 5000], [Resources.wood, 5000], @@ -542,26 +444,15 @@ export class GrasslandScene extends Scene implements CreateSceneFromObjectConfig resourceSource.extractResources(worker, 10); // todo where to get this value from const resourceDrain = townHall.components.findComponent(ResourceDrainComponent); const gatherer = worker.components.findComponent(GathererComponent); - resourceDrain.returnResources(worker, gatherer.carriedResourceType as ResourceType, gatherer.carriedResourceAmount); + resourceDrain.returnResources( + worker, + gatherer.carriedResourceType as ResourceTypeDefinition, + gatherer.carriedResourceAmount + ); const builderComponent = worker.components.findComponent(BuilderComponent); // todo not working yet because gameMode doesn't have scene defined yet! - for spawnActorForPlayer builderComponent.beginConstruction(Barracks, { tileXY: { x: 1, y: 3 }, z: 0 }); - - // todo this.demoPlaceWarriors(); - } - - private demoPlaceWarriors() { - let i = 0; - this.mapHelper.tilemapLayer.forEachTile((tile) => { - if (tile.index === -1) return; - if (i < 50) { - this.placeWarrior({ tileXY: { x: tile.x, y: tile.y }, z: 0 }); - } - - i++; - }); - console.log("placed " + i + " warriors"); } private placeWarrior(tilePlacementData: TilePlacementData) { diff --git a/apps/client/src/app/probable-waffle/game/world/scenes/playground.scene.ts b/apps/client/src/app/probable-waffle/game/world/scenes/playground.scene.ts deleted file mode 100644 index cad1c534..00000000 --- a/apps/client/src/app/probable-waffle/game/world/scenes/playground.scene.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Scenes } from './scenes'; -import { CreateSceneFromObjectConfig } from '../../../../shared/game/phaser/scene/scene-config.interface'; -import { Scene } from 'phaser'; - -export class PlaygroundScene extends Scene implements CreateSceneFromObjectConfig { - constructor() { - super({ key: Scenes.PlaygroundScene }); - } - - preload() { - // pass - } - - create() { - // pass - } -} diff --git a/apps/client/src/app/probable-waffle/game/world/scenes/scenes.ts b/apps/client/src/app/probable-waffle/game/world/scenes/scenes.ts deleted file mode 100644 index cc7b96ba..00000000 --- a/apps/client/src/app/probable-waffle/game/world/scenes/scenes.ts +++ /dev/null @@ -1,85 +0,0 @@ -import { TilePlacementData } from '../managers/controllers/input/tilemap/tilemap-input.handler'; - -export enum Scenes { - 'GrasslandScene' = 'GrasslandScene', - 'PlaygroundScene' = 'PlaygroundScene' -} - -export enum MapIds { - 'GrasslandSmall' = 'GrasslandSmall', - 'GrasslandLarge' = 'GrasslandLarge', - 'GrasslandExtraLarge' = 'GrasslandExtraLarge', - 'GrasslandExtraExtraLarge' = 'GrasslandExtraExtraLarge' -} - -export type MapInfo = { - id: MapIds; - name: string; - description: string; - image: string; - startPositions: TilePlacementData[]; - mapWidth: number; - mapHeight: number; -}; - -export class Maps { - static readonly maps: MapInfo[] = [ - { - id: MapIds.GrasslandSmall, - name: 'Grassland', - description: - 'Engage in intense skirmishes on a compact grassland map, where every move counts. Limited resources and tight quarters demand cunning tactics in this RTS arena.', - image: 'start-small.png', - startPositions: [ - { tileXY: { x: 2, y: 2 }, z: 0 }, - { tileXY: { x: 6, y: 9 }, z: 0 } - ], - mapWidth: 10, - mapHeight: 10 - }, - { - id: MapIds.GrasslandLarge, - name: 'Grassland Large', - description: - 'Explore a sprawling grassland teeming with resources and potential pitfalls. Navigate strategic chokepoints to outmaneuver your foes and secure victory in this RTS battleground.', - image: 'start-large.png', - startPositions: [ - { tileXY: { x: 20, y: 20 }, z: 0 }, - { tileXY: { x: 80, y: 80 }, z: 0 }, - { tileXY: { x: 20, y: 80 }, z: 0 }, - { tileXY: { x: 80, y: 20 }, z: 0 } - ], - mapWidth: 100, - mapHeight: 100 - }, - { - id: MapIds.GrasslandExtraLarge, - name: 'Grassland Extra Large', - description: - 'The RTS extra large map is a visually stunning game environment that immerses players in an expansive terrain covered in lush grass. It offers ample space for strategic gameplay, allowing players to build their base and engage in battles while taking advantage of the natural cover provided by the grass.', - image: 'start-extra-large.png', - startPositions: [ - { tileXY: { x: 20, y: 20 }, z: 0 }, - { tileXY: { x: 180, y: 180 }, z: 0 }, - { tileXY: { x: 20, y: 180 }, z: 0 }, - { tileXY: { x: 180, y: 20 }, z: 0 } - ], - mapWidth: 200, - mapHeight: 200 - }, - { - id: MapIds.GrasslandExtraExtraLarge, - name: 'Grassland Extra Extra Large', - description: 'Largest map for performance testing', - image: 'start-extra-large.png', - startPositions: [ - { tileXY: { x: 20, y: 20 }, z: 0 }, - { tileXY: { x: 480, y: 480 }, z: 0 }, - { tileXY: { x: 20, y: 480 }, z: 0 }, - { tileXY: { x: 480, y: 20 }, z: 0 } - ], - mapWidth: 500, - mapHeight: 500 - } - ]; -} 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..30de8c01 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/campaign/campaign.component.spec.ts b/apps/client/src/app/probable-waffle/gui/campaign/campaign.component.spec.ts index cacbef02..abf5c040 100644 --- a/apps/client/src/app/probable-waffle/gui/campaign/campaign.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/campaign/campaign.component.spec.ts @@ -1,25 +1,37 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { CampaignComponent } from './campaign.component'; -import { provideRouter } from '@angular/router'; -import { HomeNavTestingComponent } from '../../../shared/components/home-nav/home-nav.component.spec'; +import { CampaignComponent } from "./campaign.component"; +import { provideRouter } from "@angular/router"; +import { HomeNavTestingComponent } from "../../../shared/components/home-nav/home-nav.component.spec"; +import { ComingSoonComponent } from "../coming-soon/coming-soon.component"; +import { HomeNavComponent } from "../../../shared/components/home-nav/home-nav.component"; +import { RouterTestingModule } from "@angular/router/testing"; -describe('CampaignComponent', () => { +describe("CampaignComponent", () => { let component: CampaignComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [CampaignComponent, HomeNavTestingComponent], + imports: [CampaignComponent, ComingSoonComponent, RouterTestingModule], providers: [provideRouter([])] - }).compileComponents(); + }) + .overrideComponent(CampaignComponent, { + remove: { + imports: [HomeNavComponent] + }, + add: { + imports: [HomeNavTestingComponent] + } + }) + .compileComponents(); fixture = TestBed.createComponent(CampaignComponent); component = fixture.componentInstance; fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/probable-waffle/gui/campaign/campaign.component.ts b/apps/client/src/app/probable-waffle/gui/campaign/campaign.component.ts index ea210c23..f2f134fc 100644 --- a/apps/client/src/app/probable-waffle/gui/campaign/campaign.component.ts +++ b/apps/client/src/app/probable-waffle/gui/campaign/campaign.component.ts @@ -1,8 +1,13 @@ -import { Component } from '@angular/core'; +import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { HomeNavComponent } from "../../../shared/components/home-nav/home-nav.component"; +import { ComingSoonComponent } from "../coming-soon/coming-soon.component"; @Component({ - selector: 'fuzzy-waddle-campaign', - templateUrl: './campaign.component.html', - styleUrls: ['./campaign.component.scss'] + selector: "fuzzy-waddle-campaign", + templateUrl: "./campaign.component.html", + styleUrls: ["./campaign.component.scss"], + standalone: true, + imports: [CommonModule, HomeNavComponent, ComingSoonComponent] }) export class CampaignComponent {} diff --git a/apps/client/src/app/probable-waffle/gui/coming-soon/coming-soon.component.html b/apps/client/src/app/probable-waffle/gui/coming-soon/coming-soon.component.html new file mode 100644 index 00000000..e2d59acf --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/coming-soon/coming-soon.component.html @@ -0,0 +1,7 @@ +
    +
    +
    +

    Coming Soon

    +
    +
    +
    diff --git a/apps/client/src/app/probable-waffle/gui/coming-soon/coming-soon.component.spec.ts b/apps/client/src/app/probable-waffle/gui/coming-soon/coming-soon.component.spec.ts new file mode 100644 index 00000000..9c8f59e9 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/coming-soon/coming-soon.component.spec.ts @@ -0,0 +1,22 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; + +import { ComingSoonComponent } from "./coming-soon.component"; + +describe("ComingSoonComponent", () => { + let component: ComingSoonComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ComingSoonComponent] + }).compileComponents(); + + fixture = TestBed.createComponent(ComingSoonComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/coming-soon/coming-soon.component.ts b/apps/client/src/app/probable-waffle/gui/coming-soon/coming-soon.component.ts new file mode 100644 index 00000000..cb41be79 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/coming-soon/coming-soon.component.ts @@ -0,0 +1,11 @@ +import { ChangeDetectionStrategy, Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; + +@Component({ + selector: "coming-soon", + templateUrl: "./coming-soon.component.html", + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: true, + imports: [CommonModule] +}) +export class ComingSoonComponent {} 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/editor-drawer/atlas-display/atlas-display.component.html b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/atlas-display/atlas-display.component.html deleted file mode 100644 index a1a1add3..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/atlas-display/atlas-display.component.html +++ /dev/null @@ -1,24 +0,0 @@ -
    {{ fileName }}
    - - -
    -
    -
    diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/atlas-display/atlas-display.component.spec.ts b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/atlas-display/atlas-display.component.spec.ts deleted file mode 100644 index bff7c685..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/atlas-display/atlas-display.component.spec.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { AtlasDisplayComponent } from './atlas-display.component'; -import { MapDefinitions } from '../../../../game/world/const/map-size.info'; -import { Component, Input } from '@angular/core'; -import { AtlasFrame } from '../atlas-loader.service'; - -@Component({ selector: 'fuzzy-waddle-atlas-display', template: '' }) -export class AtlasDisplayTestingComponent { - @Input({ required: true }) atlasFrame!: AtlasFrame; - @Input({ required: true }) textureName!: string; -} - -describe('AtlasDisplayComponent', () => { - let component: AtlasDisplayComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [AtlasDisplayComponent] - }).compileComponents(); - - fixture = TestBed.createComponent(AtlasDisplayComponent); - component = fixture.componentInstance; - component.atlasFrame = { - filename: 'cube-1.png', - frame: { - y: 0, - x: 0, - w: 0, - h: 0 - } - }; - component.textureName = MapDefinitions.atlasOutside; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/atlas-display/atlas-display.component.ts b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/atlas-display/atlas-display.component.ts deleted file mode 100644 index be6b4c05..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/atlas-display/atlas-display.component.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { AtlasFrame } from '../atlas-loader.service'; - -@Component({ - selector: 'fuzzy-waddle-atlas-display', - templateUrl: './atlas-display.component.html', - styleUrls: ['./atlas-display.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class AtlasDisplayComponent { - displaySize = 64; - @Input({ required: true }) atlasFrame!: AtlasFrame; - src: string | null = null; - - private _textureName!: string; - - @Input({ required: true }) - set textureName(value: string) { - this._textureName = value; - this.src = `assets/probable-waffle/atlas/${this._textureName}.png`; - } - - get fileName(): string { - let fileName = this.atlasFrame.filename; - if (fileName.includes('.')) { - // remove extension - fileName = this.atlasFrame.filename.split('.').slice(0, -1).join('.'); - } - - fileName = fileName.replace(/[_-]/g, ' '); - - return fileName; - } - - get scale(): number { - return Math.min(this.displaySize / this.atlasFrame.frame.w, this.displaySize / this.atlasFrame.frame.h); - } - - getTranslateX(): number { - const width = this.atlasFrame.frame.w * this.scale; - return (this.displaySize - width) / 2; - } - - getTranslateY(): number { - const height = this.atlasFrame.frame.h * this.scale; - return (this.displaySize - height) / 2; - } -} diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/atlas-loader.service.spec.ts b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/atlas-loader.service.spec.ts deleted file mode 100644 index 25d4040a..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/atlas-loader.service.spec.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { TestBed } from "@angular/core/testing"; - -import { AtlasJsonWrapper, AtlasLoaderService, TileAtlasFrame } from "./atlas-loader.service"; -import { HttpClientTestingModule } from "@angular/common/http/testing"; -import { AtlasLoaderServiceInterface } from "./tile-selector-group/atlas-loader.service.interface"; - -export const atlasLoaderServiceStub = { - loadMap: (): Promise => { - return Promise.resolve([]); - }, - loadAtlasJson: (tilesetName: string): Promise => { - return Promise.resolve({} as AtlasJsonWrapper); - } -} satisfies AtlasLoaderServiceInterface; - -describe("AtlasLoaderService", () => { - let service: AtlasLoaderService; - - beforeEach(() => { - TestBed.configureTestingModule({ imports: [HttpClientTestingModule] }); - service = TestBed.inject(AtlasLoaderService); - }); - - it("should be created", () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/atlas-loader.service.ts b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/atlas-loader.service.ts deleted file mode 100644 index 176469c9..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/atlas-loader.service.ts +++ /dev/null @@ -1,121 +0,0 @@ -import { Injectable } from "@angular/core"; -import { HttpClient } from "@angular/common/http"; -import { firstValueFrom } from "rxjs"; -import { MapDefinitions } from "../../../game/world/const/map-size.info"; -import { TilePossibleProperties } from "../../../game/world/map/tile/types/tile-types"; -import { AtlasLoaderServiceInterface } from "./tile-selector-group/atlas-loader.service.interface"; - -export interface TileAtlasFrame { - tilesetName: string; - firstgid: number; // with what index does this tileset start - tileFrame: TileFrame[]; -} - -export interface AtlasFrame { - filename: string; - frame: Frame; -} - -export interface TileFrame extends AtlasFrame { - id: number; - tileProperties: TilePossibleProperties; -} - -interface Frame { - x: number; - y: number; - w: number; - h: number; -} - -export interface Atlas { - frames: AtlasFrame[]; - meta: unknown; -} - -interface TileProperties { - name: string; - type: string; - value: string; -} - -interface Tile { - id: number; - properties: TileProperties[]; -} - -interface Tileset { - name: string; - firstgid: number; - tilecount: number; - tiles: Tile[]; -} - -interface MapJson { - layers: unknown[]; - tilesets: Tileset[]; -} - -export interface AtlasJsonWrapper { - tilesetName: string; - atlas: Atlas; -} - -@Injectable({ - providedIn: "root" -}) -export class AtlasLoaderService implements AtlasLoaderServiceInterface { - constructor(private httpClient: HttpClient) {} - - /** - * Todo it'd be better to use loaded jsons from game reference - */ - async loadMap(): Promise { - const mapJson = await this.loadMapJson(); - const promises = mapJson.tilesets.map(async (tileset) => { - const atlasJson = await this.loadAtlasJson(tileset.name); - - return { - tilesetName: tileset.name, - firstgid: tileset.firstgid, - tileFrame: this.extractTileFrames(tileset, atlasJson.atlas) - } satisfies TileAtlasFrame; - }); - return Promise.all(promises); - } - - async loadAtlasJson(tilesetName: string): Promise { - return { - tilesetName, - atlas: await firstValueFrom(this.httpClient.get(`assets/probable-waffle/atlas/${tilesetName}.json`)) - }; - } - - private loadMapJson(): Promise { - return firstValueFrom(this.httpClient.get(MapDefinitions.tilemapMapJson)); - } - - private extractTileFrames(tileset: Tileset, atlas: Atlas): TileFrame[] { - const filteredFrames: TileFrame[] = []; - tileset.tiles.forEach((tile) => { - const tileFrame = atlas.frames[tile.id]; - filteredFrames.push({ - ...tileFrame, - id: tile.id + tileset.firstgid, - tileProperties: this.extractTileProperties(tile) - }); - }); - return filteredFrames; - } - - /** - * convert tile properties to TilePossibleProperties dictionary - */ - private extractTileProperties(tile: Tile): TilePossibleProperties { - const tileProperties: TilePossibleProperties = {}; - tile.properties.forEach((property) => { - tileProperties[property.name as keyof TilePossibleProperties] = property.value as any; - }); - return tileProperties; - } -} diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/editor-drawer.component.html b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/editor-drawer.component.html deleted file mode 100644 index 76b9256f..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/editor-drawer.component.html +++ /dev/null @@ -1,76 +0,0 @@ -
    - - -
    Are you sure you wish to leave?
    -     - - - - - -
    Selection
    -
    Current layer:
    - -
    Replace tile nr:
    - - -
    Tiles
    - - -     - - -
    Sprites
    -
    -
    {{ spriteAtlas.tilesetName }}
    -
    - -
    -
    -     -
    diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/editor-drawer.component.scss b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/editor-drawer.component.scss deleted file mode 100644 index fa53411e..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/editor-drawer.component.scss +++ /dev/null @@ -1,23 +0,0 @@ -.atlas-map-scroll-selector { - min-height: 100px; - max-height: 300px; - overflow-y: scroll; - - button { - width: 100%; - } -} - -.extra-margin { - margin-top: 10px; -} - -.selected { - background-color: darkgrey; -} - -.atlas-map-scroll-title { - font-size: 1.2em; - font-weight: bold; - margin-bottom: 10px; -} diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/editor-drawer.component.spec.ts b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/editor-drawer.component.spec.ts deleted file mode 100644 index b36ee4fc..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/editor-drawer.component.spec.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { EditorDrawerComponent } from './editor-drawer.component'; -import { ActivatedRoute, provideRouter } from '@angular/router'; -import { of } from 'rxjs'; -import { SceneCommunicatorService } from '../../../communicators/scene-communicator.service'; -import { TileSelectorGroupTestingComponent } from './tile-selector-group/tile-selector-group.component.spec'; -import { AtlasLoaderService } from './atlas-loader.service'; -import { ModalTestComponent } from '../../../../shared/components/modal/modal.component.spec'; -import { atlasLoaderServiceStub } from './atlas-loader.service.spec'; -import { Component } from '@angular/core'; - -@Component({ selector: 'probable-waffle-editor-drawer', template: '' }) -export class EditorDrawerTestingComponent {} - -describe('EditorDrawerComponent', () => { - let component: EditorDrawerComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [EditorDrawerComponent, TileSelectorGroupTestingComponent, ModalTestComponent], - providers: [ - provideRouter([]), - { - provide: ActivatedRoute, - useValue: { - params: of({ id: 123 }) // todo needs to be changed later - } - }, - { - provide: AtlasLoaderService, - useValue: atlasLoaderServiceStub - } - ] - }).compileComponents(); - - fixture = TestBed.createComponent(EditorDrawerComponent); - component = fixture.componentInstance; - SceneCommunicatorService.setup(); - fixture.detectChanges(); - }); - - afterAll(() => { - SceneCommunicatorService.unsubscribe(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/editor-drawer.component.ts b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/editor-drawer.component.ts deleted file mode 100644 index cfe4948f..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/editor-drawer.component.ts +++ /dev/null @@ -1,118 +0,0 @@ -import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { SceneCommunicatorService } from '../../../communicators/scene-communicator.service'; -import { ActivatedRoute, Router } from '@angular/router'; -import { AtlasFrame, AtlasJsonWrapper, AtlasLoaderService, TileAtlasFrame, TileFrame } from './atlas-loader.service'; -import { MapDefinitions } from '../../../game/world/const/map-size.info'; -import { TileTypes } from '../../../game/world/map/tile/manual-tiles/tile-types'; -import { Subscription } from 'rxjs'; -import { ModalConfig } from '../../../../shared/components/modal/modal-config'; -import { ModalComponent } from '../../../../shared/components/modal/modal.component'; - -type TileType = 'flat' | 'water' | 'slopes' | 'blocks' | 'other'; - -@Component({ - selector: 'probable-waffle-editor-drawer', - templateUrl: './editor-drawer.component.html', - styleUrls: ['./editor-drawer.component.scss'] -}) -export class EditorDrawerComponent implements OnInit, OnDestroy { - editorVisible = false; - showObjectPlacement = false; - MapDefinitions = MapDefinitions; - nrReplacedTiles = SceneCommunicatorService.DEFAULT_TILE_REPLACE; - layerNr = SceneCommunicatorService.DEFAULT_LAYER; - tileAtlasFrames: TileAtlasFrame[] | null = null; - spriteAtlases: AtlasJsonWrapper[] | null = null; - - tileTypes: { tileType: TileType; fn: (frameWithMeta: TileFrame) => boolean }[] = [ - { tileType: 'flat', fn: TileTypes.getWalkableHeight0 }, - { tileType: 'water', fn: TileTypes.getWalkableWater }, - { tileType: 'slopes', fn: TileTypes.getWalkableSlopes }, - { tileType: 'blocks', fn: TileTypes.getWalkableHeightBlock }, - { tileType: 'other', fn: TileTypes.getOtherTiles } - ]; - selectedType: { tileType: TileType; fn: (frameWithMeta: TileFrame) => boolean }; - selectedAtlas: AtlasFrame | null = null; - selectedTile: number | null = null; - leaveModalConfirm: ModalConfig = { - modalTitle: 'Leave the game?', - dismissButtonLabel: 'Continue', - closeButtonLabel: 'Leave', - onClose: async () => await this.router.navigate(['probable-waffle/skirmish']) // todo - }; - private emitterSubjectSubscription?: Subscription; - private atlasEmitterSubscription?: Subscription; - @ViewChild('modal') private modalComponent!: ModalComponent; - - constructor(private route: ActivatedRoute, private router: Router, private atlasLoaderService: AtlasLoaderService) { - this.selectedType = this.tileTypes[0]; - } - - async openModal() { - return await this.modalComponent.open(); - } - - async ngOnInit(): Promise { - await Promise.all([this.loadMapAtlas(), this.loadSpriteAtlases()]); - this.listenToSelectionEvents(); - } - - removeTile() { - SceneCommunicatorService.tileEmitterSubject.next(-1); - } - - selectAtlas(tilesetName: string, atlasFrame: AtlasFrame) { - SceneCommunicatorService.atlasEmitterSubject.next({ tilesetName, atlasFrame }); - } - - nrReplacedTilesChanged() { - SceneCommunicatorService.tileEmitterNrSubject.next(this.nrReplacedTiles); - } - - layerNrChanged() { - SceneCommunicatorService.layerEmitterSubject.next(this.layerNr); - } - - async loadMapAtlas() { - this.tileAtlasFrames = await this.atlasLoaderService.loadMap(); - } - - async loadSpriteAtlases() { - this.spriteAtlases = [ - await this.atlasLoaderService.loadAtlasJson(MapDefinitions.atlasMegaset), - await this.atlasLoaderService.loadAtlasJson(MapDefinitions.atlasBuildings), - await this.atlasLoaderService.loadAtlasJson(MapDefinitions.atlasCharacters) - ]; - } - - async leave() { - await this.openModal(); - } - - saveMap() { - // todo - } - - loadMap() { - // todo - } - - formatAtlasFileName(filename: string) { - // replace "_" with " " - return filename.replace(/_/g, ' '); - } - - ngOnDestroy(): void { - this.emitterSubjectSubscription?.unsubscribe(); - this.atlasEmitterSubscription?.unsubscribe(); - } - - private listenToSelectionEvents() { - this.emitterSubjectSubscription = SceneCommunicatorService.tileEmitterSubject.subscribe((tileId) => { - this.selectedTile = tileId; - }); - this.atlasEmitterSubscription = SceneCommunicatorService.atlasEmitterSubject.subscribe((a) => { - this.selectedAtlas = a?.atlasFrame ?? null; - }); - } -} diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector-group/atlas-loader.service.interface.ts b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector-group/atlas-loader.service.interface.ts deleted file mode 100644 index 8c31c886..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector-group/atlas-loader.service.interface.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { AtlasJsonWrapper, TileAtlasFrame } from '../atlas-loader.service'; - -export interface AtlasLoaderServiceInterface { - loadMap(): Promise; - - loadAtlasJson(tilesetName: string): Promise; -} diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector-group/tile-selector-group.component.html b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector-group/tile-selector-group.component.html deleted file mode 100644 index b4b73f0f..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector-group/tile-selector-group.component.html +++ /dev/null @@ -1,10 +0,0 @@ -
    -
    - -
    -
    diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector-group/tile-selector-group.component.scss b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector-group/tile-selector-group.component.scss deleted file mode 100644 index ea6709b7..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector-group/tile-selector-group.component.scss +++ /dev/null @@ -1,4 +0,0 @@ -.tile-scroll-selector { - max-height: 300px; - overflow: auto; -} diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector-group/tile-selector-group.component.spec.ts b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector-group/tile-selector-group.component.spec.ts deleted file mode 100644 index 81da7b9a..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector-group/tile-selector-group.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TileSelectorGroupComponent } from './tile-selector-group.component'; -import { Component } from '@angular/core'; - -@Component({ selector: 'fuzzy-waddle-tile-selector-group', template: '' }) -export class TileSelectorGroupTestingComponent {} - -describe('TileSelectorGroupComponent', () => { - let component: TileSelectorGroupComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [TileSelectorGroupComponent] - }).compileComponents(); - - fixture = TestBed.createComponent(TileSelectorGroupComponent); - component = fixture.componentInstance; - component.tileAtlasFrames = []; - component.frameWithMetaFilter = () => true; - - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector-group/tile-selector-group.component.ts b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector-group/tile-selector-group.component.ts deleted file mode 100644 index 94c169fa..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector-group/tile-selector-group.component.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { TileAtlasFrame, TileFrame } from '../atlas-loader.service'; - -@Component({ - selector: 'fuzzy-waddle-tile-selector-group', - templateUrl: './tile-selector-group.component.html', - styleUrls: ['./tile-selector-group.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class TileSelectorGroupComponent { - @Input({ required: true }) tileAtlasFrames: TileAtlasFrame[] | null = null; - @Input({ required: true }) selectedTile: number | null = null; - @Input({ required: true }) frameWithMetaFilter: (tileFrame: TileFrame) => boolean = () => true; - - getFiltered(tileFrame: TileFrame[]): TileFrame[] { - return tileFrame.filter((frameWithMeta) => this.frameWithMetaFilter(frameWithMeta)); - } -} diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector/tile-selector.component.html b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector/tile-selector.component.html deleted file mode 100644 index 7d4eced7..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector/tile-selector.component.html +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector/tile-selector.component.scss b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector/tile-selector.component.scss deleted file mode 100644 index cb6428d1..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector/tile-selector.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -.selected { - background-color: darkgrey; -} diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector/tile-selector.component.spec.ts b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector/tile-selector.component.spec.ts deleted file mode 100644 index 00fba810..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector/tile-selector.component.spec.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TileSelectorComponent } from './tile-selector.component'; -import { MapDefinitions } from '../../../../game/world/const/map-size.info'; -import { AtlasDisplayTestingComponent } from '../atlas-display/atlas-display.component.spec'; - -describe('TileSelectorComponent', () => { - let component: TileSelectorComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [TileSelectorComponent, AtlasDisplayTestingComponent] - }).compileComponents(); - - fixture = TestBed.createComponent(TileSelectorComponent); - component = fixture.componentInstance; - component.frameWithMeta = { - filename: 'cube-1.png', - tileProperties: { - stepHeight: 32 - }, - id: 1, - frame: { - y: 0, - x: 0, - w: 0, - h: 0 - } - }; - component.textureName = MapDefinitions.atlasOutside; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector/tile-selector.component.ts b/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector/tile-selector.component.ts deleted file mode 100644 index 293b82ea..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/tile-selector/tile-selector.component.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { TileFrame } from '../atlas-loader.service'; -import { SceneCommunicatorService } from '../../../../communicators/scene-communicator.service'; - -@Component({ - selector: 'fuzzy-waddle-tile-selector', - templateUrl: './tile-selector.component.html', - styleUrls: ['./tile-selector.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class TileSelectorComponent { - @Input({ required: true }) frameWithMeta!: TileFrame; - @Input({ required: true }) selectedTile: number | null = null; - @Input({ required: true }) textureName!: string; - - selectTile() { - SceneCommunicatorService.tileEmitterSubject.next(this.frameWithMeta.id); - } -} 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 deleted file mode 100644 index 5c8a14ef..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { ProbableWaffleGameComponent } from './probable-waffle-game.component'; - -const routes: Routes = [ - { - path: '', - component: ProbableWaffleGameComponent - }, - { path: '**', redirectTo: '/' } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class ProbableWaffleGameRoutingModule {} diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game.component.html b/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game.component.html deleted file mode 100644 index 91eeae5c..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game.component.html +++ /dev/null @@ -1,22 +0,0 @@ - - -
    - -
    -
    - -
    -     diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game.component.spec.ts b/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game.component.spec.ts deleted file mode 100644 index 15a7b3e1..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game.component.spec.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ProbableWaffleGameComponent } from './probable-waffle-game.component'; -import { GameContainerTestingComponent } from '../../../../shared/game/game-container/game-container.component.spec'; -import { EditorDrawerTestingComponent } from '../editor-drawer/editor-drawer.component.spec'; -import { SelectionGroupTestingComponent } from '../selection/selection-group/selection-group.component.spec'; - -jest.mock('../../../game/world/const/game-config', () => ({ - probableWaffleGameConfig: {} -})); - -describe('ProbableWaffleGameComponent', () => { - let component: ProbableWaffleGameComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ - ProbableWaffleGameComponent, - GameContainerTestingComponent, - EditorDrawerTestingComponent, - SelectionGroupTestingComponent - ] - }).compileComponents(); - - fixture = TestBed.createComponent(ProbableWaffleGameComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); 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 deleted file mode 100644 index 80b89155..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game.component.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { Component, 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 { AuthService } from "../../../../auth/auth.service"; - -@Component({ - selector: "fuzzy-waddle-game", - templateUrl: "./probable-waffle-game.component.html", - styleUrls: ["./probable-waffle-game.component.scss"] -}) -export class ProbableWaffleGameComponent implements OnInit, OnDestroy { - protected readonly probableWaffleGameConfig = probableWaffleGameConfig; - drawerWidth = "150px"; - displayDrawers = true; // todo - gameData?: BaseGameData; // todo - - constructor( - private readonly communicatorService: LittleMuncherCommunicatorService, - private readonly authService: AuthService - ) {} - - ngOnDestroy(): void { - SceneCommunicatorService.unsubscribe(); - } - - ngOnInit(): void { - SceneCommunicatorService.setup(); - const gameSessionInstance = new LittleMuncherGameInstance(); // todo later use ProbableWaffleGameInstance - this.gameData = { - gameInstance: gameSessionInstance, - communicator: this.communicatorService, - user: new LittleMuncherUserInfo(this.authService.userId) // todo later use ProbableWaffleUserInfo - }; - - // todo properly listen with communicatorService - - if (window.innerWidth < 800) { - this.displayDrawers = false; // todo for now - } - } -} diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game.module.ts b/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game.module.ts deleted file mode 100644 index 6757f448..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game.module.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { ProbableWaffleGameComponent } from './probable-waffle-game.component'; -import { ProbableWaffleGameRoutingModule } from './probable-waffle-game-routing.module'; -import { FormsModule } from '@angular/forms'; -import { EditorDrawerComponent } from '../editor-drawer/editor-drawer.component'; -import { TileSelectorComponent } from '../editor-drawer/tile-selector/tile-selector.component'; -import { TileSelectorGroupComponent } from '../editor-drawer/tile-selector-group/tile-selector-group.component'; -import { SelectionDisplayComponent } from '../selection/selection-display/selection-display.component'; -import { AtlasDisplayComponent } from '../editor-drawer/atlas-display/atlas-display.component'; -import { SelectionGroupComponent } from '../selection/selection-group/selection-group.component'; -import { ComponentsModule } from '../../../../shared/components/components.module'; -import { GameContainerModule } from '../../../../shared/game/game-container/game-container.module'; - -@NgModule({ - declarations: [ - ProbableWaffleGameComponent, - EditorDrawerComponent, - TileSelectorComponent, - TileSelectorGroupComponent, - SelectionDisplayComponent, - AtlasDisplayComponent, - SelectionGroupComponent - ], - imports: [CommonModule, FormsModule, ProbableWaffleGameRoutingModule, ComponentsModule, GameContainerModule] -}) -export class ProbableWaffleGameModule {} diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-display/selection-display.component.html b/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-display/selection-display.component.html deleted file mode 100644 index 5e4c8e44..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-display/selection-display.component.html +++ /dev/null @@ -1,19 +0,0 @@ -
    -
    - {{ formatAtlasFileName(s.name) }} -
    -
    diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-display/selection-display.component.spec.ts b/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-display/selection-display.component.spec.ts deleted file mode 100644 index 9d56fafb..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-display/selection-display.component.spec.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { SelectionDisplayComponent } from './selection-display.component'; -import { Component } from '@angular/core'; - -@Component({ selector: 'fuzzy-waddle-selection-display', template: '' }) -export class SelectionDisplayTestingComponent {} - -describe('SelectionDisplayComponent', () => { - let component: SelectionDisplayComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [SelectionDisplayComponent] - }).compileComponents(); - - fixture = TestBed.createComponent(SelectionDisplayComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-display/selection-display.component.ts b/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-display/selection-display.component.ts deleted file mode 100644 index 1ba07727..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-display/selection-display.component.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { GameObjectSelection, SceneCommunicatorService } from '../../../../communicators/scene-communicator.service'; -import { Subscription } from 'rxjs'; - -@Component({ - selector: 'fuzzy-waddle-selection-display', - templateUrl: './selection-display.component.html', - styleUrls: ['./selection-display.component.scss'] -}) -export class SelectionDisplayComponent implements OnInit, OnDestroy { - selection: GameObjectSelection[] = []; - private selectionSubscription!: Subscription; - - ngOnDestroy(): void { - this.selectionSubscription.unsubscribe(); - } - - ngOnInit(): void { - this.selectionSubscription = SceneCommunicatorService.selectionChangedSubject.subscribe((selection) => { - this.selection = selection; - }); - } - - formatAtlasFileName(filename: string) { - // replace "_" with " " - return filename.replace(/_/g, ' '); - } - - select(s: GameObjectSelection) { - this.selection = [s]; - } -} diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-group/selection-group.component.html b/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-group/selection-group.component.html deleted file mode 100644 index 14f49256..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-group/selection-group.component.html +++ /dev/null @@ -1,3 +0,0 @@ -
    - -
    diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-group/selection-group.component.scss b/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-group/selection-group.component.scss deleted file mode 100644 index a201b3c1..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-group/selection-group.component.scss +++ /dev/null @@ -1,17 +0,0 @@ -$dash-size: 5px; -$theme-color: mediumseagreen; -$fill-color: beige; -$border-size: calc($dash-size * 2.5 * 2); -$padding: 4px; -.sketchy { - background: lighten($theme-color, 20%); - border: $dash-size dashed $theme-color; - box-shadow: 0 0 0 calc($dash-size / 2) darken($theme-color, 20%), 0 0 0 calc($dash-size * 2.5) #fff, - inset 0 0 0 calc($dash-size / 2) darken($theme-color, 20%), - 0 $dash-size calc($dash-size * 2) ($dash-size * 3) rgba(0, 0, 0, 0.5), inset 0 0 0 calc($dash-size * 1.2) #fff, - inset 0 0 100vw 100vw $fill-color; - - margin: 13px; - padding: $padding; - height: calc(100% - $border-size - calc(#{$padding} * 4)); -} diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-group/selection-group.component.spec.ts b/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-group/selection-group.component.spec.ts deleted file mode 100644 index f1a05d13..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-group/selection-group.component.spec.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { SelectionGroupComponent } from './selection-group.component'; -import { SelectionDisplayTestingComponent } from '../selection-display/selection-display.component.spec'; -import { Component } from '@angular/core'; - -@Component({ selector: 'probable-waffle-selection-group', template: '' }) -export class SelectionGroupTestingComponent {} - -describe('SelectionGroupComponent', () => { - let component: SelectionGroupComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [SelectionGroupComponent, SelectionDisplayTestingComponent] - }).compileComponents(); - - fixture = TestBed.createComponent(SelectionGroupComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-group/selection-group.component.ts b/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-group/selection-group.component.ts deleted file mode 100644 index c44cad51..00000000 --- a/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-group/selection-group.component.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; - -@Component({ - selector: 'probable-waffle-selection-group', - templateUrl: './selection-group.component.html', - styleUrls: ['./selection-group.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class SelectionGroupComponent {} diff --git a/apps/client/src/app/probable-waffle/gui/home/constellation-effect/constellation-effect.component.spec.ts b/apps/client/src/app/probable-waffle/gui/home/constellation-effect/constellation-effect.component.spec.ts index 5a0e8c23..da485f6d 100644 --- a/apps/client/src/app/probable-waffle/gui/home/constellation-effect/constellation-effect.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/home/constellation-effect/constellation-effect.component.spec.ts @@ -1,18 +1,24 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { ConstellationEffectComponent } from './constellation-effect.component'; -import { Component } from '@angular/core'; +import { ConstellationEffectComponent } from "./constellation-effect.component"; +import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; -@Component({ selector: 'fuzzy-waddle-constellation-effect', template: '' }) +@Component({ + selector: "probable-waffle-constellation-effect", + template: "", + standalone: true, + imports: [CommonModule] +}) export class ConstellationEffectTestComponent {} -describe('ConstellationEffectComponent', () => { +describe("ConstellationEffectComponent", () => { let component: ConstellationEffectComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ConstellationEffectComponent] + imports: [ConstellationEffectComponent] }).compileComponents(); fixture = TestBed.createComponent(ConstellationEffectComponent); @@ -20,7 +26,7 @@ describe('ConstellationEffectComponent', () => { fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/probable-waffle/gui/home/constellation-effect/constellation-effect.component.ts b/apps/client/src/app/probable-waffle/gui/home/constellation-effect/constellation-effect.component.ts index b72e9a3e..74d8c2cb 100644 --- a/apps/client/src/app/probable-waffle/gui/home/constellation-effect/constellation-effect.component.ts +++ b/apps/client/src/app/probable-waffle/gui/home/constellation-effect/constellation-effect.component.ts @@ -1,12 +1,15 @@ -import { AfterViewInit, Component, OnDestroy } from '@angular/core'; -import { ConstellationParticle } from './constellation-particle'; +import { AfterViewInit, Component, OnDestroy } from "@angular/core"; +import { ConstellationParticle } from "./constellation-particle"; +import { CommonModule } from "@angular/common"; type MousePosition = { x?: number; y?: number }; @Component({ - selector: 'fuzzy-waddle-constellation-effect', - templateUrl: './constellation-effect.component.html', - styleUrls: ['./constellation-effect.component.scss'] + selector: "probable-waffle-constellation-effect", + templateUrl: "./constellation-effect.component.html", + styleUrls: ["./constellation-effect.component.scss"], + standalone: true, + imports: [CommonModule] }) export class ConstellationEffectComponent implements AfterViewInit, OnDestroy { private clickListener?: (e: MouseEvent) => void; @@ -25,23 +28,23 @@ export class ConstellationEffectComponent implements AfterViewInit, OnDestroy { }; ngAfterViewInit(): void { - this.canvas = document.getElementById('canvas1') as HTMLCanvasElement; - this.ctx = this.canvas.getContext('2d') as CanvasRenderingContext2D; + this.canvas = document.getElementById("canvas1") as HTMLCanvasElement; + this.ctx = this.canvas.getContext("2d") as CanvasRenderingContext2D; this.canvas.width = window.innerWidth; this.canvas.height = window.innerHeight; this.particles = []; - window.addEventListener('resize', () => { + window.addEventListener("resize", () => { if (!this.canvas) return; this.canvas.width = window.innerWidth; this.canvas.height = window.innerHeight; }); this.clickListener = (e: MouseEvent) => this.handleMouseEvent(e); - this.canvas.addEventListener('click', this.clickListener); + this.canvas.addEventListener("click", this.clickListener); this.mouseMoveListener = (e: MouseEvent) => this.handleMouseEvent(e); - this.canvas.addEventListener('mousemove', this.mouseMoveListener); + this.canvas.addEventListener("mousemove", this.mouseMoveListener); this.timer = window.setInterval(this.placeRandomParticle, 50); @@ -53,12 +56,12 @@ export class ConstellationEffectComponent implements AfterViewInit, OnDestroy { window.clearInterval(this.timer); } if (this.clickListener) { - const canvas = (document.getElementById('canvas1') as HTMLCanvasElement) || undefined; - canvas?.removeEventListener('click', this.clickListener); + const canvas = (document.getElementById("canvas1") as HTMLCanvasElement) || undefined; + canvas?.removeEventListener("click", this.clickListener); } if (this.mouseMoveListener) { - const canvas = (document.getElementById('canvas1') as HTMLCanvasElement) || undefined; - canvas?.removeEventListener('mousemove', this.mouseMoveListener); + const canvas = (document.getElementById("canvas1") as HTMLCanvasElement) || undefined; + canvas?.removeEventListener("mousemove", this.mouseMoveListener); } this.destroyed = true; } diff --git a/apps/client/src/app/probable-waffle/gui/home/constellation-effect/constellation-particle.ts b/apps/client/src/app/probable-waffle/gui/home/constellation-effect/constellation-particle.ts index 1359de30..fb2c6233 100644 --- a/apps/client/src/app/probable-waffle/gui/home/constellation-effect/constellation-particle.ts +++ b/apps/client/src/app/probable-waffle/gui/home/constellation-effect/constellation-particle.ts @@ -4,10 +4,14 @@ export class ConstellationParticle { private readonly speedX: number; private readonly speedY: number; - constructor(public x: number, public y: number, hueCol: number) { + constructor( + public x: number, + public y: number, + hueCol: number + ) { this.speedX = Math.random() * 5 - 1.5; this.speedY = Math.random() * 5 - 1.5; - this.color = 'hsl(' + hueCol + ', 100%, 50%)'; + this.color = "hsl(" + hueCol + ", 100%, 50%)"; this.size = Math.random() * 50 + 1; } 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..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 @@ -1,6 +1,6 @@ diff --git a/apps/client/src/app/probable-waffle/gui/home/home-page-nav/home-page-nav.component.spec.ts b/apps/client/src/app/probable-waffle/gui/home/home-page-nav/home-page-nav.component.spec.ts index 570b00e2..ea10af22 100644 --- a/apps/client/src/app/probable-waffle/gui/home/home-page-nav/home-page-nav.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/home/home-page-nav/home-page-nav.component.spec.ts @@ -1,25 +1,36 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { HomePageNavComponent } from './home-page-nav.component'; -import { provideRouter } from '@angular/router'; -import { HomeNavTestingComponent } from '../../../../shared/components/home-nav/home-nav.component.spec'; +import { HomePageNavComponent } from "./home-page-nav.component"; +import { provideRouter } from "@angular/router"; +import { HomeNavTestingComponent } from "../../../../shared/components/home-nav/home-nav.component.spec"; +import { HomeNavComponent } from "../../../../shared/components/home-nav/home-nav.component"; +import { RouterTestingModule } from "@angular/router/testing"; -describe('HomePageNavComponent', () => { +describe("HomePageNavComponent", () => { let component: HomePageNavComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [HomePageNavComponent, HomeNavTestingComponent], + imports: [HomePageNavComponent, RouterTestingModule], providers: [provideRouter([])] - }).compileComponents(); + }) + .overrideComponent(HomePageNavComponent, { + remove: { + imports: [HomeNavComponent] + }, + add: { + imports: [HomeNavTestingComponent] + } + }) + .compileComponents(); fixture = TestBed.createComponent(HomePageNavComponent); component = fixture.componentInstance; fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/probable-waffle/gui/home/home-page-nav/home-page-nav.component.ts b/apps/client/src/app/probable-waffle/gui/home/home-page-nav/home-page-nav.component.ts index 64c5bb45..df487104 100644 --- a/apps/client/src/app/probable-waffle/gui/home/home-page-nav/home-page-nav.component.ts +++ b/apps/client/src/app/probable-waffle/gui/home/home-page-nav/home-page-nav.component.ts @@ -1,8 +1,19 @@ -import { Component } from '@angular/core'; +import { Component } from "@angular/core"; +import { environment } from "../../../../../environments/environment"; +import { CommonModule } from "@angular/common"; +import { HomeNavComponent } from "../../../../shared/components/home-nav/home-nav.component"; +import { RouterLink } from "@angular/router"; @Component({ - selector: 'fuzzy-waddle-home-page-nav', - templateUrl: './home-page-nav.component.html', - styleUrls: ['./home-page-nav.component.scss'] + selector: "probable-waffle-home-page-nav", + templateUrl: "./home-page-nav.component.html", + styleUrls: ["./home-page-nav.component.scss"], + standalone: true, + imports: [CommonModule, HomeNavComponent, RouterLink] }) -export class HomePageNavComponent {} +export class HomePageNavComponent { + protected readonly enabledInstantDemoGame = !environment.production; + protected readonly enabledCampaign = !environment.production; // todo + protected readonly enabledProgress = !environment.production; // todo + protected readonly enabledOptions: boolean = !environment.production; // todo +} diff --git a/apps/client/src/app/probable-waffle/gui/home/home.component.html b/apps/client/src/app/probable-waffle/gui/home/home.component.html index 5d0f9c11..71260ef0 100644 --- a/apps/client/src/app/probable-waffle/gui/home/home.component.html +++ b/apps/client/src/app/probable-waffle/gui/home/home.component.html @@ -1,6 +1,6 @@ - + diff --git a/apps/client/src/app/probable-waffle/gui/home/home.component.scss b/apps/client/src/app/probable-waffle/gui/home/home.component.scss index 79e94068..8fd938e8 100644 --- a/apps/client/src/app/probable-waffle/gui/home/home.component.scss +++ b/apps/client/src/app/probable-waffle/gui/home/home.component.scss @@ -1,4 +1,4 @@ -@import '../../../../styles/_variables.scss'; +@import "../../../../styles/_variables.scss"; :host { display: flex; diff --git a/apps/client/src/app/probable-waffle/gui/home/home.component.spec.ts b/apps/client/src/app/probable-waffle/gui/home/home.component.spec.ts index 7412bf6c..e06ed4a2 100644 --- a/apps/client/src/app/probable-waffle/gui/home/home.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/home/home.component.spec.ts @@ -1,26 +1,37 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { HomeComponent } from './home.component'; -import { provideRouter } from '@angular/router'; -import { ConstellationEffectTestComponent } from './constellation-effect/constellation-effect.component.spec'; -import { HomePageNavTestingComponent } from '../../../home/page/home-page-nav/home-page-nav.component.spec'; +import { HomeComponent } from "./home.component"; +import { provideRouter } from "@angular/router"; +import { ConstellationEffectTestComponent } from "./constellation-effect/constellation-effect.component.spec"; +import { HomePageNavTestingComponent } from "../../../home/page/home-page-nav/home-page-nav.component.spec"; +import { ConstellationEffectComponent } from "./constellation-effect/constellation-effect.component"; +import { HomePageNavComponent } from "./home-page-nav/home-page-nav.component"; -describe('HomeComponent', () => { +describe("HomeComponent", () => { let component: HomeComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [HomeComponent, ConstellationEffectTestComponent, HomePageNavTestingComponent], + imports: [HomeComponent], providers: [provideRouter([])] - }).compileComponents(); + }) + .overrideComponent(HomeComponent, { + remove: { + imports: [HomePageNavComponent, ConstellationEffectComponent] + }, + add: { + imports: [HomePageNavTestingComponent, ConstellationEffectTestComponent] + } + }) + .compileComponents(); fixture = TestBed.createComponent(HomeComponent); component = fixture.componentInstance; fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/probable-waffle/gui/home/home.component.ts b/apps/client/src/app/probable-waffle/gui/home/home.component.ts index b414d747..b2d90561 100644 --- a/apps/client/src/app/probable-waffle/gui/home/home.component.ts +++ b/apps/client/src/app/probable-waffle/gui/home/home.component.ts @@ -1,8 +1,12 @@ -import { Component } from '@angular/core'; +import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { ConstellationEffectComponent } from "./constellation-effect/constellation-effect.component"; +import { HomePageNavComponent } from "./home-page-nav/home-page-nav.component"; @Component({ - selector: 'fuzzy-waddle-home', - templateUrl: './home.component.html', - styleUrls: ['./home.component.scss'] + templateUrl: "./home.component.html", + styleUrls: ["./home.component.scss"], + standalone: true, + imports: [CommonModule, ConstellationEffectComponent, HomePageNavComponent] }) export class HomeComponent {} diff --git a/apps/client/src/app/probable-waffle/gui/home/home.module.ts b/apps/client/src/app/probable-waffle/gui/home/home.module.ts deleted file mode 100644 index c24ea020..00000000 --- a/apps/client/src/app/probable-waffle/gui/home/home.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { CommonModule } from '@angular/common'; -import { HomeComponent } from './home.component'; -import { ConstellationEffectComponent } from './constellation-effect/constellation-effect.component'; -import { ComponentsModule } from '../../../shared/components/components.module'; -import { RouterLink } from '@angular/router'; -import { HomePageNavComponent } from './home-page-nav/home-page-nav.component'; - -@NgModule({ - declarations: [HomeComponent, ConstellationEffectComponent, HomePageNavComponent], - exports: [HomePageNavComponent], - imports: [CommonModule, FontAwesomeModule, ComponentsModule, RouterLink] -}) -export class HomeModule {} 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 new file mode 100644 index 00000000..6a9537d1 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/instant-game/instant-game.component.spec.ts @@ -0,0 +1,29 @@ +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; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [InstantGameComponent], + providers: [ + { + provide: GameInstanceClientService, + useValue: gameInstanceClientServiceStub + } + ] + }).compileComponents(); + + fixture = TestBed.createComponent(InstantGameComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 00000000..f93c17b5 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/instant-game/instant-game.component.ts @@ -0,0 +1,40 @@ +import { Component, inject, OnInit } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; +import { + GameSessionState, + ProbableWaffleGameInstanceType, + ProbableWaffleGameInstanceVisibility, + ProbableWaffleMapEnum +} from "@fuzzy-waddle/api-interfaces"; +import { LoaderComponent } from "../../../shared/loader/loader.component"; + +@Component({ + selector: "fuzzy-waddle-instant-game", + standalone: true, + imports: [CommonModule, LoaderComponent], + template: `` +}) +export class InstantGameComponent implements OnInit { + private readonly gameInstanceClientService = inject(GameInstanceClientService); + + async ngOnInit(): Promise { + await this.gameInstanceClientService.createGameInstance( + "InstantGame", + ProbableWaffleGameInstanceVisibility.Private, + ProbableWaffleGameInstanceType.InstantGame + ); + await this.gameInstanceClientService.addSelfAsPlayer(); + await this.gameInstanceClientService.addAiPlayer(); + + // 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 + }); + + await this.gameInstanceClientService.navigateToLobbyOrDirectlyToGame(); + } +} 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..dabd0951 --- /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.created | date: "medium" }}
    +
    + + +
    + } +
    + }@else{ +
    No saved games found.
    + } + +
    + +
    +
    +
    diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/atlas-display/atlas-display.component.scss b/apps/client/src/app/probable-waffle/gui/load/load.component.scss similarity index 100% rename from apps/client/src/app/probable-waffle/gui/game-interface/editor-drawer/atlas-display/atlas-display.component.scss rename to apps/client/src/app/probable-waffle/gui/load/load.component.scss 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..c0f7f072 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/load/load.component.spec.ts @@ -0,0 +1,30 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; +import { LoadComponent } from "./load.component"; +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; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [ + { provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }, + { provide: GameInstanceStorageServiceInterface, useValue: gameInstanceLocalStorageServiceStub } + ], + imports: [LoadComponent, RouterTestingModule] + }).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..56f6c152 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/load/load.component.ts @@ -0,0 +1,41 @@ +import { Component, inject, OnInit } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { + ProbableWaffleGameInstanceData, + ProbableWaffleGameInstanceSaveData, + ProbableWaffleLevels +} 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", + standalone: true, + imports: [CommonModule, RouterLink], + templateUrl: "./load.component.html", + styleUrls: ["./load.component.scss"] +}) +export class LoadComponent implements OnInit { + private readonly gameInstanceStorageService = inject(GameInstanceStorageServiceInterface); + private readonly gameInstanceClientService = inject(GameInstanceClientService); + protected gameInstanceDataRecords: ProbableWaffleGameInstanceSaveData[] = []; + async ngOnInit(): Promise { + this.gameInstanceDataRecords = await this.gameInstanceStorageService.getFromStorage(); + // sort descending + this.gameInstanceDataRecords.sort((a, b) => a.created - b.created); + } + + 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/game-mode-definition/game-mode-definition.component.html b/apps/client/src/app/probable-waffle/gui/lobby/game-mode-definition/game-mode-definition.component.html new file mode 100644 index 00000000..e7351dc7 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/game-mode-definition/game-mode-definition.component.html @@ -0,0 +1,70 @@ +
    +
    Game Setup
    +
    + Win Conditions +
    + + +
    +
    +
    + Flow +
    + + +
    +
    +
    + Modifiers +
    + + +
    +
    + + +
    +
    +
    diff --git a/apps/client/src/app/probable-waffle/gui/lobby/game-mode-definition/game-mode-definition.component.scss b/apps/client/src/app/probable-waffle/gui/lobby/game-mode-definition/game-mode-definition.component.scss new file mode 100644 index 00000000..7b430e13 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/game-mode-definition/game-mode-definition.component.scss @@ -0,0 +1 @@ +@import "../../../../../styles/_variables.scss"; diff --git a/apps/client/src/app/probable-waffle/gui/lobby/game-mode-definition/game-mode-definition.component.spec.ts b/apps/client/src/app/probable-waffle/gui/lobby/game-mode-definition/game-mode-definition.component.spec.ts new file mode 100644 index 00000000..791051a4 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/game-mode-definition/game-mode-definition.component.spec.ts @@ -0,0 +1,36 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; + +import { GameModeDefinitionComponent } from "./game-mode-definition.component"; +import { FormsModule } from "@angular/forms"; +import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../../communicators/game-instance-client.service.spec"; + +@Component({ + selector: "probable-waffle-game-mode-definition", + template: "", + standalone: true, + imports: [CommonModule] +}) +export class GameModeDefinitionTestingComponent {} + +describe("GameModeDefinitionComponent", () => { + let component: GameModeDefinitionComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [GameModeDefinitionComponent, FormsModule], + providers: [{ provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }] + }).compileComponents(); + + fixture = TestBed.createComponent(GameModeDefinitionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/lobby/game-mode-definition/game-mode-definition.component.ts b/apps/client/src/app/probable-waffle/gui/lobby/game-mode-definition/game-mode-definition.component.ts new file mode 100644 index 00000000..10a9d4df --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/game-mode-definition/game-mode-definition.component.ts @@ -0,0 +1,28 @@ +import { Component, inject } from "@angular/core"; +import { ProbableWaffleDataChangeEventProperty, ProbableWaffleGameModeData } from "@fuzzy-waddle/api-interfaces"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { CommonModule } from "@angular/common"; +import { FormsModule } from "@angular/forms"; + +@Component({ + selector: "probable-waffle-game-mode-definition", + templateUrl: "./game-mode-definition.component.html", + styleUrls: ["./game-mode-definition.component.scss"], + standalone: true, + imports: [CommonModule, FormsModule] +}) +export class GameModeDefinitionComponent { + private readonly gameInstanceClientService = inject(GameInstanceClientService); + + protected async onValueChange( + property: ProbableWaffleDataChangeEventProperty, + data: Partial + ): Promise { + console.log("game mode changed", property, data); + await this.gameInstanceClientService.gameModeChanged(property, data); + } + + protected get gameMode(): ProbableWaffleGameModeData | undefined { + return this.gameInstanceClientService.gameInstance?.gameMode?.data; + } +} diff --git a/apps/client/src/app/probable-waffle/gui/lobby/lobby-chat/lobby-chat.component.html b/apps/client/src/app/probable-waffle/gui/lobby/lobby-chat/lobby-chat.component.html new file mode 100644 index 00000000..2ccabb58 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/lobby-chat/lobby-chat.component.html @@ -0,0 +1,8 @@ + diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-display/selection-display.component.scss b/apps/client/src/app/probable-waffle/gui/lobby/lobby-chat/lobby-chat.component.scss similarity index 100% rename from apps/client/src/app/probable-waffle/gui/game-interface/selection/selection-display/selection-display.component.scss rename to apps/client/src/app/probable-waffle/gui/lobby/lobby-chat/lobby-chat.component.scss diff --git a/apps/client/src/app/probable-waffle/gui/lobby/lobby-chat/lobby-chat.component.spec.ts b/apps/client/src/app/probable-waffle/gui/lobby/lobby-chat/lobby-chat.component.spec.ts new file mode 100644 index 00000000..3cc074cb --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/lobby-chat/lobby-chat.component.spec.ts @@ -0,0 +1,37 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; +import { LobbyChatComponent } from "./lobby-chat.component"; +import { ProbableWaffleCommunicatorService } from "../../../communicators/probable-waffle-communicator.service"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../../communicators/game-instance-client.service.spec"; +import { AuthService } from "../../../../auth/auth.service"; +import { authServiceStub } from "../../../../auth/auth.service.spec"; +import { Component } from "@angular/core"; +import { probableWaffleCommunicatorServiceStub } from "../../../communicators/probable-waffle-communicator.service.spec"; +import { CommonModule } from "@angular/common"; + +@Component({ selector: "probable-waffle-lobby-chat", template: "", standalone: true, imports: [CommonModule] }) +export class LobbyChatTestingComponent {} + +describe("LobbyChatComponent", () => { + let component: LobbyChatComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [ + { provide: ProbableWaffleCommunicatorService, useValue: probableWaffleCommunicatorServiceStub }, + { provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }, + { provide: AuthService, useValue: authServiceStub } + ], + imports: [LobbyChatComponent] + }).compileComponents(); + + fixture = TestBed.createComponent(LobbyChatComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/lobby/lobby-chat/lobby-chat.component.ts b/apps/client/src/app/probable-waffle/gui/lobby/lobby-chat/lobby-chat.component.ts new file mode 100644 index 00000000..02c99cf0 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/lobby-chat/lobby-chat.component.ts @@ -0,0 +1,44 @@ +import { Component, inject, OnDestroy, OnInit } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { ProbableWaffleCommunicatorService } from "../../../communicators/probable-waffle-communicator.service"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { AuthService } from "../../../../auth/auth.service"; +import { ChatMessage, ProbableWaffleGameInstanceType } from "@fuzzy-waddle/api-interfaces"; +import { Subject, Subscription } from "rxjs"; +import { ChatComponent } from "../../../../shared/components/chat/chat.component"; + +@Component({ + selector: "probable-waffle-lobby-chat", + standalone: true, + imports: [CommonModule, ChatComponent], + templateUrl: "./lobby-chat.component.html", + styleUrls: ["./lobby-chat.component.scss"] +}) +export class LobbyChatComponent implements OnInit, OnDestroy { + private readonly communicatorService = inject(ProbableWaffleCommunicatorService); + protected readonly gameInstanceClientService = inject(GameInstanceClientService); + private readonly authService = inject(AuthService); + + private messagesSubscription: Subscription | undefined; + protected listenToMessages: Subject = new Subject(); + + ngOnInit(): void { + this.messagesSubscription = this.communicatorService.message?.on.subscribe((msg) => { + this.listenToMessages.next(msg.chatMessage); + }); + } + + protected sendMessage(chatMessage: ChatMessage) { + this.communicatorService.message?.send({ + chatMessage, + gameInstanceId: this.gameInstanceClientService.currentGameInstanceId!, + emitterUserId: this.authService.userId + }); + } + + ngOnDestroy(): void { + this.messagesSubscription?.unsubscribe(); + } + + protected readonly ProbableWaffleGameInstanceType = ProbableWaffleGameInstanceType; +} diff --git a/apps/client/src/app/probable-waffle/gui/lobby/lobby.component.html b/apps/client/src/app/probable-waffle/gui/lobby/lobby.component.html new file mode 100644 index 00000000..1f1148d1 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/lobby.component.html @@ -0,0 +1,5 @@ + + + + + diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/skirmish.component.scss b/apps/client/src/app/probable-waffle/gui/lobby/lobby.component.scss similarity index 86% rename from apps/client/src/app/probable-waffle/gui/skirmish/skirmish.component.scss rename to apps/client/src/app/probable-waffle/gui/lobby/lobby.component.scss index b11646cc..2dc0591e 100644 --- a/apps/client/src/app/probable-waffle/gui/skirmish/skirmish.component.scss +++ b/apps/client/src/app/probable-waffle/gui/lobby/lobby.component.scss @@ -1,4 +1,4 @@ -@import '../../../../styles/_variables.scss'; +@import "../../../../styles/_variables.scss"; :host { display: flex; diff --git a/apps/client/src/app/probable-waffle/gui/lobby/lobby.component.spec.ts b/apps/client/src/app/probable-waffle/gui/lobby/lobby.component.spec.ts new file mode 100644 index 00000000..d46baa20 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/lobby.component.spec.ts @@ -0,0 +1,61 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; + +import { LobbyComponent } from "./lobby.component"; +import { Component } from "@angular/core"; +import { PlayerDefinitionTestingComponent } from "./player-definition/player-definition.component.spec"; +import { MapDefinitionTestingComponent } from "./map-definition/map-definition.component.spec"; +import { GameModeDefinitionTestingComponent } from "./game-mode-definition/game-mode-definition.component.spec"; +import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../communicators/game-instance-client.service.spec"; +import { SpectatorsGridTestingComponent } from "./spectators-grid/spectators-grid.component.spec"; +import { LobbyChatTestingComponent } from "./lobby-chat/lobby-chat.component.spec"; +import { PlayerDefinitionComponent } from "./player-definition/player-definition.component"; +import { MapDefinitionComponent } from "./map-definition/map-definition.component"; +import { GameModeDefinitionComponent } from "./game-mode-definition/game-mode-definition.component"; +import { SpectatorsGridComponent } from "./spectators-grid/spectators-grid.component"; +import { LobbyChatComponent } from "./lobby-chat/lobby-chat.component"; +import { CommonModule } from "@angular/common"; + +@Component({ selector: "probable-waffle-lobby", template: "", standalone: true, imports: [CommonModule] }) +export class LobbyTestingComponent {} + +describe("ProbableWaffleLobbyLobbyComponent", () => { + let component: LobbyComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [{ provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }], + imports: [LobbyComponent] + }) + .overrideComponent(LobbyComponent, { + remove: { + imports: [ + PlayerDefinitionComponent, + MapDefinitionComponent, + GameModeDefinitionComponent, + SpectatorsGridComponent, + LobbyChatComponent + ] + }, + add: { + imports: [ + PlayerDefinitionTestingComponent, + MapDefinitionTestingComponent, + GameModeDefinitionTestingComponent, + SpectatorsGridTestingComponent, + LobbyChatTestingComponent + ] + } + }) + .compileComponents(); + + fixture = TestBed.createComponent(LobbyComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/lobby/lobby.component.ts b/apps/client/src/app/probable-waffle/gui/lobby/lobby.component.ts new file mode 100644 index 00000000..7afa51a1 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/lobby.component.ts @@ -0,0 +1,23 @@ +import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { MapDefinitionComponent } from "./map-definition/map-definition.component"; +import { PlayerDefinitionComponent } from "./player-definition/player-definition.component"; +import { SpectatorsGridComponent } from "./spectators-grid/spectators-grid.component"; +import { GameModeDefinitionComponent } from "./game-mode-definition/game-mode-definition.component"; +import { LobbyChatComponent } from "./lobby-chat/lobby-chat.component"; + +@Component({ + selector: "probable-waffle-lobby", + templateUrl: "./lobby.component.html", + styleUrls: ["./lobby.component.scss"], + standalone: true, + imports: [ + CommonModule, + MapDefinitionComponent, + PlayerDefinitionComponent, + SpectatorsGridComponent, + GameModeDefinitionComponent, + LobbyChatComponent + ] +}) +export class LobbyComponent {} diff --git a/apps/client/src/app/probable-waffle/gui/lobby/map-definition/map-definition.component.html b/apps/client/src/app/probable-waffle/gui/lobby/map-definition/map-definition.component.html new file mode 100644 index 00000000..c96a1413 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/map-definition/map-definition.component.html @@ -0,0 +1,18 @@ +
    + + +
    + @if (mapData) { +
    {{ mapData.name }}
    +
    {{ mapData.presentation.description }}
    +
    {{ mapData.mapInfo.widthTiles }} x {{ mapData.mapInfo.heightTiles }}
    +
    + +
    + Drag to reposition +
    +
    + } +
    + +
    diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/map-definition/map-definition.component.scss b/apps/client/src/app/probable-waffle/gui/lobby/map-definition/map-definition.component.scss similarity index 84% rename from apps/client/src/app/probable-waffle/gui/skirmish/map-definition/map-definition.component.scss rename to apps/client/src/app/probable-waffle/gui/lobby/map-definition/map-definition.component.scss index 8c27a2be..c1af21bc 100644 --- a/apps/client/src/app/probable-waffle/gui/skirmish/map-definition/map-definition.component.scss +++ b/apps/client/src/app/probable-waffle/gui/lobby/map-definition/map-definition.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../styles/_variables.scss'; +@import "../../../../../styles/_variables.scss"; :host { text-align: center; diff --git a/apps/client/src/app/probable-waffle/gui/lobby/map-definition/map-definition.component.spec.ts b/apps/client/src/app/probable-waffle/gui/lobby/map-definition/map-definition.component.spec.ts new file mode 100644 index 00000000..56396f06 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/map-definition/map-definition.component.spec.ts @@ -0,0 +1,44 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; + +import { MapDefinitionComponent } from "./map-definition.component"; +import { FormsModule } from "@angular/forms"; +import { Component } from "@angular/core"; +import { MapSelectorTestingComponent } from "../map-selector/map-selector.component.spec"; +import { TriggerTestingComponent } from "../trigger/trigger.component.spec"; +import { CommonModule } from "@angular/common"; +import { TriggerComponent } from "../trigger/trigger.component"; +import { MapSelectorComponent } from "../map-selector/map-selector.component"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../../communicators/game-instance-client.service.spec"; + +@Component({ selector: "probable-waffle-map-definition", template: "", standalone: true, imports: [CommonModule] }) +export class MapDefinitionTestingComponent {} + +describe("MapDefinitionComponent", () => { + let component: MapDefinitionComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [MapDefinitionComponent, FormsModule], + providers: [{ provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }] + }) + .overrideComponent(MapDefinitionComponent, { + remove: { + imports: [MapSelectorComponent, TriggerComponent] + }, + add: { + imports: [MapSelectorTestingComponent, TriggerTestingComponent] + } + }) + .compileComponents(); + + fixture = TestBed.createComponent(MapDefinitionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/map-definition/map-definition.component.ts b/apps/client/src/app/probable-waffle/gui/lobby/map-definition/map-definition.component.ts similarity index 68% rename from apps/client/src/app/probable-waffle/gui/skirmish/map-definition/map-definition.component.ts rename to apps/client/src/app/probable-waffle/gui/lobby/map-definition/map-definition.component.ts index bd96c264..567e1fc2 100644 --- a/apps/client/src/app/probable-waffle/gui/skirmish/map-definition/map-definition.component.ts +++ b/apps/client/src/app/probable-waffle/gui/lobby/map-definition/map-definition.component.ts @@ -2,14 +2,30 @@ import { ChangeDetectorRef, Component, ElementRef, - EventEmitter, HostListener, - Input, - Output, + inject, + OnDestroy, + OnInit, ViewChild -} from '@angular/core'; -import { MapPlayerDefinition, PlayerLobbyDefinition, PositionPlayerDefinition } from '../skirmish.component'; -import { Difficulty } from '../player-definition/player-definition.component'; +} from "@angular/core"; +import { + GameSetupHelpers, + PlayerLobbyDefinition, + PositionPlayerDefinition, + ProbableWaffleLevels, + ProbableWaffleMapData, + ProbableWafflePlayer, + ProbableWafflePlayerDataChangeEventProperty +} from "@fuzzy-waddle/api-interfaces"; +import { + ProbableWaffleCommunicators, + SceneCommunicatorClientService +} from "../../../communicators/scene-communicator-client.service"; +import { Subscription } from "rxjs"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { CommonModule } from "@angular/common"; +import { MapSelectorComponent } from "../map-selector/map-selector.component"; +import { TriggerComponent } from "../trigger/trigger.component"; /** * canvas element containing info about current player and position. @@ -32,20 +48,20 @@ interface DisplayRect { } @Component({ - selector: 'fuzzy-waddle-map-definition', - templateUrl: './map-definition.component.html', - styleUrls: ['./map-definition.component.scss'] + selector: "probable-waffle-map-definition", + templateUrl: "./map-definition.component.html", + styleUrls: ["./map-definition.component.scss"], + standalone: true, + imports: [CommonModule, MapSelectorComponent, TriggerComponent] }) -export class MapDefinitionComponent { +export class MapDefinitionComponent implements OnInit, OnDestroy { private readonly preferredCanvasWidth = 400; private readonly preferredCanvasHeight = 200; protected canvasWidth = this.preferredCanvasWidth; protected canvasHeight = this.preferredCanvasHeight; - protected selectedMap?: MapPlayerDefinition; - @Output() mapPlayerDefinitionChange: EventEmitter = new EventEmitter(); private img!: HTMLImageElement; // get canvas related references - private ctx!: CanvasRenderingContext2D; + private ctx?: CanvasRenderingContext2D; private _canvas?: ElementRef; private canvasOffsetX!: number; private canvasOffsetY!: number; @@ -60,9 +76,14 @@ export class MapDefinitionComponent { private rectangleWidth = 30; private rectangleHeight = 30; - constructor(private readonly changeDetectorRef: ChangeDetectorRef) {} + private communicators?: ProbableWaffleCommunicators; + private communicatorSubscriptions: Subscription[] = []; - @ViewChild('canvas') + private readonly cdr = inject(ChangeDetectorRef); + private readonly sceneCommunicatorClientService = inject(SceneCommunicatorClientService); + private readonly gameInstanceClientService = inject(GameInstanceClientService); + + @ViewChild("canvas") get canvas(): ElementRef | undefined { return this._canvas; } @@ -74,38 +95,102 @@ export class MapDefinitionComponent { this.initialize(); } - private _mapPlayerDefinition?: MapPlayerDefinition; + protected get mapData(): ProbableWaffleMapData | null { + const mapId = this.gameInstanceClientService.gameInstance?.gameMode?.data.map; + if (!mapId) return null; + // noinspection UnnecessaryLocalVariableJS + const mapData = ProbableWaffleLevels[mapId]; + return mapData; + } - @Input({ required: true }) - get mapPlayerDefinition(): MapPlayerDefinition | undefined { - return this._mapPlayerDefinition; + private get players(): ProbableWafflePlayer[] { + return this.gameInstanceClientService.gameInstance?.players ?? []; } - set mapPlayerDefinition(value: MapPlayerDefinition | undefined) { - // check if map changed - if (this._mapPlayerDefinition && value && this._mapPlayerDefinition.map.name !== value.map.name) { - this.reset(); - } - this._mapPlayerDefinition = value; - // noinspection JSIgnoredPromiseFromCall - this.initialize(); + ngOnInit(): void { + this.startListeningToGameInstanceEventsInLobby(); + } + + private startListeningToGameInstanceEventsInLobby() { + this.communicators = this.sceneCommunicatorClientService.communicatorObservables; + this.listenToGameInstanceMetadataEvents(); + this.listenToGameModeDataEvents(); + this.listenToPlayerEvents(); + } + + listenToGameInstanceMetadataEvents(): void { + if (!this.communicators) return; + this.communicatorSubscriptions.push( + this.communicators.gameInstanceObservable.subscribe((payload) => { + this.refresh(); + }) + ); + } + + listenToGameModeDataEvents(): void { + if (!this.communicators) return; + this.communicatorSubscriptions.push( + this.communicators.gameModeObservable.subscribe(async (payload) => { + switch (payload.property) { + case "map": + await this.initializeImage(); + break; + } + this.refresh(); + }) + ); } + listenToPlayerEvents(): void { + if (!this.communicators) return; + this.communicatorSubscriptions.push( + this.communicators.playerObservable.subscribe((payload) => { + this.refresh(); + }) + ); + } + + private stopListeningToGameInstanceEventsInLobby() { + this.communicatorSubscriptions.forEach((subscription) => subscription.unsubscribe()); + } + + ngOnDestroy() { + this.stopListeningToGameInstanceEventsInLobby(); + } + + // private _mapPlayerDefinition?: MapPlayerDefinition; + // + // @Input({ required: true }) + // get mapPlayerDefinition(): MapPlayerDefinition | undefined { + // return this._mapPlayerDefinition; + // } + // + // set mapPlayerDefinition(value: MapPlayerDefinition | undefined) { + // // check if map changed + // if (this._mapPlayerDefinition && value && this._mapPlayerDefinition.map.name !== value.map.name) { + // this.reset(); + // } + // this._mapPlayerDefinition = value; + // // noinspection JSIgnoredPromiseFromCall + // this.initialize(); + // } + /** * returns iso coordinates that correspond with image definitions for selected map definition * Meaning that iso coordinates are calculated based on image size and map definition */ private get isoCoordinates(): { x: number; y: number }[] { - const { scale, x, y, width, height } = this.getImgDefinitions(); + const data = this.getImgDefinitions(); + if (!data) return []; + const { scale, x, y, width, height } = data; - const mapPlayerDefinition = this.mapPlayerDefinition as MapPlayerDefinition; - const map = mapPlayerDefinition.map; - const mapWidth = map.mapWidth; - const mapHeight = map.mapHeight; + const map = this.mapData!; + const mapWidth = map.mapInfo.widthTiles; + const mapHeight = map.mapInfo.heightTiles; const isoCoordinates: { x: number; y: number }[] = []; - map.startPositions.forEach((startPosition) => { - const startPositionX = startPosition.tileXY.x; - const startPositionY = startPosition.tileXY.y; + map.mapInfo.startPositionsOnTile.forEach((startPosition) => { + const startPositionX = startPosition.x; + const startPositionY = startPosition.y; const startPositionZ = startPosition.z; // convert to isometric coordinates @@ -128,12 +213,9 @@ export class MapDefinitionComponent { return isoCoordinates; } - @HostListener('window:resize', ['$event']) + @HostListener("window:resize", ["$event"]) onResize() { - this.setCanvasSize(); - this.recalculateOffset(); - this.reInitializePlayerPositions(); - this.draw(); + this.refresh(); } private reInitializePlayerPositions() { @@ -141,57 +223,50 @@ export class MapDefinitionComponent { this.initializePlayerPositions(); } + refresh() { + if (!this.initialized) return; + this.setCanvasSize(); + this.recalculateOffset(); + this.reInitializePlayerPositions(); + this.draw(); + } + /** * create draggable rectangles for each player currently joined on the map */ - initializePlayerPositions() { + private initializePlayerPositions() { // an array of objects that define different rectangles - if (!this.mapPlayerDefinition) { + if (!this.mapData) { return; } const isoCoordinates = this.isoCoordinates; let i = -1; - for (const positionForPlayer of this.mapPlayerDefinition.startPositionPerPlayer) { + for (const positionForPlayer of this.players) { + const definition = positionForPlayer.playerController.data.playerDefinition; i++; - if (!positionForPlayer.player.joined) { - continue; - } - const player = positionForPlayer.player as PlayerLobbyDefinition; - const playerRect = this.rects.find((rect) => rect.playerNumber === player.playerNumber); + const playerRect = this.rects.find((rect) => rect.playerNumber === definition!.player.playerNumber); if (!playerRect) { - const playerPosition = player.playerPosition as number; + const playerPosition = definition!.player.playerPosition!; const isoCoordinate = isoCoordinates[playerPosition]; - this.createDraggablePlayerRectangle(i, playerPosition, isoCoordinate, positionForPlayer.playerColor); + const maxPlayers = this.mapData.mapInfo.startPositionsOnTile.length; + const playerNumber = definition!.player.playerNumber; + const color = GameSetupHelpers.getColorForPlayer(playerNumber, maxPlayers); + this.createDraggablePlayerRectangle(i, playerPosition, isoCoordinate, color); } } } - /** - * Removes player rectangle from canvas - */ - removePlayer(playerNumber: number) { - const index = this.rects.findIndex((rect) => rect.playerNumber === playerNumber); - if (index >= 0) { - this.rects.splice(index, 1); - } - } - /** * redraw the scene */ - draw() { + private draw() { this.clear(); this.drawMapWithStartPositions(); this.drawPlayerRectangles(); } - protected mapChanged(selectedMap: MapPlayerDefinition) { - this.selectedMap = selectedMap; - this.mapPlayerDefinitionChange.next(selectedMap); - } - private setCanvasSize() { if (!this.canvas) { this.initialize(); @@ -207,23 +282,15 @@ export class MapDefinitionComponent { } canvas.width = this.canvasWidth; canvas.height = this.canvasHeight; - this.changeDetectorRef.detectChanges(); + this.cdr.detectChanges(); this.initialize(); } - /** - * Called when map changes - reset everything - */ - private reset() { - this.initialized = false; - this.rects = []; - } - /** * initializes canvas and loads new map image */ private async initialize() { - if (!this.mapPlayerDefinition || !this.canvas) { + if (!this.mapData || !this.canvas) { return; } if (this.initialized) { @@ -233,7 +300,7 @@ export class MapDefinitionComponent { } this.initialized = true; const canvas = this.canvas.nativeElement as HTMLCanvasElement; - this.ctx = canvas.getContext('2d') as CanvasRenderingContext2D; + this.ctx = canvas.getContext("2d") as CanvasRenderingContext2D; // get canvas related references this.recalculateOffset(); @@ -245,7 +312,7 @@ export class MapDefinitionComponent { this.startX = 0; this.startY = 0; - await this.loadImage(); + await this.initializeImage(); this.initializePlayerPositions(); @@ -257,6 +324,10 @@ export class MapDefinitionComponent { this.draw(); } + private async initializeImage() { + await this.loadImage(); + } + /** * We need to recalculate offset because canvas might have been moved around */ @@ -277,7 +348,7 @@ export class MapDefinitionComponent { return new Promise((resolve) => { const img = new Image(); this.img = img; - img.src = 'assets/probable-waffle/tilemaps/' + (this.mapPlayerDefinition as MapPlayerDefinition).map.image; + img.src = this.mapData!.presentation.imagePath; img.onload = () => resolve(); }); } @@ -314,19 +385,20 @@ export class MapDefinitionComponent { * percent in is 0.0 - 1.0 */ private lightenColor(color: string, percent: number) { - const hsl = color.substring(4, color.length - 1).split(','); + const hsl = color.substring(4, color.length - 1).split(","); const h = hsl[0]; const s = hsl[1]; const l = hsl[2]; const lPercent = parseFloat(l) + percent * 100; - return 'hsl(' + h + ',' + s + ',' + lPercent + '%)'; + return "hsl(" + h + "," + s + "," + lPercent + "%)"; } /** * draw a single rect */ private rect(x: number, y: number, w: number, h: number, fill: string) { + if (!this.ctx) return; this.ctx.fillStyle = fill; this.ctx.beginPath(); @@ -341,7 +413,7 @@ export class MapDefinitionComponent { * clear the canvas */ private clear() { - this.ctx.clearRect(0, 0, this.contextWidth, this.contextHeight); + this.ctx?.clearRect(0, 0, this.contextWidth, this.contextHeight); } /** @@ -459,13 +531,13 @@ export class MapDefinitionComponent { * checks if we placed player on non-existing-position - just snap back to previous * clears all dragging flags */ - private myUp(e: MouseEvent) { + private async myUp(e: MouseEvent) { e.preventDefault(); e.stopPropagation(); - this.handleEmptyRectangleOnUp(e); - this.handleRectangleSwitchOnUp(e); - this.handleRectangleOnEmptyTileUp(); + await this.handleEmptyRectangleOnUp(e); + await this.handleRectangleSwitchOnUp(e); + await this.handleRectangleOnEmptyTileUp(); this.handleRectangleSnappingOnUp(); this.clearDraggingFlags(); } @@ -473,7 +545,7 @@ export class MapDefinitionComponent { /** * checks if we switched two player positions */ - private handleRectangleSwitchOnUp(e: MouseEvent) { + private async handleRectangleSwitchOnUp(e: MouseEvent) { const getIntersectedRectangles = this.getIntersectedRectangles(e); // get the rectangle that we're dragging const draggingRectangle = this.rects.find((r) => r.isDragging); @@ -491,36 +563,37 @@ export class MapDefinitionComponent { hoveringRectangle.tileX = prevDraggingX; hoveringRectangle.tileY = prevDraggingY; - this.switchPlayerPositions(draggingRectangle, hoveringRectangle); + await this.switchPlayerPositions(draggingRectangle, hoveringRectangle); } } /** * checks if we switched two player positions */ - private switchPlayerPositions(draggingRectangle: DisplayRect, hoveringRectangle: DisplayRect) { + private async switchPlayerPositions(draggingRectangle: DisplayRect, hoveringRectangle: DisplayRect) { const draggingPositionNumber = draggingRectangle.positionNumber; const hoveringPositionNumber = hoveringRectangle.positionNumber; draggingRectangle.positionNumber = hoveringPositionNumber; hoveringRectangle.positionNumber = draggingPositionNumber; - const mapPlayerDefinition = this.mapPlayerDefinition as MapPlayerDefinition; - const draggingPlayer = mapPlayerDefinition.startPositionPerPlayer.find( - (p) => p.player.playerPosition === draggingPositionNumber - ) as PositionPlayerDefinition; - const hoveringPlayer = mapPlayerDefinition.startPositionPerPlayer.find( - (p) => p.player.playerPosition === hoveringPositionNumber - ) as PositionPlayerDefinition; + const draggingPlayer = this.players.find( + (p) => p.playerController.data.playerDefinition!.player.playerPosition === draggingPositionNumber + )!; + const hoveringPlayer = this.players.find( + (p) => p.playerController.data.playerDefinition!.player.playerPosition === hoveringPositionNumber + )!; - draggingPlayer.player.playerPosition = hoveringPositionNumber; - hoveringPlayer.player.playerPosition = draggingPositionNumber; + await this.emitPlayerPositionChanged(draggingPlayer, hoveringPositionNumber); + await this.emitPlayerPositionChanged(hoveringPlayer, draggingPositionNumber); + + console.log("player positions changed" + draggingPositionNumber + " " + hoveringPositionNumber); } /** * checks if we placed player on empty position */ - private handleRectangleOnEmptyTileUp() { + private async handleRectangleOnEmptyTileUp() { const draggingRectangle = this.rects.find((r) => r.isDragging); if (!draggingRectangle) { @@ -536,7 +609,7 @@ export class MapDefinitionComponent { draggingRectangle.tileX = hoveringIsoCoordinate.coordinate.x; draggingRectangle.tileY = hoveringIsoCoordinate.coordinate.y; - this.updatePlayerPosition( + await this.updatePlayerPosition( draggingRectangle, { x: previousTileX, y: previousTileY }, { x: hoveringIsoCoordinate.coordinate.x, y: hoveringIsoCoordinate.coordinate.y } @@ -572,7 +645,7 @@ export class MapDefinitionComponent { /** * checks if we placed player on empty position */ - private updatePlayerPosition( + private async updatePlayerPosition( draggingRectangle: DisplayRect, previousIsoCoordinate: { x: number; y: number }, newIsoCoordinate: { x: number; y: number } @@ -588,13 +661,26 @@ export class MapDefinitionComponent { ); // update map player definition - const mapPlayerDefinition = this.mapPlayerDefinition as MapPlayerDefinition; - const playerDefinition = mapPlayerDefinition.startPositionPerPlayer.find( - (startPositionPerPlayer) => startPositionPerPlayer?.player.playerPosition === previousPosition - ) as PositionPlayerDefinition; - playerDefinition.player.playerPosition = newPosition; - - draggingRectangle.positionNumber = newPosition; + const players = this.players; + const player = players.find( + (p) => p.playerController.data.playerDefinition!.player.playerPosition === previousPosition + )!; + if (!player) throw new Error("Player not found with position " + previousPosition); + + await this.emitPlayerPositionChanged(player, newPosition); + console.log("Player positions changed", previousPosition, newPosition); + } + + private async emitPlayerPositionChanged(player: ProbableWafflePlayer, playerPosition: number) { + await this.gameInstanceClientService.playerChanged( + "playerController.data.playerDefinition.player.playerPosition" as ProbableWafflePlayerDataChangeEventProperty, + { + playerNumber: player.playerNumber, + playerControllerData: { + playerDefinition: { player: { playerPosition } as PlayerLobbyDefinition } as PositionPlayerDefinition + } + } + ); } /** @@ -619,15 +705,13 @@ export class MapDefinitionComponent { /** * Add new A.I. player on empty rectangle click */ - private handleEmptyRectangleOnUp(e: MouseEvent) { + private async handleEmptyRectangleOnUp(e: MouseEvent) { this.recalculateOffset(); const getIntersectedRectangles = this.getIntersectedRectangles(e); if (getIntersectedRectangles.length) { return; } - const map = this.mapPlayerDefinition as MapPlayerDefinition; - // get the current mouse position const mx = e.clientX - this.canvasOffsetX; const my = e.clientY - this.canvasOffsetY; @@ -640,15 +724,8 @@ export class MapDefinitionComponent { const { index } = isoCoordinate; // add new player - - // find first player in map.startPositionPerPlayer that is not joined - const player = map.startPositionPerPlayer.find((p) => !p.player.joined) as PositionPlayerDefinition; - player.player.playerPosition = index; - player.difficulty = Difficulty.Medium; - player.player.joined = true; - - this.initializePlayerPositions(); - this.draw(); + await this.gameInstanceClientService.addAiPlayer(index); + console.log("AI player added via click on canvas" + index); } /** @@ -722,7 +799,8 @@ export class MapDefinitionComponent { * gets canvas and image definitions - so image can be rendered on canvas correctly */ private getImgDefinitions() { - const canvas = (this.canvas as ElementRef).nativeElement as HTMLCanvasElement; + if (!this.canvas) return; + const canvas = this.canvas.nativeElement as HTMLCanvasElement; const img = this.img; // clamp image to canvas @@ -736,7 +814,10 @@ export class MapDefinitionComponent { * clamp image to canvas */ private drawMapImage() { - const { img, scale, x, y, width, height } = this.getImgDefinitions(); + if (!this.ctx) return; + const data = this.getImgDefinitions(); + if (!data) return; + const { img, scale, x, y, width, height } = data; this.ctx.drawImage(img, x, y, width * scale, height * scale); } @@ -754,6 +835,6 @@ export class MapDefinitionComponent { * blank start position */ private drawStartPositionSquare(x: number, y: number) { - this.rect(x, y, this.rectangleWidth, this.rectangleHeight, 'white'); + this.rect(x, y, this.rectangleWidth, this.rectangleHeight, "white"); } } diff --git a/apps/client/src/app/probable-waffle/gui/lobby/map-selector/map-selector.component.html b/apps/client/src/app/probable-waffle/gui/lobby/map-selector/map-selector.component.html new file mode 100644 index 00000000..3c84c8d0 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/map-selector/map-selector.component.html @@ -0,0 +1,19 @@ +
    + +
      +
    • + + {{ level.name }} +
      • +
    +
    diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/map-selector/map-selector.component.scss b/apps/client/src/app/probable-waffle/gui/lobby/map-selector/map-selector.component.scss similarity index 77% rename from apps/client/src/app/probable-waffle/gui/skirmish/map-selector/map-selector.component.scss rename to apps/client/src/app/probable-waffle/gui/lobby/map-selector/map-selector.component.scss index 124e008b..1b1b82b4 100644 --- a/apps/client/src/app/probable-waffle/gui/skirmish/map-selector/map-selector.component.scss +++ b/apps/client/src/app/probable-waffle/gui/lobby/map-selector/map-selector.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../styles/_variables'; +@import "../../../../../styles/_variables"; :host { margin-bottom: 10px; diff --git a/apps/client/src/app/probable-waffle/gui/lobby/map-selector/map-selector.component.spec.ts b/apps/client/src/app/probable-waffle/gui/lobby/map-selector/map-selector.component.spec.ts new file mode 100644 index 00000000..88325295 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/map-selector/map-selector.component.spec.ts @@ -0,0 +1,31 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; + +import { MapSelectorComponent } from "./map-selector.component"; +import { FormsModule } from "@angular/forms"; +import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../../communicators/game-instance-client.service.spec"; + +@Component({ selector: "probable-waffle-map-selector", template: "", standalone: true, imports: [CommonModule] }) +export class MapSelectorTestingComponent {} + +describe("MapSelectorComponent", () => { + let component: MapSelectorComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [MapSelectorComponent, FormsModule], + providers: [{ provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }] + }).compileComponents(); + + fixture = TestBed.createComponent(MapSelectorComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/lobby/map-selector/map-selector.component.ts b/apps/client/src/app/probable-waffle/gui/lobby/map-selector/map-selector.component.ts new file mode 100644 index 00000000..2d53d007 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/map-selector/map-selector.component.ts @@ -0,0 +1,37 @@ +import { Component, inject } from "@angular/core"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { ProbableWaffleLevels, ProbableWaffleMapData, ProbableWaffleMapEnum } from "@fuzzy-waddle/api-interfaces"; +import { CommonModule } from "@angular/common"; + +@Component({ + selector: "probable-waffle-map-selector", + templateUrl: "./map-selector.component.html", + styleUrls: ["./map-selector.component.scss"], + standalone: true, + imports: [CommonModule] +}) +export class MapSelectorComponent { + private readonly gameInstanceClientService = inject(GameInstanceClientService); + + protected async selectMap(map: ProbableWaffleMapEnum) { + await this.removeExtraPlayers(map); + await this.gameInstanceClientService.gameModeChanged("map", { map }); + } + + /** + * before changing map, throw out all players that don't fit in this new map + */ + private async removeExtraPlayers(map: ProbableWaffleMapEnum) { + const mapData = ProbableWaffleLevels[map]; + const maxPlayers = mapData.mapInfo.startPositionsOnTile.length; + const players = this.gameInstanceClientService.gameInstance?.players ?? []; + const playersToRemove = players.filter((player) => player.playerNumber! >= maxPlayers); + for (const player of playersToRemove) { + await this.gameInstanceClientService.removePlayer(player.playerNumber!); + } + } + + get levels(): ProbableWaffleMapData[] { + return Object.values(ProbableWaffleLevels); + } +} diff --git a/apps/client/src/app/probable-waffle/gui/lobby/player-definition/player-definition.component.html b/apps/client/src/app/probable-waffle/gui/lobby/player-definition/player-definition.component.html new file mode 100644 index 00000000..ad834c7f --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/player-definition/player-definition.component.html @@ -0,0 +1,90 @@ +
    +
    Players
    + +
    +
    +
    +
    + +
    + {{ getPlayerName(player) }} +
    +
    +
    + + +
    +
    + +
    + {{ PlayerTypeDefinitions.playerTypeLookup[definition(player).playerType] }} + @if (definition(player).playerType === PlayerType.NetworkOpen) { + + } +
    +
    + + @if(teams.length){ +
    + + +
    + } +
    + + +
    + +
    +
     
    + +
    +
    +
    + + +
    diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/player-definition/player-definition.component.scss b/apps/client/src/app/probable-waffle/gui/lobby/player-definition/player-definition.component.scss similarity index 92% rename from apps/client/src/app/probable-waffle/gui/skirmish/player-definition/player-definition.component.scss rename to apps/client/src/app/probable-waffle/gui/lobby/player-definition/player-definition.component.scss index 0266c7b6..532b64d9 100644 --- a/apps/client/src/app/probable-waffle/gui/skirmish/player-definition/player-definition.component.scss +++ b/apps/client/src/app/probable-waffle/gui/lobby/player-definition/player-definition.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../styles/_variables'; +@import "../../../../../styles/_variables"; .start-position-container { .player-rows { diff --git a/apps/client/src/app/probable-waffle/gui/lobby/player-definition/player-definition.component.spec.ts b/apps/client/src/app/probable-waffle/gui/lobby/player-definition/player-definition.component.spec.ts new file mode 100644 index 00000000..f5c52877 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/player-definition/player-definition.component.spec.ts @@ -0,0 +1,32 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; + +import { PlayerDefinitionComponent } from "./player-definition.component"; +import { FontAwesomeTestingModule } from "@fortawesome/angular-fontawesome/testing"; +import { FormsModule } from "@angular/forms"; +import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../../communicators/game-instance-client.service.spec"; + +@Component({ selector: "probable-waffle-player-definition", template: "", standalone: true, imports: [CommonModule] }) +export class PlayerDefinitionTestingComponent {} + +describe("PlayerDefinitionComponent", () => { + let component: PlayerDefinitionComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [PlayerDefinitionComponent, FontAwesomeTestingModule, FormsModule], + providers: [{ provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }] + }).compileComponents(); + + fixture = TestBed.createComponent(PlayerDefinitionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/lobby/player-definition/player-definition.component.ts b/apps/client/src/app/probable-waffle/gui/lobby/player-definition/player-definition.component.ts new file mode 100644 index 00000000..899893be --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/player-definition/player-definition.component.ts @@ -0,0 +1,199 @@ +import { Component, inject } from "@angular/core"; +import { FactionDefinitions } from "../../../game/player/faction-definitions"; +import { faSpinner } from "@fortawesome/free-solid-svg-icons"; +import { + GameSetupHelpers, + PositionPlayerDefinition, + ProbableWaffleAiDifficulty, + ProbableWaffleGameInstanceType, + ProbableWaffleLevels, + ProbableWaffleMapData, + ProbableWafflePlayer, + ProbableWafflePlayerDataChangeEventProperty, + ProbableWafflePlayerType +} from "@fuzzy-waddle/api-interfaces"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { CommonModule } from "@angular/common"; +import { FormsModule } from "@angular/forms"; +import { FaIconComponent } from "@fortawesome/angular-fontawesome"; + +export class PlayerTypeDefinitions { + static playerTypes = [ + { value: ProbableWafflePlayerType.Human, name: "Human" }, + { value: ProbableWafflePlayerType.AI, name: "AI" }, + { value: ProbableWafflePlayerType.NetworkOpen, name: "Network Open" } + ]; + static playerTypeLookup = { + [ProbableWafflePlayerType.Human]: "Human", + [ProbableWafflePlayerType.AI]: "A.I.", + [ProbableWafflePlayerType.NetworkOpen]: "Network Open" + }; +} + +export class DifficultyDefinitions { + static difficulties = [ + { name: "Easy", value: ProbableWaffleAiDifficulty.Easy }, + { name: "Normal", value: ProbableWaffleAiDifficulty.Medium }, + { name: "Hard", value: ProbableWaffleAiDifficulty.Hard } + ]; +} + +@Component({ + selector: "probable-waffle-player-definition", + templateUrl: "./player-definition.component.html", + styleUrls: ["./player-definition.component.scss"], + standalone: true, + imports: [CommonModule, FormsModule, FaIconComponent] +}) +export class PlayerDefinitionComponent { + protected readonly gameInstanceClientService = inject(GameInstanceClientService); + protected readonly faSpinner = faSpinner; + protected PlayerTypeDefinitions = PlayerTypeDefinitions; + protected PlayerType = ProbableWafflePlayerType; + protected FactionDefinitions = FactionDefinitions; + protected DifficultyDefinitions = DifficultyDefinitions; + + protected async addAiPlayer() { + await this.gameInstanceClientService.addAiPlayer(); + } + + protected async openMpSlot() { + await this.gameInstanceClientService.playerSlotOpened(); + } + + protected async removePlayer(playerNumber: number) { + await this.gameInstanceClientService.removePlayer(playerNumber); + } + + get allowOpenSlotForMp(): boolean { + return ( + this.gameInstanceClientService.gameInstance?.gameInstanceMetadata!.data.type === + ProbableWaffleGameInstanceType.SelfHosted ?? false + ); + } + + definition(player: ProbableWafflePlayer): PositionPlayerDefinition { + return player.playerController.data.playerDefinition!; + } + + get mapDetails(): ProbableWaffleMapData | null { + if (!this.map) return null; + // noinspection UnnecessaryLocalVariableJS + const mapData = ProbableWaffleLevels[this.map]; + return mapData; + } + + get map() { + return this.gameInstanceClientService.gameInstance?.gameMode?.data.map; + } + + get teams(): (undefined | number)[] { + if (!this.mapDetails) return []; + const teams: (undefined | number)[] = this.playerPositions; + teams.unshift(undefined); + return teams; + } + + getColorForPlayer(player: ProbableWafflePlayer): string { + return GameSetupHelpers.getColorForPlayer( + player.playerNumber!, + this.mapDetails!.mapInfo!.startPositionsOnTile.length + ); + } + + get playerPositions(): number[] { + // noinspection UnnecessaryLocalVariableJS + const positions = new Array(this.mapDetails!.mapInfo!.startPositionsOnTile.length) + .fill(0) + .map((n, index) => index + 1); + return positions; + } + + get players(): ProbableWafflePlayer[] { + // noinspection UnnecessaryLocalVariableJS + const players = this.gameInstanceClientService.gameInstance?.players ?? []; + return players; + } + + get allFilled() { + return this.players.length === this.playerPositions.length; + } + + protected onValueChange(property: ProbableWafflePlayerDataChangeEventProperty, player: ProbableWafflePlayer) { + // timeout so ngModelChange can finish + setTimeout(async () => { + const playerDefinition = this.definition(player); + switch (property) { + case "playerController.data.playerDefinition.factionType" as ProbableWafflePlayerDataChangeEventProperty: + const factionType = playerDefinition.factionType; + await this.gameInstanceClientService.playerChanged(property, { + playerNumber: player.playerNumber, + playerControllerData: { playerDefinition: { factionType } as PositionPlayerDefinition } + }); + break; + case "playerController.data.playerDefinition.team" as ProbableWafflePlayerDataChangeEventProperty: + const team = playerDefinition.team; + await this.gameInstanceClientService.playerChanged(property, { + playerNumber: player.playerNumber, + playerControllerData: { playerDefinition: { team } as PositionPlayerDefinition } + }); + break; + case "playerController.data.playerDefinition.difficulty" as ProbableWafflePlayerDataChangeEventProperty: + const difficulty = playerDefinition.difficulty; + await this.gameInstanceClientService.playerChanged(property, { + playerNumber: player.playerNumber, + playerControllerData: { playerDefinition: { difficulty } as PositionPlayerDefinition } + }); + break; + default: + throw new Error(`Unhandled property ${property}`); + } + console.log("player state changed", property); + }, 50); + } + + changeFaction(player: ProbableWafflePlayer) { + this.onValueChange( + "playerController.data.playerDefinition.factionType" as ProbableWafflePlayerDataChangeEventProperty, + player + ); + } + + changeTeam(player: ProbableWafflePlayer) { + this.onValueChange( + "playerController.data.playerDefinition.team" as ProbableWafflePlayerDataChangeEventProperty, + player + ); + } + + changeDifficulty(player: ProbableWafflePlayer) { + this.onValueChange( + "playerController.data.playerDefinition.difficulty" as ProbableWafflePlayerDataChangeEventProperty, + player + ); + } + + getPlayerName(player: ProbableWafflePlayer) { + const playerNumber = player.playerNumber!; + const isCurrentPlayer = this.getPlayerIsCurrentPlayer(player); + // noinspection UnnecessaryLocalVariableJS + const name = isCurrentPlayer ? "You" : `Player ${playerNumber + 1}`; + return name; + } + + getPlayerIsCurrentPlayer(player: ProbableWafflePlayer) { + const currentPlayerNumber = this.gameInstanceClientService.currentPlayerNumber; + const playerNumber = player.playerNumber; + // noinspection UnnecessaryLocalVariableJS + const isCurrentPlayer = currentPlayerNumber === playerNumber; + return isCurrentPlayer; + } + + getPlayerIsCreator(player: ProbableWafflePlayer) { + const creatorUserId = this.gameInstanceClientService.gameInstance?.gameInstanceMetadata!.data.createdBy; + const userId = player.playerController.data.userId; + // noinspection UnnecessaryLocalVariableJS + const isCreator = creatorUserId === userId; + return isCreator; + } +} diff --git a/apps/client/src/app/probable-waffle/gui/lobby/spectators-grid/spectators-grid.component.html b/apps/client/src/app/probable-waffle/gui/lobby/spectators-grid/spectators-grid.component.html new file mode 100644 index 00000000..6143be88 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/spectators-grid/spectators-grid.component.html @@ -0,0 +1,12 @@ +@if (gameInstanceClientService.gameInstance?.spectators?.length) { +
    +
    Spectators
    +
    + @for (spectator of gameInstanceClientService.gameInstance!.spectators;track spectator; let idx = $index) { +
    +
    {{ "Spectator " + (idx + 1) }}
    +
    + } +
    +
    +} diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/trigger/trigger.component.scss b/apps/client/src/app/probable-waffle/gui/lobby/spectators-grid/spectators-grid.component.scss similarity index 100% rename from apps/client/src/app/probable-waffle/gui/skirmish/trigger/trigger.component.scss rename to apps/client/src/app/probable-waffle/gui/lobby/spectators-grid/spectators-grid.component.scss diff --git a/apps/client/src/app/probable-waffle/gui/lobby/spectators-grid/spectators-grid.component.spec.ts b/apps/client/src/app/probable-waffle/gui/lobby/spectators-grid/spectators-grid.component.spec.ts new file mode 100644 index 00000000..9f64a607 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/spectators-grid/spectators-grid.component.spec.ts @@ -0,0 +1,29 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; +import { SpectatorsGridComponent } from "./spectators-grid.component"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../../communicators/game-instance-client.service.spec"; +import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; + +@Component({ selector: "probable-waffle-spectators-grid", template: "", standalone: true, imports: [CommonModule] }) +export class SpectatorsGridTestingComponent {} + +describe("SpectatorsGridComponent", () => { + let component: SpectatorsGridComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [{ provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }], + imports: [SpectatorsGridComponent] + }).compileComponents(); + + fixture = TestBed.createComponent(SpectatorsGridComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/lobby/spectators-grid/spectators-grid.component.ts b/apps/client/src/app/probable-waffle/gui/lobby/spectators-grid/spectators-grid.component.ts new file mode 100644 index 00000000..0dd6ff28 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/spectators-grid/spectators-grid.component.ts @@ -0,0 +1,14 @@ +import { Component, inject } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; + +@Component({ + selector: "probable-waffle-spectators-grid", + standalone: true, + imports: [CommonModule], + templateUrl: "./spectators-grid.component.html", + styleUrls: ["./spectators-grid.component.scss"] +}) +export class SpectatorsGridComponent { + protected readonly gameInstanceClientService = inject(GameInstanceClientService); +} diff --git a/apps/client/src/app/probable-waffle/gui/lobby/trigger/trigger.component.html b/apps/client/src/app/probable-waffle/gui/lobby/trigger/trigger.component.html new file mode 100644 index 00000000..1f2fe336 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/trigger/trigger.component.html @@ -0,0 +1,11 @@ +
    + + +
    diff --git a/apps/client/src/app/probable-waffle/gui/lobby/trigger/trigger.component.scss b/apps/client/src/app/probable-waffle/gui/lobby/trigger/trigger.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/apps/client/src/app/probable-waffle/gui/lobby/trigger/trigger.component.spec.ts b/apps/client/src/app/probable-waffle/gui/lobby/trigger/trigger.component.spec.ts new file mode 100644 index 00000000..9bdf13ec --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/trigger/trigger.component.spec.ts @@ -0,0 +1,30 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; +import { TriggerComponent } from "./trigger.component"; +import { RouterTestingModule } from "@angular/router/testing"; +import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { gameInstanceClientServiceStub } from "../../../communicators/game-instance-client.service.spec"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; + +@Component({ selector: "probable-waffle-trigger", template: "", standalone: true, imports: [CommonModule] }) +export class TriggerTestingComponent {} + +describe("TriggerComponent", () => { + let component: TriggerComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [TriggerComponent, RouterTestingModule], + providers: [{ provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }] + }).compileComponents(); + + fixture = TestBed.createComponent(TriggerComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/lobby/trigger/trigger.component.ts b/apps/client/src/app/probable-waffle/gui/lobby/trigger/trigger.component.ts new file mode 100644 index 00000000..e2247d03 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/lobby/trigger/trigger.component.ts @@ -0,0 +1,43 @@ +import { Component, inject } from "@angular/core"; +import { Router } from "@angular/router"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { CommonModule } from "@angular/common"; + +@Component({ + selector: "probable-waffle-trigger", + templateUrl: "./trigger.component.html", + styleUrls: ["./trigger.component.scss"], + standalone: true, + imports: [CommonModule] +}) +export class TriggerComponent { + protected readonly gameInstanceClientService = inject(GameInstanceClientService); + private readonly router = inject(Router); + + protected get mapSelected(): boolean { + return !!this.gameInstanceClientService.gameInstance?.gameMode?.data.map; + } + + /** + * at least two players selected and at least two different teams + */ + protected get atLeastTwoPlayersAndDifferentTeamsSelected(): boolean { + const players = this.gameInstanceClientService.gameInstance!.players; + const playerPositions = players.map((player) => player.playerController.data.playerDefinition!); + const selectedPlayers = playerPositions.filter((startPosition) => startPosition.player.joined); + const selectedEmptyTeams = playerPositions.filter( + (startPosition) => !startPosition.team && startPosition.player.joined + ); + const selectedTeams = playerPositions.filter((startPosition) => !startPosition.team && startPosition.player.joined); + const selectedTeamsSet = new Set(selectedTeams.map((startPosition) => startPosition.team)); + return selectedPlayers.length >= 2 && selectedEmptyTeams.length + selectedTeamsSet.size >= 2; + } + + protected async start() { + await this.gameInstanceClientService.startGame(); + } + + protected async leaveClick() { + await this.router.navigate(["probable-waffle"]); + } +} diff --git a/apps/client/src/app/probable-waffle/gui/main/level.guard.ts b/apps/client/src/app/probable-waffle/gui/main/level.guard.ts new file mode 100644 index 00000000..20a09eda --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/main/level.guard.ts @@ -0,0 +1,22 @@ +import { inject, Injectable } from "@angular/core"; +import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router"; +import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; + +@Injectable({ + providedIn: "root" +}) +export class LevelGuard implements CanActivate { + private readonly router = inject(Router); + private readonly gameInstanceClientService = inject(GameInstanceClientService); + canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean { + const map = this.gameInstanceClientService.gameInstance?.gameMode?.data.map; + if (map) { + // Map exists, allow navigation + return true; + } else { + console.error("Map doesn't exist in LevelGuard"); + this.router.navigate(["/probable-waffle"]); + return false; + } + } +} diff --git a/apps/client/src/app/probable-waffle/gui/main/probable-waffle-game.component.html b/apps/client/src/app/probable-waffle/gui/main/probable-waffle-game.component.html new file mode 100644 index 00000000..7a5ae6c7 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/main/probable-waffle-game.component.html @@ -0,0 +1,3 @@ +@if(gameData){ + +} diff --git a/apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game.component.scss b/apps/client/src/app/probable-waffle/gui/main/probable-waffle-game.component.scss similarity index 100% rename from apps/client/src/app/probable-waffle/gui/game-interface/main/probable-waffle-game.component.scss rename to apps/client/src/app/probable-waffle/gui/main/probable-waffle-game.component.scss diff --git a/apps/client/src/app/probable-waffle/gui/main/probable-waffle-game.component.spec.ts b/apps/client/src/app/probable-waffle/gui/main/probable-waffle-game.component.spec.ts new file mode 100644 index 00000000..222c6b6c --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/main/probable-waffle-game.component.spec.ts @@ -0,0 +1,40 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; + +import { ProbableWaffleGameComponent } from "./probable-waffle-game.component"; +import { GameContainerTestingComponent } from "../../../shared/game/game-container/game-container.component.spec"; +import { gameInstanceClientServiceStub } from "../../communicators/game-instance-client.service.spec"; +import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; +import { GameContainerComponent } from "../../../shared/game/game-container/game-container.component"; + +jest.mock("../../game/world/const/game-config", () => ({ + probableWaffleGameConfig: {} +})); + +describe("ProbableWaffleGameComponent", () => { + let component: ProbableWaffleGameComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [{ provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }], + imports: [ProbableWaffleGameComponent] + }) + .overrideComponent(ProbableWaffleGameComponent, { + remove: { + imports: [GameContainerComponent] + }, + add: { + imports: [GameContainerTestingComponent] + } + }) + .compileComponents(); + + fixture = TestBed.createComponent(ProbableWaffleGameComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 00000000..a75345b1 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/main/probable-waffle-game.component.ts @@ -0,0 +1,38 @@ +import { Component, inject, OnInit } from "@angular/core"; +import { ProbableWaffleGameInstance, ProbableWaffleUserInfo } from "@fuzzy-waddle/api-interfaces"; +import { BaseGameData } from "../../../shared/game/phaser/game/base-game-data"; +import { ProbableWaffleCommunicatorService } from "../../communicators/probable-waffle-communicator.service"; +import { AuthService } from "../../../auth/auth.service"; +import { probableWaffleGameConfig } from "../../game/world/const/game-config"; +import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; +import { CommonModule } from "@angular/common"; +import { GameContainerComponent } from "../../../shared/game/game-container/game-container.component"; + +@Component({ + templateUrl: "./probable-waffle-game.component.html", + styleUrls: ["./probable-waffle-game.component.scss"], + standalone: true, + imports: [CommonModule, GameContainerComponent] +}) +export class ProbableWaffleGameComponent implements OnInit { + protected readonly probableWaffleGameConfig = probableWaffleGameConfig; + protected gameData?: BaseGameData< + ProbableWaffleCommunicatorService, + ProbableWaffleGameInstance, + ProbableWaffleUserInfo + >; + + private readonly gameInstanceClientService = inject(GameInstanceClientService); + private readonly communicatorService = inject(ProbableWaffleCommunicatorService); + private readonly authService = inject(AuthService); + + ngOnInit(): void { + const gameInstance = this.gameInstanceClientService.gameInstance; + if (!gameInstance) return; + this.gameData = { + gameInstance, + communicator: this.communicatorService, + user: new ProbableWaffleUserInfo(this.authService.userId, this.gameInstanceClientService.currentPlayerNumber) + } as const; + } +} diff --git a/apps/client/src/app/probable-waffle/gui/main/probable-waffle-routing.module.ts b/apps/client/src/app/probable-waffle/gui/main/probable-waffle-routing.module.ts deleted file mode 100644 index 43be19ac..00000000 --- a/apps/client/src/app/probable-waffle/gui/main/probable-waffle-routing.module.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { SkirmishComponent } from '../skirmish/skirmish.component'; -import { HomeComponent } from '../home/home.component'; -import { ProbableWaffleComponent } from './probable-waffle.component'; -import { ProgressComponent } from '../progress/progress.component'; -import { OptionsComponent } from '../options/options.component'; -import { OnlineComponent } from '../online/online.component'; -import { CampaignComponent } from '../campaign/campaign.component'; -import { EditorComponent } from '../editor/editor.component'; - -const routes: Routes = [ - { - path: '', - component: ProbableWaffleComponent, - children: [ - { - path: '', - component: HomeComponent - }, - { - path: 'campaign', - component: CampaignComponent - }, - { - path: 'online', - component: OnlineComponent - }, - { - path: 'skirmish', - component: SkirmishComponent - }, - { - path: 'editor', - component: EditorComponent - }, - { - path: 'progress', - component: ProgressComponent - }, - { - path: 'options', - component: OptionsComponent - }, - { - path: 'game', - loadChildren: () => - import('../game-interface/main/probable-waffle-game.module').then((m) => m.ProbableWaffleGameModule) - } - ] - }, - { path: '**', redirectTo: 'home' } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class ProbableWaffleRoutingModule {} diff --git a/apps/client/src/app/probable-waffle/gui/main/probable-waffle.component.html b/apps/client/src/app/probable-waffle/gui/main/probable-waffle.component.html deleted file mode 100644 index 7dd570e8..00000000 --- a/apps/client/src/app/probable-waffle/gui/main/probable-waffle.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/client/src/app/probable-waffle/gui/main/probable-waffle.component.spec.ts b/apps/client/src/app/probable-waffle/gui/main/probable-waffle.component.spec.ts deleted file mode 100644 index 458e2f77..00000000 --- a/apps/client/src/app/probable-waffle/gui/main/probable-waffle.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ProbableWaffleComponent } from './probable-waffle.component'; -import { RouterTestingModule } from '@angular/router/testing'; - -describe('ProbableWaffleComponent', () => { - let component: ProbableWaffleComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ProbableWaffleComponent], - imports: [RouterTestingModule] - }).compileComponents(); - - fixture = TestBed.createComponent(ProbableWaffleComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/probable-waffle/gui/main/probable-waffle.component.ts b/apps/client/src/app/probable-waffle/gui/main/probable-waffle.component.ts deleted file mode 100644 index 5947e453..00000000 --- a/apps/client/src/app/probable-waffle/gui/main/probable-waffle.component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Component } from '@angular/core'; -import { GameInstanceService } from '../../communicators/game-instance.service'; - -@Component({ - selector: 'fuzzy-waddle-probable-waffle', - templateUrl: './probable-waffle.component.html', - styleUrls: ['./probable-waffle.component.scss'] -}) -export class ProbableWaffleComponent { - constructor(private gameInstanceService: GameInstanceService) {} -} diff --git a/apps/client/src/app/probable-waffle/gui/main/probable-waffle.module.ts b/apps/client/src/app/probable-waffle/gui/main/probable-waffle.module.ts deleted file mode 100644 index 31a31694..00000000 --- a/apps/client/src/app/probable-waffle/gui/main/probable-waffle.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule, NgOptimizedImage } from '@angular/common'; -import { ProbableWaffleRoutingModule } from './probable-waffle-routing.module'; -import { ProbableWaffleComponent } from './probable-waffle.component'; -import { ProgressComponent } from '../progress/progress.component'; -import { SkirmishModule } from '../skirmish/skirmish.module'; -import { HomeModule } from '../home/home.module'; -import { FormsModule } from '@angular/forms'; -import { OnlineModule } from '../online/online.module'; -import { EditorComponent } from '../editor/editor.component'; -import { CampaignComponent } from '../campaign/campaign.component'; -import { OptionsComponent } from '../options/options.component'; -import { ComponentsModule } from '../../../shared/components/components.module'; - -@NgModule({ - declarations: [ProbableWaffleComponent, ProgressComponent, EditorComponent, CampaignComponent, OptionsComponent], - imports: [ - CommonModule, - ProbableWaffleRoutingModule, - SkirmishModule, - HomeModule, - FormsModule, - SkirmishModule, - OnlineModule, - ComponentsModule, - NgOptimizedImage - ] -}) -export class ProbableWaffleModule {} diff --git a/apps/client/src/app/probable-waffle/gui/online/host/host.component.html b/apps/client/src/app/probable-waffle/gui/online/host/host.component.html index 8895b0f4..88a9a896 100644 --- a/apps/client/src/app/probable-waffle/gui/online/host/host.component.html +++ b/apps/client/src/app/probable-waffle/gui/online/host/host.component.html @@ -1 +1,27 @@ - +
    +
    Game Setup
    + +
    + + +
    + +
    + + +
    + + +
    diff --git a/apps/client/src/app/probable-waffle/gui/online/host/host.component.scss b/apps/client/src/app/probable-waffle/gui/online/host/host.component.scss index e69de29b..9951c193 100644 --- a/apps/client/src/app/probable-waffle/gui/online/host/host.component.scss +++ b/apps/client/src/app/probable-waffle/gui/online/host/host.component.scss @@ -0,0 +1,5 @@ +.lobby-host { + max-width: 500px; + margin-left: auto; + margin-right: auto; +} diff --git a/apps/client/src/app/probable-waffle/gui/online/host/host.component.spec.ts b/apps/client/src/app/probable-waffle/gui/online/host/host.component.spec.ts index faab6fc5..cf072cb3 100644 --- a/apps/client/src/app/probable-waffle/gui/online/host/host.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/online/host/host.component.spec.ts @@ -1,23 +1,42 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { HostComponent } from './host.component'; -import { SkirmishTestingComponent } from '../../skirmish/skirmish.component.spec'; +import { HostComponent } from "./host.component"; +import { LobbyTestingComponent } from "../../lobby/lobby.component.spec"; +import { Component } from "@angular/core"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../../communicators/game-instance-client.service.spec"; +import { FormsModule } from "@angular/forms"; +import { CommonModule } from "@angular/common"; +import { LobbyComponent } from "../../lobby/lobby.component"; -describe('HostComponent', () => { +@Component({ selector: "probable-waffle-host", template: "", standalone: true, imports: [CommonModule] }) +export class HostTestingComponent {} + +describe("HostComponent", () => { let component: HostComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [HostComponent, SkirmishTestingComponent] - }).compileComponents(); + providers: [{ provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }], + imports: [HostComponent, FormsModule] + }) + .overrideComponent(HostComponent, { + remove: { + imports: [LobbyComponent] + }, + add: { + imports: [LobbyTestingComponent] + } + }) + .compileComponents(); fixture = TestBed.createComponent(HostComponent); component = fixture.componentInstance; fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/probable-waffle/gui/online/host/host.component.ts b/apps/client/src/app/probable-waffle/gui/online/host/host.component.ts index 5b4c19cb..f101e197 100644 --- a/apps/client/src/app/probable-waffle/gui/online/host/host.component.ts +++ b/apps/client/src/app/probable-waffle/gui/online/host/host.component.ts @@ -1,8 +1,36 @@ -import { Component } from '@angular/core'; +import { Component, inject } from "@angular/core"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { ProbableWaffleGameInstanceType, ProbableWaffleGameInstanceVisibility } from "@fuzzy-waddle/api-interfaces"; +import { Router } from "@angular/router"; +import { CommonModule } from "@angular/common"; +import { FormsModule } from "@angular/forms"; @Component({ - selector: 'fuzzy-waddle-host', - templateUrl: './host.component.html', - styleUrls: ['./host.component.scss'] + selector: "probable-waffle-host", + templateUrl: "./host.component.html", + styleUrls: ["./host.component.scss"], + standalone: true, + imports: [CommonModule, FormsModule] }) -export class HostComponent {} +export class HostComponent { + protected readonly gameInstanceClientService = inject(GameInstanceClientService); + private readonly router = inject(Router); + + protected gameModeLobby: { + lobbyName: string; + visibility: ProbableWaffleGameInstanceVisibility; + } = { + lobbyName: "", + visibility: ProbableWaffleGameInstanceVisibility.Public + }; + + protected async createLobby() { + await this.gameInstanceClientService.createGameInstance( + this.gameModeLobby.lobbyName, + this.gameModeLobby.visibility, + ProbableWaffleGameInstanceType.SelfHosted + ); + await this.gameInstanceClientService.addSelfAsPlayer(); + await this.gameInstanceClientService.navigateToLobbyOrDirectlyToGame(); + } +} diff --git a/apps/client/src/app/probable-waffle/gui/online/lobbies/lobbies.component.html b/apps/client/src/app/probable-waffle/gui/online/lobbies/lobbies.component.html index 54563406..a2136a60 100644 --- a/apps/client/src/app/probable-waffle/gui/online/lobbies/lobbies.component.html +++ b/apps/client/src/app/probable-waffle/gui/online/lobbies/lobbies.component.html @@ -1,58 +1,87 @@
    -
    Open Lobbies
    -

    Browse currently open game lobbies to join

    +
    Browse currently open game lobbies to join or spectate
    + + @if (roomsService.rooms().length === 0) { +
    No open lobbies
    +
    + +
    + }@else{
    - Filter: -
    - - -
    + +
    - +
    + - - - - + + +
    Name MapHost Players
    {{ lobby.map }}{{ lobby.host }}{{ lobby.players.length }}{{ room.gameInstanceMetadataData.name }} + @if(room.gameModeData && mapInfoOfMap(room.gameModeData.map)){ + {{ mapInfoOfMap(room.gameModeData.map)?.name }} + } + @if(room.gameModeData && mapInfoOfMap(room.gameModeData.map)){ + {{ + ProbableWaffleRoomHelper.getActivatedPlayersInRoom(room).length + + "/" + + (mapInfoOfMap(room.gameModeData.map)?.mapInfo!.startPositionsOnTile.length) + }} + } +
    -
    + @if (selectedRoom) { +
    +
    + map preview +
    {{ mapInfo!.presentation.description }}
    +
    -
    Map Preview
    - map preview -
    Map Description
    +
    Joined players
    + @for (player of ProbableWaffleRoomHelper.getActivatedPlayersInRoom(selectedRoom);track player) { +
    {{ player.controllerData.playerDefinition!.player.playerName }}
    + }
    + @if(selectedRoom.spectators.length){
    -
    Joined players
    -
    Player 1
    -
    Player 2
    +
    Joined spectators
    +
    {{ selectedRoom.spectators.length }}
    + }
    + }
    - + +
    + }
    diff --git a/apps/client/src/app/probable-waffle/gui/online/lobbies/lobbies.component.scss b/apps/client/src/app/probable-waffle/gui/online/lobbies/lobbies.component.scss index 9f0cdb42..378abd5d 100644 --- a/apps/client/src/app/probable-waffle/gui/online/lobbies/lobbies.component.scss +++ b/apps/client/src/app/probable-waffle/gui/online/lobbies/lobbies.component.scss @@ -1,5 +1,19 @@ +@import "../../../../../styles/_variables"; + .lobbies { max-width: 500px; margin-left: auto; margin-right: auto; } + +.selected-row td { + background-color: $primary; + color: white; +} + +.lobbies-tooltip { + font-style: italic; + font-size: 0.8em; + margin-bottom: 10px; + text-align: center; +} diff --git a/apps/client/src/app/probable-waffle/gui/online/lobbies/lobbies.component.spec.ts b/apps/client/src/app/probable-waffle/gui/online/lobbies/lobbies.component.spec.ts index 9fcbd6aa..27f07076 100644 --- a/apps/client/src/app/probable-waffle/gui/online/lobbies/lobbies.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/online/lobbies/lobbies.component.spec.ts @@ -1,14 +1,40 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { LobbiesComponent } from './lobbies.component'; +import { LobbiesComponent } from "./lobbies.component"; +import { Component } from "@angular/core"; +import { roomsServiceStub } from "../../../communicators/rooms/rooms.service.spec"; +import { ServerHealthService } from "../../../../shared/services/server-health.service"; +import { serverHealthServiceStub } from "../../../../shared/services/server-health.service.spec"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../../communicators/game-instance-client.service.spec"; +import { RoomsService } from "../../../communicators/rooms/rooms.service"; +import { FontAwesomeTestingModule } from "@fortawesome/angular-fontawesome/testing"; +import { CommonModule } from "@angular/common"; -describe('LobbiesComponent', () => { +@Component({ selector: "probable-waffle-lobbies", template: "", standalone: true, imports: [CommonModule] }) +export class LobbiesTestingComponent {} + +describe("LobbiesComponent", () => { let component: LobbiesComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [LobbiesComponent] + providers: [ + { + provide: RoomsService, + useValue: roomsServiceStub + }, + { + provide: ServerHealthService, + useValue: serverHealthServiceStub + }, + { + provide: GameInstanceClientService, + useValue: gameInstanceClientServiceStub + } + ], + imports: [LobbiesComponent, FontAwesomeTestingModule] }).compileComponents(); fixture = TestBed.createComponent(LobbiesComponent); @@ -16,7 +42,7 @@ describe('LobbiesComponent', () => { fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/probable-waffle/gui/online/lobbies/lobbies.component.ts b/apps/client/src/app/probable-waffle/gui/online/lobbies/lobbies.component.ts index 5d0aae02..b67f45e2 100644 --- a/apps/client/src/app/probable-waffle/gui/online/lobbies/lobbies.component.ts +++ b/apps/client/src/app/probable-waffle/gui/online/lobbies/lobbies.component.ts @@ -1,70 +1,98 @@ -import { Component, OnInit } from '@angular/core'; -import { MapIds, Maps } from '../../../game/world/scenes/scenes'; - -type Lobby = { - host: string; - players: { - name: string; - }[]; - map: MapIds; -}; +import { Component, EventEmitter, inject, OnDestroy, OnInit, Output } from "@angular/core"; +import { + ProbableWaffleLevels, + ProbableWaffleMapData, + ProbableWaffleMapEnum, + ProbableWafflePlayerType, + ProbableWaffleRoom, + ProbableWaffleRoomHelper +} from "@fuzzy-waddle/api-interfaces"; +import { RoomsService } from "../../../communicators/rooms/rooms.service"; +import { ServerHealthService } from "../../../../shared/services/server-health.service"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { faFilter } from "@fortawesome/free-solid-svg-icons"; +import { Router } from "@angular/router"; +import { CommonModule } from "@angular/common"; +import { FaIconComponent } from "@fortawesome/angular-fontawesome"; +import { MapFilterComponent } from "./map-filter/map-filter.component"; @Component({ - selector: 'fuzzy-waddle-lobbies', - templateUrl: './lobbies.component.html', - styleUrls: ['./lobbies.component.scss'] + selector: "probable-waffle-lobbies", + templateUrl: "./lobbies.component.html", + styleUrls: ["./lobbies.component.scss"], + standalone: true, + imports: [CommonModule, FaIconComponent, MapFilterComponent] }) -export class LobbiesComponent implements OnInit { - Maps = Maps; - lobbies: Lobby[] = []; - selectedLobby?: Lobby; +export class LobbiesComponent implements OnInit, OnDestroy { + protected readonly ProbableWaffleRoomHelper = ProbableWaffleRoomHelper; + protected readonly faFilter = faFilter; + protected isFilterPopupOpen: boolean = false; + protected selectedRoom?: ProbableWaffleRoom; + protected readonly roomsService = inject(RoomsService); + protected readonly serverHealthService = inject(ServerHealthService); + protected readonly gameInstanceClientService = inject(GameInstanceClientService); + protected readonly router = inject(Router); + @Output() requestNavigateToHostLobby: EventEmitter = new EventEmitter(); + + async ngOnInit(): Promise { + await this.roomsService.init(); + } + + ngOnDestroy(): void { + this.roomsService.destroy(); + } + + protected canAddSelfAsPlayer(): boolean { + if (!this.selectedRoom) return false; + return this.selectedRoom.players.some( + (player) => player.controllerData.playerDefinition?.playerType === ProbableWafflePlayerType.NetworkOpen + ); + } - ngOnInit(): void { - this.pull(); + protected canAddSelfAsSpectator(): boolean { + return !!this.selectedRoom; } - pull = () => { - // todo - pull lobbies from server - this.lobbies = [ - { - host: 'host1', - players: [ - { - name: 'player1' - }, - { - name: 'player2' - } - ], - map: MapIds.GrasslandSmall - }, - { - host: 'host2', - players: [ - { - name: 'player3' - }, - { - name: 'player4' - } - ], - map: MapIds.GrasslandLarge - } - ]; - }; + protected async addSelfAsPlayer() { + if (!this.selectedRoom?.gameInstanceMetadataData?.gameInstanceId) return; + await this.gameInstanceClientService.joinGameInstanceAsPlayer( + this.selectedRoom.gameInstanceMetadataData.gameInstanceId + ); + await this.gameInstanceClientService.navigateToLobbyOrDirectlyToGame(); + } - join() { - // todo - do something with this.selectedLobby + protected async addSelfAsSpectator() { + if (!this.selectedRoom?.gameInstanceMetadataData?.gameInstanceId) return; + await this.gameInstanceClientService.joinGameInstanceAsSpectator( + this.selectedRoom.gameInstanceMetadataData.gameInstanceId + ); + await this.gameInstanceClientService.navigateToLobbyOrDirectlyToGame(); } - select(lobby: Lobby) { - this.selectedLobby = lobby; + protected select(room: ProbableWaffleRoom) { + this.selectedRoom = room; } - filter($event: Event) { - // todo - filter lobbies + protected toggleFilterPopup(): void { + this.isFilterPopupOpen = !this.isFilterPopupOpen; + } + + protected async filter(maps: ProbableWaffleMapEnum[]): Promise { + // Handle the filter logic here + await this.roomsService.getRooms(maps); + } + + protected get mapInfo(): null | ProbableWaffleMapData { + if (!this.selectedRoom) return null; + return this.mapInfoOfMap(this.selectedRoom.gameModeData?.map); + } + + protected mapInfoOfMap(map?: ProbableWaffleMapEnum): null | ProbableWaffleMapData { + if (!map) return null; + return ProbableWaffleLevels[map]; + } - const mapId = ($event.target as HTMLInputElement).value; - console.log(mapId); + protected navigateToCreateLobby() { + this.requestNavigateToHostLobby.emit(); } } diff --git a/apps/client/src/app/probable-waffle/gui/online/lobbies/map-filter/map-filter.component.html b/apps/client/src/app/probable-waffle/gui/online/lobbies/map-filter/map-filter.component.html new file mode 100644 index 00000000..2734ed6b --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/online/lobbies/map-filter/map-filter.component.html @@ -0,0 +1,13 @@ +
    +
    + + +
    +
    diff --git a/apps/client/src/app/probable-waffle/gui/online/lobbies/map-filter/map-filter.component.scss b/apps/client/src/app/probable-waffle/gui/online/lobbies/map-filter/map-filter.component.scss new file mode 100644 index 00000000..5db2a5ee --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/online/lobbies/map-filter/map-filter.component.scss @@ -0,0 +1,11 @@ +.filter-popup { + background-color: #fff; + border: 1px solid #ccc; + padding: 10px; + position: absolute; + z-index: 1000; +} + +input { + margin-right: 5px; +} diff --git a/apps/client/src/app/probable-waffle/gui/online/lobbies/map-filter/map-filter.component.spec.ts b/apps/client/src/app/probable-waffle/gui/online/lobbies/map-filter/map-filter.component.spec.ts new file mode 100644 index 00000000..0452f457 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/online/lobbies/map-filter/map-filter.component.spec.ts @@ -0,0 +1,21 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; +import { MapFilterComponent } from "./map-filter.component"; + +describe("MapFilterComponent", () => { + let component: MapFilterComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [MapFilterComponent] + }).compileComponents(); + + fixture = TestBed.createComponent(MapFilterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/online/lobbies/map-filter/map-filter.component.ts b/apps/client/src/app/probable-waffle/gui/online/lobbies/map-filter/map-filter.component.ts new file mode 100644 index 00000000..5fd520f2 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/online/lobbies/map-filter/map-filter.component.ts @@ -0,0 +1,30 @@ +import { Component, EventEmitter, OnInit, Output } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { ProbableWaffleLevels, ProbableWaffleMapEnum } from "@fuzzy-waddle/api-interfaces"; + +@Component({ + selector: "probable-waffle-map-filter", + standalone: true, + imports: [CommonModule], + templateUrl: "./map-filter.component.html", + styleUrls: ["./map-filter.component.scss"] +}) +export class MapFilterComponent implements OnInit { + @Output() filter = new EventEmitter(); + protected checkedMaps: { id: number; name: string; checked: boolean }[] = []; + + ngOnInit(): void { + this.checkedMaps = Object.values(ProbableWaffleLevels).map((m) => ({ + id: m.id, + name: m.name, + checked: true + })); + } + + protected onLevelChange($event: Event, level: ProbableWaffleMapEnum) { + const isChecked = ($event.target as HTMLInputElement).checked; + const checkedLevelObject = this.checkedMaps.find((m) => m.id === level); + checkedLevelObject!.checked = isChecked; + this.filter.emit(this.checkedMaps.filter((m) => m.checked).map((m) => m.id)); + } +} diff --git a/apps/client/src/app/probable-waffle/gui/online/lobby-page/game-instance.guard.ts b/apps/client/src/app/probable-waffle/gui/online/lobby-page/game-instance.guard.ts new file mode 100644 index 00000000..baa7782d --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/online/lobby-page/game-instance.guard.ts @@ -0,0 +1,25 @@ +import { Injectable } from "@angular/core"; +import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; + +@Injectable({ + providedIn: "root" +}) +export class GameInstanceGuard implements CanActivate { + constructor( + private readonly router: Router, + private readonly gameInstanceClientService: GameInstanceClientService + ) {} + + canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean { + const gameInstance = this.gameInstanceClientService.gameInstance; + if (gameInstance) { + // Game Instance exists, allow navigation + return true; + } else { + console.error("Game Instance doesn't exist in GameInstanceGuard"); + this.router.navigate(["/probable-waffle"]); + return false; + } + } +} diff --git a/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.html b/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.html new file mode 100644 index 00000000..4bb82ef0 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.html @@ -0,0 +1 @@ + diff --git a/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.scss b/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.scss new file mode 100644 index 00000000..51616a27 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.scss @@ -0,0 +1,4 @@ +:host { + display: flex; + height: 100%; +} diff --git a/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.spec.ts b/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.spec.ts new file mode 100644 index 00000000..4433026f --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.spec.ts @@ -0,0 +1,35 @@ +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"; + +describe("LobbyPageComponent", () => { + let component: LobbyPageComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [{ provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }], + imports: [LobbyPageComponent] + }) + .overrideComponent(LobbyPageComponent, { + remove: { + imports: [LobbyComponent] + }, + add: { + imports: [LobbyTestingComponent] + } + }) + .compileComponents(); + + fixture = TestBed.createComponent(LobbyPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.ts b/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.ts new file mode 100644 index 00000000..dc7ce5fd --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/online/lobby-page/lobby-page.component.ts @@ -0,0 +1,12 @@ +import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { LobbyComponent } from "../../lobby/lobby.component"; + +@Component({ + selector: "fuzzy-waddle-lobby-page", + standalone: true, + imports: [CommonModule, LobbyComponent], + templateUrl: "./lobby-page.component.html", + styleUrls: ["./lobby-page.component.scss"] +}) +export class LobbyPageComponent {} diff --git a/apps/client/src/app/probable-waffle/gui/online/matchmaking/matchmaking.component.html b/apps/client/src/app/probable-waffle/gui/online/matchmaking/matchmaking.component.html new file mode 100644 index 00000000..34928a67 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/online/matchmaking/matchmaking.component.html @@ -0,0 +1,82 @@ +
    +
    Please select your preferences then press the Search button to find a Match
    +
    Number of players
    +
    + @for (nr of nrOfPlayersOptions;track nr) { +  {{ nr }} + } +
    +
    +
    Faction
    +
    + +
    +
    +
    +
    Map Pool
    +
    + + + + {{ level.name }} + +
    +
    + +
    + @if(gameFound) { +
    + {{ navigatingText }} +
    + }@else{ + + + + } +
    + +
    + There are currently {{ roomsService.playersSearchingForMatchmakingGame() }} players waiting for a Match and + {{ roomsService.matchmakingGamesInProgress() }} Matchmaking Games in progress +
    +
    diff --git a/apps/client/src/app/probable-waffle/gui/online/matchmaking/matchmaking.component.scss b/apps/client/src/app/probable-waffle/gui/online/matchmaking/matchmaking.component.scss new file mode 100644 index 00000000..95117e0f --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/online/matchmaking/matchmaking.component.scss @@ -0,0 +1,23 @@ +.matchmaking { + max-width: 500px; + margin-left: auto; + margin-right: auto; +} + +.matchmaking-tooltip { + font-style: italic; + font-size: 0.8em; +} +.grid-container { + display: grid; + grid-template-columns: auto auto auto; + align-items: center; + gap: 10px; +} + +.navigating-text{ + font-size: 1.5em; + font-weight: bold; + text-align: center; + margin-top: 20px; +} diff --git a/apps/client/src/app/probable-waffle/gui/online/matchmaking/matchmaking.component.spec.ts b/apps/client/src/app/probable-waffle/gui/online/matchmaking/matchmaking.component.spec.ts new file mode 100644 index 00000000..9ba0a3f6 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/online/matchmaking/matchmaking.component.spec.ts @@ -0,0 +1,36 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; + +import { MatchmakingComponent } from "./matchmaking.component"; +import { FormsModule } from "@angular/forms"; +import { Component } from "@angular/core"; +import { RoomsService } from "../../../communicators/rooms/rooms.service"; +import { roomsServiceStub } from "../../../communicators/rooms/rooms.service.spec"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../../communicators/game-instance-client.service.spec"; +import { CommonModule } from "@angular/common"; + +@Component({ selector: "probable-waffle-matchmaking", template: "", standalone: true, imports: [CommonModule] }) +export class MatchmakingTestingComponent {} + +describe("MatchmakingComponent", () => { + let component: MatchmakingComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [ + { provide: RoomsService, useValue: roomsServiceStub }, + { provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub } + ], + imports: [MatchmakingComponent, FormsModule] + }).compileComponents(); + + fixture = TestBed.createComponent(MatchmakingComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/online/matchmaking/matchmaking.component.ts b/apps/client/src/app/probable-waffle/gui/online/matchmaking/matchmaking.component.ts new file mode 100644 index 00000000..29261088 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/online/matchmaking/matchmaking.component.ts @@ -0,0 +1,144 @@ +import { Component, inject, OnDestroy, OnInit } from "@angular/core"; +import { FactionDefinitions } from "../../../game/player/faction-definitions"; +import { + FactionType, + ProbableWaffleGameFoundEvent, + ProbableWaffleGameInstance, + ProbableWaffleLevels +} from "@fuzzy-waddle/api-interfaces"; +import { RoomsService } from "../../../communicators/rooms/rooms.service"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { Router } from "@angular/router"; +import { Subscription } from "rxjs"; +import { CommonModule } from "@angular/common"; +import { FormsModule } from "@angular/forms"; + +export type MatchmakingLevel = { + id: number; + name: string; + checked: boolean; + imagePath: string; + nrOfPlayers: number; + enabled: boolean; +}; +export type MatchmakingOptions = { + factionType: FactionType | null; + nrOfPlayers: number; + levels: MatchmakingLevel[]; +}; +@Component({ + selector: "probable-waffle-matchmaking", + templateUrl: "./matchmaking.component.html", + styleUrls: ["./matchmaking.component.scss"], + standalone: true, + imports: [CommonModule, FormsModule] +}) +export class MatchmakingComponent implements OnInit, OnDestroy { + protected readonly FactionDefinitions = FactionDefinitions; + protected searching = false; + protected readonly matchmakingOptions: MatchmakingOptions; + protected readonly roomsService = inject(RoomsService); + protected readonly gameInstanceClientService = inject(GameInstanceClientService); + private readonly router = inject(Router); + private gameFoundSubscription?: Subscription; + protected gameFound: boolean = false; + protected navigatingText: string | undefined; + + constructor() { + const firstNrOfPlayersOption = this.nrOfPlayersOptions[0]; + this.matchmakingOptions = { + factionType: this.lastPlayedFactionType, + nrOfPlayers: firstNrOfPlayersOption, + levels: this.levels + }; + this.nrOfPlayersChanged(firstNrOfPlayersOption); + } + + async ngOnInit(): Promise { + await this.roomsService.init(); + } + + ngOnDestroy(): void { + this.roomsService.destroy(); + this.cancelSearching(); + } + + private get lastPlayedFactionType(): FactionType | null { + // load it from local storage + const factionType = localStorage.getItem("last-played-faction-type"); + if (factionType) { + // try parse in FactionType enum + // convert to int + const factionTypeInt = parseInt(factionType, 10); + const factionTypeEnum = FactionType[factionTypeInt]; + if (factionTypeEnum) { + return factionTypeInt; + } + } + return null; + } + + protected factionChanged() { + localStorage.setItem("last-played-faction-type", this.matchmakingOptions.factionType?.toString() ?? ""); + } + + private get levels(): MatchmakingLevel[] { + return Object.values(ProbableWaffleLevels).map((level) => ({ + id: level.id, + name: level.name, + checked: true, + imagePath: level.presentation.imagePath, + enabled: true, + nrOfPlayers: level.mapInfo.startPositionsOnTile.length + })); + } + + protected get nrOfPlayersOptions(): number[] { + const options = new Set(); + Object.values(ProbableWaffleLevels).forEach((level) => { + options.add(level.mapInfo.startPositionsOnTile.length); + }); + return Array.from(options); + } + + protected async startSearching() { + this.searching = true; + this.gameFoundSubscription = this.gameInstanceClientService.listenToGameFound().subscribe(this.onGameFound); + await this.gameInstanceClientService.requestGameSearchForMatchmaking(this.matchmakingOptions); + } + + protected get selectedLevels(): MatchmakingLevel[] { + return this.matchmakingOptions.levels.filter((level) => level.checked); + } + + private onGameFound = async ($event: ProbableWaffleGameFoundEvent) => { + this.gameFound = true; + + await this.gameInstanceClientService.joinGameInstanceAsPlayerForMatchmaking($event.gameInstanceId); + + this.navigatingText = "Joining game in 3 seconds..."; + setTimeout(() => (this.navigatingText = "Joining game in 2 seconds..."), 1000); + setTimeout(() => (this.navigatingText = "Joining game in 1 second..."), 2000); + setTimeout(async () => await this.gameInstanceClientService.navigateToLobbyOrDirectlyToGame(), 3000); + }; + + protected async cancelSearching() { + if (!this.searching) return; + this.searching = false; + this.gameFoundSubscription?.unsubscribe(); + await this.gameInstanceClientService.stopRequestGameSearchForMatchmaking(); + } + + protected nrOfPlayersChanged(nr: number) { + this.matchmakingOptions.nrOfPlayers = nr; + const nrOfPlayers = this.matchmakingOptions.nrOfPlayers; + this.matchmakingOptions.levels.forEach((level) => { + level.enabled = level.nrOfPlayers === nrOfPlayers; + level.checked = level.enabled; + }); + } + + checkedChanged(level: MatchmakingLevel) { + this.matchmakingOptions.levels.find((l) => l.id === level.id)!.checked = !level.checked; + } +} diff --git a/apps/client/src/app/probable-waffle/gui/online/online.component.html b/apps/client/src/app/probable-waffle/gui/online/online.component.html index 36181229..6af0d14f 100644 --- a/apps/client/src/app/probable-waffle/gui/online/online.component.html +++ b/apps/client/src/app/probable-waffle/gui/online/online.component.html @@ -1,13 +1,30 @@ - + +@if(!authService.isAuthenticated){ +
    +

    Not authenticated. Please Login to continue

    +
    +} @else{ @if (serverHealthService.serverChecking) { +
    +

    Checking server health...

    +
    +} @else if (serverHealthService.serverAvailable) {
    - - - + + + +
    + +} @else { +
    +

    Server is not available

    +} } diff --git a/apps/client/src/app/probable-waffle/gui/online/online.component.scss b/apps/client/src/app/probable-waffle/gui/online/online.component.scss index 00f3f549..03eb4bd1 100644 --- a/apps/client/src/app/probable-waffle/gui/online/online.component.scss +++ b/apps/client/src/app/probable-waffle/gui/online/online.component.scss @@ -1,4 +1,4 @@ -@import '../../../../styles/_variables.scss'; +@import "../../../../styles/_variables.scss"; /* Start with resetting the list style */ .nav-tabs { @@ -25,3 +25,10 @@ .nav-tabs li a.active { color: $primary; } + +.server-health { + max-width: 500px; + margin-left: auto; + margin-right: auto; + text-align: center; +} diff --git a/apps/client/src/app/probable-waffle/gui/online/online.component.spec.ts b/apps/client/src/app/probable-waffle/gui/online/online.component.spec.ts index b8f3cee4..860a7077 100644 --- a/apps/client/src/app/probable-waffle/gui/online/online.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/online/online.component.spec.ts @@ -1,28 +1,69 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { OnlineComponent } from './online.component'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { provideRouter } from '@angular/router'; -import { HomeNavTestingComponent } from '../../../shared/components/home-nav/home-nav.component.spec'; -import { RankedTestingComponent } from './ranked/ranked.component.spec'; +import { OnlineComponent } from "./online.component"; +import { provideRouter } from "@angular/router"; +import { HomeNavTestingComponent } from "../../../shared/components/home-nav/home-nav.component.spec"; +import { MatchmakingTestingComponent } from "./matchmaking/matchmaking.component.spec"; +import { ServerHealthService } from "../../../shared/services/server-health.service"; +import { serverHealthServiceStub } from "../../../shared/services/server-health.service.spec"; +import { LobbiesTestingComponent } from "./lobbies/lobbies.component.spec"; +import { HostTestingComponent } from "./host/host.component.spec"; +import { AuthService } from "../../../auth/auth.service"; +import { authServiceStub } from "../../../auth/auth.service.spec"; +import { HomeNavComponent } from "../../../shared/components/home-nav/home-nav.component"; +import { MatchmakingComponent } from "./matchmaking/matchmaking.component"; +import { LobbiesComponent } from "./lobbies/lobbies.component"; +import { HostComponent } from "./host/host.component"; +import { GameModeDefinitionComponent } from "../lobby/game-mode-definition/game-mode-definition.component"; +import { GameModeDefinitionTestingComponent } from "../lobby/game-mode-definition/game-mode-definition.component.spec"; -describe('OnlineComponent', () => { +describe("OnlineComponent", () => { let component: OnlineComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [OnlineComponent, HomeNavTestingComponent, RankedTestingComponent], - imports: [NgbModule], - providers: [provideRouter([])] - }).compileComponents(); + imports: [OnlineComponent], + providers: [ + provideRouter([]), + { + provide: ServerHealthService, + useValue: serverHealthServiceStub + }, + { + provide: AuthService, + useValue: authServiceStub + } + ] + }) + .overrideComponent(OnlineComponent, { + remove: { + imports: [ + HomeNavComponent, + MatchmakingComponent, + GameModeDefinitionComponent, + LobbiesComponent, + HostComponent + ] + }, + add: { + imports: [ + HomeNavTestingComponent, + MatchmakingTestingComponent, + GameModeDefinitionTestingComponent, + LobbiesTestingComponent, + HostTestingComponent + ] + } + }) + .compileComponents(); fixture = TestBed.createComponent(OnlineComponent); component = fixture.componentInstance; fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/probable-waffle/gui/online/online.component.ts b/apps/client/src/app/probable-waffle/gui/online/online.component.ts index 76d8bc9c..78ce74fe 100644 --- a/apps/client/src/app/probable-waffle/gui/online/online.component.ts +++ b/apps/client/src/app/probable-waffle/gui/online/online.component.ts @@ -1,14 +1,25 @@ -import { Component } from '@angular/core'; +import { Component, inject } from "@angular/core"; +import { ServerHealthService } from "../../../shared/services/server-health.service"; +import { AuthService } from "../../../auth/auth.service"; +import { CommonModule } from "@angular/common"; +import { MatchmakingComponent } from "./matchmaking/matchmaking.component"; +import { HostComponent } from "./host/host.component"; +import { LobbiesComponent } from "./lobbies/lobbies.component"; +import { HomeNavComponent } from "../../../shared/components/home-nav/home-nav.component"; +import { RouterLink } from "@angular/router"; @Component({ - selector: 'fuzzy-waddle-online', - templateUrl: './online.component.html', - styleUrls: ['./online.component.scss'] + templateUrl: "./online.component.html", + styleUrls: ["./online.component.scss"], + standalone: true, + imports: [CommonModule, MatchmakingComponent, HostComponent, LobbiesComponent, HomeNavComponent, RouterLink] }) export class OnlineComponent { - protected selectedTab: string = 'ranked'; + protected selectedTab: string = "join"; + protected readonly serverHealthService = inject(ServerHealthService); + protected readonly authService = inject(AuthService); - selectTab(tab: string) { + protected selectTab(tab: string) { this.selectedTab = tab; } } diff --git a/apps/client/src/app/probable-waffle/gui/online/online.module.ts b/apps/client/src/app/probable-waffle/gui/online/online.module.ts deleted file mode 100644 index 88a7286b..00000000 --- a/apps/client/src/app/probable-waffle/gui/online/online.module.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { OnlineComponent } from './online.component'; -import { LobbiesComponent } from './lobbies/lobbies.component'; -import { HostComponent } from './host/host.component'; -import { RankedComponent } from './ranked/ranked.component'; -import { SkirmishModule } from '../skirmish/skirmish.module'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { FormsModule } from '@angular/forms'; -import { ComponentsModule } from '../../../shared/components/components.module'; - -@NgModule({ - declarations: [OnlineComponent, LobbiesComponent, HostComponent, RankedComponent], - imports: [CommonModule, SkirmishModule, NgbModule, FormsModule, ComponentsModule] -}) -export class OnlineModule {} diff --git a/apps/client/src/app/probable-waffle/gui/online/ranked/ranked.component.html b/apps/client/src/app/probable-waffle/gui/online/ranked/ranked.component.html deleted file mode 100644 index dcf44afb..00000000 --- a/apps/client/src/app/probable-waffle/gui/online/ranked/ranked.component.html +++ /dev/null @@ -1,36 +0,0 @@ -
    -
    Please select your preferences then press the Play button to find a ranked match
    -
    - Game settings -
    -
    Number of players
    -
    - 2 - 3 4 -
    -
    -
    -
    Faction
    -
    - -
    -
    -
    - Map Pool -
    -
    - {{ map.name }} -
    -
    -
    - - -
    -
    diff --git a/apps/client/src/app/probable-waffle/gui/online/ranked/ranked.component.scss b/apps/client/src/app/probable-waffle/gui/online/ranked/ranked.component.scss deleted file mode 100644 index 02ed6824..00000000 --- a/apps/client/src/app/probable-waffle/gui/online/ranked/ranked.component.scss +++ /dev/null @@ -1,5 +0,0 @@ -.ranked { - max-width: 500px; - margin-left: auto; - margin-right: auto; -} diff --git a/apps/client/src/app/probable-waffle/gui/online/ranked/ranked.component.spec.ts b/apps/client/src/app/probable-waffle/gui/online/ranked/ranked.component.spec.ts deleted file mode 100644 index 895e15a1..00000000 --- a/apps/client/src/app/probable-waffle/gui/online/ranked/ranked.component.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { RankedComponent } from './ranked.component'; -import { FormsModule } from '@angular/forms'; -import { Component } from '@angular/core'; - -@Component({ selector: 'fuzzy-waddle-ranked', template: '' }) -export class RankedTestingComponent {} - -describe('RankedComponent', () => { - let component: RankedComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [RankedComponent], - imports: [FormsModule] - }).compileComponents(); - - fixture = TestBed.createComponent(RankedComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/probable-waffle/gui/online/ranked/ranked.component.ts b/apps/client/src/app/probable-waffle/gui/online/ranked/ranked.component.ts deleted file mode 100644 index e580eab2..00000000 --- a/apps/client/src/app/probable-waffle/gui/online/ranked/ranked.component.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Component } from '@angular/core'; -import { FactionDefinitions } from '../../../game/player/faction-definitions'; -import { Maps } from '../../../game/world/scenes/scenes'; - -@Component({ - selector: 'fuzzy-waddle-ranked', - templateUrl: './ranked.component.html', - styleUrls: ['./ranked.component.scss'] -}) -export class RankedComponent { - FactionDefinitions = FactionDefinitions; - Maps = Maps; - searching = false; - rankedOptions = { - factionType: undefined - }; - - start() { - this.searching = true; - // todo - } -} diff --git a/apps/client/src/app/probable-waffle/gui/options/options.component.html b/apps/client/src/app/probable-waffle/gui/options/options.component.html index f07cee81..c5698260 100644 --- a/apps/client/src/app/probable-waffle/gui/options/options.component.html +++ b/apps/client/src/app/probable-waffle/gui/options/options.component.html @@ -1 +1,50 @@ -

    options works!

    + + +
    +
    Options:
    + +
    +
    Volume Controls:
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    diff --git a/apps/client/src/app/probable-waffle/gui/options/options.component.scss b/apps/client/src/app/probable-waffle/gui/options/options.component.scss index e69de29b..83146e78 100644 --- a/apps/client/src/app/probable-waffle/gui/options/options.component.scss +++ b/apps/client/src/app/probable-waffle/gui/options/options.component.scss @@ -0,0 +1,11 @@ +:host { + display: flex; + justify-content: center; + align-items: center; + width: 100%; + height: 100%; +} + +.form-label--volume { + min-width: 200px; +} diff --git a/apps/client/src/app/probable-waffle/gui/options/options.component.spec.ts b/apps/client/src/app/probable-waffle/gui/options/options.component.spec.ts index e5a11974..375fcbe9 100644 --- a/apps/client/src/app/probable-waffle/gui/options/options.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/options/options.component.spec.ts @@ -1,14 +1,31 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { OptionsComponent } from './options.component'; +import { OptionsComponent } from "./options.component"; +import { ActivatedRoute } from "@angular/router"; +import { FormsModule } from "@angular/forms"; -describe('OptionsComponent', () => { +describe("OptionsComponent", () => { let component: OptionsComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [OptionsComponent] + providers: [ + { + provide: ActivatedRoute, + useValue: { + // add your mock values here that replicate the ActivatedRoute API + // snapshot: { + // paramMap: { + // get(): string { + // return '1'; // Mock route parameter + // } + // } + // } + } + } + ], + imports: [OptionsComponent, FormsModule] }).compileComponents(); fixture = TestBed.createComponent(OptionsComponent); @@ -16,7 +33,7 @@ describe('OptionsComponent', () => { fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/probable-waffle/gui/options/options.component.ts b/apps/client/src/app/probable-waffle/gui/options/options.component.ts index 96a12cd1..78267dfa 100644 --- a/apps/client/src/app/probable-waffle/gui/options/options.component.ts +++ b/apps/client/src/app/probable-waffle/gui/options/options.component.ts @@ -1,8 +1,23 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from "@angular/core"; +import { VolumeSettings } from "../../../fly-squasher/shared/volumeSettings"; +import { CommonModule } from "@angular/common"; +import { FormsModule } from "@angular/forms"; +import { RouterLink } from "@angular/router"; @Component({ - selector: 'fuzzy-waddle-options', - templateUrl: './options.component.html', - styleUrls: ['./options.component.scss'] + templateUrl: "./options.component.html", + styleUrls: ["./options.component.scss"], + standalone: true, + imports: [CommonModule, FormsModule, RouterLink] }) -export class OptionsComponent {} +export class OptionsComponent implements OnInit { + protected volumeSettings = new VolumeSettings(); + + ngOnInit() { + this.volumeSettings.init(); + } + + protected saveToLocalStorage() { + this.volumeSettings.saveToLocalStorage(); + } +} diff --git a/apps/client/src/app/probable-waffle/gui/progress/progress.component.html b/apps/client/src/app/probable-waffle/gui/progress/progress.component.html index 35967d4e..ee4c91cb 100644 --- a/apps/client/src/app/probable-waffle/gui/progress/progress.component.html +++ b/apps/client/src/app/probable-waffle/gui/progress/progress.component.html @@ -1,21 +1,41 @@ -
    -
    -

    Achievements:

    -
    -
    -

    {{ achievement.name }}

    -
    {{ achievement.description }}
    + + +
    +
    +
    + @if(!authService.isAuthenticated){ +
    +

    Not authenticated. Please Login to continue

    +
    + } @else{ @if (serverHealthService.serverChecking) { +
    +

    Checking server health...

    +
    + } @else if (serverHealthService.serverAvailable) { +

    Achievements:

    +
    +
    +

    {{ achievement.name }}

    +
    {{ achievement.description }}
    +
    +
    - -
    -
    -
    -
    -
    - + } @else { +
    +

    Server is not available

    +
    + } } +
    diff --git a/apps/client/src/app/probable-waffle/gui/progress/progress.component.scss b/apps/client/src/app/probable-waffle/gui/progress/progress.component.scss index 735bebb1..9166156a 100644 --- a/apps/client/src/app/probable-waffle/gui/progress/progress.component.scss +++ b/apps/client/src/app/probable-waffle/gui/progress/progress.component.scss @@ -1,4 +1,4 @@ -@import '../../../../styles/_variables.scss'; +@import "../../../../styles/_variables.scss"; :host { display: flex; diff --git a/apps/client/src/app/probable-waffle/gui/progress/progress.component.spec.ts b/apps/client/src/app/probable-waffle/gui/progress/progress.component.spec.ts index e9da7a4b..1b810f95 100644 --- a/apps/client/src/app/probable-waffle/gui/progress/progress.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/progress/progress.component.spec.ts @@ -1,14 +1,29 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { ProgressComponent } from './progress.component'; +import { ProgressComponent } from "./progress.component"; +import { ServerHealthService } from "../../../shared/services/server-health.service"; +import { serverHealthServiceStub } from "../../../shared/services/server-health.service.spec"; +import { AuthService } from "../../../auth/auth.service"; +import { authServiceStub } from "../../../auth/auth.service.spec"; +import { RouterTestingModule } from "@angular/router/testing"; -describe('ProfileComponent', () => { +describe("ProfileComponent", () => { let component: ProgressComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ProgressComponent] + imports: [ProgressComponent, RouterTestingModule], + providers: [ + { + provide: ServerHealthService, + useValue: serverHealthServiceStub + }, + { + provide: AuthService, + useValue: authServiceStub + } + ] }).compileComponents(); fixture = TestBed.createComponent(ProgressComponent); @@ -16,7 +31,7 @@ describe('ProfileComponent', () => { fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/probable-waffle/gui/progress/progress.component.ts b/apps/client/src/app/probable-waffle/gui/progress/progress.component.ts index 04c0ee70..c6b98cf5 100644 --- a/apps/client/src/app/probable-waffle/gui/progress/progress.component.ts +++ b/apps/client/src/app/probable-waffle/gui/progress/progress.component.ts @@ -1,16 +1,19 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { GameInstanceService } from '../../communicators/game-instance.service'; -import { Router } from '@angular/router'; +import { ChangeDetectionStrategy, Component, inject } from "@angular/core"; +import { DEPRECATED_gameInstanceService } from "../../communicators/DEPRECATED_game-instance.service"; +import { AuthService } from "../../../auth/auth.service"; +import { ServerHealthService } from "../../../shared/services/server-health.service"; +import { CommonModule } from "@angular/common"; +import { RouterLink } from "@angular/router"; @Component({ - templateUrl: './progress.component.html', - styleUrls: ['./progress.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + templateUrl: "./progress.component.html", + styleUrls: ["./progress.component.scss"], + changeDetection: ChangeDetectionStrategy.OnPush, + standalone: true, + imports: [CommonModule, RouterLink] }) export class ProgressComponent { - constructor(protected gameInstanceService: GameInstanceService, private router: Router) {} - - leaveClick() { - this.router.navigate(['/probable-waffle']); - } + protected readonly gameInstanceService = inject(DEPRECATED_gameInstanceService); + protected readonly authService = inject(AuthService); + protected readonly serverHealthService = inject(ServerHealthService); } 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..8bf1581e --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/replay/replay.component.html @@ -0,0 +1,27 @@ +
    +
    + @if(gameInstanceDataRecords.length){ +
    +
    Map Name
    +
    Played
    +
    Game length
    +
    + @for (rec of gameInstanceDataRecords;track rec) { +
    {{ getMapName(rec.gameInstanceData) }}
    +
    {{ rec.gameInstanceData.gameInstanceMetadataData!.updatedOn | date: "medium" }}
    +
    {{ rec.gameInstanceData | gameLength }}
    +
    + + +
    + } +
    + }@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..c387b568 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/replay/replay.component.spec.ts @@ -0,0 +1,31 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; +import { ReplayComponent } from "./replay.component"; +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; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [ + { provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }, + { provide: GameInstanceStorageServiceInterface, useValue: gameInstanceLocalStorageServiceStub } + ], + imports: [ReplayComponent, GameLengthPipe, RouterTestingModule] + }).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..99511236 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/replay/replay.component.ts @@ -0,0 +1,40 @@ +import { Component, inject, OnInit } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { RouterLink } from "@angular/router"; +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"; +import { GameLengthPipe } from "../../../shared/pipes/game-length.pipe"; + +@Component({ + selector: "probable-waffle-replay", + standalone: true, + imports: [CommonModule, RouterLink, GameLengthPipe], + templateUrl: "./replay.component.html", + styleUrls: ["./replay.component.scss"] +}) +export class ReplayComponent implements OnInit { + private readonly gameInstanceStorageService = inject(GameInstanceStorageServiceInterface); + 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/router/probable-waffle.component.html b/apps/client/src/app/probable-waffle/gui/router/probable-waffle.component.html new file mode 100644 index 00000000..67e7bd4c --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/router/probable-waffle.component.html @@ -0,0 +1 @@ + diff --git a/apps/client/src/app/probable-waffle/gui/main/probable-waffle.component.scss b/apps/client/src/app/probable-waffle/gui/router/probable-waffle.component.scss similarity index 100% rename from apps/client/src/app/probable-waffle/gui/main/probable-waffle.component.scss rename to apps/client/src/app/probable-waffle/gui/router/probable-waffle.component.scss diff --git a/apps/client/src/app/probable-waffle/gui/router/probable-waffle.component.spec.ts b/apps/client/src/app/probable-waffle/gui/router/probable-waffle.component.spec.ts new file mode 100644 index 00000000..258c7f76 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/router/probable-waffle.component.spec.ts @@ -0,0 +1,31 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; + +import { ProbableWaffleComponent } from "./probable-waffle.component"; +import { RouterTestingModule } from "@angular/router/testing"; +import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../communicators/game-instance-client.service.spec"; + +describe("ProbableWaffleComponent", () => { + let component: ProbableWaffleComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [ + { + provide: GameInstanceClientService, + useValue: gameInstanceClientServiceStub + } + ], + imports: [ProbableWaffleComponent, RouterTestingModule] + }).compileComponents(); + + fixture = TestBed.createComponent(ProbableWaffleComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/router/probable-waffle.component.ts b/apps/client/src/app/probable-waffle/gui/router/probable-waffle.component.ts new file mode 100644 index 00000000..194f1605 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/router/probable-waffle.component.ts @@ -0,0 +1,32 @@ +import { Component, HostListener, inject, OnDestroy, OnInit } from "@angular/core"; +import { DEPRECATED_gameInstanceService } from "../../communicators/DEPRECATED_game-instance.service"; +import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; +import { UserInstanceService } from "../../../home/profile/user-instance.service"; +import { CommonModule } from "@angular/common"; +import { RouterOutlet } from "@angular/router"; + +@Component({ + templateUrl: "./probable-waffle.component.html", + styleUrls: ["./probable-waffle.component.scss"], + standalone: true, + imports: [CommonModule, RouterOutlet] +}) +export class ProbableWaffleComponent implements OnInit, OnDestroy { + private readonly gameInstanceClientService = inject(GameInstanceClientService); + protected readonly userInstanceService = inject(UserInstanceService); + + private readonly dEPRECATED_gameInstanceService = inject(DEPRECATED_gameInstanceService); + + ngOnInit(): void { + this.userInstanceService.setVisitedGame("probable-waffle"); + } + + @HostListener("window:beforeunload") + async onBeforeUnload() { + await this.gameInstanceClientService.stopGameInstance(); + } + + async ngOnDestroy(): Promise { + await this.onBeforeUnload(); + } +} diff --git a/apps/client/src/app/probable-waffle/gui/score-screen/chart/score-through-time.component.html b/apps/client/src/app/probable-waffle/gui/score-screen/chart/score-through-time.component.html new file mode 100644 index 00000000..e73372d1 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/score-screen/chart/score-through-time.component.html @@ -0,0 +1,21 @@ +
    +
    +

    {{ chartTitle }}

    +
    + @if (ready) { + @if (chartData.labels!.length > 1) { + + + } @else { +
    +

    No data available

    +
    + } + } +
    diff --git a/apps/client/src/app/probable-waffle/gui/score-screen/chart/score-through-time.component.scss b/apps/client/src/app/probable-waffle/gui/score-screen/chart/score-through-time.component.scss new file mode 100644 index 00000000..1e65a740 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/score-screen/chart/score-through-time.component.scss @@ -0,0 +1,6 @@ +.chart-title { + font-size: 1.5rem; + font-weight: 500; + margin-bottom: 1rem; + text-align: center; +} 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 new file mode 100644 index 00000000..cc2b0493 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/score-screen/chart/score-through-time.component.spec.ts @@ -0,0 +1,154 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; +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, + 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", + standalone: true, + imports: [CommonModule, NgChartsModule], + templateUrl: "./score-through-time.component.html", + styleUrls: ["./score-through-time.component.scss"] +}) +export class ScoreThroughTimeTestingComponent { + @Input({ required: true }) summaryType!: "units" | "buildings" | "resources"; +} +describe("ScoreThroughTimeComponent", () => { + let component: ScoreThroughTimeComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ScoreThroughTimeComponent], + providers: [{ provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }] + }).compileComponents(); + + fixture = TestBed.createComponent(ScoreThroughTimeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); + + it("should create chart", async () => { + const gameInstanceService = gameInstanceClientServiceStub; + + gameInstanceService.createGameInstance( + "test", + ProbableWaffleGameInstanceVisibility.Private, + ProbableWaffleGameInstanceType.Skirmish + ); + + 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( + { + data: { + unitName: "test" + }, + time: 2000, + type: "unit_produced" + } satisfies PlayerStateActionUnitProduced, + + { + data: { + unitName: "test_2" + }, + time: 3000, + type: "unit_produced" + } satisfies PlayerStateActionUnitProduced, + { + data: { + unitName: "test_2", + killedPlayerNr: 1 + }, + time: 32000, + type: "unit_killed" + } satisfies PlayerStateActionUnitKilled + ); + players[1].playerState.data.summary.push( + { + data: { + unitName: "test" + }, + time: 1000, + type: "unit_produced" + } satisfies PlayerStateActionUnitProduced, + { + data: { + unitName: "test_3" + }, + time: 8000, + type: "unit_produced" + } satisfies PlayerStateActionUnitProduced, + { + data: { + unitName: "test_3" + }, + time: 10500, + type: "unit_produced" + } satisfies PlayerStateActionUnitProduced + ); + + players[0].playerState.data.summary.push({ + data: { + buildingName: "test" + }, + time: 1000, + type: "building_constructed" + } satisfies PlayerStateActionBuildingConstructed); + players[1].playerState.data.summary.push( + { + data: { + buildingName: "test" + }, + time: 3000, + type: "building_constructed" + } satisfies PlayerStateActionBuildingConstructed, + { + data: { + buildingName: "test_3", + killedPlayerNr: 0 + }, + time: 8000, + type: "building_destroyed" + } satisfies PlayerStateActionBuildingDestroyed + ); + + component.ngOnInit(); + + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/score-screen/chart/score-through-time.component.ts b/apps/client/src/app/probable-waffle/gui/score-screen/chart/score-through-time.component.ts new file mode 100644 index 00000000..e53cf70d --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/score-screen/chart/score-through-time.component.ts @@ -0,0 +1,153 @@ +import { Component, inject, Input, OnInit } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { + GameSetupHelpers, + PlayerStateAction, + PlayerStateActionType, + ProbableWafflePlayer +} from "@fuzzy-waddle/api-interfaces"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; +import { NgChartsModule } from "ng2-charts"; +import { ChartConfiguration, ChartData, ChartTypeRegistry, DefaultDataPoint } from "chart.js"; + +@Component({ + selector: "probable-waffle-score-through-time", + standalone: true, + imports: [CommonModule, NgChartsModule], + templateUrl: "./score-through-time.component.html", + styleUrls: ["./score-through-time.component.scss"] +}) +export class ScoreThroughTimeComponent implements OnInit { + @Input({ required: true }) summaryType!: "units" | "buildings" | "resources"; + protected ready = false; + private readonly gameInstanceClientService = inject(GameInstanceClientService); + protected readonly chartData: ChartData<"line", Array>, string> = { + datasets: [], + labels: [] + }; + + protected readonly chartOptions: ChartConfiguration< + "bar" | "line" | "scatter" | "bubble" | "pie" | "doughnut" | "polarArea" | "radar", + Array>, + string + >["options"] = { + responsive: true, + scales: { + x: { + type: "linear", + position: "bottom", + ticks: { + callback: this.formatTimestampLabel + } + } + } + }; + + protected readonly chartLegend = true; + protected readonly chartType: "bar" | "line" | "scatter" | "bubble" | "pie" | "doughnut" | "polarArea" | "radar" = + "line"; + private summaryAddType!: PlayerStateActionType; + private summaryRemoveType!: PlayerStateActionType; + protected chartTitle!: string; + ngOnInit(): void { + this.prepareGraphData(); + } + + private prepareGraphData() { + if (!this.gameInstanceClientService.gameInstance) return; + + switch (this.summaryType) { + case "units": + this.summaryAddType = "unit_produced"; + this.summaryRemoveType = "unit_killed"; + this.chartTitle = "Units produced"; + break; + case "buildings": + this.summaryAddType = "building_constructed"; + this.summaryRemoveType = "building_destroyed"; + this.chartTitle = "Buildings constructed"; + break; + case "resources": + this.summaryAddType = "resource_collected"; + this.summaryRemoveType = "resource_spent"; + this.chartTitle = "Resources collected"; + break; + } + + const players = this.gameInstanceClientService.gameInstance.players; + const allTimestamps = this.getAllTimestamps(players); + + this.chartData.labels = allTimestamps.map((n) => n.toString()); + + players.forEach((player) => { + const playerName = player.playerController.data.playerDefinition!.player.playerName!; + const buildingProduced = this.getBuildingProducedForPlayer(player, allTimestamps); + + this.chartData.datasets.push({ + label: playerName, + data: buildingProduced, + fill: false, + borderColor: GameSetupHelpers.getColorForPlayer(player.playerNumber!, players.length) + }); + }); + this.ready = true; + } + + private getBuildingProducedForPlayer(player: ProbableWafflePlayer, allTimestamps: number[]): number[] { + const timestamps = allTimestamps; + const buildingProduced: number[] = new Array(timestamps.length).fill(0); + + let cumulativeCount = 0; + const summary = player.playerState.data.summary; + + timestamps.forEach((timestamp, index) => { + const producedEvent = summary.find((s) => s.type === this.summaryAddType && s.time === timestamp); + if (producedEvent) { + cumulativeCount++; + } + + const killedEvents = this.getOtherPlayers(player) + .map((p) => p.playerState.data.summary) + .flat() + .filter( + (s) => + s.type === this.summaryRemoveType && s.time === timestamp && s.data.killedPlayerNr === player.playerNumber + ); + + cumulativeCount -= killedEvents.length; + buildingProduced[index] = cumulativeCount; + }); + + return buildingProduced; + } + + getOtherPlayers(player: ProbableWafflePlayer): ProbableWafflePlayer[] { + return this.gameInstanceClientService.gameInstance!.players.filter((p) => p.playerNumber !== player.playerNumber); + } + + private getAllTimestamps(players: ProbableWafflePlayer[]): number[] { + const timestamps: number[] = []; + + players.forEach((player) => { + const summary = player.playerState.data.summary; + + summary.forEach((s: PlayerStateAction) => { + if (!timestamps.includes(s.time)) { + timestamps.push(s.time); + } + }); + }); + // Ensure that 0 is in the timestamps array + if (!timestamps.includes(0)) { + timestamps.unshift(0); + } + // Sort timestamps in ascending order + // noinspection UnnecessaryLocalVariableJS + const sortedTimestamps = timestamps.sort((a, b) => a - b); + return sortedTimestamps; + } + + private formatTimestampLabel(value: string | number): string { + return Math.floor((value as number) / 1000).toString() + "s"; + } +} 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 new file mode 100644 index 00000000..679dc1a1 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/score-screen/score-screen.component.html @@ -0,0 +1,41 @@ +
    +
    +

    Score Screen

    + + + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    + +
    +
    +
    diff --git a/apps/client/src/app/probable-waffle/gui/score-screen/score-screen.component.scss b/apps/client/src/app/probable-waffle/gui/score-screen/score-screen.component.scss new file mode 100644 index 00000000..e69de29b 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 new file mode 100644 index 00000000..d87ebc4a --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/score-screen/score-screen.component.spec.ts @@ -0,0 +1,36 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; +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; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ScoreScreenComponent, RouterTestingModule], + providers: [{ provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }] + }) + .overrideComponent(ScoreScreenComponent, { + remove: { + imports: [ScoreThroughTimeComponent] + }, + add: { + imports: [ScoreThroughTimeTestingComponent] + } + }) + .compileComponents(); + + fixture = TestBed.createComponent(ScoreScreenComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/score-screen/score-screen.component.ts b/apps/client/src/app/probable-waffle/gui/score-screen/score-screen.component.ts new file mode 100644 index 00000000..a4f1c012 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/score-screen/score-screen.component.ts @@ -0,0 +1,19 @@ +import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { RouterLink } from "@angular/router"; +import { ScoreTableComponent } from "./table/score-table.component"; +import { ScoreThroughTimeComponent } from "./chart/score-through-time.component"; + +@Component({ + standalone: true, + imports: [CommonModule, RouterLink, ScoreTableComponent, ScoreThroughTimeComponent], + templateUrl: "./score-screen.component.html", + styleUrls: ["./score-screen.component.scss"] +}) +export class ScoreScreenComponent { + protected activeTab: string = "scoreTable"; + + protected changeTab = (scoreTable: string) => { + this.activeTab = scoreTable; + }; +} diff --git a/apps/client/src/app/probable-waffle/gui/score-screen/table/score-table.component.html b/apps/client/src/app/probable-waffle/gui/score-screen/table/score-table.component.html new file mode 100644 index 00000000..6c498895 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/score-screen/table/score-table.component.html @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Player NameUnits ProducedUnits KilledBuildings ConstructedBuildings DestroyedResources CollectedResources Spent
    {{ player.name }}{{ player.unit_produced }}{{ player.unit_killed }}{{ player.building_constructed }}{{ player.building_destroyed }}{{ player.resource_collected }}{{ player.resource_spent }}
    Total{{ getTotal("unit_produced") }}{{ getTotal("unit_killed") }}{{ getTotal("building_constructed") }}{{ getTotal("building_destroyed") }}{{ getTotal("resource_collected") }}{{ getTotal("resource_spent") }}
    diff --git a/apps/client/src/app/probable-waffle/gui/score-screen/table/score-table.component.scss b/apps/client/src/app/probable-waffle/gui/score-screen/table/score-table.component.scss new file mode 100644 index 00000000..efdc4d4e --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/score-screen/table/score-table.component.scss @@ -0,0 +1,3 @@ +.table { + margin-top: 20px; +} 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 new file mode 100644 index 00000000..769874d0 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/score-screen/table/score-table.component.spec.ts @@ -0,0 +1,92 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; +import { PlayerSummary, ScoreTableComponent } from "./score-table.component"; +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"; +import { gameInstanceClientServiceStub } from "../../../communicators/game-instance-client.service.spec"; + +describe("ScoreTableComponent", () => { + let component: ScoreTableComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [{ provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }], + imports: [ScoreTableComponent] + }).compileComponents(); + + fixture = TestBed.createComponent(ScoreTableComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); + + it("should set players correctly on initialization", () => { + // Assuming you have some mock player data + + gameInstanceClientServiceStub.createGameInstance( + "test", + ProbableWaffleGameInstanceVisibility.Private, + ProbableWaffleGameInstanceType.Skirmish + ); + + 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); + }); + + it("should display unit_produced value in the DOM", () => { + // Assuming you have some mock player data + // noinspection UnnecessaryLocalVariableJS + const mockPlayers = [ + { + name: "Player 1", + unit_produced: 10, + unit_killed: 5, + building_constructed: 3, + building_destroyed: 1, + resource_collected: 100, + resource_spent: 50 + } + ] satisfies PlayerSummary[]; + + // Set the component's players property + component["players"] = mockPlayers; + + // Trigger change detection + fixture.detectChanges(); + + // Get the DebugElement for the unit_produced cell + const unitProducedCell: DebugElement = fixture.debugElement.query(By.css("tbody tr td:nth-child(2)")); // Assuming 'unit_produced' is the second column + + // Extract the text content from the DebugElement + const unitProducedValue = unitProducedCell.nativeElement.textContent.trim(); + + // Assert the value in the DOM + expect(unitProducedValue).toBe("10"); // Adjust this value based on your actual mock data + }); +}); diff --git a/apps/client/src/app/probable-waffle/gui/score-screen/table/score-table.component.ts b/apps/client/src/app/probable-waffle/gui/score-screen/table/score-table.component.ts new file mode 100644 index 00000000..dcedfbc5 --- /dev/null +++ b/apps/client/src/app/probable-waffle/gui/score-screen/table/score-table.component.ts @@ -0,0 +1,51 @@ +import { Component, inject, OnInit } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { PlayerStateActionType, ProbableWafflePlayer } from "@fuzzy-waddle/api-interfaces"; +import { GameInstanceClientService } from "../../../communicators/game-instance-client.service"; + +export type PlayerSummary = { + name: string; + unit_produced: number; + unit_killed: number; + building_constructed: number; + building_destroyed: number; + resource_collected: number; + resource_spent: number; +}; + +@Component({ + selector: "probable-waffle-score-table", + standalone: true, + imports: [CommonModule], + templateUrl: "./score-table.component.html", + styleUrls: ["./score-table.component.scss"] +}) +export class ScoreTableComponent implements OnInit { + private readonly gameInstanceClientService = inject(GameInstanceClientService); + protected players: PlayerSummary[] = []; + + ngOnInit(): void { + if (!this.gameInstanceClientService.gameInstance) return; + const players = this.gameInstanceClientService.gameInstance.players; + this.players = players.map((p) => { + return { + name: p.playerController.data.playerDefinition!.player.playerName!, + unit_produced: this.getTotalForPlayer(p, "unit_produced"), + unit_killed: this.getTotalForPlayer(p, "unit_killed"), + building_constructed: this.getTotalForPlayer(p, "building_constructed"), + building_destroyed: this.getTotalForPlayer(p, "building_destroyed"), + resource_collected: this.getTotalForPlayer(p, "resource_collected"), + resource_spent: this.getTotalForPlayer(p, "resource_spent") + } satisfies PlayerSummary; + }); + } + + private getTotalForPlayer(player: ProbableWafflePlayer, type: PlayerStateActionType): number { + const summary = player.playerState.data.summary; + return summary.filter((s) => s.type === type).length; + } + + protected getTotal(type: PlayerStateActionType): number { + return this.players.map((p: PlayerSummary) => p[type]).reduce((a, b) => a + b, 0); + } +} diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/game-mode-definition/game-mode-definition.component.html b/apps/client/src/app/probable-waffle/gui/skirmish/game-mode-definition/game-mode-definition.component.html deleted file mode 100644 index cc26fdf7..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/game-mode-definition/game-mode-definition.component.html +++ /dev/null @@ -1,127 +0,0 @@ -
    -
    Game Setup
    -
    - Win Conditions -
    - - -
    -
    - - -
    -
    -
    - Flow -
    - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    - Modifiers -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/game-mode-definition/game-mode-definition.component.scss b/apps/client/src/app/probable-waffle/gui/skirmish/game-mode-definition/game-mode-definition.component.scss deleted file mode 100644 index 5c0741a4..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/game-mode-definition/game-mode-definition.component.scss +++ /dev/null @@ -1 +0,0 @@ -@import '../../../../../styles/_variables.scss'; diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/game-mode-definition/game-mode-definition.component.spec.ts b/apps/client/src/app/probable-waffle/gui/skirmish/game-mode-definition/game-mode-definition.component.spec.ts deleted file mode 100644 index a28d84f0..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/game-mode-definition/game-mode-definition.component.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { GameModeDefinitionComponent } from './game-mode-definition.component'; -import { FormsModule } from '@angular/forms'; -import { Component } from '@angular/core'; - -@Component({ selector: 'fuzzy-waddle-game-mode-definition', template: '' }) -export class GameModeDefinitionTestingComponent {} - -describe('GameModeDefinitionComponent', () => { - let component: GameModeDefinitionComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [GameModeDefinitionComponent], - imports: [FormsModule] - }).compileComponents(); - - fixture = TestBed.createComponent(GameModeDefinitionComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/game-mode-definition/game-mode-definition.component.ts b/apps/client/src/app/probable-waffle/gui/skirmish/game-mode-definition/game-mode-definition.component.ts deleted file mode 100644 index 16075bbe..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/game-mode-definition/game-mode-definition.component.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Component, Output } from '@angular/core'; -import { GameModeLobby } from './game-mode-lobby'; -import { BehaviorSubject } from 'rxjs'; - -@Component({ - selector: 'fuzzy-waddle-game-mode-definition', - templateUrl: './game-mode-definition.component.html', - styleUrls: ['./game-mode-definition.component.scss'] -}) -export class GameModeDefinitionComponent { - gameModeLobby: GameModeLobby; - @Output() gameModeLobbyChange; - - constructor() { - this.gameModeLobby = new GameModeLobby(); - this.gameModeLobbyChange = new BehaviorSubject(this.gameModeLobby); - } - - onValueChange() { - console.log('game setup changed'); - this.gameModeLobbyChange.next(this.gameModeLobby); - } -} diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/game-mode-definition/game-mode-lobby.ts b/apps/client/src/app/probable-waffle/gui/skirmish/game-mode-definition/game-mode-lobby.ts deleted file mode 100644 index f078ad3d..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/game-mode-definition/game-mode-lobby.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Resources, ResourceType } from '../../../game/entity/economy/resource/resource-type'; - -export class WinConditions { - constructor(public timeLimit: number | null = null, public scoreLimit: number | null = null) {} -} - -export class MapTuning { - constructor( - public techLevel: number = 1, - public gameSpeed: number = 1, - public revealMap: boolean = false, - public unitCap: number = 20 - ) {} -} - -export class DifficultyModifiers { - constructor( - public aiAdvantageResources: Map = new Map([ - [Resources.wood, 100], - [Resources.stone, 100] - ]), - public reducedVisibility: boolean = false, - public reducedIncome: number = 0.5, - public unitsDieOfAge: boolean = false - ) {} -} - -export class GameModeLobby { - constructor( - public winConditions: WinConditions = new WinConditions(), - public mapTuning: MapTuning = new MapTuning(), - public difficultyModifiers: DifficultyModifiers = new DifficultyModifiers() - ) {} -} diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/map-definition/map-definition.component.html b/apps/client/src/app/probable-waffle/gui/skirmish/map-definition/map-definition.component.html deleted file mode 100644 index ab04e287..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/map-definition/map-definition.component.html +++ /dev/null @@ -1,14 +0,0 @@ - - -
    -
    {{ mapPlayerDefinition.map.name }}
    -
    {{ mapPlayerDefinition.map.description }}
    -
    {{ mapPlayerDefinition.map.mapWidth }} x {{ mapPlayerDefinition.map.mapHeight }}
    -
    - -
    - Drag to reposition -
    -
    -
    - diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/map-definition/map-definition.component.spec.ts b/apps/client/src/app/probable-waffle/gui/skirmish/map-definition/map-definition.component.spec.ts deleted file mode 100644 index 72340cd1..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/map-definition/map-definition.component.spec.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { MapDefinitionComponent } from './map-definition.component'; -import { FormsModule } from '@angular/forms'; -import { Component, Input } from '@angular/core'; -import { MapSelectorTestingComponent } from '../map-selector/map-selector.component.spec'; -import { MapPlayerDefinition } from '../skirmish.component'; -import { TriggerTestingComponent } from '../trigger/trigger.component.spec'; - -@Component({ selector: 'fuzzy-waddle-map-definition', template: '' }) -export class MapDefinitionTestingComponent { - @Input({ required: true }) mapPlayerDefinition!: MapPlayerDefinition; -} - -describe('MapDefinitionComponent', () => { - let component: MapDefinitionComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [MapDefinitionComponent, MapSelectorTestingComponent, TriggerTestingComponent], - imports: [FormsModule] - }).compileComponents(); - - fixture = TestBed.createComponent(MapDefinitionComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/map-selector/map-selector.component.html b/apps/client/src/app/probable-waffle/gui/skirmish/map-selector/map-selector.component.html deleted file mode 100644 index 707f7f1e..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/map-selector/map-selector.component.html +++ /dev/null @@ -1,19 +0,0 @@ -
    - -
      -
    • - - {{ mapPlayerDefinition.map.name }} -
      • -
    -
    diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/map-selector/map-selector.component.spec.ts b/apps/client/src/app/probable-waffle/gui/skirmish/map-selector/map-selector.component.spec.ts deleted file mode 100644 index bb363e86..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/map-selector/map-selector.component.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { MapSelectorComponent } from './map-selector.component'; -import { FormsModule } from '@angular/forms'; -import { Component } from '@angular/core'; - -@Component({ selector: 'fuzzy-waddle-map-selector', template: '' }) -export class MapSelectorTestingComponent {} - -describe('MapSelectorComponent', () => { - let component: MapSelectorComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [MapSelectorComponent], - imports: [FormsModule] - }).compileComponents(); - - fixture = TestBed.createComponent(MapSelectorComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/map-selector/map-selector.component.ts b/apps/client/src/app/probable-waffle/gui/skirmish/map-selector/map-selector.component.ts deleted file mode 100644 index c9501392..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/map-selector/map-selector.component.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Component, EventEmitter, OnInit, Output } from '@angular/core'; -import { MapIds, Maps } from '../../../game/world/scenes/scenes'; -import { MapPlayerDefinition } from '../skirmish.component'; - -@Component({ - selector: 'fuzzy-waddle-map-selector', - templateUrl: './map-selector.component.html', - styleUrls: ['./map-selector.component.scss'] -}) -export class MapSelectorComponent implements OnInit { - dropdownVisible = false; - mapPlayerDefinitions: MapPlayerDefinition[]; - selectedMap?: MapPlayerDefinition; - @Output() selectedMapChange: EventEmitter = new EventEmitter(); - private readonly defaultMap = MapIds.GrasslandLarge; - - constructor() { - this.mapPlayerDefinitions = Maps.maps.map((map) => new MapPlayerDefinition(map)); - } - - selectMap(mapPlayerDefinition: MapPlayerDefinition) { - this.selectedMap = mapPlayerDefinition; - this.selectedMapChange.emit(this.selectedMap); - this.dropdownVisible = false; - } - - ngOnInit(): void { - const defaultMap = this.mapPlayerDefinitions.find( - (mapPlayerDefinition) => mapPlayerDefinition.map.id === this.defaultMap - ) as MapPlayerDefinition; - this.selectMap(defaultMap); - } -} diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/player-definition/player-definition.component.html b/apps/client/src/app/probable-waffle/gui/skirmish/player-definition/player-definition.component.html deleted file mode 100644 index 082e0717..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/player-definition/player-definition.component.html +++ /dev/null @@ -1,76 +0,0 @@ -
    -
    Players
    - -
    -
    - -
    -
    - -
    {{ position.player.playerNumber + 1 }}
    -
    - -
    - - -
    -
    - -
    {{ PlayerTypeDefinitions.playerTypeLookup[position.playerType] }}
    -
    - -
    - - -
    - -
    - - -
    - -
    -
     
    - -
    -     -
    -
    - - -
    diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/player-definition/player-definition.component.spec.ts b/apps/client/src/app/probable-waffle/gui/skirmish/player-definition/player-definition.component.spec.ts deleted file mode 100644 index 7152fea2..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/player-definition/player-definition.component.spec.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { PlayerDefinitionComponent } from './player-definition.component'; -import { FontAwesomeTestingModule } from '@fortawesome/angular-fontawesome/testing'; -import { FormsModule } from '@angular/forms'; -import { Component, Input } from '@angular/core'; -import { MapPlayerDefinition } from '../skirmish.component'; - -@Component({ selector: 'fuzzy-waddle-player-definition', template: '' }) -export class PlayerDefinitionTestingComponent { - @Input({ required: true }) selectedMap?: MapPlayerDefinition; -} - -describe('PlayerDefinitionComponent', () => { - let component: PlayerDefinitionComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [PlayerDefinitionComponent], - imports: [FontAwesomeTestingModule, FormsModule] - }).compileComponents(); - - fixture = TestBed.createComponent(PlayerDefinitionComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/player-definition/player-definition.component.ts b/apps/client/src/app/probable-waffle/gui/skirmish/player-definition/player-definition.component.ts deleted file mode 100644 index 85e077ed..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/player-definition/player-definition.component.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { MapPlayerDefinition, PositionPlayerDefinition } from '../skirmish.component'; -import { FactionDefinitions } from '../../../game/player/faction-definitions'; - -export enum PlayerType { - Human = 0, - AI = 1 -} - -export class PlayerTypeDefinitions { - static playerTypes = [ - { value: PlayerType.Human, name: 'Human' }, - { value: PlayerType.AI, name: 'AI' } - ]; - static playerTypeLookup = { - [PlayerType.Human]: 'Human', - [PlayerType.AI]: 'A.I.' - }; -} - -export enum Difficulty { - Easy = 0, - Medium = 1, - Hard = 2 -} - -export class DifficultyDefinitions { - static difficulties = [ - { name: 'Easy', value: Difficulty.Easy }, - { name: 'Normal', value: Difficulty.Medium }, - { name: 'Hard', value: Difficulty.Hard } - ]; -} - -@Component({ - selector: 'fuzzy-waddle-player-definition', - templateUrl: './player-definition.component.html', - styleUrls: ['./player-definition.component.scss'] -}) -export class PlayerDefinitionComponent { - PlayerTypeDefinitions = PlayerTypeDefinitions; - PlayerType = PlayerType; - FactionDefinitions = FactionDefinitions; - DifficultyDefinitions = DifficultyDefinitions; - @Input({ required: true }) selectedMap: MapPlayerDefinition | undefined; - @Output() playerJoined: EventEmitter = new EventEmitter(); - @Output() playerRemoved: EventEmitter = new EventEmitter(); - - /** - * get first free position - */ - private get firstFreePosition(): number { - const map = this.selectedMap as MapPlayerDefinition; - - // extract all positions that are already taken - const takenPositions = map.startPositionPerPlayer - .filter((startPosition) => startPosition.player.playerPosition !== null) - .map((startPosition) => startPosition.player.playerPosition) as number[]; - // sort them - takenPositions.sort(); - // get first free position - let freePosition = 0; - for (let i = 0; i < map.startPositionPerPlayer.length; i++) { - if (takenPositions.includes(i)) { - continue; - } - freePosition = i; - break; - } - return freePosition; - } - - addPlayer(playerIndex: number) { - const map = this.selectedMap as MapPlayerDefinition; - const startPositionPerPlayerElement = map.startPositionPerPlayer[playerIndex]; - startPositionPerPlayerElement.player.playerPosition = this.firstFreePosition; - startPositionPerPlayerElement.player.joined = true; - startPositionPerPlayerElement.difficulty = Difficulty.Medium; - this.playerJoined.emit(); - } - - openSlot(playerIndex: number) { - // todo implement this for multiplayer - this.addPlayer(playerIndex); - } - - removePlayer(playerNumber: number) { - const map = this.selectedMap as MapPlayerDefinition; - const startPositionPerPlayerElement = map.startPositionPerPlayer[playerNumber]; - startPositionPerPlayerElement.player.playerPosition = null; - startPositionPerPlayerElement.player.joined = false; - this.playerRemoved.emit(startPositionPerPlayerElement); - } -} diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/skirmish.component.html b/apps/client/src/app/probable-waffle/gui/skirmish/skirmish.component.html deleted file mode 100644 index ee208c4b..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/skirmish.component.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/skirmish.component.spec.ts b/apps/client/src/app/probable-waffle/gui/skirmish/skirmish.component.spec.ts index 9b2c7f93..f510e27c 100644 --- a/apps/client/src/app/probable-waffle/gui/skirmish/skirmish.component.spec.ts +++ b/apps/client/src/app/probable-waffle/gui/skirmish/skirmish.component.spec.ts @@ -1,26 +1,16 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; +import { SkirmishComponent } from "./skirmish.component"; +import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; +import { gameInstanceClientServiceStub } from "../../communicators/game-instance-client.service.spec"; -import { SkirmishComponent } from './skirmish.component'; -import { Component } from '@angular/core'; -import { PlayerDefinitionTestingComponent } from './player-definition/player-definition.component.spec'; -import { MapDefinitionTestingComponent } from './map-definition/map-definition.component.spec'; -import { GameModeDefinitionTestingComponent } from './game-mode-definition/game-mode-definition.component.spec'; - -@Component({ selector: 'fuzzy-waddle-skirmish', template: '' }) -export class SkirmishTestingComponent {} - -describe('SkirmishComponent', () => { +describe("SkirmishComponent", () => { let component: SkirmishComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ - SkirmishComponent, - PlayerDefinitionTestingComponent, - MapDefinitionTestingComponent, - GameModeDefinitionTestingComponent - ] + providers: [{ provide: GameInstanceClientService, useValue: gameInstanceClientServiceStub }], + imports: [SkirmishComponent] }).compileComponents(); fixture = TestBed.createComponent(SkirmishComponent); @@ -28,7 +18,7 @@ describe('SkirmishComponent', () => { fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/skirmish.component.ts b/apps/client/src/app/probable-waffle/gui/skirmish/skirmish.component.ts index 85cf512c..685fdd33 100644 --- a/apps/client/src/app/probable-waffle/gui/skirmish/skirmish.component.ts +++ b/apps/client/src/app/probable-waffle/gui/skirmish/skirmish.component.ts @@ -1,83 +1,25 @@ -import { ChangeDetectorRef, Component, ViewChild } from '@angular/core'; -import { Router } from '@angular/router'; -import { MapInfo } from '../../game/world/scenes/scenes'; -import { FactionDefinitions, FactionType } from '../../game/player/faction-definitions'; -import { MapDefinitionComponent } from './map-definition/map-definition.component'; -import { Difficulty, PlayerType } from './player-definition/player-definition.component'; -import { GameModeLobby } from './game-mode-definition/game-mode-lobby'; - -export class PlayerLobbyDefinition { - constructor(public playerNumber: number, public playerPosition: number | null, public joined: boolean) {} -} - -export class PositionPlayerDefinition { - constructor( - public player: PlayerLobbyDefinition, - public team: number | null, - public factionType: FactionType, - public playerType: PlayerType, - public playerColor: string, - public difficulty: Difficulty | null - ) {} -} - -export class MapPlayerDefinition { - startPositionPerPlayer: PositionPlayerDefinition[] = []; - allPossibleTeams: (number | null)[] = []; - initialNrAiPlayers = 1; - - constructor(public map: MapInfo) { - this.allPossibleTeams.push(null); - const factions = FactionDefinitions.factionTypes; - for (let i = 0; i < map.startPositions.length; i++) { - const randomFaction = factions[Math.floor(Math.random() * factions.length)]; - const playerColor = `hsl(${(i * 360) / map.startPositions.length}, 100%, 50%)`; - // use initialNrAiPlayers to set the first x players to AI - const shouldAutoJoin = i < this.initialNrAiPlayers + 1; // 1 for human player - const isAi = i > 0 && shouldAutoJoin; - this.startPositionPerPlayer.push( - new PositionPlayerDefinition( - new PlayerLobbyDefinition(i, shouldAutoJoin ? i : null, shouldAutoJoin), - null, - randomFaction.value, - !isAi ? PlayerType.Human : PlayerType.AI, - playerColor, - isAi ? Difficulty.Medium : null - ) - ); - this.allPossibleTeams.push(i); - } - } - - get playerPositions(): PositionPlayerDefinition[] { - return this.startPositionPerPlayer.filter((positionPlayer) => positionPlayer.player.playerPosition !== null); - } -} +import { Component, inject, OnInit } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { GameInstanceClientService } from "../../communicators/game-instance-client.service"; +import { ProbableWaffleGameInstanceType, ProbableWaffleGameInstanceVisibility } from "@fuzzy-waddle/api-interfaces"; +import { LoaderComponent } from "../../../shared/loader/loader.component"; @Component({ - selector: 'fuzzy-waddle-skirmish', - templateUrl: './skirmish.component.html', - styleUrls: ['./skirmish.component.scss'] + template: ``, + standalone: true, + imports: [CommonModule, LoaderComponent] }) -export class SkirmishComponent { - @ViewChild('mapDefinition') mapDefinition!: MapDefinitionComponent; - selectedMap?: MapPlayerDefinition; - gameModeLobby!: GameModeLobby; - - constructor(private router: Router, private cd: ChangeDetectorRef) {} - - playerCountChanged() { - this.mapDefinition.initializePlayerPositions(); - this.mapDefinition.draw(); - } - - playerRemoved(positionPlayerDefinition: PositionPlayerDefinition) { - this.mapDefinition.removePlayer(positionPlayerDefinition.player.playerNumber); - this.playerCountChanged(); - } - - mapChanged($event: MapPlayerDefinition) { - this.selectedMap = $event; - this.cd.detectChanges(); +export class SkirmishComponent implements OnInit { + private readonly gameInstanceClientService = inject(GameInstanceClientService); + + async ngOnInit(): Promise { + await this.gameInstanceClientService.createGameInstance( + "Skirmish", + ProbableWaffleGameInstanceVisibility.Private, + ProbableWaffleGameInstanceType.Skirmish + ); + await this.gameInstanceClientService.addSelfAsPlayer(); + await this.gameInstanceClientService.addAiPlayer(); + await this.gameInstanceClientService.navigateToLobbyOrDirectlyToGame(); } } diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/skirmish.module.ts b/apps/client/src/app/probable-waffle/gui/skirmish/skirmish.module.ts deleted file mode 100644 index 8303aaf7..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/skirmish.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule } from '@angular/core'; -import { SkirmishComponent } from './skirmish.component'; -import { FormsModule } from '@angular/forms'; -import { PlayerDefinitionComponent } from './player-definition/player-definition.component'; -import { MapSelectorComponent } from './map-selector/map-selector.component'; -import { MapDefinitionComponent } from './map-definition/map-definition.component'; -import { GameModeDefinitionComponent } from './game-mode-definition/game-mode-definition.component'; -import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { CommonModule } from '@angular/common'; -import { ComponentsModule } from '../../../shared/components/components.module'; -import { RouterLink } from '@angular/router'; -import { TriggerComponent } from './trigger/trigger.component'; - -@NgModule({ - declarations: [ - SkirmishComponent, - PlayerDefinitionComponent, - MapSelectorComponent, - MapDefinitionComponent, - GameModeDefinitionComponent, - TriggerComponent - ], - exports: [SkirmishComponent, MapSelectorComponent], - imports: [CommonModule, FormsModule, FontAwesomeModule, ComponentsModule, RouterLink] -}) -export class SkirmishModule {} diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/trigger/trigger.component.html b/apps/client/src/app/probable-waffle/gui/skirmish/trigger/trigger.component.html deleted file mode 100644 index 3ee147e0..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/trigger/trigger.component.html +++ /dev/null @@ -1,11 +0,0 @@ -
    - - -
    diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/trigger/trigger.component.spec.ts b/apps/client/src/app/probable-waffle/gui/skirmish/trigger/trigger.component.spec.ts deleted file mode 100644 index ced9a94e..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/trigger/trigger.component.spec.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TriggerComponent } from './trigger.component'; -import { RouterTestingModule } from '@angular/router/testing'; -import { Component, Input } from '@angular/core'; -import { MapPlayerDefinition } from '../skirmish.component'; - -@Component({ selector: 'fuzzy-waddle-trigger', template: '' }) -export class TriggerTestingComponent { - @Input({ required: true }) selectedMap?: MapPlayerDefinition; -} - -describe('TriggerComponent', () => { - let component: TriggerComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [TriggerComponent], - imports: [RouterTestingModule] - }).compileComponents(); - - fixture = TestBed.createComponent(TriggerComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/apps/client/src/app/probable-waffle/gui/skirmish/trigger/trigger.component.ts b/apps/client/src/app/probable-waffle/gui/skirmish/trigger/trigger.component.ts deleted file mode 100644 index 7e1daca5..00000000 --- a/apps/client/src/app/probable-waffle/gui/skirmish/trigger/trigger.component.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { Router } from '@angular/router'; -import { MapPlayerDefinition } from '../skirmish.component'; - -@Component({ - selector: 'fuzzy-waddle-trigger', - templateUrl: './trigger.component.html', - styleUrls: ['./trigger.component.scss'] -}) -export class TriggerComponent { - @Input({ required: true }) selectedMap: MapPlayerDefinition | undefined; - - constructor(private router: Router) {} - - /** - * at least two players selected and at least two different teams - */ - get atLeastTwoPlayersAndDifferentTeamsSelected(): boolean { - if (!this.selectedMap) { - return false; - } - const selectedPlayers = this.selectedMap.startPositionPerPlayer.filter( - (startPosition) => startPosition.player.joined - ); - const selectedEmptyTeams = this.selectedMap.startPositionPerPlayer.filter( - (startPosition) => startPosition.team === null && startPosition.player.joined - ); - const selectedTeams = this.selectedMap.startPositionPerPlayer.filter( - (startPosition) => startPosition.team !== null && startPosition.player.joined - ); - const selectedTeamsSet = new Set(selectedTeams.map((startPosition) => startPosition.team)); - return selectedPlayers.length >= 2 && selectedEmptyTeams.length + selectedTeamsSet.size >= 2; - } - - start() { - // todo use this to set the real game mode! - console.log('selected map definitions'); - - this.router.navigate(['probable-waffle/game']); - } - - leaveClick() { - this.router.navigate(['probable-waffle']); - } -} diff --git a/apps/client/src/app/home/chat/chat/avatar-provider/avatar-provider.service.interface.ts b/apps/client/src/app/shared/components/chat/avatar-provider/avatar-provider.service.interface.ts similarity index 100% rename from apps/client/src/app/home/chat/chat/avatar-provider/avatar-provider.service.interface.ts rename to apps/client/src/app/shared/components/chat/avatar-provider/avatar-provider.service.interface.ts diff --git a/apps/client/src/app/home/chat/chat/avatar-provider/avatar-provider.service.spec.ts b/apps/client/src/app/shared/components/chat/avatar-provider/avatar-provider.service.spec.ts similarity index 100% rename from apps/client/src/app/home/chat/chat/avatar-provider/avatar-provider.service.spec.ts rename to apps/client/src/app/shared/components/chat/avatar-provider/avatar-provider.service.spec.ts diff --git a/apps/client/src/app/shared/components/chat/avatar-provider/avatar-provider.service.ts b/apps/client/src/app/shared/components/chat/avatar-provider/avatar-provider.service.ts new file mode 100644 index 00000000..12d4513e --- /dev/null +++ b/apps/client/src/app/shared/components/chat/avatar-provider/avatar-provider.service.ts @@ -0,0 +1,14 @@ +import { Injectable } from "@angular/core"; +import { createAvatar } from "@dicebear/core"; +import * as pixelArt from "@dicebear/pixel-art"; +import { IAvatarProviderService } from "./avatar-provider.service.interface"; + +@Injectable({ + providedIn: "root" +}) +export class AvatarProviderService implements IAvatarProviderService { + getAvatar(seed: string) { + const avatar = createAvatar(pixelArt, { seed }); + return avatar.toDataUriSync(); + } +} diff --git a/apps/client/src/app/home/chat/chat/chat.component.html b/apps/client/src/app/shared/components/chat/chat.component.html similarity index 81% rename from apps/client/src/app/home/chat/chat/chat.component.html rename to apps/client/src/app/shared/components/chat/chat.component.html index ef1ee687..ea7c7dfb 100644 --- a/apps/client/src/app/home/chat/chat/chat.component.html +++ b/apps/client/src/app/shared/components/chat/chat.component.html @@ -3,12 +3,7 @@
    - avatar + avatar
    {{ message.fullName }}
    {{ message.text }}
    diff --git a/apps/client/src/app/home/chat/chat/chat.component.scss b/apps/client/src/app/shared/components/chat/chat.component.scss similarity index 92% rename from apps/client/src/app/home/chat/chat/chat.component.scss rename to apps/client/src/app/shared/components/chat/chat.component.scss index 3b5905bb..6447cc6e 100644 --- a/apps/client/src/app/home/chat/chat/chat.component.scss +++ b/apps/client/src/app/shared/components/chat/chat.component.scss @@ -1,4 +1,4 @@ -@import '../../../../styles/_variables'; +@import "../../../../styles/_variables"; :host { display: flex; @@ -80,7 +80,9 @@ border-radius: 10px; background-color: white; cursor: pointer; - transition: background-color 0.1s ease-in-out, color 0.1s ease-in-out; + transition: + background-color 0.1s ease-in-out, + color 0.1s ease-in-out; &:not([disabled]) { &:hover { diff --git a/apps/client/src/app/shared/components/chat/chat.component.spec.ts b/apps/client/src/app/shared/components/chat/chat.component.spec.ts new file mode 100644 index 00000000..6e36ca4e --- /dev/null +++ b/apps/client/src/app/shared/components/chat/chat.component.spec.ts @@ -0,0 +1,37 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; + +import { ChatComponent } from "./chat.component"; +import { FormsModule } from "@angular/forms"; +import { AvatarProviderService } from "./avatar-provider/avatar-provider.service"; +import { avatarProviderServiceStub } from "./avatar-provider/avatar-provider.service.spec"; +import { AuthService } from "../../../auth/auth.service"; +import { authServiceStub } from "../../../auth/auth.service.spec"; + +describe("ChatComponent", () => { + let component: ChatComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + providers: [ + { + provide: AvatarProviderService, + useValue: avatarProviderServiceStub + }, + { + provide: AuthService, + useValue: authServiceStub + } + ], + imports: [ChatComponent, FormsModule] + }).compileComponents(); + + fixture = TestBed.createComponent(ChatComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/client/src/app/shared/components/chat/chat.component.ts b/apps/client/src/app/shared/components/chat/chat.component.ts new file mode 100644 index 00000000..d56d0d91 --- /dev/null +++ b/apps/client/src/app/shared/components/chat/chat.component.ts @@ -0,0 +1,81 @@ +import { + Component, + ElementRef, + EventEmitter, + inject, + Input, + OnDestroy, + OnInit, + Output, + ViewChild +} from "@angular/core"; +import { ChatMessage } from "@fuzzy-waddle/api-interfaces"; +import { AvatarProviderService } from "./avatar-provider/avatar-provider.service"; +import { Observable, Subscription } from "rxjs"; +import { CommonModule } from "@angular/common"; +import { FormsModule } from "@angular/forms"; +import { AuthService } from "../../../auth/auth.service"; + +@Component({ + selector: "fuzzy-waddle-chat", + templateUrl: "./chat.component.html", + styleUrls: ["./chat.component.scss"], + standalone: true, + imports: [CommonModule, FormsModule] +}) +export class ChatComponent implements OnInit, OnDestroy { + @ViewChild("chatBody") chatBody!: ElementRef; + + @Input({ required: true }) listenToMessages: Observable | undefined; + @Output() newMessage: EventEmitter = new EventEmitter(); + + protected message = ""; + protected readonly messages: ChatMessage[] = []; + private messageSubscription?: Subscription; + + protected readonly avatarProviderService = inject(AvatarProviderService); + protected readonly authService = inject(AuthService); + + ngOnInit(): void { + this.messageSubscription = this.listenToMessages?.subscribe((msg: ChatMessage) => { + this.messages.push(msg); + this.scrollToBottom(); + }); + + this.newMessage?.next(this.createMessage("Joined the chat")); + } + + private scrollToBottom() { + if (this.chatBody) { + // scroll to bottom only if we are already at the bottom, otherwise stick to the current position + const scrollBottom = this.chatBody.nativeElement.scrollTop + this.chatBody.nativeElement.clientHeight; + setTimeout(() => { + if (scrollBottom + 1 >= this.chatBody.nativeElement.scrollHeight - this.chatBody.nativeElement.clientHeight) { + this.chatBody.nativeElement.scrollTop = this.chatBody.nativeElement.scrollHeight; + } + }, 0); + } + } + + protected sendMessage() { + if (!this.message) { + return; + } + this.newMessage?.next(this.createMessage(this.message)); + this.message = ""; + } + + ngOnDestroy(): void { + this.newMessage?.next(this.createMessage("Left the chat")); + this.messageSubscription?.unsubscribe(); + } + + createMessage(message: string): ChatMessage { + return { + text: message, + userId: this.authService.userId as string, + fullName: this.authService.fullName as string, + createdAt: new Date() + }; + } +} diff --git a/apps/client/src/app/shared/components/components.module.ts b/apps/client/src/app/shared/components/components.module.ts deleted file mode 100644 index c5e17fa2..00000000 --- a/apps/client/src/app/shared/components/components.module.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { NgModule } from "@angular/core"; -import { CommonModule } from "@angular/common"; -import { HomeNavComponent } from "./home-nav/home-nav.component"; -import { RouterLink } from "@angular/router"; -import { ModalComponent } from "./modal/modal.component"; -import { NgbActiveModal, NgbAlert } from "@ng-bootstrap/ng-bootstrap"; -import { SwRefreshComponent } from "./sw-refresh/sw-refresh.component"; -import { FaIconComponent } from "@fortawesome/angular-fontawesome"; - -@NgModule({ - declarations: [HomeNavComponent, ModalComponent, SwRefreshComponent], - imports: [CommonModule, RouterLink, NgbAlert, FaIconComponent], - exports: [HomeNavComponent, ModalComponent, SwRefreshComponent], - providers: [NgbActiveModal] -}) -export class ComponentsModule {} diff --git a/apps/client/src/app/shared/components/home-nav/home-nav.component.spec.ts b/apps/client/src/app/shared/components/home-nav/home-nav.component.spec.ts index 7684c3dc..cc304ced 100644 --- a/apps/client/src/app/shared/components/home-nav/home-nav.component.spec.ts +++ b/apps/client/src/app/shared/components/home-nav/home-nav.component.spec.ts @@ -1,18 +1,20 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { HomeNavComponent } from './home-nav.component'; -import { Component } from '@angular/core'; +import { HomeNavComponent } from "./home-nav.component"; +import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { RouterTestingModule } from "@angular/router/testing"; -@Component({ selector: 'fuzzy-waddle-home-nav', template: '' }) +@Component({ selector: "fuzzy-waddle-home-nav", template: "", standalone: true, imports: [CommonModule] }) export class HomeNavTestingComponent {} -describe('HomeNavComponent', () => { +describe("HomeNavComponent", () => { let component: HomeNavComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [HomeNavComponent] + imports: [HomeNavComponent, RouterTestingModule] }).compileComponents(); fixture = TestBed.createComponent(HomeNavComponent); @@ -20,7 +22,7 @@ describe('HomeNavComponent', () => { fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/shared/components/home-nav/home-nav.component.ts b/apps/client/src/app/shared/components/home-nav/home-nav.component.ts index 28efc941..a439e941 100644 --- a/apps/client/src/app/shared/components/home-nav/home-nav.component.ts +++ b/apps/client/src/app/shared/components/home-nav/home-nav.component.ts @@ -1,8 +1,12 @@ -import { Component } from '@angular/core'; +import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { RouterLink } from "@angular/router"; @Component({ - selector: 'fuzzy-waddle-home-nav', - templateUrl: './home-nav.component.html', - styleUrls: ['./home-nav.component.scss'] + selector: "fuzzy-waddle-home-nav", + templateUrl: "./home-nav.component.html", + styleUrls: ["./home-nav.component.scss"], + standalone: true, + imports: [CommonModule, RouterLink] }) export class HomeNavComponent {} diff --git a/apps/client/src/app/shared/components/modal/modal.component.spec.ts b/apps/client/src/app/shared/components/modal/modal.component.spec.ts index 5cb826d6..b3651886 100644 --- a/apps/client/src/app/shared/components/modal/modal.component.spec.ts +++ b/apps/client/src/app/shared/components/modal/modal.component.spec.ts @@ -1,20 +1,21 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { ModalComponent } from './modal.component'; -import { Component, Input } from '@angular/core'; +import { ModalComponent } from "./modal.component"; +import { Component, Input } from "@angular/core"; +import { CommonModule } from "@angular/common"; -@Component({ selector: 'fuzzy-waddle-modal', template: '' }) +@Component({ selector: "fuzzy-waddle-modal", template: "", standalone: true, imports: [CommonModule] }) export class ModalTestComponent { @Input({ required: true }) modalConfig: unknown; } -describe('ModalComponent', () => { +describe("ModalComponent", () => { let component: ModalComponent; let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ModalComponent] + imports: [ModalComponent] }).compileComponents(); fixture = TestBed.createComponent(ModalComponent); @@ -22,7 +23,7 @@ describe('ModalComponent', () => { fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/shared/components/modal/modal.component.ts b/apps/client/src/app/shared/components/modal/modal.component.ts index 004a8f6c..05d9a579 100644 --- a/apps/client/src/app/shared/components/modal/modal.component.ts +++ b/apps/client/src/app/shared/components/modal/modal.component.ts @@ -1,19 +1,22 @@ -import { Component, Injectable, Input, TemplateRef, ViewChild } from '@angular/core'; -import { ModalConfig } from './modal-config'; -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { Component, inject, Injectable, Input, TemplateRef, ViewChild } from "@angular/core"; +import { ModalConfig } from "./modal-config"; +import { NgbModal, NgbModalRef } from "@ng-bootstrap/ng-bootstrap"; +import { CommonModule } from "@angular/common"; @Component({ - selector: 'fuzzy-waddle-modal', - templateUrl: './modal.component.html', - styleUrls: ['./modal.component.scss'] + selector: "fuzzy-waddle-modal", + templateUrl: "./modal.component.html", + styleUrls: ["./modal.component.scss"], + standalone: true, + imports: [CommonModule] }) @Injectable() export class ModalComponent { @Input({ required: true }) public modalConfig!: ModalConfig; - @ViewChild('modal') private modalContent!: TemplateRef; + @ViewChild("modal") private modalContent!: TemplateRef; private modalRef!: NgbModalRef; - constructor(private modalService: NgbModal) {} + private readonly modalService = inject(NgbModal); open(): Promise { return new Promise((resolve) => { @@ -22,14 +25,14 @@ export class ModalComponent { }); } - async close(): Promise { + protected async close(): Promise { if (this.modalConfig.shouldClose === undefined || (await this.modalConfig.shouldClose())) { const result = this.modalConfig.onClose === undefined || (await this.modalConfig.onClose()); this.modalRef.close(result); } } - async dismiss(): Promise { + protected async dismiss(): Promise { if (this.modalConfig.shouldDismiss === undefined || (await this.modalConfig.shouldDismiss())) { const result = this.modalConfig.onDismiss === undefined || (await this.modalConfig.onDismiss()); this.modalRef.dismiss(result); diff --git a/apps/client/src/app/shared/components/sw-refresh/sw-refresh.component.html b/apps/client/src/app/shared/components/sw-refresh/sw-refresh.component.html index c4f5d208..d002de83 100644 --- a/apps/client/src/app/shared/components/sw-refresh/sw-refresh.component.html +++ b/apps/client/src/app/shared/components/sw-refresh/sw-refresh.component.html @@ -2,7 +2,7 @@
    Update Available
    diff --git a/apps/client/src/app/shared/components/sw-refresh/sw-refresh.component.spec.ts b/apps/client/src/app/shared/components/sw-refresh/sw-refresh.component.spec.ts index b71b5b55..ac988912 100644 --- a/apps/client/src/app/shared/components/sw-refresh/sw-refresh.component.spec.ts +++ b/apps/client/src/app/shared/components/sw-refresh/sw-refresh.component.spec.ts @@ -1,19 +1,20 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { SwRefreshComponent } from './sw-refresh.component'; -import { Component } from '@angular/core'; -import { SwUpdate } from '@angular/service-worker'; +import { SwRefreshComponent } from "./sw-refresh.component"; +import { Component } from "@angular/core"; +import { SwUpdate } from "@angular/service-worker"; +import { CommonModule } from "@angular/common"; -@Component({ selector: 'fuzzy-waddle-sw-refresh', template: '' }) +@Component({ selector: "fuzzy-waddle-sw-refresh", template: "", standalone: true, imports: [CommonModule] }) export class SwRefreshTestingComponent {} -describe('SwRefreshComponent', () => { +describe("SwRefreshComponent", () => { let component: SwRefreshComponent; let fixture: ComponentFixture; beforeEach(() => { TestBed.configureTestingModule({ - declarations: [SwRefreshComponent], + imports: [SwRefreshComponent], providers: [ { provide: SwUpdate, @@ -26,7 +27,7 @@ describe('SwRefreshComponent', () => { fixture.detectChanges(); }); - it('should create', () => { + it("should create", () => { expect(component).toBeTruthy(); }); }); diff --git a/apps/client/src/app/shared/components/sw-refresh/sw-refresh.component.ts b/apps/client/src/app/shared/components/sw-refresh/sw-refresh.component.ts index 94019c7c..8f21817d 100644 --- a/apps/client/src/app/shared/components/sw-refresh/sw-refresh.component.ts +++ b/apps/client/src/app/shared/components/sw-refresh/sw-refresh.component.ts @@ -1,18 +1,23 @@ -import { Component, OnInit } from "@angular/core"; +import { Component, inject, OnInit } from "@angular/core"; import { SwUpdate } from "@angular/service-worker"; import { faSpinner } from "@fortawesome/free-solid-svg-icons"; +import { CommonModule } from "@angular/common"; +import { FaIconComponent } from "@fortawesome/angular-fontawesome"; +import { NgbAlert } from "@ng-bootstrap/ng-bootstrap"; @Component({ selector: "fuzzy-waddle-sw-refresh", templateUrl: "./sw-refresh.component.html", - styleUrls: ["./sw-refresh.component.scss"] + styleUrls: ["./sw-refresh.component.scss"], + standalone: true, + imports: [CommonModule, FaIconComponent, NgbAlert] }) export class SwRefreshComponent implements OnInit { protected readonly faSpinner = faSpinner; protected showNewVersion = false; protected showVersionReady = false; - constructor(private swUpdate: SwUpdate) {} + private readonly swUpdate = inject(SwUpdate); ngOnInit(): void { this.swUpdateCheck(); diff --git a/apps/client/src/app/shared/game/base-game.config.ts b/apps/client/src/app/shared/game/base-game.config.ts index d09abb8f..84f22e68 100644 --- a/apps/client/src/app/shared/game/base-game.config.ts +++ b/apps/client/src/app/shared/game/base-game.config.ts @@ -1,5 +1,5 @@ -import { Scale, Types } from 'phaser'; -import { GameContainerElement } from './game-container/game-container'; +import { Scale, Types } from "phaser"; +import { GameContainerElement } from "./game-container/game-container"; export const baseGameConfig: Types.Core.GameConfig = { width: window.innerWidth, diff --git a/apps/client/src/app/shared/game/communicators/CommunicatorService.ts b/apps/client/src/app/shared/game/communicators/CommunicatorService.ts new file mode 100644 index 00000000..4f6d61a7 --- /dev/null +++ b/apps/client/src/app/shared/game/communicators/CommunicatorService.ts @@ -0,0 +1,6 @@ +import { Socket } from "ngx-socket-io"; + +export interface CommunicatorService { + startCommunication(gameInstanceId: string, socket?: Socket): void; + stopCommunication(gameInstanceId: string, socket?: Socket): void; +} diff --git a/apps/client/src/app/shared/game/communicators/two-way-communicator.ts b/apps/client/src/app/shared/game/communicators/two-way-communicator.ts index c9348d9b..7606e65f 100644 --- a/apps/client/src/app/shared/game/communicators/two-way-communicator.ts +++ b/apps/client/src/app/shared/game/communicators/two-way-communicator.ts @@ -1,18 +1,18 @@ -import { Observable, Subject, Subscription } from "rxjs"; +import { Observable, Subject, Subscription, take } from "rxjs"; import { Socket } from "ngx-socket-io"; -import { CommunicatorEvent, LittleMuncherCommunicatorType } from "@fuzzy-waddle/api-interfaces"; +import { CommunicatorEvent } from "@fuzzy-waddle/api-interfaces"; -export class TwoWayCommunicator { +export class TwoWayCommunicator { private onSubject: Subject = new Subject(); private sendSubject: Subject = new Subject(); private sendLocallySubject: Subject = new Subject(); private subscriptions: Subscription[] = []; constructor( - private readonly eventName: string, - private readonly communicator: LittleMuncherCommunicatorType, + eventName: string, + private readonly communicator: K, gameInstanceId?: string, - socket?: Socket + private readonly socket?: Socket ) { this.listenToCommunication(eventName, gameInstanceId, socket); } @@ -25,9 +25,16 @@ export class TwoWayCommunicator { return this.onSubject.asObservable(); } + get once(): Observable { + return this.on.pipe(take(1)); + } + /** - * Sends data to UI + Server from Game or Server + Game from UI - * @param data + * Sends data to Server if we're connected to a socket, otherwise manage data locally + * + * Note - this sends data locally (so event is seen immediately) and to the server (so event is seen by other players). + * On server, use socket.emit to send data to other players or socket.to(room).emit to send data to other players in the same room. + * https://socket.io/docs/v3/emit-cheatsheet/ */ send(data: T): void { this.sendSubject.next(data); @@ -61,17 +68,20 @@ export class TwoWayCommunicator { socket?.emit(eventName, { gameInstanceId, communicator: this.communicator, - data: data + payload: data } satisfies CommunicatorEvent); }) ); // listen from server - if (socket) { + if (socket && gameInstanceId) { this.subscriptions.push( socket.fromEvent>(eventName).subscribe((event) => { + if (event.communicator === undefined) { + console.error("Communicator received from socket event is undefined", event); + } if (event.communicator !== this.communicator) return; - this.onSubject.next(event.data); + this.onSubject.next(event.payload); }) ); } @@ -84,7 +94,7 @@ export class TwoWayCommunicator { * @param valueChange * @returns {Subscription} */ - onWithInitial(stateChanged: () => void, valueChange: (event: T) => void): Subscription { + onWithInitialStateChange(stateChanged: () => void, valueChange: (event: T) => void): Subscription { stateChanged(); return this.on.subscribe((event) => { valueChange(event); diff --git a/apps/client/src/app/shared/game/game-container/game-container.component.html b/apps/client/src/app/shared/game/game-container/game-container.component.html index 3d8fa4f6..474c74f2 100644 --- a/apps/client/src/app/shared/game/game-container/game-container.component.html +++ b/apps/client/src/app/shared/game/game-container/game-container.component.html @@ -1 +1 @@ -
    +
    diff --git a/apps/client/src/app/shared/game/game-container/game-container.component.spec.ts b/apps/client/src/app/shared/game/game-container/game-container.component.spec.ts index 57ff2e86..fa6e39da 100644 --- a/apps/client/src/app/shared/game/game-container/game-container.component.spec.ts +++ b/apps/client/src/app/shared/game/game-container/game-container.component.spec.ts @@ -3,24 +3,11 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { GameContainerComponent } from "./game-container.component"; import { Component, Input } from "@angular/core"; import { BaseGameData } from "../phaser/game/base-game-data"; -import { LittleMuncherCommunicatorService } from "../../../little-muncher/game/little-muncher-communicator.service"; import { LittleMuncherGameInstance, LittleMuncherUserInfo } from "@fuzzy-waddle/api-interfaces"; +import { LittleMuncherCommunicatorService } from "../../../little-muncher/main/communicators/little-muncher-communicator.service"; +import { CommonModule } from "@angular/common"; -jest.mock("phaser", () => { - return { - Game: class Game { - constructor() { - // - } - - destroy() { - // - } - } - }; -}); - -@Component({ selector: "fuzzy-waddle-game-container", template: "" }) +@Component({ selector: "fuzzy-waddle-game-container", template: "", standalone: true, imports: [CommonModule] }) export class GameContainerTestingComponent { @Input({ required: true }) gameConfig!: Phaser.Types.Core.GameConfig; @Input({ required: true }) gameData!: BaseGameData< @@ -36,7 +23,7 @@ describe("GameContainerComponent", () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [GameContainerComponent] + imports: [GameContainerComponent] }).compileComponents(); fixture = TestBed.createComponent(GameContainerComponent); diff --git a/apps/client/src/app/shared/game/game-container/game-container.component.ts b/apps/client/src/app/shared/game/game-container/game-container.component.ts index 40564082..add1408b 100644 --- a/apps/client/src/app/shared/game/game-container/game-container.component.ts +++ b/apps/client/src/app/shared/game/game-container/game-container.component.ts @@ -1,13 +1,16 @@ -import { Component, Input, NgZone, OnDestroy, ViewChild } from "@angular/core"; +import { Component, inject, Input, NgZone, OnDestroy, ViewChild } from "@angular/core"; import { BaseGame } from "../phaser/game/base-game"; import { Types } from "phaser"; import { BaseGameData } from "../phaser/game/base-game-data"; import { GameContainerElement } from "./game-container"; +import { CommonModule } from "@angular/common"; @Component({ selector: "fuzzy-waddle-game-container", templateUrl: "./game-container.component.html", - styleUrls: ["./game-container.component.scss"] + styleUrls: ["./game-container.component.scss"], + standalone: true, + imports: [CommonModule] }) export class GameContainerComponent implements OnDestroy { protected readonly GameContainerElement = GameContainerElement; @@ -17,7 +20,7 @@ export class GameContainerComponent implements OnDestroy { private gameRef?: BaseGame; - constructor(private readonly ngZone: NgZone) {} + private readonly ngZone = inject(NgZone); private _gameContainerElement!: HTMLDivElement; diff --git a/apps/client/src/app/shared/game/game-container/game-container.module.ts b/apps/client/src/app/shared/game/game-container/game-container.module.ts deleted file mode 100644 index fb78395a..00000000 --- a/apps/client/src/app/shared/game/game-container/game-container.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { GameContainerComponent } from './game-container.component'; - -@NgModule({ - declarations: [GameContainerComponent], - exports: [GameContainerComponent], - imports: [CommonModule] -}) -export class GameContainerModule {} diff --git a/apps/client/src/app/shared/game/game-container/game-container.ts b/apps/client/src/app/shared/game/game-container/game-container.ts index 570160ea..d1aa4eac 100644 --- a/apps/client/src/app/shared/game/game-container/game-container.ts +++ b/apps/client/src/app/shared/game/game-container/game-container.ts @@ -1 +1 @@ -export const GameContainerElement = 'gameCanvas'; +export const GameContainerElement = "gameCanvas"; diff --git a/apps/client/src/app/shared/game/phaser/components/fireworks.ts b/apps/client/src/app/shared/game/phaser/components/fireworks.ts index b50aca13..a576e4fe 100644 --- a/apps/client/src/app/shared/game/phaser/components/fireworks.ts +++ b/apps/client/src/app/shared/game/phaser/components/fireworks.ts @@ -1,6 +1,6 @@ -import { Subscription } from 'rxjs'; -import { BaseScene } from '../scene/base.scene'; -import { UpdateEventData } from '../scene/update-event-data'; +import { Subscription } from "rxjs"; +import { BaseScene } from "../scene/base.scene"; +import { UpdateEventData } from "../scene/update-event-data"; const { Between } = Phaser.Math; const { GetRandom } = Phaser.Utils.Array; @@ -19,7 +19,10 @@ export class Fireworks { private emitter3Event?: Phaser.Time.TimerEvent; private subscriptions: Subscription[] = []; - constructor(private readonly scene: BaseScene, autoStart = false) { + constructor( + private readonly scene: BaseScene, + autoStart = false + ) { this.registerEvents(autoStart); if (autoStart) { this.create(); @@ -39,12 +42,12 @@ export class Fireworks { this.renderTexture = this.scene.add .renderTexture(0, 0, this.scene.cameras.main.width, this.scene.cameras.main.height) .setOrigin(0, 0) - .setBlendMode('ADD'); + .setBlendMode("ADD"); const emitterConfig: Phaser.Types.GameObjects.Particles.ParticleEmitterConfig = { - alpha: { start: 1, end: 0, ease: 'Quad.easeOut' }, + alpha: { start: 1, end: 0, ease: "Quad.easeOut" }, angle: { start: 0, end: 360, steps: 100 }, - blendMode: 'SCREEN', + blendMode: "SCREEN", emitting: false, frequency: -1, gravityY: 100, @@ -55,12 +58,12 @@ export class Fireworks { speed: { min: 100, max: 200 } }; - this.emitter1 = this.scene.make.particles({ key: '__WHITE', config: emitterConfig }, false); - this.emitter2 = this.scene.make.particles({ key: '__WHITE', config: emitterConfig }, false); - this.emitter3 = this.scene.make.particles({ key: '__WHITE', config: emitterConfig }, false); + this.emitter1 = this.scene.make.particles({ key: "__WHITE", config: emitterConfig }, false); + this.emitter2 = this.scene.make.particles({ key: "__WHITE", config: emitterConfig }, false); + this.emitter3 = this.scene.make.particles({ key: "__WHITE", config: emitterConfig }, false); if (!this.emitter1 || !this.emitter2 || !this.emitter3) { - console.error('Could not create fireworks'); + console.error("Could not create fireworks"); return; } this.emitter1Event = this.scene.time.addEvent({ diff --git a/apps/client/src/app/shared/game/phaser/game/base-game-data.ts b/apps/client/src/app/shared/game/phaser/game/base-game-data.ts index 09c66811..254ea423 100644 --- a/apps/client/src/app/shared/game/phaser/game/base-game-data.ts +++ b/apps/client/src/app/shared/game/phaser/game/base-game-data.ts @@ -1,8 +1,8 @@ import { BaseUserInfo, GameInstance } from "@fuzzy-waddle/api-interfaces"; -import { LittleMuncherCommunicatorService } from "../../../../little-muncher/game/little-muncher-communicator.service"; +import { CommunicatorService } from "../../communicators/CommunicatorService"; export interface BaseGameData< - TCommunicator = any, + TCommunicator extends CommunicatorService = CommunicatorService, TGameInstance extends GameInstance = GameInstance, TUserInfo extends BaseUserInfo = BaseUserInfo > { diff --git a/apps/client/src/app/shared/game/phaser/game/base-game.ts b/apps/client/src/app/shared/game/phaser/game/base-game.ts index 25ac206e..eca55f17 100644 --- a/apps/client/src/app/shared/game/phaser/game/base-game.ts +++ b/apps/client/src/app/shared/game/phaser/game/base-game.ts @@ -1,5 +1,5 @@ -import { Game } from 'phaser'; -import { BaseGameData } from './base-game-data'; +import { Game } from "phaser"; +import { BaseGameData } from "./base-game-data"; export class BaseGame extends Game { constructor(gameConfig?: Phaser.Types.Core.GameConfig, data?: TGameData) { @@ -8,13 +8,13 @@ export class BaseGame extends Gam callbacks: { ...gameConfig?.callbacks, preBoot: (game) => { - game.registry.set('data', data); + game.registry.set("data", data); } } }); } get data(): TGameData { - return this.registry.get('data'); + return this.registry.get("data"); } } 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 af96d1cb..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 @@ -4,18 +4,20 @@ import { EventEmitter } from "@angular/core"; import { UpdateEventData } from "./update-event-data"; import { BaseGame } from "../game/base-game"; import { BaseGameData } from "../game/base-game-data"; -import { Subscription } from "rxjs"; +import { Observable, Subscription, take } from "rxjs"; import { BaseData, BaseGameMode, BaseGameState, BasePlayer, + BasePlayerControllerData, BaseSpectator, BaseSpectatorData } from "@fuzzy-waddle/api-interfaces"; -import { LittleMuncherCommunicatorService } from "../../../../little-muncher/game/little-muncher-communicator.service"; 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, @@ -23,48 +25,78 @@ export class BaseScene< TGameModeData extends BaseData = BaseData, TGameMode extends BaseGameMode = BaseGameMode, TPlayerStateData extends BaseData = BaseData, - TPlayerControllerData extends BaseData = BaseData, + TPlayerControllerData extends BasePlayerControllerData = BasePlayerControllerData, TPlayer extends BasePlayer = BasePlayer< TPlayerStateData, TPlayerControllerData >, TSpectatorData extends BaseSpectatorData = BaseSpectatorData, - TSpectator extends BaseSpectator = BaseSpectator + TSpectator extends BaseSpectator = BaseSpectator, + TCommunicatorService extends CommunicatorService = CommunicatorService > extends Scene implements CreateSceneFromObjectConfig { - onInit: EventEmitter = new EventEmitter(); - onPreload: EventEmitter = new EventEmitter(); - onCreate: EventEmitter = new EventEmitter(); - postCreate: EventEmitter = new EventEmitter(); - onDestroy: EventEmitter = new EventEmitter(); + _onInit: EventEmitter = new EventEmitter(); + _onPreload: EventEmitter = new EventEmitter(); + _onCreate: EventEmitter = new EventEmitter(); + _postCreate: EventEmitter = new EventEmitter(); + _onDestroy: EventEmitter = new EventEmitter(); onUpdate: EventEmitter = new EventEmitter(); onResize: EventEmitter = new EventEmitter(); private subscriptions: Subscription[] = []; override game!: BaseGame; - communicator!: LittleMuncherCommunicatorService; + communicator!: TCommunicatorService; baseGameData!: TGameData; + get onInit(): Observable { + return this._onInit.pipe(take(1)); + } + + get onPreload(): Observable { + return this._onPreload.pipe(take(1)); + } + + get onCreate(): Observable { + return this._onCreate.pipe(take(1)); + } + + get onPostCreate(): Observable { + return this._postCreate.pipe(take(1)); + } + + get onDestroy(): Observable { + return this._onDestroy.pipe(take(1)); + } + preload() { new Loader(this); - this.onPreload.emit(); + this._onPreload.emit(); } init() { this.game = this.sys.game as BaseGame; this.baseGameData = this.game.data; - this.communicator = this.baseGameData.communicator; + this.communicator = this.baseGameData.communicator as TCommunicatorService; + + this.data.set(SceneGameDataKey, this.getSceneGameData()); + this.registerSceneDestroy(); this.registerSceneResize(); this.registerScenePostCreate(); - this.onInit.emit(); + this._onInit.emit(); + } + + protected getSceneGameData() { + return { + baseGameData: this.baseGameData + }; } create() { - this.onCreate.emit(); + this._onCreate.emit(); } override update(time: number, delta: number) { @@ -80,7 +112,8 @@ export class BaseScene< private registerScenePostCreate() { this.events.once(Phaser.Scenes.Events.CREATE, () => { - this.postCreate.emit(); + this._postCreate.emit(); + this.postCreate(); }); } @@ -98,9 +131,11 @@ export class BaseScene< destroy() { this.scale.removeAllListeners(); this.subscriptions.forEach((subscription) => subscription.unsubscribe()); - this.onDestroy.emit(); + 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; @@ -113,7 +148,7 @@ export class BaseScene< get playerOrNull(): TPlayer | null { const player = this.baseGameData.gameInstance.players.find( - (player) => player.userId === this.baseGameData.user.userId + (player) => player.playerController.data.userId === this.baseGameData.user.userId ); if (!player) return null; return player as TPlayer; @@ -150,4 +185,12 @@ export class BaseScene< get isSpectator(): boolean { return this.baseGameData.gameInstance.isSpectator(this.baseGameData.user.userId); } + + get gameInstanceId(): string { + return this.baseGameData.gameInstance.gameInstanceMetadata.data.gameInstanceId!; + } + + get userId(): string | null { + return this.baseGameData.user.userId; + } } diff --git a/apps/client/src/app/shared/game/phaser/scene/scene-config.interface.ts b/apps/client/src/app/shared/game/phaser/scene/scene-config.interface.ts index 6568253b..b28f5f86 100644 --- a/apps/client/src/app/shared/game/phaser/scene/scene-config.interface.ts +++ b/apps/client/src/app/shared/game/phaser/scene/scene-config.interface.ts @@ -1,4 +1,4 @@ -import { Types } from 'phaser'; +import { Types } from "phaser"; export interface CreateSceneFromObjectConfig { /** @@ -21,5 +21,5 @@ export interface CreateSceneFromObjectConfig { /** * Any values, which will be merged into the Scene's Data Manager store. */ - 'extend.data'?: unknown; + "extend.data"?: unknown; } diff --git a/apps/client/src/app/shared/loader/loader.component.ts b/apps/client/src/app/shared/loader/loader.component.ts index 42599324..f69ad9d1 100644 --- a/apps/client/src/app/shared/loader/loader.component.ts +++ b/apps/client/src/app/shared/loader/loader.component.ts @@ -1,8 +1,8 @@ -import { Component } from '@angular/core'; -import { CommonModule } from '@angular/common'; +import { Component } from "@angular/core"; +import { CommonModule } from "@angular/common"; @Component({ - selector: 'fuzzy-waddle-loader', + selector: "fuzzy-waddle-loader", standalone: true, imports: [CommonModule], template: `
    `, 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..4c5ca4ad --- /dev/null +++ b/apps/client/src/app/shared/pipes/game-length.pipe.ts @@ -0,0 +1,21 @@ +import { Pipe, PipeTransform } from "@angular/core"; +import { ProbableWaffleGameInstanceData } from "@fuzzy-waddle/api-interfaces"; + +@Pipe({ + name: "gameLength", + pure: true, + standalone: 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`; + } +} diff --git a/apps/client/src/app/little-muncher/main/game-interface/wrap.pipe.ts b/apps/client/src/app/shared/pipes/wrap.pipe.ts similarity index 67% rename from apps/client/src/app/little-muncher/main/game-interface/wrap.pipe.ts rename to apps/client/src/app/shared/pipes/wrap.pipe.ts index 04972786..6b8d2100 100644 --- a/apps/client/src/app/little-muncher/main/game-interface/wrap.pipe.ts +++ b/apps/client/src/app/shared/pipes/wrap.pipe.ts @@ -1,7 +1,8 @@ -import { Pipe, PipeTransform } from '@angular/core'; +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/assets/icons/loaders/probable-waffle-loader.png b/apps/client/src/assets/icons/loaders/probable-waffle-loader.png new file mode 100644 index 00000000..65c6a276 Binary files /dev/null and b/apps/client/src/assets/icons/loaders/probable-waffle-loader.png differ diff --git a/apps/client/src/assets/other/Template/Background/Volcano Level Set_Background - Layer 00.png b/apps/client/src/assets/other/Template/Background/Volcano Level Set_Background - Layer 00.png deleted file mode 100644 index 27142ac8..00000000 Binary files a/apps/client/src/assets/other/Template/Background/Volcano Level Set_Background - Layer 00.png and /dev/null differ diff --git a/apps/client/src/assets/other/Template/FufuSuperDino.png b/apps/client/src/assets/other/Template/FufuSuperDino.png deleted file mode 100644 index cb4561fb..00000000 Binary files a/apps/client/src/assets/other/Template/FufuSuperDino.png and /dev/null differ diff --git a/apps/client/src/assets/other/Template/animations.json b/apps/client/src/assets/other/Template/animations.json deleted file mode 100644 index 36f84a5a..00000000 --- a/apps/client/src/assets/other/Template/animations.json +++ /dev/null @@ -1,304 +0,0 @@ -{ - "anims": [ - { - "key": "player-Idle", - "type": "frame", - "frames": [ - { - "key": "player", - "frame": "Idle_000", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_001", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_002", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_003", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_004", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_005", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_006", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_007", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_008", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_009", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_010", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_011", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_012", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_013", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_014", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_015", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_016", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Idle_017", - "duration": 0, - "keyframe": false - } - ], - "frameRate": 30, - "skipMissedFrames": true, - "repeat": -1, - "showBeforeDelay": false - }, - { - "key": "player-Jump Loop", - "type": "frame", - "frames": [ - { - "key": "player", - "frame": "Jump Loop_000", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Jump Loop_001", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Jump Loop_002", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Jump Loop_003", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Jump Loop_004", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Jump Loop_005", - "duration": 0, - "keyframe": false - } - ], - "frameRate": 30, - "skipMissedFrames": true, - "repeat": -1, - "showBeforeDelay": false - }, - { - "key": "player-Jump Start", - "type": "frame", - "frames": [ - { - "key": "player", - "frame": "Jump Start_000", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Jump Start_001", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Jump Start_002", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Jump Start_003", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Jump Start_004", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Jump Start_005", - "duration": 0, - "keyframe": false - } - ], - "frameRate": 30, - "skipMissedFrames": true, - "showBeforeDelay": false - }, - { - "key": "player-Running", - "type": "frame", - "frames": [ - { - "key": "player", - "frame": "Running_000", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Running_001", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Running_002", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Running_003", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Running_004", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Running_005", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Running_006", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Running_007", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Running_008", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Running_009", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Running_010", - "duration": 0, - "keyframe": false - }, - { - "key": "player", - "frame": "Running_011", - "duration": 0, - "keyframe": false - } - ], - "frameRate": 30, - "skipMissedFrames": true, - "repeat": -1, - "showBeforeDelay": false - } - ], - "meta": { - "app": "Phaser Editor 2D v3", - "contentType": "Phaser v3 Animations" - }, - "settings": { - "sourceLang": "JAVA_SCRIPT", - "esModule": false, - "generateCode": false - } -} \ No newline at end of file diff --git a/apps/client/src/assets/other/Template/atlas/player-0.png b/apps/client/src/assets/other/Template/atlas/player-0.png deleted file mode 100644 index 874c2e4b..00000000 Binary files a/apps/client/src/assets/other/Template/atlas/player-0.png and /dev/null differ diff --git a/apps/client/src/assets/other/Template/atlas/player.json b/apps/client/src/assets/other/Template/atlas/player.json deleted file mode 100644 index e06d4dbe..00000000 --- a/apps/client/src/assets/other/Template/atlas/player.json +++ /dev/null @@ -1,902 +0,0 @@ -{ - "textures": [ - { - "image": "player-0.png", - "format": "RGBA8888", - "size": { - "w": 978, - "h": 1681 - }, - "scale": 0.2, - "frames": [ - { - "filename": "Running_003", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 48, - "y": 30, - "w": 195, - "h": 182 - }, - "frame": { - "x": 1, - "y": 1, - "w": 195, - "h": 182 - } - }, - { - "filename": "Idle_003", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 43, - "y": 31, - "w": 202, - "h": 183 - }, - "frame": { - "x": 198, - "y": 1, - "w": 202, - "h": 183 - } - }, - { - "filename": "Idle_002", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 44, - "y": 31, - "w": 200, - "h": 183 - }, - "frame": { - "x": 402, - "y": 1, - "w": 200, - "h": 183 - } - }, - { - "filename": "Idle_001", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 44, - "y": 31, - "w": 199, - "h": 183 - }, - "frame": { - "x": 604, - "y": 1, - "w": 199, - "h": 183 - } - }, - { - "filename": "Running_004", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 49, - "y": 28, - "w": 193, - "h": 183 - }, - "frame": { - "x": 1, - "y": 185, - "w": 193, - "h": 183 - } - }, - { - "filename": "Idle_000", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 45, - "y": 31, - "w": 197, - "h": 183 - }, - "frame": { - "x": 196, - "y": 186, - "w": 197, - "h": 183 - } - }, - { - "filename": "Jump Start_000", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 45, - "y": 31, - "w": 197, - "h": 183 - }, - "frame": { - "x": 196, - "y": 186, - "w": 197, - "h": 183 - } - }, - { - "filename": "Idle_017", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 45, - "y": 31, - "w": 196, - "h": 183 - }, - "frame": { - "x": 395, - "y": 186, - "w": 196, - "h": 183 - } - }, - { - "filename": "Running_002", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 47, - "y": 30, - "w": 196, - "h": 183 - }, - "frame": { - "x": 593, - "y": 186, - "w": 196, - "h": 183 - } - }, - { - "filename": "Running_006", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 50, - "y": 23, - "w": 186, - "h": 187 - }, - "frame": { - "x": 791, - "y": 186, - "w": 186, - "h": 187 - } - }, - { - "filename": "Idle_015", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 45, - "y": 30, - "w": 193, - "h": 184 - }, - "frame": { - "x": 1, - "y": 370, - "w": 193, - "h": 184 - } - }, - { - "filename": "Idle_004", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 44, - "y": 30, - "w": 201, - "h": 184 - }, - "frame": { - "x": 196, - "y": 371, - "w": 201, - "h": 184 - } - }, - { - "filename": "Idle_005", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 44, - "y": 30, - "w": 200, - "h": 184 - }, - "frame": { - "x": 399, - "y": 371, - "w": 200, - "h": 184 - } - }, - { - "filename": "Running_010", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 45, - "y": 26, - "w": 188, - "h": 187 - }, - "frame": { - "x": 601, - "y": 371, - "w": 188, - "h": 187 - } - }, - { - "filename": "Running_008", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 47, - "y": 23, - "w": 186, - "h": 189 - }, - "frame": { - "x": 791, - "y": 375, - "w": 186, - "h": 189 - } - }, - { - "filename": "Jump Start_001", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 45, - "y": 29, - "w": 197, - "h": 184 - }, - "frame": { - "x": 1, - "y": 557, - "w": 197, - "h": 184 - } - }, - { - "filename": "Running_001", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 46, - "y": 31, - "w": 197, - "h": 184 - }, - "frame": { - "x": 200, - "y": 557, - "w": 197, - "h": 184 - } - }, - { - "filename": "Idle_016", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 45, - "y": 30, - "w": 195, - "h": 184 - }, - "frame": { - "x": 399, - "y": 557, - "w": 195, - "h": 184 - } - }, - { - "filename": "Jump Loop_000", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 49, - "y": 20, - "w": 192, - "h": 185 - }, - "frame": { - "x": 596, - "y": 560, - "w": 192, - "h": 185 - } - }, - { - "filename": "Running_007", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 48, - "y": 23, - "w": 187, - "h": 187 - }, - "frame": { - "x": 790, - "y": 566, - "w": 187, - "h": 187 - } - }, - { - "filename": "Idle_006", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 44, - "y": 29, - "w": 198, - "h": 185 - }, - "frame": { - "x": 1, - "y": 743, - "w": 198, - "h": 185 - } - }, - { - "filename": "Running_000", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 45, - "y": 31, - "w": 198, - "h": 185 - }, - "frame": { - "x": 201, - "y": 743, - "w": 198, - "h": 185 - } - }, - { - "filename": "Jump Loop_001", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 49, - "y": 20, - "w": 192, - "h": 185 - }, - "frame": { - "x": 401, - "y": 743, - "w": 192, - "h": 185 - } - }, - { - "filename": "Jump Loop_005", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 49, - "y": 20, - "w": 192, - "h": 185 - }, - "frame": { - "x": 595, - "y": 747, - "w": 192, - "h": 185 - } - }, - { - "filename": "Running_009", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 46, - "y": 24, - "w": 185, - "h": 189 - }, - "frame": { - "x": 789, - "y": 755, - "w": 185, - "h": 189 - } - }, - { - "filename": "Idle_007", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 44, - "y": 29, - "w": 197, - "h": 185 - }, - "frame": { - "x": 1, - "y": 930, - "w": 197, - "h": 185 - } - }, - { - "filename": "Jump Start_002", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 46, - "y": 27, - "w": 196, - "h": 185 - }, - "frame": { - "x": 200, - "y": 930, - "w": 196, - "h": 185 - } - }, - { - "filename": "Running_011", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 45, - "y": 29, - "w": 194, - "h": 185 - }, - "frame": { - "x": 398, - "y": 930, - "w": 194, - "h": 185 - } - }, - { - "filename": "Idle_014", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 46, - "y": 29, - "w": 191, - "h": 185 - }, - "frame": { - "x": 594, - "y": 934, - "w": 191, - "h": 185 - } - }, - { - "filename": "Idle_013", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 46, - "y": 29, - "w": 190, - "h": 185 - }, - "frame": { - "x": 787, - "y": 946, - "w": 190, - "h": 185 - } - }, - { - "filename": "Running_005", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 49, - "y": 25, - "w": 189, - "h": 185 - }, - "frame": { - "x": 1, - "y": 1117, - "w": 189, - "h": 185 - } - }, - { - "filename": "Idle_008", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 45, - "y": 28, - "w": 195, - "h": 186 - }, - "frame": { - "x": 192, - "y": 1117, - "w": 195, - "h": 186 - } - }, - { - "filename": "Jump Start_003", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 47, - "y": 25, - "w": 195, - "h": 186 - }, - "frame": { - "x": 389, - "y": 1117, - "w": 195, - "h": 186 - } - }, - { - "filename": "Jump Start_005", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 48, - "y": 22, - "w": 194, - "h": 186 - }, - "frame": { - "x": 586, - "y": 1121, - "w": 194, - "h": 186 - } - }, - { - "filename": "Idle_009", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 45, - "y": 28, - "w": 193, - "h": 186 - }, - "frame": { - "x": 782, - "y": 1133, - "w": 193, - "h": 186 - } - }, - { - "filename": "Idle_012", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 46, - "y": 28, - "w": 189, - "h": 186 - }, - "frame": { - "x": 1, - "y": 1304, - "w": 189, - "h": 186 - } - }, - { - "filename": "Idle_010", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 45, - "y": 28, - "w": 192, - "h": 186 - }, - "frame": { - "x": 192, - "y": 1305, - "w": 192, - "h": 186 - } - }, - { - "filename": "Jump Loop_002", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 49, - "y": 20, - "w": 192, - "h": 186 - }, - "frame": { - "x": 386, - "y": 1305, - "w": 192, - "h": 186 - } - }, - { - "filename": "Idle_011", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 46, - "y": 28, - "w": 190, - "h": 186 - }, - "frame": { - "x": 580, - "y": 1309, - "w": 190, - "h": 186 - } - }, - { - "filename": "Jump Start_004", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 47, - "y": 23, - "w": 195, - "h": 187 - }, - "frame": { - "x": 772, - "y": 1321, - "w": 195, - "h": 187 - } - }, - { - "filename": "Jump Loop_003", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 48, - "y": 19, - "w": 193, - "h": 187 - }, - "frame": { - "x": 1, - "y": 1493, - "w": 193, - "h": 187 - } - }, - { - "filename": "Jump Loop_004", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 280, - "h": 240 - }, - "spriteSourceSize": { - "x": 49, - "y": 19, - "w": 192, - "h": 187 - }, - "frame": { - "x": 196, - "y": 1493, - "w": 192, - "h": 187 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:5f3e69cc355be10cbe2c8da72e4890ae:81a932ba403e3770edab7da375e9c06d:95162a1ab6b6297b1e671da3cedc2be3$" - } -} diff --git a/apps/client/src/assets/other/Template/atlas/player.png b/apps/client/src/assets/other/Template/atlas/player.png deleted file mode 100644 index 34f91886..00000000 Binary files a/apps/client/src/assets/other/Template/atlas/player.png and /dev/null differ diff --git a/apps/client/src/assets/other/Template/atlas/ui.json b/apps/client/src/assets/other/Template/atlas/ui.json deleted file mode 100644 index 478ec260..00000000 --- a/apps/client/src/assets/other/Template/atlas/ui.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "frames": { - "btn-left": { - "frame": { - "x": 0, - "y": 0, - "w": 160, - "h": 160 - }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 160, - "h": 160 - }, - "sourceSize": { - "w": 160, - "h": 160 - }, - "pivot": { - "x": 0.5, - "y": 0.5 - } - }, - "btn-right": { - "frame": { - "x": 0, - "y": 160, - "w": 160, - "h": 160 - }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 160, - "h": 160 - }, - "sourceSize": { - "w": 160, - "h": 160 - }, - "pivot": { - "x": 0.5, - "y": 0.5 - } - }, - "btn-up": { - "frame": { - "x": 0, - "y": 320, - "w": 160, - "h": 160 - }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 160, - "h": 160 - }, - "sourceSize": { - "w": 160, - "h": 160 - }, - "pivot": { - "x": 0.5, - "y": 0.5 - } - } - }, - "meta": { - "app": "http://free-tex-packer.com", - "version": "0.6.6", - "image": "ui.png", - "format": "RGBA8888", - "size": { - "w": 160, - "h": 480 - }, - "scale": 1 - } -} \ No newline at end of file diff --git a/apps/client/src/assets/other/Template/atlas/ui.png b/apps/client/src/assets/other/Template/atlas/ui.png deleted file mode 100644 index ff2d60fd..00000000 Binary files a/apps/client/src/assets/other/Template/atlas/ui.png and /dev/null differ diff --git a/apps/client/src/assets/other/Template/atlas/volcano-0.png b/apps/client/src/assets/other/Template/atlas/volcano-0.png deleted file mode 100644 index 4019f1ae..00000000 Binary files a/apps/client/src/assets/other/Template/atlas/volcano-0.png and /dev/null differ diff --git a/apps/client/src/assets/other/Template/atlas/volcano.json b/apps/client/src/assets/other/Template/atlas/volcano.json deleted file mode 100644 index 4243a0cd..00000000 --- a/apps/client/src/assets/other/Template/atlas/volcano.json +++ /dev/null @@ -1,293 +0,0 @@ -{ - "textures": [ - { - "image": "volcano-0.png", - "format": "RGBA8888", - "size": { - "w": 500, - "h": 516 - }, - "scale": 1, - "frames": [ - { - "filename": "Volcano Level Set_Platformer - Ground Additional 03.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 320, - "h": 320 - }, - "spriteSourceSize": { - "x": 7, - "y": 16, - "w": 308, - "h": 304 - }, - "frame": { - "x": 1, - "y": 1, - "w": 308, - "h": 304 - } - }, - { - "filename": "Volcano Level Set_Platformer - Ground 11.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 128, - "h": 128 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 128, - "h": 128 - }, - "frame": { - "x": 1, - "y": 307, - "w": 128, - "h": 128 - } - }, - { - "filename": "Volcano Level Set_Platformer - Ladder.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 128, - "h": 128 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 122, - "h": 124 - }, - "frame": { - "x": 311, - "y": 1, - "w": 122, - "h": 124 - } - }, - { - "filename": "Volcano Level Set_Platformer - Ground 10.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 128, - "h": 128 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 125, - "h": 121 - }, - "frame": { - "x": 131, - "y": 307, - "w": 125, - "h": 121 - } - }, - { - "filename": "Volcano Level Set_Platformer - Stone.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 128, - "h": 128 - }, - "spriteSourceSize": { - "x": 3, - "y": 2, - "w": 122, - "h": 124 - }, - "frame": { - "x": 311, - "y": 127, - "w": 122, - "h": 124 - } - }, - { - "filename": "Volcano Level Set_Environment - Skull.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 160, - "h": 80 - }, - "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 136, - "h": 78 - }, - "frame": { - "x": 1, - "y": 437, - "w": 136, - "h": 78 - } - }, - { - "filename": "Volcano Level Set_Environment - Red Flag.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 128 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 58, - "h": 124 - }, - "frame": { - "x": 435, - "y": 1, - "w": 58, - "h": 124 - } - }, - { - "filename": "Volcano Level Set_Environment - White Flag.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 128 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 58, - "h": 124 - }, - "frame": { - "x": 435, - "y": 127, - "w": 58, - "h": 124 - } - }, - { - "filename": "Volcano Level Set_Platformer - Ground 12.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 128, - "h": 128 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 125, - "h": 121 - }, - "frame": { - "x": 311, - "y": 253, - "w": 125, - "h": 121 - } - }, - { - "filename": "Volcano Level Set_Platformer - Wooden Bridge.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 128, - "h": 32 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 122, - "h": 26 - }, - "frame": { - "x": 139, - "y": 430, - "w": 122, - "h": 26 - } - }, - { - "filename": "Volcano Level Set_Collectable Object - Meat.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 128, - "h": 128 - }, - "spriteSourceSize": { - "x": 3, - "y": 3, - "w": 122, - "h": 122 - }, - "frame": { - "x": 263, - "y": 376, - "w": 122, - "h": 122 - } - }, - { - "filename": "Volcano Level Set_Environment - Signpost 01.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 128, - "h": 128 - }, - "spriteSourceSize": { - "x": 8, - "y": 8, - "w": 112, - "h": 120 - }, - "frame": { - "x": 387, - "y": 376, - "w": 112, - "h": 120 - } - }, - { - "filename": "Volcano Level Set_Environment - Lava 02.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 32 - }, - "spriteSourceSize": { - "x": 1, - "y": 5, - "w": 62, - "h": 22 - }, - "frame": { - "x": 139, - "y": 458, - "w": 62, - "h": 22 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:e5481a45c2de76caabe5fa5ead7298f4:566bc6b3f36e5703b4d35e6123f5521e:2a43dd78155c9fa81d725f37f0d19e57$" - } -} diff --git a/apps/client/src/assets/other/Template/atlas/volcano.png b/apps/client/src/assets/other/Template/atlas/volcano.png deleted file mode 100644 index b20a5096..00000000 Binary files a/apps/client/src/assets/other/Template/atlas/volcano.png and /dev/null differ diff --git a/apps/client/src/assets/other/Template/dino.png b/apps/client/src/assets/other/Template/dino.png deleted file mode 100644 index cb4561fb..00000000 Binary files a/apps/client/src/assets/other/Template/dino.png and /dev/null differ diff --git a/apps/client/src/assets/other/Template/guapen.png b/apps/client/src/assets/other/Template/guapen.png deleted file mode 100644 index 0fb11b04..00000000 Binary files a/apps/client/src/assets/other/Template/guapen.png and /dev/null differ diff --git a/apps/client/src/assets/other/asset-packers/asset-pack.json b/apps/client/src/assets/other/asset-packers/asset-pack.json deleted file mode 100644 index 4bde58da..00000000 --- a/apps/client/src/assets/other/asset-packers/asset-pack.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "section1": { - "files": [ - { - "url": "assets/other/Template/animations.json", - "type": "animation", - "key": "animations" - }, - { - "type": "multiatlas", - "url": "assets/other/Template/atlas/player.json", - "path": "assets/other/Template/atlas", - "key": "player" - }, - { - "atlasURL": "assets/other/Template/atlas/ui.json", - "textureURL": "assets/other/Template/atlas/ui.png", - "type": "atlas", - "key": "ui" - }, - { - "type": "multiatlas", - "url": "assets/other/Template/atlas/volcano.json", - "path": "assets/other/Template/atlas", - "key": "volcano" - }, - { - "url": "assets/other/Template/Background/Volcano Level Set_Background - Layer 00.png", - "type": "image", - "key": "Volcano Level Set_Background - Layer 00" - } - ] - }, - "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/asset-pack-probable-waffle-gui.json b/apps/client/src/assets/probable-waffle/asset-packers/asset-pack-probable-waffle-gui.json new file mode 100644 index 00000000..54f222c1 --- /dev/null +++ b/apps/client/src/assets/probable-waffle/asset-packers/asset-pack-probable-waffle-gui.json @@ -0,0 +1,19 @@ +{ + "section1": { + "files": [ + { + "type": "multiatlas", + "url": "assets/probable-waffle/atlas/gui.json", + "path": "assets/probable-waffle/atlas", + "key": "gui" + } + ] + }, + "meta": { + "app": "Phaser Editor 2D - Asset Pack Editor", + "contentType": "phasereditor2d.pack.core.AssetContentType", + "url": "https://phasereditor2d.com", + "version": 2, + "showAllFilesInBlocks": false + } +} \ No newline at end of file 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..f57ae5b2 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 @@ -1,6 +1,17 @@ { "section1": { "files": [ + { + "type": "multiatlas", + "url": "assets/probable-waffle/atlas/animals.json", + "path": "assets/probable-waffle/atlas", + "key": "animals" + }, + { + "url": "assets/probable-waffle/atlas/anims/animals.json", + "type": "animation", + "key": "animals_1" + }, { "url": "assets/probable-waffle/atlas/anims/skaduwee/buildings.json", "path": "assets/probable-waffle/atlas/anims/skaduwee/buildings.json", @@ -14,17 +25,17 @@ "key": "buildings_1" }, { - "url": "assets/probable-waffle/atlas/anims/effects.json", - "type": "animation", - "key": "effects" + "url": "assets/probable-waffle/atlas/anims/effects.json", + "type": "animation", + "key": "effects" + }, + { + "type": "multiatlas", + "url": "assets/probable-waffle/atlas/effects.json", + "path": "assets/probable-waffle/atlas", + "key": "effects_1" }, - { - "type": "multiatlas", - "url": "assets/probable-waffle/atlas/effects.json", - "path": "assets/probable-waffle/atlas", - "key": "effects_1" - }, - { + { "type": "multiatlas", "url": "assets/probable-waffle/atlas/factions.json", "path": "assets/probable-waffle/atlas", @@ -313,24 +324,15 @@ "key": "slingshot_female_walk" }, { - "url": "assets/probable-waffle/tilemaps/tiles.json", - "path": "assets/probable-waffle/tilemaps/tiles.json", - "type": "tilemapTiledJSON", - "key": "tiles" + "type": "multiatlas", + "url": "assets/probable-waffle/atlas/units.json", + "path": "assets/probable-waffle/atlas", + "key": "units" }, { - "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/atlas/anims/units.json", + "type": "animation", + "key": "units_1" }, { "url": "assets/probable-waffle/spritesheets/characters/general/warrior/warrior_anim.json", @@ -797,4 +799,4 @@ "version": 2, "showAllFilesInBlocks": false } -} +} \ No newline at end of file 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..3e5f7c4c --- /dev/null +++ b/apps/client/src/assets/probable-waffle/asset-packers/maps/asset-pack-probable-waffle-ember-enclave.json @@ -0,0 +1,47 @@ +{ + "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" + }, + { + "url": "assets/probable-waffle/tilesets/tiles_2.png", + "path": "assets/probable-waffle/tilesets/tiles_2.png", + "frameConfig": { + "frameWidth": 64, + "frameHeight": 32, + "startFrame": 0, + "endFrame": -1, + "spacing": 0, + "margin": 0 + }, + "type": "spritesheet", + "key": "tiles_2" + } + ] + }, + "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..66fa1c74 --- /dev/null +++ b/apps/client/src/assets/probable-waffle/asset-packers/maps/asset-pack-probable-waffle-river-crossing.json @@ -0,0 +1,47 @@ +{ + "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" + }, + { + "url": "assets/probable-waffle/tilesets/tiles_2.png", + "path": "assets/probable-waffle/tilesets/tiles_2.png", + "frameConfig": { + "frameWidth": 64, + "frameHeight": 32, + "startFrame": 0, + "endFrame": -1, + "spacing": 0, + "margin": 0 + }, + "type": "spritesheet", + "key": "tiles_2" + } + ] + }, + "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/preload-asset-pack.json b/apps/client/src/assets/probable-waffle/asset-packers/preload-asset-pack.json index 61f80bef..99e6ac6e 100644 --- a/apps/client/src/assets/probable-waffle/asset-packers/preload-asset-pack.json +++ b/apps/client/src/assets/probable-waffle/asset-packers/preload-asset-pack.json @@ -2,9 +2,9 @@ "section1": { "files": [ { - "url": "assets/other/Template/guapen.png", + "url": "assets/icons/loaders/probable-waffle-loader.png", "type": "image", - "key": "guapen" + "key": "probable-waffle-loader" } ] }, diff --git a/apps/client/src/assets/probable-waffle/atlas/animals.json b/apps/client/src/assets/probable-waffle/atlas/animals.json new file mode 100644 index 00000000..56c97012 --- /dev/null +++ b/apps/client/src/assets/probable-waffle/atlas/animals.json @@ -0,0 +1,608 @@ +{ + "textures": [ + { + "image": "animals.png", + "format": "RGBA8888", + "size": { + "w": 126, + "h": 235 + }, + "scale": 1, + "frames": [ + { + "filename": "sheep/sheep_left.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 7, + "y": 24, + "w": 53, + "h": 34 + }, + "frame": { + "x": 1, + "y": 1, + "w": 53, + "h": 34 + } + }, + { + "filename": "sheep/sheep_right.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 4, + "y": 24, + "w": 53, + "h": 34 + }, + "frame": { + "x": 1, + "y": 37, + "w": 53, + "h": 34 + } + }, + { + "filename": "sheep/sheep_up.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 10, + "y": 17, + "w": 37, + "h": 42 + }, + "frame": { + "x": 56, + "y": 1, + "w": 37, + "h": 42 + } + }, + { + "filename": "hedgehog/4.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 0, + "y": 4, + "w": 30, + "h": 26 + }, + "frame": { + "x": 95, + "y": 1, + "w": 30, + "h": 26 + } + }, + { + "filename": "sheep/sheep_down.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 10, + "y": 21, + "w": 37, + "h": 38 + }, + "frame": { + "x": 1, + "y": 73, + "w": 37, + "h": 38 + } + }, + { + "filename": "hedgehog/16.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 2, + "y": 4, + "w": 30, + "h": 26 + }, + "frame": { + "x": 95, + "y": 29, + "w": 30, + "h": 26 + } + }, + { + "filename": "sheep/sheared/sheep_left.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "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": 32 + }, + "spriteSourceSize": { + "x": 3, + "y": 8, + "w": 26, + "h": 21 + }, + "frame": { + "x": 1, + "y": 213, + "w": 26, + "h": 21 + } + }, + { + "filename": "hedgehog/1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 0, + "y": 5, + "w": 32, + "h": 25 + }, + "frame": { + "x": 56, + "y": 45, + "w": 32, + "h": 25 + } + }, + { + "filename": "sheep/sheared/sheep_down.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 18, + "y": 29, + "w": 25, + "h": 30 + }, + "frame": { + "x": 26, + "y": 171, + "w": 25, + "h": 30 + } + }, + { + "filename": "hedgehog/0.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 0, + "y": 6, + "w": 32, + "h": 24 + }, + "frame": { + "x": 90, + "y": 57, + "w": 32, + "h": 24 + } + }, + { + "filename": "hedgehog/2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 0, + "y": 5, + "w": 32, + "h": 25 + }, + "frame": { + "x": 56, + "y": 72, + "w": 32, + "h": 25 + } + }, + { + "filename": "hedgehog/12.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 0, + "y": 6, + "w": 32, + "h": 24 + }, + "frame": { + "x": 90, + "y": 83, + "w": 32, + "h": 24 + } + }, + { + "filename": "hedgehog/3.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 0, + "y": 4, + "w": 31, + "h": 26 + }, + "frame": { + "x": 29, + "y": 203, + "w": 31, + "h": 26 + } + }, + { + "filename": "hedgehog/13.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 0, + "y": 5, + "w": 32, + "h": 25 + }, + "frame": { + "x": 50, + "y": 99, + "w": 32, + "h": 25 + } + }, + { + "filename": "hedgehog/14.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 0, + "y": 5, + "w": 32, + "h": 25 + }, + "frame": { + "x": 50, + "y": 126, + "w": 32, + "h": 25 + } + }, + { + "filename": "hedgehog/15.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 1, + "y": 4, + "w": 31, + "h": 26 + }, + "frame": { + "x": 84, + "y": 109, + "w": 31, + "h": 26 + } + }, + { + "filename": "hedgehog/5.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 0, + "y": 4, + "w": 30, + "h": 25 + }, + "frame": { + "x": 84, + "y": 137, + "w": 30, + "h": 25 + } + }, + { + "filename": "hedgehog/7.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 3, + "y": 7, + "w": 26, + "h": 22 + }, + "frame": { + "x": 53, + "y": 153, + "w": 26, + "h": 22 + } + }, + { + "filename": "hedgehog/8.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 1, + "y": 6, + "w": 30, + "h": 23 + }, + "frame": { + "x": 53, + "y": 177, + "w": 30, + "h": 23 + } + }, + { + "filename": "hedgehog/17.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 2, + "y": 4, + "w": 30, + "h": 25 + }, + "frame": { + "x": 62, + "y": 202, + "w": 30, + "h": 25 + } + }, + { + "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": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 3, + "y": 7, + "w": 26, + "h": 22 + }, + "frame": { + "x": 94, + "y": 189, + "w": 26, + "h": 22 + } + }, + { + "filename": "hedgehog/9.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 3, + "y": 8, + "w": 26, + "h": 21 + }, + "frame": { + "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 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "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 new file mode 100644 index 00000000..ec97fcf8 Binary files /dev/null and b/apps/client/src/assets/probable-waffle/atlas/animals.png differ diff --git a/apps/client/src/assets/probable-waffle/atlas/anims/animals.json b/apps/client/src/assets/probable-waffle/atlas/anims/animals.json new file mode 100644 index 00000000..61250cc2 --- /dev/null +++ b/apps/client/src/assets/probable-waffle/atlas/anims/animals.json @@ -0,0 +1,401 @@ +{ + "anims": [ + { + "key": "hedgehog_idle_right", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "hedgehog/0.png", + "duration": 0, + "keyframe": false + }, + { + "key": "animals", + "frame": "hedgehog/1.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 1, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "hedgehog_idle_down", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "hedgehog/10.png", + "duration": 0, + "keyframe": false + }, + { + "key": "animals", + "frame": "hedgehog/9.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 1, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "hedgehog_idle_top", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "hedgehog/6.png", + "duration": 0, + "keyframe": false + }, + { + "key": "animals", + "frame": "hedgehog/7.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 1, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "hedgehog_walk_right", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "hedgehog/1.png", + "duration": 0, + "keyframe": false + }, + { + "key": "animals", + "frame": "hedgehog/2.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 4, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "hedgehog_walk_top", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "hedgehog/6.png", + "duration": 0, + "keyframe": false + }, + { + "key": "animals", + "frame": "hedgehog/7.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 4, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "hedgehog_ball_right", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "hedgehog/3.png", + "duration": 0, + "keyframe": false + }, + { + "key": "animals", + "frame": "hedgehog/4.png", + "duration": 0, + "keyframe": false + }, + { + "key": "animals", + "frame": "hedgehog/5.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 2, + "skipMissedFrames": true + }, + { + "key": "hedgehog_ball_down", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "hedgehog/9.png", + "duration": 0, + "keyframe": false + }, + { + "key": "animals", + "frame": "hedgehog/11.png", + "duration": 0, + "keyframe": false + }, + { + "key": "animals", + "frame": "hedgehog/8.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 2, + "skipMissedFrames": true + }, + { + "key": "hedgehog_ball_top", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "hedgehog/6.png", + "duration": 0, + "keyframe": false + }, + { + "key": "animals", + "frame": "hedgehog/5.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 2, + "skipMissedFrames": true + }, + { + "key": "hedgehog_idle_left", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "hedgehog/12.png", + "duration": 0, + "keyframe": false + }, + { + "key": "animals", + "frame": "hedgehog/13.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 1, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "hedgehog_walk_left", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "hedgehog/13.png", + "duration": 0, + "keyframe": false + }, + { + "key": "animals", + "frame": "hedgehog/14.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 4, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "hedgehog_ball_left", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "hedgehog/15.png", + "duration": 0, + "keyframe": false + }, + { + "key": "animals", + "frame": "hedgehog/16.png", + "duration": 0, + "keyframe": false + }, + { + "key": "animals", + "frame": "hedgehog/17.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 2, + "skipMissedFrames": true + }, + { + "key": "hedgehog_walk_down", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "hedgehog/10.png", + "duration": 0, + "keyframe": false + }, + { + "key": "animals", + "frame": "hedgehog/9.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 4, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "sheep_idle_down", + "type": "frame", + "frames": [ + { + "key": "animals", + "frame": "sheep/sheep_down.png", + "duration": 0, + "keyframe": false + } + ], + "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_up", + "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 + } + ], + "globalTimeScale": 1, + "meta": { + "app": "Phaser Editor 2D v3", + "contentType": "Phaser v3 Animations" + }, + "settings": { + "sourceLang": "TYPE_SCRIPT", + "esModule": true, + "generateCode": true, + "outputFolder": "fuzzy-waddle/apps/client/src/app/probable-waffle/game/prefabs/animals/anims" + } +} \ No newline at end of file diff --git a/apps/client/src/assets/probable-waffle/atlas/anims/animals.ts b/apps/client/src/assets/probable-waffle/atlas/anims/animals.ts new file mode 100644 index 00000000..2ffc9fe4 --- /dev/null +++ b/apps/client/src/assets/probable-waffle/atlas/anims/animals.ts @@ -0,0 +1,23 @@ +// The constants with the animation keys. + +export const ANIM_HEDGEHOG_IDLE_RIGHT = "hedgehog_idle_right"; + +export const ANIM_HEDGEHOG_IDLE_BOTTOM = "hedgehog_idle_bottom"; + +export const ANIM_HEDGEHOG_IDLE_TOP = "hedgehog_idle_top"; + +export const ANIM_HEDGEHOG_WALK_RIGHT = "hedgehog_walk_right"; + +export const ANIM_HEDGEHOG_WALK_TOP = "hedgehog_walk_top"; + +export const ANIM_HEDGEHOG_BALL_RIGHT = "hedgehog_ball_right"; + +export const ANIM_HEDGEHOG_BALL_DOWN = "hedgehog_ball_down"; + +export const ANIM_HEDGEHOG_BALL_TOP = "hedgehog_ball_top"; + +export const ANIM_HEDGEHOG_IDLE_LEFT = "hedgehog_idle_left"; + +export const ANIM_HEDGEHOG_WALK_LEFT = "hedgehog_walk_left"; + +export const ANIM_HEDGEHOG_BALL_LEFT = "hedgehog_ball_left"; diff --git a/apps/client/src/assets/probable-waffle/atlas/anims/skaduwee/buildings.json b/apps/client/src/assets/probable-waffle/atlas/anims/skaduwee/buildings.json index 3e624cb8..c9ac41a7 100644 --- a/apps/client/src/assets/probable-waffle/atlas/anims/skaduwee/buildings.json +++ b/apps/client/src/assets/probable-waffle/atlas/anims/skaduwee/buildings.json @@ -73,6 +73,33 @@ ], "frameRate": 3, "skipMissedFrames": true + }, + { + "key": "frost_forge_flame", + "type": "frame", + "frames": [ + { + "key": "factions", + "frame": "buildings/skaduwee/frost_forge/flame/frost_forge_flame_1.png", + "duration": 0, + "keyframe": false + }, + { + "key": "factions", + "frame": "buildings/skaduwee/frost_forge/flame/frost_forge_flame_2.png", + "duration": 0, + "keyframe": false + }, + { + "key": "factions", + "frame": "buildings/skaduwee/frost_forge/flame/frost_forge_flame_3.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 1, + "skipMissedFrames": true, + "repeat": -1 } ], "globalTimeScale": 1, diff --git a/apps/client/src/assets/probable-waffle/atlas/anims/skaduwee/buildings.ts b/apps/client/src/assets/probable-waffle/atlas/anims/skaduwee/buildings.ts index 7d84612c..5a3e175e 100644 --- a/apps/client/src/assets/probable-waffle/atlas/anims/skaduwee/buildings.ts +++ b/apps/client/src/assets/probable-waffle/atlas/anims/skaduwee/buildings.ts @@ -5,3 +5,5 @@ export const ANIM_SKADUWEE_BUILDINGS_INFANTRY_INN_ENTRANCE = "skaduwee-buildings export const ANIM_SKADUWEE_BUILDINGS_OWLERY_OWL = "skaduwee-buildings-owlery-owl"; export const ANIM_SKADUWEE_BUILDINGS_OWLERY_OWL_FLAP = "skaduwee-buildings-owlery-owl-flap"; + +export const ANIM_FROST_FORGE_FLAME = "frost_forge_flame"; diff --git a/apps/client/src/assets/probable-waffle/atlas/anims/units.json b/apps/client/src/assets/probable-waffle/atlas/anims/units.json new file mode 100644 index 00000000..5ee5d821 --- /dev/null +++ b/apps/client/src/assets/probable-waffle/atlas/anims/units.json @@ -0,0 +1,283 @@ +{ + "anims": [ + { + "key": "skaduwee/owl/idle/down", + "type": "frame", + "frames": [ + { + "key": "units", + "frame": "skaduwee/owl/idle/down_1.png", + "duration": 0, + "keyframe": false + }, + { + "key": "units", + "frame": "skaduwee/owl/idle/down_2.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 5, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "skaduwee/owl/idle/right", + "type": "frame", + "frames": [ + { + "key": "units", + "frame": "skaduwee/owl/idle/right_1.png", + "duration": 0, + "keyframe": false + }, + { + "key": "units", + "frame": "skaduwee/owl/idle/right_2.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 5, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "skaduwee/owl/idle/up", + "type": "frame", + "frames": [ + { + "key": "units", + "frame": "skaduwee/owl/idle/up_1.png", + "duration": 0, + "keyframe": false + }, + { + "key": "units", + "frame": "skaduwee/owl/idle/up_2.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 5, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "skaduwee/owl/idle/right_1", + "type": "frame", + "frames": [ + { + "key": "units", + "frame": "skaduwee/owl/idle/right_1.png", + "duration": 0, + "keyframe": false + }, + { + "key": "units", + "frame": "skaduwee/owl/idle/right_2.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 5, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "skaduwee/owl/move/down", + "type": "frame", + "frames": [ + { + "key": "units", + "frame": "skaduwee/owl/move/down_1.png", + "duration": 0, + "keyframe": false + }, + { + "key": "units", + "frame": "skaduwee/owl/move/down_2.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 10, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "skaduwee/owl/move/left", + "type": "frame", + "frames": [ + { + "key": "units", + "frame": "skaduwee/owl/move/left_1.png", + "duration": 0, + "keyframe": false + }, + { + "key": "units", + "frame": "skaduwee/owl/move/left_2.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 10, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "skaduwee/owl/move/up", + "type": "frame", + "frames": [ + { + "key": "units", + "frame": "skaduwee/owl/move/up_1.png", + "duration": 0, + "keyframe": false + }, + { + "key": "units", + "frame": "skaduwee/owl/move/up_2.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 10, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "skaduwee/owl/move/right", + "type": "frame", + "frames": [ + { + "key": "units", + "frame": "skaduwee/owl/move/right_1.png", + "duration": 0, + "keyframe": false + }, + { + "key": "units", + "frame": "skaduwee/owl/move/right_2.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 10, + "skipMissedFrames": true, + "repeat": -1 + }, + { + "key": "skaduwee/owl/attack/up", + "type": "frame", + "frames": [ + { + "key": "units", + "frame": "skaduwee/owl/attack/up_1.png", + "duration": 0, + "keyframe": false + }, + { + "key": "units", + "frame": "skaduwee/owl/attack/up_2.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 5, + "skipMissedFrames": true + }, + { + "key": "skaduwee/owl/attack/down", + "type": "frame", + "frames": [ + { + "key": "units", + "frame": "skaduwee/owl/attack/down_1.png", + "duration": 0, + "keyframe": false + }, + { + "key": "units", + "frame": "skaduwee/owl/attack/down_2.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 5, + "skipMissedFrames": true + }, + { + "key": "skaduwee/owl/attack/left", + "type": "frame", + "frames": [ + { + "key": "units", + "frame": "skaduwee/owl/attack/left_1.png", + "duration": 0, + "keyframe": false + }, + { + "key": "units", + "frame": "skaduwee/owl/attack/left_2.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 5, + "skipMissedFrames": true + }, + { + "key": "skaduwee/owl/attack/right", + "type": "frame", + "frames": [ + { + "key": "units", + "frame": "skaduwee/owl/attack/right_1.png", + "duration": 0, + "keyframe": false + }, + { + "key": "units", + "frame": "skaduwee/owl/attack/right_2.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 5, + "skipMissedFrames": true + }, + { + "key": "skaduwee/owl/die/down", + "type": "frame", + "frames": [ + { + "key": "units", + "frame": "skaduwee/owl/die/down_1.png", + "duration": 0, + "keyframe": false + }, + { + "key": "units", + "frame": "skaduwee/owl/die/down_2.png", + "duration": 0, + "keyframe": false + } + ], + "frameRate": 5, + "skipMissedFrames": true + } + ], + "globalTimeScale": 1, + "meta": { + "app": "Phaser Editor 2D v3", + "contentType": "Phaser v3 Animations" + }, + "settings": { + "sourceLang": "TYPE_SCRIPT", + "esModule": true, + "generateCode": true, + "outputFolder": "fuzzy-waddle/apps/client/src/app/probable-waffle/game/prefabs/units/anims" + } +} \ No newline at end of file diff --git a/apps/client/src/assets/probable-waffle/atlas/factions.json b/apps/client/src/assets/probable-waffle/atlas/factions.json index 8b0be6a0..bbf8759f 100644 --- a/apps/client/src/assets/probable-waffle/atlas/factions.json +++ b/apps/client/src/assets/probable-waffle/atlas/factions.json @@ -4,8 +4,8 @@ "image": "factions.png", "format": "RGBA8888", "size": { - "w": 730, - "h": 479 + "w": 497, + "h": 840 }, "scale": 1, "frames": [ @@ -35,24 +35,24 @@ } }, { - "filename": "buildings/tivara/ankguard/ankguard.png", + "filename": "buildings/skaduwee/frost_forge/frost_forge.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 256, - "h": 256 + "h": 384 }, "spriteSourceSize": { - "x": 29, - "y": 50, - "w": 227, - "h": 197 + "x": 21, + "y": 92, + "w": 214, + "h": 277 }, "frame": { "x": 1, "y": 266, - "w": 227, - "h": 197 + "w": 214, + "h": 277 }, "anchor": { "x": 0.5, @@ -60,24 +60,24 @@ } }, { - "filename": "buildings/tivara/temple/temple.png", + "filename": "buildings/tivara/ankguard/ankguard.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 192, - "h": 192 + "w": 256, + "h": 256 }, "spriteSourceSize": { - "x": 7, - "y": 23, - "w": 185, - "h": 165 + "x": 29, + "y": 50, + "w": 227, + "h": 197 }, "frame": { - "x": 314, - "y": 1, - "w": 185, - "h": 165 + "x": 1, + "y": 545, + "w": 227, + "h": 197 }, "anchor": { "x": 0.5, @@ -99,7 +99,7 @@ "h": 168 }, "frame": { - "x": 501, + "x": 314, "y": 1, "w": 128, "h": 168 @@ -110,24 +110,24 @@ } }, { - "filename": "buildings/skaduwee/owlery/owlery.png", + "filename": "buildings/tivara/temple/temple.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 64, + "w": 192, "h": 192 }, "spriteSourceSize": { - "x": 1, - "y": 3, - "w": 63, - "h": 189 + "x": 7, + "y": 23, + "w": 185, + "h": 165 }, "frame": { - "x": 230, + "x": 217, "y": 266, - "w": 63, - "h": 189 + "w": 185, + "h": 165 }, "anchor": { "x": 0.5, @@ -135,24 +135,24 @@ } }, { - "filename": "buildings/tivara/workmill.png", + "filename": "buildings/tivara/sandhold/sandhold-crystal.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { - "w": 128, - "h": 128 + "w": 64, + "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 128, - "h": 128 + "x": 5, + "y": 5, + "w": 52, + "h": 59 }, "frame": { - "x": 314, - "y": 168, - "w": 128, - "h": 128 + "x": 444, + "y": 1, + "w": 52, + "h": 59 }, "anchor": { "x": 0.5, @@ -160,28 +160,28 @@ } }, { - "filename": "buildings/skaduwee/infantry_inn/infantry_inn.png", + "filename": "character_icons/general/warrior.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 128, - "h": 128 + "w": 64, + "h": 64 }, "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 125, - "h": 128 + "x": 0, + "y": 12, + "w": 52, + "h": 52 }, "frame": { - "x": 295, - "y": 298, - "w": 125, - "h": 128 + "x": 444, + "y": 62, + "w": 52, + "h": 52 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.9 } }, { @@ -199,8 +199,8 @@ "h": 89 }, "frame": { - "x": 631, - "y": 1, + "x": 1, + "y": 744, "w": 64, "h": 89 }, @@ -210,124 +210,124 @@ } }, { - "filename": "character_icons/skaduwee/worker_male.png", + "filename": "buildings/tivara/wall/wall_top_right_bottom_left.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 96 }, "spriteSourceSize": { - "x": 16, - "y": 9, - "w": 32, - "h": 55 + "x": 0, + "y": 7, + "w": 64, + "h": 89 }, "frame": { - "x": 697, - "y": 1, - "w": 32, - "h": 55 + "x": 217, + "y": 433, + "w": 64, + "h": 89 }, "anchor": { "x": 0.5, - "y": 0.9 + "y": 0.75 } }, { - "filename": "buildings/tivara/wall/wall_bottom_left.png", + "filename": "buildings/skaduwee/owlery/owlery.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 96 + "h": 192 }, "spriteSourceSize": { - "x": 0, - "y": 18, - "w": 64, - "h": 78 + "x": 1, + "y": 3, + "w": 63, + "h": 189 }, "frame": { - "x": 631, - "y": 92, - "w": 64, - "h": 78 + "x": 230, + "y": 524, + "w": 63, + "h": 189 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { - "filename": "character_icons/skaduwee/worker_female.png", + "filename": "buildings/tivara/wall/wall_top_right_bottom_right.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 96 }, "spriteSourceSize": { - "x": 16, - "y": 11, - "w": 32, - "h": 53 + "x": 0, + "y": 7, + "w": 64, + "h": 89 }, "frame": { - "x": 697, - "y": 58, - "w": 32, - "h": 53 + "x": 283, + "y": 433, + "w": 64, + "h": 89 }, "anchor": { "x": 0.5, - "y": 0.9 + "y": 0.75 } }, { - "filename": "character_icons/tivara/worker_female.png", + "filename": "buildings/skaduwee/infantry_inn/infantry_inn.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 64, - "h": 64 + "w": 128, + "h": 128 }, "spriteSourceSize": { - "x": 16, - "y": 12, - "w": 32, - "h": 52 + "x": 2, + "y": 0, + "w": 125, + "h": 128 }, "frame": { - "x": 697, - "y": 113, - "w": 32, - "h": 52 + "x": 295, + "y": 524, + "w": 125, + "h": 128 }, "anchor": { "x": 0.5, - "y": 0.9 + "y": 0.5 } }, { - "filename": "buildings/tivara/sandhold/sandhold-crystal.png", + "filename": "buildings/tivara/workmill.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { - "w": 64, - "h": 64 + "w": 128, + "h": 128 }, "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 52, - "h": 59 + "x": 0, + "y": 0, + "w": 128, + "h": 128 }, "frame": { - "x": 444, - "y": 168, - "w": 52, - "h": 59 + "x": 295, + "y": 654, + "w": 128, + "h": 128 }, "anchor": { "x": 0.5, @@ -335,7 +335,7 @@ } }, { - "filename": "buildings/tivara/wall/wall_bottom_left_bottom_right.png", + "filename": "buildings/tivara/wall/wall_top_left.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -344,15 +344,15 @@ }, "spriteSourceSize": { "x": 0, - "y": 18, + "y": 8, "w": 64, - "h": 78 + "h": 88 }, "frame": { - "x": 444, - "y": 229, + "x": 314, + "y": 171, "w": 64, - "h": 78 + "h": 88 }, "anchor": { "x": 0.5, @@ -360,7 +360,7 @@ } }, { - "filename": "buildings/tivara/wall/wall_top_right_bottom_left.png", + "filename": "buildings/tivara/wall/wall_top_left_bottom_left.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -369,15 +369,15 @@ }, "spriteSourceSize": { "x": 0, - "y": 7, + "y": 8, "w": 64, - "h": 89 + "h": 88 }, "frame": { - "x": 422, - "y": 309, + "x": 67, + "y": 744, "w": 64, - "h": 89 + "h": 88 }, "anchor": { "x": 0.5, @@ -385,7 +385,7 @@ } }, { - "filename": "buildings/tivara/wall/wall_top_right_bottom_right.png", + "filename": "buildings/tivara/wall/wall_top_left_bottom_right.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -394,15 +394,15 @@ }, "spriteSourceSize": { "x": 0, - "y": 7, + "y": 8, "w": 64, - "h": 89 + "h": 88 }, "frame": { - "x": 488, - "y": 309, + "x": 133, + "y": 744, "w": 64, - "h": 89 + "h": 88 }, "anchor": { "x": 0.5, @@ -410,99 +410,99 @@ } }, { - "filename": "character_icons/tivara/maceman_male.png", + "filename": "buildings/tivara/wall/wall_top_left_top_right.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 96 }, "spriteSourceSize": { - "x": 12, - "y": 14, - "w": 37, - "h": 50 + "x": 0, + "y": 8, + "w": 64, + "h": 88 }, "frame": { - "x": 295, - "y": 428, - "w": 37, - "h": 50 + "x": 380, + "y": 171, + "w": 64, + "h": 88 }, "anchor": { "x": 0.5, - "y": 0.9 + "y": 0.75 } }, { - "filename": "character_icons/tivara/worker_male.png", + "filename": "buildings/tivara/wall/wall_bottom_left.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 96 }, "spriteSourceSize": { - "x": 16, - "y": 14, - "w": 32, - "h": 50 + "x": 0, + "y": 18, + "w": 64, + "h": 78 }, "frame": { - "x": 334, - "y": 428, - "w": 32, - "h": 50 + "x": 349, + "y": 433, + "w": 64, + "h": 78 }, "anchor": { "x": 0.5, - "y": 0.9 + "y": 0.75 } }, { - "filename": "character_icons/general/warrior.png", + "filename": "buildings/tivara/wall/wall_bottom_left_bottom_right.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 96 }, "spriteSourceSize": { "x": 0, - "y": 12, - "w": 52, - "h": 52 + "y": 18, + "w": 64, + "h": 78 }, "frame": { - "x": 498, - "y": 171, - "w": 52, - "h": 52 + "x": 404, + "y": 261, + "w": 64, + "h": 78 }, "anchor": { "x": 0.5, - "y": 0.9 + "y": 0.75 } }, { - "filename": "buildings/tivara/wall/stairs_left.png", + "filename": "buildings/tivara/wall/wall_bottom_right.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 96 }, "spriteSourceSize": { "x": 0, - "y": 0, + "y": 21, "w": 64, - "h": 64 + "h": 75 }, "frame": { - "x": 552, - "y": 171, + "x": 404, + "y": 341, "w": 64, - "h": 64 + "h": 75 }, "anchor": { "x": 0.5, @@ -510,7 +510,32 @@ } }, { - "filename": "buildings/tivara/wall/stairs_right.png", + "filename": "buildings/tivara/wall/wall_empty.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 96 + }, + "spriteSourceSize": { + "x": 0, + "y": 23, + "w": 64, + "h": 73 + }, + "frame": { + "x": 415, + "y": 418, + "w": 64, + "h": 73 + }, + "anchor": { + "x": 0.5, + "y": 0.75 + } + }, + { + "filename": "buildings/tivara/wall/stairs_left.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -524,8 +549,8 @@ "h": 64 }, "frame": { - "x": 618, - "y": 172, + "x": 199, + "y": 744, "w": 64, "h": 64 }, @@ -535,7 +560,32 @@ } }, { - "filename": "character_icons/tivara/archer_female.png", + "filename": "buildings/skaduwee/frost_forge/flame/frost_forge_flame_2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 48 + }, + "spriteSourceSize": { + "x": 12, + "y": 19, + "w": 40, + "h": 29 + }, + "frame": { + "x": 199, + "y": 810, + "w": 40, + "h": 29 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "character_icons/skaduwee/ranged_female.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -545,13 +595,13 @@ "spriteSourceSize": { "x": 16, "y": 13, - "w": 40, + "w": 41, "h": 51 }, "frame": { - "x": 510, - "y": 225, - "w": 40, + "x": 444, + "y": 116, + "w": 41, "h": 51 }, "anchor": { @@ -560,24 +610,24 @@ } }, { - "filename": "buildings/tivara/wall/wall_bottom_right.png", + "filename": "buildings/tivara/wall/stairs_right.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { "w": 64, - "h": 96 + "h": 64 }, "spriteSourceSize": { "x": 0, - "y": 21, + "y": 0, "w": 64, - "h": 75 + "h": 64 }, "frame": { "x": 422, - "y": 400, + "y": 493, "w": 64, - "h": 75 + "h": 64 }, "anchor": { "x": 0.5, @@ -585,57 +635,57 @@ } }, { - "filename": "buildings/tivara/wall/wall_empty.png", + "filename": "character_icons/skaduwee/warrior_male.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 96 + "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 23, - "w": 64, - "h": 73 + "x": 16, + "y": 12, + "w": 39, + "h": 52 }, "frame": { - "x": 488, - "y": 400, - "w": 64, - "h": 73 + "x": 422, + "y": 559, + "w": 39, + "h": 52 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.9 } }, { - "filename": "buildings/tivara/olival/olival.png", + "filename": "character_icons/skaduwee/magician_female.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 32, + "w": 64, "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 14, - "w": 32, - "h": 48 + "x": 16, + "y": 11, + "w": 33, + "h": 53 }, "frame": { - "x": 697, - "y": 167, - "w": 32, - "h": 48 + "x": 463, + "y": 559, + "w": 33, + "h": 53 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.9 } }, { - "filename": "character_icons/skaduwee/ranged_female.png", + "filename": "character_icons/tivara/archer_female.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -645,13 +695,13 @@ "spriteSourceSize": { "x": 16, "y": 13, - "w": 41, + "w": 40, "h": 51 }, "frame": { - "x": 552, - "y": 237, - "w": 41, + "x": 446, + "y": 169, + "w": 40, "h": 51 }, "anchor": { @@ -660,107 +710,132 @@ } }, { - "filename": "buildings/tivara/wall/wall_top_left.png", + "filename": "buildings/skaduwee/frost_forge/flame/frost_forge_flame_1.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 96 + "h": 48 + }, + "spriteSourceSize": { + "x": 11, + "y": 16, + "w": 43, + "h": 32 + }, + "frame": { + "x": 446, + "y": 222, + "w": 43, + "h": 32 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "weapons/arrow.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 31, + "h": 4 }, "spriteSourceSize": { "x": 0, - "y": 8, - "w": 64, - "h": 88 + "y": 0, + "w": 31, + "h": 4 }, "frame": { - "x": 554, - "y": 290, - "w": 64, - "h": 88 + "x": 1, + "y": 835, + "w": 31, + "h": 4 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { - "filename": "buildings/tivara/wall/wall_top_left_bottom_left.png", + "filename": "buildings/tivara/olival_small/olival_small-0.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { - "w": 64, - "h": 96 + "w": 32, + "h": 32 }, "spriteSourceSize": { "x": 0, - "y": 8, - "w": 64, - "h": 88 + "y": 0, + "w": 32, + "h": 32 }, "frame": { - "x": 554, - "y": 380, - "w": 64, - "h": 88 + "x": 422, + "y": 613, + "w": 32, + "h": 32 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { - "filename": "buildings/tivara/wall/wall_top_left_bottom_right.png", + "filename": "buildings/skaduwee/infantry_inn/infantry_inn-entrance/infantry_inn-0.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { - "w": 64, - "h": 96 + "w": 27, + "h": 61 }, "spriteSourceSize": { "x": 0, - "y": 8, - "w": 64, - "h": 88 + "y": 0, + "w": 27, + "h": 61 }, "frame": { - "x": 620, - "y": 238, - "w": 64, - "h": 88 + "x": 425, + "y": 647, + "w": 27, + "h": 61 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { - "filename": "buildings/tivara/wall/wall_top_left_top_right.png", + "filename": "buildings/skaduwee/infantry_inn/infantry_inn-entrance/infantry_inn-1.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { - "w": 64, - "h": 96 + "w": 27, + "h": 61 }, "spriteSourceSize": { "x": 0, - "y": 8, - "w": 64, - "h": 88 + "y": 0, + "w": 27, + "h": 61 }, "frame": { - "x": 620, - "y": 328, - "w": 64, - "h": 88 + "x": 425, + "y": 710, + "w": 27, + "h": 61 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { - "filename": "character_icons/skaduwee/warrior_male.png", + "filename": "character_icons/tivara/maceman_male.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -768,16 +843,16 @@ "h": 64 }, "spriteSourceSize": { - "x": 16, - "y": 12, - "w": 39, - "h": 52 + "x": 12, + "y": 14, + "w": 37, + "h": 50 }, "frame": { - "x": 620, - "y": 418, - "w": 39, - "h": 52 + "x": 456, + "y": 614, + "w": 37, + "h": 50 }, "anchor": { "x": 0.5, @@ -785,7 +860,7 @@ } }, { - "filename": "character_icons/skaduwee/magician_female.png", + "filename": "character_icons/skaduwee/worker_male.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -794,15 +869,15 @@ }, "spriteSourceSize": { "x": 16, - "y": 11, - "w": 33, - "h": 53 + "y": 9, + "w": 32, + "h": 55 }, - "frame": { - "x": 661, - "y": 418, - "w": 33, - "h": 53 + "frame": { + "x": 454, + "y": 666, + "w": 32, + "h": 55 }, "anchor": { "x": 0.5, @@ -810,24 +885,24 @@ } }, { - "filename": "buildings/tivara/temple/temple-olival.png", + "filename": "buildings/tivara/olival/olival.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 33, - "h": 41 + "w": 32, + "h": 64 }, "spriteSourceSize": { - "x": 1, - "y": 0, + "x": 0, + "y": 14, "w": 32, - "h": 41 + "h": 48 }, "frame": { - "x": 368, - "y": 428, + "x": 454, + "y": 723, "w": 32, - "h": 41 + "h": 48 }, "anchor": { "x": 0.5, @@ -835,24 +910,24 @@ } }, { - "filename": "buildings/tivara/ankguard/ankguard-flame/ankguard-flame-0.png", + "filename": "buildings/skaduwee/frost_forge/flame/frost_forge_flame_3.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 19, - "h": 24 + "w": 64, + "h": 48 }, "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 17, - "h": 23 + "x": 11, + "y": 17, + "w": 44, + "h": 31 }, "frame": { - "x": 295, - "y": 266, - "w": 17, - "h": 23 + "x": 425, + "y": 773, + "w": 44, + "h": 31 }, "anchor": { "x": 0.5, @@ -860,24 +935,24 @@ } }, { - "filename": "buildings/skaduwee/infantry_inn/infantry_inn-entrance/infantry_inn-0.png", + "filename": "buildings/skaduwee/owlery/owlery-owl/owlery-owl-2.png", "rotated": false, "trimmed": false, "sourceSize": { - "w": 27, - "h": 61 + "w": 22, + "h": 22 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 27, - "h": 61 + "w": 22, + "h": 22 }, "frame": { - "x": 686, - "y": 217, - "w": 27, - "h": 61 + "x": 230, + "y": 715, + "w": 22, + "h": 22 }, "anchor": { "x": 0.5, @@ -885,24 +960,24 @@ } }, { - "filename": "buildings/skaduwee/infantry_inn/infantry_inn-entrance/infantry_inn-1.png", + "filename": "buildings/skaduwee/owlery/owlery-owl/owlery-owl-3.png", "rotated": false, "trimmed": false, "sourceSize": { - "w": 27, - "h": 61 + "w": 22, + "h": 22 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 27, - "h": 61 + "w": 22, + "h": 22 }, "frame": { - "x": 686, - "y": 280, - "w": 27, - "h": 61 + "x": 241, + "y": 810, + "w": 22, + "h": 22 }, "anchor": { "x": 0.5, @@ -910,99 +985,99 @@ } }, { - "filename": "buildings/tivara/olival_small/olival_small-0.png", + "filename": "character_icons/skaduwee/worker_female.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { - "w": 32, - "h": 32 + "w": 64, + "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 0, + "x": 16, + "y": 11, "w": 32, - "h": 32 + "h": 53 }, "frame": { - "x": 686, - "y": 343, + "x": 265, + "y": 784, "w": 32, - "h": 32 + "h": 53 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.9 } }, { - "filename": "buildings/tivara/olival_small/olival_small-1.png", + "filename": "character_icons/tivara/worker_female.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { - "w": 32, - "h": 32 + "w": 64, + "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 0, + "x": 16, + "y": 12, "w": 32, - "h": 32 + "h": 52 }, "frame": { - "x": 686, - "y": 377, + "x": 299, + "y": 784, "w": 32, - "h": 32 + "h": 52 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.9 } }, { - "filename": "buildings/tivara/ankguard/ankguard-flag/flag-1.png", + "filename": "character_icons/tivara/worker_male.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { - "w": 14, - "h": 19 + "w": 64, + "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 14, - "h": 19 + "x": 16, + "y": 14, + "w": 32, + "h": 50 }, "frame": { - "x": 715, - "y": 217, - "w": 14, - "h": 19 + "x": 333, + "y": 784, + "w": 32, + "h": 50 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.9 } }, { - "filename": "buildings/tivara/olival_small/olival_small-2.png", + "filename": "buildings/tivara/temple/temple-olival.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { - "w": 32, - "h": 32 + "w": 33, + "h": 41 }, "spriteSourceSize": { - "x": 0, + "x": 1, "y": 0, "w": 32, - "h": 32 + "h": 41 }, "frame": { - "x": 696, - "y": 411, + "x": 367, + "y": 784, "w": 32, - "h": 32 + "h": 41 }, "anchor": { "x": 0.5, @@ -1010,7 +1085,7 @@ } }, { - "filename": "buildings/skaduwee/owlery/owlery-owl/owlery-owl-2.png", + "filename": "character_icons/skaduwee/owl.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -1024,8 +1099,8 @@ "h": 22 }, "frame": { - "x": 510, - "y": 278, + "x": 401, + "y": 784, "w": 22, "h": 22 }, @@ -1035,24 +1110,24 @@ } }, { - "filename": "buildings/skaduwee/owlery/owlery-owl/owlery-owl-3.png", + "filename": "buildings/tivara/olival/olival-floor.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { - "w": 22, - "h": 22 + "w": 32, + "h": 10 }, "spriteSourceSize": { - "x": 0, + "x": 1, "y": 0, - "w": 22, - "h": 22 + "w": 31, + "h": 10 }, "frame": { - "x": 696, - "y": 445, - "w": 22, - "h": 22 + "x": 254, + "y": 715, + "w": 31, + "h": 10 }, "anchor": { "x": 0.5, @@ -1060,24 +1135,24 @@ } }, { - "filename": "buildings/tivara/olival/olival-floor.png", + "filename": "buildings/tivara/ankguard/ankguard-flame/ankguard-flame-0.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 32, - "h": 10 + "w": 19, + "h": 24 }, "spriteSourceSize": { "x": 1, "y": 0, - "w": 31, - "h": 10 + "w": 17, + "h": 23 }, "frame": { - "x": 1, - "y": 465, - "w": 31, - "h": 10 + "x": 471, + "y": 773, + "w": 17, + "h": 23 }, "anchor": { "x": 0.5, @@ -1099,8 +1174,8 @@ "h": 23 }, "frame": { - "x": 595, - "y": 237, + "x": 470, + "y": 256, "w": 17, "h": 23 }, @@ -1124,8 +1199,8 @@ "h": 23 }, "frame": { - "x": 402, - "y": 428, + "x": 470, + "y": 281, "w": 17, "h": 23 }, @@ -1149,8 +1224,8 @@ "h": 23 }, "frame": { - "x": 595, - "y": 262, + "x": 470, + "y": 306, "w": 17, "h": 23 }, @@ -1174,8 +1249,33 @@ "h": 22 }, "frame": { - "x": 534, - "y": 278, + "x": 470, + "y": 331, + "w": 15, + "h": 22 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "buildings/skaduwee/owlery/owlery-owl/owlery-owl-1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 22, + "h": 22 + }, + "spriteSourceSize": { + "x": 3, + "y": 0, + "w": 15, + "h": 22 + }, + "frame": { + "x": 470, + "y": 355, "w": 15, "h": 22 }, @@ -1199,8 +1299,8 @@ "h": 24 }, "frame": { - "x": 715, - "y": 238, + "x": 470, + "y": 379, "w": 12, "h": 24 }, @@ -1210,24 +1310,24 @@ } }, { - "filename": "weapons/arrow.png", + "filename": "buildings/tivara/olival_small/olival_small-1.png", "rotated": false, "trimmed": false, "sourceSize": { - "w": 31, - "h": 4 + "w": 32, + "h": 32 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 31, - "h": 4 + "w": 32, + "h": 32 }, "frame": { - "x": 230, - "y": 457, - "w": 31, - "h": 4 + "x": 425, + "y": 806, + "w": 32, + "h": 32 }, "anchor": { "x": 0.5, @@ -1235,24 +1335,24 @@ } }, { - "filename": "buildings/skaduwee/owlery/owlery-owl/owlery-owl-1.png", + "filename": "buildings/tivara/olival_small/olival_small-2.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { - "w": 22, - "h": 22 + "w": 32, + "h": 32 }, "spriteSourceSize": { - "x": 3, + "x": 0, "y": 0, - "w": 15, - "h": 22 + "w": 32, + "h": 32 }, "frame": { - "x": 402, - "y": 453, - "w": 15, - "h": 22 + "x": 459, + "y": 806, + "w": 32, + "h": 32 }, "anchor": { "x": 0.5, @@ -1260,23 +1360,23 @@ } }, { - "filename": "buildings/tivara/ankguard/ankguard-flag/flag-0.png", + "filename": "buildings/tivara/ankguard/ankguard-flag/flag-1.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { "w": 14, "h": 19 }, "spriteSourceSize": { - "x": 1, + "x": 0, "y": 0, - "w": 13, + "w": 14, "h": 19 }, "frame": { - "x": 715, - "y": 264, - "w": 13, + "x": 401, + "y": 808, + "w": 14, "h": 19 }, "anchor": { @@ -1299,8 +1399,8 @@ "h": 9 }, "frame": { - "x": 422, - "y": 298, + "x": 404, + "y": 418, "w": 9, "h": 9 }, @@ -1324,8 +1424,8 @@ "h": 9 }, "frame": { - "x": 433, - "y": 298, + "x": 349, + "y": 513, "w": 9, "h": 9 }, @@ -1349,8 +1449,8 @@ "h": 9 }, "frame": { - "x": 720, - "y": 445, + "x": 487, + "y": 116, "w": 9, "h": 9 }, @@ -1374,8 +1474,8 @@ "h": 9 }, "frame": { - "x": 720, - "y": 456, + "x": 360, + "y": 513, "w": 9, "h": 9 }, @@ -1383,6 +1483,31 @@ "x": 0.5, "y": 0.5 } + }, + { + "filename": "buildings/tivara/ankguard/ankguard-flag/flag-0.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 14, + "h": 19 + }, + "spriteSourceSize": { + "x": 1, + "y": 0, + "w": 13, + "h": 19 + }, + "frame": { + "x": 265, + "y": 727, + "w": 13, + "h": 19 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } } ] } @@ -1390,6 +1515,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:7c7e42d25648f2a5ca3fa15bbda220b8:af0ab750ca21782d78114b1973635d18:a9758daa4601cfd09e71f5a21b84c376$" + "smartupdate": "$TexturePacker:SmartUpdate:aefa636cd37e7da235c82c29f45c5f82:ba08651e2384355b005e97f0986e0891:a9758daa4601cfd09e71f5a21b84c376$" } } diff --git a/apps/client/src/assets/probable-waffle/atlas/factions.png b/apps/client/src/assets/probable-waffle/atlas/factions.png index 9c9f6263..74d7ff17 100644 Binary files a/apps/client/src/assets/probable-waffle/atlas/factions.png and b/apps/client/src/assets/probable-waffle/atlas/factions.png differ diff --git a/apps/client/src/assets/probable-waffle/atlas/gui.json b/apps/client/src/assets/probable-waffle/atlas/gui.json new file mode 100644 index 00000000..e120e953 --- /dev/null +++ b/apps/client/src/assets/probable-waffle/atlas/gui.json @@ -0,0 +1,146 @@ +{ + "textures": [ + { + "image": "gui.png", + "format": "RGBA8888", + "size": { + "w": 32, + "h": 61 + }, + "scale": 1, + "frames": [ + { + "filename": "cryos_mini_gui/surfaces/surface_parchment.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 24, + "h": 24 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 24, + "h": 24 + }, + "frame": { + "x": 1, + "y": 1, + "w": 24, + "h": 24 + } + }, + { + "filename": "cryos_mini_gui/buttons/button_small.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 16, + "h": 16 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 16, + "h": 16 + }, + "frame": { + "x": 1, + "y": 27, + "w": 16, + "h": 16 + } + }, + { + "filename": "cryos_mini_gui/borders/border_wood.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 12, + "h": 12 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 12, + "h": 12 + }, + "frame": { + "x": 19, + "y": 27, + "w": 12, + "h": 12 + } + }, + { + "filename": "cryos_mini_gui/buttons/button_small_pressed.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 16, + "h": 16 + }, + "spriteSourceSize": { + "x": 0, + "y": 1, + "w": 16, + "h": 15 + }, + "frame": { + "x": 1, + "y": 45, + "w": 16, + "h": 15 + } + }, + { + "filename": "cryos_mini_gui/borders/border_dark_outer.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 8, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 8, + "h": 8 + }, + "frame": { + "x": 19, + "y": 41, + "w": 8, + "h": 8 + } + }, + { + "filename": "cryos_mini_gui/surfaces/surface_dark.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 8, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 8, + "h": 8 + }, + "frame": { + "x": 19, + "y": 51, + "w": 8, + "h": 8 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "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 new file mode 100644 index 00000000..589912e6 Binary files /dev/null and b/apps/client/src/assets/probable-waffle/atlas/gui.png differ diff --git a/apps/client/src/assets/probable-waffle/atlas/outside.json b/apps/client/src/assets/probable-waffle/atlas/outside.json index 62ce4fdf..cb0921e4 100644 --- a/apps/client/src/assets/probable-waffle/atlas/outside.json +++ b/apps/client/src/assets/probable-waffle/atlas/outside.json @@ -4,30 +4,30 @@ "image": "outside.png", "format": "RGBA8888", "size": { - "w": 1636, - "h": 256 + "w": 1944, + "h": 249 }, "scale": 1, "frames": [ { - "filename": "architecture/river/bridge_stone.png", + "filename": "foliage/trees/resources/tree9.png", "rotated": false, "trimmed": true, "sourceSize": { - "w": 320, + "w": 128, "h": 192 }, "spriteSourceSize": { - "x": 11, - "y": 23, - "w": 294, - "h": 162 + "x": 5, + "y": 0, + "w": 120, + "h": 187 }, "frame": { "x": 1, "y": 1, - "w": 294, - "h": 162 + "w": 120, + "h": 187 }, "anchor": { "x": 0.5, @@ -35,157 +35,857 @@ } }, { - "filename": "foliage/trees/resources/tree8.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 128 - }, - "spriteSourceSize": { - "x": 8, - "y": 42, - "w": 45, - "h": 73 - }, - "frame": { - "x": 1, - "y": 165, - "w": 45, - "h": 73 - }, - "anchor": { - "x": 0.5, - "y": 0.859375 - } - }, - { - "filename": "foliage/tree_trunks/tree_trunk.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 32 - }, - "spriteSourceSize": { - "x": 27, - "y": 7, - "w": 10, - "h": 12 - }, - "frame": { - "x": 1, - "y": 240, - "w": 10, - "h": 12 - }, - "anchor": { - "x": 0.5, - "y": 0.5 - } - }, - { - "filename": "effects/ember/1.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 8, - "h": 8 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 8, - "h": 8 - }, - "frame": { - "x": 13, - "y": 240, - "w": 8, - "h": 8 - }, - "anchor": { - "x": 0.5, - "y": 0.5 - } - }, - { - "filename": "effects/ember/2.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 8, - "h": 8 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 8, - "h": 8 - }, - "frame": { - "x": 23, - "y": 240, - "w": 8, - "h": 8 - }, - "anchor": { - "x": 0.5, - "y": 0.5 - } - }, - { - "filename": "effects/ember/3.png", - "rotated": false, - "trimmed": false, - "sourceSize": { - "w": 8, - "h": 8 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 8, - "h": 8 - }, - "frame": { - "x": 33, - "y": 240, - "w": 8, - "h": 8 - }, - "anchor": { - "x": 0.5, - "y": 0.5 - } - }, - { - "filename": "architecture/blocks/doors_left.png", + "filename": "nature/block_obsidian_lava/2.png", "rotated": false, - "trimmed": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 32, + "y": 2, + "w": 19, + "h": 58 + }, + "frame": { + "x": 1, + "y": 190, + "w": 19, + "h": 58 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "nature/block_stone_water/2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 32, + "y": 2, + "w": 19, + "h": 58 + }, + "frame": { + "x": 22, + "y": 190, + "w": 19, + "h": 58 + }, + "anchor": { + "x": 0.5, + "y": 0.75 + } + }, + { + "filename": "architecture/blocks/height_3.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 0, + "y": 7, + "w": 64, + "h": 57 + }, + "frame": { + "x": 43, + "y": 190, + "w": 64, + "h": 57 + }, + "anchor": { + "x": 0.5, + "y": 0.75 + } + }, + { + "filename": "nature/ramp/stone/top_left.png", + "rotated": false, + "trimmed": true, "sourceSize": { "w": 64, "h": 64 }, + "spriteSourceSize": { + "x": 1, + "y": 6, + "w": 57, + "h": 57 + }, + "frame": { + "x": 109, + "y": 190, + "w": 57, + "h": 57 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "architecture/river/bridge_stone.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 320, + "h": 192 + }, "spriteSourceSize": { "x": 0, "y": 0, + "w": 305, + "h": 185 + }, + "frame": { + "x": 123, + "y": 1, + "w": 305, + "h": 185 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "nature/block_stone_water/6.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 11, + "y": 2, + "w": 43, + "h": 59 + }, + "frame": { + "x": 168, + "y": 188, + "w": 43, + "h": 59 + }, + "anchor": { + "x": 0.5, + "y": 0.75 + } + }, + { + "filename": "nature/ramp/stone/top_right.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 57, + "h": 57 + }, + "frame": { + "x": 213, + "y": 188, + "w": 57, + "h": 57 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "nature/block_obsidian_lava/4.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 42, + "h": 57 + }, + "frame": { + "x": 272, + "y": 188, + "w": 42, + "h": 57 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "nature/block_stone_water/4.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 7, + "y": 3, + "w": 42, + "h": 57 + }, + "frame": { + "x": 316, + "y": 188, + "w": 42, + "h": 57 + }, + "anchor": { + "x": 0.5, + "y": 0.75 + } + }, + { + "filename": "nature/block_obsidian_lava/1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 18, + "y": 4, + "w": 36, + "h": 57 + }, + "frame": { + "x": 360, + "y": 188, + "w": 36, + "h": 57 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "nature/block_stone_water/1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 18, + "y": 4, + "w": 36, + "h": 57 + }, + "frame": { + "x": 398, + "y": 188, + "w": 36, + "h": 57 + }, + "anchor": { + "x": 0.5, + "y": 0.75 + } + }, + { + "filename": "foliage/trees/large/with_leaves.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 192, + "h": 192 + }, + "spriteSourceSize": { + "x": 14, + "y": 39, + "w": 174, + "h": 147 + }, + "frame": { + "x": 430, + "y": 1, + "w": 174, + "h": 147 + }, + "anchor": { + "x": 0.5, + "y": 0.885417 + } + }, + { + "filename": "foliage/trees/resources/special/tree_christmas.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 128 + }, + "spriteSourceSize": { + "x": 6, + "y": 18, + "w": 48, + "h": 97 + }, + "frame": { + "x": 436, + "y": 150, + "w": 48, + "h": 97 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "foliage/trees/resources/tree7.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 128 + }, + "spriteSourceSize": { + "x": 6, + "y": 18, + "w": 48, + "h": 97 + }, + "frame": { + "x": 486, + "y": 150, + "w": 48, + "h": 97 + }, + "anchor": { + "x": 0.5, + "y": 0.86719 + } + }, + { + "filename": "foliage/trees/resources/tree11.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 92, + "h": 92 + }, + "spriteSourceSize": { + "x": 3, + "y": 12, + "w": 89, + "h": 80 + }, + "frame": { + "x": 536, + "y": 150, + "w": 89, + "h": 80 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "foliage/tree_trunks/tree_trunk.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 32 + }, + "spriteSourceSize": { + "x": 27, + "y": 7, + "w": 10, + "h": 12 + }, + "frame": { + "x": 536, + "y": 232, + "w": 10, + "h": 12 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "foliage/trees/resources/tree6.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 192 + }, + "spriteSourceSize": { + "x": 1, + "y": 40, + "w": 63, + "h": 141 + }, + "frame": { + "x": 606, + "y": 1, + "w": 63, + "h": 141 + }, + "anchor": { + "x": 0.5, + "y": 0.911458 + } + }, + { + "filename": "effects/ember/1.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 8, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 8, + "h": 8 + }, + "frame": { + "x": 548, + "y": 232, + "w": 8, + "h": 8 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "effects/ember/2.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 8, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 8, + "h": 8 + }, + "frame": { + "x": 558, + "y": 232, + "w": 8, + "h": 8 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "effects/ember/3.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 8, + "h": 8 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 8, + "h": 8 + }, + "frame": { + "x": 568, + "y": 232, + "w": 8, + "h": 8 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "foliage/trees/resources/tree8.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 128 + }, + "spriteSourceSize": { + "x": 8, + "y": 42, + "w": 45, + "h": 73 + }, + "frame": { + "x": 627, + "y": 144, + "w": 45, + "h": 73 + }, + "anchor": { + "x": 0.5, + "y": 0.859375 + } + }, + { + "filename": "foliage/bushes/bush_upwards_small.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 27, + "y": 27, + "w": 35, + "h": 29 + }, + "frame": { + "x": 627, + "y": 219, + "w": 35, + "h": 29 + }, + "anchor": { + "x": 0.5, + "y": 0.75 + } + }, + { + "filename": "nature/rocks/4.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 7, + "y": 33, + "w": 52, + "h": 26 + }, + "frame": { + "x": 664, + "y": 219, + "w": 52, + "h": 26 + }, + "anchor": { + "x": 0.5, + "y": 0.75 + } + }, + { + "filename": "foliage/trees/resources/tree1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 192 + }, + "spriteSourceSize": { + "x": 5, + "y": 46, + "w": 59, + "h": 135 + }, + "frame": { + "x": 671, + "y": 1, + "w": 59, + "h": 135 + }, + "anchor": { + "x": 0.5, + "y": 0.911458 + } + }, + { + "filename": "foliage/trees/resources/tree5.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 128 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 50, + "h": 108 + }, + "frame": { + "x": 718, + "y": 138, + "w": 50, + "h": 108 + }, + "anchor": { + "x": 0.5, + "y": 0.859375 + } + }, + { + "filename": "foliage/tree_trunks/tree_trunk_right.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 41, + "h": 22 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 41, + "h": 22 + }, + "frame": { + "x": 674, + "y": 138, + "w": 41, + "h": 22 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "nature/block_obsidian_lava/3.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 17, + "y": 6, + "w": 38, + "h": 55 + }, + "frame": { + "x": 674, + "y": 162, + "w": 38, + "h": 55 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "foliage/trees/large/no_leaves.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 192, + "h": 128 + }, + "spriteSourceSize": { + "x": 23, + "y": 10, + "w": 144, + "h": 115 + }, + "frame": { + "x": 732, + "y": 1, + "w": 144, + "h": 115 + }, + "anchor": { + "x": 0.5, + "y": 0.851563 + } + }, + { + "filename": "nature/rocks/2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 40, + "y": 33, + "w": 20, + "h": 17 + }, + "frame": { + "x": 732, + "y": 118, + "w": 20, + "h": 17 + }, + "anchor": { + "x": 0.5, + "y": 0.75 + } + }, + { + "filename": "foliage/trees/resources/tree4.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 128 + }, + "spriteSourceSize": { + "x": 12, + "y": 10, + "w": 39, + "h": 105 + }, + "frame": { + "x": 770, + "y": 118, + "w": 39, + "h": 105 + }, + "anchor": { + "x": 0.5, + "y": 0.859375 + } + }, + { + "filename": "foliage/tree_trunks/tree_trunk_left.png", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 38, + "h": 23 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 38, + "h": 23 + }, + "frame": { + "x": 770, + "y": 225, + "w": 38, + "h": 23 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "nature/stone_water/1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 64, + "h": 32 + }, + "spriteSourceSize": { + "x": 19, + "y": 0, + "w": 23, + "h": 21 + }, + "frame": { + "x": 810, + "y": 225, + "w": 23, + "h": 21 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "foliage/trees/resources/tree10.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 92, + "h": 92 + }, + "spriteSourceSize": { + "x": 3, + "y": 17, + "w": 85, + "h": 71 + }, + "frame": { + "x": 811, + "y": 118, + "w": 85, + "h": 71 + }, + "anchor": { + "x": 0.5, + "y": 0.5 + } + }, + { + "filename": "nature/block_obsidian_lava/5.png", + "rotated": false, + "trimmed": true, + "sourceSize": { "w": 64, "h": 64 }, + "spriteSourceSize": { + "x": 19, + "y": 3, + "w": 30, + "h": 57 + }, "frame": { - "x": 48, - "y": 165, - "w": 64, - "h": 64 + "x": 835, + "y": 191, + "w": 30, + "h": 57 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { - "filename": "foliage/bushes/leaves_small.png", + "filename": "nature/block_stone_water/5.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -193,16 +893,16 @@ "h": 64 }, "spriteSourceSize": { - "x": 9, - "y": 22, - "w": 44, - "h": 24 + "x": 19, + "y": 3, + "w": 30, + "h": 57 }, "frame": { - "x": 48, - "y": 231, - "w": 44, - "h": 24 + "x": 867, + "y": 191, + "w": 30, + "h": 57 }, "anchor": { "x": 0.5, @@ -210,32 +910,32 @@ } }, { - "filename": "foliage/tree_trunks/tree_trunk_left.png", + "filename": "nature/rocks/3.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { - "w": 38, - "h": 23 + "w": 64, + "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 38, - "h": 23 + "x": 22, + "y": 24, + "w": 19, + "h": 21 }, "frame": { - "x": 94, - "y": 231, - "w": 38, - "h": 23 + "x": 811, + "y": 191, + "w": 19, + "h": 21 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.75 } }, { - "filename": "architecture/blocks/doors_right.png", + "filename": "architecture/blocks/doors_left.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -249,8 +949,8 @@ "h": 64 }, "frame": { - "x": 114, - "y": 165, + "x": 878, + "y": 1, "w": 64, "h": 64 }, @@ -260,53 +960,53 @@ } }, { - "filename": "foliage/tree_trunks/tree_trunk_right.png", + "filename": "architecture/blocks/height_2.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { - "w": 41, - "h": 22 + "w": 64, + "h": 64 }, "spriteSourceSize": { "x": 0, - "y": 0, - "w": 41, - "h": 22 + "y": 15, + "w": 64, + "h": 49 }, "frame": { - "x": 134, - "y": 231, - "w": 41, - "h": 22 + "x": 878, + "y": 67, + "w": 64, + "h": 49 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.75 } }, { - "filename": "nature/stone_water/1.png", + "filename": "architecture/blocks/doors_right.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { "w": 64, - "h": 32 + "h": 64 }, "spriteSourceSize": { - "x": 19, + "x": 0, "y": 0, - "w": 23, - "h": 21 + "w": 64, + "h": 64 }, "frame": { - "x": 177, - "y": 231, - "w": 23, - "h": 21 + "x": 898, + "y": 118, + "w": 64, + "h": 64 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.75 } }, { @@ -324,8 +1024,8 @@ "h": 64 }, "frame": { - "x": 180, - "y": 165, + "x": 899, + "y": 184, "w": 64, "h": 64 }, @@ -335,57 +1035,57 @@ } }, { - "filename": "nature/rocks/3.png", + "filename": "architecture/blocks/hollow.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { "w": 64, - "h": 64 + "h": 64 }, "spriteSourceSize": { - "x": 22, - "y": 24, - "w": 19, - "h": 21 + "x": 0, + "y": 0, + "w": 64, + "h": 64 }, "frame": { - "x": 202, - "y": 231, - "w": 19, - "h": 21 + "x": 944, + "y": 1, + "w": 64, + "h": 64 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.75 } }, { - "filename": "foliage/tree_trunks/tree_fallen.png", + "filename": "nature/ramp/earth/platform_bottom.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 32 + "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 37, - "h": 19 + "x": 0, + "y": 15, + "w": 64, + "h": 49 }, "frame": { - "x": 223, - "y": 231, - "w": 37, - "h": 19 + "x": 944, + "y": 67, + "w": 64, + "h": 49 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.75 } }, { - "filename": "architecture/blocks/hollow.png", + "filename": "architecture/blocks/hollow_bottom.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -399,8 +1099,8 @@ "h": 64 }, "frame": { - "x": 246, - "y": 165, + "x": 964, + "y": 118, "w": 64, "h": 64 }, @@ -410,24 +1110,24 @@ } }, { - "filename": "nature/rocks/2.png", + "filename": "architecture/blocks/hollow_left.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { - "x": 40, - "y": 33, - "w": 20, - "h": 17 + "x": 0, + "y": 0, + "w": 64, + "h": 64 }, "frame": { - "x": 262, - "y": 231, - "w": 20, - "h": 17 + "x": 965, + "y": 184, + "w": 64, + "h": 64 }, "anchor": { "x": 0.5, @@ -435,82 +1135,57 @@ } }, { - "filename": "foliage/trees/large/with_leaves.png", + "filename": "architecture/blocks/hollow_right.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { - "w": 192, - "h": 192 + "w": 64, + "h": 64 }, "spriteSourceSize": { - "x": 14, - "y": 39, - "w": 174, - "h": 147 + "x": 0, + "y": 0, + "w": 64, + "h": 64 }, "frame": { - "x": 297, + "x": 1010, "y": 1, - "w": 174, - "h": 147 - }, - "anchor": { - "x": 0.5, - "y": 0.885417 - } - }, - { - "filename": "foliage/trees/resources/tree4.png", - "rotated": false, - "trimmed": true, - "sourceSize": { "w": 64, - "h": 128 - }, - "spriteSourceSize": { - "x": 12, - "y": 10, - "w": 39, - "h": 105 - }, - "frame": { - "x": 312, - "y": 150, - "w": 39, - "h": 105 + "h": 64 }, "anchor": { "x": 0.5, - "y": 0.859375 + "y": 0.75 } }, { - "filename": "foliage/trees/resources/tree7.png", + "filename": "nature/ramp/earth/ramp_bottom_left.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 128 + "h": 64 }, "spriteSourceSize": { - "x": 6, - "y": 18, - "w": 48, - "h": 97 + "x": 0, + "y": 15, + "w": 64, + "h": 49 }, "frame": { - "x": 353, - "y": 150, - "w": 48, - "h": 97 + "x": 1010, + "y": 67, + "w": 64, + "h": 49 }, "anchor": { "x": 0.5, - "y": 0.86719 + "y": 0.75 } }, { - "filename": "architecture/blocks/hollow_bottom.png", + "filename": "nature/block_obsidian/1.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -524,60 +1199,60 @@ "h": 64 }, "frame": { - "x": 403, - "y": 150, + "x": 1030, + "y": 118, "w": 64, "h": 64 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { - "filename": "nature/grass/grass_1.png", + "filename": "nature/block_obsidian/2.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { "x": 0, - "y": 25, + "y": 0, "w": 64, - "h": 39 + "h": 64 }, "frame": { - "x": 403, - "y": 216, + "x": 1031, + "y": 184, "w": 64, - "h": 39 + "h": 64 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { - "filename": "architecture/blocks/hollow_left.png", + "filename": "nature/block_stone/1.png", "rotated": false, - "trimmed": false, + "trimmed": false, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 64, - "h": 64 + "x": 0, + "y": 0, + "w": 64, + "h": 64 }, "frame": { - "x": 469, - "y": 150, - "w": 64, - "h": 64 + "x": 1076, + "y": 1, + "w": 64, + "h": 64 }, "anchor": { "x": 0.5, @@ -585,24 +1260,24 @@ } }, { - "filename": "nature/grass/grass_2.png", + "filename": "nature/ramp/earth/ramp_bottom_right.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 25, - "w": 64, - "h": 39 + "x": 0, + "y": 15, + "w": 64, + "h": 49 }, "frame": { - "x": 469, - "y": 216, + "x": 1076, + "y": 67, "w": 64, - "h": 39 + "h": 49 }, "anchor": { "x": 0.5, @@ -610,124 +1285,99 @@ } }, { - "filename": "foliage/trees/resources/tree6.png", + "filename": "nature/block_stone/2.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { "w": 64, - "h": 192 + "h": 64 }, "spriteSourceSize": { - "x": 1, - "y": 40, - "w": 63, - "h": 141 - }, - "frame": { - "x": 473, - "y": 1, - "w": 63, - "h": 141 - }, - "anchor": { - "x": 0.5, - "y": 0.911458 - } - }, - { - "filename": "foliage/trees/resources/tree5.png", - "rotated": false, - "trimmed": true, - "sourceSize": { + "x": 0, + "y": 0, "w": 64, - "h": 128 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 50, - "h": 108 + "h": 64 }, "frame": { - "x": 535, - "y": 144, - "w": 50, - "h": 108 + "x": 1096, + "y": 118, + "w": 64, + "h": 64 }, "anchor": { "x": 0.5, - "y": 0.859375 + "y": 0.75 } }, { - "filename": "foliage/trees/resources/tree1.png", + "filename": "nature/block_stone_grass/bottom_left.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { "w": 64, - "h": 192 + "h": 64 }, "spriteSourceSize": { - "x": 5, - "y": 46, - "w": 59, - "h": 135 + "x": 0, + "y": 0, + "w": 64, + "h": 64 }, "frame": { - "x": 538, - "y": 1, - "w": 59, - "h": 135 + "x": 1097, + "y": 184, + "w": 64, + "h": 64 }, "anchor": { "x": 0.5, - "y": 0.911458 + "y": 0.75 } }, { - "filename": "foliage/trees/large/no_leaves.png", + "filename": "nature/block_stone_grass/bottom_left_bottom_right.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { - "w": 192, - "h": 128 + "w": 64, + "h": 64 }, "spriteSourceSize": { - "x": 23, - "y": 10, - "w": 144, - "h": 115 + "x": 0, + "y": 0, + "w": 64, + "h": 64 }, "frame": { - "x": 587, - "y": 138, - "w": 144, - "h": 115 + "x": 1142, + "y": 1, + "w": 64, + "h": 64 }, "anchor": { "x": 0.5, - "y": 0.851563 + "y": 0.75 } }, { - "filename": "architecture/blocks/hollow_right.png", + "filename": "nature/ramp/earth/spike_left.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { "x": 0, - "y": 0, + "y": 15, "w": 64, - "h": 64 + "h": 49 }, "frame": { - "x": 599, - "y": 1, + "x": 1142, + "y": 67, "w": 64, - "h": 64 + "h": 49 }, "anchor": { "x": 0.5, @@ -735,7 +1385,7 @@ } }, { - "filename": "nature/block_obsidian/1.png", + "filename": "nature/block_stone_grass/bottom_right.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -749,18 +1399,18 @@ "h": 64 }, "frame": { - "x": 599, - "y": 67, + "x": 1162, + "y": 118, "w": 64, "h": 64 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.75 } }, { - "filename": "nature/block_obsidian/2.png", + "filename": "nature/block_stone_grass/empty.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -774,18 +1424,18 @@ "h": 64 }, "frame": { - "x": 665, - "y": 1, + "x": 1163, + "y": 184, "w": 64, "h": 64 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.75 } }, { - "filename": "nature/block_stone/1.png", + "filename": "nature/block_stone_grass/top_left.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -799,35 +1449,35 @@ "h": 64 }, "frame": { - "x": 665, - "y": 67, + "x": 1208, + "y": 1, "w": 64, "h": 64 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.75 } }, { - "filename": "nature/block_stone/2.png", + "filename": "nature/ramp/earth/spike_right.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { "x": 0, - "y": 0, + "y": 15, "w": 64, - "h": 64 + "h": 49 }, "frame": { - "x": 731, - "y": 1, + "x": 1208, + "y": 67, "w": 64, - "h": 64 + "h": 49 }, "anchor": { "x": 0.5, @@ -835,7 +1485,7 @@ } }, { - "filename": "nature/block_stone_grass/bottom_left.png", + "filename": "nature/block_stone_grass/top_left_bottom_left.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -849,18 +1499,18 @@ "h": 64 }, "frame": { - "x": 731, - "y": 67, + "x": 1228, + "y": 118, "w": 64, "h": 64 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.75 } }, { - "filename": "nature/block_stone_grass/bottom_left_bottom_right.png", + "filename": "nature/block_stone_grass/top_left_top_right.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -874,43 +1524,43 @@ "h": 64 }, "frame": { - "x": 733, - "y": 133, + "x": 1229, + "y": 184, "w": 64, "h": 64 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.75 } }, { - "filename": "nature/block_obsidian_lava/3.png", + "filename": "nature/block_stone_grass/top_right.png", "rotated": false, - "trimmed": true, + "trimmed": false, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { - "x": 17, - "y": 6, - "w": 38, - "h": 55 + "x": 0, + "y": 0, + "w": 64, + "h": 64 }, "frame": { - "x": 733, - "y": 199, - "w": 38, - "h": 55 + "x": 1274, + "y": 1, + "w": 64, + "h": 64 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.75 } }, { - "filename": "nature/block_stone_water/3.png", + "filename": "nature/ramp/stone/bottom_right.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -918,16 +1568,16 @@ "h": 64 }, "spriteSourceSize": { - "x": 17, - "y": 6, - "w": 38, - "h": 55 + "x": 0, + "y": 15, + "w": 64, + "h": 49 }, "frame": { - "x": 773, - "y": 199, - "w": 38, - "h": 55 + "x": 1274, + "y": 67, + "w": 64, + "h": 49 }, "anchor": { "x": 0.5, @@ -935,7 +1585,7 @@ } }, { - "filename": "nature/block_stone_grass/bottom_right.png", + "filename": "nature/block_stone_grass/top_right_bottom_right.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -949,8 +1599,8 @@ "h": 64 }, "frame": { - "x": 797, - "y": 1, + "x": 1294, + "y": 118, "w": 64, "h": 64 }, @@ -960,7 +1610,7 @@ } }, { - "filename": "nature/block_stone_grass/empty.png", + "filename": "nature/ramp/earth/empty.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -974,8 +1624,8 @@ "h": 64 }, "frame": { - "x": 797, - "y": 67, + "x": 1295, + "y": 184, "w": 64, "h": 64 }, @@ -985,7 +1635,7 @@ } }, { - "filename": "nature/block_stone_grass/top_left.png", + "filename": "nature/ramp/earth/platform_left.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -999,8 +1649,8 @@ "h": 64 }, "frame": { - "x": 799, - "y": 133, + "x": 1340, + "y": 1, "w": 64, "h": 64 }, @@ -1010,7 +1660,7 @@ } }, { - "filename": "nature/rock_piles/3.png", + "filename": "foliage/tall_grass/tall_grass_7.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -1018,16 +1668,16 @@ "h": 64 }, "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 55, - "h": 54 + "x": 0, + "y": 16, + "w": 64, + "h": 48 }, "frame": { - "x": 813, - "y": 199, - "w": 55, - "h": 54 + "x": 1340, + "y": 67, + "w": 64, + "h": 48 }, "anchor": { "x": 0.5, @@ -1035,7 +1685,7 @@ } }, { - "filename": "nature/block_stone_grass/top_left_bottom_left.png", + "filename": "nature/ramp/earth/platform_right.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -1049,8 +1699,8 @@ "h": 64 }, "frame": { - "x": 863, - "y": 1, + "x": 1360, + "y": 117, "w": 64, "h": 64 }, @@ -1060,7 +1710,7 @@ } }, { - "filename": "nature/block_stone_grass/top_left_top_right.png", + "filename": "nature/ramp/earth/platform_top.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -1074,8 +1724,8 @@ "h": 64 }, "frame": { - "x": 863, - "y": 67, + "x": 1361, + "y": 183, "w": 64, "h": 64 }, @@ -1085,7 +1735,7 @@ } }, { - "filename": "nature/block_stone_grass/top_right.png", + "filename": "nature/ramp/earth/ramp_top_left.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -1099,8 +1749,8 @@ "h": 64 }, "frame": { - "x": 865, - "y": 133, + "x": 1406, + "y": 1, "w": 64, "h": 64 }, @@ -1110,7 +1760,7 @@ } }, { - "filename": "nature/ramp/stone/bottom_left.png", + "filename": "foliage/tall_grass/tall_grass_3.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -1118,16 +1768,16 @@ "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 11, - "w": 60, - "h": 53 + "x": 13, + "y": 16, + "w": 51, + "h": 48 }, "frame": { - "x": 870, - "y": 199, - "w": 60, - "h": 53 + "x": 1406, + "y": 67, + "w": 51, + "h": 48 }, "anchor": { "x": 0.5, @@ -1135,7 +1785,7 @@ } }, { - "filename": "nature/block_stone_grass/top_right_bottom_right.png", + "filename": "nature/ramp/earth/ramp_top_right.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -1149,8 +1799,8 @@ "h": 64 }, "frame": { - "x": 929, - "y": 1, + "x": 1426, + "y": 117, "w": 64, "h": 64 }, @@ -1160,32 +1810,32 @@ } }, { - "filename": "nature/ramp/earth/empty.png", + "filename": "architecture/chimneys/chimney_large.png", "rotated": false, "trimmed": false, "sourceSize": { - "w": 64, - "h": 64 + "w": 32, + "h": 48 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 64, - "h": 64 + "w": 32, + "h": 48 }, "frame": { - "x": 929, - "y": 67, - "w": 64, - "h": 64 + "x": 1459, + "y": 67, + "w": 32, + "h": 48 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.833333 } }, { - "filename": "nature/ramp/earth/platform_left.png", + "filename": "nature/ramp/earth/spike_top.png", "rotated": false, "trimmed": false, "sourceSize": { @@ -1199,8 +1849,8 @@ "h": 64 }, "frame": { - "x": 931, - "y": 133, + "x": 1472, + "y": 1, "w": 64, "h": 64 }, @@ -1210,74 +1860,74 @@ } }, { - "filename": "nature/rock_piles/2.png", + "filename": "architecture/obstruction/fence/left.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 80 }, "spriteSourceSize": { - "x": 4, - "y": 9, - "w": 55, - "h": 51 + "x": 0, + "y": 18, + "w": 37, + "h": 62 }, "frame": { - "x": 932, - "y": 199, - "w": 55, - "h": 51 + "x": 1427, + "y": 183, + "w": 37, + "h": 62 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { - "filename": "foliage/tall_grass/tall_grass_1.png", + "filename": "architecture/obstruction/fence/right.png", "rotated": false, - "trimmed": true, + "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 80 }, "spriteSourceSize": { - "x": 0, - "y": 14, - "w": 64, - "h": 50 + "x": 27, + "y": 18, + "w": 37, + "h": 62 }, "frame": { - "x": 989, - "y": 199, - "w": 64, - "h": 50 + "x": 1466, + "y": 183, + "w": 37, + "h": 62 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { - "filename": "nature/ramp/earth/platform_right.png", + "filename": "nature/block_stone_water/3.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 64, - "h": 64 + "x": 17, + "y": 6, + "w": 38, + "h": 55 }, "frame": { - "x": 995, - "y": 1, - "w": 64, - "h": 64 + "x": 1492, + "y": 117, + "w": 38, + "h": 55 }, "anchor": { "x": 0.5, @@ -1285,24 +1935,24 @@ } }, { - "filename": "nature/ramp/earth/platform_top.png", + "filename": "foliage/tall_grass/tall_grass_6.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { "x": 0, - "y": 0, + "y": 17, "w": 64, - "h": 64 + "h": 47 }, "frame": { - "x": 995, - "y": 67, + "x": 1493, + "y": 67, "w": 64, - "h": 64 + "h": 47 }, "anchor": { "x": 0.5, @@ -1310,24 +1960,24 @@ } }, { - "filename": "nature/ramp/earth/ramp_top_left.png", + "filename": "nature/rock_piles/3.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 64, - "h": 64 + "x": 4, + "y": 6, + "w": 55, + "h": 54 }, "frame": { - "x": 997, - "y": 133, - "w": 64, - "h": 64 + "x": 1538, + "y": 1, + "w": 55, + "h": 54 }, "anchor": { "x": 0.5, @@ -1335,24 +1985,24 @@ } }, { - "filename": "foliage/tall_grass/tall_grass_4.png", + "filename": "nature/ramp/stone/bottom_left.png", "rotated": false, - "trimmed": true, + "trimmed": true, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { "x": 0, - "y": 14, - "w": 64, - "h": 50 + "y": 11, + "w": 60, + "h": 53 }, "frame": { - "x": 1055, - "y": 199, - "w": 64, - "h": 50 + "x": 1505, + "y": 174, + "w": 60, + "h": 53 }, "anchor": { "x": 0.5, @@ -1360,49 +2010,49 @@ } }, { - "filename": "nature/ramp/earth/ramp_top_right.png", + "filename": "foliage/tree_trunks/tree_fallen.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 32 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 64, - "h": 64 + "w": 37, + "h": 19 }, "frame": { - "x": 1061, - "y": 1, - "w": 64, - "h": 64 + "x": 1505, + "y": 229, + "w": 37, + "h": 19 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { - "filename": "nature/ramp/earth/spike_top.png", + "filename": "nature/rock_piles/2.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 64, - "h": 64 + "x": 4, + "y": 9, + "w": 55, + "h": 51 }, "frame": { - "x": 1061, - "y": 67, - "w": 64, - "h": 64 + "x": 1532, + "y": 116, + "w": 55, + "h": 51 }, "anchor": { "x": 0.5, @@ -1410,7 +2060,7 @@ } }, { - "filename": "nature/block_stone_water/6.png", + "filename": "foliage/tall_grass/tall_grass_1.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -1418,16 +2068,16 @@ "h": 64 }, "spriteSourceSize": { - "x": 11, - "y": 2, - "w": 43, - "h": 59 + "x": 0, + "y": 14, + "w": 64, + "h": 50 }, "frame": { - "x": 1063, - "y": 133, - "w": 43, - "h": 59 + "x": 1559, + "y": 57, + "w": 64, + "h": 50 }, "anchor": { "x": 0.5, @@ -1435,49 +2085,49 @@ } }, { - "filename": "nature/block_obsidian_lava/2.png", + "filename": "foliage/tall_grass/tall_grass_4.png", "rotated": false, - "trimmed": true, + "trimmed": true, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { - "x": 32, - "y": 2, - "w": 19, - "h": 58 + "x": 0, + "y": 14, + "w": 64, + "h": 50 }, "frame": { - "x": 1108, - "y": 133, - "w": 19, - "h": 58 + "x": 1595, + "y": 1, + "w": 64, + "h": 50 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.75 } }, { - "filename": "nature/block_stone_water/2.png", + "filename": "foliage/tall_grass/tall_grass_2.png", "rotated": false, - "trimmed": true, + "trimmed": true, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { - "x": 32, - "y": 2, - "w": 19, - "h": 58 + "x": 0, + "y": 14, + "w": 62, + "h": 50 }, "frame": { - "x": 1121, - "y": 193, - "w": 19, - "h": 58 + "x": 1567, + "y": 169, + "w": 62, + "h": 50 }, "anchor": { "x": 0.5, @@ -1485,24 +2135,24 @@ } }, { - "filename": "architecture/blocks/height_3.png", + "filename": "foliage/bushes/leaves_large.png", "rotated": false, - "trimmed": true, + "trimmed": true, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 7, - "w": 64, - "h": 57 + "x": 13, + "y": 24, + "w": 35, + "h": 26 }, "frame": { - "x": 1127, - "y": 1, - "w": 64, - "h": 57 + "x": 1567, + "y": 221, + "w": 35, + "h": 26 }, "anchor": { "x": 0.5, @@ -1510,7 +2160,7 @@ } }, { - "filename": "nature/ramp/stone/top_left.png", + "filename": "foliage/bushes/leaves_small.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -1518,99 +2168,74 @@ "h": 64 }, "spriteSourceSize": { - "x": 1, - "y": 6, - "w": 57, - "h": 57 + "x": 9, + "y": 22, + "w": 44, + "h": 24 }, "frame": { - "x": 1127, - "y": 60, - "w": 57, - "h": 57 - }, - "anchor": { - "x": 0.5, - "y": 0.5 - } - }, - { - "filename": "nature/ramp/stone/top_right.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 64 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 57, - "h": 57 - }, - "frame": { - "x": 1129, - "y": 119, - "w": 57, - "h": 57 + "x": 1604, + "y": 221, + "w": 44, + "h": 24 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.75 } }, { - "filename": "nature/block_obsidian_lava/4.png", + "filename": "foliage/bushes/bush_downwards_large.png", "rotated": false, - "trimmed": true, + "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 64 }, "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 42, - "h": 57 + "x": 2, + "y": 10, + "w": 59, + "h": 50 }, "frame": { - "x": 1186, - "y": 60, - "w": 42, - "h": 57 + "x": 1589, + "y": 109, + "w": 59, + "h": 50 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.75 } }, { - "filename": "nature/block_stone_water/4.png", + "filename": "nature/rock_piles/5.png", "rotated": false, - "trimmed": true, + "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 64 }, "spriteSourceSize": { - "x": 7, - "y": 3, - "w": 42, - "h": 57 + "x": 9, + "y": 15, + "w": 55, + "h": 47 }, "frame": { - "x": 1193, - "y": 1, - "w": 42, - "h": 57 + "x": 1625, + "y": 53, + "w": 55, + "h": 47 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.75 } }, { - "filename": "nature/block_obsidian_lava/1.png", + "filename": "nature/rock_piles/6.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -1618,116 +2243,116 @@ "h": 64 }, "spriteSourceSize": { - "x": 18, - "y": 4, - "w": 36, - "h": 57 + "x": 0, + "y": 14, + "w": 54, + "h": 46 }, "frame": { - "x": 1142, - "y": 178, - "w": 36, - "h": 57 + "x": 1661, + "y": 1, + "w": 54, + "h": 46 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.75 } }, { - "filename": "nature/block_stone_water/1.png", + "filename": "foliage/bushes/bush_upwards_large.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 64 }, "spriteSourceSize": { - "x": 18, - "y": 4, - "w": 36, - "h": 57 + "x": 5, + "y": 15, + "w": 58, + "h": 45 }, "frame": { - "x": 1180, - "y": 178, - "w": 36, - "h": 57 + "x": 1631, + "y": 161, + "w": 58, + "h": 45 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.75 } }, { - "filename": "nature/block_obsidian_lava/5.png", + "filename": "nature/grass/grass_5.png", "rotated": false, - "trimmed": true, + "trimmed": true, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { - "x": 19, - "y": 3, - "w": 30, - "h": 57 + "x": 0, + "y": 24, + "w": 64, + "h": 40 }, "frame": { - "x": 1188, - "y": 119, - "w": 30, - "h": 57 + "x": 1650, + "y": 208, + "w": 64, + "h": 40 }, "anchor": { "x": 0.5, - "y": 0.5 + "y": 0.75 } }, { - "filename": "nature/block_stone_water/5.png", + "filename": "architecture/obstruction/fence/top.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 80 }, "spriteSourceSize": { - "x": 19, - "y": 3, - "w": 30, - "h": 57 + "x": 0, + "y": 18, + "w": 64, + "h": 42 }, "frame": { - "x": 1218, - "y": 178, - "w": 30, - "h": 57 + "x": 1650, + "y": 102, + "w": 64, + "h": 42 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { - "filename": "foliage/tall_grass/tall_grass_2.png", + "filename": "nature/grass/grass_3.png", "rotated": false, - "trimmed": true, + "trimmed": true, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { "x": 0, - "y": 14, - "w": 62, - "h": 50 + "y": 22, + "w": 64, + "h": 42 }, "frame": { - "x": 1220, - "y": 119, - "w": 62, - "h": 50 + "x": 1682, + "y": 49, + "w": 64, + "h": 42 }, "anchor": { "x": 0.5, @@ -1735,24 +2360,24 @@ } }, { - "filename": "foliage/bushes/bush_downwards_large.png", + "filename": "foliage/bushes/bush_downwards_small.png", "rotated": false, - "trimmed": true, + "trimmed": true, "sourceSize": { "w": 64, "h": 64 }, "spriteSourceSize": { - "x": 2, - "y": 10, - "w": 59, - "h": 50 + "x": 4, + "y": 18, + "w": 59, + "h": 42 }, "frame": { - "x": 1230, - "y": 60, - "w": 59, - "h": 50 + "x": 1717, + "y": 1, + "w": 59, + "h": 42 }, "anchor": { "x": 0.5, @@ -1760,7 +2385,7 @@ } }, { - "filename": "architecture/blocks/height_2.png", + "filename": "foliage/tall_grass/tall_grass_8.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -1768,16 +2393,16 @@ "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 15, - "w": 64, - "h": 49 + "x": 5, + "y": 22, + "w": 54, + "h": 42 }, "frame": { - "x": 1237, - "y": 1, - "w": 64, - "h": 49 + "x": 1691, + "y": 146, + "w": 54, + "h": 42 }, "anchor": { "x": 0.5, @@ -1785,7 +2410,7 @@ } }, { - "filename": "nature/ramp/earth/platform_bottom.png", + "filename": "foliage/tall_grass/tall_grass_5.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -1794,15 +2419,15 @@ }, "spriteSourceSize": { "x": 0, - "y": 15, - "w": 64, - "h": 49 + "y": 19, + "w": 52, + "h": 42 }, "frame": { - "x": 1250, - "y": 171, - "w": 64, - "h": 49 + "x": 1716, + "y": 93, + "w": 52, + "h": 42 }, "anchor": { "x": 0.5, @@ -1810,57 +2435,57 @@ } }, { - "filename": "nature/ramp/earth/spike_bottom.png", + "filename": "architecture/obstruction/fence/top_left.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 80 }, "spriteSourceSize": { - "x": 0, - "y": 31, - "w": 64, - "h": 33 + "x": 0, + "y": 18, + "w": 37, + "h": 42 }, "frame": { - "x": 1250, - "y": 222, - "w": 64, - "h": 33 + "x": 1748, + "y": 45, + "w": 37, + "h": 42 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { - "filename": "nature/ramp/earth/ramp_bottom_left.png", + "filename": "architecture/obstruction/fence/top_right.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 80 }, "spriteSourceSize": { - "x": 0, - "y": 15, - "w": 64, - "h": 49 + "x": 27, + "y": 18, + "w": 37, + "h": 42 }, "frame": { - "x": 1284, - "y": 112, - "w": 64, - "h": 49 + "x": 1778, + "y": 1, + "w": 37, + "h": 42 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { - "filename": "nature/ramp/earth/ramp_bottom_right.png", + "filename": "architecture/blocks/height_1.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -1869,15 +2494,15 @@ }, "spriteSourceSize": { "x": 0, - "y": 15, + "y": 23, "w": 64, - "h": 49 + "h": 41 }, "frame": { - "x": 1291, - "y": 52, + "x": 1716, + "y": 190, "w": 64, - "h": 49 + "h": 41 }, "anchor": { "x": 0.5, @@ -1885,7 +2510,7 @@ } }, { - "filename": "nature/ramp/earth/spike_left.png", + "filename": "architecture/well/stone_empty.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -1894,15 +2519,15 @@ }, "spriteSourceSize": { "x": 0, - "y": 15, + "y": 23, "w": 64, - "h": 49 + "h": 41 }, "frame": { - "x": 1303, - "y": 1, + "x": 1747, + "y": 137, "w": 64, - "h": 49 + "h": 41 }, "anchor": { "x": 0.5, @@ -1910,7 +2535,7 @@ } }, { - "filename": "nature/ramp/earth/spike_right.png", + "filename": "architecture/well/stone_full.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -1918,16 +2543,16 @@ "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 15, - "w": 64, - "h": 49 + "x": 0, + "y": 23, + "w": 64, + "h": 41 }, "frame": { - "x": 1316, - "y": 163, - "w": 64, - "h": 49 + "x": 1770, + "y": 89, + "w": 64, + "h": 41 }, "anchor": { "x": 0.5, @@ -1935,7 +2560,7 @@ } }, { - "filename": "architecture/blocks/height_1.png", + "filename": "foliage/bushes/bush_dry.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -1943,16 +2568,16 @@ "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 23, - "w": 64, - "h": 41 + "x": 6, + "y": 15, + "w": 55, + "h": 41 }, "frame": { - "x": 1316, - "y": 214, - "w": 64, - "h": 41 + "x": 1787, + "y": 45, + "w": 55, + "h": 41 }, "anchor": { "x": 0.5, @@ -1960,7 +2585,7 @@ } }, { - "filename": "nature/ramp/stone/bottom_right.png", + "filename": "nature/rock_piles/1.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -1968,16 +2593,16 @@ "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 15, - "w": 64, - "h": 49 + "x": 5, + "y": 24, + "w": 56, + "h": 40 }, "frame": { - "x": 1350, - "y": 103, - "w": 64, - "h": 49 + "x": 1817, + "y": 1, + "w": 56, + "h": 40 }, "anchor": { "x": 0.5, @@ -1985,124 +2610,49 @@ } }, { - "filename": "foliage/tall_grass/tall_grass_7.png", + "filename": "architecture/obstruction/fence/bottom.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 80 }, "spriteSourceSize": { "x": 0, - "y": 16, + "y": 41, "w": 64, - "h": 48 + "h": 39 }, "frame": { - "x": 1357, - "y": 52, + "x": 1875, + "y": 1, "w": 64, - "h": 48 + "h": 39 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { - "filename": "foliage/tall_grass/tall_grass_3.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 64 - }, - "spriteSourceSize": { - "x": 13, - "y": 16, - "w": 51, - "h": 48 - }, - "frame": { - "x": 1369, - "y": 1, - "w": 51, - "h": 48 - }, - "anchor": { - "x": 0.5, - "y": 0.75 - } - }, - { - "filename": "architecture/chimneys/chimney_large.png", + "filename": "nature/grass/grass_1.png", "rotated": false, - "trimmed": false, + "trimmed": true, "sourceSize": { - "w": 32, - "h": 48 + "w": 64, + "h": 64 }, "spriteSourceSize": { "x": 0, - "y": 0, - "w": 32, - "h": 48 + "y": 25, + "w": 64, + "h": 39 }, "frame": { - "x": 1422, - "y": 1, - "w": 32, - "h": 48 - }, - "anchor": { - "x": 0.5, - "y": 0.833333 - } - }, - { - "filename": "foliage/tall_grass/tall_grass_6.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 17, - "w": 64, - "h": 47 - }, - "frame": { - "x": 1382, - "y": 154, - "w": 64, - "h": 47 - }, - "anchor": { - "x": 0.5, - "y": 0.75 - } - }, - { - "filename": "nature/rock_piles/5.png", - "rotated": false, - "trimmed": true, - "sourceSize": { + "x": 1875, + "y": 42, "w": 64, - "h": 64 - }, - "spriteSourceSize": { - "x": 9, - "y": 15, - "w": 55, - "h": 47 - }, - "frame": { - "x": 1416, - "y": 102, - "w": 55, - "h": 47 + "h": 39 }, "anchor": { "x": 0.5, @@ -2110,7 +2660,7 @@ } }, { - "filename": "nature/rock_piles/6.png", + "filename": "nature/rocks/1.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -2118,16 +2668,16 @@ "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 14, - "w": 54, - "h": 46 + "x": 22, + "y": 23, + "w": 21, + "h": 35 }, "frame": { - "x": 1423, - "y": 51, - "w": 54, - "h": 46 + "x": 1844, + "y": 43, + "w": 21, + "h": 35 }, "anchor": { "x": 0.5, @@ -2135,32 +2685,7 @@ } }, { - "filename": "foliage/bushes/bush_upwards_large.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 64 - }, - "spriteSourceSize": { - "x": 5, - "y": 15, - "w": 58, - "h": 45 - }, - "frame": { - "x": 1456, - "y": 1, - "w": 58, - "h": 45 - }, - "anchor": { - "x": 0.5, - "y": 0.75 - } - }, - { - "filename": "nature/grass/grass_3.png", + "filename": "foliage/tall_grass/tall_grass_0.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -2168,16 +2693,16 @@ "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 22, - "w": 64, - "h": 42 + "x": 6, + "y": 17, + "w": 54, + "h": 40 }, "frame": { - "x": 1382, - "y": 203, - "w": 64, - "h": 42 + "x": 1782, + "y": 180, + "w": 54, + "h": 40 }, "anchor": { "x": 0.5, @@ -2185,7 +2710,7 @@ } }, { - "filename": "architecture/well/stone_empty.png", + "filename": "nature/grass/grass_2.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -2194,15 +2719,15 @@ }, "spriteSourceSize": { "x": 0, - "y": 23, + "y": 25, "w": 64, - "h": 41 + "h": 39 }, "frame": { - "x": 1516, - "y": 1, + "x": 1813, + "y": 132, "w": 64, - "h": 41 + "h": 39 }, "anchor": { "x": 0.5, @@ -2210,7 +2735,7 @@ } }, { - "filename": "nature/rocks/5.png", + "filename": "nature/grass/grass_4.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -2218,41 +2743,16 @@ "h": 64 }, "spriteSourceSize": { - "x": 6, - "y": 25, - "w": 53, - "h": 35 - }, - "frame": { - "x": 1582, - "y": 1, - "w": 53, - "h": 35 - }, - "anchor": { - "x": 0.5, - "y": 0.75 - } - }, - { - "filename": "foliage/tall_grass/tall_grass_5.png", - "rotated": false, - "trimmed": true, - "sourceSize": { + "x": 0, + "y": 25, "w": 64, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 19, - "w": 52, - "h": 42 + "h": 39 }, "frame": { - "x": 1582, - "y": 38, - "w": 52, - "h": 42 + "x": 1836, + "y": 88, + "w": 64, + "h": 39 }, "anchor": { "x": 0.5, @@ -2260,7 +2760,7 @@ } }, { - "filename": "architecture/well/stone_full.png", + "filename": "nature/grass/grass_0.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -2268,16 +2768,16 @@ "h": 64 }, "spriteSourceSize": { - "x": 0, - "y": 23, - "w": 64, - "h": 41 + "x": 0, + "y": 26, + "w": 64, + "h": 38 }, "frame": { - "x": 1516, - "y": 44, - "w": 64, - "h": 41 + "x": 1879, + "y": 129, + "w": 64, + "h": 38 }, "anchor": { "x": 0.5, @@ -2285,57 +2785,32 @@ } }, { - "filename": "foliage/bushes/bush_upwards_small.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 64 - }, - "spriteSourceSize": { - "x": 27, - "y": 27, - "w": 35, - "h": 29 - }, - "frame": { - "x": 1479, - "y": 48, - "w": 35, - "h": 29 - }, - "anchor": { - "x": 0.5, - "y": 0.75 - } - }, - { - "filename": "foliage/bushes/leaves_large.png", + "filename": "architecture/obstruction/fence/bottom_left.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 80 }, "spriteSourceSize": { - "x": 13, - "y": 24, - "w": 35, - "h": 26 + "x": 0, + "y": 41, + "w": 37, + "h": 39 }, "frame": { - "x": 1479, - "y": 79, - "w": 35, - "h": 26 + "x": 1902, + "y": 83, + "w": 37, + "h": 39 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { - "filename": "nature/rocks/4.png", + "filename": "nature/ramp/earth/spike_bottom.png", "rotated": false, "trimmed": true, "sourceSize": { @@ -2343,16 +2818,16 @@ "h": 64 }, "spriteSourceSize": { - "x": 7, - "y": 33, - "w": 52, - "h": 26 + "x": 0, + "y": 31, + "w": 64, + "h": 33 }, "frame": { - "x": 1582, - "y": 82, - "w": 52, - "h": 26 + "x": 1879, + "y": 169, + "w": 64, + "h": 33 }, "anchor": { "x": 0.5, @@ -2360,28 +2835,28 @@ } }, { - "filename": "nature/grass/grass_5.png", + "filename": "architecture/obstruction/fence/bottom_right.png", "rotated": false, "trimmed": true, "sourceSize": { "w": 64, - "h": 64 + "h": 80 }, "spriteSourceSize": { - "x": 0, - "y": 24, - "w": 64, - "h": 40 + "x": 27, + "y": 41, + "w": 37, + "h": 39 }, "frame": { - "x": 1516, - "y": 87, - "w": 64, - "h": 40 + "x": 1838, + "y": 173, + "w": 37, + "h": 39 }, "anchor": { "x": 0.5, - "y": 0.75 + "y": 0.5 } }, { @@ -2399,8 +2874,8 @@ "h": 32 }, "frame": { - "x": 1473, - "y": 107, + "x": 1838, + "y": 214, "w": 32, "h": 32 }, @@ -2410,204 +2885,29 @@ } }, { - "filename": "nature/rocks/1.png", + "filename": "nature/rocks/5.png", "rotated": false, - "trimmed": true, + "trimmed": true, "sourceSize": { - "w": 64, - "h": 64 - }, - "spriteSourceSize": { - "x": 22, - "y": 23, - "w": 21, - "h": 35 - }, - "frame": { - "x": 1582, - "y": 110, - "w": 21, - "h": 35 - }, - "anchor": { - "x": 0.5, - "y": 0.75 - } - }, - { - "filename": "nature/grass/grass_4.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 64 + "w": 64, + "h": 64 + }, + "spriteSourceSize": { + "x": 6, + "y": 25, + "w": 53, + "h": 35 + }, + "frame": { + "x": 1877, + "y": 204, + "w": 53, + "h": 35 }, - "spriteSourceSize": { - "x": 0, - "y": 25, - "w": 64, - "h": 39 - }, - "frame": { - "x": 1507, - "y": 129, - "w": 64, - "h": 39 - }, - "anchor": { - "x": 0.5, - "y": 0.75 - } - }, - { - "filename": "nature/rock_piles/1.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 64 - }, - "spriteSourceSize": { - "x": 5, - "y": 24, - "w": 56, - "h": 40 - }, - "frame": { - "x": 1448, - "y": 151, - "w": 56, - "h": 40 - }, - "anchor": { - "x": 0.5, - "y": 0.75 - } - }, - { - "filename": "foliage/bushes/bush_downwards_small.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 64 - }, - "spriteSourceSize": { - "x": 4, - "y": 18, - "w": 59, - "h": 42 - }, - "frame": { - "x": 1573, - "y": 147, - "w": 59, - "h": 42 - }, - "anchor": { - "x": 0.5, - "y": 0.75 - } - }, - { - "filename": "nature/grass/grass_0.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 64 - }, - "spriteSourceSize": { - "x": 0, - "y": 26, - "w": 64, - "h": 38 - }, - "frame": { - "x": 1506, - "y": 170, - "w": 64, - "h": 38 - }, - "anchor": { - "x": 0.5, - "y": 0.75 - } - }, - { - "filename": "foliage/bushes/bush_dry.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 64 - }, - "spriteSourceSize": { - "x": 6, - "y": 15, - "w": 55, - "h": 41 - }, - "frame": { - "x": 1448, - "y": 193, - "w": 55, - "h": 41 - }, - "anchor": { - "x": 0.5, - "y": 0.75 - } - }, - { - "filename": "foliage/tall_grass/tall_grass_8.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 64 - }, - "spriteSourceSize": { - "x": 5, - "y": 22, - "w": 54, - "h": 42 - }, - "frame": { - "x": 1505, - "y": 210, - "w": 54, - "h": 42 - }, - "anchor": { - "x": 0.5, - "y": 0.75 - } - }, - { - "filename": "foliage/tall_grass/tall_grass_0.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 64, - "h": 64 - }, - "spriteSourceSize": { - "x": 6, - "y": 17, - "w": 54, - "h": 40 - }, - "frame": { - "x": 1561, - "y": 210, - "w": 54, - "h": 40 - }, - "anchor": { - "x": 0.5, - "y": 0.75 - } + "anchor": { + "x": 0.5, + "y": 0.75 + } } ] } @@ -2615,6 +2915,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:2922ae260a82f64979c67c016cd7fa70:b8554d45428f67bca1ef2c05fddcaa8b:abb19a90748d26f4f55b50cb9c7aab1d$" + "smartupdate": "$TexturePacker:SmartUpdate:723d79294a664c180f04ab5b3f83880b:65db93000d6e808cd680fb96762a61ea:abb19a90748d26f4f55b50cb9c7aab1d$" } } diff --git a/apps/client/src/assets/probable-waffle/atlas/outside.png b/apps/client/src/assets/probable-waffle/atlas/outside.png index 835fecbd..d00d8fb2 100644 Binary files a/apps/client/src/assets/probable-waffle/atlas/outside.png and b/apps/client/src/assets/probable-waffle/atlas/outside.png differ diff --git a/apps/client/src/assets/probable-waffle/atlas/units.json b/apps/client/src/assets/probable-waffle/atlas/units.json new file mode 100644 index 00000000..d8cd6c39 --- /dev/null +++ b/apps/client/src/assets/probable-waffle/atlas/units.json @@ -0,0 +1,566 @@ +{ + "textures": [ + { + "image": "units.png", + "format": "RGBA8888", + "size": { + "w": 50, + "h": 26 + }, + "scale": 1, + "frames": [ + { + "filename": "skaduwee/owl/attack/down_1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 24, + "h": 24 + }, + "frame": { + "x": 1, + "y": 1, + "w": 24, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/attack/left_1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 24, + "h": 24 + }, + "frame": { + "x": 1, + "y": 1, + "w": 24, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/attack/right_1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 24, + "h": 24 + }, + "frame": { + "x": 1, + "y": 1, + "w": 24, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/attack/up_1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 24, + "h": 24 + }, + "frame": { + "x": 1, + "y": 1, + "w": 24, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/die/down_1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 24, + "h": 24 + }, + "frame": { + "x": 1, + "y": 1, + "w": 24, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/idle/down_1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 24, + "h": 24 + }, + "frame": { + "x": 1, + "y": 1, + "w": 24, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/idle/left_1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 24, + "h": 24 + }, + "frame": { + "x": 1, + "y": 1, + "w": 24, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/idle/right_1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 24, + "h": 24 + }, + "frame": { + "x": 1, + "y": 1, + "w": 24, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/idle/up_1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 24, + "h": 24 + }, + "frame": { + "x": 1, + "y": 1, + "w": 24, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/move/down_1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 24, + "h": 24 + }, + "frame": { + "x": 1, + "y": 1, + "w": 24, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/move/left_1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 24, + "h": 24 + }, + "frame": { + "x": 1, + "y": 1, + "w": 24, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/move/right_1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 24, + "h": 24 + }, + "frame": { + "x": 1, + "y": 1, + "w": 24, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/move/up_1.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 12, + "y": 12, + "w": 24, + "h": 24 + }, + "frame": { + "x": 1, + "y": 1, + "w": 24, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/attack/down_2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 22, + "h": 24 + }, + "frame": { + "x": 27, + "y": 1, + "w": 22, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/attack/left_2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 22, + "h": 24 + }, + "frame": { + "x": 27, + "y": 1, + "w": 22, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/attack/right_2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 22, + "h": 24 + }, + "frame": { + "x": 27, + "y": 1, + "w": 22, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/attack/up_2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 22, + "h": 24 + }, + "frame": { + "x": 27, + "y": 1, + "w": 22, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/die/down_2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 22, + "h": 24 + }, + "frame": { + "x": 27, + "y": 1, + "w": 22, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/idle/down_2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 22, + "h": 24 + }, + "frame": { + "x": 27, + "y": 1, + "w": 22, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/idle/left_2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 22, + "h": 24 + }, + "frame": { + "x": 27, + "y": 1, + "w": 22, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/idle/right_2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 22, + "h": 24 + }, + "frame": { + "x": 27, + "y": 1, + "w": 22, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/idle/up_2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 22, + "h": 24 + }, + "frame": { + "x": 27, + "y": 1, + "w": 22, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/move/down_2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 22, + "h": 24 + }, + "frame": { + "x": 27, + "y": 1, + "w": 22, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/move/left_2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 22, + "h": 24 + }, + "frame": { + "x": 27, + "y": 1, + "w": 22, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/move/right_2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 22, + "h": 24 + }, + "frame": { + "x": 27, + "y": 1, + "w": 22, + "h": 24 + } + }, + { + "filename": "skaduwee/owl/move/up_2.png", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 48, + "h": 48 + }, + "spriteSourceSize": { + "x": 13, + "y": 12, + "w": 22, + "h": 24 + }, + "frame": { + "x": 27, + "y": 1, + "w": 22, + "h": 24 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:b84290915365b353da8258d4e580d618:2d3ecc2b79941dbb7e1289518bf27735:f2a24b8f3894bf9bf01b668fabf88373$" + } +} diff --git a/apps/client/src/assets/probable-waffle/atlas/units.png b/apps/client/src/assets/probable-waffle/atlas/units.png new file mode 100644 index 00000000..f199c261 Binary files /dev/null and b/apps/client/src/assets/probable-waffle/atlas/units.png differ 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..c52a0528 --- /dev/null +++ b/apps/client/src/assets/probable-waffle/tilemaps/ember_enclave.json @@ -0,0 +1,1258 @@ +{ + "compressionlevel": -1, + "height": 50, + "infinite": false, + "layers": [ + { + "data": [ + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 303, 303, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 303, 303, 303, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 303, 302, 303, 303, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 303, 302, 302, 302, 302, 302, 302, 302, 302, 302, 6, 7, 7, 7, 7, 7, 7, 8, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 306, 306, 302, 303, 302, 302, 305, 302, 302, 302, 302, 6, 22, 145, 146, + 146, 146, 146, 147, 20, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 306, 306, 302, 302, 302, 302, 302, 305, 302, + 302, 302, 18, 145, 161, 12, 12, 12, 12, 159, 21, 8, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 306, 306, 306, 306, 306, 302, + 302, 302, 302, 302, 302, 302, 18, 157, 12, 12, 12, 12, 12, 160, 147, 20, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 306, 306, 306, + 306, 306, 302, 302, 302, 302, 302, 302, 302, 302, 18, 169, 149, 12, 12, 12, 12, 12, 159, 20, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 306, 306, 306, 306, 306, 302, 302, 302, 302, 302, 302, 302, 302, 30, 10, 169, 149, 12, 12, 12, 12, 159, 20, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 306, 306, 302, 302, 302, 302, 305, 302, 302, 302, 302, 302, 30, 10, 169, 149, + 12, 12, 12, 159, 20, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 306, 306, 302, 302, 302, 302, 302, 305, 302, 302, 302, + 302, 302, 30, 10, 157, 12, 12, 12, 159, 20, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 306, 306, 302, 305, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 18, 169, 149, 148, 170, 171, 20, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 304, 302, 303, 302, 302, 30, 10, 169, 171, 9, 43, 32, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 305, 302, 302, 302, 304, 304, 303, 302, 302, 302, 30, 31, 31, 32, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 304, 304, 304, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 295, 302, 302, 302, 302, + 305, 302, 302, 302, 304, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 304, 304, 304, 304, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 304, 304, 304, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 304, 304, 304, 304, + 304, 302, 304, 304, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 304, 304, 304, 304, 304, 304, 304, 304, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 295, 295, 302, 302, 302, 304, 304, 304, 304, 302, 304, 304, 304, 304, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 295, 302, 296, 302, 302, 302, 302, 304, 304, 304, 304, 304, 304, 304, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 296, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 296, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 296, 295, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 299, 297, 297, 297, 298, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 296, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 300, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302 + ], + "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] + } + ] + } + ] + }, + { + "columns": 18, + "firstgid": 289, + "image": "../tilesets/tiles_2.png", + "imageheight": 32, + "imagewidth": 1152, + "margin": 0, + "name": "tiles_2", + "spacing": 0, + "tilecount": 18, + "tileheight": 32, + "tilewidth": 64 + } + ], + "tilewidth": 64, + "type": "map", + "version": "1.10", + "width": 50 +} 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 88% rename from apps/client/src/assets/probable-waffle/tilemaps/tiles.json rename to apps/client/src/assets/probable-waffle/tilemaps/river_crossing.json index 337ea678..48632b18 100644 --- a/apps/client/src/assets/probable-waffle/tilemaps/tiles.json +++ b/apps/client/src/assets/probable-waffle/tilemaps/river_crossing.json @@ -19,40 +19,40 @@ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 124, 111, 121, 23, 23, 23, 23, 23, 23, 60, 60, 60, 60, 60, 60, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 21, 8, 23, 123, 133, 113, 23, 23, 23, 23, 23, 23, 23, 60, 60, 60, 60, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 123, 35, 121, 23, 23, 23, 23, 23, 23, 23, 18, 60, 60, 60, - 11, 145, 146, 147, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 124, 111, 133, 113, 23, 23, 23, 23, 23, 6, 22, 11, 60, 60, - 11, 157, 12, 159, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 21, 8, 23, 123, 35, 121, 6, 7, 7, 8, 23, 18, 11, 11, 11, 60, - 146, 161, 12, 160, 146, 147, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 123, 35, 121, 30, 10, 11, 21, 7, 22, 11, 11, 11, 11, - 12, 12, 12, 12, 12, 160, 147, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 123, 35, 121, 23, 18, 11, 11, 11, 11, 11, 11, 11, 11, - 12, 12, 12, 12, 12, 12, 160, 147, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 123, 35, 121, 23, 18, 11, 11, 11, 11, 11, 11, 11, 11, - 12, 12, 12, 12, 12, 12, 12, 160, 147, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 123, 35, 121, 23, 18, 11, 11, 11, 11, 11, 11, 11, 11, - 12, 12, 12, 12, 12, 12, 12, 12, 160, 146, 147, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 123, 35, 121, 23, 18, 11, 11, 11, 11, 11, 11, 11, 11, - 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 159, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 123, 35, 121, 23, 18, 11, 11, 11, 11, 11, 11, 11, 11, - 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 159, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 123, 35, 121, 6, 22, 11, 11, 11, 11, 11, 11, 145, 146, - 12, 12, 12, 12, 12, 12, 12, 12, 12, 148, 171, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 9, 43, 32, 112, 135, 109, 125, 18, 11, 11, 11, 11, 11, 11, 145, 161, 12, - 12, 12, 12, 12, 12, 12, 12, 12, 12, 159, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 9, 43, 32, 112, 134, 135, 109, 125, 23, 18, 11, 11, 11, 11, 11, 11, 157, 12, 12, - 12, 12, 12, 12, 12, 12, 12, 12, 12, 159, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 9, 43, 31, 31, 31, 43, 43, 31, 43, 31, 43, 32, 112, 134, 135, 109, 110, 125, 6, 7, 22, 11, 11, 11, 11, 11, 145, 161, 12, 12, + 310, 310, 310, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 124, 111, 133, 113, 23, 23, 23, 23, 23, 6, 22, 11, 60, 60, + 11, 157, 310, 310, 310, 310, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 21, 8, 23, 123, 35, 121, 6, 7, 7, 8, 23, 18, 11, 11, 11, 60, + 146, 161, 12, 160, 146, 147, 310, 310, 310, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 123, 35, 121, 30, 10, 11, 21, 7, 22, 11, 11, 11, 11, + 12, 12, 12, 12, 12, 160, 147, 11, 11, 310, 310, 310, 310, 310, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 123, 35, 121, 23, 18, 11, 11, 11, 11, 11, 11, 11, 11, + 309, 309, 12, 12, 12, 12, 160, 147, 11, 11, 11, 11, 11, 11, 310, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 123, 35, 121, 23, 18, 11, 11, 11, 11, 11, 11, 11, 11, + 309, 309, 309, 309, 309, 12, 12, 160, 147, 11, 11, 11, 11, 11, 11, 310, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 123, 35, 121, 23, 18, 11, 11, 11, 11, 11, 11, 11, 11, + 309, 309, 309, 309, 309, 12, 12, 12, 160, 146, 147, 11, 11, 11, 11, 11, 310, 310, 310, 310, 310, 310, 310, 310, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 123, 35, 121, 23, 18, 11, 11, 11, 11, 11, 11, 11, 11, + 309, 309, 309, 309, 309, 12, 12, 12, 12, 12, 159, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 123, 35, 121, 23, 18, 11, 11, 11, 11, 11, 11, 11, 11, + 12, 309, 309, 309, 309, 309, 12, 12, 12, 12, 159, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 20, 23, 123, 35, 121, 6, 22, 11, 11, 11, 11, 11, 11, 145, 146, + 12, 12, 309, 309, 309, 12, 12, 12, 12, 148, 171, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 310, 11, 11, 11, 11, 11, 11, 9, 43, 32, 112, 135, 109, 125, 18, 11, 11, 11, 11, 11, 11, 145, 161, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 159, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 310, 11, 11, 11, 11, 9, 43, 32, 112, 134, 135, 109, 125, 23, 18, 11, 11, 11, 11, 11, 11, 157, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 159, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 9, 43, 43, 43, 31, 310, 310, 43, 31, 31, 43, 32, 112, 134, 135, 109, 110, 125, 6, 7, 22, 11, 11, 11, 11, 11, 145, 161, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 159, 11, 11, 9, 43, 31, 31, 43, 43, 31, 43, 32, 112, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 135, 109, 110, 125, 23, 6, 22, 11, 11, 11, 11, 11, 145, 146, 161, 12, 12, 12, 12, 12, 12, 148, 170, 170, 170, 170, 170, 171, 9, 31, 32, 112, 134, 134, 134, 134, 134, 134, 134, 135, 109, 110, 110, 110, 110, 110, 110, 110, 110, 110, 110, 125, 6, 7, 7, 22, 11, 11, 11, 11, 11, 11, 157, 12, 12, 12, 12, 12, - 12, 12, 148, 171, 9, 43, 31, 43, 43, 43, 32, 23, 112, 135, 109, 110, 111, 109, 110, 110, 110, 110, 125, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 22, 11, 11, 11, 11, 11, 11, 11, 11, 11, 157, 12, 12, 12, 12, 12, - 182, 182, 199, 98, 163, 134, 134, 134, 134, 134, 134, 134, 135, 109, 125, 23, 124, 125, 6, 7, 8, 23, 23, 18, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 145, 161, 12, 12, 12, 12, 12, - 110, 110, 110, 110, 110, 110, 111, 35, 24, 35, 109, 110, 110, 125, 6, 8, 23, 6, 22, 11, 21, 7, 7, 22, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 145, 147, 11, 157, 12, 12, 12, 12, 12, 12, - 7, 7, 7, 7, 7, 8, 124, 110, 110, 110, 125, 23, 6, 7, 22, 21, 7, 22, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 169, 171, 145, 161, 12, 12, 12, 12, 12, 12, - 11, 11, 11, 11, 11, 21, 7, 7, 7, 7, 7, 7, 22, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 145, 146, 161, 12, 12, 12, 12, 12, 12, 12, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 157, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 145, 146, 146, 161, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 157, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 145, 161, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 157, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 169, 170, 149, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 157, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 157, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 169, 170, 149, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 169, 149, 12, 12, 12, 12, 12, 12, 12, 12, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 76, 98, 98, 198, 183, 12, 12, 12, 12, 12, 12, 12, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 76, 99, 35, 35, 35, 196, 182, 183, 12, 12, 12, 12, 12, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 76, 99, 35, 35, 35, 35, 35, 35, 196, 182, 182, 182, 183, 12, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 87, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 196, 182, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 87, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35], + 12, 12, 148, 171, 9, 43, 31, 43, 43, 43, 32, 23, 112, 135, 109, 110, 111, 109, 110, 110, 110, 110, 125, 6, 7, 310, 310, 7, 7, 7, 7, 7, 7, 7, 22, 11, 11, 11, 11, 11, 11, 11, 11, 11, 157, 12, 12, 12, 12, 12, + 182, 182, 199, 98, 163, 134, 134, 134, 134, 134, 134, 134, 135, 109, 125, 23, 124, 125, 6, 7, 8, 23, 23, 18, 11, 310, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 145, 161, 12, 12, 12, 12, 12, + 110, 110, 110, 110, 110, 110, 111, 35, 24, 35, 109, 110, 110, 125, 6, 8, 23, 6, 22, 11, 21, 7, 7, 22, 11, 310, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 145, 147, 11, 157, 12, 12, 12, 12, 12, 12, + 7, 7, 7, 7, 7, 8, 124, 110, 110, 110, 125, 23, 6, 7, 22, 21, 7, 22, 11, 11, 11, 11, 11, 11, 11, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 169, 171, 145, 161, 12, 12, 12, 12, 12, 12, + 11, 11, 11, 11, 11, 21, 7, 7, 7, 7, 7, 7, 22, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 145, 146, 146, 147, 145, 146, 161, 12, 12, 12, 12, 12, 12, 12, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 169, 149, 12, 160, 161, 12, 12, 12, 12, 309, 309, 309, 12, 12, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 11, 11, 11, 11, 145, 146, 146, 146, 146, 146, 146, 146, 161, 12, 12, 12, 12, 12, 12, 309, 309, 309, 309, 12, 12, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 310, 11, 11, 11, 145, 161, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 309, 309, 309, 309, 309, 12, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 11, 11, 11, 11, 157, 12, 12, 12, 308, 308, 308, 308, 308, 308, 12, 12, 12, 309, 309, 309, 309, 309, 309, 309, 309, 12, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 11, 11, 11, 11, 157, 12, 308, 308, 308, 308, 308, 307, 308, 308, 308, 12, 12, 309, 309, 309, 309, 309, 309, 309, 309, 12, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 11, 11, 11, 11, 157, 12, 308, 308, 308, 308, 307, 307, 307, 307, 307, 12, 12, 309, 309, 309, 309, 309, 309, 309, 309, 12, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 11, 11, 11, 11, 169, 149, 308, 308, 308, 308, 307, 307, 307, 307, 307, 307, 12, 12, 309, 309, 309, 309, 309, 309, 309, 12, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 310, 11, 11, 11, 11, 11, 157, 308, 308, 308, 307, 307, 307, 307, 307, 307, 307, 307, 12, 309, 309, 309, 309, 309, 309, 309, 12, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 11, 11, 11, 11, 11, 11, 157, 12, 308, 308, 307, 307, 307, 307, 307, 307, 307, 12, 12, 12, 309, 309, 309, 309, 309, 12, 12, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 11, 11, 11, 11, 11, 11, 169, 149, 12, 308, 308, 308, 308, 307, 308, 308, 307, 12, 12, 12, 12, 309, 309, 309, 309, 12, 12, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 11, 11, 11, 11, 11, 11, 11, 169, 149, 12, 12, 12, 12, 12, 12, 181, 182, 182, 182, 183, 12, 12, 12, 12, 12, 12, 12, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 11, 11, 11, 11, 11, 11, 11, 11, 169, 170, 170, 170, 149, 12, 181, 197, 35, 35, 35, 196, 182, 183, 12, 12, 12, 12, 12, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 169, 247, 197, 35, 35, 35, 35, 35, 35, 196, 182, 182, 182, 183, 12, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 87, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 196, 182, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 310, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 87, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35], "height":50, "id":1, "name":"TileMap_level_1", @@ -1163,6 +1163,19 @@ "wangid":[0, 3, 0, 7, 0, 3, 0, 7] }] }] + }, + { + "columns":22, + "firstgid":289, + "image":"..\/tilesets\/tiles_2.png", + "imageheight":32, + "imagewidth":1408, + "margin":0, + "name":"tiles_2", + "spacing":0, + "tilecount":22, + "tileheight":32, + "tilewidth":64 }], "tilewidth":64, "type":"map", diff --git a/apps/client/src/assets/probable-waffle/tilemaps/thumbnails/ember_enclave.png b/apps/client/src/assets/probable-waffle/tilemaps/thumbnails/ember_enclave.png new file mode 100644 index 00000000..553df6bd Binary files /dev/null and b/apps/client/src/assets/probable-waffle/tilemaps/thumbnails/ember_enclave.png differ diff --git a/apps/client/src/assets/probable-waffle/tilemaps/thumbnails/tiles.png b/apps/client/src/assets/probable-waffle/tilemaps/thumbnails/river_crossing.png similarity index 100% rename from apps/client/src/assets/probable-waffle/tilemaps/thumbnails/tiles.png rename to apps/client/src/assets/probable-waffle/tilemaps/thumbnails/river_crossing.png diff --git a/apps/client/src/assets/probable-waffle/tilesets/tiles.png b/apps/client/src/assets/probable-waffle/tilesets/tiles.png index 0fe5ef43..1f7fea2d 100644 Binary files a/apps/client/src/assets/probable-waffle/tilesets/tiles.png and b/apps/client/src/assets/probable-waffle/tilesets/tiles.png differ diff --git a/apps/client/src/assets/probable-waffle/tilesets/tiles_2.png b/apps/client/src/assets/probable-waffle/tilesets/tiles_2.png new file mode 100644 index 00000000..0f944d14 Binary files /dev/null and b/apps/client/src/assets/probable-waffle/tilesets/tiles_2.png differ diff --git a/apps/client/src/environments/environment.ts b/apps/client/src/environments/environment.ts index 71da9d13..ac277b2b 100644 --- a/apps/client/src/environments/environment.ts +++ b/apps/client/src/environments/environment.ts @@ -2,17 +2,17 @@ // `ng build` replaces `environment.ts` with `environment.prod.ts`. // The list of file replacements can be found in `angular.json`. -import { Environment } from './environment-type'; +import { Environment } from "./environment-type"; export const environment: Environment = { production: false, - api: 'http://localhost:3333/', + api: "http://localhost:3333/", supabase: { - url: 'https://bhzetyxjimpabioxoodz.supabase.co', - key: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImJoemV0eXhqaW1wYWJpb3hvb2R6Iiwicm9sZSI6ImFub24iLCJpYXQiOjE2NzM3OTQ4NTcsImV4cCI6MTk4OTM3MDg1N30.qXNM5FGjVb9scqNxBL3EHYl1HL-RI2NZNGXceZGTMLs' + url: "https://bhzetyxjimpabioxoodz.supabase.co", + key: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImJoemV0eXhqaW1wYWJpb3hvb2R6Iiwicm9sZSI6ImFub24iLCJpYXQiOjE2NzM3OTQ4NTcsImV4cCI6MTk4OTM3MDg1N30.qXNM5FGjVb9scqNxBL3EHYl1HL-RI2NZNGXceZGTMLs" }, socketIoConfig: { - url: 'http://localhost:3333', + url: "http://localhost:3333", options: {} } }; 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)); diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/0.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/0.png new file mode 100644 index 00000000..1cd81b4d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/0.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/1.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/1.png new file mode 100644 index 00000000..36888171 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/10.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/10.png new file mode 100644 index 00000000..c88942e4 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/10.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/11.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/11.png new file mode 100644 index 00000000..a935b98a Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/11.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/12.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/12.png new file mode 100644 index 00000000..8d724f2c Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/12.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/13.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/13.png new file mode 100644 index 00000000..dcb85e54 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/13.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/14.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/14.png new file mode 100644 index 00000000..910e33d7 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/14.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/15.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/15.png new file mode 100644 index 00000000..0bdb1a18 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/15.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/16.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/16.png new file mode 100644 index 00000000..41300022 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/16.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/17.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/17.png new file mode 100644 index 00000000..979d4285 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/17.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/2.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/2.png new file mode 100644 index 00000000..d35a585d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/3.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/3.png new file mode 100644 index 00000000..07a61327 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/3.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/4.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/4.png new file mode 100644 index 00000000..11f7a1be Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/4.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/5.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/5.png new file mode 100644 index 00000000..9b6a77df Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/5.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/6.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/6.png new file mode 100644 index 00000000..9033cd68 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/6.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/7.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/7.png new file mode 100644 index 00000000..c6762da5 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/7.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/8.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/8.png new file mode 100644 index 00000000..9c1fc7d6 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/8.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/9.png b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/9.png new file mode 100644 index 00000000..0403dddc Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/hedgehog/9.png differ 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 00000000..1e5e9d33 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/effects/wool_1.png differ 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 00000000..93e751a9 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/effects/wool_2.png differ 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 00000000..808c8cbf Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheared/sheep_down.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheared/sheep_left.png b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheared/sheep_left.png new file mode 100644 index 00000000..289e78fd Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheared/sheep_left.png differ 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 00000000..2c36a8af Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheared/sheep_right.png differ 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 00000000..c3da13c1 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheared/sheep_up.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheep_down.png b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheep_down.png new file mode 100644 index 00000000..8845d239 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheep_down.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheep_left.png b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheep_left.png new file mode 100644 index 00000000..409fba7d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheep_left.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheep_right.png b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheep_right.png new file mode 100644 index 00000000..dd823805 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheep_right.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheep_up.png b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheep_up.png new file mode 100644 index 00000000..fa1a76c8 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/animals/sheep/sheep_up.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/factions/buildings/skaduwee/frost_forge/flame/frost_forge_flame_1.png b/apps/client/src/metadata/probable-waffle/sprites/factions/buildings/skaduwee/frost_forge/flame/frost_forge_flame_1.png new file mode 100644 index 00000000..30a0ab73 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/factions/buildings/skaduwee/frost_forge/flame/frost_forge_flame_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/factions/buildings/skaduwee/frost_forge/flame/frost_forge_flame_2.png b/apps/client/src/metadata/probable-waffle/sprites/factions/buildings/skaduwee/frost_forge/flame/frost_forge_flame_2.png new file mode 100644 index 00000000..d0fb99f2 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/factions/buildings/skaduwee/frost_forge/flame/frost_forge_flame_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/factions/buildings/skaduwee/frost_forge/flame/frost_forge_flame_3.png b/apps/client/src/metadata/probable-waffle/sprites/factions/buildings/skaduwee/frost_forge/flame/frost_forge_flame_3.png new file mode 100644 index 00000000..29cf8a6e Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/factions/buildings/skaduwee/frost_forge/flame/frost_forge_flame_3.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/factions/buildings/skaduwee/frost_forge/frost_forge.png b/apps/client/src/metadata/probable-waffle/sprites/factions/buildings/skaduwee/frost_forge/frost_forge.png new file mode 100644 index 00000000..8737330e Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/factions/buildings/skaduwee/frost_forge/frost_forge.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/factions/character_icons/skaduwee/owl.png b/apps/client/src/metadata/probable-waffle/sprites/factions/character_icons/skaduwee/owl.png new file mode 100644 index 00000000..6da74b1d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/factions/character_icons/skaduwee/owl.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/attribution.md b/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/attribution.md new file mode 100644 index 00000000..00c8ab89 --- /dev/null +++ b/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/attribution.md @@ -0,0 +1 @@ +https://paperhatlizard.itch.io/cryos-mini-gui \ No newline at end of file diff --git a/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/borders/border_dark_outer.png b/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/borders/border_dark_outer.png new file mode 100644 index 00000000..9d83784f Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/borders/border_dark_outer.png differ 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 new file mode 100644 index 00000000..d944a95d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/borders/border_wood.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/buttons/button_small.png b/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/buttons/button_small.png new file mode 100644 index 00000000..5307f6b1 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/buttons/button_small.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/buttons/button_small_pressed.png b/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/buttons/button_small_pressed.png new file mode 100644 index 00000000..9653c585 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/buttons/button_small_pressed.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/surfaces/surface_dark.png b/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/surfaces/surface_dark.png new file mode 100644 index 00000000..72cec305 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/surfaces/surface_dark.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/surfaces/surface_parchment.png b/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/surfaces/surface_parchment.png new file mode 100644 index 00000000..1edad2b8 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/gui/cryos_mini_gui/surfaces/surface_parchment.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/bottom.png b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/bottom.png new file mode 100644 index 00000000..607e616a Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/bottom.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/bottom_left.png b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/bottom_left.png new file mode 100644 index 00000000..42ba90aa Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/bottom_left.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/bottom_right.png b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/bottom_right.png new file mode 100644 index 00000000..d775e6cd Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/bottom_right.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/left.png b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/left.png new file mode 100644 index 00000000..9ac61266 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/left.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/right.png b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/right.png new file mode 100644 index 00000000..4b619bef Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/right.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/top.png b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/top.png new file mode 100644 index 00000000..8d02c0cd Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/top.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/top_left.png b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/top_left.png new file mode 100644 index 00000000..e97e45bd Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/top_left.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/top_right.png b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/top_right.png new file mode 100644 index 00000000..cf8f30d7 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/obstruction/fence/top_right.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/river/bridge_stone.png b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/river/bridge_stone.png index 3760e9ff..a8142bb6 100644 Binary files a/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/river/bridge_stone.png and b/apps/client/src/metadata/probable-waffle/sprites/outside/architecture/river/bridge_stone.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/outside/foliage/trees/resources/special/tree_christmas.png b/apps/client/src/metadata/probable-waffle/sprites/outside/foliage/trees/resources/special/tree_christmas.png new file mode 100644 index 00000000..9195cd5d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/outside/foliage/trees/resources/special/tree_christmas.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/outside/foliage/trees/resources/tree10.png b/apps/client/src/metadata/probable-waffle/sprites/outside/foliage/trees/resources/tree10.png new file mode 100644 index 00000000..8b83a8a3 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/outside/foliage/trees/resources/tree10.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/outside/foliage/trees/resources/tree11.png b/apps/client/src/metadata/probable-waffle/sprites/outside/foliage/trees/resources/tree11.png new file mode 100644 index 00000000..e664158a Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/outside/foliage/trees/resources/tree11.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/outside/foliage/trees/resources/tree9.png b/apps/client/src/metadata/probable-waffle/sprites/outside/foliage/trees/resources/tree9.png new file mode 100644 index 00000000..9f0ef843 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/outside/foliage/trees/resources/tree9.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles/0019_stone_1.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0019_stone_1.png similarity index 100% rename from apps/client/src/metadata/probable-waffle/sprites/tiles/0019_stone_1.png rename to apps/client/src/metadata/probable-waffle/sprites/tiles_2/0019_stone_1.png diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles/0020_stone_2.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0020_stone_2.png similarity index 100% rename from apps/client/src/metadata/probable-waffle/sprites/tiles/0020_stone_2.png rename to apps/client/src/metadata/probable-waffle/sprites/tiles_2/0020_stone_2.png diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles/0021_stone_3.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0021_stone_3.png similarity index 100% rename from apps/client/src/metadata/probable-waffle/sprites/tiles/0021_stone_3.png rename to apps/client/src/metadata/probable-waffle/sprites/tiles_2/0021_stone_3.png diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles/0022_wood_1.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0022_wood_1.png similarity index 100% rename from apps/client/src/metadata/probable-waffle/sprites/tiles/0022_wood_1.png rename to apps/client/src/metadata/probable-waffle/sprites/tiles_2/0022_wood_1.png diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles/0023_wood_2.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0023_wood_2.png similarity index 100% rename from apps/client/src/metadata/probable-waffle/sprites/tiles/0023_wood_2.png rename to apps/client/src/metadata/probable-waffle/sprites/tiles_2/0023_wood_2.png diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles/0024_wood_3.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0024_wood_3.png similarity index 100% rename from apps/client/src/metadata/probable-waffle/sprites/tiles/0024_wood_3.png rename to apps/client/src/metadata/probable-waffle/sprites/tiles_2/0024_wood_3.png diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0025_lava_1.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0025_lava_1.png new file mode 100644 index 00000000..f49bd657 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0025_lava_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0026_lava_2.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0026_lava_2.png new file mode 100644 index 00000000..8255bea8 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0026_lava_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0027_lava_3.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0027_lava_3.png new file mode 100644 index 00000000..9adfc63a Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0027_lava_3.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0028_lava_4.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0028_lava_4.png new file mode 100644 index 00000000..d4833353 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0028_lava_4.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0029_lava_5.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0029_lava_5.png new file mode 100644 index 00000000..89d6edd7 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0029_lava_5.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0030_lava_6.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0030_lava_6.png new file mode 100644 index 00000000..7a6707af Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0030_lava_6.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0031_lava_7.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0031_lava_7.png new file mode 100644 index 00000000..bb5079f6 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0031_lava_7.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0032_obsidian_1.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0032_obsidian_1.png new file mode 100644 index 00000000..052789de Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0032_obsidian_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0033_obsidian_2.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0033_obsidian_2.png new file mode 100644 index 00000000..b2abe06e Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0033_obsidian_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0034_obsidian_3.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0034_obsidian_3.png new file mode 100644 index 00000000..b3156391 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0034_obsidian_3.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0035_obsidian_4.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0035_obsidian_4.png new file mode 100644 index 00000000..5b420692 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0035_obsidian_4.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0036_obsidian_5.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0036_obsidian_5.png new file mode 100644 index 00000000..1643fbe9 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0036_obsidian_5.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0037_grass_dark_1.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0037_grass_dark_1.png new file mode 100644 index 00000000..c52e0e80 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0037_grass_dark_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0038_grass_dark_2.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0038_grass_dark_2.png new file mode 100644 index 00000000..b595e18e Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0038_grass_dark_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0039_forest_1.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0039_forest_1.png new file mode 100644 index 00000000..6d5aa858 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0039_forest_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0040_gravel_1.png b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0040_gravel_1.png new file mode 100644 index 00000000..5897cf85 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/0040_gravel_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/tiles_2/README.md b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/README.md new file mode 100644 index 00000000..afda156c --- /dev/null +++ b/apps/client/src/metadata/probable-waffle/sprites/tiles_2/README.md @@ -0,0 +1 @@ +contents of this folder are used by TileSetter to generate the Tileset - see `..\..\tilesetter` folder for more info \ No newline at end of file diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/down_1.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/down_1.png new file mode 100644 index 00000000..67e9fe4d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/down_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/down_2.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/down_2.png new file mode 100644 index 00000000..88ff3f72 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/down_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/left_1.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/left_1.png new file mode 100644 index 00000000..67e9fe4d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/left_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/left_2.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/left_2.png new file mode 100644 index 00000000..88ff3f72 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/left_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/right_1.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/right_1.png new file mode 100644 index 00000000..67e9fe4d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/right_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/right_2.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/right_2.png new file mode 100644 index 00000000..88ff3f72 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/right_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/up_1.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/up_1.png new file mode 100644 index 00000000..67e9fe4d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/up_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/up_2.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/up_2.png new file mode 100644 index 00000000..88ff3f72 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/attack/up_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/die/down_1.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/die/down_1.png new file mode 100644 index 00000000..67e9fe4d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/die/down_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/die/down_2.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/die/down_2.png new file mode 100644 index 00000000..88ff3f72 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/die/down_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/down_1.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/down_1.png new file mode 100644 index 00000000..67e9fe4d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/down_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/down_2.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/down_2.png new file mode 100644 index 00000000..88ff3f72 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/down_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/left_1.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/left_1.png new file mode 100644 index 00000000..67e9fe4d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/left_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/left_2.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/left_2.png new file mode 100644 index 00000000..88ff3f72 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/left_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/right_1.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/right_1.png new file mode 100644 index 00000000..67e9fe4d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/right_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/right_2.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/right_2.png new file mode 100644 index 00000000..88ff3f72 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/right_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/up_1.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/up_1.png new file mode 100644 index 00000000..67e9fe4d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/up_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/up_2.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/up_2.png new file mode 100644 index 00000000..88ff3f72 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/idle/up_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/down_1.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/down_1.png new file mode 100644 index 00000000..67e9fe4d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/down_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/down_2.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/down_2.png new file mode 100644 index 00000000..88ff3f72 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/down_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/left_1.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/left_1.png new file mode 100644 index 00000000..67e9fe4d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/left_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/left_2.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/left_2.png new file mode 100644 index 00000000..88ff3f72 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/left_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/right_1.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/right_1.png new file mode 100644 index 00000000..67e9fe4d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/right_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/right_2.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/right_2.png new file mode 100644 index 00000000..88ff3f72 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/right_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/up_1.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/up_1.png new file mode 100644 index 00000000..67e9fe4d Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/up_1.png differ diff --git a/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/up_2.png b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/up_2.png new file mode 100644 index 00000000..88ff3f72 Binary files /dev/null and b/apps/client/src/metadata/probable-waffle/sprites/units/skaduwee/owl/move/up_2.png differ diff --git a/apps/client/src/metadata/probable-waffle/spritesheets/tiles/tiles.png b/apps/client/src/metadata/probable-waffle/spritesheets/tiles/tiles.png index f980b4a6..3e65695e 100644 Binary files a/apps/client/src/metadata/probable-waffle/spritesheets/tiles/tiles.png and b/apps/client/src/metadata/probable-waffle/spritesheets/tiles/tiles.png differ diff --git a/apps/client/src/metadata/probable-waffle/texture-packer/animals.tps b/apps/client/src/metadata/probable-waffle/texture-packer/animals.tps new file mode 100644 index 00000000..46134272 --- /dev/null +++ b/apps/client/src/metadata/probable-waffle/texture-packer/animals.tps @@ -0,0 +1,260 @@ + + + + fileFormatVersion + 6 + texturePackerVersion + 7.1.0 + autoSDSettings + + + scale + 1 + extension + + spriteFilter + + acceptFractionalValues + + maxTextureSize + + width + -1 + height + -1 + + + + allowRotation + + shapeDebug + + dpi + 72 + dataFormat + phaser + textureFileName + + flipPVR + + pvrQualityLevel + 3 + astcQualityLevel + 2 + basisUniversalQualityLevel + 2 + etc1QualityLevel + 70 + etc2QualityLevel + 70 + dxtCompressionMode + DXT_PERCEPTUAL + ditherType + NearestNeighbour + backgroundColor + 0 + libGdx + + filtering + + x + Linear + y + Linear + + + shapePadding + 0 + jpgQuality + 80 + pngOptimizationLevel + 1 + webpQualityLevel + 101 + textureSubPath + + textureFormat + png + borderPadding + 0 + maxTextureSize + + width + 2048 + height + 2048 + + fixedTextureSize + + width + -1 + height + -1 + + algorithmSettings + + algorithm + MaxRects + freeSizeMode + Best + sizeConstraints + AnySize + forceSquared + + maxRects + + heuristic + Best + + basic + + sortBy + Best + order + Ascending + + polygon + + alignToGrid + 1 + + + dataFileNames + + json + + name + ../../../assets/probable-waffle/atlas/animals.json + + + multiPackMode + MultiPackOff + forceIdenticalLayout + + outputFormat + RGBA8888 + alphaHandling + ClearTransparentPixels + contentProtection + + key + + + autoAliasEnabled + + trimSpriteNames + + prependSmartFolderName + + autodetectAnimations + + globalSpriteSettings + + scale + 1 + scaleMode + Smooth + extrude + 1 + trimThreshold + 1 + trimMargin + 1 + trimMode + Trim + tracerTolerance + 200 + heuristicMask + + defaultPivotPoint + 0.5,0.5 + writePivotPoints + + + individualSpriteSettings + + ../sprites/animals/hedgehog/0.png + ../sprites/animals/hedgehog/1.png + ../sprites/animals/hedgehog/10.png + ../sprites/animals/hedgehog/11.png + ../sprites/animals/hedgehog/12.png + ../sprites/animals/hedgehog/13.png + ../sprites/animals/hedgehog/14.png + ../sprites/animals/hedgehog/15.png + ../sprites/animals/hedgehog/16.png + ../sprites/animals/hedgehog/17.png + ../sprites/animals/hedgehog/2.png + ../sprites/animals/hedgehog/3.png + ../sprites/animals/hedgehog/4.png + ../sprites/animals/hedgehog/5.png + ../sprites/animals/hedgehog/6.png + ../sprites/animals/hedgehog/7.png + ../sprites/animals/hedgehog/8.png + ../sprites/animals/hedgehog/9.png + + pivotPoint + 0.5,0.5 + spriteScale + 1 + scale9Enabled + + scale9Borders + 8,8,16,16 + scale9Paddings + 8,8,16,16 + scale9FromFile + + + ../sprites/animals/sheep/sheep_down.png + ../sprites/animals/sheep/sheep_left.png + ../sprites/animals/sheep/sheep_right.png + ../sprites/animals/sheep/sheep_up.png + + pivotPoint + 0.5,0.5 + spriteScale + 1 + scale9Enabled + + scale9Borders + 16,16,32,32 + scale9Paddings + 16,16,32,32 + scale9FromFile + + + + fileLists + + default + + files + + ../sprites/animals + + + + ignoreFileList + + replaceList + + ignoredWarnings + + commonDivisorX + 1 + commonDivisorY + 1 + packNormalMaps + + autodetectNormalMaps + + normalMapFilter + + normalMapSuffix + + normalMapSheetFileName + + exporterProperties + + + diff --git a/apps/client/src/metadata/probable-waffle/texture-packer/factions.tps b/apps/client/src/metadata/probable-waffle/texture-packer/factions.tps index 8416c192..02d618ae 100644 --- a/apps/client/src/metadata/probable-waffle/texture-packer/factions.tps +++ b/apps/client/src/metadata/probable-waffle/texture-packer/factions.tps @@ -173,6 +173,38 @@ individualSpriteSettings + ../sprites/factions/buildings/skaduwee/frost_forge/flame/frost_forge_flame_1.png + ../sprites/factions/buildings/skaduwee/frost_forge/flame/frost_forge_flame_2.png + ../sprites/factions/buildings/skaduwee/frost_forge/flame/frost_forge_flame_3.png + + pivotPoint + 0.5,0.5 + spriteScale + 1 + scale9Enabled + + scale9Borders + 16,12,32,24 + scale9Paddings + 16,12,32,24 + scale9FromFile + + + ../sprites/factions/buildings/skaduwee/frost_forge/frost_forge.png + + pivotPoint + 0.5,0.5 + spriteScale + 1 + scale9Enabled + + scale9Borders + 64,96,128,192 + scale9Paddings + 64,96,128,192 + scale9FromFile + + ../sprites/factions/buildings/skaduwee/infantry_inn/cloud-vertical.png pivotPoint @@ -224,6 +256,7 @@ ../sprites/factions/buildings/skaduwee/owlery/owlery-owl/owlery-owl-1.png ../sprites/factions/buildings/skaduwee/owlery/owlery-owl/owlery-owl-2.png ../sprites/factions/buildings/skaduwee/owlery/owlery-owl/owlery-owl-3.png + ../sprites/factions/character_icons/skaduwee/owl.png pivotPoint 0.5,0.5 diff --git a/apps/client/src/metadata/probable-waffle/texture-packer/gui.tps b/apps/client/src/metadata/probable-waffle/texture-packer/gui.tps new file mode 100644 index 00000000..27f4fb4d --- /dev/null +++ b/apps/client/src/metadata/probable-waffle/texture-packer/gui.tps @@ -0,0 +1,286 @@ + + + + fileFormatVersion + 6 + texturePackerVersion + 7.1.0 + autoSDSettings + + + scale + 1 + extension + + spriteFilter + + acceptFractionalValues + + maxTextureSize + + width + -1 + height + -1 + + + + allowRotation + + shapeDebug + + dpi + 72 + dataFormat + phaser + textureFileName + + flipPVR + + pvrQualityLevel + 3 + astcQualityLevel + 2 + basisUniversalQualityLevel + 2 + etc1QualityLevel + 70 + etc2QualityLevel + 70 + dxtCompressionMode + DXT_PERCEPTUAL + ditherType + NearestNeighbour + backgroundColor + 0 + libGdx + + filtering + + x + Linear + y + Linear + + + shapePadding + 0 + jpgQuality + 80 + pngOptimizationLevel + 1 + webpQualityLevel + 101 + textureSubPath + + textureFormat + png + borderPadding + 0 + maxTextureSize + + width + 2048 + height + 2048 + + fixedTextureSize + + width + -1 + height + -1 + + algorithmSettings + + algorithm + MaxRects + freeSizeMode + Best + sizeConstraints + AnySize + forceSquared + + maxRects + + heuristic + Best + + basic + + sortBy + Best + order + Ascending + + polygon + + alignToGrid + 1 + + + dataFileNames + + json + + name + ../../../assets/probable-waffle/atlas/gui.json + + + multiPackMode + MultiPackOff + forceIdenticalLayout + + outputFormat + RGBA8888 + alphaHandling + ClearTransparentPixels + contentProtection + + key + + + autoAliasEnabled + + trimSpriteNames + + prependSmartFolderName + + autodetectAnimations + + globalSpriteSettings + + scale + 1 + scaleMode + Smooth + extrude + 1 + trimThreshold + 1 + trimMargin + 1 + trimMode + Trim + tracerTolerance + 200 + heuristicMask + + defaultPivotPoint + 0.5,0.5 + writePivotPoints + + + individualSpriteSettings + + ../sprites/gui/cryos_mini_gui/borders/border_dark_outer.png + + pivotPoint + 0.5,0.5 + spriteScale + 1 + scale9Enabled + + scale9Borders + 3,3,2,2 + scale9Paddings + 2,2,4,4 + scale9FromFile + + + ../sprites/gui/cryos_mini_gui/borders/border_wood.png + + pivotPoint + 0.5,0.5 + spriteScale + 1 + scale9Enabled + + scale9Borders + 5,5,2,2 + scale9Paddings + 10,3,20,6 + scale9FromFile + + + ../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 + 5,5,6,6 + scale9Paddings + 4,4,8,8 + scale9FromFile + + + ../sprites/gui/cryos_mini_gui/surfaces/surface_dark.png + + pivotPoint + 0.5,0.5 + spriteScale + 1 + scale9Enabled + + scale9Borders + 2,2,4,4 + scale9Paddings + 2,2,4,4 + scale9FromFile + + + ../sprites/gui/cryos_mini_gui/surfaces/surface_parchment.png + + pivotPoint + 0.5,0.5 + spriteScale + 1 + scale9Enabled + + scale9Borders + 6,6,12,12 + scale9Paddings + 6,6,12,12 + scale9FromFile + + + + fileLists + + default + + files + + ../sprites/gui + + + + ignoreFileList + + replaceList + + ignoredWarnings + + commonDivisorX + 1 + commonDivisorY + 1 + packNormalMaps + + autodetectNormalMaps + + normalMapFilter + + normalMapSuffix + + normalMapSheetFileName + + exporterProperties + + + diff --git a/apps/client/src/metadata/probable-waffle/texture-packer/outside.tps b/apps/client/src/metadata/probable-waffle/texture-packer/outside.tps index 4525fe99..98496439 100644 --- a/apps/client/src/metadata/probable-waffle/texture-packer/outside.tps +++ b/apps/client/src/metadata/probable-waffle/texture-packer/outside.tps @@ -279,6 +279,28 @@ scale9FromFile + ../sprites/outside/architecture/obstruction/fence/bottom.png + ../sprites/outside/architecture/obstruction/fence/bottom_left.png + ../sprites/outside/architecture/obstruction/fence/bottom_right.png + ../sprites/outside/architecture/obstruction/fence/left.png + ../sprites/outside/architecture/obstruction/fence/right.png + ../sprites/outside/architecture/obstruction/fence/top.png + ../sprites/outside/architecture/obstruction/fence/top_left.png + ../sprites/outside/architecture/obstruction/fence/top_right.png + + pivotPoint + 0.5,0.5 + spriteScale + 1 + scale9Enabled + + scale9Borders + 16,20,32,40 + scale9Paddings + 16,20,32,40 + scale9FromFile + + ../sprites/outside/architecture/river/bridge_stone.png pivotPoint @@ -383,6 +405,21 @@ scale9FromFile + ../sprites/outside/foliage/trees/resources/special/tree_christmas.png + + pivotPoint + 0.5,0.5 + spriteScale + 1 + scale9Enabled + + scale9Borders + 16,32,32,64 + scale9Paddings + 16,32,32,64 + scale9FromFile + + ../sprites/outside/foliage/trees/resources/tree1.png ../sprites/outside/foliage/trees/resources/tree6.png @@ -399,6 +436,22 @@ scale9FromFile + ../sprites/outside/foliage/trees/resources/tree10.png + ../sprites/outside/foliage/trees/resources/tree11.png + + pivotPoint + 0.5,0.5 + spriteScale + 1 + scale9Enabled + + scale9Borders + 23,23,46,46 + scale9Paddings + 23,23,46,46 + scale9FromFile + + ../sprites/outside/foliage/trees/resources/tree4.png ../sprites/outside/foliage/trees/resources/tree5.png ../sprites/outside/foliage/trees/resources/tree8.png @@ -431,6 +484,21 @@ scale9FromFile + ../sprites/outside/foliage/trees/resources/tree9.png + + pivotPoint + 0.5,0.5 + spriteScale + 1 + scale9Enabled + + scale9Borders + 32,48,64,96 + scale9Paddings + 32,48,64,96 + scale9FromFile + + fileLists diff --git a/apps/client/src/metadata/probable-waffle/texture-packer/tiles.tps b/apps/client/src/metadata/probable-waffle/texture-packer/tiles.tps index 4df92534..7b296adb 100644 --- a/apps/client/src/metadata/probable-waffle/texture-packer/tiles.tps +++ b/apps/client/src/metadata/probable-waffle/texture-packer/tiles.tps @@ -94,7 +94,7 @@ algorithmSettings algorithm - MaxRects + Grid freeSizeMode Best sizeConstraints @@ -185,12 +185,6 @@ ../sprites/tiles/0016_ice.png ../sprites/tiles/0017_ice_snow.png ../sprites/tiles/0018_ice_water.png - ../sprites/tiles/0019_stone_1.png - ../sprites/tiles/0020_stone_2.png - ../sprites/tiles/0021_stone_3.png - ../sprites/tiles/0022_wood_1.png - ../sprites/tiles/0023_wood_2.png - ../sprites/tiles/0024_wood_3.png pivotPoint 0.5,0.5 diff --git a/apps/client/src/metadata/probable-waffle/texture-packer/tiles_2.tps b/apps/client/src/metadata/probable-waffle/texture-packer/tiles_2.tps new file mode 100644 index 00000000..14f1f0b0 --- /dev/null +++ b/apps/client/src/metadata/probable-waffle/texture-packer/tiles_2.tps @@ -0,0 +1,240 @@ + + + + fileFormatVersion + 6 + texturePackerVersion + 7.1.0 + autoSDSettings + + + scale + 1 + extension + + spriteFilter + + acceptFractionalValues + + maxTextureSize + + width + -1 + height + -1 + + + + allowRotation + + shapeDebug + + dpi + 72 + dataFormat + spritesheet-only + textureFileName + ../../../assets/probable-waffle/tilesets/tiles_2.png + flipPVR + + pvrQualityLevel + 3 + astcQualityLevel + 2 + basisUniversalQualityLevel + 2 + etc1QualityLevel + 70 + etc2QualityLevel + 70 + dxtCompressionMode + DXT_PERCEPTUAL + ditherType + PngQuantLow + backgroundColor + 0 + libGdx + + filtering + + x + Linear + y + Linear + + + shapePadding + 0 + jpgQuality + 80 + pngOptimizationLevel + 1 + webpQualityLevel + 101 + textureSubPath + + textureFormat + png8 + borderPadding + 0 + maxTextureSize + + width + 2048 + height + 2048 + + fixedTextureSize + + width + -1 + height + -1 + + algorithmSettings + + algorithm + Grid + freeSizeMode + Best + sizeConstraints + AnySize + forceSquared + + maxRects + + heuristic + Best + + basic + + sortBy + Best + order + Ascending + + polygon + + alignToGrid + 1 + + + dataFileNames + + multiPackMode + MultiPackOff + forceIdenticalLayout + + outputFormat + RGBA8888 + alphaHandling + ClearTransparentPixels + contentProtection + + key + + + autoAliasEnabled + + trimSpriteNames + + prependSmartFolderName + + autodetectAnimations + + globalSpriteSettings + + scale + 1 + scaleMode + Smooth + extrude + 0 + trimThreshold + 1 + trimMargin + 1 + trimMode + None + tracerTolerance + 200 + heuristicMask + + defaultPivotPoint + 0.5,0.5 + writePivotPoints + + + individualSpriteSettings + + ../sprites/tiles_2/0019_stone_1.png + ../sprites/tiles_2/0020_stone_2.png + ../sprites/tiles_2/0021_stone_3.png + ../sprites/tiles_2/0022_wood_1.png + ../sprites/tiles_2/0023_wood_2.png + ../sprites/tiles_2/0024_wood_3.png + ../sprites/tiles_2/0025_lava_1.png + ../sprites/tiles_2/0026_lava_2.png + ../sprites/tiles_2/0027_lava_3.png + ../sprites/tiles_2/0028_lava_4.png + ../sprites/tiles_2/0029_lava_5.png + ../sprites/tiles_2/0030_lava_6.png + ../sprites/tiles_2/0031_lava_7.png + ../sprites/tiles_2/0032_obsidian_1.png + ../sprites/tiles_2/0033_obsidian_2.png + ../sprites/tiles_2/0034_obsidian_3.png + ../sprites/tiles_2/0035_obsidian_4.png + ../sprites/tiles_2/0036_obsidian_5.png + ../sprites/tiles_2/0037_grass_dark_1.png + ../sprites/tiles_2/0038_grass_dark_2.png + ../sprites/tiles_2/0039_forest_1.png + ../sprites/tiles_2/0040_gravel_1.png + + pivotPoint + 0.5,0.5 + spriteScale + 1 + scale9Enabled + + scale9Borders + 16,8,32,16 + scale9Paddings + 16,8,32,16 + scale9FromFile + + + + fileLists + + default + + files + + ../sprites/tiles_2 + + + + ignoreFileList + + replaceList + + ignoredWarnings + + commonDivisorX + 1 + commonDivisorY + 1 + packNormalMaps + + autodetectNormalMaps + + normalMapFilter + + normalMapSuffix + + normalMapSheetFileName + + exporterProperties + + + diff --git a/apps/client/src/metadata/probable-waffle/texture-packer/units.tps b/apps/client/src/metadata/probable-waffle/texture-packer/units.tps new file mode 100644 index 00000000..20be3802 --- /dev/null +++ b/apps/client/src/metadata/probable-waffle/texture-packer/units.tps @@ -0,0 +1,250 @@ + + + + fileFormatVersion + 6 + texturePackerVersion + 7.1.0 + autoSDSettings + + + scale + 1 + extension + + spriteFilter + + acceptFractionalValues + + maxTextureSize + + width + -1 + height + -1 + + + + allowRotation + + shapeDebug + + dpi + 72 + dataFormat + phaser + textureFileName + ../../../assets/probable-waffle/atlas/units.png + flipPVR + + pvrQualityLevel + 3 + astcQualityLevel + 2 + basisUniversalQualityLevel + 2 + etc1QualityLevel + 70 + etc2QualityLevel + 70 + dxtCompressionMode + DXT_PERCEPTUAL + ditherType + NearestNeighbour + backgroundColor + 0 + libGdx + + filtering + + x + Linear + y + Linear + + + shapePadding + 0 + jpgQuality + 80 + pngOptimizationLevel + 1 + webpQualityLevel + 101 + textureSubPath + + textureFormat + png + borderPadding + 0 + maxTextureSize + + width + 2048 + height + 2048 + + fixedTextureSize + + width + -1 + height + -1 + + algorithmSettings + + algorithm + MaxRects + freeSizeMode + Best + sizeConstraints + AnySize + forceSquared + + maxRects + + heuristic + Best + + basic + + sortBy + Best + order + Ascending + + polygon + + alignToGrid + 1 + + + dataFileNames + + json + + name + ../../../assets/probable-waffle/atlas/units.json + + + multiPackMode + MultiPackOff + forceIdenticalLayout + + outputFormat + RGBA8888 + alphaHandling + ClearTransparentPixels + contentProtection + + key + + + autoAliasEnabled + + trimSpriteNames + + prependSmartFolderName + + autodetectAnimations + + globalSpriteSettings + + scale + 1 + scaleMode + Smooth + extrude + 1 + trimThreshold + 1 + trimMargin + 1 + trimMode + Trim + tracerTolerance + 200 + heuristicMask + + defaultPivotPoint + 0.5,0.5 + writePivotPoints + + + individualSpriteSettings + + ../sprites/units/skaduwee/owl/attack/down_1.png + ../sprites/units/skaduwee/owl/attack/down_2.png + ../sprites/units/skaduwee/owl/attack/left_1.png + ../sprites/units/skaduwee/owl/attack/left_2.png + ../sprites/units/skaduwee/owl/attack/right_1.png + ../sprites/units/skaduwee/owl/attack/right_2.png + ../sprites/units/skaduwee/owl/attack/up_1.png + ../sprites/units/skaduwee/owl/attack/up_2.png + ../sprites/units/skaduwee/owl/die/down_1.png + ../sprites/units/skaduwee/owl/die/down_2.png + ../sprites/units/skaduwee/owl/idle/down_1.png + ../sprites/units/skaduwee/owl/idle/down_2.png + ../sprites/units/skaduwee/owl/idle/left_1.png + ../sprites/units/skaduwee/owl/idle/left_2.png + ../sprites/units/skaduwee/owl/idle/right_1.png + ../sprites/units/skaduwee/owl/idle/right_2.png + ../sprites/units/skaduwee/owl/idle/up_1.png + ../sprites/units/skaduwee/owl/idle/up_2.png + ../sprites/units/skaduwee/owl/move/down_1.png + ../sprites/units/skaduwee/owl/move/down_2.png + ../sprites/units/skaduwee/owl/move/left_1.png + ../sprites/units/skaduwee/owl/move/left_2.png + ../sprites/units/skaduwee/owl/move/right_1.png + ../sprites/units/skaduwee/owl/move/right_2.png + ../sprites/units/skaduwee/owl/move/up_1.png + ../sprites/units/skaduwee/owl/move/up_2.png + + pivotPoint + 0.5,0.5 + spriteScale + 1 + scale9Enabled + + scale9Borders + 12,12,24,24 + scale9Paddings + 12,12,24,24 + scale9FromFile + + + + fileLists + + default + + files + + ../sprites/units + + + + ignoreFileList + + replaceList + + ignoredWarnings + + commonDivisorX + 1 + commonDivisorY + 1 + packNormalMaps + + autodetectNormalMaps + + normalMapFilter + + normalMapSuffix + + normalMapSheetFileName + + exporterProperties + + + 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..0a44a387 --- /dev/null +++ b/apps/client/src/metadata/probable-waffle/tilemaps/ember_enclave.tmx @@ -0,0 +1,62 @@ + + + + + + + + + +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,303,303,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,303,303,303,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,303,302,303,303,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,303,302,302,302,302,302,302,302,302,302,6,7,7,7,7,7,7,8,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,306,306,302,303,302,302,305,302,302,302,302,6,22,145,146,146,146,146,147,20,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,306,306,302,302,302,302,302,305,302,302,302,18,145,161,12,12,12,12,159,21,8,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,306,306,306,306,306,302,302,302,302,302,302,302,18,157,12,12,12,12,12,160,147,20,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,306,306,306,306,306,302,302,302,302,302,302,302,302,18,169,149,12,12,12,12,12,159,20,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,306,306,306,306,306,302,302,302,302,302,302,302,302,30,10,169,149,12,12,12,12,159,20,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,306,306,302,302,302,302,305,302,302,302,302,302,30,10,169,149,12,12,12,159,20,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,306,306,302,302,302,302,302,305,302,302,302,302,302,30,10,157,12,12,12,159,20,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,306,306,302,305,302,302,302,302,302,302,302,302,302,302,18,169,149,148,170,171,20,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,304,302,303,302,302,30,10,169,171,9,43,32,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,305,302,302,302,304,304,303,302,302,302,30,31,31,32,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,304,304,304,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,295,302,302,302,302,305,302,302,302,304,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,304,304,304,304,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,304,304,304,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,304,304,304,304,304,302,304,304,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,304,304,304,304,304,304,304,304,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,295,295,302,302,302,304,304,304,304,302,304,304,304,304,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,295,302,296,302,302,302,302,304,304,304,304,304,304,304,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,296,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,296,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,296,295,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,299,297,297,297,298,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,296,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,300,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302 + + + 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 54% 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..6a198ef4 100644 --- a/apps/client/src/metadata/probable-waffle/tilemaps/tiles.tmx +++ b/apps/client/src/metadata/probable-waffle/tilemaps/river_crossing.tmx @@ -1,9 +1,10 @@ - + + 11,11,11,11,11,11,11,11,11,76,98,99,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,256,279,72,72,241,221,60,60,60,60,60,60,60,60, @@ -22,40 +23,40 @@ 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,20,23,124,111,121,23,23,23,23,23,23,60,60,60,60,60,60, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,21,8,23,123,133,113,23,23,23,23,23,23,23,60,60,60,60, 11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,20,23,123,35,121,23,23,23,23,23,23,23,18,60,60,60, -11,145,146,147,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,20,23,124,111,133,113,23,23,23,23,23,6,22,11,60,60, -11,157,12,159,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,21,8,23,123,35,121,6,7,7,8,23,18,11,11,11,60, -146,161,12,160,146,147,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,20,23,123,35,121,30,10,11,21,7,22,11,11,11,11, -12,12,12,12,12,160,147,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,20,23,123,35,121,23,18,11,11,11,11,11,11,11,11, -12,12,12,12,12,12,160,147,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,20,23,123,35,121,23,18,11,11,11,11,11,11,11,11, -12,12,12,12,12,12,12,160,147,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,20,23,123,35,121,23,18,11,11,11,11,11,11,11,11, -12,12,12,12,12,12,12,12,160,146,147,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,20,23,123,35,121,23,18,11,11,11,11,11,11,11,11, -12,12,12,12,12,12,12,12,12,12,159,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,20,23,123,35,121,23,18,11,11,11,11,11,11,11,11, -12,12,12,12,12,12,12,12,12,12,159,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,20,23,123,35,121,6,22,11,11,11,11,11,11,145,146, -12,12,12,12,12,12,12,12,12,148,171,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,9,43,32,112,135,109,125,18,11,11,11,11,11,11,145,161,12, -12,12,12,12,12,12,12,12,12,159,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,9,43,32,112,134,135,109,125,23,18,11,11,11,11,11,11,157,12,12, -12,12,12,12,12,12,12,12,12,159,11,11,11,11,11,11,11,11,11,11,9,43,31,31,31,43,43,31,43,31,43,32,112,134,135,109,110,125,6,7,22,11,11,11,11,11,145,161,12,12, +310,310,310,310,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,20,23,124,111,133,113,23,23,23,23,23,6,22,11,60,60, +11,157,310,310,310,310,310,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,21,8,23,123,35,121,6,7,7,8,23,18,11,11,11,60, +146,161,12,160,146,147,310,310,310,310,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,20,23,123,35,121,30,10,11,21,7,22,11,11,11,11, +12,12,12,12,12,160,147,11,11,310,310,310,310,310,310,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,20,23,123,35,121,23,18,11,11,11,11,11,11,11,11, +309,309,12,12,12,12,160,147,11,11,11,11,11,11,310,310,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,20,23,123,35,121,23,18,11,11,11,11,11,11,11,11, +309,309,309,309,309,12,12,160,147,11,11,11,11,11,11,310,310,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,20,23,123,35,121,23,18,11,11,11,11,11,11,11,11, +309,309,309,309,309,12,12,12,160,146,147,11,11,11,11,11,310,310,310,310,310,310,310,310,310,11,11,11,11,11,11,11,11,11,11,20,23,123,35,121,23,18,11,11,11,11,11,11,11,11, +309,309,309,309,309,12,12,12,12,12,159,11,11,11,11,11,11,11,11,11,11,11,11,11,310,310,11,11,11,11,11,11,11,11,11,20,23,123,35,121,23,18,11,11,11,11,11,11,11,11, +12,309,309,309,309,309,12,12,12,12,159,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,11,11,11,11,11,11,11,11,11,20,23,123,35,121,6,22,11,11,11,11,11,11,145,146, +12,12,309,309,309,12,12,12,12,148,171,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,310,11,11,11,11,11,11,9,43,32,112,135,109,125,18,11,11,11,11,11,11,145,161,12, +12,12,12,12,12,12,12,12,12,159,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,310,11,11,11,11,9,43,32,112,134,135,109,125,23,18,11,11,11,11,11,11,157,12,12, +12,12,12,12,12,12,12,12,12,159,11,11,11,11,11,11,11,11,11,11,9,43,43,43,31,310,310,43,31,31,43,32,112,134,135,109,110,125,6,7,22,11,11,11,11,11,145,161,12,12, 12,12,12,12,12,12,12,12,12,159,11,11,9,43,31,31,43,43,31,43,32,112,134,134,134,134,134,134,134,134,134,134,135,109,110,125,23,6,22,11,11,11,11,11,145,146,161,12,12,12, 12,12,12,148,170,170,170,170,170,171,9,31,32,112,134,134,134,134,134,134,134,135,109,110,110,110,110,110,110,110,110,110,110,125,6,7,7,22,11,11,11,11,11,11,157,12,12,12,12,12, -12,12,148,171,9,43,31,43,43,43,32,23,112,135,109,110,111,109,110,110,110,110,125,6,7,7,7,7,7,7,7,7,7,7,22,11,11,11,11,11,11,11,11,11,157,12,12,12,12,12, -182,182,199,98,163,134,134,134,134,134,134,134,135,109,125,23,124,125,6,7,8,23,23,18,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,145,161,12,12,12,12,12, -110,110,110,110,110,110,111,35,24,35,109,110,110,125,6,8,23,6,22,11,21,7,7,22,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,145,147,11,157,12,12,12,12,12,12, -7,7,7,7,7,8,124,110,110,110,125,23,6,7,22,21,7,22,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,169,171,145,161,12,12,12,12,12,12, -11,11,11,11,11,21,7,7,7,7,7,7,22,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,145,146,161,12,12,12,12,12,12,12, -11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,157,12,12,12,12,12,12,12,12,12, -11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,145,146,146,161,12,12,12,12,12,12,12,12,12, -11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,157,12,12,12,12,12,12,12,12,12,12,12,12, -11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,145,161,12,12,12,12,12,12,12,12,12,12,12,12, -11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,157,12,12,12,12,12,12,12,12,12,12,12,12,12, -11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,169,170,149,12,12,12,12,12,12,12,12,12,12,12, -11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,157,12,12,12,12,12,12,12,12,12,12,12, -11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,157,12,12,12,12,12,12,12,12,12,12,12, -11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,169,170,149,12,12,12,12,12,12,12,12,12, -11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,169,149,12,12,12,12,12,12,12,12, -11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,76,98,98,198,183,12,12,12,12,12,12,12, -11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,76,99,35,35,35,196,182,183,12,12,12,12,12, -11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,76,99,35,35,35,35,35,35,196,182,182,182,183,12, -11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,87,35,35,35,35,35,35,35,35,35,35,35,196,182, -11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,87,35,35,35,35,35,35,35,35,35,35,35,35,35 +12,12,148,171,9,43,31,43,43,43,32,23,112,135,109,110,111,109,110,110,110,110,125,6,7,310,310,7,7,7,7,7,7,7,22,11,11,11,11,11,11,11,11,11,157,12,12,12,12,12, +182,182,199,98,163,134,134,134,134,134,134,134,135,109,125,23,124,125,6,7,8,23,23,18,11,310,310,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,145,161,12,12,12,12,12, +110,110,110,110,110,110,111,35,24,35,109,110,110,125,6,8,23,6,22,11,21,7,7,22,11,310,310,11,11,11,11,11,11,11,11,11,11,11,11,11,145,147,11,157,12,12,12,12,12,12, +7,7,7,7,7,8,124,110,110,110,125,23,6,7,22,21,7,22,11,11,11,11,11,11,11,310,11,11,11,11,11,11,11,11,11,11,11,11,11,11,169,171,145,161,12,12,12,12,12,12, +11,11,11,11,11,21,7,7,7,7,7,7,22,11,11,11,11,11,11,11,11,11,11,11,310,310,11,11,11,11,11,11,11,11,11,11,145,146,146,147,145,146,161,12,12,12,12,12,12,12, +11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,11,11,11,11,11,11,11,11,11,11,11,169,149,12,160,161,12,12,12,12,309,309,309,12,12, +11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,11,11,11,11,145,146,146,146,146,146,146,146,161,12,12,12,12,12,12,309,309,309,309,12,12, +11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,310,11,11,11,145,161,12,12,12,12,12,12,12,12,12,12,12,12,12,12,309,309,309,309,309,12, +11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,11,11,11,11,157,12,12,12,308,308,308,308,308,308,12,12,12,309,309,309,309,309,309,309,309,12, +11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,11,11,11,11,157,12,308,308,308,308,308,307,308,308,308,12,12,309,309,309,309,309,309,309,309,12, +11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,11,11,11,11,157,12,308,308,308,308,307,307,307,307,307,12,12,309,309,309,309,309,309,309,309,12, +11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,11,11,11,11,169,149,308,308,308,308,307,307,307,307,307,307,12,12,309,309,309,309,309,309,309,12, +11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,310,11,11,11,11,11,157,308,308,308,307,307,307,307,307,307,307,307,12,309,309,309,309,309,309,309,12, +11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,11,11,11,11,11,11,157,12,308,308,307,307,307,307,307,307,307,12,12,12,309,309,309,309,309,12,12, +11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,11,11,11,11,11,11,169,149,12,308,308,308,308,307,308,308,307,12,12,12,12,309,309,309,309,12,12, +11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,11,11,11,11,11,11,11,169,149,12,12,12,12,12,12,181,182,182,182,183,12,12,12,12,12,12,12, +11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,11,11,11,11,11,11,11,11,169,170,170,170,149,12,181,197,35,35,35,196,182,183,12,12,12,12,12, +11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,11,11,11,11,11,11,11,11,11,11,11,11,169,247,197,35,35,35,35,35,35,196,182,182,182,183,12, +11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,11,11,11,11,11,11,11,11,11,11,11,11,11,87,35,35,35,35,35,35,35,35,35,35,35,196,182, +11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,310,11,11,11,11,11,11,11,11,11,11,11,11,11,87,35,35,35,35,35,35,35,35,35,35,35,35,35 diff --git a/apps/client/src/metadata/probable-waffle/tilesets/tiles_2.tsx b/apps/client/src/metadata/probable-waffle/tilesets/tiles_2.tsx new file mode 100644 index 00000000..76447c9d --- /dev/null +++ b/apps/client/src/metadata/probable-waffle/tilesets/tiles_2.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/apps/client/src/metadata/probable-waffle/tilesetter/probable-waffle.tset b/apps/client/src/metadata/probable-waffle/tilesetter/probable-waffle.tset index d2fb7bfd..74ac1cf4 100644 --- a/apps/client/src/metadata/probable-waffle/tilesetter/probable-waffle.tset +++ b/apps/client/src/metadata/probable-waffle/tilesetter/probable-waffle.tset @@ -1 +1 @@ -{"version":"2.1.0-pro","tilewidth":64,"tileheight":32,"tileshape":1,"sources":[{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAEqklEQVRoQ8VZy27bRhQ9MyRFK7ZgK47TpkUQuAiCoCgCtOgiQNbddN1Pab+iv9JVF93kH1og6KKPICmQoHFjR6nrCDJfw+JechhqNORQoiTPyiaHM3POPfc1EriikT79Iaetk+fPERwfw7/7jbiKo2x9Uw28Cey2idgaAS7gJiHbImLjBFRSzwbw42gOZzoIEXgxuwENcoVtE7ExAmaPv2cfJ1D5jP8EAeZnXry0u29KEWsnwCr1dxmw5y2A1gHQxkaUBUCaAb6H/O0EeRJjeOtw7cFybQQs6+NtErh8/RaQPiAlxP4BICTUP38zAXqsSxG9CWgCnmSDRamTEvSwKIJeRWf/IpcBxO6IrR96Sau79CViZQKmT39ixx78+hj5tX0kdz6fO6z2e5Gpwv/zCLk/gBoMEc4uC1AGCQQeo+udgK8rWC5NQBXVZyn8F08YVPLxAyAIEMoyypeWjvZGkPEUIprBe/VbQcDRJ8h2x+/nlkhmr95ABh4wPmq2el1BDUpaVhGdCahLPYlz+H/9Ulj29oPCqlqqZcCLVAgZTSuSRFpEfibMUAs9JwLqPr6gew2+rhpLcNUpdfjVd52wOSfZfFwTQOCDoW/1UYri/smfkNNJQZIc8LwwLFyiPpzgaXJDJmkNEIAzazQSsEpU59QlJMubFIBcOYOYC4B+H0USUmSAVxRPy44m11ggoF7AVJu0RG8CTXmaUpY3DOfdoZS2XqdV4jVEVQ0AQKoYavoOwX8veQa7UjyD+OwR/89z2Rcz5OdvOH0KZAhvHFg5MomoCGgsYGgZS8qqgNOhRvvVZmpyurBxF+CU+8X+IWcAGc8gJy+Rhgfwp6cQWcTAxb0v5tYmVeTTCwiVIFdFtanXWEifNSNScN69+zVjF41StwUdzTixfXFeAO+Qq5vkWhU8NEGlVfHj7V2rgiwI+KcPrUtcnl3wdzs3x+0eUcdi4LIT0AKe5U7Mja/38m8NvlJPSSQFRBou1XSd54oV7S5gfM2SuzjHzo2Ra93W93R44VGZe2jNCn0W18FX9xFNlaSOBQtBkFyiqT1lqwFuyTkQkHT7kmjbQsclCoI5PA6GKslae4il0mCnfF2erK3HJytVVWMfcxvfErG6azSX7ZwGzQ/NIJmUJXCReop8nB5/CRXubgRUX35cpbGzEtQH0ETkf/zMj7Jb9+G9eMJ/5zt71vJWf6v9Uvf1+rm8+SGnPB6eB+XvVCS6VKIVRp/2uUnqTIA+dPLjtzlZvKkENi1W90tdnHCfkCVQCvBPfgf8APACpOPbHBTpfT45YznTcGWE+p4ui5vnW5oAUxEuiZJfUqrTPQARIrOYO0R5+ow/pw5Rt8rq9Uk30EZ1uixwfe6VCTCJaJLk5WTKlxtsWQJfVnnUJHH8KLvJTsCNao6+1xWdyxBN73sT0KYI7vE/+Oi9X0cS/tkzqKM7CAbzW1szjKX/pzJ2HcDXpgCT2XrWMEHpxsV1zUXXaXSFTrdJGrDep6/F1xYDXJJbpZ3Wa9av0ZVX3DesG/jGFNCmCBdpdQLoNwQCvyngWyOgS9aw/T6walTvSvLWCehCBM3ZFvArI8CWPq/y5/H/AZY4YEXwclOfAAAAAElFTkSuQmCC"},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAGuElEQVRoQ8VYy24cRRQ9/Zyet195yJkYJ0QgEIqQWCCE2LHgB1jwBXwai+xZIXYICQkJIYQSCIlxjOPE9tied09Xd6NTnWrX1Lz8GudKlqd7qrvqnjr33FNj4S3Fk5++S/Wp3//8G+ttLOXaJ1WJN27V83x3Xp3kn68biGsDQN9xlbyeuLn71wXEwgEwqT6L5vdqJ3jeOmUGxy4aiIUB8PMPj9KCZ+POiod/90PUCwKdoQ3fSSASCyUvk4BeZKHkCGzUe3CsZAwABdiigLhyAJj4h40iRJxCJCn2TyKkyRCbtTZEYst8+H/rpILUsnCv1kbgCrg2sN2ujhFkEAIbXgcuEvwRruCzL7++0jVf2cuY+MPNskxgEMZ4eTSEZw3l9VrQQ5JaaPZ9NMOCvPfJrcM8WZP2OgorcVdeBlYs/+/aNfn/qhhxaQBY453IQ2PVh2tb+OfVQFK56sdYDfpysb4TY6tVRV+4iJMs+cN+gN1uERU/kWO6wkeapqh40QgLWgNHXteCDAAzLgvEhQHQxY0AVAMbQ5GiN0xQdAXWyz2Z+G73lNZKA2qeQDP0IGJbJnYSunjnRgGBZ8NlLbwJdgk+w1BA8bPeQn/fyhhy0dI4NwDdp9+nZvtiAhQ57hbr+oOVIwxjB8+Oq/nOiUjgph1CBC4OBgUMImdsV9kFzAjjDICCkyAqbuRfq8RXiiJnDzfgvECcGQAmztmPOxF2D8N88RQpxjB1sOm1sBXV8GC5hWcn1XzXCMy610HJirEVV/MOQNoz0kRgo5rt5PNWVYI5LxRYfa8hBZdB3SEDWWZnBWIuACpxCpusb9tCnKRykUx+ze3DRwLXSvHarsiFKEbw83q5Le+pUmC5qDpfqmWiuXPQh22lUih1qisQ1pNWLn68p5LXxfP2ahWDKJEtlwComAfEVABMA8OFJ3ECkVpwbMBK03xXVeL6rrG/P1hq4a+jzNgwsUm17vW3p/b+m0lHzjeEjd2oIlk3jCFbqq4tJlvIuCW3jyUrkhvDFlr94tuJuY7dnOTclBBtOG0U3RRpKZWJJYklF0hzw89KqblwlC1stSo53SdRepLzI6vW3awcJHNEGcKycwDpG/Z6RfhZcxgJXYtYcozjxIPrufk4s2vkAEyzrEScqk1F51/Ji2WbU0GRorFx7eyeaGev3I4qCLKWLyNKfdxdK0iVf/yijfv19phOcBwXfiCK8hnqit7+CNhJ6GOnUxoBlju+Wc8S1jWELFSdxgRLAWFNS5yTMblmv4iByJLigjrDUzRJL/+NQeF3tp2JUZxmys3W9l8zgogTvHsrgOtY2Dtsy9amAyAT8FrS7CijYy5YsYVjJ3kCJqtrCK8blR4qvphpsScCoCbjQk1xoiCpELBlCdgUhTfBLkCRZMIUpcMuP/swW+fNYhdPj2pTDQ57vXpG6cmsutcB4/q5CSKBNGBmueg5jJXAJIVVL1cPql1SBqjuJ9jvpAgTC5s0NAVH2uGt/XDM2fFdnOO3/dWRdqebG45RybOu6SueHtdGaG+uhc9w7Mc3Mos9y17z+7wETKqd9fjKyUousFzzUQkc/LmT2V6eB2hSAjeWlFTBHWHnCLwYa0GIF53yGAAmS0h3eorX/axdMiYlzvtqbNkTElzOxTDLZaoInhcIitqNuodaujciinyPEkb9nRTK7XYZ6+W+dII6LXXfYK5Dv56WPJ9n7/9o7QjPmpn1pj+h8VItetqZYa4RmtgWI09SvRS/nCgwqm2ayby3nFldvZaVWNUL2clxGnVn7fz9JWW2SljBqTGb1f/V2uYCoAbqQKhFN8OsXU0L0pIiqYJ+gUFTxHcwqNR6W5vkDaYlz+fZphuVLnY6ZQxjG/fdFh6HS1dnhaeVhklbCqJlse8muU2moWFrG6SOPCOoeiRD6P35Q8gsZee4SdZYrYlroDHSATzv8fjMDJinEfTiPJSw19Ps9HZ35SNNpywFSiXPHbtd6oOUn6XUTO5upTvym4G+BtWtfn21Km/P8/zTWHphAMzS0Ps2Kft4uCyH6CrMHaUI7vWCmRaZz/EQ1Rn6IwCYx2Umf9HEz60BM4sdwFnaJwGgEM6iPRMfCFfSmqF+PDXnPy/VF8aAeaWhvp8lnGpnu5ErD1DXkfiVM2AeEEqtdVPDZ3TnOcsPXNWOm+u8tAactTRWCn1phExVJwCsZR6sTM3g9aISXzgDTGB++fFRav7UpXb/yVEdjSBCEgkcIPMWi0782gEwu4YO0B1vCKdaxd+tEh5++tXCWanPfa2T6ROrrqFc3rSfrOaV2GW//x8y+b3gtsgAfgAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAEEklEQVRoQ+1YS28TVxg987Q9NoQQcAioQQJBiCqhFhCP8hAsELu2KhISYsmaBQv+Bhv+ARsWiEWzq7pAAqFGKCXhWQzYIB52HJI0iolf4xmj7xvfYTwxsRGT2JjczURzxzP3nHvO+e4XCd/5kL5z/FglYFUBy8RAITFS9b46MvRrR6ot8EUJ4JpSRiEzwxyo8QF0PQEEXIAmwLArjgBklS9dS4B3xwmoaelAOQ959i3sjVuh6RLf6zoCEneu1XmcwG8wJITePYKuq7AGdgGqDk2zu4sAAh6zCuiZT6Fgq5iYlpHOVZHLl7DGCOH0gUGEph4DtsXSrwyfcLPQrwJhm3YqpOUQFDu+7f1dlNQog0ormxCNGkjPm3iSnER2JgcjouPwviH09q2DJgOmDfRHa5/x5QJlRu7BXYR/PNI2izQlwCt1Ak/jVe9PfLVVHdv7NSQzRVSsKuxSEfeepnnu+KFdWF+aw0x0E/oWJrkSUDAqbx7A2rrHUcdUxq0SQiYrnRVfRMBSR4awXIHxPomJQi8SqSw/mi+U3Z9cOHfMAfvfTdcWpAA3OGtPdhwBS4GmOVIIqcAsO5n4+v9a+QOw2Z5HWl6LP//6l+cu7rGWBO+8IMGXyMlLTTen2dpamf/qjzSqBgK4yIvMmh2I599AsYq4kdQ4K878frRufW5OEAGDQ3VzpAoKzOVQx1cTIFTgZ1vkRapvL2TbgiFZ6AkrMCFh5J+XTIKwRXahis3T4zC37IasOgcnv13omf6ZZ4ErY1kIIPCpjfsXKTCsyYjHZMCycOX6GH47tZefCUUMRGAiFpIhyzXwiduuXQT45bBGIAQIFQwdPsvva2QLLxsVs4Kx+ylWgSCBSOMzg69SNPJxkFYIjIBmgeMlhQiYy5XxIvXWJYGCkixBu91rKI4FJAuy718WrAZxrgigx1gxArzKiGfHGeBU/88ub6Njz/jvg/t2IhY13PvrI5+W6Ae/iPRaBeH7tSBtppYVJcBvj3y+jDtjCZw4NIxCwUSpUsX4oySfH4QaaLe9ZwdqtJTMU8Zo/bAbsyVHLbGwAl2yF3HSkQSQAry738g+VErZBvEBlwAiAnqEG62qqnOzZcsKKlUFH4oWvGppBlx8s60KoEWQ9ykIqZM0Qgq3z5evjvI901Ih2UXEQsCGtdG6EinsQFcxSC2tAm8bAeLD/kpBwRgzdBRNm0mhpoq6Sxq/DGrQt2xHVQ27ASiAi0D8UuBtJ8BLxN+3HnIHaRhOc0Xj4csFTM/OIT05x632+T8OcoWg4TZX31oVaOT1zylCEDHxfB6jEy/qGiuyhzhzLPXOVuZWPAOaLcpvDW63s6b7s6CAd4wFPkeIn4iggXc8Ac2UEtR8x1kgKGCtvmeVgFaZ6tbnPgLoPtEwyvYIKAAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAACsklEQVRoQ+1YXU7bQBCeBIfIJYtAQH9eIllFvCHBAXjkAgiJI9AL9BScgCNU6i16gPYArSLlBSGoFBGQiRISNGvPMru2sdc/+VGyL5C1spn55vu+mXUNlnzVljx/WAGwYsCSI7CSwJITYGWCuSUw+vNjAq01gMcXGHxowMbBWe6zZslC66D7v64nZsD1T3tyq/n0D5zj79ZnLgQAo99XMvHhPUBjNwjZf9xUsbutBxhsfFWfF4URqdXCimNytDgAcZVDEJAJUGvLx87RRepvzCUDTI2Pb++0avOgiQnulx3pCX6/Jx8vgjQi1UnTuEqWsQL3OEtAeODf/NcKK8GBF3D254sRCgBbjUua84WUn3SlLygwhAfQ7wABgiAMOx1oeO25AaJWVOOUNMdCAhCygP6XzxEMvsTsgVAAmI5uq/GIkXEAwo5BzNCMFFkyQ2lEJFBU49Dvxpu64QsRMETYNabsERETRC+ImBqmZKlx/6anGyNjQRLbkBm4pukRiT2aA8EDxgBtNE6MiGMWgoot05wz1j4LGDY/QrM+rNwsU4cUaotam0MULDWuMSJkE58m485H0xw7AurudmVApAJAgja7RZLp0X6SxiUQYku2TFqKHWw/apQgW6h7Wu5dIzMAJhBxPkF7WTTOGZH2PfnbwgtniOBvWUBYA8CBUH7ALkYalTNoPI4RmjTkBBnMEGSSgVF6MPbvYf3wW+4cpLfH96zsu3x0Vsnn0DiapckqYpLz/HYZQ4OkVXd3wdk/L5RDoS9zmDQgCmicrtrvlkB4hROn80sDgA4c/f05oYsQMSKPxjkQvIWW/cKldAA0sxRbQZ83GGGj8UEvCFGcXFYSayWHmtIwmWC2vyo1nuZmlQOQeY7gkZao8bkBIKl9anJoPUz9perUGGBWwnzzVJXG0xjwCmBGwDBXdx8cAAAAAElFTkSuQmCC"},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAEKklEQVRoQ+2X21MbVRzHv3tNsiFMzI3YcCuIFBFoasKU9kmn49jx2Qd967/Sv0SfdEbr5c0HH9QRDaVQwXFGcEqAlDbk1gTYzSab3XXOSTdDpZlAbsDAvhwWZpZzPuf7+f3OYXDBH+aCrx+XAC4TcMEJXCpwwQNwWQSbVuCPn742PY5KLUDjtz9t+lunmcITT/qr+/fMobmP4JV05GUTN/zP6PyfKP10PG8gjg2A7LhLBJ7/OY+iDrw5NoFh4zneGHBiOX0FOiviPCaiIYC1+S9NsrOFEo/x0hrWVReU7C4kbx/ckCFzLgi9bvAcg0KRoYmw0nAeElEXwP8dtwCkVBYZTUQ+k4bb50d5Lwdn6C3YWB25RBzBiSlsLy1geCYMgxfPfI04AsDcjZmx1a26jms6j31ZQXI1RhfXP3kddoHFRCBP31efVNc8PVodSRpG0g+x4Z9Frshj7s4nDVPXzaJYm8xJHc8pLG5ODyE//y1cV/10zvFNDfu6gJLBIDpmYj+eRqovTBce9W7C3HpGQZwlNZhWHSeLm1JXUDR4vBB8KKg6FFlBIb0L/7UwwNsR9W3XNpVC8L5H3xmWxdu3PzvVRFAAZBEcC1rkmnV8ILMMmXFiSxhEqWIi8fg32Gx2BKdvws4DosDSQskaOlS1DLGnh0IYlZ5iQwmdGohXFHA6BLC61pLjMA26MM6sQNcr0IsyivkM7nz8IWLLaxCgw9XrwF4qRbvJOwERu+5JiJwGE0zXzxFH4rf8ywPTyRaRUwXEf/0Bd8P9TTk+kl2CIrixzfahIGvIba1DsNngGxyBYJTh8PooqPLBQS0Nh4tftw5UDdtgq44PKDv4BwGoL0/NJAHXg1lsJB0osTbaPV4kZOS844ChAywHolPCd6MrXaNhASLdgezMjPzwFcdvzU7i+8+/OLbjWYWjG2wVxL8yAUz5UiCjZvL0b6xegqlrgKaiNxCoFkqYHVWjIQArlhaIeo4XCzla9Rs5ThJFvmGBKG+nsCJFgIoKT6+IZHwTwavDdJScEvgeNySpcweqYwOwQFhdI6IstOQ4ORw96rmFyMHv0Bge4mAAC0899N/4PBIdczs78IRCtdJA4Fn3jXbViBMDOJwI0jXGlH9bctz6HjkokYdAMLUSdKVA30kKGLsLBmdDWHkEZuhKW+8aTQOwJr708zfmRGGhGuMWHKdqkPZplOmFKhZ30vZJnvfDDiwmA4gGU7U0tOv63TKAw4kgu7iYHW7JcaIGUWJFfBdGpULTwAg27CXW4b0WgV49ZrTtTtE2AIdBEK/J04rjBMRjKYLk34v0/BCamYNc1Nq2cGu+bQdwpGu8/EWzjpNLF8exmP2gM7fIjgGoB6LbjteKRp0fOg7gdWp00/EzA+B1IIjj0ZlR/Pjgu445fuYAHFHDNDrqeCMA/wHEl8s/OoreNQAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAABf0lEQVRoQ+2WwQ3CMAxFKeLMAjABC8AODMICjMECDMIOsAATwAKcESCKiqqU1N/utwsSvdZJ/F7sJMWgp2++Od7rSx/Ws6KPVMIXTcFT6GgRYQIk8L5EuAvQgkeLcBOAgK+Wk5J3uzuL7e/VGnQBbeCL6bUE3Z9GInAugC2CJgDZcTP1h4EsEZ0FsMGHl1c73Mav9pC+riLMAtjgEqj03ypCLaANXHOoSUDW/1oRsICIHWcKREWIAiLArbuNjJNEZAV4gTOuQgQcfVA1BHiBW5K2jJHaKK2It4BvB5fAtLIqEYUHODtZLZwmXiWADcaeTwNexf5MC1jg2sa8WyAN8mgJdvLP+azVkz0EvUSgb3vv6zH3Hvg/hNDyjGoNa2mjD580TqwAtDVYiaMbkouTnr6dBVQTRFUEKkQL3rgG0YXQirDOpx1nBacJ0FQE86TvCk4XoBGh3eV6PAvcTYCXCDa4uwCWCC/wMAGoiPR88AYPF4CKiALvTUBORDR4lccDWPyzUVmAw5sAAAAASUVORK5CYII="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAADB0lEQVRoQ+2YQWvUUBDHZ7dZl9hGK1bdohSCRVApVBA8efTkTQXxE9SbCPopLIjHindR8OgnEARPSg/2pAtSqUgFcStr2W4jM8nESfZlk7y87Aa777LdvLzNm9/7z38mrcEBH7UDHj9MAEwUUBKBvQ8vPJiZAtjpw+7hBkyfu1FJtRnfVOfNmhdnWj91gi41f38C69JD488scobGNrP3/hEF3tsGaMz5W+ruHAn3Zs/8gt3ps+H3qiiiMAA8cQyOhwSgOhmEgEqA2gJNW8u3C+9hLArY7Hvezccb8Or+eXr+0bdPI6ctN8VKsOePkyd0Oz9pugqpkZv+ldWPkRxnAJvf/KAufn5Jn1IVCEB+B8eF7taPyMERHOiDtThaRWQGIAN/cmeeNn/v+daA+hhIa301OoeS976QL4QwHBeg0wYGghB67TY03IWRgUgFED9xVb4xEJw705oFmRoIQpphqI5ABQQDQeBAGHI45YPQArBy/TRtc+3111T/SVSEBBBUDFZGxEgJTnmpkQqAIxymBAaigoLqwFRhlVz+/kwNLeYLAzCcoGoY9ojMALKAkJEl+YSsGhFjFCqI9w/8u6gMHCY9IjeAvCDwfgmDAbBPsFmGpVL0FNgrYMmM9xlTLQd6zZPQrPcKm6U2AB0QSQaKxol9RBhoUDHwfiUYnAgqyL7lQN0+pg2iMIAkEElGOSw1sJfAPsJ2Zqlk8gghiOuDRglUQu1r+d41jAEwpQiVR3DvkOQN9GzHDXoI/zMrCOMAdEBIVfDfmBY4KDViioikBnWQfg/BJukbpQv73W04tHR3aIylAdABofII2UfEW2pWhPXn38sYGiSPuj0H1uKt8QJI8wicT2qoZIeJ96EqBlpsFTXHTQ2cl5WugPj+srTWXDqzvmvISpH3Hy4jB2AiNVAZ0iPIA6+uaMWitUilOt1rSYqQZTReOrm9xme+e3ChUAyFFusGrVqXNTV4bdHAx+YBadDSQJgKvLIAkjzCdOCVB5CmFFPzlfEAUwHl/Z0JgLzE/rf7/wI4a0wwNEwKJwAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAADZklEQVRoQ+2XT0hUQRzHv293feHTZHV1W/+lKVoaqausm5mhYhR4KIgCu3XqHFjHII9hRcfOQUQR1aFDEAVJiJpeAvcQmVr+y5AC/+vui5l1ttfTfTvvz+ojfZfdZWfezPcz3993ZgTs8kfY5fqxB2DPAUki0PvmqZyVuh57++HGDlu6zfJJPe66Ihc1nIVHCuPXgozanEkK4ctiAf20GwjLANy+2Smz5T6SuY7csgoUR6aQWZiGodk8hB0i7OgI0wCUwgmAplNB5GaJmB0bhRsLWHDuR0qGGy6ngN9LAnUEc4MdHGEYQLB7mK74s2sVdOEf3br+T5oc8znxaTq8KWHOnanD+GAfiqv9iLjEHc8I3QCYcCb+wr0QFREPREt9Gd71f6bOCHhGcff5DNqqDqCqNKqduKFkth8jOfWYW3Khoe2i7jmZyXHuwZTCtQaMB4L1ISB63vfFXkEcQYQTOPLYJAWxnaWREACPcCaauIF9ZwpJaRDR5FEKjwFpCiCQPR4DQiF46uhvweFAeePlhHNMqgOUAK6259OxHrya4B4zniPUUNpbq2lQOiJhLC+vQkxPp2OUSt8xspifNBDcdHmcoKSidMX9jlwU+NybwlJdDqRBa0Ml3vYO07bBgyIqvSJm3EchOtcgQ7D8HMENgExIlmXx+J3Qinr59TgjUUawd5NsIM/q/HzMDcpxrTpQ6QKgnIBeR6ihbQWClQXLi0vnm/DkRc/fwDxdAzicKPw5hG/ZtZbsGoYBsFlpgVA7Q1kWpL8yMNXnCDWw5pN+OMIrkMNrwNoyMrzeaFBCNlUapgHwgNBKzIcbBylpo1EiEMFyD3yHijH9dRRSmgRXuhuSZPxAZRkAIyDUjtAKS1YW5JPlw9zEBLLyozvTy9eDdLtl9w3ejLAcgBqEkYBUnicSOYKNR0rEv/gRQlGerrtG0gBo7RpaJaH8L54jWBuy4vPjIbT4UzEw7UXA9yPWnff6nVQAWruGHmdogThRUwIhZR8+DITQ3BxEOBIdlfdOsW0AzGQE6UvKIpEjSLsbXd26NOlqzGtdnnZmzhFbgdArnM1xxwCYcQS7gpN39HVWmtJgqjPPSvO20XvpMivcNg5QA0pUGlYJty2AeKVhtXDbA+AtHbPtbJMBZoUY7b8HwCi5/6XfH8DxSTDm6EVHAAAAAElFTkSuQmCC"},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAOC0lEQVRoQ8WZaWxc53WGn9lnOPtCcobDfRluojaTWizJEmtZVuO2gWujdgI3LYK2AYqkRYOi6J+i6O/2T9GkQNA6SGOkMYwgsePateRFlmXJsiSSIs19J4czHA5nvTNz7529mOtaTeyotmVJ/n5dzMU93znvd8573vONii9pRcM/qk5kFxkPhhlp7+N019+qvgxX7vumFxe/U23y7CGZXiccT7OSkxlpH2Cvv5/F6BqHmr59X326b5v90/Nfrf7B2SdR61TkpDTvjY2xb89e7BYnhUoJQZKwGgzUGQx870c/4B+/ffm++HbPNykt/6y6RYKVQgSP1YVdV0cslyQYj9Lu96ExmLiy9AG5gkhfQys2rczcYoi2QC8+Zz17Pd+6pz7eM+PRws+qtZquFktE1yK8tf0BBouJ4aZO1jY26PC3Ync4SeZFpoPLSha0ODwKAPGChs14lKVoiL8++zQ7gnDPSuOuA1AL/Mb8S8wu5/nKkRO47fWsRENcWpziaN8QHoMVe1GHrtFGVspRLpWpZPIIuRxahxaNSiaVr3JueoyTnh76+geIiGm8dXZeu3yeP3vsubvq810z9v1fPF0d2d9xi8hnF3du1XhWyjIdXCfQ4KPF08Ri+Cb6rI13hWVGWnuwa618sPgBI137MTksaA060mKGjCxi0Ri5Nvk+Xp8bl1ULBr+yx90iyy8MQO3EpYJITkizlVrG6/CRzIaoVIy0+Xq5cuM6rb4WxFKaIWc/ormodIBdQUdQTChpX8hIhEMbnD5wUgGgRpQzm+uEhBgHmtu5cu0q/haXErjN4cfnbKPZ0cHczsQXBuKOAagF/uOfP8fpU6MsLa4pNT2/vkig04XH1UWhoiKbl9CjIinMk5NTDNSdIGmIYDE3sp3JcHNjga56P8aqWqn5YWc3JbvAUlIkkcsyYPdiyKvZzOyQkzIUzWXWkzm0ei1P7RtVAHl+/A2+e+aPcWgfu6NYPvdHtcALRZlCSaZYzKNWa6FQpSJXURtVrCXmcNiaMGotvDJznaeGR1kNX0Gn0eN19ZEvZDAZnUgV+Le3X+Ls4CHW5+c5sH9ECcyokpjYWiEmldlf345bo0EoV4lnM8wkwkrQB3wd7He1k0gLvBqaoLe5mYnYKn917JnPDcRnBmA++Wy11qttJhOSmCGVCWEyWmlwNrGxvYDV5MNssbKwNsFEPMGgr10hvr8YfRKpKCFkBCxWE1qNBrFQwWgwQqnEbiLOdGgDUV3m4f5hqOSYCy+zm83Q7w7QUV+PUEgSyeWZ3V7Borcy3NLHoK2FdTHKWPjDDjITWuVoiweHqYrHc/gzl8anAnB+9i+rXleAbDHPYmyLPa5mtnaXkSmymsrQ3dCOJMcJZ4ocbO1GKkhcX12gq6GZjJBhpHsAfQWlPHw+P3qdyMR2HL3OQIfDSyoRoaw3sZAI8sS+E4Sj6wSFKOuxGP3WZnpcbegb6khKOf5r5hr1FiePDY7QaHWTkDOsRkO8uThBsVhUAOhu8GNXtfLGxEW+8Xvfwao59v/GeNuXNeV25tQZNnZnEAU1vuZ2tqI7NJvtShomxDDj0V2anI0EYxFsejMtrgbCwQ3KZhMBp5dUPkeX20s1V2EhukRrixeDHsS8Ca1ej7ZaQcjm6GptxWN3kxNFxufHEaoZrm5s0W9y4zFbCAQGEStFsnKGBpsbv9PDzu6cwjWRRJrX5q7S7vbTYdcRMPcjZSXOzV/i+PBxHLYWdnLB22bEJwBIlV6p7qTWeeGtVzF5rBxsHcKmM6HRqskUJHaCEQ7UB4gaZd5auEmT081uKskRVxdriXXsznpUZi0BdytGkxFtVc2VqdcRMlXq65vwNZgpFXVsphIEXF7qzBZK2g+7Z1Uq8v7U+wwEBvjlzDXaqgbsNjs72qIyL9SWw2zFQAlRiuPUNUO2pLTL2rI3uzHodMrzcy//lKYOO/NxibP9R1hdXWTvvoOfUJa3AJiKfL96Y2OJ4a5+ynmJG2sTBAWRU4H9hDc26e7y47S4FQ1/ePgouWKe6e1VAg4/TWUrReeHUewKSaYiaxxs7aHZ1YhcyHJt8h22wmk2tEX+9PhjqDUVXp4a4yuB4Q+/KWTZjEUY1DdwY32KMw+dYXNni1gyiliBdTGmlIfFZCGdTSr8U1sd2h7ShgI/GXsTm9HC14+exliCVF4gWxEVLlmJpTg7dJRSKc+LU1fxmE2cHjh+KyNUocwvq8VcjIub7yl1fKx7D646A8sbc2yKRQ76OpmcnqS3z85A+yixdBy0WnQqNZl8XlFoNdRVOq0ie6c3Frm2vaoEV19nZSl+A5POwnKsxExkja8+cEr5JlUSEZIJKsUyap2Gy6vzShZdnrmKp97N3sEeUkKGHTnFajLDw33DOAwmhSPSGQkpK3Jo6AAqg5EXb17mkcFhvFYHybUY84k1Gj31SDq4vDTJ7x88xuTmDCEhQ73RgC6nYWDoIFaDA9Vq+j+qz154AafNikpTx9HOPZjUarJihKrWjsNkU5Cf33gDrdZFVVfPldVpnnhgFM//8kGxXCAtS1h0GsLRXd5emeXRln20OT2EypvUmdy8/M5F5DoDD/XvY5+llWQxy/mxC0q6u6wufn7zXR7s7sPnbCApZtCqiuSyMZZjUZZiAn2+NgKuRmLpINGdjMInjU6rYlvMFzHVWalT6ZmfmyUs7NDS0o6sqnBxYZIzQ4cJxVcoFApodE4SoTD9/QMKed4qgVen/rDa13ZaSbGZ+TlFvfm89Sxtvctg5yNMB1e5sjzNoLdDOclH9x5BVYhh0jdQqFS5snadvd5GHPZO1uPbtLt9tDka2RV3lbYnyJKS5n6XB6/RgT2v592NMfq6e6l3exDzeXazaVYTYYRMhiNde3CajMyHJrm0ss3vHDiGUVMmHNkgFZfp7uzBqDcwv7xAoLeTSimPJGeYnQuSTgscP3lCSfla1zgZ2Iu6nMVotNHkalbKp0H/pBL7J0hwKf7D6kuvv4S33qsYlsQtZFUj52avY1LrGG7sUgRJ7bRKhSjRbZnWznbemBtnoMHBQPN+ClQx6wy4rU6mgsvMhlY4NTCMXCgiSFmiibhCgBp9DoPGicfjoyanJzYWWIltI8giXzv0CBa9gYwsoVKrlWcpn2NmdVIBoLOlkzqDifH5m8QMRR5o7URVymGrc+PztFMoSCQlWQnWqNFiMRnQa400m5/5tZhv2wbD0vPVpeBlxUANACXt951QBM3s4uytlhaNS3S09/D8jbcY7fTT4e1HLKow6nVKiazHwjz7zit8a/RxxVYNgBogR929mJ0GUvkCclnGZTGzHt9lLhJib1M7/U0d5EsFhWdq4stmNKOpwOTUJEuRNUoWM2d7hllOb3Nlc5YHWwdYSW/T62vDWN1hW5CRNVYOtvTitblvnfiH/eb/1qcKoY/memV0LcusRWZZWtihtdtFS32AUr6ilEClVECvFUDn4Pz0NB67nQd7hhSy/NcLv6C93svR1kGScoblrSC/5Rsiqc6yuR2kqNfR1exHKma4vhrkQFsX76/NcNjfz24ly0BjJ81Oz62OEo8X8DR4ODp4WCHgzGacuJzm9Z05Rrp6FQBkrFzZXuMfTv70zoTQx5GqATG18jpuWz9vXrpA76CfPv8+dnM5prZWlcHF47ATEQVem77Bw4MP0ObxUSqJjK1NkZZRJOzObpTNdEwB4Nz0BdAbSOoqjA4Mc2n5psL2NcE1v7vOkKWJ64lNnjl+FpfJTCK9xXRwlpntOI8eGKXd3ogmU+TFG+c5FBjmx3Nv8eejjyul91GNfzyOz50BvwmI2m+1S4+1lSLde/Ywvrms1Oc3Ok6RrEgsiTuMdPZjMupJiUmyuSRqrQG5rOHc1FWFQOtQMz49gc5mV/r808MPI8s5thKLCumVVBUeDYzwwvgF/u7wU+idBraEeXayaa4HdznW3UODyahwyIvn/5s/+fo3f43cPi3wj95/agnczlAtI/79P3/I6UceZTa6wVo0zInu/bQ5GpQ0dxqtUCyQLUbRGZ1YTXZ2swJXFicZ8HfRYLZydewq7R0uGlwd2GoiRwgTz4aos/Qq29ba8ffefpm/OfYkTr2JCBEMeitSqUgyFaJcFehpOYZJX/eZT/wLZ8BvyojNRITV6BZeu0eRqrWlLcH4zLiiIC1mJ3V6G2JBYC0yh9nkx+9wENydwmZ0YTTYsZg9CgC1u4KkmCIlhDHpTLjNfhwGG7miBHoVZpOdSqXE/OYl9nY9cseBf+EM+DgQtXG5UC4xHlxQsuFk1xDLC/OcPHyEuJTn4uIUh3ydZMQIy0KCQx37MCKg05oUMaNWmcjKgjJvvLsySafDSp+1HU3RjKwqkRTiNDb78TV67yjVb5fJd1wCtzP49xe/VkWu8rv7jpNILDE1tc7QAyO8OTPGE20jrBTmmYmKPNS9n15nE3qdRjnd8++9rQw+ziaf0gH63CYard3KTVGDzcX66qIyI/S4v3lXfb6rxn4VlBpHxGLbvPrOG9TG6trt0G8P7ieaWCMUL/Ngy6BS18VyhbCQ4NriDfqHhtBq1NwMrtLh1NHo6uXqyjTDHf082PLde+LrPTH6cSBqKq92t69Xl5BlQZGkLqObilxkJbGl3AjJlRL7O/w46+xcvz7ByMgBmt1tNJmevqc+3lPjHwdiPTRGU8Og8nOhVCYh1W50tggmo5j1dfS7VbQ3jXwhVv+s7e+uk+Bn3ThTvqz8YxRJLfDm4jgtdS5F7T3eeoSb8UucDPzLfTuUmh/3dbNfBWkq9oPqP597QZkRPGYrnfY/+lJ8+R+bGZdTjoXiQwAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAFdElEQVRoQ+1Ya2xTZRh+2q3bTi/rTsvWy+YodBujAsNZkbvMcYtBjckS+SHGSAiJIcbEG/5QEzX6BxMvSLzEP/KHkEWMiHHehluCwNgGDQ4YYyvd1tX1str1frp95pzx1bOmwOhWGbDvT3vOd77zvc/zPu/znnMkuMeH5B7HjzkC5hRwjzMw4yXAff8KkVhWCrRGhrxgDFrhP+k6Cf58bkXDjO85nRzOWDDD8UaicUyEwgOnI5UASspsIWLaBPDAI/EwSl3yJOgOuQu1Yb1wLP5PyVGt2z3tfaeTdfHajAPhgX/z7UFs3FCHJcGytPGcVbqwPDhBhHikZj/R00j4+duhilsmgAce56KIJ6LguBik0lws8E3UOa31ztpiFOQqceyvNjxtrUOv8wQ2yDYlS4NXAAUtXke94/8k45YJoAE3X3yVMAUqlLBGXB26BBVjgEKpQuUIi3evNOJ+gwmt3Ta8WNeACBeBJahLqxLeHPkhBn9HEHDozC7S6x9FRYkJkagXzlEOteUViMQjaOu9BHNJGZ7VrsXpnKtYMTY/qQ4eKPUFcZegxpnOH3i1ZKs8MlbAd2deIB3DbhhZHfo9LhTmKfCy+XF8ZDuMMQWDKlYPfywEs1aP1XnV1/UsXzlAu4c487REaPvMlioyJuBE34fk90tnYWS1cPtHsFJjRp/PDjVbDIkiF9vyH4CjOIRcIoXRwySzzgM6tVgLh9+HjTUPC8TwBIjboxh8annMtBIyIuCC9ysS4mKw6vcI6+09XxKOzUWl9nnh+PM/95Da8kqUaXSIxoModxclFdCl/BvSnHEctbVj57ptSQJSJUIzn9pGZ1oJGRFwXT1fm/jgt+fIY1VWWDrtOFEdwxrpI8klPCC9XA1/IgyL/7/uQTtIqhmm7nUjr7hZXOnms0LAez/tIFvuq8F8dh4GxxyQM1ocbfkDUXk+1i+uwWrOhAFlAD+3N8NSZYFGpUHl6cuIspVCjPTpkfcHWiL8LwXPz89UKWSFgMO2vcSkNWB+kQ7usBvh+DgC0QgcHhdKNfOgLyiCOpaH0q5unKsxYjl3Dem1FB1wNmGleQlMxaWCP1CjFJcDJWC6HSIrBJxx7ScKWT60Kha2/h50DV7BBosV0TiHQCSIYZ8XVRo9cvJCWBqzJJX5Q6wTVzxDCETDeNPcIJy/zI5AIpWiwquepGAxAeKJW1VGVgjgA7J5viDzFGrYPU583XIMu+ueEuJcYdwj+aRlF1mlXQQFm4+qsEE4f145ALvXjQuuQSwzmrBFtkQAPxqLoZBhJhFAH55oydCyEbdMvlym8s6RNQJoVviOcaD5CD5t+DG518e/7CSPGpZiRBoUnhEODh2HuawUEW4Ubb392FvxpLC8KWSDezwIi25h8uWKP5/uQUoMnvrFrCAgnfNSAprON+Ml6w68feEQ6ixWtPacRX21VTBJfhxxtqLN58Aza7cKHaNL3gNLuCJ5S2qSYqOk3UT2xL4pJXdKF2XSXm60puXqPiKHFB3nOyErVMMe9mC7tR7RaAgDvm5s7ZPjdXIZW6oeQr2sGgPwoQwadOS0o3bswUkEiE2Sn5g1HnAz0myuz8jJ9pMwLdCgRLMAhYwS/wSc8AYHIVcuEpYzUin2Hz+K19Y0wJwonnTL1sQpjJGA8JbJK6EkL7MvTbdFAWIkp/veIAX5aiwz7pV09r9DlAodRsJ++ANOMDIGqyRWDLMhhLgIkCeBglFjfDyBi45WLDNvyhg4jeG2E5BOKe//up0sLFKhWmVCDqdAVJLASMALXVkpDLqJDyyZZjx1v1lJQGqQx869Rey93di8fnPyfeNmJTbV+TuCgKmCyeS6OQIyYe1uWjOngLspm5lg+RdmyDY/3kYmHQAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAD30lEQVRoQ+2Xa2hbZRjHf0nak2S9LAkxa3pzade4ZlMczHZbx2rmNkexH3QdrW5iEWGiOFHUQcELCAoiKKgDEfym+GFeYExhH/zgnIhDZotdQx2ddG1X7ZI0lyVN2p3ICZxxCLbJSU5MZDmfQs7zvs//+b3P5T06bvNHd5vHTwVAJQOKROCjr4dS993rurV7l+vtssw2zUX9nTyViidj3AiHmFm8TIPFSTA6iyiauNN5F23rn9LcZyFnqJmYd054U/pt9ey738sfk1dwNbXi+3MSd5sNu62dpKgjmogjoCMY9tHr/kAz3yUF0P3updSXL3SmNXw+speHTwxBMoW4lEJv0nElMIGlvhFTVS1nxi8wuN3L1NxPVBuEsoCQ9ylIgSvJSxAkAAMjRzj11mfsfaaf70+exn24k4v+AFucGzk3OcZx7wDx5TjhSJjaOjNVBgNb73gubx2FnL60Nm/HypM/9N7ELR1yNsh/SFCUz+6nH0IQSZeH09mEUB3j4jU/x/d8kreWQiAU7DQzEzLFZAKRS8Wyp5nWlgaMAsQSZqoEgaqUyAOe1wrWpAaIZs6UIOSglZkhi1L2i45DXTgdNawsVzO9GMBta2BdTS2ehmOa6coGQ3NH2TJCCUIuj76XHuH02K/0ubenXy8ko0xfn+fJ7vc115cJpCgOVoOQmRnKbDj48hDhYABx+Sb6agPnp3zssLVzfvxnRoa/LYrOgppgttSS3n86EUpPio/PzK5qLk8PyUDqCx63B1udja9++5FdmzbjtDoIxiLsanmxKBCKsum/RbtWacgQGg+4mTs7mV7e/8pjLERDTAXmCEci7GjfitVswjc7Sv/dJzXTrdlGuWSEZJMNROb4NPS5CC/FeLRrP7WCkchSHJ1en/4dT9ygw1ZYw/zPAcgBSuWxWmkoe4Nkv2W4l85GF4mVJJFEgnqzmXpTDQYRRsdGObAz/w+tkgGQQWRrmPKkiPba6W7qZEGM4tnQRrPVzlIyyi+jP+D3J7E77Az2fKg6HtULck11tXZr3SyVt8nrOy0c3X0Qm7mGQGiG369eYvyanwe3edm4fgOtlsdVxaTKWG1Qau1z6Q+vf7GPV7sHEaxGZsI+/oqGuHB1gZ5NHTjMJowGK9+c/S7n0VlWAJTA1ioNKSOGn3+CeeYxCnXEV5YJLs5yMxWmo6UHs7AOhzCQU2w5Gak9SS3tM0tDeW+Q/Bx94xiiuIJv+hz3tO/POXBZY9kDyBydyo8ruTcMv/ms6sD/VwDkW2Xm2JRgNBt0BR1iQYu1TPVS7VUBUCry5eK3kgHlchKl0lHJgFKRLxe//wAJCF0wkD6YoQAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAABgklEQVRoQ9WX0REBMRCGnfGsASrQAD0oRAPK0IBC9EADKqABzwZzd5MbE2I3u//ujns9yeX78u8mmlHQs9ydn++fPm0XTcRS3D+ag+fQ3iLcBCTw1fzeMR8vk58b7iXCXAC141TsrUWYCdCCe5UGXAAa3FoETAACnNsfWimo0lALQIBTfeDXe60IsYBocFRpVAuIBt+sZx37/nD9GozaRLAFaMGphWvK4NtYrghSgBYcDVY7HyWiKMAKnNvpx7c+4o9pH3ntUxLxIaAW3DvaaBGDgFpw7UKix6dENJHg6PRI5gsVwE2BBIw7N7wELBfLheL8biiB/MelkvgXMAo+Pw3cj8HSArnHIwVYes8+BrmJkC7Ee5z4ImQhwrOMKPDER16FLURIU8ARyAUXC0gDI+8Pmj8/+djqBEgTgb7bp3XU7jhcQFQitODqEijVsaY0OEchCtxMQE0iOE0NFfXShql7ANXRNYlo50bvuFkPQIuwBjcvAWmP8AIPE1DqEd7gaR0vqSuzUVelNdEAAAAASUVORK5CYII="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAABcUlEQVRoQ9XX0RHBQBSFYTGeNUAFGqAHhWhAGRpQiB5oQAU04NlgJLMZs6x7du+5d/GaxOb/djehGVT6zDfH++vQh/WsqXEr7oPG4XG0N4QbgBReC8IcIDfcG8IMAAlfLSdt73Z3Fre/1dagAyDhqdrF9Noe2p9GSRA2BA1AEy5O/4cTWBBqADR8eOmW+W3cLXvWRwtRDICGs0Kl7ymFyAaoGY48NHMhYABGOBIgzTR6HIUQARjh6E1bnCdBJAG8w5FXoAYoBfEGkAr3XL6aUOnaGKIHYM34v0AFiIYVLslrjluiVgVgh5V8H30LaGba89p+C8SD5m6JEnXP0His5ENQC4FGoa879n8H+DXoBYGCac8r/iHEhvDeKlJ46BN/CrMhtDMqQaLhxQDhwtyHpTZcuj43XA3wKxCl4TQAJgT6hniOqQ2nAzAhvi13VrgZgBUEO9wcgAVhFe4GEEOg+9w63B0AXRFe4dUAUhDe4eE+Hsjts1H/LKgjAAAAAElFTkSuQmCC"},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAA80lEQVRoQ+3Y0Q3DMAhF0XqdLtDFMkYX6wJdp/1yVLlCBgMP7DgL2PcIJRHlFvQ8nu/P79Gv414irgI/tA1vo9EQMIBeeBSEO4A0HA3hBqANR0GYA1iHe0OYAXiHe0GoAdDh1hDDANHhVhBigGzhWgg2QPbwUYguwGzhUggSYPZwLsQfwGrhPYgTYPVwCqJcLbyF2ABV5GqTUPcO+yVIraFWmwhq07R/hLiLyNkmgrtb7E5AC5Qdghteu8QAWb8a0nA1QBaI0XAzgCgIbbg5AArCKtwNwAvCOtwdwArCKxwGMArhHQ4H4EKgwsMAKAh0eL3HF/63fVFCOk+sAAAAAElFTkSuQmCC"},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAEr0lEQVRoQ8VZTW/TQBR8bpOG0g8h1AOiQiCQCuLQA4IL//8G4tATVAJRoSIOFaB+UDVpYzROx5pMdps0cVJfqGN7d9+8mXlvlyLu6Nr/cVo+frgcP39fxfF5P97ubBZ3sZSFT3p6dl4y0M+HvXi13a5AwAVA1tdWF7qmhU2GjDNwBLp30IuVVlQA8PpyeBkvt1vV7aKAmDsAmnFkGsEj85urS3XWyQCVAOWx82R9rmuc2+AInPp2miP7UZax0i4qIMiIrY1hUAjCPKXROADM+E1ZRUC4wARclAHu/12U8ejBcmWMAOfX36vqnt80LY3GAGDGmTUEdnR8FVEUsfu0HdQ3/t1YLeqA8B6l4aAh+LXOgBVllNHtlXHZj7jfKRqrGjMD4Bpn5lTPRyf92vAIRCpoZpnPCJaap1aOJqQxNQCs48wgyxh1rybnpseAGKiClTLIk/OyYg3n8PchoWmlcWsAchln5g//9OPdi0FtVxNjYAxGmyCaJCsEPQFj4H2URnxfRFGXyb3v3djaHHiJMuS2QEwMgAaeorHSVxdEXQMgBAAt0/g4DmlNY1T2OMM0cPUb/3tSIMYCwMDp2MyCUhXBdS8jUMYIBBbKMqeAaJDMbkrrQ6m9Nkoa6+6zleqxSsgZx+/HAZEFAIFrmWLAanIMlpMxk17elAWs++4DeAdVA6BRAh++9io5+cV5tHNMjaeszDVUIwBoHXdXdjrqpABGteuUdPf2fQDHAgiubY4NViH7Cii+I6gEkQwh27QRcyBqAFjH1WmZdTesHNpOQywYl2Y1tSiOh7r/5vkgQJXHRa8fnfbSUP+gGyhdj8tN228AQbkRiEIbGNcV71HH0czoc9Wfmtinb91oLUWdKUoGmUVmKlCKIjqtoi5t/o5LCb6jzZP3EFUrfc0OZyXuyQDOowmtAFANk05EKkVtZ0CKEfyOmWJ2FUSAhYxricM+AWYKBpxd9GtGuKTUONWLKhlI45XqS5SFSQkoUq77XNvKDQ2YootgP09qe7nEPcxu494gU9oqu9kpnVlS1VS1lXZQtCdBTKwOSRP0gegFpPGILVtJYkaRQW5kdC/APT9+Q1+gZwI+t36Hefmty5FrUuZ5lcLYWRP0oLT+q8t6ZcjVX2+WnEl8Dhlgw4PAHBB1dTc9BQqJgUlijBRDb9ozjG2EeJKDQajZXBVQM8x1i9Qkt73e5/O5mpdWppFKc9AbMWhdx9SNkDMCQCi9WKY0s97n45n6iTo1/tasefnKVSSdw0uqGuWkJ0ljGZCThnZhpCM9IkVDAqbUZWZT9NZDE3gEsorzAPQUuilSENTcUj6V+u3WAHAQPdZWs0kdeDhYuuvT9102PCHCAYj6kDZMnHsc1XOATA0AB/y4f1zmDjg169pP5Dwk1d3hXW6stNXG76j371/P9v8JMwPAYFIdpaKuZpeSA/WLoNAIeQPGPcKsGXcmNAZADgiltYKgzs5vfe+RMsZpqT43CeQGdkYACFzo6QmEmqYH671904FzvsYZ4ICoR7gPuAHy3K/S9/XmaV6BLwwAlUautmsVYRMz78AXDoACwb0Ct7i6/19U4HcGgPcRZMWkndukDc6k7/0H4NHB04m0pXEAAAAASUVORK5CYII="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAABgklEQVRoQ+WZMQ7CMAxF6cDKJdjZOAAn5wBs7FyClQGUIVWVJvX3r+2mgrVOnP/i71hiOGz0uz/f32nq2+U0bHGU8KSl8FJ0NIgwAJLwrUC4AyiFX8/Hw+P1gavduyLcANSEJ9Ua8RE9whyAtXBva5gB0Ho8WQGpiFaclTVWA4gWbl0RNAAv4UmgtlGmNWxFqAF4CoefhoVALQgYQE34ko9Rj1uIru2BghAB7E24tkc0AexdOApiBkDrca8S9tq3tMYIoDfhSA+RYpa+ZxDDvwkvK6sbANJt5vlAmh61MwRtAeTAJe3aGmQfJEbbM0YLlAslSzCH6VF41q16BrWUW7CQMkViNOdpDUbUICQlZqpE2pP9Lk2EIoCcWLJGjrO+OS/hogVaiVEQ7MHXrpNufPYMsglZEF720AqnK0D7akytIb3hzGWwws0AID3Coi+UlbNWuDkABARzw17C3QBYgfAW7g6ABRElPAwACiJaeDgAFIRVc0P7DTwJohuicb38Pf4DJ7UJNHIqhgoAAAAASUVORK5CYII="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAACrElEQVRoQ+2YzU8TURTF7yvQSrGNGBaGbogsIC66MDEhbtSd/7WJCzaCC4yJNoGQmDbGGLGdQu3H9Jnz4Ayv43QI89WO7Wwm05lO3/3dc8+9r0oW/FALHr8sASwVkBKBdycdjVe/qVfnWmWJL46BI3h11RJd3v4H8TxBSQwAA58WdK1yJU2nbKC8PthP7HfjCjj2QrqXPSP1D6fDibW82F0zn/UvzqW0uTNx779QQONbV28/XjGBtX655oxrBF1aFRGtpb5TlJPzgfTdYM5+tcwCTGQFIPMIvNMbS3W94J2bF2NB9nl8PBvIk0fXoHAPB8uBz/Aaann7qh55TVHKIfKPEQCyDhBBauDnhEAAYQvNGkJkAAgCZYAzVDAYiWxVCh4ISB8l8LU5kr3aqoFEAJUHIs6fWwx2KWRdBrEAhGXyqNHR+7XrUqBHABQCr20W5GfHNYD85mm/MwswqQFgidAcvzSHAiCE8f23K8+fFk28QRDs7mF7RtIKSRUAygBHcU2Z4KkGBk+PaP1omxnBb45BCkvaI1IFYHcJSp5B297A0rADthWQ5kSZGoCg7HFosrsDygDloUQZswzzBL6TQJIoh0wBhA1P6AwoEyijsq5Mx4BZolxcfbvMpP0gUwBBqrC7hd0x7GfpGX515E4BQQDef2rrjVLByB/Z16InDBPfoX8YU1VK+qPpDfi+UGaugOOGoyF5tksaJ65REmyfDPkuj8gdAAbGqZIjNcsB1/YM4fS05xF4ht0i6sZq5goImyZxjx4BCIOhNjMFO0bQEJVbBUwDAY8ol5TZcXLjZQ9S3F/cN3Cvpd6VgVnfx+wA8/NPk8YcnbG8fBbvP8e5LwEm4PBzW29VV7zd5sONG+eMmaHcAIgZ59SvLwGkRTYv710qIC+ZSmudC6+AvxDPlzC3oN1yAAAAAElFTkSuQmCC"},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAACBElEQVRoQ2NkGOGAcYT7n2E0AEZTwAgPAapngf2XPv131OOjurm0iieqORTkcXRHDoWAoDgAaufc/u9kJo43ggZzQJAdAKAYb5l5AuxxK0NFMI0rIIZVAJj3XIMn9bWFmmCPx+fthgcEodSAnFQGQ8AQnQKQPY6e3pEDoibdguTyaiADgioBAPMxKCBmzr+DMysQCpmBCAiiAwDmeHwpAaSG5/4TgmUCroAYEgEAcjyoAKzY9QSrP0CpALlMQC4c9516OegKS5JTALKvcQUEtsIRpO/Y+ftg7fjKCXqnAooCAJYaQDSuFAHLFiB64SRXcADcvvqZUHGAIk/LQKE4AGAuhbUE8WWN4P7rDJQUlKbKrGDreLg5qeZuqhlESkCAyghCjSfkJADz+Om7v6meMqgeAMQEBKGCkp6NKZoFACwgvnz9/h8Uc9iyBraAQK41zl57x/Dxy2+C7QpKygiaBwChFEGoxgDpJza7kBMQdAsA9GIfW4MKFBixRfsZmP78YRDk/gfWMqHdHWe7ghoNqgELAJjjcbUsYSkD2ZO4GljIakhNBQMeALC2BL52BLIHcRWgpHocZuagCABkDxLqa4DUggIB1pgi1+ODNgAIZQ2Y/MkSLapEHlUMIaldS6Ji5BTR4SbDQGmMo1s/6AOAxPAiWfloAJAcZMNMw2gKGGYRSrJ3ALuryCE1cDalAAAAAElFTkSuQmCC"},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAACVUlEQVRoQ82YvU4EMQyE73qEdIj3oqSlP4mWBipoaJHoeS8qqBFIiB6UlYx8xs6MN8ku10H2J/PFnvHddrPS5/Hp9lu/en9xs11jK4u/VIR/fH4d6N0dH01/Lw1iMQBWuAg+3Z1s3j7eNwJkaRDDAUTC9fEXCOWzBohhABjhHoSlQXQHkBUuEKQKLABZH9Ua3QD0EF7EPr+8TppFsAAY5RHNAEYLt9HYG8RsALU4E2f3cl2Xeu3E0UzQC0QaQCbOrFgtSkrd9jgSXtY14FYQNACm1KM40yB0j9eEsCBaUwMCYISjOCuGZk+KnQNGgwgBZIVLaeoNe4NNJCiKwQKv5ikoRlF8/gEwR7gnPoozxhg1OO0RFpInPjtH/AJYQzgCF3kEY662ciKz3NqvpUzPoY0zz8jEYdZc7ftr3zXSADIbZ8qdbRV2VEYeU9qrfKQiDlogMhuv5KIc955Ru9+OvAy07ADlvf/8bD9pd02Q7TG9Wd1jc+5HJyfrbMVEBinCZb0ag9EAU+vxCETrxlvvt8IhALng7uFq+u2OKVWvInSM9TZHpl0i4TQAubCkhXbTmphafIkJ6ftZj4neX+txBB2OwvYBGoQMHah/7UTIesScOQCduN1rGoCtCO9E2RxmPYaZA7LC0y0QnbJUBAIRzQ+sR0RzwPXl/exDdGMQ9QwCIesaiBWf+ZJUntfS40hPEz3v4dYj7DWj4gwJjda7A/BSo/zvvwnv5gGIfHaOsOU+19zQvhYDwMwRI3scgRjWAqxZ2utGn3i3OQCRRevWLJcWLvv7AXQA8XPZBQHWAAAAAElFTkSuQmCC"},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAACO0lEQVRoQ82ZMU8DMQyFeztCKuJ/MbKyV2JlgaksrEjs/C8mmBGVEDsoJxkZN/Z7SS45ulXnNHlf7GefOm1W+jw977/11ruru2mNowzfVIQfPr/+6N2enszfR4MYBsAKF8FCQYCMBtEdABJu0340iG4ASoWvBWJxAKjGGaM7355t3g8fc2jvjFgMQO7GIyEsiBSXYPQC0QyASfUEwhOCQMjaXiCqATDCtbhIiAbkrbEAJK61axQDKBWeDqrFR0JsnIjMlcBS7ZMGUCM8J/7l9W0+ezQH1JRMrUdAAL2FR+0vibKgkGeUgnABjBaO5gAkHK33RuwjAFEfZ80qHUZS3ZpVq5DW9RbELwB04zq1PLPSwtGszwhZYo5AA9WEhEeppUF45oZSkwVRO0doI851k+n+8WZ+L681m9oUtxklN+UBQXMEu95mxFEJMDeiY6zrtqxnPUbfpL4Adn1ac3mxm7W7JsgI6VWj7EDk7R95lAgXfbANsiB61Cg7EHlxGoQVDgFIQDJJTbp3jVqQrMfY9JfSvL1+CIc9OAlaEHJADaJ01reGFa1nzDmX8t6N2wukAeRA2B9jX1rYGi8pP4llhdMl4B1CSqO09nMDVQSOKTnt6gw0HVOcAXaD0XOEzZ7SG28ugSgjSumneGYgaqlxdKbmDLAb2H98ogMs0ceRQPR8cQDaLNHm8rylj7N7eHHdANiuwc7q1lRRH//3ALz2qYH0rHEEqHsG5DyiZFZHAlqfDwfgZURrO6sF8QMHfgyCOVqWzwAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAACPElEQVRoQ8WYP08DMQzFeztCKuJ7MbKyV2JlgQkWVqTurIx8HiaYEZUQOygnufKZ2HlOnFwXpGuC837xn9ebNit99s/3vzz07upuWuMow4NK4Yfvn1n39vRk/jsaxDAAUngSe74923wevmbha4HoDiAnXKZ6ApE+CcZoEN0AcOH8prU6JwijQYQDIOF0kyQ41bgUSd/x5/Ts7f1j0RvoeXSPCAMghVNTo4Pz1M4JLgmXmRMFohlASbg8uAZCu/HSaGwFUQ3AK1wDwUukJJYmB19HU6QWhBuAVeOIgFJGkCC+zuoREqAXBAwgd+PWHEdgaPvRHhHhI4oAkFS35jgKIjf+OAirR7T4CBUAIjyXpjln1+ID0B7BIXic5T8AXuG5xpSe0Y1F+4BcRrX0iCOAGuE58VqqRvsAzUQh8dNeapZTb+Glru81QF7hVvz03fTwdDP/LpfOTWteMt1qDUzOKnsaZi042kfxFyWgNStPjSEi+BpZGq0+AI1/LAG5IZVExBxGDtLTB2jxpVEyx2DEHEZB9PIBFF9ziEUjhPYIaw6v6QNurx9NjUUARNB6s4P2iIj3AagPuLzYQdqgRTyoBIFOhVE+ABVOmtwAaOPL637xWhsdh1HvAyR4r/BmAPQP0B6hGRJulT0Nk9bWCg8DgPQIS1itD2gVHg6gBkSND4gS3g1ALYiSD4gW3h0AB9HiA0pzHOkb1prqKeANLC029/w5H9HrxuW5hwGQGaEBHCV8WAloQmVGjBZO5/oDFZ3cc+cN/8IAAAAASUVORK5CYII="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAABxUlEQVRoQ92YP0oDQRSHs632XkAEozew9xo2egALrxBIYSFYewEP4AEsBUuNILYKEjCNtooDL4yzM3lv3r9ZkyaBzc7O971f3ttNN2r0Oj89/o4vfXZx1bXYivtFAfzpYRZ4d/fHf7i9RbgJwMC3NjeCiPfPr/DuJcJcABX89u6+SSLMBEjBvRKhLkAL3CsRagKswa0SIRbgBW6VCLaA1uBaiagWkAOfv74tZ/neznb4XKoYbDw+Lj1fckNFFrCq4gD1+Pwymn8ssuMsBw4bl57/uw43EaiAoUS9JlE1iSgK+O/g1ET0BKwLOHVqLAWsO3gpER0HXLNrr2qOcXPj9gBs/e7k8CA8l6ePpV5dWxOMU5jeTwAzZnGcs/GcuJpxejS5DOy9JshJRCmqVLCajUsTA+AwKtExKKm4JxgmJgVHBcAXNBMR36BIxNY0xxI4WQB8EaaF18aximLHMfBqAUNMRK7HUMHZAoaUiLjHTK9v0Oea3N/urJPihVr3iNqKpxLEAiiJoI5DzeaWq7ZJAtJFc4nQHIfSipslIF1Ye2pog4ubIDVi0h5hBe4mgNIjcjdI1uDuAqj3EV7gzQSUEuENDvv4AUkjKiaJ4WxIAAAAAElFTkSuQmCC"},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAACQklEQVRoQ92Xu0sDQRDGc52PxkICitiIoLGRgI29jX+ApY22goWFYC1YWAjWNpZ2NhaWlorBxgeIjYVCCCaNj065DRM2c9mbnd3ZvZg0ed3d3u+7b76ZTUoFvQ63N371pXeOTpIibiX6ogD+dP+oeOcW5ru4YwsRTQAKvDw6ooSof36p91hCBBfAFvzq+rYQRwQTwBd8uvytBHmtDwd1hLgAUuC1u5YCr8zOBC0NMQFCgUNCTlU+1MfazZCoI7wFiAV+ed4M4ghnAYoCl3YEW4Be4I23904vh5o1pTqEm17jaetLrzE+OVGqLv2oa+EnjsGlHGEtQN4Thx7+8PxSajTb4YUHnF7g+gSU1nha3yAmCEmB+zqCFKBfrB7KEUYB/is41xEZAQYFHByT5or+wiN2R4BBBzftNRIXcD31q4tj7QEFTW7c8OLWuOn6+IkDuKkrJZsry2pfjlM770RdTd/UlgTntGNgyJQApZhNO+P2cZ85QH/iNu0YjlnfP1bsmRA0OcIFnAvGmQO4VsfgUEJkG3QBDzHgmFKdcqwJnBQADthdW1UZ4TqZSda4LqwvuLUAcODp3pYSAralUmCUsFJW7xoGtC/kKIxPjOUIG/BeqQ/hZgLGv7MFCO0IG3C4Bz31D84unFicTtJVlHIEBzxdnwq34A7AC+RlRF47LAqcHYK2iuY5Qu/zRYMHE4DKiH4BDy4AniP6DTyaALAQ7DqlBhjbkqSO8+4C1AL4f2r3ye3j3PXF5gDfhbEjYoPD/f8BPh6HJsAe6K0AAAAASUVORK5CYII="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAACPklEQVRoQ92YPUsDQRCG7zrRShBBsRNBY6doYWEhaOsPEGz0B6TwL9hZCNaCjfa2lpaKdn6AiJ2CBGOj2Cm7MGFvb/dmZr9uMU1CLvfxvPPuO7Mpi5ZeB92dX/XWe4fHZRuPkvymAP549yB5Z+fnKtyphUgmAAY+PjIshXj/+pbvqYSILgAV/PLqphVHRBMAwHuvbxJsbHKiYnWouA08lSOCC6CDd2amK9amgqdyRDABbOBQ9qnOh/x4dvJitDpVmNAZ4S0AFfzivC/Bc3OEswCu4Lk5gi2ACVzYUoSdCLqFpR/JqFdcB1eP3z89DwISHIKFY6iMIAsQquJNwohjvf5n0oxABUgBbnIMhB01HF0dYRVAH2BWlxcrfRxSnWN19QLU82N3jZoA2OTmssZdwFN1jYEAGLhuxf/iiJILLnZvMN6Kym5sjrJTPydHlLvrK3Jfrm9Lm8IHjon2BamdgyPUwlDbaW0J+KauS0b4zhGwjTYVxlbY7f0jyV4LQRdHiAuZMoILdns9NFheUMGmAcq0lLCuAeBwLtoGfRyhbmnBnq5g3HarzxE6OCoA/CCkI0KEH9cRa1unjcMeOgnCDaFb+DhCXMslI1yEw8DJDqiMf0VR5OQIU8ZQwZ0FyNERIjxd/0QlLwHdCblkBLfiOoe3ABRHcAYUakb4gnsvAY4jOAMKbGttk2Uo8GgCUByhiod1FXBEaPDoAoTKCNsAY3Mg9/tgGYDdmDtHxAZP5gDuHJEKvDUBbBmRGhye4w9s6IQmpDq23wAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="}],"relations":[{"type":"wang_border","matrix":[10,10,10,0],"isBorder":false},{"type":"wang_border","matrix":[10,10,10,0],"isBorder":true},{"type":"wang_border","matrix":[10,10,0,10],"isBorder":false},{"type":"wang_border","matrix":[10,10,0,10],"isBorder":true},{"type":"wang_border","matrix":[10,10,0,0],"isBorder":false},{"type":"wang_border","matrix":[10,10,0,0],"isBorder":true},{"type":"wang_border","matrix":[10,0,10,10],"isBorder":false},{"type":"wang_border","matrix":[10,0,10,10],"isBorder":true},{"type":"wang_border","matrix":[10,0,10,0],"isBorder":false},{"type":"wang_border","matrix":[10,0,10,0],"isBorder":true},{"type":"wang_border","matrix":[10,0,0,10],"isBorder":false},{"type":"wang_border","matrix":[10,0,0,10],"isBorder":true},{"type":"wang_border","matrix":[10,0,0,0],"isBorder":false},{"type":"wang_border","matrix":[10,0,0,0],"isBorder":true},{"type":"wang_border","matrix":[0,10,10,10],"isBorder":false},{"type":"wang_border","matrix":[0,10,10,10],"isBorder":true},{"type":"wang_border","matrix":[0,10,10,0],"isBorder":false},{"type":"wang_border","matrix":[0,10,10,0],"isBorder":true},{"type":"wang_border","matrix":[0,10,0,10],"isBorder":false},{"type":"wang_border","matrix":[0,10,0,10],"isBorder":true},{"type":"wang_border","matrix":[0,10,0,0],"isBorder":false},{"type":"wang_border","matrix":[0,10,0,0],"isBorder":true},{"type":"wang_border","matrix":[0,0,10,10],"isBorder":false},{"type":"wang_border","matrix":[0,0,10,10],"isBorder":true},{"type":"wang_border","matrix":[0,0,10,0],"isBorder":false},{"type":"wang_border","matrix":[0,0,10,0],"isBorder":true},{"type":"wang_border","matrix":[0,0,0,10],"isBorder":false},{"type":"wang_border","matrix":[0,0,0,10],"isBorder":true},{"type":"wang_border","matrix":[0,0,10,1],"isBorder":false},{"type":"wang_border","matrix":[0,0,10,1],"isBorder":true},{"type":"wang_border","matrix":[0,0,1,10],"isBorder":false},{"type":"wang_border","matrix":[0,0,1,10],"isBorder":true},{"type":"wang_border","matrix":[0,10,0,1],"isBorder":false},{"type":"wang_border","matrix":[0,10,0,1],"isBorder":true},{"type":"wang_border","matrix":[0,10,10,1],"isBorder":false},{"type":"wang_border","matrix":[0,10,10,1],"isBorder":true},{"type":"wang_border","matrix":[0,10,1,0],"isBorder":false},{"type":"wang_border","matrix":[0,10,1,0],"isBorder":true},{"type":"wang_border","matrix":[0,10,1,10],"isBorder":false},{"type":"wang_border","matrix":[0,10,1,10],"isBorder":true},{"type":"wang_border","matrix":[0,10,1,1],"isBorder":false},{"type":"wang_border","matrix":[0,10,1,1],"isBorder":true},{"type":"wang_border","matrix":[0,1,0,10],"isBorder":false},{"type":"wang_border","matrix":[0,1,0,10],"isBorder":true},{"type":"wang_border","matrix":[0,1,10,0],"isBorder":false},{"type":"wang_border","matrix":[0,1,10,0],"isBorder":true},{"type":"wang_border","matrix":[0,1,10,10],"isBorder":false},{"type":"wang_border","matrix":[0,1,10,10],"isBorder":true},{"type":"wang_border","matrix":[0,1,10,1],"isBorder":false},{"type":"wang_border","matrix":[0,1,10,1],"isBorder":true},{"type":"wang_border","matrix":[0,1,1,10],"isBorder":false},{"type":"wang_border","matrix":[0,1,1,10],"isBorder":true},{"type":"wang_border","matrix":[10,0,0,1],"isBorder":false},{"type":"wang_border","matrix":[10,0,0,1],"isBorder":true},{"type":"wang_border","matrix":[10,0,10,1],"isBorder":false},{"type":"wang_border","matrix":[10,0,10,1],"isBorder":true},{"type":"wang_border","matrix":[10,0,1,0],"isBorder":false},{"type":"wang_border","matrix":[10,0,1,0],"isBorder":true},{"type":"wang_border","matrix":[10,0,1,10],"isBorder":false},{"type":"wang_border","matrix":[10,0,1,10],"isBorder":true},{"type":"wang_border","matrix":[10,0,1,1],"isBorder":false},{"type":"wang_border","matrix":[10,0,1,1],"isBorder":true},{"type":"wang_border","matrix":[10,10,0,1],"isBorder":false},{"type":"wang_border","matrix":[10,10,0,1],"isBorder":true},{"type":"wang_border","matrix":[10,10,1,0],"isBorder":false},{"type":"wang_border","matrix":[10,10,1,0],"isBorder":true},{"type":"wang_border","matrix":[10,1,0,0],"isBorder":false},{"type":"wang_border","matrix":[10,1,0,0],"isBorder":true},{"type":"wang_border","matrix":[10,1,0,10],"isBorder":false},{"type":"wang_border","matrix":[10,1,0,10],"isBorder":true},{"type":"wang_border","matrix":[10,1,0,1],"isBorder":false},{"type":"wang_border","matrix":[10,1,0,1],"isBorder":true},{"type":"wang_border","matrix":[10,1,10,0],"isBorder":false},{"type":"wang_border","matrix":[10,1,10,0],"isBorder":true},{"type":"wang_border","matrix":[10,1,1,0],"isBorder":false},{"type":"wang_border","matrix":[10,1,1,0],"isBorder":true},{"type":"wang_border","matrix":[1,0,0,10],"isBorder":false},{"type":"wang_border","matrix":[1,0,0,10],"isBorder":true},{"type":"wang_border","matrix":[1,0,10,0],"isBorder":false},{"type":"wang_border","matrix":[1,0,10,0],"isBorder":true},{"type":"wang_border","matrix":[1,0,10,10],"isBorder":false},{"type":"wang_border","matrix":[1,0,10,10],"isBorder":true},{"type":"wang_border","matrix":[1,0,10,1],"isBorder":false},{"type":"wang_border","matrix":[1,0,10,1],"isBorder":true},{"type":"wang_border","matrix":[1,0,1,10],"isBorder":false},{"type":"wang_border","matrix":[1,0,1,10],"isBorder":true},{"type":"wang_border","matrix":[1,10,0,0],"isBorder":false},{"type":"wang_border","matrix":[1,10,0,0],"isBorder":true},{"type":"wang_border","matrix":[1,10,0,10],"isBorder":false},{"type":"wang_border","matrix":[1,10,0,10],"isBorder":true},{"type":"wang_border","matrix":[1,10,0,1],"isBorder":false},{"type":"wang_border","matrix":[1,10,0,1],"isBorder":true},{"type":"wang_border","matrix":[1,10,10,0],"isBorder":false},{"type":"wang_border","matrix":[1,10,10,0],"isBorder":true},{"type":"wang_border","matrix":[1,10,1,0],"isBorder":false},{"type":"wang_border","matrix":[1,10,1,0],"isBorder":true},{"type":"wang_border","matrix":[1,1,0,10],"isBorder":false},{"type":"wang_border","matrix":[1,1,0,10],"isBorder":true},{"type":"wang_border","matrix":[1,1,10,0],"isBorder":false},{"type":"wang_border","matrix":[1,1,10,0],"isBorder":true},{"type":"wang_border","matrix":[10,10,27,0],"isBorder":false},{"type":"wang_border","matrix":[10,10,27,0],"isBorder":true},{"type":"wang_border","matrix":[10,10,0,27],"isBorder":false},{"type":"wang_border","matrix":[10,10,0,27],"isBorder":true},{"type":"wang_border","matrix":[10,27,10,0],"isBorder":false},{"type":"wang_border","matrix":[10,27,10,0],"isBorder":true},{"type":"wang_border","matrix":[10,27,27,0],"isBorder":false},{"type":"wang_border","matrix":[10,27,27,0],"isBorder":true},{"type":"wang_border","matrix":[10,27,0,10],"isBorder":false},{"type":"wang_border","matrix":[10,27,0,10],"isBorder":true},{"type":"wang_border","matrix":[10,27,0,27],"isBorder":false},{"type":"wang_border","matrix":[10,27,0,27],"isBorder":true},{"type":"wang_border","matrix":[10,27,0,0],"isBorder":false},{"type":"wang_border","matrix":[10,27,0,0],"isBorder":true},{"type":"wang_border","matrix":[10,0,10,27],"isBorder":false},{"type":"wang_border","matrix":[10,0,10,27],"isBorder":true},{"type":"wang_border","matrix":[10,0,27,10],"isBorder":false},{"type":"wang_border","matrix":[10,0,27,10],"isBorder":true},{"type":"wang_border","matrix":[10,0,27,27],"isBorder":false},{"type":"wang_border","matrix":[10,0,27,27],"isBorder":true},{"type":"wang_border","matrix":[10,0,27,0],"isBorder":false},{"type":"wang_border","matrix":[10,0,27,0],"isBorder":true},{"type":"wang_border","matrix":[10,0,0,27],"isBorder":false},{"type":"wang_border","matrix":[10,0,0,27],"isBorder":true},{"type":"wang_border","matrix":[27,10,10,0],"isBorder":false},{"type":"wang_border","matrix":[27,10,10,0],"isBorder":true},{"type":"wang_border","matrix":[27,10,27,0],"isBorder":false},{"type":"wang_border","matrix":[27,10,27,0],"isBorder":true},{"type":"wang_border","matrix":[27,10,0,10],"isBorder":false},{"type":"wang_border","matrix":[27,10,0,10],"isBorder":true},{"type":"wang_border","matrix":[27,10,0,27],"isBorder":false},{"type":"wang_border","matrix":[27,10,0,27],"isBorder":true},{"type":"wang_border","matrix":[27,10,0,0],"isBorder":false},{"type":"wang_border","matrix":[27,10,0,0],"isBorder":true},{"type":"wang_border","matrix":[27,27,10,0],"isBorder":false},{"type":"wang_border","matrix":[27,27,10,0],"isBorder":true},{"type":"wang_border","matrix":[27,27,0,10],"isBorder":false},{"type":"wang_border","matrix":[27,27,0,10],"isBorder":true},{"type":"wang_border","matrix":[27,0,10,10],"isBorder":false},{"type":"wang_border","matrix":[27,0,10,10],"isBorder":true},{"type":"wang_border","matrix":[27,0,10,27],"isBorder":false},{"type":"wang_border","matrix":[27,0,10,27],"isBorder":true},{"type":"wang_border","matrix":[27,0,10,0],"isBorder":false},{"type":"wang_border","matrix":[27,0,10,0],"isBorder":true},{"type":"wang_border","matrix":[27,0,27,10],"isBorder":false},{"type":"wang_border","matrix":[27,0,27,10],"isBorder":true},{"type":"wang_border","matrix":[27,0,0,10],"isBorder":false},{"type":"wang_border","matrix":[27,0,0,10],"isBorder":true},{"type":"wang_border","matrix":[0,10,10,27],"isBorder":false},{"type":"wang_border","matrix":[0,10,10,27],"isBorder":true},{"type":"wang_border","matrix":[0,10,27,10],"isBorder":false},{"type":"wang_border","matrix":[0,10,27,10],"isBorder":true},{"type":"wang_border","matrix":[0,10,27,27],"isBorder":false},{"type":"wang_border","matrix":[0,10,27,27],"isBorder":true},{"type":"wang_border","matrix":[0,10,27,0],"isBorder":false},{"type":"wang_border","matrix":[0,10,27,0],"isBorder":true},{"type":"wang_border","matrix":[0,10,0,27],"isBorder":false},{"type":"wang_border","matrix":[0,10,0,27],"isBorder":true},{"type":"wang_border","matrix":[0,27,10,10],"isBorder":false},{"type":"wang_border","matrix":[0,27,10,10],"isBorder":true},{"type":"wang_border","matrix":[0,27,10,27],"isBorder":false},{"type":"wang_border","matrix":[0,27,10,27],"isBorder":true},{"type":"wang_border","matrix":[0,27,10,0],"isBorder":false},{"type":"wang_border","matrix":[0,27,10,0],"isBorder":true},{"type":"wang_border","matrix":[0,27,27,10],"isBorder":false},{"type":"wang_border","matrix":[0,27,27,10],"isBorder":true},{"type":"wang_border","matrix":[0,27,0,10],"isBorder":false},{"type":"wang_border","matrix":[0,27,0,10],"isBorder":true},{"type":"wang_border","matrix":[0,0,10,27],"isBorder":false},{"type":"wang_border","matrix":[0,0,10,27],"isBorder":true},{"type":"wang_border","matrix":[0,0,27,10],"isBorder":false},{"type":"wang_border","matrix":[0,0,27,10],"isBorder":true},{"type":"wang","origin":0,"data":[{"srcID":6,"r":0,"fx":false,"fy":false,"cutoff":0},{"srcID":6,"r":1,"fx":false,"fy":true,"cutoff":0},{"srcID":6,"r":2,"fx":true,"fy":true,"cutoff":0},{"srcID":6,"r":3,"fx":true,"fy":false,"cutoff":0},{"srcID":24,"r":0,"fx":false,"fy":false,"c":true},{"srcID":24,"r":0,"fx":false,"fy":false,"c":true},{"srcID":24,"r":0,"fx":false,"fy":false,"c":true},{"srcID":24,"r":0,"fx":false,"fy":false,"c":true},{"srcID":24,"r":0,"fx":false,"fy":false,"c":true},{"srcID":24,"r":0,"fx":false,"fy":false,"c":true},{"srcID":24,"r":0,"fx":false,"fy":false,"c":true},{"srcID":24,"r":0,"fx":false,"fy":false,"c":true}]},{"type":"wang_border","matrix":[1,1,1,0],"isBorder":false},{"type":"wang_border","matrix":[1,1,1,0],"isBorder":true},{"type":"wang_border","matrix":[1,1,0,1],"isBorder":false},{"type":"wang_border","matrix":[1,1,0,1],"isBorder":true},{"type":"wang_border","matrix":[1,1,0,0],"isBorder":false},{"type":"wang_border","matrix":[1,1,0,0],"isBorder":true},{"type":"wang_border","matrix":[1,0,1,1],"isBorder":false},{"type":"wang_border","matrix":[1,0,1,1],"isBorder":true},{"type":"wang_border","matrix":[1,0,1,0],"isBorder":false},{"type":"wang_border","matrix":[1,0,1,0],"isBorder":true},{"type":"wang_border","matrix":[1,0,0,1],"isBorder":false},{"type":"wang_border","matrix":[1,0,0,1],"isBorder":true},{"type":"wang_border","matrix":[1,0,0,0],"isBorder":false},{"type":"wang_border","matrix":[1,0,0,0],"isBorder":true},{"type":"wang_border","matrix":[0,1,1,1],"isBorder":false},{"type":"wang_border","matrix":[0,1,1,1],"isBorder":true},{"type":"wang_border","matrix":[0,1,1,0],"isBorder":false},{"type":"wang_border","matrix":[0,1,1,0],"isBorder":true},{"type":"wang_border","matrix":[0,1,0,1],"isBorder":false},{"type":"wang_border","matrix":[0,1,0,1],"isBorder":true},{"type":"wang_border","matrix":[0,1,0,0],"isBorder":false},{"type":"wang_border","matrix":[0,1,0,0],"isBorder":true},{"type":"wang_border","matrix":[0,0,1,1],"isBorder":false},{"type":"wang_border","matrix":[0,0,1,1],"isBorder":true},{"type":"wang_border","matrix":[0,0,1,0],"isBorder":false},{"type":"wang_border","matrix":[0,0,1,0],"isBorder":true},{"type":"wang_border","matrix":[0,0,0,1],"isBorder":false},{"type":"wang_border","matrix":[0,0,0,1],"isBorder":true},{"type":"wang_border","matrix":[false,false,1,0],"isBorder":false},{"type":"wang_border","matrix":[false,false,1,0],"isBorder":true},{"type":"wang_border","matrix":[false,false,0,1],"isBorder":false},{"type":"wang_border","matrix":[false,false,0,1],"isBorder":true},{"type":"wang_border","matrix":[false,1,false,0],"isBorder":false},{"type":"wang_border","matrix":[false,1,false,0],"isBorder":true},{"type":"wang_border","matrix":[false,1,1,0],"isBorder":false},{"type":"wang_border","matrix":[false,1,1,0],"isBorder":true},{"type":"wang_border","matrix":[false,1,0,false],"isBorder":false},{"type":"wang_border","matrix":[false,1,0,false],"isBorder":true},{"type":"wang_border","matrix":[false,1,0,1],"isBorder":false},{"type":"wang_border","matrix":[false,1,0,1],"isBorder":true},{"type":"wang_border","matrix":[false,1,0,0],"isBorder":false},{"type":"wang_border","matrix":[false,1,0,0],"isBorder":true},{"type":"wang_border","matrix":[false,0,false,1],"isBorder":false},{"type":"wang_border","matrix":[false,0,false,1],"isBorder":true},{"type":"wang_border","matrix":[false,0,1,false],"isBorder":false},{"type":"wang_border","matrix":[false,0,1,false],"isBorder":true},{"type":"wang_border","matrix":[false,0,1,1],"isBorder":false},{"type":"wang_border","matrix":[false,0,1,1],"isBorder":true},{"type":"wang_border","matrix":[false,0,1,0],"isBorder":false},{"type":"wang_border","matrix":[false,0,1,0],"isBorder":true},{"type":"wang_border","matrix":[false,0,0,1],"isBorder":false},{"type":"wang_border","matrix":[false,0,0,1],"isBorder":true},{"type":"wang_border","matrix":[1,false,false,0],"isBorder":false},{"type":"wang_border","matrix":[1,false,false,0],"isBorder":true},{"type":"wang_border","matrix":[1,false,1,0],"isBorder":false},{"type":"wang_border","matrix":[1,false,1,0],"isBorder":true},{"type":"wang_border","matrix":[1,false,0,false],"isBorder":false},{"type":"wang_border","matrix":[1,false,0,false],"isBorder":true},{"type":"wang_border","matrix":[1,false,0,1],"isBorder":false},{"type":"wang_border","matrix":[1,false,0,1],"isBorder":true},{"type":"wang_border","matrix":[1,false,0,0],"isBorder":false},{"type":"wang_border","matrix":[1,false,0,0],"isBorder":true},{"type":"wang_border","matrix":[1,1,false,0],"isBorder":false},{"type":"wang_border","matrix":[1,1,false,0],"isBorder":true},{"type":"wang_border","matrix":[1,1,0,false],"isBorder":false},{"type":"wang_border","matrix":[1,1,0,false],"isBorder":true},{"type":"wang_border","matrix":[1,0,false,false],"isBorder":false},{"type":"wang_border","matrix":[1,0,false,false],"isBorder":true},{"type":"wang_border","matrix":[1,0,false,1],"isBorder":false},{"type":"wang_border","matrix":[1,0,false,1],"isBorder":true},{"type":"wang_border","matrix":[1,0,false,0],"isBorder":false},{"type":"wang_border","matrix":[1,0,false,0],"isBorder":true},{"type":"wang_border","matrix":[1,0,1,false],"isBorder":false},{"type":"wang_border","matrix":[1,0,1,false],"isBorder":true},{"type":"wang_border","matrix":[1,0,0,false],"isBorder":false},{"type":"wang_border","matrix":[1,0,0,false],"isBorder":true},{"type":"wang_border","matrix":[0,false,false,1],"isBorder":false},{"type":"wang_border","matrix":[0,false,false,1],"isBorder":true},{"type":"wang_border","matrix":[0,false,1,false],"isBorder":false},{"type":"wang_border","matrix":[0,false,1,false],"isBorder":true},{"type":"wang_border","matrix":[0,false,1,1],"isBorder":false},{"type":"wang_border","matrix":[0,false,1,1],"isBorder":true},{"type":"wang_border","matrix":[0,false,1,0],"isBorder":false},{"type":"wang_border","matrix":[0,false,1,0],"isBorder":true},{"type":"wang_border","matrix":[0,false,0,1],"isBorder":false},{"type":"wang_border","matrix":[0,false,0,1],"isBorder":true},{"type":"wang_border","matrix":[0,1,false,false],"isBorder":false},{"type":"wang_border","matrix":[0,1,false,false],"isBorder":true},{"type":"wang_border","matrix":[0,1,false,1],"isBorder":false},{"type":"wang_border","matrix":[0,1,false,1],"isBorder":true},{"type":"wang_border","matrix":[0,1,false,0],"isBorder":false},{"type":"wang_border","matrix":[0,1,false,0],"isBorder":true},{"type":"wang_border","matrix":[0,1,1,false],"isBorder":false},{"type":"wang_border","matrix":[0,1,1,false],"isBorder":true},{"type":"wang_border","matrix":[0,1,0,false],"isBorder":false},{"type":"wang_border","matrix":[0,1,0,false],"isBorder":true},{"type":"wang_border","matrix":[0,0,false,1],"isBorder":false},{"type":"wang_border","matrix":[0,0,false,1],"isBorder":true},{"type":"wang_border","matrix":[0,0,1,false],"isBorder":false},{"type":"wang_border","matrix":[0,0,1,false],"isBorder":true},{"type":"wang","origin":0,"data":[{"srcID":2,"r":0,"fx":false,"fy":false,"cutoff":0},{"srcID":2,"r":1,"fx":false,"fy":true,"cutoff":0},{"srcID":2,"r":2,"fx":true,"fy":true,"cutoff":0},{"srcID":2,"r":3,"fx":true,"fy":false,"cutoff":0},{"srcID":25,"r":0,"fx":false,"fy":false,"c":true},{"srcID":25,"r":0,"fx":false,"fy":false,"c":true},{"srcID":25,"r":0,"fx":false,"fy":false,"c":true},{"srcID":25,"r":0,"fx":false,"fy":false,"c":true},{"srcID":25,"r":0,"fx":false,"fy":false,"c":true},{"srcID":25,"r":0,"fx":false,"fy":false,"c":true},{"srcID":25,"r":0,"fx":false,"fy":false,"c":true},{"srcID":25,"r":0,"fx":false,"fy":false,"c":true}]},{"type":"wang_border","matrix":[false,false,false,0],"isBorder":false},{"type":"wang_border","matrix":[false,false,false,0],"isBorder":true},{"type":"wang_border","matrix":[false,false,0,false],"isBorder":false},{"type":"wang_border","matrix":[false,false,0,false],"isBorder":true},{"type":"wang_border","matrix":[false,false,0,0],"isBorder":false},{"type":"wang_border","matrix":[false,false,0,0],"isBorder":true},{"type":"wang_border","matrix":[false,0,false,false],"isBorder":false},{"type":"wang_border","matrix":[false,0,false,false],"isBorder":true},{"type":"wang_border","matrix":[false,0,false,0],"isBorder":false},{"type":"wang_border","matrix":[false,0,false,0],"isBorder":true},{"type":"wang_border","matrix":[false,0,0,false],"isBorder":false},{"type":"wang_border","matrix":[false,0,0,false],"isBorder":true},{"type":"wang_border","matrix":[false,0,0,0],"isBorder":false},{"type":"wang_border","matrix":[false,0,0,0],"isBorder":true},{"type":"wang_border","matrix":[0,false,false,false],"isBorder":false},{"type":"wang_border","matrix":[0,false,false,false],"isBorder":true},{"type":"wang_border","matrix":[0,false,false,0],"isBorder":false},{"type":"wang_border","matrix":[0,false,false,0],"isBorder":true},{"type":"wang_border","matrix":[0,false,0,false],"isBorder":false},{"type":"wang_border","matrix":[0,false,0,false],"isBorder":true},{"type":"wang_border","matrix":[0,false,0,0],"isBorder":false},{"type":"wang_border","matrix":[0,false,0,0],"isBorder":true},{"type":"wang_border","matrix":[0,0,false,false],"isBorder":false},{"type":"wang_border","matrix":[0,0,false,false],"isBorder":true},{"type":"wang_border","matrix":[0,0,false,0],"isBorder":false},{"type":"wang_border","matrix":[0,0,false,0],"isBorder":true},{"type":"wang_border","matrix":[0,0,0,false],"isBorder":false},{"type":"wang_border","matrix":[0,0,0,false],"isBorder":true},{"type":"wang","origin":0,"data":[{"srcID":3,"r":0,"fx":false,"fy":false,"cutoff":0},{"srcID":3,"r":1,"fx":false,"fy":true,"cutoff":0},{"srcID":3,"r":2,"fx":true,"fy":true,"cutoff":0},{"srcID":3,"r":3,"fx":true,"fy":false,"cutoff":0},{"srcID":26,"r":0,"fx":false,"fy":false,"c":true},{"srcID":26,"r":0,"fx":false,"fy":false,"c":true},{"srcID":26,"r":0,"fx":false,"fy":false,"c":true},{"srcID":26,"r":0,"fx":false,"fy":false,"c":true},{"srcID":26,"r":0,"fx":false,"fy":false,"c":true},{"srcID":26,"r":0,"fx":false,"fy":false,"c":true},{"srcID":26,"r":0,"fx":false,"fy":false,"c":true},{"srcID":26,"r":0,"fx":false,"fy":false,"c":true}]},{"type":"wang_border","matrix":[27,27,27,0],"isBorder":false},{"type":"wang_border","matrix":[27,27,27,0],"isBorder":true},{"type":"wang_border","matrix":[27,27,0,27],"isBorder":false},{"type":"wang_border","matrix":[27,27,0,27],"isBorder":true},{"type":"wang_border","matrix":[27,27,0,0],"isBorder":false},{"type":"wang_border","matrix":[27,27,0,0],"isBorder":true},{"type":"wang_border","matrix":[27,0,27,27],"isBorder":false},{"type":"wang_border","matrix":[27,0,27,27],"isBorder":true},{"type":"wang_border","matrix":[27,0,27,0],"isBorder":false},{"type":"wang_border","matrix":[27,0,27,0],"isBorder":true},{"type":"wang_border","matrix":[27,0,0,27],"isBorder":false},{"type":"wang_border","matrix":[27,0,0,27],"isBorder":true},{"type":"wang_border","matrix":[27,0,0,0],"isBorder":false},{"type":"wang_border","matrix":[27,0,0,0],"isBorder":true},{"type":"wang_border","matrix":[0,27,27,27],"isBorder":false},{"type":"wang_border","matrix":[0,27,27,27],"isBorder":true},{"type":"wang_border","matrix":[0,27,27,0],"isBorder":false},{"type":"wang_border","matrix":[0,27,27,0],"isBorder":true},{"type":"wang_border","matrix":[0,27,0,27],"isBorder":false},{"type":"wang_border","matrix":[0,27,0,27],"isBorder":true},{"type":"wang_border","matrix":[0,27,0,0],"isBorder":false},{"type":"wang_border","matrix":[0,27,0,0],"isBorder":true},{"type":"wang_border","matrix":[0,0,27,27],"isBorder":false},{"type":"wang_border","matrix":[0,0,27,27],"isBorder":true},{"type":"wang_border","matrix":[0,0,27,0],"isBorder":false},{"type":"wang_border","matrix":[0,0,27,0],"isBorder":true},{"type":"wang_border","matrix":[0,0,0,27],"isBorder":false},{"type":"wang_border","matrix":[0,0,0,27],"isBorder":true},{"type":"wang","origin":27,"data":[{"srcID":9,"r":0,"fx":true,"fy":true,"cutoff":0},{"srcID":9,"r":1,"fx":true,"fy":false,"cutoff":0},{"srcID":9,"r":2,"fx":false,"fy":false,"cutoff":0},{"srcID":9,"r":3,"fx":false,"fy":true,"cutoff":0},{"srcID":27,"r":0,"fx":false,"fy":false,"c":true},{"srcID":27,"r":0,"fx":false,"fy":false,"c":true},{"srcID":27,"r":0,"fx":false,"fy":false,"c":true},{"srcID":27,"r":0,"fx":false,"fy":false,"c":true},{"srcID":27,"r":0,"fx":false,"fy":false,"c":true},{"srcID":27,"r":0,"fx":false,"fy":false,"c":true},{"srcID":27,"r":0,"fx":false,"fy":false,"c":true},{"srcID":27,"r":0,"fx":false,"fy":false,"c":true}]},{"type":"wang_border","matrix":[10,10,10,1],"isBorder":false},{"type":"wang_border","matrix":[10,10,10,1],"isBorder":true},{"type":"wang_border","matrix":[10,10,1,10],"isBorder":false},{"type":"wang_border","matrix":[10,10,1,10],"isBorder":true},{"type":"wang_border","matrix":[10,10,1,1],"isBorder":false},{"type":"wang_border","matrix":[10,10,1,1],"isBorder":true},{"type":"wang_border","matrix":[10,1,10,10],"isBorder":false},{"type":"wang_border","matrix":[10,1,10,10],"isBorder":true},{"type":"wang_border","matrix":[10,1,10,1],"isBorder":false},{"type":"wang_border","matrix":[10,1,10,1],"isBorder":true},{"type":"wang_border","matrix":[10,1,1,10],"isBorder":false},{"type":"wang_border","matrix":[10,1,1,10],"isBorder":true},{"type":"wang_border","matrix":[10,1,1,1],"isBorder":false},{"type":"wang_border","matrix":[10,1,1,1],"isBorder":true},{"type":"wang_border","matrix":[1,10,10,10],"isBorder":false},{"type":"wang_border","matrix":[1,10,10,10],"isBorder":true},{"type":"wang_border","matrix":[1,10,10,1],"isBorder":false},{"type":"wang_border","matrix":[1,10,10,1],"isBorder":true},{"type":"wang_border","matrix":[1,10,1,10],"isBorder":false},{"type":"wang_border","matrix":[1,10,1,10],"isBorder":true},{"type":"wang_border","matrix":[1,10,1,1],"isBorder":false},{"type":"wang_border","matrix":[1,10,1,1],"isBorder":true},{"type":"wang_border","matrix":[1,1,10,10],"isBorder":false},{"type":"wang_border","matrix":[1,1,10,10],"isBorder":true},{"type":"wang_border","matrix":[1,1,10,1],"isBorder":false},{"type":"wang_border","matrix":[1,1,10,1],"isBorder":true},{"type":"wang_border","matrix":[1,1,1,10],"isBorder":false},{"type":"wang_border","matrix":[1,1,1,10],"isBorder":true},{"type":"wang","origin":1,"data":[{"srcID":7,"r":0,"fx":false,"fy":false,"cutoff":0},{"srcID":7,"r":1,"fx":false,"fy":true,"cutoff":0},{"srcID":7,"r":2,"fx":true,"fy":true,"cutoff":0},{"srcID":7,"r":3,"fx":true,"fy":false,"cutoff":0},{"srcID":28,"r":0,"fx":false,"fy":false,"c":true},{"srcID":28,"r":0,"fx":false,"fy":false,"c":true},{"srcID":28,"r":0,"fx":false,"fy":false,"c":true},{"srcID":28,"r":0,"fx":false,"fy":false,"c":true},{"srcID":28,"r":0,"fx":false,"fy":false,"c":true},{"srcID":28,"r":0,"fx":false,"fy":false,"c":true},{"srcID":28,"r":0,"fx":false,"fy":false,"c":true},{"srcID":28,"r":0,"fx":false,"fy":false,"c":true}]},{"type":"wang_border","matrix":[false,false,false,1],"isBorder":false},{"type":"wang_border","matrix":[false,false,false,1],"isBorder":true},{"type":"wang_border","matrix":[false,false,1,false],"isBorder":false},{"type":"wang_border","matrix":[false,false,1,false],"isBorder":true},{"type":"wang_border","matrix":[false,false,1,1],"isBorder":false},{"type":"wang_border","matrix":[false,false,1,1],"isBorder":true},{"type":"wang_border","matrix":[false,1,false,false],"isBorder":false},{"type":"wang_border","matrix":[false,1,false,false],"isBorder":true},{"type":"wang_border","matrix":[false,1,false,1],"isBorder":false},{"type":"wang_border","matrix":[false,1,false,1],"isBorder":true},{"type":"wang_border","matrix":[false,1,1,false],"isBorder":false},{"type":"wang_border","matrix":[false,1,1,false],"isBorder":true},{"type":"wang_border","matrix":[false,1,1,1],"isBorder":false},{"type":"wang_border","matrix":[false,1,1,1],"isBorder":true},{"type":"wang_border","matrix":[1,false,false,false],"isBorder":false},{"type":"wang_border","matrix":[1,false,false,false],"isBorder":true},{"type":"wang_border","matrix":[1,false,false,1],"isBorder":false},{"type":"wang_border","matrix":[1,false,false,1],"isBorder":true},{"type":"wang_border","matrix":[1,false,1,false],"isBorder":false},{"type":"wang_border","matrix":[1,false,1,false],"isBorder":true},{"type":"wang_border","matrix":[1,false,1,1],"isBorder":false},{"type":"wang_border","matrix":[1,false,1,1],"isBorder":true},{"type":"wang_border","matrix":[1,1,false,false],"isBorder":false},{"type":"wang_border","matrix":[1,1,false,false],"isBorder":true},{"type":"wang_border","matrix":[1,1,false,1],"isBorder":false},{"type":"wang_border","matrix":[1,1,false,1],"isBorder":true},{"type":"wang_border","matrix":[1,1,1,false],"isBorder":false},{"type":"wang_border","matrix":[1,1,1,false],"isBorder":true},{"type":"wang","origin":1,"data":[{"srcID":4,"r":0,"fx":false,"fy":false,"cutoff":0},{"srcID":4,"r":1,"fx":false,"fy":true,"cutoff":0},{"srcID":4,"r":2,"fx":true,"fy":true,"cutoff":0},{"srcID":4,"r":3,"fx":true,"fy":false,"cutoff":0},{"srcID":29,"r":0,"fx":false,"fy":false,"c":true},{"srcID":29,"r":0,"fx":false,"fy":false,"c":true},{"srcID":29,"r":0,"fx":false,"fy":false,"c":true},{"srcID":29,"r":0,"fx":false,"fy":false,"c":true},{"srcID":29,"r":0,"fx":false,"fy":false,"c":true},{"srcID":29,"r":0,"fx":false,"fy":false,"c":true},{"srcID":29,"r":0,"fx":false,"fy":false,"c":true},{"srcID":29,"r":0,"fx":false,"fy":false,"c":true}]},{"type":"wang_border","matrix":[100,100,100,10],"isBorder":false},{"type":"wang_border","matrix":[100,100,100,10],"isBorder":true},{"type":"wang_border","matrix":[100,100,10,100],"isBorder":false},{"type":"wang_border","matrix":[100,100,10,100],"isBorder":true},{"type":"wang_border","matrix":[100,100,10,10],"isBorder":false},{"type":"wang_border","matrix":[100,100,10,10],"isBorder":true},{"type":"wang_border","matrix":[100,10,100,100],"isBorder":false},{"type":"wang_border","matrix":[100,10,100,100],"isBorder":true},{"type":"wang_border","matrix":[100,10,100,10],"isBorder":false},{"type":"wang_border","matrix":[100,10,100,10],"isBorder":true},{"type":"wang_border","matrix":[100,10,10,100],"isBorder":false},{"type":"wang_border","matrix":[100,10,10,100],"isBorder":true},{"type":"wang_border","matrix":[100,10,10,10],"isBorder":false},{"type":"wang_border","matrix":[100,10,10,10],"isBorder":true},{"type":"wang_border","matrix":[10,100,100,100],"isBorder":false},{"type":"wang_border","matrix":[10,100,100,100],"isBorder":true},{"type":"wang_border","matrix":[10,100,100,10],"isBorder":false},{"type":"wang_border","matrix":[10,100,100,10],"isBorder":true},{"type":"wang_border","matrix":[10,100,10,100],"isBorder":false},{"type":"wang_border","matrix":[10,100,10,100],"isBorder":true},{"type":"wang_border","matrix":[10,100,10,10],"isBorder":false},{"type":"wang_border","matrix":[10,100,10,10],"isBorder":true},{"type":"wang_border","matrix":[10,10,100,100],"isBorder":false},{"type":"wang_border","matrix":[10,10,100,100],"isBorder":true},{"type":"wang_border","matrix":[10,10,100,10],"isBorder":false},{"type":"wang_border","matrix":[10,10,100,10],"isBorder":true},{"type":"wang_border","matrix":[10,10,10,100],"isBorder":false},{"type":"wang_border","matrix":[10,10,10,100],"isBorder":true},{"type":"wang","origin":10,"data":[{"srcID":17,"r":0,"fx":true,"fy":true,"cutoff":0},{"srcID":17,"r":1,"fx":true,"fy":false,"cutoff":0},{"srcID":17,"r":2,"fx":false,"fy":false,"cutoff":0},{"srcID":17,"r":3,"fx":false,"fy":true,"cutoff":0},{"srcID":30,"r":0,"fx":false,"fy":false,"c":true},{"srcID":30,"r":0,"fx":false,"fy":false,"c":true},{"srcID":30,"r":0,"fx":false,"fy":false,"c":true},{"srcID":30,"r":0,"fx":false,"fy":false,"c":true},{"srcID":30,"r":0,"fx":false,"fy":false,"c":true},{"srcID":30,"r":0,"fx":false,"fy":false,"c":true},{"srcID":30,"r":0,"fx":false,"fy":false,"c":true},{"srcID":30,"r":0,"fx":false,"fy":false,"c":true}]},{"type":"wang_border","matrix":[10,10,10,27],"isBorder":false},{"type":"wang_border","matrix":[10,10,10,27],"isBorder":true},{"type":"wang_border","matrix":[10,10,27,10],"isBorder":false},{"type":"wang_border","matrix":[10,10,27,10],"isBorder":true},{"type":"wang_border","matrix":[10,10,27,27],"isBorder":false},{"type":"wang_border","matrix":[10,10,27,27],"isBorder":true},{"type":"wang_border","matrix":[10,27,10,10],"isBorder":false},{"type":"wang_border","matrix":[10,27,10,10],"isBorder":true},{"type":"wang_border","matrix":[10,27,10,27],"isBorder":false},{"type":"wang_border","matrix":[10,27,10,27],"isBorder":true},{"type":"wang_border","matrix":[10,27,27,10],"isBorder":false},{"type":"wang_border","matrix":[10,27,27,10],"isBorder":true},{"type":"wang_border","matrix":[10,27,27,27],"isBorder":false},{"type":"wang_border","matrix":[10,27,27,27],"isBorder":true},{"type":"wang_border","matrix":[27,10,10,10],"isBorder":false},{"type":"wang_border","matrix":[27,10,10,10],"isBorder":true},{"type":"wang_border","matrix":[27,10,10,27],"isBorder":false},{"type":"wang_border","matrix":[27,10,10,27],"isBorder":true},{"type":"wang_border","matrix":[27,10,27,10],"isBorder":false},{"type":"wang_border","matrix":[27,10,27,10],"isBorder":true},{"type":"wang_border","matrix":[27,10,27,27],"isBorder":false},{"type":"wang_border","matrix":[27,10,27,27],"isBorder":true},{"type":"wang_border","matrix":[27,27,10,10],"isBorder":false},{"type":"wang_border","matrix":[27,27,10,10],"isBorder":true},{"type":"wang_border","matrix":[27,27,10,27],"isBorder":false},{"type":"wang_border","matrix":[27,27,10,27],"isBorder":true},{"type":"wang_border","matrix":[27,27,27,10],"isBorder":false},{"type":"wang_border","matrix":[27,27,27,10],"isBorder":true},{"type":"wang","origin":10,"data":[{"srcID":10,"r":0,"fx":true,"fy":true,"cutoff":0},{"srcID":10,"r":1,"fx":true,"fy":false,"cutoff":0},{"srcID":10,"r":2,"fx":false,"fy":false,"cutoff":0},{"srcID":10,"r":3,"fx":false,"fy":true,"cutoff":0},{"srcID":31,"r":0,"fx":false,"fy":false,"c":true},{"srcID":31,"r":0,"fx":false,"fy":false,"c":true},{"srcID":31,"r":0,"fx":false,"fy":false,"c":true},{"srcID":31,"r":0,"fx":false,"fy":false,"c":true},{"srcID":31,"r":0,"fx":false,"fy":false,"c":true},{"srcID":31,"r":0,"fx":false,"fy":false,"c":true},{"srcID":31,"r":0,"fx":false,"fy":false,"c":true},{"srcID":31,"r":0,"fx":false,"fy":false,"c":true}]},{"type":"wang_border","matrix":[87,87,87,100],"isBorder":false},{"type":"wang_border","matrix":[87,87,87,100],"isBorder":true},{"type":"wang_border","matrix":[87,87,100,87],"isBorder":false},{"type":"wang_border","matrix":[87,87,100,87],"isBorder":true},{"type":"wang_border","matrix":[87,87,100,100],"isBorder":false},{"type":"wang_border","matrix":[87,87,100,100],"isBorder":true},{"type":"wang_border","matrix":[87,100,87,87],"isBorder":false},{"type":"wang_border","matrix":[87,100,87,87],"isBorder":true},{"type":"wang_border","matrix":[87,100,87,100],"isBorder":false},{"type":"wang_border","matrix":[87,100,87,100],"isBorder":true},{"type":"wang_border","matrix":[87,100,100,87],"isBorder":false},{"type":"wang_border","matrix":[87,100,100,87],"isBorder":true},{"type":"wang_border","matrix":[87,100,100,100],"isBorder":false},{"type":"wang_border","matrix":[87,100,100,100],"isBorder":true},{"type":"wang_border","matrix":[100,87,87,87],"isBorder":false},{"type":"wang_border","matrix":[100,87,87,87],"isBorder":true},{"type":"wang_border","matrix":[100,87,87,100],"isBorder":false},{"type":"wang_border","matrix":[100,87,87,100],"isBorder":true},{"type":"wang_border","matrix":[100,87,100,87],"isBorder":false},{"type":"wang_border","matrix":[100,87,100,87],"isBorder":true},{"type":"wang_border","matrix":[100,87,100,100],"isBorder":false},{"type":"wang_border","matrix":[100,87,100,100],"isBorder":true},{"type":"wang_border","matrix":[100,100,87,87],"isBorder":false},{"type":"wang_border","matrix":[100,100,87,87],"isBorder":true},{"type":"wang_border","matrix":[100,100,87,100],"isBorder":false},{"type":"wang_border","matrix":[100,100,87,100],"isBorder":true},{"type":"wang_border","matrix":[100,100,100,87],"isBorder":false},{"type":"wang_border","matrix":[100,100,100,87],"isBorder":true},{"type":"wang","origin":87,"data":[{"srcID":16,"r":0,"fx":true,"fy":true,"cutoff":0},{"srcID":16,"r":1,"fx":true,"fy":false,"cutoff":0},{"srcID":16,"r":2,"fx":false,"fy":false,"cutoff":0},{"srcID":16,"r":3,"fx":false,"fy":true,"cutoff":0},{"srcID":32,"r":0,"fx":false,"fy":false,"c":true},{"srcID":32,"r":0,"fx":false,"fy":false,"c":true},{"srcID":32,"r":0,"fx":false,"fy":false,"c":true},{"srcID":32,"r":0,"fx":false,"fy":false,"c":true},{"srcID":32,"r":0,"fx":false,"fy":false,"c":true},{"srcID":32,"r":0,"fx":false,"fy":false,"c":true},{"srcID":32,"r":0,"fx":false,"fy":false,"c":true},{"srcID":32,"r":0,"fx":false,"fy":false,"c":true}]}],"tileRelations":[{"tile":0,"other":50,"r":0},{"tile":50,"other":0,"r":1},{"tile":50,"other":10,"r":1},{"tile":10,"other":50,"r":0},{"tile":0,"other":34,"r":2},{"tile":34,"other":0,"r":3},{"tile":34,"other":10,"r":3},{"tile":10,"other":34,"r":2},{"tile":0,"other":41,"r":4},{"tile":41,"other":0,"r":5},{"tile":41,"other":10,"r":5},{"tile":10,"other":41,"r":4},{"tile":0,"other":51,"r":6},{"tile":51,"other":0,"r":7},{"tile":51,"other":10,"r":7},{"tile":10,"other":51,"r":6},{"tile":0,"other":95,"r":8},{"tile":95,"other":0,"r":9},{"tile":95,"other":10,"r":9},{"tile":10,"other":95,"r":8},{"tile":0,"other":42,"r":10},{"tile":42,"other":0,"r":11},{"tile":42,"other":10,"r":11},{"tile":10,"other":42,"r":10},{"tile":0,"other":83,"r":12},{"tile":83,"other":0,"r":13},{"tile":83,"other":10,"r":13},{"tile":10,"other":83,"r":12},{"tile":0,"other":72,"r":14},{"tile":72,"other":0,"r":15},{"tile":72,"other":10,"r":15},{"tile":10,"other":72,"r":14},{"tile":0,"other":60,"r":16},{"tile":60,"other":0,"r":17},{"tile":60,"other":10,"r":17},{"tile":10,"other":60,"r":16},{"tile":0,"other":84,"r":18},{"tile":84,"other":0,"r":19},{"tile":84,"other":10,"r":19},{"tile":10,"other":84,"r":18},{"tile":0,"other":71,"r":20},{"tile":71,"other":0,"r":21},{"tile":71,"other":10,"r":21},{"tile":10,"other":71,"r":20},{"tile":0,"other":61,"r":22},{"tile":61,"other":0,"r":23},{"tile":61,"other":10,"r":23},{"tile":10,"other":61,"r":22},{"tile":0,"other":59,"r":24},{"tile":59,"other":0,"r":25},{"tile":59,"other":10,"r":25},{"tile":10,"other":59,"r":24},{"tile":0,"other":70,"r":26},{"tile":70,"other":0,"r":27},{"tile":70,"other":10,"r":27},{"tile":10,"other":70,"r":26},{"tile":0,"other":204,"r":28},{"tile":204,"other":0,"r":29},{"tile":204,"other":10,"r":29},{"tile":10,"other":204,"r":28},{"tile":204,"other":1,"r":29},{"tile":1,"other":204,"r":28},{"tile":0,"other":215,"r":30},{"tile":215,"other":0,"r":31},{"tile":215,"other":1,"r":31},{"tile":1,"other":215,"r":30},{"tile":215,"other":10,"r":31},{"tile":10,"other":215,"r":30},{"tile":0,"other":206,"r":32},{"tile":206,"other":0,"r":33},{"tile":206,"other":10,"r":33},{"tile":10,"other":206,"r":32},{"tile":206,"other":1,"r":33},{"tile":1,"other":206,"r":32},{"tile":0,"other":179,"r":34},{"tile":179,"other":0,"r":35},{"tile":179,"other":10,"r":35},{"tile":10,"other":179,"r":34},{"tile":179,"other":1,"r":35},{"tile":1,"other":179,"r":34},{"tile":0,"other":236,"r":36},{"tile":236,"other":0,"r":37},{"tile":236,"other":10,"r":37},{"tile":10,"other":236,"r":36},{"tile":236,"other":1,"r":37},{"tile":1,"other":236,"r":36},{"tile":0,"other":193,"r":38},{"tile":193,"other":0,"r":39},{"tile":193,"other":10,"r":39},{"tile":10,"other":193,"r":38},{"tile":193,"other":1,"r":39},{"tile":1,"other":193,"r":38},{"tile":0,"other":132,"r":40},{"tile":132,"other":0,"r":41},{"tile":132,"other":10,"r":41},{"tile":10,"other":132,"r":40},{"tile":132,"other":1,"r":41},{"tile":1,"other":132,"r":40},{"tile":0,"other":205,"r":42},{"tile":205,"other":0,"r":43},{"tile":205,"other":1,"r":43},{"tile":1,"other":205,"r":42},{"tile":205,"other":10,"r":43},{"tile":10,"other":205,"r":42},{"tile":0,"other":226,"r":44},{"tile":226,"other":0,"r":45},{"tile":226,"other":1,"r":45},{"tile":1,"other":226,"r":44},{"tile":226,"other":10,"r":45},{"tile":10,"other":226,"r":44},{"tile":0,"other":182,"r":46},{"tile":182,"other":0,"r":47},{"tile":182,"other":1,"r":47},{"tile":1,"other":182,"r":46},{"tile":182,"other":10,"r":47},{"tile":10,"other":182,"r":46},{"tile":0,"other":156,"r":48},{"tile":156,"other":0,"r":49},{"tile":156,"other":1,"r":49},{"tile":1,"other":156,"r":48},{"tile":156,"other":10,"r":49},{"tile":10,"other":156,"r":48},{"tile":0,"other":169,"r":50},{"tile":169,"other":0,"r":51},{"tile":169,"other":1,"r":51},{"tile":1,"other":169,"r":50},{"tile":169,"other":10,"r":51},{"tile":10,"other":169,"r":50},{"tile":0,"other":227,"r":52},{"tile":227,"other":0,"r":53},{"tile":227,"other":10,"r":53},{"tile":10,"other":227,"r":52},{"tile":227,"other":1,"r":53},{"tile":1,"other":227,"r":52},{"tile":0,"other":181,"r":54},{"tile":181,"other":0,"r":55},{"tile":181,"other":10,"r":55},{"tile":10,"other":181,"r":54},{"tile":181,"other":1,"r":55},{"tile":1,"other":181,"r":54},{"tile":0,"other":217,"r":56},{"tile":217,"other":0,"r":57},{"tile":217,"other":10,"r":57},{"tile":10,"other":217,"r":56},{"tile":217,"other":1,"r":57},{"tile":1,"other":217,"r":56},{"tile":0,"other":191,"r":58},{"tile":191,"other":0,"r":59},{"tile":191,"other":10,"r":59},{"tile":10,"other":191,"r":58},{"tile":191,"other":1,"r":59},{"tile":1,"other":191,"r":58},{"tile":0,"other":144,"r":60},{"tile":144,"other":0,"r":61},{"tile":144,"other":10,"r":61},{"tile":10,"other":144,"r":60},{"tile":144,"other":1,"r":61},{"tile":1,"other":144,"r":60},{"tile":0,"other":183,"r":62},{"tile":183,"other":0,"r":63},{"tile":183,"other":10,"r":63},{"tile":10,"other":183,"r":62},{"tile":183,"other":1,"r":63},{"tile":1,"other":183,"r":62},{"tile":0,"other":195,"r":64},{"tile":195,"other":0,"r":65},{"tile":195,"other":10,"r":65},{"tile":10,"other":195,"r":64},{"tile":195,"other":1,"r":65},{"tile":1,"other":195,"r":64},{"tile":0,"other":203,"r":66},{"tile":203,"other":0,"r":67},{"tile":203,"other":10,"r":67},{"tile":10,"other":203,"r":66},{"tile":203,"other":1,"r":67},{"tile":1,"other":203,"r":66},{"tile":0,"other":178,"r":68},{"tile":178,"other":0,"r":69},{"tile":178,"other":10,"r":69},{"tile":10,"other":178,"r":68},{"tile":178,"other":1,"r":69},{"tile":1,"other":178,"r":68},{"tile":0,"other":155,"r":70},{"tile":155,"other":0,"r":71},{"tile":155,"other":10,"r":71},{"tile":10,"other":155,"r":70},{"tile":155,"other":1,"r":71},{"tile":1,"other":155,"r":70},{"tile":0,"other":180,"r":72},{"tile":180,"other":0,"r":73},{"tile":180,"other":10,"r":73},{"tile":10,"other":180,"r":72},{"tile":180,"other":1,"r":73},{"tile":1,"other":180,"r":72},{"tile":0,"other":157,"r":74},{"tile":157,"other":0,"r":75},{"tile":157,"other":10,"r":75},{"tile":10,"other":157,"r":74},{"tile":157,"other":1,"r":75},{"tile":1,"other":157,"r":74},{"tile":0,"other":216,"r":76},{"tile":216,"other":0,"r":77},{"tile":216,"other":1,"r":77},{"tile":1,"other":216,"r":76},{"tile":216,"other":10,"r":77},{"tile":10,"other":216,"r":76},{"tile":0,"other":194,"r":78},{"tile":194,"other":0,"r":79},{"tile":194,"other":1,"r":79},{"tile":1,"other":194,"r":78},{"tile":194,"other":10,"r":79},{"tile":10,"other":194,"r":78},{"tile":0,"other":170,"r":80},{"tile":170,"other":0,"r":81},{"tile":170,"other":1,"r":81},{"tile":1,"other":170,"r":80},{"tile":170,"other":10,"r":81},{"tile":10,"other":170,"r":80},{"tile":0,"other":158,"r":82},{"tile":158,"other":0,"r":83},{"tile":158,"other":1,"r":83},{"tile":1,"other":158,"r":82},{"tile":158,"other":10,"r":83},{"tile":10,"other":158,"r":82},{"tile":0,"other":167,"r":84},{"tile":167,"other":0,"r":85},{"tile":167,"other":1,"r":85},{"tile":1,"other":167,"r":84},{"tile":167,"other":10,"r":85},{"tile":10,"other":167,"r":84},{"tile":0,"other":192,"r":86},{"tile":192,"other":0,"r":87},{"tile":192,"other":1,"r":87},{"tile":1,"other":192,"r":86},{"tile":192,"other":10,"r":87},{"tile":10,"other":192,"r":86},{"tile":0,"other":168,"r":88},{"tile":168,"other":0,"r":89},{"tile":168,"other":1,"r":89},{"tile":1,"other":168,"r":88},{"tile":168,"other":10,"r":89},{"tile":10,"other":168,"r":88},{"tile":0,"other":145,"r":90},{"tile":145,"other":0,"r":91},{"tile":145,"other":1,"r":91},{"tile":1,"other":145,"r":90},{"tile":145,"other":10,"r":91},{"tile":10,"other":145,"r":90},{"tile":0,"other":166,"r":92},{"tile":166,"other":0,"r":93},{"tile":166,"other":1,"r":93},{"tile":1,"other":166,"r":92},{"tile":166,"other":10,"r":93},{"tile":10,"other":166,"r":92},{"tile":0,"other":143,"r":94},{"tile":143,"other":0,"r":95},{"tile":143,"other":1,"r":95},{"tile":1,"other":143,"r":94},{"tile":143,"other":10,"r":95},{"tile":10,"other":143,"r":94},{"tile":0,"other":131,"r":96},{"tile":131,"other":0,"r":97},{"tile":131,"other":1,"r":97},{"tile":1,"other":131,"r":96},{"tile":131,"other":10,"r":97},{"tile":10,"other":131,"r":96},{"tile":0,"other":120,"r":98},{"tile":120,"other":0,"r":99},{"tile":120,"other":1,"r":99},{"tile":1,"other":120,"r":98},{"tile":120,"other":10,"r":99},{"tile":10,"other":120,"r":98},{"tile":0,"other":196,"r":100},{"tile":196,"other":0,"r":101},{"tile":196,"other":10,"r":101},{"tile":10,"other":196,"r":100},{"tile":196,"other":27,"r":101},{"tile":27,"other":196,"r":100},{"tile":0,"other":207,"r":102},{"tile":207,"other":0,"r":103},{"tile":207,"other":10,"r":103},{"tile":10,"other":207,"r":102},{"tile":207,"other":27,"r":103},{"tile":27,"other":207,"r":102},{"tile":0,"other":218,"r":104},{"tile":218,"other":0,"r":105},{"tile":218,"other":10,"r":105},{"tile":10,"other":218,"r":104},{"tile":218,"other":27,"r":105},{"tile":27,"other":218,"r":104},{"tile":0,"other":237,"r":106},{"tile":237,"other":0,"r":107},{"tile":237,"other":10,"r":107},{"tile":10,"other":237,"r":106},{"tile":237,"other":27,"r":107},{"tile":27,"other":237,"r":106},{"tile":0,"other":220,"r":108},{"tile":220,"other":0,"r":109},{"tile":220,"other":10,"r":109},{"tile":10,"other":220,"r":108},{"tile":220,"other":27,"r":109},{"tile":27,"other":220,"r":108},{"tile":0,"other":239,"r":110},{"tile":239,"other":0,"r":111},{"tile":239,"other":10,"r":111},{"tile":10,"other":239,"r":110},{"tile":239,"other":27,"r":111},{"tile":27,"other":239,"r":110},{"tile":0,"other":256,"r":112},{"tile":256,"other":0,"r":113},{"tile":256,"other":10,"r":113},{"tile":10,"other":256,"r":112},{"tile":256,"other":27,"r":113},{"tile":27,"other":256,"r":112},{"tile":0,"other":238,"r":114},{"tile":238,"other":0,"r":115},{"tile":238,"other":10,"r":115},{"tile":10,"other":238,"r":114},{"tile":238,"other":27,"r":115},{"tile":27,"other":238,"r":114},{"tile":0,"other":231,"r":116},{"tile":231,"other":0,"r":117},{"tile":231,"other":10,"r":117},{"tile":10,"other":231,"r":116},{"tile":231,"other":27,"r":117},{"tile":27,"other":231,"r":116},{"tile":0,"other":241,"r":118},{"tile":241,"other":0,"r":119},{"tile":241,"other":10,"r":119},{"tile":10,"other":241,"r":118},{"tile":241,"other":27,"r":119},{"tile":27,"other":241,"r":118},{"tile":0,"other":258,"r":120},{"tile":258,"other":0,"r":121},{"tile":258,"other":10,"r":121},{"tile":10,"other":258,"r":120},{"tile":258,"other":27,"r":121},{"tile":27,"other":258,"r":120},{"tile":0,"other":268,"r":122},{"tile":268,"other":0,"r":123},{"tile":268,"other":10,"r":123},{"tile":10,"other":268,"r":122},{"tile":268,"other":27,"r":123},{"tile":27,"other":268,"r":122},{"tile":0,"other":230,"r":124},{"tile":230,"other":0,"r":125},{"tile":230,"other":27,"r":125},{"tile":27,"other":230,"r":124},{"tile":230,"other":10,"r":125},{"tile":10,"other":230,"r":124},{"tile":0,"other":248,"r":126},{"tile":248,"other":0,"r":127},{"tile":248,"other":27,"r":127},{"tile":27,"other":248,"r":126},{"tile":248,"other":10,"r":127},{"tile":10,"other":248,"r":126},{"tile":0,"other":228,"r":128},{"tile":228,"other":0,"r":129},{"tile":228,"other":27,"r":129},{"tile":27,"other":228,"r":128},{"tile":228,"other":10,"r":129},{"tile":10,"other":228,"r":128},{"tile":0,"other":246,"r":130},{"tile":246,"other":0,"r":131},{"tile":246,"other":27,"r":131},{"tile":27,"other":246,"r":130},{"tile":246,"other":10,"r":131},{"tile":10,"other":246,"r":130},{"tile":0,"other":262,"r":132},{"tile":262,"other":0,"r":133},{"tile":262,"other":27,"r":133},{"tile":27,"other":262,"r":132},{"tile":262,"other":10,"r":133},{"tile":10,"other":262,"r":132},{"tile":0,"other":259,"r":134},{"tile":259,"other":0,"r":135},{"tile":259,"other":27,"r":135},{"tile":27,"other":259,"r":134},{"tile":259,"other":10,"r":135},{"tile":10,"other":259,"r":134},{"tile":0,"other":251,"r":136},{"tile":251,"other":0,"r":137},{"tile":251,"other":27,"r":137},{"tile":27,"other":251,"r":136},{"tile":251,"other":10,"r":137},{"tile":10,"other":251,"r":136},{"tile":0,"other":219,"r":138},{"tile":219,"other":0,"r":139},{"tile":219,"other":27,"r":139},{"tile":27,"other":219,"r":138},{"tile":219,"other":10,"r":139},{"tile":10,"other":219,"r":138},{"tile":0,"other":255,"r":140},{"tile":255,"other":0,"r":141},{"tile":255,"other":27,"r":141},{"tile":27,"other":255,"r":140},{"tile":255,"other":10,"r":141},{"tile":10,"other":255,"r":140},{"tile":0,"other":269,"r":142},{"tile":269,"other":0,"r":143},{"tile":269,"other":27,"r":143},{"tile":27,"other":269,"r":142},{"tile":269,"other":10,"r":143},{"tile":10,"other":269,"r":142},{"tile":0,"other":249,"r":144},{"tile":249,"other":0,"r":145},{"tile":249,"other":27,"r":145},{"tile":27,"other":249,"r":144},{"tile":249,"other":10,"r":145},{"tile":10,"other":249,"r":144},{"tile":0,"other":271,"r":146},{"tile":271,"other":0,"r":147},{"tile":271,"other":27,"r":147},{"tile":27,"other":271,"r":146},{"tile":271,"other":10,"r":147},{"tile":10,"other":271,"r":146},{"tile":0,"other":240,"r":148},{"tile":240,"other":0,"r":149},{"tile":240,"other":10,"r":149},{"tile":10,"other":240,"r":148},{"tile":240,"other":27,"r":149},{"tile":27,"other":240,"r":148},{"tile":0,"other":229,"r":150},{"tile":229,"other":0,"r":151},{"tile":229,"other":10,"r":151},{"tile":10,"other":229,"r":150},{"tile":229,"other":27,"r":151},{"tile":27,"other":229,"r":150},{"tile":0,"other":250,"r":152},{"tile":250,"other":0,"r":153},{"tile":250,"other":10,"r":153},{"tile":10,"other":250,"r":152},{"tile":250,"other":27,"r":153},{"tile":27,"other":250,"r":152},{"tile":0,"other":270,"r":154},{"tile":270,"other":0,"r":155},{"tile":270,"other":10,"r":155},{"tile":10,"other":270,"r":154},{"tile":270,"other":27,"r":155},{"tile":27,"other":270,"r":154},{"tile":0,"other":264,"r":156},{"tile":264,"other":0,"r":157},{"tile":264,"other":10,"r":157},{"tile":10,"other":264,"r":156},{"tile":264,"other":27,"r":157},{"tile":27,"other":264,"r":156},{"tile":0,"other":208,"r":158},{"tile":208,"other":0,"r":159},{"tile":208,"other":27,"r":159},{"tile":27,"other":208,"r":158},{"tile":208,"other":10,"r":159},{"tile":10,"other":208,"r":158},{"tile":0,"other":257,"r":160},{"tile":257,"other":0,"r":161},{"tile":257,"other":27,"r":161},{"tile":27,"other":257,"r":160},{"tile":257,"other":10,"r":161},{"tile":10,"other":257,"r":160},{"tile":0,"other":272,"r":162},{"tile":272,"other":0,"r":163},{"tile":272,"other":27,"r":163},{"tile":27,"other":272,"r":162},{"tile":272,"other":10,"r":163},{"tile":10,"other":272,"r":162},{"tile":0,"other":247,"r":164},{"tile":247,"other":0,"r":165},{"tile":247,"other":27,"r":165},{"tile":27,"other":247,"r":164},{"tile":247,"other":10,"r":165},{"tile":10,"other":247,"r":164},{"tile":0,"other":265,"r":166},{"tile":265,"other":0,"r":167},{"tile":265,"other":27,"r":167},{"tile":27,"other":265,"r":166},{"tile":265,"other":10,"r":167},{"tile":10,"other":265,"r":166},{"tile":0,"other":267,"r":168},{"tile":267,"other":0,"r":169},{"tile":267,"other":10,"r":169},{"tile":10,"other":267,"r":168},{"tile":267,"other":27,"r":169},{"tile":27,"other":267,"r":168},{"tile":0,"other":263,"r":170},{"tile":263,"other":0,"r":171},{"tile":263,"other":27,"r":171},{"tile":27,"other":263,"r":170},{"tile":263,"other":10,"r":171},{"tile":10,"other":263,"r":170},{"tile":0,"other":10,"r":172},{"tile":10,"other":0,"r":172},{"tile":0,"other":36,"r":173},{"tile":36,"other":0,"r":174},{"tile":36,"other":1,"r":174},{"tile":1,"other":36,"r":173},{"tile":0,"other":22,"r":175},{"tile":22,"other":0,"r":176},{"tile":22,"other":1,"r":176},{"tile":1,"other":22,"r":175},{"tile":0,"other":28,"r":177},{"tile":28,"other":0,"r":178},{"tile":28,"other":1,"r":178},{"tile":1,"other":28,"r":177},{"tile":0,"other":37,"r":179},{"tile":37,"other":0,"r":180},{"tile":37,"other":1,"r":180},{"tile":1,"other":37,"r":179},{"tile":0,"other":78,"r":181},{"tile":78,"other":0,"r":182},{"tile":78,"other":1,"r":182},{"tile":1,"other":78,"r":181},{"tile":0,"other":29,"r":183},{"tile":29,"other":0,"r":184},{"tile":29,"other":1,"r":184},{"tile":1,"other":29,"r":183},{"tile":0,"other":65,"r":185},{"tile":65,"other":0,"r":186},{"tile":65,"other":1,"r":186},{"tile":1,"other":65,"r":185},{"tile":0,"other":55,"r":187},{"tile":55,"other":0,"r":188},{"tile":55,"other":1,"r":188},{"tile":1,"other":55,"r":187},{"tile":0,"other":45,"r":189},{"tile":45,"other":0,"r":190},{"tile":45,"other":1,"r":190},{"tile":1,"other":45,"r":189},{"tile":0,"other":66,"r":191},{"tile":66,"other":0,"r":192},{"tile":66,"other":1,"r":192},{"tile":1,"other":66,"r":191},{"tile":0,"other":54,"r":193},{"tile":54,"other":0,"r":194},{"tile":54,"other":1,"r":194},{"tile":1,"other":54,"r":193},{"tile":0,"other":46,"r":195},{"tile":46,"other":0,"r":196},{"tile":46,"other":1,"r":196},{"tile":1,"other":46,"r":195},{"tile":0,"other":44,"r":197},{"tile":44,"other":0,"r":198},{"tile":44,"other":1,"r":198},{"tile":1,"other":44,"r":197},{"tile":0,"other":53,"r":199},{"tile":53,"other":0,"r":200},{"tile":53,"other":1,"r":200},{"tile":1,"other":53,"r":199},{"tile":0,"other":128,"r":201},{"tile":128,"other":0,"r":202},{"tile":128,"other":1,"r":202},{"tile":1,"other":128,"r":201},{"tile":0,"other":140,"r":203},{"tile":140,"other":0,"r":204},{"tile":140,"other":1,"r":204},{"tile":1,"other":140,"r":203},{"tile":0,"other":130,"r":205},{"tile":130,"other":0,"r":206},{"tile":130,"other":1,"r":206},{"tile":1,"other":130,"r":205},{"tile":0,"other":103,"r":207},{"tile":103,"other":0,"r":208},{"tile":103,"other":1,"r":208},{"tile":1,"other":103,"r":207},{"tile":0,"other":165,"r":209},{"tile":165,"other":0,"r":210},{"tile":165,"other":1,"r":210},{"tile":1,"other":165,"r":209},{"tile":0,"other":117,"r":211},{"tile":117,"other":0,"r":212},{"tile":117,"other":1,"r":212},{"tile":1,"other":117,"r":211},{"tile":0,"other":57,"r":213},{"tile":57,"other":0,"r":214},{"tile":57,"other":1,"r":214},{"tile":1,"other":57,"r":213},{"tile":0,"other":129,"r":215},{"tile":129,"other":0,"r":216},{"tile":129,"other":1,"r":216},{"tile":1,"other":129,"r":215},{"tile":0,"other":153,"r":217},{"tile":153,"other":0,"r":218},{"tile":153,"other":1,"r":218},{"tile":1,"other":153,"r":217},{"tile":0,"other":106,"r":219},{"tile":106,"other":0,"r":220},{"tile":106,"other":1,"r":220},{"tile":1,"other":106,"r":219},{"tile":0,"other":80,"r":221},{"tile":80,"other":0,"r":222},{"tile":80,"other":1,"r":222},{"tile":1,"other":80,"r":221},{"tile":0,"other":93,"r":223},{"tile":93,"other":0,"r":224},{"tile":93,"other":1,"r":224},{"tile":1,"other":93,"r":223},{"tile":0,"other":154,"r":225},{"tile":154,"other":0,"r":226},{"tile":154,"other":1,"r":226},{"tile":1,"other":154,"r":225},{"tile":0,"other":105,"r":227},{"tile":105,"other":0,"r":228},{"tile":105,"other":1,"r":228},{"tile":1,"other":105,"r":227},{"tile":0,"other":142,"r":229},{"tile":142,"other":0,"r":230},{"tile":142,"other":1,"r":230},{"tile":1,"other":142,"r":229},{"tile":0,"other":115,"r":231},{"tile":115,"other":0,"r":232},{"tile":115,"other":1,"r":232},{"tile":1,"other":115,"r":231},{"tile":0,"other":68,"r":233},{"tile":68,"other":0,"r":234},{"tile":68,"other":1,"r":234},{"tile":1,"other":68,"r":233},{"tile":0,"other":107,"r":235},{"tile":107,"other":0,"r":236},{"tile":107,"other":1,"r":236},{"tile":1,"other":107,"r":235},{"tile":0,"other":119,"r":237},{"tile":119,"other":0,"r":238},{"tile":119,"other":1,"r":238},{"tile":1,"other":119,"r":237},{"tile":0,"other":127,"r":239},{"tile":127,"other":0,"r":240},{"tile":127,"other":1,"r":240},{"tile":1,"other":127,"r":239},{"tile":0,"other":102,"r":241},{"tile":102,"other":0,"r":242},{"tile":102,"other":1,"r":242},{"tile":1,"other":102,"r":241},{"tile":0,"other":79,"r":243},{"tile":79,"other":0,"r":244},{"tile":79,"other":1,"r":244},{"tile":1,"other":79,"r":243},{"tile":0,"other":104,"r":245},{"tile":104,"other":0,"r":246},{"tile":104,"other":1,"r":246},{"tile":1,"other":104,"r":245},{"tile":0,"other":81,"r":247},{"tile":81,"other":0,"r":248},{"tile":81,"other":1,"r":248},{"tile":1,"other":81,"r":247},{"tile":0,"other":141,"r":249},{"tile":141,"other":0,"r":250},{"tile":141,"other":1,"r":250},{"tile":1,"other":141,"r":249},{"tile":0,"other":118,"r":251},{"tile":118,"other":0,"r":252},{"tile":118,"other":1,"r":252},{"tile":1,"other":118,"r":251},{"tile":0,"other":94,"r":253},{"tile":94,"other":0,"r":254},{"tile":94,"other":1,"r":254},{"tile":1,"other":94,"r":253},{"tile":0,"other":82,"r":255},{"tile":82,"other":0,"r":256},{"tile":82,"other":1,"r":256},{"tile":1,"other":82,"r":255},{"tile":0,"other":91,"r":257},{"tile":91,"other":0,"r":258},{"tile":91,"other":1,"r":258},{"tile":1,"other":91,"r":257},{"tile":0,"other":116,"r":259},{"tile":116,"other":0,"r":260},{"tile":116,"other":1,"r":260},{"tile":1,"other":116,"r":259},{"tile":0,"other":92,"r":261},{"tile":92,"other":0,"r":262},{"tile":92,"other":1,"r":262},{"tile":1,"other":92,"r":261},{"tile":0,"other":69,"r":263},{"tile":69,"other":0,"r":264},{"tile":69,"other":1,"r":264},{"tile":1,"other":69,"r":263},{"tile":0,"other":90,"r":265},{"tile":90,"other":0,"r":266},{"tile":90,"other":1,"r":266},{"tile":1,"other":90,"r":265},{"tile":0,"other":67,"r":267},{"tile":67,"other":0,"r":268},{"tile":67,"other":1,"r":268},{"tile":1,"other":67,"r":267},{"tile":0,"other":56,"r":269},{"tile":56,"other":0,"r":270},{"tile":56,"other":1,"r":270},{"tile":1,"other":56,"r":269},{"tile":0,"other":47,"r":271},{"tile":47,"other":0,"r":272},{"tile":47,"other":1,"r":272},{"tile":1,"other":47,"r":271},{"tile":0,"other":1,"r":273},{"tile":1,"other":0,"r":273},{"tile":0,"other":8,"r":274},{"tile":8,"other":0,"r":275},{"tile":0,"other":3,"r":276},{"tile":3,"other":0,"r":277},{"tile":0,"other":5,"r":278},{"tile":5,"other":0,"r":279},{"tile":0,"other":9,"r":280},{"tile":9,"other":0,"r":281},{"tile":0,"other":30,"r":282},{"tile":30,"other":0,"r":283},{"tile":0,"other":6,"r":284},{"tile":6,"other":0,"r":285},{"tile":0,"other":23,"r":286},{"tile":23,"other":0,"r":287},{"tile":0,"other":18,"r":288},{"tile":18,"other":0,"r":289},{"tile":0,"other":12,"r":290},{"tile":12,"other":0,"r":291},{"tile":0,"other":24,"r":292},{"tile":24,"other":0,"r":293},{"tile":0,"other":17,"r":294},{"tile":17,"other":0,"r":295},{"tile":0,"other":13,"r":296},{"tile":13,"other":0,"r":297},{"tile":0,"other":11,"r":298},{"tile":11,"other":0,"r":299},{"tile":0,"other":16,"r":300},{"tile":16,"other":0,"r":301},{"tile":0,"other":false,"r":302},{"tile":0,"other":146,"r":303},{"tile":146,"other":0,"r":304},{"tile":146,"other":27,"r":304},{"tile":27,"other":146,"r":303},{"tile":0,"other":134,"r":305},{"tile":134,"other":0,"r":306},{"tile":134,"other":27,"r":306},{"tile":27,"other":134,"r":305},{"tile":0,"other":136,"r":307},{"tile":136,"other":0,"r":308},{"tile":136,"other":27,"r":308},{"tile":27,"other":136,"r":307},{"tile":0,"other":147,"r":309},{"tile":147,"other":0,"r":310},{"tile":147,"other":27,"r":310},{"tile":27,"other":147,"r":309},{"tile":0,"other":160,"r":311},{"tile":160,"other":0,"r":312},{"tile":160,"other":27,"r":312},{"tile":27,"other":160,"r":311},{"tile":0,"other":135,"r":313},{"tile":135,"other":0,"r":314},{"tile":135,"other":27,"r":314},{"tile":27,"other":135,"r":313},{"tile":0,"other":148,"r":315},{"tile":148,"other":0,"r":316},{"tile":148,"other":27,"r":316},{"tile":27,"other":148,"r":315},{"tile":0,"other":159,"r":317},{"tile":159,"other":0,"r":318},{"tile":159,"other":27,"r":318},{"tile":27,"other":159,"r":317},{"tile":0,"other":112,"r":319},{"tile":112,"other":0,"r":320},{"tile":112,"other":27,"r":320},{"tile":27,"other":112,"r":319},{"tile":0,"other":171,"r":321},{"tile":171,"other":0,"r":322},{"tile":171,"other":27,"r":322},{"tile":27,"other":171,"r":321},{"tile":0,"other":124,"r":323},{"tile":124,"other":0,"r":324},{"tile":124,"other":27,"r":324},{"tile":27,"other":124,"r":323},{"tile":0,"other":111,"r":325},{"tile":111,"other":0,"r":326},{"tile":111,"other":27,"r":326},{"tile":27,"other":111,"r":325},{"tile":0,"other":99,"r":327},{"tile":99,"other":0,"r":328},{"tile":99,"other":27,"r":328},{"tile":27,"other":99,"r":327},{"tile":0,"other":123,"r":329},{"tile":123,"other":0,"r":330},{"tile":123,"other":27,"r":330},{"tile":27,"other":123,"r":329},{"tile":0,"other":27,"r":331},{"tile":27,"other":0,"r":331},{"tile":1,"other":85,"r":332},{"tile":85,"other":1,"r":333},{"tile":85,"other":10,"r":333},{"tile":10,"other":85,"r":332},{"tile":1,"other":62,"r":334},{"tile":62,"other":1,"r":335},{"tile":62,"other":10,"r":335},{"tile":10,"other":62,"r":334},{"tile":1,"other":73,"r":336},{"tile":73,"other":1,"r":337},{"tile":73,"other":10,"r":337},{"tile":10,"other":73,"r":336},{"tile":1,"other":86,"r":338},{"tile":86,"other":1,"r":339},{"tile":86,"other":10,"r":339},{"tile":10,"other":86,"r":338},{"tile":1,"other":133,"r":340},{"tile":133,"other":1,"r":341},{"tile":133,"other":10,"r":341},{"tile":10,"other":133,"r":340},{"tile":1,"other":74,"r":342},{"tile":74,"other":1,"r":343},{"tile":74,"other":10,"r":343},{"tile":10,"other":74,"r":342},{"tile":1,"other":121,"r":344},{"tile":121,"other":1,"r":345},{"tile":121,"other":10,"r":345},{"tile":10,"other":121,"r":344},{"tile":1,"other":110,"r":346},{"tile":110,"other":1,"r":347},{"tile":110,"other":10,"r":347},{"tile":10,"other":110,"r":346},{"tile":1,"other":97,"r":348},{"tile":97,"other":1,"r":349},{"tile":97,"other":10,"r":349},{"tile":10,"other":97,"r":348},{"tile":1,"other":122,"r":350},{"tile":122,"other":1,"r":351},{"tile":122,"other":10,"r":351},{"tile":10,"other":122,"r":350},{"tile":1,"other":109,"r":352},{"tile":109,"other":1,"r":353},{"tile":109,"other":10,"r":353},{"tile":10,"other":109,"r":352},{"tile":1,"other":98,"r":354},{"tile":98,"other":1,"r":355},{"tile":98,"other":10,"r":355},{"tile":10,"other":98,"r":354},{"tile":1,"other":96,"r":356},{"tile":96,"other":1,"r":357},{"tile":96,"other":10,"r":357},{"tile":10,"other":96,"r":356},{"tile":1,"other":108,"r":358},{"tile":108,"other":1,"r":359},{"tile":108,"other":10,"r":359},{"tile":10,"other":108,"r":358},{"tile":1,"other":10,"r":360},{"tile":10,"other":1,"r":360},{"tile":1,"other":25,"r":361},{"tile":25,"other":1,"r":362},{"tile":1,"other":14,"r":363},{"tile":14,"other":1,"r":364},{"tile":1,"other":19,"r":365},{"tile":19,"other":1,"r":366},{"tile":1,"other":26,"r":367},{"tile":26,"other":1,"r":368},{"tile":1,"other":58,"r":369},{"tile":58,"other":1,"r":370},{"tile":1,"other":20,"r":371},{"tile":20,"other":1,"r":372},{"tile":1,"other":48,"r":373},{"tile":48,"other":1,"r":374},{"tile":1,"other":40,"r":375},{"tile":40,"other":1,"r":376},{"tile":1,"other":32,"r":377},{"tile":32,"other":1,"r":378},{"tile":1,"other":49,"r":379},{"tile":49,"other":1,"r":380},{"tile":1,"other":39,"r":381},{"tile":39,"other":1,"r":382},{"tile":1,"other":33,"r":383},{"tile":33,"other":1,"r":384},{"tile":1,"other":31,"r":385},{"tile":31,"other":1,"r":386},{"tile":1,"other":38,"r":387},{"tile":38,"other":1,"r":388},{"tile":1,"other":false,"r":389},{"tile":10,"other":234,"r":390},{"tile":234,"other":10,"r":391},{"tile":234,"other":100,"r":391},{"tile":100,"other":234,"r":390},{"tile":10,"other":213,"r":392},{"tile":213,"other":10,"r":393},{"tile":213,"other":100,"r":393},{"tile":100,"other":213,"r":392},{"tile":10,"other":224,"r":394},{"tile":224,"other":10,"r":395},{"tile":224,"other":100,"r":395},{"tile":100,"other":224,"r":394},{"tile":10,"other":235,"r":396},{"tile":235,"other":10,"r":397},{"tile":235,"other":100,"r":397},{"tile":100,"other":235,"r":396},{"tile":10,"other":266,"r":398},{"tile":266,"other":10,"r":399},{"tile":266,"other":100,"r":399},{"tile":100,"other":266,"r":398},{"tile":10,"other":225,"r":400},{"tile":225,"other":10,"r":401},{"tile":225,"other":100,"r":401},{"tile":100,"other":225,"r":400},{"tile":10,"other":260,"r":402},{"tile":260,"other":10,"r":403},{"tile":260,"other":100,"r":403},{"tile":100,"other":260,"r":402},{"tile":10,"other":254,"r":404},{"tile":254,"other":10,"r":405},{"tile":254,"other":100,"r":405},{"tile":100,"other":254,"r":404},{"tile":10,"other":244,"r":406},{"tile":244,"other":10,"r":407},{"tile":244,"other":100,"r":407},{"tile":100,"other":244,"r":406},{"tile":10,"other":261,"r":408},{"tile":261,"other":10,"r":409},{"tile":261,"other":100,"r":409},{"tile":100,"other":261,"r":408},{"tile":10,"other":253,"r":410},{"tile":253,"other":10,"r":411},{"tile":253,"other":100,"r":411},{"tile":100,"other":253,"r":410},{"tile":10,"other":245,"r":412},{"tile":245,"other":10,"r":413},{"tile":245,"other":100,"r":413},{"tile":100,"other":245,"r":412},{"tile":10,"other":243,"r":414},{"tile":243,"other":10,"r":415},{"tile":243,"other":100,"r":415},{"tile":100,"other":243,"r":414},{"tile":10,"other":252,"r":416},{"tile":252,"other":10,"r":417},{"tile":252,"other":100,"r":417},{"tile":100,"other":252,"r":416},{"tile":10,"other":100,"r":418},{"tile":100,"other":10,"r":418},{"tile":10,"other":184,"r":419},{"tile":184,"other":10,"r":420},{"tile":184,"other":27,"r":420},{"tile":27,"other":184,"r":419},{"tile":10,"other":172,"r":421},{"tile":172,"other":10,"r":422},{"tile":172,"other":27,"r":422},{"tile":27,"other":172,"r":421},{"tile":10,"other":174,"r":423},{"tile":174,"other":10,"r":424},{"tile":174,"other":27,"r":424},{"tile":27,"other":174,"r":423},{"tile":10,"other":185,"r":425},{"tile":185,"other":10,"r":426},{"tile":185,"other":27,"r":426},{"tile":27,"other":185,"r":425},{"tile":10,"other":198,"r":427},{"tile":198,"other":10,"r":428},{"tile":198,"other":27,"r":428},{"tile":27,"other":198,"r":427},{"tile":10,"other":173,"r":429},{"tile":173,"other":10,"r":430},{"tile":173,"other":27,"r":430},{"tile":27,"other":173,"r":429},{"tile":10,"other":186,"r":431},{"tile":186,"other":10,"r":432},{"tile":186,"other":27,"r":432},{"tile":27,"other":186,"r":431},{"tile":10,"other":197,"r":433},{"tile":197,"other":10,"r":434},{"tile":197,"other":27,"r":434},{"tile":27,"other":197,"r":433},{"tile":10,"other":150,"r":435},{"tile":150,"other":10,"r":436},{"tile":150,"other":27,"r":436},{"tile":27,"other":150,"r":435},{"tile":10,"other":209,"r":437},{"tile":209,"other":10,"r":438},{"tile":209,"other":27,"r":438},{"tile":27,"other":209,"r":437},{"tile":10,"other":162,"r":439},{"tile":162,"other":10,"r":440},{"tile":162,"other":27,"r":440},{"tile":27,"other":162,"r":439},{"tile":10,"other":149,"r":441},{"tile":149,"other":10,"r":442},{"tile":149,"other":27,"r":442},{"tile":27,"other":149,"r":441},{"tile":10,"other":137,"r":443},{"tile":137,"other":10,"r":444},{"tile":137,"other":27,"r":444},{"tile":27,"other":137,"r":443},{"tile":10,"other":161,"r":445},{"tile":161,"other":10,"r":446},{"tile":161,"other":27,"r":446},{"tile":27,"other":161,"r":445},{"tile":10,"other":27,"r":447},{"tile":27,"other":10,"r":447},{"tile":87,"other":221,"r":448},{"tile":221,"other":87,"r":449},{"tile":221,"other":100,"r":449},{"tile":100,"other":221,"r":448},{"tile":87,"other":210,"r":450},{"tile":210,"other":87,"r":451},{"tile":210,"other":100,"r":451},{"tile":100,"other":210,"r":450},{"tile":87,"other":212,"r":452},{"tile":212,"other":87,"r":453},{"tile":212,"other":100,"r":453},{"tile":100,"other":212,"r":452},{"tile":87,"other":222,"r":454},{"tile":222,"other":87,"r":455},{"tile":222,"other":100,"r":455},{"tile":100,"other":222,"r":454},{"tile":87,"other":233,"r":456},{"tile":233,"other":87,"r":457},{"tile":233,"other":100,"r":457},{"tile":100,"other":233,"r":456},{"tile":87,"other":211,"r":458},{"tile":211,"other":87,"r":459},{"tile":211,"other":100,"r":459},{"tile":100,"other":211,"r":458},{"tile":87,"other":223,"r":460},{"tile":223,"other":87,"r":461},{"tile":223,"other":100,"r":461},{"tile":100,"other":223,"r":460},{"tile":87,"other":232,"r":462},{"tile":232,"other":87,"r":463},{"tile":232,"other":100,"r":463},{"tile":100,"other":232,"r":462},{"tile":87,"other":188,"r":464},{"tile":188,"other":87,"r":465},{"tile":188,"other":100,"r":465},{"tile":100,"other":188,"r":464},{"tile":87,"other":242,"r":466},{"tile":242,"other":87,"r":467},{"tile":242,"other":100,"r":467},{"tile":100,"other":242,"r":466},{"tile":87,"other":200,"r":468},{"tile":200,"other":87,"r":469},{"tile":200,"other":100,"r":469},{"tile":100,"other":200,"r":468},{"tile":87,"other":187,"r":470},{"tile":187,"other":87,"r":471},{"tile":187,"other":100,"r":471},{"tile":100,"other":187,"r":470},{"tile":87,"other":175,"r":472},{"tile":175,"other":87,"r":473},{"tile":175,"other":100,"r":473},{"tile":100,"other":175,"r":472},{"tile":87,"other":199,"r":474},{"tile":199,"other":87,"r":475},{"tile":199,"other":100,"r":475},{"tile":100,"other":199,"r":474},{"tile":87,"other":100,"r":476},{"tile":100,"other":87,"r":476}],"tiles":[{"type":"base","sourceID":0},{"type":"base","sourceID":1},{"type":"base","sourceID":2},{"type":"wang"},{"type":"base","sourceID":3},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":4},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":5},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":6},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":7},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":8},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":9},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":10},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":11},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":12},{"type":"base","sourceID":0},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":13},{"type":"base","sourceID":8},{"type":"base","sourceID":1},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":14},{"type":"base","sourceID":11},{"type":"base","sourceID":5},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":15},{"type":"base","sourceID":12},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":16},{"type":"base","sourceID":13},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":17},{"type":"base","sourceID":14},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":18},{"type":"base","sourceID":15},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":19},{"type":"base","sourceID":18},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":20},{"type":"base","sourceID":19},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":21},{"type":"base","sourceID":20},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":22},{"type":"base","sourceID":21},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":23},{"type":"base","sourceID":22},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":23},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"}],"set":[{"pos":{"x":6,"y":2},"tileID":0},{"pos":{"x":7,"y":2},"tileID":1},{"pos":{"x":8,"y":2},"tileID":2},{"pos":{"x":6,"y":4},"tileID":3},{"pos":{"x":9,"y":2},"tileID":4},{"pos":{"x":7,"y":4},"tileID":5},{"pos":{"x":6,"y":5},"tileID":6},{"pos":{"x":10,"y":2},"tileID":7},{"pos":{"x":8,"y":4},"tileID":8},{"pos":{"x":6,"y":6},"tileID":9},{"pos":{"x":11,"y":2},"tileID":10},{"pos":{"x":9,"y":4},"tileID":11},{"pos":{"x":8,"y":5},"tileID":12},{"pos":{"x":7,"y":6},"tileID":13},{"pos":{"x":6,"y":7},"tileID":14},{"pos":{"x":12,"y":2},"tileID":15},{"pos":{"x":10,"y":4},"tileID":16},{"pos":{"x":9,"y":5},"tileID":17},{"pos":{"x":8,"y":6},"tileID":18},{"pos":{"x":7,"y":7},"tileID":19},{"pos":{"x":6,"y":8},"tileID":20},{"pos":{"x":13,"y":2},"tileID":21},{"pos":{"x":11,"y":4},"tileID":22},{"pos":{"x":10,"y":5},"tileID":23},{"pos":{"x":9,"y":6},"tileID":24},{"pos":{"x":8,"y":7},"tileID":25},{"pos":{"x":6,"y":9},"tileID":26},{"pos":{"x":14,"y":2},"tileID":27},{"pos":{"x":12,"y":4},"tileID":28},{"pos":{"x":11,"y":5},"tileID":29},{"pos":{"x":10,"y":6},"tileID":30},{"pos":{"x":9,"y":7},"tileID":31},{"pos":{"x":8,"y":8},"tileID":32},{"pos":{"x":7,"y":9},"tileID":33},{"pos":{"x":6,"y":10},"tileID":34},{"pos":{"x":15,"y":2},"tileID":35},{"pos":{"x":13,"y":4},"tileID":36},{"pos":{"x":11,"y":6},"tileID":37},{"pos":{"x":10,"y":7},"tileID":38},{"pos":{"x":9,"y":8},"tileID":39},{"pos":{"x":8,"y":9},"tileID":40},{"pos":{"x":7,"y":10},"tileID":41},{"pos":{"x":6,"y":11},"tileID":42},{"pos":{"x":16,"y":2},"tileID":43},{"pos":{"x":14,"y":4},"tileID":44},{"pos":{"x":13,"y":5},"tileID":45},{"pos":{"x":12,"y":6},"tileID":46},{"pos":{"x":11,"y":7},"tileID":47},{"pos":{"x":10,"y":8},"tileID":48},{"pos":{"x":9,"y":9},"tileID":49},{"pos":{"x":8,"y":10},"tileID":50},{"pos":{"x":6,"y":12},"tileID":51},{"pos":{"x":17,"y":2},"tileID":52},{"pos":{"x":15,"y":4},"tileID":53},{"pos":{"x":14,"y":5},"tileID":54},{"pos":{"x":13,"y":6},"tileID":55},{"pos":{"x":12,"y":7},"tileID":56},{"pos":{"x":11,"y":8},"tileID":57},{"pos":{"x":10,"y":9},"tileID":58},{"pos":{"x":9,"y":10},"tileID":59},{"pos":{"x":8,"y":11},"tileID":60},{"pos":{"x":7,"y":12},"tileID":61},{"pos":{"x":6,"y":13},"tileID":62},{"pos":{"x":18,"y":2},"tileID":63},{"pos":{"x":16,"y":4},"tileID":64},{"pos":{"x":15,"y":5},"tileID":65},{"pos":{"x":14,"y":6},"tileID":66},{"pos":{"x":13,"y":7},"tileID":67},{"pos":{"x":12,"y":8},"tileID":68},{"pos":{"x":11,"y":9},"tileID":69},{"pos":{"x":10,"y":10},"tileID":70},{"pos":{"x":9,"y":11},"tileID":71},{"pos":{"x":8,"y":12},"tileID":72},{"pos":{"x":7,"y":13},"tileID":73},{"pos":{"x":6,"y":14},"tileID":74},{"pos":{"x":19,"y":2},"tileID":75},{"pos":{"x":17,"y":4},"tileID":76},{"pos":{"x":16,"y":5},"tileID":77},{"pos":{"x":15,"y":6},"tileID":78},{"pos":{"x":14,"y":7},"tileID":79},{"pos":{"x":13,"y":8},"tileID":80},{"pos":{"x":12,"y":9},"tileID":81},{"pos":{"x":11,"y":10},"tileID":82},{"pos":{"x":10,"y":11},"tileID":83},{"pos":{"x":9,"y":12},"tileID":84},{"pos":{"x":8,"y":13},"tileID":85},{"pos":{"x":6,"y":15},"tileID":86},{"pos":{"x":20,"y":2},"tileID":87},{"pos":{"x":17,"y":5},"tileID":88},{"pos":{"x":16,"y":6},"tileID":89},{"pos":{"x":15,"y":7},"tileID":90},{"pos":{"x":14,"y":8},"tileID":91},{"pos":{"x":13,"y":9},"tileID":92},{"pos":{"x":12,"y":10},"tileID":93},{"pos":{"x":11,"y":11},"tileID":94},{"pos":{"x":10,"y":12},"tileID":95},{"pos":{"x":9,"y":13},"tileID":96},{"pos":{"x":8,"y":14},"tileID":97},{"pos":{"x":7,"y":15},"tileID":98},{"pos":{"x":6,"y":16},"tileID":99},{"pos":{"x":21,"y":2},"tileID":100},{"pos":{"x":17,"y":6},"tileID":101},{"pos":{"x":16,"y":7},"tileID":102},{"pos":{"x":15,"y":8},"tileID":103},{"pos":{"x":14,"y":9},"tileID":104},{"pos":{"x":13,"y":10},"tileID":105},{"pos":{"x":12,"y":11},"tileID":106},{"pos":{"x":11,"y":12},"tileID":107},{"pos":{"x":10,"y":13},"tileID":108},{"pos":{"x":9,"y":14},"tileID":109},{"pos":{"x":8,"y":15},"tileID":110},{"pos":{"x":7,"y":16},"tileID":111},{"pos":{"x":6,"y":17},"tileID":112},{"pos":{"x":22,"y":2},"tileID":113},{"pos":{"x":17,"y":7},"tileID":114},{"pos":{"x":16,"y":8},"tileID":115},{"pos":{"x":15,"y":9},"tileID":116},{"pos":{"x":14,"y":10},"tileID":117},{"pos":{"x":13,"y":11},"tileID":118},{"pos":{"x":12,"y":12},"tileID":119},{"pos":{"x":11,"y":13},"tileID":120},{"pos":{"x":10,"y":14},"tileID":121},{"pos":{"x":9,"y":15},"tileID":122},{"pos":{"x":8,"y":16},"tileID":123},{"pos":{"x":6,"y":18},"tileID":124},{"pos":{"x":23,"y":2},"tileID":125},{"pos":{"x":17,"y":8},"tileID":126},{"pos":{"x":16,"y":9},"tileID":127},{"pos":{"x":15,"y":10},"tileID":128},{"pos":{"x":14,"y":11},"tileID":129},{"pos":{"x":13,"y":12},"tileID":130},{"pos":{"x":12,"y":13},"tileID":131},{"pos":{"x":11,"y":14},"tileID":132},{"pos":{"x":10,"y":15},"tileID":133},{"pos":{"x":9,"y":16},"tileID":134},{"pos":{"x":8,"y":17},"tileID":135},{"pos":{"x":7,"y":18},"tileID":136},{"pos":{"x":6,"y":19},"tileID":137},{"pos":{"x":24,"y":2},"tileID":138},{"pos":{"x":17,"y":9},"tileID":139},{"pos":{"x":16,"y":10},"tileID":140},{"pos":{"x":15,"y":11},"tileID":141},{"pos":{"x":14,"y":12},"tileID":142},{"pos":{"x":13,"y":13},"tileID":143},{"pos":{"x":12,"y":14},"tileID":144},{"pos":{"x":11,"y":15},"tileID":145},{"pos":{"x":10,"y":16},"tileID":146},{"pos":{"x":9,"y":17},"tileID":147},{"pos":{"x":8,"y":18},"tileID":148},{"pos":{"x":7,"y":19},"tileID":149},{"pos":{"x":6,"y":20},"tileID":150},{"pos":{"x":25,"y":2},"tileID":151},{"pos":{"x":17,"y":10},"tileID":152},{"pos":{"x":16,"y":11},"tileID":153},{"pos":{"x":15,"y":12},"tileID":154},{"pos":{"x":14,"y":13},"tileID":155},{"pos":{"x":13,"y":14},"tileID":156},{"pos":{"x":12,"y":15},"tileID":157},{"pos":{"x":11,"y":16},"tileID":158},{"pos":{"x":10,"y":17},"tileID":159},{"pos":{"x":9,"y":18},"tileID":160},{"pos":{"x":8,"y":19},"tileID":161},{"pos":{"x":6,"y":21},"tileID":162},{"pos":{"x":26,"y":2},"tileID":163},{"pos":{"x":17,"y":11},"tileID":164},{"pos":{"x":16,"y":12},"tileID":165},{"pos":{"x":15,"y":13},"tileID":166},{"pos":{"x":14,"y":14},"tileID":167},{"pos":{"x":13,"y":15},"tileID":168},{"pos":{"x":12,"y":16},"tileID":169},{"pos":{"x":11,"y":17},"tileID":170},{"pos":{"x":10,"y":18},"tileID":171},{"pos":{"x":9,"y":19},"tileID":172},{"pos":{"x":8,"y":20},"tileID":173},{"pos":{"x":7,"y":21},"tileID":174},{"pos":{"x":6,"y":22},"tileID":175},{"pos":{"x":27,"y":2},"tileID":176},{"pos":{"x":17,"y":12},"tileID":177},{"pos":{"x":16,"y":13},"tileID":178},{"pos":{"x":15,"y":14},"tileID":179},{"pos":{"x":14,"y":15},"tileID":180},{"pos":{"x":13,"y":16},"tileID":181},{"pos":{"x":12,"y":17},"tileID":182},{"pos":{"x":11,"y":18},"tileID":183},{"pos":{"x":10,"y":19},"tileID":184},{"pos":{"x":9,"y":20},"tileID":185},{"pos":{"x":8,"y":21},"tileID":186},{"pos":{"x":7,"y":22},"tileID":187},{"pos":{"x":6,"y":23},"tileID":188},{"pos":{"x":28,"y":2},"tileID":189},{"pos":{"x":17,"y":13},"tileID":190},{"pos":{"x":16,"y":14},"tileID":191},{"pos":{"x":15,"y":15},"tileID":192},{"pos":{"x":14,"y":16},"tileID":193},{"pos":{"x":13,"y":17},"tileID":194},{"pos":{"x":12,"y":18},"tileID":195},{"pos":{"x":11,"y":19},"tileID":196},{"pos":{"x":10,"y":20},"tileID":197},{"pos":{"x":9,"y":21},"tileID":198},{"pos":{"x":8,"y":22},"tileID":199},{"pos":{"x":6,"y":24},"tileID":200},{"pos":{"x":29,"y":2},"tileID":201},{"pos":{"x":17,"y":14},"tileID":202},{"pos":{"x":16,"y":15},"tileID":203},{"pos":{"x":15,"y":16},"tileID":204},{"pos":{"x":14,"y":17},"tileID":205},{"pos":{"x":13,"y":18},"tileID":206},{"pos":{"x":12,"y":19},"tileID":207},{"pos":{"x":11,"y":20},"tileID":208},{"pos":{"x":10,"y":21},"tileID":209},{"pos":{"x":9,"y":22},"tileID":210},{"pos":{"x":8,"y":23},"tileID":211},{"pos":{"x":7,"y":24},"tileID":212},{"pos":{"x":6,"y":25},"tileID":213},{"pos":{"x":17,"y":15},"tileID":214},{"pos":{"x":16,"y":16},"tileID":215},{"pos":{"x":15,"y":17},"tileID":216},{"pos":{"x":14,"y":18},"tileID":217},{"pos":{"x":13,"y":19},"tileID":218},{"pos":{"x":12,"y":20},"tileID":219},{"pos":{"x":11,"y":21},"tileID":220},{"pos":{"x":10,"y":22},"tileID":221},{"pos":{"x":9,"y":23},"tileID":222},{"pos":{"x":8,"y":24},"tileID":223},{"pos":{"x":7,"y":25},"tileID":224},{"pos":{"x":6,"y":26},"tileID":225},{"pos":{"x":16,"y":17},"tileID":226},{"pos":{"x":15,"y":18},"tileID":227},{"pos":{"x":14,"y":19},"tileID":228},{"pos":{"x":13,"y":20},"tileID":229},{"pos":{"x":12,"y":21},"tileID":230},{"pos":{"x":11,"y":22},"tileID":231},{"pos":{"x":10,"y":23},"tileID":232},{"pos":{"x":9,"y":24},"tileID":233},{"pos":{"x":8,"y":25},"tileID":234},{"pos":{"x":6,"y":27},"tileID":235},{"pos":{"x":16,"y":18},"tileID":236},{"pos":{"x":15,"y":19},"tileID":237},{"pos":{"x":14,"y":20},"tileID":238},{"pos":{"x":13,"y":21},"tileID":239},{"pos":{"x":12,"y":22},"tileID":240},{"pos":{"x":11,"y":23},"tileID":241},{"pos":{"x":10,"y":24},"tileID":242},{"pos":{"x":9,"y":25},"tileID":243},{"pos":{"x":8,"y":26},"tileID":244},{"pos":{"x":7,"y":27},"tileID":245},{"pos":{"x":16,"y":19},"tileID":246},{"pos":{"x":15,"y":20},"tileID":247},{"pos":{"x":14,"y":21},"tileID":248},{"pos":{"x":13,"y":22},"tileID":249},{"pos":{"x":12,"y":23},"tileID":250},{"pos":{"x":11,"y":24},"tileID":251},{"pos":{"x":10,"y":25},"tileID":252},{"pos":{"x":9,"y":26},"tileID":253},{"pos":{"x":8,"y":27},"tileID":254},{"pos":{"x":16,"y":20},"tileID":255},{"pos":{"x":15,"y":21},"tileID":256},{"pos":{"x":14,"y":22},"tileID":257},{"pos":{"x":13,"y":23},"tileID":258},{"pos":{"x":12,"y":24},"tileID":259},{"pos":{"x":10,"y":26},"tileID":260},{"pos":{"x":9,"y":27},"tileID":261},{"pos":{"x":16,"y":21},"tileID":262},{"pos":{"x":15,"y":22},"tileID":263},{"pos":{"x":14,"y":23},"tileID":264},{"pos":{"x":13,"y":24},"tileID":265},{"pos":{"x":10,"y":27},"tileID":266},{"pos":{"x":16,"y":22},"tileID":267},{"pos":{"x":15,"y":23},"tileID":268},{"pos":{"x":14,"y":24},"tileID":269},{"pos":{"x":16,"y":23},"tileID":270},{"pos":{"x":15,"y":24},"tileID":271},{"pos":{"x":16,"y":24},"tileID":272}],"set_regions":[{"type":"sync","filename":"..\\..\\spritesheets\\tiles\\tiles.png","bounds":{"x0":6,"y0":2,"x1":29,"y1":2},"syncTiles":[{"type":"tile","data":0,"pos":{"x":0,"y":0}},{"type":"tile","data":1,"pos":{"x":1,"y":0}},{"type":"tile","data":2,"pos":{"x":2,"y":0}},{"type":"tile","data":4,"pos":{"x":3,"y":0}},{"type":"tile","data":7,"pos":{"x":4,"y":0}},{"type":"tile","data":10,"pos":{"x":5,"y":0}},{"type":"tile","data":15,"pos":{"x":6,"y":0}},{"type":"tile","data":21,"pos":{"x":7,"y":0}},{"type":"tile","data":27,"pos":{"x":8,"y":0}},{"type":"tile","data":35,"pos":{"x":9,"y":0}},{"type":"tile","data":43,"pos":{"x":10,"y":0}},{"type":"tile","data":52,"pos":{"x":11,"y":0}},{"type":"tile","data":63,"pos":{"x":12,"y":0}},{"type":"tile","data":75,"pos":{"x":13,"y":0}},{"type":"tile","data":87,"pos":{"x":14,"y":0}},{"type":"tile","data":100,"pos":{"x":15,"y":0}},{"type":"tile","data":113,"pos":{"x":16,"y":0}},{"type":"tile","data":125,"pos":{"x":17,"y":0}},{"type":"tile","data":138,"pos":{"x":18,"y":0}},{"type":"tile","data":151,"pos":{"x":19,"y":0}},{"type":"tile","data":163,"pos":{"x":20,"y":0}},{"type":"tile","data":176,"pos":{"x":21,"y":0}},{"type":"tile","data":189,"pos":{"x":22,"y":0}},{"type":"tile","data":201,"pos":{"x":23,"y":0}}]}],"sandbox_layers":[{"visible":true,"name":"Unnamed Layer"}],"sandbox":[],"extra":{"set":{"camX":450.9375,"camY":-35.3125,"camZoom":0},"sandbox":{"camX":-32,"camY":-64,"camZoom":1}}} \ No newline at end of file +{"version":"2.1.0-pro","tilewidth":64,"tileheight":32,"tileshape":1,"sources":[{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAEnklEQVRoQ8VZy24cRRQ91dWPTDKJ7UywZAkChqAoKBJIZIHEmg1rPgW+gl9hxYJNfgGJSGSDHBHFwjFxMLGJh3E/C93qrqGmu7qrZqanXSt7uqaqzrnnnnurh+GKRvbsB0Fbp8+fI9jfh3/vG3YVRxl8UwW8DezQRAxGgA14nZChiNg4AXOp5yH8NF7AmQURAp7INKBBqTA0ERsjYPb4e5njBEpcyj9BgOVnPFk63TeliN4JMEr9IgfGvAFaGaCJjTgPgTwHOIc4+xsiiTHam/Rulr0RsGyOd0lgdnwKFkbwfAYx3pFTi5NjSYAafSlibQLagKd52JQ6KUENgyLo0eXrM8DzwcZjwA8RWdJlXSJWJmD67CeZ2OHTxxCjW0g/+HzhsCrvWVZIyEl+KaNahNcRzWYlDTUSCDzbmkjZ24D3ZZZLEzB39VkG//AJRHQD6d6DxWhVkY7HN+ElMyC7AD86AIIIyZ2PwEbjBkApe5+D3d5tB68rqEVJyyrCmQBd6mnCwF/8Io+Qv/uwjKqSamV4ZGJe8i/4H08BjwNFJf8gQvrep0YC9BxveIQCr6vGYK6qpI6++s4Jm3WSKccVAQQ+GPlGPyMC/FcH8N6+Rnb3M4AHZQkMy5KoD4p+J3ia3FJJusyUntkU0UrAKq4uSxcgo6v/bTuky3MivRDCyRhN67UR0SBAb2DmC3W4NwGlOl0iDxv5TdFVwxrlaqIkL0sAxuHlMVCcg//5snxa5GDxFOzhl/LfOOHSNKlnEOf/73XtnW0jr3Ui5gS0NjC0jKFk6cDZzS1A5PLAxelJY2MX4NNXZ/C3t2WEyTu8N0dIgy2E02Mgz8CyGOz+o4W1Cbx4ew4UGfIC4B7AbpVrNKqIFkQy5xv3vpbYWavUTaZDjFcdGm0sga9QshQK5fxU9wmEHFUPEBw+AaPPCPwnXxijeXl6Me8QO9NIx1LDZSagA7ySO9u+vXStrhsf9QWy4WGljClqKmVsqnGdZ/OX7hSofTuOAfHPGdryy7aZHvnC4/B3JohCrTt0XaBjnjJfdY9oa6iUFzRMkFKi7XpKeeoVub1kWYCQdK9Nxj3AXVxi7kuUOlVaiWzxvK0mWD+NyRuc6nW1UNcdnw66bKvrwlaXJziXQRsRadUCy3l5aVzZ/qPFbtDltAPNWbkRaiNC/PYzhOcj2/0YwdGvcpq4vmVsb9UaKi/VvV597u3uyZJHoyDJauXLphKlMPruOm+SrK1wnYj0x28FRbytBa7P1/NSmae8J+SpnMpeHoCFZZuc3flQmqL6Dr0EoWGrCPqetojXz7c0AWoB11aZ8pL6BeX2qsvz8in4yWEJfOfu/KpMLz6cQNe602WBKxwrE1Anok2SOgHqhkhdHpu+kY0OXZToNukEvNbN0RlUR7eqpaxNQJciqGpQnivHp9bV/+t3ZJP3EZXvR+fDWGEM939qY/sA3psC6szrqVEH5XpDlK/TqrdGCrDaZ92I9+YBNsm5eoRpHf01esHL9w19A9+YAroUYSNNPScC6DcEAr8p4IMR4FI1TL8PrOrqriQPToALETRnKOBXRoCpfF7lz+P/ATHAWEWDxClbAAAAAElFTkSuQmCC"},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAGxUlEQVRoQ8VZW28bRRg9e/XdceKk15A0rQoCUYTEU4V445k3HvgF/DQkeOcJHhESEhJCiFJa0iRKkzZp7MSXrL2XWXRmO8544ktuTj8psr07uzvnzPed78zGwjuKp798l+qP/uDzb6x3MZVrf6gCvnxzboB3+/XR4Pt1E3FtBOgrrsDrwM3Vvy4iZk6AmeqT0nyteoQXrZPM4NhZEzEzAn796YfUdy0s131svQlR9SN0+jZ8VyARFgpeJgFBZMG3Y6zNdeHY6SkCFGGzIuLKCSDwj5YLiJMUsUixfxgiTSPcq7YRC1viSVIb64dl+f1+rYOcE8O1Umx1qqcSpNcHVr0OHAj81V/A4y+/vtI5X9nNCPyTeyUJoNdPsNvow7MjAAL1fF+CPwo9NAJfjvns5sEArJn2Ogt1cSx/5hDLzx07I+mqMuLSBLDGW6GHlUUfrm1hfa8PO01QzsUSuJy8E2OjVUEQOUhSS4Jv9PJ42S6gnBNyzHHiQ4gUZY+kncRRz5E/5vLJSPm4LBEXJkAXt07koVYQCEIbQQzknQi3S4EEvtOtDCauNKDqxTjo+YiFJYEpAvOeDdfNyoTBLsFrGIooftdb6J8bXXn+oqVxbgK6z39MzfZFABQ5fqZC4NFiE93Yk3WuVi4JQ9SdGGnBwX6QQxjbQ6AIgl3AjH6SEZBzBKLCyuC0Ar5QiAfZE8bpuYk4MwEEzqc32yF2D2MJmNENbTipQAxbitV6WMHD+RbWDysDgEzjVa+NnCWwkVQGHYBpzxBxjNW5bCV10kbm/NuDiqzAW5aCy9g6CDPxTc5OxFQCFHAK23+vAjiOjSQRcmWp0IvOMVwLEtxrO1N2AlYrf6fUlsdUKbBcVJ3Xqplobu8HsgWyPeqprgi4I1oD8dMzRRfPW/UKepHA5l5P6oyKaaUxlgDTwKj05s0dK5V/y25nCLi+YsyMh/NH+LeRGRsCG1XrXrA1tvffFB2ZWX0BvIwrklT6hge11pC2mJnCBaj5fSwghAshW2jli29HYj11cJRzIxjGittB3k2RFoQERjL459tCfqpV58TTkoUXRxWU/EzlR8Uo58esuuVmrc+xgJdRUZJAAglspXosNcTPmsNQqMyjcN5yOvLcm6SIfO5kmNk1BgSMs6xhAlC1c24C1xYouZFMVxUUKfZ4nmMk7eyWeq3zdyQ8vLeUlyr/z1Yb92vtUzrBcXfdtpw0QwFXzyJhrdDHdrs40BGeI3AaKoauIVw41WlMshQR1jjgfBjBNYICeoJ1nyKBg07oDu7FlWeKqcmqE8LKlofeYKcZSVG6fyMH17Hw6qAtW5tOgBLJohUP1bo+aZUtur7o51kauoYQ/Eq1O1iwcWZrJAHqYZyoKU4UJBUJbLlKemwmcxApJOAgTHDYibF2uyh7uh43Cl08a1bHGhz2enWN0hPdU5grapJFMhhPm3ND2cJjOoZTJaDayyjG1IXKjioDVC7msdfsIhQe7i3lkM850g5v7PdPOTtOgM/4Y29hCLxubjhGgeeKf1g/xLPm3JCemHNRpfDpjYYEPsle8/ygBEwmz7p95cSKvo2lmg86uL+3A3kr7gdoUgpuApFaSN/KhWpNBS/BUqGPrVbxFAFmlvAZ9BR7QdYu9dVTi6COq7ElL5bkskvpwqzGjRXB8xJBUSP4atqEY2XgVShh1I9xB7h5VMLdSnBKxcfVtTmnUauuVp5gP15sYr2RWW/6k5J94k3G7RmmGqFRGcHUZ6oXk4YEb6ab8u8mgPcXMh3Qa5nitVw5RtUPJ6buJPCqA+x2C1hIj5GzMbX/q7lNJUAN1IlQkz7oFUyMQ7+5srorY9dgsKfzHgyC32qVBvU9yhuMA8/reZ/VagfbnZLcXzzwWnjSr515T3BmAkwizLRlVti2JVse9wnK0LC1HacuNqPMyTGYIfT+5m7RZJPjRlljve65+jqB590en5uAURnBY/TiBM9eT7MT7O7KoQd2cWhvQGPFrTJTfpJSK9envzPQCVLd6vfXdXl4mucfl6oXJsAkQu/bTNkn4bwcor/IYD+/Uw6w0ylMtMi8jpuobuQPvTQxt8sEf1Hg59aAicVOw2H8o2PU+LMYGgLvJ660uwz18tS833lTfWYZYN54HBGThFOtbDdysdnKttSzBn7lGTCNCNb+crk7ZGp4je48J/mBq1pxc56X1oCzlkY9H0gjZKo6CWAt07mZmsHfswI+8wwwifnt5+9T882uWn1uWNZyfSRxjFfIbO+sgV87AWbX0Al6Lx/CKs/jeQN49PirmWel/uxrfZj+YCWWyuWNe2U1rcQue/5/wdq/4OuOUCwAAAAASUVORK5CYII="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAEM0lEQVRoQ+2YzW8bRRjGH++H17s2iUw+m0pVKYrSQCRoUFuJBKQiISQOgDhUQr1x76EH/g0u/Ae9cIALXBASEhJqUZRAqEKhsVESSiDGjd00H/7a3dlF72xms964XVfdxCbJXNbesXf3+c3zvDOzCRzzljjm+nEC4MQBB0SglvvaDV5aH3uvK90W+0MJ4apsolYocwbK4CkceQAkXIgmwWAWHEiQZJlDOLIAgiNOQi2WBMwqpI1/4PSfhaoClqMePQC52583ZZzEn067SBZ+ByQZbGQckFWoSZdDOTIOIOEZu4rsozyqCR13ShIKFRdbOyb0lIKrr78ArXgXcBi3vj1+xa+FYQgiNp0E1HYRFCN+bn0WNS3LRT10DKiZLNa36/h1pYTC+jZUVcH05QkM9D8HJeHCdhMYSu/ehlkeDFnlB6oZ2wuzSL083TGHRAIIWp3EU1vpm+RHV1Lw4pCK/Frd+16vYj5X4BAuXhjFoLmBcnoYfZV/+UxAhVFeXQA7+5rnjgcFf5YQNjnsqDwVgCctGVKSDal0H/mKgcWVMkybwbJs/y/Xr73pib33vR8LVfIcQUWyawE8STT1kUPIBQCDW5ewvLknesTZwprUg6++/Zlf5sYk2xMvm554mjWC7a8c/6a//Unk4EQ9Wzv9z3yTVrOBEE6RsRJJ/P38BIZ3VvjzfLnIUNqo4OoHbzQ9n18nCMCZsaY+igUVzIOIxzMDEC4I0w7Xi7RjIptRUAXDNz+u8oIpYlGsuBgpzsE68yokZc8RwbjQb4bK+didcSAASPzywKV9DlQUGcMZCZJj47MvfsL773jFUNMNPmNkNddbOTILSv6WHxch/iCiEQsA4YKxqY/49VrFIkiDmSZm7ixjc6eBd996hXcRNL5mCM0UrXIcZxRiAxBVcIJQGGPYeFRHbmnVh0CFkiJBo501vP2DkqDdRHPjbhDrihj2GIcGIOiMweIvXNWDoQu+utuzi/zz1KXzSBu6f77P2EMQFr8P+u4Mws/vFtIotxwqgHA86rUGbs39gStT46hWTFgOML+whEqt4buBRjtYDGmjJa/dA2QFbOQllBueW7KGtM8tvGZEvIfoCAByQHD0W8WHplIeg8FTPgAC4WppsNOjQELjS2pHVmG7ErZrNoJuiRIu7tkRAEHBlH2aDXqTDfT09iApOfj05gw/ZzJAZibSKQn9vRn/3QL9X8SBjqKRW9oV3jEA4sbhmYJmBs3QYduMrxzTuoaeTJLvKyYHXBjnJpo2VkK4KIhPK7zjAIIgvvvhLqYvjiKla3xzRe23P3dQKj3E/cImanUbH394mY86NX9z1UbGW8UreO7QI/C4Bwo7QoCYy21hZj7ftLGieIg1R5TAqP6uAfC4aBCIpeLuewQgNuFdE4F2HRHXiIfv13UOiLJs3P0nAOIm+n+73rF3wH+ssdgwUuIvCgAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAACsklEQVRoQ+1YS07jQBCtJE6QIY1AMB82SBZodiMNB2DJBUZIHIG5wJxiTjBHQJpbcADmAKBIbBACpIiAPORDRtV2NdVtG7v9yUdJbyBtpVP16r1X1a7Bgq/agucPSwCWDFhwBJYSWHACLE0wtwSGf8/G0G4API2gv9qE1S/fc581TRZaB907/z02A258+iC3Ws9X4Bz8tD5zLgAYXvySiQ/uAZrbQcj+07qK3W0/Qn9tT32eF0akVgsrjsnR4gDEVQ5BQCZAbVc+dr6dpP7GTDLA1Pjo9k6rNg+amODubElP8Htd+XgepBGpTprGVbKMFbjHWQLCA//mQSusBAdG4OzPFiMUALYalzTnCyk/vpa+oMAQHkCvAwQIgjDodKDp7c4MELWiGqekORYSgJAF9L98jmDwJaYPhALAdHRbjUeMjAMQdgxihmakyJIpSiMigaIah951vKkbvhABQ4RdY8IeETFB9IKIqWFKlhr3b7q6MTIWJLENmYFrkh6R2KM5EDxgDNBG48SIOGYhqNgyzTmj8VnAcOUjtOqDys0ydUihtqi1OUTBUuMaI0I28Wky7nw0zVdHQN3drAyIVABI0Ga3SDI92k/SuARCbMiWSUuxg+1HjRJkC3WPyr1rZAbABCLOJ2gvi8Y5I9K+J39beOEMEfwtCwhrADgQyg/YxUijcgaNxzFCk4acIIMZgkwyMEoPXv17aH39kTsH6e3xPSv7Lh+dVfI5NI5mabKKmOT8e7uMoUHSqrvb4OwfF8qh0Jc5TBoQBTROV+13SyC8wonT+aUBQAcOL/+M6SJEjMijcQ4Eb6Flv3ApHQDNLMVG0OcNRtho/KUbhCgOTyuJtZJDTWmYTDDbX5UaT3OzygHIPEfwSEvU+MwAkNQ+NTm0Hyf+UnViDDArYb55qkrjaQz4D2CWwDAU5SiTAAAAAElFTkSuQmCC"},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAELklEQVRoQ+2X3XMaVRjGn2V3+dqQlBBIqLQp1UpjOxLSxGrNhY4dx5ne6kUv/Fv8S/S2F2Z654wXXnjRalpCa6vGiWMDKQoJBEIgbHaXZU/nnHR3MG2GhAVCJzk3y8fM2fd9zvN73/dwOOGLO+H541SAUweccAVOETjhBjgtgh0j8OtP35NRj24ZKPbx7Y73Ok4XHjnoO998TaLzt+D3NrEl85gdy7L4n8kR9nzThDi0APTEfS4O+cf3sKsThC+9hyjJ48w5CY+LYegOF95ER7QVYOX+HUJPtqqJiCnLWFFGsFXYgD80jhGjBtnlh1MaAngedQVIBPMv3WAAcAy8Iw4UYD/jpgBlw4uCDJQKBQRCIVRrMs6EI/DwOsrZVYQux/E89QCTiWsgDmHga8QrApCNRfLgaeZAxhuGiNqOjOJfKZYcRYETRExPlNj3R//sbTnzDjMOc8PF4kOsBj9AeVfARze/auu6fhZFK5ijMr4lc7j+/gVU7t+FLxpkMa+uqqgYbkuAWrqIwniCJT4XyICs5ZgQg1QsObuM0+Ti9SXInAclfhRVjUCu17Fd2EBw6ho4wWl1Cpq4sZZHJpBgIlBEjrtrMAFoEgLPsSLXKePnNn9jImTE81AbBnJ/PGRJRhLz8IoGRJ4D7xTQ1HSQhgpB8rH/3/b+yzA5LiH+h8CQ5AKna7YY50jTQphoMpqqAqWyic9ufY7FpWWIDsA37EG1UIBSzmMq6Ma6/ypER+NY0HilIKV+XiAeh4KqKiB97wd8EQ93xPjFyhPsOrzI8hPY2tFRzqzALUnwn52EyOnw+EdZwnq9Zrmhtfj1yxFt26Bdxid31/C7EYHepHMBIEJnHeNZzgVddCMW3EYlW0cpEANn6KwuUJyyY9N96RptWxLtDjRws9CZjN+4fhUL3353aMZp16DLHJ3/LAVxJVAEfWrG3rzANTUQvQHoCoZDoZeG6O1A1VYA05amEAcxLldKCMbibRmnjqJ7mEJozzfx1JsA0TWMDotYT6cxEY2yp1eSwLl9rGaYq9toHFoAMwCza8yqKVuM0+FoaegGZnd+QYNzwnl+DMlcAEbTwFhAYq/bzv2HkbNvWclT8cz7RreEOLIArY6gXeNSfdkW4+Z+dFCii4pAO4eqKRB0xXIB4Z2Iy4/gmAxbN89uDFQdC2AGTrvG1HaS2dgO4/R06RIMlV2oFtMSa590fZLwILk+jrmJDcsN3bp+2xag1RH0FJOlC7YYjxaT0DkRT5xXYDRoUdTYNFnN/o3A5Vk0yV7I3bpTdE2AViEo13TZYZwKkXJNs0uX6HIhMjOPnbratcTNeLsuwP6uYZdx2j55QcDcp1/2JNaebGqBCsBsn+Zv/Wa8NZbXfe65APvRIOD6yvjACPA6ISjjH868ix8X7vaM8YETYH+NoFNhLxlvJ8ALYzzZP+eOLe8AAAAASUVORK5CYII="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAABf0lEQVRoQ+2WwQ3CMAxFKeLMAjABC8AODMICjMECDMIOsAATwAKcESCKiqqU1N/utwsSvdZJ/F7sJMWgp2++Od7rSx/Ws6KPVMIXTcFT6GgRYQIk8L5EuAvQgkeLcBOAgK+Wk5J3uzuL7e/VGnQBbeCL6bUE3Z9GInAugC2CJgDZcTP1h4EsEZ0FsMGHl1c73Mav9pC+riLMAtjgEqj03ypCLaANXHOoSUDW/1oRsICIHWcKREWIAiLArbuNjJNEZAV4gTOuQgQcfVA1BHiBW5K2jJHaKK2It4BvB5fAtLIqEYUHODtZLZwmXiWADcaeTwNexf5MC1jg2sa8WyAN8mgJdvLP+azVkz0EvUSgb3vv6zH3Hvg/hNDyjGoNa2mjD580TqwAtDVYiaMbkouTnr6dBVQTRFUEKkQL3rgG0YXQirDOpx1nBacJ0FQE86TvCk4XoBGh3eV6PAvcTYCXCDa4uwCWCC/wMAGoiPR88AYPF4CKiALvTUBORDR4lccDWPyzUVmAw5sAAAAASUVORK5CYII="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAADBklEQVRoQ+2YQYvTUBDHp21aybrRFVftoiwEF0FFUBA8efTkTQXxE6w3EfRTuCAeV7yLgkc/gSB4UjzoSQuysiIriF2pbNuNzCQTJ+lLk7y8tMHtu3Sbl9e8+b3//GeyNdjjo7bH44cZgJkCSiIwePfMg/kGwPYQduaaMHfqWiXVZnxT3VfrXpxp49gRutT6/QmsC/eNP7PIGRrbzODtAwq8vwXQXPS31Ns+EO7Nnv8FO/tPht+roojCAPDEMTgeEoDqZBACKgFqyzRtnb9ZeA9TUcDG0POuP/wIL+6epucffP04ctpyU6wEe+kweUKv+5Omq5AauelfWvsQyXEGsPHND+rs5+f0KVWBAOR3cFzobf6IHBzBgSFYK5NVRGYAMvBHt5Zo83eebo6oj4G0369F51Dy3hfyhRCG4wJ0O8BAEEK/04GmuzwxEKkA4ieuyjcGgnMn2gsgUwNBSDMM1RGogGAgCBwIQw6nfBBaAFavHqdtrr/8muo/iYqQAIKKwcqIGCnBKS81UgFwhOOUwEBUUFAdmCqskovfn6ihxXxhBIYTVA3DHpEZQBYQMrIkn5BVI2KMQgXx/oF/F5WBw6RH5AaQFwTeL2EwAPYJNsuwVIqeAnsFLJnxPqPRdmCw7yi06v3CZqkNQAdEkoGicWIfEQYaVAy8XwkGJ4IKsms5ULcPaYMoDCAJRJJRjksN7CWwj7CdBSqZPEII4vqoUQKVUPtKvncNYwBMKULlEdw7JHkDPdtxgx7C/8wKwjgAHRBSFfw3pgUOSo2YIiKpQR2k30OwSfpG6cJubwta526PjbE0ADogVB4h+4h4S82KsP78exlDg+RRtxfBWrkxXQBpHoHzSQ2V7DDxPlTFSIutoua4qYHzstIVEN9fltaaS2fWdw1ZKfL+w2XiAEykBipDegR54OVVrVi0FqlUp3stSRGyjMZLJ7fX+Mw3984UiqHQYt2gVeuypgavLRr41DwgDVoaCFOBVxZAkkeYDrzyANKUYmq+Mh5gKqC8vzMDkJfY/3b/XziTTDBlZFnQAAAAAElFTkSuQmCC"},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAADbklEQVRoQ+2XW0hUQRjH/3tx1d28rbfdUmQtK5dEN29ZahpGDwYJUeBDzz0H1mNRj2FFjz0HBUVUDz0EUZCEmFlBoEGUt7xhFCFu5u56Ysadw3hwz5mz56we0vNylp1vzsz/N//vmxkbtvhj2+L6sQ1g2wEpItD/4qHkzYzKX993pNuSbjN9UvevnJMCzZ3Ic8fwK+xAXcEkhfA1XELfVgNhGoDrl3skttz7cyPwVwQRkGaQW+rBh3k/ovZ0WNERhgHwwgmAltZG+L0uzI+PIWdlAeH0PLg8OwCHA4tLQKhwJu6GFQD2TXdE0gAae4fpij+6UEkX/t7Vi2uqSVWxHZ/miMi1z6kTtZgYGkBZqBaS3bnpNUI3ACaciT99a4SKSASivb4Crwa/UGfU54/h5uM5tFX5cHDPasaQ2lA+/xbfChvw848TTR1ndM/JSB0XHowXrjZgIhCsDwHR93pA/gRxBBFO4Ejj0xTERhZLTQAiwplo4gb2mykkqUFEk4cXztpbW+rknYL8tzI+g7H8EG0mKZLqXUMXgPOdu+jE7jybEnZdIkcooZxsr4LD5URsOQop8hdOTxYdY7f7O02TVIHQBMCUijiBp8K74na3HyW+XNrMF0tlOpD2Y01BvOwfprFNZU5UFmZgNu8A0uyRlKSGMABqSUlKO3RjZFm5/HqcoVUj2LdJbSBPdHFBdgM/rlmO0AWAn4BeRyihrQeCpQWrF2e7WvDgSZ/ctet4Na0LpT8+YrKgxpRdI2kAIqmhdAafFqQ/XzCV5wglsPbmGthiy5CiESC6hOyioniIsQOVYQAiINQq5t34QcodD9IC0bjXC18ggNnRUbg9HtgyspCVnSkPoTc1TAOQDAilI9SKJUsL8mb14ff0FHJ2ru5MT58P0e2W3TdEQZgOQAkimQLJnye0HMHGIylSHX4Pe5lfvnmSNi0QKQOgtmuopQTflsgRLIas+OLECNpCmRicLUa9b07uLnr9TikAtV1DjzPUQByuKYfN6cKbd5/RdrQBMWlVkuidYsMAGKkRpC9JCy1HkLhL13p1adIVLGpdkTgj54j1QOgVzua4aQCMOIJdwck3BnqChjQY6iyy0qIxvCNE6oNR4ZZxgBKQVmqYJdyyABKlhtnCLQ9ANHWMxlmmBhgVkmz/bQDJkvtf+v0Dp2VMMD16JMMAAAAASUVORK5CYII="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAOI0lEQVRoQ8WZZ3Cbh3nHf9h7kQBIgJsQF0RSk7K2LcmylTjn1m5c1+41d3XT610vbXNp+7mXz+mXttd1bnpxhpu7+BLXsWLLljUcy6I1SIlLJEGCA8TeG3ixenhd6zzqykOS348vgGf8n+f5PwMSvqIn7P9RYzrvYXrNx4GhcR7q/RvJV2HKfVd6bvEvGz3tY0TDqwQKGbzJEnv73ezsHGE54mWf8y/uq033TdkPfv47jd8/9bvI5UqKhSyTN6/hHt6B2WSiUquSLRfQKVXolGr+6Uf/xg++c+m+2HbPlVRXXmr4Ggm8jSh2jYkWjYFgOs5mcIvenj7kGiXvemYpVgX6re1YFBXm5jdwud04LDbGrX92T228Z8IjwksNGg1qtRoxb4hzoTlUOjUTThdL3mUGuwcwmUwkhQJz6x4ESZ3eVhNaaZ10UcFKKoQ3vMXfnnqGUCZ1z0rjrgPQdPzq4iusLhc5dvghrMZW1kIBLnpucHh4DKvWQIugRmLVkSsXqQkVqski+XIJVYuchqRIWpBz+uYkD9vHGRztFwFoN5o5c/EN/vSxn9xVm++asH986anGob0ukciFhpzFpQB7x8cxak1kSgVmfesM2Z04bQ42fDeQFIz8NrnCvt5BLAo9NxdvsHdkNwazCalURqqUJVMooJXLuTk7jdWhx6ZXU1N2iDruFll+aQCaES8JRdKZONGMF6vJQSobolZX0t0+yOWr74m1nhOiuM1jCMoK6cI6gawSfy5Bh76FSjrHVsjHI/uPiQDUqHMruIE/GmFn1wCTU5fpbDNTVYFJ10GnzYHTOMSt8NSXBuILA9B0/IVf/oRTR48xu7REf2cvK+seXNvasVt6EOrQBKb5JFMrFIUUbs1hUpoQep0dfzrHtG8Zd2sHKokUbzLKAdsgJU2C1USBWD7Hdo0DZUOCPx8jnUtR0VfwJgoolUqeHT1CQyXlxWtv8tcnn8Msf+wL+fK5f/RBxCvVEkKlhlyiQFKvUBXqyJVSViKLmIw2NCoLr81f4em9x/H6L6GUqXGaRyjUkmjUFoo1Cc9f+G++4X6AVc8SO8f2IlPKkEsrzPuXSBQERmz9mBRqSlWBWCWPJxhAkNfYbXexr6WfSDLFq/4p3N293Ais8lcPPvu5gfjMANxKPN/IlkqYNDqEYoZYxo9aa8ZutLMZWkavtaPXGLi1NcNcNIq73cXF5Rm+c+KbCOVmiaTQGQ2o5JAtNdCo1UiqVQKJmAhA2qDkxPAeatUMnvA6oUyWEfsgA5Z2SkKSlVyW+agPo1LHAx3DjBg6WCtFuBlZoywIzPu9HOl1oFNWsFknPnNp3BGA5uRmMw+RqZRZjmzhbushvLVESV5mPZ2n39ZLoRzHn62wu2sb2WKOa+seBq0dZAsFJvrdKBuwvOmhta0djbLErD+CRqGjw9xKMpmkrlSwGN/iyV1HCEWX2UzFWYulGDN14jJ3IW9TkixW+M3cJDaDhW+4J8TukivkWYhucHH5JpVKhYNOK32tTkzSTt68eZE/fuK7GGSH/l8fP/XD5uR28tij+KMzZFMSOrr68UUiOPVG5DIpkbyf6VCYDrOD9WgQk0pHT0sbPv8mdY2KUYuDaLXIgLZN5IGV0CqO9g5U6hLlkhqJUo5cLqeQytDb3S06lCkXmJ6/SoYc76z62KuzYdAb2DYyQrlaJS8UserNdFls+KNLOC0u/Ikkr89fobfVTl+LCrdhO4WCwGsLF9i/+wA2Uw/B3ManZsQnAEhVTzeCSR+vvvUaDZuG/X070chlSBty8rUysUCEkbZ+cqoiv/HcoNvcRigW43DbkOikwWlHJVHS4+hAr9Sgksp4e+YMuWSDdpsTq01BraJhM51isMWBXqVGUMtEkCTFCpMz7zEyMMzphUm6JAbMRhOBRpkDA6NUanVa9AY0sga5fAS7ugchWSZezqBCjrHTJI7aCoWSF371Uzq7TSyk83xt6BDrGx5Gx3Z+YrK8DcBs6J8b1/yr7OkZoiJkueldZKuQ5lDvTsL+LfpcnZg1rUxev8L+PfvI16rM+r0MWTpx1PRULe87Ec2kmQl72dU1QHdLG4JQ5N2F82xtptmUV3ju8ClkMimnZ6/x6MAeFEgIC1k2w0G2a9q5vjnHyUMn8EcDhOIBUeZCLiWWh0apvs0/zfe9sgFyaoEXr5/BqLHw9IGHUQkNEsUspUaRW+FlPLEEp0YPUasIvDx7GZNez9dG9t/OCIkv80qjkYlyITgp1vFh13ZadSoWfYsEM2XGugaYm51hcNDA9p5jhLMJpDIZCqmUJila9SY0ciUymUwce5c2PFwLrvHowG5x7l9NTKFQGFiLlZkJenly70PiVJcqFcgkYlRrdaQqBZc8C0yYXFxZfA+brZXRsWHSmSiBVE4MxLGhfZhVWvwxD6lUmWqxwo7to8gVal6eneSkey8OvYXEehRPapOWVgtluYR3VqZ5cteDTK/MECvnsKr0SHJ13KM7MOsMSLyZHzeeP/cLLAYdSrmKif4dqGV18oU4SE0YdUaMGj231s+iUZqpKxxcWp/jiR1HsWlNYoSai0xOKGKSK9lIhDk7f4PH+/bSZbESaGyiUpv59TuXRG5o7v47dF1kyznO3LzA2OAoJrOJl6feZV/fEE6rnUQ+i7JRI1eI4ImFREIcsPcxaG0jkfATjmfFcup06lCr7JRqAlqVHrVEwszyIrFEFGd3DyVJjcueeb4+OsF6fJVSuYRcaiG+ucH4+G7OeKa4XQKnZ77VGOl9mGQyLi4rznYnHTYny4GLNN/P+ldEYeOOfjGSj+3YT6OSQKewU6DK5ZXrjLe1Y2vpZC0Wo6vFIZZANB+jWK6J664vFcVpbMGmNmEpqbi8Nc2Aq59WcxvlaplwJs1aPECqkOOQawyLRsGqf5ELXp+oTy2BYGCNeKrEiGsIhVIp2tqUUa2lKZXLzM6tk8vlOXz0qJjyza5xfHAX9XoOtdJAR4tTDJpd+U3R90+QoCf2w8bLZ1/B0WpjaGiIYmmLosTGmYWr6KUadlqceGJ+9rrHqQhRYsEc3a5tvLl0lTGbmeGeXQg1xN2+VW9hxudhNrDGiZE9lASBTDFHJJEQCVAuKSLTmmmz2MXFqAmyNxYimc/yzL7jGJVaMkIBqUSGRqGgXMlza2lGBKCvpw+9Usf04jRJdYXxLhcIeXEI62jpJi+UxBJt1OtoVDJ0ChUKuZpu/R99xOdPbYPBws8bnq3L76e4xMal1XmRiEqZLLPLc3T1tKKSKwjHKwx2u/jp1FlOuBz0tbvJCRLUSqVYIpuJMD/87at8+8HHkUolpPJZ5tdWOdQ+jN6sJSGUKFaLtBgNbCZjLAQ3xXlioK1bzIq8UMag0mJUaUVblqZusBDfpKLT8njPPuZKW1xdX2aid5DNhB+Xox0tOWL5Cum6WiT1dmPr7Yh//Ox2x0FI3OuBXKlArVbAF15gcSlGv8tOR0svQqVBudagXi0iUxSRy0xie2zTWjg4MCaS5b+c+xU9Le0c7B0lnk/hDQc43j5KXJYlEApQUinY1u6kUM3ynm+dnU4X11fedyom5Nju6KPLbLvdUaKBInZHB0d2TIibY8mfIZKLcS6yyO7+QRS1CILUIMr6uxM/+2KD0MeRagIxs/ombaYRXn/7PO5RB/1tO8mUy0z7POLiYrNa8BeSvLk4xbGRXfRandRqOa6tzYqz/b6uHcRjYbyZuAjA+cVLFOVS8jIJR907eNszw8mR3eLAtRjy4W5p50bcx7MHH6FVrSee3WR+7RYzkSRf33WUbpNVZPSXJ1/n4PADvLB4jj8//oRYeh/U+J0OrXfMgP8LiOa75tFjY63K0Mh2rqwtURQEnhk+TJo83lSMPdtG0CtUpEtx0oWsKKZcV3Fu9hoPb9+JTqZiam4KmUkltrmn9j5CoZQmlFjhrdWg+P1H3RP87N2zfP/gsygtKjazHhLZTa6HiuIdoU2rQoOVX559lW8/+9xHyO1Ojn/w+ecG4IMfNjPiP178T048/CgL4Q3WokGODozTY7KTKOXEHiurCGSFiNgG9WoLkVya95amGercRpvOyOT1SZFLmp3D3Dyc5IIEUgHMpkFRjVYh51/P/5rvHXkCi0RLsOxHZWilQpV4fINaI8Ng12HUSs1njvjn5oA7IdkEYjMRYj2yhdVoFUfV5qMs1bh2a0q8D5gMdtRKM7lyhuXgFha1AaelFX9sGp3ahk6tQ6exigAY9Q5ShTTpzCZaiRadtlMcqIr1928LOr2Zer3GLd/bjLtOfmHHv3QGfByY5rpcqde5vrEkZsOD/aN4PYsc3neIRKkg1vcBh4tEKchKIsGRgTGoFVErlOKBpNnqCoU8yVKJCyvXGW4xMtjSj6ygo0yVYCFKr6OLNvv7y5Vd9dQXzt4P235XhHxY4Pff+kOxazy+/QHCMS+zc2uM75ng/K1pnujag7e4yM1YnmPbxum3d6JFTraU543J81hbreLK/M7GDG6TDodlQLwUObUmvBur4o4wYP2Tu2rzXRX2YSAi5V80wskIr194g+Za3bwOnXLvFkEJZOoc7B4W67rcqBFJJbmyOiUSqkIuY9bnwdVqwGLu4921efb1DnOo63v3xNZ7IvQjQAgvNZozRKKQQVWvkqvmxZHULjdRK1XxFEJMb61SqVTZ1ddFq9rM1elpJnbtotPahUP7B/fUxnsq/ONA+ALXaLeO/W9LrImgNMlzPRZBr9EyaJGyrXPiS7H6nUj7rneBz6swW7skckQouchbnml6NRaCtTxP9x/iWvRtjg7+w30LStOO+6rsw2DNxP698fen/4vvHv898Q/SfuO3vhJb/gf4tKFR9oaJlQAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAFaUlEQVRoQ+2YXUybVRjH/21hL/2AfgxaCpTBoKwgMIZMZbCpQzZNDMnilhkvvJAlJgtXxkWNugsujInzwsyPqfFCvVLJTJzbdDGbsi3sAweWCcvKAMtGC5TSAv2gLRxzXnLqC3YD+iFMdm76vu95z3mf53ee5/+cUxHWeBOtcf/xAMCDCFjjBOKeAsEfXiWiksd4rD7bGKT69fw16b4E+jypcG/cvxnLGsbNmJFAC9FY50yhjrO2EACDslpAxAyAOu4P+JBll4adviazodKr5++F1wxO6vaXY/5uLKsuHBu1IdTxL49/jad3PIlib05Ee7oUQyibyvpX38LVD/W2EPrSSkTFsgGwFQ+G/AgEZ5AkSka+Sxl2kuZ6e4UaUk6N039ewf6qnei7cxFPJNeHU4NGAHOaDWQawe7/KxjLBsAMPHfjEEmRqaBN08JqvwmFTAuFNBVGdzre6fsGJZkF+O2mGU11exGY9qF4ShcxSqjjtDHhvG8AfNveSAbcHmzMyIN3egx3JoOoNBRi0jeF9gELitKz8aJ2B66IrXhkNndeJWC6IKwSTDgj6QONlkRFRNQRcLzjIOmwDyNbpcfAqA1KTo5DBQ14//p3mJVyKFXrMRrywSjToVqx6a6a5cwFWPUQ6gBLEWFqJAJC1ACuWt8jpyydyFXpYHc4UKvbhF77LaRmacGJ1uEZaTmsWi84sQQ6OxeuBtShyyY1rG4Xntr8KA+GAhCWR6HzC9Mj3hCiAtAzeox4ZkKoymzix/dbPiMhtQTG9Eb+/lhbE9liMCJXo0Mg4EO2IzUcAbQySCRinOxqR2Pts2EAC0OErfzCMhrvahEVgMVq8JGzL5HdxkqYOgbQZgpim3j7vD1CZpoKLr8XJa65XeLdKkGk79xLKxazK1J/QgAcPvE8acivgkGdjiFiBZeiwokLF3ltqN5UjtpQHoZS3Pj5j19RVlQKpUqJwrZe+NVG3ka2e6T6wFKE/jLnaX+8UiEhAFrMrxODRs+nwKjHAd/0DCanvRh0jSIrTYOMFCXUfg45PTfRWaHDlkD+vMU5ajuDmoIy5KXreX1gQilMBwYg1gqREADt9g+JfB2H9Qo1zIMWdA31o674YfgDAUz4pjDidKJIo0eSyIfS2X8qxMmgGX0OO8Y9kzhc+BwPxaIZh1gkQcFY2jxIQgDCjuVGRkIAUIPMjk9JhkwJq3MYX5z/EQceb4BYLOKF84NfDpCaTBMUKhkK/VrefiqO1nEHum1Wfj9RJzLxznsC00jlZPMAsM0TSxmWNsKSSdNlKWeOhAFgq9Lj/Jx8fPZ7HN17KvwtCmBnZinGJJOoTS7GVyOtKMzMgjc0icuDA3hzwx5++GmfGY7AFB7S54cPV/R5pI3Uwq30qgEQSXkZgHM3LuJgxX4097RgR8lmtFrMqC+uRHVwThNahi+gc2wQL2zbxVeMbrkFJZ45oaSNiaRQKOk1hZHccGRJi7ukl6IpL/ca09r3LpFLOFy7fg0SJYfbXjf2Ve2C1++G3dmLXX0KvEYs2F2ylU+FQeKEQaTBVUknts5UzAMgFEnasWo0YDFoXfaPyKXfL8GwYT0yNDlQyZSYmLJhyDUElbKIHy5LTsIn507gle17wlrB5j0fuowZMsGfMmkkaNdF90/TikSAEE5b/1tEniJHuf4NUcftZpKm0MPldcM9YYVMJEOVpArDKg98sz5+mFyhwuzsDHoGW1FeUB+148yGFQcQKVKaz+wjJk0aijQbIfHKMY0QbN5R5OkN0GnnjtVabl9cbI/LJIuFe6z9P3W+Tfr+uoX6mrrweSPWOVd1BMTLuaXMc19EwFIcifadBwCiJfd/GbfmI+BvfiM1P7SAtKQAAAAASUVORK5CYII="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAD6UlEQVRoQ+2WX2hbZRjGf2mTnKSuSbOmaeLSrjVrbOemDLeKTammRReGu5BuWIuyKcpkk4HiGNYLUQRFBHXghRd6JbvaxAs3vRCGwgYbOmR1/bPWTaPZ1nZp06Rdm9MmkRM4cghtk+ackJbluzzne9/3eZ7veb/303GPL909zp+SACUHFEiBE6f2p3w7PensYkrP440frEm3aQ5qXDyVmhfnmI6GmYhex251EYndJpE0Uu/04ql6VfOaas5QMzAfH/endDssBDr89A8P84C7gdG/RvBsceKwbUZMgiSMtKYio3Q2n9CsdlEFeOyTgdTpN1rSGE72dfLssRfQJRdYFJPojWWMjg9htdRgFmz8cPUSz+3s5HroPMZyEx3ez4suQt4AJOJK5SURJAG63+7l9Icn8R/Zw7kvzrKlp4U/JibY6vTw87UrvN61DzEutUiE+yyVCHrYaj+aNw41py/F5l1YefLdnw7+j0N2g/xBEkW52g/txZiCa8ERqmudmI3z9IfGOfLEV3ljUSOC6qKZTsgEkymI3Co1/kZczk0Ipnni8yZ0Rj16vZ4u7zuqMa1GEM2KKYWQSSudIYNS3hct3a3YawwkFswEpyN4N7rYIJhodh/WDFc2MTQvlM0RSiHk9gi81c2Z/l/Z3fQoBnSMiTGCY7d4ua3wk0JzASSCy4mQ6QylGwLHeohO3mExkaRMMHB+ZIBdVg+Xhi7Sd/BsQXCqugSzWUv6//XgdHpSfHkmtOx2eXpIG2wdbrZ7t2GtsvLd5Qu0Nj7I/XYHk7MxfHVvFkSEgiRdiu1KrSGL4A408++PQ+nwvcd7GYtOcyN8k8jdGXye7djMBv4MDRHY9plmuDVLlIsjVmoP6Z9yYsj3g+GZJqZmYzzf2onFWEFUvEuZrhyzwUB8YZYm22uqOKgKzpX0Uvuk9liuNZR3gxT7yCtdNNXWE1+MMyvGqRQqsAgV6bTDl3/nyfaP8uaRd6Aa8srYbBem7ISZ9lp2NXi5I87wkKuRuqoaRHGOCwPnmLg5h8O1iR7f6luj6ALIYqz0slS+Jid9G+lte5pq0wbCsSBXbwxyZXyKPTs6qLfa2Vz10qo4rWqzVqe+XJ5sF6UU1/eNn/faejHaBIKxESZjQX67PUdrg5faCgEzdr796fucR+eaEiDX1pAcceDoAW7FQwiV1SywSDj8N4lUFG9dOyajGYdxX07cctpU6JNfKX9mayjfDVLci+8eIplMMPjPLzzseSpn4nLNNS9A5uhcalQefP8wDmF/XlzyCiqGI5Yam5IY7nKdKg6qgoshhNY1SwJoreh6y1dywHo7Ma3xlhygtaLrLd9/sc1dMMWonB4AAAAASUVORK5CYII="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAABgklEQVRoQ9WX0REBMRCGnfGsASrQAD0oRAPK0IBC9EADKqABzwZzd5MbE2I3u//ujns9yeX78u8mmlHQs9ydn++fPm0XTcRS3D+ag+fQ3iLcBCTw1fzeMR8vk58b7iXCXAC141TsrUWYCdCCe5UGXAAa3FoETAACnNsfWimo0lALQIBTfeDXe60IsYBocFRpVAuIBt+sZx37/nD9GozaRLAFaMGphWvK4NtYrghSgBYcDVY7HyWiKMAKnNvpx7c+4o9pH3ntUxLxIaAW3DvaaBGDgFpw7UKix6dENJHg6PRI5gsVwE2BBIw7N7wELBfLheL8biiB/MelkvgXMAo+Pw3cj8HSArnHIwVYes8+BrmJkC7Ee5z4ImQhwrOMKPDER16FLURIU8ARyAUXC0gDI+8Pmj8/+djqBEgTgb7bp3XU7jhcQFQitODqEijVsaY0OEchCtxMQE0iOE0NFfXShql7ANXRNYlo50bvuFkPQIuwBjcvAWmP8AIPE1DqEd7gaR0vqSuzUVelNdEAAAAASUVORK5CYII="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAABcUlEQVRoQ9XX0RHBQBSFYTGeNUAFGqAHhWhAGRpQiB5oQAU04NlgJLMZs6x7du+5d/GaxOb/djehGVT6zDfH++vQh/WsqXEr7oPG4XG0N4QbgBReC8IcIDfcG8IMAAlfLSdt73Z3Fre/1dagAyDhqdrF9Noe2p9GSRA2BA1AEy5O/4cTWBBqADR8eOmW+W3cLXvWRwtRDICGs0Kl7ymFyAaoGY48NHMhYABGOBIgzTR6HIUQARjh6E1bnCdBJAG8w5FXoAYoBfEGkAr3XL6aUOnaGKIHYM34v0AFiIYVLslrjluiVgVgh5V8H30LaGba89p+C8SD5m6JEnXP0His5ENQC4FGoa879n8H+DXoBYGCac8r/iHEhvDeKlJ46BN/CrMhtDMqQaLhxQDhwtyHpTZcuj43XA3wKxCl4TQAJgT6hniOqQ2nAzAhvi13VrgZgBUEO9wcgAVhFe4GEEOg+9w63B0AXRFe4dUAUhDe4eE+Hsjts1H/LKgjAAAAAElFTkSuQmCC"},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAA80lEQVRoQ+3Y0Q3DMAhF0XqdLtDFMkYX6wJdp/1yVLlCBgMP7DgL2PcIJRHlFvQ8nu/P79Gv414irgI/tA1vo9EQMIBeeBSEO4A0HA3hBqANR0GYA1iHe0OYAXiHe0GoAdDh1hDDANHhVhBigGzhWgg2QPbwUYguwGzhUggSYPZwLsQfwGrhPYgTYPVwCqJcLbyF2ABV5GqTUPcO+yVIraFWmwhq07R/hLiLyNkmgrtb7E5AC5Qdghteu8QAWb8a0nA1QBaI0XAzgCgIbbg5AArCKtwNwAvCOtwdwArCKxwGMArhHQ4H4EKgwsMAKAh0eL3HF/63fVFCOk+sAAAAAElFTkSuQmCC"},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAEXUlEQVRoQ8VYQWsTQRidTdOG0qaI9CCKKCIVPPSgnvz/R/XQm0VEEcVDETEtIWmSlTfJC8/nTDbJ7qZ7STY7O5nvfe+975spwh1dl9+uy4f398KPX9MwGJbh9Vm/uIul7PxPr2+GJQP9+H0SXjzqRhBwAZDjo8Odrmlnf4aMM3AEevH1NvS6RQTAAcH9roBoHQDNODKN4JH5/iLRlIHTn7+fPT5udY2tTY7AqW+nObIfyjL09jsRCDLitN9ZSoFg8bMtRjQOADNOXWtmmVV84gITcFEGuL8ZzcKDe3vRGAHOz9/TeM93mgaiMQCYcaX01Z9pCEURzp/sx2ARKOnPgACAZlsBQ/BHvTkrcI1uZ2EyC/G3pqpGbQBc48ycBnI1mC0NT53f9U9QUl7BKuHv12XE1gCwjjODXCB1rybnpkdwGKiClTJIBVWZQxmBWdsCsTEAuYxzkQjqzfODf2itzs9x2gTRJDmOnqAm6n5x8WUcTk/mXqLldVMg1gYg18C4san5KcURuF70A/1kRpU9zjANXOf37+sCUQkAA2cG6NpKVQQ3mpQBZYwUxUJZ5jRDGiTeU2P0cQoYgYWxnj89iI9UQl42+W4VEFkAELjSjgGvo0enKxev9HcfwBgEB9AogXefxlFOfmlF0U5SQXFwcg3VfwBoHXdXdjpqEMymLyLn3r4P4FwAwbXNucEqZF8BxXtspggiGaImyXcciCUArONcsFLVDSuVPfUCoo8F49KsphbF+VD3Xz2bB6jyQP3XrnFVIlxGWlJVbgSi0AbGdcV71HE0MzmKMZt4/uHzOHQ7YZkp0p7ajaAURewLaHY+RinOgJjlHMPIDmcl7lllUhUoAsCXtEtTzWtZSnVwKUYwg6Qes6sBACxkXD0D+wSYKd5HW0xGuMuv6i208Ur1JcrCpATcrHS/nmtbuaEBU6IWF90f+3kNxCkMs+sfzs3Pk6BlUumcY4ZLIMdaVoekCXot56K0BPGPPPtEF5/c2GiDo3LxaqHA0ItcDur6qWQo87xrxPisCXpAWv/VZb0y5Oqv9+yedT6HDLC5Yaap2aX/LOq+stCB0vKZAmXVSVNlI8STHExCzaY0721satOj1WQwnMWmyfsKalbNi2xI0Rme4QatLNu6EXJGAAill9d9jHeX9d/Uqdkp6mGJBqrBurNrRcjtLtc9SapkwCppaHXAOHpElTZ1Tnd3D1w9gP2AykQdHd+rMu7xbAwAJ9BjbTWb1IGHUjLXmKiEdAyMFB6hPqQNU92Toq0BIBDvLwdl7oAzJ5mch7jRcZzKRQ0Qpfbty5NaMdR6WemU6ij1uZqdN0nUPvsHNkIqMe4R6ma8MQn4RLx3INSk/LgsdbqjVOecOm5TjefWyd8bY0DKLHVLyqYHAXrv740X5vLevunAWwcg5RFaOunezLj29lpR2gp8ZwCoNHK13atInUPOKsq37gFVC9CTJtU72dF2xu8cAO8jyIp1O7cqgDd9/hftRbjVmpq7lgAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAABgklEQVRoQ+WZMQ7CMAxF6cDKJdjZOAAn5wBs7FyClQGUIVWVJvX3r+2mgrVOnP/i71hiOGz0uz/f32nq2+U0bHGU8KSl8FJ0NIgwAJLwrUC4AyiFX8/Hw+P1gavduyLcANSEJ9Ua8RE9whyAtXBva5gB0Ho8WQGpiFaclTVWA4gWbl0RNAAv4UmgtlGmNWxFqAF4CoefhoVALQgYQE34ko9Rj1uIru2BghAB7E24tkc0AexdOApiBkDrca8S9tq3tMYIoDfhSA+RYpa+ZxDDvwkvK6sbANJt5vlAmh61MwRtAeTAJe3aGmQfJEbbM0YLlAslSzCH6VF41q16BrWUW7CQMkViNOdpDUbUICQlZqpE2pP9Lk2EIoCcWLJGjrO+OS/hogVaiVEQ7MHXrpNufPYMsglZEF720AqnK0D7akytIb3hzGWwws0AID3Coi+UlbNWuDkABARzw17C3QBYgfAW7g6ABRElPAwACiJaeDgAFIRVc0P7DTwJohuicb38Pf4DJ7UJNHIqhgoAAAAASUVORK5CYII="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAACmklEQVRoQ+2YS2/TUBCFx+kjtCURRV1UzaYCJBCLLBBIVTctO/41UhdsoCyKWFABqoQSIVRRkvTltM5F55rjTl0nVf2KTeKN5UfsO9+cOTOOIxO+ORMev0wBTBWQEYG3e12DR79u1gutstQXx8ARvHPaFrO4dgNxkaCkBoCBDwu6UTuVVm/RQtneeJbae5MKOPFCjk/OrNTff7u4tpZXj+fsOffoQKrL69eu/RcK2P9xbNYeztjA2r89u8cxgq7Oiogx0lyfl72DvrheNOewWsYBJrYCkHkE3jszUltwgj3OvXwyH2T84/e+rD7wQbWOBnbPcuBNPIZa3mw1Y68pTjnEfhkBIOsIOkoNPE8IBDBqoXlDiA0AQaAMsIcK3EsjK7VKAALSRwl8aV3K08ashUQA9XuOdM/tT+2mSyHvMkgEYFQmd/d7BoFrjwAoBN5Yrshh17OAwuapn5kHmMwAsERojloJOPfzjycvHvleEQVBdw/tGWkrJFMAKANs1bmKLQOqgcHTI9q/OnZGCJtjlMLS9ohMAeguQckzaK0IloYOWCsgy4kyMwBR2ePQpLsDygAwsEElozwhbJpplEOuAIYNTx++9qW24JcJYGCuQMeAWaJcPHO1zLT9IFcAUarQ3UJ3DH0vPSOsjtIpIArAzqeOWapeZZ+loGHQP6ypOo64fsVEbneFUggFQPJslzROgqBZMtrbPKJ0ABgYp0qO1FQAjsMdgx6Be9gt4n5YjV0Bw8XsX6FHAIJ7MbAzhS6TpL5QeAD0CGSdH156kOL3xV2lH7TU2zIw7uuYHWB+4WkS6zrsDWTzebL/HAuvACbg3eeOWanPBF+b95f+OWfCDJUGQMI4h/58CiArsmV57lQBZclUVuuceAX8BamLmTAfhVYvAAAAAElFTkSuQmCC"},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAACFUlEQVRoQ2NkGOGAcYT7n2E0AEZTwAgPAapngf2XPv131OOjurm0iieqORTkcXRHDoWAoDgAaufc/u9kJo43ggZzQJAdAKAYb5l5AuxxK0NFMI0rIIZVAJj3XIMn9bWFmmCPx+fthgcEodSAnFQGQ8AQnQKQPY6e3pEDoibdguTyaiADgioBAPMxKCBmzr+DMysQCpmBCAiiAwDmeHwpAaSG5/4TgmUCroAYEgEAcjyoAKzY9QSrP0CpALlMQC4c9516OegKS5JTALKvcQUEtsIRpO/Y+ftg7fjKCXqnAooCAJYaQDSuFAHLFiB64SRXcADcvvqZUHHAwMjIyPD/P6TCoWWgUBwAMJ/AWoL4skZw/3UGSgpKU2VWsHU83JxUczfVDCIlIEBlBKHGE8w8UEowUWIBc0/f/Y2ScqiRMqgeAMQEBKGCkp6NKZoFACwgvnz9/h8Uc9iyBraAQK41zl57x/Dxy2+C7QpKUgLNA4BQiiBUY4D0E5tdyAkIugUAerGPrUEFCoy4wn0MjH//Mghy/wNrmdDujrNdgasqISUgBiwAYI7H1bKEpQxkT+JqYCGrIcXzIH0DHgCwtgS+dgSyB3EVoKR6HF7LEGyR0FkBob4GyDmgQIA1psj1+KANAEJZAyZ/skSLKqmXKobQMpEgp4gONxmqN4sHfQDQMnAHTSFIa0/iM380BQxk6A8Gu0d8CgAAF63LIQXQ/poAAAAASUVORK5CYII="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="},{"type":"image","url":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAnUlEQVRoQ+3YOQ7AMAhE0XD/QxOliOSebb6MD4DgeewCey4/dvn8zwJsAi4X2CdweQDin6C7u5lhkxRq/Bv+TBARIgTwD0+GSAEgQ6QCECFKAEgQpQAEiBYAZYhWAEWIEQAliFEABQgJgEkIKYAJCEmATghpgA4IBEAlBAqgAgIJcEJEdxBogIx13gJkKJJrbALIt5fR+yYgQ5Fc4wVyCEghGQsk2QAAAABJRU5ErkJggg=="}],"relations":[{"type":"wang_border","matrix":[0,0,0,27],"isBorder":false},{"type":"wang_border","matrix":[0,0,0,27],"isBorder":true},{"type":"wang_border","matrix":[0,0,27,0],"isBorder":false},{"type":"wang_border","matrix":[0,0,27,0],"isBorder":true},{"type":"wang_border","matrix":[0,0,27,27],"isBorder":false},{"type":"wang_border","matrix":[0,0,27,27],"isBorder":true},{"type":"wang_border","matrix":[0,27,0,0],"isBorder":false},{"type":"wang_border","matrix":[0,27,0,0],"isBorder":true},{"type":"wang_border","matrix":[0,27,0,27],"isBorder":false},{"type":"wang_border","matrix":[0,27,0,27],"isBorder":true},{"type":"wang_border","matrix":[0,27,27,0],"isBorder":false},{"type":"wang_border","matrix":[0,27,27,0],"isBorder":true},{"type":"wang_border","matrix":[0,27,27,27],"isBorder":false},{"type":"wang_border","matrix":[0,27,27,27],"isBorder":true},{"type":"wang_border","matrix":[27,0,0,0],"isBorder":false},{"type":"wang_border","matrix":[27,0,0,0],"isBorder":true},{"type":"wang_border","matrix":[27,0,0,27],"isBorder":false},{"type":"wang_border","matrix":[27,0,0,27],"isBorder":true},{"type":"wang_border","matrix":[27,0,27,0],"isBorder":false},{"type":"wang_border","matrix":[27,0,27,0],"isBorder":true},{"type":"wang_border","matrix":[27,0,27,27],"isBorder":false},{"type":"wang_border","matrix":[27,0,27,27],"isBorder":true},{"type":"wang_border","matrix":[27,27,0,0],"isBorder":false},{"type":"wang_border","matrix":[27,27,0,0],"isBorder":true},{"type":"wang_border","matrix":[27,27,0,27],"isBorder":false},{"type":"wang_border","matrix":[27,27,0,27],"isBorder":true},{"type":"wang_border","matrix":[27,27,27,0],"isBorder":false},{"type":"wang_border","matrix":[27,27,27,0],"isBorder":true},{"type":"wang_border","matrix":[0,0,27,10],"isBorder":false},{"type":"wang_border","matrix":[0,0,27,10],"isBorder":true},{"type":"wang_border","matrix":[0,0,10,27],"isBorder":false},{"type":"wang_border","matrix":[0,0,10,27],"isBorder":true},{"type":"wang_border","matrix":[0,27,0,10],"isBorder":false},{"type":"wang_border","matrix":[0,27,0,10],"isBorder":true},{"type":"wang_border","matrix":[0,27,27,10],"isBorder":false},{"type":"wang_border","matrix":[0,27,27,10],"isBorder":true},{"type":"wang_border","matrix":[0,27,10,0],"isBorder":false},{"type":"wang_border","matrix":[0,27,10,0],"isBorder":true},{"type":"wang_border","matrix":[0,27,10,27],"isBorder":false},{"type":"wang_border","matrix":[0,27,10,27],"isBorder":true},{"type":"wang_border","matrix":[0,27,10,10],"isBorder":false},{"type":"wang_border","matrix":[0,27,10,10],"isBorder":true},{"type":"wang_border","matrix":[0,10,0,27],"isBorder":false},{"type":"wang_border","matrix":[0,10,0,27],"isBorder":true},{"type":"wang_border","matrix":[0,10,27,0],"isBorder":false},{"type":"wang_border","matrix":[0,10,27,0],"isBorder":true},{"type":"wang_border","matrix":[0,10,27,27],"isBorder":false},{"type":"wang_border","matrix":[0,10,27,27],"isBorder":true},{"type":"wang_border","matrix":[0,10,27,10],"isBorder":false},{"type":"wang_border","matrix":[0,10,27,10],"isBorder":true},{"type":"wang_border","matrix":[0,10,10,27],"isBorder":false},{"type":"wang_border","matrix":[0,10,10,27],"isBorder":true},{"type":"wang_border","matrix":[27,0,0,10],"isBorder":false},{"type":"wang_border","matrix":[27,0,0,10],"isBorder":true},{"type":"wang_border","matrix":[27,0,27,10],"isBorder":false},{"type":"wang_border","matrix":[27,0,27,10],"isBorder":true},{"type":"wang_border","matrix":[27,0,10,0],"isBorder":false},{"type":"wang_border","matrix":[27,0,10,0],"isBorder":true},{"type":"wang_border","matrix":[27,0,10,27],"isBorder":false},{"type":"wang_border","matrix":[27,0,10,27],"isBorder":true},{"type":"wang_border","matrix":[27,0,10,10],"isBorder":false},{"type":"wang_border","matrix":[27,0,10,10],"isBorder":true},{"type":"wang_border","matrix":[27,27,0,10],"isBorder":false},{"type":"wang_border","matrix":[27,27,0,10],"isBorder":true},{"type":"wang_border","matrix":[27,27,10,0],"isBorder":false},{"type":"wang_border","matrix":[27,27,10,0],"isBorder":true},{"type":"wang_border","matrix":[27,10,0,0],"isBorder":false},{"type":"wang_border","matrix":[27,10,0,0],"isBorder":true},{"type":"wang_border","matrix":[27,10,0,27],"isBorder":false},{"type":"wang_border","matrix":[27,10,0,27],"isBorder":true},{"type":"wang_border","matrix":[27,10,0,10],"isBorder":false},{"type":"wang_border","matrix":[27,10,0,10],"isBorder":true},{"type":"wang_border","matrix":[27,10,27,0],"isBorder":false},{"type":"wang_border","matrix":[27,10,27,0],"isBorder":true},{"type":"wang_border","matrix":[27,10,10,0],"isBorder":false},{"type":"wang_border","matrix":[27,10,10,0],"isBorder":true},{"type":"wang_border","matrix":[10,0,0,27],"isBorder":false},{"type":"wang_border","matrix":[10,0,0,27],"isBorder":true},{"type":"wang_border","matrix":[10,0,27,0],"isBorder":false},{"type":"wang_border","matrix":[10,0,27,0],"isBorder":true},{"type":"wang_border","matrix":[10,0,27,27],"isBorder":false},{"type":"wang_border","matrix":[10,0,27,27],"isBorder":true},{"type":"wang_border","matrix":[10,0,27,10],"isBorder":false},{"type":"wang_border","matrix":[10,0,27,10],"isBorder":true},{"type":"wang_border","matrix":[10,0,10,27],"isBorder":false},{"type":"wang_border","matrix":[10,0,10,27],"isBorder":true},{"type":"wang_border","matrix":[10,27,0,0],"isBorder":false},{"type":"wang_border","matrix":[10,27,0,0],"isBorder":true},{"type":"wang_border","matrix":[10,27,0,27],"isBorder":false},{"type":"wang_border","matrix":[10,27,0,27],"isBorder":true},{"type":"wang_border","matrix":[10,27,0,10],"isBorder":false},{"type":"wang_border","matrix":[10,27,0,10],"isBorder":true},{"type":"wang_border","matrix":[10,27,27,0],"isBorder":false},{"type":"wang_border","matrix":[10,27,27,0],"isBorder":true},{"type":"wang_border","matrix":[10,27,10,0],"isBorder":false},{"type":"wang_border","matrix":[10,27,10,0],"isBorder":true},{"type":"wang_border","matrix":[10,10,0,27],"isBorder":false},{"type":"wang_border","matrix":[10,10,0,27],"isBorder":true},{"type":"wang_border","matrix":[10,10,27,0],"isBorder":false},{"type":"wang_border","matrix":[10,10,27,0],"isBorder":true},{"type":"wang","origin":27,"data":[{"srcID":9,"r":0,"fx":true,"fy":true,"cutoff":0},{"srcID":9,"r":1,"fx":true,"fy":false,"cutoff":0},{"srcID":9,"r":2,"fx":false,"fy":false,"cutoff":0},{"srcID":9,"r":3,"fx":false,"fy":true,"cutoff":0},{"srcID":18,"r":0,"fx":false,"fy":false,"c":true},{"srcID":18,"r":0,"fx":false,"fy":false,"c":true},{"srcID":18,"r":0,"fx":false,"fy":false,"c":true},{"srcID":18,"r":0,"fx":false,"fy":false,"c":true},{"srcID":18,"r":0,"fx":false,"fy":false,"c":true},{"srcID":18,"r":0,"fx":false,"fy":false,"c":true},{"srcID":18,"r":0,"fx":false,"fy":false,"c":true},{"srcID":18,"r":0,"fx":false,"fy":false,"c":true}]},{"type":"wang_border","matrix":[0,0,0,false],"isBorder":false},{"type":"wang_border","matrix":[0,0,0,false],"isBorder":true},{"type":"wang_border","matrix":[0,0,false,0],"isBorder":false},{"type":"wang_border","matrix":[0,0,false,0],"isBorder":true},{"type":"wang_border","matrix":[0,0,false,false],"isBorder":false},{"type":"wang_border","matrix":[0,0,false,false],"isBorder":true},{"type":"wang_border","matrix":[0,false,0,0],"isBorder":false},{"type":"wang_border","matrix":[0,false,0,0],"isBorder":true},{"type":"wang_border","matrix":[0,false,0,false],"isBorder":false},{"type":"wang_border","matrix":[0,false,0,false],"isBorder":true},{"type":"wang_border","matrix":[0,false,false,0],"isBorder":false},{"type":"wang_border","matrix":[0,false,false,0],"isBorder":true},{"type":"wang_border","matrix":[0,false,false,false],"isBorder":false},{"type":"wang_border","matrix":[0,false,false,false],"isBorder":true},{"type":"wang_border","matrix":[false,0,0,0],"isBorder":false},{"type":"wang_border","matrix":[false,0,0,0],"isBorder":true},{"type":"wang_border","matrix":[false,0,0,false],"isBorder":false},{"type":"wang_border","matrix":[false,0,0,false],"isBorder":true},{"type":"wang_border","matrix":[false,0,false,0],"isBorder":false},{"type":"wang_border","matrix":[false,0,false,0],"isBorder":true},{"type":"wang_border","matrix":[false,0,false,false],"isBorder":false},{"type":"wang_border","matrix":[false,0,false,false],"isBorder":true},{"type":"wang_border","matrix":[false,false,0,0],"isBorder":false},{"type":"wang_border","matrix":[false,false,0,0],"isBorder":true},{"type":"wang_border","matrix":[false,false,0,false],"isBorder":false},{"type":"wang_border","matrix":[false,false,0,false],"isBorder":true},{"type":"wang_border","matrix":[false,false,false,0],"isBorder":false},{"type":"wang_border","matrix":[false,false,false,0],"isBorder":true},{"type":"wang_border","matrix":[0,0,1,false],"isBorder":false},{"type":"wang_border","matrix":[0,0,1,false],"isBorder":true},{"type":"wang_border","matrix":[0,0,false,1],"isBorder":false},{"type":"wang_border","matrix":[0,0,false,1],"isBorder":true},{"type":"wang_border","matrix":[0,1,0,false],"isBorder":false},{"type":"wang_border","matrix":[0,1,0,false],"isBorder":true},{"type":"wang_border","matrix":[0,1,1,false],"isBorder":false},{"type":"wang_border","matrix":[0,1,1,false],"isBorder":true},{"type":"wang_border","matrix":[0,1,false,0],"isBorder":false},{"type":"wang_border","matrix":[0,1,false,0],"isBorder":true},{"type":"wang_border","matrix":[0,1,false,1],"isBorder":false},{"type":"wang_border","matrix":[0,1,false,1],"isBorder":true},{"type":"wang_border","matrix":[0,1,false,false],"isBorder":false},{"type":"wang_border","matrix":[0,1,false,false],"isBorder":true},{"type":"wang_border","matrix":[0,false,0,1],"isBorder":false},{"type":"wang_border","matrix":[0,false,0,1],"isBorder":true},{"type":"wang_border","matrix":[0,false,1,0],"isBorder":false},{"type":"wang_border","matrix":[0,false,1,0],"isBorder":true},{"type":"wang_border","matrix":[0,false,1,1],"isBorder":false},{"type":"wang_border","matrix":[0,false,1,1],"isBorder":true},{"type":"wang_border","matrix":[0,false,1,false],"isBorder":false},{"type":"wang_border","matrix":[0,false,1,false],"isBorder":true},{"type":"wang_border","matrix":[0,false,false,1],"isBorder":false},{"type":"wang_border","matrix":[0,false,false,1],"isBorder":true},{"type":"wang_border","matrix":[1,0,0,false],"isBorder":false},{"type":"wang_border","matrix":[1,0,0,false],"isBorder":true},{"type":"wang_border","matrix":[1,0,1,false],"isBorder":false},{"type":"wang_border","matrix":[1,0,1,false],"isBorder":true},{"type":"wang_border","matrix":[1,0,false,0],"isBorder":false},{"type":"wang_border","matrix":[1,0,false,0],"isBorder":true},{"type":"wang_border","matrix":[1,0,false,1],"isBorder":false},{"type":"wang_border","matrix":[1,0,false,1],"isBorder":true},{"type":"wang_border","matrix":[1,0,false,false],"isBorder":false},{"type":"wang_border","matrix":[1,0,false,false],"isBorder":true},{"type":"wang_border","matrix":[1,1,0,false],"isBorder":false},{"type":"wang_border","matrix":[1,1,0,false],"isBorder":true},{"type":"wang_border","matrix":[1,1,false,0],"isBorder":false},{"type":"wang_border","matrix":[1,1,false,0],"isBorder":true},{"type":"wang_border","matrix":[1,false,0,0],"isBorder":false},{"type":"wang_border","matrix":[1,false,0,0],"isBorder":true},{"type":"wang_border","matrix":[1,false,0,1],"isBorder":false},{"type":"wang_border","matrix":[1,false,0,1],"isBorder":true},{"type":"wang_border","matrix":[1,false,0,false],"isBorder":false},{"type":"wang_border","matrix":[1,false,0,false],"isBorder":true},{"type":"wang_border","matrix":[1,false,1,0],"isBorder":false},{"type":"wang_border","matrix":[1,false,1,0],"isBorder":true},{"type":"wang_border","matrix":[1,false,false,0],"isBorder":false},{"type":"wang_border","matrix":[1,false,false,0],"isBorder":true},{"type":"wang_border","matrix":[false,0,0,1],"isBorder":false},{"type":"wang_border","matrix":[false,0,0,1],"isBorder":true},{"type":"wang_border","matrix":[false,0,1,0],"isBorder":false},{"type":"wang_border","matrix":[false,0,1,0],"isBorder":true},{"type":"wang_border","matrix":[false,0,1,1],"isBorder":false},{"type":"wang_border","matrix":[false,0,1,1],"isBorder":true},{"type":"wang_border","matrix":[false,0,1,false],"isBorder":false},{"type":"wang_border","matrix":[false,0,1,false],"isBorder":true},{"type":"wang_border","matrix":[false,0,false,1],"isBorder":false},{"type":"wang_border","matrix":[false,0,false,1],"isBorder":true},{"type":"wang_border","matrix":[false,1,0,0],"isBorder":false},{"type":"wang_border","matrix":[false,1,0,0],"isBorder":true},{"type":"wang_border","matrix":[false,1,0,1],"isBorder":false},{"type":"wang_border","matrix":[false,1,0,1],"isBorder":true},{"type":"wang_border","matrix":[false,1,0,false],"isBorder":false},{"type":"wang_border","matrix":[false,1,0,false],"isBorder":true},{"type":"wang_border","matrix":[false,1,1,0],"isBorder":false},{"type":"wang_border","matrix":[false,1,1,0],"isBorder":true},{"type":"wang_border","matrix":[false,1,false,0],"isBorder":false},{"type":"wang_border","matrix":[false,1,false,0],"isBorder":true},{"type":"wang_border","matrix":[false,false,0,1],"isBorder":false},{"type":"wang_border","matrix":[false,false,0,1],"isBorder":true},{"type":"wang_border","matrix":[false,false,1,0],"isBorder":false},{"type":"wang_border","matrix":[false,false,1,0],"isBorder":true},{"type":"wang","origin":0,"data":[{"srcID":3,"r":0,"fx":false,"fy":false,"cutoff":0},{"srcID":3,"r":1,"fx":false,"fy":true,"cutoff":0},{"srcID":3,"r":2,"fx":true,"fy":true,"cutoff":0},{"srcID":3,"r":3,"fx":true,"fy":false,"cutoff":0},{"srcID":19,"r":0,"fx":false,"fy":false,"c":true},{"srcID":19,"r":0,"fx":false,"fy":false,"c":true},{"srcID":19,"r":0,"fx":false,"fy":false,"c":true},{"srcID":19,"r":0,"fx":false,"fy":false,"c":true},{"srcID":19,"r":0,"fx":false,"fy":false,"c":true},{"srcID":19,"r":0,"fx":false,"fy":false,"c":true},{"srcID":19,"r":0,"fx":false,"fy":false,"c":true},{"srcID":19,"r":0,"fx":false,"fy":false,"c":true}]},{"type":"wang_border","matrix":[0,0,0,1],"isBorder":false},{"type":"wang_border","matrix":[0,0,0,1],"isBorder":true},{"type":"wang_border","matrix":[0,0,1,0],"isBorder":false},{"type":"wang_border","matrix":[0,0,1,0],"isBorder":true},{"type":"wang_border","matrix":[0,0,1,1],"isBorder":false},{"type":"wang_border","matrix":[0,0,1,1],"isBorder":true},{"type":"wang_border","matrix":[0,1,0,0],"isBorder":false},{"type":"wang_border","matrix":[0,1,0,0],"isBorder":true},{"type":"wang_border","matrix":[0,1,0,1],"isBorder":false},{"type":"wang_border","matrix":[0,1,0,1],"isBorder":true},{"type":"wang_border","matrix":[0,1,1,0],"isBorder":false},{"type":"wang_border","matrix":[0,1,1,0],"isBorder":true},{"type":"wang_border","matrix":[0,1,1,1],"isBorder":false},{"type":"wang_border","matrix":[0,1,1,1],"isBorder":true},{"type":"wang_border","matrix":[1,0,0,0],"isBorder":false},{"type":"wang_border","matrix":[1,0,0,0],"isBorder":true},{"type":"wang_border","matrix":[1,0,0,1],"isBorder":false},{"type":"wang_border","matrix":[1,0,0,1],"isBorder":true},{"type":"wang_border","matrix":[1,0,1,0],"isBorder":false},{"type":"wang_border","matrix":[1,0,1,0],"isBorder":true},{"type":"wang_border","matrix":[1,0,1,1],"isBorder":false},{"type":"wang_border","matrix":[1,0,1,1],"isBorder":true},{"type":"wang_border","matrix":[1,1,0,0],"isBorder":false},{"type":"wang_border","matrix":[1,1,0,0],"isBorder":true},{"type":"wang_border","matrix":[1,1,0,1],"isBorder":false},{"type":"wang_border","matrix":[1,1,0,1],"isBorder":true},{"type":"wang_border","matrix":[1,1,1,0],"isBorder":false},{"type":"wang_border","matrix":[1,1,1,0],"isBorder":true},{"type":"wang_border","matrix":[1,1,10,0],"isBorder":false},{"type":"wang_border","matrix":[1,1,10,0],"isBorder":true},{"type":"wang_border","matrix":[1,1,0,10],"isBorder":false},{"type":"wang_border","matrix":[1,1,0,10],"isBorder":true},{"type":"wang_border","matrix":[1,10,1,0],"isBorder":false},{"type":"wang_border","matrix":[1,10,1,0],"isBorder":true},{"type":"wang_border","matrix":[1,10,10,0],"isBorder":false},{"type":"wang_border","matrix":[1,10,10,0],"isBorder":true},{"type":"wang_border","matrix":[1,10,0,1],"isBorder":false},{"type":"wang_border","matrix":[1,10,0,1],"isBorder":true},{"type":"wang_border","matrix":[1,10,0,10],"isBorder":false},{"type":"wang_border","matrix":[1,10,0,10],"isBorder":true},{"type":"wang_border","matrix":[1,10,0,0],"isBorder":false},{"type":"wang_border","matrix":[1,10,0,0],"isBorder":true},{"type":"wang_border","matrix":[1,0,1,10],"isBorder":false},{"type":"wang_border","matrix":[1,0,1,10],"isBorder":true},{"type":"wang_border","matrix":[1,0,10,1],"isBorder":false},{"type":"wang_border","matrix":[1,0,10,1],"isBorder":true},{"type":"wang_border","matrix":[1,0,10,10],"isBorder":false},{"type":"wang_border","matrix":[1,0,10,10],"isBorder":true},{"type":"wang_border","matrix":[1,0,10,0],"isBorder":false},{"type":"wang_border","matrix":[1,0,10,0],"isBorder":true},{"type":"wang_border","matrix":[1,0,0,10],"isBorder":false},{"type":"wang_border","matrix":[1,0,0,10],"isBorder":true},{"type":"wang_border","matrix":[10,1,1,0],"isBorder":false},{"type":"wang_border","matrix":[10,1,1,0],"isBorder":true},{"type":"wang_border","matrix":[10,1,10,0],"isBorder":false},{"type":"wang_border","matrix":[10,1,10,0],"isBorder":true},{"type":"wang_border","matrix":[10,1,0,1],"isBorder":false},{"type":"wang_border","matrix":[10,1,0,1],"isBorder":true},{"type":"wang_border","matrix":[10,1,0,10],"isBorder":false},{"type":"wang_border","matrix":[10,1,0,10],"isBorder":true},{"type":"wang_border","matrix":[10,1,0,0],"isBorder":false},{"type":"wang_border","matrix":[10,1,0,0],"isBorder":true},{"type":"wang_border","matrix":[10,10,1,0],"isBorder":false},{"type":"wang_border","matrix":[10,10,1,0],"isBorder":true},{"type":"wang_border","matrix":[10,10,0,1],"isBorder":false},{"type":"wang_border","matrix":[10,10,0,1],"isBorder":true},{"type":"wang_border","matrix":[10,0,1,1],"isBorder":false},{"type":"wang_border","matrix":[10,0,1,1],"isBorder":true},{"type":"wang_border","matrix":[10,0,1,10],"isBorder":false},{"type":"wang_border","matrix":[10,0,1,10],"isBorder":true},{"type":"wang_border","matrix":[10,0,1,0],"isBorder":false},{"type":"wang_border","matrix":[10,0,1,0],"isBorder":true},{"type":"wang_border","matrix":[10,0,10,1],"isBorder":false},{"type":"wang_border","matrix":[10,0,10,1],"isBorder":true},{"type":"wang_border","matrix":[10,0,0,1],"isBorder":false},{"type":"wang_border","matrix":[10,0,0,1],"isBorder":true},{"type":"wang_border","matrix":[0,1,1,10],"isBorder":false},{"type":"wang_border","matrix":[0,1,1,10],"isBorder":true},{"type":"wang_border","matrix":[0,1,10,1],"isBorder":false},{"type":"wang_border","matrix":[0,1,10,1],"isBorder":true},{"type":"wang_border","matrix":[0,1,10,10],"isBorder":false},{"type":"wang_border","matrix":[0,1,10,10],"isBorder":true},{"type":"wang_border","matrix":[0,1,10,0],"isBorder":false},{"type":"wang_border","matrix":[0,1,10,0],"isBorder":true},{"type":"wang_border","matrix":[0,1,0,10],"isBorder":false},{"type":"wang_border","matrix":[0,1,0,10],"isBorder":true},{"type":"wang_border","matrix":[0,10,1,1],"isBorder":false},{"type":"wang_border","matrix":[0,10,1,1],"isBorder":true},{"type":"wang_border","matrix":[0,10,1,10],"isBorder":false},{"type":"wang_border","matrix":[0,10,1,10],"isBorder":true},{"type":"wang_border","matrix":[0,10,1,0],"isBorder":false},{"type":"wang_border","matrix":[0,10,1,0],"isBorder":true},{"type":"wang_border","matrix":[0,10,10,1],"isBorder":false},{"type":"wang_border","matrix":[0,10,10,1],"isBorder":true},{"type":"wang_border","matrix":[0,10,0,1],"isBorder":false},{"type":"wang_border","matrix":[0,10,0,1],"isBorder":true},{"type":"wang_border","matrix":[0,0,1,10],"isBorder":false},{"type":"wang_border","matrix":[0,0,1,10],"isBorder":true},{"type":"wang_border","matrix":[0,0,10,1],"isBorder":false},{"type":"wang_border","matrix":[0,0,10,1],"isBorder":true},{"type":"wang","origin":0,"data":[{"srcID":2,"r":0,"fx":false,"fy":false,"cutoff":0},{"srcID":2,"r":1,"fx":false,"fy":true,"cutoff":0},{"srcID":2,"r":2,"fx":true,"fy":true,"cutoff":0},{"srcID":2,"r":3,"fx":true,"fy":false,"cutoff":0},{"srcID":20,"r":0,"fx":false,"fy":false,"c":true},{"srcID":20,"r":0,"fx":false,"fy":false,"c":true},{"srcID":20,"r":0,"fx":false,"fy":false,"c":true},{"srcID":20,"r":0,"fx":false,"fy":false,"c":true},{"srcID":20,"r":0,"fx":false,"fy":false,"c":true},{"srcID":20,"r":0,"fx":false,"fy":false,"c":true},{"srcID":20,"r":0,"fx":false,"fy":false,"c":true},{"srcID":20,"r":0,"fx":false,"fy":false,"c":true}]},{"type":"wang_border","matrix":[0,0,0,10],"isBorder":false},{"type":"wang_border","matrix":[0,0,0,10],"isBorder":true},{"type":"wang_border","matrix":[0,0,10,0],"isBorder":false},{"type":"wang_border","matrix":[0,0,10,0],"isBorder":true},{"type":"wang_border","matrix":[0,0,10,10],"isBorder":false},{"type":"wang_border","matrix":[0,0,10,10],"isBorder":true},{"type":"wang_border","matrix":[0,10,0,0],"isBorder":false},{"type":"wang_border","matrix":[0,10,0,0],"isBorder":true},{"type":"wang_border","matrix":[0,10,0,10],"isBorder":false},{"type":"wang_border","matrix":[0,10,0,10],"isBorder":true},{"type":"wang_border","matrix":[0,10,10,0],"isBorder":false},{"type":"wang_border","matrix":[0,10,10,0],"isBorder":true},{"type":"wang_border","matrix":[0,10,10,10],"isBorder":false},{"type":"wang_border","matrix":[0,10,10,10],"isBorder":true},{"type":"wang_border","matrix":[10,0,0,0],"isBorder":false},{"type":"wang_border","matrix":[10,0,0,0],"isBorder":true},{"type":"wang_border","matrix":[10,0,0,10],"isBorder":false},{"type":"wang_border","matrix":[10,0,0,10],"isBorder":true},{"type":"wang_border","matrix":[10,0,10,0],"isBorder":false},{"type":"wang_border","matrix":[10,0,10,0],"isBorder":true},{"type":"wang_border","matrix":[10,0,10,10],"isBorder":false},{"type":"wang_border","matrix":[10,0,10,10],"isBorder":true},{"type":"wang_border","matrix":[10,10,0,0],"isBorder":false},{"type":"wang_border","matrix":[10,10,0,0],"isBorder":true},{"type":"wang_border","matrix":[10,10,0,10],"isBorder":false},{"type":"wang_border","matrix":[10,10,0,10],"isBorder":true},{"type":"wang_border","matrix":[10,10,10,0],"isBorder":false},{"type":"wang_border","matrix":[10,10,10,0],"isBorder":true},{"type":"wang","origin":0,"data":[{"srcID":6,"r":0,"fx":false,"fy":false,"cutoff":0},{"srcID":6,"r":1,"fx":false,"fy":true,"cutoff":0},{"srcID":6,"r":2,"fx":true,"fy":true,"cutoff":0},{"srcID":6,"r":3,"fx":true,"fy":false,"cutoff":0},{"srcID":21,"r":0,"fx":false,"fy":false,"c":true},{"srcID":21,"r":0,"fx":false,"fy":false,"c":true},{"srcID":21,"r":0,"fx":false,"fy":false,"c":true},{"srcID":21,"r":0,"fx":false,"fy":false,"c":true},{"srcID":21,"r":0,"fx":false,"fy":false,"c":true},{"srcID":21,"r":0,"fx":false,"fy":false,"c":true},{"srcID":21,"r":0,"fx":false,"fy":false,"c":true},{"srcID":21,"r":0,"fx":false,"fy":false,"c":true}]},{"type":"wang_border","matrix":[1,1,1,false],"isBorder":false},{"type":"wang_border","matrix":[1,1,1,false],"isBorder":true},{"type":"wang_border","matrix":[1,1,false,1],"isBorder":false},{"type":"wang_border","matrix":[1,1,false,1],"isBorder":true},{"type":"wang_border","matrix":[1,1,false,false],"isBorder":false},{"type":"wang_border","matrix":[1,1,false,false],"isBorder":true},{"type":"wang_border","matrix":[1,false,1,1],"isBorder":false},{"type":"wang_border","matrix":[1,false,1,1],"isBorder":true},{"type":"wang_border","matrix":[1,false,1,false],"isBorder":false},{"type":"wang_border","matrix":[1,false,1,false],"isBorder":true},{"type":"wang_border","matrix":[1,false,false,1],"isBorder":false},{"type":"wang_border","matrix":[1,false,false,1],"isBorder":true},{"type":"wang_border","matrix":[1,false,false,false],"isBorder":false},{"type":"wang_border","matrix":[1,false,false,false],"isBorder":true},{"type":"wang_border","matrix":[false,1,1,1],"isBorder":false},{"type":"wang_border","matrix":[false,1,1,1],"isBorder":true},{"type":"wang_border","matrix":[false,1,1,false],"isBorder":false},{"type":"wang_border","matrix":[false,1,1,false],"isBorder":true},{"type":"wang_border","matrix":[false,1,false,1],"isBorder":false},{"type":"wang_border","matrix":[false,1,false,1],"isBorder":true},{"type":"wang_border","matrix":[false,1,false,false],"isBorder":false},{"type":"wang_border","matrix":[false,1,false,false],"isBorder":true},{"type":"wang_border","matrix":[false,false,1,1],"isBorder":false},{"type":"wang_border","matrix":[false,false,1,1],"isBorder":true},{"type":"wang_border","matrix":[false,false,1,false],"isBorder":false},{"type":"wang_border","matrix":[false,false,1,false],"isBorder":true},{"type":"wang_border","matrix":[false,false,false,1],"isBorder":false},{"type":"wang_border","matrix":[false,false,false,1],"isBorder":true},{"type":"wang","origin":1,"data":[{"srcID":4,"r":0,"fx":false,"fy":false,"cutoff":0},{"srcID":4,"r":1,"fx":false,"fy":true,"cutoff":0},{"srcID":4,"r":2,"fx":true,"fy":true,"cutoff":0},{"srcID":4,"r":3,"fx":true,"fy":false,"cutoff":0},{"srcID":22,"r":0,"fx":false,"fy":false,"c":true},{"srcID":22,"r":0,"fx":false,"fy":false,"c":true},{"srcID":22,"r":0,"fx":false,"fy":false,"c":true},{"srcID":22,"r":0,"fx":false,"fy":false,"c":true},{"srcID":22,"r":0,"fx":false,"fy":false,"c":true},{"srcID":22,"r":0,"fx":false,"fy":false,"c":true},{"srcID":22,"r":0,"fx":false,"fy":false,"c":true},{"srcID":22,"r":0,"fx":false,"fy":false,"c":true}]},{"type":"wang_border","matrix":[1,1,1,10],"isBorder":false},{"type":"wang_border","matrix":[1,1,1,10],"isBorder":true},{"type":"wang_border","matrix":[1,1,10,1],"isBorder":false},{"type":"wang_border","matrix":[1,1,10,1],"isBorder":true},{"type":"wang_border","matrix":[1,1,10,10],"isBorder":false},{"type":"wang_border","matrix":[1,1,10,10],"isBorder":true},{"type":"wang_border","matrix":[1,10,1,1],"isBorder":false},{"type":"wang_border","matrix":[1,10,1,1],"isBorder":true},{"type":"wang_border","matrix":[1,10,1,10],"isBorder":false},{"type":"wang_border","matrix":[1,10,1,10],"isBorder":true},{"type":"wang_border","matrix":[1,10,10,1],"isBorder":false},{"type":"wang_border","matrix":[1,10,10,1],"isBorder":true},{"type":"wang_border","matrix":[1,10,10,10],"isBorder":false},{"type":"wang_border","matrix":[1,10,10,10],"isBorder":true},{"type":"wang_border","matrix":[10,1,1,1],"isBorder":false},{"type":"wang_border","matrix":[10,1,1,1],"isBorder":true},{"type":"wang_border","matrix":[10,1,1,10],"isBorder":false},{"type":"wang_border","matrix":[10,1,1,10],"isBorder":true},{"type":"wang_border","matrix":[10,1,10,1],"isBorder":false},{"type":"wang_border","matrix":[10,1,10,1],"isBorder":true},{"type":"wang_border","matrix":[10,1,10,10],"isBorder":false},{"type":"wang_border","matrix":[10,1,10,10],"isBorder":true},{"type":"wang_border","matrix":[10,10,1,1],"isBorder":false},{"type":"wang_border","matrix":[10,10,1,1],"isBorder":true},{"type":"wang_border","matrix":[10,10,1,10],"isBorder":false},{"type":"wang_border","matrix":[10,10,1,10],"isBorder":true},{"type":"wang_border","matrix":[10,10,10,1],"isBorder":false},{"type":"wang_border","matrix":[10,10,10,1],"isBorder":true},{"type":"wang","origin":1,"data":[{"srcID":7,"r":0,"fx":false,"fy":false,"cutoff":0},{"srcID":7,"r":1,"fx":false,"fy":true,"cutoff":0},{"srcID":7,"r":2,"fx":true,"fy":true,"cutoff":0},{"srcID":7,"r":3,"fx":true,"fy":false,"cutoff":0},{"srcID":23,"r":0,"fx":false,"fy":false,"c":true},{"srcID":23,"r":0,"fx":false,"fy":false,"c":true},{"srcID":23,"r":0,"fx":false,"fy":false,"c":true},{"srcID":23,"r":0,"fx":false,"fy":false,"c":true},{"srcID":23,"r":0,"fx":false,"fy":false,"c":true},{"srcID":23,"r":0,"fx":false,"fy":false,"c":true},{"srcID":23,"r":0,"fx":false,"fy":false,"c":true},{"srcID":23,"r":0,"fx":false,"fy":false,"c":true}]},{"type":"wang_border","matrix":[27,27,27,10],"isBorder":false},{"type":"wang_border","matrix":[27,27,27,10],"isBorder":true},{"type":"wang_border","matrix":[27,27,10,27],"isBorder":false},{"type":"wang_border","matrix":[27,27,10,27],"isBorder":true},{"type":"wang_border","matrix":[27,27,10,10],"isBorder":false},{"type":"wang_border","matrix":[27,27,10,10],"isBorder":true},{"type":"wang_border","matrix":[27,10,27,27],"isBorder":false},{"type":"wang_border","matrix":[27,10,27,27],"isBorder":true},{"type":"wang_border","matrix":[27,10,27,10],"isBorder":false},{"type":"wang_border","matrix":[27,10,27,10],"isBorder":true},{"type":"wang_border","matrix":[27,10,10,27],"isBorder":false},{"type":"wang_border","matrix":[27,10,10,27],"isBorder":true},{"type":"wang_border","matrix":[27,10,10,10],"isBorder":false},{"type":"wang_border","matrix":[27,10,10,10],"isBorder":true},{"type":"wang_border","matrix":[10,27,27,27],"isBorder":false},{"type":"wang_border","matrix":[10,27,27,27],"isBorder":true},{"type":"wang_border","matrix":[10,27,27,10],"isBorder":false},{"type":"wang_border","matrix":[10,27,27,10],"isBorder":true},{"type":"wang_border","matrix":[10,27,10,27],"isBorder":false},{"type":"wang_border","matrix":[10,27,10,27],"isBorder":true},{"type":"wang_border","matrix":[10,27,10,10],"isBorder":false},{"type":"wang_border","matrix":[10,27,10,10],"isBorder":true},{"type":"wang_border","matrix":[10,10,27,27],"isBorder":false},{"type":"wang_border","matrix":[10,10,27,27],"isBorder":true},{"type":"wang_border","matrix":[10,10,27,10],"isBorder":false},{"type":"wang_border","matrix":[10,10,27,10],"isBorder":true},{"type":"wang_border","matrix":[10,10,10,27],"isBorder":false},{"type":"wang_border","matrix":[10,10,10,27],"isBorder":true},{"type":"wang","origin":10,"data":[{"srcID":10,"r":0,"fx":true,"fy":true,"cutoff":0},{"srcID":10,"r":1,"fx":true,"fy":false,"cutoff":0},{"srcID":10,"r":2,"fx":false,"fy":false,"cutoff":0},{"srcID":10,"r":3,"fx":false,"fy":true,"cutoff":0},{"srcID":24,"r":0,"fx":false,"fy":false,"c":true},{"srcID":24,"r":0,"fx":false,"fy":false,"c":true},{"srcID":24,"r":0,"fx":false,"fy":false,"c":true},{"srcID":24,"r":0,"fx":false,"fy":false,"c":true},{"srcID":24,"r":0,"fx":false,"fy":false,"c":true},{"srcID":24,"r":0,"fx":false,"fy":false,"c":true},{"srcID":24,"r":0,"fx":false,"fy":false,"c":true},{"srcID":24,"r":0,"fx":false,"fy":false,"c":true}]},{"type":"wang_border","matrix":[10,10,10,100],"isBorder":false},{"type":"wang_border","matrix":[10,10,10,100],"isBorder":true},{"type":"wang_border","matrix":[10,10,100,10],"isBorder":false},{"type":"wang_border","matrix":[10,10,100,10],"isBorder":true},{"type":"wang_border","matrix":[10,10,100,100],"isBorder":false},{"type":"wang_border","matrix":[10,10,100,100],"isBorder":true},{"type":"wang_border","matrix":[10,100,10,10],"isBorder":false},{"type":"wang_border","matrix":[10,100,10,10],"isBorder":true},{"type":"wang_border","matrix":[10,100,10,100],"isBorder":false},{"type":"wang_border","matrix":[10,100,10,100],"isBorder":true},{"type":"wang_border","matrix":[10,100,100,10],"isBorder":false},{"type":"wang_border","matrix":[10,100,100,10],"isBorder":true},{"type":"wang_border","matrix":[10,100,100,100],"isBorder":false},{"type":"wang_border","matrix":[10,100,100,100],"isBorder":true},{"type":"wang_border","matrix":[100,10,10,10],"isBorder":false},{"type":"wang_border","matrix":[100,10,10,10],"isBorder":true},{"type":"wang_border","matrix":[100,10,10,100],"isBorder":false},{"type":"wang_border","matrix":[100,10,10,100],"isBorder":true},{"type":"wang_border","matrix":[100,10,100,10],"isBorder":false},{"type":"wang_border","matrix":[100,10,100,10],"isBorder":true},{"type":"wang_border","matrix":[100,10,100,100],"isBorder":false},{"type":"wang_border","matrix":[100,10,100,100],"isBorder":true},{"type":"wang_border","matrix":[100,100,10,10],"isBorder":false},{"type":"wang_border","matrix":[100,100,10,10],"isBorder":true},{"type":"wang_border","matrix":[100,100,10,100],"isBorder":false},{"type":"wang_border","matrix":[100,100,10,100],"isBorder":true},{"type":"wang_border","matrix":[100,100,100,10],"isBorder":false},{"type":"wang_border","matrix":[100,100,100,10],"isBorder":true},{"type":"wang","origin":10,"data":[{"srcID":17,"r":0,"fx":true,"fy":true,"cutoff":0},{"srcID":17,"r":1,"fx":true,"fy":false,"cutoff":0},{"srcID":17,"r":2,"fx":false,"fy":false,"cutoff":0},{"srcID":17,"r":3,"fx":false,"fy":true,"cutoff":0},{"srcID":25,"r":0,"fx":false,"fy":false,"c":true},{"srcID":25,"r":0,"fx":false,"fy":false,"c":true},{"srcID":25,"r":0,"fx":false,"fy":false,"c":true},{"srcID":25,"r":0,"fx":false,"fy":false,"c":true},{"srcID":25,"r":0,"fx":false,"fy":false,"c":true},{"srcID":25,"r":0,"fx":false,"fy":false,"c":true},{"srcID":25,"r":0,"fx":false,"fy":false,"c":true},{"srcID":25,"r":0,"fx":false,"fy":false,"c":true}]},{"type":"wang_border","matrix":[100,100,100,87],"isBorder":false},{"type":"wang_border","matrix":[100,100,100,87],"isBorder":true},{"type":"wang_border","matrix":[100,100,87,100],"isBorder":false},{"type":"wang_border","matrix":[100,100,87,100],"isBorder":true},{"type":"wang_border","matrix":[100,100,87,87],"isBorder":false},{"type":"wang_border","matrix":[100,100,87,87],"isBorder":true},{"type":"wang_border","matrix":[100,87,100,100],"isBorder":false},{"type":"wang_border","matrix":[100,87,100,100],"isBorder":true},{"type":"wang_border","matrix":[100,87,100,87],"isBorder":false},{"type":"wang_border","matrix":[100,87,100,87],"isBorder":true},{"type":"wang_border","matrix":[100,87,87,100],"isBorder":false},{"type":"wang_border","matrix":[100,87,87,100],"isBorder":true},{"type":"wang_border","matrix":[100,87,87,87],"isBorder":false},{"type":"wang_border","matrix":[100,87,87,87],"isBorder":true},{"type":"wang_border","matrix":[87,100,100,100],"isBorder":false},{"type":"wang_border","matrix":[87,100,100,100],"isBorder":true},{"type":"wang_border","matrix":[87,100,100,87],"isBorder":false},{"type":"wang_border","matrix":[87,100,100,87],"isBorder":true},{"type":"wang_border","matrix":[87,100,87,100],"isBorder":false},{"type":"wang_border","matrix":[87,100,87,100],"isBorder":true},{"type":"wang_border","matrix":[87,100,87,87],"isBorder":false},{"type":"wang_border","matrix":[87,100,87,87],"isBorder":true},{"type":"wang_border","matrix":[87,87,100,100],"isBorder":false},{"type":"wang_border","matrix":[87,87,100,100],"isBorder":true},{"type":"wang_border","matrix":[87,87,100,87],"isBorder":false},{"type":"wang_border","matrix":[87,87,100,87],"isBorder":true},{"type":"wang_border","matrix":[87,87,87,100],"isBorder":false},{"type":"wang_border","matrix":[87,87,87,100],"isBorder":true},{"type":"wang","origin":87,"data":[{"srcID":16,"r":0,"fx":true,"fy":true,"cutoff":0},{"srcID":16,"r":1,"fx":true,"fy":false,"cutoff":0},{"srcID":16,"r":2,"fx":false,"fy":false,"cutoff":0},{"srcID":16,"r":3,"fx":false,"fy":true,"cutoff":0},{"srcID":26,"r":0,"fx":false,"fy":false,"c":true},{"srcID":26,"r":0,"fx":false,"fy":false,"c":true},{"srcID":26,"r":0,"fx":false,"fy":false,"c":true},{"srcID":26,"r":0,"fx":false,"fy":false,"c":true},{"srcID":26,"r":0,"fx":false,"fy":false,"c":true},{"srcID":26,"r":0,"fx":false,"fy":false,"c":true},{"srcID":26,"r":0,"fx":false,"fy":false,"c":true},{"srcID":26,"r":0,"fx":false,"fy":false,"c":true}]}],"tileRelations":[{"tile":0,"other":123,"r":0},{"tile":123,"other":0,"r":1},{"tile":123,"other":27,"r":1},{"tile":27,"other":123,"r":0},{"tile":0,"other":99,"r":2},{"tile":99,"other":0,"r":3},{"tile":99,"other":27,"r":3},{"tile":27,"other":99,"r":2},{"tile":0,"other":111,"r":4},{"tile":111,"other":0,"r":5},{"tile":111,"other":27,"r":5},{"tile":27,"other":111,"r":4},{"tile":0,"other":124,"r":6},{"tile":124,"other":0,"r":7},{"tile":124,"other":27,"r":7},{"tile":27,"other":124,"r":6},{"tile":0,"other":166,"r":8},{"tile":166,"other":0,"r":9},{"tile":166,"other":27,"r":9},{"tile":27,"other":166,"r":8},{"tile":0,"other":112,"r":10},{"tile":112,"other":0,"r":11},{"tile":112,"other":27,"r":11},{"tile":27,"other":112,"r":10},{"tile":0,"other":156,"r":12},{"tile":156,"other":0,"r":13},{"tile":156,"other":27,"r":13},{"tile":27,"other":156,"r":12},{"tile":0,"other":147,"r":14},{"tile":147,"other":0,"r":15},{"tile":147,"other":27,"r":15},{"tile":27,"other":147,"r":14},{"tile":0,"other":135,"r":16},{"tile":135,"other":0,"r":17},{"tile":135,"other":27,"r":17},{"tile":27,"other":135,"r":16},{"tile":0,"other":157,"r":18},{"tile":157,"other":0,"r":19},{"tile":157,"other":27,"r":19},{"tile":27,"other":157,"r":18},{"tile":0,"other":146,"r":20},{"tile":146,"other":0,"r":21},{"tile":146,"other":27,"r":21},{"tile":27,"other":146,"r":20},{"tile":0,"other":136,"r":22},{"tile":136,"other":0,"r":23},{"tile":136,"other":27,"r":23},{"tile":27,"other":136,"r":22},{"tile":0,"other":134,"r":24},{"tile":134,"other":0,"r":25},{"tile":134,"other":27,"r":25},{"tile":27,"other":134,"r":24},{"tile":0,"other":145,"r":26},{"tile":145,"other":0,"r":27},{"tile":145,"other":27,"r":27},{"tile":27,"other":145,"r":26},{"tile":0,"other":251,"r":28},{"tile":251,"other":0,"r":29},{"tile":251,"other":10,"r":29},{"tile":10,"other":251,"r":28},{"tile":251,"other":27,"r":29},{"tile":27,"other":251,"r":28},{"tile":0,"other":255,"r":30},{"tile":255,"other":0,"r":31},{"tile":255,"other":27,"r":31},{"tile":27,"other":255,"r":30},{"tile":255,"other":10,"r":31},{"tile":10,"other":255,"r":30},{"tile":0,"other":253,"r":32},{"tile":253,"other":0,"r":33},{"tile":253,"other":10,"r":33},{"tile":10,"other":253,"r":32},{"tile":253,"other":27,"r":33},{"tile":27,"other":253,"r":32},{"tile":0,"other":235,"r":34},{"tile":235,"other":0,"r":35},{"tile":235,"other":10,"r":35},{"tile":10,"other":235,"r":34},{"tile":235,"other":27,"r":35},{"tile":27,"other":235,"r":34},{"tile":0,"other":260,"r":36},{"tile":260,"other":0,"r":37},{"tile":260,"other":10,"r":37},{"tile":10,"other":260,"r":36},{"tile":260,"other":27,"r":37},{"tile":27,"other":260,"r":36},{"tile":0,"other":245,"r":38},{"tile":245,"other":0,"r":39},{"tile":245,"other":10,"r":39},{"tile":10,"other":245,"r":38},{"tile":245,"other":27,"r":39},{"tile":27,"other":245,"r":38},{"tile":0,"other":197,"r":40},{"tile":197,"other":0,"r":41},{"tile":197,"other":10,"r":41},{"tile":10,"other":197,"r":40},{"tile":197,"other":27,"r":41},{"tile":27,"other":197,"r":40},{"tile":0,"other":252,"r":42},{"tile":252,"other":0,"r":43},{"tile":252,"other":27,"r":43},{"tile":27,"other":252,"r":42},{"tile":252,"other":10,"r":43},{"tile":10,"other":252,"r":42},{"tile":0,"other":258,"r":44},{"tile":258,"other":0,"r":45},{"tile":258,"other":27,"r":45},{"tile":27,"other":258,"r":44},{"tile":258,"other":10,"r":45},{"tile":10,"other":258,"r":44},{"tile":0,"other":238,"r":46},{"tile":238,"other":0,"r":47},{"tile":238,"other":27,"r":47},{"tile":27,"other":238,"r":46},{"tile":238,"other":10,"r":47},{"tile":10,"other":238,"r":46},{"tile":0,"other":217,"r":48},{"tile":217,"other":0,"r":49},{"tile":217,"other":27,"r":49},{"tile":27,"other":217,"r":48},{"tile":217,"other":10,"r":49},{"tile":10,"other":217,"r":48},{"tile":0,"other":228,"r":50},{"tile":228,"other":0,"r":51},{"tile":228,"other":27,"r":51},{"tile":27,"other":228,"r":50},{"tile":228,"other":10,"r":51},{"tile":10,"other":228,"r":50},{"tile":0,"other":259,"r":52},{"tile":259,"other":0,"r":53},{"tile":259,"other":10,"r":53},{"tile":10,"other":259,"r":52},{"tile":259,"other":27,"r":53},{"tile":27,"other":259,"r":52},{"tile":0,"other":237,"r":54},{"tile":237,"other":0,"r":55},{"tile":237,"other":10,"r":55},{"tile":10,"other":237,"r":54},{"tile":237,"other":27,"r":55},{"tile":27,"other":237,"r":54},{"tile":0,"other":257,"r":56},{"tile":257,"other":0,"r":57},{"tile":257,"other":10,"r":57},{"tile":10,"other":257,"r":56},{"tile":257,"other":27,"r":57},{"tile":27,"other":257,"r":56},{"tile":0,"other":243,"r":58},{"tile":243,"other":0,"r":59},{"tile":243,"other":10,"r":59},{"tile":10,"other":243,"r":58},{"tile":243,"other":27,"r":59},{"tile":27,"other":243,"r":58},{"tile":0,"other":207,"r":60},{"tile":207,"other":0,"r":61},{"tile":207,"other":10,"r":61},{"tile":10,"other":207,"r":60},{"tile":207,"other":27,"r":61},{"tile":27,"other":207,"r":60},{"tile":0,"other":239,"r":62},{"tile":239,"other":0,"r":63},{"tile":239,"other":10,"r":63},{"tile":10,"other":239,"r":62},{"tile":239,"other":27,"r":63},{"tile":27,"other":239,"r":62},{"tile":0,"other":247,"r":64},{"tile":247,"other":0,"r":65},{"tile":247,"other":10,"r":65},{"tile":10,"other":247,"r":64},{"tile":247,"other":27,"r":65},{"tile":27,"other":247,"r":64},{"tile":0,"other":250,"r":66},{"tile":250,"other":0,"r":67},{"tile":250,"other":10,"r":67},{"tile":10,"other":250,"r":66},{"tile":250,"other":27,"r":67},{"tile":27,"other":250,"r":66},{"tile":0,"other":234,"r":68},{"tile":234,"other":0,"r":69},{"tile":234,"other":10,"r":69},{"tile":10,"other":234,"r":68},{"tile":234,"other":27,"r":69},{"tile":27,"other":234,"r":68},{"tile":0,"other":216,"r":70},{"tile":216,"other":0,"r":71},{"tile":216,"other":10,"r":71},{"tile":10,"other":216,"r":70},{"tile":216,"other":27,"r":71},{"tile":27,"other":216,"r":70},{"tile":0,"other":236,"r":72},{"tile":236,"other":0,"r":73},{"tile":236,"other":10,"r":73},{"tile":10,"other":236,"r":72},{"tile":236,"other":27,"r":73},{"tile":27,"other":236,"r":72},{"tile":0,"other":218,"r":74},{"tile":218,"other":0,"r":75},{"tile":218,"other":10,"r":75},{"tile":10,"other":218,"r":74},{"tile":218,"other":27,"r":75},{"tile":27,"other":218,"r":74},{"tile":0,"other":256,"r":76},{"tile":256,"other":0,"r":77},{"tile":256,"other":27,"r":77},{"tile":27,"other":256,"r":76},{"tile":256,"other":10,"r":77},{"tile":10,"other":256,"r":76},{"tile":0,"other":246,"r":78},{"tile":246,"other":0,"r":79},{"tile":246,"other":27,"r":79},{"tile":27,"other":246,"r":78},{"tile":246,"other":10,"r":79},{"tile":10,"other":246,"r":78},{"tile":0,"other":229,"r":80},{"tile":229,"other":0,"r":81},{"tile":229,"other":27,"r":81},{"tile":27,"other":229,"r":80},{"tile":229,"other":10,"r":81},{"tile":10,"other":229,"r":80},{"tile":0,"other":219,"r":82},{"tile":219,"other":0,"r":83},{"tile":219,"other":27,"r":83},{"tile":27,"other":219,"r":82},{"tile":219,"other":10,"r":83},{"tile":10,"other":219,"r":82},{"tile":0,"other":226,"r":84},{"tile":226,"other":0,"r":85},{"tile":226,"other":27,"r":85},{"tile":27,"other":226,"r":84},{"tile":226,"other":10,"r":85},{"tile":10,"other":226,"r":84},{"tile":0,"other":244,"r":86},{"tile":244,"other":0,"r":87},{"tile":244,"other":27,"r":87},{"tile":27,"other":244,"r":86},{"tile":244,"other":10,"r":87},{"tile":10,"other":244,"r":86},{"tile":0,"other":227,"r":88},{"tile":227,"other":0,"r":89},{"tile":227,"other":27,"r":89},{"tile":27,"other":227,"r":88},{"tile":227,"other":10,"r":89},{"tile":10,"other":227,"r":88},{"tile":0,"other":208,"r":90},{"tile":208,"other":0,"r":91},{"tile":208,"other":27,"r":91},{"tile":27,"other":208,"r":90},{"tile":208,"other":10,"r":91},{"tile":10,"other":208,"r":90},{"tile":0,"other":225,"r":92},{"tile":225,"other":0,"r":93},{"tile":225,"other":27,"r":93},{"tile":27,"other":225,"r":92},{"tile":225,"other":10,"r":93},{"tile":10,"other":225,"r":92},{"tile":0,"other":206,"r":94},{"tile":206,"other":0,"r":95},{"tile":206,"other":27,"r":95},{"tile":27,"other":206,"r":94},{"tile":206,"other":10,"r":95},{"tile":10,"other":206,"r":94},{"tile":0,"other":196,"r":96},{"tile":196,"other":0,"r":97},{"tile":196,"other":27,"r":97},{"tile":27,"other":196,"r":96},{"tile":196,"other":10,"r":97},{"tile":10,"other":196,"r":96},{"tile":0,"other":187,"r":98},{"tile":187,"other":0,"r":99},{"tile":187,"other":27,"r":99},{"tile":27,"other":187,"r":98},{"tile":187,"other":10,"r":99},{"tile":10,"other":187,"r":98},{"tile":0,"other":27,"r":100},{"tile":27,"other":0,"r":100},{"tile":0,"other":16,"r":101},{"tile":16,"other":0,"r":102},{"tile":0,"other":11,"r":103},{"tile":11,"other":0,"r":104},{"tile":0,"other":13,"r":105},{"tile":13,"other":0,"r":106},{"tile":0,"other":17,"r":107},{"tile":17,"other":0,"r":108},{"tile":0,"other":24,"r":109},{"tile":24,"other":0,"r":110},{"tile":0,"other":12,"r":111},{"tile":12,"other":0,"r":112},{"tile":0,"other":18,"r":113},{"tile":18,"other":0,"r":114},{"tile":0,"other":23,"r":115},{"tile":23,"other":0,"r":116},{"tile":0,"other":6,"r":117},{"tile":6,"other":0,"r":118},{"tile":0,"other":30,"r":119},{"tile":30,"other":0,"r":120},{"tile":0,"other":9,"r":121},{"tile":9,"other":0,"r":122},{"tile":0,"other":5,"r":123},{"tile":5,"other":0,"r":124},{"tile":0,"other":3,"r":125},{"tile":3,"other":0,"r":126},{"tile":0,"other":8,"r":127},{"tile":8,"other":0,"r":128},{"tile":0,"other":47,"r":129},{"tile":47,"other":0,"r":130},{"tile":47,"other":1,"r":130},{"tile":1,"other":47,"r":129},{"tile":0,"other":56,"r":131},{"tile":56,"other":0,"r":132},{"tile":56,"other":1,"r":132},{"tile":1,"other":56,"r":131},{"tile":0,"other":67,"r":133},{"tile":67,"other":0,"r":134},{"tile":67,"other":1,"r":134},{"tile":1,"other":67,"r":133},{"tile":0,"other":90,"r":135},{"tile":90,"other":0,"r":136},{"tile":90,"other":1,"r":136},{"tile":1,"other":90,"r":135},{"tile":0,"other":69,"r":137},{"tile":69,"other":0,"r":138},{"tile":69,"other":1,"r":138},{"tile":1,"other":69,"r":137},{"tile":0,"other":92,"r":139},{"tile":92,"other":0,"r":140},{"tile":92,"other":1,"r":140},{"tile":1,"other":92,"r":139},{"tile":0,"other":116,"r":141},{"tile":116,"other":0,"r":142},{"tile":116,"other":1,"r":142},{"tile":1,"other":116,"r":141},{"tile":0,"other":91,"r":143},{"tile":91,"other":0,"r":144},{"tile":91,"other":1,"r":144},{"tile":1,"other":91,"r":143},{"tile":0,"other":82,"r":145},{"tile":82,"other":0,"r":146},{"tile":82,"other":1,"r":146},{"tile":1,"other":82,"r":145},{"tile":0,"other":94,"r":147},{"tile":94,"other":0,"r":148},{"tile":94,"other":1,"r":148},{"tile":1,"other":94,"r":147},{"tile":0,"other":118,"r":149},{"tile":118,"other":0,"r":150},{"tile":118,"other":1,"r":150},{"tile":1,"other":118,"r":149},{"tile":0,"other":140,"r":151},{"tile":140,"other":0,"r":152},{"tile":140,"other":1,"r":152},{"tile":1,"other":140,"r":151},{"tile":0,"other":81,"r":153},{"tile":81,"other":0,"r":154},{"tile":81,"other":1,"r":154},{"tile":1,"other":81,"r":153},{"tile":0,"other":104,"r":155},{"tile":104,"other":0,"r":156},{"tile":104,"other":1,"r":156},{"tile":1,"other":104,"r":155},{"tile":0,"other":79,"r":157},{"tile":79,"other":0,"r":158},{"tile":79,"other":1,"r":158},{"tile":1,"other":79,"r":157},{"tile":0,"other":102,"r":159},{"tile":102,"other":0,"r":160},{"tile":102,"other":1,"r":160},{"tile":1,"other":102,"r":159},{"tile":0,"other":127,"r":161},{"tile":127,"other":0,"r":162},{"tile":127,"other":1,"r":162},{"tile":1,"other":127,"r":161},{"tile":0,"other":119,"r":163},{"tile":119,"other":0,"r":164},{"tile":119,"other":1,"r":164},{"tile":1,"other":119,"r":163},{"tile":0,"other":107,"r":165},{"tile":107,"other":0,"r":166},{"tile":107,"other":1,"r":166},{"tile":1,"other":107,"r":165},{"tile":0,"other":68,"r":167},{"tile":68,"other":0,"r":168},{"tile":68,"other":1,"r":168},{"tile":1,"other":68,"r":167},{"tile":0,"other":115,"r":169},{"tile":115,"other":0,"r":170},{"tile":115,"other":1,"r":170},{"tile":1,"other":115,"r":169},{"tile":0,"other":141,"r":171},{"tile":141,"other":0,"r":172},{"tile":141,"other":1,"r":172},{"tile":1,"other":141,"r":171},{"tile":0,"other":105,"r":173},{"tile":105,"other":0,"r":174},{"tile":105,"other":1,"r":174},{"tile":1,"other":105,"r":173},{"tile":0,"other":151,"r":175},{"tile":151,"other":0,"r":176},{"tile":151,"other":1,"r":176},{"tile":1,"other":151,"r":175},{"tile":0,"other":93,"r":177},{"tile":93,"other":0,"r":178},{"tile":93,"other":1,"r":178},{"tile":1,"other":93,"r":177},{"tile":0,"other":80,"r":179},{"tile":80,"other":0,"r":180},{"tile":80,"other":1,"r":180},{"tile":1,"other":80,"r":179},{"tile":0,"other":106,"r":181},{"tile":106,"other":0,"r":182},{"tile":106,"other":1,"r":182},{"tile":1,"other":106,"r":181},{"tile":0,"other":150,"r":183},{"tile":150,"other":0,"r":184},{"tile":150,"other":1,"r":184},{"tile":1,"other":150,"r":183},{"tile":0,"other":129,"r":185},{"tile":129,"other":0,"r":186},{"tile":129,"other":1,"r":186},{"tile":1,"other":129,"r":185},{"tile":0,"other":57,"r":187},{"tile":57,"other":0,"r":188},{"tile":57,"other":1,"r":188},{"tile":1,"other":57,"r":187},{"tile":0,"other":117,"r":189},{"tile":117,"other":0,"r":190},{"tile":117,"other":1,"r":190},{"tile":1,"other":117,"r":189},{"tile":0,"other":160,"r":191},{"tile":160,"other":0,"r":192},{"tile":160,"other":1,"r":192},{"tile":1,"other":160,"r":191},{"tile":0,"other":103,"r":193},{"tile":103,"other":0,"r":194},{"tile":103,"other":1,"r":194},{"tile":1,"other":103,"r":193},{"tile":0,"other":130,"r":195},{"tile":130,"other":0,"r":196},{"tile":130,"other":1,"r":196},{"tile":1,"other":130,"r":195},{"tile":0,"other":139,"r":197},{"tile":139,"other":0,"r":198},{"tile":139,"other":1,"r":198},{"tile":1,"other":139,"r":197},{"tile":0,"other":128,"r":199},{"tile":128,"other":0,"r":200},{"tile":128,"other":1,"r":200},{"tile":1,"other":128,"r":199},{"tile":0,"other":false,"r":201},{"tile":0,"other":53,"r":202},{"tile":53,"other":0,"r":203},{"tile":53,"other":1,"r":203},{"tile":1,"other":53,"r":202},{"tile":0,"other":44,"r":204},{"tile":44,"other":0,"r":205},{"tile":44,"other":1,"r":205},{"tile":1,"other":44,"r":204},{"tile":0,"other":46,"r":206},{"tile":46,"other":0,"r":207},{"tile":46,"other":1,"r":207},{"tile":1,"other":46,"r":206},{"tile":0,"other":54,"r":208},{"tile":54,"other":0,"r":209},{"tile":54,"other":1,"r":209},{"tile":1,"other":54,"r":208},{"tile":0,"other":66,"r":210},{"tile":66,"other":0,"r":211},{"tile":66,"other":1,"r":211},{"tile":1,"other":66,"r":210},{"tile":0,"other":45,"r":212},{"tile":45,"other":0,"r":213},{"tile":45,"other":1,"r":213},{"tile":1,"other":45,"r":212},{"tile":0,"other":55,"r":214},{"tile":55,"other":0,"r":215},{"tile":55,"other":1,"r":215},{"tile":1,"other":55,"r":214},{"tile":0,"other":65,"r":216},{"tile":65,"other":0,"r":217},{"tile":65,"other":1,"r":217},{"tile":1,"other":65,"r":216},{"tile":0,"other":29,"r":218},{"tile":29,"other":0,"r":219},{"tile":29,"other":1,"r":219},{"tile":1,"other":29,"r":218},{"tile":0,"other":78,"r":220},{"tile":78,"other":0,"r":221},{"tile":78,"other":1,"r":221},{"tile":1,"other":78,"r":220},{"tile":0,"other":37,"r":222},{"tile":37,"other":0,"r":223},{"tile":37,"other":1,"r":223},{"tile":1,"other":37,"r":222},{"tile":0,"other":28,"r":224},{"tile":28,"other":0,"r":225},{"tile":28,"other":1,"r":225},{"tile":1,"other":28,"r":224},{"tile":0,"other":22,"r":226},{"tile":22,"other":0,"r":227},{"tile":22,"other":1,"r":227},{"tile":1,"other":22,"r":226},{"tile":0,"other":36,"r":228},{"tile":36,"other":0,"r":229},{"tile":36,"other":1,"r":229},{"tile":1,"other":36,"r":228},{"tile":0,"other":120,"r":230},{"tile":120,"other":0,"r":231},{"tile":120,"other":10,"r":231},{"tile":10,"other":120,"r":230},{"tile":120,"other":1,"r":231},{"tile":1,"other":120,"r":230},{"tile":0,"other":131,"r":232},{"tile":131,"other":0,"r":233},{"tile":131,"other":10,"r":233},{"tile":10,"other":131,"r":232},{"tile":131,"other":1,"r":233},{"tile":1,"other":131,"r":232},{"tile":0,"other":142,"r":234},{"tile":142,"other":0,"r":235},{"tile":142,"other":10,"r":235},{"tile":10,"other":142,"r":234},{"tile":142,"other":1,"r":235},{"tile":1,"other":142,"r":234},{"tile":0,"other":161,"r":236},{"tile":161,"other":0,"r":237},{"tile":161,"other":10,"r":237},{"tile":10,"other":161,"r":236},{"tile":161,"other":1,"r":237},{"tile":1,"other":161,"r":236},{"tile":0,"other":144,"r":238},{"tile":144,"other":0,"r":239},{"tile":144,"other":10,"r":239},{"tile":10,"other":144,"r":238},{"tile":144,"other":1,"r":239},{"tile":1,"other":144,"r":238},{"tile":0,"other":163,"r":240},{"tile":163,"other":0,"r":241},{"tile":163,"other":10,"r":241},{"tile":10,"other":163,"r":240},{"tile":163,"other":1,"r":241},{"tile":1,"other":163,"r":240},{"tile":0,"other":183,"r":242},{"tile":183,"other":0,"r":243},{"tile":183,"other":10,"r":243},{"tile":10,"other":183,"r":242},{"tile":183,"other":1,"r":243},{"tile":1,"other":183,"r":242},{"tile":0,"other":162,"r":244},{"tile":162,"other":0,"r":245},{"tile":162,"other":10,"r":245},{"tile":10,"other":162,"r":244},{"tile":162,"other":1,"r":245},{"tile":1,"other":162,"r":244},{"tile":0,"other":155,"r":246},{"tile":155,"other":0,"r":247},{"tile":155,"other":10,"r":247},{"tile":10,"other":155,"r":246},{"tile":155,"other":1,"r":247},{"tile":1,"other":155,"r":246},{"tile":0,"other":165,"r":248},{"tile":165,"other":0,"r":249},{"tile":165,"other":10,"r":249},{"tile":10,"other":165,"r":248},{"tile":165,"other":1,"r":249},{"tile":1,"other":165,"r":248},{"tile":0,"other":185,"r":250},{"tile":185,"other":0,"r":251},{"tile":185,"other":10,"r":251},{"tile":10,"other":185,"r":250},{"tile":185,"other":1,"r":251},{"tile":1,"other":185,"r":250},{"tile":0,"other":204,"r":252},{"tile":204,"other":0,"r":253},{"tile":204,"other":10,"r":253},{"tile":10,"other":204,"r":252},{"tile":204,"other":1,"r":253},{"tile":1,"other":204,"r":252},{"tile":0,"other":154,"r":254},{"tile":154,"other":0,"r":255},{"tile":154,"other":1,"r":255},{"tile":1,"other":154,"r":254},{"tile":154,"other":10,"r":255},{"tile":10,"other":154,"r":254},{"tile":0,"other":173,"r":256},{"tile":173,"other":0,"r":257},{"tile":173,"other":1,"r":257},{"tile":1,"other":173,"r":256},{"tile":173,"other":10,"r":257},{"tile":10,"other":173,"r":256},{"tile":0,"other":152,"r":258},{"tile":152,"other":0,"r":259},{"tile":152,"other":1,"r":259},{"tile":1,"other":152,"r":258},{"tile":152,"other":10,"r":259},{"tile":10,"other":152,"r":258},{"tile":0,"other":171,"r":260},{"tile":171,"other":0,"r":261},{"tile":171,"other":1,"r":261},{"tile":1,"other":171,"r":260},{"tile":171,"other":10,"r":261},{"tile":10,"other":171,"r":260},{"tile":0,"other":192,"r":262},{"tile":192,"other":0,"r":263},{"tile":192,"other":1,"r":263},{"tile":1,"other":192,"r":262},{"tile":192,"other":10,"r":263},{"tile":10,"other":192,"r":262},{"tile":0,"other":186,"r":264},{"tile":186,"other":0,"r":265},{"tile":186,"other":1,"r":265},{"tile":1,"other":186,"r":264},{"tile":186,"other":10,"r":265},{"tile":10,"other":186,"r":264},{"tile":0,"other":176,"r":266},{"tile":176,"other":0,"r":267},{"tile":176,"other":1,"r":267},{"tile":1,"other":176,"r":266},{"tile":176,"other":10,"r":267},{"tile":10,"other":176,"r":266},{"tile":0,"other":143,"r":268},{"tile":143,"other":0,"r":269},{"tile":143,"other":1,"r":269},{"tile":1,"other":143,"r":268},{"tile":143,"other":10,"r":269},{"tile":10,"other":143,"r":268},{"tile":0,"other":182,"r":270},{"tile":182,"other":0,"r":271},{"tile":182,"other":1,"r":271},{"tile":1,"other":182,"r":270},{"tile":182,"other":10,"r":271},{"tile":10,"other":182,"r":270},{"tile":0,"other":205,"r":272},{"tile":205,"other":0,"r":273},{"tile":205,"other":1,"r":273},{"tile":1,"other":205,"r":272},{"tile":205,"other":10,"r":273},{"tile":10,"other":205,"r":272},{"tile":0,"other":174,"r":274},{"tile":174,"other":0,"r":275},{"tile":174,"other":1,"r":275},{"tile":1,"other":174,"r":274},{"tile":174,"other":10,"r":275},{"tile":10,"other":174,"r":274},{"tile":0,"other":215,"r":276},{"tile":215,"other":0,"r":277},{"tile":215,"other":1,"r":277},{"tile":1,"other":215,"r":276},{"tile":215,"other":10,"r":277},{"tile":10,"other":215,"r":276},{"tile":0,"other":164,"r":278},{"tile":164,"other":0,"r":279},{"tile":164,"other":10,"r":279},{"tile":10,"other":164,"r":278},{"tile":164,"other":1,"r":279},{"tile":1,"other":164,"r":278},{"tile":0,"other":153,"r":280},{"tile":153,"other":0,"r":281},{"tile":153,"other":10,"r":281},{"tile":10,"other":153,"r":280},{"tile":153,"other":1,"r":281},{"tile":1,"other":153,"r":280},{"tile":0,"other":175,"r":282},{"tile":175,"other":0,"r":283},{"tile":175,"other":10,"r":283},{"tile":10,"other":175,"r":282},{"tile":175,"other":1,"r":283},{"tile":1,"other":175,"r":282},{"tile":0,"other":214,"r":284},{"tile":214,"other":0,"r":285},{"tile":214,"other":10,"r":285},{"tile":10,"other":214,"r":284},{"tile":214,"other":1,"r":285},{"tile":1,"other":214,"r":284},{"tile":0,"other":194,"r":286},{"tile":194,"other":0,"r":287},{"tile":194,"other":10,"r":287},{"tile":10,"other":194,"r":286},{"tile":194,"other":1,"r":287},{"tile":1,"other":194,"r":286},{"tile":0,"other":132,"r":288},{"tile":132,"other":0,"r":289},{"tile":132,"other":1,"r":289},{"tile":1,"other":132,"r":288},{"tile":132,"other":10,"r":289},{"tile":10,"other":132,"r":288},{"tile":0,"other":184,"r":290},{"tile":184,"other":0,"r":291},{"tile":184,"other":1,"r":291},{"tile":1,"other":184,"r":290},{"tile":184,"other":10,"r":291},{"tile":10,"other":184,"r":290},{"tile":0,"other":224,"r":292},{"tile":224,"other":0,"r":293},{"tile":224,"other":1,"r":293},{"tile":1,"other":224,"r":292},{"tile":224,"other":10,"r":293},{"tile":10,"other":224,"r":292},{"tile":0,"other":172,"r":294},{"tile":172,"other":0,"r":295},{"tile":172,"other":1,"r":295},{"tile":1,"other":172,"r":294},{"tile":172,"other":10,"r":295},{"tile":10,"other":172,"r":294},{"tile":0,"other":195,"r":296},{"tile":195,"other":0,"r":297},{"tile":195,"other":1,"r":297},{"tile":1,"other":195,"r":296},{"tile":195,"other":10,"r":297},{"tile":10,"other":195,"r":296},{"tile":0,"other":203,"r":298},{"tile":203,"other":0,"r":299},{"tile":203,"other":10,"r":299},{"tile":10,"other":203,"r":298},{"tile":203,"other":1,"r":299},{"tile":1,"other":203,"r":298},{"tile":0,"other":193,"r":300},{"tile":193,"other":0,"r":301},{"tile":193,"other":1,"r":301},{"tile":1,"other":193,"r":300},{"tile":193,"other":10,"r":301},{"tile":10,"other":193,"r":300},{"tile":0,"other":1,"r":302},{"tile":1,"other":0,"r":302},{"tile":0,"other":70,"r":303},{"tile":70,"other":0,"r":304},{"tile":70,"other":10,"r":304},{"tile":10,"other":70,"r":303},{"tile":0,"other":59,"r":305},{"tile":59,"other":0,"r":306},{"tile":59,"other":10,"r":306},{"tile":10,"other":59,"r":305},{"tile":0,"other":61,"r":307},{"tile":61,"other":0,"r":308},{"tile":61,"other":10,"r":308},{"tile":10,"other":61,"r":307},{"tile":0,"other":71,"r":309},{"tile":71,"other":0,"r":310},{"tile":71,"other":10,"r":310},{"tile":10,"other":71,"r":309},{"tile":0,"other":84,"r":311},{"tile":84,"other":0,"r":312},{"tile":84,"other":10,"r":312},{"tile":10,"other":84,"r":311},{"tile":0,"other":60,"r":313},{"tile":60,"other":0,"r":314},{"tile":60,"other":10,"r":314},{"tile":10,"other":60,"r":313},{"tile":0,"other":72,"r":315},{"tile":72,"other":0,"r":316},{"tile":72,"other":10,"r":316},{"tile":10,"other":72,"r":315},{"tile":0,"other":83,"r":317},{"tile":83,"other":0,"r":318},{"tile":83,"other":10,"r":318},{"tile":10,"other":83,"r":317},{"tile":0,"other":42,"r":319},{"tile":42,"other":0,"r":320},{"tile":42,"other":10,"r":320},{"tile":10,"other":42,"r":319},{"tile":0,"other":95,"r":321},{"tile":95,"other":0,"r":322},{"tile":95,"other":10,"r":322},{"tile":10,"other":95,"r":321},{"tile":0,"other":51,"r":323},{"tile":51,"other":0,"r":324},{"tile":51,"other":10,"r":324},{"tile":10,"other":51,"r":323},{"tile":0,"other":41,"r":325},{"tile":41,"other":0,"r":326},{"tile":41,"other":10,"r":326},{"tile":10,"other":41,"r":325},{"tile":0,"other":34,"r":327},{"tile":34,"other":0,"r":328},{"tile":34,"other":10,"r":328},{"tile":10,"other":34,"r":327},{"tile":0,"other":50,"r":329},{"tile":50,"other":0,"r":330},{"tile":50,"other":10,"r":330},{"tile":10,"other":50,"r":329},{"tile":0,"other":10,"r":331},{"tile":10,"other":0,"r":331},{"tile":1,"other":38,"r":332},{"tile":38,"other":1,"r":333},{"tile":1,"other":31,"r":334},{"tile":31,"other":1,"r":335},{"tile":1,"other":33,"r":336},{"tile":33,"other":1,"r":337},{"tile":1,"other":39,"r":338},{"tile":39,"other":1,"r":339},{"tile":1,"other":49,"r":340},{"tile":49,"other":1,"r":341},{"tile":1,"other":32,"r":342},{"tile":32,"other":1,"r":343},{"tile":1,"other":40,"r":344},{"tile":40,"other":1,"r":345},{"tile":1,"other":48,"r":346},{"tile":48,"other":1,"r":347},{"tile":1,"other":20,"r":348},{"tile":20,"other":1,"r":349},{"tile":1,"other":58,"r":350},{"tile":58,"other":1,"r":351},{"tile":1,"other":26,"r":352},{"tile":26,"other":1,"r":353},{"tile":1,"other":19,"r":354},{"tile":19,"other":1,"r":355},{"tile":1,"other":14,"r":356},{"tile":14,"other":1,"r":357},{"tile":1,"other":25,"r":358},{"tile":25,"other":1,"r":359},{"tile":1,"other":false,"r":360},{"tile":1,"other":108,"r":361},{"tile":108,"other":1,"r":362},{"tile":108,"other":10,"r":362},{"tile":10,"other":108,"r":361},{"tile":1,"other":96,"r":363},{"tile":96,"other":1,"r":364},{"tile":96,"other":10,"r":364},{"tile":10,"other":96,"r":363},{"tile":1,"other":98,"r":365},{"tile":98,"other":1,"r":366},{"tile":98,"other":10,"r":366},{"tile":10,"other":98,"r":365},{"tile":1,"other":109,"r":367},{"tile":109,"other":1,"r":368},{"tile":109,"other":10,"r":368},{"tile":10,"other":109,"r":367},{"tile":1,"other":122,"r":369},{"tile":122,"other":1,"r":370},{"tile":122,"other":10,"r":370},{"tile":10,"other":122,"r":369},{"tile":1,"other":97,"r":371},{"tile":97,"other":1,"r":372},{"tile":97,"other":10,"r":372},{"tile":10,"other":97,"r":371},{"tile":1,"other":110,"r":373},{"tile":110,"other":1,"r":374},{"tile":110,"other":10,"r":374},{"tile":10,"other":110,"r":373},{"tile":1,"other":121,"r":375},{"tile":121,"other":1,"r":376},{"tile":121,"other":10,"r":376},{"tile":10,"other":121,"r":375},{"tile":1,"other":74,"r":377},{"tile":74,"other":1,"r":378},{"tile":74,"other":10,"r":378},{"tile":10,"other":74,"r":377},{"tile":1,"other":133,"r":379},{"tile":133,"other":1,"r":380},{"tile":133,"other":10,"r":380},{"tile":10,"other":133,"r":379},{"tile":1,"other":86,"r":381},{"tile":86,"other":1,"r":382},{"tile":86,"other":10,"r":382},{"tile":10,"other":86,"r":381},{"tile":1,"other":73,"r":383},{"tile":73,"other":1,"r":384},{"tile":73,"other":10,"r":384},{"tile":10,"other":73,"r":383},{"tile":1,"other":62,"r":385},{"tile":62,"other":1,"r":386},{"tile":62,"other":10,"r":386},{"tile":10,"other":62,"r":385},{"tile":1,"other":85,"r":387},{"tile":85,"other":1,"r":388},{"tile":85,"other":10,"r":388},{"tile":10,"other":85,"r":387},{"tile":1,"other":10,"r":389},{"tile":10,"other":1,"r":389},{"tile":10,"other":158,"r":390},{"tile":158,"other":10,"r":391},{"tile":158,"other":27,"r":391},{"tile":27,"other":158,"r":390},{"tile":10,"other":137,"r":392},{"tile":137,"other":10,"r":393},{"tile":137,"other":27,"r":393},{"tile":27,"other":137,"r":392},{"tile":10,"other":148,"r":394},{"tile":148,"other":10,"r":395},{"tile":148,"other":27,"r":395},{"tile":27,"other":148,"r":394},{"tile":10,"other":159,"r":396},{"tile":159,"other":10,"r":397},{"tile":159,"other":27,"r":397},{"tile":27,"other":159,"r":396},{"tile":10,"other":198,"r":398},{"tile":198,"other":10,"r":399},{"tile":198,"other":27,"r":399},{"tile":27,"other":198,"r":398},{"tile":10,"other":149,"r":400},{"tile":149,"other":10,"r":401},{"tile":149,"other":27,"r":401},{"tile":27,"other":149,"r":400},{"tile":10,"other":188,"r":402},{"tile":188,"other":10,"r":403},{"tile":188,"other":27,"r":403},{"tile":27,"other":188,"r":402},{"tile":10,"other":179,"r":404},{"tile":179,"other":10,"r":405},{"tile":179,"other":27,"r":405},{"tile":27,"other":179,"r":404},{"tile":10,"other":168,"r":406},{"tile":168,"other":10,"r":407},{"tile":168,"other":27,"r":407},{"tile":27,"other":168,"r":406},{"tile":10,"other":189,"r":408},{"tile":189,"other":10,"r":409},{"tile":189,"other":27,"r":409},{"tile":27,"other":189,"r":408},{"tile":10,"other":178,"r":410},{"tile":178,"other":10,"r":411},{"tile":178,"other":27,"r":411},{"tile":27,"other":178,"r":410},{"tile":10,"other":169,"r":412},{"tile":169,"other":10,"r":413},{"tile":169,"other":27,"r":413},{"tile":27,"other":169,"r":412},{"tile":10,"other":167,"r":414},{"tile":167,"other":10,"r":415},{"tile":167,"other":27,"r":415},{"tile":27,"other":167,"r":414},{"tile":10,"other":177,"r":416},{"tile":177,"other":10,"r":417},{"tile":177,"other":27,"r":417},{"tile":27,"other":177,"r":416},{"tile":10,"other":27,"r":418},{"tile":27,"other":10,"r":418},{"tile":10,"other":240,"r":419},{"tile":240,"other":10,"r":420},{"tile":240,"other":100,"r":420},{"tile":100,"other":240,"r":419},{"tile":10,"other":231,"r":421},{"tile":231,"other":10,"r":422},{"tile":231,"other":100,"r":422},{"tile":100,"other":231,"r":421},{"tile":10,"other":233,"r":423},{"tile":233,"other":10,"r":424},{"tile":233,"other":100,"r":424},{"tile":100,"other":233,"r":423},{"tile":10,"other":241,"r":425},{"tile":241,"other":10,"r":426},{"tile":241,"other":100,"r":426},{"tile":100,"other":241,"r":425},{"tile":10,"other":249,"r":427},{"tile":249,"other":10,"r":428},{"tile":249,"other":100,"r":428},{"tile":100,"other":249,"r":427},{"tile":10,"other":232,"r":429},{"tile":232,"other":10,"r":430},{"tile":232,"other":100,"r":430},{"tile":100,"other":232,"r":429},{"tile":10,"other":242,"r":431},{"tile":242,"other":10,"r":432},{"tile":242,"other":100,"r":432},{"tile":100,"other":242,"r":431},{"tile":10,"other":248,"r":433},{"tile":248,"other":10,"r":434},{"tile":248,"other":100,"r":434},{"tile":100,"other":248,"r":433},{"tile":10,"other":213,"r":435},{"tile":213,"other":10,"r":436},{"tile":213,"other":100,"r":436},{"tile":100,"other":213,"r":435},{"tile":10,"other":254,"r":437},{"tile":254,"other":10,"r":438},{"tile":254,"other":100,"r":438},{"tile":100,"other":254,"r":437},{"tile":10,"other":223,"r":439},{"tile":223,"other":10,"r":440},{"tile":223,"other":100,"r":440},{"tile":100,"other":223,"r":439},{"tile":10,"other":212,"r":441},{"tile":212,"other":10,"r":442},{"tile":212,"other":100,"r":442},{"tile":100,"other":212,"r":441},{"tile":10,"other":202,"r":443},{"tile":202,"other":10,"r":444},{"tile":202,"other":100,"r":444},{"tile":100,"other":202,"r":443},{"tile":10,"other":222,"r":445},{"tile":222,"other":10,"r":446},{"tile":222,"other":100,"r":446},{"tile":100,"other":222,"r":445},{"tile":10,"other":100,"r":447},{"tile":100,"other":10,"r":447},{"tile":87,"other":190,"r":448},{"tile":190,"other":87,"r":449},{"tile":190,"other":100,"r":449},{"tile":100,"other":190,"r":448},{"tile":87,"other":170,"r":450},{"tile":170,"other":87,"r":451},{"tile":170,"other":100,"r":451},{"tile":100,"other":170,"r":450},{"tile":87,"other":180,"r":452},{"tile":180,"other":87,"r":453},{"tile":180,"other":100,"r":453},{"tile":100,"other":180,"r":452},{"tile":87,"other":191,"r":454},{"tile":191,"other":87,"r":455},{"tile":191,"other":100,"r":455},{"tile":100,"other":191,"r":454},{"tile":87,"other":230,"r":456},{"tile":230,"other":87,"r":457},{"tile":230,"other":100,"r":457},{"tile":100,"other":230,"r":456},{"tile":87,"other":181,"r":458},{"tile":181,"other":87,"r":459},{"tile":181,"other":100,"r":459},{"tile":100,"other":181,"r":458},{"tile":87,"other":220,"r":460},{"tile":220,"other":87,"r":461},{"tile":220,"other":100,"r":461},{"tile":100,"other":220,"r":460},{"tile":87,"other":211,"r":462},{"tile":211,"other":87,"r":463},{"tile":211,"other":100,"r":463},{"tile":100,"other":211,"r":462},{"tile":87,"other":200,"r":464},{"tile":200,"other":87,"r":465},{"tile":200,"other":100,"r":465},{"tile":100,"other":200,"r":464},{"tile":87,"other":221,"r":466},{"tile":221,"other":87,"r":467},{"tile":221,"other":100,"r":467},{"tile":100,"other":221,"r":466},{"tile":87,"other":210,"r":468},{"tile":210,"other":87,"r":469},{"tile":210,"other":100,"r":469},{"tile":100,"other":210,"r":468},{"tile":87,"other":201,"r":470},{"tile":201,"other":87,"r":471},{"tile":201,"other":100,"r":471},{"tile":100,"other":201,"r":470},{"tile":87,"other":199,"r":472},{"tile":199,"other":87,"r":473},{"tile":199,"other":100,"r":473},{"tile":100,"other":199,"r":472},{"tile":87,"other":209,"r":474},{"tile":209,"other":87,"r":475},{"tile":209,"other":100,"r":475},{"tile":100,"other":209,"r":474},{"tile":87,"other":100,"r":476},{"tile":100,"other":87,"r":476}],"tiles":[{"type":"base","sourceID":0},{"type":"base","sourceID":1},{"type":"base","sourceID":2},{"type":"wang"},{"type":"base","sourceID":3},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":4},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":5},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":6},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":7},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":8},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":9},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":10},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":11},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":12},{"type":"base","sourceID":0},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":13},{"type":"base","sourceID":8},{"type":"base","sourceID":1},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":14},{"type":"base","sourceID":11},{"type":"base","sourceID":5},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":15},{"type":"base","sourceID":12},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":16},{"type":"base","sourceID":13},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":17},{"type":"base","sourceID":14},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"base","sourceID":15},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"},{"type":"wang"}],"set":[{"pos":{"x":6,"y":2},"tileID":0},{"pos":{"x":7,"y":2},"tileID":1},{"pos":{"x":8,"y":2},"tileID":2},{"pos":{"x":6,"y":4},"tileID":3},{"pos":{"x":9,"y":2},"tileID":4},{"pos":{"x":7,"y":4},"tileID":5},{"pos":{"x":6,"y":5},"tileID":6},{"pos":{"x":10,"y":2},"tileID":7},{"pos":{"x":8,"y":4},"tileID":8},{"pos":{"x":6,"y":6},"tileID":9},{"pos":{"x":11,"y":2},"tileID":10},{"pos":{"x":9,"y":4},"tileID":11},{"pos":{"x":8,"y":5},"tileID":12},{"pos":{"x":7,"y":6},"tileID":13},{"pos":{"x":6,"y":7},"tileID":14},{"pos":{"x":12,"y":2},"tileID":15},{"pos":{"x":10,"y":4},"tileID":16},{"pos":{"x":9,"y":5},"tileID":17},{"pos":{"x":8,"y":6},"tileID":18},{"pos":{"x":7,"y":7},"tileID":19},{"pos":{"x":6,"y":8},"tileID":20},{"pos":{"x":13,"y":2},"tileID":21},{"pos":{"x":11,"y":4},"tileID":22},{"pos":{"x":10,"y":5},"tileID":23},{"pos":{"x":9,"y":6},"tileID":24},{"pos":{"x":8,"y":7},"tileID":25},{"pos":{"x":6,"y":9},"tileID":26},{"pos":{"x":14,"y":2},"tileID":27},{"pos":{"x":12,"y":4},"tileID":28},{"pos":{"x":11,"y":5},"tileID":29},{"pos":{"x":10,"y":6},"tileID":30},{"pos":{"x":9,"y":7},"tileID":31},{"pos":{"x":8,"y":8},"tileID":32},{"pos":{"x":7,"y":9},"tileID":33},{"pos":{"x":6,"y":10},"tileID":34},{"pos":{"x":15,"y":2},"tileID":35},{"pos":{"x":13,"y":4},"tileID":36},{"pos":{"x":11,"y":6},"tileID":37},{"pos":{"x":10,"y":7},"tileID":38},{"pos":{"x":9,"y":8},"tileID":39},{"pos":{"x":8,"y":9},"tileID":40},{"pos":{"x":7,"y":10},"tileID":41},{"pos":{"x":6,"y":11},"tileID":42},{"pos":{"x":16,"y":2},"tileID":43},{"pos":{"x":14,"y":4},"tileID":44},{"pos":{"x":13,"y":5},"tileID":45},{"pos":{"x":12,"y":6},"tileID":46},{"pos":{"x":11,"y":7},"tileID":47},{"pos":{"x":10,"y":8},"tileID":48},{"pos":{"x":9,"y":9},"tileID":49},{"pos":{"x":8,"y":10},"tileID":50},{"pos":{"x":6,"y":12},"tileID":51},{"pos":{"x":17,"y":2},"tileID":52},{"pos":{"x":15,"y":4},"tileID":53},{"pos":{"x":14,"y":5},"tileID":54},{"pos":{"x":13,"y":6},"tileID":55},{"pos":{"x":12,"y":7},"tileID":56},{"pos":{"x":11,"y":8},"tileID":57},{"pos":{"x":10,"y":9},"tileID":58},{"pos":{"x":9,"y":10},"tileID":59},{"pos":{"x":8,"y":11},"tileID":60},{"pos":{"x":7,"y":12},"tileID":61},{"pos":{"x":6,"y":13},"tileID":62},{"pos":{"x":18,"y":2},"tileID":63},{"pos":{"x":16,"y":4},"tileID":64},{"pos":{"x":15,"y":5},"tileID":65},{"pos":{"x":14,"y":6},"tileID":66},{"pos":{"x":13,"y":7},"tileID":67},{"pos":{"x":12,"y":8},"tileID":68},{"pos":{"x":11,"y":9},"tileID":69},{"pos":{"x":10,"y":10},"tileID":70},{"pos":{"x":9,"y":11},"tileID":71},{"pos":{"x":8,"y":12},"tileID":72},{"pos":{"x":7,"y":13},"tileID":73},{"pos":{"x":6,"y":14},"tileID":74},{"pos":{"x":19,"y":2},"tileID":75},{"pos":{"x":17,"y":4},"tileID":76},{"pos":{"x":16,"y":5},"tileID":77},{"pos":{"x":15,"y":6},"tileID":78},{"pos":{"x":14,"y":7},"tileID":79},{"pos":{"x":13,"y":8},"tileID":80},{"pos":{"x":12,"y":9},"tileID":81},{"pos":{"x":11,"y":10},"tileID":82},{"pos":{"x":10,"y":11},"tileID":83},{"pos":{"x":9,"y":12},"tileID":84},{"pos":{"x":8,"y":13},"tileID":85},{"pos":{"x":6,"y":15},"tileID":86},{"pos":{"x":20,"y":2},"tileID":87},{"pos":{"x":17,"y":5},"tileID":88},{"pos":{"x":16,"y":6},"tileID":89},{"pos":{"x":15,"y":7},"tileID":90},{"pos":{"x":14,"y":8},"tileID":91},{"pos":{"x":13,"y":9},"tileID":92},{"pos":{"x":12,"y":10},"tileID":93},{"pos":{"x":11,"y":11},"tileID":94},{"pos":{"x":10,"y":12},"tileID":95},{"pos":{"x":9,"y":13},"tileID":96},{"pos":{"x":8,"y":14},"tileID":97},{"pos":{"x":7,"y":15},"tileID":98},{"pos":{"x":6,"y":16},"tileID":99},{"pos":{"x":21,"y":2},"tileID":100},{"pos":{"x":17,"y":6},"tileID":101},{"pos":{"x":16,"y":7},"tileID":102},{"pos":{"x":15,"y":8},"tileID":103},{"pos":{"x":14,"y":9},"tileID":104},{"pos":{"x":13,"y":10},"tileID":105},{"pos":{"x":12,"y":11},"tileID":106},{"pos":{"x":11,"y":12},"tileID":107},{"pos":{"x":10,"y":13},"tileID":108},{"pos":{"x":9,"y":14},"tileID":109},{"pos":{"x":8,"y":15},"tileID":110},{"pos":{"x":7,"y":16},"tileID":111},{"pos":{"x":6,"y":17},"tileID":112},{"pos":{"x":22,"y":2},"tileID":113},{"pos":{"x":17,"y":7},"tileID":114},{"pos":{"x":16,"y":8},"tileID":115},{"pos":{"x":15,"y":9},"tileID":116},{"pos":{"x":14,"y":10},"tileID":117},{"pos":{"x":13,"y":11},"tileID":118},{"pos":{"x":12,"y":12},"tileID":119},{"pos":{"x":11,"y":13},"tileID":120},{"pos":{"x":10,"y":14},"tileID":121},{"pos":{"x":9,"y":15},"tileID":122},{"pos":{"x":8,"y":16},"tileID":123},{"pos":{"x":6,"y":18},"tileID":124},{"pos":{"x":23,"y":2},"tileID":125},{"pos":{"x":17,"y":8},"tileID":126},{"pos":{"x":16,"y":9},"tileID":127},{"pos":{"x":15,"y":10},"tileID":128},{"pos":{"x":14,"y":11},"tileID":129},{"pos":{"x":13,"y":12},"tileID":130},{"pos":{"x":12,"y":13},"tileID":131},{"pos":{"x":11,"y":14},"tileID":132},{"pos":{"x":10,"y":15},"tileID":133},{"pos":{"x":9,"y":16},"tileID":134},{"pos":{"x":8,"y":17},"tileID":135},{"pos":{"x":7,"y":18},"tileID":136},{"pos":{"x":6,"y":19},"tileID":137},{"pos":{"x":17,"y":9},"tileID":138},{"pos":{"x":16,"y":10},"tileID":139},{"pos":{"x":15,"y":11},"tileID":140},{"pos":{"x":14,"y":12},"tileID":141},{"pos":{"x":13,"y":13},"tileID":142},{"pos":{"x":12,"y":14},"tileID":143},{"pos":{"x":11,"y":15},"tileID":144},{"pos":{"x":10,"y":16},"tileID":145},{"pos":{"x":9,"y":17},"tileID":146},{"pos":{"x":8,"y":18},"tileID":147},{"pos":{"x":7,"y":19},"tileID":148},{"pos":{"x":6,"y":20},"tileID":149},{"pos":{"x":16,"y":11},"tileID":150},{"pos":{"x":15,"y":12},"tileID":151},{"pos":{"x":14,"y":13},"tileID":152},{"pos":{"x":13,"y":14},"tileID":153},{"pos":{"x":12,"y":15},"tileID":154},{"pos":{"x":11,"y":16},"tileID":155},{"pos":{"x":10,"y":17},"tileID":156},{"pos":{"x":9,"y":18},"tileID":157},{"pos":{"x":8,"y":19},"tileID":158},{"pos":{"x":6,"y":21},"tileID":159},{"pos":{"x":16,"y":12},"tileID":160},{"pos":{"x":15,"y":13},"tileID":161},{"pos":{"x":14,"y":14},"tileID":162},{"pos":{"x":13,"y":15},"tileID":163},{"pos":{"x":12,"y":16},"tileID":164},{"pos":{"x":11,"y":17},"tileID":165},{"pos":{"x":10,"y":18},"tileID":166},{"pos":{"x":9,"y":19},"tileID":167},{"pos":{"x":8,"y":20},"tileID":168},{"pos":{"x":7,"y":21},"tileID":169},{"pos":{"x":6,"y":22},"tileID":170},{"pos":{"x":16,"y":13},"tileID":171},{"pos":{"x":15,"y":14},"tileID":172},{"pos":{"x":14,"y":15},"tileID":173},{"pos":{"x":13,"y":16},"tileID":174},{"pos":{"x":12,"y":17},"tileID":175},{"pos":{"x":11,"y":18},"tileID":176},{"pos":{"x":10,"y":19},"tileID":177},{"pos":{"x":9,"y":20},"tileID":178},{"pos":{"x":8,"y":21},"tileID":179},{"pos":{"x":7,"y":22},"tileID":180},{"pos":{"x":6,"y":23},"tileID":181},{"pos":{"x":16,"y":14},"tileID":182},{"pos":{"x":15,"y":15},"tileID":183},{"pos":{"x":14,"y":16},"tileID":184},{"pos":{"x":13,"y":17},"tileID":185},{"pos":{"x":12,"y":18},"tileID":186},{"pos":{"x":11,"y":19},"tileID":187},{"pos":{"x":10,"y":20},"tileID":188},{"pos":{"x":9,"y":21},"tileID":189},{"pos":{"x":8,"y":22},"tileID":190},{"pos":{"x":6,"y":24},"tileID":191},{"pos":{"x":16,"y":15},"tileID":192},{"pos":{"x":15,"y":16},"tileID":193},{"pos":{"x":14,"y":17},"tileID":194},{"pos":{"x":13,"y":18},"tileID":195},{"pos":{"x":12,"y":19},"tileID":196},{"pos":{"x":11,"y":20},"tileID":197},{"pos":{"x":10,"y":21},"tileID":198},{"pos":{"x":9,"y":22},"tileID":199},{"pos":{"x":8,"y":23},"tileID":200},{"pos":{"x":7,"y":24},"tileID":201},{"pos":{"x":6,"y":25},"tileID":202},{"pos":{"x":16,"y":16},"tileID":203},{"pos":{"x":15,"y":17},"tileID":204},{"pos":{"x":14,"y":18},"tileID":205},{"pos":{"x":13,"y":19},"tileID":206},{"pos":{"x":12,"y":20},"tileID":207},{"pos":{"x":11,"y":21},"tileID":208},{"pos":{"x":10,"y":22},"tileID":209},{"pos":{"x":9,"y":23},"tileID":210},{"pos":{"x":8,"y":24},"tileID":211},{"pos":{"x":7,"y":25},"tileID":212},{"pos":{"x":6,"y":26},"tileID":213},{"pos":{"x":16,"y":17},"tileID":214},{"pos":{"x":15,"y":18},"tileID":215},{"pos":{"x":14,"y":19},"tileID":216},{"pos":{"x":13,"y":20},"tileID":217},{"pos":{"x":12,"y":21},"tileID":218},{"pos":{"x":11,"y":22},"tileID":219},{"pos":{"x":10,"y":23},"tileID":220},{"pos":{"x":9,"y":24},"tileID":221},{"pos":{"x":8,"y":25},"tileID":222},{"pos":{"x":6,"y":27},"tileID":223},{"pos":{"x":16,"y":18},"tileID":224},{"pos":{"x":15,"y":19},"tileID":225},{"pos":{"x":14,"y":20},"tileID":226},{"pos":{"x":13,"y":21},"tileID":227},{"pos":{"x":12,"y":22},"tileID":228},{"pos":{"x":11,"y":23},"tileID":229},{"pos":{"x":10,"y":24},"tileID":230},{"pos":{"x":9,"y":25},"tileID":231},{"pos":{"x":8,"y":26},"tileID":232},{"pos":{"x":7,"y":27},"tileID":233},{"pos":{"x":16,"y":19},"tileID":234},{"pos":{"x":15,"y":20},"tileID":235},{"pos":{"x":14,"y":21},"tileID":236},{"pos":{"x":13,"y":22},"tileID":237},{"pos":{"x":12,"y":23},"tileID":238},{"pos":{"x":11,"y":24},"tileID":239},{"pos":{"x":10,"y":25},"tileID":240},{"pos":{"x":9,"y":26},"tileID":241},{"pos":{"x":8,"y":27},"tileID":242},{"pos":{"x":16,"y":20},"tileID":243},{"pos":{"x":15,"y":21},"tileID":244},{"pos":{"x":14,"y":22},"tileID":245},{"pos":{"x":13,"y":23},"tileID":246},{"pos":{"x":12,"y":24},"tileID":247},{"pos":{"x":10,"y":26},"tileID":248},{"pos":{"x":9,"y":27},"tileID":249},{"pos":{"x":16,"y":21},"tileID":250},{"pos":{"x":15,"y":22},"tileID":251},{"pos":{"x":14,"y":23},"tileID":252},{"pos":{"x":13,"y":24},"tileID":253},{"pos":{"x":10,"y":27},"tileID":254},{"pos":{"x":16,"y":22},"tileID":255},{"pos":{"x":15,"y":23},"tileID":256},{"pos":{"x":14,"y":24},"tileID":257},{"pos":{"x":16,"y":23},"tileID":258},{"pos":{"x":15,"y":24},"tileID":259},{"pos":{"x":16,"y":24},"tileID":260}],"set_regions":[{"type":"sync","filename":"..\\..\\spritesheets\\tiles\\tiles.png","bounds":{"x0":6,"y0":2,"x1":23,"y1":2},"syncTiles":[{"type":"tile","data":0,"pos":{"x":0,"y":0}},{"type":"tile","data":1,"pos":{"x":1,"y":0}},{"type":"tile","data":2,"pos":{"x":2,"y":0}},{"type":"tile","data":4,"pos":{"x":3,"y":0}},{"type":"tile","data":7,"pos":{"x":4,"y":0}},{"type":"tile","data":10,"pos":{"x":5,"y":0}},{"type":"tile","data":15,"pos":{"x":6,"y":0}},{"type":"tile","data":21,"pos":{"x":7,"y":0}},{"type":"tile","data":27,"pos":{"x":8,"y":0}},{"type":"tile","data":35,"pos":{"x":9,"y":0}},{"type":"tile","data":43,"pos":{"x":10,"y":0}},{"type":"tile","data":52,"pos":{"x":11,"y":0}},{"type":"tile","data":63,"pos":{"x":12,"y":0}},{"type":"tile","data":75,"pos":{"x":13,"y":0}},{"type":"tile","data":87,"pos":{"x":14,"y":0}},{"type":"tile","data":100,"pos":{"x":15,"y":0}},{"type":"tile","data":113,"pos":{"x":16,"y":0}},{"type":"tile","data":125,"pos":{"x":17,"y":0}}]}],"sandbox_layers":[{"visible":true,"name":"Unnamed Layer"}],"sandbox":[],"extra":{"set":{"camX":396.9375,"camY":-2.3125,"camZoom":0},"sandbox":{"camX":-32,"camY":-64,"camZoom":1}}} \ No newline at end of file diff --git a/apps/client/src/test-setup.ts b/apps/client/src/test-setup.ts index 5dda10c6..31263683 100644 --- a/apps/client/src/test-setup.ts +++ b/apps/client/src/test-setup.ts @@ -1,7 +1,7 @@ -import 'jest-canvas-mock'; -import 'jest-preset-angular/setup-jest'; +import "jest-canvas-mock"; +import "jest-preset-angular/setup-jest"; -import * as failOnConsole from 'jest-fail-on-console'; +import * as failOnConsole from "jest-fail-on-console"; failOnConsole(); @@ -10,16 +10,30 @@ failOnConsole(); // ^^^^^^ // // SyntaxError: Cannot use import statement outside a module -jest.mock('@dicebear/core', () => { +jest.mock("@dicebear/core", () => { return { createAvatar: () => { - return ''; + return ""; } }; }); -jest.mock('@dicebear/pixel-art', () => { +jest.mock("@dicebear/pixel-art", () => { return { sprites: {} }; }); + +jest.mock("phaser", () => { + return { + Game: class Game { + constructor() { + // + } + + destroy() { + // + } + } + }; +}); diff --git a/apps/client/tsconfig.json b/apps/client/tsconfig.json index 88154628..8023722e 100644 --- a/apps/client/tsconfig.json +++ b/apps/client/tsconfig.json @@ -22,8 +22,7 @@ "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, - "allowSyntheticDefaultImports": true, - "resolveJsonModule": true + "allowSyntheticDefaultImports": true }, "angularCompilerOptions": { "enableI18nLegacyMessageIdFormat": false, diff --git a/libs/api-interfaces/.eslintrc.json b/libs/api-interfaces/.eslintrc.json index 0bd833d7..4f23b62e 100644 --- a/libs/api-interfaces/.eslintrc.json +++ b/libs/api-interfaces/.eslintrc.json @@ -1,20 +1,15 @@ { - "extends": [ - "../../.eslintrc.json" - ], - "ignorePatterns": [ - "!**/*" - ], + "extends": ["../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], "overrides": [ { - "files": [ - "*.ts" - ], + "files": ["*.ts"], "rules": { "@typescript-eslint/no-empty-interface": "off", "@typescript-eslint/no-non-null-assertion": "off", "@typescript-eslint/no-explicit-any": "warn", - "@typescript-eslint/no-unused-vars": "warn" + "@typescript-eslint/no-unused-vars": "warn", + "no-case-declarations": "off" } } ] diff --git a/libs/api-interfaces/src/fly-squasher.ts b/libs/api-interfaces/src/fly-squasher.ts new file mode 100644 index 00000000..06410659 --- /dev/null +++ b/libs/api-interfaces/src/fly-squasher.ts @@ -0,0 +1,9 @@ +export * from "./lib/communicators/fly-squasher/communicators"; +export * from "./lib/user-info/fly-squasher/user-info"; +export * from "./lib/game-instance/fly-squasher/game-instance"; +export * from "./lib/game-instance/fly-squasher/game-mode"; +export * from "./lib/game-instance/fly-squasher/game-state"; +export * from "./lib/game-instance/fly-squasher/player"; +export * from "./lib/game-instance/fly-squasher/game-instance-medatada"; +export * from "./lib/game-instance/fly-squasher/spectator"; +export * from "./lib/fly-squasher/fly-squasher"; diff --git a/libs/api-interfaces/src/game-instance.ts b/libs/api-interfaces/src/game-instance.ts new file mode 100644 index 00000000..f409e60a --- /dev/null +++ b/libs/api-interfaces/src/game-instance.ts @@ -0,0 +1,13 @@ +export * from "./lib/game-instance/game-state"; +export * from "./lib/game-instance/game-mode"; +export * from "./lib/game-instance/player/player-state"; +export * from "./lib/game-instance/player/player"; +export * from "./lib/game-instance/player/player-controller"; +export * from "./lib/game-instance/game-instance"; +export * from "./lib/game-instance/data"; +export * from "./lib/game-instance/session"; +export * from "./lib/game-instance/spectator"; +export * from "./lib/game-instance/game-instance-metadata"; +export * from "./lib/game-instance/room"; +export * from "./lib/communicators/communicator"; +export * from "./lib/user-info/user-info"; diff --git a/libs/api-interfaces/src/index.ts b/libs/api-interfaces/src/index.ts index 4ade4fc3..ed70db56 100644 --- a/libs/api-interfaces/src/index.ts +++ b/libs/api-interfaces/src/index.ts @@ -1,33 +1,6 @@ -export * from "./lib/game-instance/game-state"; -export * from "./lib/game-instance/game-mode"; -export * from "./lib/game-instance/player/player-state"; -export * from "./lib/game-instance/player/player"; -export * from "./lib/game-instance/player/player-controller"; -export * from "./lib/game-instance/game-instance"; -export * from "./lib/game-instance/data"; -export * from "./lib/game-instance/session"; -export * from "./lib/game-instance/spectator"; -export * from "./lib/game-instance/game-instance-metadata"; -export * from "./lib/game-instance/room"; export * from "./lib/chat/chat"; -export * from "./lib/little-muncher/little-muncher"; -export * from "./lib/communicators/little-muncher/communicators"; -export * from "./lib/communicators/fly-squasher/communicators"; -export * from "./lib/communicators/communicator"; -export * from "./lib/game-instance/little-muncher/game-instance"; -export * from "./lib/game-instance/little-muncher/data"; -export * from "./lib/game-instance/little-muncher/game-mode"; -export * from "./lib/game-instance/little-muncher/game-state"; -export * from "./lib/game-instance/little-muncher/player"; -export * from "./lib/game-instance/little-muncher/game-instance-medatada"; -export * from "./lib/game-instance/little-muncher/spectator"; -export * from "./lib/user-info/user-info"; -export * from "./lib/user-info/little-muncher/user-info"; -export * from "./lib/user-info/fly-squasher/user-info"; -export * from "./lib/game-instance/fly-squasher/game-instance"; -export * from "./lib/game-instance/fly-squasher/game-mode"; -export * from "./lib/game-instance/fly-squasher/game-state"; -export * from "./lib/game-instance/fly-squasher/player"; -export * from "./lib/game-instance/fly-squasher/game-instance-medatada"; -export * from "./lib/game-instance/fly-squasher/spectator"; -export * from "./lib/fly-squasher/fly-squasher"; +export * from "./game-instance"; +export * from "./little-muncher"; +export * from "./fly-squasher"; +export * from "./probable-waffle"; +export * from "./lib/game/vector"; diff --git a/libs/api-interfaces/src/lib/chat/chat.ts b/libs/api-interfaces/src/lib/chat/chat.ts index b3b5453e..08a36396 100644 --- a/libs/api-interfaces/src/lib/chat/chat.ts +++ b/libs/api-interfaces/src/lib/chat/chat.ts @@ -6,5 +6,5 @@ export interface ChatMessage { } export enum GatewayChatEvent { - CHAT_MESSAGE = 'chat-message' + CHAT_MESSAGE = "chat-message" } diff --git a/libs/api-interfaces/src/lib/communicators/communicator.ts b/libs/api-interfaces/src/lib/communicators/communicator.ts index 98220c11..a38ec21d 100644 --- a/libs/api-interfaces/src/lib/communicators/communicator.ts +++ b/libs/api-interfaces/src/lib/communicators/communicator.ts @@ -1,5 +1,5 @@ export interface CommunicatorEvent { gameInstanceId?: string; communicator: K; - data: T; + payload: T; } diff --git a/libs/api-interfaces/src/lib/communicators/fly-squasher/communicators.ts b/libs/api-interfaces/src/lib/communicators/fly-squasher/communicators.ts index d1689209..d600bf04 100644 --- a/libs/api-interfaces/src/lib/communicators/fly-squasher/communicators.ts +++ b/libs/api-interfaces/src/lib/communicators/fly-squasher/communicators.ts @@ -9,5 +9,5 @@ export interface FlySquasherCommunicatorScoreEvent { } export enum FlySquasherGatewayEvent { - FlySquasherAction = "little-muncher-action" + FlySquasherAction = "fly-squasher-action" } diff --git a/libs/api-interfaces/src/lib/communicators/probable-waffle/communicator-game-events.ts b/libs/api-interfaces/src/lib/communicators/probable-waffle/communicator-game-events.ts new file mode 100644 index 00000000..4e82f9e4 --- /dev/null +++ b/libs/api-interfaces/src/lib/communicators/probable-waffle/communicator-game-events.ts @@ -0,0 +1,10 @@ +import { ProbableWaffleCommunicatorEvent } from "./communicators"; + +export interface ProbableWaffleCommunicatorSelectionEvent extends ProbableWaffleCommunicatorEvent { + type: "deselect" | "singleSelect" | "multiSelect" | "multiSelectPreview" | "terrainSelect"; + data?: { + selected?: string[]; + selectedArea?: { x: number; y: number; width: number; height: number }; + terrainSelected?: { x: number; y: number; z: number }; + }; +} diff --git a/libs/api-interfaces/src/lib/communicators/probable-waffle/communicators.ts b/libs/api-interfaces/src/lib/communicators/probable-waffle/communicators.ts new file mode 100644 index 00000000..81b8ec56 --- /dev/null +++ b/libs/api-interfaces/src/lib/communicators/probable-waffle/communicators.ts @@ -0,0 +1,95 @@ +// noinspection ES6PreferShortImport +import { ChatMessage } from "../../chat/chat"; +import { ProbableWaffleGameInstanceMetadataData } from "../../game-instance/probable-waffle/game-instance-medatada"; +import { ProbableWaffleGameModeData } from "../../game-instance/probable-waffle/game-mode"; +import { + ProbableWafflePlayer, + ProbableWafflePlayerControllerData, + ProbableWafflePlayerStateData +} from "../../game-instance/probable-waffle/player"; +import { ProbableWaffleSpectatorData } from "../../game-instance/probable-waffle/spectator"; + +export type ProbableWaffleGameCommunicatorType = "selection"; + +export type ProbableWaffleCommunicatorType = + | "gameInstanceMetadataDataChange" + | "gameModeDataChange" + | "playerDataChange" + | "spectatorDataChange" + | "message" + | ProbableWaffleGameCommunicatorType; + +export interface ProbableWaffleCommunicatorEvent { + gameInstanceId: string; + emitterUserId: string | null; +} + +export type RecursiveKeyOf = { + [TKey in keyof TObj & (string | number)]: TObj[TKey] extends any[] + ? `${TKey}` + : TObj[TKey] extends object + ? `${TKey}` | `${TKey}.${RecursiveKeyOf}` + : `${TKey}`; +}[keyof TObj & + (string | number) & + Exclude & + Exclude & + Exclude & + Exclude & + Exclude>]; + +export type ProbableWaffleAllChanged = "all"; + +export type ProbableWaffleDataChangeEventProperty = RecursiveKeyOf | ProbableWaffleAllChanged; + +export interface ProbableWaffleGameInstanceMetadataChangeEvent extends ProbableWaffleCommunicatorEvent { + property: ProbableWaffleDataChangeEventProperty; + data: Partial; +} + +export interface ProbableWaffleGameModeDataChangeEvent extends ProbableWaffleCommunicatorEvent { + property: ProbableWaffleDataChangeEventProperty; + data: Partial; +} + +export type ProbableWafflePlayerDataChangeEventPayload = Partial<{ + // provide player number only when updating player + playerNumber?: number; + playerStateData: Partial; + playerControllerData: Partial; +}>; + +export type ProbableWafflePlayerDataChangeEventProperty = + | ProbableWaffleDataChangeEventProperty + | "joined" + | "left" + | "joinedFromNetwork"; +export interface ProbableWafflePlayerDataChangeEvent extends ProbableWaffleCommunicatorEvent { + property: ProbableWafflePlayerDataChangeEventProperty; + data: ProbableWafflePlayerDataChangeEventPayload; +} + +export type ProbableWaffleSpectatorDataChangeEventProperty = + | ProbableWaffleDataChangeEventProperty + | "joined" + | "left"; +export interface ProbableWaffleSpectatorDataChangeEvent extends ProbableWaffleCommunicatorEvent { + property: ProbableWaffleSpectatorDataChangeEventProperty; + data: Partial; +} + +export interface ProbableWaffleCommunicatorMessageEvent extends ProbableWaffleCommunicatorEvent { + chatMessage: ChatMessage; +} + +export interface ProbableWaffleWebsocketRoomEvent { + gameInstanceId: string; + type: "join" | "leave"; +} + +export enum ProbableWaffleGatewayEvent { + ProbableWaffleRoom = "probable-waffle-room", + ProbableWaffleAction = "probable-waffle-action", + ProbableWaffleMessage = "probable-waffle-message", + ProbableWaffleWebsocketRoom = "probable-waffle-websocket-room" +} diff --git a/libs/api-interfaces/src/lib/communicators/probable-waffle/listeners.ts b/libs/api-interfaces/src/lib/communicators/probable-waffle/listeners.ts new file mode 100644 index 00000000..20aad03b --- /dev/null +++ b/libs/api-interfaces/src/lib/communicators/probable-waffle/listeners.ts @@ -0,0 +1,171 @@ +import { ProbableWaffleGameInstance } from "../../game-instance/probable-waffle/game-instance"; +import { + ProbableWaffleGameInstanceMetadataChangeEvent, + ProbableWaffleGameModeDataChangeEvent, + ProbableWafflePlayerDataChangeEvent, + ProbableWafflePlayerDataChangeEventProperty, + ProbableWaffleSpectatorDataChangeEvent +} from "./communicators"; +import { + ProbableWafflePlayer, + ProbableWafflePlayerControllerData, + ProbableWafflePlayerType +} from "../../game-instance/probable-waffle/player"; +import { ProbableWaffleSpectatorData } from "../../game-instance/probable-waffle/spectator"; +import { ProbableWaffleGameMode, ProbableWaffleGameModeData } from "../../game-instance/probable-waffle/game-mode"; +import { GameSessionState } from "../../game-instance/session"; +import { GameSetupHelpers } from "../../probable-waffle/game-setup.helpers"; + +export class ProbableWaffleListeners { + static gameInstanceMetadataChanged( + gameInstance: ProbableWaffleGameInstance | undefined, + payload: ProbableWaffleGameInstanceMetadataChangeEvent + ) { + if (!gameInstance) throw new Error("Game instance empty"); + switch (payload.property) { + case "sessionState": + gameInstance.gameInstanceMetadata!.data.sessionState = payload.data.sessionState; + switch (payload.data.sessionState) { + case GameSessionState.NotStarted: + case GameSessionState.MovingPlayersToGame: + case GameSessionState.StartingTheGame: + case GameSessionState.InProgress: + case GameSessionState.ToScoreScreen: + case GameSessionState.Stopped: + // none of these need any additional handling here + break; + default: + throw new Error("Unknown session state: " + payload.data.sessionState); + } + break; + default: + throw new Error("Unknown communicator for gameInstanceMetadataDataChange: " + payload.property); + } + } + + static gameModeChanged( + gameInstance: ProbableWaffleGameInstance | undefined, + payload: ProbableWaffleGameModeDataChangeEvent + ) { + if (!gameInstance) throw new Error("Game instance empty"); + switch (payload.property) { + case "all": + gameInstance.gameMode = new ProbableWaffleGameMode(payload.data as ProbableWaffleGameModeData); + break; + case "map": + gameInstance.gameMode!.data.map = payload.data.map; + break; + case "winConditions.timeLimit": + gameInstance.gameMode!.data.winConditions.timeLimit = payload.data.winConditions!.timeLimit; + break; + case "mapTuning.unitCap": + gameInstance.gameMode!.data.mapTuning.unitCap = payload.data.mapTuning!.unitCap; + break; + case "difficultyModifiers.aiAdvantageResources": + gameInstance.gameMode!.data.difficultyModifiers.aiAdvantageResources = + payload.data.difficultyModifiers!.aiAdvantageResources; + break; + case "difficultyModifiers.reducedIncome": + gameInstance.gameMode!.data.difficultyModifiers.reducedIncome = payload.data.difficultyModifiers!.reducedIncome; + break; + default: + throw new Error("Unknown communicator for gameModeDataChange: " + payload.property); + } + } + + static playerChanged( + gameInstance: ProbableWaffleGameInstance | undefined, + payload: ProbableWafflePlayerDataChangeEvent + ) { + { + if (!gameInstance) throw new Error("Game instance empty"); + let controllerData: ProbableWafflePlayerControllerData; + let player: ProbableWafflePlayer | undefined; + switch (payload.property) { + case "joined": + // check if player with this player number doesn't exist + controllerData = payload.data.playerControllerData as ProbableWafflePlayerControllerData; + const playerNumber = controllerData.playerDefinition!.player.playerNumber; + const exists = gameInstance.players.find((p) => p.playerNumber === playerNumber); + if (exists) throw new Error("Player already exists in this game instance with number " + playerNumber); + player = gameInstance.initPlayer(controllerData); + gameInstance.addPlayer(player); + break; + case "joinedFromNetwork": + const firstNetworkOpenPlayer = GameSetupHelpers.getFirstNetworkOpenPlayer(gameInstance.players); + if (!firstNetworkOpenPlayer) throw new Error("No network open player found"); + controllerData = payload.data.playerControllerData as ProbableWafflePlayerControllerData; + firstNetworkOpenPlayer.playerController.data.userId = controllerData.userId; + firstNetworkOpenPlayer.playerController.data.playerDefinition!.playerType = ProbableWafflePlayerType.Human; + break; + case "left": + controllerData = payload.data.playerControllerData as ProbableWafflePlayerControllerData; + gameInstance.removePlayerByData(controllerData); + break; + case "playerController.data.playerDefinition.player.playerPosition" as ProbableWafflePlayerDataChangeEventProperty: + player = gameInstance.getPlayerByNumber(payload.data.playerNumber!); + if (!player) throw new Error("Player not found with number " + payload.data.playerNumber); + player.playerController.data.playerDefinition!.player.playerPosition = + payload.data.playerControllerData!.playerDefinition!.player.playerPosition; + break; + case "playerController.data.playerDefinition.factionType" as ProbableWafflePlayerDataChangeEventProperty: + player = gameInstance.getPlayerByNumber(payload.data.playerNumber!); + if (!player) throw new Error("Player not found with number " + payload.data.playerNumber); + player.playerController.data.playerDefinition!.factionType = + payload.data.playerControllerData!.playerDefinition!.factionType; + console.log( + "faction type changed", + player.playerController.data.playerDefinition!.factionType, + "for player", + player.playerNumber + ); + break; + case "playerController.data.playerDefinition.team" as ProbableWafflePlayerDataChangeEventProperty: + player = gameInstance.getPlayerByNumber(payload.data.playerNumber!); + if (!player) throw new Error("Player not found with number " + payload.data.playerNumber); + player.playerController.data.playerDefinition!.team = + payload.data.playerControllerData!.playerDefinition!.team; + console.log( + "team changed", + player.playerController.data.playerDefinition!.team, + "for player", + player.playerNumber + ); + break; + case "playerController.data.playerDefinition.difficulty" as ProbableWafflePlayerDataChangeEventProperty: + player = gameInstance.getPlayerByNumber(payload.data.playerNumber!); + if (!player) throw new Error("Player not found with number " + payload.data.playerNumber); + player.playerController.data.playerDefinition!.difficulty = + payload.data.playerControllerData!.playerDefinition!.difficulty; + console.log( + "difficulty changed", + player.playerController.data.playerDefinition!.difficulty, + "for player", + player.playerNumber + ); + break; + + default: + throw new Error("Unknown communicator for playerDataChange: " + payload.property); + } + } + } + + static spectatorChanged( + gameInstance: ProbableWaffleGameInstance | undefined, + payload: ProbableWaffleSpectatorDataChangeEvent + ) { + if (!gameInstance) throw new Error("Game instance empty"); + switch (payload.property) { + case "joined": + const spectator = gameInstance!.initSpectator(payload.data as ProbableWaffleSpectatorData); + gameInstance.addSpectator(spectator); + break; + case "left": + gameInstance.removeSpectator(payload.data.userId!); + break; + default: + throw new Error("Unknown communicator for spectatorDataChange: " + payload.property); + } + } +} diff --git a/libs/api-interfaces/src/lib/fly-squasher/fly-squasher.ts b/libs/api-interfaces/src/lib/fly-squasher/fly-squasher.ts index d5ff62d1..a9053e79 100644 --- a/libs/api-interfaces/src/lib/fly-squasher/fly-squasher.ts +++ b/libs/api-interfaces/src/lib/fly-squasher/fly-squasher.ts @@ -6,10 +6,10 @@ export enum FlySquasherLevelEnum { } export type FlySquasherLevelType = { - [key in FlySquasherLevelEnum]: LevelData; + [key in FlySquasherLevelEnum]: FlySquasherLevelData; }; -export type LevelData = { +export type FlySquasherLevelData = { id: FlySquasherLevelEnum; name: string; description: string; diff --git a/libs/api-interfaces/src/lib/game-instance/fly-squasher/game-mode.ts b/libs/api-interfaces/src/lib/game-instance/fly-squasher/game-mode.ts index af26775f..f4fc79c4 100644 --- a/libs/api-interfaces/src/lib/game-instance/fly-squasher/game-mode.ts +++ b/libs/api-interfaces/src/lib/game-instance/fly-squasher/game-mode.ts @@ -1,9 +1,9 @@ import { BaseData } from "../data"; import { BaseGameMode } from "../game-mode"; -import { LevelData } from "../../fly-squasher/fly-squasher"; +import { FlySquasherLevelData } from "../../fly-squasher/fly-squasher"; export interface FlySquasherGameModeData extends BaseData { - level?: LevelData; + level?: FlySquasherLevelData; } export class FlySquasherGameMode extends BaseGameMode { diff --git a/libs/api-interfaces/src/lib/game-instance/fly-squasher/player.ts b/libs/api-interfaces/src/lib/game-instance/fly-squasher/player.ts index 913af370..4218a587 100644 --- a/libs/api-interfaces/src/lib/game-instance/fly-squasher/player.ts +++ b/libs/api-interfaces/src/lib/game-instance/fly-squasher/player.ts @@ -1,6 +1,6 @@ import { BasePlayer } from "../player/player"; import { BaseData } from "../data"; -import { BasePlayerController } from "../player/player-controller"; +import { BasePlayerController, BasePlayerControllerData } from "../player/player-controller"; import { BasePlayerState } from "../player/player-state"; export class FlySquasherPlayer extends BasePlayer< @@ -33,4 +33,4 @@ export class FlySquasherPlayerController extends BasePlayerController = GameInstanceMetadata, + TGameInstanceMetadata extends + GameInstanceMetadata = GameInstanceMetadata, TGameStateData extends BaseData = BaseData, TGameState extends BaseGameState = BaseGameState, TGameModeData extends BaseData = BaseData, TGameMode extends BaseGameMode = BaseGameMode, TPlayerStateData extends BaseData = BaseData, - TPlayerControllerData extends BaseData = BaseData, + TPlayerControllerData extends BasePlayerControllerData = BasePlayerControllerData, TPlayerState extends BasePlayerState = BasePlayerState, TPlayerController extends BasePlayerController = BasePlayerController, TPlayer extends BasePlayer = BasePlayer< @@ -55,7 +54,7 @@ export abstract class GameInstance< TSpectator extends BaseSpectator = BaseSpectator > { gameMode: TGameMode | null = null; - gameInstanceMetadata: TGameInstanceMetadata | null = null; + gameInstanceMetadata: TGameInstanceMetadata; gameState: TGameState | null = null; players: TPlayer[] = []; spectators: TSpectator[] = []; @@ -67,11 +66,7 @@ export abstract class GameInstance< gameState: new (...args: any /*TGameStateData */) => TGameState; playerState: new (...args: any /*TPlayerStateData */) => TPlayerState; playerController: new (...args: any /*TPlayerControllerData */) => TPlayerController; - player: new ( - userId: string | null, - playerState: any /*TPlayerState*/, - playerController: any /*TPlayerController*/ - ) => TPlayer; + player: new (playerState: any /*TPlayerState*/, playerController: any /*TPlayerController*/) => TPlayer; spectator: new (...args: any /*TSpectatorData*/) => TSpectator; }, gameInstanceData?: GameInstanceData< @@ -84,13 +79,14 @@ export abstract class GameInstance< > ) { this.gameInstanceMetadata = new constructors.gameInstanceMetadata(gameInstanceData?.gameInstanceMetadataData); - this.gameMode = new constructors.gameMode(gameInstanceData?.gameModeData); - this.gameState = new constructors.gameState(gameInstanceData?.gameStateData); + this.gameMode = gameInstanceData?.gameModeData ? new constructors.gameMode(gameInstanceData?.gameModeData) : null; + this.gameState = gameInstanceData?.gameStateData + ? new constructors.gameState(gameInstanceData?.gameStateData) + : null; this.players = gameInstanceData?.players?.map( (playerData) => new constructors.player( - playerData.userId, new constructors.playerState(playerData.playerStateData), new constructors.playerController(playerData.playerControllerData) ) @@ -111,7 +107,6 @@ export abstract class GameInstance< gameStateData: this.gameState?.data, gameModeData: this.gameMode?.data, players: this.players.map((player) => ({ - userId: player.userId, playerStateData: player.playerState.data, playerControllerData: player.playerController.data })), @@ -119,27 +114,39 @@ export abstract class GameInstance< }; } - initGame(gameModeData: TGameModeData) { - if (!this.gameMode || !this.gameInstanceMetadata) - throw new Error('Game mode or game instance metadata is not initialized'); - this.gameMode.data = gameModeData; - this.gameInstanceMetadata.data.sessionState = GameSessionState.Playing; - } - - initPlayer(userId: string | null, playerStateData: TPlayerStateData, playerControllerData: TPlayerControllerData) { + initPlayer( + playerControllerData: TPlayerControllerData, + playerStateData: TPlayerStateData | undefined = undefined + ): TPlayer { const playerState = new this.constructors.playerState(playerStateData); const playerController = new this.constructors.playerController(playerControllerData); - this.players.push(new this.constructors.player(userId, playerState, playerController)); + return new this.constructors.player(playerState, playerController); } - initSpectator(spectatorData: TSpectatorData) { - this.spectators.push(new this.constructors.spectator(spectatorData)); + initSpectator(spectatorData: TSpectatorData): TSpectator { + return new this.constructors.spectator(spectatorData); } removeSpectator(userId: string) { this.spectators = this.spectators.filter((s) => s.data.userId !== userId); } + removePlayerByUserId(userId: string) { + this.players = this.players.filter((p) => p.playerController.data.userId !== userId); + } + + removePlayerByPlayer(player: TPlayer) { + this.players = this.players.filter((p) => p !== player); + } + + addPlayer(player: TPlayer) { + this.players.push(player); + } + + addSpectator(spectator: TSpectator) { + this.spectators.push(spectator); + } + stopLevel() { this.gameInstanceMetadata?.resetData(); this.gameMode?.resetData(); @@ -152,7 +159,7 @@ export abstract class GameInstance< } getPlayer(userId: string | null): TPlayer | null { - return this.players.find((p) => p.userId === userId) ?? null; + return this.players.find((p) => p.playerController.data.userId === userId) ?? null; } getSpectator(userId: string | null): TSpectator | null { @@ -164,7 +171,7 @@ export abstract class GameInstance< } isPlayer(userId: string | null): boolean { - return this.players.some((p) => p.userId === userId); + return this.players.some((p) => p.playerController.data.userId === userId); } isSpectator(userId: string | null): boolean { diff --git a/libs/api-interfaces/src/lib/game-instance/game-mode.ts b/libs/api-interfaces/src/lib/game-instance/game-mode.ts index 5051d07b..ce11fa51 100644 --- a/libs/api-interfaces/src/lib/game-instance/game-mode.ts +++ b/libs/api-interfaces/src/lib/game-instance/game-mode.ts @@ -1,4 +1,4 @@ -import { BaseData } from './data'; +import { BaseData } from "./data"; export abstract class BaseGameMode { protected constructor(public data: TData) { 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/little-muncher/data.ts b/libs/api-interfaces/src/lib/game-instance/little-muncher/data.ts index 9c2d21d3..a1241235 100644 --- a/libs/api-interfaces/src/lib/game-instance/little-muncher/data.ts +++ b/libs/api-interfaces/src/lib/game-instance/little-muncher/data.ts @@ -3,5 +3,8 @@ export class LittleMuncherPosition { } export class LittleMuncherBoost { - constructor(public boostMultiplier: number = 1, public durationInSec: number = 0) {} + constructor( + public boostMultiplier: number = 1, + public durationInSec: number = 0 + ) {} } diff --git a/libs/api-interfaces/src/lib/game-instance/little-muncher/game-instance-medatada.ts b/libs/api-interfaces/src/lib/game-instance/little-muncher/game-instance-medatada.ts index 65dc86be..d33b9618 100644 --- a/libs/api-interfaces/src/lib/game-instance/little-muncher/game-instance-medatada.ts +++ b/libs/api-interfaces/src/lib/game-instance/little-muncher/game-instance-medatada.ts @@ -1,4 +1,4 @@ -import { GameInstanceMetadata, GameInstanceMetadataData } from '../game-instance-metadata'; +import { GameInstanceMetadata, GameInstanceMetadataData } from "../game-instance-metadata"; export interface LittleMuncherGameInstanceMetadataData extends GameInstanceMetadataData {} diff --git a/libs/api-interfaces/src/lib/game-instance/little-muncher/game-instance.ts b/libs/api-interfaces/src/lib/game-instance/little-muncher/game-instance.ts index 5422afae..627a5ea8 100644 --- a/libs/api-interfaces/src/lib/game-instance/little-muncher/game-instance.ts +++ b/libs/api-interfaces/src/lib/game-instance/little-muncher/game-instance.ts @@ -1,15 +1,16 @@ -import { GameInstance, GameInstanceData } from '../game-instance'; -import { LittleMuncherGameInstanceMetadata, LittleMuncherGameInstanceMetadataData } from './game-instance-medatada'; -import { LittleMuncherGameMode, LittleMuncherGameModeData } from './game-mode'; -import { LittleMuncherGameState, LittleMuncherGameStateData } from './game-state'; +import { GameInstance, GameInstanceData } from "../game-instance"; +import { LittleMuncherGameInstanceMetadata, LittleMuncherGameInstanceMetadataData } from "./game-instance-medatada"; +import { LittleMuncherGameMode, LittleMuncherGameModeData } from "./game-mode"; +import { LittleMuncherGameState, LittleMuncherGameStateData } from "./game-state"; import { LittleMuncherPlayer, LittleMuncherPlayerController, LittleMuncherPlayerControllerData, LittleMuncherPlayerState, LittleMuncherPlayerStateData -} from './player'; -import { LittleMuncherSpectator, LittleMuncherSpectatorData } from './spectator'; +} from "./player"; +import { LittleMuncherSpectator, LittleMuncherSpectatorData } from "./spectator"; +import { GameSessionState } from "../session"; export type LittleMuncherGameInstanceData = GameInstanceData< LittleMuncherGameInstanceMetadataData, @@ -49,4 +50,10 @@ export class LittleMuncherGameInstance extends GameInstance< gameInstanceData ); } + + initGame(gameModeData: LittleMuncherGameModeData) { + this.gameMode = new LittleMuncherGameMode(gameModeData); + this.gameState = new LittleMuncherGameState(); + this.gameInstanceMetadata.data.sessionState = GameSessionState.InProgress; + } } diff --git a/libs/api-interfaces/src/lib/game-instance/little-muncher/game-mode.ts b/libs/api-interfaces/src/lib/game-instance/little-muncher/game-mode.ts index 356bae01..52a5c65f 100644 --- a/libs/api-interfaces/src/lib/game-instance/little-muncher/game-mode.ts +++ b/libs/api-interfaces/src/lib/game-instance/little-muncher/game-mode.ts @@ -1,6 +1,6 @@ -import { BaseData } from '../data'; -import { LittleMuncherHillEnum } from '../../little-muncher/little-muncher'; -import { BaseGameMode } from '../game-mode'; +import { BaseData } from "../data"; +import { LittleMuncherHillEnum } from "../../little-muncher/little-muncher"; +import { BaseGameMode } from "../game-mode"; export interface LittleMuncherGameModeData extends BaseData { hill?: LittleMuncherHillEnum; diff --git a/libs/api-interfaces/src/lib/game-instance/little-muncher/game-state.ts b/libs/api-interfaces/src/lib/game-instance/little-muncher/game-state.ts index 48241ba9..3d6fc2c5 100644 --- a/libs/api-interfaces/src/lib/game-instance/little-muncher/game-state.ts +++ b/libs/api-interfaces/src/lib/game-instance/little-muncher/game-state.ts @@ -1,5 +1,5 @@ -import { BaseGameState } from '../game-state'; -import { BaseData } from '../data'; +import { BaseGameState } from "../game-state"; +import { BaseData } from "../data"; export class LittleMuncherGameState extends BaseGameState { constructor(data?: LittleMuncherGameStateData) { diff --git a/libs/api-interfaces/src/lib/game-instance/little-muncher/player.ts b/libs/api-interfaces/src/lib/game-instance/little-muncher/player.ts index c0d123cc..2b8ceed7 100644 --- a/libs/api-interfaces/src/lib/game-instance/little-muncher/player.ts +++ b/libs/api-interfaces/src/lib/game-instance/little-muncher/player.ts @@ -1,8 +1,8 @@ -import { LittleMuncherBoost, LittleMuncherPosition } from './data'; -import { BasePlayer } from '../player/player'; -import { BaseData } from '../data'; -import { BasePlayerController } from '../player/player-controller'; -import { BasePlayerState } from '../player/player-state'; +import { LittleMuncherBoost, LittleMuncherPosition } from "./data"; +import { BasePlayer } from "../player/player"; +import { BaseData } from "../data"; +import { BasePlayerController, BasePlayerControllerData } from "../player/player-controller"; +import { BasePlayerState } from "../player/player-state"; export class LittleMuncherPlayer extends BasePlayer< LittleMuncherPlayerStateData, @@ -38,4 +38,4 @@ export class LittleMuncherPlayerController extends BasePlayerController { constructor(data?: LittleMuncherSpectatorData) { diff --git a/libs/api-interfaces/src/lib/game-instance/player/player-controller.ts b/libs/api-interfaces/src/lib/game-instance/player/player-controller.ts index 42cd4871..9676d148 100644 --- a/libs/api-interfaces/src/lib/game-instance/player/player-controller.ts +++ b/libs/api-interfaces/src/lib/game-instance/player/player-controller.ts @@ -1,11 +1,17 @@ -import { BaseData } from '../data'; +import { BaseData } from "../data"; -export abstract class BasePlayerController { +export interface BasePlayerControllerData extends BaseData { + userId: string | null; +} + +export abstract class BasePlayerController { protected constructor(public data: TData) { if (!data) this.resetData(); } resetData() { - this.data = {} as TData; + this.data = { + userId: null + } as TData; } } diff --git a/libs/api-interfaces/src/lib/game-instance/player/player-state.ts b/libs/api-interfaces/src/lib/game-instance/player/player-state.ts index af50098b..6270e0c4 100644 --- a/libs/api-interfaces/src/lib/game-instance/player/player-state.ts +++ b/libs/api-interfaces/src/lib/game-instance/player/player-state.ts @@ -1,4 +1,4 @@ -import { BaseData } from '../data'; +import { BaseData } from "../data"; export abstract class BasePlayerState { protected constructor(public data: TData) { diff --git a/libs/api-interfaces/src/lib/game-instance/player/player.ts b/libs/api-interfaces/src/lib/game-instance/player/player.ts index c34fba66..c6abf220 100644 --- a/libs/api-interfaces/src/lib/game-instance/player/player.ts +++ b/libs/api-interfaces/src/lib/game-instance/player/player.ts @@ -1,15 +1,14 @@ -import { BasePlayerState } from './player-state'; -import { BaseData } from '../data'; -import { BasePlayerController } from './player-controller'; +import { BasePlayerState } from "./player-state"; +import { BaseData } from "../data"; +import { BasePlayerController, BasePlayerControllerData } from "./player-controller"; export abstract class BasePlayer< TPlayerStateData extends BaseData = BaseData, - TPlayerControllerData extends BaseData = BaseData, + TPlayerControllerData extends BasePlayerControllerData = BasePlayerControllerData, TPlayerState extends BasePlayerState = BasePlayerState, TPlayerController extends BasePlayerController = BasePlayerController > { constructor( - public userId: string | null, public playerState: TPlayerState, public playerController: TPlayerController ) {} diff --git a/libs/api-interfaces/src/lib/game-instance/probable-waffle/data.ts b/libs/api-interfaces/src/lib/game-instance/probable-waffle/data.ts new file mode 100644 index 00000000..e69de29b 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 new file mode 100644 index 00000000..e3838adb --- /dev/null +++ b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance-medatada.ts @@ -0,0 +1,35 @@ +import { GameInstanceMetadata, GameInstanceMetadataData } from "../game-instance-metadata"; + +export enum ProbableWaffleGameInstanceType { + Matchmaking, + SelfHosted, + Skirmish, + InstantGame, + Replay +} + +export interface GameInstanceMetadataStartOptions { + loadFromSave?: boolean; +} + +export interface ProbableWaffleGameInstanceMetadataData extends GameInstanceMetadataData { + type: ProbableWaffleGameInstanceType; + visibility: ProbableWaffleGameInstanceVisibility; + name: string; + startOptions: GameInstanceMetadataStartOptions; +} + +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", + Private = "private" +} 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 new file mode 100644 index 00000000..55f08bd1 --- /dev/null +++ b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-instance.ts @@ -0,0 +1,68 @@ +import { GameInstance, GameInstanceData, GameInstanceDataDto } from "../game-instance"; +import { ProbableWaffleGameInstanceMetadata, ProbableWaffleGameInstanceMetadataData } from "./game-instance-medatada"; +import { ProbableWaffleGameMode, ProbableWaffleGameModeData } from "./game-mode"; +import { ProbableWaffleGameState, ProbableWaffleGameStateData } from "./game-state"; +import { + ProbableWafflePlayer, + ProbableWafflePlayerController, + ProbableWafflePlayerControllerData, + ProbableWafflePlayerState, + ProbableWafflePlayerStateData +} from "./player"; +import { ProbableWaffleSpectator, ProbableWaffleSpectatorData } from "./spectator"; + +export type ProbableWaffleGameInstanceData = GameInstanceData< + ProbableWaffleGameInstanceMetadataData, + ProbableWaffleGameStateData, + ProbableWaffleGameModeData, + ProbableWafflePlayerStateData, + ProbableWafflePlayerControllerData, + ProbableWaffleSpectatorData +>; + +export class ProbableWaffleGameInstance extends GameInstance< + ProbableWaffleGameInstanceMetadataData, + ProbableWaffleGameInstanceMetadata, + ProbableWaffleGameStateData, + ProbableWaffleGameState, + ProbableWaffleGameModeData, + ProbableWaffleGameMode, + ProbableWafflePlayerStateData, + ProbableWafflePlayerControllerData, + ProbableWafflePlayerState, + ProbableWafflePlayerController, + ProbableWafflePlayer, + ProbableWaffleSpectatorData, + ProbableWaffleSpectator +> { + constructor(gameInstanceData?: ProbableWaffleGameInstanceData) { + super( + { + gameInstanceMetadata: ProbableWaffleGameInstanceMetadata, + gameMode: ProbableWaffleGameMode, + gameState: ProbableWaffleGameState, + spectator: ProbableWaffleSpectator, + playerController: ProbableWafflePlayerController, + player: ProbableWafflePlayer, + playerState: ProbableWafflePlayerState + }, + gameInstanceData + ); + } + + removePlayerByData(controllerData: ProbableWafflePlayerControllerData) { + if (!controllerData.playerDefinition) throw new Error("Player definition is required"); + const playerNumber = controllerData.playerDefinition.player.playerNumber; + this.players = this.players.filter((p) => { + if (!p.playerController.data.playerDefinition) throw new Error("Player definition is required"); + return p.playerNumber !== playerNumber; + }); + } + + getPlayerByNumber(playerNumber: number) { + return this.players.find((p) => { + if (!p.playerController.data.playerDefinition) throw new Error("Player definition is required"); + return p.playerNumber === playerNumber; + }); + } +} diff --git a/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-mode.ts b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-mode.ts new file mode 100644 index 00000000..2ce00427 --- /dev/null +++ b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-mode.ts @@ -0,0 +1,17 @@ +import { BaseData } from "../data"; +import { BaseGameMode } from "../game-mode"; +import { ProbableWaffleMapEnum } from "../../probable-waffle/probable-waffle"; +import { DifficultyModifiers, MapTuning, WinConditions } from "../../probable-waffle/probable-waffle-game-mode-lobby"; + +export interface ProbableWaffleGameModeData extends BaseData { + map?: ProbableWaffleMapEnum; + winConditions: WinConditions; + mapTuning: MapTuning; + difficultyModifiers: DifficultyModifiers; +} + +export class ProbableWaffleGameMode extends BaseGameMode { + constructor(data?: ProbableWaffleGameModeData) { + super(data as ProbableWaffleGameModeData); + } +} 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 new file mode 100644 index 00000000..78d90539 --- /dev/null +++ b/libs/api-interfaces/src/lib/game-instance/probable-waffle/game-state.ts @@ -0,0 +1,27 @@ +import { BaseGameState } from "../game-state"; +import { BaseData } from "../data"; + +export class ProbableWaffleGameState extends BaseGameState { + constructor(data?: ProbableWaffleGameStateData) { + super(data as ProbableWaffleGameStateData); + } + + override resetData() { + super.resetData(); + this.data = { + actors: [], + score: 0, + pause: false + }; + } +} + +export interface ProbableWaffleGameStateData extends BaseData { + actors: ActorDefinition[]; + pause: boolean; + score: number; +} + +export interface ActorDefinition extends Record { + name: string; +} diff --git a/libs/api-interfaces/src/lib/game-instance/probable-waffle/player.ts b/libs/api-interfaces/src/lib/game-instance/probable-waffle/player.ts new file mode 100644 index 00000000..3955e681 --- /dev/null +++ b/libs/api-interfaces/src/lib/game-instance/probable-waffle/player.ts @@ -0,0 +1,87 @@ +import { BasePlayer } from "../player/player"; +import { BaseData } from "../data"; +import { BasePlayerController, BasePlayerControllerData } from "../player/player-controller"; +import { BasePlayerState } from "../player/player-state"; +import { ResourceType } from "../../probable-waffle/resource-type-definition"; +import { PlayerStateAction } from "../../probable-waffle/probable-waffle-player-state-action"; + +export class ProbableWafflePlayer extends BasePlayer< + ProbableWafflePlayerStateData, + ProbableWafflePlayerControllerData, + ProbableWafflePlayerState, + ProbableWafflePlayerController +> { + get playerNumber(): number | undefined { + return this.playerController.data.playerDefinition?.player.playerNumber ?? undefined; + } +} + +export interface ProbableWafflePlayerStateData extends BaseData { + resources: PlayerStateResources; + summary: PlayerStateAction[]; +} + +export class ProbableWafflePlayerState extends BasePlayerState { + constructor(data?: ProbableWafflePlayerStateData) { + super(data as ProbableWafflePlayerStateData); + } + + override resetData() { + super.resetData(); + this.data = { + resources: { + [ResourceType.Ambrosia]: 0, + [ResourceType.Minerals]: 0, + [ResourceType.Stone]: 0, + [ResourceType.Wood]: 0 + }, + summary: [] + }; + } +} + +export class ProbableWafflePlayerController extends BasePlayerController { + constructor(data?: ProbableWafflePlayerControllerData) { + super(data as ProbableWafflePlayerControllerData); + } +} + +export interface ProbableWafflePlayerControllerData extends BasePlayerControllerData { + playerDefinition?: PositionPlayerDefinition; +} + +export enum ProbableWafflePlayerType { + Human = 0, + AI = 1, + NetworkOpen = 2 +} + +export enum ProbableWaffleAiDifficulty { + Easy = 0, + Medium = 1, + Hard = 2 +} + +export interface PlayerLobbyDefinition { + playerNumber: number; + playerName?: string; + playerPosition?: number; + joined: boolean; +} + +export enum FactionType { + Tivara, + Skaduwee +} + +export interface PositionPlayerDefinition { + player: PlayerLobbyDefinition; + team?: number; + factionType?: FactionType; + playerType: ProbableWafflePlayerType; + difficulty?: ProbableWaffleAiDifficulty; +} + +export type PlayerStateResources = { + [key in ResourceType]: number; +}; diff --git a/libs/api-interfaces/src/lib/game-instance/probable-waffle/spectator.ts b/libs/api-interfaces/src/lib/game-instance/probable-waffle/spectator.ts new file mode 100644 index 00000000..ed858214 --- /dev/null +++ b/libs/api-interfaces/src/lib/game-instance/probable-waffle/spectator.ts @@ -0,0 +1,9 @@ +import { BaseSpectator, BaseSpectatorData } from "../spectator"; + +export class ProbableWaffleSpectator extends BaseSpectator { + constructor(data?: ProbableWaffleSpectatorData) { + super(data as ProbableWaffleSpectatorData); + } +} + +export interface ProbableWaffleSpectatorData extends BaseSpectatorData {} diff --git a/libs/api-interfaces/src/lib/game-instance/room.ts b/libs/api-interfaces/src/lib/game-instance/room.ts index f1a0b6e3..92ccb103 100644 --- a/libs/api-interfaces/src/lib/game-instance/room.ts +++ b/libs/api-interfaces/src/lib/game-instance/room.ts @@ -1,25 +1,76 @@ -import { GameInstanceMetadataData } from './game-instance-metadata'; +import { LittleMuncherGameMode } from "./little-muncher/game-mode"; +import { LittleMuncherGameInstanceMetadataData } from "./little-muncher/game-instance-medatada"; +import { ProbableWaffleGameModeData } from "./probable-waffle/game-mode"; +import { ProbableWaffleGameInstanceMetadataData } from "./probable-waffle/game-instance-medatada"; +import { ProbableWafflePlayerControllerData, ProbableWafflePlayerType } from "./probable-waffle/player"; +import { ProbableWaffleSpectatorData } from "./probable-waffle/spectator"; -export interface Room { - gameInstanceId: string; +interface Room { + gameInstanceMetadataData: TGameInstanceMetadataData; + gameModeData?: TGameModeData; } -export interface RoomEvent { - room: Room; +interface RoomEvent { + room: TRoom; action: RoomAction; - gameInstanceMetadataData: GameInstanceMetadataData; } -export type RoomAction = 'added' | 'existing' | 'removed'; +interface SpectatorEvent { + gameInstanceId: string; + action: SpectatorAction; +} + +interface PlayerEvent { + gameInstanceId: string; + action: PlayerAction; +} + +export type SpectatorAction = "joined" | "left"; +export type PlayerAction = "joined" | "left"; + +export type RoomAction = + | "added" + | "removed" + | "game_instance_metadata" + | "game_mode" + | "player.joined" + | "player.left" + | "spectator.joined" + | "spectator.left"; + +export enum ProbableWaffleGameInstanceEvent { + GameFound = "game-found" +} -export interface SpectatorEvent { - room: Room; +export interface LittleMuncherRoom extends Room {} + +export interface LittleMuncherRoomEvent extends RoomEvent {} + +export interface LittleMuncherSpectatorEvent extends SpectatorEvent { user_id: string; - action: SpectatorAction; + room: Room; +} + +export interface ProbableWaffleRoomPlayer { + controllerData: ProbableWafflePlayerControllerData; } -export type SpectatorAction = 'joined' | 'left'; +export interface ProbableWaffleRoom extends Room { + players: ProbableWaffleRoomPlayer[]; + spectators: ProbableWaffleSpectatorData[]; +} + +export interface ProbableWaffleRoomEvent extends RoomEvent {} + +export interface ProbableWaffleGameFoundEvent { + userIds: string[]; + gameInstanceId: string; +} -export enum GatewaySpectatorEvent { - Spectator = 'room-spectator' +export class ProbableWaffleRoomHelper { + public static getActivatedPlayersInRoom(room: ProbableWaffleRoom): ProbableWaffleRoomPlayer[] { + return room.players.filter( + (p) => p.controllerData.playerDefinition?.playerType !== ProbableWafflePlayerType.NetworkOpen + ); + } } diff --git a/libs/api-interfaces/src/lib/game-instance/session.ts b/libs/api-interfaces/src/lib/game-instance/session.ts index bf55139c..e29de2fd 100644 --- a/libs/api-interfaces/src/lib/game-instance/session.ts +++ b/libs/api-interfaces/src/lib/game-instance/session.ts @@ -1,4 +1,8 @@ export enum GameSessionState { - NotPlaying, - Playing + NotStarted, + MovingPlayersToGame, + StartingTheGame, + InProgress, + ToScoreScreen, + Stopped } diff --git a/libs/api-interfaces/src/lib/game/vector.ts b/libs/api-interfaces/src/lib/game/vector.ts new file mode 100644 index 00000000..3165152d --- /dev/null +++ b/libs/api-interfaces/src/lib/game/vector.ts @@ -0,0 +1,10 @@ +export interface Vector2Simple { + x: number; + y: number; +} + +export interface Vector3Simple { + x: number; + y: number; + z: number; +} diff --git a/libs/api-interfaces/src/lib/little-muncher/little-muncher.ts b/libs/api-interfaces/src/lib/little-muncher/little-muncher.ts index ee3c0055..5b77e324 100644 --- a/libs/api-interfaces/src/lib/little-muncher/little-muncher.ts +++ b/libs/api-interfaces/src/lib/little-muncher/little-muncher.ts @@ -14,11 +14,11 @@ export type HillData = { export const LittleMuncherHills: LittleMuncherHillType = { [LittleMuncherHillEnum.Stefka]: { - name: 'Stefka', + name: "Stefka", height: 748 }, [LittleMuncherHillEnum.Jakob]: { - name: 'Jakob', + name: "Jakob", height: 806 } }; diff --git a/libs/api-interfaces/src/lib/probable-waffle/game-setup.helpers.ts b/libs/api-interfaces/src/lib/probable-waffle/game-setup.helpers.ts new file mode 100644 index 00000000..522e80ad --- /dev/null +++ b/libs/api-interfaces/src/lib/probable-waffle/game-setup.helpers.ts @@ -0,0 +1,41 @@ +import { ProbableWafflePlayer, ProbableWafflePlayerType } from "../game-instance/probable-waffle/player"; + +export class GameSetupHelpers { + public static getColorForPlayer(playerNumber: number, totalPlayers: number = 8): string { + const hue = (playerNumber / totalPlayers) * 360; + const saturation = 100; + const lightness = 50; + return `hsl(${hue}, ${saturation}%, ${lightness}%)`; + } + + public static getFirstFreePosition(players: ProbableWafflePlayer[]) { + const playerPositions = players.map((p) => p.playerController.data.playerDefinition!.player.playerPosition); + // iterate from 0 to players.length and find first number that doesn't exist in playerPositions + for (let i = 0; i < players.length; i++) { + if (!playerPositions.includes(i)) { + return i; + } + } + return players.length; + } + + public static getFirstFreePlayerNumber(players: ProbableWafflePlayer[]) { + const playerNumbers = players.map((p) => p.playerNumber); + // iterate from 0 to players.length and find first number that doesn't exist in playerPositions + for (let i = 0; i < players.length; i++) { + if (!playerNumbers.includes(i)) { + return i; + } + } + return players.length; + } + + static getFirstNetworkOpenPlayer(players: ProbableWafflePlayer[]): ProbableWafflePlayer | null { + // noinspection UnnecessaryLocalVariableJS + const player = + players.find( + (p) => p.playerController.data.playerDefinition?.playerType === ProbableWafflePlayerType.NetworkOpen + ) ?? null; + return player; + } +} 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 new file mode 100644 index 00000000..e21ae110 --- /dev/null +++ b/libs/api-interfaces/src/lib/probable-waffle/probable-waffle-api.ts @@ -0,0 +1,66 @@ +import { ProbableWaffleGameModeData } from "../game-instance/probable-waffle/game-mode"; +import { + FactionType, + ProbableWafflePlayerControllerData, + ProbableWafflePlayerStateData +} from "../game-instance/probable-waffle/player"; +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; +} + +export interface ProbableWaffleChangeGameModeDto extends GameInstanceDataDto { + gameInstanceId: string; + gameModeData: ProbableWaffleGameModeData; +} + +export interface ProbableWaffleAddPlayerDto extends GameInstanceDataDto { + gameInstanceId: string; + player: { + stateData: ProbableWafflePlayerStateData; + controllerData: ProbableWafflePlayerControllerData; + }; +} + +export interface ProbableWaffleAddSpectatorDto extends GameInstanceDataDto { + gameInstanceId: string; + spectator: { + data: ProbableWaffleSpectatorData; + }; +} + +export interface ProbableWaffleGetRoomsDto { + maps: ProbableWaffleMapEnum[] | null; +} + +export interface ProbableWafflePlayerLeftDto extends GameInstanceDataDto { + gameInstanceId: string; + playerNumber: number; +} + +export interface RequestGameSearchForMatchMakingDto { + mapPoolIds: number[]; + factionType: FactionType | null; +} + +export enum ProbableWaffleGatewayRoomTypes { + ProbableWaffleGameInstance = "probable_waffle_gi_" +} + +export interface PendingMatchmakingGameInstance { + gameInstance: ProbableWaffleGameInstance; + commonMapPoolIds: number[]; +} + +export interface ProbableWaffleGameInstanceSaveData { + saveName: string; + created: number; + gameInstanceData: ProbableWaffleGameInstanceData; +} diff --git a/libs/api-interfaces/src/lib/probable-waffle/probable-waffle-game-mode-lobby.ts b/libs/api-interfaces/src/lib/probable-waffle/probable-waffle-game-mode-lobby.ts new file mode 100644 index 00000000..af6fd2c3 --- /dev/null +++ b/libs/api-interfaces/src/lib/probable-waffle/probable-waffle-game-mode-lobby.ts @@ -0,0 +1,14 @@ +import { ResourceTypeDefinition } from "./resource-type-definition"; + +export interface WinConditions { + timeLimit?: number; +} + +export interface MapTuning { + unitCap?: number; +} + +export interface DifficultyModifiers { + aiAdvantageResources?: Map; + reducedIncome?: number; +} diff --git a/libs/api-interfaces/src/lib/probable-waffle/probable-waffle-player-state-action.ts b/libs/api-interfaces/src/lib/probable-waffle/probable-waffle-player-state-action.ts new file mode 100644 index 00000000..7735e9b9 --- /dev/null +++ b/libs/api-interfaces/src/lib/probable-waffle/probable-waffle-player-state-action.ts @@ -0,0 +1,50 @@ +import { ResourceType } from "./resource-type-definition"; + +export type PlayerStateActionType = + | "unit_produced" + | "unit_killed" + | "building_constructed" + | "building_destroyed" + | "resource_collected" + | "resource_spent"; + +export interface PlayerStateAction { + type: PlayerStateActionType; + time: number; + data: T; +} + +export interface PlayerStateActionUnitProducedData { + unitName: string; +} +export interface PlayerStateActionUnitProduced extends PlayerStateAction {} + +export interface PlayerStateActionUnitKilledData { + unitName: string; + killedPlayerNr: number; +} +export interface PlayerStateActionUnitKilled extends PlayerStateAction {} + +export interface PlayerStateActionBuildingConstructedData { + buildingName: string; +} +export interface PlayerStateActionBuildingConstructed + extends PlayerStateAction {} + +export interface PlayerStateActionBuildingDestroyedData { + buildingName: string; + killedPlayerNr: number; +} +export interface PlayerStateActionBuildingDestroyed extends PlayerStateAction {} + +export interface PlayerStateActionResourceCollectedData { + resourceType: ResourceType; + amount: number; +} +export interface PlayerStateActionResourceCollected extends PlayerStateAction {} + +export interface PlayerStateActionResourceSpentData { + resourceType: ResourceType; + amount: number; +} +export interface PlayerStateActionResourceSpent extends PlayerStateAction {} diff --git a/libs/api-interfaces/src/lib/probable-waffle/probable-waffle.ts b/libs/api-interfaces/src/lib/probable-waffle/probable-waffle.ts new file mode 100644 index 00000000..59d0c986 --- /dev/null +++ b/libs/api-interfaces/src/lib/probable-waffle/probable-waffle.ts @@ -0,0 +1,73 @@ +import { Vector3Simple } from "../game/vector"; + +export enum ProbableWaffleMapEnum { + RiverCrossing = 1, + EmberEnclave = 2 +} + +export type ProbableWaffleMapType = { + [key in ProbableWaffleMapEnum]: ProbableWaffleMapData; +}; + +export type ProbableWaffleMapData = { + id: ProbableWaffleMapEnum; + name: string; + loader: { + mapSceneKey: string; + mapLoaderAssetPackPath: string; + }; + presentation: { + description: string; + imagePath: string; + }; + mapInfo: { + startPositionsOnTile: Vector3Simple[]; + widthTiles: number; + heightTiles: number; + }; +}; + +export const ProbableWaffleLevels: ProbableWaffleMapType = { + [ProbableWaffleMapEnum.RiverCrossing]: { + id: ProbableWaffleMapEnum.RiverCrossing, + name: "River Crossing", + loader: { + mapSceneKey: "MapRiverCrossing", + mapLoaderAssetPackPath: "asset-pack-probable-waffle-river-crossing.json" + }, + presentation: { + description: "Navigate tactical challenges on this battlefield with vital water crossings", + imagePath: "assets/probable-waffle/tilemaps/thumbnails/river_crossing.png" + }, + mapInfo: { + startPositionsOnTile: [ + { x: 10, y: 20, z: 0 }, + { x: 40, y: 40, z: 0 } + ], + widthTiles: 50, + heightTiles: 50 + } + }, + [ProbableWaffleMapEnum.EmberEnclave]: { + id: ProbableWaffleMapEnum.EmberEnclave, + name: "Ember Enclave", + loader: { + mapSceneKey: "MapEmberEnclave", + mapLoaderAssetPackPath: "asset-pack-probable-waffle-ember-enclave.json" + }, + presentation: { + description: + "Unravel the mysteries of this captivating strategic battlefield in the heart of the mystical enclave", + imagePath: "assets/probable-waffle/tilemaps/thumbnails/ember_enclave.png" + }, + mapInfo: { + startPositionsOnTile: [ + { x: 10, y: 20, z: 0 }, + { x: 30, y: 10, z: 0 }, + { x: 35, y: 35, z: 0 } + ], + widthTiles: 50, + heightTiles: 50 + } + } +}; diff --git a/libs/api-interfaces/src/lib/probable-waffle/resource-type-definition.ts b/libs/api-interfaces/src/lib/probable-waffle/resource-type-definition.ts new file mode 100644 index 00000000..d70e56d9 --- /dev/null +++ b/libs/api-interfaces/src/lib/probable-waffle/resource-type-definition.ts @@ -0,0 +1,21 @@ +export class ResourceTypeDefinition { + constructor( + public name: string, + public icon: string, + public color: string + ) {} +} + +export enum ResourceType { + Ambrosia = "ambrosia", + Wood = "wood", + Stone = "stone", + Minerals = "minerals" +} + +export class Resources { + static readonly ambrosia = new ResourceTypeDefinition("Ambrosia", "ambrosia", "gold"); + static readonly wood = new ResourceTypeDefinition("Wood", "wood", "brown"); + static readonly stone = new ResourceTypeDefinition("Stone", "stone", "grey"); + static readonly minerals = new ResourceTypeDefinition("Minerals", "minerals", "blue"); +} diff --git a/libs/api-interfaces/src/lib/user-info/fly-squasher/user-info.ts b/libs/api-interfaces/src/lib/user-info/fly-squasher/user-info.ts index 2d5fe539..691c5ca5 100644 --- a/libs/api-interfaces/src/lib/user-info/fly-squasher/user-info.ts +++ b/libs/api-interfaces/src/lib/user-info/fly-squasher/user-info.ts @@ -1,3 +1,3 @@ -import { BaseUserInfo } from '../user-info'; +import { BaseUserInfo } from "../user-info"; export class FlySquasherUserInfo extends BaseUserInfo {} diff --git a/libs/api-interfaces/src/lib/user-info/little-muncher/user-info.ts b/libs/api-interfaces/src/lib/user-info/little-muncher/user-info.ts index 3dcd88ee..923d5fac 100644 --- a/libs/api-interfaces/src/lib/user-info/little-muncher/user-info.ts +++ b/libs/api-interfaces/src/lib/user-info/little-muncher/user-info.ts @@ -1,3 +1,3 @@ -import {BaseUserInfo} from "../user-info"; +import { BaseUserInfo } from "../user-info"; export class LittleMuncherUserInfo extends BaseUserInfo {} 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 new file mode 100644 index 00000000..de95ca2c --- /dev/null +++ b/libs/api-interfaces/src/lib/user-info/probable-waffle/user-info.ts @@ -0,0 +1,9 @@ +import { BaseUserInfo } from "../user-info"; + +export class ProbableWaffleUserInfo extends BaseUserInfo { + playerNumber?: number; + constructor(userId: string | null, playerNumber?: number) { + super(userId); + this.playerNumber = playerNumber; + } +} diff --git a/libs/api-interfaces/src/lib/uuid.ts b/libs/api-interfaces/src/lib/uuid.ts index b15a7ff2..c0b8c9a9 100644 --- a/libs/api-interfaces/src/lib/uuid.ts +++ b/libs/api-interfaces/src/lib/uuid.ts @@ -14,8 +14,8 @@ export class Guid { */ private generateUUID = () => { let d = new Date().getTime(), - d2 = (typeof performance !== 'undefined' && performance.now && performance.now() * 1000) || 0; - return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => { + d2 = (typeof performance !== "undefined" && performance.now && performance.now() * 1000) || 0; + return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => { let r = Math.random() * 16; if (d > 0) { r = (d + r) % 16 | 0; @@ -24,7 +24,7 @@ export class Guid { r = (d2 + r) % 16 | 0; d2 = Math.floor(d2 / 16); } - return (c == 'x' ? r : (r & 0x7) | 0x8).toString(16); + return (c == "x" ? r : (r & 0x7) | 0x8).toString(16); }); }; } diff --git a/libs/api-interfaces/src/little-muncher.ts b/libs/api-interfaces/src/little-muncher.ts new file mode 100644 index 00000000..60d40c8a --- /dev/null +++ b/libs/api-interfaces/src/little-muncher.ts @@ -0,0 +1,10 @@ +export * from "./lib/little-muncher/little-muncher"; +export * from "./lib/communicators/little-muncher/communicators"; +export * from "./lib/game-instance/little-muncher/game-instance"; +export * from "./lib/game-instance/little-muncher/data"; +export * from "./lib/game-instance/little-muncher/game-mode"; +export * from "./lib/game-instance/little-muncher/game-state"; +export * from "./lib/game-instance/little-muncher/player"; +export * from "./lib/game-instance/little-muncher/game-instance-medatada"; +export * from "./lib/game-instance/little-muncher/spectator"; +export * from "./lib/user-info/little-muncher/user-info"; diff --git a/libs/api-interfaces/src/probable-waffle.ts b/libs/api-interfaces/src/probable-waffle.ts new file mode 100644 index 00000000..a53ad5c4 --- /dev/null +++ b/libs/api-interfaces/src/probable-waffle.ts @@ -0,0 +1,16 @@ +export * from "./lib/communicators/probable-waffle/communicators"; +export * from "./lib/communicators/probable-waffle/communicator-game-events"; +export * from "./lib/communicators/probable-waffle/listeners"; +export * from "./lib/user-info/probable-waffle/user-info"; +export * from "./lib/game-instance/probable-waffle/game-instance"; +export * from "./lib/game-instance/probable-waffle/game-mode"; +export * from "./lib/game-instance/probable-waffle/game-state"; +export * from "./lib/game-instance/probable-waffle/player"; +export * from "./lib/game-instance/probable-waffle/game-instance-medatada"; +export * from "./lib/game-instance/probable-waffle/spectator"; +export * from "./lib/probable-waffle/probable-waffle"; +export * from "./lib/probable-waffle/probable-waffle-game-mode-lobby"; +export * from "./lib/probable-waffle/probable-waffle-player-state-action"; +export * from "./lib/probable-waffle/resource-type-definition"; +export * from "./lib/probable-waffle/probable-waffle-api"; +export * from "./lib/probable-waffle/game-setup.helpers"; diff --git a/package.json b/package.json index 00fa3898..b78dce77 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,6 @@ "@nestjs/platform-express": "10.2.8", "@nestjs/platform-socket.io": "^10.2.8", "@nestjs/schedule": "^4.0.0", - "@nestjs/swagger": "7.1.15", "@nestjs/throttler": "^5.0.1", "@nestjs/websockets": "^10.2.8", "@ng-bootstrap/ng-bootstrap": "^15.1.2", @@ -78,10 +77,12 @@ "@supabase/supabase-js": "^2.38.4", "@types/cron": "^2.0.1", "bootstrap": "^5.3.2", + "chart.js": "^4.4.1", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "easystarjs": "^0.4.4", "helmet": "^7.1.0", + "ng2-charts": "^5.0.4", "ngx-socket-io": "^4.6.1", "node-cache": "^5.1.2", "passport": "^0.6.0", @@ -93,6 +94,7 @@ "profanity-cleaner": "^0.0.3", "reflect-metadata": "^0.1.13", "rxjs": "^7.8.1", + "socket.io": "^4.7.2", "tslib": "^2.6.2", "zone.js": "0.14.2" }, @@ -105,6 +107,7 @@ "@angular/compiler-cli": "17.0.1", "@angular/language-service": "17.0.1", "@nestjs/schematics": "10.0.3", + "@nestjs/swagger": "7.1.15", "@nestjs/testing": "10.2.8", "@nx/cypress": "17.1.1", "@nx/eslint-plugin": "17.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0aadb3b8..88ff425c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -89,9 +89,6 @@ importers: '@nestjs/schedule': specifier: ^4.0.0 version: 4.0.0(@nestjs/common@10.2.8)(@nestjs/core@10.2.8)(reflect-metadata@0.1.13) - '@nestjs/swagger': - specifier: 7.1.15 - version: 7.1.15(@nestjs/common@10.2.8)(@nestjs/core@10.2.8)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13) '@nestjs/throttler': specifier: ^5.0.1 version: 5.0.1(@nestjs/common@10.2.8)(@nestjs/core@10.2.8)(reflect-metadata@0.1.13) @@ -119,6 +116,9 @@ importers: bootstrap: specifier: ^5.3.2 version: 5.3.2(@popperjs/core@2.11.8) + chart.js: + specifier: ^4.4.1 + version: 4.4.1 class-transformer: specifier: ^0.5.1 version: 0.5.1 @@ -131,6 +131,9 @@ importers: helmet: specifier: ^7.1.0 version: 7.1.0 + ng2-charts: + specifier: ^5.0.4 + version: 5.0.4(@angular/cdk@17.0.4)(@angular/common@17.0.1)(@angular/core@17.0.1)(@angular/platform-browser@17.0.1)(chart.js@4.4.1)(rxjs@7.8.1) ngx-socket-io: specifier: ^4.6.1 version: 4.6.1(@angular/common@17.0.1)(@angular/core@17.0.1)(rxjs@7.8.1) @@ -164,6 +167,9 @@ importers: rxjs: specifier: ^7.8.1 version: 7.8.1 + socket.io: + specifier: ^4.7.2 + version: 4.7.2 tslib: specifier: ^2.6.2 version: 2.6.2 @@ -195,6 +201,9 @@ importers: '@nestjs/schematics': specifier: 10.0.3 version: 10.0.3(typescript@5.2.2) + '@nestjs/swagger': + specifier: 7.1.15 + version: 7.1.15(@nestjs/common@10.2.8)(@nestjs/core@10.2.8)(class-transformer@0.5.1)(class-validator@0.14.0)(reflect-metadata@0.1.13) '@nestjs/testing': specifier: 10.2.8 version: 10.2.8(@nestjs/common@10.2.8)(@nestjs/core@10.2.8)(@nestjs/platform-express@10.2.8) @@ -625,6 +634,21 @@ packages: '@angular/core': 17.0.1(rxjs@7.8.1)(zone.js@0.14.2) tslib: 2.6.2 + /@angular/cdk@17.0.4(@angular/common@17.0.1)(@angular/core@17.0.1)(rxjs@7.8.1): + resolution: {integrity: sha512-mh/EuIR0NPfpNqAXBSZWuJeBMXUvUDYdKhiFWZet5NLO1bDgFe1MGLBjtW4us95k4BZsMLbCKNxJgc+4JqwUvg==} + peerDependencies: + '@angular/common': ^17.0.0 || ^18.0.0 + '@angular/core': ^17.0.0 || ^18.0.0 + rxjs: ^6.5.3 || ^7.4.0 + dependencies: + '@angular/common': 17.0.1(@angular/core@17.0.1)(rxjs@7.8.1) + '@angular/core': 17.0.1(rxjs@7.8.1)(zone.js@0.14.2) + rxjs: 7.8.1 + tslib: 2.6.2 + optionalDependencies: + parse5: 7.1.2 + dev: false + /@angular/cli@17.0.0: resolution: {integrity: sha512-VzKYmN+1wSE2wLBEFu/NHSrRQbeaKkEDO9aZxd7nAnxC5T1Zcva7dfqZIXMHXH2HESYAZCvOS8ikBE/7DCtWWw==} engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} @@ -3435,6 +3459,10 @@ packages: '@jridgewell/resolve-uri': 3.1.0 '@jridgewell/sourcemap-codec': 1.4.14 + /@kurkle/color@0.3.2: + resolution: {integrity: sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==} + dev: false + /@leichtgewicht/ip-codec@2.0.4: resolution: {integrity: sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==} @@ -3607,7 +3635,7 @@ packages: class-transformer: 0.5.1 class-validator: 0.14.0 reflect-metadata: 0.1.13 - dev: false + dev: true /@nestjs/passport@10.0.2(@nestjs/common@10.2.8)(passport@0.6.0): resolution: {integrity: sha512-od31vfB2z3y05IDB5dWSbCGE2+pAf2k2WCBinNuTTOxN0O0+wtO1L3kawj/aCW3YR9uxsTOVbTDwtwgpNNsnjQ==} @@ -3722,7 +3750,7 @@ packages: path-to-regexp: 3.2.0 reflect-metadata: 0.1.13 swagger-ui-dist: 5.9.1 - dev: false + dev: true /@nestjs/testing@10.2.8(@nestjs/common@10.2.8)(@nestjs/core@10.2.8)(@nestjs/platform-express@10.2.8): resolution: {integrity: sha512-9Kj5IQhM67/nj/MT6Wi2OmWr5YQnCMptwKVFrX1TDaikpY12196v7frk0jVjdT7wms7rV07GZle9I2z0aSjqtQ==} @@ -6024,7 +6052,7 @@ packages: serve-index: 1.9.1 serve-static: 1.13.2 server-destroy: 1.0.1 - socket.io: 4.7.1 + socket.io: 4.7.2 ua-parser-js: 1.0.37 yargs: 17.7.2 transitivePeerDependencies: @@ -6190,6 +6218,13 @@ packages: resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==} dev: false + /chart.js@4.4.1: + resolution: {integrity: sha512-C74QN1bxwV1v2PEujhmKjOZ7iUM4w6BWs23Md/6aOZZSlwMzeCIDGuZay++rBgChYru7/+QFeoQW0fQoP534Dg==} + engines: {pnpm: '>=7'} + dependencies: + '@kurkle/color': 0.3.2 + dev: false + /check-more-types@2.24.0: resolution: {integrity: sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==} engines: {node: '>= 0.8.0'} @@ -7198,33 +7233,10 @@ packages: resolution: {integrity: sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==} engines: {node: '>=10.0.0'} - /engine.io-parser@5.1.0: - resolution: {integrity: sha512-enySgNiK5tyZFynt3z7iqBR+Bto9EVVVvDFuTT0ioHCGbzirZVGDGiQjZzEp8hWl6hd5FSVytJGuScX1C1C35w==} - engines: {node: '>=10.0.0'} - /engine.io-parser@5.2.1: resolution: {integrity: sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==} engines: {node: '>=10.0.0'} - /engine.io@6.5.1: - resolution: {integrity: sha512-mGqhI+D7YxS9KJMppR6Iuo37Ed3abhU8NdfgSvJSDUafQutrN+sPTncJYTyM9+tkhSmWodKtVYGPPHyXJEwEQA==} - engines: {node: '>=10.0.0'} - dependencies: - '@types/cookie': 0.4.1 - '@types/cors': 2.8.13 - '@types/node': 20.9.0 - accepts: 1.3.8 - base64id: 2.0.0 - cookie: 0.4.2 - cors: 2.8.5 - debug: 4.3.4(supports-color@8.1.1) - engine.io-parser: 5.1.0 - ws: 8.11.0 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - /engine.io@6.5.4: resolution: {integrity: sha512-KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg==} engines: {node: '>=10.2.0'} @@ -9943,6 +9955,10 @@ packages: dependencies: p-locate: 6.0.0 + /lodash-es@4.17.21: + resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} + dev: false + /lodash.camelcase@4.3.0: resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==} dev: true @@ -10379,6 +10395,26 @@ packages: resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==} dev: false + /ng2-charts@5.0.4(@angular/cdk@17.0.4)(@angular/common@17.0.1)(@angular/core@17.0.1)(@angular/platform-browser@17.0.1)(chart.js@4.4.1)(rxjs@7.8.1): + resolution: {integrity: sha512-AnOZ2KSRw7QjiMMNtXz9tdnO+XrIKP/2MX1TfqEEo2fwFU5c8LFJIYqmkMPkIzAEm/U9y/1psA5TDNmxxjEdgA==} + peerDependencies: + '@angular/cdk': '>=16.0.0' + '@angular/common': '>=16.0.0' + '@angular/core': '>=16.0.0' + '@angular/platform-browser': '>=16.0.0' + chart.js: ^3.4.0 || ^4.0.0 + rxjs: ^6.5.3 || ^7.4.0 + dependencies: + '@angular/cdk': 17.0.4(@angular/common@17.0.1)(@angular/core@17.0.1)(rxjs@7.8.1) + '@angular/common': 17.0.1(@angular/core@17.0.1)(rxjs@7.8.1) + '@angular/core': 17.0.1(rxjs@7.8.1)(zone.js@0.14.2) + '@angular/platform-browser': 17.0.1(@angular/animations@17.0.1)(@angular/common@17.0.1)(@angular/core@17.0.1) + chart.js: 4.4.1 + lodash-es: 4.17.21 + rxjs: 7.8.1 + tslib: 2.6.2 + dev: false + /ngx-socket-io@4.6.1(@angular/common@17.0.1)(@angular/core@17.0.1)(rxjs@7.8.1): resolution: {integrity: sha512-R8Ja/f9Kj+SOLk8WH+uwKrpaoTwiW5/DXmSpBKfzy7SzfoUUxQSCzVGJ4PZ20UfqsT1KKhF3kqqsxWdkPWliLQ==} peerDependencies: @@ -11012,7 +11048,7 @@ packages: dev: false /phasereditor2d-launcher@3.65.0: - resolution: { integrity: sha512-2ucHdBN+3lSHDyZsRc6EIPURhIhAhyIIHVwRBAIIFs8WscLtN3U6b5MpuEEnW7KKaueAwSV0/5GsC8vvFQzHlQ== } + resolution: {integrity: sha512-2ucHdBN+3lSHDyZsRc6EIPURhIhAhyIIHVwRBAIIFs8WscLtN3U6b5MpuEEnW7KKaueAwSV0/5GsC8vvFQzHlQ==} hasBin: true dependencies: adm-zip: 0.5.10 @@ -12162,22 +12198,6 @@ packages: transitivePeerDependencies: - supports-color - /socket.io@4.7.1: - resolution: {integrity: sha512-W+utHys2w//dhFjy7iQQu9sGd3eokCjGbl2r59tyLqNiJJBdIebn3GAKEXBr3osqHTObJi2die/25bCx2zsaaw==} - engines: {node: '>=10.0.0'} - dependencies: - accepts: 1.3.8 - base64id: 2.0.0 - cors: 2.8.5 - debug: 4.3.4(supports-color@8.1.1) - engine.io: 6.5.1 - socket.io-adapter: 2.5.2 - socket.io-parser: 4.2.4 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - /socket.io@4.7.2: resolution: {integrity: sha512-bvKVS29/I5fl2FGLNHuXlQaUH/BlzX1IN6S+NKLNZpBsPZIDH+90eQmCs2Railn4YUiww4SzUedJ6+uzwFnKLw==} engines: {node: '>=10.2.0'} @@ -12555,7 +12575,7 @@ packages: /swagger-ui-dist@5.9.1: resolution: {integrity: sha512-5zAx+hUwJb9T3EAntc7TqYkV716CMqG6sZpNlAAMOMWkNXRYxGkN8ADIvD55dQZ10LxN90ZM/TQmN7y1gpICnw==} - dev: false + dev: true /symbol-observable@1.2.0: resolution: {integrity: sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==}