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

tweask.

Browse Source
This commit is contained in:
Remington Covert
2015-04-22 17:49:40 -07:00
parent e520fe0792
commit cf0a83ff02
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/settings.edn
View File

@@ -1 +1 @@
{:sound-volume 44.0, :music-volume 70.0} {:sound-volume 44.0, :music-volume 0.0}

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

@@ -335,7 +335,7 @@
(do-stop entities :ego :face face)))) (do-stop entities :ego :face face))))
(defn get-text-duration [text] (defn get-text-duration [text]
(* (count (s/split text #" ")) 0.5)) (max 1.5 (* (count (s/split text #" ")) 0.5)))
(defn talk [entities target-id text & {:keys [stop? animate? anim]}] (defn talk [entities target-id text & {:keys [stop? animate? anim]}]
(let [initial-time (atom nil) (let [initial-time (atom nil)

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

@@ -328,6 +328,7 @@
(actions/remove-item entities :dream-sword) (actions/remove-item entities :dream-sword)
(actions/remove-item entities :broom) (actions/remove-item entities :broom)
(actions/remove-item entities :shovel) (actions/remove-item entities :shovel)
(actions/resume-camera entities)
(actions/transition-background entities :inside-castle [79 145] :time 5.0) (actions/transition-background entities :inside-castle [79 145] :time 5.0)
(actions/walk-to entities :ego [159 74]) (actions/walk-to entities :ego [159 74])
(actions/do-dialogue entities (actions/do-dialogue entities

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

@@ -367,6 +367,7 @@
:anim-merges {(get-in ego [:right :shock]) {:origin-x 15} :anim-merges {(get-in ego [:right :shock]) {:origin-x 15}
(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}
(get-in ego [:left :love]) {:origin-x 36}
:default {:origin-x 9}})] :default {:origin-x 9}})]
(actions/start-animation screen (actions/start-animation screen
(merge (animation->texture screen (:stand (:right ego))) ego) (merge (animation->texture screen (:stand (:right ego))) ego)