diff --git a/src/dehacked.c b/src/dehacked.c index c108a818c..5d77e61dc 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -9432,6 +9432,22 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_FINISHBEAMEND1", "S_FINISHBEAMEND2", + // Funny Spike + "S_DEBTSPIKE1", + "S_DEBTSPIKE2", + "S_DEBTSPIKE3", + "S_DEBTSPIKE4", + "S_DEBTSPIKE5", + "S_DEBTSPIKE6", + "S_DEBTSPIKE7", + "S_DEBTSPIKE8", + "S_DEBTSPIKE9", + "S_DEBTSPIKEA", + "S_DEBTSPIKEB", + "S_DEBTSPIKEC", + "S_DEBTSPIKED", + "S_DEBTSPIKEE", + #ifdef SEENAMES "S_NAMECHECK", #endif @@ -9573,6 +9589,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s // Collectible Items "MT_RING", "MT_FLINGRING", // Lost ring + "MT_DEBTSPIKE", // Ring debt funny spike "MT_BLUESPHERE", // Blue sphere for special stages "MT_FLINGBLUESPHERE", // Lost blue sphere "MT_BOMBSPHERE", diff --git a/src/info.c b/src/info.c index 53a0850e8..4652c4ed9 100644 --- a/src/info.c +++ b/src/info.c @@ -133,6 +133,7 @@ char sprnames[NUMSPRITES + 1][5] = // Collectible Items "RING", + "DEBT", "TRNG", // Team Rings "TOKE", // Special Stage Token "RFLG", // Red CTF Flag @@ -5170,6 +5171,22 @@ state_t states[NUMSTATES] = {SPR_FLBM, FF_PAPERSPRITE|5, 1, {NULL}, 0, 0, S_NULL}, // S_FINISHBEAMEND1 {SPR_FLBM, FF_PAPERSPRITE|6, 1, {NULL}, 0, 0, S_NULL}, // S_FINISHBEAMEND2 + // Funny Spike + {SPR_DEBT, 0|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE2}, // S_DEBTSPIKE1 + {SPR_DEBT, 7|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE3}, // S_DEBTSPIKE2 + {SPR_DEBT, 1|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE4}, // S_DEBTSPIKE3 + {SPR_DEBT, 7|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE5}, // S_DEBTSPIKE4 + {SPR_DEBT, 2|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE6}, // S_DEBTSPIKE5 + {SPR_DEBT, 7|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE7}, // S_DEBTSPIKE6 + {SPR_DEBT, 3|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE8}, // S_DEBTSPIKE7 + {SPR_DEBT, 7|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE9}, // S_DEBTSPIKE8 + {SPR_DEBT, 4|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKEA}, // S_DEBTSPIKE9 + {SPR_DEBT, 7|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKEB}, // S_DEBTSPIKEA + {SPR_DEBT, 5|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKEC}, // S_DEBTSPIKEB + {SPR_DEBT, 7|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKED}, // S_DEBTSPIKEC + {SPR_DEBT, 6|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKEE}, // S_DEBTSPIKED + {SPR_DEBT, 7|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_DEBTSPIKE1}, // S_DEBTSPIKEE + #ifdef SEENAMES {SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL}, // S_NAMECHECK #endif @@ -8120,6 +8137,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, + { // MT_DEBTSPIKE + -1, // doomednum + S_DEBTSPIKE1, // spawnstate + 1000, // spawnhealth + S_NULL, // seestate + sfx_None, // seesound + MT_FLINGRING, // reactiontime + sfx_None, // attacksound + S_NULL, // painstate + MT_RING, // painchance + sfx_None, // painsound + S_NULL, // meleestate + S_NULL, // missilestate + S_SPRK1, // deathstate + S_NULL, // xdeathstate + sfx_itemup, // deathsound + 38*FRACUNIT, // speed + 24*FRACUNIT, // radius + 48*FRACUNIT, // height + 0, // display offset + 100, // mass + 0, // damage + sfx_None, // activesound + MF_DONTENCOREMAP, // flags + S_NULL // raisestate + }, + { // MT_BLUESPHERE -1, // doomednum S_BLUESPHERE_SPAWN, // spawnstate diff --git a/src/info.h b/src/info.h index 6265bd38a..3fc3e718b 100644 --- a/src/info.h +++ b/src/info.h @@ -404,6 +404,7 @@ typedef enum sprite // Collectible Items SPR_RING, + SPR_DEBT, SPR_TRNG, // Team Rings SPR_TOKE, // Special Stage Token SPR_RFLG, // Red CTF Flag @@ -5304,6 +5305,21 @@ typedef enum state S_FINISHBEAMEND1, S_FINISHBEAMEND2, + S_DEBTSPIKE1, + S_DEBTSPIKE2, + S_DEBTSPIKE3, + S_DEBTSPIKE4, + S_DEBTSPIKE5, + S_DEBTSPIKE6, + S_DEBTSPIKE7, + S_DEBTSPIKE8, + S_DEBTSPIKE9, + S_DEBTSPIKEA, + S_DEBTSPIKEB, + S_DEBTSPIKEC, + S_DEBTSPIKED, + S_DEBTSPIKEE, + #ifdef SEENAMES S_NAMECHECK, #endif @@ -5465,6 +5481,7 @@ typedef enum mobj_type // Collectible Items MT_RING, MT_FLINGRING, // Lost ring + MT_DEBTSPIKE, // Ring debt funny spike MT_BLUESPHERE, // Blue sphere for special stages MT_FLINGBLUESPHERE, // Lost blue sphere MT_BOMBSPHERE, diff --git a/src/k_kart.c b/src/k_kart.c index 71adac13d..2f01f2dc0 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -2881,8 +2881,10 @@ static void K_HandleTumbleSound(player_t *player) } } -void K_ExplodePlayer(player_t *player, mobj_t *inflictor, mobj_t *source) // A bit of a hack, we just throw the player up higher here and extend their spinout timer +INT32 K_ExplodePlayer(player_t *player, mobj_t *inflictor, mobj_t *source) // A bit of a hack, we just throw the player up higher here and extend their spinout timer { + INT32 ringburst = 10; + (void)source; player->mo->momz = 18*mapobjectscale*P_MobjFlip(player->mo); // please stop forgetting mobjflip checks!!!! @@ -2897,6 +2899,7 @@ void K_ExplodePlayer(player_t *player, mobj_t *inflictor, mobj_t *source) // A b { player->kartstuff[k_spinouttimer] = ((5*player->kartstuff[k_spinouttimer])/2)+1; player->mo->momz *= 2; + ringburst = 20; } } @@ -2907,6 +2910,8 @@ void K_ExplodePlayer(player_t *player, mobj_t *inflictor, mobj_t *source) // A b if (P_IsDisplayPlayer(player)) P_StartQuake(64<> 1; + + z = player->mo->z; + if (player->mo->eflags & MFE_VERTICALFLIP) + z += player->mo->height - mobjinfo[objType].height; + + mo = P_SpawnMobj(player->mo->x, player->mo->y, z, objType); + + mo->threshold = 10; // not useful for spikes + mo->fuse = objFuse; + P_SetTarget(&mo->target, player->mo); + + mo->destscale = objScale; + P_SetScale(mo, objScale); + + /* + 0: 0 + 1: 1 = (1+1)/2 = 1 + 2: 1 = (2+1)/2 = 1 + 3: 2 = (3+1)/2 = 2 + 4: 2 = (4+1)/2 = 2 + 5: 3 = (4+1)/2 = 2 + */ + // Angle / height offset changes every other ring + momxy -= mx * FRACUNIT; + momz += mx * (2<mo->scale); + mo->momx = (mo->target->momx/2) + FixedMul(FINECOSINE(fa>>ANGLETOFINESHIFT), ns); + mo->momy = (mo->target->momy/2) + FixedMul(FINESINE(fa>>ANGLETOFINESHIFT), ns); + + ns = FixedMul(momz, player->mo->scale); + P_SetObjectMomZ(mo, (mo->target->momz/2) + ns, false); + + if (player->mo->eflags & MFE_VERTICALFLIP) + mo->momz *= -1; +} + /** Spills an injured player's rings. * * \param player The player who is losing rings. @@ -2143,12 +2197,10 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da */ void P_PlayerRingBurst(player_t *player, INT32 num_rings) { + INT32 num_fling_rings; INT32 i; - mobj_t *mo; angle_t fa; - fixed_t ns; fixed_t z; - fixed_t momxy = 5<rings <= 0 && num_rings > 2) - num_rings = 2; + num_fling_rings = min(num_rings, player->rings); P_GivePlayerRings(player, -num_rings); // determine first angle fa = player->mo->angle + ((P_RandomByte() & 1) ? -ANGLE_90 : ANGLE_90); - for (i = 0; i < num_rings; i++) + z = player->mo->z; + if (player->mo->eflags & MFE_VERTICALFLIP) + z += player->mo->height - mobjinfo[MT_RING].height; + + for (i = 0; i < num_fling_rings; i++) { - INT32 objType = mobjinfo[MT_RING].reactiontime; + P_FlingBurst(player, fa, z, + MT_FLINGRING, 60*TICRATE, player->mo->scale, i); + } - z = player->mo->z; - if (player->mo->eflags & MFE_VERTICALFLIP) - z += player->mo->height - mobjinfo[objType].height; - - mo = P_SpawnMobj(player->mo->x, player->mo->y, z, objType); - - mo->threshold = 10; - mo->fuse = 60*TICRATE; - P_SetTarget(&mo->target, player->mo); - - mo->destscale = player->mo->scale; - P_SetScale(mo, player->mo->scale); - - // Angle / height offset changes every other ring - if (i != 0) - { - if (i & 1) - { - momxy -= FRACUNIT; - momz += 2<scale); - mo->momx = (mo->target->momx/2) + FixedMul(FINECOSINE(fa>>ANGLETOFINESHIFT), ns); - mo->momy = (mo->target->momy/2) + FixedMul(FINESINE(fa>>ANGLETOFINESHIFT), ns); - - ns = FixedMul(momz, mo->scale); - P_SetObjectMomZ(mo, (mo->target->momz/2) + ns, false); - - if (player->mo->eflags & MFE_VERTICALFLIP) - mo->momz *= -1; + while (i < num_rings) + { + P_FlingBurst(player, fa, z, + MT_DEBTSPIKE, 90, 3 * player->mo->scale / 2, i++); } } diff --git a/src/p_mobj.c b/src/p_mobj.c index 704e03114..2fd5375f5 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -2292,6 +2292,11 @@ boolean P_ZMovement(mobj_t *mo) else mo->flags2 ^= MFD_DONTDRAW; } + else if (mo->type == MT_DEBTSPIKE) + { + mom.x = mom.y = 0; + mom.z = -mom.z/2; + } else if (mo->flags & MF_MISSILE) { if (!(mo->flags & MF_NOCLIP)) @@ -9192,6 +9197,7 @@ static void P_DefaultMobjShadowScale(mobj_t *thing) thing->shadowscale = FRACUNIT; break; case MT_RING: + case MT_DEBTSPIKE: case MT_FLOATINGITEM: case MT_BLUESPHERE: case MT_EMERALD: