This commit is contained in:
Bryce Covert
2015-11-04 21:43:47 -08:00
parent 4c1e91a6fb
commit 66b446c16c
18 changed files with 27 additions and 7 deletions

View File

@@ -1247,7 +1247,11 @@ void main ()
(click-inventory screen entities))
:on-save (fn [screen [entities]]
(when-not (get-in entities [:actions :script-running?])
(utils/save entities (str (java.util.UUID/randomUUID)) (str "Save " (rand-int 20)))))
(let [date (.format (java.text.SimpleDateFormat. "MM/dd/YY") (java.util.Date.))]
(utils/save entities
(str (java.util.UUID/randomUUID))
(str (-> entities :room :name) " - " date)
date))))
:on-menu (fn [{:keys [viewport] :as screen} [entities]]
(when-not (or (get-in entities [:tweens :fade-out])
@@ -1328,13 +1332,13 @@ void main ()
:inventory (assoc (utils/get-texture "inventory.png") :x 278 :y 0 :baseline 9000
:mouse-in? (zone/box 278 0 320 42)
:opacity 0.8)
:fps (assoc (label "" (color :white) ) :x 5 :baseline 0 :opacity 0.1)}))
#_#_:fps (assoc (label "" (color :white) ) :x 5 :baseline 0 :opacity 0.1)}))
:on-render
(fn [{:keys [^FitViewport viewport] :as screen} [entities]]
(.apply viewport)
(let [entities (utils/apply-tweens screen entities (:tweens entities))]
(label! (:fps entities) :set-text (str (game :fps)))
#_(label! (:fps entities) :set-text (str (game :fps)))
(render! screen [ (:save entities) (:inventory entities) (:close entities)])
entities))