diff --git a/1.6/1.6/Assemblies/ArachnaeSwarm.dll b/1.6/1.6/Assemblies/ArachnaeSwarm.dll index 9ad99a8..441d9f5 100644 Binary files a/1.6/1.6/Assemblies/ArachnaeSwarm.dll and b/1.6/1.6/Assemblies/ArachnaeSwarm.dll differ diff --git a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml index bf6e6a2..33e7a9d 100644 --- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml +++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml @@ -642,30 +642,6 @@ -
  • - FacialAnimation.DrawFaceGraphicsComp -
    • -
  • - FacialAnimation.HeadControllerComp -
    • -
  • - FacialAnimation.EyeballControllerComp -
    • -
  • - FacialAnimation.LidControllerComp -
    • -
  • - FacialAnimation.BrowControllerComp -
    • -
  • - FacialAnimation.MouthControllerComp -
    • -
  • - FacialAnimation.SkinControllerComp -
    • -
  • - FacialAnimation.FacialAnimationControllerComp -
  • ARA_HiveMindDrone
    • @@ -2110,30 +2086,6 @@ -
  • - FacialAnimation.DrawFaceGraphicsComp -
    • -
  • - FacialAnimation.HeadControllerComp -
    • -
  • - FacialAnimation.EyeballControllerComp -
    • -
  • - FacialAnimation.LidControllerComp -
    • -
  • - FacialAnimation.BrowControllerComp -
    • -
  • - FacialAnimation.MouthControllerComp -
    • -
  • - FacialAnimation.SkinControllerComp -
    • -
  • - FacialAnimation.FacialAnimationControllerComp -
  • ARA_HiveStrength_Low
    • diff --git a/1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Facehugger_JobAnim.xml b/1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Facehugger_JobAnim.xml similarity index 100% rename from 1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Facehugger_JobAnim.xml rename to 1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Facehugger_JobAnim.xml diff --git a/1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Fighter_JobAnim.xml b/1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Fighter_JobAnim.xml similarity index 100% rename from 1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Fighter_JobAnim.xml rename to 1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Fighter_JobAnim.xml diff --git a/1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Myrmecocystus_JobAnim.xml b/1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Myrmecocystus_JobAnim.xml similarity index 100% rename from 1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Myrmecocystus_JobAnim.xml rename to 1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Myrmecocystus_JobAnim.xml diff --git a/1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_NeuroSwarm_JobAnim.xml b/1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_NeuroSwarm_JobAnim.xml similarity index 100% rename from 1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_NeuroSwarm_JobAnim.xml rename to 1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_NeuroSwarm_JobAnim.xml diff --git a/1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Praetorian_JobAnim.xml b/1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Praetorian_JobAnim.xml similarity index 100% rename from 1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Praetorian_JobAnim.xml rename to 1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Praetorian_JobAnim.xml diff --git a/1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_ShieldHead_JobAnim.xml b/1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_ShieldHead_JobAnim.xml similarity index 100% rename from 1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_ShieldHead_JobAnim.xml rename to 1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_ShieldHead_JobAnim.xml diff --git a/1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Skyraider_JobAnim.xml b/1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Skyraider_JobAnim.xml similarity index 100% rename from 1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Skyraider_JobAnim.xml rename to 1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Skyraider_JobAnim.xml diff --git a/1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Smokepop_JobAnim.xml b/1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Smokepop_JobAnim.xml similarity index 100% rename from 1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Smokepop_JobAnim.xml rename to 1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_Smokepop_JobAnim.xml diff --git a/1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_WeaponSmith_JobAnim.xml b/1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_WeaponSmith_JobAnim.xml similarity index 100% rename from 1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_WeaponSmith_JobAnim.xml rename to 1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_ArachnaeNode_Race_WeaponSmith_JobAnim.xml diff --git a/1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml b/1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml similarity index 100% rename from 1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml rename to 1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml diff --git a/1.6/1.6/Defs/FaceShapeDefs/BrowShape.xml b/1.6/FA/Defs/FaceShapeDefs/BrowShape.xml similarity index 100% rename from 1.6/1.6/Defs/FaceShapeDefs/BrowShape.xml rename to 1.6/FA/Defs/FaceShapeDefs/BrowShape.xml diff --git a/1.6/1.6/Defs/FaceShapeDefs/EmotionShape.xml b/1.6/FA/Defs/FaceShapeDefs/EmotionShape.xml similarity index 100% rename from 1.6/1.6/Defs/FaceShapeDefs/EmotionShape.xml rename to 1.6/FA/Defs/FaceShapeDefs/EmotionShape.xml diff --git a/1.6/1.6/Defs/FaceShapeDefs/EyeShape.xml b/1.6/FA/Defs/FaceShapeDefs/EyeShape.xml similarity index 100% rename from 1.6/1.6/Defs/FaceShapeDefs/EyeShape.xml rename to 1.6/FA/Defs/FaceShapeDefs/EyeShape.xml diff --git a/1.6/1.6/Defs/FaceShapeDefs/HeadShape.xml b/1.6/FA/Defs/FaceShapeDefs/HeadShape.xml similarity index 100% rename from 1.6/1.6/Defs/FaceShapeDefs/HeadShape.xml rename to 1.6/FA/Defs/FaceShapeDefs/HeadShape.xml diff --git a/1.6/1.6/Defs/FaceShapeDefs/LidOptionShape.xml b/1.6/FA/Defs/FaceShapeDefs/LidOptionShape.xml similarity index 100% rename from 1.6/1.6/Defs/FaceShapeDefs/LidOptionShape.xml rename to 1.6/FA/Defs/FaceShapeDefs/LidOptionShape.xml diff --git a/1.6/1.6/Defs/FaceShapeDefs/LidShape.xml b/1.6/FA/Defs/FaceShapeDefs/LidShape.xml similarity index 100% rename from 1.6/1.6/Defs/FaceShapeDefs/LidShape.xml rename to 1.6/FA/Defs/FaceShapeDefs/LidShape.xml diff --git a/1.6/1.6/Defs/FaceShapeDefs/MouthShape.xml b/1.6/FA/Defs/FaceShapeDefs/MouthShape.xml similarity index 100% rename from 1.6/1.6/Defs/FaceShapeDefs/MouthShape.xml rename to 1.6/FA/Defs/FaceShapeDefs/MouthShape.xml diff --git a/1.6/1.6/Defs/FaceShapeDefs/SkinShape.xml b/1.6/FA/Defs/FaceShapeDefs/SkinShape.xml similarity index 100% rename from 1.6/1.6/Defs/FaceShapeDefs/SkinShape.xml rename to 1.6/FA/Defs/FaceShapeDefs/SkinShape.xml diff --git a/1.6/1.6/Defs/FaceTypeDefs/ArachnaeNode_Race/ARA_FaceType.xml b/1.6/FA/Defs/FaceTypeDefs/ArachnaeNode_Race/ARA_FaceType.xml similarity index 100% rename from 1.6/1.6/Defs/FaceTypeDefs/ArachnaeNode_Race/ARA_FaceType.xml rename to 1.6/FA/Defs/FaceTypeDefs/ArachnaeNode_Race/ARA_FaceType.xml diff --git a/1.6/FA/Patches/ARA_FacialAnimation_Patch.xml b/1.6/FA/Patches/ARA_FacialAnimation_Patch.xml new file mode 100644 index 0000000..2b950f9 --- /dev/null +++ b/1.6/FA/Patches/ARA_FacialAnimation_Patch.xml @@ -0,0 +1,64 @@ + + + + + /Defs/AlienRace.ThingDef_AlienRace[@Name="ARA_NodeBase"]/comps + +
  • + FacialAnimation.DrawFaceGraphicsComp +
    • +
  • + FacialAnimation.HeadControllerComp +
    • +
  • + FacialAnimation.EyeballControllerComp +
    • +
  • + FacialAnimation.LidControllerComp +
    • +
  • + FacialAnimation.BrowControllerComp +
    • +
  • + FacialAnimation.MouthControllerComp +
    • +
  • + FacialAnimation.SkinControllerComp +
    • +
  • + FacialAnimation.FacialAnimationControllerComp +
    • +     +     + + + + /Defs/AlienRace.ThingDef_AlienRace[defName="ArachnaeNode_Race_MimicNematode"]/comps + +
  • + FacialAnimation.DrawFaceGraphicsComp +
    • +
  • + FacialAnimation.HeadControllerComp +
    • +
  • + FacialAnimation.EyeballControllerComp +
    • +
  • + FacialAnimation.LidControllerComp +
    • +
  • + FacialAnimation.BrowControllerComp +
    • +
  • + FacialAnimation.MouthControllerComp +
    • +
  • + FacialAnimation.SkinControllerComp +
    • +
  • + FacialAnimation.FacialAnimationControllerComp +
    • +     +     +     \ No newline at end of file diff --git a/LoadFolders.xml b/LoadFolders.xml index ad7c3bc..4400051 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -1,6 +1,7 @@
  • 1.6/1.6
    • +
  • 1.6/FA
  • Content
    •      \ No newline at end of file diff --git a/Source/ArachnaeSwarm/FacialAnimation/FaceAnimationStaticGenerator.cs b/Source/ArachnaeSwarm/FacialAnimation/FaceAnimationStaticGenerator.cs index 5ee5695..3ab33ae 100644 --- a/Source/ArachnaeSwarm/FacialAnimation/FaceAnimationStaticGenerator.cs +++ b/Source/ArachnaeSwarm/FacialAnimation/FaceAnimationStaticGenerator.cs @@ -16,6 +16,13 @@ namespace ArachnaeSwarm static FaceAnimationFileGenerator() { + // 检查 Nals.FacialAnimation 是否被加载 + if (!LoadedModManager.RunningMods.Any(m => m.PackageId == "Nals.FacialAnimation")) + { + Log.Message("[Arachnae Swarm] Facial Animation mod not found. Skipping animation file generation."); + return; // 如果未加载，则直接退出，不执行任何操作 + } + GenerateAllFaceAnimationFiles(); } @@ -40,39 +47,39 @@ namespace ArachnaeSwarm { { "ArachnaeNode_Race_Myrmecocystus", - new List { "1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } + new List { "1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } }, { "ArachnaeNode_Race_ShieldHead", - new List { "1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } + new List { "1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } }, { "ArachnaeNode_Race_WeaponSmith", - new List { "1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } + new List { "1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } }, { "ArachnaeNode_Race_Fighter", - new List { "1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } + new List { "1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } }, { "ArachnaeNode_Race_Facehugger", - new List { "1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } + new List { "1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } }, { "ArachnaeNode_Race_Smokepop", - new List { "1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } + new List { "1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } }, { "ArachnaeNode_Race_NeuroSwarm", - new List { "1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } + new List { "1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } }, { "ArachnaeNode_Race_Praetorian", - new List { "1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } + new List { "1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } }, { "ArachnaeNode_Race_Skyraider", - new List { "1.6/1.6/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } + new List { "1.6/FA/Defs/AnimationDefs/FacialAnimation/ARA_JobAnim.xml" } } }; @@ -234,4 +241,4 @@ namespace ArachnaeSwarm } } } -} +} \ No newline at end of file