Merge branch 'main' of https://git.joshuareason.com/Jam/GGJ_2022

Assets/Art Assets/Textures/Environ/castle_tileset.png.meta

@@ -23,6 +23,9 @@ TextureImporter:
   - first:
       213: -1078892822073738303
     second: castle_BG5
+  - first:
+      213: -3421357031467037408
+    second: castle_big_window
   externalObjects: {}
   serializedVersion: 11
   mipmaps:
@@ -966,6 +969,27 @@ TextureImporter:
       indices: 
       edges: []
       weights: []
+    - serializedVersion: 2
+      name: castle_big_window
+      rect:
+        serializedVersion: 2
+        x: 247
+        y: 35
+        width: 48
+        height: 32
+      alignment: 9
+      pivot: {x: 0.5, y: 0.25}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 02d4f9138e5e480d0800000000000000
+      internalID: -3421357031467037408
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
     outline: []
     physicsShape: []
     bones: []

Assets/Art Assets/Tiles/Environment/DarkCastle/DarkCastle.prefab

@@ -505,6 +505,16 @@ Tilemap:
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
       m_AllTileFlags: 1073741825
+  - first: {x: -5, y: 8, z: 0}
+    second:
+      serializedVersion: 2
+      m_TileIndex: 42
+      m_TileSpriteIndex: 2
+      m_TileMatrixIndex: 2
+      m_TileColorIndex: 0
+      m_TileObjectToInstantiateIndex: 65535
+      dummyAlignment: 0
+      m_AllTileFlags: 1073741825
   m_AnimatedTiles: {}
   m_TileAssetArray:
   - m_RefCount: 1
@@ -591,13 +601,15 @@ Tilemap:
     m_Data: {fileID: 11400000, guid: 4c26ecb559507274c8b2c5a02868f867, type: 2}
   - m_RefCount: 1
     m_Data: {fileID: 11400000, guid: 85de75962b9d082458d8c0ee1bcb5701, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: a8aef594c33310540b16b5ee96a2e4e7, type: 2}
   m_TileSpriteArray:
   - m_RefCount: 0
     m_Data: {fileID: 0}
   - m_RefCount: 0
     m_Data: {fileID: 0}
-  - m_RefCount: 0
-    m_Data: {fileID: 0}
+  - m_RefCount: 1
+    m_Data: {fileID: -3421357031467037408, guid: 955c0bce688a12046b99aa20d31ae763, type: 3}
   - m_RefCount: 1
     m_Data: {fileID: -3558780021574804381, guid: 955c0bce688a12046b99aa20d31ae763, type: 3}
   - m_RefCount: 1
@@ -713,7 +725,7 @@ Tilemap:
       e31: 0
       e32: 4.5905e-41
       e33: 5.8e-43
-  - m_RefCount: 42
+  - m_RefCount: 43
     m_Data:
       e00: 1
       e01: 0
@@ -732,7 +744,7 @@ Tilemap:
       e32: 0
       e33: 1
   m_TileColorArray:
-  - m_RefCount: 42
+  - m_RefCount: 43
     m_Data: {r: 1, g: 1, b: 1, a: 1}
   m_TileObjectToInstantiateArray:
   - m_RefCount: 0
@@ -740,7 +752,7 @@ Tilemap:
   m_AnimationFrameRate: 1
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Origin: {x: -8, y: -3, z: 0}
-  m_Size: {x: 16, y: 12, z: 1}
+  m_Size: {x: 16, y: 13, z: 1}
   m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
   m_TileOrientation: 0
   m_TileOrientationMatrix:
@@ -808,7 +820,7 @@ TilemapRenderer:
   m_Mode: 0
   m_DetectChunkCullingBounds: 0
   m_MaskInteraction: 0
---- !u!114 &2403586544446495185
+--- !u!114 &8879933024101859601
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}

Assets/Art Assets/Tiles/Environment/DarkCastle/castle_big_window.asset (Stored with Git LFS)

+size 792

Assets/Art Assets/Tiles/Environment/DarkCastle/castle_big_window.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a8aef594c33310540b16b5ee96a2e4e7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: