AAA nyctophobia

Assets/Art Final/catghost_spritesheet.png.meta

@@ -70,7 +70,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 16
+  spritePixelsToUnits: 32
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1

Assets/Jacob Folder/Spoopy Ghoste (Jumpscare Warning).prefab

@@ -25,8 +25,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 776050268538294905}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.191, y: -0.063, z: 0}
-  m_LocalScale: {x: 0.16666667, y: 0.16666667, z: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3103723802129481039}
   m_RootOrder: 0
@@ -44,7 +44,7 @@ BoxCollider2D:
   m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
+  m_Offset: {x: -0.09, y: -0.1}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0, y: 0}
@@ -55,7 +55,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 2.79, y: 6.9}
+  m_Size: {x: 0.46, y: 0.54}
   m_EdgeRadius: 0
 --- !u!1 &3103723802129481037
 GameObject:
@@ -69,6 +69,7 @@ GameObject:
   - component: {fileID: 3103723802129481036}
   - component: {fileID: 3103723802129481033}
   - component: {fileID: 3103723802129481074}
+  - component: {fileID: 1331037034804418945}
   m_Layer: 8
   m_Name: Spoopy Ghoste (Jumpscare Warning)
   m_TagString: Untagged
@@ -131,7 +132,7 @@ SpriteRenderer:
   m_SortingLayerID: 1027733709
   m_SortingLayer: 2
   m_SortingOrder: 0
-  m_Sprite: {fileID: -5029764186598712489, guid: 1a0db7ae73c9e43ac856b25d6ad47dbc, type: 3}
+  m_Sprite: {fileID: -4819166152505672304, guid: 11f1c18ac45a940769c85c3c17315fb4, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -180,3 +181,23 @@ MonoBehaviour:
   cat: {fileID: 0}
   ball: 0
   mvt: {fileID: 0}
+  anim: {fileID: 1331037034804418945}
+--- !u!95 &1331037034804418945
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3103723802129481037}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 11a230482c553484f92721b47ab590a2, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0

Assets/booMovement.cs

@@ -13,6 +13,7 @@ public class booMovement : MonoBehaviour
     public GameObject cat;
     public bool ball;
     public Movement mvt;
+    public Animator anim;
 
     void Start()
     {
@@ -21,8 +22,6 @@ public class booMovement : MonoBehaviour
         sizeOffset = Random.Range(2f, 10f);
         player = cat.transform;
         
-        
-        //player = GameObject.FindWithTag("Player").transform;
         if (player == null)
         {
             Debug.Log("Player not found! Make sure Seiden's Char Movement has a tag of Player!");
@@ -36,27 +35,18 @@ public class booMovement : MonoBehaviour
          mvt = cat.GetComponent<Movement>();
         ball = mvt.m_FacingRight;
 
-        if ((transform.position.x < player.position.x && ball)||(transform.position.x > player.position.x && !ball))
-        {
-            //Debug.Log("Away");
+        if ((transform.position.x < player.position.x && ball)||(transform.position.x > player.position.x && !ball)) {
             player = cat.transform;
             Vector3 direction = player.position - transform.position;
             movement = direction.normalized;
-            // Scale spirit size so they look like the swim like squid lol
-            float size = Mathf.Sin(Time.time * sizeOffset) * .25f + 1;
-            transform.localScale = new Vector3(size, size, 1);
         }
     }
 
-    void FixedUpdate()
-    {
+    void FixedUpdate() {
         if (Movement.pause) return;
-        if ((transform.position.x < player.position.x && ball) || (transform.position.x > player.position.x && !ball))
-        {
-            moveMe(movement); 
-        }
-        else
-        {
+        if ((transform.position.x < player.position.x && ball) || (transform.position.x > player.position.x && !ball)) {
+            moveMe(movement);
+        } else {
             noMoveMe(transform);
         }
     }
@@ -69,12 +59,12 @@ public class booMovement : MonoBehaviour
         }
     }
 
-    void moveMe(Vector2 direction)
-    {
+    void moveMe(Vector2 direction) {
+        if (anim != null) anim.SetBool("Shy?", false);
         rb.MovePosition(rb.position + direction * swimSpeed * Time.fixedDeltaTime);
     }
-    void noMoveMe(Transform transform)
-    {
+    void noMoveMe(Transform transform) {
+        if (anim != null) anim.SetBool("Shy?", true);
         rb.MovePosition(new Vector2(transform.position.x, transform.position.y));
     }
-}
+}

UserSettings/EditorUserSettings.asset

@@ -6,58 +6,8 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     RecentlyUsedScenePath-0:
-<<<<<<< Updated upstream
-<<<<<<< HEAD
-      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367f6d7717e1351027
-      flags: 0
-    RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
-      flags: 0
-    RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
-      flags: 0
-    RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663536ebe73c2cf1a71aecf13f33722c0ce6281d
-      flags: 0
-    RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
-      flags: 0
-    RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036c7c0219001c396c1c23233967083debf42d
-      flags: 0
-    RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c6f1c17031e253e256624283a097df7ee3d2cfb
-      flags: 0
-    RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c71091503173a242724392c67083debf42d
-      flags: 0
-    RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c7e0103160822232a2f31633c133af6f9
-      flags: 0
-    RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb
-=======
-      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
-=======
       value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b
->>>>>>> Stashed changes
       flags: 0
-    RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
-      flags: 0
-<<<<<<< Updated upstream
-    RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c7e0103160822232a2f31633c133af6f9
-      flags: 0
-    RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c7c0219001c396c1c23233967083debf42d
-      flags: 0
-    RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
->>>>>>> origin/main
-      flags: 0
-=======
->>>>>>> Stashed changes
     vcSharedLogLevel:
       value: 0d5e400f0650
       flags: 0