diff --git a/desktop/asset-work/title.psd b/desktop/asset-work/title.psd index 57a9507a..c72f9cee 100644 Binary files a/desktop/asset-work/title.psd and b/desktop/asset-work/title.psd differ diff --git a/desktop/last-release b/desktop/last-release index e85087af..f5c89552 100644 --- a/desktop/last-release +++ b/desktop/last-release @@ -1 +1 @@ -31 +32 diff --git a/desktop/project.clj b/desktop/project.clj index 32265eac..aa642bea 100644 --- a/desktop/project.clj +++ b/desktop/project.clj @@ -24,6 +24,7 @@ :jvm-opts ["-Duse-repl=true" "-Dno-steam=true"] :dependencies [[com.badlogicgames.gdx/gdx-tools "1.5.3"] [org.clojure/tools.nrepl "0.2.7"] + [play-clj-nrepl "0.1.0" :exclusions [play-clj]] [slamhound "1.5.5"] [org.clojure/data.csv "0.1.3"]] @@ -34,6 +35,7 @@ :jvm-opts ["-Duse-repl=true"] :dependencies [[com.badlogicgames.gdx/gdx-tools "1.5.3"] [org.clojure/tools.nrepl "0.2.7"] + [play-clj-nrepl "0.1.0" :exclusions [play-clj]] [slamhound "1.5.5"] [org.clojure/data.csv "0.1.3"] [com.code-disaster.steamworks4j/steamworks4j "1.2.2"]] diff --git a/desktop/src-common/advent/core.clj b/desktop/src-common/advent/core.clj index 47bb8f0f..b11be4e3 100644 --- a/desktop/src-common/advent/core.clj +++ b/desktop/src-common/advent/core.clj @@ -19,7 +19,6 @@ (defonce am (asset-manager)) (set-asset-manager! am) - (defgame advent :on-create @@ -27,7 +26,6 @@ (steam/init) (set-screen! this title/title-screen))) - (defn reload [] (on-gl (set-screen! advent title/title-screen))) diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index aa75e642..8bf1268a 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -342,7 +342,8 @@ (continue [this screen entities] (if (= 185 (get-in entities [:room :entities :bloodclot :current-frame-index])) - (particle-effect! (get-in entities [:room :entities :grow-explode]) :start)) + (do (particle-effect! (get-in entities [:room :entities :grow-explode]) :reset) + (particle-effect! (get-in entities [:room :entities :grow-explode]) :start))) (let [move-speed (* 0.17 (/ (:delta-time screen) diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 3130eb4c..0f525b70 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -117,7 +117,7 @@ :finish (fn [entities] (utils/stop-music (:music entities)) (reset! utils/selected-save save) - (set-screen! @(resolve 'advent.core/advent) scene/scene scene/demo scene/hud dialogue/talking-screen dialogue/choice-screen dialogue/toast-screen inventory/inventory-screen safe/safe-screen fade/fade-screen + (set-screen! @(resolve 'advent.core/advent) scene/scene #_scene/demo scene/hud dialogue/talking-screen dialogue/choice-screen dialogue/toast-screen inventory/inventory-screen safe/safe-screen fade/fade-screen ) entities) :ease tween/ease-in-cubic)) diff --git a/desktop/src/advent/core/desktop_launcher.clj b/desktop/src/advent/core/desktop_launcher.clj index 78aa50c4..44c1e263 100644 --- a/desktop/src/advent/core/desktop_launcher.clj +++ b/desktop/src/advent/core/desktop_launcher.clj @@ -9,22 +9,19 @@ - +(def has-nrepl? + (try + (require '[play-clj-nrepl.core :as a]) + (System/getProperty "use-repl") + (catch Exception e + (println e) + false))) (defn -main [& [port]] - (when (System/getProperty "use-repl") - (eval `(require 'clojure.tools.nrepl.server)) - (eval `(try - - (when ~port (let [{port# :port} (clojure.tools.nrepl.server/start-server :port (Integer/parseInt ~port))] - (doseq [port-file# ["target/repl-port" ".nrepl-port"]] - (-> port-file# - java.io.File. - (doto .deleteOnExit) - (spit port#))) - (println "Started nREPL server on port" port#))) - (catch Exception e#)))) + (when has-nrepl? + (play-clj-nrepl.core/start-nrepl advent.core/advent port)) + (let [cfg (LwjglApplicationConfiguration.)] #_(println (.exists (files! :classpath "icon/icon_128x128.png")))