From ac3f8644b7123caa1094b15ecab0dd9444e414de Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Thu, 8 Jan 2015 12:59:17 -0800 Subject: [PATCH] working on getting in stash. --- desktop/resources/ego/crowbar.png | Bin 0 -> 2534 bytes desktop/resources/ego/crowbar.pxa/0.pxi | Bin 0 -> 264071 bytes desktop/resources/ego/crowbar.pxa/1.pxi | Bin 0 -> 264071 bytes desktop/resources/ego/crowbar.pxa/2.pxi | Bin 0 -> 264071 bytes desktop/resources/ego/crowbar.pxa/3.pxi | Bin 0 -> 264071 bytes .../resources/ego/crowbar.pxa/CelData.plist | 22 ++++++ .../advent/screens/rooms/inside_stash.clj | 40 +++++++++++ .../advent/screens/rooms/outside_jail.clj | 7 +- desktop/src-common/advent/screens/scene.clj | 68 +++++++++--------- 9 files changed, 103 insertions(+), 34 deletions(-) create mode 100644 desktop/resources/ego/crowbar.png create mode 100644 desktop/resources/ego/crowbar.pxa/0.pxi create mode 100644 desktop/resources/ego/crowbar.pxa/1.pxi create mode 100644 desktop/resources/ego/crowbar.pxa/2.pxi create mode 100644 desktop/resources/ego/crowbar.pxa/3.pxi create mode 100644 desktop/resources/ego/crowbar.pxa/CelData.plist create mode 100644 desktop/src-common/advent/screens/rooms/inside_stash.clj diff --git a/desktop/resources/ego/crowbar.png b/desktop/resources/ego/crowbar.png new file mode 100644 index 0000000000000000000000000000000000000000..dcfff95cc9992deaadaa09dacf874fcd38f40628 GIT binary patch literal 2534 zcmV4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER000GjNkl#_$@<;|*c09Ex zNuS7a+WzTak#LTY{qxx?Xz$}UQAfU{n%A!7vtGVyyQrjJbUclHY}-Ez!g#m!F7Uf| z9FKkf#O`ONpBYpi4|9dfe0B6b@=RH&R4&iJV!6CF8e);-RFo(UDd-o zE?Aj`%8NP`%Pp1fRla^h?Zc)IXt>~bY7W=Lz~aH_6*nv-2x)rvHd^!gUR6fhEBBw) zu1hn1%mmw<4sCowF_~t8eaFL5Aku_z_efXZhtqmjq7xI>Qn7T3OwU4%m`t<4AC9N4 zir76+y$h)s2=$KN7Ag_Rb7_|`+M{e>R7Q5uU0mXAnrD+KHM2dLV-JQTc~G~>ltmu+Ns6cy|GanLc;u{) z=ME?BEsXa$vSSuzAjyNW?HMRbJRCDAq7~jtk4hWz)u+B#r9Qq6j#R?fs(#|gTiRYY zvSUP}CZLEunP|f1oktkYN;bhH&--t7)0c(i)VaBz2LG)1qqmj7%=Ou%h~loDsT|c# z^%nZ6c;}GMj1D{Z)cy-Y>m1QAX92-ceWUgNRE)T1TbuBfb@hEqs|Xki2SVa=O7Mv(iB{trmBLp3lntkT@ME?|7rxy_XMTC!GEe;>%DdmDsSr<0aD=Ef)o;*ZX>sN2z#Ynmb)G0|$Q)=jg(p0w|HA|fE20s&!f wVRMO)JQ29Yn;egEmpg;b1I`1^10fIm2VX->xJ?)nAOHXW07*qoM6N<$f`%UEU;qFB literal 0 HcmV?d00001 diff --git a/desktop/resources/ego/crowbar.pxa/0.pxi b/desktop/resources/ego/crowbar.pxa/0.pxi new file mode 100644 index 0000000000000000000000000000000000000000..6f68c52620a51caf64b6accdcbd6e277b1dd062c GIT binary patch literal 264071 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 literal 0 HcmV?d00001 diff --git a/desktop/resources/ego/crowbar.pxa/3.pxi b/desktop/resources/ego/crowbar.pxa/3.pxi new file mode 100644 index 0000000000000000000000000000000000000000..f262820142ce275064c106c837051e2c7951982f GIT binary patch literal 264071 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 Lo0tF2WS;*IlalH& literal 0 HcmV?d00001 diff --git a/desktop/resources/ego/crowbar.pxa/CelData.plist b/desktop/resources/ego/crowbar.pxa/CelData.plist new file mode 100644 index 00000000..f0b74d60 --- /dev/null +++ b/desktop/resources/ego/crowbar.pxa/CelData.plist @@ -0,0 +1,22 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/src-common/advent/screens/rooms/inside_stash.clj b/desktop/src-common/advent/screens/rooms/inside_stash.clj new file mode 100644 index 00000000..ad737adf --- /dev/null +++ b/desktop/src-common/advent/screens/rooms/inside_stash.clj @@ -0,0 +1,40 @@ +(ns advent.screens.rooms.inside-stash + (:require [advent.screens.rooms :as rooms] + [advent.screens.items :as items] + [advent.actions :as actions] + [advent.utils :as utils] + [clojure.zip :as zip] + [play-clj.core :refer :all] + [play-clj.ui :refer :all] + [play-clj.utils :refer :all] + [play-clj.g2d :refer :all])) + + + +(defn make [screen] + (rooms/make :music {:day :town-2 :night :night} + :interactions + {:left-dir {:box [91 60 125 140] + :script (actions/get-script + entities + (actions/walk-straight-to entities :ego [118 96]) + (actions/transition-background entities :outside-jail [200 97]) + (actions/walk-straight-to entities :ego [167 100])) + :cursor :left} + :chest {:box [151 107 180 124] + :script (actions/get-script entities + (actions/walk-to entities :ego [152 95]) + (actions/talk entities :ego "Maybe my stuff is in here...") + (actions/play-animation entities :ego :reach) + (actions/talk entities :ego "It's locked tight!")) + :scripts {:sword (actions/get-script entities (actions/talk entities :ego "There's not enough room to swing my sword here.")) + :crowbar (actions/get-script entities + (actions/talk entities :ego "Let's see if this can open this puppy up.") + (actions/walk-straight-to entities :ego [152 95] :face :right) + (actions/play-animation entities :ego :crowbar) + )}}} + :layers [(assoc (texture "inside-stash/background.png") :x 0 :y 0 :baseline 0)] + :entities {} + :collision "inside-stash/collision.png" + :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.00) + :start-pos [143 96])) diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index ea654faf..5efdbb1b 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -76,7 +76,10 @@ (actions/talk entities :ego "Here goes nothing!") (actions/play-animation entities :ego :squat) (actions/play-animation entities :stash :open :stop? false) - (actions/walk-straight-to entities :ego [212 97]))) + (actions/walk-straight-to entities :ego [212 97]) + (actions/transition-background entities :inside-stash [118 96]) + (actions/walk-straight-to entities :ego [142 96]) + (actions/talk entities :ego "This must be Frankie Rockfist's secret stash!"))) (defn make [screen] (let [fountain (utils/make-anim "outside-jail/fountain.png" [42 50] 0.2 (range 3)) @@ -197,7 +200,7 @@ (actions/remove-entity entities :watch) (actions/give entities :watch)))) - :stash (rooms/make-entity :stash (assoc (texture "outside-jail/closed-stash.png") + :stash (rooms/make-entity :stash (assoc (animation->texture screen open-stash) :x 197 :y 94 :baseline 146 :open open-stash :close close-stash)) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 6dab5059..3dda50c5 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -18,6 +18,7 @@ [advent.screens.rooms.castle-gate :as rooms.castle-gate] [advent.screens.rooms.outside-house :as rooms.outside-house] [advent.screens.rooms.inside-house :as rooms.inside-house] + [advent.screens.rooms.inside-stash :as rooms.inside-stash] [advent.screens.rooms.inside-castle :as rooms.inside-castle] [advent.screens.rooms.inside-jail :as rooms.inside-jail] [advent.screens.rooms.outside-jail :as rooms.outside-jail] @@ -91,36 +92,36 @@ entities)))) #_(defn drink-blergh [entities] - (actions/walk-straight-to entities :ego [205 45]) - (sound! (sound "ego/potion.ogg") :play) - (actions/play-animation entities :ego :grow :stop? false) - (actions/do-dialogue entities - :blergh "What this? A potion of strength?" - :blergh "You're still no match for me." - :blergh "Give it to me, or I'll make you regret it!") - (actions/present-choices entities {:choices ["Ok." - {:run (fn [_] - (actions/talk entities :ego "Ok." :anim :grow-talk :stop? false) - (actions/talk entities :ego "Here you go." :anim :grow-talk) - (actions/do-dialogue entities - :blergh "Yes! Now I can drink this whole thing and can become powerful enough to rule the world!" - :blergh "[#AAFFAAFF]*gulp*[]" - :blergh "What's this? What's happening?") - (actions/talk entities :ego "Uh oh." :anim :grow-talk :stop? false) - (actions/walk-straight-to entities :ego [100 45] :face :right) - (actions/play-animation entities :blergh :grow :stop? false) - (actions/do-dialogue entities :ego "'Not more than that do drink,\nOr you'll push your body to the brink.'" - :ego "Brilliant! I win!") - (actions/walk-straight-to entities :ego [800 75] :face :right) - (actions/update-state entities (fn [s] (assoc s :blergh-dead? true))))} - "No way!" - {:run (fn [_] - (actions/talk entities :ego "No way!" :anim :grow-talk) - (actions/talk entities :blergh "Then take this!") - (actions/play-animation entities :blergh :swing) - (actions/walk-straight-to entities :ego [100 45] :anim :squat :override-dir :right :speed 3.0) - (actions/do-dialogue entities :ego "Yeow!!" - :ego "Even with that potion, I'm not strong enough."))}]})) + (actions/walk-straight-to entities :ego [205 45]) + (sound! (sound "ego/potion.ogg") :play) + (actions/play-animation entities :ego :grow :stop? false) + (actions/do-dialogue entities + :blergh "What this? A potion of strength?" + :blergh "You're still no match for me." + :blergh "Give it to me, or I'll make you regret it!") + (actions/present-choices entities {:choices ["Ok." + {:run (fn [_] + (actions/talk entities :ego "Ok." :anim :grow-talk :stop? false) + (actions/talk entities :ego "Here you go." :anim :grow-talk) + (actions/do-dialogue entities + :blergh "Yes! Now I can drink this whole thing and can become powerful enough to rule the world!" + :blergh "[#AAFFAAFF]*gulp*[]" + :blergh "What's this? What's happening?") + (actions/talk entities :ego "Uh oh." :anim :grow-talk :stop? false) + (actions/walk-straight-to entities :ego [100 45] :face :right) + (actions/play-animation entities :blergh :grow :stop? false) + (actions/do-dialogue entities :ego "'Not more than that do drink,\nOr you'll push your body to the brink.'" + :ego "Brilliant! I win!") + (actions/walk-straight-to entities :ego [800 75] :face :right) + (actions/update-state entities (fn [s] (assoc s :blergh-dead? true))))} + "No way!" + {:run (fn [_] + (actions/talk entities :ego "No way!" :anim :grow-talk) + (actions/talk entities :blergh "Then take this!") + (actions/play-animation entities :blergh :swing) + (actions/walk-straight-to entities :ego [100 45] :anim :squat :override-dir :right :speed 3.0) + (actions/do-dialogue entities :ego "Yeow!!" + :ego "Even with that potion, I'm not strong enough."))}]})) (defn get-ego [screen start-pos start-scale] @@ -145,13 +146,13 @@ start-squat (animation 0.05 (for [i [0 1 2 3 4]] (texture (aget squat-sheet 0 i)))) end-squat (animation 0.05 (for [i [4 3 2 1 0]] - (texture (aget squat-sheet 0 i)))) + (texture (aget squat-sheet 0 i)))) squat-anim (animation 0.05 (for [i [0 1 2 3 3 3 3 3 3 3 3 3 3 3 3 2 1] ] (texture (aget squat-sheet 0 i)))) reach-anim (animation 0.1 (for [i [0 1 2 3 3 3 3 3 3 2 1 0]] (texture (aget reach-sheet 0 i)))) reach-start (animation 0.1 (for [i [0 1 2 3 ]] - (texture (aget reach-sheet 0 i)))) + (texture (aget reach-sheet 0 i)))) reach-stop (animation 0.1 (for [i [3 2 1 0]] (texture (aget reach-sheet 0 i)))) cat-toy-anim (animation 0.1 (for [i [0 0 1 1 2 2 3 4 3 2 3 4 3 2 3 4 3 2 3 4 3 2 2 1 1 0 0]] @@ -173,6 +174,7 @@ grow-talk (utils/make-anim "ego/grow-talk.png" [18 36] 0.2 (range 2)) get-sick (animation 0.3 (map (partial get [(aget talk-sheet 0 0 ) (texture "ego/get-sick.png")]) [0 1 1 1 1 1 1 1 1 1 1 1]) ) spear (utils/make-anim "ego/spear.png" [18 100] 0.2 [0 1 2 3 2 3 2 3 2 3 2 1 0]) + crowbar (utils/make-anim "ego/crowbar.png" [36 36] 0.1 [0 0 0 1 1 2 2 2 2 2 3 2 3 2 3 2 3 2 3 3 3 1 1 0 0 0]) ego {:right {:walk walk-right :stand stand-anim @@ -185,6 +187,7 @@ :cat-toy-first-half cat-toy-first-half :cat-toy-last-half cat-toy-last-half :grow grow + :crowbar crowbar :get-sick get-sick :hold-up-to-window hold-up-to-window :swing swing @@ -342,6 +345,7 @@ (update! screen :renderer (stage) :camera (orthographic)) (let [_ (input! :set-cursor-image (utils/cursor "cursor.png" :main) 0 0) rooms {:inside-house (rooms.inside-house/make screen) + :inside-stash (rooms.inside-stash/make screen) :outside-house (rooms.outside-house/make screen) :behind-house (rooms.behind-house/make screen) :cat-tree (rooms.cat-tree/make screen)