From 93777d1f6185bbb4478ee7e2318d3feb6cda65b8 Mon Sep 17 00:00:00 2001 From: Pinapelz Date: Wed, 4 Sep 2024 01:12:32 -0700 Subject: fix: incorrect calculation function called on Frontline chat notif --- Malmstone/Addons/PvPMatchAddon.cs | 3 ++- Malmstone/Plugin.cs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Malmstone/Addons/PvPMatchAddon.cs b/Malmstone/Addons/PvPMatchAddon.cs index 4110d4d..1785b29 100644 --- a/Malmstone/Addons/PvPMatchAddon.cs +++ b/Malmstone/Addons/PvPMatchAddon.cs @@ -133,7 +133,7 @@ namespace Malmstone.Addons seString.Append(UIForegroundPayload.UIForegroundOff); break; case PvPContentType.Frontlines: - MalmstoneXPCalculator.XpCalculationResult flResultData = MalmstoneXPCalculator.CalculateCrystallineConflictMatches( + MalmstoneXPCalculator.XpCalculationResult flResultData = MalmstoneXPCalculator.CalculateFrontlineMatches( seriesInfo.CurrentSeriesRank, seriesInfo.CurrentSeriesRank + 1, seriesInfo.SeriesExperience); if (flResultData.FrontlineDailyLose3rd == 0) break; seString.Append(new TextPayload("[Frontlines to Level " + (seriesInfo.CurrentSeriesRank + 1) + "]\n")); @@ -141,6 +141,7 @@ namespace Malmstone.Addons seString.Append(new TextPayload($"Take 1st Place: {flResultData.FrontlineWin} " + (flResultData.FrontlineWin == 1 ? "time" : "times") +" (" + (flResultData.FrontlineDailyWin) + ")\n")); seString.Append(new TextPayload($"Take 2nd Place: {flResultData.FrontlineWin} " + (flResultData.FrontlineWin == 1 ? "time" : "times") + " (" + (flResultData.FrontlineDailyLose2nd) + ")\n")); seString.Append(new TextPayload($"Take 3rd Place: {flResultData.FrontlineWin} " + (flResultData.FrontlineWin == 1 ? "time" : "times") + " (" + (flResultData.FrontlineDailyLose3rd) + ")\n")); + seString.Append(new TextPayload($"Frontline Roulette Shown in Parentheses")); seString.Append(UIForegroundPayload.UIForegroundOff); break; case PvPContentType.RivalWings: diff --git a/Malmstone/Plugin.cs b/Malmstone/Plugin.cs index be9858a..5ed6a65 100644 --- a/Malmstone/Plugin.cs +++ b/Malmstone/Plugin.cs @@ -224,9 +224,9 @@ private void OnCommand(string command, string args) if (xpResult.RivalWingsWin > 0) { seString.Append(new TextPayload($"Win: {xpResult.RivalWingsWin} " + (xpResult.RivalWingsWin == 1 ? "time" : "times") + "\n")); - } + } - if (xpResult.RivalWingsLose > 0) + if (xpResult.RivalWingsLose > 0) { seString.Append(new TextPayload($"Lose: {xpResult.RivalWingsLose} " + (xpResult.RivalWingsLose == 1 ? "time" : "times") + "\n")); } -- cgit v1.2.3