credits screen and stuff.

This commit is contained in:
Bryce Covert
2015-09-09 18:36:29 -07:00
parent e6de6660e5
commit 4d04431044
18 changed files with 126 additions and 32 deletions

View File

@@ -0,0 +1 @@
brycecovert@brometheus.local.31618

View File

@@ -85,7 +85,17 @@
(actions/talk entities :ego "It looks like the wall is crumbling here.")
(actions/play-animation entities :ego :reach)
(actions/update-entity entities :peeling #(assoc % :opacity 0))
(actions/update-state entities (fn [state] (assoc state :opened-crack? true)))))))
(actions/update-state entities (fn [state] (assoc state :opened-crack? true))))))
:scripts {:stick (actions/get-script entities
(if (get-in @entities [:state :opened-crack?])
(actions/talk entities :ego "I could shove the stick in that, hole, but why?")
(actions/do-dialogue entities
:ego "It looks like that wall is crumbling."
:ego "I can probably scratch it off with my hand.")))
:sword (actions/get-script entities
(actions/do-dialogue entities
:ego "I should be careful with this sword."
:ego "It's sharp!"))})
:bird (utils/make-bird screen [[50 235] [80 220] [100 239] [180 235] [85 225]])
:outside-particles (common/make-outside-particles)}
:collision "behindhouse/collision.png"

View File

@@ -96,4 +96,9 @@
(update-in [:tweens] dissoc :cam-x :cam-y)
(update-in [:room :entities :ego] #(actions/start-animation screen % :suspended))
(assoc-in [:room :entities :ego :stand-override] :suspended)
(assoc-in [:room :entities :ego :talk-override] :suspended-talk))))))
(assoc-in [:room :entities :ego :talk-override] :suspended-talk)
(assoc-in [:room :entities :ego :get-script] (fn [cursor [x y]]
(actions/get-script entities
(if (= :flask-1-strength (:value cursor))
(common/do-win entities)
(actions/talk entities :ego "I can't reach it!"))))))))))

View File

@@ -275,7 +275,7 @@
(actions/talk entities :ego "Who are you?!" :anim :scared-talk)
(actions/begin-animation entities :ego :scared)
(actions/do-dialogue entities
:bloodclot-head "I am Bloodclot, the Scottish goblin!"
:bloodclot-head "I am Bloodclot, the goblin!"
:bloodclot-head "I've spent last 100 years training for this day."
:bloodclot-head "The day when I must best the worthiest of knights in battle."
:bloodclot-head "But I had never expected my foe to be so..."

View File

@@ -31,8 +31,7 @@
(assoc-in [:tweens :dawn-g-s] (tween/tween :dawn-g-s screen [:time-profiles :sprite :g] :current 0.36 50.0 :entities entities))
(assoc-in [:tweens :dawn-b-s] (tween/tween :dawn-b-s screen [:time-profiles :sprite :b] :current 0.23 50.0 :entities entities))
(assoc-in [:tweens :hue-amount-v-s] (tween/tween :hue-amount-v-s screen [:time-profiles :sprite :hue-amount] :current 0.0 50.0 :entities entities))
(assoc-in [:tweens :multiply-amount-v-s] (tween/tween :multiply-amount-v-s screen [:time-profiles :sprite :multiply-amount] :current 0.0 50.0 :entities entities)))
)
(assoc-in [:tweens :multiply-amount-v-s] (tween/tween :multiply-amount-v-s screen [:time-profiles :sprite :multiply-amount] :current 0.0 50.0 :entities entities))))
(continue [this screen entities]
entities)
(done? [this screen entities]
@@ -43,8 +42,6 @@
:none)))
(defn walk-to-castle [entities & {:keys [skip-type stop?] :or {skip-type :end stop? true}}]
(actions/walk-to entities :ego [0 80] :skip-type skip-type)
(actions/walk-straight-to entities :ego [-20 80])
@@ -699,6 +696,10 @@
(items/make-cream-of-mushroom entities)
(leave-sheep entities))
(actions/talk entities :ego "She's too far away.")))
:sword
(actions/get-script entities
(actions/talk entities :ego "That's just cruel."))
nil)
:left {:walk (utils/flip sheep-walk)
:stand (utils/flip sheep-stand)}
@@ -731,8 +732,8 @@
(actions/talk entities :ego "Aww, it's a newborn lamb!")
)
:scripts {:carrot (actions/get-script entities (actions/talk entities :ego "I think it's still nursing."))
:grass (actions/get-script entities (actions/talk entities :ego "I think it's still nursing."))}
)
:grass (actions/get-script entities (actions/talk entities :ego "I think it's still nursing."))
:sword (actions/get-script entities (actions/talk entities :ego "I prefer to let the butcher make lamb chops."))})
:butterfly (assoc (animation->texture screen butterfly-stand)
:x 161
:y 218
@@ -756,7 +757,10 @@
:scripts put-something-in-cauldron))
:wizard (rooms/make-entity :wizard (common/make-wizard screen {:x 190 :y 78 :baseline 162 :scale-x 1.2 :scale-y 1.2
:script (actions/get-script entities (talk-to-gandarf-outside entities))
:scripts {:default (actions/get-script entities (actions/talk entities :wizard "No time for that!"))}}))
:scripts {:default (actions/get-script entities (actions/talk entities :wizard "No time for that!"))
:sword (actions/get-script entities (actions/do-dialogue entities
:wizard "The Sword of Blergh!"
:wizard "Good job, Tick."))}}))
:note (rooms/make-entity :note (assoc (texture "outsidehouse/note.png")
:x 277 :y 74 :baseline 160
:night-profile :none

View File

@@ -20,11 +20,12 @@
(get-in entities [:state :active?])
(not (get-in entities [:state :blergh-dead?]))
(not (actions/has-item? entities :magic-slingshot)))
((actions/get-script entities (actions/do-dialogue entities :bloodclot-head (rand-nth ["Come on, little man! Try and hit me!"
"What's the matter? Cold feet?"
((actions/get-script entities (actions/do-dialogue entities :bloodclot-head (rand-nth ["Come over here, so I can eat you!"
"The taste of children makes my tummy rumble!"
"Come here and fight me like man!"
"Your precious Georgia McGorgeous would be laughing if she saw you now."
"Pick up your weapon and fight!"]))) entities))
"Georgia McGorgeous will be so impressed with how quickly I eat you!"
"Come on, I'm hungry!"
"First I'll eat you, then I'll eat Georgia McGorgeous!"]))) entities))
nil)
(defn shock [screen entities]