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

disappearing blanket.

Browse Source
This commit is contained in:
Bryce Covert
2015-07-26 22:01:00 -07:00
parent 2b0c5dba0d
commit ff6715877d
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/gametodos.txt
View File

@@ -8,10 +8,10 @@
+ too small area for bars + too small area for bars
+ more visible crowbar + more visible crowbar
+ peddler stuff should be gone at night + peddler stuff should be gone at night
+ owl barf effect
+ sack lunch should spoil + sack lunch should spoil
+ swinging axe at second doesn't seem right + swinging axe at second doesn't seem right
+ fight with blergh at end isn't great + fight with blergh at end isn't great
+ ending + ending
+ secret lever + secret lever
+ shopkeep sigh + shopkeep sigh
+ proper save/settings file location

BIN
desktop/resources/outside-castle/background.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 15 KiB

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

@@ -303,14 +303,15 @@
(actions/talk entities :ego "No one will notice one missing.") (actions/talk entities :ego "No one will notice one missing.")
(actions/give entities :carrot))))}} (actions/give entities :carrot))))}}
:layers {:day [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) :layers {:day [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outside-castle/blanket.png") :x 60 :y (- 240 173) :baseline 1)
(assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) (assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2)
(assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)] (assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)]
:night [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) :night [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) (assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2)
(assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)] (assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)]
:sunrise [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0) :sunrise [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2) (assoc (texture "outside-castle/brush.png") :origin-x 0 :origin-y 0 :scale-x 1.0 :scale-y 1.0 :x 15 :y 0 :baseline 240 :parallax 1.2)
(assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)]} (assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)]}
:entities {:peddler (actions/start-animation screen :entities {:peddler (actions/start-animation screen
(assoc (texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil (assoc (texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil
:anim-sound-frames {peddler-stand {23 [:scratch 1.0]} :anim-sound-frames {peddler-stand {23 [:scratch 1.0]}
@@ -407,7 +408,7 @@
(common/read-note-2 entities)))) (common/read-note-2 entities))))
:collision "outside-castle/collision.png" :collision "outside-castle/collision.png"
:scale-fn (utils/scaler-fn-from-image "outside-castle/scale-map.png" 0.20 1.00) :scale-fn (utils/scaler-fn-from-image "outside-castle/scale-map.png" 0.20 1.00)
:start-pos [310 80] :start-pos [259 80]
:apply-state (fn [_ entities] :apply-state (fn [_ entities]
(if (#{:night :sunrise} (get-in entities [:state :time])) (if (#{:night :sunrise} (get-in entities [:state :time]))
(make-night entities) (make-night entities)