From 3d0bc51391372e81cd71fb675ce49ea4e8f54df2 Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Thu, 4 Sep 2025 23:22:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E4=BF=AE=E8=9C=82=E5=B7=A2=E6=96=AD?= =?UTF-8?q?=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.6/1.6/Assemblies/ArachnaeSwarm.dll | Bin 70656 -> 70656 bytes .../Defs/AbilityDefs/ARA_Possession_Defs.xml | 4 ++++ .../HediffDefs/ARA_Hediffs_Possession.xml | 3 +++ .../ARA_HiveMind/Hediff_HiveMindDrone.cs | 16 ++-------------- .../ARA_HiveMind/Hediff_HiveMindMaster.cs | 2 ++ 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/1.6/1.6/Assemblies/ArachnaeSwarm.dll b/1.6/1.6/Assemblies/ArachnaeSwarm.dll index 889af9cba2f19cf6c2aeb73fd85b54b076078de7..83a59e0f667e1df40f9d162d7bc594059ab954c2 100644 GIT binary patch delta 14661 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
  • +
  • + CompAbilityEffect_GiveHediff + ARA_HiveMindDrone +
  • diff --git a/1.6/1.6/Defs/HediffDefs/ARA_Hediffs_Possession.xml b/1.6/1.6/Defs/HediffDefs/ARA_Hediffs_Possession.xml index b2252d6..bf7db93 100644 --- a/1.6/1.6/Defs/HediffDefs/ARA_Hediffs_Possession.xml +++ b/1.6/1.6/Defs/HediffDefs/ARA_Hediffs_Possession.xml @@ -57,6 +57,9 @@ + +
  • + \ No newline at end of file diff --git a/Source/ArachnaeSwarm/ARA_HiveMind/Hediff_HiveMindDrone.cs b/Source/ArachnaeSwarm/ARA_HiveMind/Hediff_HiveMindDrone.cs index 87760f0..6a141f8 100644 --- a/Source/ArachnaeSwarm/ARA_HiveMind/Hediff_HiveMindDrone.cs +++ b/Source/ArachnaeSwarm/ARA_HiveMind/Hediff_HiveMindDrone.cs @@ -42,18 +42,7 @@ namespace ArachnaeSwarm { get { - // Only remove if base ShouldRemove is true, OR if pawn is dead - // We do NOT want to remove it just because target is invalid, as the Comp will handle delayed death - if (base.ShouldRemove && pawn.Dead) - { - return true; - } - // Also remove if pawn is no longer spawned or on a map - if (!pawn.Spawned || pawn.Map == null) - { - return true; - } - return false; // Let the Comp handle the unlinked death + return this.pawn.Dead; } } @@ -61,8 +50,7 @@ namespace ArachnaeSwarm { base.PostRemoved(); // Deregister from the master when this hediff is removed - // Ensure target is a Pawn and not dead before attempting to deregister - if (this.target is Pawn master && master != null && !master.Destroyed && !master.Dead) + if (this.target is Pawn master && master != null && !master.Destroyed) { var masterHediff = master.health.hediffSet.GetFirstHediffOfDef(HediffDef.Named("ARA_HiveMindMaster")) as Hediff_HiveMindMaster; masterHediff?.DeregisterDrone(this.pawn); diff --git a/Source/ArachnaeSwarm/ARA_HiveMind/Hediff_HiveMindMaster.cs b/Source/ArachnaeSwarm/ARA_HiveMind/Hediff_HiveMindMaster.cs index 2558b1e..50f49f2 100644 --- a/Source/ArachnaeSwarm/ARA_HiveMind/Hediff_HiveMindMaster.cs +++ b/Source/ArachnaeSwarm/ARA_HiveMind/Hediff_HiveMindMaster.cs @@ -11,6 +11,8 @@ namespace ArachnaeSwarm public override string LabelInBrackets => drones.Count.ToString(); + public override bool ShouldRemove => false; + public override void ExposeData() { base.ExposeData();