From 19a269c3ee514d745dc2ccb97999b229fa0a549f Mon Sep 17 00:00:00 2001
From: Vitaliy Vashchenko <vitaliy.vashchenko@nic.cz>
Date: Wed, 7 Sep 2016 13:38:29 +0200
Subject: [PATCH] Fixed wrong holder size.
---
core/src/cz/nic/tablexia/game/games/runes/RunesGame.java | 3 ---
.../tablexia/game/games/runes/actors/RunesCluster.java | 8 +++++++-
.../nic/tablexia/game/games/runes/actors/RunesHolder.java | 3 +--
.../game/games/runes/model/RunesGameProperties.java | 1 -
4 files changed, 8 insertions(+), 7 deletions(-)
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 685ee278c..83f79efba 100644
--- a/core/src/cz/nic/tablexia/game/games/runes/RunesGame.java
+++ b/core/src/cz/nic/tablexia/game/games/runes/RunesGame.java
@@ -79,11 +79,8 @@ public class RunesGame extends AbstractTablexiaGame<RunesGameState> {
@Override
protected void gameLoaded(Map<String, String> gameState) {
- // TODO: 17.8.16 replace rule help sound
// TODO: 7.9.16 replace de/sk help and result sounds
- // TODO: 7.9.16 add sounds
// TODO: 7.9.16 add texts
- // TODO: 7.9.16 swap medium and hard diff. rule text
// TODO: 7.9.16 change assets?
super.gameLoaded(gameState);
initScene();
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 416c0b8a5..9fe4e1f45 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
@@ -31,7 +31,7 @@ public class RunesCluster extends Group implements IRune{
rune1.setX(rune2.getWidth() * OVERLAPPING);
addActor(rune1);
}
- setY(0);
+ setSize(getWidth(),getHeight());
}
@Override
@@ -39,6 +39,12 @@ public class RunesCluster extends Group implements IRune{
return rune1.getWidth()*OVERLAPPING + rune2.getWidth();
}
+ @Override
+ public float getHeight() {
+ if (rune1.getHeight() > rune2.getHeight()) return rune1.getHeight();
+ else return rune2.getHeight();
+ }
+
@Override
public RuneDefinition getType() {
return rune1.getType();
diff --git a/core/src/cz/nic/tablexia/game/games/runes/actors/RunesHolder.java b/core/src/cz/nic/tablexia/game/games/runes/actors/RunesHolder.java
index 7d58102da..d73209cf1 100644
--- a/core/src/cz/nic/tablexia/game/games/runes/actors/RunesHolder.java
+++ b/core/src/cz/nic/tablexia/game/games/runes/actors/RunesHolder.java
@@ -111,8 +111,7 @@ public class RunesHolder extends Group {
}
if (clickListener != null) newActor.addListener(clickListener);
runesGroup.addActor(newActor);
- setWidth(getWidth() + newActor.getWidth());
- // FIXME: 7.9.16 missing space between runes
+ setWidth(getWidth() + newActor.getWidth() + runesGroup.getSpace());
}
}
diff --git a/core/src/cz/nic/tablexia/game/games/runes/model/RunesGameProperties.java b/core/src/cz/nic/tablexia/game/games/runes/model/RunesGameProperties.java
index 6717559a0..f5894b7b4 100644
--- a/core/src/cz/nic/tablexia/game/games/runes/model/RunesGameProperties.java
+++ b/core/src/cz/nic/tablexia/game/games/runes/model/RunesGameProperties.java
@@ -23,7 +23,6 @@ public class RunesGameProperties {
public static final int[] RUNES_TO_FIND = {2,2,3,3,3,3,4,4,4,5,5,6}; //44
// public static final int[] RUNES_TO_FIND = {6,6,6,6,6,6,6,6,6,6,6,6}; //44
- // TODO: 7.9.16 change path and filenames
public static final String MFX_PATH = "common/sfx/";
public static final String[] RESULT_SOUNDS = new String[]{ MFX_PATH + "result_0.mp3",
--
GitLab