From b1054f486eceb941a2a3c26d03274eb0332ddfc4 Mon Sep 17 00:00:00 2001 From: VelocitOni Date: Mon, 3 Jul 2023 06:15:03 -0400 Subject: [PATCH] Added level 8 hitsparks Added level 8 hitsparks, 2 more to go. Gonna take MR out of draft though and do the other 2 later. --- src/deh_tables.c | 1 + src/info.c | 2 ++ src/info.h | 2 ++ src/k_hitlag.h | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/deh_tables.c b/src/deh_tables.c index 0b3a456fd..323bf3bc0 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -4569,6 +4569,7 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi "S_HITLAG_4", "S_HITLAG_5", "S_HITLAG_6", + "S_HITLAG_8", "S_HITLAG_9", // Broly Ki Orb diff --git a/src/info.c b/src/info.c index d805c8771..eeb22c45a 100644 --- a/src/info.c +++ b/src/info.c @@ -579,6 +579,7 @@ char sprnames[NUMSPRITES + 1][5] = "HFX4", // Hitlag stage 4 "HFX5", // Hitlag stage 5 "HFX6", // Hitlag stage 6 + "HFX8", // Hitlag stage 8 "HFX9", // Hitlag stage 9 // Kart Items @@ -5249,6 +5250,7 @@ state_t states[NUMSTATES] = {SPR_HFX4, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 4, {NULL}, 3, 1, S_NULL}, // S_HITLAG_4 {SPR_HFX5, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 5, {NULL}, 4, 1, S_NULL}, // S_HITLAG_5 {SPR_HFX6, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 6, {NULL}, 5, 1, S_NULL}, // S_HITLAG_6 + {SPR_HFX8, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 8, {NULL}, 7, 1, S_NULL}, // S_HITLAG_8 {SPR_HFX9, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 9, {NULL}, 8, 1, S_NULL}, // S_HITLAG_9 // Broly Ki Orb diff --git a/src/info.h b/src/info.h index 7c35acede..c52ec8541 100644 --- a/src/info.h +++ b/src/info.h @@ -1130,6 +1130,7 @@ typedef enum sprite SPR_HFX4, // Hitlag stage 4 SPR_HFX5, // Hitlag stage 5 SPR_HFX6, // Hitlag stage 6 + SPR_HFX8, // Hitlag stage 8 SPR_HFX9, // Hitlag stage 9 // Kart Items @@ -5679,6 +5680,7 @@ typedef enum state S_HITLAG_4, S_HITLAG_5, S_HITLAG_6, + S_HITLAG_8, S_HITLAG_9, // Broly Ki Orb diff --git a/src/k_hitlag.h b/src/k_hitlag.h index 45e0126ae..02dedfc2a 100644 --- a/src/k_hitlag.h +++ b/src/k_hitlag.h @@ -22,7 +22,7 @@ extern "C" { #define MAXHITLAGTICS (30) #define HITLAGJITTERS (FRACUNIT / 20) -#define NUM_HITLAG_STATES (7) +#define NUM_HITLAG_STATES (8) /*-------------------------------------------------- void K_AddHitLag(mobj_t *mo, INT32 tics, boolean fromDamage);