From 37ad2fcfd6174ebc1f36316252485a6351d5bf57 Mon Sep 17 00:00:00 2001 From: moreoreganostodump Date: Thu, 4 Feb 2021 19:42:52 +0900 Subject: [PATCH] changed cum calculate method cum overay dependent on womb textrue --- About/Manifest.xml | 2 +- Assemblies/RJW_Menstruation.dll | Bin 46592 -> 47104 bytes Patches/Hediffs_PrivateParts.xml | 2 +- Textures/Womb/{Cum_00.png => Womb_Cum_00.png} | Bin Textures/Womb/{Cum_01.png => Womb_Cum_01.png} | Bin Textures/Womb/{Cum_02.png => Womb_Cum_02.png} | Bin Textures/Womb/{Cum_03.png => Womb_Cum_03.png} | Bin Textures/Womb/{Cum_04.png => Womb_Cum_04.png} | Bin Textures/Womb/{Cum_05.png => Womb_Cum_05.png} | Bin Textures/Womb/{Cum_06.png => Womb_Cum_06.png} | Bin Textures/Womb/{Cum_07.png => Womb_Cum_07.png} | Bin Textures/Womb/{Cum_08.png => Womb_Cum_08.png} | Bin Textures/Womb/{Cum_09.png => Womb_Cum_09.png} | Bin Textures/Womb/{Cum_10.png => Womb_Cum_10.png} | Bin Textures/Womb/{Cum_11.png => Womb_Cum_11.png} | Bin Textures/Womb/{Cum_12.png => Womb_Cum_12.png} | Bin Textures/Womb/{Cum_13.png => Womb_Cum_13.png} | Bin Textures/Womb/{Cum_14.png => Womb_Cum_14.png} | Bin Textures/Womb/{Cum_15.png => Womb_Cum_15.png} | Bin Textures/Womb/{Cum_16.png => Womb_Cum_16.png} | Bin Textures/Womb/{Cum_17.png => Womb_Cum_17.png} | Bin changelogs.txt | 28 +++++++++++ .../RJW_Menstruation/Dialog_WombStatus.cs | 2 +- .../HediffComp_Menstruation.cs | 4 +- .../RJW_Menstruation/{ => Patch}/GetGizmos.cs | 2 +- .../RJW_Menstruation/{ => Patch}/Harmony.cs | 0 .../{ => Patch}/Pawn_Patch.cs | 0 .../RJW_Menstruation/{ => Patch}/RJW_Patch.cs | 0 .../RJW_Menstruation/RJW_Menstruation.csproj | 8 ++-- .../RJW_Menstruation/Utility.cs | 45 ++++++++++-------- 30 files changed, 62 insertions(+), 31 deletions(-) rename Textures/Womb/{Cum_00.png => Womb_Cum_00.png} (100%) rename Textures/Womb/{Cum_01.png => Womb_Cum_01.png} (100%) rename Textures/Womb/{Cum_02.png => Womb_Cum_02.png} (100%) rename Textures/Womb/{Cum_03.png => Womb_Cum_03.png} (100%) rename Textures/Womb/{Cum_04.png => Womb_Cum_04.png} (100%) rename Textures/Womb/{Cum_05.png => Womb_Cum_05.png} (100%) rename Textures/Womb/{Cum_06.png => Womb_Cum_06.png} (100%) rename Textures/Womb/{Cum_07.png => Womb_Cum_07.png} (100%) rename Textures/Womb/{Cum_08.png => Womb_Cum_08.png} (100%) rename Textures/Womb/{Cum_09.png => Womb_Cum_09.png} (100%) rename Textures/Womb/{Cum_10.png => Womb_Cum_10.png} (100%) rename Textures/Womb/{Cum_11.png => Womb_Cum_11.png} (100%) rename Textures/Womb/{Cum_12.png => Womb_Cum_12.png} (100%) rename Textures/Womb/{Cum_13.png => Womb_Cum_13.png} (100%) rename Textures/Womb/{Cum_14.png => Womb_Cum_14.png} (100%) rename Textures/Womb/{Cum_15.png => Womb_Cum_15.png} (100%) rename Textures/Womb/{Cum_16.png => Womb_Cum_16.png} (100%) rename Textures/Womb/{Cum_17.png => Womb_Cum_17.png} (100%) create mode 100644 changelogs.txt rename source/RJW_Menstruation/RJW_Menstruation/{ => Patch}/GetGizmos.cs (99%) rename source/RJW_Menstruation/RJW_Menstruation/{ => Patch}/Harmony.cs (100%) rename source/RJW_Menstruation/RJW_Menstruation/{ => Patch}/Pawn_Patch.cs (100%) rename source/RJW_Menstruation/RJW_Menstruation/{ => Patch}/RJW_Patch.cs (100%) 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 d7c17c46afc6d3d0b78df557669cd45711f6c434..a8752b9ba44c253e197b1d466779b947c3b468bd 100644 GIT binary patch delta 12172 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 N*I?Omoz-^L{x4ikO$z`3 delta 11890 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 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; }