diff --git a/core/assets/characters.png b/core/assets/characters.png index 8db79d0..ef80898 100644 Binary files a/core/assets/characters.png and b/core/assets/characters.png differ diff --git a/core/src/netwerkprog/game/client/MainGame.java b/core/src/netwerkprog/game/client/MainGame.java index bb89bf2..1102297 100644 --- a/core/src/netwerkprog/game/client/MainGame.java +++ b/core/src/netwerkprog/game/client/MainGame.java @@ -96,12 +96,9 @@ public class MainGame extends ApplicationAdapter { TextureRegion[][] characters = TextureRegion.split(texture, 32, 32); this.testCharacter = new Hacker("harry",characters[1][0], new BodySwap("test")); GameCharacter character2 = new Hacker("test2",characters[2][0], new BodySwap("test")); -// this.tree.insert(testCharacter); -// this.tree.insert(character2); -// this.tree.insert(new Agent(characters[2][0], new Implant("test"))); this.setSelectedCharacter(testCharacter); - mapRenderer.getGameTiles()[0][1].visit(testCharacter); - mapRenderer.getGameTiles()[0][2].visit(character2); + mapRenderer.getGameTiles()[1][1].visit(testCharacter); + mapRenderer.getGameTiles()[1][2].visit(character2); } diff --git a/core/src/netwerkprog/game/client/game/map/GameTile.java b/core/src/netwerkprog/game/client/game/map/GameTile.java index d224a12..978cdc1 100644 --- a/core/src/netwerkprog/game/client/game/map/GameTile.java +++ b/core/src/netwerkprog/game/client/game/map/GameTile.java @@ -36,6 +36,8 @@ public class GameTile extends Rectangle { public boolean visit(GameCharacter character) { if (this.character != null) return false; this.character = character; + this.character.setX(this.x); + this.character.setY(this.y); return true; } @@ -61,6 +63,7 @@ public class GameTile extends Rectangle { "symbol=" + symbol + ", x=" + x + ", y=" + y + + ", character=" + this.character + '}'; } diff --git a/core/src/netwerkprog/game/util/game/GameCharacter.java b/core/src/netwerkprog/game/util/game/GameCharacter.java index b871fbd..64c63ca 100644 --- a/core/src/netwerkprog/game/util/game/GameCharacter.java +++ b/core/src/netwerkprog/game/util/game/GameCharacter.java @@ -19,6 +19,7 @@ public abstract class GameCharacter extends Actor implements Comparable(Arrays.asList(abilities)); @@ -77,6 +78,8 @@ public abstract class GameCharacter extends Actor implements Comparable