save combined model from ow2 mythic weapons

Author: ZingBallyhoo

DataTool/FindLogic/Combo.cs

@@ -137,6 +137,7 @@ public void SetEffectName(ulong effect, string name, Dictionary<ulong, ulong> re
             SetAssetName(effect, name, m_animationEffects, replacements);
         }
 
+        public void SetModelName(ulong look, string name, Dictionary<ulong, ulong> replacements = null) => SetAssetName(look, name, m_models, replacements);
         public void SetModelLookName(ulong look, string name, Dictionary<ulong, ulong> replacements = null) => SetAssetName(look, name, m_modelLooks, replacements);
 
         public void SetEffectVoiceSet(ulong effectGUID, ulong voiceSet) {
@@ -619,7 +620,7 @@ public static ComboInfo Find(ComboInfo info, ulong guid, Dictionary<ulong, ulong
                 }
 
                 if (context.Model == 0 && context.Entity == 0) {
-                    TankLib.Helpers.Logger.Debug("Combo", "Animation with no model or entity. will be lost");
+                    TankLib.Helpers.Logger.Debug("Combo", "Animation with no model or entity. will be lost (unless saving all)");
                 }
 
                 if (info.m_animations.ContainsKey(guid)) break;

DataTool/SaveLogic/Unlock/WeaponSkin.cs

@@ -77,6 +77,19 @@ private static void SaveMythicWeaponSkin(ICLIFlags flags, string directory, STUH
             FindWeapons(findInfo, variantReplacements, hero);
             MythicSkin.SaveAndFlushEntities(flags, findInfo, saveContext, variantDirectory);
 
+            if (variantWeaponSkin is STU_475420BE derivedSkin) {
+                // ow2 heroes
+                // also on the root skin... doesn't really matter
+                
+                FindLogic.Combo.Find(findInfo, derivedSkin.m_8EB89D4C, variantReplacements);
+                FindLogic.Combo.Find(findInfo, derivedSkin.m_56BE636B, variantReplacements, new FindLogic.Combo.ComboContext {
+                    // ensure the look is linked to the model
+                    Model = derivedSkin.m_8EB89D4C
+                });
+
+                findInfo.SetModelName(derivedSkin.m_8EB89D4C, "Combined", variantReplacements);
+            }
+
             FindEffects(findInfo, variantReplacements);
             SkinTheme.FindSoundFiles(flags, directory, SkinTheme.GetReplacements(variantSkinGUID)); // save any sounds to main skin dir