slightly fix weapon variants

overtools · Dec 13, 2023 · 6c81232 · 6c81232
1 parent c45cced
commit 6c81232
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/DataTool/DataModels/Unlock.cs b/DataTool/DataModels/Unlock.cs
@@ -121,7 +121,8 @@ private void Init(STU_3021DDED unlock, ulong key) {
                 Type == UnlockType.VictoryPose || Type == UnlockType.VoiceLine ||
                 Type == UnlockType.Emote || Type == UnlockType.Souvenir ||
                 Type == UnlockType.NameCard || Type == UnlockType.PlayerTitle ||
-                Type == UnlockType.WeaponCharm || Type == UnlockType.WeaponSkin;
+                Type == UnlockType.WeaponCharm || Type == UnlockType.WeaponSkin ||
+                Type == UnlockType.WeaponVariant;
 
             if (unlock.m_BEE9BCDA != null) {
                 Categories = unlock.m_BEE9BCDA

diff --git a/DataTool/SaveLogic/Unlock/SkinTheme.cs b/DataTool/SaveLogic/Unlock/SkinTheme.cs
@@ -188,7 +188,7 @@ private static void SetPreviewWeaponNames(FindLogic.Combo.ComboInfo info, Dictio
         /// Pass these replacements into Combo.Find to make sure you're getting the right files for a specific skin theme.
         /// </summary>
         public static Dictionary<ulong, ulong> GetReplacements(STU_21276722 skin) {
-            if (skin == null) return null;
+            if (skin == null) return new Dictionary<ulong, ulong>();
 
             var replacements = new Dictionary<ulong, ulong>();
             if (skin.m_runtimeOverrides != null) {

diff --git a/DataTool/ToolLogic/Extract/ExtractHeroUnlocks.cs b/DataTool/ToolLogic/Extract/ExtractHeroUnlocks.cs
@@ -336,6 +336,11 @@ public static void SaveUnlock(
             }
 
             if (ShouldDo(unlock, config, tags, UnlockType.WeaponVariant)) {
+                if (unlock.STU.m_rarity == STUUnlockRarity.Common) {
+                    Logger.Debug("ExtractHeroUnlock", $"skipping common rarity weapon {unlock.Name}");
+                    return;
+                }
+
                 LoudLog($"\tExtracting weapon variant {unlock.Name}");
                 WeaponVariant.Save(flags, thisPath, unlock, hero);
             }