notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cat toy can be off.

Browse Source
This commit is contained in:
Bryce Covert
2015-11-06 07:37:39 -08:00
parent 2d042e5efe
commit 51998792a8
4 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/last-release
View File

@@ -1 +1 @@
3 4

12
desktop/src-common/advent/screens/rooms/cat_tree.clj
View File

@@ -398,11 +398,13 @@
(update-in entities [:room :entities] #(dissoc % :cat)) (update-in entities [:room :entities] #(dissoc % :cat))
entities) entities)
(if (is-standing-on-ladder entities) (if (is-standing-on-ladder entities)
(-> entities (do
(update-in [:room :entities]
assoc :blank (get-in entities [:room :blank]) (-> entities
:ladder (get-in entities [:room :ladder])) (update-in [:room :entities]
(update-in [:room :entities :ego ] assoc :x 140 :y 85)) assoc :blank (get-in entities [:room :blank])
:ladder (get-in entities [:room :ladder]))
(update-in [:room :entities :ego ] assoc :x 140 :y 85 :facing :right :baseline (- 240 25))))
entities) entities)
(if (= :night (get-in entities [:state :time])) (if (= :night (get-in entities [:state :time]))
(make-night entities) (make-night entities)

1
desktop/src-common/advent/screens/scene.clj
View File

@@ -720,6 +720,7 @@ void main ()
(get-in ego [:left :jump-straight]) {:origin-x 9} (get-in ego [:left :jump-straight]) {:origin-x 9}
(get-in ego [:right :jump-straight]) {:origin-x 9} (get-in ego [:right :jump-straight]) {:origin-x 9}
(get-in ego [:left :jumping-straight]) {:origin-x 9} (get-in ego [:left :jumping-straight]) {:origin-x 9}
(get-in ego [:left :cat-toy]) {:origin-x 32}
(get-in ego [:right :jumping-straight]) {:origin-x 9} (get-in ego [:right :jumping-straight]) {:origin-x 9}
(get-in ego [:left :swing-shovel]) {:origin-x 26} (get-in ego [:left :swing-shovel]) {:origin-x 26}
(get-in ego [:right :swing-shovel]) {:origin-x 26} (get-in ego [:right :swing-shovel]) {:origin-x 26}

23
desktop/src/advent/core/desktop_launcher.clj
View File

@@ -1,28 +1,27 @@
(ns advent.core.desktop-launcher (ns advent.core.desktop-launcher
(:require [advent.core :refer :all] (:require [advent.core :refer :all]
[advent.utils :as utils] [advent.utils :as utils]
#_[clojure.tools.nrepl.server]) [clojure.tools.nrepl.server])
(:import [com.badlogic.gdx.backends.lwjgl LwjglApplication LwjglApplicationConfiguration] (:import [com.badlogic.gdx.backends.lwjgl LwjglApplication LwjglApplicationConfiguration]
[org.lwjgl.input Keyboard] [org.lwjgl.input Keyboard]
[com.badlogic.gdx Gdx]) [com.badlogic.gdx Gdx])
(:gen-class)) (:gen-class))
#_(defmacro start-nrepl-expr [port]
`(let [{port# :port} (clojure.tools.nrepl.server/start-server :port ~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#)))
(defn -main (defn -main
[& [port]] [& [port]]
#_(try (try
(when port (start-nrepl-expr (Integer/parseInt port))) #_(require 'clojure.tools.nrepl.server)
(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)) (catch Exception e))
(let [cfg (LwjglApplicationConfiguration.)] (let [cfg (LwjglApplicationConfiguration.)]
(if false (if false
(do (do