attraction shield attack timer
and tweak visuals
This commit is contained in:
parent
204cbc8190
commit
c8a4e99dd2
4 changed files with 23 additions and 4 deletions
|
|
@ -93,7 +93,7 @@
|
|||
#define ASSET_HASH_TEXTURES_KART 0xb4211b2f32b6a291
|
||||
#define ASSET_HASH_CHARS_KART 0x1e68a3e01aa5c68b
|
||||
#define ASSET_HASH_MAPS_KART 0x38558ed00da41ce9
|
||||
#define ASSET_HASH_MAIN_PK3 0x0427b79b6f27903f
|
||||
#define ASSET_HASH_MAIN_PK3 0x28ffde2e8c416914
|
||||
#define ASSET_HASH_MAPPATCH_PK3 0x1745690024efbaf8
|
||||
#define ASSET_HASH_BONUSCHARS_KART 0x60e6f13d822a7461
|
||||
#ifdef USE_PATCH_FILE
|
||||
|
|
|
|||
|
|
@ -301,6 +301,12 @@ void K_DisplayItemTimers(void)
|
|||
{qche("K_TIFLMS")},
|
||||
1,
|
||||
},
|
||||
{ // attractionshield
|
||||
"attractionshield",
|
||||
stplyr->attractionattack,
|
||||
{qche("K_TIATTR")},
|
||||
1,
|
||||
},
|
||||
};
|
||||
|
||||
// insert sortable timers
|
||||
|
|
|
|||
14
src/k_hud.c
14
src/k_hud.c
|
|
@ -1533,6 +1533,20 @@ static void K_drawKartItem(void)
|
|||
}
|
||||
else if (stplyr->attractioncharge > 0)
|
||||
{
|
||||
if (leveltime & 2)
|
||||
{
|
||||
if (stplyr->attractioncharge >= ATTRACTIONCHARGETIME)
|
||||
{
|
||||
colormode = TC_BLINK;
|
||||
localcolor = SKINCOLOR_WHITE;
|
||||
}
|
||||
localpatch = K_GetCachedItemPatch(KITEM_THUNDERSHIELD, tiny, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
localpatch = kp_nodraw;
|
||||
}
|
||||
|
||||
itembar = FixedDiv(stplyr->attractioncharge, ATTRACTIONCHARGETIME);
|
||||
}
|
||||
else if (stplyr->bricktimer > 0)
|
||||
|
|
|
|||
|
|
@ -11844,16 +11844,15 @@ void K_KartAttractHomingAttack(player_t *player)
|
|||
{
|
||||
effectangle = R_PointToAngle2(0,0, player->mo->momx, player->mo->momy);
|
||||
}
|
||||
mo->angle = P_RandomRange(-30, 30)*ANG1 + effectangle - ANGLE_180;
|
||||
mo->angle = P_RandomRange(-30, 30)*ANG1 + (effectangle - ANGLE_180);
|
||||
mo->fuse = P_RandomRange(10, 20);
|
||||
P_SetScale(mo, player->mo->scale/2);
|
||||
mo->destscale = mo->scale/3;
|
||||
P_SetTarget(&mo->target, player->mo);
|
||||
P_SetMobjState(mo, S_KLIT1);
|
||||
mo->renderflags |= RF_ADD|RF_FULLBRIGHT|RF_TRANS30;
|
||||
mo->renderflags |= RF_ADD|RF_FULLBRIGHT|RF_TRANS50;
|
||||
|
||||
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_THOK);
|
||||
P_SetTarget(&mo->target, player->mo);
|
||||
P_SetMobjState(mo, S_KSPARK1);
|
||||
mo->renderflags |= RF_ADD|RF_FULLBRIGHT|RF_TRANS30;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue