From e240ef568f386bbec300ec9dbbafad02d30ef62e Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Sat, 2 Dec 2023 14:27:30 +0100
Subject: [PATCH] Fix 'Trade High-Quality Item?' prompt for JP

---
 Deliveroo/Deliveroo.csproj               | 2 +-
 Deliveroo/DeliverooPlugin.SelectYesNo.cs | 2 +-
 Deliveroo/GameData/GameStrings.cs        | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Deliveroo/Deliveroo.csproj b/Deliveroo/Deliveroo.csproj
index 205868c..cc1a5e2 100644
--- a/Deliveroo/Deliveroo.csproj
+++ b/Deliveroo/Deliveroo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net7.0-windows</TargetFramework>
-        <Version>2.20</Version>
+        <Version>2.21</Version>
         <LangVersion>11.0</LangVersion>
         <Nullable>enable</Nullable>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/Deliveroo/DeliverooPlugin.SelectYesNo.cs b/Deliveroo/DeliverooPlugin.SelectYesNo.cs
index 87cdb15..c0eca53 100644
--- a/Deliveroo/DeliverooPlugin.SelectYesNo.cs
+++ b/Deliveroo/DeliverooPlugin.SelectYesNo.cs
@@ -13,7 +13,7 @@ partial class DeliverooPlugin
         _pluginLog.Verbose("SelectYesNo post-setup");
 
         AddonSelectYesno* addonSelectYesNo = (AddonSelectYesno*)args.Addon;
-        string text = MemoryHelper.ReadSeString(&addonSelectYesNo->PromptText->NodeText).ToString().Replace("\n", "").Replace("\r", "");
+        string text = MemoryHelper.ReadSeString(&addonSelectYesNo->PromptText->NodeText).ToString().ReplaceLineEndings("");
         _pluginLog.Verbose($"YesNo prompt: '{text}'");
 
         if (CurrentStage == Stage.ConfirmReward &&
diff --git a/Deliveroo/GameData/GameStrings.cs b/Deliveroo/GameData/GameStrings.cs
index 6e523a7..75e8b87 100644
--- a/Deliveroo/GameData/GameStrings.cs
+++ b/Deliveroo/GameData/GameStrings.cs
@@ -21,8 +21,9 @@ internal sealed class GameStrings
             ?? throw new Exception($"Unable to resolve {nameof(ClosePersonnelOfficerTalk)}");
         ExchangeItems = dataManager.GetRegex<Addon>(3290, addon => addon.Text, pluginLog)
                         ?? throw new Exception($"Unable to resolve {nameof(ExchangeItems)}");
-        TradeHighQualityItem = dataManager.GetString<Addon>(102434, addon => addon.Text, pluginLog)
-                               ?? throw new Exception($"Unable to resolve {nameof(TradeHighQualityItem)}");
+        TradeHighQualityItem =
+            dataManager.GetString<Addon>(102434, addon => addon.Text, pluginLog)?.ReplaceLineEndings("")
+            ?? throw new Exception($"Unable to resolve {nameof(TradeHighQualityItem)}");
 
         var rankUpFc = dataManager.GetExcelSheet<LogMessage>()!.GetRow(3123)!;
         RankUpFc = rankUpFc.GetRegex(logMessage => logMessage.Text, pluginLog)