thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix arrangement of gametype rules between SOC and constants

Browse source
This commit is contained in:
toaster 2022-12-31 22:33:09 +00:00
parent 36d6fcaba4
commit 98646ef65b
2 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/deh_tables.c
View file

@ -5796,28 +5796,31 @@ const char *const GAMETYPERULE_LIST[] = {
"BUMPERS", "BUMPERS",
"SPHERES", "SPHERES",
"CLOSERPLAYERS",
"BATTLESTARTS",
"PAPERITEMS", "PAPERITEMS",
"POWERSTONES", "POWERSTONES",
"KARMA", "KARMA",
"ITEMARROWS", "ITEMARROWS",
"CAPSULES", "CAPSULES",
"BATTLESTARTS", "CATCHER",
"ROLLINGSTART",
"SPECIALSTART",
"BOSS",
"POINTLIMIT", "POINTLIMIT",
"TIMELIMIT", "TIMELIMIT",
"OVERTIME", "OVERTIME",
"ENCORE",
"TEAMS", "TEAMS",
"NOTEAMS", "NOTEAMS",
"TEAMSTARTS", "TEAMSTARTS",
"CATCHER", "NOMP",
"BOSS",
"ROLLINGSTART",
"NOCUPSELECT", "NOCUPSELECT",
"CLOSERPLAYERS",
"ENCORE",
"SPECIALSTART",
NULL NULL
}; };

54
src/doomstat.h
View file

@ -489,37 +489,39 @@ extern INT16 gametype;
enum GameTypeRules enum GameTypeRules
{ {
// Race rules // Race rules
GTR_CIRCUIT = 1, // Enables the finish line, laps, and the waypoint system. GTR_CIRCUIT = 1, // Enables the finish line, laps, and the waypoint system.
GTR_BOTS = 1<<2, // Allows bots in this gametype. Combine with BotTiccmd hooks to make bots support your gametype. GTR_BOTS = 1<<1, // Allows bots in this gametype. Combine with BotTiccmd hooks to make bots support your gametype.
// Battle gametype rules // Battle gametype rules
GTR_BUMPERS = 1<<3, // Enables the bumper health system GTR_BUMPERS = 1<<2, // Enables the bumper health system
GTR_SPHERES = 1<<4, // Replaces rings with blue spheres GTR_SPHERES = 1<<3, // Replaces rings with blue spheres
GTR_PAPERITEMS = 1<<5, // Replaces item boxes with paper item spawners GTR_CLOSERPLAYERS = 1<<4, // Buffs spindash and draft power to bring everyone together, nerfs invincibility and grow to prevent excessive combos
GTR_POWERSTONES = 1<<6, // Battle Emerald collectables.
GTR_KARMA = 1<<7, // Enables the Karma system if you're out of bumpers
GTR_ITEMARROWS = 1<<8, // Show item box arrows above players
GTR_CAPSULES = 1<<9, // Can enter Break The Capsules mode
GTR_BATTLESTARTS = 1<<10, // Use Battle Mode start positions.
GTR_POINTLIMIT = 1<<11, // Reaching point limit ends the round GTR_BATTLESTARTS = 1<<5, // Use Battle Mode start positions.
GTR_TIMELIMIT = 1<<12, // Reaching time limit ends the round GTR_PAPERITEMS = 1<<6, // Replaces item boxes with paper item spawners
GTR_OVERTIME = 1<<13, // Allow overtime behavior GTR_POWERSTONES = 1<<7, // Battle Emerald collectables.
GTR_KARMA = 1<<8, // Enables the Karma system if you're out of bumpers
GTR_ITEMARROWS = 1<<9, // Show item box arrows above players
// Custom gametype rules // Bonus gametype rules
GTR_TEAMS = 1<<14, // Teams are forced on GTR_CAPSULES = 1<<10, // Can enter Break The Capsules mode
GTR_NOTEAMS = 1<<15, // Teams are forced off GTR_CATCHER = 1<<11, // UFO Catcher (only works with GTR_CIRCUIT)
GTR_TEAMSTARTS = 1<<16, // Use team-based start positions GTR_ROLLINGSTART = 1<<12, // Rolling start (only works with GTR_CIRCUIT)
GTR_SPECIALSTART = 1<<13, // White fade instant start
GTR_BOSS = 1<<14, // Boss intro and spawning
// To be rearranged later // General purpose rules
GTR_CATCHER = 1<<17, // UFO Catcher (only works with GTR_CIRCUIT) GTR_POINTLIMIT = 1<<15, // Reaching point limit ends the round
GTR_BOSS = 1<<18, // Boss intro and spawning GTR_TIMELIMIT = 1<<16, // Reaching time limit ends the round
GTR_ROLLINGSTART = 1<<19, // Rolling start (only works with GTR_CIRCUIT) GTR_OVERTIME = 1<<17, // Allow overtime behavior
GTR_NOCUPSELECT = 1<<20, // Your maps are not selected via cup. GTR_ENCORE = 1<<18, // Alternate Encore mirroring, scripting, and texture remapping
GTR_CLOSERPLAYERS = 1<<21, // Buffs spindash and draft power to bring everyone together, nerfs invincibility and grow to prevent excessive combos
GTR_ENCORE = 1<<22, // Alternate Encore mirroring, scripting, and texture remapping GTR_TEAMS = 1<<19, // Teams are forced on
GTR_SPECIALSTART = 1<<23, // White fade instant start GTR_NOTEAMS = 1<<20, // Teams are forced off
GTR_NOMP = 1<<24, // No multiplayer GTR_TEAMSTARTS = 1<<21, // Use team-based start positions
GTR_NOMP = 1<<22, // No multiplayer
GTR_NOCUPSELECT = 1<<23, // Your maps are not selected via cup.
// free: to and including 1<<31 // free: to and including 1<<31
}; };