diff --git a/android/project.clj b/android/project.clj index e5b1d21a..cc12cd70 100644 --- a/android/project.clj +++ b/android/project.clj @@ -16,6 +16,8 @@ [com.google.android.gms/play-services-games "11.6.2" :extension "aar" :exclusions [com.android.support/support-annotations]] [com.google.android.gms/play-services-auth "11.6.2" :extension "aar" :exclusions [com.android.support/support-annotations]] + [com.google.android.gms/play-services-tasks-license "11.6.2" :extension "aar" :exclusions [com.android.support/support-annotations]] + [com.google.android.gms/play-services-auth-api-phone-license "11.6.2" :extension "aar" :exclusions [com.android.support/support-annotations]] #_[com.google.android.gms/play-services "11.6.2" :extension "aar" :exclusions [com.android.support/support-annotations]] [org.clojure/tools.logging "0.3.1" :exclusions [org.clojure/clojure]] diff --git a/desktop/asset-work/title/google-play.png b/desktop/asset-work/title/google-play.png index 3d468daf..8fe4fd70 100644 Binary files a/desktop/asset-work/title/google-play.png and b/desktop/asset-work/title/google-play.png differ diff --git a/desktop/last-release b/desktop/last-release index ec635144..f599e28b 100644 --- a/desktop/last-release +++ b/desktop/last-release @@ -1 +1 @@ -9 +10 diff --git a/desktop/resources/packed/title.png b/desktop/resources/packed/title.png index de833742..8dabbafd 100644 Binary files a/desktop/resources/packed/title.png and b/desktop/resources/packed/title.png differ diff --git a/desktop/src-common/advent/achievements.clj b/desktop/src-common/advent/achievements.clj index bfd5d04d..1b43dc4d 100644 --- a/desktop/src-common/advent/achievements.clj +++ b/desktop/src-common/advent/achievements.clj @@ -3,7 +3,18 @@ (:require [advent.steam :as steam] [advent.utils :as utils])) -(def android-ids {"DESTINY" "CgkIwc6UgfgZEAIQAQ"}) +(def android-ids {"DESTINY" "CgkIwc6UgfgZEAIQAQ" + "PARDON" "CgkIwc6UgfgZEAIQBw" + "EX_CON" "CgkIwc6UgfgZEAIQBg" + "PRO_WRESTLER" "CgkIwc6UgfgZEAIQBA" + "SHEEP_HORDER" "CgkIwc6UgfgZEAIQAw" + "SAFE_AND_SOUND" "CgkIwc6UgfgZEAIQAg" + "FOOLISH_LULLABY" "CgkIwc6UgfgZEAIQCQ" + "WISE_UP" "CgkIwc6UgfgZEAIQDA" + "TONGUESBANE" "CgkIwc6UgfgZEAIQCA" + "KITTY_KISS" "CgkIwc6UgfgZEAIQBQ" + "BEHOLDER" "CgkIwc6UgfgZEAIQCg" + "MOUTH_DIVER" "CgkIwc6UgfgZEAIQCw"}) (defn set-achievement [achievement] (utils/platformify diff --git a/desktop/src-common/advent/screens/rooms/tongue_fight.clj b/desktop/src-common/advent/screens/rooms/tongue_fight.clj index d5385ac6..34c14e78 100644 --- a/desktop/src-common/advent/screens/rooms/tongue_fight.clj +++ b/desktop/src-common/advent/screens/rooms/tongue_fight.clj @@ -178,7 +178,7 @@ :interactions {} :layers [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0 :scale-x 1 :scale-y 1)] :update-fn trigger-tongue - :ego-hearts 2 + :ego-hearts 5 :tongue-hearts 5 :sounds {:swoosh (utils/load-sound "tongue-fight/swoosh.ogg") :big-swoosh (utils/load-sound "tongue-fight/big-swoosh.ogg") diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index c52c51dd..80e74b66 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -448,7 +448,7 @@ (utils/play-music (:music %)) %) :ease tween/ease-in-quadratic)}} entities (utils/platformify - (dissoc entities :google-play) + entities entities (dissoc entities :google-play))] (println "after load" (.getDiagnostics @(resolve 'advent.core/am))) @@ -552,7 +552,9 @@ (= :google-play actor-key) (utils/platformify - entities + (do + (.show (advent.core.GameCenter.) (.getUIViewController (Gdx/app))) + entities) (do (.showAchievements (advent.core.GooglePlay.) (Gdx/app)) entities) diff --git a/ios/src/java/advent/core/GameCenter.java b/ios/src/java/advent/core/GameCenter.java index b1732393..ae98a999 100644 --- a/ios/src/java/advent/core/GameCenter.java +++ b/ios/src/java/advent/core/GameCenter.java @@ -67,6 +67,19 @@ public class GameCenter { }); } + public void show(final UIViewController d) { + GKGameCenterViewController controller= new GKGameCenterViewController(); + controller.setGameCenterDelegate(new GKGameCenterControllerDelegateAdapter() { + @Override + public void didFinish(GKGameCenterViewController g) { + d.dismissViewController(true, null); + System.out.println("achievements done"); + } + }); + System.out.println("showing achievements"); + d.presentViewController(controller, true, null); + } + /** Report an achievement completed (100 as percentComplete) * * @param identifier */