Hard to believe, but I think fullscreen truly works, even through sleep.
This commit is contained in:
Bryce Covert
@@ -1 +0,0 @@
|
||||
brycecovert@brometheus.local.2657
|
||||
@@ -195,7 +195,7 @@
|
||||
(begin [this screen entities]
|
||||
(-> entities
|
||||
(assoc-in [:tweens :fade-out]
|
||||
(tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 3.5 :ease tween/ease-in-out-quintic))))
|
||||
(tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 7.0 :ease tween/ease-in-out-quintic))))
|
||||
(continue [this screen entities]
|
||||
entities)
|
||||
|
||||
@@ -245,8 +245,8 @@
|
||||
(skip-type [this screen entities]
|
||||
:none))
|
||||
(Thread/sleep 2000)
|
||||
(actions/transition-background entities :ending [165 49] :time 4.0)
|
||||
(actions/do-stop entities :ego :face :left)
|
||||
(actions/transition-background entities :ending [165 49] :time 4.0)
|
||||
(actions/do-dialogue entities
|
||||
:duke "Ladies and gentlemen."
|
||||
:duke "As the Duke of Remington, I'm pleased to inform you..."
|
||||
@@ -282,10 +282,6 @@
|
||||
(Thread/sleep 400)
|
||||
(actions/do-stop entities :ego :face :left)
|
||||
(Thread/sleep 400)
|
||||
(actions/do-stop entities :ego :face :right)
|
||||
(Thread/sleep 400)
|
||||
(actions/do-stop entities :ego :face :left)
|
||||
(Thread/sleep 400)
|
||||
(actions/do-dialogue entities :ego "Where's Georgia McGorgeous?")
|
||||
(actions/walk-straight-to entities :gandarf-cloud [215 100] :update-baseline? false)
|
||||
(actions/do-dialogue entities :gandarf "Quickly, boy!")
|
||||
@@ -314,6 +310,7 @@
|
||||
(particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :reset)
|
||||
(particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :start)
|
||||
(disappear entities)
|
||||
(Thread/sleep 2000)
|
||||
(fade-out entities)
|
||||
(on-gl (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.credits/credits)))
|
||||
))
|
||||
|
||||
@@ -16,43 +16,6 @@
|
||||
[play-clj.utils :refer :all]
|
||||
[play-clj.g2d :refer :all]))
|
||||
|
||||
(defn disappear [entities]
|
||||
(actions/run-action entities
|
||||
(begin [this screen entities]
|
||||
(-> entities
|
||||
|
||||
(assoc-in [:tweens :disappear-ego]
|
||||
(tween/tween :disappear-ego screen [:room :entities :ego :opacity] 1.0 0.0 0.5 :ease tween/ease-in-out-quintic))))
|
||||
|
||||
(continue [this screen entities]
|
||||
entities)
|
||||
|
||||
(done? [this screen entities]
|
||||
(= 0.0 (get-in entities [:room :entities :ego :opacity])))
|
||||
|
||||
(terminate [this screen entities]
|
||||
entities)
|
||||
(skip-type [this screen entities]
|
||||
:none)))
|
||||
|
||||
(defn fade-out [entities]
|
||||
(actions/run-action entities
|
||||
(begin [this screen entities]
|
||||
(-> entities
|
||||
(assoc-in [:tweens :fade-out]
|
||||
(tween/tween :fade-out screen [:fade :opacity] 0.0 1.0 3.5 :ease tween/ease-in-out-quintic))))
|
||||
(continue [this screen entities]
|
||||
entities)
|
||||
|
||||
(done? [this screen entities]
|
||||
(= 1.0 (get-in entities [:fade :opacity])))
|
||||
|
||||
(terminate [this screen entities]
|
||||
entities)
|
||||
(skip-type [this screen entities]
|
||||
:none)))
|
||||
|
||||
|
||||
(defn make [screen]
|
||||
(let [
|
||||
peddler-sheet (texture! (texture "outside-castle/peddler-talk.png" ) :split 18 36)
|
||||
@@ -76,6 +39,8 @@
|
||||
:interactions {}
|
||||
:layers [(assoc (texture "ending-castle/ending-castle2-assets/background.png") :x 0 :y 0 :origin-x 0 :origin-y 0 :baseline 0)
|
||||
(assoc (texture "ending-castle/ending-castle2-assets/foreground.png") :x 160 :y 0 :origin-x 165 :origin-y 5 :baseline 240 :parallax 1.4)]
|
||||
:apply-state (fn [screen e]
|
||||
(update-in e [:room :entities :ego] dissoc :talk-override ))
|
||||
:entities {:peddler (assoc (animation->texture screen peddler-stand)
|
||||
:x 245 :y 46 :baseline 200
|
||||
:anim peddler-stand
|
||||
@@ -104,78 +69,7 @@
|
||||
:stand duke-stand
|
||||
:reach duke-reach
|
||||
:reach-talk duke-reach-talk
|
||||
:knight duke-knight
|
||||
:script (actions/get-script entities
|
||||
(actions/do-stop entities :ego :face :left)
|
||||
(actions/do-dialogue entities
|
||||
:duke "Ladies and gentlemen."
|
||||
:duke "As the Duke of Remington, I'm pleased to inform you..."
|
||||
:duke "The goblin by the name of Bloodclot has been destroyed!"
|
||||
:duke "Our town is saved."
|
||||
:duke "Thanks to this young boy, Tick."
|
||||
:duke "It is my rightful duty as Duke of Remington to knight you."
|
||||
:duke "You've proven yourself worthy."
|
||||
:duke "Your sword, please.")
|
||||
(actions/walk-straight-to entities :ego [150 49])
|
||||
(actions/play-animation entities :ego :reach-start :stop? false)
|
||||
(actions/play-animation entities :duke :reach :stop? false)
|
||||
(actions/play-animation entities :ego :reach-stop :stop? false)
|
||||
(actions/talk entities :duke "Kneel." :anim :reach-talk :stop? false)
|
||||
(actions/play-animation entities :ego :start-squat-2 :stop? false)
|
||||
(Thread/sleep 1000)
|
||||
(actions/play-animation entities :duke :knight :stop? false)
|
||||
(actions/update-entity entities :duke (fn [d] (assoc d :baseline (- 240 48))))
|
||||
(actions/play-animation entities :duke :knight :stop? false)
|
||||
(actions/talk entities :duke "In honor of your bravery..." :anim :reach-talk :stop? false)
|
||||
(actions/talk entities :duke "I declare you Sir Tick of Remington." :anim :reach-talk)
|
||||
(actions/play-animation entities :ego :end-squat :stop? true)
|
||||
(Thread/sleep 500)
|
||||
(actions/glad entities)
|
||||
(Thread/sleep 200)
|
||||
(actions/do-dialogue entities :ego "Wait...")
|
||||
(Thread/sleep 400)
|
||||
(actions/do-stop entities :ego :face :right)
|
||||
(Thread/sleep 400)
|
||||
(actions/do-stop entities :ego :face :left)
|
||||
(Thread/sleep 400)
|
||||
(actions/do-stop entities :ego :face :right)
|
||||
(Thread/sleep 400)
|
||||
(actions/do-stop entities :ego :face :left)
|
||||
(Thread/sleep 400)
|
||||
(actions/do-stop entities :ego :face :right)
|
||||
(Thread/sleep 400)
|
||||
(actions/do-stop entities :ego :face :left)
|
||||
(Thread/sleep 400)
|
||||
(actions/do-dialogue entities :ego "Where's Georgia McGorgeous?")
|
||||
(actions/walk-straight-to entities :gandarf-cloud [215 100] :update-baseline? false)
|
||||
(actions/do-dialogue entities :gandarf "Quickly, boy!")
|
||||
(actions/do-stop entities :ego :face :right)
|
||||
(actions/do-dialogue entities :ego "Gandarf?"
|
||||
:gandarf "Yes, it is I!"
|
||||
:ego "How did you escape?"
|
||||
:gandarf "No time for that!"
|
||||
:gandarf "Georgia McGorgeous has been captured!"
|
||||
:ego "Captured?! By who?"
|
||||
:gandarf "Bloodclot's second-in-command, Swinebreath."
|
||||
:gandarf "I'm afraid that I can't save her."
|
||||
:gandarf "This is a job for a knight."
|
||||
:gandarf "If you are willing, Tick..."
|
||||
:duke "That's 'Sir Tick'..."
|
||||
:gandarf "Quite right, quite right."
|
||||
:gandarf "If you are willing, Sir Tick..."
|
||||
:gandarf "I can transport you to the land where her prision lies."
|
||||
:gandarf "But it is far out of my sight, and I know not what you'll find."
|
||||
:gandarf "Well? What say you?"
|
||||
:ego "I'll do it! "
|
||||
:gandarf "Very good."
|
||||
:gandarf "Prepare yourself.")
|
||||
(Thread/sleep 300)
|
||||
(actions/talk entities :gandarf "Beamium Up!!!" :anim :talk-angry)
|
||||
(particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :reset)
|
||||
(particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :start)
|
||||
(disappear entities)
|
||||
(fade-out entities)
|
||||
(on-gl (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.credits/credits)))))
|
||||
:knight duke-knight)
|
||||
:magic-frog-particle (doto (assoc (particle-effect "inside-house/magic-frog") :x 140 :y 49
|
||||
:baseline 241)
|
||||
(particle-effect! :set-position 150 49))
|
||||
|
||||
Reference in New Issue
Block a user