Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main

4 年前 · 75076141
--- a/UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare.controller
+++ b/UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare.controller
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 1
+--- !u!1101 &-9092154409766127825
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: IsTalking
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9603175
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1107 &-8922074601772979250
 AnimatorStateMachine:
  serializedVersion: 6
  m_ExitPosition: {x: 870, y: 160, z: 0}
  m_ParentStateMachinePosition: {x: 960, y: -20, z: 0}
  m_DefaultState: {fileID: -5498160952533448129}
--- !u!1102 &-8469571835042200281
+--- !u!1101 &-8330992559062188889
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: JumpUp
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.96411484
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-7913247318419321385
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: JumpUp
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.96411484
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &-5943099573550533948
 AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions:
-  - {fileID: 7922362597612938490}
-  - {fileID: -4421386546069748714}
+  - {fileID: 813894584215551175}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_Transitions:
  - {fileID: 3943266464784214337}
  - {fileID: 1201560230152072265}
+  - {fileID: -7913247318419321385}
+  - {fileID: -8330992559062188889}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1101 &-4421386546069748714
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions: []
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 7467964322136481553}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.8295455
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1109 &-4394027057195029758
 AnimatorTransition:
  m_ObjectHideFlags: 1
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 1
--- !u!1101 &-3813820208879679561
+--- !u!1101 &-3446933760404224606
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
-  m_Conditions:
-  - m_ConditionMode: 2
-    m_ConditionEvent: IsTalking
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
+  m_Conditions: []
+  m_DstStateMachine: {fileID: -8922074601772979250}
-  m_IsExit: 1
+  m_IsExit: 0
-  m_ExitTime: 0.9603175
-  m_HasExitTime: 0
+  m_ExitTime: 0.7916667
+  m_HasExitTime: 1
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: 5016800082881321634}
-  - {fileID: 171725598432738298}
+  - {fileID: 4353565650259770779}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1109 &-2571972952110134739
+AnimatorTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: RandomIdle
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 7467964322136481553}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
 --- !u!114 &-2560727757387082229
 MonoBehaviour:
  m_ObjectHideFlags: 1
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 1
--- !u!1101 &-2085247292988123788
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 2
-    m_ConditionEvent: IsTalking
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 3583411645183670853}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.95689654
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1102 &-2050654672260532050
 AnimatorState:
  serializedVersion: 6
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &-1664865702140399576
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: IsTalking
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.96411484
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!114 &-1278029081251987127
 MonoBehaviour:
  m_ObjectHideFlags: 1
  - serializedVersion: 1
    m_State: {fileID: 7467964322136481553}
    m_Position: {x: 400, y: 220, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: -8469571835042200281}
-    m_Position: {x: 140, y: 110, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 3583411645183670853}
-    m_Position: {x: 820, y: 130, z: 0}
-  - {fileID: 1349388855333511327}
+  - {fileID: 8944268493305491835}
+  - {fileID: -2571972952110134739}
  m_StateMachineTransitions: {}
  m_StateMachineBehaviours:
  - {fileID: -1278029081251987127}
  m_ParentStateMachinePosition: {x: -190, y: -40, z: 0}
-  m_DefaultState: {fileID: -8469571835042200281}
+  m_DefaultState: {fileID: -2982860026827336943}
+--- !u!1109 &-384121867820306950
+AnimatorTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: JumpDown
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 4077334438025311903}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
 --- !u!91 &9100000
 AnimatorController:
  m_ObjectHideFlags: 0
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
+  - m_Name: JumpUp
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: JumpDown
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
--- !u!1101 &171725598432738298
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 2
-    m_ConditionEvent: IsTalking
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 3583411645183670853}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.9603175
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1102 &506854443335118827
 AnimatorState:
  serializedVersion: 6
  m_Transitions:
  - {fileID: -5889163485102351479}
  - {fileID: 768716371077858704}
+  - {fileID: 1291868367040009996}
+  - {fileID: 5450956186395528051}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &689868256378094573
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 7467964322136481553}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.8295455
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &735038263065974624
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -2982860026827336943}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.8295455
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &768716371077858704
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1101 &1201560230152072265
+--- !u!1101 &813894584215551175
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_Conditions: []
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 506854443335118827}
+  m_DstStateMachine: {fileID: -8922074601772979250}
+  m_DstState: {fileID: 0}
  m_Solo: 0
  m_Mute: 0
  m_IsExit: 0
-  m_ExitTime: 0.9906015
+  m_ExitTime: 0.8295455
--- !u!1101 &1348238984624469047
+--- !u!1101 &1201560230152072265
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_Conditions: []
  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -2982860026827336943}
+  m_DstState: {fileID: 506854443335118827}
  m_Solo: 0
  m_Mute: 0
  m_IsExit: 0
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1109 &1349388855333511327
-AnimatorTransition:
+--- !u!1101 &1291868367040009996
+AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
-  - m_ConditionMode: 6
-    m_ConditionEvent: RandomIdle
-    m_EventTreshold: 1
-    m_ConditionEvent: IsTalking
+    m_ConditionEvent: JumpUp
-  m_DstState: {fileID: -8469571835042200281}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.96231157
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1348238984624469047
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -2982860026827336943}
-  serializedVersion: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9906015
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &2274748286261154411
 AnimatorState:
  serializedVersion: 6
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 1
--- !u!1102 &3583411645183670853
+--- !u!1109 &3618554181139686882
+AnimatorTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: JumpUp
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -5943099573550533948}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
+--- !u!1101 &3943266464784214337
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: IsTalking
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9906015
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &4077334438025311903
 AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions:
-  - {fileID: -3813820208879679561}
+  - {fileID: -3446933760404224606}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1101 &3943266464784214337
+--- !u!1101 &4353565650259770779
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_Conditions:
-  - m_ConditionMode: 1
+  - m_ConditionMode: 2
    m_ConditionEvent: IsTalking
    m_EventTreshold: 0
  m_DstStateMachine: {fileID: 0}
  m_IsExit: 1
  serializedVersion: 3
-  m_TransitionDuration: 0.1
+  m_TransitionDuration: 0.25
-  m_ExitTime: 0.9906015
+  m_ExitTime: 0.9603175
  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 1
+--- !u!1101 &5450956186395528051
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: JumpDown
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.96231157
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &6375416532858191911
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: 1348238984624469047}
-  - {fileID: -2085247292988123788}
+  - {fileID: -1664865702140399576}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1101 &7922362597612938490
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions: []
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -2982860026827336943}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.8295455
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1107 &8113754229338220148
 AnimatorStateMachine:
  serializedVersion: 6
  m_PrefabAsset: {fileID: 0}
  m_Name: Base Layer
-  m_ChildStates: []
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -5943099573550533948}
+    m_Position: {x: 700, y: 40, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 4077334438025311903}
+    m_Position: {x: 700, y: 230, z: 0}
  m_ChildStateMachines:
  - serializedVersion: 1
    m_StateMachine: {fileID: -8922074601772979250}
-    m_Position: {x: 340, y: -30, z: 0}
+    m_Position: {x: 340, y: -10, z: 0}
  m_AnyStateTransitions: []
  m_EntryTransitions:
  - {fileID: -4394027057195029758}
    - {fileID: 5363044950688599843}
+    - {fileID: 3618554181139686882}
+    - {fileID: -384121867820306950}
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_AnyStatePosition: {x: -120, y: -50, z: 0}
+--- !u!1109 &8944268493305491835
+AnimatorTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -2982860026827336943}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
--- a/UOP1_Project/Assets/Prefabs/Characters/BardHare.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/BardHare.prefab
  m_Script: {fileID: 11500000, guid: 1eeda163c70b3cb4ebb88ba92f608fd8, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _transitionTableSO: {fileID: 11400000, guid: 40a97759ea1c18c47ad6a9bfe0cacd99, type: 2}
+  _transitionTableSO: {fileID: 11400000, guid: 9a856fbf5f8a165408eb9fb51d367494, type: 2}
  _debugger:
    debugTransitions: 0
    appendConditionsInfo: 1
--- a/UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
+++ b/UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/BardHare_TransitionTable.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/BardHare_TransitionTable.asset
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: 13401f769215f3245807de4b2ea14759, type: 2}
      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 11d32529e8bdbc24e81d7b578426352c, type: 2}
+      Operator: 0
  - FromState: {fileID: 11400000, guid: 1aad0cd7a387c6544a113d9fa8df1ce3, type: 2}
    ToState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2}
    Conditions:
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: 1748abd46aa04284b8bf442050ef790f, type: 2}
+      Operator: 1
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 87426477fd21a254d8cd4ff826d4ee29, type: 2}
-  - FromState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2}
+  - FromState: {fileID: 11400000, guid: e8445f4dd402c244d8f2e2e0440bd834, type: 2}
    ToState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2}
    Conditions:
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2}
      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: ad97f6f8066c4d4499492813bfed08d3, type: 2}
+      Operator: 0
-    ToState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2}
+    ToState: {fileID: 11400000, guid: b815b7da412ff164abfb213e11d27ace, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: dcb00df815f03384cb096d4556e5ba95, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: b815b7da412ff164abfb213e11d27ace, type: 2}
+    ToState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2}
+      Operator: 1
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: f7264f99aeb6a8046b637306314556da, type: 2}
+  - FromState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2}
+    ToState: {fileID: 11400000, guid: e8445f4dd402c244d8f2e2e0440bd834, type: 2}
+    Conditions:
-      Condition: {fileID: 11400000, guid: 1748abd46aa04284b8bf442050ef790f, type: 2}
+      Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2}
-    ToState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2}
+    ToState: {fileID: 11400000, guid: e8445f4dd402c244d8f2e2e0440bd834, type: 2}
+  - FromState: {fileID: 11400000, guid: e8445f4dd402c244d8f2e2e0440bd834, type: 2}
+    ToState: {fileID: 11400000, guid: b815b7da412ff164abfb213e11d27ace, type: 2}
+    Conditions:
+      Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2}
+      Operator: 0
+    - ExpectedResult: 1
-  - FromState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2}
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: ad97f6f8066c4d4499492813bfed08d3, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: daed10358ee01bc4c8d68fe4ff3f0d40, type: 2}
+    ToState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2}
+    Conditions:
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 1748abd46aa04284b8bf442050ef790f, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 40db78531f0c5cd49904c91aea4d8d2a, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: daed10358ee01bc4c8d68fe4ff3f0d40, type: 2}
    ToState: {fileID: 11400000, guid: 1aad0cd7a387c6544a113d9fa8df1ce3, type: 2}
    Conditions:
    - ExpectedResult: 1
      Condition: {fileID: 11400000, guid: 13401f769215f3245807de4b2ea14759, type: 2}
      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 40db78531f0c5cd49904c91aea4d8d2a, type: 2}
+      Operator: 0
-    ToState: {fileID: 11400000, guid: b815b7da412ff164abfb213e11d27ace, type: 2}
-    Conditions:
-    - ExpectedResult: 1
-      Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2}
-      Operator: 1
-  - FromState: {fileID: 11400000, guid: b815b7da412ff164abfb213e11d27ace, type: 2}
-    ToState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2}
+    ToState: {fileID: 11400000, guid: daed10358ee01bc4c8d68fe4ff3f0d40, type: 2}
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2}
-      Operator: 1
    - ExpectedResult: 1
      Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2}
      Operator: 0
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/BardHare_TransitionTable.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/BardHare_TransitionTable.asset.meta
 fileFormatVersion: 2
-guid: 40a97759ea1c18c47ad6a9bfe0cacd99
+guid: 9a856fbf5f8a165408eb9fb51d367494
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Townsfolk/Townsfolk_TransitionTable.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Townsfolk/Townsfolk_TransitionTable.asset
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: 13401f769215f3245807de4b2ea14759, type: 2}
      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 11d32529e8bdbc24e81d7b578426352c, type: 2}
+      Operator: 0
  - FromState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2}
    ToState: {fileID: 11400000, guid: 0e91b8fa2c44dc346b693ecfce70a7f1, type: 2}
    Conditions:
      Operator: 0
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: 1748abd46aa04284b8bf442050ef790f, type: 2}
+      Operator: 1
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 87426477fd21a254d8cd4ff826d4ee29, type: 2}
      Operator: 0
  - FromState: {fileID: 11400000, guid: 0e91b8fa2c44dc346b693ecfce70a7f1, type: 2}
    ToState: {fileID: 11400000, guid: 1aad0cd7a387c6544a113d9fa8df1ce3, type: 2}
      Operator: 0
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: 1748abd46aa04284b8bf442050ef790f, type: 2}
-      Operator: 0
+      Operator: 1
  - FromState: {fileID: 11400000, guid: 0e91b8fa2c44dc346b693ecfce70a7f1, type: 2}
    ToState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2}
    Conditions:
  - FromState: {fileID: 11400000, guid: 3388e91c73e51e845a78aa522a2f2bda, type: 2}
    ToState: {fileID: 11400000, guid: b815b7da412ff164abfb213e11d27ace, type: 2}
    Conditions:
-    - ExpectedResult: 1
-      Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2}
-      Operator: 1
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: dcb00df815f03384cb096d4556e5ba95, type: 2}
+      Operator: 0
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2}
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2}
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: f7264f99aeb6a8046b637306314556da, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 7aedcd9c179a4824eaf24451ab5689ba, type: 2}
+    ToState: {fileID: 11400000, guid: b815b7da412ff164abfb213e11d27ace, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: f4c89ffbe6ca8fe46ae22ec9d191671a, type: 2}
+      Operator: 0
+      Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 0e91b8fa2c44dc346b693ecfce70a7f1, type: 2}
+    ToState: {fileID: 11400000, guid: b815b7da412ff164abfb213e11d27ace, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: 4f15fe7b4afb565469f360b403d50f64, type: 2}
+      Operator: 0
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/NPCPathwayConfigTownsfolk4.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/NPCPathwayConfigTownsfolk4.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: NPCPathwayConfigTownsfolk4
+  m_EditorClassIdentifier: 
+  _stopDuration: 0.5
+  _speed: 1
+  Waypoints:
+  - waypoint: {x: -0.85746765, y: 0.2386721, z: 18.665764}
+    corners:
+    - {x: -0.85746765, y: 0.29796824, z: 18.665764}
+    - {x: -14.727016, y: 0.023244983, z: 3.4424734}
+  - waypoint: {x: -14.727016, y: 0.009132994, z: 3.4424734}
+    corners:
+    - {x: -14.727016, y: 0.023244983, z: 3.4424734}
+    - {x: 0, y: 0.011909485, z: 0}
+    - {x: 2.8, y: 0.011909485, z: -0.79999924}
+    - {x: 4.8, y: 0.011909485, z: -0.8999996}
+    - {x: 5.6, y: 0.061909676, z: -0.8999996}
+    - {x: 17.306187, y: 0.6537565, z: 0.9256344}
+  - waypoint: {x: 17.306187, y: 0.6071178, z: 0.9256344}
+    corners:
+    - {x: 17.306187, y: 0.6537565, z: 0.9256344}
+    - {x: 23.4, y: 1.3619099, z: 11.8}
+    - {x: 24.35562, y: 1.6066635, z: 14.649771}
+  - waypoint: {x: 24.35562, y: 1.5449709, z: 14.649771}
+    corners:
+    - {x: 24.35562, y: 1.6066635, z: 14.649771}
+    - {x: -0.85746765, y: 0.29796824, z: 18.665764}
+  _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
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/NPCPathwayConfigTownsfolk4.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/NPCPathwayConfigTownsfolk4.asset.meta
+fileFormatVersion: 2
+guid: 2a85764ae534c9c4da142db0581b69da
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Actions.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Actions.meta
+fileFormatVersion: 2
+guid: b2b01ec8987f48b499b7f982f1733013
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Conditions.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Conditions.meta
+fileFormatVersion: 2
+guid: e467b75771df5a64c874de6ac2f4f8b2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/States.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/States.meta
+fileFormatVersion: 2
+guid: 459a03bcc52461f4ab92cebcc6f15d55
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/IsANewLineDisplayed.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/IsANewLineDisplayed.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: 4c79d6f5f75586e4fa3fc91bdc6734b4, type: 3}
+  m_Name: IsANewLineDisplayed
+  m_EditorClassIdentifier: 
+  _onLineDisplayed: {fileID: 11400000, guid: d987db4881d794f2da0013a89588d890, type: 2}
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/IsANewLineDisplayed.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/IsANewLineDisplayed.asset.meta
+fileFormatVersion: 2
+guid: f7264f99aeb6a8046b637306314556da
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/StartTalking_RandomTimerElapsed.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/StartTalking_RandomTimerElapsed.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: 176cefe776b9f114393e9f982ce6e208, type: 3}
+  m_Name: StartTalking_RandomTimerElapsed
+  m_EditorClassIdentifier: 
+  minTimerLength: 1
+  maxTimerLength: 4
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/StartTalking_RandomTimerElapsed.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/StartTalking_RandomTimerElapsed.asset.meta
+fileFormatVersion: 2
+guid: 11d32529e8bdbc24e81d7b578426352c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/StopTalkingToProtagonist_RandomTimerElapsed.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/StopTalkingToProtagonist_RandomTimerElapsed.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: 176cefe776b9f114393e9f982ce6e208, type: 3}
+  m_Name: StopTalkingToProtagonist_RandomTimerElapsed
+  m_EditorClassIdentifier: 
+  minTimerLength: 3
+  maxTimerLength: 5
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/StopTalkingToProtagonist_RandomTimerElapsed.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/StopTalkingToProtagonist_RandomTimerElapsed.asset.meta
+fileFormatVersion: 2
+guid: dcb00df815f03384cb096d4556e5ba95
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/StopTalking_RandomTimerElapsed.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/StopTalking_RandomTimerElapsed.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: 176cefe776b9f114393e9f982ce6e208, type: 3}
+  m_Name: StopTalking_RandomTimerElapsed
+  m_EditorClassIdentifier: 
+  minTimerLength: 5
+  maxTimerLength: 8
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/StopTalking_RandomTimerElapsed.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/StopTalking_RandomTimerElapsed.asset.meta
+fileFormatVersion: 2
+guid: 87426477fd21a254d8cd4ff826d4ee29
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsANewLineDisplayedSO.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsANewLineDisplayedSO.cs
+using UnityEngine;
+using UnityEngine.Localization;
+using UOP1.StateMachine;
+using UOP1.StateMachine.ScriptableObjects;
+
+[CreateAssetMenu(fileName = "IsANewLineDisplayed", menuName = "State Machines/Conditions/Is A New Line Displayed")]
+public class IsANewLineDisplayedSO : StateConditionSO {
+
+	[SerializeField] private DialogueLineChannelSO _onLineDisplayed = default;
+
+	protected override Condition CreateCondition() => new IsANewLineDisplayedCondition(_onLineDisplayed);
+
+}
+
+public class IsANewLineDisplayedCondition : Condition
+{
+	private DialogueLineChannelSO _sayLineEvent;
+	private bool _isAnewLineDisplayed = false;
+
+
+	public IsANewLineDisplayedCondition(DialogueLineChannelSO sayLineEvent)
+	{
+		_sayLineEvent = sayLineEvent;
+	}
+	protected override bool Statement()
+	{
+
+		return _isAnewLineDisplayed;
+	}
+
+	public override void OnStateEnter()
+	{
+		if (_sayLineEvent != null)
+		{
+			_sayLineEvent.OnEventRaised += OnLineDisplayed;
+		}
+	}
+
+	public override void OnStateExit()
+	{
+		if (_sayLineEvent != null)
+		{
+			_sayLineEvent.OnEventRaised -= OnLineDisplayed;
+		}
+		_isAnewLineDisplayed = false;
+	}
+
+	private void OnLineDisplayed(LocalizedString line, ActorSO actor)
+	{
+		_isAnewLineDisplayed = true;
+	}
+}
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsANewLineDisplayedSO.cs.meta
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsANewLineDisplayedSO.cs.meta
+fileFormatVersion: 2
+guid: 4c79d6f5f75586e4fa3fc91bdc6734b4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/TimeElapsedRandomConditionSO.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/TimeElapsedRandomConditionSO.cs
+using UnityEngine;
+using UOP1.StateMachine;
+using UOP1.StateMachine.ScriptableObjects;
+
+[CreateAssetMenu(menuName = "State Machines/Conditions/Time elapsed random")]
+public class TimeElapsedRandomConditionSO : StateConditionSO<TimeElapsedRandomCondition>
+{
+	public float minTimerLength = .5f;
+	public float maxTimerLength = .5f;
+}
+
+public class TimeElapsedRandomCondition : Condition
+{
+	private float _startTime;
+	private float timerLength = .5f;
+	private TimeElapsedRandomConditionSO _originSO => (TimeElapsedRandomConditionSO)base.OriginSO; // The SO this Condition spawned from
+
+	public override void OnStateEnter()
+	{
+		_startTime = Time.time;
+		timerLength = Random.Range(_originSO.minTimerLength, _originSO.maxTimerLength);
+	}
+
+	protected override bool Statement() => Time.time >= _startTime + timerLength;
+}
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/TimeElapsedRandomConditionSO.cs.meta
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/TimeElapsedRandomConditionSO.cs.meta
+fileFormatVersion: 2
+guid: 176cefe776b9f114393e9f982ce6e208
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Actions/JumpDownTrigger_OnEnter.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Actions/JumpDownTrigger_OnEnter.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: 4c70afd7f911db7449d578cc18700875, type: 3}
+  m_Name: JumpDownTrigger_OnEnter
+  m_EditorClassIdentifier: 
+  parameterType: 3
+  parameterName: JumpDown
+  boolValue: 0
+  intValue: 0
+  floatValue: 0
+  whenToRun: 0
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Actions/JumpDownTrigger_OnEnter.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Actions/JumpDownTrigger_OnEnter.asset.meta
+fileFormatVersion: 2
+guid: 89d1557bcc9b8d74784a87e6517f81f1
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Actions/JumpUpTrigger_OnEnter.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Actions/JumpUpTrigger_OnEnter.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: 4c70afd7f911db7449d578cc18700875, type: 3}
+  m_Name: JumpUpTrigger_OnEnter
+  m_EditorClassIdentifier: 
+  parameterType: 3
+  parameterName: JumpUp
+  boolValue: 0
+  intValue: 0
+  floatValue: 0
+  whenToRun: 0
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Actions/JumpUpTrigger_OnEnter.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Actions/JumpUpTrigger_OnEnter.asset.meta
+fileFormatVersion: 2
+guid: cfe5df43f2fcde04782c40b4eae4ccb0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Conditions/Timer_JumpDownAnimation.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Conditions/Timer_JumpDownAnimation.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: 8139f9f328ed1144690b7a9ffca2d5b4, type: 3}
+  m_Name: Timer_JumpDownAnimation
+  m_EditorClassIdentifier: 
+  timerLength: 1.3
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Conditions/Timer_JumpDownAnimation.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Conditions/Timer_JumpDownAnimation.asset.meta
+fileFormatVersion: 2
+guid: 40db78531f0c5cd49904c91aea4d8d2a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Conditions/Timer_JumpUpAnimation.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Conditions/Timer_JumpUpAnimation.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: 8139f9f328ed1144690b7a9ffca2d5b4, type: 3}
+  m_Name: Timer_JumpUpAnimation
+  m_EditorClassIdentifier: 
+  timerLength: 1.5
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Conditions/Timer_JumpUpAnimation.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/Conditions/Timer_JumpUpAnimation.asset.meta
+fileFormatVersion: 2
+guid: ad97f6f8066c4d4499492813bfed08d3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/States/EndConversation.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/States/EndConversation.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: 35432205b9a6a374bbbfe6b7cac92179, type: 3}
+  m_Name: EndConversation
+  m_EditorClassIdentifier: 
+  _actions:
+  - {fileID: 11400000, guid: 89d1557bcc9b8d74784a87e6517f81f1, type: 2}
+  - {fileID: 11400000, guid: 098a951ce0fcb154bb9cb4900665dd9b, type: 2}
+  - {fileID: 11400000, guid: 6f2fd87f078fefb48ad59ba0e24df91e, type: 2}
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/States/EndConversation.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/States/EndConversation.asset.meta
+fileFormatVersion: 2
+guid: daed10358ee01bc4c8d68fe4ff3f0d40
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/States/StartConversation.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/States/StartConversation.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: 35432205b9a6a374bbbfe6b7cac92179, type: 3}
+  m_Name: StartConversation
+  m_EditorClassIdentifier: 
+  _actions:
+  - {fileID: 11400000, guid: cfe5df43f2fcde04782c40b4eae4ccb0, type: 2}
+  - {fileID: 11400000, guid: 098a951ce0fcb154bb9cb4900665dd9b, type: 2}
+  - {fileID: 11400000, guid: 6f2fd87f078fefb48ad59ba0e24df91e, type: 2}
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/States/StartConversation.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/BardHare/States/StartConversation.asset.meta
+fileFormatVersion: 2
+guid: e8445f4dd402c244d8f2e2e0440bd834
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/StopTalking_TimeElapsed.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/StopTalking_TimeElapsed.asset.meta
-fileFormatVersion: 2
-guid: 5ef92fc56785ca244a1415862e4e8e6e
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/StopTalking_TimeElapsed.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/NPC/Conditions/StopTalking_TimeElapsed.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: 8139f9f328ed1144690b7a9ffca2d5b4, type: 3}
-  m_Name: StopTalking_TimeElapsed
-  m_EditorClassIdentifier: 
-  timerLength: 4