From 15fdefe984f256b5a21d8897dc6adf0d4dff270f Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Tue, 11 Nov 2014 17:44:45 -0800 Subject: [PATCH 1/5] adding simple warrior dialogue. --- .../inside-cafeteria/warriors-stand.png | Bin 0 -> 6873 bytes .../advent/screens/rooms/inside_cafeteria.clj | 74 ++++++++++++++---- 2 files changed, 60 insertions(+), 14 deletions(-) create mode 100644 desktop/resources/inside-cafeteria/warriors-stand.png diff --git a/desktop/resources/inside-cafeteria/warriors-stand.png b/desktop/resources/inside-cafeteria/warriors-stand.png new file mode 100644 index 0000000000000000000000000000000000000000..ac54ac4d3c8ded73b896935176e6b1a5da9f9aa6 GIT binary patch literal 6873 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 literal 0 HcmV?d00001 diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index 35c28193..37eb05af 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -9,18 +9,64 @@ [play-clj.utils :refer :all] [play-clj.g2d :refer :all])) +(defn do-warrior-dialogue [entities] + (actions/talk entities :ego "Hey guys!") + (actions/talk entities :warriors "Hark! Good day, young esquire.") + (actions/present-choices entities + {:choices ["Why dost thou speaketh in this manner?" + {:run #(actions/respond entities % + :warriors "`Tis but a tradition!" + :warriors "All knights speaketh in such a manner." + :warriors "As my father instructedeth unto me as a mere lad: " + :warriors "'Son, thou must speaketh in this manner.'" + :warriors "And I asketh unto him:" + :warriors "'But father, why musteth I speaketh in this manner?'" + :warriors "'Yea, my son, for thou art a knight. And thou musteth speaketh in this manner.'" + :warriors "And I toldeth unto him:" + :warriors "'Thou art my father, and I am thy son. Therefore I will speaketh in this manner.'" + :ego "... I think I've got the idea.") + :choices actions/previous-choices} + "Can I be a knight like you guys?" + {:run #(actions/respond entities % + :warriors "We thinketh not, young esquire." + :warriors "You lacketh the strength and vigor required for such a task.") + :choices ["But I'm on a quest to become a knight!" + {:run #(actions/respond entities % + :warriors "Young esquire, thou art valiant in heart. " + :warriors "Departeth henceforth and go hitherto, unto the gym.")} + "I challenge you to a arm wrestling match to prove my strength." + {:run #(actions/respond entities % :warriors "[TODO] You lose.")} + "Something else." + {:choices actions/something-else}] + } + "Goodbye." + {:run #(actions/respond entities % :warriors "Fare thee well, and godspeed.")}]})) + (defn make [screen] - (rooms/make :music :town-1 - :interactions - {:right-dir {:box [300 0 320 120] - :script (actions/get-script - entities - (actions/walk-to entities :ego [319 50]) - (actions/transition-background entities :inside-castle [65 150]) - (actions/walk-to entities :ego [126 80])) - :cursor :right} - } - :layers [(assoc (texture "inside-cafeteria/background.png") :x 0 :y 0 :baseline 0)] - :entities {} - :collision "inside-cafeteria/collision.png" - :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.50))) + (let [warriors-stand-sheet (texture! (texture "inside-cafeteria/warriors-stand.png") :split 66 126) + warriors-stand (animation 0.2 (for [i [0 0 0 0 0 0 1 1 0 0 1 1 1 0 0 2 2 2 2 3 3 3 0 0 0 2 2 2 ]] + (aget warriors-stand-sheet 0 i)))] + (rooms/make :music :town-1 + :interactions + {:right-dir {:box [300 0 320 120] + :script (actions/get-script + entities + (actions/walk-to entities :ego [319 50]) + (actions/transition-background entities :inside-castle [65 150]) + (actions/walk-to entities :ego [126 80])) + :cursor :right} + } + :layers [(assoc (texture "inside-cafeteria/background.png") :x 0 :y 0 :baseline 0)] + :entities {:warriors (actions/start-animation screen (assoc (animation->texture screen warriors-stand) :x 5 :y 9 :baseline 180 + + :left {:stand (utils/flip warriors-stand) + :talk (utils/flip warriors-stand)} + :right {:stand warriors-stand + :talk warriors-stand} + :facing :right + :script (actions/get-script entities + (do-warrior-dialogue entities) + )) + :stand) } + :collision "inside-cafeteria/collision.png" + :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.50)))) From 3fb29d463efc13336e5878affd1c949cd298aaf8 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Fri, 14 Nov 2014 13:13:21 -0800 Subject: [PATCH 2/5] progress on interacting with player. --- desktop/src-common/advent/screens/scene.clj | 32 +++++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index cd6243cb..7bf236a3 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -135,15 +135,29 @@ :origin-y 0 :scaled true - #_:mouse-in? #_(fn [entities x y] - (let [{entity-x :x entity-y :y region :object} (get-in entities [:room :entities :ego]) - width (.getRegionWidth region) - height (.getRegionHeight region)] + :mouse-in? (fn [entities x y] + (let [{entity-x :x entity-y :y region :object scale :scale-x} (get-in entities [:room :entities :ego]) + half-width (/ (* (.getRegionWidth region) (or scale 1.0)) 2) + height (* (.getRegionHeight region) (or scale 1.0))] + #_(clojure.pprint/pprint [["point" x y] + ["entity " (- entity-x half-width) entity-y (+ entity-x half-width) (+ entity-y height)]]) - ((zone/box entity-x entity-y (+ entity-x width) (+ entity-y height)) x y))) - #_:get-script #_(fn [cursor [x y]] - (case cursor - items/flask-with-cream-of-mushroom (actions/get-script entities (actions/talk entities :ego "Yuck. I filled it with backwash.")))) + ((zone/box (- entity-x half-width) entity-y (+ entity-x half-width) (+ entity-y height)) x y))) + :get-script (fn [cursor [x y]] + (condp = cursor + items/flask-1-with-cream-of-mushroom (actions/get-script entities (actions/talk entities :ego "My muscles have doubled in size!")) + items/recipe (actions/get-script entities (actions/do-dialogue entities + :ego "The recipe says:" + :ego "'For strength beyond measure,'" + :ego "'you must mix, at your leisure,'" + :ego "'1. Cream of mushroom soup.'" + :ego "'2. Saliva of the creature whose strength you want to match.'" + :ego "'3. Heat over flame.'" + :ego "'A word of warning, before you go.'" + :ego "'A sip is all it takes to grow.'" + :ego "'Not more than that do drink,'" + :ego "'Or you'll push your body to the brink.'")) + nil)) :x 150 :y 95 :id "ego"}] (actions/start-animation screen @@ -205,7 +219,7 @@ :inside-fangald (make-music "inside-fangald.ogg")} :state {:object nil :active? true - :inventory [] + :inventory [items/flask-1-with-cream-of-mushroom items/recipe] :clues #{} :mints-eaten 0} :actions {:object nil From 949d7f71c1312b0f5508bd78205e157f9683d957 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Fri, 14 Nov 2014 16:34:03 -0800 Subject: [PATCH 3/5] adding grass and slobber. --- desktop/resources/cursor.png | Bin 4856 -> 5162 bytes desktop/src-common/advent/screens/items.clj | 2 ++ .../advent/screens/rooms/outside_castle.clj | 8 +++++++- desktop/src-common/advent/screens/scene.clj | 2 +- desktop/src-common/advent/utils.clj | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 8132e284bfb26fa8d161cbcd54cc077834418545..9a06201f6e80f871a0680aa0103c93757404003e 100644 GIT binary patch delta 4094 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 delta 3786 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 AN&o-= diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj index 7e7e6b66..b1d2eb29 100644 --- a/desktop/src-common/advent/screens/items.clj +++ b/desktop/src-common/advent/screens/items.clj @@ -55,3 +55,5 @@ (def glass-eye {:name "Choicest of glass eyes" :value :glass-eye :cursor :glass-eye}) (def motivational-tapes {:name "Choicest motivational tapes" :value :motivational-tapes :cursor :motivational-tapes}) (def used-earplugs {:name "Choicest used earplugs" :value :used-earplugs :cursor :used-earplugs}) +(def grass {:name "Huge grass" :value :grass :cursor :grass}) +(def slobber {:name "Bull slobber" :value :slobber :cursor :slobber}) diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index a1398369..f4bcad67 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -120,6 +120,12 @@ :stand) :steer (assoc (texture "outside-castle/steer.png" ) :x 203 :y 155 :baseline 80 :script (actions/get-script entities - (actions/talk entities :ego "That is one buff bull!")))} + (actions/talk entities :ego "That is one buff bull!")) + :scripts {:grass (actions/get-script entities + (actions/walk-to entities :ego [168 150] :face :right) + (actions/play-animation entities :ego :reach) + (actions/remove-item entities items/grass) + (actions/talk entities :ego "Eww! He slobbered on my hand.") + (actions/give entities items/slobber))})} :collision "outside-castle/collision.png" :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.00)))) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 7bf236a3..f25a66c4 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -219,7 +219,7 @@ :inside-fangald (make-music "inside-fangald.ogg")} :state {:object nil :active? true - :inventory [items/flask-1-with-cream-of-mushroom items/recipe] + :inventory [items/grass] :clues #{} :mints-eaten 0} :actions {:object nil diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 00f245ff..c0f7badb 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -11,7 +11,7 @@ (let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})] (println (:input-x screen) (:input-y screen) "->" x y))) -(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :stool :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :stool :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber]) (defn cursor [filename which] (let [scale 2 From 9529c60cf7a49da929aed953d0559455e538eb7c Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Fri, 14 Nov 2014 17:19:16 -0800 Subject: [PATCH 4/5] adding strength potion transformation. --- desktop/resources/cursor.png | Bin 5162 -> 5347 bytes desktop/src-common/advent/screens/items.clj | 21 ++++++++++++++---- .../advent/screens/rooms/outside_house.clj | 2 +- desktop/src-common/advent/screens/scene.clj | 18 ++++++++++----- desktop/src-common/advent/utils.clj | 2 +- 5 files changed, 32 insertions(+), 11 deletions(-) diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png index 9a06201f6e80f871a0680aa0103c93757404003e..782a841aef7fdd609e5a5ab9ee1d73c8ad21c7e7 100644 GIT binary patch delta 4281 zcmV;q5JvB+DB~%xQv`nydPzhM90}2xXBO)T8I8c%DQ)`7( zQB<&1>x@zX!RmC1v`Qc?L<6yQD6OL-NU-2efRghfQi1Hxtz0S&pEqqbMO1kp56OU>Kjse7j=KIaPi}sb;`3eI|EH& z23EAswQwEHv8;W3tcB~lxua0Xgj^;CU zY5i}L{&Gkhb9MqeXr?}Ck1wW6&peq`HLZMeB;OMFcmHdjYX6-Rw2yVub_Lq!=H^

%wr<_7wLjXkM_qq+(=DOCwDM8@$J+9cGycR` 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 diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj index b1d2eb29..9e50a60b 100644 --- a/desktop/src-common/advent/screens/items.clj +++ b/desktop/src-common/advent/screens/items.clj @@ -6,6 +6,10 @@ (declare wool) (declare cat-toy) (declare flask-1-with-milk) +(declare slobber) +(declare flask-1-strength) +(declare flask-1-with-cream-of-mushroom) + (def make-cat-toy (actions/get-script entities (actions/remove-item entities stick) @@ -18,8 +22,6 @@ (def carrot {:name "Carrot" :value :carrot :cursor :carrot}) (def flask-1-with-mushrooms {:name "Flask with mushrooms" :value :flask-1-with-mushrooms :cursor :flask-with-contents}) -(def flask-1-with-cream-of-mushroom {:name "Flask with cream of mushrooms soup" :value :flask-1-with-cream-of-mushroom :cursor :flask-with-contents}) - (defn make-cream-of-mushroom [] (actions/get-script entities @@ -32,7 +34,7 @@ (def flask-1-with-milk {:name "Flask with milk" :value :flask-1-with-milk :cursor :flask-with-contents :scripts {:mushrooms (make-cream-of-mushroom)}}) -(def flask-1-strength {:name "Strength potion" :value :flask-1-strength :cursor :flask-with-contents}) +(def flask-1-strength {:name "Strength potion" :value :flask-1-strength :cursor :flask-with-strength}) (def flask-1 {:name "Flask" :value :flask-1 :cursor :flask :scripts {:mushrooms (actions/get-script entities (actions/remove-item entities flask-1) @@ -56,4 +58,15 @@ (def motivational-tapes {:name "Choicest motivational tapes" :value :motivational-tapes :cursor :motivational-tapes}) (def used-earplugs {:name "Choicest used earplugs" :value :used-earplugs :cursor :used-earplugs}) (def grass {:name "Huge grass" :value :grass :cursor :grass}) -(def slobber {:name "Bull slobber" :value :slobber :cursor :slobber}) + +(defn make-strength-potion [] + (actions/get-script entities + (actions/remove-item entities flask-1-with-cream-of-mushroom) + (actions/remove-item entities slobber) + (actions/give entities flask-1-strength) + (actions/talk entities :ego "It's the completed potion of strength!"))) + +(def slobber {:name "Bull slobber" :value :slobber :cursor :slobber :scripts {:flask-1-with-cream-of-mushroom (make-strength-potion)}}) +(def flask-1-with-cream-of-mushroom {:name "Flask with cream of mushrooms soup" :value :flask-1-with-cream-of-mushroom :cursor :flask-with-contents + :scripts {:slobber (make-strength-potion)}}) + diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index cfcd06e3..32f69eb3 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -188,7 +188,7 @@ (actions/give entities items/flask-1-with-milk) (actions/talk entities :ego "Sheeps milk.")) (actions/talk entities :ego "She's too far away."))) - items/flask-1-with-mushrooms (items/make-cream-of-mushroom)} + :flask-1-with-mushrooms (items/make-cream-of-mushroom)} :left {:walk (utils/flip sheep-walk) :stand (utils/flip sheep-stand)} :right {:walk sheep-walk diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index f25a66c4..05925a38 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -83,6 +83,7 @@ stand-sheet (texture! (texture "ego/stand.png") :split 18 36) squat-sheet (texture! (texture "ego/squat.png") :split 18 36) reach-sheet (texture! (texture "ego/reach.png") :split 18 36) + grow-sheet (texture! (texture "ego/grow.png") :split 18 36) cat-toy-sheet (texture! (texture "ego/cat-toy.png") :split 41 50) fire-sheet (texture! (texture "ego/fire.png") :split 18 36) walk-right (animation 0.075 (for [i (range 8)] @@ -107,6 +108,8 @@ (texture (aget fire-sheet 0 i)))) fire-3-anim (animation 0.1 (for [i [0 1 2 2 2 2 3 2 3 2 2 2 4 5 6 7 2 2 2 8 9 10 11 2 2 2 2 2 2 2 2 0]] (texture (aget fire-sheet 0 i)))) + grow (animation 0.1 (for [i [0 2 0 0 0 0 2 0 0 0 2 2 0 0 0 1 1 0 0 1 0 0 1 0 1 0 1 0 1 0 1 0 1 2 1 2 1 2 1 2 1 3 2 3 2 3 2 3]] + (texture (aget grow-sheet 0 i)))) ego {:right {:walk walk-right :stand stand-anim :talk talk-anim @@ -115,6 +118,7 @@ :end-squat end-squat :reach reach-anim :cat-toy cat-toy-anim + :grow grow [:fire 1] fire-1-anim [:fire 2] fire-2-anim [:fire 3] fire-3-anim} @@ -126,6 +130,7 @@ :squat (utils/flip squat-anim) :reach (utils/flip reach-anim) :cat-toy (utils/flip cat-toy-anim) + :grow (utils/flip grow) [:fire 1] (utils/flip fire-1-anim) [:fire 2] (utils/flip fire-2-anim) [:fire 3] (utils/flip fire-3-anim)} @@ -144,15 +149,18 @@ ((zone/box (- entity-x half-width) entity-y (+ entity-x half-width) (+ entity-y height)) x y))) :get-script (fn [cursor [x y]] - (condp = cursor - items/flask-1-with-cream-of-mushroom (actions/get-script entities (actions/talk entities :ego "My muscles have doubled in size!")) + (condp = cursor + items/flask-1-with-cream-of-mushroom (actions/get-script entities (actions/talk entities :ego "Blegh! Gross!")) + items/flask-1-strength (actions/get-script entities + (actions/talk entities :ego "I'll just take a sip!") + (actions/talk entities :ego "Woah! I feel something!!") + (actions/play-animation entities :ego :grow :stop? false)) items/recipe (actions/get-script entities (actions/do-dialogue entities :ego "The recipe says:" :ego "'For strength beyond measure,'" - :ego "'you must mix, at your leisure,'" + :ego "'you must mix, at your leisure:'" :ego "'1. Cream of mushroom soup.'" :ego "'2. Saliva of the creature whose strength you want to match.'" - :ego "'3. Heat over flame.'" :ego "'A word of warning, before you go.'" :ego "'A sip is all it takes to grow.'" :ego "'Not more than that do drink,'" @@ -219,7 +227,7 @@ :inside-fangald (make-music "inside-fangald.ogg")} :state {:object nil :active? true - :inventory [items/grass] + :inventory [items/flask-1-strength] :clues #{} :mints-eaten 0} :actions {:object nil diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index c0f7badb..0a0d4fda 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -11,7 +11,7 @@ (let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})] (println (:input-x screen) (:input-y screen) "->" x y))) -(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :stool :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber]) +(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :stool :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength]) (defn cursor [filename which] (let [scale 2 From 299bca0780402d49276a8895d3643039964872c4 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Fri, 14 Nov 2014 17:19:19 -0800 Subject: [PATCH 5/5] adding strength potion transformation. --- desktop/resources/ego/grow.png | Bin 0 -> 2291 bytes desktop/resources/ego/grow.pxa/0.pxi | Bin 0 -> 526471 bytes desktop/resources/ego/grow.pxa/1.pxi | Bin 0 -> 264078 bytes desktop/resources/ego/grow.pxa/2.pxi | Bin 0 -> 264078 bytes desktop/resources/ego/grow.pxa/3.pxi | Bin 0 -> 264078 bytes desktop/resources/ego/grow.pxa/CelData.plist | 22 +++++++++++++++++++ 6 files changed, 22 insertions(+) create mode 100644 desktop/resources/ego/grow.png create mode 100644 desktop/resources/ego/grow.pxa/0.pxi create mode 100644 desktop/resources/ego/grow.pxa/1.pxi create mode 100644 desktop/resources/ego/grow.pxa/2.pxi create mode 100644 desktop/resources/ego/grow.pxa/3.pxi create mode 100644 desktop/resources/ego/grow.pxa/CelData.plist diff --git a/desktop/resources/ego/grow.png b/desktop/resources/ego/grow.png new file mode 100644 index 0000000000000000000000000000000000000000..e107234b25593bf372f526aebac93793e4d32389 GIT binary patch literal 2291 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)UmlaER000DvNkl(EYUjJI(Uh6yG*?S+Ne>W1DSUT~&Gb1>!?@c!1YP z#T$!=ij^r+j%@1h)^qKAi?NJQ1cd=Ipu3A3-oX`$LGlZhb)IW1parF09M|f-9U2!}k=+533n%TY zBM3@))6tI(ubM#l@iL`cq9K)AjRa{wF%wW#mB8D(RZMcnoH{&@DyviEtgJgoM{Czn zpJCHz@!DmMZR;dYeE}e589*2SVq1;Rm3ig(az{Dn<@BKwZrLEpZ)ghg0!^cDukJee zK|p?sWW&2e^LL^+x&5Ff?#-`0O+gM&S26?e(+?<{-(fSZx!**c?GN2Df84r5_yi3P zLEQmT7Q%*S-1L+<-zkppu*bL`(DmDGF?_H&GfBN>PA7aY*k{5pHu2`ht^|_Q-5$Q- z%P$&pOyEhM-)R;a$M3k0Lg2u;C5cC4MmeR%#`Jbeo_PKly}#UItjFj?X6v>&PID3{ z0y%!fxP>JR>-q@tBgO*~a2HyCDelzsyy-JNeK?qyBw$QxenE>?r0zlos@t`CGzTwS zQP($d?is4FlkIWE35qLL$XrOkavAIM=sTK8|J5gYb6szS`@u_-0V zc+Vz{7b+;&zgDv*nOx}P;k^XNC0kX_rzxkL@J04)NzO;C@2>P z|729vGbyYfo=bIczgB`e2mIdoSwWnXi%*aQ74d$9ClrJyei~vAO<_@NSaY_m5Q66(3XZ$ zrw3LJo_>89Z_@lPxA^!zPwzu&M`omP59nW>ptp_3=TR}uqZzmtHWQWaueVlVZFu3* zm!2DQs_pzVp$isf1v=nKQvn^8d$I;NY??afYzCe&i{-8>u&%6 N002ovPDHLkV1j0_MkoLP literal 0 HcmV?d00001 diff --git a/desktop/resources/ego/grow.pxa/0.pxi b/desktop/resources/ego/grow.pxa/0.pxi new file mode 100644 index 0000000000000000000000000000000000000000..1fef209fffe34d4c5c6691595098aab9d823944f GIT binary patch literal 526471 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 H&H29qvaJH8 literal 0 HcmV?d00001 diff --git a/desktop/resources/ego/grow.pxa/1.pxi b/desktop/resources/ego/grow.pxa/1.pxi new file mode 100644 index 0000000000000000000000000000000000000000..787e225a1e939851ae446859f8eeb32059306b45 GIT binary patch literal 264078 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 Xjz;6ZAMuGbCqCo9UsIo^rdR(9n-V7@ literal 0 HcmV?d00001 diff --git a/desktop/resources/ego/grow.pxa/2.pxi b/desktop/resources/ego/grow.pxa/2.pxi new file mode 100644 index 0000000000000000000000000000000000000000..eb2eefa82a47a7d101c5eb0fc120f09742233a3d GIT binary patch literal 264078 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 literal 0 HcmV?d00001 diff --git a/desktop/resources/ego/grow.pxa/3.pxi b/desktop/resources/ego/grow.pxa/3.pxi new file mode 100644 index 0000000000000000000000000000000000000000..5caea1413cc25f1ed2ee2849d02ac9fb3440f2b8 GIT binary patch literal 264078 zcmeI(eQaHI83*vLEiZ$@?luN&ybV_H1(+R^;R`CTL3vwO>9%$-8Mp1Bz2olQaeKE} z5OM@TPy_-kQl3n0) zm+#KG=iK}IJ?C@#oO8OhgPY5xv3gh6vol)T+V|S~fr)|6tx0XHRILnjRtGmGL-nzB zoyFSFXelj@xJ7c?&u})V1WKWuN@iX{VoY_W3J&K7B!7e{r;O zd40>(*Iaw!SH61J*X~=>S=mx9|7PZX`*$30;H<*zIdczMTP}{r6a#}J%d3@3OCuL; zt|ePb$+o`I70KGpp>lC-Z1qU3G~EAcA!%!RaN3a`n;u7)`)oh{gcH+!(?U8sowKH1Dko!Wwv~qKqiaW# z(#U8%CSN-Lfe)uM(^=UNr+n-a6Ce3#x?j5g#Oza}zys0)2g=oo1|Q2 z5FpSXfxPdt-p`Zu{M6*zv)49gTEh?^u!jZStoQSN?>yw{UH1g}eZU?r+4KYmG)Q22 z|L52Iy#KT3`Fgg@o;PS}!w?{_hXtng|McF^`aQq?=jQ&*2<%~jytlLdp4$I;?`PNld_8~d9xmDR1PC-pAn)n?{yx7S$e-u? z=YM?3u73w;(A0(@K%fZ(@*dCc0jBnTwl7QG|4mS?5(p4zpg`W^dEZaH2guJ2`oDqT zh9b~p0#nZcS^wuh_m^+a`aj#&WMwOd0D%Sxti9;BJF;Ybp8f7mc0Z6`|MTAkYS2`M zAwZzX1oHmRdOcsym)ZXVWNEUJl|z6)g9Nhv&ij4pQtvki*f0c|SYUep=Y5|qo49nP z5g_mu1*Tr}v-NB^z5f$KPy}Rze7GeWfEwBz|?zyY&iYj08~Q|c!vn& z_W*gh`ahSjB=GJR(EsoL&)5+XcryY0|7J3_6L@b3bRRnFH9zN*J)geqy&>T!3B30N z^!t17Gk3%U2oNAZfB*pk?|y-&m#;YUtP4Ab%Ehs62;)w`iE zch{?S54C;OncWwzES4$@&o7QAwMD0`+ld@+S-qyecVKes#MuDp!6Sx-lS@a|4aN-1tL18K%~1AtdU$$hdRV&PnbO9N%gUSLX!}P?^(2@k zU(~m`IFy{Rq@~c7&W}T>ZjKjB?wF`{XK$&MH?8biyexm5(vr^KP?*yf?4!x>!rc|d zd$(?jJ-q{y`^I{v7#B`$rClM4dC{M&?BhiOi226*)F?LS#u~Y2@Tc)IZ~sk<%l~BWFg= zj+`4gKhhKFkF1XjwY1MDMJkc;$Tg8$BDY2EiQFG~Eb`sRR?uy(Uc_8vg zVa#*A*a#rLsk&Th7A~!~Ejl_Iy zF<)EE*Y?fGqmekSwivhVrO01f+S_MD_Kw6@?MFtIMox{K7g-Y-jD%r(5*dkvW&7sH ywUO&0H%D%d#IdyB7kMxe$J73u$oC^Zjyx54CX#)9#3Sb1`N+P$c0bzNU-%!aZeo4_ literal 0 HcmV?d00001 diff --git a/desktop/resources/ego/grow.pxa/CelData.plist b/desktop/resources/ego/grow.pxa/CelData.plist new file mode 100644 index 00000000..f0b74d60 --- /dev/null +++ b/desktop/resources/ego/grow.pxa/CelData.plist @@ -0,0 +1,22 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + +