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

dialogue colors for each person.

Browse Source
This commit is contained in:
Bryce Covert
2014-12-16 12:17:49 -08:00
parent 6a8191f49a
commit 72d2b10574
10 changed files with 112 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,7 @@
choice-count (count choices)]
(-> entities
(into (for [[[text] i] (map vector choices (range))]
[i (assoc (label text (style :label font (color :white))) :height 30 :x 30 :y (+ 30 (* choice-height (- choice-count i 1))) :index i)]))
[i (assoc (label text (style :label font (color 0.6 1.0 1.0 1.0))) :height 30 :x 30 :y (+ 30 (* choice-height (- choice-count i 1))) :index i)]))
(assoc :state {:object nil :callback callback :choices choices :font font}))))
:on-touch-up (fn [screen [entities]]
@@ -102,7 +102,7 @@
:when (:object e)]
(if (intersects? e [x y])
(label! e :set-style (style :label (get-in entities [:state :font]) (color :yellow)))
(label! e :set-style (style :label (get-in entities [:state :font]) (color :white))))))))
(label! e :set-style (style :label (get-in entities [:state :font]) (color 0.6 1.0 1.0 1.0))))))))
:on-resize (fn [screen entities]
(size! screen 1280 960)))

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

@@ -189,6 +189,8 @@
:stand grandma-stand
:squat-1 grandma-squat-1
:squat-2 grandma-squat-2
:talk-color (color 1.0 0.4 0.9 1.0)
:origin-x 12
:origin-y 0
:scale-x 1.45

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

@@ -168,6 +168,7 @@
:layers [(assoc (texture "inside-antique/background.png") :x 0 :y 0 :baseline 0)]
:entities {:shopkeep (actions/start-animation screen (assoc (animation->texture screen shopkeep-stand) :x 137 :y 128 :baseline 112
:stand shopkeep-stand
:talk-color (color 0.2 1.0 0.2 1.0)
:talk shopkeep-talk
:script (actions/get-script entities (do-antique-dialogue entities))
:scripts {:teddy (actions/get-script entities

5
desktop/src-common/advent/screens/rooms/inside_cafeteria.clj
View File

@@ -121,7 +121,7 @@
{:choices actions/something-else}]}
"Why aren't you sitting and eating?"
{:run #(do (actions/respond entities % :ladder-guard "I'm on duty, young sire.")
(when (not (actions/has-obtained? :ladder))
(when (not (actions/has-obtained? entities :ladder))
(actions/do-dialogue entities
:ladder-guard "Dost thou seeth this ladder?"
:ladder-guard "Tis my duty to guardeth it."
@@ -167,7 +167,7 @@
:right {:stand warriors-stand
:talk warriors-stand}
:facing :right
:talk-color (color 1.0 0.4 0.3 1.0)
:talk-color (color 1.0 0.2 0.3 1.0)
:script (actions/get-script entities
(do-warrior-dialogue entities)
))
@@ -175,6 +175,7 @@
:ladder-guard (actions/start-animation screen (assoc (animation->texture screen ladder-guard-stand) :x 202 :y 85 :baseline 155
:stand ladder-guard-stand
:talk ladder-guard-talk
:talk-color (color 0.2 0.6 1.0 1.0)
:script (actions/get-script entities (do-ladder-guard-dialogue entities)))
:stand)
:ladder (assoc (texture "inside-cafeteria/ladder.png") :x 250 :y 85 :baseline 155

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

@@ -206,6 +206,7 @@
(actions/do-dialogue entities :ego "Can't you give me your trophy of wisdom?"
:game-player "If you want my trophy, you'll have to help me with my riddles."))))
:game-player (assoc (texture "inside-castle/gameplayer.png") :x 266 :y 49 :baseline 191
`:talk-color (color 1.0 0.3 0.2 1.0)
:script (actions/get-script entities (do-game-player-dialogue entities))
:scripts {:wool (actions/get-script entities
(walk-to-player entities)

2
desktop/src-common/advent/screens/rooms/inside_house.clj
View File

@@ -135,7 +135,7 @@
:right {:talk wizard-talk
:stand wizard-stand
:disappear wizard-disappear}
:talk-color (color 0.75 0.1 1.0 1.0)
:talk-color (color 0.95 0.3 1.0 1.0)
:facing :left
:script (actions/get-script entities (do-wizard-dialogue entities)))
:stand)

7
desktop/src-common/advent/screens/rooms/outside_castle.clj
View File

@@ -169,7 +169,9 @@
:layers [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)]
:entities {:peddler (actions/start-animation screen
(assoc (texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil
:talk peddler-talk :stand peddler-stand)
:talk peddler-talk :stand peddler-stand
:talk-color (color 1.0 0.9 0.4 1.0))
:stand)
:steer (actions/start-animation screen (assoc (animation->texture screen steer-stand) :x 203 :y 155 :baseline 80
:stand steer-stand
@@ -184,7 +186,8 @@
(actions/play-animation entities :ego :reach)
(actions/remove-item entities :grass)
(actions/talk entities :ego "Eww! He slobbered on my hand.")
(actions/give entities :slobber))})
(actions/give entities :slobber))}
)
:stand)
:balloons (actions/start-animation screen
(assoc (animation->texture screen balloon-stand)

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

@@ -164,7 +164,7 @@
:step-sound (sound "ego/step.ogg")
:scale-x start-scale
:scale-y start-scale
:talk-color (color 0.5 0.9 1.0 1.0)
:talk-color (color 0.6 1.0 1.0 1.0)
:mouse-in? (fn [entities x y]
(let [{entity-x :x entity-y :y region :object scale :scale-x} (get-in entities [:room :entities :ego])