Update time in boss tasks

miniature-studios · Aug 24, 2024 · 0dea373 · 0dea373
1 parent 2f650e2
commit 0dea373
Show file tree

Hide file tree

Showing 10 changed files with 210 additions and 92 deletions.
diff --git a/JamGame/Assets/Prefabs/UI/Boss.prefab b/JamGame/Assets/Prefabs/UI/Boss.prefab
@@ -52,16 +52,63 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   maxStressGatherTime:
-    days: 5
+    timeUnit: 0
+    value: 5
   stress: 0
   meetingTasks:
   - Tasks:
     - task:
-        rid: 5009512970511974400
-      cost: 0
+        rid: 8023115963875983371
+      cost: 20
     - task:
-        rid: 3161708622866808832
-      cost: 0
+        rid: 8023115963875983372
+      cost: 10
+    - task:
+        rid: 8023115963875983373
+      cost: 10
+  - Tasks: []
+  - Tasks:
+    - task:
+        rid: 8023115963875983374
+      cost: 20
+    - task:
+        rid: 8023115963875983375
+      cost: 10
+  - Tasks: []
+  - Tasks:
+    - task:
+        rid: 8023115963875983376
+      cost: 10
+  - Tasks:
+    - task:
+        rid: 8023115963875983377
+      cost: 20
+    - task:
+        rid: 8023115963875983378
+      cost: 7
+    - task:
+        rid: 8023115963875983379
+      cost: 7
+    - task:
+        rid: 8023115963875983380
+      cost: 7
+  - Tasks: []
+  - Tasks:
+    - task:
+        rid: 8023115963875983382
+      cost: 20
+  - Tasks:
+    - task:
+        rid: 8023115963875983383
+      cost: 10
+    - task:
+        rid: 8023115963875983384
+      cost: 10
+  - Tasks: []
+  - Tasks:
+    - task:
+        rid: 8023115963875983385
+      cost: 30
   ActiveTasksChanged:
     m_PersistentCalls:
       m_Calls:
@@ -80,18 +127,91 @@ MonoBehaviour:
   references:
     version: 2
     RefIds:
-    - rid: 3161708622866808832
+    - rid: 8023115963875983371
+      type: {class: MinBalance, ns: Level.Boss.Task, asm: Assembly-CSharp}
+      data:
+        minBalanceTarget: 0
+        targetDuration:
+          timeUnit: 0
+          value: 13
+    - rid: 8023115963875983372
+      type: {class: TargetRoomCount, ns: Level.Boss.Task, asm: Assembly-CSharp}
+      data:
+        timeToEnsureCompletion:
+          seconds: 0.5
+        room: {fileID: 739786844684371711, guid: 12f9d01fff44d1f469de9bec77ff7e01, type: 3}
+        targetAmount: 1
+    - rid: 8023115963875983373
+      type: {class: TargetEmployeeAmount, ns: Level.Boss.Task, asm: Assembly-CSharp}
+      data:
+        employeeCountTarget: 2
+    - rid: 8023115963875983374
+      type: {class: MinEarnPerWorkingSession, ns: Level.Boss.Task, asm: Assembly-CSharp}
+      data:
+        executor: {fileID: 0}
+        earnTarget: 500
+    - rid: 8023115963875983375
+      type: {class: TargetRoomCount, ns: Level.Boss.Task, asm: Assembly-CSharp}
+      data:
+        timeToEnsureCompletion:
+          seconds: 0.5
+        room: {fileID: 739786844684371711, guid: f44832571ae043748b5bf64334ca05af, type: 3}
+        targetAmount: 5
+    - rid: 8023115963875983376
+      type: {class: MaxStressBound, ns: Level.Boss.Task, asm: Assembly-CSharp}
+      data:
+        maxStressTarget: 80
+        targetDuration:
+          timeUnit: 0
+          value: 1
+    - rid: 8023115963875983377
+      type: {class: MinEmployeesWithQuirk, ns: Level.Boss.Task, asm: Assembly-CSharp}
+      data:
+        employeeCountTarget: 1
+        targetQuirk: {fileID: 11400000, guid: f0e19fd7eb5f01940a1e652f0dbc564f, type: 2}
+    - rid: 8023115963875983378
+      type: {class: MinEmployeesWithQuirk, ns: Level.Boss.Task, asm: Assembly-CSharp}
+      data:
+        employeeCountTarget: 2
+        targetQuirk: {fileID: 11400000, guid: f0e19fd7eb5f01940a1e652f0dbc564f, type: 2}
+    - rid: 8023115963875983379
+      type: {class: MinEmployeesWithQuirk, ns: Level.Boss.Task, asm: Assembly-CSharp}
+      data:
+        employeeCountTarget: 1
+        targetQuirk: {fileID: 11400000, guid: 1156cf1b31295974b9f193ed3f761170, type: 2}
+    - rid: 8023115963875983380
+      type: {class: MinEmployeesWithQuirk, ns: Level.Boss.Task, asm: Assembly-CSharp}
+      data:
+        employeeCountTarget: 0
+        targetQuirk: {fileID: 11400000, guid: e251cd156eeb0a343a3b80129ea24798, type: 2}
+    - rid: 8023115963875983382
       type: {class: DontSatisfyNeed, ns: Level.Boss.Task, asm: Assembly-CSharp}
       data:
         employeeManager: {fileID: 0}
         targetNeed: 0
         targetDuration:
-          days: 1
-    - rid: 5009512970511974400
+          timeUnit: 0
+          value: 2
+    - rid: 8023115963875983383
       type: {class: MinEarnPerWorkingSession, ns: Level.Boss.Task, asm: Assembly-CSharp}
       data:
         executor: {fileID: 0}
-        earnTarget: 200
+        earnTarget: 2000
+    - rid: 8023115963875983384
+      type: {class: MaxWaitingLineLength, ns: Level.Boss.Task, asm: Assembly-CSharp}
+      data:
+        lengthTarget: 3
+        targetDuration:
+          timeUnit: 0
+          value: 2
+    - rid: 8023115963875983385
+      type: {class: RoomCountUpperBound, ns: Level.Boss.Task, asm: Assembly-CSharp}
+      data:
+        room: {fileID: 739786844684371711, guid: 12f9d01fff44d1f469de9bec77ff7e01, type: 3}
+        upperIntBoundInclusive: 2
+        timeToComplete:
+          timeUnit: 0
+          value: 2
 --- !u!95 &5879659543434839987
 Animator:
   serializedVersion: 5

diff --git a/JamGame/Assets/Scenes/Main.unity b/JamGame/Assets/Scenes/Main.unity
@@ -3410,22 +3410,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Boss
       objectReference: {fileID: 0}
-    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
-      propertyPath: executor
-      value: 
-      objectReference: {fileID: 1067622715}
-    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
-      propertyPath: managedReferences[-2]
-      value: 
-      objectReference: {fileID: 0}
     - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
       propertyPath: meetingTasks.Array.size
       value: 11
       objectReference: {fileID: 0}
-    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
-      propertyPath: maxStressGatherTime.days
-      value: 5
-      objectReference: {fileID: 0}
     - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
       propertyPath: managedReferences[8023115963875983371]
       value: Assembly-CSharp Level.Boss.Task.MinBalance
@@ -3466,10 +3454,6 @@ PrefabInstance:
       propertyPath: managedReferences[8023115963875983380]
       value: Assembly-CSharp Level.Boss.Task.MinEmployeesWithQuirk
       objectReference: {fileID: 0}
-    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
-      propertyPath: managedReferences[8023115963875983381]
-      value: Assembly-CSharp Level.Boss.Task.MinEarnPerWorkingSession
-      objectReference: {fileID: 0}
     - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
       propertyPath: managedReferences[8023115963875983382]
       value: Assembly-CSharp Level.Boss.Task.DontSatisfyNeed
@@ -3526,18 +3510,10 @@ PrefabInstance:
       propertyPath: meetingTasks.Array.data[10].Tasks.Array.size
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
-      propertyPath: managedReferences[5009512970511974400].executor
-      value: 
-      objectReference: {fileID: 1067622715}
     - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
       propertyPath: managedReferences[8023115963875983374].executor
       value: 
       objectReference: {fileID: 1067622715}
-    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
-      propertyPath: managedReferences[8023115963875983381].executor
-      value: 
-      objectReference: {fileID: 1067622715}
     - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
       propertyPath: managedReferences[8023115963875983383].executor
       value: 
@@ -3546,10 +3522,6 @@ PrefabInstance:
       propertyPath: managedReferences[8023115963875983374].earnTarget
       value: 500
       objectReference: {fileID: 0}
-    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
-      propertyPath: managedReferences[8023115963875983381].earnTarget
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
       propertyPath: managedReferences[8023115963875983382].targetNeed
       value: 0
@@ -3690,10 +3662,6 @@ PrefabInstance:
       propertyPath: meetingTasks.Array.data[8].Tasks.Array.data[1].task
       value: 8023115963875983384
       objectReference: {fileID: 0}
-    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
-      propertyPath: meetingTasks.Array.data[8].Tasks.Array.data[2].task
-      value: -2
-      objectReference: {fileID: 0}
     - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
       propertyPath: meetingTasks.Array.data[10].Tasks.Array.data[0].cost
       value: 30
@@ -3702,10 +3670,6 @@ PrefabInstance:
       propertyPath: meetingTasks.Array.data[10].Tasks.Array.data[0].task
       value: 8023115963875983385
       objectReference: {fileID: 0}
-    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
-      propertyPath: managedReferences[3161708622866808832].employeeManager
-      value: 
-      objectReference: {fileID: 42303835}
     - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
       propertyPath: managedReferences[8023115963875983376].maxStressTarget
       value: 80
@@ -3718,18 +3682,10 @@ PrefabInstance:
       propertyPath: managedReferences[8023115963875983371].minBalanceTarget
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
-      propertyPath: managedReferences[8023115963875983371].targetDuration.days
-      value: 13
-      objectReference: {fileID: 0}
     - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
       propertyPath: managedReferences[8023115963875983373].employeeCountTarget
       value: 2
       objectReference: {fileID: 0}
-    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
-      propertyPath: managedReferences[8023115963875983376].targetDuration.days
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
       propertyPath: managedReferences[8023115963875983377].employeeCountTarget
       value: 1
@@ -3747,21 +3703,49 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
-      propertyPath: managedReferences[8023115963875983382].targetDuration.days
+      propertyPath: managedReferences[8023115963875983371].targetDuration.value
+      value: 13
+      objectReference: {fileID: 0}
+    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
+      propertyPath: managedReferences[8023115963875983376].targetDuration.value
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
+      propertyPath: managedReferences[8023115963875983382].targetDuration.value
       value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
-      propertyPath: managedReferences[8023115963875983384].targetDuration.days
+      propertyPath: managedReferences[8023115963875983384].targetDuration.value
       value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
-      propertyPath: managedReferences[8023115963875983385].timeToComplete.days
+      propertyPath: managedReferences[8023115963875983385].timeToComplete.value
       value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
       propertyPath: managedReferences[8023115963875983385].upperIntBoundInclusive
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
+      propertyPath: managedReferences[8023115963875983371].targetDuration.timeUnit
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
+      propertyPath: managedReferences[8023115963875983376].targetDuration.timeUnit
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
+      propertyPath: managedReferences[8023115963875983382].targetDuration.timeUnit
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
+      propertyPath: managedReferences[8023115963875983384].targetDuration.timeUnit
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
+      propertyPath: managedReferences[8023115963875983385].timeToComplete.timeUnit
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8254209980902256311, guid: 56568a2b14b58814586efd0c61ee9ef0, type: 3}
       propertyPath: managedReferences[8023115963875983372].timeToEnsureCompletion.seconds
       value: 0.5

diff --git a/JamGame/Assets/ScriptableObjects/Employee Configs/Buffs/BurnedOutBuff.asset b/JamGame/Assets/ScriptableObjects/Employee Configs/Buffs/BurnedOutBuff.asset
@@ -15,7 +15,8 @@ MonoBehaviour:
   uid:
     uid: 1016078263
   Time:
-    days: Infinity
+    timeUnit: 0
+    value: Infinity
   effects:
   - rid: 5009512637202432000
   references:

diff --git a/JamGame/Assets/ScriptableObjects/Employee Configs/Buffs/ExcitedBuff.asset b/JamGame/Assets/ScriptableObjects/Employee Configs/Buffs/ExcitedBuff.asset
@@ -15,7 +15,8 @@ MonoBehaviour:
   uid:
     uid: 1298764036
   Time:
-    days: Infinity
+    timeUnit: 0
+    value: Infinity
   effects:
   - rid: 5009512637202432004
   - rid: 5009512637202432005

diff --git a/JamGame/Assets/ScriptableObjects/Employee Configs/Buffs/StressedBuff.asset b/JamGame/Assets/ScriptableObjects/Employee Configs/Buffs/StressedBuff.asset
@@ -15,7 +15,8 @@ MonoBehaviour:
   uid:
     uid: 2112747369
   Time:
-    days: Infinity
+    timeUnit: 0
+    value: Infinity
   effects:
   - rid: 5009512637202432003
   references:

diff --git a/JamGame/Assets/ScriptableObjects/Employee Configs/Buffs/VeryStressedBuff.asset b/JamGame/Assets/ScriptableObjects/Employee Configs/Buffs/VeryStressedBuff.asset
@@ -15,7 +15,8 @@ MonoBehaviour:
   uid:
     uid: 312740263
   Time:
-    days: Infinity
+    timeUnit: 0
+    value: Infinity
   effects:
   - rid: 5009512637202432001
   - rid: 5009512637202432002

diff --git a/JamGame/Assets/Scripts/Employee/Buff.cs b/JamGame/Assets/Scripts/Employee/Buff.cs
@@ -12,7 +12,8 @@ public class Buff : ScriptableObject, IPostprocessedUidHandle
         private InternalUid uid;
         public InternalUid Uid => uid;
 
-        public Days Time;
+        [SerializeField]
+        public InGameTime Time;
 
         [SerializeReference]
         private List<IEffect> effects = new();

diff --git a/JamGame/Assets/Scripts/Level/Boss/Model.cs b/JamGame/Assets/Scripts/Level/Boss/Model.cs
@@ -50,7 +50,7 @@ private class TaskWithCost
         private DataProvider<GameLoseCause> gameLoseCauseProvider;
 
         [SerializeField]
-        private Days maxStressGatherTime;
+        private InGameTime maxStressGatherTime;
 
         private float stressNormalized;
         public float StressNormalized => stressNormalized;