AblativeAbsolute/RJW_Animal_Gene_Inheritance
1
0
Fork 0
mirror of https://github.com/Shabakur/RJW_Animal_Gene_Inheritance.git synced 2024-08-14 22:46:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed error in animal inheritance

Browse source
This commit is contained in:
Shabakur 2022-12-01 06:52:13 +01:00
parent 3cc62ba818
commit b8a5e64baf
13 changed files with 61 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Assemblies/RJW_BGS.dll
View file

Binary file not shown.

15
Defs/RaceGeneDefs/RaceGeneDefs.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>
<RJW_BGS.RaceGeneDef>
<RJW_BGS.RaceGeneDef Name = "Canine">
<defName>Canine</defName>
<raceGroup>Canine_Group</raceGroup>
<genes>
@ -11,6 +11,19 @@
</genechances>
</RJW_BGS.RaceGeneDef>
<RJW_BGS.RaceGeneDef ParentName = "Canine">
<defName>Warg</defName>
<raceNames>
<li>Warg</li>
</raceNames>
<genes>
<li>DarkVision</li>
</genes>
<genechances>
<li>0.9</li>
</genechances>
</RJW_BGS.RaceGeneDef>
<RJW_BGS.RaceGeneDef>
<defName>Insect</defName>
<raceGroup>Insect_Group</raceGroup>

BIN
Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/11af8697-03f0-496e-9b1f-69cf88ff3392.vsidx Normal file
View file

Binary file not shown.

0
Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/b4651e63-d1f2-4e86-b492-ad7feb733d02.vsidx → Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/423eb7c2-4b31-454f-84c3-7021ad6b44aa.vsidx
View file

BIN
Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/675d72eb-b423-43fc-aa52-c64bd84ba82a.vsidx Normal file
View file

Binary file not shown.

BIN
Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/6df2cac7-ead0-46d6-a3ec-96409da0265f.vsidx
View file

Binary file not shown.

BIN
Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/d79ca6e2-29c0-42a6-b23a-36d6799644bd.vsidx Normal file
View file

Binary file not shown.

BIN
Source/RJW_BGS/.vs/RJW_BGS/v17/.suo
View file

Binary file not shown.

60
Source/RJW_BGS/Class1.cs → Source/RJW_BGS/First.cs
View file

@ -1,30 +1,30 @@
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 Class1
{
static Class1()
{
RJWcopy.Racegroupdictbuilder();
//foreach (RaceGroupDef raceGroupDef2 in DefDatabase<RaceGroupDef>.AllDefs)
//{
//Log.Message("defName = " + raceGroupDef2.defName);
// if (raceGroupDef2.raceNames != null)
// {
// foreach (string race in raceGroupDef2.raceNames)
// {
//Log.Message(race);
// }
// }
//}
}
}
}
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();
//foreach (RaceGroupDef raceGroupDef2 in DefDatabase<RaceGroupDef>.AllDefs)
//{
//Log.Message("defName = " + raceGroupDef2.defName);
// if (raceGroupDef2.raceNames != null)
// {
// foreach (string race in raceGroupDef2.raceNames)
// {
//Log.Message(race);
// }
// }
//}
}
}
}

2
Source/RJW_BGS/RJW_BGS.csproj
View file

@ -57,7 +57,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Class1.cs" />
<Compile Include="First.cs" />
<Compile Include="Harmony_Init.cs" />
<Compile Include="InheritanceUtility.cs" />
<Compile Include="PatchRJWBestialityPregnancyUtility.cs" />

21
Source/RJW_BGS/RJWcopies.cs
View file

@ -34,6 +34,7 @@ namespace RJW_BGS
return raceGroupDef != null;
}
//slightly modified code so it also works racegroupdefs
public static RaceGroupDef GetRaceGroupDefInternal(PawnKindDef kindDef)
{
string raceName = kindDef.race.defName;
@ -71,9 +72,14 @@ namespace RJW_BGS
public static RaceGeneDef GetRaceGenDefInternal(PawnKindDef kindDef)
{
if (kindDef == null)
{
return null;
}
string raceName = kindDef.race.defName;
string pawnKindName = kindDef.defName;
string raceGroupName = GetRaceGroupDef(kindDef).defName;
RaceGroupDef raceGroupDef = GetRaceGroupDef(kindDef);
//string raceGroupName = GetRaceGroupDef(kindDef).defName;
IEnumerable<RaceGeneDef> allDefs = DefDatabase<RaceGeneDef>.AllDefs;
List<RaceGeneDef> list = allDefs.Where(delegate (RaceGeneDef group)
{
@ -85,12 +91,15 @@ namespace RJW_BGS
List<string> raceNames = group.raceNames;
return raceNames != null && raceNames.Contains(raceName);
}).ToList<RaceGeneDef>();
List<RaceGeneDef> list3 = allDefs.Where(delegate (RaceGeneDef group)
List<RaceGeneDef> list3 = new List<RaceGeneDef>();
if (raceGroupDef != null)
{
String raceGroupDefName = group.raceGroup;
return raceGroupDefName != null && raceGroupDefName == raceGroupName;
}).ToList<RaceGeneDef>();
list3 = allDefs.Where(delegate (RaceGeneDef group)
{
String raceGroupDefName = group.raceGroup;
return raceGroupDefName != null && raceGroupDefName == raceGroupDef.defName;
}).ToList<RaceGeneDef>();
}
RaceGeneDef result = null;
//First check if there is a matching pawnkinddef then race, then racegroup
if (list.Any())

2
Source/RJW_BGS/obj/Debug/RJW_BGS.csproj.CoreCompileInputs.cache
View file

@ -1 +1 @@
bbcef32adb57331bca8d9d64ae20e770e4ed1e71
0b0a8825bf7e783f74047adfd92c6a9898735e8c

BIN
Source/RJW_BGS/obj/Debug/RJW_BGS.dll
View file

Binary file not shown.