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

Update for death and timer

Browse Source
This commit is contained in:
David Kalatzis
2023-01-27 02:16:02 +02:00
parent 473fc9446d
commit bc656c19bf
9 changed files with 453 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/_Project/Scripts/SimulationScripts/StateScripts/StatesScripts/ExceptionStateScripts/DeathState.cs
View File

@@ -2,10 +2,12 @@ using UnityEngine;
public class DeathState : State
{
//TODO: Refactor frame checks
public override void UpdateLogic(PlayerNetwork player)
{
if (!player.enter)
{
GameSimulation.GlobalHitstop = 2;
player.velocity = DemonicsVector2.Zero;
player.enter = true;
player.animationFrames = 0;
@@ -14,25 +16,28 @@ public class DeathState : State
GameSimulation.IntroFrame = 360;
player.healthRecoverable = 0;
player.player.PlayerUI.UpdateHealthDamaged(player.healthRecoverable);
ResetCombo(player);
if (!SceneSettings.IsTrainingMode)
{
GameSimulation.Run = false;
}
}
player.velocity = new DemonicsVector2(player.velocity.x, player.velocity.y - DemonicsPhysics.GRAVITY);
player.animation = "Knockdown";
player.animation = "Death";
player.animationFrames++;
if (player.animationFrames >= 510)
if (player.animationFrames >= 510 / GameSimulation.GlobalHitstop)
{
if (player.otherPlayer.state != "Taunt")
{
GameSimulation.GlobalHitstop = 1;
EnterState(player.otherPlayer, "Taunt");
}
}
if (SceneSettings.IsTrainingMode)
{
if (player.animationFrames >= 190)
if (player.animationFrames >= 190 / GameSimulation.GlobalHitstop)
{
GameSimulation.GlobalHitstop = 1;
ResetPlayer(player);
ResetPlayer(player.otherPlayer);
EnterState(player, "Idle");
@@ -40,8 +45,9 @@ public class DeathState : State
}
else
{
if (player.animationFrames >= 725)
if (player.animationFrames >= 725 / GameSimulation.GlobalHitstop)
{
GameSimulation.GlobalHitstop = 1;
ResetPlayer(player);
ResetPlayer(player.otherPlayer);
EnterState(player, "Taunt");