From 3fbffb0b4da81a622f682b52df5c81ecc5d3bb8b Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Fri, 30 Mar 2018 14:36:49 -0400
Subject: [PATCH 1/7] Add player_t marelap and marebonuslap, with logic

---
 src/d_player.h      |  2 ++
 src/g_game.c        |  2 ++
 src/lua_playerlib.c |  8 ++++++++
 src/p_map.c         | 17 ++++++++++++-----
 src/p_saveg.c       |  4 ++++
 src/p_setup.c       |  1 +
 src/p_user.c        |  4 ++++
 7 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/d_player.h b/src/d_player.h
index e1350fe67..f919eddb0 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -455,6 +455,8 @@ typedef struct player_s
 	boolean bonustime; // Capsule destroyed, now it's bonus time!
 	mobj_t *capsule; // Go inside the capsule
 	UINT8 mare; // Current mare
+	UINT8 marelap; // Current mare lap
+	UINT8 marebonuslap; // Current mare lap starting from bonus time
 
 	// Statistical purposes.
 	tic_t marebegunat; // Leveltime when mare begun
diff --git a/src/g_game.c b/src/g_game.c
index 9db9c413b..a2e9b881a 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2230,6 +2230,8 @@ void G_PlayerReborn(INT32 player)
 	if (p->mare == 255)
 		p->mare = 0;
 
+	p->marelap = p->marebonuslap = 0;
+
 	// Check to make sure their color didn't change somehow...
 	if (G_GametypeHasTeams())
 	{
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index 12b2646d0..9b5aa6fdc 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -288,6 +288,10 @@ static int player_get(lua_State *L)
 		LUA_PushUserdata(L, plr->capsule, META_MOBJ);
 	else if (fastcmp(field,"mare"))
 		lua_pushinteger(L, plr->mare);
+	else if (fastcmp(field,"marelap"))
+		lua_pushinteger(L, plr->marelap);
+	else if (fastcmp(field,"marebonuslap"))
+		lua_pushinteger(L, plr->marebonuslap);
 	else if (fastcmp(field,"marebegunat"))
 		lua_pushinteger(L, plr->marebegunat);
 	else if (fastcmp(field,"startedtime"))
@@ -564,6 +568,10 @@ static int player_set(lua_State *L)
 	}
 	else if (fastcmp(field,"mare"))
 		plr->mare = (UINT8)luaL_checkinteger(L, 3);
+	else if (fastcmp(field,"marelap"))
+		plr->marelap = (UINT8)luaL_checkinteger(L, 3);
+	else if (fastcmp(field,"marebonuslap"))
+		plr->marebonuslap = (UINT8)luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"marebegunat"))
 		plr->marebegunat = (tic_t)luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"startedtime"))
diff --git a/src/p_map.c b/src/p_map.c
index 6d1760596..565680e22 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -905,24 +905,31 @@ static boolean PIT_CheckThing(mobj_t *thing)
 		P_SetTarget(&thing->target, tmthing);
 	}
 
-	// Respawn rings and items
+	// NiGHTS lap logic
 	if ((tmthing->type == MT_NIGHTSDRONE || thing->type == MT_NIGHTSDRONE)
 	 && (tmthing->player || thing->player))
 	{
 		mobj_t *droneobj = (tmthing->type == MT_NIGHTSDRONE) ? tmthing : thing;
 		player_t *pl = (droneobj == thing) ? tmthing->player : thing->player;
 
-		// Must be in bonus time, and must be NiGHTS, must wait about a second
+		// Must be NiGHTS, must wait about a second
 		// must be flying in the SAME DIRECTION as the last time you came through.
 		// not (your direction) xor (stored direction)
 		// In other words, you can't u-turn and respawn rings near the drone.
-		if (pl->bonustime && (pl->powers[pw_carry] == CR_NIGHTSMODE) && (INT32)leveltime > droneobj->extravalue2 && (
+		if ((pl->powers[pw_carry] == CR_NIGHTSMODE) && (INT32)leveltime > droneobj->extravalue2 && (
 		   !(pl->anotherflyangle >= 90 &&   pl->anotherflyangle <= 270)
 		^ (droneobj->extravalue1 >= 90 && droneobj->extravalue1 <= 270)
 		))
 		{
-			// Reload all the fancy ring stuff!
-			P_ReloadRings();
+			pl->marelap++;
+
+			if (pl->bonustime) 
+			{
+				pl->marebonuslap++;
+
+				// Respawn rings and items
+				P_ReloadRings();
+			}
 		}
 		droneobj->extravalue1 = pl->anotherflyangle;
 		droneobj->extravalue2 = (INT32)leveltime + TICRATE;
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 029df08f4..59d1775a8 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -197,6 +197,8 @@ static void P_NetArchivePlayers(void)
 		WRITEUINT8(save_p, players[i].drilldelay);
 		WRITEUINT8(save_p, players[i].bonustime);
 		WRITEUINT8(save_p, players[i].mare);
+		WRITEUINT8(save_p, players[i].marelap);
+		WRITEUINT8(save_p, players[i].marebonuslap);
 
 		WRITEUINT32(save_p, players[i].marebegunat);
 		WRITEUINT32(save_p, players[i].startedtime);
@@ -384,6 +386,8 @@ static void P_NetUnArchivePlayers(void)
 		players[i].drilldelay = READUINT8(save_p);
 		players[i].bonustime = (boolean)READUINT8(save_p);
 		players[i].mare = READUINT8(save_p);
+		players[i].marelap = READUINT8(save_p);
+		players[i].marebonuslap = READUINT8(save_p);
 
 		players[i].marebegunat = READUINT32(save_p);
 		players[i].startedtime = READUINT32(save_p);
diff --git a/src/p_setup.c b/src/p_setup.c
index a9fc57652..f3e92abce 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2350,6 +2350,7 @@ static void P_LevelInitStuff(void)
 		players[i].linkcount = players[i].linktimer = 0;
 		players[i].flyangle = players[i].anotherflyangle = 0;
 		players[i].nightstime = players[i].mare = 0;
+		players[i].marelap = 0; players[i].marebonuslap = 0;
 		P_SetTarget(&players[i].capsule, NULL);
 		players[i].drillmeter = 40*20;
 
diff --git a/src/p_user.c b/src/p_user.c
index f422e9b65..a6fe9e315 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -399,6 +399,8 @@ boolean P_TransferToNextMare(player_t *player)
 	CONS_Debug(DBG_NIGHTS, "Mare is %d\n", mare);
 
 	player->mare = mare;
+	player->marelap = 0;
+	player->marebonuslap = 0;
 
 	// scan the thinkers
 	// to find the closest axis point
@@ -586,6 +588,8 @@ static void P_DeNightserizePlayer(player_t *player)
 	player->climbing = 0;
 	player->mo->fuse = 0;
 	player->speed = 0;
+	player->marelap = 0;
+	player->marebonuslap = 0;
 	P_SetTarget(&player->mo->target, NULL);
 	P_SetTarget(&player->axis1, P_SetTarget(&player->axis2, NULL));
 

From d58445fdf3425af786f729a9ef9b89f0a1628d64 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Fri, 10 Aug 2018 16:17:28 -0400
Subject: [PATCH 2/7] Set player->finishedrings upon new mare

(Forgot this line from the player->spheres merge, so let's straggle here)
---
 src/p_user.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/p_user.c b/src/p_user.c
index 5f1284ef8..b7336b545 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -746,6 +746,7 @@ void P_NightserizePlayer(player_t *player, INT32 nighttime)
 		player->texttimer = 4*TICRATE;
 		player->textvar = 4; // Score and grades
 		player->finishedspheres = (INT16)(player->spheres);
+		player->finishedrings = (INT16)(player->rings);
 
 		// Add score to temp leaderboards
 		if (!(netgame||multiplayer) && P_IsLocalPlayer(player))

From 18b5b70822a88a8dfffa68dd4fff91ac9cc3ed82 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Fri, 10 Aug 2018 16:30:49 -0400
Subject: [PATCH 3/7] Add lastmarelap and lastmarebonuslap player variables

---
 src/d_player.h      |  2 ++
 src/lua_playerlib.c |  8 ++++++++
 src/p_saveg.c       |  4 ++++
 src/p_setup.c       |  1 +
 src/p_user.c        | 10 ++++++++--
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/d_player.h b/src/d_player.h
index cea3d5130..498b7166d 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -468,6 +468,8 @@ typedef struct player_s
 	UINT32 marescore; // score for this nights stage
 	UINT32 lastmarescore; // score for the last mare
 	UINT8 lastmare; // previous mare
+	UINT8 lastmarelap; // previous mare lap
+	UINT8 lastmarebonuslap; // previous mare bonus lap
 	INT32 maxlink; // maximum link obtained
 	UINT8 texttimer; // nights_texttime should not be local
 	UINT8 textvar; // which line of NiGHTS text to show -- let's not use cheap hacks
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index 345f4a4d0..7deefa7ff 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -310,6 +310,10 @@ static int player_get(lua_State *L)
 		lua_pushinteger(L, plr->lastmarescore);
 	else if (fastcmp(field,"lastmare"))
 		lua_pushinteger(L, plr->lastmare);
+	else if (fastcmp(field,"lastmarelap"))
+		lua_pushinteger(L, plr->lastmarelap);
+	else if (fastcmp(field,"lastmarebonuslap"))
+		lua_pushinteger(L, plr->lastmarebonuslap);
 	else if (fastcmp(field,"maxlink"))
 		lua_pushinteger(L, plr->maxlink);
 	else if (fastcmp(field,"texttimer"))
@@ -594,6 +598,10 @@ static int player_set(lua_State *L)
 		plr->lastmarescore = (UINT32)luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"lastmare"))
 		plr->lastmare = (UINT8)luaL_checkinteger(L, 3);
+	else if (fastcmp(field,"lastmarelap"))
+		plr->lastmarelap = (UINT8)luaL_checkinteger(L, 3);
+	else if (fastcmp(field,"lastmarebonuslap"))
+		plr->lastmarebonuslap = (UINT8)luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"maxlink"))
 		plr->maxlink = (INT32)luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"texttimer"))
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 729342424..2b48cc783 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -209,6 +209,8 @@ static void P_NetArchivePlayers(void)
 		WRITEUINT32(save_p, players[i].marescore);
 		WRITEUINT32(save_p, players[i].lastmarescore);
 		WRITEUINT8(save_p, players[i].lastmare);
+		WRITEUINT8(save_p, players[i].lastmarelap);
+		WRITEUINT8(save_p, players[i].lastmarebonuslap);
 		WRITEINT32(save_p, players[i].maxlink);
 		WRITEUINT8(save_p, players[i].texttimer);
 		WRITEUINT8(save_p, players[i].textvar);
@@ -400,6 +402,8 @@ static void P_NetUnArchivePlayers(void)
 		players[i].marescore = READUINT32(save_p);
 		players[i].lastmarescore = READUINT32(save_p);
 		players[i].lastmare = READUINT8(save_p);
+		players[i].lastmarelap = READUINT8(save_p);
+		players[i].lastmarebonuslap = READUINT8(save_p);
 		players[i].maxlink = READINT32(save_p);
 		players[i].texttimer = READUINT8(save_p);
 		players[i].textvar = READUINT8(save_p);
diff --git a/src/p_setup.c b/src/p_setup.c
index 46f77536d..e4b6034b1 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2381,6 +2381,7 @@ static void P_LevelInitStuff(void)
 		 players[i].maxlink = players[i].startedtime =\
 		 players[i].finishedtime = players[i].finishedspheres =\
 		 players[i].finishedrings = players[i].lastmare =\
+		 players[i].lastmarelap = players[i].lastmarebonuslap =\
 		 players[i].marebegunat = players[i].textvar =\
 		 players[i].texttimer = players[i].linkcount =\
 		 players[i].linktimer = players[i].flyangle =\
diff --git a/src/p_user.c b/src/p_user.c
index b7336b545..99ecb8154 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -637,7 +637,7 @@ static void P_DeNightserizePlayer(player_t *player)
 // NiGHTS Time!
 void P_NightserizePlayer(player_t *player, INT32 nighttime)
 {
-	INT32 oldmare;
+	UINT8 oldmare, oldmarelap, oldmarebonuslap;
 
 	// Bots can't be NiGHTSerized, silly!1 :P
 	if (player->bot)
@@ -684,6 +684,8 @@ void P_NightserizePlayer(player_t *player, INT32 nighttime)
 	}
 
 	oldmare = player->mare;
+	oldmarelap = player->marelap;
+	oldmarebonuslap = player->marebonuslap;
 
 	if (!P_TransferToNextMare(player))
 	{
@@ -711,6 +713,8 @@ void P_NightserizePlayer(player_t *player, INT32 nighttime)
 			players[i].texttimer = (3 * TICRATE) - 10;
 			players[i].textvar = 4; // Score and grades
 			players[i].lastmare = players[i].mare;
+			players[i].lastmarelap = players[i].marelap;
+			players[i].lastmarebonuslap = players[i].marebonuslap;
 			if (G_IsSpecialStage(gamemap))
 			{
 				players[i].finishedspheres = (INT16)total_spheres;
@@ -742,7 +746,9 @@ void P_NightserizePlayer(player_t *player, INT32 nighttime)
 		// Spheres bonus
 		P_AddPlayerScore(player, (player->spheres) * 50);
 
-		player->lastmare = (UINT8)oldmare;
+		player->lastmare = oldmare;
+		player->lastmarelap = oldmarelap;
+		player->lastmarebonuslap = oldmarebonuslap;
 		player->texttimer = 4*TICRATE;
 		player->textvar = 4; // Score and grades
 		player->finishedspheres = (INT16)(player->spheres);

From 4e02171c2350400602bbf421a8d0af56b4fdc99a Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Fri, 10 Aug 2018 17:12:26 -0400
Subject: [PATCH 4/7] Add lapbegunat and lapstartedtime player variables

There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.
---
 src/d_player.h      | 2 ++
 src/lua_playerlib.c | 8 ++++++++
 src/p_inter.c       | 2 ++
 src/p_map.c         | 2 ++
 src/p_saveg.c       | 4 ++++
 src/p_setup.c       | 3 ++-
 src/p_user.c        | 3 ++-
 7 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/d_player.h b/src/d_player.h
index 498b7166d..648867b92 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -463,6 +463,8 @@ typedef struct player_s
 	tic_t marebegunat; // Leveltime when mare begun
 	tic_t startedtime; // Time which you started this mare with.
 	tic_t finishedtime; // Time it took you to finish the mare (used for display)
+	tic_t lapbegunat; // Leveltime when lap begun
+	tic_t lapstartedtime; // Time which you started this lap with.
 	INT16 finishedspheres; // The spheres you had left upon finishing the mare
 	INT16 finishedrings; // The rings/stars you had left upon finishing the mare
 	UINT32 marescore; // score for this nights stage
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index 7deefa7ff..114aa27b0 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -300,6 +300,10 @@ static int player_get(lua_State *L)
 		lua_pushinteger(L, plr->startedtime);
 	else if (fastcmp(field,"finishedtime"))
 		lua_pushinteger(L, plr->finishedtime);
+	else if (fastcmp(field,"lapbegunat"))
+		lua_pushinteger(L, plr->lapbegunat);
+	else if (fastcmp(field,"lapstartedtime"))
+		lua_pushinteger(L, plr->lapstartedtime);
 	else if (fastcmp(field,"finishedspheres"))
 		lua_pushinteger(L, plr->finishedspheres);
 	else if (fastcmp(field,"finishedrings"))
@@ -588,6 +592,10 @@ static int player_set(lua_State *L)
 		plr->startedtime = (tic_t)luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"finishedtime"))
 		plr->finishedtime = (tic_t)luaL_checkinteger(L, 3);
+	else if (fastcmp(field,"lapbegunat"))
+		plr->lapbegunat = (tic_t)luaL_checkinteger(L, 3);
+	else if (fastcmp(field,"lapstartedtime"))
+		plr->lapstartedtime = (tic_t)luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"finishedspheres"))
 		plr->finishedspheres = (INT16)luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"finishedrings"))
diff --git a/src/p_inter.c b/src/p_inter.c
index ce8bba6b6..e7590439e 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1134,6 +1134,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			{
 				player->nightstime += special->info->speed;
 				player->startedtime += special->info->speed;
+				player->lapstartedtime += special->info->speed;
 				P_RestoreMusic(player);
 			}
 			else
@@ -1143,6 +1144,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 					{
 						players[i].nightstime += special->info->speed;
 						players[i].startedtime += special->info->speed;
+						players[i].lapstartedtime += special->info->speed;
 						P_RestoreMusic(&players[i]);
 					}
 				if (special->info->deathsound != sfx_None)
diff --git a/src/p_map.c b/src/p_map.c
index 415e2bac1..7d3538573 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -1114,6 +1114,8 @@ static boolean PIT_CheckThing(mobj_t *thing)
 		))
 		{
 			pl->marelap++;
+			pl->lapbegunat = leveltime;
+			pl->lapstartedtime = pl->nightstime;
 
 			if (pl->bonustime) 
 			{
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 2b48cc783..e18802f57 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -204,6 +204,8 @@ static void P_NetArchivePlayers(void)
 		WRITEUINT32(save_p, players[i].marebegunat);
 		WRITEUINT32(save_p, players[i].startedtime);
 		WRITEUINT32(save_p, players[i].finishedtime);
+		WRITEUINT32(save_p, players[i].lapbegunat);
+		WRITEUINT32(save_p, players[i].lapstartedtime);
 		WRITEINT16(save_p, players[i].finishedspheres);
 		WRITEINT16(save_p, players[i].finishedrings);
 		WRITEUINT32(save_p, players[i].marescore);
@@ -397,6 +399,8 @@ static void P_NetUnArchivePlayers(void)
 		players[i].marebegunat = READUINT32(save_p);
 		players[i].startedtime = READUINT32(save_p);
 		players[i].finishedtime = READUINT32(save_p);
+		players[i].lapbegunat = READUINT32(save_p);
+		players[i].lapstartedtime = READUINT32(save_p);
 		players[i].finishedspheres = READINT16(save_p);
 		players[i].finishedrings = READINT16(save_p);
 		players[i].marescore = READUINT32(save_p);
diff --git a/src/p_setup.c b/src/p_setup.c
index e4b6034b1..4b10f431c 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2387,7 +2387,8 @@ static void P_LevelInitStuff(void)
 		 players[i].linktimer = players[i].flyangle =\
 		 players[i].anotherflyangle = players[i].nightstime =\
 		 players[i].mare = players[i].marelap =\
-		 players[i].marebonuslap = players[i].realtime =\
+		 players[i].marebonuslap = players[i].lapbegunat =\
+		 players[i].lapstartedtime = players[i].realtime =\
 		 players[i].exiting = 0;
 
 		// i guess this could be part of the above but i feel mildly uncomfortable implicitly casting
diff --git a/src/p_user.c b/src/p_user.c
index 99ecb8154..06f42dcad 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -666,7 +666,7 @@ void P_NightserizePlayer(player_t *player, INT32 nighttime)
 		player->followitem = skins[DEFAULTNIGHTSSKIN].followitem;
 	}
 
-	player->nightstime = player->startedtime = nighttime*TICRATE;
+	player->nightstime = player->startedtime = player->lapstartedtime = nighttime*TICRATE;
 	player->bonustime = false;
 
 	P_RestoreMusic(player);
@@ -762,6 +762,7 @@ void P_NightserizePlayer(player_t *player, INT32 nighttime)
 		player->lastmarescore = player->marescore;
 		player->marescore = 0;
 		player->marebegunat = leveltime;
+		player->lapbegunat = leveltime;
 
 		player->spheres = player->rings = 0;
 	}

From 5938a5797070d9c5c1293f7bb90b245307266bc6 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Sun, 12 Aug 2018 19:57:33 -0400
Subject: [PATCH 5/7] totalmarelap and totalmarebonuslap player variables

---
 src/d_player.h      | 2 ++
 src/lua_playerlib.c | 8 ++++++++
 src/p_map.c         | 4 +++-
 src/p_saveg.c       | 4 ++++
 src/p_setup.c       | 1 +
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/d_player.h b/src/d_player.h
index 648867b92..e7e6e4827 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -472,6 +472,8 @@ typedef struct player_s
 	UINT8 lastmare; // previous mare
 	UINT8 lastmarelap; // previous mare lap
 	UINT8 lastmarebonuslap; // previous mare bonus lap
+	UINT8 totalmarelap; // total mare lap
+	UINT8 totalmarebonuslap; // total mare bonus lap
 	INT32 maxlink; // maximum link obtained
 	UINT8 texttimer; // nights_texttime should not be local
 	UINT8 textvar; // which line of NiGHTS text to show -- let's not use cheap hacks
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index 114aa27b0..67efe7710 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -318,6 +318,10 @@ static int player_get(lua_State *L)
 		lua_pushinteger(L, plr->lastmarelap);
 	else if (fastcmp(field,"lastmarebonuslap"))
 		lua_pushinteger(L, plr->lastmarebonuslap);
+	else if (fastcmp(field,"totalmarelap"))
+		lua_pushinteger(L, plr->totalmarelap);
+	else if (fastcmp(field,"totalmarebonuslap"))
+		lua_pushinteger(L, plr->totalmarebonuslap);
 	else if (fastcmp(field,"maxlink"))
 		lua_pushinteger(L, plr->maxlink);
 	else if (fastcmp(field,"texttimer"))
@@ -610,6 +614,10 @@ static int player_set(lua_State *L)
 		plr->lastmarelap = (UINT8)luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"lastmarebonuslap"))
 		plr->lastmarebonuslap = (UINT8)luaL_checkinteger(L, 3);
+	else if (fastcmp(field,"totalmarelap"))
+		plr->totalmarelap = (UINT8)luaL_checkinteger(L, 3);
+	else if (fastcmp(field,"totalmarebonuslap"))
+		plr->totalmarebonuslap = (UINT8)luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"maxlink"))
 		plr->maxlink = (INT32)luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"texttimer"))
diff --git a/src/p_map.c b/src/p_map.c
index 7d3538573..6e5e03a8d 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -1114,12 +1114,14 @@ static boolean PIT_CheckThing(mobj_t *thing)
 		))
 		{
 			pl->marelap++;
+			pl->totalmarelap++;
 			pl->lapbegunat = leveltime;
 			pl->lapstartedtime = pl->nightstime;
 
-			if (pl->bonustime) 
+			if (pl->bonustime)
 			{
 				pl->marebonuslap++;
+				pl->totalmarebonuslap++;
 
 				// Respawn rings and items
 				P_ReloadRings();
diff --git a/src/p_saveg.c b/src/p_saveg.c
index e18802f57..bcc582cd0 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -213,6 +213,8 @@ static void P_NetArchivePlayers(void)
 		WRITEUINT8(save_p, players[i].lastmare);
 		WRITEUINT8(save_p, players[i].lastmarelap);
 		WRITEUINT8(save_p, players[i].lastmarebonuslap);
+		WRITEUINT8(save_p, players[i].totalmarelap);
+		WRITEUINT8(save_p, players[i].totalmarebonuslap);
 		WRITEINT32(save_p, players[i].maxlink);
 		WRITEUINT8(save_p, players[i].texttimer);
 		WRITEUINT8(save_p, players[i].textvar);
@@ -408,6 +410,8 @@ static void P_NetUnArchivePlayers(void)
 		players[i].lastmare = READUINT8(save_p);
 		players[i].lastmarelap = READUINT8(save_p);
 		players[i].lastmarebonuslap = READUINT8(save_p);
+		players[i].totalmarelap = READUINT8(save_p);
+		players[i].totalmarebonuslap = READUINT8(save_p);
 		players[i].maxlink = READINT32(save_p);
 		players[i].texttimer = READUINT8(save_p);
 		players[i].textvar = READUINT8(save_p);
diff --git a/src/p_setup.c b/src/p_setup.c
index 4b10f431c..ee462193d 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2382,6 +2382,7 @@ static void P_LevelInitStuff(void)
 		 players[i].finishedtime = players[i].finishedspheres =\
 		 players[i].finishedrings = players[i].lastmare =\
 		 players[i].lastmarelap = players[i].lastmarebonuslap =\
+		 players[i].totalmarelap = players[i].totalmarebonuslap =\
 		 players[i].marebegunat = players[i].textvar =\
 		 players[i].texttimer = players[i].linkcount =\
 		 players[i].linktimer = players[i].flyangle =\

From ec8d26402929b5099e2fd922a707c04d98070cf3 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Sun, 12 Aug 2018 19:59:34 -0400
Subject: [PATCH 6/7] totalmarescore player variable for NiGHTS scoring

# Conflicts:
#	src/p_setup.c
---
 src/d_player.h      | 1 +
 src/lua_playerlib.c | 4 ++++
 src/p_saveg.c       | 2 ++
 src/p_setup.c       | 4 ++--
 src/p_user.c        | 2 ++
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/d_player.h b/src/d_player.h
index e7e6e4827..fd41c7621 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -469,6 +469,7 @@ typedef struct player_s
 	INT16 finishedrings; // The rings/stars you had left upon finishing the mare
 	UINT32 marescore; // score for this nights stage
 	UINT32 lastmarescore; // score for the last mare
+	UINT32 totalmarescore; // score for all mares
 	UINT8 lastmare; // previous mare
 	UINT8 lastmarelap; // previous mare lap
 	UINT8 lastmarebonuslap; // previous mare bonus lap
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index 67efe7710..f973061f1 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -312,6 +312,8 @@ static int player_get(lua_State *L)
 		lua_pushinteger(L, plr->marescore);
 	else if (fastcmp(field,"lastmarescore"))
 		lua_pushinteger(L, plr->lastmarescore);
+	else if (fastcmp(field,"totalmarescore"))
+		lua_pushinteger(L, plr->totalmarescore);
 	else if (fastcmp(field,"lastmare"))
 		lua_pushinteger(L, plr->lastmare);
 	else if (fastcmp(field,"lastmarelap"))
@@ -608,6 +610,8 @@ static int player_set(lua_State *L)
 		plr->marescore = (UINT32)luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"lastmarescore"))
 		plr->lastmarescore = (UINT32)luaL_checkinteger(L, 3);
+	else if (fastcmp(field,"totalmarescore"))
+		plr->totalmarescore = (UINT32)luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"lastmare"))
 		plr->lastmare = (UINT8)luaL_checkinteger(L, 3);
 	else if (fastcmp(field,"lastmarelap"))
diff --git a/src/p_saveg.c b/src/p_saveg.c
index bcc582cd0..22d43f358 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -210,6 +210,7 @@ static void P_NetArchivePlayers(void)
 		WRITEINT16(save_p, players[i].finishedrings);
 		WRITEUINT32(save_p, players[i].marescore);
 		WRITEUINT32(save_p, players[i].lastmarescore);
+		WRITEUINT32(save_p, players[i].totalmarescore);
 		WRITEUINT8(save_p, players[i].lastmare);
 		WRITEUINT8(save_p, players[i].lastmarelap);
 		WRITEUINT8(save_p, players[i].lastmarebonuslap);
@@ -407,6 +408,7 @@ static void P_NetUnArchivePlayers(void)
 		players[i].finishedrings = READINT16(save_p);
 		players[i].marescore = READUINT32(save_p);
 		players[i].lastmarescore = READUINT32(save_p);
+		players[i].totalmarescore = READUINT32(save_p);
 		players[i].lastmare = READUINT8(save_p);
 		players[i].lastmarelap = READUINT8(save_p);
 		players[i].lastmarebonuslap = READUINT8(save_p);
diff --git a/src/p_setup.c b/src/p_setup.c
index ee462193d..368b95dd5 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2389,8 +2389,8 @@ static void P_LevelInitStuff(void)
 		 players[i].anotherflyangle = players[i].nightstime =\
 		 players[i].mare = players[i].marelap =\
 		 players[i].marebonuslap = players[i].lapbegunat =\
-		 players[i].lapstartedtime = players[i].realtime =\
-		 players[i].exiting = 0;
+		 players[i].lapstartedtime = players[i].totalmarescore =\
+		 players[i].realtime = players[i].exiting = 0;
 
 		// i guess this could be part of the above but i feel mildly uncomfortable implicitly casting
 		players[i].gotcontinue = false;
diff --git a/src/p_user.c b/src/p_user.c
index 06f42dcad..9d677b4bc 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -733,6 +733,7 @@ void P_NightserizePlayer(player_t *player, INT32 nighttime)
 				G_AddTempNightsRecords(players[i].marescore, leveltime - player->marebegunat, players[i].mare + 1);
 
 			// transfer scores anyway
+			players[i].totalmarescore += players[i].marescore;
 			players[i].lastmarescore = players[i].marescore;
 			players[i].marescore = 0;
 
@@ -759,6 +760,7 @@ void P_NightserizePlayer(player_t *player, INT32 nighttime)
 			G_AddTempNightsRecords(player->marescore, leveltime - player->marebegunat, (UINT8)(oldmare + 1));
 
 		// Starting a new mare, transfer scores
+		player->totalmarescore += players[i].marescore;
 		player->lastmarescore = player->marescore;
 		player->marescore = 0;
 		player->marebegunat = leveltime;

From 0c8e2ffd7872df0342f483176a0e9e70d2d18fc4 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Sun, 12 Aug 2018 19:26:18 -0400
Subject: [PATCH 7/7] Totalmarescore typo

---
 src/p_user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/p_user.c b/src/p_user.c
index 9d677b4bc..8177338da 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -760,7 +760,7 @@ void P_NightserizePlayer(player_t *player, INT32 nighttime)
 			G_AddTempNightsRecords(player->marescore, leveltime - player->marebegunat, (UINT8)(oldmare + 1));
 
 		// Starting a new mare, transfer scores
-		player->totalmarescore += players[i].marescore;
+		player->totalmarescore += player->marescore;
 		player->lastmarescore = player->marescore;
 		player->marescore = 0;
 		player->marebegunat = leveltime;