Merge pull request #588 from RyanYappert/fix/quest-english-patching

Fix: More adjustments to the language patcher

Author: RyanYappert

Arrowgene.Ddon.Cli/Command/ClientCommand.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Text.Json;
 using Arrowgene.Ddon.Client;
@@ -219,16 +220,27 @@ public CommandResultType Run(CommandParameter parameter)
                         foreach (GuiMessage.Entry entry in gmd.Entries)
                         {
                             GmdCsv.Entry matchCsvEntry = null;
+                            List<GmdCsv.Entry> keyMatches = new();
+                            List<GmdCsv.Entry> indexMatches = new();
                             foreach (GmdCsv.Entry csvEntry in gmdCsvEntries)
                             {
-                                if (!string.IsNullOrEmpty(entry.Key) && csvEntry.Key == entry.Key && entry.ReadIndex == csvEntry.ReadIndex)
+                                if (!string.IsNullOrEmpty(entry.Key) && csvEntry.Key == entry.Key)
                                 {
-                                    // Both key AND index have to match, because there are gui entries with duplicate keys.
-                                    matchCsvEntry = csvEntry;
-                                    break;
+                                    keyMatches.Add(csvEntry);
+                                    continue;
+                                }
+
+                                if (entry.ReadIndex == csvEntry.ReadIndex)
+                                {
+                                    indexMatches.Add(csvEntry);
+                                    continue;
                                 }
                             }
 
+                            matchCsvEntry = keyMatches.Where(x => x.ReadIndex == entry.ReadIndex).FirstOrDefault()
+                                ?? keyMatches.FirstOrDefault()
+                                ?? indexMatches.FirstOrDefault();
+
                             if (matchCsvEntry == null)
                             {
                                 Logger.Info(