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

more graphics updates.

Browse Source
This commit is contained in:
Bryce Covert
2015-02-27 12:19:25 -08:00
parent 60d1ab6382
commit c58af4decc
5 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

BIN
desktop/resources/inside-castle/background-dark.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 45 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
desktop/resources/inside-castle/collision.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

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

@@ -253,7 +253,7 @@
(if (actions/has-item? entities :sword) (if (actions/has-item? entities :sword)
(actions/talk entities :ego "I already have the Sword of Blergh!") (actions/talk entities :ego "I already have the Sword of Blergh!")
(do (actions/talk entities :ego "That's the coolest sword I've ever seen!!") (do (actions/talk entities :ego "That's the coolest sword I've ever seen!!")
(actions/walk-to entities :ego [52 97] :face :left) (actions/walk-to entities :ego [45 97] :face :left)
(actions/talk entities :ego "If I pull it out I can become a great knight!") (actions/talk entities :ego "If I pull it out I can become a great knight!")
(let [missing-items (set/difference #{:trophy :medal :kiss} (get-in @entities [:state :obtained-items])) (let [missing-items (set/difference #{:trophy :medal :kiss} (get-in @entities [:state :obtained-items]))
obtained-items (set/intersection #{:trophy :medal :kiss} (get-in @entities [:state :obtained-items]))] obtained-items (set/intersection #{:trophy :medal :kiss} (get-in @entities [:state :obtained-items]))]
@@ -303,8 +303,8 @@
:bird-2 (utils/make-bird screen (as-> [[220 225] [195 235] [210 230] [250 225]] p :bird-2 (utils/make-bird screen (as-> [[220 225] [195 235] [210 230] [250 225]] p
(concat p (reverse p)))) (concat p (reverse p))))
:sword (assoc (texture "inside-castle/sword.png") :sword (assoc (texture "inside-castle/sword.png")
:x 29 :x 22
:y 108 :y 110
:baseline 95) :baseline 95)
:trophy (assoc (animation->texture screen trophy) :trophy (assoc (animation->texture screen trophy)
:x 253 :y 69 :baseline 191 :x 253 :y 69 :baseline 191