diff --git a/android/assets/cannon_barrel.png b/android/assets/cannon_barrel.png index cf2b289..805c4f1 100644 Binary files a/android/assets/cannon_barrel.png and b/android/assets/cannon_barrel.png differ diff --git a/core/src/de/samdev/cannonshooter/CannonGame.java b/core/src/de/samdev/cannonshooter/CannonGame.java index 218bdc6..f98db09 100644 --- a/core/src/de/samdev/cannonshooter/CannonGame.java +++ b/core/src/de/samdev/cannonshooter/CannonGame.java @@ -20,7 +20,8 @@ public class CannonGame extends AgdxGame { settings.debugVisualMenu.set(false); settings.debugMenuLayerTextInfos.set(true); settings.debugGameLayerMenuTextInfos.set(false); - settings.debugEnabled.set(true); + + settings.debugEnabled.set(false); } @Override diff --git a/core/src/de/samdev/cannonshooter/entities/CannonBarrel.java b/core/src/de/samdev/cannonshooter/entities/CannonBarrel.java index 313c0eb..33bbaaf 100644 --- a/core/src/de/samdev/cannonshooter/entities/CannonBarrel.java +++ b/core/src/de/samdev/cannonshooter/entities/CannonBarrel.java @@ -32,7 +32,7 @@ public class CannonBarrel extends Entity { super(Textures.cannon_barrel[0], 4, 2); cannon = owner; - setPosition(owner.getPositionX() - 1, owner.getPositionY()); + setPosition(owner.getPositionX(), owner.getPositionY()); setZLayer(ZLayers.LAYER_CANNON_BARREL); } @@ -53,11 +53,12 @@ public class CannonBarrel extends Entity { private void updateBullet() { if (loaded) { - Vector2 v = new Vector2(1f - 0.2f + (120*charge)/128f, 0); + Vector2 v = new Vector2(1f - 0.5f + (1.9f) * charge, 0); v.rotate(rotation); bullet.setPosition(cannon.getCenterX() + v.x - bullet.getWidth()/2, cannon.getCenterY() + v.y - bullet.getHeight()/2); + bullet.scale = charge; } } diff --git a/core/src/de/samdev/cannonshooter/entities/CannonBullet.java b/core/src/de/samdev/cannonshooter/entities/CannonBullet.java index d50459d..62ac855 100644 --- a/core/src/de/samdev/cannonshooter/entities/CannonBullet.java +++ b/core/src/de/samdev/cannonshooter/entities/CannonBullet.java @@ -12,18 +12,17 @@ import de.samdev.cannonshooter.ZLayers; import de.samdev.cannonshooter.teams.Team; public class CannonBullet extends Entity { - private final static float RESIZE_SPEED = 0.005f; + private final static float RESIZE_SPEED = 0.002f; private Cannon cannon; private final Team team; private boolean inBarrel = true; - private float scale = 0.001f; + public float scale = 0.001f; private boolean death = false; - private boolean birth = true; public CannonBullet(Cannon owner, Team t) { - super(Textures.cannon_bullet, 0.25f, 0.25f); + super(Textures.cannon_bullet, 0.5f, 0.5f); this.cannon = owner; this.team = t; @@ -36,14 +35,6 @@ public class CannonBullet extends Entity { @Override public void beforeUpdate(float delta) { - if (birth) { - scale += RESIZE_SPEED * delta; - if (scale >= 1) { - birth = false; - scale = 1; - } - } - if (death) { scale -= RESIZE_SPEED * delta; if (scale <= 0) { diff --git a/data/CreateSpriteSheet_Barrel.linq b/data/CreateSpriteSheet_Barrel.linq index 6dfc05d..3a24cf6 100644 --- a/data/CreateSpriteSheet_Barrel.linq +++ b/data/CreateSpriteSheet_Barrel.linq @@ -17,9 +17,9 @@ void Main() { int idx = y*4 + x; - g.DrawImageUnscaledAndClipped(input, new Rectangle(input.Width * x, input.Height * y, input.Width - idx * 4 - 22, input.Height)); + g.DrawImageUnscaledAndClipped(input, new Rectangle(input.Width * x, input.Height * y, input.Width - idx * 8 - 58, input.Height)); - g.DrawImage(input, new Rectangle(input.Width * (x+1) - idx * 4 - 22, input.Height * y, 22, input.Height), new Rectangle(input.Width - 22, 0, 22, input.Height), GraphicsUnit.Pixel); + g.DrawImage(input, new Rectangle(input.Width * (x+1) - idx * 8 - 58, input.Height * y, 58, input.Height), new Rectangle(input.Width - 58, 0, 58, input.Height), GraphicsUnit.Pixel); } } } diff --git a/data/cannon_barrel_base.png b/data/cannon_barrel_base.png index 79b65b3..089c359 100644 Binary files a/data/cannon_barrel_base.png and b/data/cannon_barrel_base.png differ diff --git a/lib/absGDX-framework-1.0.jar b/lib/absGDX-framework-1.0.jar index 77189ec..6245041 100644 Binary files a/lib/absGDX-framework-1.0.jar and b/lib/absGDX-framework-1.0.jar differ