thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-05 09:46:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added stages 4, 5, and 6 of hitsparks, maxhitlag 30

Browse source 
Now the amount of hitsparks is 7, need to do 3 more.
This commit is contained in:
VelocitOni 2023-07-01 20:48:20 -04:00
parent 5067bb854a
commit 25c0ff738c
5 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/deh_tables.c
View file

@ -4566,6 +4566,9 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
"S_HITLAG_1",
"S_HITLAG_2",
"S_HITLAG_3",
"S_HITLAG_4",
"S_HITLAG_5",
"S_HITLAG_6",
"S_HITLAG_9",
// Broly Ki Orb

6
src/info.c
View file

@ -576,6 +576,9 @@ char sprnames[NUMSPRITES + 1][5] =
"HFX1", // Hitlag stage 1
"HFX2", // Hitlag stage 2
"HFX3", // Hitlag stage 3
"HFX4", // Hitlag stage 4
"HFX5", // Hitlag stage 5
"HFX6", // Hitlag stage 6
"HFX9", // Hitlag stage 9
// Kart Items
@ -5243,6 +5246,9 @@ state_t states[NUMSTATES] =
{SPR_HFX1, FF_FULLBRIGHT|FF_PAPERSPRITE, 1, {NULL}, 0, 1, S_NULL}, // S_HITLAG_1
{SPR_HFX2, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 2, {NULL}, 1, 1, S_NULL}, // S_HITLAG_2
{SPR_HFX3, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 3, {NULL}, 2, 1, S_NULL}, // S_HITLAG_3
{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_HFX9, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 9, {NULL}, 8, 1, S_NULL}, // S_HITLAG_9
// Broly Ki Orb

6
src/info.h
View file

@ -1127,6 +1127,9 @@ typedef enum sprite
SPR_HFX1, // Hitlag stage 1
SPR_HFX2, // Hitlag stage 2
SPR_HFX3, // Hitlag stage 3
SPR_HFX4, // Hitlag stage 4
SPR_HFX5, // Hitlag stage 5
SPR_HFX6, // Hitlag stage 6
SPR_HFX9, // Hitlag stage 9
// Kart Items
@ -5673,6 +5676,9 @@ typedef enum state
S_HITLAG_1,
S_HITLAG_2,
S_HITLAG_3,
S_HITLAG_4,
S_HITLAG_5,
S_HITLAG_6,
S_HITLAG_9,
// Broly Ki Orb

6
src/k_hitlag.c
View file

@ -186,9 +186,9 @@ static void K_SpawnHitLagEFX(mobj_t *victim, mobj_t *inflictor, mobj_t *source,
startTics += max(1, FixedMul((particle * FRACUNIT) + (FRACUNIT/2), FRACUNIT/3) / FRACUNIT);
endTics += particle;
offset.x += P_RandomRange(PR_DECORATION, -75, 75) * newScale;
offset.y += P_RandomRange(PR_DECORATION, -75, 75) * newScale;
offset.z += P_RandomRange(PR_DECORATION, -75, 75) * newScale;
offset.x += P_RandomRange(PR_DECORATION, -45, 45) * newScale;
offset.y += P_RandomRange(PR_DECORATION, -45, 45) * newScale;
offset.z += P_RandomRange(PR_DECORATION, -45, 45) * newScale;
newScale = (newScale * 2) / 3;
}

4
src/k_hitlag.h
View file

@ -20,9 +20,9 @@
extern "C" {
#endif
#define MAXHITLAGTICS (20)
#define MAXHITLAGTICS (30)
#define HITLAGJITTERS (FRACUNIT / 20)
#define NUM_HITLAG_STATES (4)
#define NUM_HITLAG_STATES (7)
/*--------------------------------------------------
void K_AddHitLag(mobj_t *mo, INT32 tics, boolean fromDamage);