thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-09 17:43:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply to more things, make the timing more reasonable

Browse source
This commit is contained in:
Sally Coolatta 2020-07-31 00:07:24 -04:00
parent f3d832e71f
commit 0cb123f74e
2 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/k_collide.c
View file

@ -41,6 +41,7 @@ boolean K_OrbinautJawzCollide(mobj_t *t1, mobj_t *t2)
{ {
// Melt item // Melt item
S_StartSound(t2, sfx_s3k43); S_StartSound(t2, sfx_s3k43);
t2->hitlag += 3;
} }
else else
{ {
@ -48,7 +49,7 @@ boolean K_OrbinautJawzCollide(mobj_t *t1, mobj_t *t2)
P_DamageMobj(t2, t1, t1->target, 1); P_DamageMobj(t2, t1, t1->target, 1);
K_KartBouncing(t2, t1, false, false); K_KartBouncing(t2, t1, false, false);
S_StartSound(t2, sfx_s3k7b); S_StartSound(t2, sfx_s3k7b);
t2->hitlag = TICRATE; t2->hitlag += 10;
} }
damageitem = true; damageitem = true;
@ -59,10 +60,7 @@ boolean K_OrbinautJawzCollide(mobj_t *t1, mobj_t *t2)
|| t2->type == MT_BALLHOG) || t2->type == MT_BALLHOG)
{ {
// Other Item Damage // Other Item Damage
if (t2->eflags & MFE_VERTICALFLIP) t2->hitlag += 10;
t2->z -= t2->height;
else
t2->z += t2->height;
S_StartSound(t2, t2->info->deathsound); S_StartSound(t2, t2->info->deathsound);
P_KillMobj(t2, t1, t1); P_KillMobj(t2, t1, t1);
@ -89,18 +87,14 @@ boolean K_OrbinautJawzCollide(mobj_t *t1, mobj_t *t2)
{ {
// Shootable damage // Shootable damage
P_DamageMobj(t2, t2, t1->target, 1); P_DamageMobj(t2, t2, t1->target, 1);
t2->hitlag += 10;
damageitem = true; damageitem = true;
} }
if (damageitem) if (damageitem)
{ {
// This Item Damage // This Item Damage
if (t1->eflags & MFE_VERTICALFLIP) t1->hitlag += 10;
t1->z -= t1->height;
else
t1->z += t1->height;
t1->hitlag = TICRATE;
S_StartSound(t1, t1->info->deathsound); S_StartSound(t1, t1->info->deathsound);
P_KillMobj(t1, t2, t2); P_KillMobj(t1, t2, t2);
@ -147,11 +141,13 @@ boolean K_BananaBallhogCollide(mobj_t *t1, mobj_t *t2)
{ {
// Melt item // Melt item
S_StartSound(t2, sfx_s3k43); S_StartSound(t2, sfx_s3k43);
t2->hitlag += 3;
} }
else else
{ {
// Player Damage // Player Damage
K_SpinPlayer(t2->player, t1->target, 0, t1, (t1->type == MT_BANANA || t1->type == MT_BANANA_SHIELD)); K_SpinPlayer(t2->player, t1->target, 0, t1, (t1->type == MT_BANANA || t1->type == MT_BANANA_SHIELD));
t2->hitlag += 5;
} }
damageitem = true; damageitem = true;
@ -162,10 +158,7 @@ boolean K_BananaBallhogCollide(mobj_t *t1, mobj_t *t2)
|| t2->type == MT_BALLHOG) || t2->type == MT_BALLHOG)
{ {
// Other Item Damage // Other Item Damage
if (t2->eflags & MFE_VERTICALFLIP) t2->hitlag += 10;
t2->z -= t2->height;
else
t2->z += t2->height;
S_StartSound(t2, t2->info->deathsound); S_StartSound(t2, t2->info->deathsound);
P_KillMobj(t2, t1, t1); P_KillMobj(t2, t1, t1);
@ -181,16 +174,14 @@ boolean K_BananaBallhogCollide(mobj_t *t1, mobj_t *t2)
{ {
// Shootable damage // Shootable damage
P_DamageMobj(t2, t2, t1->target, 1); P_DamageMobj(t2, t2, t1->target, 1);
t2->hitlag += 10;
damageitem = true; damageitem = true;
} }
if (damageitem) if (damageitem)
{ {
// This Item Damage // This Item Damage
if (t1->eflags & MFE_VERTICALFLIP) t1->hitlag += 10;
t1->z -= t1->height;
else
t1->z += t1->height;
S_StartSound(t1, t1->info->deathsound); S_StartSound(t1, t1->info->deathsound);
P_KillMobj(t1, t2, t2); P_KillMobj(t1, t2, t2);
@ -303,10 +294,7 @@ boolean K_MineCollide(mobj_t *t1, mobj_t *t2)
P_KillMobj(t1, t2, t2); P_KillMobj(t1, t2, t2);
// Other Item Damage // Other Item Damage
if (t2->eflags & MFE_VERTICALFLIP) t2->hitlag += 10;
t2->z -= t2->height;
else
t2->z += t2->height;
S_StartSound(t2, t2->info->deathsound); S_StartSound(t2, t2->info->deathsound);
P_KillMobj(t2, t1, t1); P_KillMobj(t2, t1, t1);
@ -333,9 +321,15 @@ boolean K_MineExplosionCollide(mobj_t *t1, mobj_t *t2)
return true; return true;
if (t1->state == &states[S_MINEEXPLOSION1]) if (t1->state == &states[S_MINEEXPLOSION1])
{
K_ExplodePlayer(t2->player, t1->target, t1); K_ExplodePlayer(t2->player, t1->target, t1);
t2->hitlag += 10;
}
else else
{
K_SpinPlayer(t2->player, t1->target, 0, t1, false); K_SpinPlayer(t2->player, t1->target, 0, t1, false);
t2->hitlag += 5;
}
} }
else if (t2->flags & MF_SHOOTABLE) else if (t2->flags & MF_SHOOTABLE)
{ {
@ -363,12 +357,16 @@ boolean K_KitchenSinkCollide(mobj_t *t1, mobj_t *t2)
I_OutputMsg("%s was hit by a kitchen sink.\n", player_names[t2->player-players]); I_OutputMsg("%s was hit by a kitchen sink.\n", player_names[t2->player-players]);
P_DamageMobj(t2, t1, t1->target, 10000); P_DamageMobj(t2, t1, t1->target, 10000);
P_KillMobj(t1, t2, t2); P_KillMobj(t1, t2, t2);
t1->hitlag += 10;
t2->hitlag += 10;
} }
else if (t2->flags & MF_SHOOTABLE) else if (t2->flags & MF_SHOOTABLE)
{ {
// Shootable damage // Shootable damage
P_KillMobj(t2, t2, t1->target); P_KillMobj(t2, t2, t1->target);
// This item damage t2->hitlag += 10;
// This Item Damage
t1->hitlag += 10;
P_KillMobj(t1, t2, t2); P_KillMobj(t1, t2, t2);
} }

2
src/r_things.c
View file

@ -1487,7 +1487,7 @@ static void R_ProjectSprite(mobj_t *thing)
// hitlag vibrating // hitlag vibrating
if (thing->hitlag > 0) if (thing->hitlag > 0)
{ {
fixed_t mul = (thing->hitlag * FRACUNIT) / (TICRATE); fixed_t mul = (thing->hitlag * FRACUNIT) / 5;
if (leveltime & 1) if (leveltime & 1)
{ {