summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-11-26 16:55:55 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-11-26 16:55:55 +0100
commit1c2b80955f7e7801b55ad9187ce63ba1d06edf52 (patch)
tree0044be18063045d052d7db1dc5a8ce6d57e1bbf9
parent7ae5d3a7de9eada5f73104c32da7c2f67d8b8a27 (diff)
downloadRustAndDust-1c2b80955f7e7801b55ad9187ce63ba1d06edf52.zip
RustAndDust-1c2b80955f7e7801b55ad9187ce63ba1d06edf52.tar.gz
Map: use ShotAnimation
-rw-r--r--core/src/ch/asynk/tankontank/TankOnTank.java2
-rw-r--r--core/src/ch/asynk/tankontank/game/Ctrl.java1
-rw-r--r--core/src/ch/asynk/tankontank/game/Map.java63
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateEngage.java2
4 files changed, 37 insertions, 31 deletions
diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java
index c2a5d38..d60b679 100644
--- a/core/src/ch/asynk/tankontank/TankOnTank.java
+++ b/core/src/ch/asynk/tankontank/TankOnTank.java
@@ -54,7 +54,6 @@ public class TankOnTank extends Game
manager.load("data/units.atlas", TextureAtlas.class);
manager.load("data/unit-overlays.atlas", TextureAtlas.class);
manager.load("data/hex-overlays.atlas", TextureAtlas.class);
- manager.load("data/explosion.png", Texture.class);
manager.load("data/shots.png", Texture.class);
manager.load("data/explosions.png", Texture.class);
manager.load("sounds/move.mp3", Sound.class);
@@ -72,7 +71,6 @@ public class TankOnTank extends Game
manager.unload("data/units.atlas");
manager.unload("data/unit-overlays.atlas");
manager.unload("data/hex-overlays.atlas");
- manager.unload("data/explosion.png");
manager.unload("data/shots.png");
manager.unload("data/explosions.png");
manager.unload("sounds/move.mp3");
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java
index 3db444b..a54deaf 100644
--- a/core/src/ch/asynk/tankontank/game/Ctrl.java
+++ b/core/src/ch/asynk/tankontank/game/Ctrl.java
@@ -113,6 +113,7 @@ public class Ctrl implements Disposable
{
animationCount -= 1;
if (animationCount == 0) {
+ map.animationsDone();
StateType tmp = stateAfterAnimation;
stateAfterAnimation = StateType.DONE;
setState(tmp);
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index 398ded0..78a7b20 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -14,8 +14,9 @@ import ch.asynk.tankontank.engine.Board;
import ch.asynk.tankontank.engine.Orientation;
import ch.asynk.tankontank.engine.Meteorology;
import ch.asynk.tankontank.engine.PossiblePaths;
+import ch.asynk.tankontank.engine.gfx.Animation;
import ch.asynk.tankontank.engine.gfx.animations.AnimationSequence;
-import ch.asynk.tankontank.engine.gfx.animations.SpriteAnimation;
+import ch.asynk.tankontank.engine.gfx.animations.ShotAnimation;
import ch.asynk.tankontank.engine.gfx.animations.SoundAnimation;
import ch.asynk.tankontank.engine.gfx.animations.RunnableAnimation;
@@ -38,12 +39,10 @@ public abstract class Map extends Board
public final Meteorology meteorology;
- private final SpriteAnimation explosion;
- private final SpriteAnimation explosions;
private final Sound moveSound;
- private final Sound engagementSound;
private Sound sound;
private long soundId = -1;
+ private Animation animationClosure;
protected abstract void setup();
@@ -56,10 +55,12 @@ public abstract class Map extends Board
{
super(game.factory, cfg, game.manager.get(textureName, Texture.class));
this.ctrl = game.ctrl;
- this.explosion = new SpriteAnimation(game.manager.get("data/explosion.png", Texture.class), 10, 4, 40);
- this.explosions = new SpriteAnimation(game.manager.get("data/explosions.png", Texture.class), 16, 8, 15);
this.moveSound = game.manager.get("sounds/move.mp3", Sound.class);
- this.engagementSound = game.manager.get("sounds/attack.mp3", Sound.class);
+ ShotAnimation.init(
+ game.manager.get("data/shots.png", Texture.class), 1, 7,
+ game.manager.get("data/explosions.png", Texture.class), 16, 8,
+ game.manager.get("sounds/shot.mp3", Sound.class)
+ );
setup();
@@ -82,10 +83,8 @@ public abstract class Map extends Board
{
super.dispose();
clearAll();
- explosion.dispose();
- explosions.dispose();
moveSound.dispose();
- engagementSound.dispose();
+ ShotAnimation.free();
}
public void clearAll()
@@ -188,6 +187,13 @@ public abstract class Map extends Board
activatedUnits.clear();
}
+ public void animationsDone()
+ {
+ if (animationClosure != null)
+ addAnimation(animationClosure);
+ animationClosure = null;
+ }
+
// ACTIONS
public void actionDone()
@@ -323,25 +329,16 @@ public abstract class Map extends Board
return success;
}
- private void setFightAnimation(final Unit target, boolean success)
+ public void addEngagementAnimation(Unit target)
{
- AnimationSequence seq = AnimationSequence.get(success ? 3 : 2);
- SpriteAnimation e = (success ? explosions : explosion);
- e.init(1, target.getCenterX(), target.getCenterY());
- seq.addAnimation(e);
- if (success) {
- seq.addAnimation(RunnableAnimation.get(target, new Runnable() {
- @Override
- public void run() {
- objectives.unclaim(target.getHex());
- removePawn(target);
- }
- }));
+ Hex to = target.getHex();
+ for (Unit u : activatedUnits) {
+ Hex from = u.getHex();
+ AnimationSequence seq = AnimationSequence.get(2);
+ seq.addAnimation(ShotAnimation.get(ctrl.cfg.fxVolume, (u.getWidth() / 2.f), from.getX(), from.getY(), to.getX(), to.getY()));
+ seq.addAnimation(notifyDoneAnimation(target));
+ addAnimation(seq);
}
- seq.addAnimation(notifyDoneAnimation(target));
- addAnimation(seq);
- sound = engagementSound;
- sound.play(ctrl.cfg.fxVolume);
}
public boolean engageUnit(Unit unit, final Unit target)
@@ -369,7 +366,17 @@ public abstract class Map extends Board
if ((activatedUnits.size() == 1) && unit.isA(Unit.UnitType.AT_GUN) && target.isHardTarget())
activatedUnits.clear();
- setFightAnimation(target, success);
+ if (success) {
+ animationClosure = RunnableAnimation.get(target, new Runnable() {
+ @Override
+ public void run() {
+ objectives.unclaim(target.getHex());
+ removePawn(target);
+ }
+ });
+ }
+
+ addEngagementAnimation(target);
return success;
}
diff --git a/core/src/ch/asynk/tankontank/game/states/StateEngage.java b/core/src/ch/asynk/tankontank/game/states/StateEngage.java
index 778ab03..85e6c30 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateEngage.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateEngage.java
@@ -65,7 +65,7 @@ public class StateEngage extends StateCommon
}
activeUnit.showTarget();
- ctrl.setAnimationCount(1);
+ ctrl.setAnimationCount(map.activatedUnits.size());
ctrl.setAfterAnimationState(nextState);
return StateType.ANIMATION;
}