From f65cebdd0a0f14844e81254da0bf7402139e72f0 Mon Sep 17 00:00:00 2001
From: Ivy <ivyjs@hendrix.edu>
Date: Sun, 2 May 2021 22:41:39 -0500
Subject: [PATCH] Updated powerup prefabs to match artwork as described by
 design doc

---
 .../Prefabs/Art/{Scarecrow.prefab => Glider art.prefab}     | 6 +++---
 .../Art/{Scarecrow.prefab.meta => Glider art.prefab.meta}   | 0
 .../Prefabs/Powerups/Glider Powerup placeholder.prefab      | 4 ++--
 .../Materials/Blackburn-Abstract#2 Pixelart.mat             | 2 +-
 MuseumGame/UserSettings/EditorUserSettings.asset            | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename MuseumGame/Assets/Prefabs/Art/{Scarecrow.prefab => Glider art.prefab} (96%)
 rename MuseumGame/Assets/Prefabs/Art/{Scarecrow.prefab.meta => Glider art.prefab.meta} (100%)

diff --git a/MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab b/MuseumGame/Assets/Prefabs/Art/Glider art.prefab
similarity index 96%
rename from MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab
rename to MuseumGame/Assets/Prefabs/Art/Glider art.prefab
index 8493ead..ade090a 100644
--- a/MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab
+++ b/MuseumGame/Assets/Prefabs/Art/Glider art.prefab	
@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 8843438201003174078}
   - component: {fileID: 8843438201003174079}
   m_Layer: 0
-  m_Name: Scarecrow
+  m_Name: Glider art
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -73,7 +73,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 71938390b65010447bd9357a6450359c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 7b73779098dd1e74aaf64aec51eb65ee, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -122,4 +122,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cd4d5b992474f984fa6c9f579b861848, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  index: 7
+  index: 8
diff --git a/MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab.meta b/MuseumGame/Assets/Prefabs/Art/Glider art.prefab.meta
similarity index 100%
rename from MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab.meta
rename to MuseumGame/Assets/Prefabs/Art/Glider art.prefab.meta
diff --git a/MuseumGame/Assets/Prefabs/Powerups/Glider Powerup placeholder.prefab b/MuseumGame/Assets/Prefabs/Powerups/Glider Powerup placeholder.prefab
index 3e8f6ef..57bef1e 100644
--- a/MuseumGame/Assets/Prefabs/Powerups/Glider Powerup placeholder.prefab	
+++ b/MuseumGame/Assets/Prefabs/Powerups/Glider Powerup placeholder.prefab	
@@ -73,7 +73,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 71938390b65010447bd9357a6450359c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 7b73779098dd1e74aaf64aec51eb65ee, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -122,5 +122,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b211c5a33678e544f8a025eda8fe81eb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  artIndex: 7
+  artIndex: 8
   powerup: 0
diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites/Materials/Blackburn-Abstract#2 Pixelart.mat b/MuseumGame/Assets/Sprites/Artwork Sprites/Materials/Blackburn-Abstract#2 Pixelart.mat
index d6fdece..a0f38de 100644
--- a/MuseumGame/Assets/Sprites/Artwork Sprites/Materials/Blackburn-Abstract#2 Pixelart.mat	
+++ b/MuseumGame/Assets/Sprites/Artwork Sprites/Materials/Blackburn-Abstract#2 Pixelart.mat	
@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: Blackburn-Abstract#2 Pixelart
   m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
+  m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset
index 68f883a..48c9605 100644
--- a/MuseumGame/UserSettings/EditorUserSettings.asset
+++ b/MuseumGame/UserSettings/EditorUserSettings.asset
@@ -27,13 +27,13 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0
       flags: 0
     RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
+      value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb
       flags: 0
     RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
+      value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb
+      value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650