remove mini-game from main app.component

baloise-incubator · Oct 19, 2023 · 920b608 · 920b608
1 parent 51d27c1
commit 920b608
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 22 deletions.
diff --git a/angular-frontend/src/app/app.component.html b/angular-frontend/src/app/app.component.html
@@ -1,6 +1,5 @@
 <bal-app class="has-sticky-footer" style="position: relative;" (mousemove)="mouseMoved($event)">
   <bal-icon *ngFor="let cursor of cursors" name="edit" style="z-index: 1000; position: absolute;" [ngStyle]="{'top': cursor.posY + 'px', 'left': cursor.posX + 'px'}" [color]="cursor.color"></bal-icon>
-  <bal-icon *ngFor="let char of characters" name="account" style="z-index: 1000; position: absolute;" [ngStyle]="{'top': char.posY + 'px', 'left': char.posX + 'px'}" [color]="char.color"></bal-icon>
   <header>
     <!-- Header content -->
     <bal-navbar interface="app">

diff --git a/angular-frontend/src/app/app.component.ts b/angular-frontend/src/app/app.component.ts
@@ -18,9 +18,6 @@ export class AppComponent implements OnDestroy {
   cursors: Cursor[] = [];
   inventories?: Inventory[];
 
-  // Game stuff
-  characters: Character[] = []
-
   constructor() {
     this.httpService = new HttpService();
     this.client = new Client();
@@ -42,8 +39,6 @@ export class AppComponent implements OnDestroy {
       this.client.subscribe("/topic/cursor", (payload => this.updateCursors(JSON.parse(payload.body))));
       this.client.subscribe("/app/inventory", (payload => this.updateInventory(JSON.parse(payload.body))));
       this.client.subscribe("/topic/inventory", (payload => this.updateInventory(JSON.parse(payload.body))));
-      this.client.subscribe("/topic/game/character", (payload => this.updateCharacter(JSON.parse(payload.body))))
-      this.client.subscribe("/topic/game/character_removal", (payload => this.removeCharacter(JSON.parse(payload.body))))
     };
 
     this.client.onWebSocketError = (error) => {
@@ -147,17 +142,4 @@ export class AppComponent implements OnDestroy {
     });
   }
 
-  updateCharacter(character : Character) {
-    const characterIndexToUpdate  = this.characters.findIndex((char) => char.name === character.name);
-
-    if (characterIndexToUpdate === -1) {
-      this.characters.push(character);
-    } else {
-      this.characters[characterIndexToUpdate] = character;
-    }
-  }
-
-  removeCharacter(character : Character) {
-      this.characters = this.characters.filter(char => char.name != character.name)
-  }
 }
diff --git a/angular-frontend/src/app/components/game/game.component.html b/angular-frontend/src/app/components/game/game.component.html
@@ -1,3 +1,4 @@
+<bal-icon *ngFor="let char of characters" name="account" style="z-index: 1000; position: absolute;" [ngStyle]="{'top': char.posY + 'px', 'left': char.posX + 'px'}" [color]="char.color"></bal-icon>
 <bal-card class="mt-medium">
   <bal-card-content class="is-flex fg-small">
     <bal-heading level="medium">Mini-Game</bal-heading>

diff --git a/angular-frontend/src/app/components/game/game.component.ts b/angular-frontend/src/app/components/game/game.component.ts
@@ -1,6 +1,7 @@
 import {Component, HostListener, Input, OnDestroy, OnInit} from '@angular/core';
 
 import { Client } from '@stomp/stompjs';
+import {Character} from "../../../model";
 
 @Component({
   selector: 'app-game',
@@ -14,9 +15,13 @@ export class GameComponent implements OnInit, OnDestroy {
 
   connected : boolean = false;
 
+  // Game stuff
+  characters: Character[] = [];
+
   ngOnInit(): void {
     if (this.client.connected) {
-      //this.client.subscribe("/topic/chat", payload => this.addMessage(payload));
+      this.client.subscribe("/topic/game/character", (payload => this.updateCharacter(JSON.parse(payload.body))))
+      this.client.subscribe("/topic/game/character_removal", (payload => this.removeCharacter(JSON.parse(payload.body))))
     }
   }
 
@@ -71,4 +76,18 @@ export class GameComponent implements OnInit, OnDestroy {
 
   }
 
+  updateCharacter(character : Character) {
+    const characterIndexToUpdate  = this.characters.findIndex((char) => char.name === character.name);
+    console.log("Character update");
+    if (characterIndexToUpdate === -1) {
+      this.characters.push(character);
+    } else {
+      this.characters[characterIndexToUpdate] = character;
+    }
+  }
+
+  removeCharacter(character : Character) {
+    this.characters = this.characters.filter(char => char.name != character.name)
+  }
+
 }
diff --git a/spring-backend/src/main/java/com/baloise/collab/springbackend/game/CharacterController.java b/spring-backend/src/main/java/com/baloise/collab/springbackend/game/CharacterController.java
@@ -22,8 +22,8 @@ public class CharacterController {
 
     private final SimpMessagingTemplate messageSender;
 
-    private final int spawnX = 500;
-    private final int spawnY = 500;
+    private final int spawnX = 0;
+    private final int spawnY = 0;
 
     public CharacterDTO createCharacterForUser(UserDTO user) {
         var characterForUser = getActiveCharacterForName(user.name());