From bee3dfdc8d5efa3206f8078e4dd8f17e6bb9b216 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 16 Jan 2019 16:16:11 -0500 Subject: [PATCH 1/2] Fix XD_REMOVEPLAYER not having a proper corresponding netxcmdname Caught while working on power levels -- turns out it wasn't a total waste of time when I should've been working on the rest of v1.0.2! --- src/d_netcmd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index e15ed9aac..e3b5e9847 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -483,6 +483,7 @@ const char *netxcmdnames[MAXNETXCMD - 1] = "SETUPVOTE", "MODIFYVOTE", "PICKVOTE", + "REMOVEPLAYER", #ifdef HAVE_BLUA "LUACMD", "LUAVAR" From c5a2a95ef1f3b0b3c80a25983c84bc269d98b942 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 16 Jan 2019 16:19:16 -0500 Subject: [PATCH 2/2] Bump up the frequency of voting rule changes This is in our changelog, but I didn't actually get around to doing it. Would've been foolish to ship with that :V --- src/d_netcmd.c | 2 +- src/g_game.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index e3b5e9847..2b6078306 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -357,7 +357,7 @@ consvar_t cv_kartfrantic = {"kartfrantic", "Off", CV_NETVAR|CV_CHEAT|CV_CALL|CV_ consvar_t cv_kartcomeback = {"kartcomeback", "On", CV_NETVAR|CV_CHEAT|CV_CALL|CV_NOINIT, CV_OnOff, KartComeback_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_kartencore = {"kartencore", "Off", CV_NETVAR|CV_CALL|CV_NOINIT, CV_OnOff, KartEncore_OnChange, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t kartvoterulechanges_cons_t[] = {{0, "Never"}, {1, "Sometimes"}, {2, "Frequent"}, {3, "Always"}, {0, NULL}}; -consvar_t cv_kartvoterulechanges = {"kartvoterulechanges", "Sometimes", CV_NETVAR, kartvoterulechanges_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_kartvoterulechanges = {"kartvoterulechanges", "Frequent", CV_NETVAR, kartvoterulechanges_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t kartspeedometer_cons_t[] = {{0, "Off"}, {1, "Kilometers"}, {2, "Miles"}, {3, "Fracunits"}, {0, NULL}}; consvar_t cv_kartspeedometer = {"kartdisplayspeed", "Off", CV_SAVE, kartspeedometer_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; // use tics in display static CV_PossibleValue_t kartvoices_cons_t[] = {{0, "Never"}, {1, "Tasteful"}, {2, "Meme"}, {0, NULL}}; diff --git a/src/g_game.c b/src/g_game.c index cad3ab853..1160dc698 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -3159,7 +3159,7 @@ INT16 G_SometimesGetDifferentGametype(void) break; case 1: // sometimes default: - encorepossible = M_RandomChance(FRACUNIT>>3); + encorepossible = M_RandomChance(FRACUNIT>>2); break; } if (encorepossible != (boolean)cv_kartencore.value) @@ -3174,12 +3174,12 @@ INT16 G_SometimesGetDifferentGametype(void) randmapbuffer[NUMMAPS] = 1; // every other vote (or always if !encorepossible) break; case 1: // sometimes - randmapbuffer[NUMMAPS] = 10; // ...every two cups? + randmapbuffer[NUMMAPS] = 5; // per "cup" break; default: // fallthrough - happens when clearing buffer, but needs a reasonable countdown if cvar is modified case 2: // frequent - randmapbuffer[NUMMAPS] = 5; // per "cup" + randmapbuffer[NUMMAPS] = 3; // ...every 1/2th-ish cup? break; }