allow old "overwatch 1" and "overwatch 2" names for default skins

Author: ZingBallyhoo

DataTool/IQueryParser.cs

@@ -41,16 +41,22 @@ public ParsedArg Combine(ParsedArg? other) {
             };
         }
 
-        public bool ShouldDo(string name, Dictionary<string, TagExpectedValue>? expectedVals = null) {
+        public bool ShouldDo(string name, Dictionary<string, TagExpectedValue>? expectedVals=null, ReadOnlySpan<string> alternateNames=default) {
             name = name.ReplaceLineEndings(""); // Magma\r\nTitan
             name = name.Replace("<hy>", ""); // deDE
             name = name.Replace("<en>", ""); // thTR
             name = name.Replace("<en/>", ""); // thTR
 
+            // IsDisallowed promotes spellcheck for the canon name. so we don't need to worry about it anywhere
+            // else in this function
             if (Values.IsDisallowed(name)) {
                 // if disallowed by name, don't attempt to match tags
                 return false;
             }
+            // (or if alternate name explicitly disallowed)
+            if (Values.Disallowed.Matches(alternateNames)) {
+                return false;
+            }
 
             if (expectedVals != null) {
                 foreach (KeyValuePair<string, TagExpectedValue> expectedVal in expectedVals) {
@@ -69,16 +75,16 @@ public bool ShouldDo(string name, Dictionary<string, TagExpectedValue>? expected
                     }
 
                     if (!explicitlyAllowed) {
-                        // if the tag value is not explicitly allowed or disallowed
+                        // if the tag value is not explicitly allowed or disallowed (but is specified)
                         // try to match by exact unlock name instead
                         // this helps with owl skins, as the tag is set to "none" by default
                         // (if we allowed glob, (leagueteam=boston) would match everything due to unspecified Allowed)
-                        return Values.Allowed.MatchesNoGlob(name);
+                        return Values.Allowed.MatchesNoGlob(name) || Values.Allowed.MatchesNoGlob(alternateNames);
                     }
                 }
             }
 
-            return Values.IsAllowed(name);
+            return Values.Allowed.Matches(name) || Values.Allowed.Matches(alternateNames);
         }
     }
 
@@ -129,6 +135,24 @@ public bool Matches(string name) {
 
             return false;
         }
+        
+        public bool MatchesNoGlob(ReadOnlySpan<string> names) {
+            foreach (var name in names) {
+                if (MatchesNoGlob(name)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public bool Matches(ReadOnlySpan<string> names) {
+            foreach (var name in names) {
+                if (Matches(name)) {
+                    return true;
+                }
+            }
+            return false;
+        }
 
         public ParsedNameSet Union(ParsedNameSet other) {
             var output = new ParsedNameSet();

DataTool/ToolLogic/Dump/DumpHeroOW2SkinNameGUIDs.cs

@@ -0,0 +1,35 @@
+using System;
+using System.IO;
+using System.Linq;
+using DataTool.DataModels;
+using DataTool.Flag;
+using DataTool.Helper;
+using DataTool.ToolLogic.Extract;
+
+namespace DataTool.ToolLogic.Dump {
+    [Tool("dump-pw2-name-guids", 
+          Description = "Dump ow2 skin name guids",
+          CustomFlags = typeof(ExtractFlags),
+          IsSensitive = true)]
+    public class DumpHeroOW2SkinNameGUIDs : ITool {
+        public void Parse(ICLIFlags toolFlags) {
+            var flags = (ExtractFlags)toolFlags;
+            if (flags.OutputPath == null)
+                throw new Exception("no output path");
+
+            var outputPath = Path.Combine(flags.OutputPath, "LocalizedNamesMapping");
+            IO.CreateDirectorySafe(outputPath);
+            
+            using var output = new StreamWriter(Path.Combine(outputPath, "OW2Skins.csv"));
+            
+            foreach (var hero in Helpers.GetHeroes().Values) {
+                if (!hero.IsHero) continue;
+
+                // (this is intended to be run on 2026 builds, so the name is "Overwatch" now)
+                var defaultSkin = new ProgressionUnlocks(hero.STU).LevelUnlocks!.First().Unlocks.Single(x => x.GetName() == "Overwatch");
+                
+                output.WriteLine($"0x{defaultSkin.STU.m_name.GUID.GUID:X16} ; {hero.Name}");
+            }
+        }
+    }
+}

DataTool/ToolLogic/Extract/ExtractHeroUnlocks.cs

@@ -114,7 +114,7 @@ protected override void QueryHelp(List<QueryType> types) {
         base.QueryHelp(types);
 
         Log("\r\nExample commands: ");
-        Log($"{indent + 1}\"Lúcio|skin=Overwatch 1\"");
+        Log($"{indent + 1}\"Lúcio|skin=Overwatch Classic\"");
         Log($"{indent + 1}\"Tracer|skin=Track and Field\"");
         Log($"{indent + 1}\"Reinhardt|emote=*\"");
         Log($"{indent + 1}\"Junker Queen|victorypose=*\"");
@@ -351,6 +351,28 @@ public static void SaveUnlock(
         }
     }
 
+    // todo: add previous zhCN name for ow1 skins: "守望先锋"
+    // but for whatever reason, ow1 and ow2 skins on rcn+zhCN are all called "守望先锋" now
+    // needs to be fixed first
+    private static string[] OW1SkinAlternateNames = [
+        "Overwatch 1", // old en
+        "オーバーウォッチ 1", // old jp
+        "오버워치 1", // old kr
+        "《鬥陣特攻》",
+        /* todo, */
+        "Classic", // old rcn-en
+        "Overwatch Classic" // new en
+    ];
+    private static string[] OW2SkinAlternateNames = [
+        "Overwatch 2", // old en
+        "オーバーウォッチ 2", // old jp
+        "오버워치 2", // old kr
+        "《鬥陣特攻2》",
+        "守望先锋归来", // old rcn-cn
+        "Valorous", // old rcn-en
+        "Overwatch", // new en
+    ];
+
     private static bool ShouldDo(Unlock unlock, IgnoreCaseDict<ParsedArg>? config, Dictionary<string, TagExpectedValue>? tags, UnlockType unlockType) {
         if (unlock.Type != unlockType) return false;
 
@@ -362,32 +384,25 @@ private static bool ShouldDo(Unlock unlock, IgnoreCaseDict<ParsedArg>? config, D
         if (!config.TryGetValue(typeLower, out var configForType)) {
             return false;
         }
-
-        if (configForType.ShouldDo(unlock.GetName(), tags)) {
-            return true;
-        }
 
-        // todo: decide if i want to ship this
-        // different extracted name from query is confusing
-        // and polluting the spellcheck with these names is also confusing
-        // maybe it could be precise locale mapping instead
-
-        // todo: add previous zhCN name for ow1 skins: "守望先锋"
-        // but for whatever reason, ow1 and ow2 skins on rcn+zhCN are all called "守望先锋" now
-        // needs to be fixed first
-        /*ReadOnlySpan<string> alternateNames = unlock.GetSTU().m_name.GUID.GUID switch {
-            0x0DE00000000024D4 => 
-                ["Overwatch 1", "オーバーウォッチ 1", "오버워치 1", "《鬥陣特攻》", "Classic"],
-            0x0DE000000000CB5F => 
-                ["Overwatch 2", "オーバーウォッチ 2", "오버워치 2", "《鬥陣特攻2》", "守望先锋归来", "Valorous"],
+        // todo: different extracted name from query is confusing (log?)
+        // todo: if there are issues with dup names (cn, for now), maybe it could be a precise locale mapping using data instead
+        ReadOnlySpan<string> alternateNames = unlock.GetSTU().m_name.GUID.GUID switch {
+            0x0DE00000000024D4 => OW1SkinAlternateNames,
+            0x0DE000000000CB5F => OW2SkinAlternateNames, // shared
+            0x0DE0000000022DAB => OW2SkinAlternateNames, // echo, freja
+            0x0DE00000000179D3 => OW2SkinAlternateNames, // lw
+            0x0DE000000001B41C => OW2SkinAlternateNames, // mauga
+            0x0DE000000001AE12 => OW2SkinAlternateNames, // illari
+            0x0DE000000001CAC5 => OW2SkinAlternateNames, // venture
+            0x0DE00000000204E3 => OW2SkinAlternateNames, // hazard
+            0x0DE0000000020A28 => OW2SkinAlternateNames, // juno
+            0x0DE000000002B1D8 => OW2SkinAlternateNames, // vendetta
+            0x0DE0000000029E6A => OW2SkinAlternateNames, // anran
+            0x0DE000000002A7CC => OW2SkinAlternateNames, // jetpack cat
             _ => []
         };
-        foreach (var alternateName in alternateNames) {
-            if (configForType.ShouldDo(alternateName, tags)) {
-                return true;
-            }
-        }*/
-
-        return false;
+        
+        return configForType.ShouldDo(unlock.GetName(), tags, alternateNames);
     }
 }