diff --git a/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_NonPregnant.cs b/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_NonPregnant.cs index 696c385..118d2bd 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_NonPregnant.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_NonPregnant.cs @@ -8,19 +8,19 @@ namespace RJWSexperience.Ideology.Ideology.Precept_Workers /// thought worker for a thought that is active when a certain hediff is present, and who's stage depends on the ether state of the pawn /// Shamelessly taken from: https://github.com/Tachyonite/Pawnmorpher/blob/master/Source/Pawnmorphs/Esoteria/Thoughts/ThoughtWorker_EtherHediff.cs /// - public class ThoughtWorker_Precept_NonPregnant : ThoughtWorker + public class ThoughtWorker_Precept_NonPregnant : ThoughtWorker_Precept { /// Gets the current thought state of the given pawn. /// The pawn for whom the thoughts are generated. /// - protected override ThoughtState CurrentStateInternal(Pawn p) + protected override ThoughtState ShouldHaveThought(Pawn p) { var pregnancy = rjw.PregnancyHelper.GetPregnancy(p); if (pregnancy == null) { - return false; + return ThoughtState.Inactive; } return ThoughtState.ActiveAtStage(0); diff --git a/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_NonPregnant_Social.cs b/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_NonPregnant_Social.cs index e8efa9a..68ed70b 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_NonPregnant_Social.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_NonPregnant_Social.cs @@ -8,19 +8,19 @@ namespace RJWSexperience.Ideology.Ideology.Precept_Workers /// thought worker for a thought that is active when a certain hediff is present, and who's stage depends on the ether state of the pawn /// Shamelessly taken from: https://github.com/Tachyonite/Pawnmorpher/blob/master/Source/Pawnmorphs/Esoteria/Thoughts/ThoughtWorker_EtherHediff.cs /// - public class ThoughtWorker_Precept_NonPregnant_Social : ThoughtWorker + public class ThoughtWorker_Precept_NonPregnant_Social : ThoughtWorker_Precept { /// Gets the current thought state of the given pawn. /// The pawn for whom the thoughts are generated. /// - protected override ThoughtState CurrentStateInternal(Pawn p) + protected override ThoughtState ShouldHaveThought(Pawn p) { var pregnancy = rjw.PregnancyHelper.GetPregnancy(p); - if (pregnancy != null) //ignoring the hediff's stage, the thought's stage is dependent on only the ether state of the pawn c + if (pregnancy != null) { - return false; + return ThoughtState.Inactive; } else return ThoughtState.ActiveAtStage(0); } diff --git a/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_Pregnant.cs b/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_Pregnant.cs index 7384c8a..fab5f90 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_Pregnant.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_Pregnant.cs @@ -9,19 +9,19 @@ namespace RJWSexperience.Ideology.Ideology.Precept_Workers /// thought worker for a thought that is active when a certain hediff is present, and who's stage depends on the ether state of the pawn /// Shamelessly taken from: https://github.com/Tachyonite/Pawnmorpher/blob/master/Source/Pawnmorphs/Esoteria/Thoughts/ThoughtWorker_EtherHediff.cs /// - public class ThoughtWorker_Precept_Pregnant : ThoughtWorker + public class ThoughtWorker_Precept_Pregnant : ThoughtWorker_Precept { /// Gets the current thought state of the given pawn. /// The pawn for whom the thoughts are generated. /// - protected override ThoughtState CurrentStateInternal(Pawn p) + protected override ThoughtState ShouldHaveThought(Pawn p) { var pregnancy = rjw.PregnancyHelper.GetPregnancy(p); - if (pregnancy == null) //ignoring the hediff's stage, the thought's stage is dependent on only the ether state of the pawn c + if (pregnancy == null) { - return false; + return ThoughtState.Inactive; } return ThoughtState.ActiveAtStage(0); diff --git a/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_Pregnant_Social.cs b/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_Pregnant_Social.cs index 8204a09..b1cdaa0 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_Pregnant_Social.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Precept_Workers/ThoughtWorker_Precept_Pregnant_Social.cs @@ -8,19 +8,19 @@ namespace RJWSexperience.Ideology.Ideology.Precept_Workers /// thought worker for a thought that is active when a certain hediff is present, and who's stage depends on the ether state of the pawn /// Shamelessly taken from: https://github.com/Tachyonite/Pawnmorpher/blob/master/Source/Pawnmorphs/Esoteria/Thoughts/ThoughtWorker_EtherHediff.cs /// - public class ThoughtWorker_Precept_Pregnant_Social : ThoughtWorker + public class ThoughtWorker_Precept_Pregnant_Social : ThoughtWorker_Precept { /// Gets the current thought state of the given pawn. /// The pawn for whom the thoughts are generated. /// - protected override ThoughtState CurrentStateInternal(Pawn p) + protected override ThoughtState ShouldHaveThought(Pawn p) { var pregnancy = rjw.PregnancyHelper.GetPregnancy(p); - if (pregnancy == null) //ignoring the hediff's stage, the thought's stage is dependent on only the ether state of the pawn c + if (pregnancy == null) { - return false; + return ThoughtState.Inactive; } return ThoughtState.ActiveAtStage(0); diff --git a/RJWSexperience/IdeologyAddon/IdeologyAddon.csproj b/RJWSexperience/IdeologyAddon/IdeologyAddon.csproj index 620b567..96460c9 100644 --- a/RJWSexperience/IdeologyAddon/IdeologyAddon.csproj +++ b/RJWSexperience/IdeologyAddon/IdeologyAddon.csproj @@ -36,12 +36,10 @@ False - D:\Games\SteamLibrary\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll - False + ..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll - ..\..\..\rjw\1.3\Assemblies\RJW.dll - False + ..\..\..\rjw-vegapnk\1.3\Assemblies\RJW.dll @@ -62,6 +60,10 @@ + + + +