From 820aa48f4ad2c0a7edff6e4e68e3fe9c57629ba6 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Tue, 3 Mar 2015 13:51:54 -0800 Subject: [PATCH] chorus. cool. --- desktop/resources/inside-castle/magic | 66 ++++++++++-------- desktop/resources/inside-castle/magic.png | Bin 1077 -> 15309 bytes .../advent/screens/rooms/inside_castle.clj | 42 +++++++++-- 3 files changed, 70 insertions(+), 38 deletions(-) diff --git a/desktop/resources/inside-castle/magic b/desktop/resources/inside-castle/magic index eba34810..9dbe05bd 100644 --- a/desktop/resources/inside-castle/magic +++ b/desktop/resources/inside-castle/magic @@ -8,13 +8,13 @@ lowMax: 3000.0 min: 0 max: 200 - Emission - -lowMin: 1.0 -lowMax: 1.0 -highMin: 20.0 -highMax: 20.0 +lowMin: 40.0 +lowMax: 40.0 +highMin: 80.0 +highMax: 80.0 relative: false scalingCount: 2 -scaling0: 0.0 +scaling0: 0.42857143 scaling1: 1.0 timelineCount: 2 timeline0: 0.0 @@ -23,7 +23,7 @@ timeline1: 1.0 lowMin: 0.0 lowMax: 0.0 highMin: 1000.0 -highMax: 1000.0 +highMax: 3000.0 relative: false scalingCount: 3 scaling0: 1.0 @@ -46,8 +46,8 @@ side: both - Spawn Width - lowMin: 0.0 lowMax: 0.0 -highMin: 20.0 -highMax: 20.0 +highMin: 35.0 +highMax: 35.0 relative: false scalingCount: 1 scaling0: 1.0 @@ -56,40 +56,44 @@ timeline0: 0.0 - Spawn Height - lowMin: 0.0 lowMax: 0.0 -highMin: 30.0 -highMax: 30.0 +highMin: 45.0 +highMax: 45.0 relative: false scalingCount: 1 scaling0: 1.0 timelineCount: 1 timeline0: 0.0 - Scale - -lowMin: 0.0 -lowMax: 0.0 -highMin: 15.0 -highMax: 5.0 +lowMin: 3.0 +lowMax: 3.0 +highMin: 11.0 +highMax: 20.0 relative: false scalingCount: 4 scaling0: 0.0 scaling1: 1.0 -scaling2: 0.877551 +scaling2: 0.6938776 scaling3: 0.0 timelineCount: 4 timeline0: 0.0 -timeline1: 0.07534247 -timeline2: 0.6164383 +timeline1: 0.23972602 +timeline2: 0.63013697 timeline3: 1.0 - Velocity - active: true -lowMin: 0.0 -lowMax: 0.0 +lowMin: 3.0 +lowMax: 3.0 highMin: 10.0 highMax: 20.0 relative: false -scalingCount: 1 +scalingCount: 3 scaling0: 1.0 -timelineCount: 1 +scaling1: 0.85714287 +scaling2: 0.0 +timelineCount: 3 timeline0: 0.0 +timeline1: 0.6712329 +timeline2: 0.96575344 - Angle - active: true lowMin: 90.0 @@ -100,11 +104,11 @@ relative: false scalingCount: 3 scaling0: 1.0 scaling1: 1.0 -scaling2: 1.0 +scaling2: 0.0 timelineCount: 3 timeline0: 0.0 timeline1: 0.48630136 -timeline2: 1.0 +timeline2: 0.9931507 - Rotation - active: false - Wind - @@ -113,12 +117,12 @@ active: false active: false - Tint - colorsCount: 6 -colors0: 0.5019608 -colors1: 0.94509804 -colors2: 1.0 -colors3: 0.047058824 -colors4: 0.7137255 -colors5: 1.0 +colors0: 0.24705882 +colors1: 0.31764707 +colors2: 0.8156863 +colors3: 0.5529412 +colors4: 0.34901962 +colors5: 0.7019608 timelineCount: 2 timeline0: 0.0 timeline1: 1.0 @@ -130,12 +134,12 @@ highMax: 1.0 relative: false scalingCount: 4 scaling0: 0.0 -scaling1: 0.8947368 +scaling1: 1.0 scaling2: 0.49122807 scaling3: 0.0 timelineCount: 4 timeline0: 0.0 -timeline1: 0.30136988 +timeline1: 0.1849315 timeline2: 0.84931505 timeline3: 1.0 - Options - diff --git a/desktop/resources/inside-castle/magic.png b/desktop/resources/inside-castle/magic.png index 6416d5ee2db6b093ec3e840242f36ebb4851e0d6..c0d2478d015c79b4510cb7d20def97fbb114f079 100644 GIT binary patch literal 15309 zcmeI3dvFs)9LKM`)Ygil3?KtzCZZJ~xw|xJlAAQOO+@n za`kA6a=s$f)M~Z9X`CPj&Acc#0&^r7hH8p(l|;h4Fc)ZsM$jaMijC)X?lBr9vDkR8 z&Byq{9?&dRb|_$0$MhPZW3J#7jV10}SA>HGL7?%5NH7pmxk#}w>dV1cZ>Eigs6?Av zY%J9WG}QWL8a%QB3^udPBrq1%V0W5Xo6T;wOfpy))=D!h%@&$iCug;C3}cADjP6_* zxfIdQReLMq!@>WGjm?@C=4iUDtOL5g&Q57Vrfp|d3Ud{<5j1~X== zS~W<`EaQM`O?w#7)j*Y76ahf_EtxJs)yiApl;Vg6U{u};LRv;EQAqlPTa-W)v?$OZ z0D>?@g%sF~a|t)gnyfaF`K9xTgQ9GtZX^+1&A9&js)yv7g61=aTT@%gx_kgD+^0aSV2 zaPDSF5;-Sd#Mldg#ni|a3MMPC+D#6Jz0o9yg1u4n+r>t|B|6Ez>HVy|ve2TJQrudE z)}Hc;A{$#)Ugq?AS+?9-R#xtXpAN=judtLk90^+_wZAP;q*fqSC~`2m%fq~)0)6uo z8xy-Hc`U?BA-erIssB{t*Hf1LditfNt_PaCV%=ianR;-}NNUPCi6J%Bw91C)XDAXp z*!cj$N?*bMf;oc)auLuC4pS+qa0j&`rA=^0 z4D2k5`SwlBK7i27hnj%srW5QE4e2Q^T3@_?)OYP-t$mj?QHK3Xz$FTtUsi&==9Yqd z6QIMPCKsJ*OpWPE{vL21IUpcO7fJ&g6I@tCsDR)?X<%c53yTO95L_q?Y)o)r5upNt3#EaL2`(%mR6uZ{G_Wzj zg++u42riTcHYT{Rh)@B+h0?&r1Q!+&Dj>K}8rYcN!XiQi1Q$vJ8xveuM5ut^LTO-Q zf(wfX6%bq~4QxzsVG*GMf(xaAjR`I+B2++dp){~D!G%SH3J5Ng1~w+Ru!v9r!G+Sm z#sn7@5h@_KP#W0yinwx94_<;0eA==NK34g4@48O-NTxxktoBh<$E_6A`4~lAybQn3 zP*e*;QD++{id#-mqvYr3d{9AAIqR#ur8SY0Z!P&=>1w$C&KZW6XD>SX`G#|s$G`VX z{e-`brwsdI9};J~gqIZuw@uUg$X?2W~{7fyP8@8s^Pi?5y< z{q2`me>~{a!zG_?Uo&VKSCX@NZ(i@U4>1S3wEMcBJ+=7F5vQpm*5hMNG<9$M^QPK@ zhQU7sM;5*Q_NM!(iI1#W^3%j#U(Y=a!^a->|F+|NLH?Ex_dfBQ*pt^g^pBnkM|u`j znU1mfVC9Y}?aaw-=kt0GHs_wdZSg%|*srtqPhvk~k564U-gzJ}^5n;zb<~1|vtQ6& zyD;^uzy5jcsT20Wo5vg&xwdBnDWf)y-fMp3fpMoEH@H?-4=x$9=Zoc^ z%f~E-tKYfI)NOw<|BbG(yK}xiI&Xg0ch0Ala=CXraefS4uu2*6yEFK4%X(y?}b z``Xrv{`c>CahGC!spPr^4%@!1Rc8+Td~|*Nv3=7oJiWPe-L;2Kf8$v3`1~~soR_9< kXnOafU!Bv&%^yy!YS_B0eoDO?E-qD7KHa;itl`mr0r5-b2LJ#7 delta 518 zcmX?GzLjHwikf7JYeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_ox0iB|rM z3KP3>C;oDhQ?MyYNwacEElw`VEGWs$&r<;L6O-~wOKg>tCg(6}PF~2UH~BWBt&l=R zZh@6^QEFmIeo;t%evYlu(q+L@zTl#md>$&CJx$ z$z}2#RtXW9LYMsH(%jU%5|F~lo@^Q#N_Gl15Hnm-i!#enQ{0O3a}|n9f>P70GLcN3 zT*RsYGzB7&f^5neR*iZkeV{S=Xug371-ZC^m=#t)dva4t5`i51ih{)C?9>v4)Vvg1 zr6MJJJH}m}j~N&k7JIrlhE&|zGxap@5d#hv;VIkhaHfkNo#}U}Kl_IFmMBHL=1FH` zY7U;4Fs_Kt&TaS+wUz6RaJ_ (:y ego) 112) + 0.0 + (* (max 0.0 (- 1.0 (/ (utils/dist 45 97 (:x ego) (:y ego)) 50.0))) + (- 1.0 (get-in entities [:fade :opacity])))))) (defn bloodclot-appear [entities] (actions/run-action entities @@ -302,12 +308,13 @@ :fn (fn [screen entities] (let [magic (get-in entities [:room :entities :magic])] (cond (nil? magic) - (assoc-in entities [:room :entities :magic] (assoc (doto (particle-effect "inside-castle/magic") - (particle-effect! :reset) - ) - :x 25 - :y 112 - :baseline 240)) + (do + (assoc-in entities [:room :entities :magic] (assoc (doto (particle-effect "inside-castle/magic") + (particle-effect! :reset) + ) + :x 25 + :y 108 + :baseline 240))) (particle-effect! magic :is-complete) (do (doto magic @@ -414,6 +421,7 @@ (actions/give entities :monocle) (actions/talk entities :ego "It looks like a monocle."))})) + :chorus {:sound (sound "inside-castle/chorus.wav")} :collision "inside-castle/collision.png" :scale-fn (utils/scaler-fn-from-image "inside-castle/scale.png" 0.25 1.00) :apply-state (fn [entities] @@ -426,5 +434,25 @@ entities) (if (= :night (get-in entities [:state :time])) (make-night entities) - entities))) + entities) + #_(let [chorus + instance (sound! chorus :loop 0.0)] + (-> entities + (assoc-in [:room :chorus :sound] chorus) + (assoc-in [:room :chorus :instance] instance))))) + :update-fn (fn [screen entities] + (let [chorus-volume (get-chorus-volume entities)] + (if (= 0.0 chorus-volume) + (if (get-in entities [:room :chorus :instance]) + (do (sound! (get-in entities [:room :chorus :sound]) :stop) + (update-in entities [:room :chorus] dissoc :instance)) + entities) + (let [chorus (get-in entities [:room :chorus])] + (if (:instance chorus) + (do (sound! (:sound chorus) :set-volume + (:instance chorus) + chorus-volume) + entities) + (assoc-in entities [:room :chorus :instance] (sound! (:sound chorus) :loop + chorus-volume))))))) :start-pos [245 90])))