Merge branch 'devel' into feature-shootingrange

android/assets/atlases/buttons_atlas.pack

-
-buttons_atlas.png
-size: 512,256
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-tablexiabutton_blank_blue_pressed
-  rotate: false
-  xy: 2, 170
-  size: 157, 82
-  split: 19, 27, 12, 31
-  pad: 15, 22, 10, 29
-  orig: 157, 82
-  offset: 0, 0
-  index: -1
-tablexiabutton_blank_blue_unpressed
-  rotate: false
-  xy: 2, 86
-  size: 157, 82
-  split: 31, 30, 8, 35
-  pad: 17, 18, 8, 32
-  orig: 157, 82
-  offset: 0, 0
-  index: -1
-tablexiabutton_blank_green_pressed
-  rotate: false
-  xy: 161, 170
-  size: 157, 82
-  split: 10, 19, 9, 28
-  pad: 13, 21, 9, 28
-  orig: 157, 82
-  offset: 0, 0
-  index: -1
-tablexiabutton_blank_green_unpressed
-  rotate: false
-  xy: 2, 2
-  size: 157, 82
-  split: 29, 36, 9, 31
-  pad: 18, 19, 6, 32
-  orig: 157, 82
-  offset: 0, 0
-  index: -1
-tablexiabutton_blank_red_pressed
-  rotate: false
-  xy: 161, 86
-  size: 157, 82
-  split: 52, 27, 9, 28
-  pad: 56, 27, 6, 32
-  orig: 157, 82
-  offset: 0, 0
-  index: -1
-tablexiabutton_blank_red_unpressed
-  rotate: false
-  xy: 320, 170
-  size: 157, 82
-  split: 61, 27, 9, 31
-  pad: 60, 27, 6, 32
-  orig: 157, 82
-  offset: 0, 0
-  index: -1
-tablexiabutton_disabled
-  rotate: false
-  xy: 161, 2
-  size: 157, 82
-  split: 40, 36, 12, 33
-  pad: 14, 20, 10, 30
-  orig: 157, 82
-  offset: 0, 0
-  index: -1

android/assets/atlases/dialog_background.atlas

-
-dialog_background.png
-size: 1024,512
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-bubble_arrow_down
-  rotate: false
-  xy: 251, 52
-  size: 158, 101
-  split: 62, 16, 3, 54
-  pad: 5, 7, 2, 52
-  orig: 158, 101
-  offset: 0, 0
-  index: -1
-bubble_arrow_left
-  rotate: false
-  xy: 758, 267
-  size: 158, 101
-  split: 64, 27, 4, 65
-  pad: 7, 9, 3, 51
-  orig: 158, 101
-  offset: 0, 0
-  index: -1
-bubble_classic
-  rotate: false
-  xy: 408, 180
-  size: 123, 69
-  split: 6, 35, 4, 21
-  pad: 7, 5, 5, 19
-  orig: 123, 69
-  offset: 0, 0
-  index: -1
-bubble_classic_continue_button
-  rotate: false
-  xy: 408, 251
-  size: 348, 245
-  split: 132, 78, 11, 143
-  pad: 23, 58, 6, 58
-  orig: 348, 245
-  offset: 0, 0
-  index: -1
-dialog_rectangle
-  rotate: false
-  xy: 2, 2
-  size: 247, 151
-  split: 52, 37, 30, 37
-  pad: 20, 27, 24, 32
-  orig: 247, 151
-  offset: 0, 0
-  index: -1
-dialog_square
-  rotate: false
-  xy: 758, 370
-  size: 150, 126
-  split: 12, 18, 4, 8
-  pad: 9, 10, 8, 10
-  orig: 150, 126
-  offset: 0, 0
-  index: -1
-dialog_square_borderlines
-  rotate: false
-  xy: 2, 155
-  size: 404, 341
-  split: 22, 27, 18, 24
-  pad: 21, 27, 17, 27
-  orig: 404, 341
-  offset: 0, 0
-  index: -1

android/assets/text/game/kidnapping/kidnapping_cs.properties

+game_kidnapping_replay=Přehrát znovu
+game_kidnapping_rulemessage_understand=Rozumím
+game_kidnapping_result_0=Je to bída, ale kdo říká, že\u00A0by ses nemohl zlepšit?
+game_kidnapping_result_1=S čistýma ušima a trochou tréninku to jistě dotáhneš dál!
+game_kidnapping_result_2=Dobré uši detektiovi sluší!
+game_kidnapping_result_3=S takovýmhle sluchem si můžeš ve městě vykračovat poslepu!
+
+game_kidnapping_loadingtext_2=Poslechni a zapamatuj si\u00A0zvuk, který jsi\u00A0slyšel na\u00A0křižovatce.
+game_kidnapping_loadingtext_2=Pak si\u00A0poslechni zvuky okolních ulic a urči, kterou jste projeli.
+game_kidnapping_loadingtext_3=Se\u00A0sluchátky zvuky lépe uslyšíš.
+game_kidnapping_instructions_silence=Pššššt!
+game_kidnapping_instructions_pay_attention=Poslouchej pozorně
+game_kidnapping_stats=Počet chyb: <b>%1$s</b>
+game_kidnapping_rule_easy=Najdi ulici se\u00A0stejně znějícím zvukem nebo slovem.
+game_kidnapping_rule_medium=Najdi ulici se\u00A0stejně znějícím zvukem nebo slovem, jehož hláskovaná varianta odpovídá té\u00A0čtené.
+game_kidnapping_rule_hardcore=Najdi ulici se\u00A0stejně znějícím zvukem nebo slovem, kterému chybí předposlední písmeno.

android/assets/text/game/kidnapping/kidnapping_sk.properties

+game_kidnapping_replay=Prehrať znova
+game_kidnapping_rulemessage_understand=Rozumiem
+game_kidnapping_result_0=Je to bieda, ale kto hovorí, že by si sa eště nemohol zlepšiť?
+game_kidnapping_result_1=S čistými ušami a trochou tréningu to určite dotiahneš ďalej!
+game_kidnapping_result_2=Dobré uši detektívovi pristanú!
+game_kidnapping_result_3=S takým sluchom si môžeš v meste vykračovať poslepiačky!
+
+game_kidnapping_loadingtext_2=Vypočuj a zapamätaj si zvuk, ktorý si počul na križovatke.
+game_kidnapping_loadingtext_2=Potom si vypočuj zvuky okolitých ulic a urči, ktorú ste prešli.
+game_kidnapping_loadingtext_3=So slúchatkami budeš zvuky počuť lepšie.
+game_kidnapping_instructions_silence=Pššššt!
+game_kidnapping_instructions_pay_attention=Počúvaj pozorne
+game_kidnapping_stats=Počet chýb: <b>%1$s</b>
+game_kidnapping_rule_easy=Nájdi ulicu s rovnako znejúcim zvukom alebo slovom.
+game_kidnapping_rule_medium=Nájdi ulicu s rovnako znejúcim zvukom alebo slovom, ktorému chýba predposledné písmeno.
+game_kidnapping_rule_hardcore=Nájdi ulicu s rovnako znejúcim zvukom alebo slovom, ktorého hláskovaná varianta odpovedá tej čítanej
+
+

build.gradle

+import com.badlogic.gdx.graphics.Texture
+import com.badlogic.gdx.tools.texturepacker.TexturePacker
+
 buildscript {
     repositories {
         mavenCentral()
@@ -10,9 +13,14 @@ buildscript {
         classpath 'de.felixschulze.gradle:gradle-spoon-plugin:2.1'
         classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
         classpath 'com.novoda:gradle-android-command-plugin:1.3.0'
+        classpath "com.badlogicgames.gdx:gdx-tools:1.6.1"
     }
 }
 
+final assetsDirName = "assets"
+final assetsSourceDirName = "src"
+final assetsDestinationDirName = "dest"
+
 ext {
     assetsChecksumPattern = "\"=======ASSETS_CHECKSUM=======\""
     assetsChecksum = [:]
@@ -53,6 +61,100 @@ allprojects {
     }
 }
 
+task clean << {
+    delete "${buildDir}"
+}
+
+task prepareAssets {
+    def sourceDir = new File(project(":core").projectDir.absolutePath + "/${assetsDirName}")
+
+    inputs.dir(sourceDir.absolutePath)
+    outputs.dir("${buildDir}/${assetsDirName}/${assetsSourceDirName}/")
+
+    doLast {
+        sourceDir.eachDir() { dir ->
+
+            if (!dir.name.equals('common')) {
+                String dirName = dir.getName()
+                String destDir = "${buildDir}/${assetsDirName}/${assetsSourceDirName}/${dirName}"
+                task("${name}_${dirName}", type: Copy) {
+                    from sourceDir.absolutePath + "/common"
+                    from dir.absolutePath
+                    into destDir
+                }.execute()
+            }
+        }
+    }
+}
+
+task prepareSoundAssets(dependsOn: prepareAssets) {
+    def assetsDir = new File("${buildDir}/${assetsDirName}/")
+
+    inputs.dir("${assetsDir.absolutePath}/${assetsSourceDirName}/")
+    outputs.dir("${assetsDir.absolutePath}/${assetsDestinationDirName}/")
+
+    doLast {
+        new File("${assetsDir}/${assetsSourceDirName}/").eachDir() { langDir ->
+            langDir.eachDir() { sectionDir ->
+                sectionDir.eachDir() { atlasDir ->
+                    task("${name}_" + atlasDir.name + "_" + langDir.name, type: Copy) {
+                        from atlasDir
+                        into "${buildDir}/${assetsDirName}/${assetsDestinationDirName}/${langDir.name}/${sectionDir.name}/${atlasDir.name}/"
+                        include '**/*.mp3'
+                        includeEmptyDirs false
+                        eachFile { FileCopyDetails fcd ->
+                            fcd.setPath(fcd.getRelativePath().toString().replace(File.separator, '.'))
+                        }
+                    }.execute()
+                }
+            }
+        }
+    }
+}
+
+task prepareGraphicAssets(dependsOn: prepareAssets) {
+    def assetsDir = new File("${buildDir}/${assetsDirName}/")
+
+    inputs.dir("${assetsDir.absolutePath}/${assetsSourceDirName}/")
+    outputs.dir("${assetsDir.absolutePath}/${assetsDestinationDirName}/")
+
+    doLast {
+        TexturePacker.Settings settings = new TexturePacker.Settings();
+        settings.pot = false;
+        settings.maxWidth = 2048;
+        settings.maxHeight = 2048;
+        settings.combineSubdirectories = true;
+        settings.filterMin = Texture.TextureFilter.Linear;
+        settings.filterMag = Texture.TextureFilter.Linear;
+
+        new File("${assetsDir.absolutePath}/${assetsSourceDirName}/").eachDir() { langDir ->
+            langDir.eachDir() { sectionDir ->
+                sectionDir.eachDir() { atlasDir ->
+                    TexturePacker.process(settings,
+                                          "${atlasDir}",
+                                          "${assetsDir.absolutePath}/${assetsDestinationDirName}/${langDir.name}/${sectionDir.name}/${atlasDir.name}/",
+                                          "${atlasDir.name}")
+                }
+            }
+        }
+    }
+}
+
+task zipAssets(dependsOn: [prepareSoundAssets, prepareGraphicAssets]) {
+    doLast {
+        new File(project(":core").projectDir.absolutePath + "/${assetsDirName}").eachDir() { dir ->
+
+            if (!dir.name.equals('common')) {
+                task("${name}_${dir.name}", type: Zip) {
+                    archiveName = dir.getName() + ".zip"
+                    destinationDir = new File(project(":android").projectDir.absolutePath + "/${assetsDirName}")
+                    from "${buildDir}/${assetsDirName}/${assetsDestinationDirName}/${dir.name}"
+                }.execute()
+            }
+        }
+    }
+}
+
 def getVersionNameFromGit() {
     def stdout = new ByteArrayOutputStream()
     exec {
@@ -80,20 +182,6 @@ def getMapConvertedToString(Map map) {
     return result;
 }
 
-task zipAssets(type:Zip) {
-    outputs.upToDateWhen { false }
-	new File(project(":core").projectDir.absolutePath + "/assets").eachDir() { dir ->
-
-		task(dir.getName(), type: Zip) {
-        	archiveName = dir.getName() + ".zip"
-			ext.destDir = new File(project(":android").projectDir.absolutePath + "/assets/")
-			ext.destFile = new File(destDir, archiveName)
-			destinationDir = new File("android/assets/")
-			from dir.getPath()
-	    }.execute()
-    }
-}
-
 project(":desktop") {
     apply plugin: "java"