incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add missing doubled flashtics back to battle via gametyperule

Browse source
This commit is contained in:
NepDisk 2026-03-18 12:36:34 -04:00
parent a27d40b16b
commit f8e61760f1
5 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/deh_tables.c
View file

@ -464,13 +464,13 @@ const char *const GAMETYPERULE_LIST[] = {
"CLOSERPLAYERS",
"BATTLEBOXES",
"BATTLESPEED",
"DOUBLEDFLASHTICS",
"POINTLIMIT",
"TIMELIMIT",
"OVERTIME",
"TEAMS",
"NOTEAMS",
"TEAMSTARTS",
"\x01",
"LIVES",
"SPECIALBOTS",
"NOCOUNTDOWN",

22
src/doomstat.h
View file

@ -509,24 +509,24 @@ enum GameTypeRules
GTR_CLOSERPLAYERS = 1<<14, // Enables specfic gameplay tweaks with closer players.
GTR_BATTLEBOXES = 1<<15, // Itemboxes respawn differently.
GTR_BATTLESPEED = 1<<16, // Use battle gamespeed cvar.
GTR_DOUBLEDFLASHTICS = 1<<17, // Double your flashtics after taking damage.
GTR_POINTLIMIT = 1<<17, // Reaching point limit ends the round.
GTR_TIMELIMIT = 1<<18, // Reaching time limit ends the round.
GTR_OVERTIME = 1<<19, // Allow overtime behavior.
GTR_POINTLIMIT = 1<<18, // Reaching point limit ends the round.
GTR_TIMELIMIT = 1<<19, // Reaching time limit ends the round.
GTR_OVERTIME = 1<<20, // Allow overtime behavior.
// Custom gametype rules
GTR_TEAMS = 1<<20, // Teams are forced on.
GTR_NOTEAMS = 1<<21, // Teams are forced off.
GTR_TEAMSTARTS = 1<<22, // Use team-based start positions.
GTR_TEAMS = 1<<21, // Teams are forced on.
GTR_NOTEAMS = 1<<22, // Teams are forced off.
GTR_TEAMSTARTS = 1<<23, // Use team-based start positions.
// Grand Prix rules
//Free = 1<<23,
GTR_LIVES = 1<<24, // Lives system, players are forced to spectate during Game Over.
GTR_SPECIALBOTS = 1<<25, // Bot difficulty gets stronger between rounds, and the rival system is enabled.
GTR_LIVES = 1<<25, // Lives system, players are forced to spectate during Game Over.
GTR_SPECIALBOTS = 1<<26, // Bot difficulty gets stronger between rounds, and the rival system is enabled.
// Misc
GTR_NOCOUNTDOWN = 1<<26, // Disables Countdown timer and control lock at the start of levels.
GTR_ENCORE = 1<<27, // Enable Encore mode.
GTR_NOCOUNTDOWN = 1<<27, // Disables Countdown timer and control lock at the start of levels.
GTR_ENCORE = 1<<28, // Enable Encore mode.
// free: to and including 1<<31
};

2
src/g_game.c
View file

@ -4163,7 +4163,7 @@ static gametype_t defaultgametypes[] =
{
"Battle",
"GT_BATTLE",
GTR_BUMPERS|GTR_POINTS|GTR_RINGS|GTR_KARMA|GTR_WANTED|GTR_WANTEDSPB|GTR_ITEMARROWS|GTR_ITEMBREAKER|GTR_BATTLESTARTS|GTR_TIMELIMIT|GTR_POINTLIMIT|GTR_BATTLEODDS|GTR_CLOSERPLAYERS|GTR_BATTLEBOXES|GTR_BATTLESPEED,
GTR_BUMPERS|GTR_POINTS|GTR_RINGS|GTR_KARMA|GTR_WANTED|GTR_WANTEDSPB|GTR_ITEMARROWS|GTR_ITEMBREAKER|GTR_BATTLESTARTS|GTR_TIMELIMIT|GTR_POINTLIMIT|GTR_BATTLEODDS|GTR_CLOSERPLAYERS|GTR_BATTLEBOXES|GTR_BATTLESPEED|GTR_DOUBLEDFLASHTICS,
TOL_BATTLE,
int_battle,
0,

6
src/k_kart.c
View file

@ -3110,7 +3110,13 @@ UINT16 K_GetKartFlashing(const player_t *player)
return tics;
}
if (gametypes[gametype]->rules & GTR_DOUBLEDFLASHTICS)
{
tics *= 2;
}
tics += (tics/8) * (player->kartspeed);
return tics;
}

2
src/p_user.c
View file

@ -1476,7 +1476,7 @@ boolean P_PlayerHitFloor(player_t *player, boolean fromAir)
{
player->mo->momx = player->mo->momx/2;
player->mo->momy = player->mo->momy/2;
}
}
}
}