sem/netwerk-programming-eindopdracht
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

added more title text

Browse Source
This commit is contained in:
Sem van der Hoeven
2020-06-07 19:34:52 +02:00
parent 3cb7d2369b
commit edd9d6c34f
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/netwerkprog/game/client/MainGame.java
View File

@@ -108,10 +108,16 @@ public class MainGame extends Game implements ClientCallback {
"# xxxx #xxxx #", "# xxxx #xxxx #",
"# xxxx #x xx #", "# xxxx #x xx #",
"# x #xxxx #", "# x #xxxx #",
"# x #xxx #", "# # x #xxx # #",
"# x #", "# # x # # #",
"# xxxxxx #", "# # x#xxxx # #",
"# x #", "# # #",
"# x xxxx x x #",
"# x xxxx x x #",
"# x xxxx x x #",
"# x xxxx x x #",
"# ## x ## xxxx x x #",
"# x #### xxxx x x #",
"# x xxxx x x #", "# x xxxx x x #",
"#########################" "#########################"
}; };
@@ -152,7 +158,7 @@ public class MainGame extends Game implements ClientCallback {
GameCharacter temp2 = new Agent("Agent" + i, characters[11][0], new BodySwap("Test")); GameCharacter temp2 = new Agent("Agent" + i, characters[11][0], new BodySwap("Test"));
int width = mapRenderer.getGameTiles()[0].length; int width = mapRenderer.getGameTiles()[0].length;
mapRenderer.getGameTiles()[3][width - (i + 1)].visit(temp2); mapRenderer.getGameTiles()[1][width - (i + 1)].visit(temp2);
if (chosenFaction == Faction.HACKER) { if (chosenFaction == Faction.HACKER) {
this.team.addMember(temp); this.team.addMember(temp);
@@ -214,9 +220,11 @@ public class MainGame extends Game implements ClientCallback {
} else if (this.gamestate == GAMESTATE.SELECTING_FACTION) { } else if (this.gamestate == GAMESTATE.SELECTING_FACTION) {
clearRender(67, 168, 186, 1); clearRender(67, 168, 186, 1);
String text = ""; String text = "";
if (otherPlayerConnected) if (otherPlayerConnected) {
text = username == null ? "Connecting to server..." : "FACTION SELECT\nYou are: " + username + "\nPress 1 for mega corporation, press 2 for hackers"; text = username == null ? "Connecting to server..." : "FACTION SELECT\nYou are: " + username + "\nPress 1 for mega corporation, press 2 for hackers";
else text = "Waiting for other player..."; text += "\n\n\nHOW TO PLAY:\nUse WASD to move the camera, and scroll to zoom.\nClick on one of your characters to select them, and click on one of the available surrounding squares to move.\n" +
"Click on an enemy when he is in range to attack him.\nFirst to kill the other's team wins!\n\n\nGood luck!";
} else text = "Waiting for other player...";
renderString(text, Gdx.graphics.getWidth() / 2f, Gdx.graphics.getHeight() / 2f); renderString(text, Gdx.graphics.getWidth() / 2f, Gdx.graphics.getHeight() / 2f);
if (this.ready && this.enemyReady) { if (this.ready && this.enemyReady) {
if (this.chosenFaction == Faction.HACKER) { if (this.chosenFaction == Faction.HACKER) {

2
core/src/netwerkprog/game/server/ServerClient.java
View File

@@ -32,7 +32,7 @@ public class ServerClient implements Runnable, DataSource {
try { try {
this.out.writeObject(data); this.out.writeObject(data);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); System.out.println("Connection suddenly terminated!");
} }
} }