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

seems a bit more legit.

Browse Source
This commit is contained in:
Bryce Covert
2015-04-22 21:04:43 -07:00
parent b9a49008cd
commit fab21fc690
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@@ -242,7 +242,9 @@
:cursor :right :cursor :right
:script (actions/get-script entities :script (actions/get-script entities
(actions/walk-to entities :ego [284 145]) (actions/walk-to entities :ego [284 145])
(actions/transition-background entities :outside-castle [82 180]) (actions/walk-straight-to entities :ego [295 145])
(actions/transition-background entities :outside-castle [61 182])
(actions/walk-straight-to entities :ego [82 180])
(actions/walk-to entities :ego [129 148]))} (actions/walk-to entities :ego [129 148]))}
:up-door {:box [50 150 70 170] :up-door {:box [50 150 70 170]
:script (actions/get-script entities :script (actions/get-script entities

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

@@ -222,10 +222,13 @@
(actions/update-state entities #(assoc % :seen-frankie? true))) (actions/update-state entities #(assoc % :seen-frankie? true)))
(defn go-through-gate [entities] (defn go-through-gate [entities]
(actions/walk-to entities :ego [82 180])
(if (should-block? entities) (if (should-block? entities)
(block-entrance entities)
(do (do
(actions/walk-to entities :ego [82 180])
(block-entrance entities))
(do
(actions/walk-to entities :ego [82 180])
(actions/walk-straight-to entities :ego [61 182])
(actions/transition-background entities :inside-castle [295 145]) (actions/transition-background entities :inside-castle [295 145])
(actions/walk-to entities :ego [245 90])))) (actions/walk-to entities :ego [245 90]))))
@@ -290,9 +293,12 @@
(actions/play-animation entities :ego :squat) (actions/play-animation entities :ego :squat)
(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)
:night [(assoc (texture "outside-castle/background-dark.png") :x 0 :y 0 :baseline 0)] (assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 240)]
:sunrise [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)]} :night [(assoc (texture "outside-castle/background-dark.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outside-castle/walk-behind-dark.png") :x 0 :y 0 :baseline 240)]
:sunrise [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 240)]}
: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]}

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

@@ -18,6 +18,7 @@
[advent.screens.items :as items] [advent.screens.items :as items]
[advent.screens.rooms.dream :as rooms.dream] [advent.screens.rooms.dream :as rooms.dream]
[advent.screens.rooms.castle-gate :as rooms.castle-gate] [advent.screens.rooms.castle-gate :as rooms.castle-gate]
[advent.screens.rooms.common :as common]
[advent.screens.rooms.outside-house :as rooms.outside-house] [advent.screens.rooms.outside-house :as rooms.outside-house]
[advent.screens.rooms.inside-house :as rooms.inside-house] [advent.screens.rooms.inside-house :as rooms.inside-house]
[advent.screens.rooms.inside-stash :as rooms.inside-stash] [advent.screens.rooms.inside-stash :as rooms.inside-stash]
@@ -161,7 +162,7 @@
start-squat (animation 0.05 (for [i [0 1 2 3 4]] start-squat (animation 0.05 (for [i [0 1 2 3 4]]
(texture (aget squat-sheet 0 i)))) (texture (aget squat-sheet 0 i))))
start-squat-2 (animation 0.05 (for [i [0 1 2 3]] start-squat-2 (animation 0.05 (for [i [0 1 2 3]]
(texture (aget squat-sheet 0 i)))) (texture (aget squat-sheet 0 i))))
end-squat (animation 0.05 (for [i [3 2 1 0]] end-squat (animation 0.05 (for [i [3 2 1 0]]
(texture (aget squat-sheet 0 i)))) (texture (aget squat-sheet 0 i))))
squat-anim (animation 0.05 (for [i [0 1 2 3 3 3 3 3 3 3 3 3 3 3 3 2 1] ] squat-anim (animation 0.05 (for [i [0 1 2 3 3 3 3 3 3 3 3 3 3 3 3 2 1] ]