AblativeAbsolute/rjw-genes
1
0
Fork 0
mirror of https://github.com/vegapnk/RJW-Genes.git synced 2024-08-15 00:23:31 +00:00
Code Issues 1 Projects Releases Packages Wiki Activity

Removed properties from GenitaliaTypeExtension

Browse source
This commit is contained in:
a flock of birds 2024-05-27 09:42:09 +01:00
parent 20f1cb67f4
commit 2cf89ba6df
4 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Common/Assemblies/Rjw-Genes.dll
View file

Binary file not shown.

9
Source/Genes/Genitalia/Defs/GenitaliaTypeExtension.cs
View file

@ -8,13 +8,10 @@ namespace RJW_Genes
{ {
public class GenitaliaTypeExtension : DefModExtension public class GenitaliaTypeExtension : DefModExtension
{ {
private HediffDef_PartBase penis; public HediffDef_PartBase penis;
public HediffDef_PartBase Penis => penis ?? (HediffDef_PartBase) Genital_Helper.average_penis;
private HediffDef_PartBase vagina; public HediffDef_PartBase vagina;
public HediffDef_PartBase Vagina => vagina ?? (HediffDef_PartBase) Genital_Helper.average_vagina;
private HediffDef_PartBase anus; public HediffDef_PartBase anus;
public HediffDef_PartBase Anus => anus ?? (HediffDef_PartBase) Genital_Helper.average_anus;
} }
} }

2
Source/Genes/Genitalia/Gene_GenitaliaType.cs
View file

@ -25,7 +25,7 @@ namespace RJW_Genes
ModLog.Error($"Gene {def} failed to change genitals - Need a modExtension with Class=\"{typeof(GenitaliaTypeExtension).FullName}\"."); ModLog.Error($"Gene {def} failed to change genitals - Need a modExtension with Class=\"{typeof(GenitaliaTypeExtension).FullName}\".");
return; return;
} }
GenitaliaChanger.ChangeGenitalia(pawn, genitals.Penis, genitals.Vagina, genitals.Anus); GenitaliaChanger.ChangeGenitalia(pawn, genitals.penis, genitals.vagina, genitals.anus);
} }
} }
} }

15
Source/Genes/Genitalia/GenitaliaUtility.cs
View file

@ -29,28 +29,19 @@ namespace RJW_Genes
public static HediffDef GetPenisForGene(GeneDef gene) public static HediffDef GetPenisForGene(GeneDef gene)
{ {
if (gene == null) return gene?.GetModExtension<GenitaliaTypeExtension>()?.penis ?? Genital_Helper.average_penis;
return Genital_Helper.average_penis;
return gene.GetModExtension<GenitaliaTypeExtension>()?.Penis ?? Genital_Helper.average_penis;
} }
public static HediffDef GetVaginaForGene(GeneDef gene) public static HediffDef GetVaginaForGene(GeneDef gene)
{ {
if (gene == null) return gene?.GetModExtension<GenitaliaTypeExtension>()?.vagina ?? Genital_Helper.average_vagina;
return Genital_Helper.average_vagina;
return gene.GetModExtension<GenitaliaTypeExtension>()?.Vagina ?? Genital_Helper.average_vagina;
} }
public static HediffDef GetAnusForGene(GeneDef gene) public static HediffDef GetAnusForGene(GeneDef gene)
{ {
if (gene == null)
return Genital_Helper.average_anus;
//TODO: Do I want the default to be generic or average for feline,equine and canine? //TODO: Do I want the default to be generic or average for feline,equine and canine?
return gene.GetModExtension<GenitaliaTypeExtension>()?.Anus ?? Genital_Helper.average_anus; return gene?.GetModExtension<GenitaliaTypeExtension>()?.anus ?? Genital_Helper.average_anus;
} }
public static HediffDef GetBreastsForGene(GeneDef gene) public static HediffDef GetBreastsForGene(GeneDef gene)