Merge current dev branch (A.K.A. "Output workers")

About/About.xml

@@ -2,6 +2,7 @@
 <ModMetaData>
 	<name>Community Framework</name>
 	<author>ISOREX, Turnovus, and community contributors.</author>
+	<modVersion IgnoreIfNoMatchingField="True">1.4.0</modVersion>
 	<supportedVersions>
 		<li>1.2</li>
 		<li>1.3</li>

About/Manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
     <identifier>CommunityFramework</identifier>
-    <version>1.3.0</version>
+    <version>1.4.0</version>
     <dependencies>
 		<li>Harmony</li>
 	</dependencies>

Common/Languages/English/Keyed/Settings.xml

@@ -51,4 +51,16 @@
 
 	<CFSettings_ApplyOutputWorkerPatch_Name>Recipe Output Patches</CFSettings_ApplyOutputWorkerPatch_Name>
 	<CFSettings_ApplyOutputWorkerPatch_Desc>allows modders to run additional scripts whenever certain recipes are complete.</CFSettings_ApplyOutputWorkerPatch_Desc>
+
+	<CFSettings_ApplyCanPlaceBlueprintOverPatch_Name>Blueprint Overlap Patches</CFSettings_ApplyCanPlaceBlueprintOverPatch_Name>
+	<CFSettings_ApplyCanPlaceBlueprintOverPatch_Desc>allows modders to alter behaviors pertaining to placing blueprints onto existing buildings.</CFSettings_ApplyCanPlaceBlueprintOverPatch_Desc>
+
+	<CFSettings_ShortCircuitPatches_Name>Short circuit patches</CFSettings_ShortCircuitPatches_Name>
+	<CFSettings_ShortCircuitPatches_Desc>allows modders to create buildings that react differently to short circuits.</CFSettings_ShortCircuitPatches_Desc>
+
+	<CFSettings_PostMakePatch_Name>Thing post-make patches</CFSettings_PostMakePatch_Name>
+	<CFSettings_PostMakePatch_Desc>runs additional behaviors whenever a thing is created.</CFSettings_PostMakePatch_Desc>
+
+	<CFSettings_ApplyBatteryPatches_Name>Battery charge patches</CFSettings_ApplyBatteryPatches_Name>
+	<CFSettings_ApplyBatteryPatches_Desc>allows modders to further customize their modded batteries.</CFSettings_ApplyBatteryPatches_Desc>
 </LanguageData>

Source/communityframework/communityframework/Comps/HediffComps/CraftedQualityOffset/HediffCompProperties_CraftedQualityOffset.cs

@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Verse;
-using RimWorld;
 
 namespace CF
 {

Source/communityframework/communityframework/Comps/HediffComps/CraftedQualityOffset/HediffComp_CraftedQualityOffset.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
+using Verse;
 using RimWorld;
 
 namespace CF

Source/communityframework/communityframework/Comps/HediffComps/HediffComp_IgnorePathCost.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using RimWorld;
+using RimWorld;
 using Verse;
 
 namespace CF

Source/communityframework/communityframework/Comps/HediffComps/HediffComp_SeverityFromApparel.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Verse;
 using RimWorld;
 

Source/communityframework/communityframework/Comps/HediffComps/IHediffComp_OnHediffAdded.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-using RimWorld;
+using Verse;
 
 namespace CF
 {

Source/communityframework/communityframework/Comps/HediffComps/MultiplyOtherHediff/HediffCompProperties_MultiplyOtherHediff.cs

@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Verse;
-using RimWorld;
 
 namespace CF
 {
@@ -30,5 +25,17 @@ class HediffCompProperties_MultiplyOtherHediff :
         /// multiplied by.
         /// </summary>
         public float multiplier = 1.0f;
+        /// <summary>
+        /// If <c>true</c>, then the comp will affect newly-added
+        /// <c>Hediff</c>s. Does not affect conditions that are already
+        /// present.
+        /// </summary>
+        public bool affectsNewHediffs = true;
+        /// <summary>
+        /// If <c>true</c>, then the comp will affect <c>Hediff</c>s that were
+        /// already present when the parent condition was applied. Does not
+        /// affect other conditions that were added after the parent.
+        /// </summary>
+        public bool affectsExistingHediffs = false;
     }
 }

Source/communityframework/communityframework/Comps/HediffComps/MultiplyOtherHediff/HediffComp_MultiplyOtherHediffDuration.cs

@@ -1,10 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Verse;
-using RimWorld;
 
 namespace CF
 {
@@ -28,23 +23,73 @@ class HediffComp_MultiplyOtherHediffDuration :
         /// Run when another <c>Hediff</c> is added to the parent's
         /// <c>Pawn</c>. Multiplies the other <c>Hediff</c>'s duration by a set
         /// amount, if the other <c>Hediff</c>'s <c>Def</c> is in
-        /// <c>Props.affectedHediffs</c>.
+        /// <c>Props.affectedHediffs</c>, and if <c>Props.affectsNewHediffs</c>
+        /// is <c>true</c>.
         /// </summary>
         /// <param name="hediff">The <c>Hediff</c> being added.</param>
         public void OnHediffAdded(ref Hediff hediff)
         {
-            if (hediff == parent)
+            if (!Props.affectsNewHediffs)
                 return;
-            if (Props.affectedHediffs.Contains(hediff.def))
-                if (hediff is HediffWithComps withComps)
+
+            TryAdjustOtherHediff(hediff);
+        }
+
+        /// <summary>
+        /// Run when the parent <see cref="Hediff"/> is applied to a
+        /// <see cref="Pawn"/>. If <c>Props.affectsExistingHediff</c> is
+        /// <c>true</c>, then this override will go through each health
+        /// condition already present on the target <c>Pawn</c>, and, if the
+        /// condition's <see cref="HediffDef"/> is in
+        /// <c>Props.affectedHediffs</c>, its duration will be multiplied by
+        /// <c>Props.multiplier</c>.
+        /// </summary>
+        /// <param name="dinfo">
+        /// The <see cref="DamageInfo"/> that caused the parent condition to be
+        /// applied. Unused here.
+        /// </param>
+        public override void CompPostPostAdd(DamageInfo? dinfo)
+        {
+            base.CompPostPostAdd(dinfo);
+
+            if (!Props.affectsExistingHediffs)
+                return;
+
+            foreach (Hediff otherHediff in Pawn.health.hediffSet.hediffs)
+                TryAdjustOtherHediff(otherHediff);
+        }
+
+        /// <summary>
+        /// Internal helper method used to adjust the duration of other
+        /// <see cref="Hediff"/>s where applicable. This method ensures that
+        /// the targeted health condition is not the comp's parent condition,
+        /// and that the condition's <see cref="HediffDef"/> is contained in
+        /// <c>Props.affectedHediff</c> before taking effect, as well as
+        /// ensring that it has the required
+        /// <see cref="HediffComp_Disappears"/>, so doing those comparisons
+        /// externally is unnecessary.
+        /// </summary>
+        /// <param name="other">
+        /// The <see cref="Hediff"/> to possibly adjust.
+        /// </param>
+        private void TryAdjustOtherHediff(Hediff other)
+        {
+            if (other == parent)
+                return;
+            if (Props.affectedHediffs.Contains(other.def))
+            {
+                if (other is HediffWithComps withComps)
                 {
                     HediffComp_Disappears comp =
                         withComps.TryGetComp<HediffComp_Disappears>();
+
                     if (comp != null)
+                    {
                         comp.ticksToDisappear =
-                            (int)Math.Ceiling(
-                                comp.ticksToDisappear * Props.multiplier);
+                            (int)Math.Ceiling(comp.ticksToDisappear * Props.multiplier);
+                    }
                 }
+            }
         }
     }
 }

Source/communityframework/communityframework/Comps/HediffComps/MultiplyOtherHediff/HediffComp_MultiplyOtherHediffSeverity.cs

@@ -1,10 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Verse;
-using RimWorld;
 
 namespace CF
 {
@@ -28,16 +23,58 @@ class HediffComp_MultiplyOtherHediffSeverity :
         /// Run when another <c>Hediff</c> is added to the parent's
         /// <c>Pawn</c>. Multiplies the other <c>Hediff</c>'s severity by a set
         /// amount, if the other <c>Hediff</c>'s <c>Def</c> is in
-        /// <c>Props.affectedHediffs</c>.
+        /// <c>Props.affectedHediffs</c>, and if <c>Props.affectsNewHediffs</c>
+        /// is <c>true</c>.
         /// </summary>
         /// <param name="hediff">The <c>Hediff</c> being added.</param>
         public void OnHediffAdded(ref Hediff hediff)
         {
-            if (hediff == parent)
+            if (Props.affectsNewHediffs)
+                TryAdjustOtherHediff(hediff);
+        }
+
+        /// <summary>
+        /// Run when the parent <see cref="Hediff"/> is applied to a
+        /// <see cref="Pawn"/>. If <c>Props.affectsExistingHediff</c> is
+        /// <c>true</c>, then this override will go through each health
+        /// condition already present on the target <c>Pawn</c>, and, if the
+        /// condition's <see cref="HediffDef"/> is in
+        /// <c>Props.affectedHediffs</c>, its severity will be multiplied by
+        /// <c>Props.multiplier</c>.
+        /// </summary>
+        /// <param name="dinfo">
+        /// The <see cref="DamageInfo"/> that caused the parent condition to be
+        /// applied. Unused here.
+        /// </param>
+        public override void CompPostPostAdd(DamageInfo? dinfo)
+        {
+            base.CompPostPostAdd(dinfo);
+
+            if (!Props.affectsExistingHediffs)
+                return;
+
+            foreach (Hediff otherHediff in Pawn.health.hediffSet.hediffs)
+                TryAdjustOtherHediff(otherHediff);
+        }
+
+        /// <summary>
+        /// Internal helper method used to adjust the severity of other
+        /// <see cref="Hediff"/>s where applicable. This method ensures that
+        /// the targeted health condition is not the comp's parent condition,
+        /// and that the condition's <see cref="HediffDef"/> is contained in
+        /// <c>Props.affectedHediff</c> before taking effect, so doing those
+        /// comparisons externally is unnecessary.
+        /// </summary>
+        /// <param name="other">
+        /// The <see cref="Hediff"/> to possibly adjust.
+        /// </param>
+        private void TryAdjustOtherHediff(Hediff other)
+        {
+            if (other == parent)
                 return;
-            if (Props.affectedHediffs.Contains(hediff.def))
-                hediff.Severity =
-                    (int)Math.Ceiling(hediff.Severity * Props.multiplier);
+            if (Props.affectedHediffs.Contains(other.def))
+                other.Severity =
+                    Math.Min(other.Severity * Props.multiplier, other.def.maxSeverity);
         }
     }
 }

Source/communityframework/communityframework/Comps/HediffComps/SeverityFromPain/HediffCompProperties_SeverityFromPain.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-using RimWorld;
+using Verse;
 
 namespace CF
 {

Source/communityframework/communityframework/Comps/HediffComps/SeverityFromSkill/HediffCompProperties_SeverityFromSkill.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Verse;
 using RimWorld;
 

Source/communityframework/communityframework/Comps/HediffComps/SeverityFromSkill/HediffComp_SeverityFromSkill.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq;
 using Verse;
 using RimWorld;
 

Source/communityframework/communityframework/Comps/ThingComps/CompOnWearSound.cs

@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Verse;
 using Verse.Sound;
-using RimWorld;
 
 namespace CF
 {

Source/communityframework/communityframework/Comps/ThingComps/CompRemoteTrigger.cs

@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using RimWorld;
 using Verse;
 using UnityEngine;

Source/communityframework/communityframework/Comps/ThingComps/CompSelfRepair.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using Verse;
 using RimWorld;
 

Source/communityframework/communityframework/Comps/ThingComps/CompValidator.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Verse;
-using RimWorld;
 
 namespace CF {
     /// <summary>
@@ -82,6 +80,14 @@ public override string CompInspectStringExtra()
     /// </summary>
     public class CompProperties_Validator : CompProperties
     {
+        /// <summary>
+        /// The number of in-game ticks that pass before each time the
+        /// <c>PlaceWorker</c> validation check is run. A lower number will run
+        /// the check more frequently, but can cause slowdown if the parent
+        /// <c>ThingWithComps</c> has computationally-expensive
+        /// <c>PlaceWorkers</c>. For reference, at 1x speed, there are 60 ticks
+        /// in a single second.
+        /// </summary>
         public int tickInterval = 250;
 
         /// <value>

Source/communityframework/communityframework/Comps/ThingComps/CompWithCheapHashInterval.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Verse;
+using Verse;
 
 namespace CF
 {