Implement concrete quirk types

miniature-studios · Sep 4, 2023 · bea5562 · bea5562
1 parent aac32a4
commit bea5562
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 6 deletions.
diff --git a/JamGame/Assets/Prefabs/Employee/Quirks.meta b/JamGame/Assets/Prefabs/Employee/Quirks.meta
diff --git a/...ssets/Prefabs/Employee/QuirkExample.asset → ...ets/Prefabs/Employee/Quirks/Glutton.asset b/...ssets/Prefabs/Employee/QuirkExample.asset → ...ets/Prefabs/Employee/Quirks/Glutton.asset
@@ -10,11 +10,13 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 03ce289c8c8e12e4291e9f443d663f4a, type: 3}
-  m_Name: QuirkExample
+  m_Name: Glutton
   m_EditorClassIdentifier: 
   additionalNeeds:
   - NeedType: 2
-    SatisfactionTime: 1
-    SatisfactionGained: 1
-    DecreaseSpeed: 10
-  _name: quirk0
+    SatisfactionTime: 2
+    SatisfactionGained: 400
+    DecreaseSpeed: 0.5
+    OverrideSatisfaction: 0
+    OverrideSatisfactionValue: 0
+  name_: 
diff --git a/JamGame/Assets/Prefabs/Employee/Quirks/Glutton.asset.meta b/JamGame/Assets/Prefabs/Employee/Quirks/Glutton.asset.meta
diff --git a/JamGame/Assets/Prefabs/Employee/Quirks/Smoker.asset b/JamGame/Assets/Prefabs/Employee/Quirks/Smoker.asset
@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 03ce289c8c8e12e4291e9f443d663f4a, type: 3}
+  m_Name: Smoker
+  m_EditorClassIdentifier: 
+  additionalNeeds:
+  - NeedType: 5
+    SatisfactionTime: 4
+    SatisfactionGained: 400
+    DecreaseSpeed: 0.1
+    OverrideSatisfaction: 0
+    OverrideSatisfactionValue: 0
+  name_: 
diff --git a/.../Prefabs/Employee/QuirkExample.asset.meta → ...Prefabs/Employee/Quirks/Smoker.asset.meta b/.../Prefabs/Employee/QuirkExample.asset.meta → ...Prefabs/Employee/Quirks/Smoker.asset.meta
diff --git a/JamGame/Assets/Scenes/mertwole.unity b/JamGame/Assets/Scenes/mertwole.unity
@@ -2027,6 +2027,14 @@ PrefabInstance:
       propertyPath: stages.Array.data[1].StartsAt
       value: -0.001
       objectReference: {fileID: 0}
+    - target: {fileID: 7027475554387804411, guid: 2b0954c297f03d64a875548889b6a208, type: 3}
+      propertyPath: quirks.Array.size
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7027475554387804411, guid: 2b0954c297f03d64a875548889b6a208, type: 3}
+      propertyPath: quirks.Array.data[0]
+      value: 
+      objectReference: {fileID: 11400000, guid: 1156cf1b31295974b9f193ed3f761170, type: 2}
     - target: {fileID: 7027475554387804413, guid: 2b0954c297f03d64a875548889b6a208, type: 3}
       propertyPath: m_Name
       value: Employee
@@ -3726,6 +3734,9 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+  DayEnds:
+    m_PersistentCalls:
+      m_Calls: []
   TestEmployeeConfig:
     selectedType: FixedEmployeeConfig
     fixedEmployeeConfig:

diff --git a/JamGame/Assets/Scripts/Employee/Needs/Need.cs b/JamGame/Assets/Scripts/Employee/Needs/Need.cs
@@ -9,8 +9,11 @@ public enum NeedType
         Work,
         Piss,
         Eat,
+
         Meeting,
-        Leave
+        Leave,
+
+        Smoke
     }
 
     [Serializable]