Big post jam reorganization

Assets/Prefabs/Bullets.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a792e3b288afbe849adb9727e0de87a8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Bullets/FunBullet.prefab

@@ -4728,7 +4728,7 @@ ParticleSystemRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 1811527703
-  m_SortingLayer: 4
+  m_SortingLayer: 5
   m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
@@ -9481,7 +9481,7 @@ ParticleSystemRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 1811527703
-  m_SortingLayer: 4
+  m_SortingLayer: 5
   m_SortingOrder: 0
   m_RenderMode: 0
   m_SortMode: 0
@@ -9520,7 +9520,7 @@ GameObject:
   - component: {fileID: 4482402865533696887}
   - component: {fileID: 894503829911440170}
   m_Layer: 0
-  m_Name: RevolverBullet
+  m_Name: FunBullet
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -9576,7 +9576,7 @@ Rigidbody2D:
   m_AngularDrag: 0
   m_GravityScale: 0
   m_Material: {fileID: 0}
-  m_Interpolate: 0
+  m_Interpolate: 1
   m_SleepingMode: 1
   m_CollisionDetection: 0
   m_Constraints: 4
@@ -9677,7 +9677,7 @@ SpriteRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 1969288999
-  m_SortingLayer: 5
+  m_SortingLayer: 6
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: c52c475497269974b84c1ee730136ca6, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

Assets/Prefabs/Bullets/RevolverBullet.prefab

@@ -9576,7 +9576,7 @@ Rigidbody2D:
   m_AngularDrag: 0
   m_GravityScale: 0
   m_Material: {fileID: 0}
-  m_Interpolate: 0
+  m_Interpolate: 1
   m_SleepingMode: 1
   m_CollisionDetection: 0
   m_Constraints: 4

Assets/Prefabs/Guns.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 921bc2bd134ec144b9942b1dc64cece9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Particles.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: feffd226fd00e3b4bac0ea773e4cb603
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Player.prefab

@@ -432,7 +432,7 @@ Rigidbody2D:
   m_AngularDrag: 0
   m_GravityScale: 0
   m_Material: {fileID: 0}
-  m_Interpolate: 0
+  m_Interpolate: 1
   m_SleepingMode: 1
   m_CollisionDetection: 0
   m_Constraints: 4

Assets/Scripts/Effects.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ec37182832d43fd4096be992cde26ef2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Effects/CameraFX.cs

@@ -3,12 +3,12 @@ using System.Collections.Generic;
 using UnityEngine;
 
 namespace Saltosion.OneWeapon {
-    [RequireComponent(typeof(Camera))]
     public class CameraFX : MonoBehaviour {
         public Transform Player;
         public Transform ShakeHandle;
+        public Transform CameraTransform;
+        public Camera Camera;
 
-        private Camera Camera;
         private Vector3 Offset;
 
         private float ScreenShakeTime = 0.0f;
@@ -16,9 +16,8 @@ namespace Saltosion.OneWeapon {
         private float TimeStopCooldown = 0.0f;
 
         private void Start() {
-            Camera = GetComponent<Camera>();
-            Offset = transform.position;
-            transform.position = Player.position + Offset;
+            Offset = CameraTransform.position;
+            CameraTransform.position = Player.position + Offset;
         }
 
         private void Update() {
@@ -30,7 +29,7 @@ namespace Saltosion.OneWeapon {
             }
 
             Vector2 TargetPosition = (Player.position * 2f + Camera.ScreenToWorldPoint(Input.mousePosition)) / 3.0f;
-            transform.position = Vector3.Lerp(transform.position, TargetPosition, 5f * Time.deltaTime / Time.timeScale) + Offset;
+            CameraTransform.position = Vector3.Lerp(CameraTransform.position, TargetPosition, 5f * Time.deltaTime / Time.timeScale) + Offset;
 
             if (ScreenShakeTime > 0) {
                 ScreenShakeTime -= Time.deltaTime;

Assets/Scripts/Enemies.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 703398c128b1caa48a7441a4d5455219
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Enemies/Health.cs

@@ -3,17 +3,13 @@ using System.Collections.Generic;
 using UnityEngine;
 
 namespace Saltosion.OneWeapon {
-    [RequireComponent(typeof(Explodable))]
-    public class ExplodableHealth : MonoBehaviour {
+    public class Health : MonoBehaviour {
         public float MaxHealth;
         public float CurrentHealth;
 
-        private Explodable Explodable;
-
         private PlayerFun PlayerFun;
 
         private void Start() {
-            Explodable = GetComponent<Explodable>();
             PlayerFun = GameObject.FindGameObjectWithTag("Player").GetComponent<PlayerFun>();
         }
 
@@ -22,7 +18,6 @@ namespace Saltosion.OneWeapon {
             MaxHealth -= amount * (1 + PlayerFun.CurrentDamageBoost);
             if (MaxHealth <= 0) {
                 MaxHealth = 0;
-                Explodable.Explode(true);
             }
         }
     }

Assets/Scripts/GUI/BackToMainMenuButton.cs

@@ -4,7 +4,7 @@ using UnityEngine;
 using UnityEngine.SceneManagement;
 
 namespace Saltosion.OneWeapon.Menus {
-    public class OptionsMenuController : MonoBehaviour {
+    public class BackToMainMenuButton : MonoBehaviour {
         public int MainMenuScene;
 
         public void BackToMainMenu() {

Assets/Scripts/Guns/RevolverBullet.cs

@@ -45,7 +45,7 @@ namespace Saltosion.OneWeapon.Bullets {
 
             // Do damage here, kill everyone
             Explodable Explodable = collider.GetComponent<Explodable>();
-            ExplodableHealth Health = collider.GetComponent<ExplodableHealth>();
+            Health Health = collider.GetComponent<Health>();
             Vector2 Direction = (collider.transform.position - transform.position).normalized;
             if (Health != null) {
                 Health.Damage(12f, -Direction);

Assets/Scripts/Player.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: db97c458e7e12c549a3adb649d4a216c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Player/PunchingHand.cs

@@ -16,7 +16,7 @@ namespace Saltosion.OneWeapon {
                 Punching = false;
 
                 Explodable Explodable = collider.GetComponent<Explodable>();
-                ExplodableHealth Health = collider.GetComponent<ExplodableHealth>();
+                Health Health = collider.GetComponent<Health>();
                 Vector2 Direction = (collider.transform.position - transform.position).normalized;
                 if (Health != null) {
                     Health.Damage(8f, -Direction);

Assets/Scripts/Util.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 018a3d1f7d59172409fca8ec15f1c654
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Util/CameraHelper.cs

@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Saltosion.OneWeapon {
+    public class CameraHelper : MonoBehaviour {
+        private void Start() {
+        }
+
+        private void Update() {
+        }
+    }
+}

Assets/Scripts/Util/CameraHelper.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5192955d4df7c5448a32cf7720b9ce66
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/UnityConnectSettings.asset

@@ -4,7 +4,7 @@
 UnityConnectSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 1
-  m_Enabled: 0
+  m_Enabled: 1
   m_TestMode: 0
   m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
   m_EventUrl: https://cdp.cloud.unity3d.com/v1/events