jonas/4Gewinnt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Game Logic in Frontend

Browse Source
This commit is contained in:
jhim
2026-03-07 14:05:28 +01:00
committed by Jonas
parent 34f683854b
commit 919bb71f19
8 changed files with 148 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
API/Models/Game/GameField.cs
-10
View File
@@ -4,17 +4,7 @@ namespace API.Models.Game;
public readonly struct Coordinates
{
[JsonConstructor]
public Coordinates(int x, int y)
{
X = x;
Y = y;
}
[JsonPropertyName("x")]
public int X { get; init; }
[JsonPropertyName("y")]
public int Y { get; init; }
}
API/Services/GameManager/GameManager.cs
+2
View File
@@ -69,6 +69,8 @@ public class GameManager(IGameRepository gameRepository, IHubContext<GameHubSock
if(game.CurrentTurn != player.PlayerTag)
return;
if(game.State != GameState.Running) return;
var result = game.Field.Drop(column, player.PlayerTag);
if (result != DropResult.Placed)
GUI/src/components/GameEndedMenu.vue
+41
View File
@@ -0,0 +1,41 @@
<script setup lang="ts">
import { computed } from 'vue'
import type { GameEnded } from '@/scripts/logic/signalR/GameConnection'
const props = defineProps<{ gameEndedInformation: GameEnded | null }>()
const message = computed(() => {
switch (props.gameEndedInformation?.method) {
case "PlayerDisconnected":
return `Bei Spieler ${props.gameEndedInformation.player?.name} ist die Verbindung abgebrochen`
case "Draw":
return "Das Spielfeld ist voll und es ist ein Unentschieden"
case "Win":
return `Spieler ${props.gameEndedInformation.player?.name} hat gewonnen!`
default:
return ""
}
})
</script>
<template>
<v-sheet width="100%" class="text-centered pa-2 w-75" rounded>
<h1 class="text-center">Spiel Beendet</h1>
<h3 class="test-center">{{ message }}</h3>
<v-divider class="mb-4"></v-divider>
<div class="d-flex align-center justify-space-evenly ma-4 w-100">
<v-btn color="red" @click="$router.push('/')" rounded="xl">
Abbrechen
</v-btn>
<v-btn color="primary" @click="$emit('createGame')" rounded="xl">
Spiel Starten
</v-btn>
</div>
</v-sheet>
</template>
<style scoped>
.settingsCat {
margin-top: 5px;
}
</style>
GUI/src/components/game/Field.vue
+5 -3
View File
@@ -76,8 +76,8 @@ function selectionUpdate(index: number, active: boolean) {
<style scoped>
.game-container {
height: calc(100dvh - var(--v-layout-top));
width: 100%;
height: 100%;
overflow: hidden;
display: flex;
align-items: center;
@@ -87,8 +87,10 @@ function selectionUpdate(index: number, active: boolean) {
.game-cell {
--cols: v-bind('gameFieldSize.x || 7');
--rows: v-bind('gameFieldSize.y || 6');
width: min(calc(85vw / var(--cols)), calc((100dvh - var(--v-layout-top)) * 0.85 / var(--rows)));
height: min(calc(85vw / var(--cols)), calc((100dvh - var(--v-layout-top)) * 0.85 / var(--rows)));
width: min(calc(80vw / var(--cols)), calc(75dvh / (var(--rows) + 1)));
height: min(calc(80vw / var(--cols)), calc(75dvh / (var(--rows) + 1)));
flex: 0 0 auto;
user-select: none;
}
GUI/src/components/game/InfoField.vue
+14
View File
@@ -0,0 +1,14 @@
<script setup lang="ts">
const props = defineProps<{ msg: string, currenlyWaiting?: boolean }>()
</script>
<template>
<h1 v-if="!currenlyWaiting || currenlyWaiting == null">{{msg}}</h1>
</template>
<style scoped>
#infoField {
width: min(50vw, 700px);
text-align: center;
}
</style>
GUI/src/routes/LocalMode.vue
+44 -12
View File
@@ -4,10 +4,14 @@ import GameCreationMenu from '@/components/GameCreationMenu.vue';
import type { GameSettings } from '@/scripts/interfaces/GameSettings';
import LocalGame from '@/scripts/logic/localMode/LocalGame';
import Field from '@/components/game/Field.vue';
import InfoField from '@/components/game/InfoField.vue';
import type { GameEnded } from '@/scripts/logic/signalR/GameConnection';
import GameEndedMenu from '@/components/GameEndedMenu.vue';
enum CurrentState {
CreatingGame,
Game,
EndScreen,
}
let settings = ref<GameSettings>({
@@ -20,32 +24,60 @@ var currentState = ref<CurrentState>(CurrentState.CreatingGame);
const game = ref<LocalGame>(new LocalGame(settings.value));
const gameField = ref<number[][]>([]);
const currentSelectionIndex = ref<number | null>(null);
const gameEndedInformation = ref<GameEnded | null>(null);
game.value.onGameStateChanged = (gameState) => {
gameField.value = gameState?.currentField ?? [];
};
game.value.onGameEnded = (gameEndedInfo) => {
gameEndedInformation.value = gameEndedInfo;
currentState.value = CurrentState.EndScreen;
}
async function startGame() {
await game.value.start();
await game.value.start(settings.value);
currentState.value = CurrentState.Game;
}
</script>
<template>
<v-container
class="d-flex align-center justify-center fill-height"
v-if="currentState === CurrentState.CreatingGame"
>
<v-container class="d-flex align-center justify-center fill-height" v-if="currentState === CurrentState.CreatingGame">
<GameCreationMenu v-model:settings="settings" @create-game="startGame()" />
</v-container>
<Field
v-else
:game-state="gameField"
v-model:current-selection-index="currentSelectionIndex"
@click-on-game-field="game.drop(currentSelectionIndex ?? 1)"
/>
<v-container class="d-flex align-center justify-center fill-height"
v-else-if="currentState === CurrentState.EndScreen">
<GameEndedMenu :game-ended-information="gameEndedInformation"></GameEndedMenu>
</v-container>
<div id="game" v-else>
<div class="game-content">
<Field :game-state="gameField" v-model:current-selection-index="currentSelectionIndex"
@click-on-game-field="game.drop(currentSelectionIndex ?? 1)" />
<InfoField :msg="game.currentDescription"></InfoField>
</div>
</div>
</template>
<style scoped></style>
<style scoped>
#game {
width: 100%;
min-height: calc(100dvh - var(--v-layout-top));
display: flex;
justify-content: center;
align-items: center;
padding: 16px;
box-sizing: border-box;
}
.game-content {
display: flex;
flex-direction: column;
align-items: center;
gap: 16px;
width: 100%;
}
</style>
GUI/src/scripts/logic/localMode/LocalGame.ts
+29 -16
View File
@@ -2,33 +2,34 @@ import type { GameSettings } from '@/scripts/interfaces/GameSettings';
import GameConnection, {
type GameIdentifier,
type GameInformationDto,
type GameEnded,
} from '../signalR/GameConnection';
class LocalGame {
public _settings: GameSettings;
public player1: GameConnection;
public player2: GameConnection;
public currentDescription: string = 'Warte auf Spielaufbau...';
private gameId: string = '';
public gameState: GameInformationDto | undefined;
public onGameStateChanged?: (gameState: GameInformationDto | undefined) => void;
public onGameEnded?: (gameEndedInfo: GameEnded) => void;
constructor(settings: GameSettings) {
this._settings = settings;
this.player1 = new GameConnection(settings.playerName1);
this.player2 = new GameConnection(settings.playerName2 ?? 'Player 2');
this.player1 = new GameConnection();
this.player2 = new GameConnection();
this.player1.onGameStarted = (gameInfo: GameInformationDto) => {
console.log('Game started for player 1', gameInfo);
this.updateState(gameInfo);
this.gameState = gameInfo;
this.onGameStateChanged?.(this.gameState);
this.changePlaceDescription();
};
this.player1.onFieldUpdated = (currentState: GameInformationDto) => {
if (this.gameState) {
this.gameState = currentState;
this.onGameStateChanged?.(this.gameState);
}
this.updateState(currentState);
this.changePlaceDescription();
};
this.player1.onGameCreated = (gameIdentifier: GameIdentifier) => {
@@ -39,19 +40,25 @@ class LocalGame {
this.player2.onGameJoined = (gameIdentifier: GameIdentifier) => {
this.gameId = gameIdentifier.gameId;
};
this.player1.onGameEnded = (gameEndedInfo: GameEnded) => {
this.onGameEnded?.(gameEndedInfo);
};
}
async start() {
await this.player1.connect();
await this.player2.connect();
async start(settings: GameSettings) {
await this.player1.connect(settings.playerName1);
await this.player2.connect(settings.playerName2 ?? 'Spieler 2');
await this.player1.createGame(this._settings.fieldSize);
await this.player1.createGame(settings.fieldSize);
}
async updateState(gameInfo: GameInformationDto) {
this.gameState = gameInfo;
async updateState(newState: GameInformationDto) {
if (this.gameState) {
this.gameState = newState;
this.onGameStateChanged?.(this.gameState);
}
}
async drop(index: number) {
if (this.gameState?.currentTurn == 1) {
@@ -60,6 +67,12 @@ class LocalGame {
this.player2.drop(this.gameId, index);
}
}
changePlaceDescription() {
const playerName =
this.gameState?.currentTurn == 1 ? this.player1.playerName : this.player2.playerName;
this.currentDescription = `${playerName} ist dran mit setzen!`;
}
}
export default LocalGame;
GUI/src/scripts/logic/signalR/GameConnection.ts
+8 -8
View File
@@ -15,8 +15,8 @@ export interface Player {
playerTag: number;
}
export interface GameEndedDto {
method: string,
export interface GameEnded {
method: string;
player?: Player | null;
}
@@ -27,19 +27,18 @@ export interface GameIdentifier{
class GameConnection {
private connection: signalR.HubConnection;
public playerName: string;
public playerName: string = 'Spieler';
public onGameCreated?: (gameIdentifier: GameIdentifier) => void;
public onGameJoined?: (gameIdentifier: GameIdentifier) => void;
public onGameStarted?: (gameInfo: GameInformationDto) => void;
public onGameInformation?: (gameInfo: GameInformationDto) => void;
public onFieldUpdated?: (currentField: GameInformationDto) => void;
public onGameEnded?: (gameEndedInfo: GameEndedDto) => void;
public onGameEnded?: (gameEndedInfo: GameEnded) => void;
public onError?: (error: string) => void;
public onGameDestroyed?: () => void;
constructor(playerName: string) {
this.playerName = playerName;
constructor() {
this.connection = new signalR.HubConnectionBuilder()
.withUrl('/api/gamehub')
.withAutomaticReconnect()
@@ -65,7 +64,7 @@ class GameConnection {
this.onFieldUpdated?.(payload);
});
this.connection.on('GameEnded', (payload: GameEndedDto) => {
this.connection.on('GameEnded', (payload: GameEnded) => {
this.onGameEnded?.(payload);
});
@@ -78,7 +77,8 @@ class GameConnection {
});
}
async connect() {
async connect(playerName: string) {
this.playerName = playerName;
await this.connection.start();
console.log('Connected');
}