0.2.4 release prepared

trolley813 · Dec 24, 2017 · f0cf029 · f0cf029
1 parent 815a865
commit f0cf029
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/android/assets/holidays/santahat.png b/android/assets/holidays/santahat.png
diff --git a/core/src/ru/hyst329/openfool/MainMenuScreen.kt b/core/src/ru/hyst329/openfool/MainMenuScreen.kt
@@ -23,6 +23,7 @@ internal class MainMenuScreen(private val game: OpenFoolGame) : Screen {
     private val stage: Stage = Stage(FitViewport(800f, 480f))
     private var logo: Sprite = Sprite(Texture(Gdx.files.internal("logos/mm_logo.png")))
     private var hammerAndSickle: Sprite = Sprite(Texture(Gdx.files.internal("holidays/hammersickle.png")))
+    private var santaHat: Sprite = Sprite(Texture(Gdx.files.internal("holidays/santahat.png")))
     private var canStart: Boolean = false
     private val newGameButton: VisTextButton
     private val settingsButton: VisTextButton
@@ -94,7 +95,9 @@ internal class MainMenuScreen(private val game: OpenFoolGame) : Screen {
                     hammerAndSickle.draw(game.batch)
                 }
                 Holiday.NEW_YEAR -> {
-                    // TODO: New Year logo
+                    santaHat.setCenter(165f, 430f)
+                    santaHat.setScale(0.3f)
+                    santaHat.draw(game.batch)
                 }
                 null -> {
 

diff --git a/core/src/ru/hyst329/openfool/OpenFoolGame.kt b/core/src/ru/hyst329/openfool/OpenFoolGame.kt
@@ -85,6 +85,7 @@ class OpenFoolGame : Game() {
             assetManager.load("suits/$s.png", Texture::class.java, param)
         }
         assetManager.load("holidays/hammersickle.png", Texture::class.java, param)
+        assetManager.load("holidays/santahat.png", Texture::class.java, param)
         this.setScreen(MainMenuScreen(this))
     }