Merge branch 'NewStory' of http://185.56.209.148/beyond/beyond into NewStory

Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Pro/Runic/Runic Standard Dialogue UI.prefab

@@ -31,7 +31,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 22432892}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -113,8 +112,8 @@ RectTransform:
   - {fileID: 22408920}
   - {fileID: 22402366}
   - {fileID: 22420968}
+  - {fileID: 4955339894532896010}
   m_Father: {fileID: 22497836}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -190,7 +189,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 22414656}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -270,7 +268,6 @@ RectTransform:
   m_Children:
   - {fileID: 22408098}
   m_Father: {fileID: 22449464}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -406,7 +403,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 22443832}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -486,7 +482,6 @@ RectTransform:
   m_Children:
   - {fileID: 22484822}
   m_Father: {fileID: 22477974}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -662,7 +657,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 22455432}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -735,7 +729,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 22455432}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -807,7 +800,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 22497836}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -910,7 +902,6 @@ RectTransform:
   m_Children:
   - {fileID: 22449912}
   m_Father: {fileID: 22491286}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -1100,7 +1091,6 @@ RectTransform:
   - {fileID: 22449150}
   - {fileID: 22488568}
   m_Father: {fileID: 22455678}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -1139,7 +1129,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 22491286}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -1240,7 +1229,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 22477974}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1342,7 +1330,6 @@ RectTransform:
   - {fileID: 22497836}
   - {fileID: 22455432}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -1419,7 +1406,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 22408098}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1516,7 +1502,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 22419892}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -1619,7 +1604,6 @@ RectTransform:
   m_Children:
   - {fileID: 22452514}
   m_Father: {fileID: 22408098}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1816,7 +1800,6 @@ RectTransform:
   - {fileID: 22414656}
   - {fileID: 22443832}
   m_Father: {fileID: 22449464}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -1947,7 +1930,6 @@ RectTransform:
   m_Children:
   - {fileID: 22410668}
   m_Father: {fileID: 22476168}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2115,7 +2097,6 @@ RectTransform:
   m_Children:
   - {fileID: 22491142}
   m_Father: {fileID: 22449464}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -2283,7 +2264,6 @@ RectTransform:
   m_Children:
   - {fileID: 22469478}
   m_Father: {fileID: 22402366}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -2328,7 +2308,6 @@ RectTransform:
   - {fileID: 22483620}
   - {fileID: 22432892}
   m_Father: {fileID: 22455678}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2427,7 +2406,7 @@ MonoBehaviour:
   m_ReverseArrangement: 0
 --- !u!95 &9581424
 Animator:
-  serializedVersion: 5
+  serializedVersion: 7
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -2441,6 +2420,7 @@ Animator:
   m_ApplyRootMotion: 1
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
@@ -2516,7 +2496,6 @@ RectTransform:
   - {fileID: 22449464}
   - {fileID: 22413550}
   m_Father: {fileID: 22455678}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -2575,7 +2554,7 @@ CanvasGroup:
   m_IgnoreParentGroups: 0
 --- !u!95 &9512998
 Animator:
-  serializedVersion: 5
+  serializedVersion: 7
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -2589,6 +2568,7 @@ Animator:
   m_ApplyRootMotion: 1
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
@@ -2664,7 +2644,6 @@ RectTransform:
   - {fileID: 22425482}
   - {fileID: 22419892}
   m_Father: {fileID: 22413550}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -2763,7 +2742,7 @@ CanvasGroup:
   m_IgnoreParentGroups: 0
 --- !u!95 &9579632
 Animator:
-  serializedVersion: 5
+  serializedVersion: 7
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -2777,6 +2756,7 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
@@ -2813,7 +2793,6 @@ RectTransform:
   m_Children:
   - {fileID: 22491286}
   m_Father: {fileID: 22497836}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -2905,7 +2884,6 @@ RectTransform:
   - {fileID: 22462286}
   - {fileID: 22476168}
   m_Father: {fileID: 22408920}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -3023,7 +3001,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 22420968}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3139,7 +3116,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 22452514}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -3238,7 +3214,6 @@ RectTransform:
   m_Children:
   - {fileID: 22441452}
   m_Father: {fileID: 22402366}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -3277,7 +3252,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 22408098}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -3380,3 +3354,294 @@ MonoBehaviour:
   onEnd:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &2095442764134514913
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4955339894532896010}
+  - component: {fileID: 1389728242232964473}
+  - component: {fileID: 5117111055962001579}
+  - component: {fileID: 1672372092854091372}
+  - component: {fileID: 1480187098725181408}
+  - component: {fileID: 5802016204455451101}
+  m_Layer: 5
+  m_Name: Finish Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4955339894532896010
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2095442764134514913}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1018971079618658980}
+  m_Father: {fileID: 22449464}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 289, y: 40}
+  m_SizeDelta: {x: 250, y: 60}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &1389728242232964473
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2095442764134514913}
+  m_CullTransparentMesh: 1
+--- !u!114 &5117111055962001579
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2095442764134514913}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.6392157}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1672372092854091372
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2095442764134514913}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 2
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5117111055962001579}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 5802016204455451101}
+        m_TargetAssemblyTypeName: PixelCrushers.DialogueSystem.Wrappers.StandardUIContinueButtonFastForward,
+          Assembly-CSharp-firstpass
+        m_MethodName: OnFinish
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!114 &1480187098725181408
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2095442764134514913}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: 74
+  m_MinHeight: 24
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!114 &5802016204455451101
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2095442764134514913}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 73ee3d99442035942b6dd1ede25ff7cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  dialogueUI: {fileID: 11482104}
+  typewriterEffect: {fileID: 11431652}
+  hideContinueButtonOnContinue: 1
+  continueSubtitlePanel: 1
+  continueAlertPanel: 1
+--- !u!1 &2204886149948816913
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1018971079618658980}
+  - component: {fileID: 107610575203363127}
+  - component: {fileID: 6052512605042898140}
+  - component: {fileID: 9066684554263580876}
+  - component: {fileID: 3962056570619862626}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1018971079618658980
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2204886149948816913}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4955339894532896010}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 252.41, y: 70.1}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &107610575203363127
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2204886149948816913}
+  m_CullTransparentMesh: 1
+--- !u!114 &6052512605042898140
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2204886149948816913}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 80a0137e3d8f78f41bfdb2aca0cfac44, type: 3}
+    m_FontSize: 40
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 'Finish
+
+'
+--- !u!114 &9066684554263580876
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2204886149948816913}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!114 &3962056570619862626
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2204886149948816913}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1

Assets/Plugins/Pixel Crushers/Dialogue System/Scripts/UI/Standard/Effects/StandardUIContinueButtonFastForward.cs

@@ -79,6 +79,11 @@ namespace PixelCrushers.DialogueSystem
             }
         }
 
+        public virtual void OnFinish()
+        {
+            DialogueManager.StopConversation();
+        }
+
     }
 
 }

Assets/Scenes/03_DarkWoods/DarkForest.unity

@@ -26486,7 +26486,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &236828983
 Transform:
   m_ObjectHideFlags: 0
@@ -26617,7 +26617,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 01554ac8a98d75b47b443ab9a7d5f0a5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  streamingVolume: []
+  streamingVolume:
+  - {fileID: 738387422}
   forceCloseVolume: []
 --- !u!114 &236828985
 MonoBehaviour:
@@ -58377,6 +58378,95 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b6b427d6336c57942859bb577b0f2cb2, type: 3}
+--- !u!1 &538006195
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 538006196}
+  - component: {fileID: 538006199}
+  - component: {fileID: 538006198}
+  - component: {fileID: 538006197}
+  m_Layer: 11
+  m_Name: 'SWAMP_MAZErigger '
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &538006196
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 538006195}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: 0.9525568, z: -0, w: -0.30436108}
+  m_LocalPosition: {x: -195.1, y: 13.787, z: -14.9}
+  m_LocalScale: {x: 116.17064, y: 41.10603, z: 67.0781}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1444526674}
+  m_LocalEulerAnglesHint: {x: 0, y: 215.439, z: 0}
+--- !u!114 &538006197
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 538006195}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d8c26023d2cb9264aa65a4c7d6cd66bd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  collisionLayer:
+    serializedVersion: 2
+    m_Bits: 256
+  tagMask:
+    m_tags:
+    - Player
+  startVolumeState: 0
+  deactivateDelay: 0
+  draw: 1
+  drawWire: 0
+  drawColor: {r: 0.514151, g: 1, b: 0.5941512, a: 0.4}
+  drawWireColor: {r: 1, g: 1, b: 1, a: 1}
+  activeVolumeColor: {r: 0.0023497343, g: 1, b: 0, a: 0.4}
+  activeVolumeWireColor: {r: 1, g: 0, b: 1, a: 1}
+--- !u!65 &538006198
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 538006195}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!33 &538006199
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 538006195}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!4 &538616110 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4514217290287882027, guid: 943e9fc65625b7f4a8a34cfe75a890d9,
@@ -81158,6 +81248,95 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 738077740}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &738387420
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 738387421}
+  - component: {fileID: 738387424}
+  - component: {fileID: 738387423}
+  - component: {fileID: 738387422}
+  m_Layer: 11
+  m_Name: GIANTS_CAMP_Trigger
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &738387421
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 738387420}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: 0.78814864, z: -0, w: -0.615485}
+  m_LocalPosition: {x: -58.8, y: 13.787, z: -113.7}
+  m_LocalScale: {x: 107.89351, y: 26.806421, z: 92.513245}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1444526674}
+  m_LocalEulerAnglesHint: {x: 0, y: 255.974, z: 0}
+--- !u!114 &738387422
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 738387420}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d8c26023d2cb9264aa65a4c7d6cd66bd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  collisionLayer:
+    serializedVersion: 2
+    m_Bits: 256
+  tagMask:
+    m_tags:
+    - Player
+  startVolumeState: 0
+  deactivateDelay: 0
+  draw: 1
+  drawWire: 0
+  drawColor: {r: 0.514151, g: 1, b: 0.5941512, a: 0.4}
+  drawWireColor: {r: 1, g: 1, b: 1, a: 1}
+  activeVolumeColor: {r: 0.0023497343, g: 1, b: 0, a: 0.4}
+  activeVolumeWireColor: {r: 1, g: 0, b: 1, a: 1}
+--- !u!65 &738387423
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 738387420}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!33 &738387424
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 738387420}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &738421096
 GameObject:
   m_ObjectHideFlags: 0
@@ -104205,6 +104384,95 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 955905723}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &956183036
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 956183037}
+  - component: {fileID: 956183040}
+  - component: {fileID: 956183039}
+  - component: {fileID: 956183038}
+  m_Layer: 11
+  m_Name: 'GOODSOILTrigger '
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &956183037
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 956183036}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: 0.5959078, z: -0, w: 0.80305284}
+  m_LocalPosition: {x: -113.5, y: 13.787, z: -2.1}
+  m_LocalScale: {x: 74.3712, y: 18.290989, z: 59.859173}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1444526674}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &956183038
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 956183036}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d8c26023d2cb9264aa65a4c7d6cd66bd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  collisionLayer:
+    serializedVersion: 2
+    m_Bits: 256
+  tagMask:
+    m_tags:
+    - Player
+  startVolumeState: 0
+  deactivateDelay: 0
+  draw: 1
+  drawWire: 0
+  drawColor: {r: 0.514151, g: 1, b: 0.5941512, a: 0.4}
+  drawWireColor: {r: 1, g: 1, b: 1, a: 1}
+  activeVolumeColor: {r: 0.0023497343, g: 1, b: 0, a: 0.4}
+  activeVolumeWireColor: {r: 1, g: 0, b: 1, a: 1}
+--- !u!65 &956183039
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 956183036}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!33 &956183040
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 956183036}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!4 &956707853 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4455337937660413453, guid: 9add92619d51d3f40ae4c39ab66871a6,
@@ -108205,7 +108473,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &985343415
 Transform:
   m_ObjectHideFlags: 0
@@ -108311,7 +108579,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 01554ac8a98d75b47b443ab9a7d5f0a5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  streamingVolume: []
+  streamingVolume:
+  - {fileID: 956183038}
   forceCloseVolume: []
 --- !u!114 &985343417
 MonoBehaviour:
@@ -122462,6 +122731,95 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e2c55e0b6196faf45a37f623364af185, type: 3}
+--- !u!1 &1068367601
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1068367602}
+  - component: {fileID: 1068367605}
+  - component: {fileID: 1068367604}
+  - component: {fileID: 1068367603}
+  m_Layer: 11
+  m_Name: 'ZORA''S CAMPTrigger '
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1068367602
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1068367601}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: 0.9525568, z: -0, w: -0.30436108}
+  m_LocalPosition: {x: -195.1, y: 13.787, z: -14.9}
+  m_LocalScale: {x: 116.17064, y: 41.10603, z: 67.0781}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1444526674}
+  m_LocalEulerAnglesHint: {x: 0, y: 215.439, z: 0}
+--- !u!114 &1068367603
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1068367601}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d8c26023d2cb9264aa65a4c7d6cd66bd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  collisionLayer:
+    serializedVersion: 2
+    m_Bits: 256
+  tagMask:
+    m_tags:
+    - Player
+  startVolumeState: 0
+  deactivateDelay: 0
+  draw: 1
+  drawWire: 0
+  drawColor: {r: 0.514151, g: 1, b: 0.5941512, a: 0.4}
+  drawWireColor: {r: 1, g: 1, b: 1, a: 1}
+  activeVolumeColor: {r: 0.0023497343, g: 1, b: 0, a: 0.4}
+  activeVolumeWireColor: {r: 1, g: 0, b: 1, a: 1}
+--- !u!65 &1068367604
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1068367601}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!33 &1068367605
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1068367601}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!4 &1069844622 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4079643640427470942, guid: aad277c12f1f9ac459fb72e04873de26,
@@ -140759,6 +141117,95 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3}
+--- !u!1 &1252331881
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1252331882}
+  - component: {fileID: 1252331885}
+  - component: {fileID: 1252331884}
+  - component: {fileID: 1252331883}
+  m_Layer: 11
+  m_Name: 'TAINTED_TREETrigger '
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1252331882
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1252331881}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: 0.9525568, z: -0, w: -0.30436108}
+  m_LocalPosition: {x: -199.2, y: 13.787, z: 27.7}
+  m_LocalScale: {x: 87.277054, y: 34.41275, z: 62.03895}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1444526674}
+  m_LocalEulerAnglesHint: {x: 0, y: 215.439, z: 0}
+--- !u!114 &1252331883
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1252331881}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d8c26023d2cb9264aa65a4c7d6cd66bd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  collisionLayer:
+    serializedVersion: 2
+    m_Bits: 256
+  tagMask:
+    m_tags:
+    - Player
+  startVolumeState: 0
+  deactivateDelay: 0
+  draw: 1
+  drawWire: 0
+  drawColor: {r: 0.514151, g: 1, b: 0.5941512, a: 0.4}
+  drawWireColor: {r: 1, g: 1, b: 1, a: 1}
+  activeVolumeColor: {r: 0.0023497343, g: 1, b: 0, a: 0.4}
+  activeVolumeWireColor: {r: 1, g: 0, b: 1, a: 1}
+--- !u!65 &1252331884
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1252331881}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!33 &1252331885
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1252331881}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1001 &1255222972
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -151607,12 +152054,12 @@ PrefabInstance:
     - target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 1757072.5
+      value: 2082359.2
       objectReference: {fileID: 0}
     - target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -281131.2
+      value: -333177.12
       objectReference: {fileID: 0}
     - target: {fileID: 5552483164784459722, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -155720,7 +156167,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1383216878
 Transform:
   m_ObjectHideFlags: 0
@@ -155897,7 +156344,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 01554ac8a98d75b47b443ab9a7d5f0a5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  streamingVolume: []
+  streamingVolume:
+  - {fileID: 1068367603}
   forceCloseVolume: []
 --- !u!114 &1383216880
 MonoBehaviour:
@@ -163306,18 +163754,25 @@ Transform:
   - {fileID: 2006355181}
   - {fileID: 290637970}
   - {fileID: 985343415}
+  - {fileID: 956183037}
   - {fileID: 489417850}
   - {fileID: 1854932497}
+  - {fileID: 1763956640}
   - {fileID: 432864470}
   - {fileID: 1793013648}
+  - {fileID: 1899110885}
   - {fileID: 1505791785}
   - {fileID: 1680785740}
+  - {fileID: 1252331882}
   - {fileID: 1549527266}
   - {fileID: 1383216878}
+  - {fileID: 1068367602}
   - {fileID: 1038882087}
   - {fileID: 1554866860}
+  - {fileID: 538006196}
   - {fileID: 2125503775}
   - {fileID: 236828983}
+  - {fileID: 738387421}
   - {fileID: 899745476}
   - {fileID: 1111883630}
   - {fileID: 241399758}
@@ -175532,7 +175987,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1554866860
 Transform:
   m_ObjectHideFlags: 0
@@ -176066,7 +176521,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 01554ac8a98d75b47b443ab9a7d5f0a5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  streamingVolume: []
+  streamingVolume:
+  - {fileID: 538006197}
   forceCloseVolume: []
 --- !u!114 &1554866862
 MonoBehaviour:
@@ -189104,7 +189560,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1680785740
 Transform:
   m_ObjectHideFlags: 0
@@ -189326,7 +189782,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 01554ac8a98d75b47b443ab9a7d5f0a5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  streamingVolume: []
+  streamingVolume:
+  - {fileID: 1252331883}
   forceCloseVolume: []
 --- !u!114 &1680785742
 MonoBehaviour:
@@ -197721,6 +198178,95 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 583726261}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1763956639
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1763956640}
+  - component: {fileID: 1763956643}
+  - component: {fileID: 1763956642}
+  - component: {fileID: 1763956641}
+  m_Layer: 11
+  m_Name: 'GOODSOILTrigger '
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1763956640
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1763956639}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: 0.8302053, z: -0, w: 0.5574578}
+  m_LocalPosition: {x: -134, y: 13.787, z: -67.1}
+  m_LocalScale: {x: 96.117874, y: 20.877335, z: 68.32326}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1444526674}
+  m_LocalEulerAnglesHint: {x: 0, y: 112.24, z: 0}
+--- !u!114 &1763956641
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1763956639}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d8c26023d2cb9264aa65a4c7d6cd66bd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  collisionLayer:
+    serializedVersion: 2
+    m_Bits: 256
+  tagMask:
+    m_tags:
+    - Player
+  startVolumeState: 0
+  deactivateDelay: 0
+  draw: 1
+  drawWire: 0
+  drawColor: {r: 0.514151, g: 1, b: 0.5941512, a: 0.4}
+  drawWireColor: {r: 1, g: 1, b: 1, a: 1}
+  activeVolumeColor: {r: 0.0023497343, g: 1, b: 0, a: 0.4}
+  activeVolumeWireColor: {r: 1, g: 0, b: 1, a: 1}
+--- !u!65 &1763956642
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1763956639}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!33 &1763956643
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1763956639}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1001 &1764089837
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -200373,7 +200919,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1793013648
 Transform:
   m_ObjectHideFlags: 0
@@ -200520,7 +201066,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 01554ac8a98d75b47b443ab9a7d5f0a5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  streamingVolume: []
+  streamingVolume:
+  - {fileID: 1899110886}
   forceCloseVolume: []
 --- !u!114 &1793013650
 MonoBehaviour:
@@ -206062,7 +206609,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1854932497
 Transform:
   m_ObjectHideFlags: 0
@@ -206104,7 +206651,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 01554ac8a98d75b47b443ab9a7d5f0a5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  streamingVolume: []
+  streamingVolume:
+  - {fileID: 1763956641}
   forceCloseVolume: []
 --- !u!114 &1854932499
 MonoBehaviour:
@@ -210366,6 +210914,95 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 157512936}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1899110884
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1899110885}
+  - component: {fileID: 1899110888}
+  - component: {fileID: 1899110887}
+  - component: {fileID: 1899110886}
+  m_Layer: 11
+  m_Name: 'CHASMTrigger '
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1899110885
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1899110884}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: 0.98272187, z: -0, w: 0.18508847}
+  m_LocalPosition: {x: -135.3, y: 13.787, z: 53}
+  m_LocalScale: {x: 71.47998, y: 15.525847, z: 50.809956}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1444526674}
+  m_LocalEulerAnglesHint: {x: 0, y: 158.667, z: 0}
+--- !u!114 &1899110886
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1899110884}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d8c26023d2cb9264aa65a4c7d6cd66bd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  collisionLayer:
+    serializedVersion: 2
+    m_Bits: 256
+  tagMask:
+    m_tags:
+    - Player
+  startVolumeState: 0
+  deactivateDelay: 0
+  draw: 1
+  drawWire: 0
+  drawColor: {r: 0.514151, g: 1, b: 0.5941512, a: 0.4}
+  drawWireColor: {r: 1, g: 1, b: 1, a: 1}
+  activeVolumeColor: {r: 0.0023497343, g: 1, b: 0, a: 0.4}
+  activeVolumeWireColor: {r: 1, g: 0, b: 1, a: 1}
+--- !u!65 &1899110887
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1899110884}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!33 &1899110888
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1899110884}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1001 &1899408415
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scenes/Old_Levels!/TestHub.unity

@@ -14021,6 +14021,36 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 388833200966233906, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 388833200966233906, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 388833200966233906, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 388833200966233906, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 388833200966233906, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 388833200966233906, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 429313324576581173, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
@@ -14029,42 +14059,42 @@ PrefabInstance:
     - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 210
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -135
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 210.00003
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -45
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 703778627114599771, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -14101,6 +14131,31 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 5
       objectReference: {fileID: 0}
+    - target: {fileID: 1241832264940269301, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1241832264940269301, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1241832264940269301, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1241832264940269301, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1241832264940269301, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1324734597232948583, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_IsActive
@@ -14281,6 +14336,36 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2014220137645963056, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2014220137645963056, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2014220137645963056, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2014220137645963056, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2014220137645963056, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2014220137645963056, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2081337985915706214, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_CastShadows
@@ -14972,6 +15057,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: -26.000122
       objectReference: {fileID: 0}
+    - target: {fileID: 3806889719820184542, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3806889720075550842, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_Layer
@@ -15075,22 +15165,22 @@ PrefabInstance:
     - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 210
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -225
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4204595259268909078, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -15252,6 +15342,36 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4646153520250516854, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4646153520250516854, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4646153520250516854, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4646153520250516854, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4646153520250516854, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4646153520250516854, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4670439730081820471, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_Layer
@@ -15300,22 +15420,22 @@ PrefabInstance:
     - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 210
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -315
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4907318199456855652, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -15785,12 +15905,12 @@ PrefabInstance:
     - target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 1518440.2
+      value: 1532952.2
       objectReference: {fileID: 0}
     - target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -242950.23
+      value: -245272.2
       objectReference: {fileID: 0}
     - target: {fileID: 5265345828117443429, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -15812,6 +15932,31 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 5
       objectReference: {fileID: 0}
+    - target: {fileID: 5552483164784459722, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5552483164784459722, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5552483164784459722, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5552483164784459722, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5552483164784459722, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: startItems.Array.size
@@ -16675,22 +16820,22 @@ PrefabInstance:
     - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 210
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -405
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7534046934194550914, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -16912,6 +17057,31 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8264346809613639819, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8264346809613639819, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8264346809613639819, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8264346809613639819, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8264346809613639819, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8321518817727635818, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_CastShadows

Assets/Scripts/Characters/AutoTargetting.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using Invector.vCharacterController.AI.FSMBehaviour;
 using Beyond;
 using System;
+using Invector; // Required for vDamage
 
 namespace Beyond
 {
@@ -70,14 +71,23 @@ namespace Beyond
             _playerController = Player.Instance.GetComponent<bThirdPersonController>();
             if (_playerController == null)
             {
-                Debug.LogError("AutoTargetting: Could not find bThirdPersonController on Player.Instance! Custom roll rotation may not work correctly.");
+                Debug.LogError("AutoTargetting: Could not find bThirdPersonController on Player.Instance!");
+            }
+            else
+            {
+                // Subscribe to Player Death
+                _playerController.onDead.AddListener(OnPlayerDead);
             }
 
             _gameStateManager = GameStateManager.Instance;
             if (_gameStateManager != null)
             {
                 _gameStateManager.m_OnStateChanged.AddListener(HandleGameStateChanged);
-                HandleGameStateChanged(_gameStateManager.CurrentState);
+                // Initial check, but avoid running if dead
+                if(_playerController != null && _playerController.currentHealth > 0)
+                {
+                    HandleGameStateChanged(_gameStateManager.CurrentState);
+                }
             }
             else
             {
@@ -88,11 +98,6 @@ namespace Beyond
             if (targetLockSystem == null)
             {
                 targetLockSystem = Player.Instance.GetComponentInChildren<bLockOn>(true);
-                if (targetLockSystem == null)
-                {
-                    Debug.LogWarning("AutoTargetting: bLockOn system not found. Auto-lock will be disabled.");
-                    autoLockSelectedTarget = false;
-                }
             }
 
             if (targetLockSystem != null)
@@ -106,8 +111,13 @@ namespace Beyond
         {
             if (_gameStateManager != null) _gameStateManager.m_OnStateChanged.RemoveListener(HandleGameStateChanged);
             
-            StopAndClearAllFadeCoroutines(); 
+            // Unsubscribe from Player Death
+            if (_playerController != null)
+            {
+                _playerController.onDead.RemoveListener(OnPlayerDead);
+            }
 
+            StopAndClearAllFadeCoroutines(); 
             if (_targetingLoopCoroutine != null) StopCoroutine(_targetingLoopCoroutine);
             
             if (targetLockSystem != null)
@@ -120,6 +130,36 @@ namespace Beyond
         #endregion
 
         #region Core Logic
+
+        private void OnPlayerDead(GameObject deadObject)
+        {
+            // Immediately clear targets and stop the loop when player dies
+            ClearTarget(false);
+            
+            if (_targetingLoopCoroutine != null)
+            {
+                StopCoroutine(_targetingLoopCoroutine);
+                _targetingLoopCoroutine = null;
+            }
+
+            if (targetLockSystem != null)
+            {
+                targetLockSystem.SetLockOn(false);
+            }
+        }
+
+        public void ResetSystem()
+        {
+            ClearTarget(false);
+            _manualSwitchCooldownActive = false;
+            _manualSwitchCooldownTimer = 0f;
+
+            // Restart the loop if we are in combat
+            if (_gameStateManager != null && _gameStateManager.CurrentState == GameStateManager.State.COMBAT)
+            {
+                 if (_targetingLoopCoroutine == null) _targetingLoopCoroutine = StartCoroutine(TargetingLoop());
+            }
+        }
         
         private void StopAndClearAllFadeCoroutines()
         {
@@ -135,6 +175,9 @@ namespace Beyond
 
         private void HandleGameStateChanged(GameStateManager.State newState)
         {
+            // Don't start loops if player is dead
+            if (_playerController != null && _playerController.currentHealth <= 0) return;
+
             if (newState == GameStateManager.State.COMBAT)
             {
                 if (_targetingLoopCoroutine == null) _targetingLoopCoroutine = StartCoroutine(TargetingLoop());
@@ -155,6 +198,11 @@ namespace Beyond
         {
             while (true)
             {
+                if (_playerController != null && _playerController.currentHealth <= 0)
+                {
+                    yield break;
+                }
+
                 if (_manualSwitchCooldownActive)
                 {
                     _manualSwitchCooldownTimer -= targetingInterval;
@@ -174,7 +222,6 @@ namespace Beyond
         {
             if (_playerTransform == null || _gameStateManager == null || _manualSwitchCooldownActive) return;
 
-            // Step 1: Always find the absolute best candidate in range right now.
             vFSMBehaviourController bestCandidate = null;
             float minDistanceSqr = maxTargetingDistance * maxTargetingDistance;
             HashSet<vFSMBehaviourController> combatControllers = _gameStateManager.GetActiveCombatcontrollers();
@@ -195,13 +242,11 @@ namespace Beyond
                 }
             }
 
-            // Step 2: If the best candidate is different from our current one, switch the highlight.
             if (CurrentTarget != bestCandidate)
             {
                 SetNewTarget(bestCandidate);
             }
 
-            // Step 3: Every update, evaluate and apply the correct lock-on state for the current target.
             UpdateLockOnState();
         }
         
@@ -209,7 +254,6 @@ namespace Beyond
         {
             if (targetLockSystem == null || _playerTransform == null) return;
 
-            // Determine if the target *should* be locked based on distance rules.
             bool shouldBeLocked = false;
             if (CurrentTarget != null && (autoLockSelectedTarget || alwaysLockOnInCombat))
             {
@@ -217,21 +261,15 @@ namespace Beyond
                 
                 if (targetLockSystem.isLockingOn)
                 {
-                    // If already locked, stay locked unless we are beyond the unlock threshold.
                     shouldBeLocked = distanceToTarget <= unlockDistanceThreshold;
                 }
                 else
                 {
-                    // If not locked, we only engage the lock if we are within the auto-lock distance.
                     shouldBeLocked = distanceToTarget <= autoLockOnDistance;
                 }
             }
 
-            // Synchronize the desired state with the lock-on system.
             Transform desiredLockTarget = shouldBeLocked ? CurrentTarget.transform : null;
-
-            // --- THIS IS THE FIX ---
-            // We now pass the 'shouldBeLocked' boolean to tell the system whether to lock or unlock.
             targetLockSystem.ManuallySetLockOnTarget(desiredLockTarget, shouldBeLocked);
             
             if (alwaysLockOnInCombat && desiredLockTarget != null && !targetLockSystem.isLockingOn)
@@ -261,11 +299,7 @@ namespace Beyond
 
         public void ExecuteRotationTowardsCurrentTarget(float deltaTime)
         {
-            if (_playerController != null && !_playerController.enabled)
+            if (_playerController != null && !_playerController.enabled) return;
-            {
-                return;
-            }
-
             if (CurrentTarget == null || _playerTransform == null) return;
             
             Vector3 directionToTarget = CurrentTarget.transform.position - _playerTransform.position;
@@ -311,6 +345,16 @@ namespace Beyond
 
         #region Helper Methods
 
+        // --- Restored Method ---
+        public float GetCurrentTargetHealth()
+        {
+            if (CurrentTarget != null && CurrentTarget.aiController != null)
+            {
+                return CurrentTarget.aiController.currentHealth;
+            }
+            return -1f;
+        }
+
         public bool IsTargetInAngle(Transform sourceTransform, vFSMBehaviourController targetAI, float angleThreshold)
         {
             if (targetAI == null || sourceTransform == null) return false;
@@ -329,15 +373,6 @@ namespace Beyond
             return distSqr <= (maxTargetingDistance * maxTargetingDistance);
         }
 
-        public float GetCurrentTargetHealth()
-        {
-            if (CurrentTarget != null && CurrentTarget.aiController != null)
-            {
-                return CurrentTarget.aiController.currentHealth;
-            }
-            return -1f;
-        }
-
         public void ClearTarget(bool findNewOneImmediately)
         {
             if (targetLockSystem != null)
@@ -349,7 +384,7 @@ namespace Beyond
             
             if (findNewOneImmediately && _gameStateManager != null && _gameStateManager.CurrentState == GameStateManager.State.COMBAT)
             {
-                if (!_manualSwitchCooldownActive)
+                if (_playerController != null && _playerController.currentHealth > 0 && !_manualSwitchCooldownActive)
                 {
                     UpdateTarget();
                 }
@@ -359,7 +394,6 @@ namespace Beyond
         #endregion
 
         #region Visuals
-
         private Renderer[] GetTargetRenderers(vFSMBehaviourController targetController)
         {
             if (targetController == null) return new Renderer[0];
@@ -399,7 +433,6 @@ namespace Beyond
             }
             if (material != null) material.SetColor(materialHighlightPropertyName, toValue);
         }
-
         #endregion
     }
 }

Assets/Scripts/Characters/Player.cs

@@ -75,6 +75,7 @@ namespace Beyond
         public bMeleeCombatInput MeleeCombatInput => m_meleeCombatInput;
 
         // --- TRINKET SYSTEM INTEGRATION START ---
+        // Initialize default values to 1f to prevent divide-by-zero or zero-stat issues on startup
         private TrinketManager.TrinketStats m_trinketStats = new TrinketManager.TrinketStats
         {
             healthMult = 1f,
@@ -85,7 +86,8 @@ namespace Beyond
             faithRegenMult = 1f,
             attackSpeedMult = 1f,
             thornDamageMult = 1f,
-            staminaMult = 1f
+            staminaMult = 1f,
+            soulfireDamageMult = 1f
         };
 
         public TrinketManager.TrinketStats CurrentTrinketStats => m_trinketStats;
@@ -93,29 +95,66 @@ namespace Beyond
         public void UpdateTrinketStats(TrinketManager.TrinketStats newStats)
         {
             m_trinketStats = newStats;
-            // Force stats recalculation
+            
-            UpdatePlayerStatistics();
+            // 1. Recalculate Base Stats (Health/Faith/Stamina/Natural Regen)
+            // This sets m_vController.healthRecovery to the base natural value (from Maturity/Brightness)
+            UpdatePlayerStatistics(); 
 
-            // Apply immediate effects
+            // 2. Apply Speed & Animation Speed
-             if (m_vController)
+            if (m_vController)
             {
                 m_vController.speedMultiplier = m_trinketStats.speedMult;
-                // 2. Apply Attack Speed (UI Method)
+                
                 if (m_vController.animator)
                     m_vController.animator.SetFloat("AttackSpeed", m_trinketStats.attackSpeedMult);
+
+                // --- HEALTH REGEN LOGIC START ---
+                // Start with the base natural rate we just calculated in UpdatePlayerStatistics
+                float totalRegenRate = m_vController.healthRecovery; 
+                float totalRegenCap = 1f;  // Default 100% cap
+
+                // Add Passive Trinket Regen (e.g. "Growth" effect: Regen up to 50%)
+                if (m_trinketStats.effectGrowth) 
+                {
+                    // Example: +2 HP/sec up to 50%
+                    totalRegenRate += 2f; 
+                    totalRegenCap = 0.5f;
+                }
+
+                // If you cast to bThirdPersonController, you can set the Cap
+                if (m_vController is bThirdPersonController bController)
+                {
+                    bController.healthRecoveryCap = totalRegenCap;
+                }
+                
+                // Update the final rate on the controller
+                m_vController.SetHealthRecovery(totalRegenRate);
+                // --- HEALTH REGEN LOGIC END ---
             }
 
-                // 3. Apply Damage Multiplier (NEW)
+            // 3. Apply Damage Multipliers
             if (m_meleeManager)
             {
-                // Calculate the base multiplier from stats
+                // Start with the base multiplier from items
                 float totalDamageMult = m_trinketStats.damageMult;
-                    totalDamageMult += 0.10f;                 
 
-                // Send to Melee Manager
+                // "The Darkening": Bonus dmg 
+                if (m_trinketStats.effectDarkening) 
+                {
+                    totalDamageMult += 0.10f; 
+                }
+
+                // "Determination": Combo finish +5% damage
+                // (Global application for now)
+                if (m_trinketStats.effectDetermination)
+                {
+                    totalDamageMult += 0.05f;
+                }
+
+                // Send final value to your modified vMeleeManager
+                // NOTE: Requires the SetGlobalDamageMultiplier method added to vMeleeManager
                 m_meleeManager.SetGlobalDamageMultiplier(totalDamageMult);
             }
-            
         }
         // --- TRINKET SYSTEM INTEGRATION END ---
 
@@ -172,6 +211,7 @@ namespace Beyond
         private float faithBaseMaxValue = 100f;
 
         private System.Action onMenuScrollClosed;
+        // Updated Action signature to pass 3 floats for UI (Health, Faith, Stamina)
         public System.Action<float, float, float> onStatsUpdated;
         private UnityAction<Transform> onDialogueEnded;
         private bLockOn m_lockOn; 
@@ -231,28 +271,26 @@ namespace Beyond
 
         private void OnDamageHit(vHitInfo arg0)
         {
-            // Slow motion logic (existing)
+            // Slow motion logic
             if (slowMoOnHtScale < 1f - float.Epsilon)
             {
                 TimeController.Instance.Reset();
             }
 
-            // 1. Health Vampirism
+            // 1. Health Vampirism (Vitality)
             if (m_trinketStats.effectHealthVampirism)
             {
-                // Logic: Heal 2% of Player's Max Health per hit
+                // Heal 2% of Max Health per hit, min 1 HP
-                // Mathf.Max ensures we always heal at least 1 HP
                 int healAmount = Mathf.Max(1, (int)(MaxHealth * 0.02f));
                 m_vController.ChangeHealth(healAmount);
             }
             
-            // 2. Faith Vampirism
+            // 2. Faith Vampirism (Trust)
             if (m_trinketStats.effectFaithVampirism)
             {
-                // Logic: Add 1 Faith point per hit
+                // Add 1 Faith point per hit
                 UpdateFaithCurrentValue(1); 
             }
-            // ----------------------------
         }
 
         private void OnConversationStarted(Transform transform)
@@ -311,7 +349,7 @@ namespace Beyond
             controller.RemoveAnimatorTags();
         }
 
-        // ... [Audio Play Methods - kept same] ...
+        // ... [Audio Play Methods] ...
         public void PlayNoFaithClip() { PlayRandomSound(m_noFaithClips); }
         private void PlayRandomSound(AudioClip[] sounds)
         {
@@ -367,14 +405,32 @@ namespace Beyond
         public void OnReceivedDamage(vDamage damage)
         {
             if (m_cutScenePlaying) return;
-            
+
-            // --- TRINKET DEFENSE CALCULATION ---
+            // --- 1. DEFENSE CALCULATION ---
-            // defenseMult of 0.9 means 90% damage taken (10% reduction)
+            // Example: 0.9 defenseMult = 90% damage taken (10% reduction)
             if (Mathf.Abs(m_trinketStats.defenseMult - 1f) > float.Epsilon)
             {
                 damage.damageValue = (int)(damage.damageValue * m_trinketStats.defenseMult);
             }
-            // -----------------------------------
+
+            // --- 2. THORN DAMAGE (Reflect Damage) ---
+            if (m_trinketStats.thornDamageMult > 1f && damage.sender != null)
+            {
+                // Calculate reflect amount (Base damage * (Mult - 1))
+                int thornVal = (int)(damage.damageValue * (m_trinketStats.thornDamageMult - 1f));
+
+                if (thornVal > 0)
+                {
+                    vDamage reflectDmg = new vDamage(thornVal);
+                    reflectDmg.sender = transform;
+                    reflectDmg.damageType = "Thorns"; 
+                    reflectDmg.reaction_id = -1; // No flinch
+                    
+                    // Uses Invector extension method to apply damage to sender
+                    damage.sender.gameObject.ApplyDamage(reflectDmg);
+                }
+            }
+            // ----------------------------------------
 
 #if UNITY_IOS && !UNITY_EDITOR
             HapticEngine.ImpactFeedbackHeavy();
@@ -396,6 +452,8 @@ namespace Beyond
             if (m_Respawner) m_Respawner.SaveRespawnPoint();
         }
 
+        // ... [Quest and Attribute Methods] ...
+
         public List<Quest> GetAllGuilts()
         {
             if (!m_questJournal)
@@ -525,12 +583,14 @@ namespace Beyond
             // --- TRINKET INTEGRATION IN STATS CALCULATION ---
             
             // 1. Calculate specific total multipliers for UI scaling
-                // 1. Calculate specific total multipliers
             float totalHealthMult = finalMultiplier * m_trinketStats.healthMult;
             float totalFaithMult = finalMultiplier * m_trinketStats.faithMult;
-            float totalStaminaMult = finalMultiplier * (m_trinketStats.staminaMult > 0 ? m_trinketStats.staminaMult : 1f); // Handle 0 default
+            // Handle 0 default for Stamina
+            float validStaminaMult = m_trinketStats.staminaMult > 0 ? m_trinketStats.staminaMult : 1f; 
+            float totalStaminaMult = finalMultiplier * validStaminaMult;
 
             // 2. Capture Current Health Percentage BEFORE changes
+            // This prevents the health bar from looking empty when Max HP increases
             float healthPercent = m_vController.maxHealth > 0 ? m_vController.currentHealth / m_vController.maxHealth : 1f;
 
             // 3. Apply Stats
@@ -544,12 +604,16 @@ namespace Beyond
             m_vController.maxHealth = newMaxHealth;
 
             // Apply Proportional Current Health
-            // We update the current health to match the previous percentage
+            // Uses ChangeHealth() because currentHealth has a protected setter
-            //m_vController.currentHealth = Mathf.RoundToInt(newMaxHealth * healthPercent);
+            m_vController.ChangeHealth(Mathf.RoundToInt(newMaxHealth * healthPercent));
 
             // Stamina
             m_vController.maxStamina = Mathf.Round(totalStaminaMult * staminaBaseMaxValue);
             m_vController.staminaRecovery = (finalMultiplier * staminaBaseRegenValue);
+
+            // Natural Health Recovery (From Maturity/Brightness)
+            // We set the BASE here. UpdateTrinketStats will later add any trinket bonuses to this value.
+            m_vController.healthRecovery = finalMultiplier * healthBaseRegenValue;
             
             // ------------------------------------------------
 

Assets/Scripts/InvectorDerivatives/bItemEnums.cs

@@ -61,7 +61,8 @@ namespace Beyond
         [Description("Attack Speed Bonus")] AttackSpeedBonusPercent = 26,
         [Description("Faith Regen Bonus")] FaithRegenBonusPercent = 27,
         [Description("Thorn Damage Bonus")] ThornDamageBonusPercent = 28,
-        [Description("Stamina Bonus")] StaminaBonusPercent = 29
+        [Description("Stamina Bonus")] StaminaBonusPercent = 29,
+        [Description("Soulfire Damage Bonus")] SoulfireDamageBonusPercent = 30
     }
 
     public enum TrinketColor

Assets/Scripts/InvectorDerivatives/bThirdPersonController.cs

@@ -13,6 +13,9 @@ namespace Beyond
         protected bool m_GodMode = false;
         public bool m_ignoreTriggers = true;
 
+        [Header("Beyond Health Logic")]
+        // Default cap is 1.0 (100% HP)
+        public float healthRecoveryCap = 1f; 
         [Header("Beyond's Custom Settings")]
         [Tooltip("When 'Use RootMotion' is checked, and this is true, the animation's root motion will control character rotation (for 8-way directional movement). If false, the script will rotate the character to face the input direction.")]
         public bool useAnimationBasedRotation = false;
@@ -52,6 +55,18 @@ namespace Beyond
             }
         }
 
+        protected override bool canRecoverHealth
+        {
+            get 
+            {
+                // Calculate the actual HP limit based on the cap
+                float limitHP = maxHealth * healthRecoveryCap;
+                
+                // Add the check: currentHealth must be LESS than the Limit
+                return base.canRecoverHealth && (_currentHealth < limitHP);
+            }
+        }
+
         public bool IsDashingOrRolling()
         {
             return m_isDashing || isRolling;

Assets/Scripts/Powers/TrinketManager.cs

@@ -24,25 +24,30 @@ namespace Beyond
             public float faithMult;
             public float damageMult;
             public float speedMult;
-            public float staminaMult;
             public float attackSpeedMult;
             public float faithRegenMult;
             public float thornDamageMult;
+            
+            // --- NEW ATTRIBUTES ---
+            public float staminaMult;         // For Stamina UI Scaling
+            public float soulfireDamageMult;  // For Magic Damage (Fireball, etc)
 
             // Harmony Flags (Effects from table)
-            // Renamed to match Player.cs usage
             public bool effectBalance;          // Balance (Flask bonus)
             public bool effectCalmness;         // Calmness (Longer shield)
-            public bool effectFaithVampirism;   // Trust (Faith vampirism) - Was effectTrust
+            public bool effectFaithVampirism;   // Trust (Faith vampirism)
-            public bool effectBreeze;           // Breeze (Freezing blast cost)
+            public bool effectBreeze;           // Zora's Focus (Buff Covert Gaze Radius/Length)
             public bool effectDetermination;    // Determination (Combo damage)
-            public bool effectHealthVampirism;  // Vitality (Health vampirism) - Was effectVitality
+            public bool effectHealthVampirism;  // Vitality (Health vampirism)
             public bool effectEagerness;        // Eagerness (Dash cooldown)
             public bool effectBloom;            // Bloom (Spell cost reduced)
             public bool effectGrowth;           // Growth (Cast restores HP)
             public bool effectRose;             // Rose (Thorn damage)
             public bool effectDarkening;        // The Darkening (Bonus dmg)
             public bool effectEclipse;          // Eclipse (Bonus all)
+            
+            // --- NEW EFFECTS ---
+            public bool effectAngelEye;         // Angel Eye (Silent Peek Cost = 0)
         }
 
         private void Start()
@@ -79,7 +84,10 @@ namespace Beyond
                 attackSpeedMult = 1f,
                 faithRegenMult = 1f,
                 thornDamageMult = 1f,
-                staminaMult = 1f
+                
+                // Initialize New Stats
+                staminaMult = 1f,
+                soulfireDamageMult = 1f
             };
 
             // 2. Get Currently Equipped Items
@@ -96,14 +104,17 @@ namespace Beyond
             foreach (var item in equippedItems)
             {
                 stats.healthMult += GetPct(item, bItemAttributes.HealthBonusPercent);
-                stats.defenseMult -= GetPct(item, bItemAttributes.DefenseBonusPercent); // Defense reduces damage taken
+                stats.defenseMult -= GetPct(item, bItemAttributes.DefenseBonusPercent); 
                 stats.faithMult += GetPct(item, bItemAttributes.FaithBonusPercent);
                 stats.damageMult += GetPct(item, bItemAttributes.DamageBonusPercent);
                 stats.speedMult += GetPct(item, bItemAttributes.MoveSpeedBonusPercent);
                 stats.attackSpeedMult += GetPct(item, bItemAttributes.AttackSpeedBonusPercent);
                 stats.faithRegenMult += GetPct(item, bItemAttributes.FaithRegenBonusPercent);
                 stats.thornDamageMult += GetPct(item, bItemAttributes.ThornDamageBonusPercent);
+                
+                // New Attributes
                 stats.staminaMult += GetPct(item, bItemAttributes.StaminaBonusPercent);
+                stats.soulfireDamageMult += GetPct(item, bItemAttributes.SoulfireDamageBonusPercent);
             }
 
             // 4. Apply Harmonies (Based on Table)
@@ -126,61 +137,61 @@ namespace Beyond
             int bright = items.Count(i => i.trinketColor == TrinketColor.Bright);
             int dark = items.Count(i => i.trinketColor == TrinketColor.Dark);
 
-            // --- TABLE LOGIC IMPLEMENTATION ---
+            // Balance (A C V)
-
-            // Balance: Azure + Crimson + Viridian (A C V) -> Bonus Water of Life Flask
             if (azure >= 1 && crimson >= 1 && viridian >= 1) 
                 stats.effectBalance = true;
 
-            // Calmness: 3 Azure (A A A) -> Longer Shield
+            // Calmness (A A A)
             if (azure >= 3) 
                 stats.effectCalmness = true;
 
-            // Trust: 2 Azure + 1 Crimson (A A C) -> Faith Vampirism
+            // Trust (A A C)
             if (azure >= 2 && crimson >= 1) 
                 stats.effectFaithVampirism = true;
 
-            // Breeze: 2 Azure + 1 Viridian (A A V) -> Freezing blast free
+            // Zora's Focus / Breeze (A A V) -> Covert Gaze Radius/Length
             if (azure >= 2 && viridian >= 1) 
                 stats.effectBreeze = true;
 
-            // Determination: 3 Crimson (C C C) -> Combo finish +5% dmg
+            // Determination (C C C)
             if (crimson >= 3)
                 stats.effectDetermination = true;
 
-            // Vitality: 2 Crimson + 1 Azure (C C A) -> Health Vampirism
+            // Vitality (C C A)
             if (crimson >= 2 && azure >= 1)
                 stats.effectHealthVampirism = true;
 
-            // Eagerness: 2 Crimson + 1 Viridian (C C V) -> Reduce Dash Cooldown
+            // Eagerness (C C V)
             if (crimson >= 2 && viridian >= 1)
                 stats.effectEagerness = true;
 
-            // Bloom: 3 Viridian (V V V) -> Spell cost reduced 20%
+            // Bloom (V V V)
             if (viridian >= 3)
                 stats.effectBloom = true;
 
-            // Growth: 2 Viridian + 1 Azure (V V A) -> Cast restores HP
+            // Growth (V V A)
             if (viridian >= 2 && azure >= 1)
                 stats.effectGrowth = true;
 
-            // Rose: 2 Viridian + 1 Crimson (V V C) -> Bonus Thorn Dmg
+            // Rose (V V C)
             if (viridian >= 2 && crimson >= 1)
             {
                 stats.effectRose = true;
                 stats.thornDamageMult += 0.05f; 
             }
 
-            // The Darkening: 3 Bright 
+            // The Darkening (3 Bright)
             if (bright >= 3)
                 stats.effectDarkening = true; 
             
-            // Eclipse: 2 Bright + 1 Dark
+            // Eclipse (2 Bright + 1 Dark)
             if (bright >= 1 && dark >= 1) 
                 stats.effectEclipse = true;
+
+            // Angel Eye (Requires defining combo, placeholder logic)
+            // if (bright >= 2 && azure >= 1) stats.effectAngelEye = true;
         }
 
-        // Helper: Convert Integer Attribute (5) to Float Percentage (0.05)
         private float GetPct(bItem item, bItemAttributes attrName)
         {
             var attr = item.GetItemAttribute(attrName);

Assets/Scripts/Utils/ParticlesPlayerFollower.cs

@@ -0,0 +1,44 @@
+using UnityEngine;
+
+namespace Beyond 
+{
+    public class ParticlesPlayerFollower : MonoBehaviour
+    {
+        [Header("Position Settings")]
+        [Tooltip("How high above the player the rain cloud sits.")]
+        public float heightOffset = 15f;
+        
+        [Tooltip("Smooths the movement so rain doesn't snap instantly.")]
+        public bool useSmoothing = false;
+        public float smoothSpeed = 10f;
+
+        private void Start()
+        {
+            // Auto-find Invector player if not assigned
+            if (Player.Instance == null)
+            {
+                Debug.LogWarning("ParticlesPlayerFollower: No Player found! Make sure Player.Instance is set.");
+                enabled = false;
+                return;
+            }
+        }
+
+        void LateUpdate()
+        {
+            if (Player.Instance == null) return;
+            var target = Player.Instance.transform;
+            // Calculate where the rain emitter should be
+            // We take the player's X and Z, but override the Y with our offset
+            Vector3 targetPosition = new Vector3(target.position.x, target.position.y + heightOffset, target.position.z);
+
+            if (useSmoothing)
+            {
+                transform.position = Vector3.Lerp(transform.position, targetPosition, Time.deltaTime * smoothSpeed);
+            }
+            else
+            {
+                transform.position = targetPosition;
+            }
+        }
+    }
+}

Assets/Scripts/Utils/ParticlesPlayerFollower.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 0e008257ca9c7464d8f9b914b5b218b6

Assets/ThirdParty/testy/Marcin/TesttRenderer.asset

@@ -140,7 +140,8 @@ MonoBehaviour:
   - {fileID: -8401544187620710908}
   - {fileID: 8705260567137607853}
   - {fileID: -8542654664514485498}
-  m_RendererFeatureMap: da69d7b3bdd6aeb26de13b70aa75ef177f447f3a64df181a0386cf88a7053a04e16c5c3b3c1da21a04a61e1c13b8678bade073055d4ccf7806c3c7f2d7647289
+  - {fileID: 565310806681130197}
+  m_RendererFeatureMap: da69d7b3bdd6aeb26de13b70aa75ef177f447f3a64df181a0386cf88a7053a04e16c5c3b3c1da21a04a61e1c13b8678bade073055d4ccf7806c3c7f2d7647289d514ebfb2e63d807
   m_UseNativeRenderPass: 1
   xrSystemData: {fileID: 0}
   postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
@@ -208,6 +209,19 @@ MonoBehaviour:
       restoreCamera: 1
       offset: {x: 0, y: 0, z: 0, w: 0}
       cameraFieldOfView: 60
+--- !u!114 &565310806681130197
+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: 5d111dc2a0b22b142804f4d59508b893, type: 3}
+  m_Name: URPOutlineFeature
+  m_EditorClassIdentifier: 
+  m_Active: 1
 --- !u!114 &1724726557194051949
 MonoBehaviour:
   m_ObjectHideFlags: 0

ProjectSettings/EditorBuildSettings.asset

@@ -26,6 +26,9 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/Old_Levels!/Portal/Portal.unity
     guid: cf1147d8227221747a9f5884efeaeab3
+  - enabled: 1
+    path: Assets/Scenes/01_Wasteland/Wasteland_Arenas.unity
+    guid: c4c18449baafe5d459c11608c40b2904
   m_configObjects:
     com.unity.addressableassets: {fileID: 11400000, guid: 272caeb75b6504dcb987edb253f851b7,
       type: 2}