adding charcoal.

desktop/asset-work/outsidehouse/charcoal.pxa/CelData.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+	<dict>
+		<key>duration</key>
+		<real>1</real>
+	</dict>
+</array>
+</plist>

desktop/resources/packed/pack.atlas

@@ -109,7 +109,14 @@ cat-tree/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-dream/dot
+outsidehouse/dot
+  rotate: false
+  xy: 846, 784
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
+wizard/dot
   rotate: false
   xy: 846, 784
   size: 1, 1
@@ -144,20 +151,6 @@ inside-house/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-outsidehouse/dot
-  rotate: false
-  xy: 846, 784
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-wizard/dot
-  rotate: false
-  xy: 846, 784
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
 title/dot
   rotate: false
   xy: 846, 784
@@ -165,6 +158,13 @@ title/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
+dream/dot
+  rotate: false
+  xy: 846, 784
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
 cat-tree/monocle
   rotate: false
   xy: 992, 839
@@ -361,14 +361,14 @@ held/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-outside-jail/dot
+space/dot
   rotate: false
   xy: 849, 784
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
-space/dot
+outside-jail/dot
   rotate: false
   xy: 849, 784
   size: 1, 1
@@ -1004,13 +1004,6 @@ inside-castle/trophy
   orig: 64, 16
   offset: 0, 0
   index: -1
-inside-house/frog-legs
-  rotate: false
-  xy: 626, 555
-  size: 17, 16
-  orig: 17, 16
-  offset: 0, 0
-  index: -1
 inside-jail/candle
   rotate: false
   xy: 526, 42
@@ -1088,6 +1081,13 @@ outsidehouse/cauldron
   orig: 200, 38
   offset: 0, 0
   index: -1
+outsidehouse/charcoal-1
+  rotate: false
+  xy: 626, 553
+  size: 18, 18
+  orig: 18, 18
+  offset: 0, 0
+  index: -1
 outsidehouse/fg2
   rotate: false
   xy: 956, 829
@@ -1438,14 +1438,14 @@ cat-tree/grandma-cry-1
   index: -1
 close
   rotate: false
-  xy: 196, 4
+  xy: 275, 4
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cursorr
   rotate: false
-  xy: 214, 4
+  xy: 293, 4
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1599,14 +1599,7 @@ inside-antique/desk
   index: -1
 inside-antique/portrait
   rotate: false
-  xy: 286, 4
+  xy: 365, 4
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-inside-antique/teddy
-  rotate: false
-  xy: 322, 4
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1625,6 +1618,13 @@ inside-house/desk
   orig: 320, 240
   offset: 0, 0
   index: -1
+inside-house/frog-legs
+  rotate: false
+  xy: 256, 4
+  size: 17, 16
+  orig: 17, 16
+  offset: 0, 0
+  index: -1
 inside-jail/ball-n-chain
   rotate: false
   xy: 748, 15
@@ -1648,11 +1648,32 @@ inside-jail/window-bent
   index: -1
 outside-castle/note
   rotate: false
-  xy: 232, 4
+  xy: 311, 4
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+outsidehouse/charcoal-2
+  rotate: false
+  xy: 196, 2
+  size: 18, 18
+  orig: 18, 18
+  offset: 0, 0
+  index: -1
+outsidehouse/charcoal-3
+  rotate: false
+  xy: 216, 2
+  size: 18, 18
+  orig: 18, 18
+  offset: 0, 0
+  index: -1
+outsidehouse/charcoal-4
+  rotate: false
+  xy: 236, 2
+  size: 18, 18
+  orig: 18, 18
+  offset: 0, 0
+  index: -1
 outsidehouse/fence
   rotate: false
   xy: 646, 56
@@ -1662,7 +1683,7 @@ outsidehouse/fence
   index: -1
 outsidehouse/note
   rotate: false
-  xy: 250, 4
+  xy: 329, 4
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1676,14 +1697,7 @@ outsidehouse/sheep-walk
   index: -1
 pathfind-test
   rotate: false
-  xy: 268, 4
+  xy: 347, 4
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-save
-  rotate: false
-  xy: 304, 4
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1806,6 +1820,13 @@ inside-antique/glow
   orig: 320, 240
   offset: 0, 0
   index: -1
+inside-antique/teddy
+  rotate: false
+  xy: 983, 2
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
 inside-cafeteria/fg
   rotate: false
   xy: 2, 297
@@ -1876,6 +1897,13 @@ outsidehouse/foreground
   orig: 320, 240
   offset: 0, 0
   index: -1
+save
+  rotate: false
+  xy: 965, 2
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
 wizard/experiment-10
   rotate: false
   xy: 968, 567

desktop/src-common/advent/screens/rooms/outside_house.clj

@@ -513,6 +513,7 @@
       
       (update-in entities [:room :entities] #(dissoc % :butterfly))
       (update-in entities [:room :entities] #(assoc % :cauldron (get-in entities [:room :cauldron])))
+      (update-in entities [:room :entities] assoc :charcoal (get-in entities [:room :charcoal]))
       (utils/play-sound! screen entities
                          (get-in entities [:room :cauldron-sound :sound])
                          (utils/sourced-volume-fn :cauldron 0.15 [139 73])
@@ -592,6 +593,7 @@
                                      (aget sheep-walk-sheet 0 i)))
         butterfly-stand (utils/make-anim "butterfly.png" [7 7] 0.1 [0 1])
         cauldron (utils/make-anim "outsidehouse/cauldron.png" [50 38] 0.15 (range 4))
+        charcoal (utils/make-anim-seq "outsidehouse/charcoal" [18 18] 0.25 (range 4))
         scaler (utils/scaler-fn-with-baseline 110 0.10 1.00)
         lamb-stand (aget lamb-walk-sheet 0 0)
         lamb-walk (animation 0.075 (for [i (range 4)]
@@ -733,6 +735,7 @@
                                                                   :scaled true)
                                                            sheep-stand)
                            
+                           
                            :outside-particles (common/make-outside-particles)
                            :magic (assoc (doto  (particle-effect "particles/magic") )
                                          :x 153
@@ -780,6 +783,21 @@
                                                          :script (actions/get-script entities
                                                                                      (examine-cauldron entities))
                                                          :scripts put-something-in-cauldron))
+                :charcoal (rooms/make-entity :charcoal
+                                             (assoc (animation->texture screen charcoal)
+                                               :anim charcoal
+                                               :anim-start 0
+                                               :night-profile :none
+                                               :x 125 :y 73 :baseline 167
+                                               :script (actions/get-script entities
+                                                                           (actions/walk-to entities :ego [120 73])
+                                                                           (actions/play-animation entities :ego :start-squat-2 :stop? false)
+                                                                           (Thread/sleep 200)
+                                                                           (actions/remove-entity entities :charcoal)
+                                                                           (actions/play-animation entities :ego :end-squat)
+                                                                           (actions/talk entities :ego "It's a small, sharp piece of charcoal.")
+                                                                           )
+                                               ))
                 :wizard (rooms/make-entity :wizard (common/make-wizard screen {:x 190 :y 78 :baseline 162 :scale-x 1.2 :scale-y 1.2
                                                                                :script (actions/get-script entities (talk-to-gandarf-outside entities))
                                                                                :scripts {:default (actions/get-script entities (actions/talk entities :wizard "No time for that!"))