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

fixes.

Browse Source
This commit is contained in:
Bryce Covert
2021-09-08 08:00:59 -07:00
parent 23e87d6224
commit 8ee743e371
58 changed files with 340 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
desktop/src-common/advent/screens/rooms/cat_tree.clj
View File

@@ -319,23 +319,29 @@
:cursor :hand
:label "Suspicous looking rock"
:script (actions/get-script entities
(when (and (actions/has-obtained? entities :note-1)
(if (and (actions/has-obtained? entities :note-1)
(not (actions/has-obtained? entities :walkie-talkies)))
(actions/walk-to entities :ego [85 99])
(actions/play-animation entities :ego :squat)
(actions/do-dialogue entities
:ego "Hey! A little lever."
:ego "I think this is Gandarf's secret stash of helpful stuff.")
(actions/play-animation entities :ego :squat)
(actions/give entities :alarm-clock)
(actions/do-dialogue entities :ego "What is this?")
(actions/play-animation entities :ego :squat)
(actions/give entities :camera)
(actions/do-dialogue entities :ego "These are all really strange devices.")
(actions/play-animation entities :ego :squat)
(actions/give entities :walkie-talkies)
(actions/talk entities :ego "Tin cans connected with string?")
(actions/do-dialogue entities :ego "I wonder what all of these magic devices do.")))}
(do
(actions/walk-to entities :ego [85 99])
(actions/play-animation entities :ego :squat)
(actions/do-dialogue entities
:ego "Hey! A little lever."
:ego "I think this is Gandarf's secret stash of helpful stuff.")
(actions/play-animation entities :ego :squat)
(actions/give entities :alarm-clock)
(actions/do-dialogue entities :ego "What is this?")
(actions/play-animation entities :ego :squat)
(actions/give entities :camera)
(actions/do-dialogue entities :ego "These are all really strange devices.")
(actions/play-animation entities :ego :squat)
(actions/give entities :walkie-talkies)
(actions/talk entities :ego "Tin cans connected with string?")
(actions/do-dialogue entities :ego "I wonder what all of these magic devices do."))
(do
(actions/walk-to entities :ego [85 99])
(actions/play-animation entities :ego :squat)
(actions/do-dialogue entities
:ego "I've looted everything in here!"))))}
:grass {:box [26 105 60 160]
:cursor :hand
:label "Grass"
@@ -492,7 +498,55 @@
:flask-water-flies (try-flask)
:flask-flies-ash (try-flask)
:spell-component (try-flask)
:glass-eye (actions/get-script entities
(cond
(actions/has-obtained? entities :feather)
(do (actions/walk-to entities :ego [141 54] :face :right)
(actions/do-dialogue entities
:ego "Could you use this as a monocle?"
:owl "You already gave me my monocle, silly boy!"))
(get-in @entities [:state :wants-monocle?])
(do
(actions/walk-to entities :ego [141 54] :face :right)
(actions/do-dialogue entities
:ego "Could you use this glass eye as a monocle?"
:owl "It is the choicest of eyes."
:owl "But a human eye won't fit.")
(do-puke entities))
:else
(actions/talk entities :ego "Why would an owl want that?")))
:motivational-tapes (actions/get-script entities
(cond
(get-in @entities [:state :wants-monocle?])
(do
(actions/walk-to entities :ego [141 54] :face :right)
(actions/do-dialogue entities
:ego "Could these motivational tapes help you hunt?"
:owl "I already have the strength of will."
:owl "Just not the strength of stomach.")
(do-puke entities))
:else
(actions/talk entities :ego "Why would an owl want that?")))
:earplugs (actions/get-script entities
(cond
(get-in @entities [:state :wants-monocle?])
(do
(actions/walk-to entities :ego [141 54] :face :right)
(actions/do-dialogue entities
:ego "Could these earplugs help you hunt?"
:owl "No, I rely on my hearing too much.")
(do-puke entities))
:else
(actions/talk entities :ego "Why would an owl want that?")))
:flask-1-strength (actions/get-script entities
(cond
(get-in @entities [:state :wants-monocle?])

1
desktop/src-common/advent/screens/rooms/held.clj
View File

@@ -123,6 +123,7 @@
(fn [screen entities]
(tween/tween :arm-y screen [:room :entities :arm :y] 240 70 3.0 :ease tween/ease-linear)))
(actions/transition-background entities :tongue-fight [141 240])
(actions/walk-straight-to entities :ego [141 110] :anim :tongue-idle :speed 4.0))

2
desktop/src-common/advent/screens/rooms/outside_jail.clj
View File

@@ -140,7 +140,7 @@
:script (actions/get-script entities
(actions/talk entities :ego "That's my house. I'd rather play outside."))}
:sherrif-house {:box [138 143 160 168]
:label "Sherriff's house"
:label "Sheriff's house"
:cursor :look
:script (actions/get-script entities
(actions/do-dialogue entities

1
desktop/src-common/advent/screens/rooms/tongue_fight.clj
View File

@@ -364,6 +364,7 @@
:scale-fn (constantly 1.0)
:start-pos [141 110]
:apply-state (fn [screen e]
(screen! @(resolve 'advent.screens.scene/hud) :on-tongue-fight {})
(-> e
(update-in [:room :entities :ego] #(actions/start-animation screen % :tongue-idle))
(assoc-in [:room :entities :ego :stand-override] :tongue-idle)