Skip to content
Snippets Groups Projects
Commit b4b4791e authored by Matyáš Latner's avatar Matyáš Latner
Browse files

Merge branch 'feature-crimescene' into 'V3.4'

#623 Added new gamescores for CrimeScene. (rounds_finished, replay_count)

Zamergovat spolecne s https://gitlab.labs.nic.cz/labs/tablexia-model/merge_requests/15

See merge request !506
parents 262be3e8 95b9d410
Branches
Tags
No related merge requests found
tablexia-shared @ 898bf51c
Subproject commit fc4a4521a08566e4981de7ba2c0c74466597762c
Subproject commit 898bf51c1998d8d989242c5021c5fb19aea07c0e
......@@ -84,6 +84,8 @@ public class CrimeSceneGame extends AbstractTablexiaGame<CrimeSceneGameState> {
private static final String SCORE_KEY_COUNT = CrimeSceneScoreResolver.SCORE_KEY_COUNT;
private static final String RESULT_SCORE_COUNT = CrimeSceneScoreResolver.RESULT_SCORE_COUNT;
private static final String REPLAY_COUNT = CrimeSceneScoreResolver.REPLAY_COUNT;
private static final String FINISHED_ROUNDS = CrimeSceneScoreResolver.FINISHED_ROUNDS;
private static final float ANIMATION_DURATION = 0.3f;
private static final float FADE_DURATION = 1f;
......@@ -341,6 +343,7 @@ public class CrimeSceneGame extends AbstractTablexiaGame<CrimeSceneGameState> {
hideLastTouchedAction();
playAllSounds();
repeatTaskCount++;
setGameScore(REPLAY_COUNT, repeatTaskCount);
if(getReplayCountLeft() == 0) replayButton.setDisabled();
}
});
......@@ -469,6 +472,8 @@ public class CrimeSceneGame extends AbstractTablexiaGame<CrimeSceneGameState> {
actualNumberOfGameObjects++;
}
setGameScore(FINISHED_ROUNDS, level);
if(level < MAX_ROUNDS && wrongRounds < MAX_WRONG_ROUNDS) {
getData().setSolution(getGameDifficulty(), ++level, actualNumberOfGameObjects);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment