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

progress on multiple scripts.

Browse Source
This commit is contained in:
Bryce Covert
2015-11-19 18:29:54 -08:00
parent 624688524b
commit 5b12127ae3
3 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
desktop/src-common/advent/actions.clj
View File

@@ -100,6 +100,13 @@
(change-script-state ~entities false)
(utils/save @~entities :autosave "Autosave"))))))))
(defn force-end [entities current-action key]
(do (put! (get-channel current-action) :end)
(-> entities
(assoc-in [key :script-running?] false)
(assoc-in [key :current] nil)
(assoc-in [key :started?] false))))
(defmacro get-unsaved-script [entities & forms]
`(fn [starting-entities#]
(put! (get-in starting-entities# [:fg-actions :script-chan])
@@ -197,6 +204,19 @@
(skip-type [this screen entities]
:skip)))
(defn do-force-end [entities key]
(run-action entities
(begin [this screen entities]
(if (get-in entities [key :script-running?])
(force-end entities (get-in entities [key :current]) key)
entities))
(continue [this screen entities] entities)
(done? [this screen entities] true)
(terminate [this screen entities]
entities)
(skip-type [this screen entities]
:none)))
(defn walk-straight-to [entities target-id [final-x final-y] & {:keys [update-baseline? face speed anim override-dir stop?]}]
@@ -662,12 +682,16 @@
(assoc-in [:state :next-time] nil))
entities)
:ego
:face face)]
:face face)
entities (if (get-in entities [:bg-actions :script-running?])
(force-end entities (get-in entities [:bg-actions :current]) :bg-actions)
entities)]
(if-let [stop-fn (get-in entities [:room :stop-fn])]
(stop-fn screen entities)
entities)))
(skip-type [this screen entities]
:none))
(screen! dialogue/talking-screen :stop-talk)
(run-action entities
(begin [this screen entities]
(utils/stop-all-sounds! entities)

4
desktop/src-common/advent/screens/rooms/inside_castle.clj
View File

@@ -15,7 +15,6 @@
[play-clj.g2d :refer :all]))
(defn brian [screen entities]
(when (and (not (get-in entities [:fg-actions :script-running?]))
(not (get-in entities [:bg-actions :script-running?]))
(get-in entities [:state :active?])
@@ -116,7 +115,8 @@
{:run #(actions/respond entities % :game-player "Fine by me.")}]})
(defn walk-to-player [entities]
(actions/walk-to entities :ego [209 74] :face :right))
(actions/walk-to entities :ego [209 74] :face :right)
(actions/do-force-end entities :bg-actions))
(defn brian-pause-from-work [entities]
(actions/play-animation entities :game-player :pause-from-work :stop? false)

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

@@ -189,6 +189,8 @@ void main ()
(assoc-in [:cursor :override] nil)))
(assoc-in entities [:cursor :current] :main))))
(defn skip-action [screen entities]
(let [current-action (get-in entities [:fg-actions :current])]
(cond (= :skip (actions/skip-type current-action screen entities))
@@ -201,11 +203,8 @@ void main ()
(= :end (actions/skip-type current-action screen entities))
(let [terminated-entities (actions/terminate current-action screen entities)]
(println "trying to end")
(do (put! (actions/get-channel current-action) :end)
(-> terminated-entities
(assoc-in [:fg-actions :script-running?] false)
(assoc-in [:fg-actions :current] nil)
(assoc-in [:fg-actions :started?] false))))
(actions/force-end terminated-entities current-action :fg-actions)
)
:else
entities)))