Compare commits

..

No commits in common. "trunk" and "v0.0.0-rc.8" have entirely different histories.

7 changed files with 10 additions and 72 deletions

View file

@ -1,6 +1,5 @@
package de.towerdefence.server.match; package de.towerdefence.server.match;
import de.towerdefence.server.match.callbacks.PlayerHitpointsCallback;
import de.towerdefence.server.match.callbacks.PlayerMoneyCallback; import de.towerdefence.server.match.callbacks.PlayerMoneyCallback;
import de.towerdefence.server.match.exeptions.InvalidPlacementException; import de.towerdefence.server.match.exeptions.InvalidPlacementException;
import de.towerdefence.server.match.exeptions.InvalidPlacementReason; import de.towerdefence.server.match.exeptions.InvalidPlacementReason;
@ -8,7 +7,6 @@ import de.towerdefence.server.player.Player;
import lombok.Getter; import lombok.Getter;
public class GameSession { public class GameSession {
final static int START_HITPOINTS = 100;
final static int START_MONEY = 50; final static int START_MONEY = 50;
final static int MAP_SIZE_X = 10; final static int MAP_SIZE_X = 10;
final static int MAP_SIZE_Y = 20; final static int MAP_SIZE_Y = 20;
@ -18,18 +16,12 @@ public class GameSession {
private final Player player; private final Player player;
@Getter @Getter
private int money; private int money;
@Getter
private int playerHitpoints;
private final PlayerMoneyCallback moneyCallback; private final PlayerMoneyCallback moneyCallback;
//private final PlayerHitpointsCallback hitpointsCallback;
public GameSession(Player player, PlayerMoneyCallback moneyCallback) { public GameSession(Player player, PlayerMoneyCallback moneyCallback) {
this.player = player; this.player = player;
this.moneyCallback = moneyCallback; this.moneyCallback = moneyCallback;
//this.hitpointsCallback = hitpointsCallback;
this.money = START_MONEY; this.money = START_MONEY;
this.playerHitpoints = START_HITPOINTS;
} }
public void placeTower(Tower tower, int x, int y) throws InvalidPlacementException { public void placeTower(Tower tower, int x, int y) throws InvalidPlacementException {
@ -49,6 +41,5 @@ public class GameSession {
public void addMoney(int amount) { public void addMoney(int amount) {
money += amount; money += amount;
moneyCallback.call(player, money);
} }
} }

View file

@ -1,6 +1,5 @@
package de.towerdefence.server.match; package de.towerdefence.server.match;
import de.towerdefence.server.match.callbacks.PlayerHitpointsCallback;
import de.towerdefence.server.match.callbacks.PlayerMoneyCallback; import de.towerdefence.server.match.callbacks.PlayerMoneyCallback;
import de.towerdefence.server.player.Player; import de.towerdefence.server.player.Player;
import lombok.Getter; import lombok.Getter;
@ -48,11 +47,7 @@ public class Match {
} }
public void connectPlayer( public void connectPlayer(Player player, PlayerMoneyCallback moneyCallback) {
Player player,
PlayerMoneyCallback moneyCallback,
PlayerHitpointsCallback hitpointsCallback
) {
boolean isPlayer1 = player1.equals(player); boolean isPlayer1 = player1.equals(player);
boolean isPlayer2 = player2.equals(player); boolean isPlayer2 = player2.equals(player);
if (!isPlayer1 && !isPlayer2) { if (!isPlayer1 && !isPlayer2) {

View file

@ -1,6 +1,5 @@
package de.towerdefence.server.match; package de.towerdefence.server.match;
import de.towerdefence.server.match.callbacks.PlayerHitpointsCallback;
import de.towerdefence.server.match.callbacks.PlayerMoneyCallback; import de.towerdefence.server.match.callbacks.PlayerMoneyCallback;
import de.towerdefence.server.match.exeptions.InvalidPlacementException; import de.towerdefence.server.match.exeptions.InvalidPlacementException;
import de.towerdefence.server.match.exeptions.InvalidPlacementReason; import de.towerdefence.server.match.exeptions.InvalidPlacementReason;
@ -49,20 +48,15 @@ public class MatchService {
return opponent.get(); return opponent.get();
} }
public void playerConnected( public void playerConnected(Player player, PlayerMoneyCallback moneyCallback) {
Player player,
PlayerMoneyCallback moneyCallback,
PlayerHitpointsCallback hitpointsCallback
) {
Match match = playerMatches.get(player); Match match = playerMatches.get(player);
match.connectPlayer(player, moneyCallback, hitpointsCallback); match.connectPlayer(player, moneyCallback);
Optional<GameSession> optionalPlayerSession = match.getPlayerGameSession(player); Optional<GameSession> optionalPlayerSession = match.getPlayerGameSession(player);
if (optionalPlayerSession.isEmpty()) { if (optionalPlayerSession.isEmpty()) {
return; return;
} }
GameSession playerSession = optionalPlayerSession.get(); GameSession playerSession = optionalPlayerSession.get();
moneyCallback.call(player, playerSession.getMoney()); moneyCallback.call(player, playerSession.getMoney());
hitpointsCallback.call(player, playerSession.getPlayerHitpoints() );
if (!match.hasMatchStarted()) { if (!match.hasMatchStarted()) {
return; return;
} }

View file

@ -1,8 +0,0 @@
package de.towerdefence.server.match.callbacks;
import de.towerdefence.server.player.Player;
@FunctionalInterface
public interface PlayerHitpointsCallback {
void call(Player player, int playerHitpoints);
}

View file

@ -6,7 +6,6 @@ import de.towerdefence.server.match.exeptions.InvalidPlacementException;
import de.towerdefence.server.match.exeptions.NotInMatchException; import de.towerdefence.server.match.exeptions.NotInMatchException;
import de.towerdefence.server.player.Player; import de.towerdefence.server.player.Player;
import de.towerdefence.server.server.JsonWebsocketHandler; import de.towerdefence.server.server.JsonWebsocketHandler;
import de.towerdefence.server.server.channels.match.hitpoints.PlayerHitpointsMessage;
import de.towerdefence.server.server.channels.match.money.PlayerMoneyMessage; import de.towerdefence.server.server.channels.match.money.PlayerMoneyMessage;
import de.towerdefence.server.server.channels.match.placing.GamePlayerMap; import de.towerdefence.server.server.channels.match.placing.GamePlayerMap;
import de.towerdefence.server.server.channels.match.placing.InvalidPlacementMessage; import de.towerdefence.server.server.channels.match.placing.InvalidPlacementMessage;
@ -38,11 +37,7 @@ public class MatchWebsocketHandler extends JsonWebsocketHandler {
public void afterConnectionEstablished(WebSocketSession session) { public void afterConnectionEstablished(WebSocketSession session) {
super.afterConnectionEstablished(session); super.afterConnectionEstablished(session);
playerSessions.put(sessionPlayers.get(session), session); playerSessions.put(sessionPlayers.get(session), session);
matchService.playerConnected( matchService.playerConnected(sessionPlayers.get(session), this::onPlayerMoneyChanged);
sessionPlayers.get(session),
this::onPlayerMoneyChanged,
this::onPlayerHitpointsChanged
);
} }
private void onPlayerMoneyChanged(Player player, int playerMoney) { private void onPlayerMoneyChanged(Player player, int playerMoney) {
@ -53,14 +48,6 @@ public class MatchWebsocketHandler extends JsonWebsocketHandler {
} }
} }
private void onPlayerHitpointsChanged(Player player, int playerHitpoints) {
WebSocketSession session = playerSessions.get(player);
try {
new PlayerHitpointsMessage(playerHitpoints).send(session);
} catch (IOException ignored) {
}
}
@Override @Override
protected void closeSession(WebSocketSession session, CloseStatus reason) { protected void closeSession(WebSocketSession session, CloseStatus reason) {
Player player = sessionPlayers.get(session); Player player = sessionPlayers.get(session);

View file

@ -1,4 +1,4 @@
package de.towerdefence.server.server.channels.match.hitpoints; package de.towerdefence.server.server.channels.match;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.JsonNodeFactory;
@ -8,18 +8,19 @@ import lombok.AllArgsConstructor;
import java.util.Map; import java.util.Map;
@AllArgsConstructor @AllArgsConstructor
public class PlayerHitpointsMessage extends JsonMessage { public class PlayerMoneyMessage extends JsonMessage {
private final int playerMoney;
private final int playerHitpoints;
@Override @Override
protected String getMessageId() { protected String getMessageId() {
return "PlayerHitpoints"; return "PlayerMoney";
} }
@Override @Override
protected Map<String, JsonNode> getData(JsonNodeFactory factory) { protected Map<String, JsonNode> getData(JsonNodeFactory factory) {
return Map.of( return Map.of(
"playerHitpoints", factory.numberNode(this.playerHitpoints) "playerMoney", factory.numberNode(this.playerMoney)
); );
} }
} }

View file

@ -239,21 +239,6 @@ channels:
required: required:
- $id - $id
- playerMoney - playerMoney
PlayerHitpoints:
description: Hitpoints a player currently has
payload:
type: object
additionalProperties: false
properties:
$id:
type: string
format: messageId
playerHitpoints:
type: integer
required:
- $id
- playerHitpoints
operations: operations:
@ -336,13 +321,6 @@ operations:
$ref: "#/channels/match" $ref: "#/channels/match"
messages: messages:
- $ref: "#/channels/match/messages/PlayerMoney" - $ref: "#/channels/match/messages/PlayerMoney"
playerHitpoints:
title: PlayerHitpoints
action: receive
channel:
$ref: "#/channels/match"
messages:
- $ref: "#/channels/match/messages/PlayerHitpoints"