diff --git a/core/assets/iconos.png b/core/assets/iconos.png new file mode 100644 index 0000000..cf0aa66 Binary files /dev/null and b/core/assets/iconos.png differ diff --git a/core/assets/p1.png b/core/assets/p1.png new file mode 100644 index 0000000..b3c3e5e Binary files /dev/null and b/core/assets/p1.png differ diff --git a/core/assets/p2.png b/core/assets/p2.png new file mode 100644 index 0000000..39d2ef9 Binary files /dev/null and b/core/assets/p2.png differ diff --git a/core/assets/sueloChina.png b/core/assets/sueloChina.png new file mode 100644 index 0000000..a865b32 Binary files /dev/null and b/core/assets/sueloChina.png differ diff --git a/core/bin/main/com/mygdx/game/MyGdxGame.class b/core/bin/main/com/mygdx/game/MyGdxGame.class index 55ae773..b0fc262 100644 Binary files a/core/bin/main/com/mygdx/game/MyGdxGame.class and b/core/bin/main/com/mygdx/game/MyGdxGame.class differ diff --git a/core/bin/main/menus/.gitignore b/core/bin/main/menus/.gitignore new file mode 100644 index 0000000..6e08eb0 --- /dev/null +++ b/core/bin/main/menus/.gitignore @@ -0,0 +1,4 @@ +/Menu.class +/MenuInicio.class +/MenuOpcions.class +/Battle.class diff --git a/core/bin/main/menus/Menu.class b/core/bin/main/menus/Menu.class index 2cb7990..4b1d9f4 100644 Binary files a/core/bin/main/menus/Menu.class and b/core/bin/main/menus/Menu.class differ diff --git a/core/bin/main/utilidades/.gitignore b/core/bin/main/utilidades/.gitignore new file mode 100644 index 0000000..52f3d69 --- /dev/null +++ b/core/bin/main/utilidades/.gitignore @@ -0,0 +1,2 @@ +/Gifs.class +/Personaje.class diff --git a/core/bin/main/utilidades/Gifs.class b/core/bin/main/utilidades/Gifs.class index 6ed5461..d2616e6 100644 Binary files a/core/bin/main/utilidades/Gifs.class and b/core/bin/main/utilidades/Gifs.class differ diff --git a/core/src/com/mygdx/game/MyGdxGame.java b/core/src/com/mygdx/game/MyGdxGame.java index 0c26f5c..3064ed4 100644 --- a/core/src/com/mygdx/game/MyGdxGame.java +++ b/core/src/com/mygdx/game/MyGdxGame.java @@ -3,11 +3,10 @@ package com.mygdx.game; import com.badlogic.gdx.ApplicationAdapter; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.GL20; -import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.g2d.SpriteBatch; -import com.badlogic.gdx.graphics.g2d.TextureRegion; +import menus.Battle; import menus.Menu; import menus.MenuInicio; import menus.MenuOpcions; @@ -15,25 +14,22 @@ import utilidades.Gifs; public class MyGdxGame extends ApplicationAdapter { SpriteBatch batch; - Texture img; BitmapFont font; int WIN_ALT; int WIN_ANCH; - private TextureRegion[] regions = new TextureRegion[14]; float contadorGif = 0; Gifs pinchos; int menuSeleccionado=0; @Override public void create () { batch = new SpriteBatch(); - img = new Texture("125760.png"); font = new BitmapFont(Gdx.files.internal("CentieSans.fnt")); WIN_ALT=900; WIN_ANCH=700; Gdx.graphics.setWindowedMode(WIN_ALT, WIN_ANCH); - pinchos = new Gifs(img, 14, 39, 49, 15, 40, 40); Menu.menus.add(new MenuInicio()); Menu.menus.add(new MenuOpcions()); + Menu.menus.add(new Battle()); } @Override @@ -61,7 +57,7 @@ public class MyGdxGame extends ApplicationAdapter { @Override public void dispose () { batch.dispose(); - img.dispose(); font.dispose(); + Menu.menus.get(this.menuSeleccionado).dispose(); } } diff --git a/core/src/menus/Battle.java b/core/src/menus/Battle.java new file mode 100644 index 0000000..e8f7661 --- /dev/null +++ b/core/src/menus/Battle.java @@ -0,0 +1,40 @@ +package menus; + +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.Input; +import com.badlogic.gdx.graphics.Texture; +import com.badlogic.gdx.graphics.g2d.SpriteBatch; + +import utilidades.Personaje; + +public class Battle extends Menu{ + + Personaje p1; + Personaje p2; + Texture suelo; + public Battle() { + this.p2=new Personaje("ken", true); + this.p1=new Personaje("ryu", false); + suelo = new Texture("sueloChina.png"); + } + + @Override + public int draw(SpriteBatch batch, float delta) { + batch.draw(suelo,0,0); + if (Gdx.input.isKeyPressed(Input.Keys.E)) { + p1.cambiarEstado(p1.MEDIO); + }else { + p1.cambiarEstado(p1.STAND); + } + this.p1.draw(batch, delta, 150, 10); + this.p2.draw(batch, delta, 250, 10); + return Menu.BATTLE; + } + + @Override + int darSeleccionado() { + + return 0; + } + +} diff --git a/core/src/menus/Menu.java b/core/src/menus/Menu.java index 1f197bd..5c93434 100644 --- a/core/src/menus/Menu.java +++ b/core/src/menus/Menu.java @@ -20,6 +20,7 @@ public abstract class Menu { static final int FHD=2; static final int INICIAL=0; static final int OPCIONES=1; + static final int BATTLE=2; int local; static int resolution; BitmapFont font; @@ -29,13 +30,14 @@ public abstract class Menu { this.position=0; this.pres=true; font = new BitmapFont(Gdx.files.internal("CentieSans.fnt")); - selector = new Gifs("125760.png", 14, 39, 49, 15, 40, 40); + selector = new Gifs("iconos.png", 14, 39, 49, 15, 40, 40, false); } abstract public int draw(SpriteBatch batch, float delta); - void dispose() { + public void dispose() { font.dispose(); + selector.dispose(); } int cambiarSeleccionado() { diff --git a/core/src/menus/MenuInicio.java b/core/src/menus/MenuInicio.java index e7493c5..766fbbd 100644 --- a/core/src/menus/MenuInicio.java +++ b/core/src/menus/MenuInicio.java @@ -30,7 +30,7 @@ public class MenuInicio extends Menu{ int darSeleccionado() { switch(this.position) { - case 0:return 2; + case 0:return Menu.BATTLE; case 1:return Menu.OPCIONES; default: return -1; } diff --git a/core/src/utilidades/Gifs.java b/core/src/utilidades/Gifs.java index 4d343ab..b852b92 100644 --- a/core/src/utilidades/Gifs.java +++ b/core/src/utilidades/Gifs.java @@ -11,13 +11,14 @@ public class Gifs { private float contadorEstado; public Gifs(String ruta, int n_estados, int inicio_image, int desplazamiento, - int anchura, int x, int y) { + int anchura, int x, int y, boolean flip) { textura = new Texture(ruta); this.n_estados = n_estados; frames = new TextureRegion[n_estados]; for(int i = 0; i