From a181a786f30a43e6db9ab9e7b10f52976c1895a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Fri, 18 Sep 2015 15:04:14 +0200 Subject: [PATCH] Bigger Barrel and bullet --- android/assets/cannon_barrel.png | Bin 31752 -> 45766 bytes .../de/samdev/cannonshooter/CannonGame.java | 3 ++- .../cannonshooter/entities/CannonBarrel.java | 5 +++-- .../cannonshooter/entities/CannonBullet.java | 15 +++------------ data/CreateSpriteSheet_Barrel.linq | 4 ++-- data/cannon_barrel_base.png | Bin 2220 -> 2252 bytes lib/absGDX-framework-1.0.jar | Bin 203419 -> 204540 bytes 7 files changed, 10 insertions(+), 17 deletions(-) diff --git a/android/assets/cannon_barrel.png b/android/assets/cannon_barrel.png index cf2b289c371b4112f9977468535dcc9b67908022..805c4f16ab2b951e74bfde6091f8a87f9eb9584d 100644 GIT binary patch literal 45766 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 literal 31752 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%0DN=I6tuf{^6fX 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 H`0@V$r#7ji 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 79b65b337c68e98ac6d04d12d3dd168742ebda7a..089c3593e1d7903fc84f08e2871f8c0463bc5ddc 100644 GIT binary patch literal 2252 zcmeAS@N?(olHy`uVBq!ia0y~yU;;838911M)F(f?P$0#U?&#~tz_78O`%fY(0|PTd zfKP}kQ2hV@|3GpSjE2An41x5rH_4!kQWE4B49o~4888HYXIBL#0nP%C$YKTtz5^i4 zn02j_6DTNA;u=vBoS#-wo>-L1P>`6JSE84fTB2a0XP{^HrziP7uzWG{ba4!+hWYiGdRa^O!9yQvqU<> zWBLe&%N~gTup(aKz>ZD^9|fQrlo@9@Br!ZrW2$(xb)R8FVKC#21O99Vc{&a1cCVTl zd!%_DbjqhNymn*$aU>t;@|aSF>zrF2+%cDMU_DpsT*+X~S@Yt58uq@Ss>7UKZ&8$;*S{fiX$(9>Q(*rA7t<<{G-aOarEPKo&{ph;|&_3=F}f# z=rTMokx?YML792QF&1{VfL=~Mo&{3EG7=7^Y8D0!MLhzN4wh~mJPTx$UDyKp1eKUI zj&n?8oRZvfg5i{*QwqaV2}PrZsxtx-4z_6=JPYKES=a*lC7GC49OnVLCb{hZ!z)AQ z1ct9O6b(j|kr^OF#zK})K?1|o84nIHtTH^<$QY8`#LTR5jKQ5Ppog&!InuKV|FJT! zIQmnZXMxD^c%z0Onfj9qT!lY$*#bHa=NmRy&8eLXPD!tr6Q&Bv`~}A5p^N$&{0*_M z3g1cdEMR)RZ=n^#way>8vw+Ezw*iz&*_aajSN2)=mS%+7DL=?X=Vv?VTScz zv_qMpss;Qsdz!?95I1=$0T38A^&r`qNpBj2U{!l$p<_X0~822WQ%mvv4F FO#q(vrHTLm literal 2220 zcmeAS@N?(olHy`uVBq!ia0y~yU;;838911M)F(f?P$0#U?&#~tz_78O`%fY(0|PTd zfKP}kQ2hV@|3GpSjE2An41x5rH_4!kQWE4B49o~4888HYXIBL#0nP%C$YKTtzJnml zxMO1WTcDssiEBhjaDG}zd16s2LqTF@UWr~_YKel0o`Ig(pPuCV!16`N)5S5QBJS-a z$1Y_@ks}vA{^ftWG4|rJm&{XymTcEt;akV?x7uwj!xJutb;E|>=&$7uU}#~QP(3Hu zfl)y2xd?>ETHwXV>QKR6-~pt5uoSofsU1ufN{vhkIsb*ZG#Cy&tG_Mp!zf_(FZI6y ztHX^i@xOgF7>=~pPFnw0O@twFclvpB=!Ie)ns3eWvxZLmoH&*UJ|aL4kuIKv~5Xdr{7E8_{#hL~YO-1_`e Y{xi2x_z5YA7oeKO)78&qol`;+0N#n+nE(I) diff --git a/lib/absGDX-framework-1.0.jar b/lib/absGDX-framework-1.0.jar index 77189ec3eb0542e7092db213ba725ba972c8dee5..62450411990590b0eef65640e1b4ef7ae4d6912b 100644 GIT binary patch delta 6753 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 delta 5563 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