diff --git a/core/assets/ScifiCritters4.PNG b/core/assets/ScifiCritters4.PNG new file mode 100644 index 0000000..b798f81 Binary files /dev/null and b/core/assets/ScifiCritters4.PNG differ diff --git a/core/assets/george.png b/core/assets/george.png deleted file mode 100644 index 7fb0825..0000000 Binary files a/core/assets/george.png and /dev/null differ diff --git a/core/src/netwerkprog/game/client/game/characters/DevTest1.java b/core/src/netwerkprog/game/client/game/characters/DevTest1.java index eca2e34..54ac435 100644 --- a/core/src/netwerkprog/game/client/game/characters/DevTest1.java +++ b/core/src/netwerkprog/game/client/game/characters/DevTest1.java @@ -1,12 +1,10 @@ package netwerkprog.game.client.game.characters; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Texture; -import netwerkprog.game.util.game.Character; +import netwerkprog.game.util.game.GameCharacter; import netwerkprog.game.util.game.Faction; -public class DevTest1 extends Character { +public class DevTest1 extends GameCharacter { public DevTest1() { - super("DevTest1", Faction.HACKER, new Texture(Gdx.files.internal("core/assets/george.png"))); + super("DevTest1", Faction.HACKER, "core/assets/ScifiCritters4.PNG"); } } diff --git a/core/src/netwerkprog/game/client/game/characters/DevTest2.java b/core/src/netwerkprog/game/client/game/characters/DevTest2.java index 058ff40..c5d01e5 100644 --- a/core/src/netwerkprog/game/client/game/characters/DevTest2.java +++ b/core/src/netwerkprog/game/client/game/characters/DevTest2.java @@ -1,9 +1,9 @@ package netwerkprog.game.client.game.characters; -import netwerkprog.game.util.game.Character; +import netwerkprog.game.util.game.GameCharacter; import netwerkprog.game.util.game.Faction; -public class DevTest2 extends Character { +public class DevTest2 extends GameCharacter { public DevTest2() { super("DevTest2", Faction.MEGACORPORATION, null); } diff --git a/core/src/netwerkprog/game/client/game/characters/DevTest3.java b/core/src/netwerkprog/game/client/game/characters/DevTest3.java index 7e28fff..401e170 100644 --- a/core/src/netwerkprog/game/client/game/characters/DevTest3.java +++ b/core/src/netwerkprog/game/client/game/characters/DevTest3.java @@ -1,9 +1,9 @@ package netwerkprog.game.client.game.characters; -import netwerkprog.game.util.game.Character; +import netwerkprog.game.util.game.GameCharacter; import netwerkprog.game.util.game.Faction; -public class DevTest3 extends Character { +public class DevTest3 extends GameCharacter { public DevTest3() { super("DevTest3", Faction.AI, null); } diff --git a/core/src/netwerkprog/game/util/game/Character.java b/core/src/netwerkprog/game/util/game/GameCharacter.java similarity index 50% rename from core/src/netwerkprog/game/util/game/Character.java rename to core/src/netwerkprog/game/util/game/GameCharacter.java index 191fec9..4d8ce69 100644 --- a/core/src/netwerkprog/game/util/game/Character.java +++ b/core/src/netwerkprog/game/util/game/GameCharacter.java @@ -1,30 +1,28 @@ package netwerkprog.game.util.game; 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 java.util.Arrays; import java.util.HashSet; -public abstract class Character extends Actor { +public abstract class GameCharacter extends Actor { protected String name; protected Faction faction; protected HashSet abilities; - protected TextureRegion[] sprites; + protected TextureRegion[][] sprites; protected boolean override; - protected int x; - protected int y; - private final int maxSize = 1; - - public Character(String name, Faction faction, Texture spriteSheet, Ability... abilities) { + public GameCharacter(String name, Faction faction, String spriteSheet, Ability... abilities) { this.name = name; this.faction = faction; - this.sprites = new TextureRegion[this.maxSize]; this.abilities = new HashSet<>(Arrays.asList(abilities)); this.override = false; - loadSprites(spriteSheet); + this.sprites = TextureRegion.split(new Texture(spriteSheet),32,32); + super.setX(0); + super.setY(0); } public void addAbilities(Ability ability) { @@ -39,17 +37,10 @@ public abstract class Character extends Actor { this.override = !this.override; } - private void loadSprites(Texture spriteSheet) { - int counter = 0; - TextureRegion[][] temp = TextureRegion.split(spriteSheet,32,32); - for (TextureRegion[] array : temp) { - for (TextureRegion sprite : array) { - this.sprites[counter] = sprite; - counter++; - if (counter >= this.maxSize) { - break; - } - } - } + public void draw(SpriteBatch batch) { + batch.begin(); + batch.draw(this.sprites[0][0],super.getX(),super.getY()); + batch.end(); } + } diff --git a/core/src/test/java/CharacterLoadingTest.java b/core/src/test/java/CharacterLoadingTest.java deleted file mode 100644 index 51962f4..0000000 --- a/core/src/test/java/CharacterLoadingTest.java +++ /dev/null @@ -1,15 +0,0 @@ -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Texture; -import netwerkprog.game.client.game.characters.DevTest1; -import netwerkprog.game.util.game.Character; -import org.junit.Test; - -public class CharacterLoadingTest { - - @Test - public void george() { - String path = "core/assets/george.png"; - Texture texture = new Texture(Gdx.files.internal(path)); - Character george = new DevTest1(); - } -}