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

added character squares he can move

Browse Source
This commit is contained in:
Sem van der Hoeven
2020-06-06 15:35:01 +02:00
parent 3827098c42
commit 737e1ac1cb
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/square2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 914 B

After

Width:  |  Height:  |  Size: 907 B

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

@@ -157,9 +157,11 @@ public class GameInputProcessor implements InputProcessor {
}
if (!mainGame.hasCharacterSelected() && gameTile.containsCharacter()) {
mainGame.setSelectedCharacter(gameTile.getCharacter());
mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col,row);
}
if (gameTile.containsCharacter() && !mainGame.getSelectedCharacter().equals(gameTile.getCharacter())) {
mainGame.setSelectedCharacter(gameTile.getCharacter());
mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col,row);
}
return true;
}

5
core/src/netwerkprog/game/client/game/map/MapRenderer.java
View File

@@ -7,6 +7,7 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import netwerkprog.game.client.MainGame;
import netwerkprog.game.util.game.GameCharacter;
import netwerkprog.game.util.graphics.Renderable;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
@@ -144,12 +145,14 @@ public class MapRenderer implements Renderable {
int cy = y + direction[1];
if (cy >= 0 && cy < gameTiles.length)
if (cx >= 0 && cx < gameTiles[cy].length)
res.add(gameTiles[cy][cx]);
if (gameTiles[cy][cx].getSymbol() != '#')
res.add(gameTiles[cy][cx]);
}
surroundedTilesOfCurrentCharacter = res;
return res;
}
public int getPos(GameTile tile, String choice) {
for (int row = 0; row < this.gameTiles.length; row++) {
for (int col = 0; col < this.gameTiles[0].length; col++) {

13
core/src/netwerkprog/game/util/game/GameCharacter.java
View File

@@ -5,10 +5,13 @@ import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.scenes.scene2d.Actor;
import netwerkprog.game.client.game.map.GameTile;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
public abstract class GameCharacter extends Actor implements Comparable<GameCharacter> {
@@ -18,6 +21,7 @@ public abstract class GameCharacter extends Actor implements Comparable<GameChar
protected boolean override;
protected TextureRegion textureRegion;
protected int health;
protected List<GameTile> allowedToMove;
public GameCharacter(String name, Faction faction, TextureRegion textureRegion, Ability... abilities) {
super();
@@ -27,6 +31,7 @@ public abstract class GameCharacter extends Actor implements Comparable<GameChar
this.override = false;
this.textureRegion = textureRegion;
this.health = 100;
this.allowedToMove = new ArrayList<>();
}
public String getName() {
@@ -106,4 +111,12 @@ public abstract class GameCharacter extends Actor implements Comparable<GameChar
", y=" + super.getY() +
'}';
}
public List<GameTile> getAllowedToMove() {
return allowedToMove;
}
public void setAllowedToMove(List<GameTile> allowedToMove) {
this.allowedToMove = allowedToMove;
}
}