Apply csharpier format

miniature-studios · Jan 1, 2024 · 7af285f · 7af285f
1 parent fec177f
commit 7af285f
Show file tree

Hide file tree

Showing 47 changed files with 133 additions and 131 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/Employee/Buff.cs b/JamGame/Assets/Scripts/Employee/Buff.cs
@@ -1,7 +1,7 @@
-using Sirenix.OdinInspector;
-using Sirenix.Serialization;
 using System;
 using System.Collections.Generic;
+using Sirenix.OdinInspector;
+using Sirenix.Serialization;
 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 Location;
-using Sirenix.OdinInspector;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Location;
+using Sirenix.OdinInspector;
 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 Sirenix.OdinInspector;
 using System;
 using System.Collections.Generic;
+using Sirenix.OdinInspector;
 using UnityEngine;
 
 namespace Employee

diff --git a/JamGame/Assets/Scripts/Level/Boss/Model.cs b/JamGame/Assets/Scripts/Level/Boss/Model.cs
@@ -1,11 +1,11 @@
-using Level.Boss.Task;
-using Level.GlobalTime;
-using Sirenix.OdinInspector;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
+using Level.Boss.Task;
+using Level.GlobalTime;
+using Sirenix.OdinInspector;
 using UnityEngine;
 using UnityEngine.Events;
 

diff --git a/JamGame/Assets/Scripts/Level/Boss/Task.cs b/JamGame/Assets/Scripts/Level/Boss/Task.cs
@@ -1,11 +1,11 @@
+using System;
+using System.Collections.Generic;
 using Common;
 using Level.GlobalTime;
 using Level.Room;
 using Pickle;
 using Sirenix.OdinInspector;
 using Sirenix.Serialization;
-using System;
-using System.Collections.Generic;
 using UnityEngine;
 
 namespace Level.Boss.Task

diff --git a/JamGame/Assets/Scripts/Level/Boss/TaskListView.cs b/JamGame/Assets/Scripts/Level/Boss/TaskListView.cs
@@ -1,7 +1,7 @@
-using Level.Boss.Task;
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using Level.Boss.Task;
 using UnityEngine;
 
 namespace Level.Boss

diff --git a/JamGame/Assets/Scripts/Level/Boss/TaskView.cs b/JamGame/Assets/Scripts/Level/Boss/TaskView.cs
@@ -1,5 +1,5 @@
-using Level.Boss.Task;
 using System;
+using Level.Boss.Task;
 using TMPro;
 using UnityEngine;
 
@@ -34,14 +34,12 @@ private void UpdateFromTask()
 
             description.text = task switch
             {
-                TargetEmployeeAmount =>
-                    $"Hire at least {progress.Overall} employees",
-                MaxStressBound task =>
-                    $"Hold maximum stress of employees less than {task.MaxStressTarget} for {progress.Overall} seconds",
-                TargetRoomCount task =>
-                    $"Build at least {progress.Overall} [{task.RoomTitle}]s",
-                RoomCountUpperBound task =>
-                    $"Have at most {task.UpperBoundInclusive} [{task.RoomTitle}]s for {progress.Overall} days",
+                TargetEmployeeAmount => $"Hire at least {progress.Overall} employees",
+                MaxStressBound task
+                    => $"Hold maximum stress of employees less than {task.MaxStressTarget} for {progress.Overall} seconds",
+                TargetRoomCount task => $"Build at least {progress.Overall} [{task.RoomTitle}]s",
+                RoomCountUpperBound task
+                    => $"Have at most {task.UpperBoundInclusive} [{task.RoomTitle}]s for {progress.Overall} days",
                 _ => throw new NotImplementedException("This task type is not supported")
             };
         }

diff --git a/JamGame/Assets/Scripts/Level/Config/DayAction.cs b/JamGame/Assets/Scripts/Level/Config/DayAction.cs
@@ -1,9 +1,9 @@
-using Level.GlobalTime;
-using Sirenix.OdinInspector;
-using Sirenix.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Level.GlobalTime;
+using Sirenix.OdinInspector;
+using Sirenix.Serialization;
 
 namespace Level.Config
 {

diff --git a/JamGame/Assets/Scripts/Level/Config/Employee.cs b/JamGame/Assets/Scripts/Level/Config/Employee.cs
@@ -1,8 +1,8 @@
-using Common;
-using Sirenix.OdinInspector;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Common;
+using Sirenix.OdinInspector;
 using UnityEngine;
 
 namespace Level.Config
@@ -73,9 +73,9 @@ public class RandomEmployeeConfig : IEmployeeConfig
         public EmployeeConfig GetEmployeeConfig()
         {
             List<float> list = weightList.EmployeeWeights.Select(x => x.Weight).ToList();
-            GameObject result = weightList.EmployeeWeights.ToList()[
-                RandomTools.RandomlyChooseWithWeights(list)
-            ].Prototype;
+            GameObject result = weightList
+                .EmployeeWeights.ToList()[RandomTools.RandomlyChooseWithWeights(list)]
+                .Prototype;
 
             string first_name = nameList.FirstNames.OrderBy(x => UnityEngine.Random.value).First();
             string last_name = nameList.LastNames.OrderBy(x => UnityEngine.Random.value).First();

diff --git a/JamGame/Assets/Scripts/Level/Config/EmployeeNameList.cs b/JamGame/Assets/Scripts/Level/Config/EmployeeNameList.cs
@@ -1,7 +1,7 @@
-using Sirenix.OdinInspector;
-using Sirenix.Serialization;
-using System;
+using System;
 using System.Collections.Generic;
+using Sirenix.OdinInspector;
+using Sirenix.Serialization;
 using UnityEngine;
 
 namespace Level.Config

diff --git a/JamGame/Assets/Scripts/Level/Config/EmployeeWeightList.cs b/JamGame/Assets/Scripts/Level/Config/EmployeeWeightList.cs
@@ -1,7 +1,7 @@
-using Sirenix.OdinInspector;
-using Sirenix.Serialization;
-using System;
+using System;
 using System.Collections.Generic;
+using Sirenix.OdinInspector;
+using Sirenix.Serialization;
 using UnityEngine;
 
 namespace Level.Config

diff --git a/JamGame/Assets/Scripts/Level/Config/InventoryRoom.cs b/JamGame/Assets/Scripts/Level/Config/InventoryRoom.cs
@@ -1,5 +1,5 @@
-using Level.Room;
 using System;
+using Level.Room;
 
 namespace Level.Config
 {

diff --git a/JamGame/Assets/Scripts/Level/Config/Level.cs b/JamGame/Assets/Scripts/Level/Config/Level.cs
@@ -1,7 +1,7 @@
-using Sirenix.OdinInspector;
-using Sirenix.Serialization;
 using System;
 using System.Collections.Generic;
+using Sirenix.OdinInspector;
+using Sirenix.Serialization;
 
 namespace Level.Config
 {

diff --git a/JamGame/Assets/Scripts/Level/Config/LevelConfig.cs b/JamGame/Assets/Scripts/Level/Config/LevelConfig.cs
@@ -1,7 +1,7 @@
-using Sirenix.OdinInspector;
-using Sirenix.Serialization;
-using System;
+using System;
 using System.Collections.Generic;
+using Sirenix.OdinInspector;
+using Sirenix.Serialization;
 using UnityEngine;
 
 namespace Level.Config

diff --git a/JamGame/Assets/Scripts/Level/Config/ShopRoom.cs b/JamGame/Assets/Scripts/Level/Config/ShopRoom.cs
@@ -1,10 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using Common;
 using Level.Room;
 using Sirenix.OdinInspector;
 using Sirenix.Serialization;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
 
 namespace Level.Config

diff --git a/JamGame/Assets/Scripts/Level/DragAndDropManager.cs b/JamGame/Assets/Scripts/Level/DragAndDropManager.cs
@@ -1,8 +1,8 @@
-using Common;
+using System.Linq;
+using Common;
 using Level.Room;
 using Pickle;
 using Sirenix.OdinInspector;
-using System.Linq;
 using UnityEngine;
 
 namespace Level

diff --git a/JamGame/Assets/Scripts/Level/DurationCounter.cs b/JamGame/Assets/Scripts/Level/DurationCounter.cs
@@ -24,10 +24,7 @@ public void DayEnds()
 
         public DaysLived GetData()
         {
-            return new DaysLived()
-            {
-                Value = daysLived
-            };
+            return new DaysLived() { Value = daysLived };
         }
     }
 }
diff --git a/JamGame/Assets/Scripts/Level/Executor.cs b/JamGame/Assets/Scripts/Level/Executor.cs
@@ -1,12 +1,12 @@
-using Common;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Common;
 using Level.Config;
 using Level.GlobalTime;
 using Location;
 using Sirenix.OdinInspector;
 using Sirenix.Serialization;
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Events;
 

diff --git a/JamGame/Assets/Scripts/Level/GlobalTime/Model.cs b/JamGame/Assets/Scripts/Level/GlobalTime/Model.cs
@@ -1,6 +1,6 @@
+using System;
 using Common;
 using Sirenix.OdinInspector;
-using System;
 using UnityEngine;
 
 namespace Level.GlobalTime

diff --git a/JamGame/Assets/Scripts/Level/Inventory/Controller.cs b/JamGame/Assets/Scripts/Level/Inventory/Controller.cs
@@ -1,6 +1,6 @@
-using Common;
+using System.Linq;
+using Common;
 using Level.Room;
-using System.Linq;
 using UnityEngine;
 
 namespace Level.Inventory

diff --git a/JamGame/Assets/Scripts/Level/Inventory/Model.cs b/JamGame/Assets/Scripts/Level/Inventory/Model.cs
@@ -1,6 +1,6 @@
-using Level.Room;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using Level.Room;
 using UnityEngine;
 using UnityEngine.Events;
 

diff --git a/JamGame/Assets/Scripts/Level/Inventory/View.cs b/JamGame/Assets/Scripts/Level/Inventory/View.cs
@@ -1,9 +1,9 @@
-using Common;
-using Level.Room;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
+using Common;
+using Level.Room;
 using TMPro;
 using UnityEngine;
 using UnityEngine.AddressableAssets;

diff --git a/JamGame/Assets/Scripts/Level/Room/CoreModel.cs b/JamGame/Assets/Scripts/Level/Room/CoreModel.cs
@@ -1,7 +1,7 @@
-using Common;
-using Sirenix.OdinInspector;
-using System;
+using System;
 using System.Collections.Generic;
+using Common;
+using Sirenix.OdinInspector;
 using TileBuilder;
 using UnityEngine;
 using UnityEngine.ResourceManagement.ResourceLocations;

diff --git a/JamGame/Assets/Scripts/Level/Scheduler.cs b/JamGame/Assets/Scripts/Level/Scheduler.cs
@@ -1,6 +1,6 @@
-using Level.Config;
 using System.Collections.Generic;
 using System.Linq;
+using Level.Config;
 using UnityEngine;
 
 namespace Level

diff --git a/JamGame/Assets/Scripts/Level/Shop/Controller.cs b/JamGame/Assets/Scripts/Level/Shop/Controller.cs
@@ -1,8 +1,8 @@
-using Common;
+using System.Collections.Generic;
+using System.Linq;
+using Common;
 using Level.Config;
 using Level.Room;
-using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
 
 namespace Level.Shop

diff --git a/JamGame/Assets/Scripts/Level/Shop/Model.cs b/JamGame/Assets/Scripts/Level/Shop/Model.cs
@@ -1,7 +1,7 @@
-using Level.Room;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using Level.Room;
 using UnityEngine;
 using UnityEngine.Events;
 

diff --git a/JamGame/Assets/Scripts/Level/Shop/Room/Model.cs b/JamGame/Assets/Scripts/Level/Shop/Room/Model.cs
@@ -1,5 +1,5 @@
-using Sirenix.OdinInspector;
-using System;
+using System;
+using Sirenix.OdinInspector;
 using UnityEngine;
 
 namespace Level.Shop.Room

diff --git a/JamGame/Assets/Scripts/Level/Shop/Room/View.cs b/JamGame/Assets/Scripts/Level/Shop/Room/View.cs
@@ -1,8 +1,8 @@
-using Common;
+using System;
+using Common;
 using Level.Room;
 using Pickle;
 using Sirenix.OdinInspector;
-using System;
 using TMPro;
 using UnityEngine;
 

diff --git a/JamGame/Assets/Scripts/Level/Shop/View.cs b/JamGame/Assets/Scripts/Level/Shop/View.cs
@@ -1,8 +1,8 @@
-using Common;
-using Level.Room;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
+using Common;
+using Level.Room;
 using UnityEngine;
 using UnityEngine.AddressableAssets;
 using UnityEngine.ResourceManagement.ResourceLocations;