stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 04:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Griefing timer

Browse source 
Spectates/kicks players who aren't making progress, does it even faster if they're going backwards.
This commit is contained in:
Sally Coolatta 2020-09-20 17:03:14 -04:00
parent e81a5ee0ca
commit 7b6d527bd4
12 changed files with 109 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/d_clisrv.c
View file

@ -646,6 +646,9 @@ static inline void resynch_write_player(resynch_pak *rsp, const size_t i)
rsp->jointime = (tic_t)LONG(players[i].jointime);
rsp->spectatorreentry = (tic_t)LONG(players[i].spectatorreentry);
rsp->grieftime = (tic_t)LONG(players[i].grieftime);
rsp->griefstrikes = players[i].griefstrikes;
rsp->splitscreenindex = players[i].splitscreenindex;
rsp->hasmo = false;
@ -770,6 +773,9 @@ static void resynch_read_player(resynch_pak *rsp)
players[i].jointime = (tic_t)LONG(rsp->jointime);
players[i].spectatorreentry = (tic_t)LONG(rsp->spectatorreentry);
players[i].grieftime = (tic_t)LONG(rsp->grieftime);
players[i].griefstrikes = rsp->griefstrikes;
players[i].splitscreenindex = rsp->splitscreenindex;
//We get a packet for each player in game.

3
src/d_clisrv.h
View file

@ -284,6 +284,9 @@ typedef struct
tic_t jointime;
tic_t spectatorreentry;
tic_t grieftime;
UINT8 griefstrikes;
UINT8 splitscreenindex;
//player->mo stuff

4
src/d_netcmd.c
View file

@ -250,6 +250,9 @@ consvar_t cv_ingamecap = {"ingamecap", "0", CV_NETVAR, ingamecap_cons_t, NULL, 0
static CV_PossibleValue_t spectatorreentry_cons_t[] = {{0, "MIN"}, {10*60, "MAX"}, {0, NULL}};
consvar_t cv_spectatorreentry = {"spectatorreentry", "60", CV_NETVAR, spectatorreentry_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t antigrief_cons_t[] = {{20, "MIN"}, {60, "MAX"}, {0, "Off"}, {0, NULL}};
consvar_t cv_antigrief = {"antigrief", "30", CV_NETVAR, antigrief_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_startinglives = {"startinglives", "3", CV_NETVAR|CV_CHEAT|CV_NOSHOWHELP, startingliveslimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t respawntime_cons_t[] = {{0, "MIN"}, {30, "MAX"}, {0, NULL}};
@ -683,6 +686,7 @@ void D_RegisterServerCommands(void)
CV_RegisterVar(&cv_allowteamchange);
CV_RegisterVar(&cv_ingamecap);
CV_RegisterVar(&cv_spectatorreentry);
CV_RegisterVar(&cv_antigrief);
CV_RegisterVar(&cv_respawntime);
CV_RegisterVar(&cv_killingdead);

1
src/d_netcmd.h
View file

@ -94,6 +94,7 @@ extern consvar_t cv_killingdead;
extern consvar_t cv_pause;
extern consvar_t cv_restrictskinchange, cv_allowteamchange, cv_ingamecap, cv_respawntime;
extern consvar_t cv_spectatorreentry, cv_antigrief;
/*extern consvar_t cv_teleporters, cv_superring, cv_supersneakers, cv_invincibility;
extern consvar_t cv_jumpshield, cv_watershield, cv_ringshield, cv_forceshield, cv_bombshield;

3
src/d_player.h
View file

@ -522,6 +522,9 @@ typedef struct player_s
tic_t jointime; // Timer when player joins game to change skin/color
tic_t spectatorreentry;
tic_t grieftime;
UINT8 griefstrikes;
UINT8 splitscreenindex;
#ifdef HWRENDER
fixed_t fovadd; // adjust FOV for hw rendering

8
src/g_game.c
View file

@ -2604,6 +2604,8 @@ void G_PlayerReborn(INT32 player)
INT32 respawnflip;
boolean songcredit = false;
tic_t spectatorreentry;
tic_t grieftime;
UINT8 griefstrikes;
score = players[player].score;
marescore = players[player].marescore;
@ -2696,6 +2698,9 @@ void G_PlayerReborn(INT32 player)
spectatorreentry = players[player].spectatorreentry;
grieftime = players[player].grieftime;
griefstrikes = players[player].griefstrikes;
p = &players[player];
memset(p, 0, sizeof (*p));
@ -2748,7 +2753,10 @@ void G_PlayerReborn(INT32 player)
p->kartstuff[k_wanted] = wanted;
p->kartstuff[k_eggmanblame] = -1;
p->kartstuff[k_starpostflip] = respawnflip;
p->spectatorreentry = spectatorreentry;
p->grieftime = grieftime;
p->griefstrikes = griefstrikes;
// Don't do anything immediately
p->pflags |= PF_USEDOWN;

10
src/lua_playerlib.c
View file

@ -382,8 +382,12 @@ static int player_get(lua_State *L)
lua_pushinteger(L, plr->bot);
else if (fastcmp(field,"jointime"))
lua_pushinteger(L, plr->jointime);
else if (fastcmp(field,"spectatorreentry")
else if (fastcmp(field,"spectatorreentry"))
lua_pushinteger(L, plr->spectatorreentry);
else if (fastcmp(field,"grieftime"))
lua_pushinteger(L, plr->grieftime);
else if (fastcmp(field,"griefstrikes"))
lua_pushinteger(L, plr->griefstrikes);
else if (fastcmp(field,"splitscreenindex"))
lua_pushinteger(L, plr->splitscreenindex);
#ifdef HWRENDER
@ -650,6 +654,10 @@ static int player_set(lua_State *L)
plr->jointime = (tic_t)luaL_checkinteger(L, 3);
else if (fastcmp(field,"spectatorreentry"))
plr->spectatorreentry = (tic_t)luaL_checkinteger(L, 3);
else if (fastcmp(field,"grieftime"))
plr->grieftime = (tic_t)luaL_checkinteger(L, 3);
else if (fastcmp(field,"griefstrikes"))
plr->griefstrikes = (UINT8)luaL_checkinteger(L, 3);
else if (fastcmp(field,"splitscreenindex"))
return NOSET;
#ifdef HWRENDER

9
src/p_inter.c
View file

@ -1454,7 +1454,15 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
{
// blatant reuse of a variable that's normally unused in circuit
if (!player->tossdelay)
{
S_StartSound(toucher, sfx_s26d);
if (netgame && cv_antigrief.value)
{
player->grieftime += TICRATE;
}
}
player->tossdelay = 3;
return;
}
@ -1478,6 +1486,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
player->starpostangle = special->angle;
player->starpostnum = special->health;
player->kartstuff[k_starpostflip] = special->spawnpoint->options & MTF_OBJECTFLIP; // store flipping
player->grieftime = 0;
//S_StartSound(toucher, special->info->painsound);
return;

2
src/p_mobj.c
View file

@ -10730,6 +10730,8 @@ void P_SpawnPlayer(INT32 playernum)
// Spawn with a pity shield if necessary.
//P_DoPityCheck(p);
p->grieftime = 0;
if (G_BattleGametype()) // SRB2kart
{
mobj_t *overheadarrow = P_SpawnMobj(mobj->x, mobj->y, mobj->z + P_GetPlayerHeight(p)+16*FRACUNIT, MT_PLAYERARROW);

6
src/p_saveg.c
View file

@ -248,6 +248,9 @@ static void P_NetArchivePlayers(void)
WRITEUINT32(save_p, players[i].jointime);
WRITEUINT32(save_p, players[i].spectatorreentry);
WRITEUINT32(save_p, players[i].grieftime);
WRITEUINT8(save_p, players[i].griefstrikes);
WRITEUINT8(save_p, players[i].splitscreenindex);
WRITEUINT16(save_p, flags);
@ -414,6 +417,9 @@ static void P_NetUnArchivePlayers(void)
players[i].jointime = READUINT32(save_p);
players[i].spectatorreentry = READUINT32(save_p);
players[i].grieftime = READUINT32(save_p);
players[i].griefstrikes = READUINT8(save_p);
players[i].splitscreenindex = READUINT8(save_p);
flags = READUINT16(save_p);

9
src/p_spec.c
View file

@ -4316,12 +4316,21 @@ DoneSection2:
nospectategrief = nump;
thwompsactive = true; // Lap 2 effects
player->grieftime = 0;
}
else if (player->starpostnum)
{
// blatant reuse of a variable that's normally unused in circuit
if (!player->tossdelay)
{
S_StartSound(player->mo, sfx_s26d);
if (netgame && cv_antigrief.value)
{
player->grieftime += TICRATE;
}
}
player->tossdelay = 3;
}

49
src/p_user.c
View file

@ -8489,6 +8489,55 @@ void P_PlayerThink(player_t *player)
}
}
if (netgame && cv_antigrief.value != 0)
{
if (!player->spectator && !player->exiting && !(player->pflags & PF_TIMEOVER))
{
const tic_t griefval = cv_antigrief.value * TICRATE;
const UINT8 n = player - players;
if (n != serverplayer && !IsPlayerAdmin(n))
{
if (player->grieftime > griefval)
{
player->griefstrikes++;
player->grieftime = 0;
if (server)
{
if (player->griefstrikes > 2)
{
// Send kick
XBOXSTATIC UINT8 buf[2];
buf[0] = n;
buf[1] = KICK_MSG_CON_FAIL;
SendNetXCmd(XD_KICK, &buf, 2);
}
else
{
// Send spectate
changeteam_union NetPacket;
UINT16 usvalue;
NetPacket.value.l = NetPacket.value.b = 0;
NetPacket.packet.newteam = 0;
NetPacket.packet.playernum = n;
NetPacket.packet.verification = true;
usvalue = SHORT(NetPacket.value.l|NetPacket.value.b);
SendNetXCmd(XD_TEAMCHANGE, &usvalue, sizeof(usvalue));
}
}
}
else
{
player->grieftime++;
}
}
}
}
if ((netgame || multiplayer) && player->spectator && cmd->buttons & BT_ATTACK && !player->powers[pw_flashing])
{
player->pflags ^= PF_WANTSTOJOIN;