mirror of
				https://gitgud.io/lutepickle/rjw_menstruation.git
				synced 2024-08-14 22:46:52 +00:00 
			
		
		
		
	Re-enable Animal Genetics support
This commit is contained in:
		
							parent
							
								
									889e8f90f2
								
							
						
					
					
						commit
						7eee57709d
					
				
					 6 changed files with 11 additions and 7 deletions
				
			
		
										
											Binary file not shown.
										
									
								
							| 
						 | 
					@ -1,5 +1,4 @@
 | 
				
			||||||
#if false
 | 
					using AnimalGenetics;
 | 
				
			||||||
using AnimalGenetics;
 | 
					 | 
				
			||||||
using RimWorld;
 | 
					using RimWorld;
 | 
				
			||||||
using System.Collections.Generic;
 | 
					using System.Collections.Generic;
 | 
				
			||||||
using Verse;
 | 
					using Verse;
 | 
				
			||||||
| 
						 | 
					@ -39,4 +38,3 @@ namespace RJW_Menstruation
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -454,8 +454,8 @@ namespace RJW_Menstruation
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                        if (baby.IsHAR())
 | 
					                        if (baby.IsHAR())
 | 
				
			||||||
                            HARCompatibility.CopyHARProperties(baby, firstbaby);
 | 
					                            HARCompatibility.CopyHARProperties(baby, firstbaby);
 | 
				
			||||||
                        //if (Configurations.AnimalGeneticsActivated)
 | 
					                        if (Configurations.AnimalGeneticsActivated)
 | 
				
			||||||
                            //AnimalGeneticsCompatibility.CopyGenes(baby, firstbaby);
 | 
					                            AnimalGeneticsCompatibility.CopyGenes(baby, firstbaby);
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                babies.Add(baby);
 | 
					                babies.Add(baby);
 | 
				
			||||||
| 
						 | 
					@ -467,9 +467,9 @@ namespace RJW_Menstruation
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public Pawn GenerateBaby(PawnGenerationRequest request, Pawn mother, Pawn father, List<Trait> parentTraits, int traitSeed)
 | 
					        public Pawn GenerateBaby(PawnGenerationRequest request, Pawn mother, Pawn father, List<Trait> parentTraits, int traitSeed)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            //if (Configurations.AnimalGeneticsActivated) AnimalGeneticsCompatibility.PreConception(mother, father);
 | 
					            if (Configurations.AnimalGeneticsActivated) AnimalGeneticsCompatibility.PreConception(mother, father);
 | 
				
			||||||
            Pawn baby = PawnGenerator.GeneratePawn(request);
 | 
					            Pawn baby = PawnGenerator.GeneratePawn(request);
 | 
				
			||||||
            //if (Configurations.AnimalGeneticsActivated) AnimalGeneticsCompatibility.PostConception();
 | 
					            if (Configurations.AnimalGeneticsActivated) AnimalGeneticsCompatibility.PostConception();
 | 
				
			||||||
            if (baby == null)
 | 
					            if (baby == null)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                Log.Error("Baby not generated. Request: " + request.ToString());
 | 
					                Log.Error("Baby not generated. Request: " + request.ToString());
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -98,6 +98,10 @@
 | 
				
			||||||
      <HintPath>..\..\..\..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\AlienRace.dll</HintPath>
 | 
					      <HintPath>..\..\..\..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\AlienRace.dll</HintPath>
 | 
				
			||||||
      <Private>False</Private>
 | 
					      <Private>False</Private>
 | 
				
			||||||
    </Reference>
 | 
					    </Reference>
 | 
				
			||||||
 | 
					    <Reference Include="AnimalGenetics">
 | 
				
			||||||
 | 
					      <HintPath>..\..\..\..\..\..\..\..\workshop\content\294100\2830943477\1.4\Assemblies\AnimalGenetics.dll</HintPath>
 | 
				
			||||||
 | 
					      <Private>False</Private>
 | 
				
			||||||
 | 
					    </Reference>
 | 
				
			||||||
    <Reference Include="Assembly-CSharp">
 | 
					    <Reference Include="Assembly-CSharp">
 | 
				
			||||||
      <HintPath>..\..\..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
 | 
					      <HintPath>..\..\..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
 | 
				
			||||||
      <Private>False</Private>
 | 
					      <Private>False</Private>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -11,6 +11,7 @@
 | 
				
			||||||
		<li>rim.job.world</li>
 | 
							<li>rim.job.world</li>
 | 
				
			||||||
		<li>Abraxas.RJW.RaceSupport</li>
 | 
							<li>Abraxas.RJW.RaceSupport</li>
 | 
				
			||||||
		<li>rjw.milk.humanoid</li>
 | 
							<li>rjw.milk.humanoid</li>
 | 
				
			||||||
 | 
							<li>Mlie.AnimalGenetics</li>
 | 
				
			||||||
	</loadAfter>
 | 
						</loadAfter>
 | 
				
			||||||
	<suggests>
 | 
						<suggests>
 | 
				
			||||||
	</suggests>
 | 
						</suggests>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,5 @@
 | 
				
			||||||
Version 1.0.8.3
 | 
					Version 1.0.8.3
 | 
				
			||||||
 | 
					 - Re-added support for Animal Genetics (Continued).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Version 1.0.8.2
 | 
					Version 1.0.8.2
 | 
				
			||||||
 - Compatibility update for RJW 5.3.0.7
 | 
					 - Compatibility update for RJW 5.3.0.7
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue