Merge branch 'new-offroad-dust' into 'master'

New Off-Road Dust

See merge request KartKrew/Kart!1213
This commit is contained in:
Oni 2023-04-30 07:58:37 +00:00
commit 08266c44c6
3 changed files with 23 additions and 5 deletions

View file

@ -3466,6 +3466,12 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
"S_WIPEOUTTRAIL3",
"S_WIPEOUTTRAIL4",
"S_WIPEOUTTRAIL5",
"S_WIPEOUTTRAIL6",
"S_WIPEOUTTRAIL7",
"S_WIPEOUTTRAIL8",
"S_WIPEOUTTRAIL9",
"S_WIPEOUTTRAIL10",
"S_WIPEOUTTRAIL11",
// Rocket sneaker
"S_ROCKETSNEAKER_L",

View file

@ -4107,11 +4107,17 @@ state_t states[NUMSTATES] =
{SPR_INVI, FF_FULLBRIGHT|FF_PAPERSPRITE|10, 1, {NULL}, 0, 0, S_KARTINVLINES15}, // S_KARTINVLINES14
{SPR_INVI, FF_FULLBRIGHT|FF_PAPERSPRITE|11, 1, {NULL}, 0, 0, S_NULL}, // S_KARTINVLINES15
{SPR_WIPD, 0, 3, {NULL}, 0, 0, S_WIPEOUTTRAIL2}, // S_WIPEOUTTRAIL1
{SPR_WIPD, 1, 3, {NULL}, 0, 0, S_WIPEOUTTRAIL3}, // S_WIPEOUTTRAIL2
{SPR_WIPD, 2, 3, {NULL}, 0, 0, S_WIPEOUTTRAIL4}, // S_WIPEOUTTRAIL3
{SPR_WIPD, 3, 3, {NULL}, 0, 0, S_WIPEOUTTRAIL5}, // S_WIPEOUTTRAIL4
{SPR_WIPD, 4, 3, {NULL}, 0, 0, S_NULL}, // S_WIPEOUTTRAIL5
{SPR_WIPD, 0, 1, {NULL}, 0, 0, S_WIPEOUTTRAIL2}, // S_WIPEOUTTRAIL1
{SPR_WIPD, 1, 1, {NULL}, 0, 0, S_WIPEOUTTRAIL3}, // S_WIPEOUTTRAIL2
{SPR_WIPD, 2, 1, {NULL}, 0, 0, S_WIPEOUTTRAIL4}, // S_WIPEOUTTRAIL3
{SPR_WIPD, 3, 1, {NULL}, 0, 0, S_WIPEOUTTRAIL5}, // S_WIPEOUTTRAIL4
{SPR_WIPD, 4, 1, {NULL}, 0, 0, S_WIPEOUTTRAIL6}, // S_WIPEOUTTRAIL5
{SPR_WIPD, 5, 1, {NULL}, 0, 0, S_WIPEOUTTRAIL7}, // S_WIPEOUTTRAIL6
{SPR_WIPD, 6, 1, {NULL}, 0, 0, S_WIPEOUTTRAIL8}, // S_WIPEOUTTRAIL7
{SPR_WIPD, 7, 1, {NULL}, 0, 0, S_WIPEOUTTRAIL9}, // S_WIPEOUTTRAIL8
{SPR_WIPD, 8, 1, {NULL}, 0, 0, S_WIPEOUTTRAIL10}, // S_WIPEOUTTRAIL9
{SPR_WIPD, 9, 1, {NULL}, 0, 0, S_WIPEOUTTRAIL11}, // S_WIPEOUTTRAIL10
{SPR_WIPD, 10, 1, {NULL}, 0, 0, S_NULL}, // S_WIPEOUTTRAIL11
{SPR_RSHE, 0, -1, {NULL}, 0, 0, S_NULL}, // S_ROCKETSNEAKER_L
{SPR_RSHE, 1, -1, {NULL}, 0, 0, S_NULL}, // S_ROCKETSNEAKER_R

View file

@ -4536,6 +4536,12 @@ typedef enum state
S_WIPEOUTTRAIL3,
S_WIPEOUTTRAIL4,
S_WIPEOUTTRAIL5,
S_WIPEOUTTRAIL6,
S_WIPEOUTTRAIL7,
S_WIPEOUTTRAIL8,
S_WIPEOUTTRAIL9,
S_WIPEOUTTRAIL10,
S_WIPEOUTTRAIL11,
// Rocket sneaker
S_ROCKETSNEAKER_L,