adding push observable after fighting macbook to build the content pi…

…peline

LearningMono/Config/EntityConfig.fs

@@ -19,6 +19,7 @@ let idImage =
       Offset = Vector2(0f, 10f) }
 
 let mergeImage = { idImage with TextureName = "merge" }
+let pushImage = { idImage with TextureName = "push" }
 let compareImage = { idImage with TextureName = "compare" }
 let mapImage = { idImage with TextureName = "map" }
 let filterImage = { idImage with TextureName = "filter" }
@@ -73,6 +74,7 @@ let idConfig =
       FrameLength = 300L }
 
 let idSpriteConfig = SingleSpriteConfig idConfig
+let pushSpriteConfig = SingleSpriteConfig { idConfig with Image = pushImage }
 let mergeSpriteConfig = SingleSpriteConfig { idConfig with Image = mergeImage }
 let compareSpriteConfig = SingleSpriteConfig { idConfig with Image = compareImage }
 let mapSpriteConfig = SingleSpriteConfig { idConfig with Image = mapImage }

LearningMono/Content/Content.mgcb

@@ -182,6 +182,18 @@
 /processorParam:TextureFormat=Color
 /build:sprites/entity/NextLevel.png
 
+#begin sprites/entity/Push.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:sprites/entity/Push.png
+
 #begin sprites/entity/Rock.png
 /importer:TextureImporter
 /processor:TextureProcessor

LearningMono/Content/sprites/entity/Push.piskel

@@ -0,0 +1 @@
+{"modelVersion":2,"piskel":{"name":"Push","description":"","fps":12,"height":200,"width":50,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAADICAYAAACqNrLOAAAEX0lEQVR4Xu1dMa4TQQzdfxKQcgRSU9Km4AKUSHQpkai+RJkOiZILUKSlpA5HiAQnAWn/N8pau2t7xp71OP7tznj8/OwZ/52nzcMQ5O8hCI4hgXhjMhnpkZG/TpxezR5OanUPZARwuVxcELLf78GP2eCvMdI9EBaAl1++jhH6/eF9U8aWmJlj5D6AABNAQ7eMdA8EA1gqDGuGqmskDBBgoPvUCgcEA7KuCVyL1TWCDYY5EJse5zeLqTPSDRBw1GH3O9sFL/ZaYYAcj8cRy+l02iqLJuvO+DMhYZGRcEBc0HHjxE2GyBhJIEYRSEa4gcW7G2wWeL50F8R2zBkJB+Tjn6e3Kp9fPL1lWYrop7dvVsl+/P5jdf4wTG8SyHNEmlrugXBzG4BAADAzYGczRsIBwRGnUs8tI2GAUAxkjaAI5fZ7E5DxbfxSi7GUWrCruTtHDofD6PNut6PKYvY/Se1e63q9juucz2fZ/+wRgADiMcWkgFj0CQZRTMzSg+yHATJhRhBEq6F5z24VWRO7HOWDycLaRhOIdkRr7SUjtRHUnp+MaEe01h6Hke6FZ2FaFJbcqTYluPNTQdf6NpcrQHB/zx4OCNTMksalG0a6A1IqZHPHSBgg+PzgKvPcMRIeCKXI64aR7oHU9lzF2njuwtrjxKkFDrTuuZaA3wCQvY0PAySc8Ix7v65dC9hetRTQ2kGpfXN1kNSh0vEJpDRyVvPMGQknPAMmtK+nwW4zRtwJBsIoH1bUnat1nOogFB4zdRAWzXC311TQWclluc1j1kirGqFqQio8e/f61arJbz9/jc8308ZzD8RmQKQ6Letei9JtLb5FiQBkcgkqBUTVkvQ5xcTsKxW0SCropFFnjk8FHTNQPoZxJBw+PCW8SCDeaEpGkhGjCNxVaqWCTjmLiluUVNApMzGaK5ECumICB0V8Pe3lWjqBDMOQqTVX5FzRJXeD2KxGugVSKvFzx0gYIBDZJUCUsIxipnmNhAGCmallAuw1Z8QNEHDES6uSCrpU0FH7Z+HzVNBJtSiFgRZPM1cHiT0qnJBAuIGzvtUFP8wZCQeEKxjY7ItnVIpJJRybAUl1EPrMoZuP6YX5dFsYIFTRp4IORchMZUoxId1+mwnPpN2vWyBSnZZ1i0LptlJBR9WM1nOKCViH/B0raYppAQA7GkDAVt6zK7NTfM+u7IetubvSotiGUsl6MqIUSDUzyYhaKJUM3RUjebIrZQ2nL1z97WlX4poS4dmkWXR4Gcr+OVpVJroV1eC66B5IGAlH90DCyJzCAAlX7ACo+11LuT35b24zvZY2oASiHdFae2JGYEGHTeNsW5+/4lqbItL51cIzrlBA6ph0fDUQ6YLW483VQdYAwH4CaRVp7jrmjFjf6jZLrXBAUkGHisRMi8I9GFMd1JqRMMKzMECogytrpFWNUEy4FZ6lgu6ZOu3P5FJyp1TQUTWj9ZxignNTmt+g02ID2akWnoURDBgFWNdsGC3KP2qRZRRO4/AvAAAAAElFTkSuQmCC\"}]}"]}}

LearningMono/Entity.fs

@@ -40,6 +40,7 @@ and ObservableType =
     | GoToNextLevel
     | Toggle of bool
    // | MultiToggle of bool
+    | Push
     | Map of EntityType
     | Filter of EntityType
     | Compare
@@ -90,6 +91,7 @@ let getSpriteConfig (eType: EntityType) : SpriteConfig =
         match ob with
         | GoToNextLevel _ -> nextLevelSpriteConfig
         | Id -> idSpriteConfig
+        | Push -> pushSpriteConfig
         | Toggle true -> toggleOnSpriteConfig
         | Toggle false -> toggleOffSpriteConfig
         | Map _ -> mapSpriteConfig
@@ -112,6 +114,7 @@ let getEmitImage (eType: EntityType) =
         | GoToNextLevel _ -> nextLevelImage
         | Toggle _ -> toggleOnImage
         | Id -> idImage
+        | Push -> pushImage
         | Map _ -> mapImage
         | Merge -> mergeImage
         | Filter _ -> filterImage
@@ -208,6 +211,7 @@ let private behaviorFunc (observable: ObservableData) (a: EntityType voption) (b
     match observable.Type with
     | Id
     | GoToNextLevel
+    | Push
     | Toggle _ ->
         match a with
         | (ValueSome e1) -> WillEmit e1

LearningMono/Levels.fs

@@ -826,14 +826,14 @@ let levelSandBox: LevelBuilder =
             createEntityOn
                 (buildBox
                     { Items =
-                        [ (observing (Compare))
-                          (observing (Compare))
-                          (observing (Compare))
-                          (observing (Compare))
-                          (observing (Compare))
-                          (observing (Compare))
-                          (observing (Compare))
-                          (observing (Compare)) ]
+                        [ (observing (Push))
+                          (observing (Push))
+                          (observing (Push))
+                          (observing (Push))
+                          (observing (Push))
+                          (observing (Push))
+                          (observing (Push))
+                          (observing (Push)) ]
                       IsOpen = false })
                 Grass
                 time
@@ -863,23 +863,23 @@ let levelSandBox: LevelBuilder =
 
 let levels: LevelBuilder[] =
     [| 
-        level_playerMoves
-        level_playerPickUp
-        level_left
-        level_dangRocks
-        level_observers
-        level_observers2
-        level_observers3
-        level_observers4
-        level_observers5
-        level_box0
-        level_box1
-        level_box2
-        level_toggles
-        level_toggles2
-        level_merge1
-        //level_merge2
-        level_filter1
-        level_filter11
-        level_filter2
+        // level_playerMoves
+        // level_playerPickUp
+        // level_left
+        // level_dangRocks
+        // level_observers
+        // level_observers2
+        // level_observers3
+        // level_observers4
+        // level_observers5
+        // level_box0
+        // level_box1
+        // level_box2
+        // level_toggles
+        // level_toggles2
+        // level_merge1
+        // //level_merge2
+        // level_filter1
+        // level_filter11
+        // level_filter2
         levelSandBox |]

LearningMono/Program.fs

@@ -65,6 +65,7 @@ let main _ =
               PipelineTexture("smallChar", "./content/sprites/entity/SmallChar")
               PipelineTexture("rock", "./content/sprites/entity/Rock")
               PipelineTexture("id", "./content/sprites/entity/Id")
+              PipelineTexture("push", "./content/sprites/entity/Push")
               PipelineTexture("map", "./content/sprites/entity/Map")
               PipelineTexture("filter", "./content/sprites/entity/Filter")
               PipelineTexture("timer", "./content/sprites/entity/Timer")