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

saves off Tick's position.

Browse Source
This commit is contained in:
Bryce Covert
2015-11-05 08:37:56 -08:00
parent 684364c879
commit fd3bfd691a
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/last-release
View File

@@ -1 +1 @@
2 3

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

@@ -1001,8 +1001,10 @@ void main ()
(let [[^OrthographicCamera cam] (utils/setup-viewport screen 320 240)] (let [[^OrthographicCamera cam] (utils/setup-viewport screen 320 240)]
(set! (. cam zoom) 0.95) (set! (. cam zoom) 0.95)
(let [shader (ShaderProgram. ^String v-shader ^String pix-shader) (let [shader (ShaderProgram. ^String v-shader ^String pix-shader)
_ (println (.getLog shader)) #_#__ (println (.getLog shader))
state (get-state @utils/selected-save)
start-pos [(:x state) (:y state)]
has-start-pos? (:x state)
_ (update! screen :shader shader) _ (update! screen :shader shader)
rooms {:inside-house (rooms.inside-house/make screen) rooms {:inside-house (rooms.inside-house/make screen)
@@ -1042,7 +1044,7 @@ void main ()
:dream (utils/make-music "dream/music.ogg") :dream (utils/make-music "dream/music.ogg")
:secret-hideout (utils/make-music "music/secret-hideout.ogg") :secret-hideout (utils/make-music "music/secret-hideout.ogg")
:wind (utils/make-music "music/wind.ogg")} :wind (utils/make-music "music/wind.ogg")}
:state (get-state @utils/selected-save) :state state
:time-profiles {:object nil :time-profiles {:object nil
:default utils/default-night-merge :default utils/default-night-merge
:sprite utils/default-night-merge-sprite :sprite utils/default-night-merge-sprite
@@ -1085,8 +1087,14 @@ void main ()
:all-items (assoc items/items :object nil) :all-items (assoc items/items :object nil)
:started? {:value false :started? {:value false
:object nil} :object nil}
:room (as-> (get rooms (:last-room (get-state @utils/selected-save))) room :room (as-> (get rooms (:last-room state)) room
(assoc-in room [:entities :ego] (get-ego screen (:start-pos room) ((:scale-fn room) (:start-pos room)))))}] (assoc-in room [:entities :ego] (get-ego screen (if has-start-pos?
start-pos
(:start-pos room))
((:scale-fn room)
(if has-start-pos?
start-pos
(:start-pos room))))))}]
(doseq [[k [start time fn]] (get-in entities [:room :timers])] (doseq [[k [start time fn]] (get-in entities [:room :timers])]
(add-timer! screen k start time)) (add-timer! screen k start time))

4
desktop/src-common/advent/utils.clj
View File

@@ -101,7 +101,9 @@
saves (cons {:name name saves (cons {:name name
:id id :id id
:screenshot (save-screenshot-file-name id) :screenshot (save-screenshot-file-name id)
:state (entities :state) :state (assoc (entities :state)
:x (get-in entities [:room :entities :ego :x])
:y (get-in entities [:room :entities :ego :y]))
:blurb (or blurb name)} :blurb (or blurb name)}
(filter (comp (complement #{id}) :id) saves))] (filter (comp (complement #{id}) :id) saves))]
(.putString prefs "saves" (pr-str saves)) (.putString prefs "saves" (pr-str saves))