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

improving blergh experience.

Browse Source
This commit is contained in:
Bryce Covert
2014-12-23 13:57:53 -08:00
parent c58f548ca2
commit 88a01cd821
5 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/outsidehouse/background.psd
View File

Binary file not shown.

BIN
desktop/resources/space/background.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
desktop/resources/space/collision.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

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

@@ -98,32 +98,32 @@
(defn pull-sword [entities]
(actions/play-animation entities :ego :reach)
(actions/transition-music entities :town-1 :fight)
(actions/add-entity entities :blackout (get-in @entities [:room :blackout]))
(actions/add-entity entities :pull-sword (get-in @entities [:room :pull-sword]))
(actions/play-animation entities :pull-sword :pull-sword)
(actions/give entities :sword)
(actions/remove-entity entities :sword)
(actions/transition-background entities :space [83 80])
(actions/do-dialogue entities :ego "Where am I?")
(actions/walk-to entities :ego [65 85] :face :left)
(actions/do-dialogue entities :ego "What's going on?")
(actions/walk-to entities :ego [55 55] :face :left)
(actions/do-dialogue entities :ego "What is this place?"
:blergh "Ahem.")
(actions/walk-to entities :ego [50 55] :face :right)
(actions/remove-entity entities :pull-sword)
(actions/remove-entity entities :blackout)
(actions/do-dialogue entities :ego "That was weird."
:ego "I have to go show my friends!")
(actions/walk-to entities :ego [85 145] :face :right)
(actions/transition-background entities :space [0 65])
(actions/walk-to entities :ego [150 65] :face :right)
(actions/add-entity entities :blergh (get-in @entities [:room :blergh]))
(actions/play-animation entities :blergh :appear :stop? false)
(actions/transition-music entities :town-1 :fight)
(actions/do-dialogue entities :ego "Who are YOU?!?!?!"
:blergh "I'm your worst nightmare."
:blergh "I am Blergh, and this is my dimension."
:blergh "The last 100 years I have waited for someone to pull my old sword,\n and give me my chance to escape this prison!"
:blergh "And you are the best you people could send me? HA!"
:blergh "I am Blergh, and this is now my dimension."
:blergh "The last 100 years I have waited for someone to pull my old sword,\n and let me return me to my rightful throne!"
:ego "Wait a second. I'm just a kid."
:ego "I'm just trying to impress Georgia McGorgeous."
:ego "I just... accidentally pulled the sword!"
:ego "I didn't know I would have to fight!"
:ego "I didn't know that it would release a new evil on the world!"
:blergh "'Fight he must for one more test,\nHe will die if not the best.'"
:blergh "Ring any bells?"
:blergh "This will be easy."
:blergh "It's time to die kiddo."
:blergh "I'll even let you take a free shot at me."
:blergh "Come on! Give it a go!"))
@@ -156,7 +156,7 @@
game-player-flex (animation 0.075 (for [i [0 0 4 4 5 5 5 5 5 5 5 6 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 6 5 5 5 5 5 5 5 5 5 5 4 4 0 0 0 0]]
(aget game-player-talk-sheet 0 i)))
trophy (utils/make-anim "inside-castle/trophy.png" [16 16] 0.1 (flatten [(repeat 50 0) 1 2 3 3 3 3 2 1]))
pull-sword-anim (utils/make-anim "inside-castle/pull-sword.png" [95 190] 0.15 (flatten [(map #(repeat 40 %) (range 3)) [2 2 3 2 3 3 3 3 2 2 2 2 3 2 3 3 3 2 2 3 3 2 2 3 2 3 2 3 2 3 2 3 2 2 2 2 2 2 3 2 3 3 3 3 3 3 ]]))]
pull-sword-anim (utils/make-anim "inside-castle/pull-sword.png" [95 190] 0.10 (flatten [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2 2 2 2 2 2 2 3 2 3 2 3 3 2 3 2 2 3 3 2 3 2 3 2 3 2 3 2 3 2 2 3 3 3 2 3 2 3 3 2 3 2 3 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1]))]
(rooms/make :music :town-1
:interactions
{:right-door {:box [286 140 306 160]

35
desktop/src-common/advent/screens/rooms/space.clj
View File

@@ -34,23 +34,24 @@
{}
:layers [(assoc (texture "space/background.png") :x 0 :y 0 :baseline 0)]
:timers {:taunt [10.0 8.0 taunt]}
:entities {:blergh (assoc (animation->texture screen blergh-stand-anim)
:x 180 :y 50 :baseline 190
:anim blergh-stand-anim :anim-start 0
:stand blergh-stand-anim :talk blergh-talk-anim
:swing blergh-swing
:appear blergh-appear
:script (actions/get-script entities (actions/play-animation entities :blergh :appear :stop? false) (actions/do-dialogue entities :blergh "Come on! Try and hit me!"))
:scripts {:sword (actions/get-script entities
(actions/walk-straight-to entities :ego [205 45])
(actions/play-animation entities :ego :swing)
(actions/do-dialogue entities :blergh "Ha ha ha! Is that the best you can do?"
:blergh "Take this!")
(actions/play-animation entities :blergh :swing)
(actions/walk-straight-to entities :ego [100 45] :anim :squat :override-dir :right :speed 3.0)
(actions/do-dialogue entities :ego "Ouch!"
:blergh "Why don't you try that again?"))})}
:blergh (rooms/make-entity :blergh (assoc (animation->texture screen blergh-appear)
:x 180 :y 50 :baseline 190
:anim blergh-stand-anim :anim-start 0
:stand blergh-stand-anim :talk blergh-talk-anim
:swing blergh-swing
:appear blergh-appear
:talk-color (color 0.95 0.4 0.2 1.0)
:script (actions/get-script entities (actions/do-dialogue entities :blergh "Come on! Try and hit me!"))
:scripts {:sword (actions/get-script entities
(actions/walk-straight-to entities :ego [205 45])
(actions/play-animation entities :ego :swing)
(actions/do-dialogue entities :blergh "Ha ha ha! Is that the best you can do?"
:blergh "Take this!")
(actions/play-animation entities :blergh :swing)
(actions/walk-straight-to entities :ego [100 45] :anim :squat :override-dir :right :speed 3.0)
(actions/do-dialogue entities :ego "Ouch!"
:blergh "Why don't you try that again?"))}))
:entities {}
:collision "space/collision.png"
:scale-fn (constantly 1.5)
:start-pos [43 80])))