load base types

Author: AnakinRaW

src/ModVerify/Verifiers/ReferencedModelsVerifier.cs

@@ -7,6 +7,8 @@
 
 namespace AET.ModVerify.Verifiers;
 
+// TODO: Add GameObjectTypeVerifier and check that LandModelTerrainOverride is correct (all keys correct, no dups)
+
 public sealed class ReferencedModelsVerifier(
     IStarWarsGameEngine engine,
     GameVerifySettings settings,

src/PetroglyphTools/PG.StarWarsGame.Engine/Audio/Sfx/SfxEvent.cs

@@ -170,6 +170,9 @@ internal SfxEvent(string name, Crc32 nameCrc, XmlLocationInfo location)
         : base(name, nameCrc, location)
     {
         PreSamples = new ReadOnlyCollection<string>(PreSamplesInternal);
+        Samples = new ReadOnlyCollection<string>(SamplesInternal);
+        PostSamples = new ReadOnlyCollection<string>(PostSamplesInternal);
+        LocalizedTextIDs = new ReadOnlyCollection<string>(LocalizedTextIDsInternal);
     }
 
     internal void FixupValues()

src/PetroglyphTools/PG.StarWarsGame.Engine/GameObjects/GameObject.cs

@@ -3,6 +3,7 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using PG.Commons.Hashing;
+using PG.StarWarsGame.Engine.Utilities;
 using PG.StarWarsGame.Files.XML;
 using PG.StarWarsGame.Files.XML.Data;
 
@@ -33,8 +34,6 @@ public sealed class GameObject : NamedXmlObject
 
     public string? SpaceModel { get; internal set; }
 
-    public string? TacticalModel { get; internal set; }
-
     public string? GalacticFleetOverrideModel { get; internal set; }
 
     public string? GuiModel { get; internal set; }
@@ -77,6 +76,19 @@ public void PostLoadFixup()
 
     internal void ApplyBaseType(GameObject baseType)
     {
-        throw new NotImplementedException();
+        // The following properties must not be inherited from the base type:
+        // ID, CRC, Name, Location, IsLoadingComplete, ClassificationName and VariantOfExistingType[Name], LuaScript
+
+        GalacticModel = baseType.GalacticModel;
+        DestroyedGalacticModel = baseType.DestroyedGalacticModel;
+        LandModel = baseType.LandModel;
+        SpaceModel = baseType.SpaceModel;
+        GalacticFleetOverrideModel = baseType.GalacticFleetOverrideModel;
+        GuiModel = baseType.GuiModel;
+        ModelName = baseType.ModelName;
+        LandAnimOverrideModel = baseType.LandAnimOverrideModel;
+        SpaceAnimOverrideModel = baseType.SpaceAnimOverrideModel;
+        DamagedSmokeAssetModel = baseType.DamagedSmokeAssetModel;
+        InternalLandTerrainModelMapping.ClearAddRange(baseType.InternalLandTerrainModelMapping);
     }
 }

src/PetroglyphTools/PG.StarWarsGame.Engine/GameObjects/GameObjectTypeGameManager.Initialization.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using AnakinRaW.CommonUtilities.FileSystem;
 
 namespace PG.StarWarsGame.Engine.GameObjects;
 
@@ -62,7 +63,7 @@ private void ParseGameObjectDatabases()
                 {
                     foreach (var gameObject in _gameObjects)
                     {
-                        if (!gameObject.IsLoadingComplete && gameObject.Location.XmlFile == gameObjectXmlFile)
+                        if (!gameObject.IsLoadingComplete && IsSameFile(gameObject.Location.XmlFile, gameObjectXmlFile))
                             ParseSingleGameObjectFile(gameObjectXmlFile, gameParser, gameObjectFileParser);
                     }
                 }
@@ -79,6 +80,11 @@ private void ParseGameObjectDatabases()
         }
     }
 
+    private bool IsSameFile(string filePathA, string filePathB)
+    {
+        return FileSystem.Path.AreEqual(filePathA, filePathB);
+    }
+
     private void OnGameObjectParsed(object sender, GameObjectParsedEventArgs e)
     {
         if (!e.Unique)

src/PetroglyphTools/PG.StarWarsGame.Engine/GameObjects/GameObjectTypeGameManager.cs

@@ -37,7 +37,6 @@ public IEnumerable<string> GetModels(GameObject gameObject)
         AddNotEmpty(gameObject.DestroyedGalacticModel);
         AddNotEmpty(gameObject.LandModel);
         AddNotEmpty(gameObject.SpaceModel);
-        AddNotEmpty(gameObject.TacticalModel);
         AddNotEmpty(gameObject.GalacticFleetOverrideModel);
         AddNotEmpty(gameObject.GuiModel);
         AddNotEmpty(gameObject.ModelName);

src/PetroglyphTools/PG.StarWarsGame.Engine/Utilities/ExtensionMethods.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace PG.StarWarsGame.Engine.Utilities;
+
+internal static class ExtensionMethods
+{
+    extension<T>(List<T> list)
+    {
+        public void ClearAddRange(IEnumerable<T> items)
+        {
+            list.Clear();
+            list.AddRange(items);   
+        }
+    }
+}

src/PetroglyphTools/PG.StarWarsGame.Engine/Xml/Parsers/NamedObjects/GameObjectParser.cs

@@ -63,7 +63,6 @@ protected override void ParseObject(
 
         if (OverlayLoad)
         {
-            Debug.Assert(replace);
             OverlayType(xmlObject, element, parsedEntries);
         }
         else
@@ -168,22 +167,22 @@ protected override void BuildMappings()
                 GameObjectXmlTags.SpaceModelAnimOverrideName,
                 PetroglyphXmlStringParser.Instance.Parse,
                 (obj, val) => obj.SpaceAnimOverrideModel = val);
-
-            // TODO
-
+            
             AddMapping(
                 GameObjectXmlTags.DamagedSmokeAssetName,
                 PetroglyphXmlStringParser.Instance.Parse,
                 (obj, val) => obj.DamagedSmokeAssetModel = val);
 
-            // TODO
 
             AddMapping(
                 GameObjectXmlTags.GuiModelName,
                 PetroglyphXmlStringParser.Instance.Parse,
                 (obj, val) => obj.GuiModel = val);
 
-            // TODO
+            AddMapping(
+                GameObjectXmlTags.VariantOfExistingType,
+                PetroglyphXmlStringParser.Instance.Parse,
+                (obj, val) => obj.VariantOfExistingTypeName = val);
         }
     }
 
@@ -202,5 +201,7 @@ internal static class GameObjectXmlTags
         public const string LandModelAnimOverrideName = "Land_Model_Anim_Override_Name";
         public const string SpaceModelAnimOverrideName = "Space_Model_Anim_Override_Name";
         public const string DamagedSmokeAssetName = "Damaged_Smoke_Asset_Name";
+
+        public const string VariantOfExistingType = "Variant_Of_Existing_Type";
     }
 }

src/PetroglyphTools/PG.StarWarsGame.Files.XML/Parsers/Primitives/PetroglyphXmlStringParser.cs

@@ -9,7 +9,7 @@ public sealed class PetroglyphXmlStringParser : PetroglyphPrimitiveXmlParser<str
 
     private protected override string DefaultValue => string.Empty;
 
-    internal override int EngineDataTypeId => 0x17;
+    internal override int EngineDataTypeId => 0x17 & 0x1D & 0x1F;
 
     private PetroglyphXmlStringParser()
     {