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

stuff fix

Browse Source
This commit is contained in:
Sem van der Hoeven
2020-06-07 16:34:27 +02:00
parent 8344cbab0b
commit 133310a3e2
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,7 +378,6 @@ public class MainGame extends Game implements ClientCallback {
}
public void send(Data data) {
System.out.println("[MAINGAME] sending data " + data);
this.client.writeData(data);
}
@@ -416,7 +415,7 @@ public class MainGame extends Game implements ClientCallback {
}
} else if (data instanceof DamageData) {
DamageData damageData = (DamageData) data;
team.get(damageData.getName()).damage(10);
team.get(damageData.getName()).damage(100);
} else if (data instanceof TurnData) {
this.playersTurn = !this.playersTurn;
}

27
core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
View File

@@ -120,12 +120,12 @@ public class GameInputProcessor implements InputProcessor {
} else if (mainGame.getGamestate() == GAMESTATE.SELECTING_FACTION) {
if (keycode == Input.Keys.NUM_1) {
System.out.println("choosing mega");
mainGame.send(new TeamData(Faction.MEGACORPORATION,mainGame.getUsername()));
mainGame.send(new TeamData(Faction.MEGACORPORATION, mainGame.getUsername()));
mainGame.chooseMegaCorp();
}
if (keycode == Input.Keys.NUM_2) {
System.out.println("choosing hacker");
mainGame.send(new TeamData(Faction.HACKER,mainGame.getUsername()));
mainGame.send(new TeamData(Faction.HACKER, mainGame.getUsername()));
mainGame.chooseHacker();
}
@@ -160,31 +160,38 @@ public class GameInputProcessor implements InputProcessor {
gameTile.visit(mainGame.getSelectedCharacter());
mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col, row);
mainGame.increaseTurn();
mainGame.send(new MoveData(mainGame.getUsername(),mainGame.getSelectedCharacter().getName(),mainGame.mapRenderer.getPos(gameTile)));
mainGame.send(new MoveData(mainGame.getUsername(), mainGame.getSelectedCharacter().getName(), mainGame.mapRenderer.getPos(gameTile)));
}
}
// clicking on enemy
if (mainGame.hasCharacterSelected() && gameTile.containsCharacter() && gameTile.getCharacter().getFaction() != mainGame.getChosenFaction()) {
if (mainGame.mapRenderer.getSurroundedTilesOfCurrentCharacter().contains(gameTile)) {
gameTile.getCharacter().damage(10);
mainGame.increaseTurn();
mainGame.send(new DamageData(gameTile.getCharacter().getName()));
if (!gameTile.getCharacter().isDead()) {
gameTile.getCharacter().damage(100);
mainGame.increaseTurn();
mainGame.send(new DamageData(gameTile.getCharacter().getName()));
}
}
}
}
// set selected character
if (!mainGame.hasCharacterSelected() && gameTile.containsCharacter()) {
if (gameTile.getCharacter().getFaction() == mainGame.getChosenFaction()) {
mainGame.setSelectedCharacter(gameTile.getCharacter());
mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col, row);
if (!gameTile.getCharacter().isDead()) {
mainGame.setSelectedCharacter(gameTile.getCharacter());
mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col, row);
}
}
}
// switch character
if (gameTile.containsCharacter()
&& !mainGame.getSelectedCharacter().equals(gameTile.getCharacter())
&& gameTile.getCharacter().getFaction() == mainGame.getChosenFaction()) {
mainGame.setSelectedCharacter(gameTile.getCharacter());
mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col, row);
if (!gameTile.getCharacter().isDead()) {
mainGame.setSelectedCharacter(gameTile.getCharacter());
mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col, row);
}
}
return true;
}