Commit dba1882b authored by Aneta Steimarova's avatar Aneta Steimarova

Merge branch 'V3.7' into feature-HD-assets-crime-scene

parents 9fbc73d9 260074c9
......@@ -153,7 +153,7 @@ robbery_1_limit_description=Za 3 poháry na střední úroveň
robbery_2_limit=Bytelně nedobytný
robbery_2_limit_description=Za 3 poháry na těžkou úroveň
robbery_bonus_finished=Zlatá mříž
robbery_bonus_finished_description=Za dohrání na bonusovou obtížnost hru
robbery_bonus_finished_description=Za 3 poháry na bonusovou úroveň hry
# <!-- Pursuit -->
pursuit_1_finished=Kompas
......@@ -167,7 +167,7 @@ pursuit_1_limit_description=Za 3 poháry na střední úroveň
pursuit_2_limit=Na plný plyn
pursuit_2_limit_description=Za 3 poháry na těžkou úroveň
pursuit_bonus_finished=Atlas světa
pursuit_bonus_finished_description=Za dohrání na bonusovou obtížnost hru
pursuit_bonus_finished_description=Za 3 poháry na bonusovou úroveň hry
# <!-- Kidnapping -->
kidnapping_1_finished=Nastražené ucho
......@@ -180,8 +180,8 @@ kidnapping_1_limit=Spící netopýr
kidnapping_1_limit_description=Za 3 poháry na střední úroveň
kidnapping_2_limit=Netopýří koruna
kidnapping_2_limit_description=Za 3 poháry na těžkou úroveň
kidnapping_bonus_finished=Kovadlinka
kidnapping_bonus_finished_description=Za dohrání na bonusovou obtížnost hru
kidnapping_bonus_finished=Kovadlina
kidnapping_bonus_finished_description=Za 3 poháry na bonusovou úroveň hry
# <!-- Night watch -->
night_watch_1_finished=Večernice
......@@ -195,7 +195,7 @@ night_watch_1_limit_description=Za 3 poháry na střední úroveň
night_watch_2_limit=Výr velký
night_watch_2_limit_description=Za 3 poháry na těžkou úroveň
night_watch_bonus_finished=Dalekohled De Luxe
night_watch_bonus_finished_description=Za dohrání na bonusovou obtížnost hru
night_watch_bonus_finished_description=Za 3 poháry na bonusovou úroveň hry
# <!-- Shooting range -->
shooting_range_1_finished=Sváteční střelec
......@@ -209,7 +209,7 @@ shooting_range_1_limit_description=Za 3 poháry na střední úroveň
shooting_range_2_limit=Billy Ustřel-mouchu-z-nosu
shooting_range_2_limit_description=Za 3 poháry na těžkou úroveň
shooting_range_bonus_finished=Davidův prak
shooting_range_bonus_finished_description=Za dohrání na bonusovou obtížnost hru
shooting_range_bonus_finished_description=Za 3 poháry na bonusovou úroveň hry
# <!-- In the darkness -->
in_the_darkness_1_finished=Svit lucerny
......@@ -223,7 +223,7 @@ in_the_darkness_1_limit_description=Za 3 poháry na střední úroveň
in_the_darkness_2_limit=Pohmatu
in_the_darkness_2_limit_description=Za 3 poháry na těžkou úroveň
in_the_darkness_bonus_finished=Pytel plný zlata
in_the_darkness_bonus_finished_description=Za dohrání na bonusovou obtížnost hru
in_the_darkness_bonus_finished_description=Za 3 poháry na bonusovou úroveň hry
# <!-- Crime Scene -->
crime_scene_1_finished=Památníček
......@@ -237,7 +237,7 @@ crime_scene_1_limit_description=Za 3 poháry na střední úroveň
crime_scene_2_limit=Sloní paměť
crime_scene_2_limit_description=Za 3 poháry na těžkou úroveň
crime_scene_bonus_finished=Památkář
crime_scene_bonus_finished_description=Za dohrání na bonusovou obtížnost hru
crime_scene_bonus_finished_description=Za 3 poháry na bonusovou úroveň hry
# <!-- Runes -->
runes_1_finished=Vševidoucí brýle
......@@ -251,7 +251,7 @@ runes_1_limit_description=Za 3 poháry na střední úroveň
runes_2_limit=Bystrozrak
runes_2_limit_description=Za 3 poháry na těžkou úroveň
runes_bonus_finished=Nedostižný Tagger
runes_bonus_finished_description=Za dohrání na bonusovou obtížnost hru
runes_bonus_finished_description=Za 3 poháry na bonusovou úroveň hry
# <!-- Protocol -->
protocol_1_finished=Zlatá složka
......@@ -265,7 +265,7 @@ protocol_1_limit_description=Za 3 poháry na střední úroveň
protocol_2_limit=Aranžér
protocol_2_limit_description=Za 3 poháry na těžkou úroveň
protocol_bonus_finished=Protokolář
protocol_bonus_finished_description=Za dohrání na bonusovou obtížnost hru
protocol_bonus_finished_description=Za 3 poháry na bonusovou úroveň hry
# <!-- Safe -->
safe_1_finished=Diamantový pilník
......@@ -279,7 +279,7 @@ safe_1_limit_description=Za 3 poháry na střední úroveň
safe_2_limit=Zámečník
safe_2_limit_description=Za 3 poháry na těžkou úroveň
safe_bonus_finished=Kasařské nádobíčko
safe_bonus_finished_description=Za dohrání na bonusovou obtížnost hru
safe_bonus_finished_description=Za 3 poháry na bonusovou úroveň hry
# <!-- Specialni trofeje -->
user_consecutively3days=Prasklina ve zdi
......
......@@ -153,8 +153,8 @@ robbery_1_limit=Unbezwingbar
robbery_1_limit_description=Für 3 Pokale auf der mittleren Stufe
robbery_2_limit=Solide unbezwingbar
robbery_2_limit_description=Für 3 Pokale auf der schwierigen Stufe
robbery_bonus_finished=<DE>Zlatá mříž<DE>
robbery_bonus_finished_description=<DE>Za dohrání na bonusovou obtížnost hru<DE>
robbery_bonus_finished=Goldenes Gitter
robbery_bonus_finished_description=Für 3 Pokale auf der Bonusschwierigkeit des Spieles
# <!-- Pursuit -->
pursuit_1_finished=Kompass
......@@ -167,8 +167,8 @@ pursuit_1_limit=Volldampf
pursuit_1_limit_description=Für 3 Pokale auf der mittleren Stufe
pursuit_2_limit=Voll aufs Gas
pursuit_2_limit_description=Für 3 Pokale auf der schwierigen Stufe
pursuit_bonus_finished=<DE>Atlas světa<DE>
pursuit_bonus_finished_description=<DE>Za dohrání na bonusovou obtížnost hru<DE>
pursuit_bonus_finished=Weltatlas
pursuit_bonus_finished_description=Für 3 Pokale auf der Bonusschwierigkeit des Spieles
# <!-- Kidnapping -->
kidnapping_1_finished=Aufgestelltes Ohr
......@@ -181,8 +181,8 @@ kidnapping_1_limit=Schlafende Fledermaus
kidnapping_1_limit_description=Für 3 Pokale auf der mittleren Stufe
kidnapping_2_limit=Fledermaus-Krone
kidnapping_2_limit_description=Für 3 Pokale auf der schwierigen Stufe
kidnapping_bonus_finished=<DE>Kovadlinka<DE>
kidnapping_bonus_finished_description=<DE>Za dohrání na bonusovou obtížnost hru<DE>
kidnapping_bonus_finished=Amboss
kidnapping_bonus_finished_description=Für 3 Pokale auf der Bonusschwierigkeit des Spieles
# <!-- Night watch -->
night_watch_1_finished=Abendstern
......@@ -195,8 +195,8 @@ night_watch_1_limit=Kauz
night_watch_1_limit_description=Für 3 Pokale auf der mittleren Stufe
night_watch_2_limit=Uhu
night_watch_2_limit_description=Für 3 Pokale auf der schwierigen Stufe
night_watch_bonus_finished=<DE>Dalekohled De Luxe<DE>
night_watch_bonus_finished_description=<DE>Za dohrání na bonusovou obtížnost hru<DE>
night_watch_bonus_finished=Fernglas Deluxe
night_watch_bonus_finished_description=Für 3 Pokale auf der Bonusschwierigkeit des Spieles
# <!-- Shooting range -->
shooting_range_1_finished=Sonntags-Schütze
......@@ -209,8 +209,8 @@ shooting_range_1_limit=Johnny Schießt-den-Apfel-vom-Kopf
shooting_range_1_limit_description=Für 3 Pokale auf der mittleren Stufe
shooting_range_2_limit=Billy Schießt-die-Fliege-von-der-Nase
shooting_range_2_limit_description=Für 3 Pokale auf der schwierigen Stufe
shooting_range_bonus_finished=<DE>Davidův prak<DE>
shooting_range_bonus_finished_description=<DE>Za dohrání na bonusovou obtížnost hru<DE>
shooting_range_bonus_finished=Davids Schleuder
shooting_range_bonus_finished_description=Für 3 Pokale auf der Bonusschwierigkeit des Spieles
# <!-- In the darkness -->
in_the_darkness_1_finished=Licht der Laterne
......@@ -223,8 +223,8 @@ in_the_darkness_1_limit=Blind
in_the_darkness_1_limit_description=Für 3 Pokale auf mittlerer Schwierigkeit
in_the_darkness_2_limit=Tastend
in_the_darkness_2_limit_description=Für 3 Pokale auf der schwierigen Stufe
in_the_darkness_bonus_finished=<DE>Pytel plný zlata<DE>
in_the_darkness_bonus_finished_description=<DE>Za dohrání na bonusovou obtížnost hru<DE>
in_the_darkness_bonus_finished=Sack voll Gold
in_the_darkness_bonus_finished_description=Für 3 Pokale auf der Bonusschwierigkeit des Spieles
# <!-- Crime Scene -->
crime_scene_1_finished=Erinnerungsbuch
......@@ -237,8 +237,8 @@ crime_scene_1_limit=Elefantenkalbes Gedächtnis
crime_scene_1_limit_description=Für 3 Pokale auf mittlerer Schwierigkeit
crime_scene_2_limit=Elefanten Gedächtnis
crime_scene_2_limit_description=Für 3 Pokale auf der schwierigen Stufe
crime_scene_bonus_finished=<DE>Památkář<DE>
crime_scene_bonus_finished_description=<DE>Za dohrání na bonusovou obtížnost hru<DE>
crime_scene_bonus_finished=Gedächtnis-Schützer
crime_scene_bonus_finished_description=Für 3 Pokale auf der Bonusschwierigkeit des Spieles
# <!-- Runes -->
runes_1_finished=Alles-Seher-Brille
......@@ -251,8 +251,8 @@ runes_1_limit=Adlerauge
runes_1_limit_description=Für 3 Pokale auf mittlerer Schwierigkeit
runes_2_limit=Scharfäugig
runes_2_limit_description=Für 3 Pokale auf der schwierigen Stufe
runes_bonus_finished=<DE>Nedostižný Tagger<DE>
runes_bonus_finished_description=<DE>Za dohrání na bonusovou obtížnost hru<DE>
runes_bonus_finished=Unerreichbar Tagger
runes_bonus_finished_description=Für 3 Pokale auf der Bonusschwierigkeit des Spieles
# <!-- Protocol -->
protocol_1_finished=goldene Mappe
......@@ -265,8 +265,8 @@ protocol_1_limit=Archivar
protocol_1_limit_description=Für 3 Pokale auf mittlerer Schwierigkeit
protocol_2_limit=Arrangeur
protocol_2_limit_description=Für 3 Pokale auf der schwierigen Stufe
protocol_bonus_finished=<DE>Protokolář<DE>
protocol_bonus_finished_description=<DE>Za dohrání na bonusovou obtížnost hru<DE>
protocol_bonus_finished=Protokollant
protocol_bonus_finished_description=Für 3 Pokale auf der Bonusschwierigkeit des Spieles
# <!-- Safe -->
safe_1_finished=Diamantfeile
......@@ -279,8 +279,8 @@ safe_1_limit=Langfinger
safe_1_limit_description=Für 3 Pokale auf mittlerer Schwierigkeit
safe_2_limit=Schlosser
safe_2_limit_description=Für 3 Pokale auf der schwierigen Stufe
safe_bonus_finished=<DE>Kasařské nádobíčko<DE>
safe_bonus_finished_description=<DE>Za dohrání na bonusovou obtížnost hru<DE>
safe_bonus_finished=Knacker-Werkzeug
safe_bonus_finished_description=Für 3 Pokale auf der Bonusschwierigkeit des Spieles
# <!-- Specialni trofeje -->
user_consecutively3days=Riss in der Wand
......
......@@ -154,8 +154,8 @@ robbery_1_limit=Nedobytný
robbery_1_limit_description=Za 3 poháre na strednú úroveň
robbery_2_limit=Pevne nedobytný
robbery_2_limit_description=Za tri poháre na ťažkú úroveň
robbery_bonus_finished=<SK>Zlatá mříž<SK>
robbery_bonus_finished_description=<SK>Za dohrání na bonusovou obtížnost hru<SK>
robbery_bonus_finished=Zlatá mreža
robbery_bonus_finished_description=Za 3 poháre na bonusovú úroveň hry
# <!-- Pursuit -->
pursuit_1_finished=Kompas
......@@ -168,8 +168,8 @@ pursuit_1_limit=Plnou parou
pursuit_1_limit_description=Za tri poháre na strednú úroveň
pursuit_2_limit=Na plný plyn
pursuit_2_limit_description=Za 3 poháre na ťažkú úroveň
pursuit_bonus_finished=<SK>Atlas světa<SK>
pursuit_bonus_finished_description=<SK>Za dohrání na bonusovou obtížnost hru<SK>
pursuit_bonus_finished=Atlas sveta
pursuit_bonus_finished_description=Za 3 poháre na bonusovú úroveň hry
# <!-- Kidnapping -->
kidnapping_1_finished=Nastražené ucho
......@@ -182,8 +182,8 @@ kidnapping_1_limit=Spiaci netopier
kidnapping_1_limit_description=Za tri poháre na strednú úroveň
kidnapping_2_limit=Netopierská koruna
kidnapping_2_limit_description=Za tri poháre na ťažkú úroveň
kidnapping_bonus_finished=<SK>Kovadlinka<SK>
kidnapping_bonus_finished_description=<SK>Za dohrání na bonusovou obtížnost hru<SK>
kidnapping_bonus_finished=Kovadlina
kidnapping_bonus_finished_description=Za 3 poháre na bonusovú úroveň hry
# <!-- Night watch -->
night_watch_1_finished=Večernica
......@@ -196,8 +196,8 @@ night_watch_1_limit=Sýček
night_watch_1_limit_description=Za 3 poháre na strednú úroveň
night_watch_2_limit=Vír veľký
night_watch_2_limit_description=Za tri poháre na ťažkú úroveň
night_watch_bonus_finished=<SK>Dalekohled De Luxe<SK>
night_watch_bonus_finished_description=<SK>Za dohrání na bonusovou obtížnost hru<SK>
night_watch_bonus_finished=Ďalekohľad Deluxe
night_watch_bonus_finished_description=Za 3 poháre na bonusovú úroveň hry
# <!-- Shooting range -->
shooting_range_1_finished=Sviatočný strelec
......@@ -210,8 +210,8 @@ shooting_range_1_limit=Johnny Na-hlave-jablko-trafil
shooting_range_1_limit_description=Za tri poháre na strednú úroveň
shooting_range_2_limit=Billy Ustrel-muchu-z-nosu
shooting_range_2_limit_description=Za tri poháre na ťažkú úroveň
shooting_range_bonus_finished=<SK>Davidův prak<SK>
shooting_range_bonus_finished_description=<SK>Za dohrání na bonusovou obtížnost hru<SK>
shooting_range_bonus_finished=Dávidov prak
shooting_range_bonus_finished_description=Za 3 poháre na bonusovú úroveň hry
# <!-- In the darkness -->
in_the_darkness_1_finished=Svit lucerny
......@@ -224,8 +224,8 @@ in_the_darkness_1_limit=Poslepiačky
in_the_darkness_1_limit_description=Za tri poháre na strednú úroveň
in_the_darkness_2_limit=Pohmatom
in_the_darkness_2_limit_description=Za tri poháre na ťažkú úroveň
in_the_darkness_bonus_finished=<SK>Pytel plný zlata<SK>
in_the_darkness_bonus_finished_description=<SK>Za dohrání na bonusovou obtížnost hru<SK>
in_the_darkness_bonus_finished=Vrece plné zlata
in_the_darkness_bonus_finished_description=Za 3 poháre na bonusovú úroveň hry
# <!-- Crime Scene -->
crime_scene_1_finished=Pamätníček
......@@ -238,8 +238,8 @@ crime_scene_1_limit=Pamäť sloníčaťa
crime_scene_1_limit_description=Za tri poháre na strednú úroveň
crime_scene_2_limit=Slonia pamäť
crime_scene_2_limit_description=Za tri poháre na ťažkú úroveň
crime_scene_bonus_finished=<SK>Památkář<SK>
crime_scene_bonus_finished_description=<SK>Za dohrání na bonusovou obtížnost hru<SK>
crime_scene_bonus_finished=Pamiatkar
crime_scene_bonus_finished_description=Za 3 poháre na bonusovú úroveň hry
# <!-- Runes -->
runes_1_finished=Vševidiace okuliare
......@@ -252,8 +252,8 @@ runes_1_limit=Ostrovid
runes_1_limit_description=Za tri poháre na strednú úroveň
runes_2_limit=Bystrozrak
runes_2_limit_description=Za tri poháre na ťažkú úroveň
runes_bonus_finished=<SK>Nedostižný Tagger<SK>
runes_bonus_finished_description=<SK>Za dohrání na bonusovou obtížnost hru<SK>
runes_bonus_finished=Nedostihnuteľný Tagger
runes_bonus_finished_description=Za 3 poháre na bonusovú úroveň hry
# <!-- Protocol -->
protocol_1_finished=Zlatá zložka
......@@ -266,8 +266,8 @@ protocol_1_limit=Archivár
protocol_1_limit_description=Za tri poháre na strednú úroveň
protocol_2_limit=Aranžér
protocol_2_limit_description=Za tri poháre na ťažkú úroveň
protocol_bonus_finished=<SK>Protokolář<SK>
protocol_bonus_finished_description=<SK>Za dohrání na bonusovou obtížnost hru<SK>
protocol_bonus_finished=Protokolar
protocol_bonus_finished_description=Za 3 poháre na bonusovú úroveň hry
# <!-- Safe -->
safe_1_finished=Diamantový pilník
......@@ -280,8 +280,8 @@ safe_1_limit=Vreckový zlodej
safe_1_limit_description=Za tri poháre na strednú úroveň
safe_2_limit=Zámočník
safe_2_limit_description=Za tri poháre na ťažkú úroveň
safe_bonus_finished=<SK>Kasařské nádobíčko<SK>
safe_bonus_finished_description=<SK>Za dohrání na bonusovou obtížnost hru<SK>
safe_bonus_finished=Náradie zlodejov
safe_bonus_finished_description=Za 3 poháre na bonusovú úroveň hry
# <!-- Specialni trofeje -->
user_consecutively3days=Prasklina v stene
......
......@@ -35,21 +35,21 @@ public enum GameTrophyDefinition implements ITrophyDefinition {
ROBBERY_PLAY3(GameDefinition.ROBBERY, GameTrophyTypeDefinition.PLAY_LIMIT_3, "robbery_10_finished", "robbery_10_finished_description", 10, new GameTrophy.NumberOfTimesFinished()), //2
ROBBERY_DIFF1(GameDefinition.ROBBERY, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_1, "robbery_1_limit", "robbery_1_limit_description", GameDifficulty.MEDIUM.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()), //3
ROBBERY_DIFF2(GameDefinition.ROBBERY, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_2, "robbery_2_limit", "robbery_2_limit_description", GameDifficulty.HARD.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()),//4
ROBBERY_BONUS(GameDefinition.ROBBERY, GameTrophyTypeDefinition.BONUS_PLAYED, "robbery_bonus_finished", "robbery_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.GamePlayed()),//5
ROBBERY_BONUS(GameDefinition.ROBBERY, GameTrophyTypeDefinition.BONUS_PLAYED, "robbery_bonus_finished", "robbery_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()),//5
PURSUIT_PLAY1(GameDefinition.PURSUIT, GameTrophyTypeDefinition.PLAY_LIMIT_1, "pursuit_1_finished", "pursuit_1_finished_description", 1, new GameTrophy.NumberOfTimesFinished()), //6
PURSUIT_PLAY2(GameDefinition.PURSUIT, GameTrophyTypeDefinition.PLAY_LIMIT_2, "pursuit_5_finished", "pursuit_5_finished_description", 5, new GameTrophy.NumberOfTimesFinished()), //7
PURSUIT_PLAY3(GameDefinition.PURSUIT, GameTrophyTypeDefinition.PLAY_LIMIT_3, "pursuit_10_finished", "pursuit_10_finished_description", 10, new GameTrophy.NumberOfTimesFinished()), //8
PURSUIT_DIFF1(GameDefinition.PURSUIT, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_1, "pursuit_1_limit", "pursuit_1_limit_description", GameDifficulty.MEDIUM.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()), //9
PURSUIT_DIFF2(GameDefinition.PURSUIT, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_2, "pursuit_2_limit", "pursuit_2_limit_description", GameDifficulty.HARD.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()),//10
PURSUIT_BONUS(GameDefinition.PURSUIT, GameTrophyTypeDefinition.BONUS_PLAYED, "pursuit_bonus_finished", "pursuit_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.GamePlayed()),//11
PURSUIT_BONUS(GameDefinition.PURSUIT, GameTrophyTypeDefinition.BONUS_PLAYED, "pursuit_bonus_finished", "pursuit_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()),//11
KIDNAPPING_PLAY1(GameDefinition.KIDNAPPING, GameTrophyTypeDefinition.PLAY_LIMIT_1, "kidnapping_1_finished", "kidnapping_1_finished_description", 1, new GameTrophy.NumberOfTimesFinished()), //12
KIDNAPPING_PLAY2(GameDefinition.KIDNAPPING, GameTrophyTypeDefinition.PLAY_LIMIT_2, "kidnapping_5_finished", "kidnapping_5_finished_description", 5, new GameTrophy.NumberOfTimesFinished()), //13
KIDNAPPING_PLAY3(GameDefinition.KIDNAPPING, GameTrophyTypeDefinition.PLAY_LIMIT_3, "kidnapping_10_finished", "kidnapping_10_finished_description", 10, new GameTrophy.NumberOfTimesFinished()), //14
KIDNAPPING_DIFF1(GameDefinition.KIDNAPPING, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_1, "kidnapping_1_limit", "kidnapping_1_limit_description", GameDifficulty.MEDIUM.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()), //15
KIDNAPPING_DIFF2(GameDefinition.KIDNAPPING, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_2, "kidnapping_2_limit", "kidnapping_2_limit_description", GameDifficulty.HARD.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()),//16
KIDNAPPING_BONUS(GameDefinition.KIDNAPPING, GameTrophyTypeDefinition.BONUS_PLAYED, "kidnapping_bonus_finished", "kidnapping_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.GamePlayed()),//17
KIDNAPPING_BONUS(GameDefinition.KIDNAPPING, GameTrophyTypeDefinition.BONUS_PLAYED, "kidnapping_bonus_finished", "kidnapping_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()),//17
NIGHT_WATCH_PLAY1(GameDefinition.NIGHT_WATCH, GameTrophyTypeDefinition.PLAY_LIMIT_1, "night_watch_1_finished", "night_watch_1_finished_description", 1, new GameTrophy.NumberOfTimesFinished()), //18
......@@ -57,7 +57,7 @@ public enum GameTrophyDefinition implements ITrophyDefinition {
NIGHT_WATCH_PLAY3(GameDefinition.NIGHT_WATCH, GameTrophyTypeDefinition.PLAY_LIMIT_3, "night_watch_10_finished", "night_watch_10_finished_description",10, new GameTrophy.NumberOfTimesFinished()), //20
NIGHT_WATCH_DIFF1(GameDefinition.NIGHT_WATCH, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_1, "night_watch_1_limit", "night_watch_1_limit_description", GameDifficulty.MEDIUM.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()), //21
NIGHT_WATCH_DIFF2(GameDefinition.NIGHT_WATCH, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_2, "night_watch_2_limit", "night_watch_2_limit_description",GameDifficulty.HARD.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()),//22
NIGHT_WATCH_BONUS(GameDefinition.NIGHT_WATCH, GameTrophyTypeDefinition.BONUS_PLAYED, "night_watch_bonus_finished", "night_watch_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.GamePlayed()),//23
NIGHT_WATCH_BONUS(GameDefinition.NIGHT_WATCH, GameTrophyTypeDefinition.BONUS_PLAYED, "night_watch_bonus_finished", "night_watch_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()),//23
SHOOTING_RANGE_PLAY1(GameDefinition.SHOOTING_RANGE, GameTrophyTypeDefinition.PLAY_LIMIT_1, "shooting_range_1_finished", "shooting_range_1_finished_description", 1, new GameTrophy.NumberOfTimesFinished()), //24
......@@ -65,21 +65,21 @@ public enum GameTrophyDefinition implements ITrophyDefinition {
SHOOTING_RANGE_PLAY3(GameDefinition.SHOOTING_RANGE, GameTrophyTypeDefinition.PLAY_LIMIT_3, "shooting_range_10_finished", "shooting_range_10_finished_description", 10, new GameTrophy.NumberOfTimesFinished()), //26
SHOOTING_RANGE_DIFF1(GameDefinition.SHOOTING_RANGE, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_1, "shooting_range_1_limit", "shooting_range_1_limit_description", GameDifficulty.MEDIUM.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()), //27
SHOOTING_RANGE_DIFF2(GameDefinition.SHOOTING_RANGE, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_2, "shooting_range_2_limit", "shooting_range_2_limit_description", GameDifficulty.HARD.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()),//28
SHOOTING_RANGE_BONUS(GameDefinition.SHOOTING_RANGE, GameTrophyTypeDefinition.BONUS_PLAYED, "shooting_range_bonus_finished", "shooting_range_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.GamePlayed()),//29
SHOOTING_RANGE_BONUS(GameDefinition.SHOOTING_RANGE, GameTrophyTypeDefinition.BONUS_PLAYED, "shooting_range_bonus_finished", "shooting_range_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()),//29
IN_THE_DARKNESS_PLAY1(GameDefinition.IN_THE_DARKNESS, GameTrophyTypeDefinition.PLAY_LIMIT_1, "in_the_darkness_1_finished", "in_the_darkness_1_finished_description", 1, new GameTrophy.NumberOfTimesFinished()), //30
IN_THE_DARKNESS_PLAY2(GameDefinition.IN_THE_DARKNESS, GameTrophyTypeDefinition.PLAY_LIMIT_2, "in_the_darkness_5_finished","in_the_darkness_5_finished_description", 5, new GameTrophy.NumberOfTimesFinished()), //31
IN_THE_DARKNESS_PLAY3(GameDefinition.IN_THE_DARKNESS, GameTrophyTypeDefinition.PLAY_LIMIT_3, "in_the_darkness_10_finished", "in_the_darkness_10_finished_description", 10, new GameTrophy.NumberOfTimesFinished()), //32
IN_THE_DARKNESS_DIFF1(GameDefinition.IN_THE_DARKNESS, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_1, "in_the_darkness_1_limit", "in_the_darkness_1_limit_description", GameDifficulty.MEDIUM.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()), //33
IN_THE_DARKNESS_DIFF2(GameDefinition.IN_THE_DARKNESS, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_2, "in_the_darkness_2_limit", "in_the_darkness_2_limit_description", GameDifficulty.HARD.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()),//34
IN_THE_DARKNESS_BONUS(GameDefinition.IN_THE_DARKNESS, GameTrophyTypeDefinition.BONUS_PLAYED, "in_the_darkness_bonus_finished", "in_the_darkness_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.GamePlayed()),//35
IN_THE_DARKNESS_BONUS(GameDefinition.IN_THE_DARKNESS, GameTrophyTypeDefinition.BONUS_PLAYED, "in_the_darkness_bonus_finished", "in_the_darkness_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()),//35
CRIME_SCENE_PLAY1(GameDefinition.CRIME_SCENE, GameTrophyTypeDefinition.PLAY_LIMIT_1, "crime_scene_1_finished", "crime_scene_1_finished_description", 1, new GameTrophy.NumberOfTimesFinished()), //36
CRIME_SCENE_PLAY2(GameDefinition.CRIME_SCENE, GameTrophyTypeDefinition.PLAY_LIMIT_2, "crime_scene_5_finished", "crime_scene_5_finished_description", 5, new GameTrophy.NumberOfTimesFinished()), //37
CRIME_SCENE_PLAY3(GameDefinition.CRIME_SCENE, GameTrophyTypeDefinition.PLAY_LIMIT_3, "crime_scene_10_finished", "crime_scene_10_finished_description", 10, new GameTrophy.NumberOfTimesFinished()), //38
CRIME_SCENE_DIFF1(GameDefinition.CRIME_SCENE, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_1, "crime_scene_1_limit", "crime_scene_1_limit_description", GameDifficulty.MEDIUM.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()), //39
CRIME_SCENE_DIFF2(GameDefinition.CRIME_SCENE, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_2, "crime_scene_2_limit", "crime_scene_2_limit_description", GameDifficulty.HARD.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()), //40
CRIME_SCENE_BONUS(GameDefinition.CRIME_SCENE, GameTrophyTypeDefinition.BONUS_PLAYED, "crime_scene_bonus_finished", "crime_scene_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.GamePlayed()),//41
CRIME_SCENE_BONUS(GameDefinition.CRIME_SCENE, GameTrophyTypeDefinition.BONUS_PLAYED, "crime_scene_bonus_finished", "crime_scene_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()),//41
RUNES_PLAY1(GameDefinition.RUNES, GameTrophyTypeDefinition.PLAY_LIMIT_1, "runes_1_finished", "runes_1_finished_description", 1, new GameTrophy.NumberOfTimesFinished()), //42
......@@ -87,7 +87,7 @@ public enum GameTrophyDefinition implements ITrophyDefinition {
RUNES_PLAY3(GameDefinition.RUNES, GameTrophyTypeDefinition.PLAY_LIMIT_3, "runes_10_finished", "runes_10_finished_description", 10, new GameTrophy.NumberOfTimesFinished()), //44
RUNES_DIFF1(GameDefinition.RUNES, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_1, "runes_1_limit", "runes_1_limit_description", GameDifficulty.MEDIUM.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()), //45
RUNES_DIFF2(GameDefinition.RUNES, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_2, "runes_2_limit", "runes_2_limit_description", GameDifficulty.HARD.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()),//46
RUNES_BONUS(GameDefinition.RUNES, GameTrophyTypeDefinition.BONUS_PLAYED, "runes_bonus_finished", "runes_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.GamePlayed()),//47
RUNES_BONUS(GameDefinition.RUNES, GameTrophyTypeDefinition.BONUS_PLAYED, "runes_bonus_finished", "runes_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()),//47
PROTOCOL_PLAY1(GameDefinition.PROTOCOL, GameTrophyTypeDefinition.PLAY_LIMIT_1, "protocol_1_finished", "protocol_1_finished_description", 1, new GameTrophy.NumberOfTimesFinished()), //48
......@@ -95,7 +95,7 @@ public enum GameTrophyDefinition implements ITrophyDefinition {
PROTOCOL_PLAY3(GameDefinition.PROTOCOL, GameTrophyTypeDefinition.PLAY_LIMIT_3, "protocol_10_finished", "protocol_10_finished_description", 10, new GameTrophy.NumberOfTimesFinished()), //50
PROTOCOL_DIFF1(GameDefinition.PROTOCOL, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_1, "protocol_1_limit", "protocol_1_limit_description",GameDifficulty.MEDIUM.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()), //51
PROTOCOL_DIFF2(GameDefinition.PROTOCOL, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_2, "protocol_2_limit", "protocol_2_limit_description",GameDifficulty.HARD.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()), //52
PROTOCOL_BONUS(GameDefinition.PROTOCOL, GameTrophyTypeDefinition.BONUS_PLAYED, "protocol_bonus_finished", "protocol_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.GamePlayed()),//53
PROTOCOL_BONUS(GameDefinition.PROTOCOL, GameTrophyTypeDefinition.BONUS_PLAYED, "protocol_bonus_finished", "protocol_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()),//53
SAFE_PLAY1(GameDefinition.SAFE, GameTrophyTypeDefinition.PLAY_LIMIT_1, "safe_1_finished", "safe_1_finished_description", 1, new GameTrophy.NumberOfTimesFinished()), //54
......@@ -103,7 +103,7 @@ public enum GameTrophyDefinition implements ITrophyDefinition {
SAFE_PLAY3(GameDefinition.SAFE, GameTrophyTypeDefinition.PLAY_LIMIT_3, "safe_10_finished", "safe_10_finished_description", 10, new GameTrophy.NumberOfTimesFinished()), //56
SAFE_DIFF1(GameDefinition.SAFE, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_1, "safe_1_limit", "safe_1_limit_description",GameDifficulty.MEDIUM.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()), //57
SAFE_DIFF2(GameDefinition.SAFE, GameTrophyTypeDefinition.DIFFICULTY_LIMIT_2, "safe_2_limit", "safe_2_limit_description",GameDifficulty.HARD.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()), //58
SAFE_BONUS(GameDefinition.SAFE, GameTrophyTypeDefinition.BONUS_PLAYED, "safe_bonus_finished", "safe_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.GamePlayed()); //59
SAFE_BONUS(GameDefinition.SAFE, GameTrophyTypeDefinition.BONUS_PLAYED, "safe_bonus_finished", "safe_bonus_finished_description", GameDifficulty.BONUS.getDifficultyNumber(), new GameTrophy.ThreeStarsReceived()); //59
private GameDefinition gameDefinition;
......
......@@ -112,50 +112,4 @@ public class GameTrophy {
return false;
}
}
public static class GamePlayed implements GameTrophyResolver {
public static final String GAME_SELECT_FOR_GAME_AND_DIFFICULTY = "SELECT " + GameDAO.GAME_SELECT_COLUMNS + " FROM game WHERE game_number = ? AND difficulty_number = ? AND user_id = ? AND end_time IS NOT NULL";
private static List<Game> getGamesForGameAndDifficulty(User user, GameTrophyDefinition trophyDef) {
List<Game> games = new ArrayList<Game>();
try {
PreparedStatement statement = TablexiaStorage.getInstance().prepareStatement(GAME_SELECT_FOR_GAME_AND_DIFFICULTY);
statement.setInt(1, trophyDef.getGameDefinition().getGameNumber());
statement.setInt(2, trophyDef.getLimit());
statement.setLong(3, user.getId());
try {
ResultSet resultSet = statement.executeQuery();
while (resultSet.next()) {
games.add(GameDAO.prepareGameObject(resultSet));
}
resultSet.close();
} catch (SQLException e) {
Log.err(GameTrophy.class, "Cannot select game with user_id: " + user.getId() + ", game_number: " + trophyDef.getGameDefinition().getGameNumber() + ", difficulty: " + trophyDef.getLimit(), e);
}
statement.close();
} catch (SQLException e) {
Log.err(GameTrophy.class, "Cannot select game with user_id: " + user.getId() + ", game_number: " + trophyDef.getGameDefinition().getGameNumber() + ", difficulty: " + trophyDef.getLimit(), e);
}
return games;
}
@Override
public boolean hasGameTrophy(User user, GameTrophyDefinition trophyDef) {
List<Game> games = getGamesForGameAndDifficulty(user, trophyDef);
if (games.isEmpty()) {
return false;
}
for (Game game : games) {
if (GameDAO.getGameResult(game).getStarCount() == AbstractTablexiaGame.GameResult.THREE_STAR.getStarCount() ||
GameDAO.getGameResult(game).getStarCount() == AbstractTablexiaGame.GameResult.TWO_STAR.getStarCount() ||
GameDAO.getGameResult(game).getStarCount() == AbstractTablexiaGame.GameResult.ONE_STAR.getStarCount() ||
GameDAO.getGameResult(game).getStarCount() == AbstractTablexiaGame.GameResult.NO_STAR.getStarCount()) {
return true;
}
}
return false;
}
}
}
......@@ -17,6 +17,9 @@
package cz.nic.tablexia.testing;
import java.util.ArrayList;
import java.util.List;
import cz.nic.tablexia.Tablexia;
import cz.nic.tablexia.game.AbstractTablexiaGame;
import cz.nic.tablexia.game.GameDefinition;
......@@ -34,31 +37,52 @@ import cz.nic.tablexia.util.ui.TablexiaImage;
* Created by aneta on 15.11.16.
*/
public abstract class AbstractTestScenarioHallOfFameTrophies extends AbstractTestScenario {
public static final int BONUS_TROPHY_MULTIPLE = 6;
public AbstractTestScenarioHallOfFameTrophies(Tablexia tablexia) {
super(tablexia);
}
private void checkTrophy(GameTrophyDefinition gameTrophyDefinition, User user, boolean [] gotTrophies, int i){
writeToLogFile("\tCheck trophy: " + gameTrophyDefinition.toString() + "\n");
swipeToActor("\t\ta. Swipe to trophy " + gameTrophyDefinition.toString(), gameTrophyDefinition.getTrophyName());
if (gotTrophies[i]) checkTrophyFull(user, gameTrophyDefinition);
else checkTrophyEmpty(user, gameTrophyDefinition);
}
protected void checkGameTrophies(int stepNumber, User user, boolean[] gotTrophies) {
writeToLogFile(stepNumber + ". Check all trophies:\n");
int i = 0;
List<GameTrophyDefinition> bonusTrophyDefinitions = new ArrayList<>();
for (GameTrophyDefinition gameTrophyDefinition : GameTrophyDefinition.values()) {
writeToLogFile("\tCheck trophy: " + gameTrophyDefinition.toString() + "\n");
swipeToActor("\t\ta. Swipe to trophy " + gameTrophyDefinition.toString(), gameTrophyDefinition.getTrophyName());
if(gotTrophies[i]) checkTrophyFull(user, gameTrophyDefinition);
else checkTrophyEmpty(user, gameTrophyDefinition);
if((i+1)%BONUS_TROPHY_MULTIPLE == 0) bonusTrophyDefinitions.add(gameTrophyDefinition);
else checkTrophy(gameTrophyDefinition, user, gotTrophies, i);
i++;
}
i=6;
for(GameTrophyDefinition bonusTrophyDefinition: bonusTrophyDefinitions){
checkTrophy(bonusTrophyDefinition, user, gotTrophies, i-1);
i+=BONUS_TROPHY_MULTIPLE;
}
}
private void checkTrophyEmpty(GameTrophyDefinition gameTrophyDefinition, User user){
writeToLogFile("\tCheck empty trophy: " + gameTrophyDefinition.toString() + "\n");
swipeToActor("\t\ta. Swipe to trophy " + gameTrophyDefinition.toString(), gameTrophyDefinition.getTrophyName());
checkTrophyEmpty(user, gameTrophyDefinition);
}
protected void checkAllTrophiesEmpty(int stepNumber, User user) {
writeToLogFile(stepNumber + ". Check if all trophies are empty:\n");
List<GameTrophyDefinition> bonusTrophyDefinitions = new ArrayList<>();
int i=0;
for (GameTrophyDefinition gameTrophyDefinition : GameTrophyDefinition.values()) {
writeToLogFile("\tCheck trophy: " + gameTrophyDefinition.toString() + "\n");
swipeToActor("\t\ta. Swipe to trophy " + gameTrophyDefinition.toString(), gameTrophyDefinition.getTrophyName());
checkTrophyEmpty(user, gameTrophyDefinition);
if((i+1)%BONUS_TROPHY_MULTIPLE == 0) bonusTrophyDefinitions.add(gameTrophyDefinition);
else checkTrophyEmpty(gameTrophyDefinition, user);
i++;
}
for(GameTrophyDefinition bonusTrophyDefinition: bonusTrophyDefinitions) checkTrophyEmpty(bonusTrophyDefinition, user);
}
protected void addNewScoreAndGoToHallOfFame(int stepNumber, User user, GameDifficulty gameDifficulty, GameDefinition gameDefinition, AbstractTablexiaGame.GameResult gameResult) {
......
......@@ -208,7 +208,7 @@ public class TestScenarioHallOfFameCrimeSceneTrophies extends AbstractTestScenar
false, false, false, false, false, false}); //SAFE
writeToLogFile("\nADD GAME CRIME_SCENE BONUS 2 STARS ---> CHECK TROPHIES\n");
addNewScoreAndGoToHallOfFame(31, user, GameDifficulty.BONUS, GameDefinition.CRIME_SCENE, AbstractTablexiaGame.GameResult.TWO_STAR); //get _BONUS
addNewScoreAndGoToHallOfFame(31, user, GameDifficulty.BONUS, GameDefinition.CRIME_SCENE, AbstractTablexiaGame.GameResult.THREE_STAR); //get _BONUS
checkGameTrophies(32, user, new boolean[]{ false, false, false, false, false, false, //ROBBERY
false, false, false, false, false, false, //PURSUIT
false, false, false, false, false, false, //KIDNAPPING
......
......@@ -209,7 +209,7 @@ public class TestScenarioHallOfFameInTheDarknessTrophies extends AbstractTestSce
false, false, false, false, false, false}); //SAFE
writeToLogFile("\nADD GAME IN_THE_DARKNESS BONUS 1 STAR ---> CHECK TROPHIES\n");
addNewScoreAndGoToHallOfFame(31, user, GameDifficulty.BONUS, GameDefinition.IN_THE_DARKNESS, AbstractTablexiaGame.GameResult.ONE_STAR); //get _BONUS
addNewScoreAndGoToHallOfFame(31, user, GameDifficulty.BONUS, GameDefinition.IN_THE_DARKNESS, AbstractTablexiaGame.GameResult.THREE_STAR); //get _BONUS
checkGameTrophies(32, user, new boolean[]{ false, false, false, false, false, false, //ROBBERY
false, false, false, false, false, false, //PURSUIT
false, false, false, false, false, false, //KIDNAPPING
......
......@@ -208,7 +208,7 @@ public class TestScenarioHallOfFameKidnappingTrophies extends AbstractTestScenar
false, false, false, false, false, false}); //SAFE
writeToLogFile("\nADD GAME KIDNAPPING BONUS 0 STARS ---> CHECK TROPHIES\n");
addNewScoreAndGoToHallOfFame(31, user, GameDifficulty.BONUS, GameDefinition.KIDNAPPING, AbstractTablexiaGame.GameResult.NO_STAR); //get _BONUS
addNewScoreAndGoToHallOfFame(31, user, GameDifficulty.BONUS, GameDefinition.KIDNAPPING, AbstractTablexiaGame.GameResult.THREE_STAR); //get _BONUS
checkGameTrophies(32, user, new boolean[]{ false, false, false, false, false, false, //ROBBERY
false, false, false, false, false, false, //PURSUIT
true, true, true, true, true, true, //KIDNAPPING
......
......@@ -208,7 +208,7 @@ public class TestScenarioHallOfFamePursuitTrophies extends AbstractTestScenarioH
false, false, false, false, false, false}); //SAFE
writeToLogFile("\nADD GAME PURSUIT BONUS 1 STAR ---> CHECK TROPHIES\n");
addNewScoreAndGoToHallOfFame(31, user, GameDifficulty.BONUS, GameDefinition.PURSUIT, AbstractTablexiaGame.GameResult.ONE_STAR); //get _BONUS
addNewScoreAndGoToHallOfFame(31, user, GameDifficulty.BONUS, GameDefinition.PURSUIT, AbstractTablexiaGame.GameResult.THREE_STAR); //get _BONUS
checkGameTrophies(32, user, new boolean[]{ false, false, false, false, false, false, //ROBBERY
true, true, true, true, true, true, //PURSUIT
false, false, false, false, false, false, //KIDNAPPING
......
......@@ -208,7 +208,7 @@ public class TestScenarioHallOfFameRobberyTrophies extends AbstractTestScenarioH
false, false, false, false, false, false}); //SAFE
writeToLogFile("\nADD GAME ROBBERY BONUS 2 STARS ---> CHECK TROPHIES\n");
addNewScoreAndGoToHallOfFame(31, user, GameDifficulty.BONUS, GameDefinition.ROBBERY, AbstractTablexiaGame.GameResult.TWO_STAR); //get _BONUS
addNewScoreAndGoToHallOfFame(31, user, GameDifficulty.BONUS, GameDefinition.ROBBERY, AbstractTablexiaGame.GameResult.THREE_STAR); //get _BONUS
checkGameTrophies(32, user, new boolean[]{ true, true, true, true, true, true, //ROBBERY
false, false, false, false, false, false, //PURSUIT
false, false, false, false, false, false, //KIDNAPPING
......
......@@ -205,7 +205,7 @@ public class TestScenarioHallOfFameSafeTrophies extends AbstractTestScenarioHall
true, true, true, true, true, false}); //SAFE
writeToLogFile("\nADD GAME SAFE BONUS 1 STAR ---> CHECK TROPHIES\n");
addNewScoreAndGoToHallOfFame(31, user, GameDifficulty.BONUS, GameDefinition.SAFE, AbstractTablexiaGame.GameResult.ONE_STAR); //get _BONUS
addNewScoreAndGoToHallOfFame(31, user, GameDifficulty.BONUS, GameDefinition.SAFE, AbstractTablexiaGame.GameResult.THREE_STAR); //get _BONUS
checkGameTrophies(32, user, new boolean[]{ false, false, false, false, false, false, //ROBBERY
false, false, false, false, false, false, //PURSUIT
false, false, false, false, false, false, //KIDNAPPING
......
......@@ -208,7 +208,7 @@ public class TestScenarioHallOfFameShootingRangeTrophies extends AbstractTestSce
false, false, false, false, false, false}); //SAFE
writeToLogFile("\nADD GAME SHOOTING_RANGE BONUS 0 STARS ---> CHECK TROPHIES\n");
addNewScoreAndGoToHallOfFame(31, user, GameDifficulty.BONUS, GameDefinition.SHOOTING_RANGE, AbstractTablexiaGame.GameResult.NO_STAR); //get _BONUS
addNewScoreAndGoToHallOfFame(31, user, GameDifficulty.BONUS, GameDefinition.SHOOTING_RANGE, AbstractTablexiaGame.GameResult.THREE_STAR); //get _BONUS
checkGameTrophies(32, user, new boolean[]{ false, false, false, false, false, false, //ROBBERY
false, false, false, false, false, false, //PURSUIT
false, false, false, false, false, false, //KIDNAPPING
......
Markdown is supported
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