Compare commits
1 commit
9b10902d2a
...
5ec9b899f0
Author | SHA1 | Date | |
---|---|---|---|
5ec9b899f0 |
7 changed files with 65 additions and 64 deletions
|
@ -44,7 +44,8 @@ public class GameSession {
|
||||||
Player player,
|
Player player,
|
||||||
PlayerMoneyCallback moneyCallback,
|
PlayerMoneyCallback moneyCallback,
|
||||||
PlayerHitpointsCallback hitpointsCallback,
|
PlayerHitpointsCallback hitpointsCallback,
|
||||||
EnemiesChangedCallback enemyCallback) {
|
EnemiesChangedCallback enemyCallback
|
||||||
|
) {
|
||||||
this.player = player;
|
this.player = player;
|
||||||
this.moneyCallback = moneyCallback;
|
this.moneyCallback = moneyCallback;
|
||||||
this.hitpointsCallback = hitpointsCallback;
|
this.hitpointsCallback = hitpointsCallback;
|
||||||
|
@ -75,7 +76,8 @@ public class GameSession {
|
||||||
enemyCallback.call(
|
enemyCallback.call(
|
||||||
player,
|
player,
|
||||||
newEnemies.toArray(new Enemy[newEnemies.size()]),
|
newEnemies.toArray(new Enemy[newEnemies.size()]),
|
||||||
changedEnemies.toArray(new Enemy[changedEnemies.size()]));
|
changedEnemies.toArray(new Enemy[changedEnemies.size()])
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -92,9 +92,12 @@ public class AStar {
|
||||||
if (!walkable.call(pos)) {
|
if (!walkable.call(pos)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
accumulator.add(new PathNode(
|
accumulator.add(
|
||||||
|
new PathNode(
|
||||||
right,
|
right,
|
||||||
nextCost,
|
nextCost,
|
||||||
right.gridDistance(target) + nextCost));
|
right.gridDistance(target) + nextCost
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,8 @@ public class Match {
|
||||||
Player player,
|
Player player,
|
||||||
PlayerMoneyCallback moneyCallback,
|
PlayerMoneyCallback moneyCallback,
|
||||||
PlayerHitpointsCallback hitpointsCallback,
|
PlayerHitpointsCallback hitpointsCallback,
|
||||||
EnemiesChangedCallback enemyCallback) {
|
EnemiesChangedCallback enemyCallback
|
||||||
|
) {
|
||||||
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) {
|
||||||
|
|
|
@ -61,7 +61,8 @@ public class MatchService {
|
||||||
Player player,
|
Player player,
|
||||||
PlayerMoneyCallback moneyCallback,
|
PlayerMoneyCallback moneyCallback,
|
||||||
PlayerHitpointsCallback hitpointsCallback,
|
PlayerHitpointsCallback hitpointsCallback,
|
||||||
EnemiesChangedCallback enemyCallback) {
|
EnemiesChangedCallback enemyCallback
|
||||||
|
) {
|
||||||
Match match = playerMatches.get(player);
|
Match match = playerMatches.get(player);
|
||||||
match.connectPlayer(player, moneyCallback, hitpointsCallback, enemyCallback);
|
match.connectPlayer(player, moneyCallback, hitpointsCallback, enemyCallback);
|
||||||
Optional<GameSession> optionalPlayerSession = match.getPlayerGameSession(player);
|
Optional<GameSession> optionalPlayerSession = match.getPlayerGameSession(player);
|
||||||
|
|
|
@ -1,16 +1,6 @@
|
||||||
package de.towerdefence.server.server.channels.match;
|
package de.towerdefence.server.server.channels.match;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
|
||||||
|
|
||||||
import org.springframework.web.socket.CloseStatus;
|
|
||||||
import org.springframework.web.socket.TextMessage;
|
|
||||||
import org.springframework.web.socket.WebSocketSession;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
|
||||||
import de.towerdefence.server.game.Enemy;
|
import de.towerdefence.server.game.Enemy;
|
||||||
import de.towerdefence.server.game.exeptions.InvalidPlacementException;
|
import de.towerdefence.server.game.exeptions.InvalidPlacementException;
|
||||||
import de.towerdefence.server.match.MatchService;
|
import de.towerdefence.server.match.MatchService;
|
||||||
|
@ -26,6 +16,13 @@ import de.towerdefence.server.server.channels.match.placing.RequestTowerPlacingM
|
||||||
import de.towerdefence.server.server.channels.match.placing.TowerPlacedMessage;
|
import de.towerdefence.server.server.channels.match.placing.TowerPlacedMessage;
|
||||||
import de.towerdefence.server.session.Channel;
|
import de.towerdefence.server.session.Channel;
|
||||||
import de.towerdefence.server.session.SessionsService;
|
import de.towerdefence.server.session.SessionsService;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import org.springframework.web.socket.CloseStatus;
|
||||||
|
import org.springframework.web.socket.TextMessage;
|
||||||
|
import org.springframework.web.socket.WebSocketSession;
|
||||||
|
|
||||||
public class MatchWebsocketHandler extends JsonWebsocketHandler {
|
public class MatchWebsocketHandler extends JsonWebsocketHandler {
|
||||||
|
|
||||||
|
@ -95,20 +92,16 @@ public class MatchWebsocketHandler extends JsonWebsocketHandler {
|
||||||
} catch (IOException ignored) {
|
} catch (IOException ignored) {
|
||||||
this.closeSession(session, CloseStatus.BAD_DATA);
|
this.closeSession(session, CloseStatus.BAD_DATA);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void handleRequestTowerPlacingMessage(
|
private void handleRequestTowerPlacingMessage(WebSocketSession session, String payload)
|
||||||
WebSocketSession session,
|
throws IOException {
|
||||||
String payload) throws IOException {
|
RequestTowerPlacingMessage msg =
|
||||||
RequestTowerPlacingMessage msg = objectMapper.readValue(payload, RequestTowerPlacingMessage.class);
|
objectMapper.readValue(payload, RequestTowerPlacingMessage.class);
|
||||||
Player opponent;
|
Player opponent;
|
||||||
try {
|
try {
|
||||||
opponent = this.matchService.placeTower(
|
opponent =
|
||||||
this.sessionPlayers.get(session),
|
this.matchService.placeTower(this.sessionPlayers.get(session), msg.getX(), msg.getY());
|
||||||
msg.getX(),
|
|
||||||
msg.getY()
|
|
||||||
);
|
|
||||||
} catch (InvalidPlacementException exception) {
|
} catch (InvalidPlacementException exception) {
|
||||||
new InvalidPlacementMessage(msg.getX(), msg.getY(), exception.getReason()).send(session);
|
new InvalidPlacementMessage(msg.getX(), msg.getY(), exception.getReason()).send(session);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -26,6 +26,7 @@ public class InvalidPlacementMessage extends JsonMessage {
|
||||||
return Map.of(
|
return Map.of(
|
||||||
"x", factory.numberNode(this.x),
|
"x", factory.numberNode(this.x),
|
||||||
"y", factory.numberNode(this.y),
|
"y", factory.numberNode(this.y),
|
||||||
"reason", factory.textNode(this.reason.getJsonName()));
|
"reason", factory.textNode(this.reason.getJsonName())
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue