Symmetrical/BGJ-2022.1
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Over' into Syntriax

Browse Source
This commit is contained in:
Syntriax
2022-02-22 19:51:05 +03:00
parent 1a94602ada da4fc01a50
commit aa05954353
9 changed files with 638 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
Assets/Scripts/Player/PlayerController.cs
View File

@@ -2,47 +2,59 @@ using System;
using Movement;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.SceneManagement;
using PlayerInput = Input.PlayerInput;
namespace Player
{
public class PlayerController : MonoBehaviour, IMovement, Input.PlayerInput.IPlayerControlActions
public class PlayerController : MonoBehaviour, IMovement, PlayerInput.IPlayerControlActions
{
private const float DefaultJumpForce = 784.0f;
private const float DefaultJumpForce = 25.0f;
private const float DefaultMass = 80.0f;
private const float DefaultSpeed = 500.0f;
private const float GravityScale = 1.0f;
private const float MaxSpeed = 500.0f;
private const float DefaultAirSpeed = 300.0f;
private const float GravityScale = 5.0f;
private Input.PlayerInput _controls;
private const float FallMultiplier = 4.0f;
private const float LowJumpMultiplier = 10.0f;
private PlayerInput _controls;
private Rigidbody2D _playerRigidbody2D;
private SpriteRenderer _playerSpriteRenderer;
private CollisionChecker _playerGroundTrigger;
private CollisionChecker _playerInteractableTrigger;
private bool _moveKeyPressed;
private bool _jumpKeyPressed;
private bool _isOnAir;
private float _xAxisValue;
public float speed;
private bool _isOnAir;
private bool _canJump;
private void Awake()
{
this._playerRigidbody2D = gameObject.GetComponent<Rigidbody2D>();
this._playerGroundTrigger = GameObject.Find("PlayerGroundTrigger").GetComponent<CollisionChecker>();
this._playerSpriteRenderer = gameObject.GetComponent<SpriteRenderer>();
_playerRigidbody2D = GetComponent<Rigidbody2D>();
_playerSpriteRenderer = GetComponent<SpriteRenderer>();
_playerGroundTrigger = GameObject.Find("PlayerGroundTrigger").GetComponent<CollisionChecker>();
_playerInteractableTrigger = GameObject.Find("PlayerInteractableTrigger").GetComponent<CollisionChecker>();
}
private void Start()
{
this._playerRigidbody2D.gravityScale = GravityScale;
this._playerRigidbody2D.mass = DefaultMass;
BaseSpeed = DefaultSpeed;
_playerRigidbody2D.mass = DefaultMass;
_playerRigidbody2D.gravityScale = GravityScale;
_canJump = true;
BaseSpeed = 0.0f;
}
private void OnEnable()
{
if (_controls == null)
{
_controls = new Input.PlayerInput();
_controls = new PlayerInput();
_controls.PlayerControl.SetCallbacks(this);
}
@@ -56,15 +68,43 @@ namespace Player
private void FixedUpdate()
{
/*switch (_playerRigidbody2D.velocity.y)
{
case < 0:
_playerRigidbody2D.velocity +=
Vector2.up * (Physics2D.gravity.y * (FallMultiplier - 1) * Time.fixedDeltaTime);
break;
/*case > 0 and < 3:
print("We will go down" + i);
++i;
break;
case > 0 when !_jumpKeyPressed:
_playerRigidbody2D.velocity +=
Vector2.up * (Physics2D.gravity.y * (LowJumpMultiplier - 1) * Time.fixedDeltaTime);
break;
}*/
if (_moveKeyPressed)
Move(_xAxisValue);
else
_playerRigidbody2D.velocity = new Vector2(0.0f, _playerRigidbody2D.velocity.y);
if (_jumpKeyPressed && _playerGroundTrigger.IsCollided)
if (_jumpKeyPressed && _canJump && _playerGroundTrigger.IsCollided)
Jump();
}
private void Update()
{
_isOnAir = !_playerGroundTrigger.IsCollided;
RespawnCheck();
}
private void RespawnCheck()
{
if (gameObject.transform.position.y < -100)
SceneManager.LoadScene(SceneManager.GetActiveScene().name);
}
// PAUSE METHODS
public bool IsPaused { get; private set; }
@@ -72,16 +112,27 @@ namespace Player
public void Pause()
{
IsPaused = true;
_playerRigidbody2D.simulated = IsPaused;
}
public void Resume()
{
IsPaused = false;
_playerRigidbody2D.simulated = IsPaused;
}
// MOVE METHODS
public float BaseSpeed { get; set; }
public float BaseSpeed
{
get => speed;
set
{
speed = value;
if (speed > MaxSpeed)
speed = MaxSpeed;
}
}
public void Move(float value)
{
@@ -93,16 +144,27 @@ namespace Player
case > 0:
_playerSpriteRenderer.flipX = false;
break;
default:
_playerSpriteRenderer.flipX = _playerSpriteRenderer.flipX;
break;
}
if (!_isOnAir)
BaseSpeed += 40;
_playerRigidbody2D.velocity = new Vector2(BaseSpeed * _xAxisValue * Time.fixedDeltaTime,
_playerRigidbody2D.velocity.y);
}
private void DecelerationAfterMoving()
{
throw new NotImplementedException();
}
private void Jump()
{
_playerRigidbody2D.velocity = new Vector2(_playerRigidbody2D.velocity.x, 0);
_playerRigidbody2D.AddForce(Vector2.up.normalized * DefaultJumpForce, ForceMode2D.Impulse);
BaseSpeed = DefaultAirSpeed;
_playerRigidbody2D.velocity = Vector2.up.normalized * DefaultJumpForce;
_canJump = false;
}
private void Climb()
@@ -118,6 +180,7 @@ namespace Player
{
case true:
_moveKeyPressed = false;
BaseSpeed = 0;
break;
case false:
_moveKeyPressed = true;
@@ -132,11 +195,18 @@ namespace Player
{
case true:
_jumpKeyPressed = false;
_canJump = true;
break;
case false:
_jumpKeyPressed = true;
break;
}
}
public void OnInteract(InputAction.CallbackContext context)
{
if (_playerInteractableTrigger.IsCollided)
throw new NotImplementedException();
}
}
}
}