diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 21b97278..5df618c4 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -1,8 +1,6 @@ -+ More ways to burn paper + shitty plates + fight with blergh at end isn't great + ending -+ secret lever + proper save/settings file location + closing should stop all scripts + frankie should drop coin diff --git a/desktop/resources/ego/blink2.ogg b/desktop/resources/ego/blink2.ogg new file mode 100644 index 00000000..bb335b37 Binary files /dev/null and b/desktop/resources/ego/blink2.ogg differ diff --git a/desktop/resources/ego/blink2.wav b/desktop/resources/ego/blink2.wav new file mode 100644 index 00000000..fe72866a Binary files /dev/null and b/desktop/resources/ego/blink2.wav differ diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index bf75b96e..4d808cf5 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -473,7 +473,7 @@ void main() :sigh-sound (sound "ego/sigh.ogg") :breakglass-sound (sound "ego/breakglass.ogg") :idea-sound (sound "ego/idea.ogg") - :blink (sound "blink.ogg") + :blink (sound "ego/blink2.ogg") :scale-x start-scale :scale-y start-scale :talk-color (color 0.6 1.0 1.0 1.0) diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index e297a0b0..085d951d 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -207,6 +207,11 @@ (.width (.getDesktopDisplayMode Gdx/graphics)) (.height (.getDesktopDisplayMode Gdx/graphics)) true) + + (set! (.foregroundFPS (-> (class Gdx/graphics) + (.getDeclaredField (name "config")) + (doto (.setAccessible true)) + (.get Gdx/graphics))) 60 ) (label! (:fullscreen entities) set-text "Fullscreen"))) :else nil)))) @@ -214,3 +219,5 @@ :on-resize (fn [{:keys [viewport width height]} [entities]] (.update viewport width height) nil)) + + diff --git a/desktop/src/advent/core/desktop_launcher.clj b/desktop/src/advent/core/desktop_launcher.clj index 7a2db4ed..0d4fc037 100644 --- a/desktop/src/advent/core/desktop_launcher.clj +++ b/desktop/src/advent/core/desktop_launcher.clj @@ -20,13 +20,19 @@ (defn -main [& [port]] (when port (start-nrepl-expr (Integer/parseInt port))) - (if false - (let [cfg (LwjglApplicationConfiguration.)] - (set! (.width cfg) (doto (.width (LwjglApplicationConfiguration/getDesktopDisplayMode)) println)) - (set! (.height cfg) (doto (.height (LwjglApplicationConfiguration/getDesktopDisplayMode)) println)) - (set! (.fullscreen cfg) true) - (LwjglApplication. advent cfg)) - (LwjglApplication. advent "advent" 1280 960)) + (let [cfg (LwjglApplicationConfiguration.)] + (if false + (do + (set! (.width cfg) (doto (.width (LwjglApplicationConfiguration/getDesktopDisplayMode)) println)) + (set! (.height cfg) (doto (.height (LwjglApplicationConfiguration/getDesktopDisplayMode)) println)) + (set! (.fullscreen cfg) true)) + (do + (set! (.width cfg) 1280) + (set! (.height cfg) 960))) + (set! (.foregroundFPS cfg) 60) + (set! (.backgroundFPS cfg) 60) + + (LwjglApplication. advent cfg))