diff --git a/CHANGELOG.md b/CHANGELOG.md index 78025cd..c6b9f65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 2.2.0 (dd-mm-2024) +# 2.2.0 (23-07-2024) ## Explanations @@ -182,9 +182,13 @@ Its just meant if you want to drop me a tip. - Made the Feminizer and Twinkifier configurable with XML. - Typos in the Hediff Defs, tweaking of some values. - Living Cum-Bucket & Rut Genes -- Great images by @WasMachenDennSachen +- Great icons by @Alpenglow -**Beta-2** (17-07-2024) +**Since Beta-2** (17-07-2024) + +- Changed behaviour of living cumbucket. Now, once "really full" the output happens more rarely but is much more at once. +- More Icons by @Alpenglow <3 this time attributed correct. +- Adjusted some of the metabolic values - likes cumflation, generous donor and living cumbucket have small costs. # 2.1.0 (27-06-2024) diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll index ab5f34d..bb1f065 100644 Binary files a/Common/Assemblies/Rjw-Genes.dll and b/Common/Assemblies/Rjw-Genes.dll differ diff --git a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml index 63d13ba..1b946c2 100644 --- a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml +++ b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml @@ -157,7 +157,7 @@ Carriers of this gene can enter a state of heat, resulting in drastically higher sexual activity. - UI/Icons/ColonistBar/Idle + Genes/Icons/rut 1 1 11 diff --git a/Common/Defs/GeneDefs/GeneDefs_Diseases.xml b/Common/Defs/GeneDefs/GeneDefs_Diseases.xml index 75c69ce..017c1c4 100644 --- a/Common/Defs/GeneDefs/GeneDefs_Diseases.xml +++ b/Common/Defs/GeneDefs/GeneDefs_Diseases.xml @@ -85,11 +85,12 @@ - + rjw_genes_infectious_blocked_masturbation - Carriers of this gene are unable to masturbate - they need a partner or equipment. + Carriers of this gene are unable to masturbate - they need a partner or + equipment. Genes/Icons/blocked_masturbation 55 1 @@ -100,7 +101,7 @@ - + rjw_genes_infectious_low_fertility @@ -247,7 +248,8 @@ rjw_genes_fluctual_sexual_needs - Carriers of this genetic disease have a chance to suddenly require sex, gaining a bit of energy to find quick relief. + Carriers of this genetic disease have a chance to suddenly require sex, gaining + a bit of energy to find quick relief. UI/Icons/ColonistBar/Idle 1 2 @@ -269,7 +271,8 @@ rjw_genes_size_blinded - This genetic disease makes the carrier dramatically more drawn to pawns with huge cocks. + This genetic disease makes the carrier dramatically more drawn to pawns with + huge cocks. Genes/Icons/size_blinded 1 1 @@ -284,7 +287,8 @@ rjw_genes_stretcher - Pawns with this gene have a chance to alter the genes of their sexual partners to prefer large cocks. + Pawns with this gene have a chance to alter the genes of their sexual partners + to prefer large cocks. Genes/Icons/stretcher 1 0 @@ -305,27 +309,28 @@ - + rjw_genes_infectious_rut - Carriers of this gene can enter a state of heat, resulting in drastically higher - sexual activity. - UI/Icons/ColonistBar/Idle + Carriers of this gene can enter a state of heat, resulting in drastically + higher + sexual activity. + Genes/Icons/rut 1 2 11 RJW_Genes.Gene_Rut -
  • - - 60000 - 0.05 -
  • -
  • - 0.1 -
  • +
  • + + 60000 + 0.05 +
  • +
  • + 0.1 +
  • -
    - +
    + \ No newline at end of file diff --git a/Common/Textures/Genes/Icons/Cumflation_Immunity.png b/Common/Textures/Genes/Icons/Cumflation_Immunity.png index 643e0bf..40b40ad 100644 Binary files a/Common/Textures/Genes/Icons/Cumflation_Immunity.png and b/Common/Textures/Genes/Icons/Cumflation_Immunity.png differ diff --git a/Common/Textures/Genes/Icons/Samples/Cumflation_Immunity.psd b/Common/Textures/Genes/Icons/Samples/Cumflation_Immunity.psd new file mode 100644 index 0000000..06e07e4 Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/Cumflation_Immunity.psd differ diff --git a/Common/Textures/Genes/Icons/Samples/living_cumbucket.psd b/Common/Textures/Genes/Icons/Samples/living_cumbucket.psd new file mode 100644 index 0000000..85796b3 Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/living_cumbucket.psd differ diff --git a/Common/Textures/Genes/Icons/Samples/rut.psd b/Common/Textures/Genes/Icons/Samples/rut.psd new file mode 100644 index 0000000..b15bcc6 Binary files /dev/null and b/Common/Textures/Genes/Icons/Samples/rut.psd differ diff --git a/Common/Textures/Genes/Icons/living_cumbucket.png b/Common/Textures/Genes/Icons/living_cumbucket.png new file mode 100644 index 0000000..b79f8cc Binary files /dev/null and b/Common/Textures/Genes/Icons/living_cumbucket.png differ diff --git a/Common/Textures/Genes/Icons/rut.png b/Common/Textures/Genes/Icons/rut.png new file mode 100644 index 0000000..05a0d23 Binary files /dev/null and b/Common/Textures/Genes/Icons/rut.png differ diff --git a/Mods/LicentiaLabs/Defs/GeneDefs/LicentiaLabs_GeneDefs.xml b/Mods/LicentiaLabs/Defs/GeneDefs/LicentiaLabs_GeneDefs.xml index 22fb911..a0a7eee 100644 --- a/Mods/LicentiaLabs/Defs/GeneDefs/LicentiaLabs_GeneDefs.xml +++ b/Mods/LicentiaLabs/Defs/GeneDefs/LicentiaLabs_GeneDefs.xml @@ -27,6 +27,8 @@ This Xenotype loves being cumflated. Genes/Icons/Cumflation 536 + -1 + 2
  • LikesCumflation @@ -71,6 +73,8 @@ Genes/Icons/Generous_Donor 538 + 2 + -1
  • Genes/Icons/RJW_Genes_Endogene_Background diff --git a/Mods/Sexperience/Defs/GeneDefs/Sexperience_GeneDefs.xml b/Mods/Sexperience/Defs/GeneDefs/Sexperience_GeneDefs.xml index 774a874..1d89b7e 100644 --- a/Mods/Sexperience/Defs/GeneDefs/Sexperience_GeneDefs.xml +++ b/Mods/Sexperience/Defs/GeneDefs/Sexperience_GeneDefs.xml @@ -6,9 +6,10 @@ rjw_genes_cum When this Xenotype partakes in sexual activity, they store cum and produce it as an item. - Genes/Icons/Generous_Donor + Genes/Icons/living_cumbucket 559 - + 3 + -2
  • Genes/Icons/RJW_Genes_Endogene_Background diff --git a/Mods/Sexperience/Defs/HediffDefs/Sexperience_HediffDefs.xml b/Mods/Sexperience/Defs/HediffDefs/Sexperience_HediffDefs.xml index 42281b1..2c55a7a 100644 --- a/Mods/Sexperience/Defs/HediffDefs/Sexperience_HediffDefs.xml +++ b/Mods/Sexperience/Defs/HediffDefs/Sexperience_HediffDefs.xml @@ -20,7 +20,7 @@
  • 0.5
  • 0.25
  • 0.1
  • -
  • 0.005
  • +
  • 0.5
  • @@ -74,7 +74,7 @@
  • - + 10.1 0.1 diff --git a/Mods/Sexperience/Defs/JobDefs/Sexperience_JobProcessCumbucket.xml b/Mods/Sexperience/Defs/JobDefs/Sexperience_JobProcessCumbucket.xml index 2c42bea..6cbb372 100644 --- a/Mods/Sexperience/Defs/JobDefs/Sexperience_JobProcessCumbucket.xml +++ b/Mods/Sexperience/Defs/JobDefs/Sexperience_JobProcessCumbucket.xml @@ -6,7 +6,7 @@ ProcessCumbucket RJW_Genes.JobDriver_ProcessingCumbucket - true + false false processing internal cumbucket. false diff --git a/Source/Genes/Cum/JobDriver_ProcessingCumbucket.cs b/Source/Genes/Cum/JobDriver_ProcessingCumbucket.cs index efcd7de..b924a6d 100644 --- a/Source/Genes/Cum/JobDriver_ProcessingCumbucket.cs +++ b/Source/Genes/Cum/JobDriver_ProcessingCumbucket.cs @@ -97,15 +97,32 @@ namespace RJW_Genes return; } - //TODO: Fine-Tune the amount and how things calm down. + // Case 1: "Normal Severity", just puke out a bit of cum here and there. + if (hediff.Severity <= 10) + { + Thing cum = ThingMaker.MakeThing(cumDef); + cum.Position = cell; + int stacks = Math.Max(1, (int)(hediff.Severity * 1.5)); + stacks = Math.Min(stacks, 75); // 75 is the default max stacksize ... + cum.stackCount = stacks; + cum.SpawnSetup(map, false); + hediff.Severity -= (stacks / 50); + } else + // Case 2: Reserviour mode, put out a lot of cum at once but less often. + { + int stacks = Math.Max(1, (int)(hediff.Severity * 1.5)); - Thing cum = ThingMaker.MakeThing(cumDef); - cum.Position = cell; - int stacks = Math.Max(1, (int)(hediff.Severity * 1.5)); - stacks = Math.Min(stacks, 75); // 75 is the default max stacksize ... - cum.stackCount = stacks; - cum.SpawnSetup(map, false); - hediff.Severity -= (stacks / 50); + while (stacks > 0) + { + Thing cum = ThingMaker.MakeThing(cumDef); + cum.Position = cell; + var curStacks = Math.Min(stacks, 75); // 75 is the default max stacksize ... + cum.stackCount = stacks; + cum.SpawnSetup(map, false); + hediff.Severity -= (curStacks / 50); + stacks -= curStacks; + } + } } private int ticksLeft;