From 7b2ee0799383350086a49bfa6889e142eb167cf5 Mon Sep 17 00:00:00 2001 From: NepDisk <16447892+NepDisk@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:49:44 -0400 Subject: [PATCH] Remove RR ringsparkle and use regular srb2 ring sparkle --- src/d_player.h | 1 - src/deh_tables.c | 16 ---------------- src/info.c | 46 +-------------------------------------------- src/info.h | 17 ----------------- src/lua_playerlib.c | 4 ---- src/p_enemy.c | 5 ----- src/p_mobj.c | 15 --------------- src/p_saveg.c | 4 +--- 8 files changed, 2 insertions(+), 106 deletions(-) diff --git a/src/d_player.h b/src/d_player.h index 6e8b6a3f5..34255763d 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -445,7 +445,6 @@ typedef struct player_s UINT8 pickuprings; // Number of rings being picked up before added to the counter (prevents rings from being deleted forever over 20) UINT8 ringdelay; // (0 to 3) - 3 tic delay between every ring usage UINT16 ringboost; // Ring boost timer - UINT8 sparkleanim; // (0 to 19) - Angle offset for ring sparkle animation UINT16 superring; // Spawn rings on top of you every tic! UINT8 curshield; // see kartshields_t diff --git a/src/deh_tables.c b/src/deh_tables.c index cb3203ad8..2797bd15b 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -4351,21 +4351,6 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi "S_CHEESEHAPPY4", "S_RINGDEBT", - "S_RINGSPARKS1", - "S_RINGSPARKS2", - "S_RINGSPARKS3", - "S_RINGSPARKS4", - "S_RINGSPARKS5", - "S_RINGSPARKS6", - "S_RINGSPARKS7", - "S_RINGSPARKS8", - "S_RINGSPARKS9", - "S_RINGSPARKS10", - "S_RINGSPARKS11", - "S_RINGSPARKS12", - "S_RINGSPARKS13", - "S_RINGSPARKS14", - "S_RINGSPARKS15", "S_GAINAX_TINY", "S_GAINAX_HUGE", @@ -5460,7 +5445,6 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t "MT_TUMBLECOIN", "MT_KARMAFIREWORK", - "MT_RINGSPARKS", "MT_GAINAX", "MT_OVERTIME_PARTICLE", diff --git a/src/info.c b/src/info.c index 403d4000b..115b9bdfc 100644 --- a/src/info.c +++ b/src/info.c @@ -734,7 +734,6 @@ char sprnames[NUMSPRITES + 1][5] = "FWRK", "MXCL", - "RGSP", "LENS", "GRES", @@ -4921,22 +4920,6 @@ state_t states[NUMSTATES] = {SPR_MXCL, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_RINGDEBT - {SPR_RGSP, FF_PAPERSPRITE|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_RINGSPARKS2}, // S_RINGSPARKS1 - {SPR_RGSP, FF_PAPERSPRITE|FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_RINGSPARKS3}, // S_RINGSPARKS2 - {SPR_RGSP, FF_PAPERSPRITE|FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_RINGSPARKS4}, // S_RINGSPARKS3 - {SPR_RGSP, FF_PAPERSPRITE|FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_RINGSPARKS5}, // S_RINGSPARKS4 - {SPR_RGSP, FF_PAPERSPRITE|FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_RINGSPARKS6}, // S_RINGSPARKS5 - {SPR_RGSP, FF_PAPERSPRITE|FF_FULLBRIGHT|5, 1, {NULL}, 0, 0, S_RINGSPARKS7}, // S_RINGSPARKS6 - {SPR_RGSP, FF_PAPERSPRITE|FF_FULLBRIGHT|6, 1, {NULL}, 0, 0, S_RINGSPARKS8}, // S_RINGSPARKS7 - {SPR_RGSP, FF_PAPERSPRITE|FF_FULLBRIGHT|7, 1, {NULL}, 0, 0, S_RINGSPARKS9}, // S_RINGSPARKS8 - {SPR_RGSP, FF_PAPERSPRITE|FF_FULLBRIGHT|8, 1, {NULL}, 0, 0, S_RINGSPARKS10}, // S_RINGSPARKS9 - {SPR_RGSP, FF_PAPERSPRITE|FF_FULLBRIGHT|9, 1, {NULL}, 0, 0, S_RINGSPARKS11}, // S_RINGSPARKS10 - {SPR_RGSP, FF_PAPERSPRITE|FF_FULLBRIGHT|10, 1, {NULL}, 0, 0, S_RINGSPARKS12}, // S_RINGSPARKS11 - {SPR_RGSP, FF_PAPERSPRITE|FF_FULLBRIGHT|11, 1, {NULL}, 0, 0, S_RINGSPARKS13}, // S_RINGSPARKS12 - {SPR_RGSP, FF_PAPERSPRITE|FF_FULLBRIGHT|12, 1, {NULL}, 0, 0, S_RINGSPARKS14}, // S_RINGSPARKS13 - {SPR_RGSP, FF_PAPERSPRITE|FF_FULLBRIGHT|13, 1, {NULL}, 0, 0, S_RINGSPARKS15}, // S_RINGSPARKS14 - {SPR_RGSP, FF_PAPERSPRITE|FF_FULLBRIGHT|14, 1, {NULL}, 0, 0, S_NULL}, // S_RINGSPARKS15 - {SPR_LENS, FF_FULLBRIGHT|FF_ADD|FF_TRANS10|FF_ANIMATE|11, -1, {NULL}, 3, 1, S_NULL}, // S_GAINAX_TINY {SPR_LENS, FF_FULLBRIGHT|FF_ADD|FF_TRANS10|FF_ANIMATE, 5, {NULL}, 5, 1, S_GAINAX_MID1}, // S_GAINAX_HUGE {SPR_LENS, FF_FULLBRIGHT|FF_ADD|FF_TRANS10|FF_ANIMATE|5, 14, {NULL}, 14, 1, S_GAINAX_MID2}, // S_GAINAX_MID1 @@ -7545,7 +7528,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_NULL, // deathstate + S_SPRK1, // deathstate S_NULL, // xdeathstate sfx_itemup, // deathsound 38*FRACUNIT, // speed @@ -27710,33 +27693,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - - { // MT_RINGSPARKS - -1, // doomednum - S_RINGSPARKS1, // 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 - 8<ringdelay); else if (fastcmp(field,"ringboost")) lua_pushinteger(L, plr->ringboost); - else if (fastcmp(field,"sparkleanim")) - lua_pushinteger(L, plr->sparkleanim); else if (fastcmp(field,"superring")) lua_pushinteger(L, plr->superring); else if (fastcmp(field,"curshield")) @@ -652,8 +650,6 @@ static int player_set(lua_State *L) plr->ringdelay = luaL_checkinteger(L, 3); else if (fastcmp(field,"ringboost")) plr->ringboost = luaL_checkinteger(L, 3); - else if (fastcmp(field,"sparkleanim")) - plr->sparkleanim = luaL_checkinteger(L, 3); else if (fastcmp(field,"superring")) plr->superring = luaL_checkinteger(L, 3); else if (fastcmp(field,"curshield")) diff --git a/src/p_enemy.c b/src/p_enemy.c index a47d1cba9..1776eb4cd 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -3829,11 +3829,6 @@ void A_AttractChase(mobj_t *actor) actor->target->player->ringboost += K_GetKartRingPower(actor->target->player, true) + 3; S_StartSound(actor->target, sfx_s1b5); - sparkle = P_SpawnMobj(actor->target->x, actor->target->y, actor->target->z, MT_RINGSPARKS); - P_SetTarget(&sparkle->target, actor->target); - sparkle->angle = (actor->target->angle + (offset>>1)) + (offset * actor->target->player->sparkleanim); - actor->target->player->sparkleanim = (actor->target->player->sparkleanim+1) % 20; - P_KillMobj(actor, actor->target, actor->target, DMG_NORMAL); return; } diff --git a/src/p_mobj.c b/src/p_mobj.c index b7489de3f..787d3e09c 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -7341,21 +7341,6 @@ static boolean P_MobjRegularThink(mobj_t *mobj) K_MatchGenericExtraFlags(mobj, mobj->target); P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z + (mobj->target->height/2) + mobj->movefactor); break; - case MT_RINGSPARKS: - if (!mobj->target || P_MobjWasRemoved(mobj->target)) - { - P_RemoveMobj(mobj); - return false; - } - - mobj->z = mobj->target->z; - - K_MatchGenericExtraFlags(mobj, mobj->target); - - P_MoveOrigin(mobj, mobj->target->x + FINECOSINE(mobj->angle >> ANGLETOFINESHIFT), - mobj->target->y + FINESINE(mobj->angle >> ANGLETOFINESHIFT), - mobj->z + (mobj->target->height * P_MobjFlip(mobj))); - break; case MT_GAINAX: if (!mobj->target || P_MobjWasRemoved(mobj->target) // sanity || !mobj->target->player // ditto diff --git a/src/p_saveg.c b/src/p_saveg.c index 333b74e53..6490afed6 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -294,7 +294,6 @@ static void P_NetArchivePlayers(void) WRITEUINT8(save_p, players[i].pickuprings); WRITEUINT8(save_p, players[i].ringdelay); WRITEUINT16(save_p, players[i].ringboost); - WRITEUINT8(save_p, players[i].sparkleanim); WRITEUINT16(save_p, players[i].superring); WRITEUINT8(save_p, players[i].curshield); @@ -581,8 +580,7 @@ static void P_NetUnArchivePlayers(void) players[i].rings = READSINT8(save_p); players[i].pickuprings = READUINT8(save_p); players[i].ringdelay = READUINT8(save_p); - players[i].ringboost = READUINT16(save_p); - players[i].sparkleanim = READUINT8(save_p); + players[i].ringboost = READUINT16(save_p);; players[i].superring = READUINT16(save_p); players[i].curshield = READUINT8(save_p);