1.4/Languages/English/Keyed/RJW_Menstruation.xml

@@ -77,8 +77,6 @@
   <Option12_Desc>Enable menopause effect that makes pawn infertile when they run out of eggs.&#10;If you have problems with long lived races, turn off this option.</Option12_Desc>
   <Option_EnablePheromones_Label>Enable pheromones</Option_EnablePheromones_Label>
   <Option_EnablePheromones_Desc>Allow humanlikes in visible estrus to increase the sex drive of nearby humanlike males.</Option_EnablePheromones_Desc>
-  <Option_AnimalPheromoneEffect_Label>Animal pheromone effect</Option_AnimalPheromoneEffect_Label>
-  <Option_AnimalPheromoneEffect_Desc>Set the effect that animals in visible estrus have on humanlikes.</Option_AnimalPheromoneEffect_Desc>
   <Option13_Label>Use multiple pregnancy</Option13_Label>
   <Option13_Desc>Use multiple pregnancy instead RJW's default pregnancy&#10;Disable this option if you are in trouble with impregnation&#10;RJW pregnancy should be turned on.</Option13_Desc>
   <Option14_Label>Enable hetero ovular twins</Option14_Label>

1.4/Patches/PawnModExtensions_Animals.xml

@@ -500,7 +500,7 @@
 		<xpath>Defs/ThingDef[@Name="BigCatThingBase"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Felines/Fetus_Feline_W</fetusTexPath>
+				<fetusTexPath>Fetus/Felines/Fetus_Feline</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.2</cumThickness>
 				<ingestionOutcomeDoers>
@@ -515,7 +515,7 @@
 		<xpath>Defs/ThingDef[defName="Cougar"]</xpath>
 		<value>
 			<li Class="RJW_Menstruation.PawnDNAModExtension">
-				<fetusTexPath>Fetus/Felines/Fetus_Feline_W</fetusTexPath>
+				<fetusTexPath>Fetus/Felines/Fetus_Feline</fetusTexPath>
 				<cumColor>(255,255,255,255)</cumColor>
 				<cumThickness>0.2</cumThickness>
 				<ingestionOutcomeDoers>

1.4/source/RJW_Menstruation/RJW_Menstruation/Configurations.cs

@@ -59,7 +59,6 @@ namespace RJW_Menstruation
         public static bool Debug = false;
         public static bool EnableMenopause = true;
         public static bool EnablePheromones = true;
-        public static float AnimalPheromoneEffect = 0.0f;
         public static DetailLevel InfoDetail => infoDetail;
         public static bool EstrusOverridesHookupSettings = false;
         public static float EstrusFuckabilityToHookup = RJWHookupSettings.MinimumFuckabilityToHookup;
@@ -96,7 +95,6 @@ namespace RJW_Menstruation
             EnableAnimalCycle = false;
             EnableMenopause = true;
             EnablePheromones = true;
-            AnimalPheromoneEffect = 0.0f;
             CycleAcceleration = CycleAccelerationDefault;
             ColonistTickInterval = ColonistTickIntervalDefault;
             NonColonistTickInterval = NonColonistTickIntervalDefault;
@@ -216,7 +214,6 @@ namespace RJW_Menstruation
             Scribe_Values.Look(ref infoDetail, "InfoDetail", DetailLevel.All);
             Scribe_Values.Look(ref EnableMenopause, "EnableMenopause", true);
             Scribe_Values.Look(ref EnablePheromones, "EnablePheromones", true);
-            Scribe_Values.Look(ref AnimalPheromoneEffect, "AnimalPheromoneEffect", 0.0f);
             Scribe_Values.Look(ref EstrusOverridesHookupSettings, "EstrusOverridesHookupSettings", false);
             Scribe_Values.Look(ref EstrusFuckabilityToHookup, "EstrusFuckabilityToHookup", EstrusFuckabilityToHookup, true);
             Scribe_Values.Look(ref EstrusAttractivenessToHookup, "EstrusAttractivenessToHookup", EstrusAttractivenessToHookup, true);
@@ -296,7 +293,6 @@ namespace RJW_Menstruation
             float mainRectHeight = 126f +
                 (Configurations.EnableWombIcon || Configurations.EnableButtonInHT ? 400f : 0f) +
                 (Configurations.EnableAnimalCycle ? 48f : 0f) +
-                (Configurations.EnableAnimalCycle && Configurations.EnablePheromones ? 48f : 0f) +
                 (Configurations.EstrusOverridesHookupSettings ? 144f : 0f) +
                 (Configurations.PregnancySource == Configurations.PregnancyType.MultiplePregnancy ? (Configurations.EnableEnzygoticTwins ? 175f : 75f) : 0f) +
                 (Configurations.PregnancySource == Configurations.PregnancyType.Biotech ? 75f : 0f) +
@@ -400,14 +396,6 @@ namespace RJW_Menstruation
             listmain.CheckboxLabeled(Translations.Option12_Label, ref Configurations.EnableMenopause, Translations.Option12_Desc);
 
             listmain.CheckboxLabeled(Translations.Option_EnablePheromones_Label, ref Configurations.EnablePheromones, Translations.Option_EnablePheromones_Desc);
-            if (Configurations.EnablePheromones && Configurations.EnableAnimalCycle)
-            {
-                Adjust = (int)(Configurations.AnimalPheromoneEffect * 1000);
-                listmain.Label(Translations.Option_AnimalPheromoneEffect_Label + " " + Configurations.AnimalPheromoneEffect * 100 + "%", -1, Translations.Option_AnimalPheromoneEffect_Desc);
-                Adjust = (int)listmain.Slider(Adjust, 0, 1000);
-                Configurations.AnimalPheromoneEffect = (float)Adjust / 1000f;
-            }
-            else Configurations.AnimalPheromoneEffect = 0.0f;
 
             listmain.Label(Translations.Option3_Label + " " + Configurations.ImplantationChance * 100 + "%", -1, Translations.Option3_Desc);
             Configurations.ImplantationChanceAdjust = (int)listmain.Slider(Configurations.ImplantationChanceAdjust, 0, 1000);

1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Pheromones.cs

@@ -31,7 +31,7 @@ namespace RJW_Menstruation
             try
             {
                 if (!Configurations.EnablePheromones) return;
-                if (!Pawn.RaceProps.Humanlike && (!Configurations.EnableAnimalCycle || Configurations.AnimalPheromoneEffect <= 0.0f)) return;                
+                if (!Pawn.RaceProps.Humanlike) return;
                 if (!Pawn.IsHashIntervalTick(emitInterval)) return;
                 if (!Pawn.SpawnedOrAnyParentSpawned) return;
 
@@ -87,7 +87,6 @@ namespace RJW_Menstruation
             Hediff pheromones = target.health.hediffSet.GetFirstHediffOfDef(VariousDefOf.Hediff_AffectedByPheromones);
             float decay = VariousDefOf.Hediff_AffectedByPheromones.CompProps<HediffCompProperties_SeverityPerDay>().severityPerDay;
             float raiseSeverityPerDay = intensity / Props.daysToMaxSeverity - decay; // Desired increase plus enough to overcome pheromone decay
-            if (!Pawn.RaceProps.Humanlike) raiseSeverityPerDay *= Configurations.AnimalPheromoneEffect;
             float amountToApply = emitRatio * raiseSeverityPerDay;
             if (pheromones != null)
                 pheromones.Severity += amountToApply;

1.4/source/RJW_Menstruation/RJW_Menstruation/Translations.cs

@@ -81,8 +81,6 @@ namespace RJW_Menstruation
         public static readonly string Option12_Desc = "Option12_Desc".Translate();
         public static readonly string Option_EnablePheromones_Label = "Option_EnablePheromones_Label".Translate();
         public static readonly string Option_EnablePheromones_Desc = "Option_EnablePheromones_Desc".Translate();
-        public static readonly string Option_AnimalPheromoneEffect_Label = "Option_AnimalPheromoneEffect_Label".Translate();
-        public static readonly string Option_AnimalPheromoneEffect_Desc = "Option_AnimalPheromoneEffect_Desc".Translate();
         public static readonly string Option13_Label = "Option13_Label".Translate();
         public static readonly string Option13_Desc = "Option13_Desc".Translate();
         public static readonly string Option14_Label = "Option14_Label".Translate();