diff --git a/1.4/Defs/GeneDefs/GeneDefs_Menstruation.xml b/1.4/Defs/GeneDefs/GeneDefs_Menstruation.xml index c62719a..0b788e7 100644 --- a/1.4/Defs/GeneDefs/GeneDefs_Menstruation.xml +++ b/1.4/Defs/GeneDefs/GeneDefs_Menstruation.xml @@ -9,7 +9,8 @@ Menstruation - + UI/Genes/Placeholder +
  • Menstruation_EggLifetime
  • @@ -18,7 +19,7 @@ Menstruation_ShortEggLifetime Unfertilized eggs with this gene last three-quarters as long. - UI/Genes/Placeholder + UI/Genes/ShortEggLifetime 1 10 @@ -32,7 +33,7 @@ Menstruation_DoubleEggLifetime Unfertilized eggs with this gene last twice as long. - UI/Genes/Placeholder + UI/Genes/DoubleEggLifetime -1 12 @@ -46,7 +47,7 @@ Menstruation_QuadEggLifetime Eggs with this gene last four times as long. - UI/Genes/Placeholder + UI/Genes/QuadEggLifetime -2 1 16 @@ -59,7 +60,8 @@ Menstruation - + UI/Genes/Placeholder +
  • Menstruation_Estrus
  • @@ -68,7 +70,7 @@ Menstruation_NeverEstrus Carriers of this gene will never go into estrus. - UI/Genes/Placeholder + UI/Genes/NeverEstrus 1 20 @@ -82,7 +84,7 @@ Menstruation_FullEstrus Carriers of this gene will enter full estrus every menstrual cycle, regardless of vagina type. - UI/Genes/Placeholder + UI/Genes/FullEstrus -1 1 25 @@ -95,7 +97,8 @@ Menstruation - + UI/Genes/Placeholder +
  • Menstruation_Ovulation
  • @@ -104,7 +107,7 @@ Menstruation_DoubleOvulation Carriers of this gene will ovulate twice as many eggs. - UI/Genes/Placeholder + UI/Genes/DoubleOvulation -1 30 @@ -118,7 +121,7 @@ Menstruation_QuadOvulation Carriers of this gene will ovulate four times as many eggs. - UI/Genes/Placeholder + UI/Genes/QuadOvulation -1 35 @@ -133,7 +136,7 @@ Menstruation Carriers of this gene will not bleed at the end of their cycle. - UI/Genes/Placeholder + UI/Genes/NoBleeding -1 40 diff --git a/1.4/Textures/UI/Genes/DoubleEggLifetime.png b/1.4/Textures/UI/Genes/DoubleEggLifetime.png new file mode 100644 index 0000000..a9c5935 Binary files /dev/null and b/1.4/Textures/UI/Genes/DoubleEggLifetime.png differ diff --git a/1.4/Textures/UI/Genes/DoubleOvulation.png b/1.4/Textures/UI/Genes/DoubleOvulation.png new file mode 100644 index 0000000..744e08a Binary files /dev/null and b/1.4/Textures/UI/Genes/DoubleOvulation.png differ diff --git a/1.4/Textures/UI/Genes/Files.zip b/1.4/Textures/UI/Genes/Files.zip new file mode 100644 index 0000000..b569056 Binary files /dev/null and b/1.4/Textures/UI/Genes/Files.zip differ diff --git a/1.4/Textures/UI/Genes/FullEstrus.png b/1.4/Textures/UI/Genes/FullEstrus.png new file mode 100644 index 0000000..dec368b Binary files /dev/null and b/1.4/Textures/UI/Genes/FullEstrus.png differ diff --git a/1.4/Textures/UI/Genes/NeverEstrus.png b/1.4/Textures/UI/Genes/NeverEstrus.png new file mode 100644 index 0000000..c0c552d Binary files /dev/null and b/1.4/Textures/UI/Genes/NeverEstrus.png differ diff --git a/1.4/Textures/UI/Genes/NoBleeding.png b/1.4/Textures/UI/Genes/NoBleeding.png new file mode 100644 index 0000000..4f10886 Binary files /dev/null and b/1.4/Textures/UI/Genes/NoBleeding.png differ diff --git a/1.4/Textures/UI/Genes/QuadEggLifetime.png b/1.4/Textures/UI/Genes/QuadEggLifetime.png new file mode 100644 index 0000000..ba8f144 Binary files /dev/null and b/1.4/Textures/UI/Genes/QuadEggLifetime.png differ diff --git a/1.4/Textures/UI/Genes/QuadOvulation.png b/1.4/Textures/UI/Genes/QuadOvulation.png new file mode 100644 index 0000000..9f76bbb Binary files /dev/null and b/1.4/Textures/UI/Genes/QuadOvulation.png differ diff --git a/1.4/Textures/UI/Genes/ShortEggLifetime.png b/1.4/Textures/UI/Genes/ShortEggLifetime.png new file mode 100644 index 0000000..fe3ce7a Binary files /dev/null and b/1.4/Textures/UI/Genes/ShortEggLifetime.png differ diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Compatibility/HARCompatibility.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Compatibility/HARCompatibility.cs index 7eb1e66..1100c71 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Compatibility/HARCompatibility.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Compatibility/HARCompatibility.cs @@ -1,5 +1,4 @@ using AlienRace; -using System; using System.Collections.Generic; using UnityEngine; using Verse; diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Cum.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Cum.cs index eefdfc7..60394b0 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Cum.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Cum.cs @@ -1,7 +1,6 @@ using RimWorld; using System; using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; using System.Text; using UnityEngine; using Verse; diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs index 33e4e11..5017740 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs @@ -1,5 +1,4 @@ using RimWorld; -using rjw; using System.Collections.Generic; using Verse; diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs index d9f5903..cfb9a16 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs @@ -1,5 +1,4 @@ using RimWorld; -using System.Linq; using Verse; namespace RJW_Menstruation diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs index 79c13a9..0a919c4 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs @@ -1,5 +1,4 @@ using HarmonyLib; -using Mono.Cecil.Cil; using RimWorld; using rjw; using System; diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs index 2092d1f..394c376 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs @@ -1,14 +1,10 @@ using RimWorld; -using RimWorld.Planet; using rjw; using System; using System.Collections.Generic; -using System.Diagnostics.Eventing.Reader; using System.Linq; -using System.Text; using UnityEngine; using Verse; -using Verse.AI; namespace RJW_Menstruation { diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_Estrus.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_Estrus.cs index 6c7f462..26fa191 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_Estrus.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_Estrus.cs @@ -1,5 +1,4 @@ -using RimWorld; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Verse; diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs index 61ce541..b7877d2 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs @@ -1,10 +1,7 @@ using RimWorld; using rjw; -using System; using System.Collections.Generic; using System.Linq; -using System.Reflection; -using System.Text; using Verse; namespace RJW_Menstruation diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Biotech_Patch.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Biotech_Patch.cs index 0f8f2b6..0125f26 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Biotech_Patch.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Biotech_Patch.cs @@ -1,11 +1,11 @@ using HarmonyLib; -using System.Linq; using RimWorld; -using Verse; -using System.Collections.Generic; -using System.Reflection; using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; using System.Reflection.Emit; +using Verse; namespace RJW_Menstruation { diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs index b0ab1a3..92b8b16 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs @@ -2,7 +2,6 @@ using RimWorld; using rjw; using System.Collections.Generic; -using System.Linq; using System.Text; using UnityEngine; using Verse; diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Harmony.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Harmony.cs index 7194d0e..6e86da5 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Harmony.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Harmony.cs @@ -1,5 +1,4 @@ -using AlienRace; -using HarmonyLib; +using HarmonyLib; using rjw; using rjw.Modules.Interactions.Internals.Implementation; using rjw.Modules.Interactions.Rules.PartKindUsageRules; diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Pawn_Patch.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Pawn_Patch.cs index 98e5997..c2f1176 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Pawn_Patch.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Pawn_Patch.cs @@ -1,6 +1,5 @@ using HarmonyLib; using RimWorld; -using rjw; using System; using System.Collections.Generic; using System.Linq; diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs index 0020d86..7da77a7 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs @@ -276,7 +276,10 @@ namespace RJW_Menstruation float res = 0; if (VariousDefOf.Hediff_Heavy_Lactating_Permanent != null) { - if (pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Heavy_Lactating_Permanent)) milkcomp = pawn.AllComps.FirstOrDefault(x => x.GetType().ToString().ToLower().Contains("hypermilkable")); + if (pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Heavy_Lactating_Permanent) + || pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Lactating_Permanent) + || pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Lactating_Natural) + || pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Lactating_Drug)) milkcomp = pawn.AllComps.FirstOrDefault(x => x.GetType().ToString().ToLower().Contains("milkablehuman")); else milkcomp = pawn.AllComps.FirstOrDefault(x => x.GetType().ToString().ToLower().Contains("milkable")); } else diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs index 16903b2..a3fdf4c 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs @@ -158,7 +158,7 @@ namespace RJW_Menstruation public static readonly HediffDef Hediff_Lactating_Natural = DefDatabase.GetNamedSilentFail("Lactating_Natural"); public static readonly HediffDef Hediff_Lactating_Permanent = DefDatabase.GetNamedSilentFail("Lactating_Permanent"); public static readonly HediffDef Hediff_Heavy_Lactating_Permanent = DefDatabase.GetNamedSilentFail("Heavy_Lactating_Permanent"); - public static readonly JobDef Job_LactateSelf_MC = DefDatabase.GetNamedSilentFail("LactateSelf_MC"); + public static readonly JobDef Job_LactateSelf_MC = DefDatabase.GetNamedSilentFail("MilkSelf"); // Defs from Sexperience Ideology public static readonly PreceptDef Pregnancy_Elevated = DefDatabase.GetNamedSilentFail("Pregnancy_Elevated"); diff --git a/changelogs.txt b/changelogs.txt index e21994a..cd8aaa3 100644 --- a/changelogs.txt +++ b/changelogs.txt @@ -1,4 +1,5 @@ Version 1.0.9.4 + - Added graphics for the menstruation genes with thanks to Alpenglow. - Pawns with the egglaying genes from Erin's Corvyia and Outland - Genetics no longer have a menstrual cycle. Version 1.0.9.3