diff --git a/core/src/cz/nic/tablexia/game/games/runes/RunesGame.java b/core/src/cz/nic/tablexia/game/games/runes/RunesGame.java index 6f9ed004c513ba62a75f9b634a6274f5d508c3c1..7a71ffc758b6710e9c0d9e7775c9488fbed2dc9c 100644 --- a/core/src/cz/nic/tablexia/game/games/runes/RunesGame.java +++ b/core/src/cz/nic/tablexia/game/games/runes/RunesGame.java @@ -316,21 +316,13 @@ public class RunesGame extends AbstractTablexiaGame<RunesGameState> { score.setText(getFormattedText(RunesGameAssets.SCORE_TEXT.getResource(), getData().getScore(), RunesGameProperties.RUNES_TO_FIND_TOTAL)); if (targetPlate.foundAllTargets()) { timeBar.setState(TimeBar.TimeBarState.FREEZE); - if (getData().hasNextRound()) { - ((Actor)clicked).addAction(Actions.after(Actions.run(new Runnable() { + ((Actor)clicked).addAction(Actions.delay(IRune.ANIMATION_DURATION*2,Actions.run(new Runnable() { @Override public void run() { - endRound(); + if (getData().hasNextRound()) endRound(); + else finishGame(); } }))); - } else { - ((Actor)clicked).addAction(Actions.after(Actions.run(new Runnable() { - @Override - public void run() { - finishGame(); - } - }))); - } } } else { clicked.showAnimation(IRune.AnimationType.WRONG); diff --git a/core/src/cz/nic/tablexia/game/games/runes/actors/IRune.java b/core/src/cz/nic/tablexia/game/games/runes/actors/IRune.java index 483374f6da2dd9cdb7b63d4572e62bcb05517ce4..48ca95d4cb474514f3afd5c893b9468c9b1cd95a 100644 --- a/core/src/cz/nic/tablexia/game/games/runes/actors/IRune.java +++ b/core/src/cz/nic/tablexia/game/games/runes/actors/IRune.java @@ -8,8 +8,8 @@ import cz.nic.tablexia.game.games.runes.assets.RuneDefinition; * Created by Vitaliy Vashchenko on 27.4.16. */ public interface IRune { - Color DEFAULT_COLOR = Color.BLACK; - float LONG_DURATION = 0.5f; + Color DEFAULT_COLOR = Color.BLACK; + float ANIMATION_DURATION = 0.5f; enum AnimationType{ CORRECT (Color.GREEN), diff --git a/core/src/cz/nic/tablexia/game/games/runes/actors/Rune.java b/core/src/cz/nic/tablexia/game/games/runes/actors/Rune.java index 6a2f72ee17b6f53e54e3069cea2cceb7627a9a34..0aa1d67e1c3e3c20c833bf3f208468a926084468 100644 --- a/core/src/cz/nic/tablexia/game/games/runes/actors/Rune.java +++ b/core/src/cz/nic/tablexia/game/games/runes/actors/Rune.java @@ -41,7 +41,7 @@ public class Rune extends Image implements IRune { public void showAnimation(AnimationType animationType) { Color animationColor = animationType.getColor(); if (!hasActions()) { - addAction(Actions.sequence(Actions.color(animationColor, LONG_DURATION), Actions.color(DEFAULT_COLOR, LONG_DURATION))); + addAction(Actions.sequence(Actions.color(animationColor, ANIMATION_DURATION), Actions.color(DEFAULT_COLOR, ANIMATION_DURATION))); addAction(Actions.after(Actions.color(DEFAULT_COLOR))); } } diff --git a/core/src/cz/nic/tablexia/game/games/runes/actors/RunesCluster.java b/core/src/cz/nic/tablexia/game/games/runes/actors/RunesCluster.java index 9fe4e1f451060df9bcbd7c63ff72c77cb4223b56..178d2aa7965c0376f30f6aa104a4c494f5c2e6c1 100644 --- a/core/src/cz/nic/tablexia/game/games/runes/actors/RunesCluster.java +++ b/core/src/cz/nic/tablexia/game/games/runes/actors/RunesCluster.java @@ -1,6 +1,7 @@ package cz.nic.tablexia.game.games.runes.actors; import com.badlogic.gdx.graphics.Color; +import com.badlogic.gdx.scenes.scene2d.Action; import com.badlogic.gdx.scenes.scene2d.Group; import com.badlogic.gdx.scenes.scene2d.actions.Actions; @@ -13,16 +14,16 @@ import cz.nic.tablexia.game.games.runes.assets.RuneDefinition; public class RunesCluster extends Group implements IRune{ private static final float OVERLAPPING = 0.5f; - - private Rune rune1; - private Rune rune2; - private boolean targetIsFirst; + + private Rune rune1; + private Rune rune2; + private boolean targetOnLeft; public RunesCluster(Rune rune1, Rune rune2, TablexiaRandom random) { this.rune1 = rune1; this.rune2 = rune2; - this.targetIsFirst = random.nextBoolean(); - if (targetIsFirst) { + this.targetOnLeft = random.nextBoolean(); //target rune is on the left side of the cluster + if (targetOnLeft) { addActor(rune1); rune2.setX(rune1.getWidth() * OVERLAPPING); addActor(rune2); @@ -71,7 +72,7 @@ public class RunesCluster extends Group implements IRune{ private void animateRune(Rune rune, Color animationColor) { if (!rune.hasActions()) { - rune.addAction(Actions.sequence(Actions.color(animationColor, LONG_DURATION), Actions.color(DEFAULT_COLOR, LONG_DURATION))); + rune.addAction(Actions.sequence(Actions.color(animationColor, ANIMATION_DURATION), Actions.color(DEFAULT_COLOR, ANIMATION_DURATION))); rune.addAction(Actions.after(Actions.color(DEFAULT_COLOR))); } }