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

strength potion

Browse Source
This commit is contained in:
Remington Covert
2015-02-18 20:04:34 -08:00
parent 4789df90f9
commit ffe112cfcb
3 changed files with 54 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,10 +60,13 @@
(actions/update-state entities #(assoc % :next-time :day)) (actions/update-state entities #(assoc % :next-time :day))
(inside-castle/walk-to-blergh entities) (inside-castle/walk-to-blergh entities)
(actions/do-dialogue entities (actions/do-dialogue entities
:ego "Blergh!" :ego "Bloodclot!"
:blergh "Oh, hello again." :bloodclot-head "Oh, hello again."
:blergh "I thought I had taken care of you the last time I saw you." :bloodclot-head "I thought I had taken care of you the last time I saw you."
:blergh "Any final words before I destroy you again?")))) :bloodclot-head "Any final words before I destroy you again?")
(actions/play-animation entities :ego :scared :continue? true)
(Thread/sleep 500)
(actions/walk-straight-to entities :ego [35 45] :override-dir :right :speed 3.0))))
:broken-clock (actions/get-script entities :broken-clock (actions/get-script entities
(actions/walk-to entities :ego [141 90] :face :right) (actions/walk-to entities :ego [141 90] :face :right)
(actions/play-animation entities :ego :reach) (actions/play-animation entities :ego :reach)

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

@@ -166,7 +166,8 @@
blergh-stand-anim (utils/make-anim "space/bloodclot-stand.png" [106 165] 0.75 [0 1]) blergh-stand-anim (utils/make-anim "space/bloodclot-stand.png" [106 165] 0.75 [0 1])
blergh-grow (utils/make-anim "space/blergh-grow.png" [106 165] 0.10 [0 1 0 1 0 1 0 1 1 1 1 0 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 3 3 3 3 3 3 3 3 3 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 4 5 6 7 8 9 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11]) blergh-grow (utils/make-anim "space/blergh-grow.png" [106 165] 0.10 [0 1 0 1 0 1 0 1 1 1 1 0 1 1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 2 3 3 3 3 3 3 3 3 3 3 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 4 5 6 7 8 9 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11])
bullet (utils/make-anim "space/bullet.png" [24 24] 0.0075 [0 1 2 0 1 2 0 1 2 0 1 2 0 1 2 3 3 3 4 4 5 5 6 5 4 7]) bullet (utils/make-anim "space/bullet.png" [24 24] 0.0075 [0 1 2 0 1 2 0 1 2 0 1 2 0 1 2 3 3 3 4 4 5 5 6 5 4 7])
effect (particle-effect "space/appear")] effect (particle-effect "space/appear")
blowup-effect (particle-effect "space/blowup")]
(rooms/make :music :fight (rooms/make :music :fight
:interactions :interactions
{} {}
@@ -175,6 +176,9 @@
:entities {:appear (assoc effect :entities {:appear (assoc effect
:x 240 :y 50 :x 240 :y 50
:baseline 200) :baseline 200)
:blowup (assoc blowup-effect
:x 225 :y 175
:baseline 240)
:bloodclot-head (assoc (animation->texture screen bloodclot-head-stand-anim) :bloodclot-head (assoc (animation->texture screen bloodclot-head-stand-anim)
:x 195 :y 138 :baseline 195 :x 195 :y 138 :baseline 195
:opacity 0.0 :opacity 0.0
@@ -196,42 +200,56 @@
:script (actions/get-script entities :script (actions/get-script entities
(actions/do-dialogue entities :bloodclot-head "Come on! Try and hit me!")) (actions/do-dialogue entities :bloodclot-head "Come on! Try and hit me!"))
:scripts {:sword (actions/get-script entities :scripts {:sword (actions/get-script entities
(swing-at-blergh entities) (if (actions/has-item? entities :magic-slingshot)
(if (get-in @entities [:state :broke-jewel?])
(actions/do-dialogue entities :bloodclot-head "Ha ha ha! Is that the best you can do?" (do
:bloodclot-head "Take this!") (swing-at-blergh entities)
(actions/do-dialogue entities
:bloodclot-head "Ha ha ha! Still a weakling, I see."
:bloodclot-head "But you'll not best me!")
(sound! (sound "space/shock.ogg") :play) (actions/play-animation entities :ego :scared :continue? true)
(actions/play-animation entities :bloodclot-head :shoot :stop? false) (Thread/sleep 500)
(actions/begin-animation entities :bloodclot-head :keep-shoot) (actions/walk-straight-to entities :ego [35 45] :override-dir :right :speed 3.0))
(actions/play-animation entities :ego :shock :stop? false) (actions/do-dialogue entities :ego "I don't want to get too close while he still has his lightning gem!"))
(actions/begin-animation entities :bloodclot-head :stand) (do
(actions/play-animation entities :ego :burnt :stop? false) (swing-at-blergh entities)
(actions/play-animation entities :ego :passed-out :continue? true) (actions/do-dialogue entities :bloodclot-head "Ha ha ha! Is that the best you can do?"
(actions/do-dialogue entities :bloodclot-head "Oh shucks. I overcooked him." :bloodclot-head "Take this!")
:bloodclot-head "No matter."
:bloodclot-head "Tomorrow, I will return with my legion of goblins." (sound! (sound "space/shock.ogg") :play)
:bloodclot-head "And THEN the feast will begin." (actions/play-animation entities :bloodclot-head :shoot :stop? false)
:bloodclot-head "Starting with his precious Georgia McGorgeous.") (actions/begin-animation entities :bloodclot-head :keep-shoot)
(bloodclot-disappear entities) (actions/play-animation entities :ego :shock :stop? false)
(common/go-to-jail entities) (actions/begin-animation entities :bloodclot-head :stand)
(actions/do-dialogue entities :ego "Hey!" :ego "What's going on? I was just about to teach Bloodclot a lesson!")) (actions/play-animation entities :ego :burnt :stop? false)
(actions/play-animation entities :ego :passed-out :continue? true)
(actions/do-dialogue entities :bloodclot-head "Oh shucks. I overcooked him."
:bloodclot-head "No matter."
:bloodclot-head "Tomorrow, I will return with my legion of goblins."
:bloodclot-head "And THEN the feast will begin."
:bloodclot-head "Starting with his precious Georgia McGorgeous.")
(bloodclot-disappear entities)
(common/go-to-jail entities)
(actions/do-dialogue entities :ego "Hey!" :ego "What's going on? I was just about to teach Bloodclot a lesson!"))))
:magic-slingshot (actions/get-script entities :magic-slingshot (actions/get-script entities
(actions/do-dialogue entities (actions/do-dialogue entities
:ego "Hey Blergh!" :ego "Hey Bloodclot!"
:ego "Take this!") :ego "Eat this!")
(actions/play-animation entities :ego :shoot) (actions/play-animation entities :ego :shoot)
(actions/add-entity entities :bullet (get-in @entities [:room :bullet])) (actions/add-entity entities :bullet (get-in @entities [:room :bullet]))
(actions/walk-straight-to entities :bullet [213 166] :update-baseline? false :speed 5.0) (actions/walk-straight-to entities :bullet [213 166] :update-baseline? false :speed 15.0)
(particle-effect! (get-in @entities [:room :entities :blowup]) :reset)
(particle-effect! (get-in @entities [:room :entities :blowup]) :start)
(actions/add-entity entities :broken-jewel (get-in @entities [:room :broken-jewel])) (actions/add-entity entities :broken-jewel (get-in @entities [:room :broken-jewel]))
(Thread/sleep 500)
(actions/remove-entity entities :bullet) (actions/remove-entity entities :bullet)
(actions/update-state entities #(assoc % :broke-jewel? true)) (actions/update-state entities #(assoc % :broke-jewel? true))
(Thread/sleep 5000)
(actions/do-dialogue entities (actions/do-dialogue entities
:bloodclot-head "Argh! My magic lightning helmet!" :bloodclot-head "Argh! My lightning gem!"
:bloodclot-head "No matter. I will destroy you with my bare hands!"))})} :bloodclot-head "No matter. I will rip you apart with my bare hands!"))})}
:bullet (assoc (animation->texture screen bullet) :bullet (assoc (animation->texture screen bullet)
:x 130 :y 85 :baseline 241 :x 37 :y 85 :baseline 241
:walk bullet) :walk bullet)
:broken-jewel (assoc (texture "space/broken-jewel.png") :broken-jewel (assoc (texture "space/broken-jewel.png")
:x 222 :y 172 :baseline 240) :x 222 :y 172 :baseline 240)

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

@@ -451,7 +451,7 @@
:inventory (assoc (texture "inventory.png") :x 278 :y 0 :baseline 9000 :inventory (assoc (texture "inventory.png") :x 278 :y 0 :baseline 9000
:mouse-in? (zone/box 278 0 320 42)) :mouse-in? (zone/box 278 0 320 42))
:fps (assoc (label "0" (color :white) ) :x 5 :baseline 0)}] :fps (assoc (label "0" (color :white) ) :x 5 :baseline 0)}]
(music! (utils/get-current-music entities) :set-volume 0.0 #_(get-in entities [:volume :value])) (music! (utils/get-current-music entities) :set-volume (get-in entities [:volume :value]))
(utils/play-sound (get-in entities [:musics (actions/get-music (get-in entities [:room :music]) (get-in entities [:state :time]))])) (utils/play-sound (get-in entities [:musics (actions/get-music (get-in entities [:room :music]) (get-in entities [:state :time]))]))
@@ -490,7 +490,7 @@
(play-key-sounds (get-in entities [:room :entities])) (play-key-sounds (get-in entities [:room :entities]))
(doseq [m (vals (get-in entities [:musics]))] (doseq [m (vals (get-in entities [:musics]))]
(when m (when m
(music! m :set-volume 0.0 #_(get-in entities [:volume :value]) ))) (music! m :set-volume (get-in entities [:volume :value]) )))
(label! (:fps entities) :set-text (str (game :fps))) (label! (:fps entities) :set-text (str (game :fps)))