diff --git a/android/assets/text/application/application_de.properties b/android/assets/text/application/application_de.properties index 7a82e3bbc853bf7635a629f525424c5f50846e85..0fadb27689eac88df54dc0bd57bb2c150acd9f47 100644 --- a/android/assets/text/application/application_de.properties +++ b/android/assets/text/application/application_de.properties @@ -120,7 +120,7 @@ night_watch_2_limit_description=FĂĽr 3 Pokale auf der schwierigen Stufe # <!-- Shooting range --> shooting_range_1_finished=Sonntags-SchĂĽtze shooting_range_1_finished_description=FĂĽr das Beenden des ersten Spiels -shooting_range_5_finished=Revolverheld am Mehrlader +shooting_range_5_finished=Ein Profi im Nachladen shooting_range_5_finished_description=FĂĽr fĂĽnf beendete Spiele shooting_range_10_finished=Ein Schuss nach dem anderen shooting_range_10_finished_description=FĂĽr 10 beendete Spiele @@ -152,5 +152,5 @@ user_consecutivelyallgames0stars=Goldener KnĂĽppel user_consecutivelyallgames0stars_description=FĂĽr das Spielen aller Spiele an einem Tag user_consecutivelyallgames2stars=Wachhund user_consecutivelyallgames2stars_description=FĂĽr alle Spiele nacheinander auf der mittleren Stufe mit drei Pokalen -user_consecutivelyallgames3stars=Als Detektiv ein Raubtier +user_consecutivelyallgames3stars=Als DetektivIn ein Raubtier user_consecutivelyallgames3stars_description=FĂĽr alle Spiele nacheinander auf der schwierigen Stufe mit drei Pokalen diff --git a/core/external b/core/external index 17f7d92b6b507736f75c8ba45498b08b24e7469c..2bb2daf34f200050309ff8084c62fb047cf8e830 160000 --- a/core/external +++ b/core/external @@ -1 +1 @@ -Subproject commit 17f7d92b6b507736f75c8ba45498b08b24e7469c +Subproject commit 2bb2daf34f200050309ff8084c62fb047cf8e830 diff --git a/core/src/cz/nic/tablexia/screen/halloffame/HallOfFameScreen.java b/core/src/cz/nic/tablexia/screen/halloffame/HallOfFameScreen.java index 94e9555e2dcffa06d6dadec805dd4eb6cb08b1f5..955169171db26e2cc54b09e3205b2075325578ac 100644 --- a/core/src/cz/nic/tablexia/screen/halloffame/HallOfFameScreen.java +++ b/core/src/cz/nic/tablexia/screen/halloffame/HallOfFameScreen.java @@ -39,6 +39,7 @@ import cz.nic.tablexia.screen.halloffame.assets.HallOfFameAssets; import cz.nic.tablexia.screen.halloffame.trophy.TrophyDialog; import cz.nic.tablexia.screen.halloffame.trophy.TrophyHelper; import cz.nic.tablexia.screen.halloffame.trophy.TrophyThreeStarsGamesDialog; +import cz.nic.tablexia.shared.model.User; import cz.nic.tablexia.util.Log; import cz.nic.tablexia.util.Point; import cz.nic.tablexia.util.structure.Trio; @@ -184,12 +185,13 @@ public class HallOfFameScreen extends AbstractTablexiaScreen<Map<ITrophyDefiniti foregroundGroup.setSize(backgroundGroup.getWidth(), SCREEN_SIZE.y); int threeStarsCount = UserTrophy.AllStarsGame.getNumberOfAllStarsResults(getSelectedUser()); + int trophiesCount = getAchievedTrophies(getSelectedUser()); prepareCarpet(); prepareDoorButton(); prepareTrophyHeap(threeStarsCount); prepareTrophies(); - prepareMouse(threeStarsCount); + prepareMouse(trophiesCount); } private void prepareTrophyHeap(int threeStarsCount) { @@ -275,7 +277,7 @@ public class HallOfFameScreen extends AbstractTablexiaScreen<Map<ITrophyDefiniti } } - private void prepareMouse(final int threeStarsCount) { + private void prepareMouse(final int trophiesCount) { TrophyHelper.MouseTexts.resetAllTextCounters(); final TextureRegion mouseTexture = getScreenTextureRegion(HallOfFameAssets.HALL_OF_FAME_MOUSE_UNPRESSED); @@ -297,7 +299,7 @@ public class HallOfFameScreen extends AbstractTablexiaScreen<Map<ITrophyDefiniti final Timer timer = new Timer(); - final DynamicBubbleDialog mouseDialog = new MouseDialog(getText(TrophyHelper.MouseTexts.getMouseText(threeStarsCount)), dialogX, dialogY, MOUSE_DIALOG_WIDTH, MOUSE_DIALOG_HEIGHT); + final DynamicBubbleDialog mouseDialog = new MouseDialog(getText(TrophyHelper.MouseTexts.getMouseText(trophiesCount)), dialogX, dialogY, MOUSE_DIALOG_WIDTH, MOUSE_DIALOG_HEIGHT); mouseDialog.addListener(new ClickListener() { @Override public void clicked(InputEvent event, float x, float y) { @@ -348,4 +350,12 @@ public class HallOfFameScreen extends AbstractTablexiaScreen<Map<ITrophyDefiniti scrollPane.setScrollX(trophyX - TablexiaSettings.getSceneWidth(getStage()) / 2 + trophyWidth / 2); scrollPane.updateVisualScroll(); } + + private int getAchievedTrophies(User user) { + int achievedTrophies = 0; + for(GameTrophyDefinition trophyDefinition : GameTrophyDefinition.values()){ + if(trophyDefinition.hasTrophy(user)) achievedTrophies++; + } + return achievedTrophies; + } } diff --git a/core/src/cz/nic/tablexia/screen/halloffame/trophy/TrophyHelper.java b/core/src/cz/nic/tablexia/screen/halloffame/trophy/TrophyHelper.java index 525fafe74fab9fd5c19d3a8217ffb4561da75d87..5332dc55ed63bcbc09e6f27f30921be4af3d9d78 100644 --- a/core/src/cz/nic/tablexia/screen/halloffame/trophy/TrophyHelper.java +++ b/core/src/cz/nic/tablexia/screen/halloffame/trophy/TrophyHelper.java @@ -107,10 +107,10 @@ public class TrophyHelper { trophiesProperties.put(GameTrophyDefinition.SHOOTING_RANGE_DIFF2, new Trio<Float, Float, Float>(4.27f, 0.7f, 0.4f));// shooting_range_2_limit,28 trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_PLAY1, new Trio<Float, Float, Float>(4.7f, 0.43f, 0.35f));// in_the_darkness_1_finished,32 - trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_PLAY2, new Trio<Float, Float, Float>(4.85f, 0.82f, 0.35f));// in_the_darkness_5_finished,33 - trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_PLAY3, new Trio<Float, Float, Float>(4.9f, 0.05f, 0.35f));// in_the_darkness_10_finished.34 - trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_DIFF1, new Trio<Float, Float, Float>(4.7f, 0.7f, 0.35f));// in_the_darkness_1_limit,31 - trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_DIFF2, new Trio<Float, Float, Float>(5.4f, 0.4f, 0.35f));// in_the_darkness_2_limit,35 + trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_PLAY2, new Trio<Float, Float, Float>(5.05f, 0.77f, 0.35f));// in_the_darkness_5_finished,33 + trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_PLAY3, new Trio<Float, Float, Float>(4.85f, 0.1f, 0.35f));// in_the_darkness_10_finished.34 + trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_DIFF1, new Trio<Float, Float, Float>(4.85f, 0.65f, 0.35f));// in_the_darkness_1_limit,31 + trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_DIFF2, new Trio<Float, Float, Float>(5.23f, 0.4f, 0.35f));// in_the_darkness_2_limit,35 //USER TROPHIES trophiesProperties.put(UserTrophyDefinition.CONSECUTIVELY_DAYSBACK_3, new Trio<Float, Float, Float>(0.87f, 0.38f, 0.5f));//user_consecutively3days,2