Merge branch 'staging'

Author: MattFiler

CathodeLib/CathodeLib.csproj

@@ -10,11 +10,14 @@
     <Authors>Matt Filer</Authors>
     <Description>Provides support for parsing and writing common Alien: Isolation formats from the Cathode engine.</Description>
     <Copyright>Matt Filer 2025</Copyright>
-    <Version>0.8.0</Version>
+    <Version>0.8.1</Version>
     <OutputType>Library</OutputType>
-    <AssemblyVersion>0.7.8.0</AssemblyVersion>
-    <FileVersion>0.7.8.0</FileVersion>
+    <AssemblyVersion>0.7.8.1</AssemblyVersion>
+    <FileVersion>0.7.8.1</FileVersion>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageTags>alien, modding, alien isolation, mod tool, file utility</PackageTags>
+    <Title>CathodeLib</Title>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -33,6 +36,10 @@
       <Pack>True</Pack>
       <PackagePath></PackagePath>
     </None>
+    <None Include="..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
   </ItemGroup>
 
   <ItemGroup>

CathodeLib/Scripts/CATHODE/Commands.cs

@@ -705,7 +705,7 @@ override protected bool SaveInternal()
                 for (int i = 0; i < parameters.Count; i++)
                 {
                     parameterOffsets.Add(parameters[i], (int)writer.BaseStream.Position / 4);
-                    Utilities.Write<ShortGuid>(writer, CommandsUtils.GetDataTypeGUID(parameters[i].dataType));
+                    Utilities.Write<ShortGuid>(writer, CommandsUtils.GetDataTypeGUID(parameters[i].dataType == DataType.ENUM_STRING ? DataType.STRING : parameters[i].dataType));
                     switch (parameters[i].dataType)
                     {
                         case DataType.TRANSFORM:
@@ -722,6 +722,7 @@ override protected bool SaveInternal()
                         case DataType.INTEGER:
                             writer.Write(((cInteger)parameters[i]).value);
                             break;
+                        case DataType.ENUM_STRING:
                         case DataType.STRING:
                             int stringStart = ((int)writer.BaseStream.Position + 4) / 4;
                             byte[] stringStartRaw = BitConverter.GetBytes(stringStart);

CathodeLib/Scripts/CATHODE/CommandsPAK/Components/ParameterData.cs

@@ -46,9 +46,9 @@ public ParameterData(DataType type)
                 case DataType.VECTOR:
                     return ((cVector3)x).value == ((cVector3)y).value;
                 case DataType.ENUM:
-                    cEnum x_e = (cEnum)x;
-                    cEnum y_e = (cEnum)y;
-                    return x_e.enumIndex == y_e.enumIndex && x_e.enumID == y_e.enumID;
+                    return ((cEnum)x).enumIndex == ((cEnum)y).enumIndex && ((cEnum)x).enumID == ((cEnum)y).enumID;
+                case DataType.ENUM_STRING:
+                    return ((cEnumString)x).value == ((cEnumString)y).value && ((cEnumString)x).enumID == ((cEnumString)y).enumID;
                 case DataType.SPLINE:
                     return ((cSpline)x).splinePoints == ((cSpline)y).splinePoints;
                 case DataType.NONE:
@@ -89,8 +89,9 @@ public override int GetHashCode()
                 case DataType.VECTOR:
                     return ((cVector3)this).value.GetHashCode();
                 case DataType.ENUM:
-                    cEnum x_e = (cEnum)this;
-                    return x_e.enumID.ToByteString().GetHashCode() + x_e.enumIndex;
+                    return ((cEnum)this).enumID.ToByteString().GetHashCode() + ((cEnum)this).enumIndex;
+                case DataType.ENUM_STRING:
+                    return ((cEnumString)this).enumID.ToByteString().GetHashCode() + ((cEnumString)this).value.GetHashCode();
                 case DataType.SPLINE:
                     cSpline x_sd = (cSpline)this;
                     int x_sd_i = 0;

CathodeLib/Scripts/CATHODE/CommandsPAK/Components/TypeEnums.cs

@@ -1072,27 +1072,32 @@ public enum EnumType : uint
     /* Enum strings available within Cathode (these are cString type, but can be looked up using DATA) */
     public enum EnumStringType : uint
     {
+        //TODO: need to update the enum webpage with these
+
         ACHIEVEMENT_ID = 3485949151,
         ACHIEVEMENT_STAT_ID = 1970461931,
         ANIM_SET = 796973007,
         ANIM_TREE_SET = 398817255,
         ATTRIBUTE_SET = 2268397301,
         BLUEPRINT_TYPE = 3218638249,
         CHR_SKELETON_SET = 3537648953,
-        CUSTOM_PRESET_SET = 935006766,
-        DVR_MOMENT_ID = 1074858079,
         GAME_VARIABLE = 3806196912,
         GAMEPLAY_TIP_STRING_ID = 3550943910,
         IDTAG_ID = 3358979085,
-        MAP_ELEMENT_ID = 3723361710,
         MAP_KEYFRAME_ID = 1494642745,
         NOSTROMO_LOG_ID = 1157640041,
         OBJECTIVE_ENTRY_ID = 3067794301,
         PRESENCE_ID = 2589585909,
         SEVASTOPOL_LOG_ID = 3163607120,
+        SOUND_ARGUMENT = 4000624401,
         SOUND_EVENT = 3122669037,
         SOUND_FOOTWEAR_GROUP = 911429336,
         SOUND_LEG_GROUP = 1285801591,
+        SOUND_PARAMETER = 743631359,
+        SOUND_REVERB = 1053063402,
+        SOUND_RTPC = 3430842214,
+        SOUND_STATE = 3294208177,
+        SOUND_SWITCH = 1905083384,
         SOUND_TORSO_GROUP = 1112933567,
         TUTORIAL_ENTRY_ID = 2135177174,
     }

CathodeLib/Scripts/CATHODE/CommandsPAK/Helpers/CompositeUtils.cs

@@ -238,6 +238,8 @@ public static ParameterVariant PinTypeToParameterVariant(CompositePinType type)
                 case CompositePinType.CompositeOutputVariablePin:
                 case CompositePinType.CompositeOutputZoneLinkPtrVariablePin:
                 case CompositePinType.CompositeOutputZonePtrVariablePin:
+                case CompositePinType.CompositeOutputEnumVariablePin:
+                case CompositePinType.CompositeOutputEnumStringVariablePin:
                     return ParameterVariant.OUTPUT_PIN;
                 case CompositePinType.CompositeMethodPin:
                     return ParameterVariant.METHOD_PIN;

CathodeLib/Scripts/CATHODE/CommandsPAK/Helpers/ParameterUtils.cs

@@ -556,6 +556,9 @@ public static ParameterData CreateDefaultParameterData(Entity entity, Composite
                     VariableEntity variableEntity = (VariableEntity)entity;
                     if (parameter == variableEntity.name)
                     {
+                        ParameterData defaultVal = variableEntity.GetParameter(parameter)?.content;
+                        if (defaultVal != null)
+                            return (ParameterData)defaultVal.Clone();
                         CompositePinInfoTable.PinInfo info = CompositeUtils.GetParameterInfo(composite, variableEntity);
                         switch (variableEntity.type)
                         {

README.md

@@ -69,7 +69,7 @@ Check out a full overview of the Commands structure [on the Wiki](https://github
     - Get/set content as an `XmlDocument` via `BML.Content`
 
 ## For saves:
-- `CATHODE.ProgressionSave` handles `PROGRESSION.AIS` files
+- `CATHODE.EXPERIMENTAL.ProgressionSave` handles `PROGRESSION.AIS` files
 - `CATHODE.EXPERIMENTAL.MissionSave` handles `*.AIS` files (experimental)
 
 ---