mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Ring burst adjustment
Explosions and Tumble - 10 rings SPB - 20 rings
This commit is contained in:
parent
f9c6a5e8b5
commit
45b98298d9
4 changed files with 11 additions and 5 deletions
|
|
@ -2616,8 +2616,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
|
int 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
|
||||||
{
|
{
|
||||||
|
int ringburst = 10;
|
||||||
|
|
||||||
(void)source;
|
(void)source;
|
||||||
|
|
||||||
player->mo->momz = 18*mapobjectscale*P_MobjFlip(player->mo); // please stop forgetting mobjflip checks!!!!
|
player->mo->momz = 18*mapobjectscale*P_MobjFlip(player->mo); // please stop forgetting mobjflip checks!!!!
|
||||||
|
|
@ -2632,6 +2634,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->kartstuff[k_spinouttimer] = ((5*player->kartstuff[k_spinouttimer])/2)+1;
|
||||||
player->mo->momz *= 2;
|
player->mo->momz *= 2;
|
||||||
|
ringburst = 20;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2642,6 +2645,8 @@ void K_ExplodePlayer(player_t *player, mobj_t *inflictor, mobj_t *source) // A b
|
||||||
|
|
||||||
if (P_IsDisplayPlayer(player))
|
if (P_IsDisplayPlayer(player))
|
||||||
P_StartQuake(64<<FRACBITS, 5);
|
P_StartQuake(64<<FRACBITS, 5);
|
||||||
|
|
||||||
|
return ringburst;
|
||||||
}
|
}
|
||||||
|
|
||||||
// This kind of wipeout happens with no rings -- doesn't remove a bumper, has no invulnerability, and is much shorter.
|
// This kind of wipeout happens with no rings -- doesn't remove a bumper, has no invulnerability, and is much shorter.
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ void K_DoInstashield(player_t *player);
|
||||||
void K_BattleAwardHit(player_t *player, player_t *victim, mobj_t *inflictor, UINT8 bumpersRemoved);
|
void K_BattleAwardHit(player_t *player, player_t *victim, mobj_t *inflictor, UINT8 bumpersRemoved);
|
||||||
void K_SpinPlayer(player_t *player, mobj_t *inflictor, mobj_t *source, INT32 type);
|
void K_SpinPlayer(player_t *player, mobj_t *inflictor, mobj_t *source, INT32 type);
|
||||||
void K_TumblePlayer(player_t *player, mobj_t *inflictor, mobj_t *source);
|
void K_TumblePlayer(player_t *player, mobj_t *inflictor, mobj_t *source);
|
||||||
void K_ExplodePlayer(player_t *player, mobj_t *inflictor, mobj_t *source);
|
int K_ExplodePlayer(player_t *player, mobj_t *inflictor, mobj_t *source);
|
||||||
void K_DebtStingPlayer(player_t *player, mobj_t *source);
|
void K_DebtStingPlayer(player_t *player, mobj_t *source);
|
||||||
void K_HandleBumperChanges(player_t *player, UINT8 prevBumpers);
|
void K_HandleBumperChanges(player_t *player, UINT8 prevBumpers);
|
||||||
void K_DestroyBumpers(player_t *player, UINT8 amount);
|
void K_DestroyBumpers(player_t *player, UINT8 amount);
|
||||||
|
|
|
||||||
|
|
@ -3440,8 +3440,8 @@ static int lib_kExplodePlayer(lua_State *L)
|
||||||
inflictor = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ));
|
inflictor = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ));
|
||||||
if (!lua_isnone(L, 3) && lua_isuserdata(L, 3))
|
if (!lua_isnone(L, 3) && lua_isuserdata(L, 3))
|
||||||
source = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ));
|
source = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ));
|
||||||
K_ExplodePlayer(player, inflictor, source);
|
lua_pushinteger(L, K_ExplodePlayer(player, inflictor, source));
|
||||||
return 0;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int lib_kTakeBumpersFromPlayer(lua_State *L)
|
static int lib_kTakeBumpersFromPlayer(lua_State *L)
|
||||||
|
|
|
||||||
|
|
@ -2012,10 +2012,11 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
|
||||||
break;
|
break;
|
||||||
case DMG_TUMBLE:
|
case DMG_TUMBLE:
|
||||||
K_TumblePlayer(player, inflictor, source);
|
K_TumblePlayer(player, inflictor, source);
|
||||||
|
ringburst = 10;
|
||||||
break;
|
break;
|
||||||
case DMG_EXPLODE:
|
case DMG_EXPLODE:
|
||||||
case DMG_KARMA:
|
case DMG_KARMA:
|
||||||
K_ExplodePlayer(player, inflictor, source);
|
ringburst = K_ExplodePlayer(player, inflictor, source);
|
||||||
break;
|
break;
|
||||||
case DMG_WIPEOUT:
|
case DMG_WIPEOUT:
|
||||||
if (P_IsDisplayPlayer(player))
|
if (P_IsDisplayPlayer(player))
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue