peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2025-08-03 23:20:27 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bugs, game now compiles

Browse Source
This commit is contained in:
Johannes Schmelz
2024-11-13 13:31:02 +01:00
parent 17533112a1
commit 86b8297c9d
6 changed files with 73 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java
View File

@@ -39,7 +39,9 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
private Board ownMap;
private Board harbor;
private Board opponentMap;
private ClientState state = null;
private ClientState state = new ClientState(this) {
};
/**
* Constructs a ClientGameLogic with the specified sender object.

35
Projekte/monopoly/model/src/main/resources/monopoly.properties
View File

@@ -5,7 +5,38 @@
## (c) Mark Minas (mark.minas@unibw.de)
########################################
#
battleship.name=Battleship
button.ready=Ready
monopoly.name=Monopoly
button.play=Start Game
button.ready=Ready
button.rotate=Rotate
server.connection.failed=Failed to establish a server connection.
its.your.turn=It's your turn! Click on the opponent's field to shoot...
lost.connection.to.server=Lost connection to server. The game terminated.
place.ships.in.your.map=Place ships in your map.
wait.for.an.opponent=Wait for an opponent!
wait.for.opponent=Wait for your opponent!
confirm.leaving=Would you really like to leave the game?
you.lost.the.game=You lost the game!
you.won.the.game=You won the game!
button.yes=Yes
button.no=No
button.ok=Ok
button.connect=Connect
button.cancel=Cancel
server.dialog=Server
host.name=Host
port.number=Port
wait.its.not.your.turn=Wait, it's not your turn!!
menu.quit=Quit game
menu.return-to-game=Return to game
menu.sound-enabled=Sound switched on
menu.background-sound-enabled=Background music switched on
menu.map.load=Load map from file...
menu.map.save=Save map in file...
label.file=File:
label.connecting=Connecting...
dialog.error=Error
dialog.question=Question
port.must.be.integer=Port must be an integer number
map.doesnt.fit=The map doesn't fit to this game
client.server-start=Start server

35
Projekte/monopoly/model/src/main/resources/monopoly_de.properties
View File

@@ -6,4 +6,37 @@
########################################
#
monopoly.name=Monopoly
button.ready=Bereit
button.play=Start Game
button.ready=Ready
button.rotate=Rotate
server.connection.failed=Failed to establish a server connection.
its.your.turn=It's your turn! Click on the opponent's field to shoot...
lost.connection.to.server=Lost connection to server. The game terminated.
place.ships.in.your.map=Place ships in your map.
wait.for.an.opponent=Wait for an opponent!
wait.for.opponent=Wait for your opponent!
confirm.leaving=Would you really like to leave the game?
you.lost.the.game=You lost the game!
you.won.the.game=You won the game!
button.yes=Yes
button.no=No
button.ok=Ok
button.connect=Connect
button.cancel=Cancel
server.dialog=Server
host.name=Host
port.number=Port
wait.its.not.your.turn=Wait, it's not your turn!!
menu.quit=Quit game
menu.return-to-game=Return to game
menu.sound-enabled=Sound switched on
menu.background-sound-enabled=Background music switched on
menu.map.load=Load map from file...
menu.map.save=Save map in file...
label.file=File:
label.connecting=Connecting...
dialog.error=Error
dialog.question=Question
port.must.be.integer=Port must be an integer number
map.doesnt.fit=The map doesn't fit to this game
client.server-start=Start server