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

Merge branch 'item-bungus' into 'master'

Browse source 
Make Ballhog more interesting

See merge request KartKrew/Kart!639
This commit is contained in:
Oni 2022-09-20 01:31:47 +00:00
commit 3f3e3ffdf6
9 changed files with 113 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/d_player.h
View file

@ -270,6 +270,8 @@ typedef enum
#define TRIPWIRETIME (15) #define TRIPWIRETIME (15)
#define BALLHOGINCREMENT (7)
//} //}
// for kickstartaccel // for kickstartaccel
@ -486,9 +488,11 @@ typedef struct player_s
UINT16 flamemeter; // Flame Shield dash meter left UINT16 flamemeter; // Flame Shield dash meter left
UINT8 flamelength; // Flame Shield dash meter, number of segments UINT8 flamelength; // Flame Shield dash meter, number of segments
UINT16 ballhogcharge; // Ballhog charge up -- the higher this value, the more projectiles
UINT16 hyudorotimer; // Duration of the Hyudoro offroad effect itself UINT16 hyudorotimer; // Duration of the Hyudoro offroad effect itself
SINT8 stealingtimer; // if >0 you are stealing, if <0 you are being stolen from SINT8 stealingtimer; // if >0 you are stealing, if <0 you are being stolen from
mobj_t *hoverhyudoro; // First hyudoro hovering next to player mobj_t *hoverhyudoro; // First hyudoro hovering next to player
UINT16 sneakertimer; // Duration of a Sneaker Boost (from Sneakers or level boosters) UINT16 sneakertimer; // Duration of a Sneaker Boost (from Sneakers or level boosters)
UINT8 numsneakers; // Number of stacked sneaker effects UINT8 numsneakers; // Number of stacked sneaker effects

2
src/info.c
View file

@ -23753,7 +23753,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_hogbom, // deathsound sfx_hogbom, // deathsound
80*FRACUNIT, // speed 80*FRACUNIT, // speed
16*FRACUNIT, // radius 26*FRACUNIT, // radius
32*FRACUNIT, // height 32*FRACUNIT, // height
0, // display offset 0, // display offset
100, // mass 100, // mass

10
src/k_hud.c
View file

@ -1206,6 +1206,16 @@ static void K_drawKartItem(void)
else else
localpatch = kp_nodraw; localpatch = kp_nodraw;
} }
else if (stplyr->ballhogcharge > 0)
{
itembar = stplyr->ballhogcharge;
maxl = (((stplyr->itemamount-1) * BALLHOGINCREMENT) + 1);
if (leveltime & 1)
localpatch = kp_ballhog[offset];
else
localpatch = kp_nodraw;
}
else if (stplyr->rocketsneakertimer > 1) else if (stplyr->rocketsneakertimer > 1)
{ {
itembar = stplyr->rocketsneakertimer; itembar = stplyr->rocketsneakertimer;

136
src/k_kart.c
View file

@ -493,6 +493,10 @@ static void K_KartGetItemResult(player_t *player, SINT8 getitem)
player->itemtype = KITEM_JAWZ; player->itemtype = KITEM_JAWZ;
player->itemamount = 2; player->itemamount = 2;
break; break;
case KITEM_BALLHOG: // Ballhog x5
player->itemtype = KITEM_BALLHOG;
player->itemamount = 5;
break;
default: default:
if (getitem <= 0 || getitem >= NUMKARTRESULTS) // Sad (Fallback) if (getitem <= 0 || getitem >= NUMKARTRESULTS) // Sad (Fallback)
{ {
@ -4227,7 +4231,6 @@ static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t an, I
if (source->player != NULL) if (source->player != NULL)
{ {
if (source->player->itemscale == ITEMSCALE_SHRINK) if (source->player->itemscale == ITEMSCALE_SHRINK)
{ {
// Nerf the base item speed a bit. // Nerf the base item speed a bit.
@ -4340,6 +4343,11 @@ static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t an, I
S_StartSound(th, sfx_s3kbfl); S_StartSound(th, sfx_s3kbfl);
S_StartSound(th, sfx_cdfm35); S_StartSound(th, sfx_cdfm35);
break; break;
case MT_BALLHOG:
// Contra spread shot scale up
th->destscale = th->destscale << 1;
th->scalespeed = abs(th->destscale - th->scale) / (2*TICRATE);
break;
default: default:
break; break;
} }
@ -5094,7 +5102,7 @@ static mobj_t *K_FindLastTrailMobj(player_t *player)
return trail; return trail;
} }
mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t mapthing, INT32 defaultDir, INT32 altthrow) mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t mapthing, INT32 defaultDir, INT32 altthrow, angle_t angleOffset)
{ {
mobj_t *mo; mobj_t *mo;
INT32 dir; INT32 dir;
@ -5160,46 +5168,21 @@ mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t mapthing,
if (missile) // Shootables if (missile) // Shootables
{ {
if (mapthing == MT_BALLHOG) // Messy if (dir == -1 && mapthing != MT_SPB)
{ {
mo = NULL; // can't return multiple projectiles // Shoot backward
if (dir == -1) mo = K_SpawnKartMissile(player->mo, mapthing, (player->mo->angle + ANGLE_180) + angleOffset, 0, PROJSPEED/8);
{
// Shoot backward
K_SpawnKartMissile(player->mo, mapthing, (player->mo->angle + ANGLE_180) - 0x06000000, 0, PROJSPEED/8);
K_SpawnKartMissile(player->mo, mapthing, (player->mo->angle + ANGLE_180) - 0x03000000, 0, PROJSPEED/8);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + ANGLE_180, 0, PROJSPEED/8);
K_SpawnKartMissile(player->mo, mapthing, (player->mo->angle + ANGLE_180) + 0x03000000, 0, PROJSPEED/8);
K_SpawnKartMissile(player->mo, mapthing, (player->mo->angle + ANGLE_180) + 0x06000000, 0, PROJSPEED/8);
}
else
{
// Shoot forward
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle - 0x06000000, 0, PROJSPEED);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle - 0x03000000, 0, PROJSPEED);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle, 0, PROJSPEED);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + 0x03000000, 0, PROJSPEED);
K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + 0x06000000, 0, PROJSPEED);
}
} }
else else
{ {
if (dir == -1 && mapthing != MT_SPB) // Shoot forward
{ mo = K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + angleOffset, 0, PROJSPEED);
// Shoot backward }
mo = K_SpawnKartMissile(player->mo, mapthing, player->mo->angle + ANGLE_180, 0, PROJSPEED/8);
}
else
{
// Shoot forward
mo = K_SpawnKartMissile(player->mo, mapthing, player->mo->angle, 0, PROJSPEED);
}
if (mapthing == MT_DROPTARGET && mo) if (mapthing == MT_DROPTARGET && mo)
{ {
mo->reactiontime = TICRATE/2; mo->reactiontime = TICRATE/2;
P_SetMobjState(mo, mo->info->painstate); P_SetMobjState(mo, mo->info->painstate);
}
} }
} }
else else
@ -6151,6 +6134,10 @@ mobj_t *K_CreatePaperItem(fixed_t x, fixed_t y, fixed_t z, angle_t angle, SINT8
newType = KITEM_JAWZ; newType = KITEM_JAWZ;
newAmount = 2; newAmount = 2;
break; break;
case KITEM_BALLHOG: // Ballhog x5
newType = KITEM_BALLHOG;
newAmount = 5;
break;
default: default:
newType = i; newType = i;
newAmount = 1; newAmount = 1;
@ -9011,7 +8998,7 @@ void K_StripItems(player_t *player)
player->curshield = KSHIELD_NONE; player->curshield = KSHIELD_NONE;
player->bananadrag = 0; player->bananadrag = 0;
player->ballhogcharge = 0;
player->sadtimer = 0; player->sadtimer = 0;
K_UpdateHnextList(player, true); K_UpdateHnextList(player, true);
@ -9731,7 +9718,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
{ {
if (ATTACK_IS_DOWN) if (ATTACK_IS_DOWN)
{ {
K_ThrowKartItem(player, false, MT_EGGMANITEM, -1, 0); K_ThrowKartItem(player, false, MT_EGGMANITEM, -1, 0, 0);
K_PlayAttackTaunt(player->mo); K_PlayAttackTaunt(player->mo);
player->pflags &= ~PF_EGGMANOUT; player->pflags &= ~PF_EGGMANOUT;
K_UpdateHnextList(player, true); K_UpdateHnextList(player, true);
@ -9839,7 +9826,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
} }
else if (ATTACK_IS_DOWN && (player->pflags & PF_ITEMOUT)) // Banana x3 thrown else if (ATTACK_IS_DOWN && (player->pflags & PF_ITEMOUT)) // Banana x3 thrown
{ {
K_ThrowKartItem(player, false, MT_BANANA, -1, 0); K_ThrowKartItem(player, false, MT_BANANA, -1, 0, 0);
K_PlayAttackTaunt(player->mo); K_PlayAttackTaunt(player->mo);
player->itemamount--; player->itemamount--;
K_UpdateHnextList(player, false); K_UpdateHnextList(player, false);
@ -9902,7 +9889,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
} }
else if (ATTACK_IS_DOWN && (player->pflags & PF_ITEMOUT)) // Orbinaut x3 thrown else if (ATTACK_IS_DOWN && (player->pflags & PF_ITEMOUT)) // Orbinaut x3 thrown
{ {
K_ThrowKartItem(player, true, MT_ORBINAUT, 1, 0); K_ThrowKartItem(player, true, MT_ORBINAUT, 1, 0, 0);
K_PlayAttackTaunt(player->mo); K_PlayAttackTaunt(player->mo);
player->itemamount--; player->itemamount--;
K_UpdateHnextList(player, false); K_UpdateHnextList(player, false);
@ -9944,9 +9931,9 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
else if (ATTACK_IS_DOWN && HOLDING_ITEM && (player->pflags & PF_ITEMOUT)) // Jawz thrown else if (ATTACK_IS_DOWN && HOLDING_ITEM && (player->pflags & PF_ITEMOUT)) // Jawz thrown
{ {
if (player->throwdir == 1 || player->throwdir == 0) if (player->throwdir == 1 || player->throwdir == 0)
K_ThrowKartItem(player, true, MT_JAWZ, 1, 0); K_ThrowKartItem(player, true, MT_JAWZ, 1, 0, 0);
else if (player->throwdir == -1) // Throwing backward gives you a dud that doesn't home in else if (player->throwdir == -1) // Throwing backward gives you a dud that doesn't home in
K_ThrowKartItem(player, true, MT_JAWZ_DUD, -1, 0); K_ThrowKartItem(player, true, MT_JAWZ_DUD, -1, 0, 0);
K_PlayAttackTaunt(player->mo); K_PlayAttackTaunt(player->mo);
player->itemamount--; player->itemamount--;
K_UpdateHnextList(player, false); K_UpdateHnextList(player, false);
@ -9972,7 +9959,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
} }
else if (ATTACK_IS_DOWN && (player->pflags & PF_ITEMOUT)) else if (ATTACK_IS_DOWN && (player->pflags & PF_ITEMOUT))
{ {
K_ThrowKartItem(player, false, MT_SSMINE, 1, 1); K_ThrowKartItem(player, false, MT_SSMINE, 1, 1, 0);
K_PlayAttackTaunt(player->mo); K_PlayAttackTaunt(player->mo);
player->itemamount--; player->itemamount--;
player->pflags &= ~PF_ITEMOUT; player->pflags &= ~PF_ITEMOUT;
@ -10007,7 +9994,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
} }
else if (ATTACK_IS_DOWN && (player->pflags & PF_ITEMOUT)) else if (ATTACK_IS_DOWN && (player->pflags & PF_ITEMOUT))
{ {
K_ThrowKartItem(player, (player->throwdir > 0), MT_DROPTARGET, -1, 0); K_ThrowKartItem(player, (player->throwdir > 0), MT_DROPTARGET, -1, 0, 0);
K_PlayAttackTaunt(player->mo); K_PlayAttackTaunt(player->mo);
player->itemamount--; player->itemamount--;
player->pflags &= ~PF_ITEMOUT; player->pflags &= ~PF_ITEMOUT;
@ -10015,18 +10002,63 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
} }
break; break;
case KITEM_BALLHOG: case KITEM_BALLHOG:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) if (!HOLDING_ITEM && NO_HYUDORO)
{ {
player->itemamount--; INT32 ballhogmax = ((player->itemamount-1) * BALLHOGINCREMENT) + 1;
K_ThrowKartItem(player, true, MT_BALLHOG, 1, 0);
K_PlayAttackTaunt(player->mo); if ((cmd->buttons & BT_ATTACK) && (player->pflags & PF_HOLDREADY)
&& (player->ballhogcharge < ballhogmax))
{
player->ballhogcharge++;
}
else
{
if (cmd->buttons & BT_ATTACK)
{
player->pflags &= ~PF_HOLDREADY;
}
else
{
player->pflags |= PF_HOLDREADY;
}
if (player->ballhogcharge > 0)
{
INT32 numhogs = min((player->ballhogcharge / BALLHOGINCREMENT) + 1, player->itemamount);
if (numhogs <= 1)
{
player->itemamount--;
K_ThrowKartItem(player, true, MT_BALLHOG, 1, 0, 0);
}
else
{
angle_t cone = 0x01800000 * (numhogs-1);
angle_t offsetAmt = (cone * 2) / (numhogs-1);
angle_t angleOffset = cone;
INT32 i;
player->itemamount -= numhogs;
for (i = 0; i < numhogs; i++)
{
K_ThrowKartItem(player, true, MT_BALLHOG, 1, 0, angleOffset);
angleOffset -= offsetAmt;
}
}
player->ballhogcharge = 0;
K_PlayAttackTaunt(player->mo);
player->pflags &= ~PF_HOLDREADY;
}
}
} }
break; break;
case KITEM_SPB: case KITEM_SPB:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{ {
player->itemamount--; player->itemamount--;
K_ThrowKartItem(player, true, MT_SPB, 1, 0); K_ThrowKartItem(player, true, MT_SPB, 1, 0, 0);
K_PlayAttackTaunt(player->mo); K_PlayAttackTaunt(player->mo);
} }
break; break;
@ -10128,7 +10160,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
if (player->bubbleblowup > bubbletime*2) if (player->bubbleblowup > bubbletime*2)
{ {
K_ThrowKartItem(player, (player->throwdir > 0), MT_BUBBLESHIELDTRAP, -1, 0); K_ThrowKartItem(player, (player->throwdir > 0), MT_BUBBLESHIELDTRAP, -1, 0, 0);
K_PlayAttackTaunt(player->mo); K_PlayAttackTaunt(player->mo);
player->bubbleblowup = 0; player->bubbleblowup = 0;
player->bubblecool = 0; player->bubblecool = 0;
@ -10278,7 +10310,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
} }
else if (ATTACK_IS_DOWN && HOLDING_ITEM && (player->pflags & PF_ITEMOUT)) // Sink thrown else if (ATTACK_IS_DOWN && HOLDING_ITEM && (player->pflags & PF_ITEMOUT)) // Sink thrown
{ {
K_ThrowKartItem(player, false, MT_SINK, 1, 2); K_ThrowKartItem(player, false, MT_SINK, 1, 2, 0);
K_PlayAttackTaunt(player->mo); K_PlayAttackTaunt(player->mo);
player->itemamount--; player->itemamount--;
player->pflags &= ~PF_ITEMOUT; player->pflags &= ~PF_ITEMOUT;

2
src/k_kart.h
View file

@ -90,7 +90,7 @@ void K_SpawnWipeoutTrail(mobj_t *mo);
void K_SpawnDraftDust(mobj_t *mo); void K_SpawnDraftDust(mobj_t *mo);
void K_DriftDustHandling(mobj_t *spawner); void K_DriftDustHandling(mobj_t *spawner);
void K_Squish(mobj_t *mo); void K_Squish(mobj_t *mo);
mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t mapthing, INT32 defaultDir, INT32 altthrow); mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t mapthing, INT32 defaultDir, INT32 altthrow, angle_t angleOffset);
void K_PuntMine(mobj_t *mine, mobj_t *punter); void K_PuntMine(mobj_t *mine, mobj_t *punter);
void K_DoSneaker(player_t *player, INT32 type); void K_DoSneaker(player_t *player, INT32 type);
void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound); void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound);

4
src/lua_playerlib.c
View file

@ -336,6 +336,8 @@ static int player_get(lua_State *L)
lua_pushinteger(L, plr->flamemeter); lua_pushinteger(L, plr->flamemeter);
else if (fastcmp(field,"flamelength")) else if (fastcmp(field,"flamelength"))
lua_pushinteger(L, plr->flamelength); lua_pushinteger(L, plr->flamelength);
else if (fastcmp(field,"ballhogcharge"))
lua_pushinteger(L, plr->ballhogcharge);
else if (fastcmp(field,"hyudorotimer")) else if (fastcmp(field,"hyudorotimer"))
lua_pushinteger(L, plr->hyudorotimer); lua_pushinteger(L, plr->hyudorotimer);
else if (fastcmp(field,"stealingtimer")) else if (fastcmp(field,"stealingtimer"))
@ -696,6 +698,8 @@ static int player_set(lua_State *L)
plr->flamemeter = luaL_checkinteger(L, 3); plr->flamemeter = luaL_checkinteger(L, 3);
else if (fastcmp(field,"flamelength")) else if (fastcmp(field,"flamelength"))
plr->flamelength = luaL_checkinteger(L, 3); plr->flamelength = luaL_checkinteger(L, 3);
else if (fastcmp(field,"ballhogcharge"))
plr->ballhogcharge = luaL_checkinteger(L, 3);
else if (fastcmp(field,"hyudorotimer")) else if (fastcmp(field,"hyudorotimer"))
plr->hyudorotimer = luaL_checkinteger(L, 3); plr->hyudorotimer = luaL_checkinteger(L, 3);
else if (fastcmp(field,"stealingtimer")) else if (fastcmp(field,"stealingtimer"))

2
src/p_inter.c
View file

@ -1416,7 +1416,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
// special behavior for SPB capsules // special behavior for SPB capsules
if (target->threshold == KITEM_SPB) if (target->threshold == KITEM_SPB)
{ {
K_ThrowKartItem(player, true, MT_SPB, 1, 0); K_ThrowKartItem(player, true, MT_SPB, 1, 0, 0);
break; break;
} }

3
src/p_mobj.c
View file

@ -1563,7 +1563,10 @@ void P_XYMovement(mobj_t *mo)
{ {
mo->health--; mo->health--;
if (mo->health == 0) if (mo->health == 0)
{
mo->scalespeed = mo->scale/12;
mo->destscale = 0; mo->destscale = 0;
}
} }
} }
//} //}

4
src/p_saveg.c
View file

@ -320,6 +320,8 @@ static void P_NetArchivePlayers(void)
WRITEUINT16(save_p, players[i].flamemeter); WRITEUINT16(save_p, players[i].flamemeter);
WRITEUINT8(save_p, players[i].flamelength); WRITEUINT8(save_p, players[i].flamelength);
WRITEUINT16(save_p, players[i].ballhogcharge);
WRITEUINT16(save_p, players[i].hyudorotimer); WRITEUINT16(save_p, players[i].hyudorotimer);
WRITESINT8(save_p, players[i].stealingtimer); WRITESINT8(save_p, players[i].stealingtimer);
@ -609,6 +611,8 @@ static void P_NetUnArchivePlayers(void)
players[i].flamemeter = READUINT16(save_p); players[i].flamemeter = READUINT16(save_p);
players[i].flamelength = READUINT8(save_p); players[i].flamelength = READUINT8(save_p);
players[i].ballhogcharge = READUINT16(save_p);
players[i].hyudorotimer = READUINT16(save_p); players[i].hyudorotimer = READUINT16(save_p);
players[i].stealingtimer = READSINT8(save_p); players[i].stealingtimer = READSINT8(save_p);