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

progress

Browse Source
This commit is contained in:
Bryce Covert
2016-08-01 18:36:05 -07:00
parent 9139a37119
commit 0a3b10b221
11 changed files with 96 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -439,9 +439,9 @@
(actions/walk-straight-to entities :ego [180 100] :anim :jumping-straight :update-baseline? false :stop? false :speed 2.0)
(actions/walk-straight-to entities :ego [190 30] :anim :jumping-straight :update-baseline? false :stop? false :speed 3.0)
(actions/walk-straight-to entities :ego [200 -80] :anim :jumping-straight :update-baseline? false :stop? false :speed 8.0)
(actions/remove-item entities :dream-sword)
(actions/remove-item entities :broom)
(actions/remove-item entities :shovel)
(actions/remove-item entities :dream-sword :quiet? true)
(actions/remove-item entities :broom :quiet? true)
(actions/remove-item entities :shovel :quiet? true)
(actions/transition-background entities :inside-castle [92 150] :time 8.0)
(actions/resume-camera entities)
(actions/walk-straight-to entities :ego [79 145] :stop? false)

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

@@ -262,10 +262,16 @@
:frankie "And some gold..."
:frankie "And what's this?")
(actions/play-animation entities :frankie :reach)
(actions/remove-item entities :slingshot)
(actions/remove-item entities :medal)
(actions/remove-item entities :trophy)
(actions/do-dialogue entities
:frankie "The Slinger's Shot?"
:ego "No, not the Slinger's Shot!"
:frankie "Looks like we hit the jackpot tonight, boys!")
(actions/remove-item entities :flask-1-strength)
(frankie-comment-on-item entities)
(actions/update-state entities #(assoc % :bubba-gone? true))
(actions/do-dialogue entities
@@ -278,10 +284,6 @@
:frankie "Before we decide to take all of your stuff."
:ego "But I need that slingshot!"
:frankie "Too bad. Move along.")
(actions/remove-item entities :flask-1-strength)
(actions/remove-item entities :medal)
(actions/remove-item entities :trophy)
(actions/remove-item entities :slingshot)
(actions/walk-to entities :ego [181 79])
(actions/do-dialogue entities

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

@@ -121,7 +121,7 @@
(actions/play-animation entities :ego :reach-stop :stop? true)
(actions/remove-item entities :slingshot)
(actions/remove-item entities :slingshot :quiet? true )
(actions/give entities :magic-slingshot)
(actions/do-dialogue entities :ego "It worked!")
@@ -751,7 +751,7 @@
(if (is-sheep-close? @entities)
(do (walk-to-sheep entities)
(actions/play-animation entities :ego :milk)
(actions/remove-item entities :flask-1)
(actions/remove-item entities :flask-1 :quiet? true)
(actions/give entities :flask-1-with-milk)
(actions/talk entities :ego "Sheep's milk.")
)

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

@@ -213,7 +213,7 @@
:scripts {:flask-2 (actions/get-script entities
(actions/walk-to entities :ego [151 119] :face :right)
(actions/play-animation entities :ego :reach)
(actions/remove-item entities :flask-2)
(actions/remove-item entities :flask-2 :quiet? true)
(actions/give entities :flask-water)
(actions/talk entities :ego "Filled up with water, just as Gandarf wanted."))}}}
:layers {:day [(assoc (utils/get-texture "outside-jail/background.png") :x 0 :y 0 :baseline 0)