diff --git a/src/dehacked.c b/src/dehacked.c index 57feee732..ecac931db 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -1594,6 +1594,7 @@ actionpointer_t actionpointers[] = {{A_BrakLobShot}, "A_BRAKLOBSHOT"}, {{A_NapalmScatter}, "A_NAPALMSCATTER"}, {{A_SpawnFreshCopy}, "A_SPAWNFRESHCOPY"}, + {{A_InvincSparkleRotate}, "A_INVINCSPARKLEROTATE"}, {{NULL}, "NONE"}, diff --git a/src/info.c b/src/info.c index 7afc76bf6..1fb5d4e22 100644 --- a/src/info.c +++ b/src/info.c @@ -2614,13 +2614,13 @@ state_t states[NUMSTATES] = {SPR_KINV, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_KARTINVULN_SMALL3}, // S_KARTINVULN_SMALL2 {SPR_KINV, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_KARTINVULN_SMALL4}, // S_KARTINVULN_SMALL3 {SPR_KINV, FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_KARTINVULN_SMALL5}, // S_KARTINVULN_SMALL4 - {SPR_KINV, FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_NULL}, // S_KARTINVULN_SMALL5 + {SPR_KINV, FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_NULL}, // S_KARTINVULN_SMALL5 - {SPR_KINV, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_KARTINVULN_LARGE2}, // S_KARTINVULN_LARGE1 - {SPR_KINV, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_KARTINVULN_LARGE3}, // S_KARTINVULN_LARGE2 - {SPR_KINV, FF_FULLBRIGHT|5, 1, {NULL}, 0, 0, S_KARTINVULN_LARGE4}, // S_KARTINVULN_LARGE3 - {SPR_KINV, FF_FULLBRIGHT|6, 1, {NULL}, 0, 0, S_KARTINVULN_LARGE5}, // S_KARTINVULN_LARGE4 - {SPR_KINV, FF_FULLBRIGHT|7, 1, {NULL}, 0, 0, S_NULL}, // S_KARTINVULN_LARGE5 + {SPR_KINV, FF_FULLBRIGHT|1, 1, {A_InvincSparkleRotate}, 0, 0, S_KARTINVULN_LARGE2}, // S_KARTINVULN_LARGE1 + {SPR_KINV, FF_FULLBRIGHT|2, 1, {A_InvincSparkleRotate}, 0, 0, S_KARTINVULN_LARGE3}, // S_KARTINVULN_LARGE2 + {SPR_KINV, FF_FULLBRIGHT|5, 1, {A_InvincSparkleRotate}, 0, 0, S_KARTINVULN_LARGE4}, // S_KARTINVULN_LARGE3 + {SPR_KINV, FF_FULLBRIGHT|6, 1, {A_InvincSparkleRotate}, 0, 0, S_KARTINVULN_LARGE5}, // S_KARTINVULN_LARGE4 + {SPR_KINV, FF_FULLBRIGHT|7, 1, {A_InvincSparkleRotate}, 0, 0, S_NULL}, // S_KARTINVULN_LARGE5 {SPR_KINF, FF_FULLBRIGHT|FF_TRANS90, 1, {NULL}, 0, 0, S_INVULNFLASH2}, // S_INVULNFLASH1 {SPR_NULL, FF_FULLBRIGHT|FF_TRANS90, 1, {NULL}, 0, 0, S_INVULNFLASH3}, // S_INVULNFLASH2 diff --git a/src/info.h b/src/info.h index 4d24f729a..228fd9aea 100644 --- a/src/info.h +++ b/src/info.h @@ -239,6 +239,7 @@ enum actionnum A_BRAKLOBSHOT, A_NAPALMSCATTER, A_SPAWNFRESHCOPY, + A_INVINCSPARKLEROTATE, NUMACTIONS }; @@ -449,6 +450,7 @@ void A_BrakFireShot(struct mobj_s *actor); void A_BrakLobShot(struct mobj_s *actor); void A_NapalmScatter(struct mobj_s *actor); void A_SpawnFreshCopy(struct mobj_s *actor); +void A_InvincSparkleRotate(struct mobj_s *actor); extern boolean actionsoverridden[NUMACTIONS]; diff --git a/src/k_kart.c b/src/k_kart.c index 80407639e..241b14a61 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3521,11 +3521,21 @@ void K_SpawnSparkleTrail(mobj_t *mo) fixed_t newz = mo->z + mo->momz + (P_RandomRange(0, mo->height>>FRACBITS)<angle = R_PointToAngle2(mo->x, mo->y, sparkle->x, sparkle->y); + + sparkle->movefactor = R_PointToDist2(mo->x, mo->y, sparkle->x, sparkle->y); // Save the distance we spawned away from the player. + + sparkle->extravalue1 = (sparkle->z - mo->z); // Keep track of our Z position relative to the player's, I suppose. + sparkle->extravalue2 = M_RandomRange(0, 1) ? 1 : -1; // Rotation direction? + sparkle->cvmem = M_RandomRange(-25, 25)*mo->scale; // Vertical "angle" + + K_FlipFromObject(sparkle, mo); P_SetTarget(&sparkle->target, mo); + sparkle->destscale = mo->destscale; P_SetScale(sparkle, mo->scale); + sparkle->color = mo->color; sparkle->lightlevel = M_RandomRange(20, 255); diff --git a/src/p_enemy.c b/src/p_enemy.c index dfb237d74..6190d6efa 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -246,6 +246,7 @@ void A_BrakFireShot(mobj_t *actor); void A_BrakLobShot(mobj_t *actor); void A_NapalmScatter(mobj_t *actor); void A_SpawnFreshCopy(mobj_t *actor); +void A_InvincSparkleRotate(mobj_t *actor); // // ENEMY THINKING @@ -10909,3 +10910,34 @@ void A_SpawnFreshCopy(mobj_t *actor) newObject->color = actor->color; // SRB2Kart } + +void A_InvincSparkleRotate(mobj_t *actor) +{ + fixed_t sx, sy, sz; // Teleport dests. + mobj_t *ghost = NULL; + + if (LUA_CallAction(A_INVINCSPARKLEROTATE, actor)) + return; + + if (!actor->target || P_MobjWasRemoved(actor->target)) + return; + + //CONS_Printf("%d\n", actor->movefactor/FRACUNIT); + sx = actor->target->x + FixedMul((actor->movefactor), FINECOSINE((actor->angle)>>ANGLETOFINESHIFT)); + sy = actor->target->y + FixedMul((actor->movefactor), FINESINE((actor->angle)>>ANGLETOFINESHIFT)); + sz = actor->target->z + (actor->extravalue1) + FixedMul((actor->cvmem), FINECOSINE((leveltime*ANG1*10 + actor->angle)>>ANGLETOFINESHIFT)); + P_MoveOrigin(actor, sx, sy, sz); + + actor->momx = actor->target->momx; + actor->momy = actor->target->momy; + actor->momz = actor->target->momz; // Give momentum for eventual interp builds idk. + + actor->angle += ANG1*10*(actor->extravalue2); // Arbitrary value, change this if you want, I suppose. + + ghost = P_SpawnGhostMobj(actor); + if (ghost != NULL && P_MobjWasRemoved(ghost) == false) + { + //ghost->frame |= FF_ADD; + ghost->fuse = 4; + } +}