diff --git a/desktop/resources/ego/Untitled.png b/desktop/resources/ego/Untitled.png index 2393f1ff..55ca285f 100644 Binary files a/desktop/resources/ego/Untitled.png and b/desktop/resources/ego/Untitled.png differ diff --git a/desktop/resources/ego/ida.png b/desktop/resources/ego/ida.png new file mode 100644 index 00000000..107ce5ec Binary files /dev/null and b/desktop/resources/ego/ida.png differ diff --git a/desktop/resources/ego/idea.png b/desktop/resources/ego/idea.png new file mode 100644 index 00000000..ff16e193 Binary files /dev/null and b/desktop/resources/ego/idea.png differ diff --git a/desktop/resources/ego/idea.pxa/0.pxi b/desktop/resources/ego/idea.pxa/0.pxi new file mode 100644 index 00000000..0b7f48eb Binary files /dev/null and b/desktop/resources/ego/idea.pxa/0.pxi differ diff --git a/desktop/resources/ego/idea.pxa/1.pxi b/desktop/resources/ego/idea.pxa/1.pxi new file mode 100644 index 00000000..e7b4700b Binary files /dev/null and b/desktop/resources/ego/idea.pxa/1.pxi differ diff --git a/desktop/resources/ego/idea.pxa/2.pxi b/desktop/resources/ego/idea.pxa/2.pxi new file mode 100644 index 00000000..d7fc29db Binary files /dev/null and b/desktop/resources/ego/idea.pxa/2.pxi differ diff --git a/desktop/resources/ego/idea.pxa/CelData.plist b/desktop/resources/ego/idea.pxa/CelData.plist new file mode 100644 index 00000000..4749afb9 --- /dev/null +++ b/desktop/resources/ego/idea.pxa/CelData.plist @@ -0,0 +1,18 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index d155b9cb..7fa62cd2 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -103,6 +103,7 @@ (if (= :night (get-in @entities [:state :time])) (actions/talk entities :ego "I do NOT want to go back in there!") (do (actions/walk-to entities :ego [50 46]) + (actions/play-animation entities :ego :idea) (actions/talk entities :warden "NO VISITORS!"))))} :window {:box [62 175 80 212] :script (actions/get-script entities diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 6a8e8a42..3cc9d997 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -203,6 +203,7 @@ sigh (utils/make-anim "ego/sigh.png" [18 36] 0.08 [0 0 0 0 1 1 1 2 3 4 5 6 7 8 8 8 8 8 8 8 8 8 0 0 0 0 ]) 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]) + idea (utils/make-anim "ego/idea.png" [18 70] 0.3 [2 0 0 0 0 0 0 2]) 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)) love (utils/make-anim "ego/love.png" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 30 7) (repeat 3 8) (repeat 10 7) (repeat 3 8) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 21 21 6 6 5 5 4 4 3 3 2 2 1 1 0])) @@ -246,6 +247,7 @@ :throw throw :swing-shovel swing-shovel :love love + :idea idea } :left {:walk (utils/flip walk-right) :stand (utils/flip stand-anim) @@ -276,7 +278,8 @@ :milk (utils/flip milk) :throw (utils/flip throw) :swing-shovel (utils/flip swing-shovel) - :love (utils/flip love)} + :love (utils/flip love) + :idea (utils/flip idea)} :baseline (- 240 (last start-pos)) :facing :right :origin-x 9 diff --git a/desktop/started-night.edn b/desktop/started-night.edn new file mode 100644 index 00000000..5c9898f5 --- /dev/null +++ b/desktop/started-night.edn @@ -0,0 +1 @@ +{:active? true, :coaxed-sheep? true, :seen-bloodclot? true, :seen-frankie? true, :plaques-read #{:shovel}, :convinced-wizard? true, :time :night, :opened-bars? true, :inventory (:note-1 :money :flask-2 :key :rope :crowbar :sword :recipe :kiss :ladder :cat-toy), :seen-intro? true, :wizard-left? false, :dropped-ball? true, :hay-searches 1, :clues #{:name}, :hud-active? false, :allowed-to-keep-teddy? true, :warden-sleeping? true, :current-riddle :done, :warden-fast-asleep? true, :last-room :outside-jail, :wants-toy true, :bent-bars? true, :chest-contents [], :mints-eaten 0, :object nil, :obtained-items #{:balloon :money :flask-2 :flask-1-with-cream-of-mushroom :key :slingshot :teddy :recipe :mushrooms :rope :flask-1-with-milk :kiss :wool :portrait :slobber :medal :sword :frog-legs :flask-1 :flask-1-strength :dream-sword :mandrake :shovel :cat-toy :grass :stick :motivational-tapes :ladder :carrot :trophy :crowbar :note-1 :flask-1-slobber :ball-n-chain}} \ No newline at end of file