izzy/Darklings-FightingGame
0
0
Fork 0
mirror of https://github.com/izzy2lost/Darklings-FightingGame.git synced 2026-03-10 11:35:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add new 6A move for Tasko

Browse Source
This commit is contained in:
David Kalatzis
2024-01-08 23:13:48 +02:00
parent 6eb9e449ca
commit 7c5398e9b4
41 changed files with 1801 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/_Project/Scripts/PlayerScripts/PlayerAnimator.cs
View File

@@ -71,15 +71,9 @@ public class PlayerAnimator : DemonicsAnimator
public override void SetAnimation(string name, int frame)
{
if (name == "Wallsplat")
{
transform.localPosition = new Vector2(10 * -transform.localScale.x, 0);
transform.localRotation = Quaternion.Euler(0, 0, -90);
}
transform.SetLocalPositionAndRotation(new Vector2(10 * -transform.localScale.x, 0), Quaternion.Euler(0, 0, -90));
else
{
transform.localPosition = Vector2.zero;
transform.localRotation = Quaternion.identity;
}
transform.SetLocalPositionAndRotation(Vector2.zero, Quaternion.identity);
base.SetAnimation(name, frame);
}

31
Assets/_Project/Scripts/PlayerScripts/PlayerComboSystem.cs
View File

@@ -2,13 +2,13 @@ using UnityEngine;
public class PlayerComboSystem : MonoBehaviour
{
public static AttackSO GetComboAttack(PlayerStatsSO playerStats, InputEnum inputEnum, bool isCrouching, bool isAir)
public static AttackSO GetComboAttack(PlayerStatsSO playerStats, InputEnum inputEnum, Vector2 direction, bool isAir)
{
if (inputEnum == InputEnum.Special)
return GetArcana(playerStats, isCrouching, isAir);
return GetArcana(playerStats, direction, isAir);
if (inputEnum == InputEnum.Throw)
return playerStats.mThrow;
if (isCrouching)
if (direction == Vector2.down)
return GetCrouchingAttackType(playerStats, inputEnum);
else
if (isAir)
@@ -53,21 +53,34 @@ public class PlayerComboSystem : MonoBehaviour
public static AttackSO GetRedFrenzy(PlayerStatsSO playerStats) => playerStats.mRedFrenzy;
public static ArcanaSO GetArcana(PlayerStatsSO playerStats, bool isCrouching = false, bool isAir = false, bool frenzied = false)
public static ArcanaSO GetArcana(PlayerStatsSO playerStats, Vector2 direction = default, bool isAir = false, bool frenzied = false)
{
if (isAir)
if (frenzied)
return playerStats.jArcanaFrenzy;
else
return playerStats.jArcana;
if (isCrouching)
if (direction == Vector2.down)
{
if (frenzied)
return playerStats.m2ArcanaFrenzy;
else
return playerStats.m2Arcana;
if (frenzied)
return playerStats.m5ArcanaFrenzy;
else
return playerStats.m5Arcana;
}
if (direction == Vector2.zero)
{
if (frenzied)
return playerStats.m5ArcanaFrenzy;
else
return playerStats.m5Arcana;
}
if (direction == Vector2.right)
{
if (frenzied)
return playerStats.m6ArcanaFrenzy;
else
return playerStats.m6Arcana;
}
return playerStats.m5Arcana;
}
}