Merge branch 'main' into worldbuilding

# Conflicts:
#	UOP1_Project/Assets/Scenes/Locations/Field_Farms.unity

UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Farms.prefab

       propertyPath: m_Name
       value: Gluecose_FarmAttack (2)
       objectReference: {fileID: 0}
+    - target: {fileID: 3641242757122071620, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: _npcMovementConfig
+      value: 
+      objectReference: {fileID: 11400000, guid: 5932c32c5fadc7d4dbfcfe18641a14c4,
+        type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 56a7aec3927ab6a4e85add83fc22eabb, type: 3}
 --- !u!4 &8040769609122690780 stripped
       propertyPath: m_Name
       value: Gluecose_FarmAttack
       objectReference: {fileID: 0}
+    - target: {fileID: 3641242757122071620, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: _npcMovementConfig
+      value: 
+      objectReference: {fileID: 11400000, guid: fa5d257c17e2c2a49bcaad7e13ade621,
+        type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 56a7aec3927ab6a4e85add83fc22eabb, type: 3}
 --- !u!4 &8040769610452317586 stripped
       propertyPath: m_Name
       value: Gluecose_FarmAttack (1)
       objectReference: {fileID: 0}
+    - target: {fileID: 3641242757122071620, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: _npcMovementConfig
+      value: 
+      objectReference: {fileID: 11400000, guid: 07e3efd786897254797f8bee4f445e27,
+        type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 56a7aec3927ab6a4e85add83fc22eabb, type: 3}
 --- !u!4 &8040769610564248312 stripped

UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/Pathways/SlimeCritterPathwayConfig.meta

+fileFormatVersion: 2
+guid: 09f1ec9d7fb672f41ad7a4fff126e008
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/Pathways/SlimeCritterPathwayConfig/SlimeCritter1PathwayConfig.asset

+%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: 76542500a512494489526e9bcfd3a1b8, type: 3}
+  m_Name: SlimeCritter1PathwayConfig
+  m_EditorClassIdentifier: 
+  _stopDuration: 0.5
+  _speed: 1
+  Waypoints:
+  - waypoint: {x: 37.06861, y: 2.7186172, z: -155.6937}
+    corners:
+    - {x: 37.06861, y: 2.7709734, z: -155.6937}
+    - {x: 32.7, y: 3.1866074, z: -158.2}
+    - {x: 26.902933, y: 3.1366043, z: -161.16402}
+  - waypoint: {x: 26.902933, y: 3.0997455, z: -161.16402}
+    corners:
+    - {x: 26.902933, y: 3.1366043, z: -161.16402}
+    - {x: 23.4, y: 2.9866066, z: -156.5}
+    - {x: 20.815067, y: 2.4063218, z: -153.82915}
+  - waypoint: {x: 20.815067, y: 2.3792727, z: -153.82915}
+    corners:
+    - {x: 20.815067, y: 2.4063218, z: -153.82915}
+    - {x: 25.6, y: 2.6366043, z: -151}
+    - {x: 26.1, y: 2.6366043, z: -150.70001}
+    - {x: 31.454504, y: 2.4686396, z: -147.35999}
+  - waypoint: {x: 31.454504, y: 2.4480815, z: -147.35999}
+    corners:
+    - {x: 31.454504, y: 2.4686396, z: -147.35999}
+    - {x: 37.06861, y: 2.7709734, z: -155.6937}
+  _lineColor: {r: 0, g: 0.19270587, b: 1, a: 1}
+  _textSize: 20
+  _textColor: {r: 1, g: 1, b: 1, a: 1}
+  _probeRadius: 5
+  DisplayProbes: 0
+  ToggledNavMeshDisplay: 1
+  RealTimeEnabled: 1

UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/Pathways/SlimeCritterPathwayConfig/SlimeCritter1PathwayConfig.asset.meta

+fileFormatVersion: 2
+guid: fa5d257c17e2c2a49bcaad7e13ade621
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/Pathways/SlimeCritterPathwayConfig/SlimeCritter2PathwayConfig.asset

+%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: 76542500a512494489526e9bcfd3a1b8, type: 3}
+  m_Name: SlimeCritter2PathwayConfig
+  m_EditorClassIdentifier: 
+  _stopDuration: 0.5
+  _speed: 1
+  Waypoints:
+  - waypoint: {x: 48.933567, y: 1.8827523, z: -144.23233}
+    corners:
+    - {x: 48.933567, y: 1.9529065, z: -144.23233}
+    - {x: 43.39123, y: 2.5115952, z: -152.35359}
+  - waypoint: {x: 43.39123, y: 2.4610677, z: -152.35359}
+    corners:
+    - {x: 43.39123, y: 2.5115952, z: -152.35359}
+    - {x: 29.334278, y: 0.6070535, z: -126.35725}
+  - waypoint: {x: 29.334278, y: 0.5846013, z: -126.35725}
+    corners:
+    - {x: 29.334278, y: 0.6070535, z: -126.35725}
+    - {x: 13.463667, y: -1.1200124, z: -137.81865}
+  - waypoint: {x: 13.463667, y: -1.1738727, z: -137.81865}
+    corners:
+    - {x: 13.463667, y: -1.1200124, z: -137.81865}
+    - {x: 48.933567, y: 1.9529065, z: -144.23233}
+  _lineColor: {r: 0, g: 0.19270587, b: 1, a: 1}
+  _textSize: 20
+  _textColor: {r: 1, g: 1, b: 1, a: 1}
+  _probeRadius: 5
+  DisplayProbes: 0
+  ToggledNavMeshDisplay: 1
+  RealTimeEnabled: 1

UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/Pathways/SlimeCritterPathwayConfig/SlimeCritter2PathwayConfig.asset.meta

+fileFormatVersion: 2
+guid: 07e3efd786897254797f8bee4f445e27
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/Pathways/SlimeCritterPathwayConfig/SlimeCritter3PathwayConfig 1.asset

+%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: 76542500a512494489526e9bcfd3a1b8, type: 3}
+  m_Name: SlimeCritter3PathwayConfig 1
+  m_EditorClassIdentifier: 
+  _stopDuration: 0.5
+  _speed: 1
+  Waypoints:
+  - waypoint: {x: 55.830315, y: 2.2067142, z: -125.9238}
+    corners:
+    - {x: 55.830315, y: 2.2432482, z: -125.9238}
+    - {x: 48.529545, y: 1.9230813, z: -139.04124}
+  - waypoint: {x: 48.529545, y: 1.8736537, z: -139.04124}
+    corners:
+    - {x: 48.529545, y: 1.9230813, z: -139.04124}
+    - {x: 44.915432, y: 1.9276586, z: -120.25296}
+  - waypoint: {x: 44.915432, y: 1.8812014, z: -120.25296}
+    corners:
+    - {x: 44.915432, y: 1.9276586, z: -120.25296}
+    - {x: 36.647392, y: 2.333554, z: -129.73154}
+  - waypoint: {x: 36.647392, y: 2.3152366, z: -129.73154}
+    corners:
+    - {x: 36.647392, y: 2.333554, z: -129.73154}
+    - {x: 51.2, y: 2.2866058, z: -128}
+    - {x: 55.830315, y: 2.2432482, z: -125.9238}
+  _lineColor: {r: 0, g: 0.19270587, b: 1, a: 1}
+  _textSize: 20
+  _textColor: {r: 1, g: 1, b: 1, a: 1}
+  _probeRadius: 5
+  DisplayProbes: 0
+  ToggledNavMeshDisplay: 1
+  RealTimeEnabled: 1

UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/Pathways/SlimeCritterPathwayConfig/SlimeCritter3PathwayConfig 1.asset.meta

+fileFormatVersion: 2
+guid: 5932c32c5fadc7d4dbfcfe18641a14c4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: