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 00000000..a6000757 Binary files /dev/null and b/desktop/resources/wizard/Untitled.png differ diff --git a/desktop/resources/wizard/talk-angry.png b/desktop/resources/wizard/talk-angry.png new file mode 100644 index 00000000..cb64bcd4 Binary files /dev/null and b/desktop/resources/wizard/talk-angry.png differ diff --git a/desktop/resources/wizard/talk-angry.pxa/0.pxi b/desktop/resources/wizard/talk-angry.pxa/0.pxi new file mode 100644 index 00000000..bd729bce Binary files /dev/null and b/desktop/resources/wizard/talk-angry.pxa/0.pxi differ diff --git a/desktop/resources/wizard/talk-angry.pxa/1.pxi b/desktop/resources/wizard/talk-angry.pxa/1.pxi new file mode 100644 index 00000000..fc1cb84f Binary files /dev/null and b/desktop/resources/wizard/talk-angry.pxa/1.pxi differ diff --git a/desktop/resources/wizard/talk-angry.pxa/2.pxi b/desktop/resources/wizard/talk-angry.pxa/2.pxi new file mode 100644 index 00000000..fc36e5ef Binary files /dev/null and b/desktop/resources/wizard/talk-angry.pxa/2.pxi differ 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 00000000..e86884da Binary files /dev/null and b/desktop/resources/wizard/talk-angry.pxa/3.pxi differ diff --git a/desktop/resources/wizard/talk-angry.pxa/CelData.plist b/desktop/resources/wizard/talk-angry.pxa/CelData.plist new file mode 100644 index 00000000..f6263f12 --- /dev/null +++ b/desktop/resources/wizard/talk-angry.pxa/CelData.plist @@ -0,0 +1,22 @@ + + + + + + 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?"