diff --git a/1.3/Assemblies/RJW_Menstruation.dll b/1.3/Assemblies/RJW_Menstruation.dll index 26fbfcb..4c34909 100644 Binary files a/1.3/Assemblies/RJW_Menstruation.dll and b/1.3/Assemblies/RJW_Menstruation.dll differ diff --git a/1.3/Languages/English/Keyed/RJW_Menstruation.xml b/1.3/Languages/English/Keyed/RJW_Menstruation.xml index b01d614..d0a16d3 100644 --- a/1.3/Languages/English/Keyed/RJW_Menstruation.xml +++ b/1.3/Languages/English/Keyed/RJW_Menstruation.xml @@ -39,7 +39,7 @@ cum fertility decay ratio per hour cum will lose fertility about this ratio this value affects on the fertility chance indirectly estimated sperm lifespan: cum lose most of fertility at this time. cycle accelerate - accelerate menstrution cycle + accelerate menstrution cycle This can cause early menopause and infertility. Setting this lower than x12 is recommended. Rimworld's timescale: x6(default) Debug show debug informations. womb status @@ -54,7 +54,7 @@ enable menopause enable menopause effect that makes pawn infertile in time progress if you have problems with long life races, turn off this option. this option will apply after save loaded use multiple pregnancy - use multiple pregnancy instead RJW's default pregnancy disable this option if you are in trouble with impregnation + use multiple pregnancy instead RJW's default pregnancy disable this option if you are in trouble with impregnation RJW pregnancy should be turned on. enable hetero ovular twins enable multiple eggs can get pregnant enable enzygotic twins @@ -93,7 +93,7 @@ Allow shrink icon Let icon become smaller If needed. estimated sperm lifespan - The chance of pregnancy of fertilized egg. The white overlay is indicates fertilization chance of sperms in womb. + Chance of fertilization within an hour: {0}% The chance of pregnancy of fertilized egg. The white overlay is indicates fertilization chance of sperms in womb. Vaginal washing diff --git a/1.3/Languages/Korean/Keyed/RJW_Menstruation.xml b/1.3/Languages/Korean/Keyed/RJW_Menstruation.xml index 196a6a6..29b5b7a 100644 --- a/1.3/Languages/Korean/Keyed/RJW_Menstruation.xml +++ b/1.3/Languages/Korean/Keyed/RJW_Menstruation.xml @@ -39,7 +39,7 @@ 시간당 정자 사망비율 이 비율만큼 매 시간마다 정자가 사망해 정액이 생식능력을 잃습니다. 정자 예상수명: 정액이 대부분의 생식능력을 잃는 시간입니다. 주기 가속 - 월경주기를 더 빠르게합니다. + 월경주기를 더 빠르게합니다. 이 설정은 조기폐경과 난임을 유발할수도 있습니다. 12배속 이하로 설정하는것을 권장합니다. 림월드의 시간배율: x6(default) Debug 디버그정보를 보여줍니다. 자궁 그림 @@ -54,7 +54,7 @@ 폐경기 활성화 시간이 지남에따라 불임상태로 만드는 폐경기를 활성화합니다. 수명이 긴 종족을 사용할때 문제가 있으면 이 옵션을 끄세요. 변경한후에 세이브로드가 필요합니다. 다중임신 - RJW의 기본임신 대신 다중임신을 사용합니다. + RJW의 기본임신 대신 다중임신을 사용합니다. 임신에 문제가 있다면 이 기능을 끄는것으로 해결될수도 있습니다. RJW 임신이 활성화 되어야 합니다. 이란성 쌍둥이 활성화 다수의 난자가 임신으로 이어지게 합니다. 일란성 쌍둥이 활성화 @@ -93,7 +93,7 @@ 아이콘 축소 허용 아이콘 축소를 허용합니다. 정자 예상수명 - 수정란이 임신으로 진행될 확률입니다. 흰색 오버레이는 정자가 난자를 수정시킬 확률을 표시하는 것입니다. + 한시간 안에 수정될 확률: {0}% 수정란이 임신으로 진행될 확률입니다. 흰색 오버레이는 정자가 난자를 수정시킬 확률을 표시하는 것입니다. 질세척 diff --git a/1.3/MilkModule/1.2/Assemblies/MilkModule.dll b/1.3/MilkModule/1.2/Assemblies/MilkModule.dll deleted file mode 100644 index 0941445..0000000 Binary files a/1.3/MilkModule/1.2/Assemblies/MilkModule.dll and /dev/null differ diff --git a/1.3/MilkModule/1.2/Defs/JobDefs/Jobs_MilkSelf_MC.xml b/1.3/MilkModule/1.2/Defs/JobDefs/Jobs_MilkSelf_MC.xml deleted file mode 100644 index 69cdc4d..0000000 --- a/1.3/MilkModule/1.2/Defs/JobDefs/Jobs_MilkSelf_MC.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - LactateSelf_MC - MilkModule.JobDriver_MilkSelf_MC - lactating self - true - - diff --git a/1.3/MilkModule/Assemblies/MilkModule.dll b/1.3/MilkModule/Assemblies/MilkModule.dll index 0386d0d..9858ae9 100644 Binary files a/1.3/MilkModule/Assemblies/MilkModule.dll and b/1.3/MilkModule/Assemblies/MilkModule.dll differ diff --git a/1.3/MilkModule/Assemblies/RJW.dll b/1.3/MilkModule/Assemblies/RJW.dll deleted file mode 100644 index 7f68f4b..0000000 Binary files a/1.3/MilkModule/Assemblies/RJW.dll and /dev/null differ diff --git a/1.3/source/RJW_Menstruation/MilkModule/JobDriver_MilkSelf.cs b/1.3/source/RJW_Menstruation/MilkModule/JobDriver_MilkSelf.cs index 6e65b8a..fe30a50 100644 --- a/1.3/source/RJW_Menstruation/MilkModule/JobDriver_MilkSelf.cs +++ b/1.3/source/RJW_Menstruation/MilkModule/JobDriver_MilkSelf.cs @@ -20,7 +20,7 @@ namespace MilkModule { get { - return comp.Fullness; + return comp?.Fullness ?? 0f; } } @@ -32,7 +32,7 @@ namespace MilkModule protected override void Gathered() { - comp.Gathered(pawn); + comp?.Gathered(pawn); } protected override void PostTickAction() @@ -47,7 +47,7 @@ namespace MilkModule public static HumanCompHasGatherableBodyResource GetMilkComp(Pawn pawn) { - HumanCompHasGatherableBodyResource result; + HumanCompHasGatherableBodyResource result = null; if (pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Heavy_Lactating_Permanent)) { result = pawn.TryGetComp(); diff --git a/1.3/source/RJW_Menstruation/MilkModule/MilkModule.csproj b/1.3/source/RJW_Menstruation/MilkModule/MilkModule.csproj index 40a4035..4f03b6b 100644 --- a/1.3/source/RJW_Menstruation/MilkModule/MilkModule.csproj +++ b/1.3/source/RJW_Menstruation/MilkModule/MilkModule.csproj @@ -40,7 +40,7 @@ False - ..\..\..\..\..\rjw-mc-master\1.2\Assemblies\Milk.dll + ..\..\..\..\..\rjw-mc-master\1.3\Assemblies\Milk.dll False diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/Cum.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/Cum.cs index b73645b..f222ec6 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/Cum.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/Cum.cs @@ -165,10 +165,7 @@ namespace RJW_Menstruation public void MakeThinner(int speed) { - for (int i=0; i "FertilityDesc".Translate(value); public static readonly string FloatMenu_CleanSelf = "FloatMenu_CleanSelf".Translate(); diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs index 2edb78e..5c9a95a 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs @@ -399,8 +399,9 @@ namespace RJW_Menstruation } statvalue = Configurations.ImplantationChance * comp.Props.baseImplantationChanceFactor * comp.ImplantFactor; - FillableBarLabeled(lineRect, " " + xxx.reproduction.LabelCap.CapitalizeFirst() + " " + statvalue.ToStringPercent(), statvalue, TextureCache.fertilityTexture, Texture2D.blackTexture, Translations.FertilityDesc); - Rect overayRect = new Rect(lineRect.x, lineRect.y, lineRect.width * Math.Min(1.0f, comp.GetFertilityChance()), lineRect.height); + float fertchance = comp.GetFertilityChance(); + FillableBarLabeled(lineRect, " " + xxx.reproduction.LabelCap.CapitalizeFirst() + " " + statvalue.ToStringPercent(), statvalue, TextureCache.fertilityTexture, Texture2D.blackTexture, Translations.FertilityDesc(String.Format("{0:0.##}", fertchance*100))); + Rect overayRect = new Rect(lineRect.x, lineRect.y, lineRect.width * Math.Min(1.0f, fertchance), lineRect.height); GUI.DrawTexture(overayRect, TextureCache.FertChanceTex); lineRect.y += height; } diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs index 0f86ed7..8af8402 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs @@ -436,7 +436,9 @@ namespace RJW_Menstruation if (res != null) return res; else { - res = pawn.relations?.GetFirstDirectRelationPawn(VariousDefOf.Relation_birthgiver, x => !x.Equals(mother)) ?? null; + + res = pawn.relations?.GetFirstDirectRelationPawn(PawnRelationDefOf.Parent, x => x != mother) ?? null; + if (res == null) res = pawn.relations?.GetFirstDirectRelationPawn(VariousDefOf.Relation_birthgiver, x => x != mother) ?? null; return res; } } @@ -454,6 +456,12 @@ namespace RJW_Menstruation } + public static float LerpMultiple(this float a, float b, float t, int num) + { + float tmult = Mathf.Pow(1 - t, num); + return tmult * a + (1 - tmult) * b; + } + public static float VariationRange(this float num, float variant) { return num * Rand.Range(1.0f - variant, 1.0f + variant); diff --git a/About/Manifest.xml b/About/Manifest.xml index eedce61..4b2cf0c 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ RJW Menstruation - 1.0.5.1 + 1.0.5.2 diff --git a/changelogs.txt b/changelogs.txt index a16a593..b7d879c 100644 --- a/changelogs.txt +++ b/changelogs.txt @@ -1,8 +1,11 @@ -Version 1.1.0.0 +Version 1.0.5.2 - 1.3 support - added tooltips on status window - - + - clicking pawn in status window will show naked body + - removed duplicated dll + - more descriptions for mod settings + ----Last update for 1.2---- Version 1.0.4.4a - added records