diff --git a/RJW_More_Genes/Common/Assemblies/RJW_More_Genes.dll b/RJW_More_Genes/Common/Assemblies/RJW_More_Genes.dll index e1587b2..06552b3 100644 Binary files a/RJW_More_Genes/Common/Assemblies/RJW_More_Genes.dll and b/RJW_More_Genes/Common/Assemblies/RJW_More_Genes.dll differ diff --git a/RJW_More_Genes/Common/Defs/AbilityDefs/Abilities.xml b/RJW_More_Genes/Common/Defs/AbilityDefs/Abilities.xml index 098dbdb..ffefe06 100644 --- a/RJW_More_Genes/Common/Defs/AbilityDefs/Abilities.xml +++ b/RJW_More_Genes/Common/Defs/AbilityDefs/Abilities.xml @@ -8,6 +8,7 @@ false true false + 60000 Mote_CoagulateStencil Coagulate Coagulate_Cast @@ -27,15 +28,15 @@ -
  • +
  • 0.4~0.8
  • Manipulation
    • -
  • +
  • -
  • Consensual
    • +
  • Rape
    • diff --git a/RJW_More_Genes/Common/Defs/GeneDefs/GeneDefs_RJW.xml b/RJW_More_Genes/Common/Defs/GeneDefs/GeneDefs_RJW.xml deleted file mode 100644 index dc6aa7f..0000000 --- a/RJW_More_Genes/Common/Defs/GeneDefs/GeneDefs_RJW.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - rjw_genes_mechbreeder - - Pawns with this gene are able to birth mechanoids unharmed. - World/WorldObjects/Expanding/Mechanoids - 51 - Reproduction - - - - rjw_genes_insectincubator - - Pawns with this gene are able to hold more insect eggs. - World/WorldObjects/Expanding/Mechanoids - 52 - Reproduction - - - - rjw_genes_insectbreeder - - Pawns with this gene are able to fertilize eggs with any fertile penis. - World/WorldObjects/Expanding/Mechanoids - 53 - Reproduction - - \ No newline at end of file diff --git a/RJW_More_Genes/Common/Defs/JobDefs/Jobs_SexAbility.xml b/RJW_More_Genes/Common/Defs/JobDefs/Jobs_SexAbility.xml index f4237fa..6614897 100644 --- a/RJW_More_Genes/Common/Defs/JobDefs/Jobs_SexAbility.xml +++ b/RJW_More_Genes/Common/Defs/JobDefs/Jobs_SexAbility.xml @@ -3,7 +3,7 @@ HealPussy - shabe_genesaddons.JobDriver_CastAbilityAfterSex + RJW_More_Genes.JobDriver_CastAbilityAfterSex Healing someone with sex. false diff --git a/RJW_More_Genes/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/f89c998f-728f-4e82-9434-7a7cedeb321a.vsidx b/RJW_More_Genes/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/f89c998f-728f-4e82-9434-7a7cedeb321a.vsidx new file mode 100644 index 0000000..1553254 Binary files /dev/null and b/RJW_More_Genes/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/f89c998f-728f-4e82-9434-7a7cedeb321a.vsidx differ diff --git a/RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/read.lock b/RJW_More_Genes/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/read.lock similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/read.lock rename to RJW_More_Genes/Source/RJW_More_Genes/.vs/RJW_More_Genes/FileContentIndex/read.lock diff --git a/RJW_More_Genes/Source/RJW_More_Genes/.vs/RJW_More_Genes/v17/.suo b/RJW_More_Genes/Source/RJW_More_Genes/.vs/RJW_More_Genes/v17/.suo new file mode 100644 index 0000000..f12c6cb Binary files /dev/null and b/RJW_More_Genes/Source/RJW_More_Genes/.vs/RJW_More_Genes/v17/.suo differ diff --git a/RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/1b32cc0b-75bf-4b8e-b4d3-c2ce07a95f02.vsidx b/RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/1b32cc0b-75bf-4b8e-b4d3-c2ce07a95f02.vsidx similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/1b32cc0b-75bf-4b8e-b4d3-c2ce07a95f02.vsidx rename to RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/1b32cc0b-75bf-4b8e-b4d3-c2ce07a95f02.vsidx diff --git a/RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/66efd428-daf0-42d1-8c23-97ec74e2ee2a.vsidx b/RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/66efd428-daf0-42d1-8c23-97ec74e2ee2a.vsidx similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/66efd428-daf0-42d1-8c23-97ec74e2ee2a.vsidx rename to RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/66efd428-daf0-42d1-8c23-97ec74e2ee2a.vsidx diff --git a/RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/8d5baf21-343e-4f22-a2f1-93e155c2917e.vsidx b/RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/8d5baf21-343e-4f22-a2f1-93e155c2917e.vsidx similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/8d5baf21-343e-4f22-a2f1-93e155c2917e.vsidx rename to RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/8d5baf21-343e-4f22-a2f1-93e155c2917e.vsidx diff --git a/RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/a2e63c8c-c786-4ae2-aef9-dfd55aa13fa7.vsidx b/RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/a2e63c8c-c786-4ae2-aef9-dfd55aa13fa7.vsidx similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/a2e63c8c-c786-4ae2-aef9-dfd55aa13fa7.vsidx rename to RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/a2e63c8c-c786-4ae2-aef9-dfd55aa13fa7.vsidx diff --git a/RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/read.lock b/RJW_More_Genes/Source/RJW_More_Genes/.vs/shabe_genesaddons/FileContentIndex/read.lock new file mode 100644 index 0000000..e69de29 diff --git a/RJW_More_Genes/Source/shabe_genesaddons/CompAbilityEffect_PussyHeal.cs b/RJW_More_Genes/Source/RJW_More_Genes/CompAbilityEffect_PussyHeal.cs similarity index 98% rename from RJW_More_Genes/Source/shabe_genesaddons/CompAbilityEffect_PussyHeal.cs rename to RJW_More_Genes/Source/RJW_More_Genes/CompAbilityEffect_PussyHeal.cs index a0e47e0..48c1d11 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/CompAbilityEffect_PussyHeal.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/CompAbilityEffect_PussyHeal.cs @@ -9,7 +9,7 @@ using RimWorld; using rjw; using rjw.Modules.Interactions.Helpers; -namespace shabe_genesaddons +namespace RJW_More_Genes { public class CompAbilityEffect_PussyHeal : CompAbilityEffect { diff --git a/RJW_More_Genes/Source/shabe_genesaddons/CompAbility_SexInteractionRequirements.cs b/RJW_More_Genes/Source/RJW_More_Genes/CompAbility_SexInteractionRequirements.cs similarity index 93% rename from RJW_More_Genes/Source/shabe_genesaddons/CompAbility_SexInteractionRequirements.cs rename to RJW_More_Genes/Source/RJW_More_Genes/CompAbility_SexInteractionRequirements.cs index 12b578c..b15e31f 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/CompAbility_SexInteractionRequirements.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/CompAbility_SexInteractionRequirements.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using Verse; using RimWorld; -namespace shabe_genesaddons +namespace RJW_More_Genes { public class CompAbility_SexInteractionRequirements : AbilityComp { diff --git a/RJW_More_Genes/Source/shabe_genesaddons/CompProperties_AbilityPussyHeal.cs b/RJW_More_Genes/Source/RJW_More_Genes/CompProperties_AbilityPussyHeal.cs similarity index 93% rename from RJW_More_Genes/Source/shabe_genesaddons/CompProperties_AbilityPussyHeal.cs rename to RJW_More_Genes/Source/RJW_More_Genes/CompProperties_AbilityPussyHeal.cs index 292273e..6c4be07 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/CompProperties_AbilityPussyHeal.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/CompProperties_AbilityPussyHeal.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Verse; using RimWorld; -namespace shabe_genesaddons +namespace RJW_More_Genes { public class CompProperties_AbilityPussyHeal : CompProperties_AbilityEffect { diff --git a/RJW_More_Genes/Source/shabe_genesaddons/CompProperties_SexInteractionRequirements.cs b/RJW_More_Genes/Source/RJW_More_Genes/CompProperties_SexInteractionRequirements.cs similarity index 96% rename from RJW_More_Genes/Source/shabe_genesaddons/CompProperties_SexInteractionRequirements.cs rename to RJW_More_Genes/Source/RJW_More_Genes/CompProperties_SexInteractionRequirements.cs index 0760d5c..b268ec7 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/CompProperties_SexInteractionRequirements.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/CompProperties_SexInteractionRequirements.cs @@ -8,7 +8,8 @@ using RimWorld; using rjw; using rjw.Modules.Interactions.Defs.DefFragment; using rjw.Modules.Interactions.Enums; -namespace shabe_genesaddons + +namespace RJW_More_Genes { public class CompProperties_SexInteractionRequirements : AbilityCompProperties { diff --git a/RJW_More_Genes/Source/shabe_genesaddons/GeneDefOf.cs b/RJW_More_Genes/Source/RJW_More_Genes/GeneDefOf.cs similarity index 55% rename from RJW_More_Genes/Source/shabe_genesaddons/GeneDefOf.cs rename to RJW_More_Genes/Source/RJW_More_Genes/GeneDefOf.cs index 05255d6..585d640 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/GeneDefOf.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/GeneDefOf.cs @@ -6,14 +6,11 @@ using System.Threading.Tasks; using Verse; using RimWorld; -namespace shabe_genesaddons +namespace RJW_More_Genes { [DefOf] public static class GeneDefOf { - public static readonly GeneDef rjw_genes_mechbreeder; - public static readonly GeneDef rjw_genes_insectincubator; - public static readonly GeneDef rjw_genes_insectbreeder; public static readonly GeneDef rjw_genes_pussyhealer; } } diff --git a/RJW_More_Genes/Source/RJW_More_Genes/GeneUtility.cs b/RJW_More_Genes/Source/RJW_More_Genes/GeneUtility.cs new file mode 100644 index 0000000..d81ee50 --- /dev/null +++ b/RJW_More_Genes/Source/RJW_More_Genes/GeneUtility.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Verse; + +namespace RJW_More_Genes +{ + public class GeneUtility + { + public static bool isPussyHealer(Pawn pawn) + { + if (pawn.genes == null) + { + return false; + } + return pawn.genes.HasGene(GeneDefOf.rjw_genes_pussyhealer); + } + } +} diff --git a/RJW_More_Genes/Source/shabe_genesaddons/HarmonyInit.cs b/RJW_More_Genes/Source/RJW_More_Genes/HarmonyInit.cs similarity index 77% rename from RJW_More_Genes/Source/shabe_genesaddons/HarmonyInit.cs rename to RJW_More_Genes/Source/RJW_More_Genes/HarmonyInit.cs index bea2181..b2a753f 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/HarmonyInit.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/HarmonyInit.cs @@ -7,14 +7,14 @@ using Verse; using HarmonyLib; -namespace shabe_genesaddons +namespace RJW_More_Genes { [StaticConstructorOnStartup] internal static class HarmonyInit { static HarmonyInit() { - Harmony harmony = new Harmony("shabe_genesaddons"); + Harmony harmony = new Harmony("RJW_More_Genes"); harmony.PatchAll(); } } diff --git a/RJW_More_Genes/Source/shabe_genesaddons/JobDriver_CastAbilityAfterSex.cs b/RJW_More_Genes/Source/RJW_More_Genes/JobDriver_CastAbilityAfterSex.cs similarity index 99% rename from RJW_More_Genes/Source/shabe_genesaddons/JobDriver_CastAbilityAfterSex.cs rename to RJW_More_Genes/Source/RJW_More_Genes/JobDriver_CastAbilityAfterSex.cs index 2382ef5..587a73a 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/JobDriver_CastAbilityAfterSex.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/JobDriver_CastAbilityAfterSex.cs @@ -8,7 +8,7 @@ using Verse; using Verse.AI; using rjw; -namespace shabe_genesaddons +namespace RJW_More_Genes { public class JobDriver_CastAbilityAfterSex : JobDriver_SexBaseInitiator { diff --git a/RJW_More_Genes/Source/shabe_genesaddons/Properties/AssemblyInfo.cs b/RJW_More_Genes/Source/RJW_More_Genes/Properties/AssemblyInfo.cs similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/Properties/AssemblyInfo.cs rename to RJW_More_Genes/Source/RJW_More_Genes/Properties/AssemblyInfo.cs diff --git a/RJW_More_Genes/Source/shabe_genesaddons/RJW_More_Genes.csproj b/RJW_More_Genes/Source/RJW_More_Genes/RJW_More_Genes.csproj similarity index 95% rename from RJW_More_Genes/Source/shabe_genesaddons/RJW_More_Genes.csproj rename to RJW_More_Genes/Source/RJW_More_Genes/RJW_More_Genes.csproj index 6f6a149..6f563d5 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/RJW_More_Genes.csproj +++ b/RJW_More_Genes/Source/RJW_More_Genes/RJW_More_Genes.csproj @@ -64,9 +64,6 @@ - - - diff --git a/RJW_More_Genes/Source/shabe_genesaddons/RJW_More_Genes.sln b/RJW_More_Genes/Source/RJW_More_Genes/RJW_More_Genes.sln similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/RJW_More_Genes.sln rename to RJW_More_Genes/Source/RJW_More_Genes/RJW_More_Genes.sln diff --git a/RJW_More_Genes/Source/shabe_genesaddons/SexInteractionUtility.cs b/RJW_More_Genes/Source/RJW_More_Genes/SexInteractionUtility.cs similarity index 99% rename from RJW_More_Genes/Source/shabe_genesaddons/SexInteractionUtility.cs rename to RJW_More_Genes/Source/RJW_More_Genes/SexInteractionUtility.cs index 2654470..e112ec0 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/SexInteractionUtility.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/SexInteractionUtility.cs @@ -13,7 +13,7 @@ using rjw.Modules.Interactions.Implementation; using rjw.Modules.Interactions.Defs.DefFragment; //using rjw.Modules.Interactions.Enums; -namespace shabe_genesaddons +namespace RJW_More_Genes { class SexInteractionUtility { diff --git a/RJW_More_Genes/Source/shabe_genesaddons/ThoughtDefOf.cs b/RJW_More_Genes/Source/RJW_More_Genes/ThoughtDefOf.cs similarity index 90% rename from RJW_More_Genes/Source/shabe_genesaddons/ThoughtDefOf.cs rename to RJW_More_Genes/Source/RJW_More_Genes/ThoughtDefOf.cs index f3d584b..973d912 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/ThoughtDefOf.cs +++ b/RJW_More_Genes/Source/RJW_More_Genes/ThoughtDefOf.cs @@ -5,7 +5,8 @@ using System.Text; using System.Threading.Tasks; using Verse; using RimWorld; -namespace shabe_genesaddons + +namespace RJW_More_Genes { [DefOf] public static class ThoughtDefOf diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs rename to RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache similarity index 84% rename from RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache rename to RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 05556ca..1b4f562 100644 Binary files a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.csproj.AssemblyReference.cache b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.AssemblyReference.cache similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.csproj.AssemblyReference.cache rename to RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.AssemblyReference.cache diff --git a/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..cad0206 --- /dev/null +++ b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +4d7ff98164d1cf091715f5b60c92ca5ce544b757 diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt similarity index 51% rename from RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt rename to RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt index 049d531..f1c2575 100644 --- a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt +++ b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.csproj.FileListAbsolute.txt @@ -2,3 +2,7 @@ C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_Genes_Addons\RJW-Genes-Addons\Comm C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_Genes_Addons\RJW-Genes-Addons\Source\shabe_genesaddons\obj\Debug\RJW_More_Genes.csproj.AssemblyReference.cache C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_Genes_Addons\RJW-Genes-Addons\Source\shabe_genesaddons\obj\Debug\RJW_More_Genes.csproj.CoreCompileInputs.cache C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_Genes_Addons\RJW-Genes-Addons\Source\shabe_genesaddons\obj\Debug\RJW_More_Genes.dll +C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\Common\Assemblies\RJW_More_Genes.dll +C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.csproj.AssemblyReference.cache +C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.csproj.CoreCompileInputs.cache +C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.dll diff --git a/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.dll b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.dll new file mode 100644 index 0000000..06552b3 Binary files /dev/null and b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/RJW_More_Genes.dll differ diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.csproj.AssemblyReference.cache b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.AssemblyReference.cache similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.csproj.AssemblyReference.cache rename to RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.AssemblyReference.cache diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.csproj.CoreCompileInputs.cache b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.CoreCompileInputs.cache similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.csproj.CoreCompileInputs.cache rename to RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.CoreCompileInputs.cache diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.csproj.FileListAbsolute.txt b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.FileListAbsolute.txt similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.csproj.FileListAbsolute.txt rename to RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.csproj.FileListAbsolute.txt diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.dll b/RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.dll similarity index 100% rename from RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.dll rename to RJW_More_Genes/Source/RJW_More_Genes/obj/Debug/shabe_genesaddons.dll diff --git a/RJW_More_Genes/Source/shabe_genesaddons/.vs/RJW_More_Genes/v17/.suo b/RJW_More_Genes/Source/shabe_genesaddons/.vs/RJW_More_Genes/v17/.suo deleted file mode 100644 index 5231458..0000000 Binary files a/RJW_More_Genes/Source/shabe_genesaddons/.vs/RJW_More_Genes/v17/.suo and /dev/null differ diff --git a/RJW_More_Genes/Source/shabe_genesaddons/GeneUtility.cs b/RJW_More_Genes/Source/shabe_genesaddons/GeneUtility.cs deleted file mode 100644 index 022d7f4..0000000 --- a/RJW_More_Genes/Source/shabe_genesaddons/GeneUtility.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Verse; - -namespace shabe_genesaddons -{ - public class GeneUtility - { - public static bool IsMechbreeder(Pawn pawn) - { - if (pawn.genes == null) - { - return false; - } - return pawn.genes.HasGene(GeneDefOf.rjw_genes_mechbreeder); - } - - public static bool IsInsectIncubator(Pawn pawn) - { - if (pawn.genes == null) - { - return false; - } - return pawn.genes.HasGene(GeneDefOf.rjw_genes_insectincubator); - } - - public static bool isInsectBreeder(Pawn pawn) - { - if (pawn.genes == null) - { - return false; - } - return pawn.genes.HasGene(GeneDefOf.rjw_genes_insectbreeder); - } - - public static bool isPussyHealer(Pawn pawn) - { - if (pawn.genes == null) - { - return false; - } - return pawn.genes.HasGene(GeneDefOf.rjw_genes_pussyhealer); - } - - public static float MaxEggSizeMul(Pawn pawn) - { - float MaxEggSize = 1; - if (IsInsectIncubator(pawn)) - { - MaxEggSize *= 2; - } - return MaxEggSize; - } - } -} diff --git a/RJW_More_Genes/Source/shabe_genesaddons/PatchMechBirth.cs b/RJW_More_Genes/Source/shabe_genesaddons/PatchMechBirth.cs deleted file mode 100644 index 30dafd8..0000000 --- a/RJW_More_Genes/Source/shabe_genesaddons/PatchMechBirth.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Reflection; -using System.Reflection.Emit; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using HarmonyLib; -using rjw; -namespace shabe_genesaddons -{ - [HarmonyPatch(typeof(Hediff_MechanoidPregnancy), "GiveBirth")] - public static class PatchMechBirth - { - [HarmonyTranspiler] - public static IEnumerable Transpiler(IEnumerable instructions, ILGenerator il) - { - bool found_call = false; - bool found_skip = false; - Label skip_label = il.DefineLabel(); - MethodInfo ismechbreeder = AccessTools.Method(typeof(GeneUtility), "IsMechbreeder"); - foreach(CodeInstruction codeInstruction in instructions) - { - //Check if the first opcode after endfinally ldloc_0 is and in that case add the label to skip the code - if (found_skip && codeInstruction.opcode == OpCodes.Ldloc_0) - { - codeInstruction.labels.Add(skip_label); - } - found_skip = false; - if (codeInstruction.opcode == OpCodes.Endfinally) - { - found_skip = true; - } - - yield return codeInstruction; - - if (codeInstruction.opcode == OpCodes.Call) - { - //Log.Message(codeInstruction.operand.ToString()); - if (codeInstruction.operand.ToString() == "Boolean TryMakeFilth(Verse.IntVec3, Verse.Map, Verse.ThingDef, System.String, Int32, RimWorld.FilthSourceFlags)") - { - found_call = true; - } - } - //Triggers after the pop opcode (after generating filth in c#). - else if (found_call) - { - //Load pawn, call function to check if a mechbreeder, and skip past the part which does damage - yield return new CodeInstruction(OpCodes.Ldloc_0, null); - yield return new CodeInstruction(OpCodes.Call, ismechbreeder); - yield return new CodeInstruction(OpCodes.Brtrue_S, skip_label); - found_call = false; - } - } - yield break; - } - } -} diff --git a/RJW_More_Genes/Source/shabe_genesaddons/PatchPawnExtensions.cs b/RJW_More_Genes/Source/shabe_genesaddons/PatchPawnExtensions.cs deleted file mode 100644 index da43f55..0000000 --- a/RJW_More_Genes/Source/shabe_genesaddons/PatchPawnExtensions.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using HarmonyLib; -using rjw; -using Verse; -using RimWorld; -namespace shabe_genesaddons -{ - [HarmonyPatch(typeof(PawnExtensions), "RaceImplantEggs")] - public static class PatchPawnExtensions - { - [HarmonyPostfix] - public static void Postfix(Pawn pawn, ref bool __result) - { - if (!__result) - { - __result = GeneUtility.isInsectBreeder(pawn); - } - } - } -} diff --git a/RJW_More_Genes/Source/shabe_genesaddons/PatchPregnancyHelper.cs b/RJW_More_Genes/Source/shabe_genesaddons/PatchPregnancyHelper.cs deleted file mode 100644 index 3ed2001..0000000 --- a/RJW_More_Genes/Source/shabe_genesaddons/PatchPregnancyHelper.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Reflection.Emit; -using System.Reflection; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using HarmonyLib; -using Verse; -using RimWorld; -using rjw; - -namespace shabe_genesaddons -{ - [HarmonyPatch(typeof(PregnancyHelper), "DoEgg")] - static class PatchPregnancyHelper - { - [HarmonyTranspiler] - public static IEnumerable Transpiler(IEnumerable instructions, ILGenerator il) - { - //MethodInfo isinsectincubator = AccessTools.Method(typeof(GeneUtility), "IsInsectIncubator"); - MethodInfo maxeggsizemul = AccessTools.Method(typeof(GeneUtility), "MaxEggSizeMul"); - FieldInfo partner = AccessTools.Field(typeof(SexProps), "partner"); - - Label skiplabel = il.DefineLabel(); - bool finished = false; - foreach (CodeInstruction codeInstruction in instructions) - { - if (!finished) - { - if (codeInstruction.opcode == OpCodes.Ldc_R4 && codeInstruction.operand.ToString() == "0") - { - yield return new CodeInstruction(OpCodes.Ldarg_0, null); - yield return new CodeInstruction(OpCodes.Ldfld, partner); - //yield return new CodeInstruction(OpCodes.Call, isinsectincubator); - yield return new CodeInstruction(OpCodes.Callvirt, maxeggsizemul); - //yield return new CodeInstruction(OpCodes.Brfalse_S, skiplabel); - yield return new CodeInstruction(OpCodes.Ldloc_0, null); - //yield return new CodeInstruction(OpCodes.Ldc_R4, 2f); - yield return new CodeInstruction(OpCodes.Mul, null); - yield return new CodeInstruction(OpCodes.Stloc_0, null); - //codeInstruction.labels.Add(skiplabel); - finished = true; - } - } - yield return codeInstruction; - } - } - } -} diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache b/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache deleted file mode 100644 index 1838639..0000000 --- a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -6ecf46e37be50c69fa3cb87cd34ade9851fe6e74 diff --git a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.dll b/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.dll deleted file mode 100644 index e1587b2..0000000 Binary files a/RJW_More_Genes/Source/shabe_genesaddons/obj/Debug/RJW_More_Genes.dll and /dev/null differ