custom overlay pattern for import

cadon · Nov 2, 2024 · 0fb1b89 · 0fb1b89
1 parent f4f9510
commit 0fb1b89
Show file tree

Hide file tree

Showing 10 changed files with 1,737 additions and 1,658 deletions.
diff --git a/ARKBreedingStats/App.config b/ARKBreedingStats/App.config
@@ -526,6 +526,9 @@
             <setting name="LevelColorWindowRectangle" serializeAs="String">
                 <value>200, 200, 1000, 650</value>
             </setting>
+            <setting name="OverlayImportPattern" serializeAs="String">
+                <value />
+            </setting>
         </ARKBreedingStats.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/ARKBreedingStats/CreatureInfoInput.cs b/ARKBreedingStats/CreatureInfoInput.cs
@@ -612,7 +612,8 @@ public void OpenNamePatternEditor(Creature creature, TopLevels topLevels, Dictio
         {
             if (!parentListValid)
                 ParentListRequested?.Invoke(this);
-            using (var pe = new PatternEditor(creature, _sameSpecies, topLevels, ColorAlreadyExistingInformation, customReplacings, namingPatternIndex, reloadCallback, LibraryCreatureCount))
+            using (var pe = new PatternEditor(creature, _sameSpecies, topLevels, ColorAlreadyExistingInformation,
+                       customReplacings, $"pattern {namingPatternIndex + 1}", Settings.Default.NamingPatterns?[namingPatternIndex], reloadCallback, LibraryCreatureCount))
             {
                 if (pe.ShowDialog() == DialogResult.OK)
                 {

diff --git a/ARKBreedingStats/Form1.importExported.cs b/ARKBreedingStats/Form1.importExported.cs
@@ -235,7 +235,7 @@ private Creature ImportExportedAddIfPossible(string filePath)
                 creature = GetCreatureFromInput(true, species, levelStep);
             }
 
-            OverlayFeedbackForImport(creature, uniqueExtraction, alreadyExists, addedToLibrary, copiedNameToClipboard);
+            OverlayFeedbackForImport(creature, uniqueExtraction, alreadyExistingCreature, addedToLibrary, copiedNameToClipboard);
 
             if (addedToLibrary)
             {
@@ -374,7 +374,7 @@ private bool CopyCreatureNameToClipboardOnImportIfSetting(string creatureName, b
         /// <summary>
         /// Give feedback in overlay for imported creature.
         /// </summary>
-        private void OverlayFeedbackForImport(Creature creature, bool uniqueExtraction, bool alreadyExists, bool addedToLibrary,
+        private void OverlayFeedbackForImport(Creature creature, bool uniqueExtraction, Creature alreadyExistingCreature, bool addedToLibrary,
             bool copiedNameToClipboard)
         {
             string infoText;
@@ -383,7 +383,7 @@ private void OverlayFeedbackForImport(Creature creature, bool uniqueExtraction,
             if (uniqueExtraction)
             {
                 var sb = new StringBuilder();
-                sb.AppendLine($"{creature.SpeciesName} \"{creature.name}\" {(alreadyExists ? "updated in " : "added to")} the library.");
+                sb.AppendLine($"{creature.SpeciesName} \"{creature.name}\" {(alreadyExistingCreature != null ? "updated in " : "added to")} the library.");
                 if (addedToLibrary && copiedNameToClipboard)
                     sb.AppendLine("Name copied to clipboard.");
 
@@ -407,6 +407,20 @@ private void OverlayFeedbackForImport(Creature creature, bool uniqueExtraction,
 
             if (_overlay != null)
             {
+                var overlayPattern = Properties.Settings.Default.OverlayImportPattern;
+                if (!string.IsNullOrEmpty(overlayPattern))
+                {
+                    var overlayPatternResult = NamePattern.GenerateCreatureName(creature, alreadyExistingCreature,
+                        _creatureCollection.creatures.Where(c => c.Species == creature.Species).ToArray(),
+                        _topLevels.TryGetValue(creature.Species, out var tl) ? tl : null,
+                        _customReplacingNamingPattern, false, -1, false, overlayPattern,
+                        false, colorsExisting: _creatureCollection.ColorAlreadyAvailable(creature.Species, creature.colors, out _),
+                        libraryCreatureCount: _creatureCollection.GetTotalCreatureCount());
+
+                    if (!string.IsNullOrEmpty(overlayPatternResult))
+                        infoText += Environment.NewLine + Environment.NewLine + overlayPatternResult;
+                }
+
                 _overlay.SetInfoText(infoText, textColor);
                 if (Properties.Settings.Default.DisplayInheritanceInOverlay)
                     _overlay.SetInheritanceCreatures(creature, creature.Mother, creature.Father);

diff --git a/ARKBreedingStats/NamePatterns/NamePattern.cs b/ARKBreedingStats/NamePatterns/NamePattern.cs
@@ -41,7 +41,7 @@ public static class NamePattern
         /// </summary>
         /// <param name="alreadyExistingCreature">If the creature already exists in the library, null if the creature is new.</param>
         public static string GenerateCreatureName(Creature creature, Creature alreadyExistingCreature, Creature[] sameSpecies, TopLevels topLevels, Dictionary<string, string> customReplacings,
-            bool showDuplicateNameWarning, int namingPatternIndex, bool showTooLongWarning = true, string pattern = null, bool displayError = true, TokenModel tokenModel = null,
+            bool showDuplicateNameWarning = false, int namingPatternIndex = -1, bool showTooLongWarning = true, string pattern = null, bool displayError = true, TokenModel tokenModel = null,
             ColorExisting[] colorsExisting = null, int libraryCreatureCount = 0, Action<string> consoleLog = null)
         {
             if (pattern == null)

diff --git a/ARKBreedingStats/NamePatterns/PatternEditor.cs b/ARKBreedingStats/NamePatterns/PatternEditor.cs
@@ -130,7 +130,8 @@ private static void SelectFullLines(TextBox textBox, out int endLine, out int st
             textBox.Select(start, end - start);
         }
 
-        public PatternEditor(Creature creature, Creature[] creaturesOfSameSpecies, TopLevels topLevels, CreatureCollection.ColorExisting[] colorExistings, Dictionary<string, string> customReplacings, int namingPatternIndex, Action<PatternEditor> reloadCallback, int libraryCreatureCount) : this()
+        public PatternEditor(Creature creature, Creature[] creaturesOfSameSpecies, TopLevels topLevels, CreatureCollection.ColorExisting[] colorExistings,
+            Dictionary<string, string> customReplacings, string namingPatternName, string patternString, Action<PatternEditor> reloadCallback, int libraryCreatureCount) : this()
         {
             Utils.SetWindowRectangle(this, Properties.Settings.Default.PatternEditorFormRectangle);
             if (Properties.Settings.Default.PatternEditorSplitterDistance > 0)
@@ -145,11 +146,11 @@ public PatternEditor(Creature creature, Creature[] creaturesOfSameSpecies, TopLe
             _customReplacings = customReplacings;
             _reloadCallback = reloadCallback;
             _libraryCreatureCount = libraryCreatureCount;
-            txtboxPattern.Text = Properties.Settings.Default.NamingPatterns?[namingPatternIndex] ?? string.Empty;
+            txtboxPattern.Text = patternString ?? string.Empty;
             CbPatternNameToClipboardAfterManualApplication.Checked = Properties.Settings.Default.PatternNameToClipboardAfterManualApplication;
             txtboxPattern.SelectionStart = txtboxPattern.Text.Length;
 
-            Text = $"Naming Pattern Editor: pattern {namingPatternIndex + 1}";
+            Text = $"Naming Pattern Editor: {namingPatternName}";
 
             _alreadyExistingCreature = _creaturesOfSameSpecies?.FirstOrDefault(c => c.guid == creature.guid);
             _tokenModel = NamePatterns.NamePattern.CreateTokenModel(creature, _alreadyExistingCreature, _creaturesOfSameSpecies, _colorExistings, _topLevels, _libraryCreatureCount);

diff --git a/ARKBreedingStats/Properties/Settings.Designer.cs b/ARKBreedingStats/Properties/Settings.Designer.cs
diff --git a/ARKBreedingStats/Properties/Settings.settings b/ARKBreedingStats/Properties/Settings.settings
@@ -593,5 +593,8 @@
     <Setting Name="LevelColorWindowRectangle" Type="System.Drawing.Rectangle" Scope="User">
       <Value Profile="(Default)">200, 200, 1000, 650</Value>
     </Setting>
+    <Setting Name="OverlayImportPattern" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>