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

supporting different dialogue colors.

Browse Source
This commit is contained in:
Bryce Covert
2014-12-16 11:28:20 -08:00
parent 654f564311
commit 6a8191f49a
7 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,6 +255,8 @@
height (* scale 36)]
(screen! dialogue/talking-screen :on-talk :text text
:x (get-in entities [:room :entities target-id :x]) :y (+ (get-in entities [:room :entities target-id :y]) height)
:color (get-in entities [:room :entities target-id :talk-color])
:target-id target-id
:scale scale)
(if animate?

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

@@ -33,15 +33,14 @@
entities)
:on-talk
(fn [{:keys [create-talk target-id text x y scale]} [entities]]
(fn [{:keys [create-talk target-id color text x y scale]} [entities]]
(let [font (bitmap-font "ego/font.fnt" )
_ (bitmap-font! font :set-markup-enabled true)
tr (bitmap-font! font :get-region)
scale (or (min (max scale 0.75) 1) 1)
tx (.getTexture tr)
_ (texture! tx :set-filter Texture$TextureFilter/Linear Texture$TextureFilter/Linear)
talk (assoc (label text (style :label font (if (= :ego target-id)
(color :white)
(color :yellow)))) :y (* 4 y))]
talk (assoc (label text (style :label font color)) :y (* 4 y))]
(label! talk :set-font-scale scale)
(label! talk :set-alignment Align/center)
(assoc entities target-id (-> talk

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

@@ -167,6 +167,7 @@
:right {:stand warriors-stand
:talk warriors-stand}
:facing :right
:talk-color (color 1.0 0.4 0.3 1.0)
:script (actions/get-script entities
(do-warrior-dialogue entities)
))

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

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

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

@@ -21,7 +21,7 @@
(< (dist-to-sheep entities) 45))
(defn wizard-dialogue [entities]
(actions/do-dialogue entities :ego "Hello there Gandarf!" :wizard "Oh no, not you again!")
(actions/do-dialogue entities :ego "Hello there [RED]Gandarf[]!" :wizard "Oh no, not you again!")
(actions/present-choices entities
{:choices ["What do you mean, \"Not you again?\""
{:run #(actions/respond entities % :wizard "I mean, you've wrecked my life and I never want to see you again.")

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

@@ -164,6 +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)
:mouse-in? (fn [entities x y]
(let [{entity-x :x entity-y :y region :object scale :scale-x} (get-in entities [:room :entities :ego])