diff --git a/About/Manifest.xml b/About/Manifest.xml index 2ba5c1d..9ac72b8 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ RJW Menstruation - 1.0.0.4 + 1.0.0.5 diff --git a/Assemblies/RJW_Menstruation.dll b/Assemblies/RJW_Menstruation.dll index d7c17c4..a8752b9 100644 Binary files a/Assemblies/RJW_Menstruation.dll and b/Assemblies/RJW_Menstruation.dll differ diff --git a/Patches/Hediffs_PrivateParts.xml b/Patches/Hediffs_PrivateParts.xml index 75e3696..655a421 100644 --- a/Patches/Hediffs_PrivateParts.xml +++ b/Patches/Hediffs_PrivateParts.xml @@ -32,7 +32,7 @@
  • - 1000 + 500 0.5 0.2 0.05 diff --git a/Textures/Womb/Cum_00.png b/Textures/Womb/Womb_Cum_00.png similarity index 100% rename from Textures/Womb/Cum_00.png rename to Textures/Womb/Womb_Cum_00.png diff --git a/Textures/Womb/Cum_01.png b/Textures/Womb/Womb_Cum_01.png similarity index 100% rename from Textures/Womb/Cum_01.png rename to Textures/Womb/Womb_Cum_01.png diff --git a/Textures/Womb/Cum_02.png b/Textures/Womb/Womb_Cum_02.png similarity index 100% rename from Textures/Womb/Cum_02.png rename to Textures/Womb/Womb_Cum_02.png diff --git a/Textures/Womb/Cum_03.png b/Textures/Womb/Womb_Cum_03.png similarity index 100% rename from Textures/Womb/Cum_03.png rename to Textures/Womb/Womb_Cum_03.png diff --git a/Textures/Womb/Cum_04.png b/Textures/Womb/Womb_Cum_04.png similarity index 100% rename from Textures/Womb/Cum_04.png rename to Textures/Womb/Womb_Cum_04.png diff --git a/Textures/Womb/Cum_05.png b/Textures/Womb/Womb_Cum_05.png similarity index 100% rename from Textures/Womb/Cum_05.png rename to Textures/Womb/Womb_Cum_05.png diff --git a/Textures/Womb/Cum_06.png b/Textures/Womb/Womb_Cum_06.png similarity index 100% rename from Textures/Womb/Cum_06.png rename to Textures/Womb/Womb_Cum_06.png diff --git a/Textures/Womb/Cum_07.png b/Textures/Womb/Womb_Cum_07.png similarity index 100% rename from Textures/Womb/Cum_07.png rename to Textures/Womb/Womb_Cum_07.png diff --git a/Textures/Womb/Cum_08.png b/Textures/Womb/Womb_Cum_08.png similarity index 100% rename from Textures/Womb/Cum_08.png rename to Textures/Womb/Womb_Cum_08.png diff --git a/Textures/Womb/Cum_09.png b/Textures/Womb/Womb_Cum_09.png similarity index 100% rename from Textures/Womb/Cum_09.png rename to Textures/Womb/Womb_Cum_09.png diff --git a/Textures/Womb/Cum_10.png b/Textures/Womb/Womb_Cum_10.png similarity index 100% rename from Textures/Womb/Cum_10.png rename to Textures/Womb/Womb_Cum_10.png diff --git a/Textures/Womb/Cum_11.png b/Textures/Womb/Womb_Cum_11.png similarity index 100% rename from Textures/Womb/Cum_11.png rename to Textures/Womb/Womb_Cum_11.png diff --git a/Textures/Womb/Cum_12.png b/Textures/Womb/Womb_Cum_12.png similarity index 100% rename from Textures/Womb/Cum_12.png rename to Textures/Womb/Womb_Cum_12.png diff --git a/Textures/Womb/Cum_13.png b/Textures/Womb/Womb_Cum_13.png similarity index 100% rename from Textures/Womb/Cum_13.png rename to Textures/Womb/Womb_Cum_13.png diff --git a/Textures/Womb/Cum_14.png b/Textures/Womb/Womb_Cum_14.png similarity index 100% rename from Textures/Womb/Cum_14.png rename to Textures/Womb/Womb_Cum_14.png diff --git a/Textures/Womb/Cum_15.png b/Textures/Womb/Womb_Cum_15.png similarity index 100% rename from Textures/Womb/Cum_15.png rename to Textures/Womb/Womb_Cum_15.png diff --git a/Textures/Womb/Cum_16.png b/Textures/Womb/Womb_Cum_16.png similarity index 100% rename from Textures/Womb/Cum_16.png rename to Textures/Womb/Womb_Cum_16.png diff --git a/Textures/Womb/Cum_17.png b/Textures/Womb/Womb_Cum_17.png similarity index 100% rename from Textures/Womb/Cum_17.png rename to Textures/Womb/Womb_Cum_17.png diff --git a/changelogs.txt b/changelogs.txt new file mode 100644 index 0000000..369bce4 --- /dev/null +++ b/changelogs.txt @@ -0,0 +1,28 @@ +Version 1.0.0.5 + - womb cum capacity is affected by pawn's bodysize + - changed cum volume calculate method. + - cum volume is affected by pawn's bodysize + - generic cum volume decreased. + - if pawn has messy quirk, cum volume increases 4~8times. + - cum textures are dependent on womb texture + +Version 1.0.0.4 + + - fixed errors when runtimeGC removed pawns in cum list. + - added menstrual cramp - now pawns will get mood debuff during in period + - merged some stages into one stage + +Version 1.0.0.3 + + - fixed sometimes hediffcomp stops working. + - changed initializing method + - added patches for generic vagina and dragon vagina + +Version 1.0.0.2 + + - add options for turn on/off vagina/womb image in status window + +Version 1.0.0.1 + + - supports for other type of vagina + - custom images support for vagina&anus diff --git a/source/RJW_Menstruation/RJW_Menstruation/Dialog_WombStatus.cs b/source/RJW_Menstruation/RJW_Menstruation/Dialog_WombStatus.cs index 9a5577a..f4fb223 100644 --- a/source/RJW_Menstruation/RJW_Menstruation/Dialog_WombStatus.cs +++ b/source/RJW_Menstruation/RJW_Menstruation/Dialog_WombStatus.cs @@ -113,7 +113,7 @@ namespace RJW_Menstruation GUI.Box(preginfo, h.babies.Count + " " + fetus.def.label + " " + Translations.Dialog_WombInfo02, buttonstyle); GUI.Label(preginfo, Translations.Dialog_WombInfo03 + ": " + h.father.LabelShort + " ", fontstyleright); } - + } else cum = ContentFinder.Get(("Womb/Empty"), true); } diff --git a/source/RJW_Menstruation/RJW_Menstruation/HediffComp_Menstruation.cs b/source/RJW_Menstruation/RJW_Menstruation/HediffComp_Menstruation.cs index abf0909..771fbc7 100644 --- a/source/RJW_Menstruation/RJW_Menstruation/HediffComp_Menstruation.cs +++ b/source/RJW_Menstruation/RJW_Menstruation/HediffComp_Menstruation.cs @@ -124,7 +124,7 @@ namespace RJW_Menstruation { get { - float res = Props.maxCumCapacity; + float res = Props.maxCumCapacity * parent.pawn.BodySize; if (curStage == Stage.Pregnant) res *= 0.2f; return res; } @@ -154,7 +154,7 @@ namespace RJW_Menstruation get { float factor = 1.0f; - if (xxx.has_quirk(parent.pawn, "Breeder")) factor = 10.0f; + if (parent.pawn.Has(Quirk.Breeder)) factor = 10.0f; if (xxx.is_animal(parent.pawn)) factor *= RJWPregnancySettings.animal_impregnation_chance/100f; else factor *= RJWPregnancySettings.humanlike_impregnation_chance/100f; return parent.pawn.health.capacities.GetLevel(xxx.reproduction) * factor; diff --git a/source/RJW_Menstruation/RJW_Menstruation/GetGizmos.cs b/source/RJW_Menstruation/RJW_Menstruation/Patch/GetGizmos.cs similarity index 99% rename from source/RJW_Menstruation/RJW_Menstruation/GetGizmos.cs rename to source/RJW_Menstruation/RJW_Menstruation/Patch/GetGizmos.cs index 387942d..bd8c18b 100644 --- a/source/RJW_Menstruation/RJW_Menstruation/GetGizmos.cs +++ b/source/RJW_Menstruation/RJW_Menstruation/Patch/GetGizmos.cs @@ -55,7 +55,7 @@ namespace RJW_Menstruation { Texture2D icon,icon_overay; string description = ""; - if (Configurations.Debug) description += comp.curStage + ": " + comp.curStageHrs + "\n" + "fertcums: " + comp.TotalFertCum; + if (Configurations.Debug) description += comp.curStage + ": " + comp.curStageHrs + "\n" + "fertcums: " + comp.TotalFertCum + "\n"; else description += comp.GetCurStageLabel + "\n"; if (pawn.IsPregnant()) { diff --git a/source/RJW_Menstruation/RJW_Menstruation/Harmony.cs b/source/RJW_Menstruation/RJW_Menstruation/Patch/Harmony.cs similarity index 100% rename from source/RJW_Menstruation/RJW_Menstruation/Harmony.cs rename to source/RJW_Menstruation/RJW_Menstruation/Patch/Harmony.cs diff --git a/source/RJW_Menstruation/RJW_Menstruation/Pawn_Patch.cs b/source/RJW_Menstruation/RJW_Menstruation/Patch/Pawn_Patch.cs similarity index 100% rename from source/RJW_Menstruation/RJW_Menstruation/Pawn_Patch.cs rename to source/RJW_Menstruation/RJW_Menstruation/Patch/Pawn_Patch.cs diff --git a/source/RJW_Menstruation/RJW_Menstruation/RJW_Patch.cs b/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs similarity index 100% rename from source/RJW_Menstruation/RJW_Menstruation/RJW_Patch.cs rename to source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs diff --git a/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj b/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj index 15845c7..5312bc7 100644 --- a/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj +++ b/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj @@ -60,12 +60,12 @@ - + - + - - + + diff --git a/source/RJW_Menstruation/RJW_Menstruation/Utility.cs b/source/RJW_Menstruation/RJW_Menstruation/Utility.cs index d9009bb..41154ec 100644 --- a/source/RJW_Menstruation/RJW_Menstruation/Utility.cs +++ b/source/RJW_Menstruation/RJW_Menstruation/Utility.cs @@ -25,8 +25,11 @@ namespace RJW_Menstruation if (part == null) part = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn))?.FindAll((Hediff hed) => hed.def.defName.ToLower().Contains("ovipositorf")).InRandomOrder().FirstOrDefault().TryGetComp(); if (part == null) part = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn))?.FindAll((Hediff hed) => hed.def.defName.ToLower().Contains("ovipositorm")).InRandomOrder().FirstOrDefault().TryGetComp(); if (part == null) part = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn))?.FindAll((Hediff hed) => hed.def.defName.ToLower().Contains("tentacle")).InRandomOrder().FirstOrDefault().TryGetComp(); + + float res = part?.FluidAmmount * part.FluidModifier * pawn.BodySize * Rand.Range(0.8f, 1.2f) * RJWSettings.cum_on_body_amount_adjust * 0.3f ?? 0.0f; + if (pawn.Has(Quirk.Messy)) res *= Rand.Range(4.0f,8.0f); - return part?.FluidAmmount * part.FluidModifier * Rand.Range(0.8f, 1.2f) ?? 0.0f; + return res; } public static HediffComp_Menstruation GetMenstruationComp(Pawn pawn) @@ -135,27 +138,27 @@ namespace RJW_Menstruation public static Texture2D GetCumIcon(HediffComp_Menstruation comp) { - string icon = "Womb/"; + string icon = comp.Props.wombTex; float cumpercent = comp.TotalCumPercent; - if (cumpercent < 0.001f) icon += "Empty"; - else if (cumpercent < 0.01f) icon += "Cum_00"; - else if (cumpercent < 0.05f) icon += "Cum_01"; - else if (cumpercent < 0.11f) icon += "Cum_02"; - else if (cumpercent < 0.17f) icon += "Cum_03"; - else if (cumpercent < 0.23f) icon += "Cum_04"; - else if (cumpercent < 0.29f) icon += "Cum_05"; - else if (cumpercent < 0.35f) icon += "Cum_06"; - else if (cumpercent < 0.41f) icon += "Cum_07"; - else if (cumpercent < 0.47f) icon += "Cum_08"; - else if (cumpercent < 0.53f) icon += "Cum_09"; - else if (cumpercent < 0.59f) icon += "Cum_10"; - else if (cumpercent < 0.65f) icon += "Cum_11"; - else if (cumpercent < 0.71f) icon += "Cum_12"; - else if (cumpercent < 0.77f) icon += "Cum_13"; - else if (cumpercent < 0.83f) icon += "Cum_14"; - else if (cumpercent < 0.89f) icon += "Cum_15"; - else if (cumpercent < 0.95f) icon += "Cum_16"; - else icon += "Cum_17"; + if (cumpercent < 0.001f) icon = "Womb/Empty"; + else if (cumpercent < 0.01f) icon += "_Cum_00"; + else if (cumpercent < 0.05f) icon += "_Cum_01"; + else if (cumpercent < 0.11f) icon += "_Cum_02"; + else if (cumpercent < 0.17f) icon += "_Cum_03"; + else if (cumpercent < 0.23f) icon += "_Cum_04"; + else if (cumpercent < 0.29f) icon += "_Cum_05"; + else if (cumpercent < 0.35f) icon += "_Cum_06"; + else if (cumpercent < 0.41f) icon += "_Cum_07"; + else if (cumpercent < 0.47f) icon += "_Cum_08"; + else if (cumpercent < 0.53f) icon += "_Cum_09"; + else if (cumpercent < 0.59f) icon += "_Cum_10"; + else if (cumpercent < 0.65f) icon += "_Cum_11"; + else if (cumpercent < 0.71f) icon += "_Cum_12"; + else if (cumpercent < 0.77f) icon += "_Cum_13"; + else if (cumpercent < 0.83f) icon += "_Cum_14"; + else if (cumpercent < 0.89f) icon += "_Cum_15"; + else if (cumpercent < 0.95f) icon += "_Cum_16"; + else icon += "_Cum_17"; Texture2D cumtex = ContentFinder.Get((icon), true); return cumtex; }