cleanup

RimJobWorld.Main.csproj

@@ -95,7 +95,6 @@
     <Compile Include="Source\Hediffs\PartSizeExtension.cs" />
     <Compile Include="Source\Interactions\InteractionExtension.cs" />
     <Compile Include="Source\JobDrivers\JobDriver_Mating.cs" />
-    <Compile Include="Source\JobDrivers\JobDriver_SexBaseRecieverQuickie.cs" />
     <Compile Include="Source\JobDrivers\JobDriver_SexQuick.cs" />
     <Compile Include="Source\JobDrivers\JobDriver_SexBaseInitiator.cs" />
     <Compile Include="Source\JobDrivers\JobDriver_SexBaseReciever.cs" />

Source/Interactions/InteractionExtension.cs

@@ -9,8 +9,8 @@ namespace rjw
 	{
 		/// <summary>
 		/// </summary>
-		public string RMBLabelM;
-		public string RMBLabelF;
+		public string RMBLabelM = "";
+		public string RMBLabelF = "";
 
 		public List<string> tags;
 		public List<string> i_tags;

Source/Modules/Pregnancy/Hediffs/Hediff_BasePregnancy.cs

@@ -483,6 +483,7 @@ namespace rjw
 					}
 				}
 			}
+
 			//androids can only birth non androids
 			if (AndroidsCompatibility.IsAndroid(mother) && !AndroidsCompatibility.IsAndroid(father))
 			{
@@ -497,7 +498,8 @@ namespace rjw
 				Log.Warning("Both parents are andoids, what have you done monster!");
 				//this should never happen but w/e
 			}
-			//slimes birth only other slimes
+
+			//pregnancies with slimes birth only slimes
 			if (xxx.is_slime(mother))
 			{
 				parent = mother;
@@ -507,6 +509,11 @@ namespace rjw
 				{
 					parent = father;
 				}
+
+			//change baby nymph to generic colonist
+			if (parent.kindDef.defName == "Nymph")
+				parent.kindDef = PawnKindDefOf.Colonist;
+
 			//Log.Message("[" + SaveStorage.ModId + "] The main parent is " + parent);
 			//Log.Message("Mother: " + xxx.get_pawnname(mother) + " kind: " + mother.kindDef);
 			//Log.Message("Father: " + xxx.get_pawnname(father) + " kind: " + father.kindDef);
@@ -520,9 +527,6 @@ namespace rjw
 				last_name = NameTriple.FromString(mother.Name.ToStringFull).Last;
 			//Log.Message("[" + SaveStorage.ModId + "] Bady surname will be " + last_name);
 
-			if (parent.kindDef.defName == "Nymph")
-				parent.kindDef = PawnKindDefOf.Colonist;
-
 			//Pawn generation request
 			PawnKindDef spawn_kind_def = parent.kindDef;
 			Faction spawn_faction = mother.IsPrisoner ? null : mother.Faction;
@@ -542,7 +546,7 @@ namespace rjw
 				);
 
 			//Log.Message("[" + SaveStorage.ModId + "] Generated request, making babies");
-			//Litter size. Let's use the main parent litter size, increased by fertility.
+			//Litter size. Let's use the main parent litter size, reduced by fertility.
 			float litter_size = (parent.RaceProps.litterSizeCurve == null) ? 1 : Rand.ByCurve(parent.RaceProps.litterSizeCurve);
 			//Log.Message("[" + SaveStorage.ModId + "] base Litter size " + litter_size);
 			litter_size *= Math.Min(mother.health.capacities.GetLevel(xxx.reproduction), 1);

Source/Settings/RJWSettings.cs

@@ -102,6 +102,12 @@ namespace rjw
 			Rect outRect = new Rect(0f, 30f, inRect.width, inRect.height - 30f);
 			//-16 for slider, height_modifier - additional height for options
 			Rect viewRect = new Rect(0f, 0f, inRect.width - 16f, height_modifier + 120f);
+			//-16 for slider, height_modifier - additional height for options
+			//Rect viewRect = new Rect(0f, 0f, inRect.width - 16f, inRect.height + height_modifier);
+			//Log.Message("1 - " + inRect.width);
+			//Log.Message("2 - " + outRect.width);
+			//Log.Message("3 - " + viewRect.width);
+			//GUI.Button(new Rect(10, 10, 200, 20), "Meet the flashing button");
 
 			Listing_Standard listingStandard = new Listing_Standard();
 			listingStandard.maxOneColumn = true;