mirror of
				https://gitgud.io/lutepickle/rjw_menstruation.git
				synced 2024-08-14 22:46:52 +00:00 
			
		
		
		
	Add option to hide womb status for drafted pawns
This commit is contained in:
		
							parent
							
								
									9c2c0dc5aa
								
							
						
					
					
						commit
						221883c2fc
					
				
					 7 changed files with 14 additions and 2 deletions
				
			
		
										
											Binary file not shown.
										
									
								
							| 
						 | 
					@ -124,6 +124,8 @@
 | 
				
			||||||
  <Option_PregnancyFromBaseRJW_Label>Use basic RJW pregnancy</Option_PregnancyFromBaseRJW_Label>
 | 
					  <Option_PregnancyFromBaseRJW_Label>Use basic RJW pregnancy</Option_PregnancyFromBaseRJW_Label>
 | 
				
			||||||
  <Option_PregnancyFromMultiplePregnancy_Label>Use menstruation multiple pregnancy</Option_PregnancyFromMultiplePregnancy_Label>
 | 
					  <Option_PregnancyFromMultiplePregnancy_Label>Use menstruation multiple pregnancy</Option_PregnancyFromMultiplePregnancy_Label>
 | 
				
			||||||
  <Option_PregnancyFromBiotech_Label>Use Biotech pregnancy</Option_PregnancyFromBiotech_Label>
 | 
					  <Option_PregnancyFromBiotech_Label>Use Biotech pregnancy</Option_PregnancyFromBiotech_Label>
 | 
				
			||||||
 | 
					  <Option_EnableDraftedIcon_Label>Show womb status when drafted</Option_EnableDraftedIcon_Label>
 | 
				
			||||||
 | 
					  <Option_EnableDraftedIcon_Desc>Draw womb icon for drafted pawns</Option_EnableDraftedIcon_Desc>
 | 
				
			||||||
  <Button_ResetToDefault>Reset to default</Button_ResetToDefault>
 | 
					  <Button_ResetToDefault>Reset to default</Button_ResetToDefault>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  <Gizmo_GatherCum>Gather cum</Gizmo_GatherCum>
 | 
					  <Gizmo_GatherCum>Gather cum</Gizmo_GatherCum>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
										
											Binary file not shown.
										
									
								
							| 
						 | 
					@ -42,6 +42,7 @@ namespace RJW_Menstruation
 | 
				
			||||||
        public static int CumFertilityDecayRatioAdjust = CumFertilityDecayRatioAdjustDefault;
 | 
					        public static int CumFertilityDecayRatioAdjust = CumFertilityDecayRatioAdjustDefault;
 | 
				
			||||||
        public static int CycleAcceleration = CycleAccelerationDefault;
 | 
					        public static int CycleAcceleration = CycleAccelerationDefault;
 | 
				
			||||||
        public static bool EnableWombIcon = true;
 | 
					        public static bool EnableWombIcon = true;
 | 
				
			||||||
 | 
					        public static bool EnableDraftedIcon = true;
 | 
				
			||||||
        public static bool EnableAnimalCycle = false;
 | 
					        public static bool EnableAnimalCycle = false;
 | 
				
			||||||
        public static bool DrawWombStatus = true;
 | 
					        public static bool DrawWombStatus = true;
 | 
				
			||||||
        public static bool DrawVaginaStatus = true;
 | 
					        public static bool DrawVaginaStatus = true;
 | 
				
			||||||
| 
						 | 
					@ -79,6 +80,7 @@ namespace RJW_Menstruation
 | 
				
			||||||
            CumDecayRatioAdjust = CumDecayRatioAdjustDefault;
 | 
					            CumDecayRatioAdjust = CumDecayRatioAdjustDefault;
 | 
				
			||||||
            CumFertilityDecayRatioAdjust = CumFertilityDecayRatioAdjustDefault;
 | 
					            CumFertilityDecayRatioAdjust = CumFertilityDecayRatioAdjustDefault;
 | 
				
			||||||
            EnableWombIcon = true;
 | 
					            EnableWombIcon = true;
 | 
				
			||||||
 | 
					            EnableDraftedIcon = true;
 | 
				
			||||||
            EnableGatherCumGizmo = true;
 | 
					            EnableGatherCumGizmo = true;
 | 
				
			||||||
            EnableAnimalCycle = false;
 | 
					            EnableAnimalCycle = false;
 | 
				
			||||||
            CycleAcceleration = CycleAccelerationDefault;
 | 
					            CycleAcceleration = CycleAccelerationDefault;
 | 
				
			||||||
| 
						 | 
					@ -185,6 +187,7 @@ namespace RJW_Menstruation
 | 
				
			||||||
            Scribe_Values.Look(ref CumFertilityDecayRatio, "CumFertilityDecayRatio", CumFertilityDecayRatio, true);
 | 
					            Scribe_Values.Look(ref CumFertilityDecayRatio, "CumFertilityDecayRatio", CumFertilityDecayRatio, true);
 | 
				
			||||||
            Scribe_Values.Look(ref CycleAcceleration, "CycleAcceleration", CycleAcceleration, true);
 | 
					            Scribe_Values.Look(ref CycleAcceleration, "CycleAcceleration", CycleAcceleration, true);
 | 
				
			||||||
            Scribe_Values.Look(ref EnableWombIcon, "EnableWombIcon", EnableWombIcon, true);
 | 
					            Scribe_Values.Look(ref EnableWombIcon, "EnableWombIcon", EnableWombIcon, true);
 | 
				
			||||||
 | 
					            Scribe_Values.Look(ref EnableDraftedIcon, "EnableDraftedIcon", EnableDraftedIcon, true);
 | 
				
			||||||
            Scribe_Values.Look(ref EnableAnimalCycle, "EnableAnimalCycle", EnableAnimalCycle, true);
 | 
					            Scribe_Values.Look(ref EnableAnimalCycle, "EnableAnimalCycle", EnableAnimalCycle, true);
 | 
				
			||||||
            Scribe_Values.Look(ref DrawWombStatus, "DrawWombStatus", DrawWombStatus, true);
 | 
					            Scribe_Values.Look(ref DrawWombStatus, "DrawWombStatus", DrawWombStatus, true);
 | 
				
			||||||
            Scribe_Values.Look(ref DrawVaginaStatus, "DrawVaginaStatus", DrawVaginaStatus, true);
 | 
					            Scribe_Values.Look(ref DrawVaginaStatus, "DrawVaginaStatus", DrawVaginaStatus, true);
 | 
				
			||||||
| 
						 | 
					@ -290,7 +293,7 @@ namespace RJW_Menstruation
 | 
				
			||||||
            Widgets.CheckboxLabeled(middleAndRightCells.RightHalf(), Translations.Option_EnableGatherCumGizmo_Label, ref Configurations.EnableGatherCumGizmo, false, null, null, true);
 | 
					            Widgets.CheckboxLabeled(middleAndRightCells.RightHalf(), Translations.Option_EnableGatherCumGizmo_Label, ref Configurations.EnableGatherCumGizmo, false, null, null, true);
 | 
				
			||||||
            if (Configurations.EnableWombIcon || Configurations.EnableButtonInHT)
 | 
					            if (Configurations.EnableWombIcon || Configurations.EnableButtonInHT)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                Listing_Standard wombsection = listmain.BeginSection(350);
 | 
					                Listing_Standard wombsection = listmain.BeginSection(380);
 | 
				
			||||||
                wombsection.CheckboxLabeled(Translations.Option9_Label, ref Configurations.DrawWombStatus, Translations.Option9_Desc);
 | 
					                wombsection.CheckboxLabeled(Translations.Option9_Label, ref Configurations.DrawWombStatus, Translations.Option9_Desc);
 | 
				
			||||||
                if (Configurations.DrawWombStatus)
 | 
					                if (Configurations.DrawWombStatus)
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
| 
						 | 
					@ -299,6 +302,7 @@ namespace RJW_Menstruation
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                wombsection.CheckboxLabeled(Translations.Option10_Label, ref Configurations.DrawVaginaStatus, Translations.Option10_Desc);
 | 
					                wombsection.CheckboxLabeled(Translations.Option10_Label, ref Configurations.DrawVaginaStatus, Translations.Option10_Desc);
 | 
				
			||||||
                wombsection.CheckboxLabeled(Translations.Option29_Label, ref Configurations.AllowShrinkIcon, Translations.Option29_Desc);
 | 
					                wombsection.CheckboxLabeled(Translations.Option29_Label, ref Configurations.AllowShrinkIcon, Translations.Option29_Desc);
 | 
				
			||||||
 | 
					                wombsection.CheckboxLabeled(Translations.Option_EnableDraftedIcon_Label, ref Configurations.EnableDraftedIcon, Translations.Option_EnableDraftedIcon_Desc);
 | 
				
			||||||
                if (wombsection.ButtonText(Translations.Option11_Label + ": " + Configurations.LevelString(Configurations.infoDetail)))
 | 
					                if (wombsection.ButtonText(Translations.Option11_Label + ": " + Configurations.LevelString(Configurations.infoDetail)))
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    if (Configurations.infoDetail == Configurations.DetailLevel.Hide) Configurations.infoDetail = Configurations.DetailLevel.All;
 | 
					                    if (Configurations.infoDetail == Configurations.DetailLevel.Hide) Configurations.infoDetail = Configurations.DetailLevel.All;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -125,6 +125,8 @@ namespace RJW_Menstruation
 | 
				
			||||||
        public static readonly string Option_PregnancyFromBaseRJW_Label = "Option_PregnancyFromBaseRJW_Label".Translate();
 | 
					        public static readonly string Option_PregnancyFromBaseRJW_Label = "Option_PregnancyFromBaseRJW_Label".Translate();
 | 
				
			||||||
        public static readonly string Option_PregnancyFromMultiplePregnancy_Label = "Option_PregnancyFromMultiplePregnancy_Label".Translate();
 | 
					        public static readonly string Option_PregnancyFromMultiplePregnancy_Label = "Option_PregnancyFromMultiplePregnancy_Label".Translate();
 | 
				
			||||||
        public static readonly string Option_PregnancyFromBiotech_Label = "Option_PregnancyFromBiotech_Label".Translate();
 | 
					        public static readonly string Option_PregnancyFromBiotech_Label = "Option_PregnancyFromBiotech_Label".Translate();
 | 
				
			||||||
 | 
					        public static readonly string Option_EnableDraftedIcon_Label = "Option_EnableDraftedIcon_Label".Translate();
 | 
				
			||||||
 | 
					        public static readonly string Option_EnableDraftedIcon_Desc = "Option_EnableDraftedIcon_Desc".Translate();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public static readonly string Button_ResetToDefault = "Button_ResetToDefault".Translate();
 | 
					        public static readonly string Button_ResetToDefault = "Button_ResetToDefault".Translate();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -449,7 +449,10 @@ namespace RJW_Menstruation
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public static bool ShouldShowWombGizmo(this Pawn pawn)
 | 
					        public static bool ShouldShowWombGizmo(this Pawn pawn)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            return Configurations.EnableWombIcon && (!pawn.IsAnimal() || Configurations.EnableAnimalCycle);
 | 
					            if (!Configurations.EnableWombIcon) return false;
 | 
				
			||||||
 | 
					            if (pawn.Drafted && !Configurations.EnableDraftedIcon) return false;
 | 
				
			||||||
 | 
					            if (pawn.IsAnimal() && !Configurations.EnableAnimalCycle) return false;
 | 
				
			||||||
 | 
					            return true;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,7 @@
 | 
				
			||||||
Version 1.0.8.4
 | 
					Version 1.0.8.4
 | 
				
			||||||
 - Fix Biotech xenotype inheritance for single-child pregnancies.
 | 
					 - Fix Biotech xenotype inheritance for single-child pregnancies.
 | 
				
			||||||
 - Fix error in Traditional Chinese translation.
 | 
					 - Fix error in Traditional Chinese translation.
 | 
				
			||||||
 | 
					 - New option in the mod settings to hide the womb icon for drafted pawns.
 | 
				
			||||||
 - Newborns should now be baseliners if there are no xenotypes to inherit.
 | 
					 - Newborns should now be baseliners if there are no xenotypes to inherit.
 | 
				
			||||||
 - The Biotech terminate pregnancy recipe can now terminate a menstruation pregnancy, too.
 | 
					 - The Biotech terminate pregnancy recipe can now terminate a menstruation pregnancy, too.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue