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

made things a little more rewarding.

Browse Source
This commit is contained in:
Remington Covert
2015-03-18 07:06:06 -07:00
parent 9db4671376
commit 7ad3bdc4ef
7 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/ego/squat.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
desktop/resources/ego/squat.pxa/3.pxi
View File

Binary file not shown.

8
desktop/resources/ego/squat.pxa/CelData.plist
View File

@@ -22,5 +22,13 @@
<key>duration</key> <key>duration</key>
<real>1</real> <real>1</real>
</dict> </dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
</array> </array>
</plist> </plist>

2
desktop/settings.edn
View File

@@ -1 +1 @@
{:sound-volume 0.0, :music-volume 0.0} {:sound-volume 56.0, :music-volume 30.0}

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

@@ -36,6 +36,13 @@
(actions/has-obtained? entities :money) (actions/has-obtained? entities :money)
(not (actions/has-item? entities :money)))) (not (actions/has-item? entities :money))))
(defn walk-to-sheep [entities]
(actions/walk-to entities :ego [154 133])
(actions/walk-straight-to entities :ego [119 134] :update-baseline? false))
(defn leave-sheep [entities]
(actions/walk-straight-to entities :ego [154 133] :update-baseline? false))
(defn put-something-in-cauldron [item] (defn put-something-in-cauldron [item]
(condp = item (condp = item
:money (actions/get-script entities :money (actions/get-script entities
@@ -337,13 +344,13 @@
(if (actions/has-item? entities :wool) (if (actions/has-item? entities :wool)
(actions/talk entities :ego "The sheep has given me enough wool.") (actions/talk entities :ego "The sheep has given me enough wool.")
(if (is-sheep-close? @entities) (if (is-sheep-close? @entities)
(do (actions/walk-to entities :ego ego-sheep-loc :face :left) (do (walk-to-sheep entities)
(actions/play-animation entities :ego :reach) (actions/play-animation entities :ego :reach)
(actions/give entities :wool) (actions/give entities :wool)
(actions/talk entities :ego "I guess her wool is shedding.")) (actions/talk entities :ego "I guess her wool is shedding.")
(leave-sheep entities))
(do (do
(actions/talk entities :ego "Come here mama sheep!") (actions/talk entities :ego "Come here mama sheep!")
(actions/glad entities)
(actions/play-animation entities :ego :sigh) (actions/play-animation entities :ego :sigh)
(actions/talk entities :ego "She's too far away for me to pet her."))))) (actions/talk entities :ego "She's too far away for me to pet her.")))))
@@ -351,31 +358,34 @@
:wool (actions/get-script entities :wool (actions/get-script entities
(actions/talk entities :ego "She doesn't need it back.")) (actions/talk entities :ego "She doesn't need it back."))
:grass (actions/get-script entities :grass (actions/get-script entities
(actions/walk-to entities :ego ego-sheep-loc :face :left) (walk-to-sheep entities)
(actions/talk entities :ego "Come on girl, get the grass!") (actions/talk entities :ego "Come on girl, get the grass!")
(actions/play-animation entities :ego :reach) (actions/play-animation entities :ego :reach)
(actions/talk entities :ego "I think she's not interested.")) (actions/talk entities :ego "I think she's not interested."))
:carrot (actions/get-script entities :carrot (actions/get-script entities
(actions/walk-to entities :ego ego-sheep-loc :face :left) (walk-to-sheep entities)
(actions/talk entities :ego "Come on girl, get the carrot!") (actions/talk entities :ego "Come on girl, get the carrot!")
(actions/walk-straight-to entities :sheep [90 138] :update-baseline? false) (actions/walk-straight-to entities :sheep [90 138] :update-baseline? false)
(actions/play-animation entities :ego :reach) (actions/play-animation entities :ego :reach)
(actions/remove-item entities :carrot) (actions/remove-item entities :carrot)
(actions/update-state entities (fn [s] (assoc s :coaxed-sheep? true)))) (actions/update-state entities (fn [s] (assoc s :coaxed-sheep? true)))
(leave-sheep entities))
:flask-1 (actions/get-script entities :flask-1 (actions/get-script entities
(if (is-sheep-close? @entities) (if (is-sheep-close? @entities)
(do (actions/walk-to entities :ego ego-sheep-loc :face :left) (do (walk-to-sheep entities)
(actions/play-animation entities :ego :reach) (actions/play-animation entities :ego :milk)
(actions/remove-item entities :flask-1) (actions/remove-item entities :flask-1)
(actions/give entities :flask-1-with-milk) (actions/give entities :flask-1-with-milk)
(actions/talk entities :ego "Sheeps milk.")) (actions/talk entities :ego "Sheeps milk.")
(leave-sheep entities))
(actions/talk entities :ego "She's too far away."))) (actions/talk entities :ego "She's too far away.")))
:flask-1-with-mushrooms :flask-1-with-mushrooms
(actions/get-script entities (actions/get-script entities
(if (is-sheep-close? @entities) (if (is-sheep-close? @entities)
(do (actions/walk-to entities :ego ego-sheep-loc :face :left) (do (walk-to-sheep entities)
(actions/play-animation entities :ego :reach) (actions/play-animation entities :ego :milk)
(items/make-cream-of-mushroom entities)) (items/make-cream-of-mushroom entities)
(leave-sheep entities))
(actions/talk entities :ego "She's too far away."))) (actions/talk entities :ego "She's too far away.")))
nil) nil)
:left {:walk (utils/flip sheep-walk) :left {:walk (utils/flip sheep-walk)

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

@@ -18,6 +18,7 @@
(def start-y 83) (def start-y 83)
(defn close [entities] (defn close [entities]
(screen! @(resolve 'advent.screens.scene/scene) :on-reactivate) (screen! @(resolve 'advent.screens.scene/scene) :on-reactivate)
(-> entities (-> entities
(assoc :shown? false) (assoc :shown? false)
@@ -69,6 +70,7 @@
entities)) entities))
:show-screen (fn [{:keys [success failure]} [entities]] :show-screen (fn [{:keys [success failure]} [entities]]
(sound! (sound "inside-house/open-safe.ogg") :play (utils/current-sound-volume))
(assoc entities (assoc entities
:start-showing? true :start-showing? true
:button-choices [] :button-choices []
@@ -103,7 +105,9 @@
(> x (+ start-x 200)) (> x (+ start-x 200))
(< y start-y) (< y start-y)
(> y (+ start-y 75))) (> y (+ start-y 75)))
(close entities)))))) (do
(sound! (sound "inside-house/close-safe.ogg") :play (utils/current-sound-volume))
(close entities)))))))
:on-resize (fn [{:keys [width height viewport]} entities] :on-resize (fn [{:keys [width height viewport]} entities]
(.update viewport width height))) (.update viewport width height)))

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

@@ -198,6 +198,7 @@
scared-walk (utils/make-anim "ego/scared-walk.png" [16 36] 0.05 (range 6)) scared-walk (utils/make-anim "ego/scared-walk.png" [16 36] 0.05 (range 6))
sigh (utils/make-anim "ego/sigh.png" [18 36] 0.08 [0 0 0 0 1 1 1 2 3 4 5 6 7 8 8 8 8 8 8 8 8 8 0 0 0 0 ]) sigh (utils/make-anim "ego/sigh.png" [18 36] 0.08 [0 0 0 0 1 1 1 2 3 4 5 6 7 8 8 8 8 8 8 8 8 8 0 0 0 0 ])
glad (utils/make-anim "ego/glad.png" [20 46] 0.04 (flatten [0 1 2 3 4 (repeat 8 [5 5 5]) (repeat 20 0)])) glad (utils/make-anim "ego/glad.png" [20 46] 0.04 (flatten [0 1 2 3 4 (repeat 8 [5 5 5]) (repeat 20 0)]))
milk (utils/make-anim "ego/squat.png" [18 36] 0.05 [0 1 2 2 3 3 3 3 3 3 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 3 3 3 3 3 3 3 3 3 3 3 2 1 0])
ego {:right {:walk walk-right ego {:right {:walk walk-right
:stand stand-anim :stand stand-anim
@@ -233,7 +234,8 @@
:scared-talk scared-talk :scared-talk scared-talk
:scared-walk scared-walk :scared-walk scared-walk
:sigh sigh :sigh sigh
:glad glad} :glad glad
:milk milk}
:left {:walk (utils/flip walk-right) :left {:walk (utils/flip walk-right)
:stand (utils/flip stand-anim) :stand (utils/flip stand-anim)
:talk (utils/flip talk-anim) :talk (utils/flip talk-anim)
@@ -259,12 +261,14 @@
:spear (utils/flip spear) :spear (utils/flip spear)
:pant (utils/flip pant) :pant (utils/flip pant)
:sigh (utils/flip sigh) :sigh (utils/flip sigh)
:glad (utils/flip glad)} :glad (utils/flip glad)
:milk (utils/flip milk)}
:baseline (- 240 (last start-pos)) :baseline (- 240 (last start-pos))
:facing :right :facing :right
:origin-x 9 :origin-x 9
:origin-y 0 :origin-y 0
:scaled true :scaled true
:milk-sound (sound "outsidehouse/milk.ogg")
:step-sound-1 (sound "ego/step-1.ogg") :step-sound-1 (sound "ego/step-1.ogg")
:step-sound-2 (sound "ego/step-2.ogg") :step-sound-2 (sound "ego/step-2.ogg")
:sigh-sound (sound "ego/sigh.ogg") :sigh-sound (sound "ego/sigh.ogg")
@@ -338,7 +342,10 @@
143 [:blink 0.15] 143 [:blink 0.15]
176 [:blink 0.15]} 176 [:blink 0.15]}
(get-in ego [:left :sigh]) {1 [:sigh-sound 0.4]} (get-in ego [:left :sigh]) {1 [:sigh-sound 0.4]}
(get-in ego [:right :sigh]) {1 [:sigh-sound 0.4]}} (get-in ego [:right :sigh]) {1 [:sigh-sound 0.4]}
(get-in ego [:left :milk]) {8 [:milk-sound 1.0]}
(get-in ego [:right :milk]) {8 [:milk-sound 1.0]}
}
:anim-merges {(get-in ego [:right :shock]) {:origin-x 15} :anim-merges {(get-in ego [:right :shock]) {:origin-x 15}
:default {:origin-x 9}})] :default {:origin-x 9}})]
(actions/start-animation screen (actions/start-animation screen