Applying formatting

miniature-studios · Jan 1, 2024 · cc26a16 · cc26a16
1 parent 4b29e03
commit cc26a16
Show file tree

Hide file tree

Showing 58 changed files with 186 additions and 177 deletions.
diff --git a/JamGame/Assets/Scripts/Common/DebugTools.cs b/JamGame/Assets/Scripts/Common/DebugTools.cs
@@ -8,7 +8,9 @@ public static class DebugTools
     {
         public static void LogCollection<T>(IEnumerable<T> collection)
         {
-            Debug.Log(collection.Select(x => x.ToString()).Aggregate("[ ", (x, y) => x + ", " + y) + " ]");
+            Debug.Log(
+                collection.Select(x => x.ToString()).Aggregate("[ ", (x, y) => x + ", " + y) + " ]"
+            );
         }
     }
 }
diff --git a/JamGame/Assets/Scripts/Common/InspectorReadOnlyAttribute.cs b/JamGame/Assets/Scripts/Common/InspectorReadOnlyAttribute.cs
@@ -1,5 +1,4 @@
 using UnityEngine;
-
 #if UNITY_EDITOR
 using UnityEditor;
 

diff --git a/JamGame/Assets/Scripts/Editor/InterfaceListCodegen.cs b/JamGame/Assets/Scripts/Editor/InterfaceListCodegen.cs
@@ -1,9 +1,9 @@
-using Common;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using Common;
 using UnityCodeGen;
 using UnityEngine;
 
@@ -12,8 +12,8 @@ public class InterfaceEditorGenerator : ICodeGenerator
 {
     public void Execute(GeneratorContext context)
     {
-        IEnumerable<Type> interface_types = AppDomain.CurrentDomain
-            .GetAssemblies()
+        IEnumerable<Type> interface_types = AppDomain
+            .CurrentDomain.GetAssemblies()
             .SelectMany(
                 a => a.GetTypes().Where(t => t.IsDefined(typeof(InterfaceEditorAttribute)))
             );

diff --git a/JamGame/Assets/Scripts/Employee/Buff.cs b/JamGame/Assets/Scripts/Employee/Buff.cs
@@ -1,7 +1,7 @@
-using Common;
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using Common;
 using UnityEngine;
 
 namespace Employee

diff --git a/JamGame/Assets/Scripts/Employee/Controller/Controller.cs b/JamGame/Assets/Scripts/Employee/Controller/Controller.cs
@@ -1,5 +1,5 @@
-using Location;
 using System.Collections.Generic;
+using Location;
 using UnityEngine;
 using UnityEngine.AI;
 

diff --git a/JamGame/Assets/Scripts/Employee/EmployeeImpl.cs b/JamGame/Assets/Scripts/Employee/EmployeeImpl.cs
@@ -1,8 +1,8 @@
-using Common;
-using Location;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Common;
+using Location;
 using UnityEngine;
 
 namespace Employee

diff --git a/JamGame/Assets/Scripts/Employee/ExtendedInfoView.cs b/JamGame/Assets/Scripts/Employee/ExtendedInfoView.cs
@@ -28,11 +28,11 @@ private void Update()
         {
             transform.LookAt(cam.transform.position);
 
-            string buffs = employee.Buffs
-                .Select(buff => buff.Name)
+            string buffs = employee
+                .Buffs.Select(buff => buff.Name)
                 .Aggregate("", (x, y) => x + (x.Length == 0 ? "" : ", ") + y);
-            string quirks = personality.Quirks
-                .Select(quirk => quirk.Name)
+            string quirks = personality
+                .Quirks.Select(quirk => quirk.Name)
                 .Aggregate("", (x, y) => x + (x.Length == 0 ? "" : ", ") + y);
 
             text.text = $"{personality.Name}\n{buffs}\n{quirks}";

diff --git a/JamGame/Assets/Scripts/Employee/StressMeter.cs b/JamGame/Assets/Scripts/Employee/StressMeter.cs
@@ -1,6 +1,6 @@
-using Common;
 using System;
 using System.Collections.Generic;
+using Common;
 using UnityEngine;
 
 namespace Employee

diff --git a/JamGame/Assets/Scripts/Generated/SerializedDayAction.cs b/JamGame/Assets/Scripts/Generated/SerializedDayAction.cs
@@ -3,12 +3,12 @@
 using System;
 using UnityEngine;
 
-namespace Level.Config 
+namespace Level.Config
 {
     [Serializable]
     public class SerializedDayAction
     {
-        [SerializeField] 
+        [SerializeField]
         private string selectedType;
 
         [SerializeField]

diff --git a/JamGame/Assets/Scripts/Generated/SerializedDayActionEditor.cs b/JamGame/Assets/Scripts/Generated/SerializedDayActionEditor.cs
@@ -5,12 +5,21 @@
 using UnityEngine;
 using Level.Config;
 
-namespace SerializedInterface.Inspector 
+namespace SerializedInterface.Inspector
 {
     [CustomPropertyDrawer(typeof(SerializedDayAction))]
     public class SerializedDayActionDrawer : PropertyDrawer
     {
-        private string[] implementingTypeNames = { "Cutscene", "DayStart", "PreMeeting", "Meeting", "Working", "PreDayEnd", "DayEnd" };
+        private string[] implementingTypeNames =
+        {
+            "Cutscene",
+            "DayStart",
+            "PreMeeting",
+            "Meeting",
+            "Working",
+            "PreDayEnd",
+            "DayEnd"
+        };
 
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
@@ -64,13 +73,11 @@ public override float GetPropertyHeight(SerializedProperty property, GUIContent
             float height = 0.0f;
             if (selected_type != "")
             {
-                var typed_prop = property.FindPropertyRelative(
-                    PascalToCamelCase(selected_type)
-                );
+                var typed_prop = property.FindPropertyRelative(PascalToCamelCase(selected_type));
                 height = EditorGUI.GetPropertyHeight(typed_prop);
             }
             return EditorGUIUtility.singleLineHeight + height;
         }
     }
 }
-#endif
+#endif
diff --git a/JamGame/Assets/Scripts/Generated/SerializedEffect.cs b/JamGame/Assets/Scripts/Generated/SerializedEffect.cs
@@ -3,12 +3,12 @@
 using System;
 using UnityEngine;
 
-namespace Employee 
+namespace Employee
 {
     [Serializable]
     public class SerializedEffect
     {
-        [SerializeField] 
+        [SerializeField]
         private string selectedType;
 
         [SerializeField]

diff --git a/JamGame/Assets/Scripts/Generated/SerializedEffectEditor.cs b/JamGame/Assets/Scripts/Generated/SerializedEffectEditor.cs
@@ -5,12 +5,17 @@
 using UnityEngine;
 using Employee;
 
-namespace SerializedInterface.Inspector 
+namespace SerializedInterface.Inspector
 {
     [CustomPropertyDrawer(typeof(SerializedEffect))]
     public class SerializedEffectDrawer : PropertyDrawer
     {
-        private string[] implementingTypeNames = { "StressEffect", "NeedModifierEffect", "ControllerEffect" };
+        private string[] implementingTypeNames =
+        {
+            "StressEffect",
+            "NeedModifierEffect",
+            "ControllerEffect"
+        };
 
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
@@ -64,13 +69,11 @@ public override float GetPropertyHeight(SerializedProperty property, GUIContent
             float height = 0.0f;
             if (selected_type != "")
             {
-                var typed_prop = property.FindPropertyRelative(
-                    PascalToCamelCase(selected_type)
-                );
+                var typed_prop = property.FindPropertyRelative(PascalToCamelCase(selected_type));
                 height = EditorGUI.GetPropertyHeight(typed_prop);
             }
             return EditorGUIUtility.singleLineHeight + height;
         }
     }
 }
-#endif
+#endif
diff --git a/JamGame/Assets/Scripts/Generated/SerializedEmployeeConfig.cs b/JamGame/Assets/Scripts/Generated/SerializedEmployeeConfig.cs
@@ -3,12 +3,12 @@
 using System;
 using UnityEngine;
 
-namespace Level.Config 
+namespace Level.Config
 {
     [Serializable]
     public class SerializedEmployeeConfig
     {
-        [SerializeField] 
+        [SerializeField]
         private string selectedType;
 
         [SerializeField]

diff --git a/JamGame/Assets/Scripts/Generated/SerializedEmployeeConfigEditor.cs b/JamGame/Assets/Scripts/Generated/SerializedEmployeeConfigEditor.cs
@@ -5,7 +5,7 @@
 using UnityEngine;
 using Level.Config;
 
-namespace SerializedInterface.Inspector 
+namespace SerializedInterface.Inspector
 {
     [CustomPropertyDrawer(typeof(SerializedEmployeeConfig))]
     public class SerializedEmployeeConfigDrawer : PropertyDrawer
@@ -64,13 +64,11 @@ public override float GetPropertyHeight(SerializedProperty property, GUIContent
             float height = 0.0f;
             if (selected_type != "")
             {
-                var typed_prop = property.FindPropertyRelative(
-                    PascalToCamelCase(selected_type)
-                );
+                var typed_prop = property.FindPropertyRelative(PascalToCamelCase(selected_type));
                 height = EditorGUI.GetPropertyHeight(typed_prop);
             }
             return EditorGUIUtility.singleLineHeight + height;
         }
     }
 }
-#endif
+#endif
diff --git a/JamGame/Assets/Scripts/Generated/SerializedOverlay.cs b/JamGame/Assets/Scripts/Generated/SerializedOverlay.cs
@@ -3,12 +3,12 @@
 using System;
 using UnityEngine;
 
-namespace Overlay 
+namespace Overlay
 {
     [Serializable]
     public class SerializedOverlay
     {
-        [SerializeField] 
+        [SerializeField]
         private string selectedType;
 
         [SerializeField]

diff --git a/JamGame/Assets/Scripts/Generated/SerializedOverlayEditor.cs b/JamGame/Assets/Scripts/Generated/SerializedOverlayEditor.cs
@@ -5,7 +5,7 @@
 using UnityEngine;
 using Overlay;
 
-namespace SerializedInterface.Inspector 
+namespace SerializedInterface.Inspector
 {
     [CustomPropertyDrawer(typeof(SerializedOverlay))]
     public class SerializedOverlayDrawer : PropertyDrawer
@@ -64,13 +64,11 @@ public override float GetPropertyHeight(SerializedProperty property, GUIContent
             float height = 0.0f;
             if (selected_type != "")
             {
-                var typed_prop = property.FindPropertyRelative(
-                    PascalToCamelCase(selected_type)
-                );
+                var typed_prop = property.FindPropertyRelative(PascalToCamelCase(selected_type));
                 height = EditorGUI.GetPropertyHeight(typed_prop);
             }
             return EditorGUIUtility.singleLineHeight + height;
         }
     }
 }
-#endif
+#endif
diff --git a/JamGame/Assets/Scripts/Generated/SerializedPlaceCondition.cs b/JamGame/Assets/Scripts/Generated/SerializedPlaceCondition.cs
@@ -3,12 +3,12 @@
 using System;
 using UnityEngine;
 
-namespace TileUnion.PlaceCondition 
+namespace TileUnion.PlaceCondition
 {
     [Serializable]
     public class SerializedPlaceCondition
     {
-        [SerializeField] 
+        [SerializeField]
         private string selectedType;
 
         [SerializeField]

diff --git a/JamGame/Assets/Scripts/Generated/SerializedPlaceConditionEditor.cs b/JamGame/Assets/Scripts/Generated/SerializedPlaceConditionEditor.cs
@@ -5,7 +5,7 @@
 using UnityEngine;
 using TileUnion.PlaceCondition;
 
-namespace SerializedInterface.Inspector 
+namespace SerializedInterface.Inspector
 {
     [CustomPropertyDrawer(typeof(SerializedPlaceCondition))]
     public class SerializedPlaceConditionDrawer : PropertyDrawer
@@ -64,13 +64,11 @@ public override float GetPropertyHeight(SerializedProperty property, GUIContent
             float height = 0.0f;
             if (selected_type != "")
             {
-                var typed_prop = property.FindPropertyRelative(
-                    PascalToCamelCase(selected_type)
-                );
+                var typed_prop = property.FindPropertyRelative(PascalToCamelCase(selected_type));
                 height = EditorGUI.GetPropertyHeight(typed_prop);
             }
             return EditorGUIUtility.singleLineHeight + height;
         }
     }
 }
-#endif
+#endif
diff --git a/JamGame/Assets/Scripts/Generated/SerializedShopRoomConfig.cs b/JamGame/Assets/Scripts/Generated/SerializedShopRoomConfig.cs
@@ -3,12 +3,12 @@
 using System;
 using UnityEngine;
 
-namespace Level.Config 
+namespace Level.Config
 {
     [Serializable]
     public class SerializedShopRoomConfig
     {
-        [SerializeField] 
+        [SerializeField]
         private string selectedType;
 
         [SerializeField]

diff --git a/JamGame/Assets/Scripts/Generated/SerializedShopRoomConfigEditor.cs b/JamGame/Assets/Scripts/Generated/SerializedShopRoomConfigEditor.cs
@@ -5,7 +5,7 @@
 using UnityEngine;
 using Level.Config;
 
-namespace SerializedInterface.Inspector 
+namespace SerializedInterface.Inspector
 {
     [CustomPropertyDrawer(typeof(SerializedShopRoomConfig))]
     public class SerializedShopRoomConfigDrawer : PropertyDrawer
@@ -64,13 +64,11 @@ public override float GetPropertyHeight(SerializedProperty property, GUIContent
             float height = 0.0f;
             if (selected_type != "")
             {
-                var typed_prop = property.FindPropertyRelative(
-                    PascalToCamelCase(selected_type)
-                );
+                var typed_prop = property.FindPropertyRelative(PascalToCamelCase(selected_type));
                 height = EditorGUI.GetPropertyHeight(typed_prop);
             }
             return EditorGUIUtility.singleLineHeight + height;
         }
     }
 }
-#endif
+#endif
diff --git a/JamGame/Assets/Scripts/Generated/SerializedTask.cs b/JamGame/Assets/Scripts/Generated/SerializedTask.cs
@@ -3,12 +3,12 @@
 using System;
 using UnityEngine;
 
-namespace Level.Boss.Task 
+namespace Level.Boss.Task
 {
     [Serializable]
     public class SerializedTask
     {
-        [SerializeField] 
+        [SerializeField]
         private string selectedType;
 
         [SerializeField]