From c78c17d953b1520e1fb28c2fb45d1c9aa2a477dc Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 20 May 2024 22:18:15 +0200 Subject: [PATCH] funny driftsparkle --- src/dehacked.c | 20 +++++-- src/info.c | 149 +++++++++++++++++++++++++++++-------------------- src/info.h | 26 ++++++--- src/k_kart.c | 35 +++++++++++- 4 files changed, 156 insertions(+), 74 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 82dc9477e..786891eaf 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -6508,6 +6508,10 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_OPAQUESMOKE4", "S_OPAQUESMOKE5", +#ifdef SEENAMES + "S_NAMECHECK", +#endif + "S_WATERTRAIL1", "S_WATERTRAIL2", "S_WATERTRAIL3", @@ -6525,9 +6529,11 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_WATERTRAILUNDERLAY7", "S_WATERTRAILUNDERLAY8", -#ifdef SEENAMES - "S_NAMECHECK", -#endif + // Star Smoke + "S_DRIFTSTAR1", + "S_DRIFTSTAR2", + "S_DRIFTSTAR3", + "S_DRIFTSTAR4", }; // RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1", @@ -7319,12 +7325,14 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s "MT_KARMAFIREWORK", - "MT_WATERTRAIL", - "MT_WATERTRAILUNDERLAY", - #ifdef SEENAMES "MT_NAMECHECK", #endif + + "MT_WATERTRAIL", + "MT_WATERTRAILUNDERLAY", + + "MT_STARDUST", }; static const char *const MOBJFLAG_LIST[] = { diff --git a/src/info.c b/src/info.c index e15be2d74..6a0c24427 100644 --- a/src/info.c +++ b/src/info.c @@ -66,7 +66,7 @@ char sprnames[NUMSPRITES + 1][5] = "CNDL","DOCH","DUCK","GTRE","CHES","CHIM","DRGN","LZMN","PGSS","ZTCH", "MKMA","MKMP","RTCH","BOWL","BOWH","BRRL","BRRR","HRSE","TOAH","BFRT", "OFRT","RFRT","PFRT","ASPK","HBST","HBSO","HBSF","WBLZ","WBLN","OPUL", - "TGEM","TCOI","FWRK","WTRL","XMS4","XMS5","GCHA","VIEW" + "TGEM","TCOI","FWRK","XMS4","XMS5","VIEW","WTRL","DSTR" }; // Doesn't work with g++, needs actionf_p1 (don't modify this comment) @@ -3407,6 +3407,10 @@ state_t states[NUMSTATES] = {SPR_SMOK, 3, 7, {NULL}, 0, 0, S_OPAQUESMOKE5}, // S_OPAQUESMOKE4 {SPR_SMOK, 4, 8, {NULL}, 0, 0, S_NULL}, // S_OPAQUESMOKE5 +#ifdef SEENAMES + {SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL}, // S_NAMECHECK +#endif + // Water Trail {SPR_WTRL, FF_PAPERSPRITE , 2, {NULL}, 0, 0, S_NULL}, // S_WATERTRAIL1 {SPR_WTRL, FF_PAPERSPRITE|1, 2, {NULL}, 0, 0, S_NULL}, // S_WATERTRAIL2 @@ -3424,11 +3428,11 @@ state_t states[NUMSTATES] = {SPR_WTRL, FF_TRANS50|FF_PAPERSPRITE|13, 2, {NULL}, 0, 0, S_NULL}, // S_WATERTRAILUNDERLAY6 {SPR_WTRL, FF_TRANS50|FF_PAPERSPRITE|14, 2, {NULL}, 0, 0, S_NULL}, // S_WATERTRAILUNDERLAY7 {SPR_WTRL, FF_TRANS50|FF_PAPERSPRITE|15, 2, {NULL}, 0, 0, S_NULL}, // S_WATERTRAILUNDERLAY8 - -#ifdef SEENAMES - {SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL}, // S_NAMECHECK -#endif + {SPR_DSTR, 0, 3, {NULL}, 0, 0, S_DRIFTSTAR2}, // S_DRIFTSTAR1 + {SPR_DSTR, 1, 3, {NULL}, 0, 0, S_DRIFTSTAR3}, // S_DRIFTSTAR2 + {SPR_DSTR, FF_TRANS20|2, 3, {NULL}, 0, 0, S_DRIFTSTAR4}, // S_DRIFTSTAR3 + {SPR_DSTR, FF_TRANS20|3, 3, {NULL}, 0, 0, S_NULL}, // S_DRIFTSTAR4 }; mobjinfo_t mobjinfo[NUMMOBJTYPES] = @@ -20192,60 +20196,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - - { // MT_WATERTRAIL - -1, // doomednum - S_WATERTRAIL1, // spawnstate - 1000, // spawnhealth - S_NULL, // seestate - sfx_None, // seesound - 8, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 0, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_NULL, // deathstate - S_NULL, // xdeathstate - sfx_None, // deathsound - 0, // speed - 48*FRACUNIT, // radius - 32*FRACUNIT, // height - 1, // display offset - 100, // mass - 1, // damage - sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_SCENERY|MF_DONTENCOREMAP, // flags - S_NULL // raisestate - }, - { // MT_WATERTRAILUNDERLAY - -1, // doomednum - S_WATERTRAILUNDERLAY1, // spawnstate - 1000, // spawnhealth - S_NULL, // seestate - sfx_None, // seesound - 8, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 0, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_NULL, // deathstate - S_NULL, // xdeathstate - sfx_None, // deathsound - 0, // speed - 48*FRACUNIT, // radius - 32*FRACUNIT, // height - 0, // display offset - 100, // mass - 1, // damage - sfx_None, // activesound - MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_SCENERY|MF_DONTENCOREMAP, // flags - S_NULL // raisestate - }, - // ============================================================================================================================// #ifdef SEENAMES @@ -20276,6 +20226,87 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, #endif + + { // MT_WATERTRAIL + -1, // doomednum + S_WATERTRAIL1, // spawnstate + 1000, // spawnhealth + S_NULL, // seestate + sfx_None, // seesound + 8, // reactiontime + sfx_None, // attacksound + S_NULL, // painstate + 0, // painchance + sfx_None, // painsound + S_NULL, // meleestate + S_NULL, // missilestate + S_NULL, // deathstate + S_NULL, // xdeathstate + sfx_None, // deathsound + 0, // speed + 48*FRACUNIT, // radius + 32*FRACUNIT, // height + 1, // display offset + 100, // mass + 1, // damage + sfx_None, // activesound + MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_SCENERY|MF_DONTENCOREMAP, // flags + S_NULL // raisestate + }, + + { // MT_WATERTRAILUNDERLAY + -1, // doomednum + S_WATERTRAILUNDERLAY1, // spawnstate + 1000, // spawnhealth + S_NULL, // seestate + sfx_None, // seesound + 8, // reactiontime + sfx_None, // attacksound + S_NULL, // painstate + 0, // painchance + sfx_None, // painsound + S_NULL, // meleestate + S_NULL, // missilestate + S_NULL, // deathstate + S_NULL, // xdeathstate + sfx_None, // deathsound + 0, // speed + 48*FRACUNIT, // radius + 32*FRACUNIT, // height + 0, // display offset + 100, // mass + 1, // damage + sfx_None, // activesound + MF_NOBLOCKMAP|MF_NOCLIP|MF_NOGRAVITY|MF_SCENERY|MF_DONTENCOREMAP, // flags + S_NULL // raisestate + }, + + { // MT_STARDUST + -1, // doomednum + S_DRIFTSTAR1, // spawnstate + 1000, // spawnhealth + S_NULL, // seestate + sfx_None, // seesound + 8, // reactiontime + sfx_None, // attacksound + S_NULL, // painstate + 12, // painchance + sfx_None, // painsound + S_NULL, // meleestate + S_NULL, // missilestate + S_NULL, // deathstate + S_NULL, // xdeathstate + sfx_None, // deathsound + 8, // speed + 8*FRACUNIT, // radius + 15*FRACUNIT, // height + 0, // display offset + 100, // mass + 0, // damage + sfx_None, // activesound + MF_NOBLOCKMAP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_FLOAT|MF_SCENERY|MF_DONTENCOREMAP, // flags + S_NULL // raisestate + }, }; diff --git a/src/info.h b/src/info.h index 2f2b3fade..7e02b9774 100644 --- a/src/info.h +++ b/src/info.h @@ -784,8 +784,6 @@ typedef enum sprite SPR_FWRK, - SPR_WTRL, // Water Trail - // Xmas-specific sprites that don't fit aboxe SPR_XMS4, SPR_XMS5, @@ -793,6 +791,10 @@ typedef enum sprite // First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later SPR_VIEW, + SPR_WTRL, // Water Trail + + SPR_DSTR, // Star Dust + SPR_FIRSTFREESLOT, SPR_LASTFREESLOT = SPR_FIRSTFREESLOT + NUMSPRITEFREESLOTS - 1, NUMSPRITES @@ -4077,6 +4079,10 @@ typedef enum state S_OPAQUESMOKE4, S_OPAQUESMOKE5, +#ifdef SEENAMES + S_NAMECHECK, +#endif + S_WATERTRAIL1, S_WATERTRAIL2, S_WATERTRAIL3, @@ -4094,9 +4100,11 @@ typedef enum state S_WATERTRAILUNDERLAY7, S_WATERTRAILUNDERLAY8, -#ifdef SEENAMES - S_NAMECHECK, -#endif + // Star Smoke + S_DRIFTSTAR1, + S_DRIFTSTAR2, + S_DRIFTSTAR3, + S_DRIFTSTAR4, S_FIRSTFREESLOT, S_LASTFREESLOT = S_FIRSTFREESLOT + NUMSTATEFREESLOTS - 1, @@ -4905,13 +4913,15 @@ typedef enum mobj_type MT_KARMAFIREWORK, - MT_WATERTRAIL, - MT_WATERTRAILUNDERLAY, - #ifdef SEENAMES MT_NAMECHECK, #endif + MT_WATERTRAIL, + MT_WATERTRAILUNDERLAY, + + MT_STARDUST, + MT_FIRSTFREESLOT, MT_LASTFREESLOT = MT_FIRSTFREESLOT + NUMMOBJFREESLOTS - 1, NUMMOBJTYPES diff --git a/src/k_kart.c b/src/k_kart.c index a054a0525..1feaeaed9 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3464,7 +3464,7 @@ void K_DriftDustHandling(mobj_t *spawner) if (anglediff > ANGLE_180) anglediff = InvAngle(anglediff); - if (anglediff > ANG10*4) // Trying to turn further than 40 degrees + /*if (anglediff > ANG10*4) // Trying to turn further than 40 degrees { fixed_t spawnx = P_RandomRange(-spawnrange, spawnrange)< ANG10*4) // Trying to turn further than 40 degrees + { + fixed_t spawnx = P_RandomRange(-spawnrange, spawnrange)<x + spawnx, spawner->y + spawny, spawner->z, MT_STARDUST); + dust->momx = FixedMul(spawner->momx + (P_RandomRange(-speedrange, speedrange)<scale)/4); + dust->momy = FixedMul(spawner->momy + (P_RandomRange(-speedrange, speedrange)<scale)/4); + dust->momz = P_MobjFlip(spawner) * (P_RandomRange(1, 4) * (spawner->scale)); + P_SetScale(dust, spawner->scale/2); + dust->destscale = spawner->scale * 3; + dust->scalespeed = spawner->scale/12; + + if (leveltime % 6 == 0) + S_StartSound(spawner, sfx_screec); + + K_MatchGenericExtraFlags(dust, spawner); + + if (spawner->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(spawner->player)*4) + dust->color = 1 + (leveltime % (MAXSKINCOLORS-1)); + else if (spawner->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(spawner->player)*2) + { + if (spawner->player->kartstuff[k_driftcharge] <= (K_GetKartDriftSparkValue(spawner->player)*2)+(24*3)) + dust->color = SKINCOLOR_RASPBERRY; // transition + else + dust->color = SKINCOLOR_KETCHUP; + } + else if (spawner->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(spawner->player)) + dust->color = SKINCOLOR_SAPPHIRE; + else + dust->color = spawner->player->skincolor; } }