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

tweaks.

Browse Source
This commit is contained in:
Bryce Covert
2015-02-23 19:18:01 -08:00
parent 757bd8b688
commit c10edb43de
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/inside-antique/background.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 53 KiB

BIN
desktop/resources/inside-antique/background.psd
View File

Binary file not shown.

BIN
desktop/resources/inside-antique/beard.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

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

@@ -100,7 +100,7 @@
(actions/talk entities :ego "It's a portrait. There's something on the back but I can't read it.") (actions/talk entities :ego "It's a portrait. There's something on the back but I can't read it.")
(actions/remove-entity entities :portrait) (actions/remove-entity entities :portrait)
(actions/give entities :portrait)))) (actions/give entities :portrait))))
beard (utils/make-anim "inside-antique/beard.png" [12 32] 0.5 [0 1 0 2]) beard (utils/make-anim "inside-antique/beard.png" [26 52] 0.5 [0 1 0 2])
teddy (assoc (texture "inside-antique/teddy.png") teddy (assoc (texture "inside-antique/teddy.png")
:x 255 :x 255
:y 95 :y 95
@@ -167,10 +167,10 @@
:ego "He's the town of Remington's mascot."))} :ego "He's the town of Remington's mascot."))}
} }
:layers [(assoc (texture "inside-antique/background.png") :x 0 :y 0 :baseline 0)] :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 147 :y 119 :baseline 112 :entities {:shopkeep (actions/start-animation screen (assoc (animation->texture screen shopkeep-stand) :x 148 :y 122 :baseline 112
:stand shopkeep-stand :stand shopkeep-stand
:scale-x 1.3 :scale-x 1.6
:scale-y 1.3 :scale-y 1.6
:talk-color (color 0.2 1.0 0.2 1.0) :talk-color (color 0.2 1.0 0.2 1.0)
:talk shopkeep-talk :talk shopkeep-talk
:script (actions/get-script entities (do-antique-dialogue entities)) :script (actions/get-script entities (do-antique-dialogue entities))
@@ -193,8 +193,8 @@
:beard (assoc (animation->texture screen beard) :beard (assoc (animation->texture screen beard)
:anim beard :anim beard
:anim-start 0 :anim-start 0
:x 65 :x 70
:y 109 :y 86
:baseline 120) :baseline 120)
:bowl (assoc (texture "inside-antique/bowl.png") :bowl (assoc (texture "inside-antique/bowl.png")
:x 165 :x 165
@@ -227,5 +227,5 @@
(if (actions/has-item? entities :portrait ) (if (actions/has-item? entities :portrait )
(update-in entities [:room :entities] #(dissoc % :portrait)) (update-in entities [:room :entities] #(dissoc % :portrait))
entities))) entities)))
:scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.50) :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.75)
:start-pos [222 3]))) :start-pos [222 3])))