marcin/beyond
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

attack flow - breaking and blocking input, roll improvements

Browse Source
This commit is contained in:
marcin
2025-09-10 12:33:13 +02:00
parent 9d6c237088
commit 058920055b
9 changed files with 1219 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Scripts/InvectorDerivatives/bMeleeCombatInput.cs
View File

@@ -4,6 +4,7 @@ using Invector.vEventSystems;
using Invector.vMelee;
using UnityEngine;
using System.Collections;
using UnityEngine.Android;
namespace Beyond
{
@@ -23,6 +24,8 @@ namespace Beyond
internal vMeleeManager meleeManager;
protected bool _isAttacking;
public bool BlockAttack { get; set; }
public bool isAttacking
{
get => _isAttacking || (cc != null && cc.IsAnimatorTag("Attack"));
@@ -87,16 +90,17 @@ namespace Beyond
autoTargeting = GetComponent<AutoTargetting>();
if (autoTargeting == null && Player.Instance != null && Player.Instance.gameObject == this.gameObject)
{
autoTargeting = Player.Instance.GetComponent<AutoTargetting>();
autoTargeting = Player.Instance.GetComponent<AutoTargetting>();
}
if (autoTargeting == null && cc != null && cc.transform.root != null)
{
autoTargeting = cc.transform.root.GetComponentInChildren<AutoTargetting>(true);
autoTargeting = cc.transform.root.GetComponentInChildren<AutoTargetting>(true);
}
if (autoTargeting == null)
{
Debug.LogWarning("bMeleeCombatInput: AutoTargetting component not found. Dash towards target will require manual aiming.");
}
BlockAttack = false;
}
protected override void LateUpdate()
@@ -241,7 +245,7 @@ namespace Beyond
public virtual bool MeleeAttackConditions()
{
if (meleeManager == null) meleeManager = GetComponent<vMeleeManager>();
return meleeManager != null && cc != null && cc.isGrounded && !cc.customAction && !cc.IsAnimatorTag("special") &&
return !BlockAttack && meleeManager != null && cc != null && cc.isGrounded && !cc.customAction && !cc.IsAnimatorTag("special") &&
!cc.isJumping && !cc.isCrouching && !cc.isRolling && !isEquipping &&
(cc.animator != null && !cc.animator.IsInTransition(cc.baseLayer)) && !isRotatingAndDashing;
}