From 31e96bd5e3e2e21d7ec2b856163381210cbfb99c Mon Sep 17 00:00:00 2001 From: Vegapnk Date: Sun, 22 Jan 2023 09:06:28 +0100 Subject: [PATCH] Restructuring, some sorting into folders --- .../BestialityGeneInheritanceDef.cs | 0 .../{ => Defs}/RaceGeneDef.cs | 0 .../{ => Defs}/RaceGeneDef_Helper.cs | 0 .../Patch_RJW_BestialityPregnancyUtility.cs} | 2 +- .../Patch_RJW_HediffInsect_Egg.cs} | 2 +- .../Patch_Vanilla_PregnancyUtility.cs} | 2 +- .../{ => Settings}/RJW_BGSSettings.cs | 0 .../RJW_BGSSettingsController.cs | 0 .../IncidentWorker_SuccubusDreamVisit.cs | 0 .../SuccubusVisit}/LordJob_SuccubusVisit.cs | 0 .../Life_Force/{ => Genes}/Gene_LifeForce.cs | 0 .../{ => Genes}/Gene_LifeForceDrain.cs | 0 .../IngestionOutcomeDoer_LifeForceOffset.cs | 17 +++-- .../{ => JobGivers}/JobGiver_Flirt.cs | 0 .../{ => JobGivers}/JobGiver_GetLifeForce.cs | 2 +- .../JobGiver_LifeForce_RandomRape.cs | 0 .../JobGiver_TryQuickieWith.cs | 0 .../LifeForceMentalBreakWorker.cs | 0 .../LifeForceMentalState.cs | 0 .../LifeForceMentalStateWorker.cs | 0 .../Patch_SatisfyPersonal_LifeForceGain.cs} | 52 +++++++++----- .../Patch_SexTicks_ChangePsyfocus.cs | 0 .../Patch_Vanilla_Inheritance_Fertilin.cs | 0 .../ThinkNode_ConditionalCannotInteract.cs | 0 .../ThinkNode_ConditionalCritcalLifeForce.cs | 0 .../ThinkNode_ConditionalLowLifeForce.cs | 0 .../ThinkNode_NewFlirtTarget.cs | 0 .../Life_Force/{ => UI}/Alert_LowFertilin.cs | 0 .../{ => UI}/GeneGizmo_ResourceLifeForce.cs | 0 .../CompAbility_SexInteractionRequirements.cs | 0 ...mpProperties_SexInteractionRequirements.cs | 0 .../CustomSexInteraction_Helper.cs | 0 ...DomSuccubusTailCustomRequirementHandler.cs | 0 .../GenesPartKindUsageRule.cs | 0 ...SubSuccubusTailCustomRequirementHandler.cs | 0 Source/Rjw-Genes.csproj | 68 +++++++++---------- 36 files changed, 80 insertions(+), 65 deletions(-) rename Source/Animal_Inheritance/{ => Defs}/BestialityGeneInheritanceDef.cs (100%) rename Source/Animal_Inheritance/{ => Defs}/RaceGeneDef.cs (100%) rename Source/Animal_Inheritance/{ => Defs}/RaceGeneDef_Helper.cs (100%) rename Source/Animal_Inheritance/{PatchRJWBestialityPregnancyUtility.cs => Patches/Patch_RJW_BestialityPregnancyUtility.cs} (96%) rename Source/Animal_Inheritance/{PatchRJWHediffInsect_Egg.cs => Patches/Patch_RJW_HediffInsect_Egg.cs} (96%) rename Source/Animal_Inheritance/{PatchVanillaPregnancyUtility.cs => Patches/Patch_Vanilla_PregnancyUtility.cs} (95%) rename Source/Animal_Inheritance/{ => Settings}/RJW_BGSSettings.cs (100%) rename Source/Animal_Inheritance/{ => Settings}/RJW_BGSSettingsController.cs (100%) rename Source/Genes/Life_Force/{ => Events/SuccubusVisit}/IncidentWorker_SuccubusDreamVisit.cs (100%) rename Source/Genes/Life_Force/{ => Events/SuccubusVisit}/LordJob_SuccubusVisit.cs (100%) rename Source/Genes/Life_Force/{ => Genes}/Gene_LifeForce.cs (100%) rename Source/Genes/Life_Force/{ => Genes}/Gene_LifeForceDrain.cs (100%) rename Source/Genes/Life_Force/{ => JobGivers}/JobGiver_Flirt.cs (100%) rename Source/Genes/Life_Force/{ => JobGivers}/JobGiver_GetLifeForce.cs (97%) rename Source/Genes/Life_Force/{ => JobGivers}/JobGiver_LifeForce_RandomRape.cs (100%) rename Source/Genes/Life_Force/{ => JobGivers}/JobGiver_TryQuickieWith.cs (100%) rename Source/Genes/Life_Force/{ => MentalStates}/LifeForceMentalBreakWorker.cs (100%) rename Source/Genes/Life_Force/{ => MentalStates}/LifeForceMentalState.cs (100%) rename Source/Genes/Life_Force/{ => MentalStates}/LifeForceMentalStateWorker.cs (100%) rename Source/Genes/Life_Force/{Patch_LifeForce.cs => Patches/Patch_SatisfyPersonal_LifeForceGain.cs} (64%) rename Source/Genes/Life_Force/{ => Patches}/Patch_SexTicks_ChangePsyfocus.cs (100%) rename Source/Genes/Life_Force/{ => Patches}/Patch_Vanilla_Inheritance_Fertilin.cs (100%) rename Source/Genes/Life_Force/{ => ThinkNodes}/ThinkNode_ConditionalCannotInteract.cs (100%) rename Source/Genes/Life_Force/{ => ThinkNodes}/ThinkNode_ConditionalCritcalLifeForce.cs (100%) rename Source/Genes/Life_Force/{ => ThinkNodes}/ThinkNode_ConditionalLowLifeForce.cs (100%) rename Source/Genes/Life_Force/{ => ThinkNodes}/ThinkNode_NewFlirtTarget.cs (100%) rename Source/Genes/Life_Force/{ => UI}/Alert_LowFertilin.cs (100%) rename Source/Genes/Life_Force/{ => UI}/GeneGizmo_ResourceLifeForce.cs (100%) rename Source/Interactions/{ => SuccubusTailjob}/CompAbility_SexInteractionRequirements.cs (100%) rename Source/Interactions/{ => SuccubusTailjob}/CompProperties_SexInteractionRequirements.cs (100%) rename Source/Interactions/{ => SuccubusTailjob}/CustomSexInteraction_Helper.cs (100%) rename Source/Interactions/{ => SuccubusTailjob}/DomSuccubusTailCustomRequirementHandler.cs (100%) rename Source/Interactions/{ => SuccubusTailjob}/GenesPartKindUsageRule.cs (100%) rename Source/Interactions/{ => SuccubusTailjob}/SubSuccubusTailCustomRequirementHandler.cs (100%) diff --git a/Source/Animal_Inheritance/BestialityGeneInheritanceDef.cs b/Source/Animal_Inheritance/Defs/BestialityGeneInheritanceDef.cs similarity index 100% rename from Source/Animal_Inheritance/BestialityGeneInheritanceDef.cs rename to Source/Animal_Inheritance/Defs/BestialityGeneInheritanceDef.cs diff --git a/Source/Animal_Inheritance/RaceGeneDef.cs b/Source/Animal_Inheritance/Defs/RaceGeneDef.cs similarity index 100% rename from Source/Animal_Inheritance/RaceGeneDef.cs rename to Source/Animal_Inheritance/Defs/RaceGeneDef.cs diff --git a/Source/Animal_Inheritance/RaceGeneDef_Helper.cs b/Source/Animal_Inheritance/Defs/RaceGeneDef_Helper.cs similarity index 100% rename from Source/Animal_Inheritance/RaceGeneDef_Helper.cs rename to Source/Animal_Inheritance/Defs/RaceGeneDef_Helper.cs diff --git a/Source/Animal_Inheritance/PatchRJWBestialityPregnancyUtility.cs b/Source/Animal_Inheritance/Patches/Patch_RJW_BestialityPregnancyUtility.cs similarity index 96% rename from Source/Animal_Inheritance/PatchRJWBestialityPregnancyUtility.cs rename to Source/Animal_Inheritance/Patches/Patch_RJW_BestialityPregnancyUtility.cs index da5ac8d..c5f6366 100644 --- a/Source/Animal_Inheritance/PatchRJWBestialityPregnancyUtility.cs +++ b/Source/Animal_Inheritance/Patches/Patch_RJW_BestialityPregnancyUtility.cs @@ -11,7 +11,7 @@ using rjw; namespace RJW_BGS { [HarmonyPatch(typeof(Hediff_BasePregnancy), "Initialize")] - public static class PatchRJWBestialityPregnancyUtility + public static class Patch_RJW_BestialityPregnancyUtility { [HarmonyPostfix] public static void AddGenes(Pawn mother, Pawn dad, ref Hediff_BasePregnancy __instance) diff --git a/Source/Animal_Inheritance/PatchRJWHediffInsect_Egg.cs b/Source/Animal_Inheritance/Patches/Patch_RJW_HediffInsect_Egg.cs similarity index 96% rename from Source/Animal_Inheritance/PatchRJWHediffInsect_Egg.cs rename to Source/Animal_Inheritance/Patches/Patch_RJW_HediffInsect_Egg.cs index 587571f..9861537 100644 --- a/Source/Animal_Inheritance/PatchRJWHediffInsect_Egg.cs +++ b/Source/Animal_Inheritance/Patches/Patch_RJW_HediffInsect_Egg.cs @@ -7,7 +7,7 @@ using rjw; namespace RJW_BGS { [HarmonyPatch(typeof(Hediff_InsectEgg), "GiveBirth")] - public static class PatchRJWHediffInsect_Egg + public static class Patch_RJW_HediffInsect_Egg { [HarmonyTranspiler] public static IEnumerable Transpiler(IEnumerable instructions) diff --git a/Source/Animal_Inheritance/PatchVanillaPregnancyUtility.cs b/Source/Animal_Inheritance/Patches/Patch_Vanilla_PregnancyUtility.cs similarity index 95% rename from Source/Animal_Inheritance/PatchVanillaPregnancyUtility.cs rename to Source/Animal_Inheritance/Patches/Patch_Vanilla_PregnancyUtility.cs index afbfa09..28f872f 100644 --- a/Source/Animal_Inheritance/PatchVanillaPregnancyUtility.cs +++ b/Source/Animal_Inheritance/Patches/Patch_Vanilla_PregnancyUtility.cs @@ -19,7 +19,7 @@ namespace RJW_BGS //typeof(bool) } )] - public static class PatchVanillaPregnancyUtility + public static class Patch_Vanilla_PregnancyUtility { [HarmonyPostfix] public static void AnimalInheritedGenes(Pawn father, Pawn mother, ref GeneSet __result) diff --git a/Source/Animal_Inheritance/RJW_BGSSettings.cs b/Source/Animal_Inheritance/Settings/RJW_BGSSettings.cs similarity index 100% rename from Source/Animal_Inheritance/RJW_BGSSettings.cs rename to Source/Animal_Inheritance/Settings/RJW_BGSSettings.cs diff --git a/Source/Animal_Inheritance/RJW_BGSSettingsController.cs b/Source/Animal_Inheritance/Settings/RJW_BGSSettingsController.cs similarity index 100% rename from Source/Animal_Inheritance/RJW_BGSSettingsController.cs rename to Source/Animal_Inheritance/Settings/RJW_BGSSettingsController.cs diff --git a/Source/Genes/Life_Force/IncidentWorker_SuccubusDreamVisit.cs b/Source/Genes/Life_Force/Events/SuccubusVisit/IncidentWorker_SuccubusDreamVisit.cs similarity index 100% rename from Source/Genes/Life_Force/IncidentWorker_SuccubusDreamVisit.cs rename to Source/Genes/Life_Force/Events/SuccubusVisit/IncidentWorker_SuccubusDreamVisit.cs diff --git a/Source/Genes/Life_Force/LordJob_SuccubusVisit.cs b/Source/Genes/Life_Force/Events/SuccubusVisit/LordJob_SuccubusVisit.cs similarity index 100% rename from Source/Genes/Life_Force/LordJob_SuccubusVisit.cs rename to Source/Genes/Life_Force/Events/SuccubusVisit/LordJob_SuccubusVisit.cs diff --git a/Source/Genes/Life_Force/Gene_LifeForce.cs b/Source/Genes/Life_Force/Genes/Gene_LifeForce.cs similarity index 100% rename from Source/Genes/Life_Force/Gene_LifeForce.cs rename to Source/Genes/Life_Force/Genes/Gene_LifeForce.cs diff --git a/Source/Genes/Life_Force/Gene_LifeForceDrain.cs b/Source/Genes/Life_Force/Genes/Gene_LifeForceDrain.cs similarity index 100% rename from Source/Genes/Life_Force/Gene_LifeForceDrain.cs rename to Source/Genes/Life_Force/Genes/Gene_LifeForceDrain.cs diff --git a/Source/Genes/Life_Force/IngestionOutcomeDoer_LifeForceOffset.cs b/Source/Genes/Life_Force/IngestionOutcomeDoer_LifeForceOffset.cs index f3e50f1..281b4e3 100644 --- a/Source/Genes/Life_Force/IngestionOutcomeDoer_LifeForceOffset.cs +++ b/Source/Genes/Life_Force/IngestionOutcomeDoer_LifeForceOffset.cs @@ -1,23 +1,22 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using RimWorld; +using RimWorld; using Verse; namespace RJW_Genes { + /// + /// This class checks for pawns with LifeForce and Cumeater Gene to add Fertilin when eating cum (the Item from RJW-Sexperience). + /// public class IngestionOutcomeDoer_LifeForceOffset : IngestionOutcomeDoer - { + { + public const float FERTILIN_PER_UNIT = 1f; + protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested) { if (GeneUtility.HasLifeForce(pawn) && GeneUtility.HasGeneNullCheck(pawn, GeneDefOf.rjw_genes_cum_eater)) { - float num = ingested.stackCount * this.FertilinPerUnit / 100; + float num = ingested.stackCount * FERTILIN_PER_UNIT / 100; GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(pawn), num); } } - public float FertilinPerUnit = 1f; } } diff --git a/Source/Genes/Life_Force/JobGiver_Flirt.cs b/Source/Genes/Life_Force/JobGivers/JobGiver_Flirt.cs similarity index 100% rename from Source/Genes/Life_Force/JobGiver_Flirt.cs rename to Source/Genes/Life_Force/JobGivers/JobGiver_Flirt.cs diff --git a/Source/Genes/Life_Force/JobGiver_GetLifeForce.cs b/Source/Genes/Life_Force/JobGivers/JobGiver_GetLifeForce.cs similarity index 97% rename from Source/Genes/Life_Force/JobGiver_GetLifeForce.cs rename to Source/Genes/Life_Force/JobGivers/JobGiver_GetLifeForce.cs index 3cb781b..b40f221 100644 --- a/Source/Genes/Life_Force/JobGiver_GetLifeForce.cs +++ b/Source/Genes/Life_Force/JobGivers/JobGiver_GetLifeForce.cs @@ -39,7 +39,7 @@ namespace RJW_Genes { return null; } - int num = Mathf.RoundToInt(((gene_lifeforce.targetValue - gene_lifeforce.Value) * 100 + 10) / ingestionOutcomeDoer.FertilinPerUnit); + int num = Mathf.RoundToInt(((gene_lifeforce.targetValue - gene_lifeforce.Value) * 100 + 10) / ingestionOutcomeDoer.FERTILIN_PER_UNIT); if (gatheredCum != null && num > 0) { Job job = JobMaker.MakeJob(RimWorld.JobDefOf.Ingest, gatheredCum); diff --git a/Source/Genes/Life_Force/JobGiver_LifeForce_RandomRape.cs b/Source/Genes/Life_Force/JobGivers/JobGiver_LifeForce_RandomRape.cs similarity index 100% rename from Source/Genes/Life_Force/JobGiver_LifeForce_RandomRape.cs rename to Source/Genes/Life_Force/JobGivers/JobGiver_LifeForce_RandomRape.cs diff --git a/Source/Genes/Life_Force/JobGiver_TryQuickieWith.cs b/Source/Genes/Life_Force/JobGivers/JobGiver_TryQuickieWith.cs similarity index 100% rename from Source/Genes/Life_Force/JobGiver_TryQuickieWith.cs rename to Source/Genes/Life_Force/JobGivers/JobGiver_TryQuickieWith.cs diff --git a/Source/Genes/Life_Force/LifeForceMentalBreakWorker.cs b/Source/Genes/Life_Force/MentalStates/LifeForceMentalBreakWorker.cs similarity index 100% rename from Source/Genes/Life_Force/LifeForceMentalBreakWorker.cs rename to Source/Genes/Life_Force/MentalStates/LifeForceMentalBreakWorker.cs diff --git a/Source/Genes/Life_Force/LifeForceMentalState.cs b/Source/Genes/Life_Force/MentalStates/LifeForceMentalState.cs similarity index 100% rename from Source/Genes/Life_Force/LifeForceMentalState.cs rename to Source/Genes/Life_Force/MentalStates/LifeForceMentalState.cs diff --git a/Source/Genes/Life_Force/LifeForceMentalStateWorker.cs b/Source/Genes/Life_Force/MentalStates/LifeForceMentalStateWorker.cs similarity index 100% rename from Source/Genes/Life_Force/LifeForceMentalStateWorker.cs rename to Source/Genes/Life_Force/MentalStates/LifeForceMentalStateWorker.cs diff --git a/Source/Genes/Life_Force/Patch_LifeForce.cs b/Source/Genes/Life_Force/Patches/Patch_SatisfyPersonal_LifeForceGain.cs similarity index 64% rename from Source/Genes/Life_Force/Patch_LifeForce.cs rename to Source/Genes/Life_Force/Patches/Patch_SatisfyPersonal_LifeForceGain.cs index cc4da8e..e601952 100644 --- a/Source/Genes/Life_Force/Patch_LifeForce.cs +++ b/Source/Genes/Life_Force/Patches/Patch_SatisfyPersonal_LifeForceGain.cs @@ -9,9 +9,12 @@ using RimWorld; using Verse; namespace RJW_Genes { - + /// + /// This Patch hooks after "SatisfyPersonal"(i.E. when the pawn finished fucking) and covers LifeForceGain. + /// If the pawn has LifeForce, all relevant Genes are checked and applied. + /// [HarmonyPatch(typeof(SexUtility), nameof(SexUtility.SatisfyPersonal))] - public static class Patch_LifeForce + public static class Patch_SatisfyPersonal_LifeForceGain { public static void Postfix(SexProps props) { @@ -32,19 +35,19 @@ namespace RJW_Genes float absorb_factor = 0f; if (GeneUtility.HasLifeForce(props.partner)) { - Pawn succubus = props.partner; + Pawn PawnWithLifeForce = props.partner; if (!props.isRevese) { if (props.isReceiver) { // Scenario Dom Succubus, normal - absorb_factor = BaseDom(props, succubus); + absorb_factor = BaseDom(props, PawnWithLifeForce); } else { // Scenario Sub Succubus, normal - absorb_factor = BaseSub(props, succubus); + absorb_factor = BaseSub(props, PawnWithLifeForce); } } else @@ -52,28 +55,29 @@ namespace RJW_Genes if (props.isReceiver) { // Scenario Dom Succubus, Reverse - absorb_factor = BaseSub(props, succubus); + absorb_factor = BaseSub(props, PawnWithLifeForce); } else { // Scenario Sub Succubus, Reverse - absorb_factor = BaseDom(props, succubus); + absorb_factor = BaseDom(props, PawnWithLifeForce); } } - //If we remove this check fertelin is always lost, but the succubus doesn't always gain any + // If we remove this check fertilin is always lost, but the succubus doesn't always gain any if (absorb_factor != 0f) { TransferFertilin(props, absorb_factor); } - if (GeneUtility.HasGeneNullCheck(succubus, GeneDefOf.rjw_genes_drainer) && !props.pawn.health.hediffSet.HasHediff(HediffDefOf.rjw_genes_succubus_drained)) + if (GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_drainer) && !props.pawn.health.hediffSet.HasHediff(HediffDefOf.rjw_genes_succubus_drained)) { props.pawn.health.AddHediff(HediffDefOf.rjw_genes_succubus_drained); - GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(succubus), 0.25f); + GeneUtility.OffsetLifeForce(GeneUtility.GetLifeForceGene(PawnWithLifeForce), 0.25f); } } } + public static void TransferFertilin(SexProps props, float absorb_percentage = 1f) { Pawn_GeneTracker genes = props.partner.genes; @@ -120,39 +124,51 @@ namespace RJW_Genes return total_fluid; } - public static float BaseDom(SexProps props, Pawn succubus) + /// + /// Handles the Case that the Life-Force wielder initiated the Sex (They are "Dom"). + /// + /// The summary of the sex act, used for checking conditions. + /// The pawn that might gain LifeForce through this method. + /// + public static float BaseDom(SexProps props, Pawn PawnWithLifeForce) { float absorb_factor = 0f; - if (props.sexType == xxx.rjwSextype.Sixtynine && GeneUtility.HasGeneNullCheck(succubus, GeneDefOf.rjw_genes_cum_eater)) + if (props.sexType == xxx.rjwSextype.Sixtynine && GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_cum_eater)) { absorb_factor += 1f; } return absorb_factor; } - public static float BaseSub(SexProps props, Pawn succubus) + /// + /// Handles the Case that the Life-Force wielder got initiated into sex (They are "Sub"). + /// + /// The summary of the sex act, used for checking conditions. + /// The pawn that might gain LifeForce through this method. + /// + public static float BaseSub(SexProps props, Pawn PawnWithLifeForce) { float absorb_factor = 0f; if ((props.sexType == xxx.rjwSextype.Oral || props.sexType == xxx.rjwSextype.Fellatio || props.sexType == xxx.rjwSextype.Sixtynine) - && GeneUtility.HasGeneNullCheck(succubus, GeneDefOf.rjw_genes_cum_eater)) + && GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_cum_eater)) { absorb_factor += 1f; } - else if (props.sexType == xxx.rjwSextype.Vaginal && GeneUtility.HasGeneNullCheck(succubus, GeneDefOf.rjw_genes_vaginal_absorber)) + else if (props.sexType == xxx.rjwSextype.Vaginal && GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_vaginal_absorber)) { absorb_factor += 1f; } - else if (props.sexType == xxx.rjwSextype.Anal && GeneUtility.HasGeneNullCheck(succubus, GeneDefOf.rjw_genes_anal_absorber)) + else if (props.sexType == xxx.rjwSextype.Anal && GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_anal_absorber)) { absorb_factor += 1f; } else if (props.sexType == xxx.rjwSextype.DoublePenetration) { - if (GeneUtility.HasGeneNullCheck(succubus, GeneDefOf.rjw_genes_vaginal_absorber)) + if (GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_vaginal_absorber)) { absorb_factor += 0.5f; } - if (GeneUtility.HasGeneNullCheck(succubus, GeneDefOf.rjw_genes_anal_absorber)) + if (GeneUtility.HasGeneNullCheck(PawnWithLifeForce, GeneDefOf.rjw_genes_anal_absorber)) { absorb_factor += 0.5f; } diff --git a/Source/Genes/Life_Force/Patch_SexTicks_ChangePsyfocus.cs b/Source/Genes/Life_Force/Patches/Patch_SexTicks_ChangePsyfocus.cs similarity index 100% rename from Source/Genes/Life_Force/Patch_SexTicks_ChangePsyfocus.cs rename to Source/Genes/Life_Force/Patches/Patch_SexTicks_ChangePsyfocus.cs diff --git a/Source/Genes/Life_Force/Patch_Vanilla_Inheritance_Fertilin.cs b/Source/Genes/Life_Force/Patches/Patch_Vanilla_Inheritance_Fertilin.cs similarity index 100% rename from Source/Genes/Life_Force/Patch_Vanilla_Inheritance_Fertilin.cs rename to Source/Genes/Life_Force/Patches/Patch_Vanilla_Inheritance_Fertilin.cs diff --git a/Source/Genes/Life_Force/ThinkNode_ConditionalCannotInteract.cs b/Source/Genes/Life_Force/ThinkNodes/ThinkNode_ConditionalCannotInteract.cs similarity index 100% rename from Source/Genes/Life_Force/ThinkNode_ConditionalCannotInteract.cs rename to Source/Genes/Life_Force/ThinkNodes/ThinkNode_ConditionalCannotInteract.cs diff --git a/Source/Genes/Life_Force/ThinkNode_ConditionalCritcalLifeForce.cs b/Source/Genes/Life_Force/ThinkNodes/ThinkNode_ConditionalCritcalLifeForce.cs similarity index 100% rename from Source/Genes/Life_Force/ThinkNode_ConditionalCritcalLifeForce.cs rename to Source/Genes/Life_Force/ThinkNodes/ThinkNode_ConditionalCritcalLifeForce.cs diff --git a/Source/Genes/Life_Force/ThinkNode_ConditionalLowLifeForce.cs b/Source/Genes/Life_Force/ThinkNodes/ThinkNode_ConditionalLowLifeForce.cs similarity index 100% rename from Source/Genes/Life_Force/ThinkNode_ConditionalLowLifeForce.cs rename to Source/Genes/Life_Force/ThinkNodes/ThinkNode_ConditionalLowLifeForce.cs diff --git a/Source/Genes/Life_Force/ThinkNode_NewFlirtTarget.cs b/Source/Genes/Life_Force/ThinkNodes/ThinkNode_NewFlirtTarget.cs similarity index 100% rename from Source/Genes/Life_Force/ThinkNode_NewFlirtTarget.cs rename to Source/Genes/Life_Force/ThinkNodes/ThinkNode_NewFlirtTarget.cs diff --git a/Source/Genes/Life_Force/Alert_LowFertilin.cs b/Source/Genes/Life_Force/UI/Alert_LowFertilin.cs similarity index 100% rename from Source/Genes/Life_Force/Alert_LowFertilin.cs rename to Source/Genes/Life_Force/UI/Alert_LowFertilin.cs diff --git a/Source/Genes/Life_Force/GeneGizmo_ResourceLifeForce.cs b/Source/Genes/Life_Force/UI/GeneGizmo_ResourceLifeForce.cs similarity index 100% rename from Source/Genes/Life_Force/GeneGizmo_ResourceLifeForce.cs rename to Source/Genes/Life_Force/UI/GeneGizmo_ResourceLifeForce.cs diff --git a/Source/Interactions/CompAbility_SexInteractionRequirements.cs b/Source/Interactions/SuccubusTailjob/CompAbility_SexInteractionRequirements.cs similarity index 100% rename from Source/Interactions/CompAbility_SexInteractionRequirements.cs rename to Source/Interactions/SuccubusTailjob/CompAbility_SexInteractionRequirements.cs diff --git a/Source/Interactions/CompProperties_SexInteractionRequirements.cs b/Source/Interactions/SuccubusTailjob/CompProperties_SexInteractionRequirements.cs similarity index 100% rename from Source/Interactions/CompProperties_SexInteractionRequirements.cs rename to Source/Interactions/SuccubusTailjob/CompProperties_SexInteractionRequirements.cs diff --git a/Source/Interactions/CustomSexInteraction_Helper.cs b/Source/Interactions/SuccubusTailjob/CustomSexInteraction_Helper.cs similarity index 100% rename from Source/Interactions/CustomSexInteraction_Helper.cs rename to Source/Interactions/SuccubusTailjob/CustomSexInteraction_Helper.cs diff --git a/Source/Interactions/DomSuccubusTailCustomRequirementHandler.cs b/Source/Interactions/SuccubusTailjob/DomSuccubusTailCustomRequirementHandler.cs similarity index 100% rename from Source/Interactions/DomSuccubusTailCustomRequirementHandler.cs rename to Source/Interactions/SuccubusTailjob/DomSuccubusTailCustomRequirementHandler.cs diff --git a/Source/Interactions/GenesPartKindUsageRule.cs b/Source/Interactions/SuccubusTailjob/GenesPartKindUsageRule.cs similarity index 100% rename from Source/Interactions/GenesPartKindUsageRule.cs rename to Source/Interactions/SuccubusTailjob/GenesPartKindUsageRule.cs diff --git a/Source/Interactions/SubSuccubusTailCustomRequirementHandler.cs b/Source/Interactions/SuccubusTailjob/SubSuccubusTailCustomRequirementHandler.cs similarity index 100% rename from Source/Interactions/SubSuccubusTailCustomRequirementHandler.cs rename to Source/Interactions/SuccubusTailjob/SubSuccubusTailCustomRequirementHandler.cs diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj index f4ab208..6a44288 100644 --- a/Source/Rjw-Genes.csproj +++ b/Source/Rjw-Genes.csproj @@ -65,14 +65,14 @@ - - - - - - - - + + + + + + + + @@ -121,57 +121,57 @@ - + - + - + - + - - + + - - - - - - - + + + + + + + - + - + - + - - - - - + + + + + - + - - - - + + + +