diff --git a/app/bin/main/Entity/Character.class b/app/bin/main/Entity/Character.class index c6c0f76..02b1e72 100644 Binary files a/app/bin/main/Entity/Character.class and b/app/bin/main/Entity/Character.class differ diff --git a/app/bin/main/Entity/Enemy.class b/app/bin/main/Entity/Enemy.class index edec65c..68f86ae 100644 Binary files a/app/bin/main/Entity/Enemy.class and b/app/bin/main/Entity/Enemy.class differ diff --git a/app/bin/main/Entity/Entity.class b/app/bin/main/Entity/Entity.class index 1726933..b7a8f9e 100644 Binary files a/app/bin/main/Entity/Entity.class and b/app/bin/main/Entity/Entity.class differ diff --git a/app/bin/main/Entity/Player.class b/app/bin/main/Entity/Player.class index 07212de..0408b7a 100644 Binary files a/app/bin/main/Entity/Player.class and b/app/bin/main/Entity/Player.class differ diff --git a/app/bin/main/Entity/Stuff.class b/app/bin/main/Entity/Stuff.class index 1624a0e..5b389fe 100644 Binary files a/app/bin/main/Entity/Stuff.class and b/app/bin/main/Entity/Stuff.class differ diff --git a/app/bin/main/PokeMudry.class b/app/bin/main/PokeMudry.class index bbf51b8..a53aaff 100644 Binary files a/app/bin/main/PokeMudry.class and b/app/bin/main/PokeMudry.class differ diff --git a/app/bin/main/Screen/ScreenBattle.class b/app/bin/main/Screen/ScreenBattle.class new file mode 100644 index 0000000..04a2c2c Binary files /dev/null and b/app/bin/main/Screen/ScreenBattle.class differ diff --git a/app/bin/main/Screen/ScreenMap.class b/app/bin/main/Screen/ScreenMap.class new file mode 100644 index 0000000..e4d88c6 Binary files /dev/null and b/app/bin/main/Screen/ScreenMap.class differ diff --git a/app/bin/main/Screen/ScreenPlayer.class b/app/bin/main/Screen/ScreenPlayer.class new file mode 100644 index 0000000..6b981b7 Binary files /dev/null and b/app/bin/main/Screen/ScreenPlayer.class differ diff --git a/app/bin/test/AppTest.class b/app/bin/test/AppTest.class index 1078e64..4119c85 100644 Binary files a/app/bin/test/AppTest.class and b/app/bin/test/AppTest.class differ diff --git a/app/src/main/java/Entity/Character.java b/app/src/main/java/Entity/Character.java index a712521..2b96daf 100644 --- a/app/src/main/java/Entity/Character.java +++ b/app/src/main/java/Entity/Character.java @@ -1,5 +1,16 @@ package Entity; public abstract class Character extends Entity{ - + public Character(String name) { + super(name); + //TODO Auto-generated constructor stub + } + + private int pv; + + public int getPv() { + return pv; + } + + abstract protected void removedPv(int pv); } diff --git a/app/src/main/java/Entity/Enemy.java b/app/src/main/java/Entity/Enemy.java index c95a43c..a285417 100644 --- a/app/src/main/java/Entity/Enemy.java +++ b/app/src/main/java/Entity/Enemy.java @@ -1,5 +1,25 @@ package Entity; +import com.badlogic.gdx.math.Vector2; + public class Enemy extends Character{ + public Enemy(String name) { + super(name); + } + + public void setPosition(int x, int y){ + + } + + public void setPosition(Vector2 vPosition){ + setPosition((int)vPosition.x, (int)vPosition.y); + } + + @Override + protected void removedPv(int pv) { + // TODO Auto-generated method stub + + } + } diff --git a/app/src/main/java/Entity/Entity.java b/app/src/main/java/Entity/Entity.java index e5eb30b..15354fb 100644 --- a/app/src/main/java/Entity/Entity.java +++ b/app/src/main/java/Entity/Entity.java @@ -1,5 +1,20 @@ package Entity; +import com.badlogic.gdx.math.Vector2; + public abstract class Entity { - + private Vector2 position; + private String name; + + public Entity(String name){ + this.name = name; + } + + public Vector2 getPosition() { + return position; + } + + public String getName() { + return name; + } } diff --git a/app/src/main/java/Entity/Player.java b/app/src/main/java/Entity/Player.java index 7a36bd9..74d1148 100644 --- a/app/src/main/java/Entity/Player.java +++ b/app/src/main/java/Entity/Player.java @@ -1,5 +1,31 @@ package Entity; +import com.badlogic.gdx.math.Vector2; + public class Player extends Character{ - + + private int xp; + + public Player(String name) { + super(name); + //TODO Auto-generated constructor stub + } + + public void addXp(int xp){ + + } + + public void move(int x, int y){ + + } + + public void move(Vector2 vMove){ + move((int)vMove.x, (int)vMove.y); + } + + @Override + protected void removedPv(int pv) { + // TODO Auto-generated method stub + + } } diff --git a/app/src/main/java/Entity/Stuff.java b/app/src/main/java/Entity/Stuff.java index 601c5ea..8b2b878 100644 --- a/app/src/main/java/Entity/Stuff.java +++ b/app/src/main/java/Entity/Stuff.java @@ -1,5 +1,10 @@ package Entity; public class Stuff extends Entity{ + + public Stuff(String name) { + super(name); + //TODO Auto-generated constructor stub + } } diff --git a/app/src/main/java/PokeMudry.java b/app/src/main/java/PokeMudry.java index be70f77..76fd223 100644 --- a/app/src/main/java/PokeMudry.java +++ b/app/src/main/java/PokeMudry.java @@ -1,13 +1,24 @@ -/* - * This Java source file was generated by the Gradle 'init' task. - */ +import ch.hevs.gdx2d.desktop.PortableApplication; +import ch.hevs.gdx2d.lib.GdxGraphics; -public class PokeMudry { - public String getGreeting() { - return "Hello World!"; - } +public class PokeMudry extends PortableApplication{ + public final boolean ANDROID = false; + public final int PLAYERS = 1; + public static final int TIME = 10; // number of minutes for kill all enemy public static void main(String[] args) { - System.out.println(new PokeMudry().getGreeting()); + + } + + @Override + public void onInit() { + // TODO Auto-generated method stub + + } + + @Override + public void onGraphicRender(GdxGraphics g) { + // TODO Auto-generated method stub + } } diff --git a/app/src/main/java/Screen/ScreenBattle.java b/app/src/main/java/Screen/ScreenBattle.java new file mode 100644 index 0000000..a4ac024 --- /dev/null +++ b/app/src/main/java/Screen/ScreenBattle.java @@ -0,0 +1,5 @@ +package Screen; + +public class ScreenBattle { + +} diff --git a/app/src/main/java/Screen/ScreenMap.java b/app/src/main/java/Screen/ScreenMap.java new file mode 100644 index 0000000..367e361 --- /dev/null +++ b/app/src/main/java/Screen/ScreenMap.java @@ -0,0 +1,5 @@ +package Screen; + +public class ScreenMap { + +} diff --git a/app/src/main/java/Screen/ScreenPlayer.java b/app/src/main/java/Screen/ScreenPlayer.java new file mode 100644 index 0000000..16d0af0 --- /dev/null +++ b/app/src/main/java/Screen/ScreenPlayer.java @@ -0,0 +1,17 @@ +package Screen; + +import ch.hevs.gdx2d.lib.ScreenManager; + +public class ScreenPlayer { + private ScreenManager screenManager; + private ScreenMap screenMap; + private ScreenBattle screenBattle; + + public void init(){ + + } + + public void render(){ + + } +} diff --git a/app/src/test/java/AppTest.java b/app/src/test/java/AppTest.java index 299548b..86becf2 100644 --- a/app/src/test/java/AppTest.java +++ b/app/src/test/java/AppTest.java @@ -7,8 +7,5 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; class AppTest { - @Test void appHasAGreeting() { - PokeMudry classUnderTest = new PokeMudry(); - assertNotNull(classUnderTest.getGreeting(), "app should have a greeting"); - } + }