dash/roll test

Assets/Dialogue/TestDialogueBase.asset

@@ -24012,7 +24012,7 @@ MonoBehaviour:
         destinationDialogueID: 2
         isConnector: 0
         priority: 2
-      conditionsString: 
+      conditionsString: Variable["CH02HerbalistSpoke"] == false
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -24462,7 +24462,7 @@ MonoBehaviour:
         destinationDialogueID: 8
         isConnector: 0
         priority: 2
-      conditionsString: CurrentQuestState("Quest-53002") == "unassigned"
+      conditionsString: Variable["CH02HerbalistSpoke"] == true
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -24615,7 +24615,7 @@ MonoBehaviour:
       canvasRect:
         serializedVersion: 2
         x: 223
-        y: 183
+        y: 182
         width: 160
         height: 30
     canvasScrollPosition: {x: 0, y: 0}

Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller

@@ -37865,7 +37865,7 @@ AnimatorState:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Roll
-  m_Speed: 1.2
+  m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 1101417917373738956}
@@ -37882,8 +37882,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: -5281531218992145002, guid: ebddd29a45010564a8fa3d7bcfdb119c,
+  m_Motion: {fileID: 7400022, guid: c5937c944a220444aa33be3fe1480174, type: 3}
-    type: 3}
   m_Tag: 
   m_SpeedParameter: Direction
   m_MirrorParameter: 
@@ -43715,7 +43714,7 @@ AnimatorState:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Dash
-  m_Speed: 1.12
+  m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: -53148242456154466}
@@ -43732,8 +43731,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: -5281531218992145002, guid: ebddd29a45010564a8fa3d7bcfdb119c,
+  m_Motion: {fileID: 7400024, guid: c5937c944a220444aa33be3fe1480174, type: 3}
-    type: 3}
   m_Tag: 
   m_SpeedParameter: Direction
   m_MirrorParameter: 

Assets/Scenes/Fight_Arena/Fight_Arena.unity

@@ -15063,11 +15063,21 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 5
       objectReference: {fileID: 0}
+    - target: {fileID: 1324734597232948583, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1328610846986627091, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_Layer
       value: 5
       objectReference: {fileID: 0}
+    - target: {fileID: 1328610846986627091, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1343879293682565934, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: 'm_Materials.Array.data[0]'
@@ -15674,6 +15684,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3071362053167708861, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3091390076571446955, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_Layer
@@ -15709,6 +15724,21 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 5
       objectReference: {fileID: 0}
+    - target: {fileID: 3509555575385636853, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -1.31
+      objectReference: {fileID: 0}
+    - target: {fileID: 3509555575385636853, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 15.71
+      objectReference: {fileID: 0}
+    - target: {fileID: 3509555575385636853, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -4.74
+      objectReference: {fileID: 0}
     - target: {fileID: 3667793487159446755, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_Layer
@@ -15904,6 +15934,11 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 5
       objectReference: {fileID: 0}
+    - target: {fileID: 4336727261713483418, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -6.9
+      objectReference: {fileID: 0}
     - target: {fileID: 4414498741481744340, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_LocalScale.x
@@ -16014,10 +16049,45 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 5
       objectReference: {fileID: 0}
+    - target: {fileID: 4670439730081820471, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: rollSpeed
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: maxStamina
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: rollStamina
+      value: 30
+      objectReference: {fileID: 0}
+    - target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: rollTransition
+      value: 0.1
+      objectReference: {fileID: 0}
     - target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: selectedToolbar
-      value: 8
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: rollRotationSpeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: useRollRootMotion
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4704300330561169846, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
@@ -17649,6 +17719,11 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 5
       objectReference: {fileID: 0}
+    - target: {fileID: 8494942127848017573, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 35.23291
+      objectReference: {fileID: 0}
     - target: {fileID: 8561617950230068259, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_Layer
@@ -17689,11 +17764,26 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 5
       objectReference: {fileID: 0}
+    - target: {fileID: 9042387279469308472, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 15.66
+      objectReference: {fileID: 0}
+    - target: {fileID: 9042387279469308472, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -2.64
+      objectReference: {fileID: 0}
     - target: {fileID: 9164926379149337896, guid: 851e8e61247888340bdec90fc8aa37f5,
         type: 3}
       propertyPath: m_Layer
       value: 5
       objectReference: {fileID: 0}
+    - target: {fileID: 9164926379149337896, guid: 851e8e61247888340bdec90fc8aa37f5,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects:
@@ -18290,6 +18380,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: VideoCutsceneCanvas
       objectReference: {fileID: 0}
+    - target: {fileID: 4964792250825620171, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4964792250825620175, guid: 7090f2a86c4f54fc8b4363cfb6e55c2b,
         type: 3}
       propertyPath: m_Pivot.x

Assets/Scripts/InvectorDerivatives/bMeleeCombatInput.cs

@@ -357,9 +357,9 @@ namespace Beyond
         {
             if (rollInput.GetButtonDown() && RollConditions())
             {
-                cc.Roll();
+               // cc.Roll();
-                /*
+                
-                if (horizontalInput.GetAxis() != 0f && verticallInput.GetAxis() != 0f)
+                if (cc.input.magnitude > 0.1f)
                 {
                     cc.Roll();
                 }
@@ -368,7 +368,7 @@ namespace Beyond
                     bThirdPersonController beyondController = (bThirdPersonController)cc;
                     beyondController.Dash();
                 }
-                */
+                
             }
         }