From baa5d41dcaabdaf5f9486a6b5152a725e0422c1d Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 12 Aug 2018 19:19:41 -0400 Subject: [PATCH 01/12] totalmarescore player variable for NiGHTS scoring --- 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 7bee5f337..bc6a171d9 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -465,6 +465,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 INT32 maxlink; // maximum link obtained UINT8 texttimer; // nights_texttime should not be local diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c index ff62f2459..504097558 100644 --- a/src/lua_playerlib.c +++ b/src/lua_playerlib.c @@ -304,6 +304,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,"maxlink")) @@ -584,6 +586,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,"maxlink")) diff --git a/src/p_saveg.c b/src/p_saveg.c index 7cf437384..6b2b61048 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -206,6 +206,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); WRITEINT32(save_p, players[i].maxlink); WRITEUINT8(save_p, players[i].texttimer); @@ -395,6 +396,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].maxlink = READINT32(save_p); players[i].texttimer = READUINT8(save_p); diff --git a/src/p_setup.c b/src/p_setup.c index c62f281b3..285e4d22d 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2385,8 +2385,8 @@ static void P_LevelInitStuff(void) players[i].texttimer = players[i].linkcount =\ players[i].linktimer = players[i].flyangle =\ players[i].anotherflyangle = players[i].nightstime =\ - players[i].mare = players[i].realtime =\ - players[i].exiting = 0; + players[i].mare = 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 fd09b0847..6728a3c54 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -725,6 +725,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; @@ -748,6 +749,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 c51e84fdfe60b766f3c5dbaf9eb56b41a19dd1f2 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 12 Aug 2018 19:23:23 -0400 Subject: [PATCH 02/12] NiGHTS bonus implementation --- src/dehacked.c | 3 +++ src/y_inter.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/dehacked.c b/src/dehacked.c index fb0f958c3..35b0ce4b1 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -1196,6 +1196,9 @@ static void readlevelheader(MYFILE *f, INT32 num) else if (fastcmp(word2, "NORMAL")) i = 0; else if (fastcmp(word2, "BOSS")) i = 1; else if (fastcmp(word2, "ERZ3")) i = 2; + else if (fastcmp(word2, "NIGHTS")) i = 3; + else if (fastcmp(word2, "NIGHTSLINK")) i = 4; + else if (fastcmp(word2, "NIGHTSALL")) i = 5; if (i >= -1 && i <= 2) // -1 for no bonus. Max is 2. mapheaderinfo[num-1]->bonustype = (SINT8)i; diff --git a/src/y_inter.c b/src/y_inter.c index 68dda198c..b3603bb34 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -1754,6 +1754,16 @@ static void Y_SetRingBonus(player_t *player, y_bonus_t *bstruct) bstruct->points = max(0, (player->rings) * 100); } +// +// Y_SetNightsBonus +// +static void Y_SetNightsBonus(player_t *player, y_bonus_t *bstruct) +{ + strncpy(bstruct->patch, "YB_NIGHT", sizeof(bstruct->patch)); + bstruct->display = true; + bstruct->points = player->totalmarescore; +} + // // Y_SetLinkBonus // @@ -1815,7 +1825,7 @@ static void Y_SetPerfectBonus(player_t *player, y_bonus_t *bstruct) // This list can be extended in the future with SOC/Lua, perhaps. typedef void (*bonus_f)(player_t *, y_bonus_t *); -bonus_f bonuses_list[4][4] = { +bonus_f bonuses_list[7][4] = { { Y_SetNullBonus, Y_SetNullBonus, @@ -1840,6 +1850,24 @@ bonus_f bonuses_list[4][4] = { Y_SetRingBonus, Y_SetPerfectBonus, }, + { + Y_SetNullBonus, + Y_SetNightsBonus, + Y_SetNullBonus, + Y_SetNullBonus, + }, + { + Y_SetNullBonus, + Y_SetLinkBonus, + Y_SetNullBonus, + Y_SetNullBonus, + }, + { + Y_SetNullBonus, + Y_SetNightsBonus, + Y_SetLinkBonus, + Y_SetNullBonus, + }, }; From 417d7d105e039f8b3041a779d2821086cd4b3dfd Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 12 Aug 2018 19:26:18 -0400 Subject: [PATCH 03/12] 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 6728a3c54..d8f096109 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -749,7 +749,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; From 8d40d8ea4394f2682631f5ef8e7cf5124621887f Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 12 Aug 2018 19:29:35 -0400 Subject: [PATCH 04/12] BONUSTYPE typo; bonus alignment --- src/dehacked.c | 2 +- src/y_inter.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 35b0ce4b1..41d41405c 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -1200,7 +1200,7 @@ static void readlevelheader(MYFILE *f, INT32 num) else if (fastcmp(word2, "NIGHTSLINK")) i = 4; else if (fastcmp(word2, "NIGHTSALL")) i = 5; - if (i >= -1 && i <= 2) // -1 for no bonus. Max is 2. + if (i >= -1 && i <= 5) // -1 for no bonus. Max is 2. mapheaderinfo[num-1]->bonustype = (SINT8)i; else deh_warning("Level header %d: invalid bonus type number %d", num, i); diff --git a/src/y_inter.c b/src/y_inter.c index b3603bb34..de0335523 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -1852,14 +1852,14 @@ bonus_f bonuses_list[7][4] = { }, { Y_SetNullBonus, - Y_SetNightsBonus, Y_SetNullBonus, + Y_SetNightsBonus, Y_SetNullBonus, }, { Y_SetNullBonus, - Y_SetLinkBonus, Y_SetNullBonus, + Y_SetLinkBonus, Y_SetNullBonus, }, { From d83b96c126ba166ac1a55b5096051030db141669 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 12 Aug 2018 19:45:34 -0400 Subject: [PATCH 05/12] NiGHTS lap score bonus --- src/dehacked.c | 6 ++++-- src/y_inter.c | 26 ++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 41d41405c..c672cbee4 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -1198,9 +1198,11 @@ static void readlevelheader(MYFILE *f, INT32 num) else if (fastcmp(word2, "ERZ3")) i = 2; else if (fastcmp(word2, "NIGHTS")) i = 3; else if (fastcmp(word2, "NIGHTSLINK")) i = 4; - else if (fastcmp(word2, "NIGHTSALL")) i = 5; + else if (fastcmp(word2, "NIGHTSLAP")) i = 5; + else if (fastcmp(word2, "NIGHTSLINKLAP")) i = 6; + else if (fastcmp(word2, "NIGHTSALL")) i = 7; - if (i >= -1 && i <= 5) // -1 for no bonus. Max is 2. + if (i >= -1 && i <= 7) // -1 for no bonus. Max is 2. mapheaderinfo[num-1]->bonustype = (SINT8)i; else deh_warning("Level header %d: invalid bonus type number %d", num, i); diff --git a/src/y_inter.c b/src/y_inter.c index de0335523..f34bc06c0 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -1764,6 +1764,16 @@ static void Y_SetNightsBonus(player_t *player, y_bonus_t *bstruct) bstruct->points = player->totalmarescore; } +// +// Y_SetLapBonus +// +static void Y_SetLapBonus(player_t *player, y_bonus_t *bstruct) +{ + strncpy(bstruct->patch, "YB_LAP", sizeof(bstruct->patch)); + bstruct->display = true; + bstruct->points = max(0, (player->totalmarebonuslap) * 100); +} + // // Y_SetLinkBonus // @@ -1825,7 +1835,7 @@ static void Y_SetPerfectBonus(player_t *player, y_bonus_t *bstruct) // This list can be extended in the future with SOC/Lua, perhaps. typedef void (*bonus_f)(player_t *, y_bonus_t *); -bonus_f bonuses_list[7][4] = { +bonus_f bonuses_list[9][4] = { { Y_SetNullBonus, Y_SetNullBonus, @@ -1862,11 +1872,23 @@ bonus_f bonuses_list[7][4] = { Y_SetLinkBonus, Y_SetNullBonus, }, + { + Y_SetNullBonus, + Y_SetNullBonus, + Y_SetLapBonus, + Y_SetNullBonus, + }, + { + Y_SetNullBonus, + Y_SetLinkBonus, + Y_SetLapBonus, + Y_SetNullBonus, + }, { Y_SetNullBonus, Y_SetNightsBonus, Y_SetLinkBonus, - Y_SetNullBonus, + Y_SetLapBonus, }, }; From b9b2f7cfa7f798727a8d16d3107eede6ebf01be5 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 12 Aug 2018 20:08:17 -0400 Subject: [PATCH 06/12] Make lap bonus more valuable --- src/y_inter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/y_inter.c b/src/y_inter.c index f34bc06c0..9c0cc758d 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -1771,7 +1771,7 @@ static void Y_SetLapBonus(player_t *player, y_bonus_t *bstruct) { strncpy(bstruct->patch, "YB_LAP", sizeof(bstruct->patch)); bstruct->display = true; - bstruct->points = max(0, (player->totalmarebonuslap) * 100); + bstruct->points = max(0, player->totalmarebonuslap * 1000); } // From 8ec0865170353bdf2f0cbd0b51c0b3077a2ee9dd Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 12 Aug 2018 20:25:35 -0400 Subject: [PATCH 07/12] Have just one NiGHTS bonus option: NIGHTS and LINK together --- src/dehacked.c | 4 +--- src/y_inter.c | 14 +------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 41d41405c..70a19eadc 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -1197,10 +1197,8 @@ static void readlevelheader(MYFILE *f, INT32 num) else if (fastcmp(word2, "BOSS")) i = 1; else if (fastcmp(word2, "ERZ3")) i = 2; else if (fastcmp(word2, "NIGHTS")) i = 3; - else if (fastcmp(word2, "NIGHTSLINK")) i = 4; - else if (fastcmp(word2, "NIGHTSALL")) i = 5; - if (i >= -1 && i <= 5) // -1 for no bonus. Max is 2. + if (i >= -1 && i <= 3) // -1 for no bonus. Max is 3. mapheaderinfo[num-1]->bonustype = (SINT8)i; else deh_warning("Level header %d: invalid bonus type number %d", num, i); diff --git a/src/y_inter.c b/src/y_inter.c index de0335523..2cafed8ca 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -1825,7 +1825,7 @@ static void Y_SetPerfectBonus(player_t *player, y_bonus_t *bstruct) // This list can be extended in the future with SOC/Lua, perhaps. typedef void (*bonus_f)(player_t *, y_bonus_t *); -bonus_f bonuses_list[7][4] = { +bonus_f bonuses_list[5][4] = { { Y_SetNullBonus, Y_SetNullBonus, @@ -1850,18 +1850,6 @@ bonus_f bonuses_list[7][4] = { Y_SetRingBonus, Y_SetPerfectBonus, }, - { - Y_SetNullBonus, - Y_SetNullBonus, - Y_SetNightsBonus, - Y_SetNullBonus, - }, - { - Y_SetNullBonus, - Y_SetNullBonus, - Y_SetLinkBonus, - Y_SetNullBonus, - }, { Y_SetNullBonus, Y_SetNightsBonus, From 83d3099fe3313c378b2732a7142664e01f2232bb Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 12 Aug 2018 20:36:53 -0400 Subject: [PATCH 08/12] Change special stage bonus to NiGHTS in-level score, per MB --- src/y_inter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/y_inter.c b/src/y_inter.c index 2cafed8ca..915d6b810 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -1930,7 +1930,7 @@ static void Y_AwardSpecialStageBonus(void) if (!playeringame[i] || players[i].lives < 1) // not active or game over Y_SetNullBonus(&players[i], &localbonus); else if (maptol & TOL_NIGHTS) // Link instead of Rings - Y_SetLinkBonus(&players[i], &localbonus); + Y_SetNightsBonus(&players[i], &localbonus); else Y_SetRingBonus(&players[i], &localbonus); players[i].score += localbonus.points; From a2883009ed66c7c950eed4dacb730306d25c5b4c Mon Sep 17 00:00:00 2001 From: mazmazz Date: Tue, 14 Aug 2018 10:20:56 -0400 Subject: [PATCH 09/12] Preproc comment out Y_SetLinkBonus because unused --- src/y_inter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/y_inter.c b/src/y_inter.c index d2fa2e668..3fdf5f7a9 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -1774,6 +1774,7 @@ static void Y_SetLapBonus(player_t *player, y_bonus_t *bstruct) bstruct->points = max(0, player->totalmarebonuslap * 1000); } +#if 0 // // Y_SetLinkBonus // @@ -1783,6 +1784,7 @@ static void Y_SetLinkBonus(player_t *player, y_bonus_t *bstruct) bstruct->display = true; bstruct->points = max(0, (player->maxlink - 1) * 100); } +#endif // // Y_SetGuardBonus From a177548da6f8382588a59b2cadd377d102d8bb9a Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 9 Sep 2018 01:13:02 -0400 Subject: [PATCH 10/12] Added NIGHTSLINK bonus type for the 2.1 Link Bonus --- src/dehacked.c | 3 ++- src/y_inter.c | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 70a19eadc..1f56210ac 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -1197,8 +1197,9 @@ static void readlevelheader(MYFILE *f, INT32 num) else if (fastcmp(word2, "BOSS")) i = 1; else if (fastcmp(word2, "ERZ3")) i = 2; else if (fastcmp(word2, "NIGHTS")) i = 3; + else if (fastcmp(word2, "NIGHTSLINK")) i = 4; - if (i >= -1 && i <= 3) // -1 for no bonus. Max is 3. + if (i >= -1 && i <= 4) // -1 for no bonus. Max is 3. mapheaderinfo[num-1]->bonustype = (SINT8)i; else deh_warning("Level header %d: invalid bonus type number %d", num, i); diff --git a/src/y_inter.c b/src/y_inter.c index 3fdf5f7a9..2c77a577a 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -1774,7 +1774,6 @@ static void Y_SetLapBonus(player_t *player, y_bonus_t *bstruct) bstruct->points = max(0, player->totalmarebonuslap * 1000); } -#if 0 // // Y_SetLinkBonus // @@ -1784,7 +1783,6 @@ static void Y_SetLinkBonus(player_t *player, y_bonus_t *bstruct) bstruct->display = true; bstruct->points = max(0, (player->maxlink - 1) * 100); } -#endif // // Y_SetGuardBonus @@ -1837,7 +1835,7 @@ static void Y_SetPerfectBonus(player_t *player, y_bonus_t *bstruct) // This list can be extended in the future with SOC/Lua, perhaps. typedef void (*bonus_f)(player_t *, y_bonus_t *); -bonus_f bonuses_list[5][4] = { +bonus_f bonuses_list[6][4] = { { Y_SetNullBonus, Y_SetNullBonus, @@ -1868,6 +1866,12 @@ bonus_f bonuses_list[5][4] = { Y_SetLapBonus, Y_SetNullBonus, }, + { + Y_SetNullBonus, + Y_SetLinkBonus, + Y_SetLapBonus, + Y_SetNullBonus, + }, }; From eb307a4066c0e657d85be742c9923301b3059e24 Mon Sep 17 00:00:00 2001 From: Digiku Date: Wed, 19 Sep 2018 10:45:51 -0400 Subject: [PATCH 11/12] Nights intermission dehacked: a comment --- src/dehacked.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dehacked.c b/src/dehacked.c index 1f56210ac..ae1be6da2 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -1199,7 +1199,7 @@ static void readlevelheader(MYFILE *f, INT32 num) else if (fastcmp(word2, "NIGHTS")) i = 3; else if (fastcmp(word2, "NIGHTSLINK")) i = 4; - if (i >= -1 && i <= 4) // -1 for no bonus. Max is 3. + if (i >= -1 && i <= 4) // -1 for no bonus. Max is 4. mapheaderinfo[num-1]->bonustype = (SINT8)i; else deh_warning("Level header %d: invalid bonus type number %d", num, i); From 96f61d8ae6f3ce120493f716dbbe442404693832 Mon Sep 17 00:00:00 2001 From: Digiku Date: Wed, 19 Sep 2018 10:53:11 -0400 Subject: [PATCH 12/12] Nights intermission bonus y_inter.c: A comment --- src/y_inter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/y_inter.c b/src/y_inter.c index 2c77a577a..45ecd49e6 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -1945,7 +1945,7 @@ static void Y_AwardSpecialStageBonus(void) if (!playeringame[i] || players[i].lives < 1) // not active or game over Y_SetNullBonus(&players[i], &localbonus); - else if (maptol & TOL_NIGHTS) // Link instead of Rings + else if (maptol & TOL_NIGHTS) // Mare score instead of Rings Y_SetNightsBonus(&players[i], &localbonus); else Y_SetRingBonus(&players[i], &localbonus);