Merge branch 'dev' into main

This commit is contained in:
vegapnk 2023-01-15 16:43:21 +01:00 committed by GitHub
commit f3cc5e7ee2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 763 additions and 232 deletions

View file

@ -1,38 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using rjw;
using Verse;
using RimWorld;
namespace RJW_BGS
{
[StaticConstructorOnStartup]
internal static class First
{
static First()
{
//RJWcopy.Racegroupdictbuilder();
//Prints all found race dicts (debugging only)
//logAllFoundRaceGroupGenes
}
private static void logAllFoundRaceGroupGenes()
{
foreach (RaceGroupDef def in DefDatabase<RaceGroupDef>.AllDefs)
{
Log.Message("defName = " + def.defName);
if (def.raceNames != null)
{
foreach (string race in def.raceNames)
{
Log.Message(race);
}
}
}
}
}
}

View file

@ -5,6 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using Verse;
using RimWorld;
using rjw;
namespace RJW_BGS
{
@ -120,5 +121,22 @@ namespace RJW_BGS
}
}
/// <summary>
/// Used only for debugging, to see what you loaded and how it looks.
/// </summary>
private static void logAllFoundRaceGroupGenes()
{
foreach (RaceGroupDef def in DefDatabase<RaceGroupDef>.AllDefs)
{
Log.Message("defName = " + def.defName);
if (def.raceNames != null)
{
foreach (string race in def.raceNames)
{
Log.Message(race);
}
}
}
}
}
}

View file

@ -29,20 +29,21 @@ namespace RJW_BGS
baby.genes = new Pawn_GeneTracker(baby);
}
//Remove the hair and skin genes pawns always start with, should get correct ones from human parent anyway.
for (int i = baby.genes.Endogenes.Count - 1; i >= 0; i--)
{
baby.genes.RemoveGene(baby.genes.Endogenes[i]);
}
List<GeneDef> genes = PregnancyUtility.GetInheritedGenes(dad, mother);
List<GeneDef> humangenes = PregnancyUtility.GetInheritedGenes(dad, mother);
List<GeneDef> beastgenes = InheritanceUtility.AnimalInheritedGenes(dad, mother);
InheritanceUtility.AddGenes(baby, beastgenes);
InheritanceUtility.AddGenes(baby, genes);
//foreach (GeneDef gene in genes)
//{
// baby.genes.AddGene(gene, false);
//}
InheritanceUtility.AddGenes(baby, humangenes);
// The mix-breed babies should be labelled hybrids
baby.genes.hybrid = true;
baby.genes.xenotypeName = "Hybrid";
}
}
}

View file

@ -1,11 +1,8 @@
using System;
using rjw;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using rjw;
using Verse;
using RimWorld;
namespace RJW_BGS
{
@ -44,6 +41,7 @@ namespace RJW_BGS
}).ToList<RaceGeneDef>();
if (pawnKindDefs.Count() > 0)
return pawnKindDefs;
List<RaceGeneDef> raceKindDefs = allDefs.Where(delegate (RaceGeneDef group)
{
List<string> raceNames = group.raceNames;
@ -51,6 +49,7 @@ namespace RJW_BGS
}).ToList<RaceGeneDef>();
if (raceKindDefs.Count() > 0)
return raceKindDefs;
List<RaceGeneDef> raceGroupDefs = new List<RaceGeneDef>();
if (raceGroupDef != null)
{
@ -62,8 +61,10 @@ namespace RJW_BGS
|| (list_raceGroupDefName != null && list_raceGroupDefName.Contains(raceGroupDef.defName));
}).ToList<RaceGeneDef>();
}
if (raceGroupDefs.Count() > 0)
return raceGroupDefs;
return new List<RaceGeneDef>();
}
}