Skip to content

Fix #27: Discover pawnkinds via defaultFactionDef #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
feldoh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix #27: Discover pawnkinds via defaultFactionDef #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified 1.6/Assemblies/FactionLoadout.dll
View file
Open in desktop
Binary file not shown.
15 changes: 15 additions & 0 deletions 1.6/Source/DefCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public static class DefCache
public static List<PawnKindDef> AllAnimalKindDefs;
public static List<RulePackDef> AllRulePackDefs;
public static List<GeneDef> AllGeneDefs;
public static Dictionary<FactionDef, List<PawnKindDef>> DefaultFactionKinds;

public static List<string> AllBackstoryCategories;
public static List<BackstoryDef> AllChildhoodBackstories;
Expand Down Expand Up @@ -55,12 +56,26 @@ public static void ScanDefs()
HashSet<BodyTypeDef> allBodyTypeDefs = new(32);
HashSet<GeneDef> allGeneDefs = new(1024);

Dictionary<FactionDef, List<PawnKindDef>> defaultFactionKinds = new(64);

foreach (PawnKindDef def in DefDatabase<PawnKindDef>.AllDefsListForReading)
{
if (def.RaceProps is { Animal: true, packAnimal: true })
allAnimalKindDefs.Add(def);

if (def.defaultFactionDef != null)
{
if (!defaultFactionKinds.TryGetValue(def.defaultFactionDef, out List<PawnKindDef> factionKinds))
{
factionKinds = new List<PawnKindDef>();
defaultFactionKinds[def.defaultFactionDef] = factionKinds;
}
factionKinds.Add(def);
}
}

DefaultFactionKinds = defaultFactionKinds;

foreach (ThingDef def in DefDatabase<ThingDef>.AllDefsListForReading)
{
if (def.race is { Animal: false })
Expand Down
5 changes: 5 additions & 0 deletions 1.6/Source/FactionEdit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,11 @@ public static IReadOnlyList<PawnKindDef> GetAllPawnKinds(FactionDef def)
if (def.fixedLeaderKinds != null)
kinds.AddRange(def.fixedLeaderKinds);

if (DefCache.DefaultFactionKinds != null && DefCache.DefaultFactionKinds.TryGetValue(def, out List<PawnKindDef> defaultKinds))
{
kinds.AddRange(defaultKinds);
}

return kinds.ToArray();
}

Expand Down
6 changes: 6 additions & 0 deletions 1.6/Source/Util/Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ void RegisterSimple(List<PawnKindDef> list)
if (def.basicMemberKind != null)
tempKinds.Add(def.basicMemberKind);

if (DefCache.DefaultFactionKinds != null && DefCache.DefaultFactionKinds.TryGetValue(def, out List<PawnKindDef> defaultKinds))
{
foreach (PawnKindDef kind in defaultKinds)
tempKinds.Add(kind);
}

return tempKinds;
}

Expand Down