From f6d881fa98ec493f57b4f5487efe9cf3a22c9b67 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Thu, 30 Jul 2015 21:32:25 -0700 Subject: [PATCH] wizard dialogue updates --- desktop/gametodos.txt | 4 +- desktop/resources/wizard/Untitled.png | Bin 0 -> 2584 bytes desktop/resources/wizard/talk-angry.png | Bin 0 -> 2661 bytes desktop/resources/wizard/talk-angry.pxa/0.pxi | Bin 0 -> 264135 bytes desktop/resources/wizard/talk-angry.pxa/1.pxi | Bin 0 -> 264137 bytes desktop/resources/wizard/talk-angry.pxa/2.pxi | Bin 0 -> 788928 bytes desktop/resources/wizard/talk-angry.pxa/3.pxi | Bin 0 -> 788927 bytes .../wizard/talk-angry.pxa/CelData.plist | 22 +++++++++++ .../advent/screens/rooms/common.clj | 4 ++ .../advent/screens/rooms/inside_castle.clj | 10 +++-- .../advent/screens/rooms/outside_house.clj | 37 ++++++++++-------- 11 files changed, 55 insertions(+), 22 deletions(-) create mode 100644 desktop/resources/wizard/Untitled.png create mode 100644 desktop/resources/wizard/talk-angry.png create mode 100644 desktop/resources/wizard/talk-angry.pxa/0.pxi create mode 100644 desktop/resources/wizard/talk-angry.pxa/1.pxi create mode 100644 desktop/resources/wizard/talk-angry.pxa/2.pxi create mode 100644 desktop/resources/wizard/talk-angry.pxa/3.pxi create mode 100644 desktop/resources/wizard/talk-angry.pxa/CelData.plist diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 6b0eb644..8a202401 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -2,9 +2,11 @@ + fight with blergh at end isn't great + blergh taunts + ending -+ Brian O'Brainy animation + proper save/settings file location + closing should stop all scripts + dialogue for coin drop + night gandarf text is bad + descriptions for all items when used on self. ++ revamp text ++ gandarf animation ++ diff --git a/desktop/resources/wizard/Untitled.png b/desktop/resources/wizard/Untitled.png new file mode 100644 index 0000000000000000000000000000000000000000..a600075778d6d8d8ce51a64551c61dc3e215de83 GIT binary patch literal 2584 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 KmA~tbuK8aXiJ`9m literal 0 HcmV?d00001 diff --git a/desktop/resources/wizard/talk-angry.pxa/3.pxi b/desktop/resources/wizard/talk-angry.pxa/3.pxi new file mode 100644 index 0000000000000000000000000000000000000000..e86884daf8648e313fea620e39345f6c5f177a65 GIT binary patch literal 788927 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 + + + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index dd6c1e20..93b249da 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -24,6 +24,7 @@ (let [wizard-sheet (texture! (texture "wizard/talk.png") :split 20 46) wizard-stand (animation 0.2 (for [i (flatten [(repeat 10 0) 1])] (aget wizard-sheet 0 i))) + wizard-talk-angry (utils/make-anim "wizard/talk-angry.png" [20 50] 0.2 [0 2 0 2 1 2 0 3 0 2 0 1 0 2]) wizard-disappear (utils/make-anim "wizard/disappear.png" [20 46] 0.075 (range 19)) wizard-talk (animation 0.2 (for [i [0 2 0 2 1 2 0 3 0 2 0 1 0 2]] (aget wizard-sheet 0 i)))] @@ -31,10 +32,13 @@ :left {:talk (utils/flip wizard-talk) :stand (utils/flip wizard-stand) :disappear (utils/flip wizard-disappear) + + :talk-angry (utils/flip wizard-talk-angry) } :right {:talk wizard-talk :stand wizard-stand :disappear wizard-disappear + :talk-angry (utils/flip wizard-talk-angry) } :night-profile :sprite :origin-x 0 diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 4975cb42..e4a65590 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -204,15 +204,17 @@ :ego "It looks like there's an inscription here.") (actions/play-animation entities :ego :squat) (actions/do-dialogue entities - :ego "'The Sword of Blergh with magic sting,\nShall yield to no earthly king.'" - :ego "Worthy in wisdom, courage, and might,\nOnly then with sword he'll fight. ") + :ego "'In the day when I shall be pulled,\nWith much strength a knight will take hold.'" + :ego "'Courage will he need,\nWisdom he shall heed.'" + :ego "'A final test remains, behold!'") (if (= 3 (count missing-items)) (do (actions/walk-to entities :ego [115 54]) (actions/do-dialogue entities - :ego "I have to prove myself worthy in wisdom, courage, and might!" + :ego "I think it means I have to prove myself worthy in wisdom, courage, and might!" :ego "Then I can become a knight and impress Georgia McGorgeous!") - (actions/in-love entities)) + (actions/in-love entities) + (actions/talk entities :ego "... I wonder what that last bit is about.")) (actions/do-dialogue entities :ego (str "I've proven myself in " (str/join " and " (map item->proof obtained-items)) ", but still have to prove myself in " diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 83131061..014ef709 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -157,10 +157,11 @@ :wizard "That was you!?" :wizard "My house was nearly destroyed!" :wizard "I spent weeks rebuilding my home!" - :wizard "Leave, now, or I'll turn you into a ..." - :wizard "... a ..." - :wizard "... a frog!" - :ego "Okay, okay! I'm leaving.") + ) + (actions/talk entities :wizard "Leave, now, or I'll turn you into a ..." :anim :talk-angry :stop? false) + (actions/talk entities :wizard "... a ..." :anim :talk-angry :stop? false) + (actions/talk entities :wizard "... a frog!" :anim :talk-angry) + (actions/talk entities :ego "Okay, okay, I'm leaving!") (actions/transition-background entities :outside-house [257 90] :face :left) (actions/do-dialogue entities :ego "I guess he's really upset with me." :ego "I wonder if I can convince him to let me stay..."))} @@ -183,7 +184,8 @@ :wizard "Take me for example." :wizard "When you have a bod like man, you can hardly go to the grocery store without being noticed." :wizard "But no. Your looks, however good they may be, don't give you the right to teach me a lesson." - :wizard "Now please leave me in peace.") + ) + (actions/talk entities :wizard "Now leave, before I turn you into a frog!" :anim :talk-angry) (actions/transition-background entities :outside-house [257 90] :face :left) (actions/talk entities :ego "Gandarf is pretty upset, but I bet he can be reasoned with."))} "My good standing within the community?" @@ -202,27 +204,28 @@ :wizard "Well, well. It sounds like you've turned over a new leaf." :wizard "But know this, the stone cannot be cheated easily." :wizard "You must fulfill the age-old prophecy." - :wizard "'The Sword of Blergh with magic sting,\nShall yield to no earthly king'" - :wizard "'To draw from hardened, weathered stone,\nHe must have valor, to the bone.'" - :wizard "'Worthy in courage, wisdom and might,\nOnly then with sword he'll fight.'" - :wizard "'But a hero should he prove not be,\nOnly ruin will fall on he.'" - :wizard "'Fight he must, for one more test...'") + :wizard "'In the day when it shall be pulled,\nWith much strength a knight will take hold.'" + ) :choices ["Is this almost over?" {:run #(do (actions/update-state entities (fn [state] (assoc state :convinced-wizard? true))) (actions/respond entities % :wizard "Patience, boy." - :wizard "... 'He will die if not the best.'" - :wizard "If this is truely your quest, boy, then I will help you. " + :wizard "'Courage will he need,\nWisdom he shall heed.'" + :wizard "'A final test remains, behold!'" + :wizard "Do you think you're up for that?" + :wizard "If this is truely your quest, then I will help you. " :ego "So you're my friend now, Gandarf?" - :wizard "No, but I won't kick you out of my house, as long as you behave."))} + :wizard "No. But I'll help you as best I can."))} "*cough* *cough* *ahem*" {:run #(do (actions/update-state entities (fn [state] (assoc state :convinced-wizard? true))) (actions/respond entities % :wizard "Excuse you. Moving on..." - :wizard "... 'He will die if not the best'" - :wizard "If this is truely your quest, boy, then I will help you. " + :wizard "'Courage will he need,\nWisdom he shall heed.'" + :wizard "'A final test remains, behold!'" + :wizard "Do you think you're up for that?" + :wizard "If this is truely your quest, then I will help you. " :ego "So you're my friend now, Gandarf?" - :wizard "No, but I won't kick you out of my house, as long as you behave.") + :wizard "No. But I'll help you as best I can.") (utils/save @entities))}]} "By besting swamp, foe, and the occasional bizarre conversation tree." {:run #(do (actions/respond entities % @@ -247,7 +250,7 @@ :wizard "Hurry, boy! Time's-a-wastin'!") (do (actions/do-dialogue entities :ego "Gandarf! Boy am I glad to see you." - :wizard "There is no time, boy." + :wizard "There is no time, Tick!" :wizard "We must hurry if you are to defeat Bloodclot." :ego "Wait, you knew about Bloodclot all along?" :ego "And you never told me?"