thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'spring-semibright' into 'master'

Browse source 
Apply semibright to all spring types (excluding pogo)

See merge request KartKrew/Kart!1695
This commit is contained in:
James R. 2023-12-22 06:13:55 +00:00
commit 701680fcdc
1 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
src/info.c
View file

@ -3322,28 +3322,28 @@ state_t states[NUMSTATES] =
{SPR_NULL, 0, 0, {A_SpawnFreshCopy}, 0, 0, S_NULL}, // S_BALLOONPOP6
// Yellow Spring
{SPR_SPVY, 0, -1, {NULL}, 0, 0, S_NULL}, // S_YELLOWSPRING1
{SPR_SPVY, 1, 1, {A_Pain}, 0, 0, S_YELLOWSPRING3}, // S_YELLOWSPRING2
{SPR_SPVY, 0, 1, {NULL}, 0, 0, S_YELLOWSPRING4}, // S_YELLOWSPRING3
{SPR_SPVY, 2, 4, {NULL}, 0, 0, S_YELLOWSPRING1}, // S_YELLOWSPRING4
{SPR_SPVY, FF_SEMIBRIGHT|0, -1, {NULL}, 0, 0, S_NULL}, // S_YELLOWSPRING1
{SPR_SPVY, FF_SEMIBRIGHT|1, 1, {A_Pain}, 0, 0, S_YELLOWSPRING3}, // S_YELLOWSPRING2
{SPR_SPVY, FF_SEMIBRIGHT|0, 1, {NULL}, 0, 0, S_YELLOWSPRING4}, // S_YELLOWSPRING3
{SPR_SPVY, FF_SEMIBRIGHT|2, 4, {NULL}, 0, 0, S_YELLOWSPRING1}, // S_YELLOWSPRING4
// Red Spring
{SPR_SPVR, 0, -1, {NULL}, 0, 0, S_NULL}, // S_REDSPRING1
{SPR_SPVR, 1, 1, {A_Pain}, 0, 0, S_REDSPRING3}, // S_REDSPRING2
{SPR_SPVR, 0, 1, {NULL}, 0, 0, S_REDSPRING4}, // S_REDSPRING3
{SPR_SPVR, 2, 4, {NULL}, 0, 0, S_REDSPRING1}, // S_REDSPRING4
{SPR_SPVR, FF_SEMIBRIGHT|0, -1, {NULL}, 0, 0, S_NULL}, // S_REDSPRING1
{SPR_SPVR, FF_SEMIBRIGHT|1, 1, {A_Pain}, 0, 0, S_REDSPRING3}, // S_REDSPRING2
{SPR_SPVR, FF_SEMIBRIGHT|0, 1, {NULL}, 0, 0, S_REDSPRING4}, // S_REDSPRING3
{SPR_SPVR, FF_SEMIBRIGHT|2, 4, {NULL}, 0, 0, S_REDSPRING1}, // S_REDSPRING4
// Blue Spring
{SPR_SPVB, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BLUESPRING1
{SPR_SPVB, 1, 1, {A_Pain}, 0, 0, S_BLUESPRING3}, // S_BLUESPRING2
{SPR_SPVB, 0, 1, {NULL}, 0, 0, S_BLUESPRING4}, // S_BLUESPRING3
{SPR_SPVB, 2, 4, {NULL}, 0, 0, S_BLUESPRING1}, // S_BLUESPRING4
{SPR_SPVB, FF_SEMIBRIGHT|0, -1, {NULL}, 0, 0, S_NULL}, // S_BLUESPRING1
{SPR_SPVB, FF_SEMIBRIGHT|1, 1, {A_Pain}, 0, 0, S_BLUESPRING3}, // S_BLUESPRING2
{SPR_SPVB, FF_SEMIBRIGHT|0, 1, {NULL}, 0, 0, S_BLUESPRING4}, // S_BLUESPRING3
{SPR_SPVB, FF_SEMIBRIGHT|2, 4, {NULL}, 0, 0, S_BLUESPRING1}, // S_BLUESPRING4
// Grey Spring
{SPR_SPVG, 0, -1, {NULL}, 0, 0, S_NULL}, // S_GREYSPRING1
{SPR_SPVG, 1, 1, {A_Pain}, 0, 0, S_GREYSPRING3}, // S_GREYSPRING2
{SPR_SPVG, 0, 1, {NULL}, 0, 0, S_GREYSPRING4}, // S_GREYSPRING3
{SPR_SPVG, 2, 4, {NULL}, 0, 0, S_GREYSPRING1}, // S_GREYSPRING4
{SPR_SPVG, FF_SEMIBRIGHT|0, -1, {NULL}, 0, 0, S_NULL}, // S_GREYSPRING1
{SPR_SPVG, FF_SEMIBRIGHT|1, 1, {A_Pain}, 0, 0, S_GREYSPRING3}, // S_GREYSPRING2
{SPR_SPVG, FF_SEMIBRIGHT|0, 1, {NULL}, 0, 0, S_GREYSPRING4}, // S_GREYSPRING3
{SPR_SPVG, FF_SEMIBRIGHT|2, 4, {NULL}, 0, 0, S_GREYSPRING1}, // S_GREYSPRING4
// Orange Spring (Pogo)
{SPR_POGS, 0, -1, {NULL}, 0, 0, S_NULL}, // S_POGOSPRING1
@ -3353,52 +3353,52 @@ state_t states[NUMSTATES] =
{SPR_POGS, 2, 4, {NULL}, 0, 0, S_POGOSPRING1}, // S_POGOSPRING4
// Yellow Diagonal Spring
{SPR_SPDY, 0, -1, {NULL}, 0, 0, S_NULL}, // S_YDIAG1
{SPR_SPDY, 1, 1, {A_Pain}, 0, 0, S_YDIAG3}, // S_YDIAG2
{SPR_SPDY, 0, 1, {NULL}, 0, 0, S_YDIAG4}, // S_YDIAG3
{SPR_SPDY, 2, 4, {NULL}, 0, 0, S_YDIAG1}, // S_YDIAG4
{SPR_SPDY, FF_SEMIBRIGHT|0, -1, {NULL}, 0, 0, S_NULL}, // S_YDIAG1
{SPR_SPDY, FF_SEMIBRIGHT|1, 1, {A_Pain}, 0, 0, S_YDIAG3}, // S_YDIAG2
{SPR_SPDY, FF_SEMIBRIGHT|0, 1, {NULL}, 0, 0, S_YDIAG4}, // S_YDIAG3
{SPR_SPDY, FF_SEMIBRIGHT|2, 4, {NULL}, 0, 0, S_YDIAG1}, // S_YDIAG4
// Red Diagonal Spring
{SPR_SPDR, 0, -1, {NULL}, 0, 0, S_NULL}, // S_RDIAG1
{SPR_SPDR, 1, 1, {A_Pain}, 0, 0, S_RDIAG3}, // S_RDIAG2
{SPR_SPDR, 0, 1, {NULL}, 0, 0, S_RDIAG4}, // S_RDIAG3
{SPR_SPDR, 2, 4, {NULL}, 0, 0, S_RDIAG1}, // S_RDIAG4
{SPR_SPDR, FF_SEMIBRIGHT|0, -1, {NULL}, 0, 0, S_NULL}, // S_RDIAG1
{SPR_SPDR, FF_SEMIBRIGHT|1, 1, {A_Pain}, 0, 0, S_RDIAG3}, // S_RDIAG2
{SPR_SPDR, FF_SEMIBRIGHT|0, 1, {NULL}, 0, 0, S_RDIAG4}, // S_RDIAG3
{SPR_SPDR, FF_SEMIBRIGHT|2, 4, {NULL}, 0, 0, S_RDIAG1}, // S_RDIAG4
// Blue Diagonal Spring
{SPR_SPDB, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BDIAG1
{SPR_SPDB, 1, 1, {A_Pain}, 0, 0, S_BDIAG3}, // S_BDIAG2
{SPR_SPDB, 0, 1, {NULL}, 0, 0, S_BDIAG4}, // S_BDIAG3
{SPR_SPDB, 2, 4, {NULL}, 0, 0, S_BDIAG1}, // S_BDIAG4
{SPR_SPDB, FF_SEMIBRIGHT|0, -1, {NULL}, 0, 0, S_NULL}, // S_BDIAG1
{SPR_SPDB, FF_SEMIBRIGHT|1, 1, {A_Pain}, 0, 0, S_BDIAG3}, // S_BDIAG2
{SPR_SPDB, FF_SEMIBRIGHT|0, 1, {NULL}, 0, 0, S_BDIAG4}, // S_BDIAG3
{SPR_SPDB, FF_SEMIBRIGHT|2, 4, {NULL}, 0, 0, S_BDIAG1}, // S_BDIAG4
// Grey Diagonal Spring
{SPR_SPDG, 0, -1, {NULL}, 0, 0, S_NULL}, // S_GDIAG1
{SPR_SPDG, 1, 1, {A_Pain}, 0, 0, S_GDIAG3}, // S_GDIAG2
{SPR_SPDG, 0, 1, {NULL}, 0, 0, S_GDIAG4}, // S_GDIAG3
{SPR_SPDG, 2, 4, {NULL}, 0, 0, S_GDIAG1}, // S_GDIAG4
{SPR_SPDG, FF_SEMIBRIGHT|0, -1, {NULL}, 0, 0, S_NULL}, // S_GDIAG1
{SPR_SPDG, FF_SEMIBRIGHT|1, 1, {A_Pain}, 0, 0, S_GDIAG3}, // S_GDIAG2
{SPR_SPDG, FF_SEMIBRIGHT|0, 1, {NULL}, 0, 0, S_GDIAG4}, // S_GDIAG3
{SPR_SPDG, FF_SEMIBRIGHT|2, 4, {NULL}, 0, 0, S_GDIAG1}, // S_GDIAG4
// Yellow Horizontal Spring
{SPR_SPHY, 0, -1, {NULL}, 0, 0, S_NULL}, // S_YHORIZ1
{SPR_SPHY, 1, 1, {A_Pain}, 0, 0, S_YHORIZ3}, // S_YHORIZ2
{SPR_SPHY, 0, 1, {NULL}, 0, 0, S_YHORIZ4}, // S_YHORIZ3
{SPR_SPHY, 2, 4, {NULL}, 0, 0, S_YHORIZ1}, // S_YHORIZ4
{SPR_SPHY, FF_SEMIBRIGHT|0, -1, {NULL}, 0, 0, S_NULL}, // S_YHORIZ1
{SPR_SPHY, FF_SEMIBRIGHT|1, 1, {A_Pain}, 0, 0, S_YHORIZ3}, // S_YHORIZ2
{SPR_SPHY, FF_SEMIBRIGHT|0, 1, {NULL}, 0, 0, S_YHORIZ4}, // S_YHORIZ3
{SPR_SPHY, FF_SEMIBRIGHT|2, 4, {NULL}, 0, 0, S_YHORIZ1}, // S_YHORIZ4
// Red Horizontal Spring
{SPR_SPHR, 0, -1, {NULL}, 0, 0, S_NULL}, // S_RHORIZ1
{SPR_SPHR, 1, 1, {A_Pain}, 0, 0, S_RHORIZ3}, // S_RHORIZ2
{SPR_SPHR, 0, 1, {NULL}, 0, 0, S_RHORIZ4}, // S_RHORIZ3
{SPR_SPHR, 2, 4, {NULL}, 0, 0, S_RHORIZ1}, // S_RHORIZ4
{SPR_SPHR, FF_SEMIBRIGHT|0, -1, {NULL}, 0, 0, S_NULL}, // S_RHORIZ1
{SPR_SPHR, FF_SEMIBRIGHT|1, 1, {A_Pain}, 0, 0, S_RHORIZ3}, // S_RHORIZ2
{SPR_SPHR, FF_SEMIBRIGHT|0, 1, {NULL}, 0, 0, S_RHORIZ4}, // S_RHORIZ3
{SPR_SPHR, FF_SEMIBRIGHT|2, 4, {NULL}, 0, 0, S_RHORIZ1}, // S_RHORIZ4
// Blue Horizontal Spring
{SPR_SPHB, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BHORIZ1
{SPR_SPHB, 1, 1, {A_Pain}, 0, 0, S_BHORIZ3}, // S_BHORIZ2
{SPR_SPHB, 0, 1, {NULL}, 0, 0, S_BHORIZ4}, // S_BHORIZ3
{SPR_SPHB, 2, 4, {NULL}, 0, 0, S_BHORIZ1}, // S_BHORIZ4
{SPR_SPHB, FF_SEMIBRIGHT|0, -1, {NULL}, 0, 0, S_NULL}, // S_BHORIZ1
{SPR_SPHB, FF_SEMIBRIGHT|1, 1, {A_Pain}, 0, 0, S_BHORIZ3}, // S_BHORIZ2
{SPR_SPHB, FF_SEMIBRIGHT|0, 1, {NULL}, 0, 0, S_BHORIZ4}, // S_BHORIZ3
{SPR_SPHB, FF_SEMIBRIGHT|2, 4, {NULL}, 0, 0, S_BHORIZ1}, // S_BHORIZ4
// Grey Horizontal Spring
{SPR_SPHG, 0, -1, {NULL}, 0, 0, S_NULL}, // S_GHORIZ1
{SPR_SPHG, 1, 1, {A_Pain}, 0, 0, S_GHORIZ3}, // S_GHORIZ2
{SPR_SPHG, 0, 1, {NULL}, 0, 0, S_GHORIZ4}, // S_GHORIZ3
{SPR_SPHG, 2, 4, {NULL}, 0, 0, S_GHORIZ1}, // S_GHORIZ4
{SPR_SPHG, FF_SEMIBRIGHT|0, -1, {NULL}, 0, 0, S_NULL}, // S_GHORIZ1
{SPR_SPHG, FF_SEMIBRIGHT|1, 1, {A_Pain}, 0, 0, S_GHORIZ3}, // S_GHORIZ2
{SPR_SPHG, FF_SEMIBRIGHT|0, 1, {NULL}, 0, 0, S_GHORIZ4}, // S_GHORIZ3
{SPR_SPHG, FF_SEMIBRIGHT|2, 4, {NULL}, 0, 0, S_GHORIZ1}, // S_GHORIZ4
// Boosters
{SPR_NULL, 0, 1, {A_Pain}, 0, 0, S_INVISIBLE}, // S_BOOSTERSOUND