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

Fixed move and implemented Damaging characters

Browse Source
This commit is contained in:
MickWerf
2020-06-07 15:30:05 +02:00
parent 6d22fce2d1
commit 30b343fc84
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ import netwerkprog.game.client.game.map.GameTile;
import netwerkprog.game.client.game.map.Map;
import netwerkprog.game.client.game.map.MapRenderer;
import netwerkprog.game.util.data.Data;
import netwerkprog.game.util.data.character.DamageData;
import netwerkprog.game.util.data.character.MoveData;
import netwerkprog.game.util.data.connection.NameData;
import netwerkprog.game.util.data.connection.ReadyData;
@@ -400,6 +401,9 @@ public class MainGame extends Game implements ClientCallback {
} else {
moveData.getTile().visit(enemyTeam.get(moveData.getCharacterName()));
}
} else if (data instanceof DamageData) {
DamageData damageData = (DamageData) data;
team.get(damageData.getName()).damage(10);
}
}

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

@@ -9,7 +9,7 @@ import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.utils.TimeUtils;
import netwerkprog.game.client.MainGame;
import netwerkprog.game.client.game.GAMESTATE;
import netwerkprog.game.util.data.Data;
import netwerkprog.game.util.data.character.DamageData;
import netwerkprog.game.util.data.character.MoveData;
import netwerkprog.game.util.game.GameCharacter;
@@ -154,7 +154,7 @@ public class GameInputProcessor implements InputProcessor {
gameTile.visit(mainGame.getSelectedCharacter());
mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col, row);
mainGame.increaseTurn();
mainGame.send(new Data("move"));
mainGame.send(new MoveData(mainGame.getUsername(),mainGame.getSelectedCharacter().getName(),gameTile));
}
}
// clicking on enemy
@@ -162,7 +162,7 @@ public class GameInputProcessor implements InputProcessor {
if (mainGame.mapRenderer.getSurroundedTilesOfCurrentCharacter().contains(gameTile)) {
gameTile.getCharacter().damage(10);
mainGame.increaseTurn();
mainGame.send(new DamageData(gameTile.getCharacter().getName()));
}
}
}
@@ -180,7 +180,6 @@ public class GameInputProcessor implements InputProcessor {
mainGame.setSelectedCharacter(gameTile.getCharacter());
mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col, row);
}
mainGame.send(new MoveData(mainGame.getUsername(),mainGame.getSelectedCharacter().getName(),gameTile));
return true;
}
}

4
core/src/netwerkprog/game/util/data/character/DamageData.java
View File

@@ -10,4 +10,8 @@ public class DamageData extends Data {
super.setPayload(this);
this.name = name;
}
public String getName() {
return name;
}
}