Merge remote-tracking branch 'origin/master' into shitty-signs

This commit is contained in:
AJ Martinez 2024-03-02 04:32:05 -07:00
commit 81bb3500a4
4 changed files with 32 additions and 1 deletions

View file

@ -787,6 +787,8 @@ consvar_t cv_votetime = UnsavedNetVar("votetime", "20").min_max(10, 3600);
// Cheats don't save...
//
consvar_t cv_4thgear = OnlineCheat("4thgear", "Off").values(CV_OnOff).flags(CV_NOSHOWHELP).description("Surpassing your limits!");
consvar_t cv_barriertime = OnlineCheat("barriertime", "30").values(CV_Natural).description("How long it takes for the Barrier to shrink in Battle Overtime");
consvar_t cv_battlespawn = OnlineCheat("battlespawn", "0").values(CV_Unsigned).description("Spawn every player at the same spawnpoint in Battle (0 = random spawns)");
consvar_t cv_battletest = OnlineCheat("battletest", "Off").on_off().description("Free Play goes to Battle instead of Prisons");

View file

@ -100,6 +100,7 @@ extern consvar_t cv_battletest;
extern consvar_t cv_mentalsonic;
extern consvar_t cv_shittysigns;
extern consvar_t cv_4thgear;
typedef enum {
CV_CAPSULETEST_OFF,

View file

@ -422,6 +422,10 @@ fixed_t K_GetKartGameSpeedScalar(SINT8 value)
// Normal = 100%
// Hard = 118.75%
// Nightmare = 137.5% ?!?!
if (cv_4thgear.value && !netgame && (!demo.playback || !demo.netgame) && !modeattacking)
value = 3;
return ((13 + (3*value)) << FRACBITS) / 16;
}

View file

@ -164,7 +164,7 @@ static UINT8 cheatf_savetheframes(void)
static UINT8 cheatf_mentalsonic(void)
{
cv_mentalsonic.value = !(cv_mentalsonic.value);
CV_SetValue(&cv_mentalsonic, !cv_mentalsonic.value);
if (cv_mentalsonic.value)
{
S_StartSound(NULL, sfx_gshbb);
@ -192,6 +192,22 @@ static UINT8 cheatf_shittysigns(void)
return 1;
}
static UINT8 cheatf_4thgear(void)
{
CV_SetValue(&cv_4thgear, !cv_4thgear.value);
if (cv_4thgear.value)
{
M_StartMessage("Restraint device compromised!", "Local play sped up to ""\x85""4th Gear!""\x80""\nLet's see what you're made of!\n\n""\x86""No effect in netplay and attack modes.", NULL, MM_NOTHING, NULL, NULL);
S_StartSound(NULL, sfx_gshc4);
}
else
{
S_StartSound(NULL, sfx_kc46);
}
return 1;
}
#ifdef DEVELOP
static UINT8 cheatf_devmode(void)
{
@ -269,6 +285,13 @@ static cheatseq_t cheat_mentalsonic = {
NULL, cheatf_mentalsonic,
(UINT8[]){ SCRAMBLE('m'), SCRAMBLE('e'), SCRAMBLE('n'), SCRAMBLE('t'), SCRAMBLE('a'), SCRAMBLE('l'), SCRAMBLE(' '), SCRAMBLE('s'), SCRAMBLE('o'), SCRAMBLE('n'), SCRAMBLE('i'), SCRAMBLE('c'), 0xff }
};
static cheatseq_t cheat_4thgear = {
NULL, cheatf_4thgear,
(UINT8[]){ SCRAMBLE('l'), SCRAMBLE('e'), SCRAMBLE('t'), SCRAMBLE('\''), SCRAMBLE('s'), SCRAMBLE(' '),
SCRAMBLE('g'), SCRAMBLE('e'), SCRAMBLE('t'), SCRAMBLE(' '),
SCRAMBLE('f'), SCRAMBLE('i'), SCRAMBLE('r'), SCRAMBLE('e'), SCRAMBLE('d'), SCRAMBLE(' '),
SCRAMBLE('u'), SCRAMBLE('p'), SCRAMBLE('!'), 0xff }
};
static cheatseq_t cheat_shittysigns = {
NULL, cheatf_shittysigns,
@ -295,6 +318,7 @@ cheatseq_t *cheatseqlist[] =
&cheat_savetheframes,
&cheat_mentalsonic,
&cheat_shittysigns,
&cheat_4thgear,
#ifdef DEVELOP
&cheat_devmode,
&cheat_skipgoner,