AblativeAbsolute/rjw_menstruation
1
0
Fork 0
mirror of https://gitgud.io/lutepickle/rjw_menstruation.git synced 2024-08-14 22:46:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor BabyPawnKindDecider and improve the decision process

Browse source
This commit is contained in:
lutepickle 2024-05-04 18:26:20 -07:00
parent bfcb469969
commit 4949cac289
2 changed files with 19 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
1.5/Assemblies/RJW_Menstruation.dll
View file

Binary file not shown.

54
1.5/source/RJW_Menstruation/RJW_Menstruation/PregnancyCommon.cs
View file

@ -97,53 +97,39 @@ namespace RJW_Menstruation
bool IsAndroidmother = AndroidsCompatibility.IsAndroid(mother); bool IsAndroidmother = AndroidsCompatibility.IsAndroid(mother);
bool IsAndroidfather = AndroidsCompatibility.IsAndroid(father); bool IsAndroidfather = AndroidsCompatibility.IsAndroid(father);
if (IsAndroidmother && !IsAndroidfather) if (IsAndroidmother != IsAndroidfather)
{ spawn_kind_def = IsAndroidmother ? fatherKindDef : motherKindDef;
spawn_kind_def = fatherKindDef;
}
else if (!IsAndroidmother && IsAndroidfather)
{
spawn_kind_def = motherKindDef;
}
string MotherRaceName = ""; string MotherRaceName = motherKindDef?.race?.defName;
string FatherRaceName = ""; string FatherRaceName = fatherKindDef?.race?.defName;
MotherRaceName = motherKindDef?.race?.defName;
PawnKindDef non_hybrid_kind_def = spawn_kind_def;
if (father != null)
FatherRaceName = fatherKindDef?.race?.defName;
if (MotherRaceName != FatherRaceName && !FatherRaceName.NullOrEmpty())
if (FatherRaceName != "" && Configurations.UseHybridExtention)
{ {
spawn_kind_def = GetHybrid(father, mother); PawnKindDef hybridPawnKind = Configurations.UseHybridExtention ? GetHybrid(father, mother) : null;
//Log.Message("pawnkind: " + spawn_kind_def?.defName); if (hybridPawnKind != null)
} {
spawn_kind_def = hybridPawnKind;
if (MotherRaceName != FatherRaceName && FatherRaceName != "") }
{ else
if (!Configurations.UseHybridExtention || spawn_kind_def == null)
{ {
spawn_kind_def = non_hybrid_kind_def;
IEnumerable<RaceGroupDef> groups = DefDatabase<RaceGroupDef>.AllDefs.Where(x => !(x.hybridRaceParents.NullOrEmpty() || x.hybridChildKindDef.NullOrEmpty())); IEnumerable<RaceGroupDef> groups = DefDatabase<RaceGroupDef>.AllDefs.Where(x => !(x.hybridRaceParents.NullOrEmpty() || x.hybridChildKindDef.NullOrEmpty()));
//ModLog.Message(" found custom RaceGroupDefs " + groups.Count()); //ModLog.Message(" found custom RaceGroupDefs " + groups.Count());
foreach (RaceGroupDef t in groups) foreach (RaceGroupDef def in groups)
{ {
if ((t.hybridRaceParents.Contains(MotherRaceName) && t.hybridRaceParents.Contains(FatherRaceName)) if ((def.hybridRaceParents.Contains(MotherRaceName) && def.hybridRaceParents.Contains(FatherRaceName))
|| (t.hybridRaceParents.Contains("Any") && (t.hybridRaceParents.Contains(MotherRaceName) || t.hybridRaceParents.Contains(FatherRaceName)))) || (def.hybridRaceParents.Contains("Any") && (def.hybridRaceParents.Contains(MotherRaceName) || def.hybridRaceParents.Contains(FatherRaceName))))
{ {
//ModLog.Message(" has hybridRaceParents"); //ModLog.Message(" has hybridRaceParents");
if (t.hybridChildKindDef.Contains("MotherKindDef")) if (def.hybridChildKindDef.Contains("MotherKindDef"))
spawn_kind_def = motherKindDef; spawn_kind_def = motherKindDef;
else if (t.hybridChildKindDef.Contains("FatherKindDef") && father != null) else if (def.hybridChildKindDef.Contains("FatherKindDef") && father != null)
spawn_kind_def = fatherKindDef; spawn_kind_def = fatherKindDef;
else else
{ {
//ModLog.Message(" trying hybridChildKindDef " + t.defName); //ModLog.Message(" trying hybridChildKindDef " + t.defName);
List<PawnKindDef> child_kind_def_list = new List<PawnKindDef>(); List<PawnKindDef> child_kind_def_list = new List<PawnKindDef>();
child_kind_def_list.AddRange(DefDatabase<PawnKindDef>.AllDefs.Where(x => t.hybridChildKindDef.Contains(x.defName))); child_kind_def_list.AddRange(DefDatabase<PawnKindDef>.AllDefs.Where(x => def.hybridChildKindDef.Contains(x.defName)));
//ModLog.Message(" found custom hybridChildKindDefs " + t.hybridChildKindDef.Count); //ModLog.Message(" found custom hybridChildKindDefs " + t.hybridChildKindDef.Count);
if (!child_kind_def_list.NullOrEmpty()) if (!child_kind_def_list.NullOrEmpty())
@ -152,12 +138,10 @@ namespace RJW_Menstruation
} }
} }
} }
}
} if (spawn_kind_def == null)
else if (!Configurations.UseHybridExtention || spawn_kind_def == null)
{
spawn_kind_def = mother.RaceProps?.AnyPawnKind ?? motherKindDef; spawn_kind_def = mother.RaceProps?.AnyPawnKind ?? motherKindDef;
}
if (spawn_kind_def.defName.Contains("Nymph")) if (spawn_kind_def.defName.Contains("Nymph"))
{ {