From 765ef964c406f685a0dab859ec6e8fcdcbf1fba2 Mon Sep 17 00:00:00 2001 From: Vegapnk Date: Mon, 24 Apr 2023 08:56:28 +0200 Subject: [PATCH] Moved Insect Incubator and Breeder to Hive Genes --- CHANGELOG.md | 10 ++++---- Common/Defs/GeneDefs/GeneDefs_Breeding.xml | 21 ---------------- Common/Defs/GeneDefs/GeneDefs_Hive.xml | 24 +++++++++++++++++++ .../Patch_InsectBreeder_EggFertilization.cs} | 3 ++- .../Patch_InsectIncubator_PregnancyHelper.cs} | 4 +++- Source/Rjw-Genes.csproj | 2 +- 6 files changed, 36 insertions(+), 28 deletions(-) rename Source/Genes/{Breeding/Patch_EggFertilization.cs => Hive/Patches/Patch_InsectBreeder_EggFertilization.cs} (97%) rename Source/Genes/{Breeding/PatchPregnancyHelper.cs => Hive/Patches/Patch_InsectIncubator_PregnancyHelper.cs} (95%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 495d954..d43ea61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,17 @@ # 1.2 -Changes: +**Changes:** - Cocoon Weaver Gene - Spawn Spelopede Gene (Can re changed to spawn Megascarabs or other insects) +- Queens & Caste Logic (see below) -Internal: +**Internal:** - Renamed Abilities to have _ability_ in their name, to not exactly match the gene-defnames. +- Moved Insect-Incubator & Insect-Breeder to Hive Category and Folders -Fixes: +**Fixes:** - Cockeater Ability has now Icon of Cockeater Gene - Cockeater now leaves a bite wound! @@ -31,7 +33,7 @@ In general, the logic is the following: I am not sure if I want to have a specific mapping defining that Queen can only mate with certain Drones, let me know how you feel about it. *Queens can be male*. I just used the female-term, but implementation is gender-neutral. -ToDo: +**ToDo:** - Icons: Cocoon, Spelopede Spawn - Sound: Spelopede Spawn diff --git a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml index a2d7d7e..7482459 100644 --- a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml +++ b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml @@ -13,27 +13,6 @@ -1 - - rjw_genes_insectincubator - - Pawns with this gene are able to hold more insect eggs. - Genes/Icons/More_Egg_Space - 52 - rjw_genes_breeding - 1 - -1 - - - - rjw_genes_insectbreeder - - Pawns with this gene are able to fertilize eggs with any fertile penis. - World/WorldObjects/Expanding/Insects - 53 - rjw_genes_breeding - 1 - -1 - rjw_genes_zoophile diff --git a/Common/Defs/GeneDefs/GeneDefs_Hive.xml b/Common/Defs/GeneDefs/GeneDefs_Hive.xml index 897851f..e908798 100644 --- a/Common/Defs/GeneDefs/GeneDefs_Hive.xml +++ b/Common/Defs/GeneDefs/GeneDefs_Hive.xml @@ -165,4 +165,28 @@ 1 -1 + + + + rjw_genes_insectincubator + + Pawns with this gene are able to host more insect eggs, hatch them faster and fertilize any inserted egg. + Genes/Icons/More_Egg_Space + 52 + rjw_genes_hive + 1 + -1 + + + + rjw_genes_insectbreeder + + Pawns with this gene are able to fertilize eggs with any fertile penis. + World/WorldObjects/Expanding/Insects + 53 + rjw_genes_hive + 1 + -1 + + \ No newline at end of file diff --git a/Source/Genes/Breeding/Patch_EggFertilization.cs b/Source/Genes/Hive/Patches/Patch_InsectBreeder_EggFertilization.cs similarity index 97% rename from Source/Genes/Breeding/Patch_EggFertilization.cs rename to Source/Genes/Hive/Patches/Patch_InsectBreeder_EggFertilization.cs index d2f2dcf..6184b4a 100644 --- a/Source/Genes/Breeding/Patch_EggFertilization.cs +++ b/Source/Genes/Hive/Patches/Patch_InsectBreeder_EggFertilization.cs @@ -12,9 +12,10 @@ namespace RJW_Genes /// Patched Class is https://gitgud.io/Ed86/rjw/-/blob/master/1.4/Source/Common/Helpers/SexUtility.cs /// /// Normal Egg-Pregnancy logic is in https://gitgud.io/Ed86/rjw/-/blob/master/1.4/Source/Modules/Pregnancy/Pregnancy_Helper.cs + /// Gene: rjw_genes_insectbreeder /// [HarmonyPatch(typeof(SexUtility), "Aftersex")] - static class Patch_EggFertilization + static class Patch_InsectBreeder_EggFertilization { public static void Postfix(SexProps props) { diff --git a/Source/Genes/Breeding/PatchPregnancyHelper.cs b/Source/Genes/Hive/Patches/Patch_InsectIncubator_PregnancyHelper.cs similarity index 95% rename from Source/Genes/Breeding/PatchPregnancyHelper.cs rename to Source/Genes/Hive/Patches/Patch_InsectIncubator_PregnancyHelper.cs index 81a0ad4..fc3e530 100644 --- a/Source/Genes/Breeding/PatchPregnancyHelper.cs +++ b/Source/Genes/Hive/Patches/Patch_InsectIncubator_PregnancyHelper.cs @@ -15,9 +15,11 @@ namespace RJW_Genes /// /// This Class patches the RJW-DoEgg to allow up to MaxEggSizeMul times the original amount of eggs. /// This harmony patch was kindly provided by 'shabalox' https://github.com/Shabalox/RJW_Genes_Addons/ + /// + /// For Gene: rjw_genes_insectincubator /// [HarmonyPatch(typeof(PregnancyHelper), "DoEgg")] - static class PatchPregnancyHelper + static class Patch_InsectIncubator_PregnancyHelper { [HarmonyTranspiler] public static IEnumerable Transpiler(IEnumerable instructions, ILGenerator il) diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj index 68a3e34..f584d19 100644 --- a/Source/Rjw-Genes.csproj +++ b/Source/Rjw-Genes.csproj @@ -43,7 +43,7 @@ - +