Cease v0.5

This commit is contained in:
2022-08-31 03:11:06 -07:00
parent a07d347ed1
commit c73a2e918c
24 changed files with 2360 additions and 129 deletions

View File

@@ -1,5 +1,5 @@
using Scampz.GameJam.Assets.Scripts;
using UnityEngine;
using UnityEngine.InputSystem;
namespace Scampz.GameJam
{
@@ -10,6 +10,20 @@ namespace Scampz.GameJam
private bool _isWithinRange = false;
private InputAction confirmAction;
void Start()
{
confirmAction = new InputAction("confirm", binding: "<Keyboard>/x");
confirmAction.AddBinding("<GamePad>/buttonSouth");
confirmAction.Enable();
}
private void OnDisable()
{
confirmAction.Disable();
}
private void OnTriggerEnter(Collider other)
{
if (other.CompareTag("Player"))
@@ -24,7 +38,7 @@ namespace Scampz.GameJam
private void Update()
{
if (_isWithinRange && Input.GetButtonDown(InputOptions.Submit) && !DialogueManager.Instance.IsTalking)
if (_isWithinRange && confirmAction.triggered && !DialogueManager.Instance.IsTalking)
{
var player = GameObject.FindGameObjectWithTag("Player");
var cc = player.GetComponent<CharacterController>();