thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Give Drop Target a weaker state when thrown forward

Browse source 
Uses color White. Adds no EXTRA knockback, normal object
bounce collision applies.
This commit is contained in:
James R 2023-03-13 21:47:22 -07:00
parent c606ee8ef8
commit 05d80f9e92
2 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/k_collide.c
View file

@ -456,6 +456,7 @@ boolean K_LandMineCollide(mobj_t *t1, mobj_t *t2)
boolean K_DropTargetCollide(mobj_t *t1, mobj_t *t2)
{
mobj_t *draggeddroptarget = (t1->type == MT_DROPTARGET_SHIELD) ? t1->target : NULL;
UINT8 strength;
if (((t1->target == t2) || (t1->target == t2->target)) && ((t1->threshold > 0 && t2->type == MT_PLAYER) || (t2->type != MT_PLAYER && t2->threshold > 0)))
return true;
@ -466,9 +467,21 @@ boolean K_DropTargetCollide(mobj_t *t1, mobj_t *t2)
if (t2->player && (t2->player->hyudorotimer || t2->player->justbumped))
return true;
if (t1->health > 3) // forward thrown
{
strength = 0;
}
else if (t1->reactiontime == 0 || draggeddroptarget)
{
strength = 80;
}
else
{
strength = 140;
}
// Intensify bumps if already spinning...
P_Thrust(t1, R_PointToAngle2(t1->x, t1->y, t2->x, t2->y),
((t1->reactiontime && !draggeddroptarget) ? 140 : 80) * t1->scale);
P_Thrust(t1, R_PointToAngle2(t1->x, t1->y, t2->x, t2->y), strength * t1->scale);
if (draggeddroptarget)
{
@ -547,9 +560,22 @@ boolean K_DropTargetCollide(mobj_t *t1, mobj_t *t2)
t1->flags |= MF_SHOOTABLE;
// The following sets t1->target to t2, so draggeddroptarget keeps it persisting...
P_DamageMobj(t1, t2, (t2->target ? t2->target : t2), 1, DMG_NORMAL);
t1->color = (t1->health > 1)
? SKINCOLOR_GOLD
: SKINCOLOR_CRIMSON;
switch (t1->health)
{
case 3:
t1->color = SKINCOLOR_LIME;
break;
case 2:
t1->color = SKINCOLOR_GOLD;
break;
case 1:
t1->color = SKINCOLOR_CRIMSON;
break;
}
t1->flags &= ~MF_SHOOTABLE;
t1->spritexscale = 3*FRACUNIT;

2
src/k_kart.c
View file

@ -5496,6 +5496,8 @@ mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t mapthing,
if (mapthing == MT_DROPTARGET && mo)
{
mo->health++;
mo->color = SKINCOLOR_WHITE;
mo->reactiontime = TICRATE/2;
P_SetMobjState(mo, mo->info->painstate);
}