From 8ee81631e0df2d1f99cf909320bf695a82df3a49 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Tue, 14 Apr 2015 23:00:40 -0700 Subject: [PATCH] beginning of explosion. --- desktop/resources/ego/swing-shovel.png | Bin 0 -> 5149 bytes desktop/resources/ego/swingshovel.pxa/0.pxi | Bin 526470 -> 526463 bytes desktop/resources/ego/swingshovel.pxa/1.pxi | Bin 526470 -> 526463 bytes desktop/resources/ego/swingshovel.pxa/2.pxi | Bin 526470 -> 526463 bytes desktop/resources/ego/swingshovel.pxa/3.pxi | Bin 526470 -> 526465 bytes desktop/resources/ego/swingshovel.pxa/4.pxi | Bin 0 -> 526465 bytes desktop/resources/ego/swingshovel.pxa/5.pxi | Bin 0 -> 526465 bytes desktop/resources/ego/swingshovel.pxa/6.pxi | Bin 0 -> 264071 bytes desktop/resources/ego/swingshovel.pxa/7.pxi | Bin 0 -> 264071 bytes desktop/resources/ego/swingshovel.pxa/8.pxi | Bin 0 -> 264073 bytes .../ego/swingshovel.pxa/CelData.plist | 20 ++++++++++++++++++ .../src-common/advent/screens/rooms/dream.clj | 5 ++++- desktop/src-common/advent/screens/scene.clj | 19 ++++++++++++++--- 13 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 desktop/resources/ego/swing-shovel.png create mode 100644 desktop/resources/ego/swingshovel.pxa/4.pxi create mode 100644 desktop/resources/ego/swingshovel.pxa/5.pxi create mode 100644 desktop/resources/ego/swingshovel.pxa/6.pxi create mode 100644 desktop/resources/ego/swingshovel.pxa/7.pxi create mode 100644 desktop/resources/ego/swingshovel.pxa/8.pxi diff --git a/desktop/resources/ego/swing-shovel.png b/desktop/resources/ego/swing-shovel.png new file mode 100644 index 0000000000000000000000000000000000000000..1de2de5ea2712e2913dc1b6c45e1623250ec7b3b GIT binary patch literal 5149 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 diff --git a/desktop/resources/ego/swingshovel.pxa/2.pxi b/desktop/resources/ego/swingshovel.pxa/2.pxi index e30723640b77ed54238495c01ac72bedc860eae6..0a85d0b3b31eaf145247237a1f1e4a96c3c958da 100644 GIT binary patch delta 2541 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%0D>R{LLnR?Ko2nx3yCliMne*e zgEW{7>5vIiVH(T;GgzPy=5f5L0v19w)NpoQwHci)unl&>VK@pW;VU==XW%Nd!e7wN z@g6GZ2^#Q+aEJgs^n(Eq4Y7~_Ltz*UhtZG(Ho^`#1{dH8+~GuC1tOpzkAghv@jB=Sqd3vdBQZY{3ISKcF9RgwH^FW= z2q)k)G{cW@34VqaXodUmfD_d{z!PvW>Hz2qxFGdF7z~M!29v>vmyqK^@GzYnjyvf- Jx(=dx>c23uWPbnv diff --git a/desktop/resources/ego/swingshovel.pxa/3.pxi b/desktop/resources/ego/swingshovel.pxa/3.pxi index da0a6c2f641a1eda1411b1b32dfa1bf8b406a3b7..771c7fbb244c0dfbd0053b744e28d0307eca3913 100644 GIT binary patch delta 2427 zcmb8v3s6*57zgmZd+xed*7Nm zSZH)DNpsOijm*%wW@~K6l2Ws|gHsY-HR6je8$3)A;c8)w|9Ep$^u#GI#?G1@H)lce!k1Ii zm*%f3DJ@$^x7EM7`>pp5I6nO7gmmgmLwG` zq4TALj%m0Os`jK_l&7N`9tVz$paRw6&!fh`Z8LC;QZjIamhPsUMQSc1_uSmFQ#}Tn ziai-=UnRLscoq@uRYWH>my;gChFWJ(63fY5%(oE1$F)V?>g=&m+E;}moU4hk!GB*Z z$Es*=BtigNW|fBbY|ON+<$fAW)5#&ZACqDnV1`n>-b-|He0ZOh`2%~dUZOVoY#IP*=N0mh=v*@v z8DKdwXRf%ni+G8(T}0bf$#oJzP8KV=h~61u89K4{1~SUIj-ia*Yq=-k?+D8>%ICB@ zrzUxN`ES$O`$Q`qyU)(WNWus?PX+h?PFA{!B^;kRBH>#6ODPudD#!cSQxcMvSh7k= z^K$j`v&!>|4Y3&t=Y^bC7NuLP&Zr|TNgmz^&;$krTgNWWG*W-OoZi%LgJq?235)j>Zm)*vlY#BOr1tYQ8$OjTB_1eU;1oKA-AoN z+K`* zs3}t{R0`gs)^E_1Z>*@O++-K)mBO-!5E@7g9h$13>YB}4wq|5!<*bS;vK19C%3&=X zM}z2Cs=xmFcFm63I?Y`I@4j!Qv7k=z<#G zUZx#wv8LLxN>-N7#_{>ZMP;jVTf{x@yt}ta+(m>nhUy^A=Kb%Zl#z~KrgcxSWtHlO zQcl-#Bp8>R|$d23tx%zR6>Y-1%7`vCM*Wa20-rUiby>!mn@-9x4PvU?jM~GhlZ|;{iI*Lj;&18YaP1 zm<91L4>BMV)<7BTfL+i6XQ2ab!2^YWuUFvJfPy><@+im$gAt|!&b9Ma4DtX^!&d?h z;~U`!w7~^vhc5UYZo-ey19#vN^eY6F3Pu4QM&$+mfCo~ALO4u@M3@UH3g^Xh3ZKEz M#lgnCjns_h1y8^5=$Nswx+S{6Ly>?{X)6A9?DD!hReULf5pSmkn}M&&HA(x*#%a-*@f_8 z7wduW^8Xs%x3DUHrjLsiZ1V?47b2nU|TR&6ajeS;>xNm%lO~FeoQ@eqI>y z$J6Fb{Dz#1@KWX%j%kgI8bK7qiSVsOqcz0G_V`8MaV;CRV-fKsF0`<`>P6FpiDW2o zHo4Z|ksd~#Pjh3q#%kHxYCNUYcuK2f>>>}bN6ri8hY@@q{nnL(LxF~>4i^6|N77?Z z zF1J}}DcI|+&)Vy=)hQiy^qtmTwe53`_^vIcss3d;kKc?A+}V>(rw)q!rOp4o2=>GM zegD}E6WWRFYOJW23tmH)G$@xYTfTgyfr!m=A>S~Z1d_1x%GH65uQjb%n^T}Gd?l$; zUs*G+kX}hB2_hjR_}uI3l^dE{vQjg$7M9f&=cQ&yMHyAP!s5gjM#T~}{z4nyM1hnr zZA_*|-fC`1iPpq9UgH^}&R4l*=ykOVi;L8Wm^Hk#rn0`G2#2?bNNKaBWCKmvGCSYd z`tEz%wu?qqs0wWiR5pFE10N}zMC7YnX6SWwQkVWFAGV1JoZzi!`)KE`?P5G9OnPC@ zUa9Ysj!BgjC1s_ieaZj2e}4Zb2b5t4+YgEDoDivvA|uF1dMh2xEomxMv}SCy?G>wz z){MjbWG{<}8>NnkTY+2n;z*`8duB~pk?G51`wF|qzRK2SC+R8{>uOEM#gPgjKz`y| zah5`eFqGoqD~F}93f99G*bXMx1N&e<9Dsvx2s+>hd_sp#fGy3$(&gz$VxQ$Dj+Y zz#T^5WFPA9;b$In9K+U4vo1SC;{9Jw-V5d+X8#x5S)P1a1ky+H~a#<&<79T u5hEy^z!`8e3QzC{+>l}fjD|Q!hS{LSpO9hv@MB5~hB;|}x4j99^uGbOD{IdH diff --git a/desktop/resources/ego/swingshovel.pxa/4.pxi b/desktop/resources/ego/swingshovel.pxa/4.pxi new file mode 100644 index 0000000000000000000000000000000000000000..bd44f94adcb4e132e0251ed9516bf17f4ad314a2 GIT binary patch literal 526465 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 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-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk 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 literal 0 HcmV?d00001 diff --git a/desktop/resources/ego/swingshovel.pxa/7.pxi b/desktop/resources/ego/swingshovel.pxa/7.pxi new file mode 100644 index 0000000000000000000000000000000000000000..b8e688f536c42b63106c328fd994d9f653be22a1 GIT binary patch literal 264071 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 literal 0 HcmV?d00001 diff --git a/desktop/resources/ego/swingshovel.pxa/CelData.plist b/desktop/resources/ego/swingshovel.pxa/CelData.plist index f0b74d60..9088485c 100644 --- a/desktop/resources/ego/swingshovel.pxa/CelData.plist +++ b/desktop/resources/ego/swingshovel.pxa/CelData.plist @@ -18,5 +18,25 @@ duration 1 + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 84c180f4..84f85526 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -225,7 +225,10 @@ :sword (assoc (texture "dream/sword.png") :x 144 :y 122 :baseline 139 :script (actions/get-script entities - (read-sword-plaque entities))) + (read-sword-plaque entities)) + :scripts {:shovel (actions/get-script entities + (actions/walk-to entities :ego [148 76] :face :right) + (actions/play-animation entities :ego :swing-shovel))}) :broom (assoc (texture "dream/broom.png") :x 286 :y 122 :path (catmull-rom-spline (map #(apply vector-2* %) [[286 122] [286 128]]) true) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 62b6d02a..59d51af5 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -200,6 +200,7 @@ glad (utils/make-anim "ego/glad.png" [20 46] 0.04 (flatten [0 1 2 3 4 (repeat 8 [5 5 5]) (repeat 20 0)])) milk (utils/make-anim "ego/squat.png" [18 36] 0.05 [0 1 2 2 3 3 3 3 3 3 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 3 3 3 3 3 3 3 3 3 3 3 2 1 0]) throw (utils/make-anim "ego/throw.png" [18 36] 0.04 (flatten [[(repeat 5 0) (repeat 10 1)] (repeat 3 [2 2 2 3 3 3 4 4 4 5 5 5]) (repeat 5 [2 2 3 3 4 4 5 5]) (repeat 10 [2 3 4 5]) [2 3 3] (repeat 15 6)])) + swing-shovel (utils/make-anim "ego/swing-shovel.png" [70 70] 0.1 (range 9)) ego {:right {:walk walk-right :stand stand-anim @@ -237,7 +238,9 @@ :sigh sigh :glad glad :milk milk - :throw throw} + :throw throw + :swing-shovel swing-shovel + } :left {:walk (utils/flip walk-right) :stand (utils/flip stand-anim) :talk (utils/flip talk-anim) @@ -265,7 +268,8 @@ :sigh (utils/flip sigh) :glad (utils/flip glad) :milk (utils/flip milk) - :throw (utils/flip throw)} + :throw (utils/flip throw) + :swing-shovel (utils/flip swing-shovel)} :baseline (- 240 (last start-pos)) :facing :right :origin-x 9 @@ -324,6 +328,7 @@ nil)) :x (first start-pos) :y (last start-pos) :id "ego"} + ego (assoc ego :anim-sound-frames {(get-in ego [:left :walk]) {2 [:step-sound-1 1.0] 6 [:step-sound-2 0.8]} (get-in ego [:right :walk]) {2 [:step-sound-1 1.0] @@ -350,6 +355,8 @@ (get-in ego [:right :milk]) {8 [:milk-sound 1.0]} } :anim-merges {(get-in ego [:right :shock]) {:origin-x 15} + (get-in ego [:left :swing-shovel]) {:origin-x 26} + (get-in ego [:right :swing-shovel]) {:origin-x 26} :default {:origin-x 9}})] (actions/start-animation screen (merge (animation->texture screen (:stand (:right ego))) ego) @@ -395,7 +402,13 @@ (merge entity (animation->texture (update-in screen [:total-time] #(- % (:anim-start entity))) (:anim entity)) {:current-frame-index (texture! (:anim entity) :get-key-frame-index (get-animation-point (:anim entity) (- (:total-time screen) (:anim-start entity)))) - :previous-frame-index (texture! (:anim entity) :get-key-frame-index (get-animation-point (:anim entity) (- (:total-time screen) (:anim-start entity) (or (:delta-time screen) 0))))} + :previous-frame-index (texture! (:anim entity) :get-key-frame-index (get-animation-point (:anim entity) (- (:total-time screen) (:anim-start entity) (or (:delta-time screen) 0)))) + :origin-x (or (get-in entity [:anim-origins (:anim entity) 0]) + (:base-origin-x entity) + (:origin-x entity)) + :origin-y (or (get-in entity [:anim-origins (:anim entity) 1]) + (:base-origin-y entity) + (:origin-y entity))} (or (get-in entity [:anim-merges (:anim entity)]) (get-in entity [:anim-merges :default]))))