Merge pull request #126 from vegapnk/dev

2.2.0

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)
 

Common/Defs/GeneDefs/GeneDefs_Breeding.xml

@@ -157,7 +157,7 @@
     <label>Rut</label>
     <description>Carriers of this gene can enter a state of heat, resulting in drastically higher
       sexual activity.</description>
-    <iconPath>UI/Icons/ColonistBar/Idle</iconPath>
+    <iconPath>Genes/Icons/rut</iconPath>
     <biostatCpx>1</biostatCpx>
     <biostatMet>1</biostatMet>
     <displayOrderInCategory>11</displayOrderInCategory>

Common/Defs/GeneDefs/GeneDefs_Diseases.xml

@@ -85,11 +85,12 @@
         </modExtensions>
     </GeneDef>
 
-    
+
     <GeneDef ParentName="RJWGeneDisease">
         <defName>rjw_genes_infectious_blocked_masturbation</defName>
         <label>infectious masturbation block</label>
-        <description>Carriers of this gene are unable to masturbate - they need a partner or equipment.</description>
+        <description>Carriers of this gene are unable to masturbate - they need a partner or
+            equipment.</description>
         <iconPath>Genes/Icons/blocked_masturbation</iconPath>
         <displayOrderInCategory>55</displayOrderInCategory>
         <biostatCpx>1</biostatCpx>
@@ -100,7 +101,7 @@
             </li>
         </modExtensions>
     </GeneDef>
-    
+
     <GeneDef ParentName="RJWGeneDisease">
         <defName>rjw_genes_infectious_low_fertility</defName>
         <label>infectious low fertility vulnerability</label>
@@ -247,7 +248,8 @@
     <GeneDef ParentName="RJWGeneDisease">
         <defName>rjw_genes_fluctual_sexual_needs</defName>
         <label>fluctual sexual needs</label>
-        <description>Carriers of this genetic disease have a chance to suddenly require sex, gaining a bit of energy to find quick relief.</description>
+        <description>Carriers of this genetic disease have a chance to suddenly require sex, gaining
+            a bit of energy to find quick relief.</description>
         <iconPath>UI/Icons/ColonistBar/Idle</iconPath>
         <biostatCpx>1</biostatCpx>
         <biostatMet>2</biostatMet>
@@ -269,7 +271,8 @@
     <GeneDef ParentName="RJWGeneDisease">
         <defName>rjw_genes_size_blinded</defName>
         <label>size blinded</label>
-        <description>This genetic disease makes the carrier dramatically more drawn to pawns with huge cocks.</description>
+        <description>This genetic disease makes the carrier dramatically more drawn to pawns with
+            huge cocks.</description>
         <iconPath>Genes/Icons/size_blinded</iconPath>
         <biostatCpx>1</biostatCpx>
         <biostatMet>1</biostatMet>
@@ -284,7 +287,8 @@
     <GeneDef ParentName="RJWGeneDisease">
         <defName>rjw_genes_stretcher</defName>
         <label>genetic stretcher</label>
-        <description>Pawns with this gene have a chance to alter the genes of their sexual partners to prefer large cocks.</description>
+        <description>Pawns with this gene have a chance to alter the genes of their sexual partners
+            to prefer large cocks.</description>
         <iconPath>Genes/Icons/stretcher</iconPath>
         <biostatCpx>1</biostatCpx>
         <biostatMet>0</biostatMet>
@@ -305,27 +309,28 @@
     </GeneDef>
 
 
-    <GeneDef ParentName="BreedingBase">
+    <GeneDef ParentName="RJWGeneDisease">
         <defName>rjw_genes_infectious_rut</defName>
         <label>Rut</label>
-        <description>Carriers of this gene can enter a state of heat, resulting in drastically higher
-          sexual activity.</description>
-        <iconPath>UI/Icons/ColonistBar/Idle</iconPath>
+        <description>Carriers of this gene can enter a state of heat, resulting in drastically
+            higher
+            sexual activity.</description>
+        <iconPath>Genes/Icons/rut</iconPath>
         <biostatCpx>1</biostatCpx>
         <biostatMet>2</biostatMet>
         <displayOrderInCategory>11</displayOrderInCategory>
         <geneClass>RJW_Genes.Gene_Rut</geneClass>
         <modExtensions>
-          <li Class="RJW_Genes.TickBasedChanceExtension">
-            <!-- 60k = 1 days -->
-            <tickInterval>60000</tickInterval>
-            <eventChance>0.05</eventChance>
-          </li>
-          <li Class="RJW_Genes.GeneticDiseaseExtension">
-            <infectionChance>0.1</infectionChance>
-        </li>
+            <li Class="RJW_Genes.TickBasedChanceExtension">
+                <!-- 60k = 1 days -->
+                <tickInterval>60000</tickInterval>
+                <eventChance>0.05</eventChance>
+            </li>
+            <li Class="RJW_Genes.GeneticDiseaseExtension">
+                <infectionChance>0.1</infectionChance>
+            </li>
         </modExtensions>
-      </GeneDef>
-    
+    </GeneDef>
+
 
 </Defs>

Mods/LicentiaLabs/Defs/GeneDefs/LicentiaLabs_GeneDefs.xml

@@ -27,6 +27,8 @@
     <description>This Xenotype loves being cumflated.</description>
     <iconPath>Genes/Icons/Cumflation</iconPath>
     <displayOrderInCategory>536</displayOrderInCategory>
+    <biostatMet>-1</biostatMet>
+    <biostatCpx>2</biostatCpx>
     <forcedTraits>
       <li>
         <def>LikesCumflation</def>
@@ -71,6 +73,8 @@
     <iconPath>Genes/Icons/Generous_Donor</iconPath>
     <displayOrderInCategory>538</displayOrderInCategory>
     
+    <biostatCpx>2</biostatCpx>
+    <biostatMet>-1</biostatMet>
     <modExtensions>
 			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
 				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>

Mods/Sexperience/Defs/GeneDefs/Sexperience_GeneDefs.xml

@@ -6,9 +6,10 @@
     <label>living cumbucket</label>
     <displayCategory>rjw_genes_cum</displayCategory>
     <description>When this Xenotype partakes in sexual activity, they store cum and produce it as an item.</description>
-    <iconPath>Genes/Icons/Generous_Donor</iconPath>
+    <iconPath>Genes/Icons/living_cumbucket</iconPath>
     <displayOrderInCategory>559</displayOrderInCategory>
-    
+    <biostatCpx>3</biostatCpx>
+    <biostatMet>-2</biostatMet>
     <modExtensions>
         <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
             <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>

Mods/Sexperience/Defs/HediffDefs/Sexperience_HediffDefs.xml

@@ -20,7 +20,7 @@
               <li>0.5</li>
               <li>0.25</li>
               <li>0.1</li>
-              <li>0.005</li>
+              <li>0.5</li>
             </mtbDaysPerStage>
           </li>
         </comps>
@@ -74,7 +74,7 @@
             </capMods>
           </li>
           <li>
-            <label>living fountain</label>
+            <label>living reservior</label>
             <minSeverity>10.1</minSeverity>
             <hungerRateFactor>0.1</hungerRateFactor>
             <statOffsets>

Mods/Sexperience/Defs/JobDefs/Sexperience_JobProcessCumbucket.xml

@@ -6,7 +6,7 @@
   <JobDef>
     <defName>ProcessCumbucket</defName>
     <driverClass>RJW_Genes.JobDriver_ProcessingCumbucket</driverClass>
-    <playerInterruptible>true</playerInterruptible>
+    <playerInterruptible>false</playerInterruptible>
     <casualInterruptible>false</casualInterruptible>
     <reportString>processing internal cumbucket.</reportString>
     <suspendable>false</suspendable>

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;