From b09f530c5461226977bef25cf6a0dc0a9751eff7 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sun, 26 Jul 2015 20:28:32 -0700 Subject: [PATCH] another candle. --- desktop/resources/inside-stash/candle.png | Bin 0 -> 1226 bytes .../resources/inside-stash/candle.pxa/0.pxi | Bin 0 -> 264071 bytes .../resources/inside-stash/candle.pxa/1.pxi | Bin 0 -> 264071 bytes .../resources/inside-stash/candle.pxa/2.pxi | Bin 0 -> 264071 bytes .../resources/inside-stash/candle.pxa/3.pxi | Bin 0 -> 264071 bytes .../inside-stash/candle.pxa/CelData.plist | 22 +++++ desktop/src-common/advent/screens/rooms.clj | 4 +- .../advent/screens/rooms/inside_stash.clj | 78 ++++++++++++------ 8 files changed, 76 insertions(+), 28 deletions(-) create mode 100644 desktop/resources/inside-stash/candle.png create mode 100644 desktop/resources/inside-stash/candle.pxa/0.pxi create mode 100644 desktop/resources/inside-stash/candle.pxa/1.pxi create mode 100644 desktop/resources/inside-stash/candle.pxa/2.pxi create mode 100644 desktop/resources/inside-stash/candle.pxa/3.pxi create mode 100644 desktop/resources/inside-stash/candle.pxa/CelData.plist diff --git a/desktop/resources/inside-stash/candle.png b/desktop/resources/inside-stash/candle.png new file mode 100644 index 0000000000000000000000000000000000000000..1ecf712d63d28e21e9942b3043606c33b5b36f2b GIT binary patch literal 1226 zcmV;*1U37KP)4Tx05}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)UmlaER0001CNkl(OME`?mT;S84Iuvqo>%6wyamPP$u-G-3)*Izowb)e~xgjkz8{4{)dTG2I zoBO+(wTX_F*4rO>Du3PyCoW#r^|tOc7p;Bwd)8gC{;F#?_q}iH;PqpBCK}C~Z@ul~ zpZxTLpZWYiS9Nct^0WCTo!oxPsSEN8J5F0PSV^X0gyP89hFW!3d2Gi-J)JD4`wHd# z>0no>k~A9qWA*ar(2;p$^RmTRd)Ae8=G&fK(ti3G+j|SEk4)|0(yT38@WS%;Ggq8- zcIP?gt{kdOB&Bk5YM{I)8B6=C$)0p*vfL<-RMPCUY*CiWI_5uj-jen=y><0aTxNGV z)j0I#^WTykmmQy-aOi?ntFjZbe7qJ8G|QE=F|e;Z+8iGoPs?ND%^3XRGY(#o&CeFh zT;kGqUOxSf%d(TQlcyKHD<*hKc51OwD<#da>mN;;$>2@ht2(=H-qO*MYq1a@K!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0tAjq;H&p8e)*_QbP@pq$GpHxzxdG0{stWL zkI@YfI4Xge@BX3n%l!{x^@X8g`?l>ncD#S*a9l8{G}C%DX{PIw((bW(ZEtmSIKS-Gt$p=$vYhUl+qrX3 zj5PP_aDMU3hW|P&Yl+v{*^=zc=i8GNBc;)F*S3)uVMDD_s}GcB-m~S|>DjXEjOWJ7 z?KkYM#JvuUmz!xI%^p;kNJ{DYH7)tJY-!v|wH61=?wGFj%$)Lp-IdMVtJl7=T-uT? z9nN(7m>Xdk^Li+f*@oi&_a zaAhTFzIM7F{>X6t4TpK`qql!-X1Z^<^MB1D9PaqU?5)mCHD2^1IaV)^7RGCPE2A6h$-Zqfzs^32>t@yls^w;(yg!|vos*rLt(+OQU(|hgxwx}?_1ohC6>nOzc2(z^wKvCPK6_xWuhd{nmTXc8yKy)CQjvkF3kG>Q=5q&v&GI~1tcJ$ro`_T`gpF}T4zl?qx{XY6*^rz@A z(M!=^qkputw9bo;k79nUCq?a1KI(`TMN6Wk(OFSfbV1Y|#oSvjiPlD!N9&^X(Z;AJ zx;nZh+8hl=JED=6TxFFFuC96cF*CHhA6t>}Bvi_y=c-$j3p{ucc! zdbuSx?}Vr$IzQSJ^+%Pc8cjs?s2NR0w?ubD_e3$~y!)dEq6edgqQ|4Bqpw9@k75q< zz7zd0`cd>u^y}z1(chzgw&dFK(bDL`XhXC;8jJQvw?}tHFDEV-G_<;?Qv;U7odbGaA)199^m!~g&Q literal 0 HcmV?d00001 diff --git a/desktop/resources/inside-stash/candle.pxa/1.pxi b/desktop/resources/inside-stash/candle.pxa/1.pxi new file mode 100644 index 0000000000000000000000000000000000000000..32152339929b84539c6f123cadd2c2779a3b95a7 GIT binary patch literal 264071 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 T%guZ*XSRor{yFxZ%RT>JIv*Ij literal 0 HcmV?d00001 diff --git a/desktop/resources/inside-stash/candle.pxa/2.pxi b/desktop/resources/inside-stash/candle.pxa/2.pxi new file mode 100644 index 0000000000000000000000000000000000000000..c999328ea89ad591588950e13b8a7818c4aa80af GIT binary patch literal 264071 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 z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZ;HU&%`o)J{KB^ntM1a6CFK}r6a{vFw{9CjD z0!JtC)q5BF|35l9cM&+|1-2g7{_;%6{6Z{%0D=EY;MoluH(j~Ct5iuEjcT$dEgs%Y z8`t#~HkM1xa;=)wr=~ac6nhI>Ms7$;&A8+0_wMX1Y~I^UMk?tQ^?EXO=;~{FhI$LL z`}tg4(Ys|hf7+|p%suE(@1~yZo0D?2^V(!8t*>0S?eJ{lmO}qfUvc*6^gz!myDtnC z+qZ4svE%(ahvR`srJ2^NNi$ualy;BRYkRAs!}(>e9__2AljU^Z+{vALVx+lWhx3bP z4*b_;SxbD*&X#0nKHr|K7%7dWyS9zQ2pejZT7952^PMfvPS2KQXFNAvZogr7CDuAL zUT&s=G<#8DA}OWo*RX6t4TpK`qql!-X1Z^9@_)@C9PaqU>{92Z8Z+Eg9-F@NFv07OKY!QV_q4CP?^E~h z9IKZ{3*)uDmC=p$WZ$-#UuR#%bu)Vd)pD~?-k;9T&dJWrR?fVe2X;h|z*aYIs_Od8V<_q@6v zPQ8U|(y4Uxih60hJek&?nLgBCuhp7aYy7pJ7%hyJMJuBVql=d{nmTXc8y zKy)CQjvkF3kG>Q=5q&v&GI~1tcJ$ro`_T`gpF}T4zl?qx{XY6*^rz@A(M!=^qkput zw9bo;k79nUCq?a1KI(`TMN6Wk(OFSfbV1Y|#oSvjiPlD!N9&^X(Z;AJx;nZh+8hl= zJED=6TxFFFuC96cF*CHhA6t>}Bvi_y=c-$j3p{ucc!dbuSx?}Vr$ zIzQSJ^+%Pc8cjs?s2NR0w?ubD_e3$~y!)dEq6edgqQ|4Bqpw9@k75qu z^y}z1(chzgw&dFK(bDL`XhXC;8jJQvw?}tHF + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/src-common/advent/screens/rooms.clj b/desktop/src-common/advent/screens/rooms.clj index cc060b02..cf329451 100644 --- a/desktop/src-common/advent/screens/rooms.clj +++ b/desktop/src-common/advent/screens/rooms.clj @@ -26,7 +26,7 @@ (if (= :main cursor) (:script entity) (when-let [scripts (:scripts entity)] - (scripts (:value cursor)))))}))) + (or (scripts (:value cursor)) (scripts :default)))))}))) (defn make [& {:keys [collision interactions entities] :as params}] (let [interactions-as-list (for [[id spec] interactions] (merge spec {:mouse-in? (fn [_ x y] @@ -35,7 +35,7 @@ (if (= :main cursor) (:script spec) (when-let [scripts (:scripts spec)] - (scripts (:value cursor))))) + (or (scripts (:value cursor)) (scripts :default))))) :id id})) entities (into {} (for [[id entity] entities] [id (make-entity id entity)]))] diff --git a/desktop/src-common/advent/screens/rooms/inside_stash.clj b/desktop/src-common/advent/screens/rooms/inside_stash.clj index 8cabbd17..a9125147 100644 --- a/desktop/src-common/advent/screens/rooms/inside_stash.clj +++ b/desktop/src-common/advent/screens/rooms/inside_stash.clj @@ -24,11 +24,11 @@ (defn explore-chest [entities] (cond (actions/has-item? entities :slingshot) - (do (actions/walk-to entities :ego [152 95]) + (do (actions/walk-to entities :ego [152 95] :face :right) (actions/talk entities :ego "It's empty now.")) (get-in @entities [:state :broke-lock?]) (do - (actions/walk-to entities :ego [152 95]) + (actions/walk-to entities :ego [152 95] :face :right) (actions/talk entities :ego "Let's see what's inside now.") (actions/play-animation entities :ego :reach) (actions/do-dialogue entities @@ -40,7 +40,7 @@ (actions/give entities :slingshot)) :else (do - (actions/walk-to entities :ego [152 95]) + (actions/walk-to entities :ego [152 95] :face :right) (actions/talk entities :ego "Maybe my stuff is in here...") (actions/play-animation entities :ego :reach) (actions/talk entities :ego "It's locked tight!")))) @@ -48,28 +48,54 @@ (defn make [screen] - (rooms/make :music {:day :secret-hideout :night :secret-hideout} - :interactions - {:left-dir {:box [91 60 125 140] + (let [candle-flame (utils/make-anim "inside-stash/candle.png" [4 4] 0.1 (range 4)) + candle-aura (utils/make-anim (texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1] ) + ] + (rooms/make :music {:day :secret-hideout :night :secret-hideout} + :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} + :candle {:box [160 130 170 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 (explore-chest entities)) - :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 - (bust-chest entities))}}} - :layers [(assoc (texture "inside-stash/background.png") :x 0 :y 0 :baseline 0 :night-profile :none)] - :entities {:lid (assoc (texture "inside-stash/lid.png") - :x 156 :y 116 :baseline 125 :night-profile :none) - } - :collision "inside-stash/collision.png" - :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.00) - :start-pos [143 96] - :apply-state (fn [_ entities] - (if (get-in entities [:state :broke-lock?]) - (update-in entities [:room :entities] #(dissoc % :lid)) - entities)))) + (actions/talk entities :ego "Just a candle.")) + :scripts {:note-1 (actions/get-script entities + (actions/talk entities :ego "Why would I want to burn Gandarf's note?")) + :note-2 (actions/get-script entities + (actions/talk entities :ego "Why would I want to burn Gandarf's note?")) + :recipe (actions/get-script entities + (actions/walk-to entities :ego [152 95] :face :right) + (actions/play-animation entities :ego :reach) + (actions/remove-item entities :recipe) + (actions/give entities :ash) + (actions/talk entities :ego "It burned up into ash.")) + :default (actions/get-script entities + (actions/talk entities :ego "Momma always told me not to play with fire."))}} + :chest {:box [151 107 180 124] + :script (actions/get-script entities (explore-chest entities)) + :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 + (bust-chest entities))}}} + :layers [(assoc (texture "inside-stash/background.png") :x 0 :y 0 :baseline 0 :night-profile :none)] + :entities {:lid (assoc (texture "inside-stash/lid.png") + :x 156 :y 116 :baseline 125 :night-profile :none) + :candle-flame (assoc (animation->texture screen candle-flame) + :x 165 :y 135 :baseline 1 + :anim candle-flame + :anim-start 0 + :night-profile :none) + + :candle-aura (assoc (animation->texture screen candle-aura) :x 166 :y 138 :baseline 2 :additive? true :origin-x 13 :origin-y 13 :opacity 0.5 :anim candle-aura :anim-start 0 :night-profile :none) + } + :collision "inside-stash/collision.png" + :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.00) + :start-pos [143 96] + :apply-state (fn [_ entities] + (if (get-in entities [:state :broke-lock?]) + (update-in entities [:room :entities] #(dissoc % :lid)) + entities)))))