diff --git a/Assets/Prefabs/Player/DebugPlayerPrefab.prefab b/Assets/Prefabs/Player/DebugPlayerPrefab.prefab index 8e76aa5..2661ce9 100644 --- a/Assets/Prefabs/Player/DebugPlayerPrefab.prefab +++ b/Assets/Prefabs/Player/DebugPlayerPrefab.prefab @@ -190,8 +190,8 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 4.694749, y: 3.1251335, z: 1.053972} + m_Center: {x: -0.19721165, y: 0.20270348, z: 0.026986063} --- !u!1 &3607330906377400225 GameObject: m_ObjectHideFlags: 0 @@ -214,6 +214,7 @@ GameObject: - component: {fileID: 471283137481508403} - component: {fileID: 5784126162129930074} - component: {fileID: 1818923263116056088} + - component: {fileID: 384692328} m_Layer: 3 m_Name: PlayerModel m_TagString: Player @@ -304,7 +305,7 @@ MonoBehaviour: jumpPow: 60 jumpNum: 2 traction: 3 - kickPow: 150 + kickPow: 500 recovTime: 3 playerGrav: 200 hasBlink: 0 @@ -479,6 +480,7 @@ MonoBehaviour: maxGrappleDistance: 25 isGrappled: 0 ropeLength: 0 + forceDirection: {x: 0, y: 0, z: 0} --- !u!114 &5784126162129930074 MonoBehaviour: m_ObjectHideFlags: 0 @@ -516,6 +518,104 @@ MonoBehaviour: wallBouncing: 3 cameraTransitionDuration: 1 wallGravityDownForce: 3 +--- !u!120 &384692328 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3607330906377400225} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 1} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 --- !u!1 &5633209979457551608 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Player/PlayerPrefab.prefab b/Assets/Prefabs/Player/PlayerPrefab.prefab index 9070625..1ede02d 100644 --- a/Assets/Prefabs/Player/PlayerPrefab.prefab +++ b/Assets/Prefabs/Player/PlayerPrefab.prefab @@ -114,7 +114,7 @@ MonoBehaviour: jumpPow: 60 jumpNum: 2 traction: 3 - kickPow: 150 + kickPow: 500 recovTime: 3 playerGrav: 200 hasBlink: 0 @@ -213,7 +213,7 @@ MonoBehaviour: moveDirection: {x: 0, y: 0, z: 0} dashDistance: 10 dashStoppingSpeed: 0.1 - dashItem: {fileID: 0} + dashItem: {fileID: 11400000, guid: 4399d7276b3edf446ac51c5145539a5e, type: 2} --- !u!114 &3672942772524564832 MonoBehaviour: m_ObjectHideFlags: 0 @@ -376,7 +376,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7188906082087890184} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1, y: 1.8, z: -0.2} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7188906082643956518} @@ -640,5 +640,5 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 3.0057147, y: 2.5707598, z: 1} + m_Center: {x: 0.3520529, y: 0.13156563, z: 0} diff --git a/Assets/Scenes/Demos/MovementScene.unity b/Assets/Scenes/Demos/MovementScene.unity index 29d297b..6c47812 100644 --- a/Assets/Scenes/Demos/MovementScene.unity +++ b/Assets/Scenes/Demos/MovementScene.unity @@ -1154,10 +1154,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 471283137481508403, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: propelPower - value: 50 - objectReference: {fileID: 0} - target: {fileID: 5633209979457551608, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} propertyPath: m_Name value: DebugPlayerPrefab @@ -1206,14 +1202,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7058615058147771192, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_IsKinematic - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7058615058147771192, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} - propertyPath: m_CollisionDetection - value: 3 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 362ca97b75c291a47ab81d628a81f440, type: 3} --- !u!1 &1257935739 @@ -1418,6 +1406,7 @@ GameObject: - component: {fileID: 1405946432} - component: {fileID: 1405946431} - component: {fileID: 1405946430} + - component: {fileID: 1405946434} m_Layer: 0 m_Name: Sphere m_TagString: HookPoint @@ -1495,12 +1484,28 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1405946429} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -9.8, y: 18.3, z: 10.3} + m_LocalPosition: {x: -3.4, y: 18.3, z: 10.3} m_LocalScale: {x: 10, y: 10, z: 10} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &1405946434 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1405946429} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &1493944130 GameObject: m_ObjectHideFlags: 0 @@ -1868,13 +1873,25 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3} + propertyPath: m_LocalScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3} propertyPath: m_LocalPosition.x - value: -13.5969095 + value: -6.95 objectReference: {fileID: 0} - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3} propertyPath: m_LocalPosition.y - value: 3.74 + value: 0.09 objectReference: {fileID: 0} - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Scripts/Environment/BreakableBlock.cs b/Assets/Scripts/Environment/BreakableBlock.cs index 99042d7..4428eb5 100644 --- a/Assets/Scripts/Environment/BreakableBlock.cs +++ b/Assets/Scripts/Environment/BreakableBlock.cs @@ -4,7 +4,7 @@ using UnityEngine; public class BreakableBlock : MonoBehaviour { - //kicking power 150 (250 for stornger kick) + //kicking power 500 (1000 for stornger kick) public float health; // Start is called before the first frame update void Start(){ @@ -22,7 +22,7 @@ public class BreakableBlock : MonoBehaviour } public void damage(float kickPower){ - int totalDamage = (int)(kickPower / 50.0); + int totalDamage = (int)(kickPower / 100.0); health -= totalDamage; Debug.Log(health); //if item is at 0 health diff --git a/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dGrapplingHook.cs b/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dGrapplingHook.cs index 10cc33d..d12f1ea 100644 --- a/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dGrapplingHook.cs +++ b/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dGrapplingHook.cs @@ -5,7 +5,7 @@ using UnityEngine; public class dGrapplingHook : NetworkBehaviour { - public float maxGrappleDistance = 25; + public float maxGrappleDistance = 25; public bool isGrappled; private int hookPointIndex; @@ -19,6 +19,13 @@ public class dGrapplingHook : NetworkBehaviour [SerializeField] private float ropeLength; private float climbRate = 5; + Vector3 tensionDirection; + Vector3 pendulumSideDirection; + Vector3 tangentDirection; + float tensionForce; + public Vector3 forceDirection; + + // Start is called before the first frame update void Start() { @@ -56,6 +63,7 @@ public class dGrapplingHook : NetworkBehaviour private void FixedUpdate() { + //if (!IsLocalPlayer) { return; } if (isGrappled) { Debug.DrawRay(gameObject.transform.position, (hookPoint.transform.position - gameObject.transform.position)); //Visual of line @@ -82,9 +90,7 @@ public class dGrapplingHook : NetworkBehaviour if (Vector3.Distance(gameObject.transform.position, hookPoint.transform.position) > ropeLength ) { //Impact Based - Debug.Log("y"); - playerMovement.g = 2; - movementController.Move((hookPoint.transform.position - gameObject.transform.position) * Time.deltaTime); + forceDirection = calculateForceDirection(1, playerMovement.g, hookPoint.transform.position); } } @@ -105,60 +111,20 @@ public class dGrapplingHook : NetworkBehaviour } return index; } - ///////////Hookshot Concept - // public float maxGrappleDistance = 25; - // public bool isGrappled; - // private Vector3 hookPoint; - // private float distance; - // public float propelPower = 100; + Vector3 calculateForceDirection(float mass, float g, Vector3 hPoint){ + tensionDirection = (hPoint - transform.position).normalized; + Debug.Log(tensionDirection); - // private CharacterController movementController; - // private dPlayerMovement playerMovement; - // private PlayerStats pStats; - // private Camera cam; - // private Vector3 forwardHookLerp; - // private Vector3 upwardsHookLerp; + float inclinationAngle = Vector3.Angle(transform.position - hPoint, -transform.up); - // // Start is called before the first frame update - // void Start() - // { - // isGrappled = false; - // movementController = gameObject.GetComponent(); - // playerMovement = gameObject.GetComponent(); - // pStats = gameObject.GetComponent(); - // cam = playerMovement.cam; - // } - // private void FixedUpdate() - // { - // getGrapplePoint(); - // //Debug.Log((hookPoint.transform.position - transform.position).normalized); - // if (isGrappled && !Input.GetKeyDown(KeyCode.E)) - // { - // //playerMovement.AddImpact((hookPoint - transform.position), propelPower); - // forwardHookLerp = Vector3.Lerp(forwardHookLerp, transform.forward * 50, .03f); - // movementController.Move(forwardHookLerp * Time.deltaTime); + tensionForce = mass * -g * Mathf.Cos(Mathf.Deg2Rad * inclinationAngle); + Debug.Log(g); - // upwardsHookLerp = Vector3.Lerp(upwardsHookLerp, (hookPoint - transform.position).normalized * Vector3.Distance(transform.position, hookPoint) * propelPower, .03f); - // movementController.Move(upwardsHookLerp * Time.deltaTime); - // isGrappled = false; - // } - // } - - // private void getGrapplePoint(){ - // //if E or left face gamepad button is pressed is slightly pressed - // if (Input.GetKeyDown(KeyCode.E) || Input.GetKeyDown(KeyCode.JoystickButton2)) //If grapple button is hit - // { - // if (!isGrappled) //If we are not grappling - // { - // if(Physics.Raycast(cam.transform.position, cam.transform.forward, out RaycastHit raycastHit)){ - // if(raycastHit.collider.gameObject.transform.tag == "HookPoint"){ - // isGrappled = true; - // hookPoint = new Vector3 (raycastHit.point.x,raycastHit.point.y,raycastHit.point.z); - // } - // } - // } - // } - // } + Vector3 fDirection = tensionDirection * tensionForce; + Debug.Log(fDirection); + return fDirection; + } + } diff --git a/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dKickController.cs b/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dKickController.cs index bdd43e6..017ab19 100644 --- a/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dKickController.cs +++ b/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dKickController.cs @@ -59,6 +59,7 @@ public class dKickController : NetworkBehaviour leg.SetActive(true); yield return new WaitForSeconds(waitTime); isKicking = false; + leg.GetComponent().isTrigger = false; leg.SetActive(false); } @@ -74,6 +75,7 @@ public class dKickController : NetworkBehaviour Vector3 direction = this.transform.forward; Debug.Log(direction); collision.rigidbody.AddForce(direction * pStats.KickPow, ForceMode.Impulse); + leg.GetComponent().isTrigger = true; } if (collision.transform.CompareTag("destroyable") && myCollider == leg.GetComponent()){ collision.transform.gameObject.GetComponent().damage(pStats.KickPow); diff --git a/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs b/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs index 1ff33dc..e8ff396 100644 --- a/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs +++ b/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs @@ -212,9 +212,9 @@ public class dPlayerMovement : NetworkBehaviour driftVel = Vector3.zero; if(animator != null) animator.SetBool("isRunning", false); } - //Move Player moveController.Move(driftVel + (moveY * Time.deltaTime)); + if(grapple.isGrappled) moveController.Move(grapple.forceDirection * Time.deltaTime); } @@ -270,7 +270,7 @@ public class dPlayerMovement : NetworkBehaviour if (Input.GetAxis("Jump") != 0 && !jumpHeld && curJumpNum < pStats.JumpNum && !isSliding) { if(wallRun.IsWallRunning()){ - AddImpact((wallRun.GetWallJumpDirection()), pStats.JumpPow * 10f); + AddImpact((wallRun.GetWallJumpDirection()), pStats.JumpPow * 8f); g = pStats.JumpPow; } @@ -440,7 +440,7 @@ public class dPlayerMovement : NetworkBehaviour } //apply gravity if not grounded and coyote timer is less than 0 - if(isGrounded == false && curCoyJumpTimer <= 0){ + if((isGrounded == false && curCoyJumpTimer <= 0) || grapple.isGrappled){ g -= grav * Time.deltaTime; } //else don't apply gravity diff --git a/Assets/Scripts/PlayerScripts/KickController.cs b/Assets/Scripts/PlayerScripts/KickController.cs index e3d90e1..51f821d 100644 --- a/Assets/Scripts/PlayerScripts/KickController.cs +++ b/Assets/Scripts/PlayerScripts/KickController.cs @@ -59,13 +59,14 @@ public class KickController : NetworkBehaviour leg.SetActive(true); yield return new WaitForSeconds(waitTime); isKicking = false; + leg.GetComponent().isTrigger = false; leg.SetActive(false); } private void OnCollisionEnter(Collision collision) { - //if (!IsLocalPlayer) { return; } + if (!IsLocalPlayer) { return; } Collider myCollider = collision.contacts[0].thisCollider; if (collision.transform.CompareTag("kickable") && myCollider == leg.GetComponent()){ if(collision.gameObject.GetComponent().isKinematic == true){ @@ -74,6 +75,7 @@ public class KickController : NetworkBehaviour Vector3 direction = this.transform.forward; Debug.Log(direction); collision.rigidbody.AddForce(direction * pStats.KickPow, ForceMode.Impulse); + leg.GetComponent().isTrigger = true; } if (collision.transform.CompareTag("destroyable") && myCollider == leg.GetComponent()){ collision.transform.gameObject.GetComponent().damage(pStats.KickPow); diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs index e1c7030..6e744e3 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs +++ b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs @@ -16,15 +16,32 @@ public class Dash : NetworkBehaviour { float dashSpeed = 12; CharacterController characterController; + PlayerMovement pMove; void Start(){ - characterController = this.gameObject.GetComponent(); + characterController = GetComponent(); + pMove = GetComponent(); } //UPDATE CHECK FOR MOVEMENT ONLY WHEN DASHING void FixedUpdate(){ if (!IsLocalPlayer) { return; } + if(pMove.pStats.HasDash){ + DashMovement(); + } + + } + private IEnumerator startCoolDown(){ + Debug.Log("start corotine"); + isOnCoolDown = true; + //driver.startUICooldown("Nitro"); + yield return new WaitForSeconds(dashItem.cooldownM); + isOnCoolDown = false; + Debug.Log("end corotine"); + } + + private void DashMovement(){ if (Input.GetKeyDown(KeyCode.E) && isOnCoolDown == false) { currentDashTime = 0; @@ -43,13 +60,4 @@ public class Dash : NetworkBehaviour { characterController.Move(moveDirection * Time.deltaTime * dashSpeed); } - private IEnumerator startCoolDown(){ - Debug.Log("start corotine"); - isOnCoolDown = true; - //driver.startUICooldown("Nitro"); - yield return new WaitForSeconds(dashItem.cooldownM); - isOnCoolDown = false; - Debug.Log("end corotine"); - } - } \ No newline at end of file diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GrapplingHook.cs b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GrapplingHook.cs index 9d2a6bf..2df9051 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GrapplingHook.cs +++ b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GrapplingHook.cs @@ -33,23 +33,24 @@ public class GrapplingHook : NetworkBehaviour void Update() { if (!IsLocalPlayer) { return; } - - if (Input.GetKeyDown(KeyCode.E) || Input.GetKeyDown(KeyCode.JoystickButton2)) //If grapple button is hit - { - if (!isGrappled) //If we are not grappling + if(pStats.HasGrapple){ + if (Input.GetKeyDown(KeyCode.E) || Input.GetKeyDown(KeyCode.JoystickButton2)) //If grapple button is hit { - hookPointIndex = FindHookPoint(); //Find the nearest hook point within max distance - if (hookPointIndex != -1) //If there is a hookpoint + if (!isGrappled) //If we are not grappling { - hookPoint = hookPoints[hookPointIndex]; //The point we are grappling from - ropeLength = Vector3.Distance(gameObject.transform.position, hookPoint.transform.position) + 0.5f; - isGrappled = true; //toggle grappling state + hookPointIndex = FindHookPoint(); //Find the nearest hook point within max distance + if (hookPointIndex != -1) //If there is a hookpoint + { + hookPoint = hookPoints[hookPointIndex]; //The point we are grappling from + ropeLength = Vector3.Distance(gameObject.transform.position, hookPoint.transform.position) + 0.5f; + isGrappled = true; //toggle grappling state + } + } + else //Else we are grappling + { + //physics tear down? + isGrappled = false; //toggle grappling state to release } - } - else //Else we are grappling - { - //physics tear down? - isGrappled = false; //toggle grappling state to release } } } diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset b/Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/Dash.asset similarity index 100% rename from Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset rename to Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/Dash.asset diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset.meta b/Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/Dash.asset.meta similarity index 100% rename from Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset.meta rename to Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/Dash.asset.meta diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Grapple.asset b/Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/Grapple.asset similarity index 100% rename from Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Grapple.asset rename to Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/Grapple.asset diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Grapple.asset.meta b/Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/Grapple.asset.meta similarity index 100% rename from Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Grapple.asset.meta rename to Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/Grapple.asset.meta diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Springs.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Springs.asset index bce437b..33d601a 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Springs.asset +++ b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Springs.asset @@ -19,7 +19,7 @@ MonoBehaviour: minVelM: 0 curVelM: 0 accM: 0 - jumpPowM: 10 + jumpPowM: 15 jumpNumM: 0 tractionM: 0 kickPowM: 0 diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/StrongerKick.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/StrongerKick.asset index 692ab7d..91f869b 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/StrongerKick.asset +++ b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/StrongerKick.asset @@ -22,7 +22,7 @@ MonoBehaviour: jumpPowM: 0 jumpNumM: 0 tractionM: 0 - kickPowM: 100 + kickPowM: 500 recovTimeM: 0 playerGravM: 0 costM: 3 diff --git a/Assets/Scripts/PlayerScripts/PlayerMovement.cs b/Assets/Scripts/PlayerScripts/PlayerMovement.cs index 5bb34c7..4d2f657 100644 --- a/Assets/Scripts/PlayerScripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerScripts/PlayerMovement.cs @@ -87,7 +87,6 @@ public class PlayerMovement : NetworkBehaviour private Blink blink; private GrapplingHook grapple; - //Animation controller Animator animator; @@ -252,7 +251,7 @@ public class PlayerMovement : NetworkBehaviour //Apply Impact for when force needs to be applied without ragdolling public void AddImpact(Vector3 dir, float force) { - //if (!IsLocalPlayer) { return; } + if (!IsLocalPlayer) { return; } //Normalize direction multiply by force and add it to the impact dir.Normalize(); @@ -269,7 +268,7 @@ public class PlayerMovement : NetworkBehaviour if (Input.GetAxis("Jump") != 0 && !jumpHeld && curJumpNum < pStats.JumpNum && !isSliding) { if(wallRun.IsWallRunning()){ - AddImpact((wallRun.GetWallJumpDirection()), pStats.JumpPow * 10f); + AddImpact((wallRun.GetWallJumpDirection()), pStats.JumpPow * 8f); g = pStats.JumpPow; } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 33b4baa..ac97230 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -22,7 +22,7 @@ TagManager: - UI - Floor - Weather - - + - Grappleable - - - diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 17ccef5..ec152e9 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,31 +6,31 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb - flags: 0 - RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c7b151b180b650d262f3d192c0e27d1e33136e7a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-2: + RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c7b151b180b6519016b0515163936efef2776f7e93ffdfe flags: 0 + RecentlyUsedScenePath-2: + value: 22424703114646680e0b0227036c731f1415016439262f2434 + flags: 0 RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c731f1415016439262f2434 + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26