AblativeAbsolute/rjw_menstruation
1
0
Fork 0
mirror of https://gitgud.io/lutepickle/rjw_menstruation.git synced 2024-08-14 22:46:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 1.0.7.0

Browse source
This commit is contained in:
lutepickle 2022-07-26 05:52:56 -07:00
commit e4b4badfad
54 changed files with 1306 additions and 1539 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
1.3/Assemblies/RJW_Menstruation.dll
View file

Binary file not shown.

31
1.3/Defs/TaleDefs/Tales_Cum.xml Normal file
View file

@ -0,0 +1,31 @@
<Defs>
<TaleDef>
<defName>CameInside</defName>
<label>came inside</label>
<taleClass>Tale_DoublePawn</taleClass>
<type>Volatile</type>
<firstPawnSymbol>FUCKER</firstPawnSymbol>
<secondPawnSymbol>FUCKED</secondPawnSymbol>
<baseInterest>1.5</baseInterest>
<rulePack>
<rulesStrings>
<li>tale_noun->[FUCKER_nameDef] coming inside of [FUCKED_nameDef]</li>
<li>image->[FUCKER_nameFull]'s penis deep inside of [FUCKED_nameFull]'s vagina [circumstance_group]</li>
<li>image->[FUCKER_nameFull]'s penis vanishing into [FUCKED_nameFull]'s vagina [circumstance_group]</li>
<li>image->[FUCKED_nameFull]'s vagina being filled by [FUCKER_nameFull]'s penis [circumstance_group]</li>
<li>image->[FUCKED_nameFull]'s vagina gripping [FUCKER_nameFull]'s penis tight [cirsumstance_group]</li>
<li>circumstance_phrase->while [FUCKER_nameDef] grits [FUCKER_possessive] teeth</li>
<li>circumstance_phrase->while [FUCKER_nameDef] wears a triumphant smirk</li>
<li>circumstance_phrase->as [FUCKED_nameDef] shudders in ecstasy</li>
<li>circumstance_phrase->as [FUCKER_nameDef] shoots [FUCKER_possessive] load into [FUCKED_nameDef]</li>
<li>circumstance_phrase->while [FUCKED_nameDef] looks into [FUCKER_nameDef]'s eyes with a smile</li>
<li>desc_sentence->[FUCKER_nameDef]'s cum oozes out of [FUCKED_nameDef]'s vagina and drips onto the floor.</li>
<li>desc_sentence->[FUCKER_nameDef]'s sperm races into [FUCKED_nameDef]'s womb and enters [FUCKED_possessive] egg.</li>
<li>desc_sentence->[FUCKER_nameDef]'s cum shoots into [FUCKED_nameDef]'s womb.</li>
<li>desc_sentence->[FUCKED_nameDef]'s womb is filled with cum.</li>
<li>desc_sentence->Sweat runs down [FUCKER_nameDef]'s face.</li>
<li>desc_sentence->[FUCKED_nameDef] is panting heavily.</li>
</rulesStrings>
</rulePack>
</TaleDef>
</Defs>

1
1.3/Languages/ChineseSimplified/Keyed/RJW_Menstruation.xml
View file

@ -8,7 +8,6 @@
<Stage_Ovulatory>排卵</Stage_Ovulatory> <Stage_Ovulatory>排卵</Stage_Ovulatory>
<Stage_Luteal>黄体期</Stage_Luteal> <Stage_Luteal>黄体期</Stage_Luteal>
<Stage_Bleeding>月经来潮</Stage_Bleeding> <Stage_Bleeding>月经来潮</Stage_Bleeding>
<Stage_Fertilized>已受精</Stage_Fertilized>
<Stage_Pregnant>怀孕</Stage_Pregnant> <Stage_Pregnant>怀孕</Stage_Pregnant>
<Stage_Recover>产后恢复</Stage_Recover> <Stage_Recover>产后恢复</Stage_Recover>
<Stage_None>无</Stage_None> <Stage_None>无</Stage_None>

1
1.3/Languages/ChineseTraditional/Keyed/RJW_Menstruation.xml
View file

@ -8,7 +8,6 @@
<Stage_Ovulatory>排卵</Stage_Ovulatory> <Stage_Ovulatory>排卵</Stage_Ovulatory>
<Stage_Luteal>黃體期</Stage_Luteal> <Stage_Luteal>黃體期</Stage_Luteal>
<Stage_Bleeding>月經來潮</Stage_Bleeding> <Stage_Bleeding>月經來潮</Stage_Bleeding>
<Stage_Fertilized>已受精</Stage_Fertilized>
<Stage_Pregnant>懷孕</Stage_Pregnant> <Stage_Pregnant>懷孕</Stage_Pregnant>
<Stage_Recover>從出生中恢復</Stage_Recover> <Stage_Recover>從出生中恢復</Stage_Recover>
<Stage_None>無</Stage_None> <Stage_None>無</Stage_None>

1
1.3/Languages/English/Keyed/RJW_Menstruation.xml
View file

@ -8,7 +8,6 @@
<Stage_Ovulatory>Ovulation</Stage_Ovulatory> <Stage_Ovulatory>Ovulation</Stage_Ovulatory>
<Stage_Luteal>Luteal</Stage_Luteal> <Stage_Luteal>Luteal</Stage_Luteal>
<Stage_Bleeding>In period</Stage_Bleeding> <Stage_Bleeding>In period</Stage_Bleeding>
<Stage_Fertilized>Luteal</Stage_Fertilized>
<Stage_Pregnant>Pregnant</Stage_Pregnant> <Stage_Pregnant>Pregnant</Stage_Pregnant>
<Stage_Recover>Recovering from birth</Stage_Recover> <Stage_Recover>Recovering from birth</Stage_Recover>
<Stage_None>None</Stage_None> <Stage_None>None</Stage_None>

1
1.3/Languages/Korean/Keyed/RJW_Menstruation.xml
View file

@ -8,7 +8,6 @@
<Stage_Ovulatory>배란</Stage_Ovulatory> <Stage_Ovulatory>배란</Stage_Ovulatory>
<Stage_Luteal>황체기</Stage_Luteal> <Stage_Luteal>황체기</Stage_Luteal>
<Stage_Bleeding>생리중</Stage_Bleeding> <Stage_Bleeding>생리중</Stage_Bleeding>
<Stage_Fertilized>황체기</Stage_Fertilized>
<Stage_Pregnant>임신</Stage_Pregnant> <Stage_Pregnant>임신</Stage_Pregnant>
<Stage_Recover>회복기</Stage_Recover> <Stage_Recover>회복기</Stage_Recover>
<Stage_None>없음</Stage_None> <Stage_None>없음</Stage_None>

1
1.3/Languages/Spanish/Keyed/RJW_Menstruation.xml
View file

@ -8,7 +8,6 @@
<Stage_Ovulatory>Ovulación</Stage_Ovulatory> <Stage_Ovulatory>Ovulación</Stage_Ovulatory>
<Stage_Luteal>Luteal</Stage_Luteal> <Stage_Luteal>Luteal</Stage_Luteal>
<Stage_Bleeding>En periodo</Stage_Bleeding> <Stage_Bleeding>En periodo</Stage_Bleeding>
<Stage_Fertilized>Luteal</Stage_Fertilized>
<Stage_Pregnant>Embarazada</Stage_Pregnant> <Stage_Pregnant>Embarazada</Stage_Pregnant>
<Stage_Recover>Recuperándose del nacimiento</Stage_Recover> <Stage_Recover>Recuperándose del nacimiento</Stage_Recover>
<Stage_None>Ninguna</Stage_None> <Stage_None>Ninguna</Stage_None>

BIN
1.3/MilkModule/Assemblies/MilkModule.dll
View file

Binary file not shown.

16
1.3/Patches/Hediffs_PrivateParts.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- one cycle = folicularIntervalDays + lutealIntervalDays --> <!-- one cycle = follicularIntervalDays + lutealIntervalDays -->
<!-- folicularIntervalDays includes bleedingIntervalDays. --> <!-- follicularIntervalDays includes bleedingIntervalDays. -->
<!-- bleedingIntervalDays must be smaller than folicularIntervalDays --> <!-- bleedingIntervalDays must be smaller than follicularIntervalDays -->
<!-- unit of maxCumCapacity is ml --> <!-- unit of maxCumCapacity is ml -->
<!-- actual max cum capacity is 500times of maxCumCapacity --> <!-- actual max cum capacity is 500times of maxCumCapacity -->
<!-- one egg = 1 ovaryPower--> <!-- one egg = 1 ovaryPower-->
@ -16,15 +16,13 @@
<maxCumCapacity>10</maxCumCapacity> <maxCumCapacity>10</maxCumCapacity>
<baseImplantationChanceFactor>1.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>1.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>1.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>1.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>14</follicularIntervalDays>
<folicularIntervalDays>14</folicularIntervalDays>
<lutealIntervalDays>14</lutealIntervalDays> <lutealIntervalDays>14</lutealIntervalDays>
<bleedingIntervalDays>6</bleedingIntervalDays> <bleedingIntervalDays>6</bleedingIntervalDays>
<recoveryIntervalDays>30</recoveryIntervalDays> <recoveryIntervalDays>30</recoveryIntervalDays>
<eggLifespanDays>1</eggLifespanDays> <eggLifespanDays>1</eggLifespanDays>
<wombTex>Womb/Womb</wombTex> <wombTex>Womb/Womb</wombTex>
<vagTex>Genitals/Vagina</vagTex> <vagTex>Genitals/Vagina</vagTex>
<ovaryPower>420</ovaryPower>
<concealedEstrus>true</concealedEstrus> <concealedEstrus>true</concealedEstrus>
</li> </li>
</comps> </comps>
@ -40,8 +38,7 @@
<maxCumCapacity>10</maxCumCapacity> <maxCumCapacity>10</maxCumCapacity>
<baseImplantationChanceFactor>1.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>1.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>1.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>1.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>14</follicularIntervalDays>
<folicularIntervalDays>14</folicularIntervalDays>
<lutealIntervalDays>14</lutealIntervalDays> <lutealIntervalDays>14</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>30</recoveryIntervalDays> <recoveryIntervalDays>30</recoveryIntervalDays>
@ -89,8 +86,7 @@
<maxCumCapacity>10</maxCumCapacity> <maxCumCapacity>10</maxCumCapacity>
<baseImplantationChanceFactor>2.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>2.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>2.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>2.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>14</follicularIntervalDays>
<folicularIntervalDays>14</folicularIntervalDays>
<lutealIntervalDays>14</lutealIntervalDays> <lutealIntervalDays>14</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>0</recoveryIntervalDays> <recoveryIntervalDays>0</recoveryIntervalDays>

30
1.3/Patches/Hediffs_PrivateParts_Animal.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- one cycle = folicularIntervalDays + lutealIntervalDays --> <!-- one cycle = follicularIntervalDays + lutealIntervalDays -->
<!-- folicularIntervalDays includes bleedingIntervalDays. --> <!-- follicularIntervalDays includes bleedingIntervalDays. -->
<!-- bleedingIntervalDays must be smaller than folicularIntervalDays --> <!-- bleedingIntervalDays must be smaller than follicularIntervalDays -->
<!-- unit of maxCumCapacity is ml --> <!-- unit of maxCumCapacity is ml -->
<!-- actual max cum capacity is 500times of maxCumCapacity --> <!-- actual max cum capacity is 500times of maxCumCapacity -->
<!-- one egg = 1 ovaryPower--> <!-- one egg = 1 ovaryPower-->
@ -18,8 +18,7 @@
<maxCumCapacity>8</maxCumCapacity> <maxCumCapacity>8</maxCumCapacity>
<baseImplantationChanceFactor>1.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>1.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>1.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>1.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>14</follicularIntervalDays>
<folicularIntervalDays>14</folicularIntervalDays>
<lutealIntervalDays>166</lutealIntervalDays> <lutealIntervalDays>166</lutealIntervalDays>
<bleedingIntervalDays>8</bleedingIntervalDays> <bleedingIntervalDays>8</bleedingIntervalDays>
<recoveryIntervalDays>15</recoveryIntervalDays> <recoveryIntervalDays>15</recoveryIntervalDays>
@ -40,8 +39,7 @@
<maxCumCapacity>6</maxCumCapacity> <maxCumCapacity>6</maxCumCapacity>
<baseImplantationChanceFactor>1.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>1.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>2.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>2.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>9</follicularIntervalDays>
<folicularIntervalDays>9</folicularIntervalDays>
<lutealIntervalDays>10</lutealIntervalDays> <lutealIntervalDays>10</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>15</recoveryIntervalDays> <recoveryIntervalDays>15</recoveryIntervalDays>
@ -63,8 +61,7 @@
<maxCumCapacity>25</maxCumCapacity> <maxCumCapacity>25</maxCumCapacity>
<baseImplantationChanceFactor>1.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>1.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>1.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>1.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>7</follicularIntervalDays>
<folicularIntervalDays>7</folicularIntervalDays>
<lutealIntervalDays>14</lutealIntervalDays> <lutealIntervalDays>14</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>30</recoveryIntervalDays> <recoveryIntervalDays>30</recoveryIntervalDays>
@ -87,8 +84,7 @@
<maxCumCapacity>50</maxCumCapacity> <maxCumCapacity>50</maxCumCapacity>
<baseImplantationChanceFactor>0.5</baseImplantationChanceFactor> <baseImplantationChanceFactor>0.5</baseImplantationChanceFactor>
<basefertilizationChanceFactor>0.2</basefertilizationChanceFactor> <basefertilizationChanceFactor>0.2</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>270</follicularIntervalDays>
<folicularIntervalDays>270</folicularIntervalDays>
<lutealIntervalDays>30</lutealIntervalDays> <lutealIntervalDays>30</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>300</recoveryIntervalDays> <recoveryIntervalDays>300</recoveryIntervalDays>
@ -109,8 +105,7 @@
<maxCumCapacity>10</maxCumCapacity> <maxCumCapacity>10</maxCumCapacity>
<baseImplantationChanceFactor>1.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>1.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>1.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>1.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>5</follicularIntervalDays>
<folicularIntervalDays>5</folicularIntervalDays>
<lutealIntervalDays>16</lutealIntervalDays> <lutealIntervalDays>16</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>15</recoveryIntervalDays> <recoveryIntervalDays>15</recoveryIntervalDays>
@ -131,8 +126,7 @@
<maxCumCapacity>5</maxCumCapacity> <maxCumCapacity>5</maxCumCapacity>
<baseImplantationChanceFactor>1.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>1.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>2.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>2.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>6</follicularIntervalDays>
<folicularIntervalDays>6</folicularIntervalDays>
<lutealIntervalDays>9</lutealIntervalDays> <lutealIntervalDays>9</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>3</recoveryIntervalDays> <recoveryIntervalDays>3</recoveryIntervalDays>
@ -153,8 +147,7 @@
<maxCumCapacity>5</maxCumCapacity> <maxCumCapacity>5</maxCumCapacity>
<baseImplantationChanceFactor>2.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>2.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>2.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>2.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>12</follicularIntervalDays>
<folicularIntervalDays>12</folicularIntervalDays>
<lutealIntervalDays>9</lutealIntervalDays> <lutealIntervalDays>9</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>3</recoveryIntervalDays> <recoveryIntervalDays>3</recoveryIntervalDays>
@ -175,8 +168,7 @@
<maxCumCapacity>10</maxCumCapacity> <maxCumCapacity>10</maxCumCapacity>
<baseImplantationChanceFactor>2.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>2.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>2.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>2.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>14</follicularIntervalDays>
<folicularIntervalDays>14</folicularIntervalDays>
<lutealIntervalDays>14</lutealIntervalDays> <lutealIntervalDays>14</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>3</recoveryIntervalDays> <recoveryIntervalDays>3</recoveryIntervalDays>

27
1.3/RJW Menstruation Race Support/Patches/Hediffs_PrivateParts_Animal_RaceSupport.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- one cycle = folicularIntervalDays + lutealIntervalDays --> <!-- one cycle = follicularIntervalDays + lutealIntervalDays -->
<!-- folicularIntervalDays includes bleedingIntervalDays. --> <!-- follicularIntervalDays includes bleedingIntervalDays. -->
<!-- bleedingIntervalDays must be smaller than folicularIntervalDays --> <!-- bleedingIntervalDays must be smaller than follicularIntervalDays -->
<!-- unit of maxCumCapacity is ml --> <!-- unit of maxCumCapacity is ml -->
<!-- actual max cum capacity is 500times of maxCumCapacity --> <!-- actual max cum capacity is 500times of maxCumCapacity -->
<!-- one egg = 1 ovaryPower--> <!-- one egg = 1 ovaryPower-->
@ -18,8 +18,7 @@
<maxCumCapacity>18</maxCumCapacity> <maxCumCapacity>18</maxCumCapacity>
<baseImplantationChanceFactor>1.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>1.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>1.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>1.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>10</follicularIntervalDays>
<folicularIntervalDays>10</folicularIntervalDays>
<lutealIntervalDays>10</lutealIntervalDays> <lutealIntervalDays>10</lutealIntervalDays>
<bleedingIntervalDays>4</bleedingIntervalDays> <bleedingIntervalDays>4</bleedingIntervalDays>
<recoveryIntervalDays>30</recoveryIntervalDays> <recoveryIntervalDays>30</recoveryIntervalDays>
@ -40,8 +39,7 @@
<maxCumCapacity>8</maxCumCapacity> <maxCumCapacity>8</maxCumCapacity>
<baseImplantationChanceFactor>1.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>1.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>1.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>1.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>8</follicularIntervalDays>
<folicularIntervalDays>8</folicularIntervalDays>
<lutealIntervalDays>12</lutealIntervalDays> <lutealIntervalDays>12</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>0</recoveryIntervalDays> <recoveryIntervalDays>0</recoveryIntervalDays>
@ -62,8 +60,7 @@
<maxCumCapacity>15</maxCumCapacity> <maxCumCapacity>15</maxCumCapacity>
<baseImplantationChanceFactor>1.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>1.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>1.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>1.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>10</follicularIntervalDays>
<folicularIntervalDays>10</folicularIntervalDays>
<lutealIntervalDays>12</lutealIntervalDays> <lutealIntervalDays>12</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>30</recoveryIntervalDays> <recoveryIntervalDays>30</recoveryIntervalDays>
@ -84,8 +81,7 @@
<maxCumCapacity>8</maxCumCapacity> <maxCumCapacity>8</maxCumCapacity>
<baseImplantationChanceFactor>1.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>1.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>1.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>1.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>6</follicularIntervalDays>
<folicularIntervalDays>6</folicularIntervalDays>
<lutealIntervalDays>12</lutealIntervalDays> <lutealIntervalDays>12</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>30</recoveryIntervalDays> <recoveryIntervalDays>30</recoveryIntervalDays>
@ -106,8 +102,7 @@
<maxCumCapacity>12</maxCumCapacity> <maxCumCapacity>12</maxCumCapacity>
<baseImplantationChanceFactor>1.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>1.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>1.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>1.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>14</follicularIntervalDays>
<folicularIntervalDays>14</folicularIntervalDays>
<lutealIntervalDays>20</lutealIntervalDays> <lutealIntervalDays>20</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>30</recoveryIntervalDays> <recoveryIntervalDays>30</recoveryIntervalDays>
@ -128,8 +123,7 @@
<maxCumCapacity>2</maxCumCapacity> <maxCumCapacity>2</maxCumCapacity>
<baseImplantationChanceFactor>0.1</baseImplantationChanceFactor> <baseImplantationChanceFactor>0.1</baseImplantationChanceFactor>
<basefertilizationChanceFactor>0.1</basefertilizationChanceFactor> <basefertilizationChanceFactor>0.1</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>14</follicularIntervalDays>
<folicularIntervalDays>14</folicularIntervalDays>
<lutealIntervalDays>14</lutealIntervalDays> <lutealIntervalDays>14</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>0</recoveryIntervalDays> <recoveryIntervalDays>0</recoveryIntervalDays>
@ -150,8 +144,7 @@
<maxCumCapacity>10</maxCumCapacity> <maxCumCapacity>10</maxCumCapacity>
<baseImplantationChanceFactor>0.1</baseImplantationChanceFactor> <baseImplantationChanceFactor>0.1</baseImplantationChanceFactor>
<basefertilizationChanceFactor>0.1</basefertilizationChanceFactor> <basefertilizationChanceFactor>0.1</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>14</follicularIntervalDays>
<folicularIntervalDays>14</folicularIntervalDays>
<lutealIntervalDays>14</lutealIntervalDays> <lutealIntervalDays>14</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>0</recoveryIntervalDays> <recoveryIntervalDays>0</recoveryIntervalDays>

18
1.3/RJW Menstruation Race Support/Patches/Hediffs_PrivateParts_Humanlike_RaceSupport.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- one cycle = folicularIntervalDays + lutealIntervalDays --> <!-- one cycle = follicularIntervalDays + lutealIntervalDays -->
<!-- folicularIntervalDays includes bleedingIntervalDays. --> <!-- follicularIntervalDays includes bleedingIntervalDays. -->
<!-- bleedingIntervalDays must be smaller than folicularIntervalDays --> <!-- bleedingIntervalDays must be smaller than follicularIntervalDays -->
<!-- unit of maxCumCapacity is ml --> <!-- unit of maxCumCapacity is ml -->
<!-- actual max cum capacity is 500times of maxCumCapacity --> <!-- actual max cum capacity is 500times of maxCumCapacity -->
<!-- one egg = 1 ovaryPower--> <!-- one egg = 1 ovaryPower-->
@ -16,15 +16,13 @@
<maxCumCapacity>10</maxCumCapacity> <maxCumCapacity>10</maxCumCapacity>
<baseImplantationChanceFactor>1.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>1.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>1.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>1.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>1800</follicularIntervalDays>
<folicularIntervalDays>1800</folicularIntervalDays>
<lutealIntervalDays>1800</lutealIntervalDays> <lutealIntervalDays>1800</lutealIntervalDays>
<bleedingIntervalDays>6</bleedingIntervalDays> <bleedingIntervalDays>6</bleedingIntervalDays>
<recoveryIntervalDays>30</recoveryIntervalDays> <recoveryIntervalDays>30</recoveryIntervalDays>
<eggLifespanDays>1</eggLifespanDays> <eggLifespanDays>1</eggLifespanDays>
<wombTex>Womb/Womb</wombTex> <wombTex>Womb/Womb</wombTex>
<vagTex>Genitals/Vagina</vagTex> <vagTex>Genitals/Vagina</vagTex>
<ovaryPower>620</ovaryPower>
<concealedEstrus>true</concealedEstrus> <concealedEstrus>true</concealedEstrus>
</li> </li>
</comps> </comps>
@ -50,15 +48,13 @@
<maxCumCapacity>10</maxCumCapacity> <maxCumCapacity>10</maxCumCapacity>
<baseImplantationChanceFactor>1.0</baseImplantationChanceFactor> <baseImplantationChanceFactor>1.0</baseImplantationChanceFactor>
<basefertilizationChanceFactor>1.0</basefertilizationChanceFactor> <basefertilizationChanceFactor>1.0</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>7</follicularIntervalDays>
<folicularIntervalDays>7</folicularIntervalDays>
<lutealIntervalDays>10</lutealIntervalDays> <lutealIntervalDays>10</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>10</recoveryIntervalDays> <recoveryIntervalDays>10</recoveryIntervalDays>
<eggLifespanDays>1</eggLifespanDays> <eggLifespanDays>1</eggLifespanDays>
<wombTex>Womb/Womb</wombTex> <wombTex>Womb/Womb</wombTex>
<vagTex>Genitals/Vagina</vagTex> <vagTex>Genitals/Vagina</vagTex>
<ovaryPower>620</ovaryPower>
<concealedEstrus>true</concealedEstrus> <concealedEstrus>true</concealedEstrus>
</li> </li>
</comps> </comps>
@ -86,15 +82,13 @@
<maxCumCapacity>10</maxCumCapacity> <maxCumCapacity>10</maxCumCapacity>
<baseImplantationChanceFactor>0.2</baseImplantationChanceFactor> <baseImplantationChanceFactor>0.2</baseImplantationChanceFactor>
<basefertilizationChanceFactor>0.2</basefertilizationChanceFactor> <basefertilizationChanceFactor>0.2</basefertilizationChanceFactor>
<deviationFactor>0.05</deviationFactor> <follicularIntervalDays>14</follicularIntervalDays>
<folicularIntervalDays>14</folicularIntervalDays>
<lutealIntervalDays>14</lutealIntervalDays> <lutealIntervalDays>14</lutealIntervalDays>
<bleedingIntervalDays>0</bleedingIntervalDays> <bleedingIntervalDays>0</bleedingIntervalDays>
<recoveryIntervalDays>10</recoveryIntervalDays> <recoveryIntervalDays>10</recoveryIntervalDays>
<eggLifespanDays>1</eggLifespanDays> <eggLifespanDays>1</eggLifespanDays>
<wombTex>Womb/Womb</wombTex> <wombTex>Womb/Womb</wombTex>
<vagTex>Genitals/Vagina</vagTex> <vagTex>Genitals/Vagina</vagTex>
<ovaryPower>420</ovaryPower>
<concealedEstrus>true</concealedEstrus> <concealedEstrus>true</concealedEstrus>
</li> </li>
</comps> </comps>

BIN
1.3/SexperienceModule/Assemblies/SexperienceModule.dll
View file

Binary file not shown.

11
1.3/source/RJW_Menstruation/MilkModule/JobDriver_MilkSelf.cs
View file

@ -1,13 +1,6 @@
using System; using Milk;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Verse;
using Verse.AI;
using RimWorld;
using Milk;
using RJW_Menstruation; using RJW_Menstruation;
using Verse;
namespace MilkModule namespace MilkModule
{ {

14
1.3/source/RJW_Menstruation/MilkModule/Milk_Patch.cs
View file

@ -1,14 +1,8 @@
using System; using HarmonyLib;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Reflection;
using HarmonyLib;
using Verse;
using RimWorld;
using Milk; using Milk;
using RJW_Menstruation; using RJW_Menstruation;
using System.Reflection;
using Verse;
namespace MilkModule namespace MilkModule
{ {
@ -16,7 +10,7 @@ namespace MilkModule
{ {
static First() static First()
{ {
var har = new Harmony("RJW_Menstruation_MilkModule"); Harmony har = new Harmony("RJW_Menstruation_MilkModule");
har.PatchAll(Assembly.GetExecutingAssembly()); har.PatchAll(Assembly.GetExecutingAssembly());
} }
} }

1
1.3/source/RJW_Menstruation/MilkModule/Properties/AssemblyInfo.cs
View file

@ -1,5 +1,4 @@
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
// 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해 // 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해

19
1.3/source/RJW_Menstruation/RJW_Menstruation/Configurations.cs
View file

@ -10,12 +10,12 @@ namespace RJW_Menstruation
{ {
public const float ImplantationChanceDefault = 0.65f; public const float ImplantationChanceDefault = 0.65f;
public const int ImplantationChanceAdjustDefault = 65; public const int ImplantationChanceAdjustDefault = 65;
public const float FertilizeChanceDefault = 0.10f; public const float FertilizeChanceDefault = 0.15f;
public const int FertilizeChanceAdjustDefault = 100; public const int FertilizeChanceAdjustDefault = 150;
public const float CumDecayRatioDefault = 0.30f; public const float CumDecayRatioDefault = 0.15f;
public const int CumDecayRatioAdjustDefault = 300; public const int CumDecayRatioAdjustDefault = 150;
public const float CumFertilityDecayRatioDefault = 0.2f; public const float CumFertilityDecayRatioDefault = 0.05f;
public const int CumFertilityDecayRatioAdjustDefault = 200; public const int CumFertilityDecayRatioAdjustDefault = 50;
public const int CycleAccelerationDefault = 6; public const int CycleAccelerationDefault = 6;
public const float EnzygoticTwinsChanceDefault = 0.002f; public const float EnzygoticTwinsChanceDefault = 0.002f;
public const int EnzygoticTwinsChanceAdjustDefault = 2; public const int EnzygoticTwinsChanceAdjustDefault = 2;
@ -242,7 +242,7 @@ namespace RJW_Menstruation
{ {
get get
{ {
int days = VariousDefOf.VaginaCompProperties.bleedingIntervalDays; int days = VariousDefOf.HumanVaginaCompProperties.bleedingIntervalDays;
return days * 0.03f * Configurations.BleedingAmount * 6; return days * 0.03f * Configurations.BleedingAmount * 6;
} }
} }
@ -383,7 +383,8 @@ namespace RJW_Menstruation
Configurations.ImplantationChanceAdjust = (int)listmain.Slider(Configurations.ImplantationChanceAdjust, 0, 1000); Configurations.ImplantationChanceAdjust = (int)listmain.Slider(Configurations.ImplantationChanceAdjust, 0, 1000);
Configurations.ImplantationChance = (float)Configurations.ImplantationChanceAdjust / 100; Configurations.ImplantationChance = (float)Configurations.ImplantationChanceAdjust / 100;
listmain.Label(Translations.Option4_Label + " " + Configurations.FertilizeChance * 100 + "%", -1, Translations.Option4_Desc); string tenMl = String.Format("10 ml: {0:0}%", (1.0f - Mathf.Pow(1.0f - Configurations.FertilizeChance, 10)) * 100f);
listmain.LabelDouble(Translations.Option4_Label + " " + Configurations.FertilizeChance * 100 + "%", tenMl, Translations.Option4_Desc);
Configurations.FertilizeChanceAdjust = (int)listmain.Slider(Configurations.FertilizeChanceAdjust, 0, 1000); Configurations.FertilizeChanceAdjust = (int)listmain.Slider(Configurations.FertilizeChanceAdjust, 0, 1000);
Configurations.FertilizeChance = (float)Configurations.FertilizeChanceAdjust / 1000; Configurations.FertilizeChance = (float)Configurations.FertilizeChanceAdjust / 1000;
@ -399,7 +400,7 @@ namespace RJW_Menstruation
Configurations.EggLifespanMultiplier = (float)Adjust / 20; Configurations.EggLifespanMultiplier = (float)Adjust / 20;
int semenlifespan = (int)(-5 / ((float)Math.Log10((1 - Configurations.CumFertilityDecayRatio)*10) - 1)) + 1; int semenlifespan = (int)(-5 / ((float)Math.Log10((1 - Configurations.CumFertilityDecayRatio) * (1 - Configurations.CumDecayRatio) * 10) - 1)) + 1;
string estimatedlifespan; string estimatedlifespan;
if (semenlifespan < 0) if (semenlifespan < 0)
{ {

40
1.3/source/RJW_Menstruation/RJW_Menstruation/Cum.cs
View file

@ -11,8 +11,7 @@ namespace RJW_Menstruation
public Pawn pawn; public Pawn pawn;
protected float volume; // ml protected float volume; // ml
protected float fertvolume; public float fertility = 1.0f;
public float fertFactor = 1.0f;
public bool notcum = false; // for other fluids public bool notcum = false; // for other fluids
public string notcumLabel = ""; public string notcumLabel = "";
protected bool useCustomColor = false; protected bool useCustomColor = false;
@ -32,7 +31,7 @@ namespace RJW_Menstruation
{ {
get get
{ {
return fertvolume; return volume * fertility;
} }
} }
@ -62,8 +61,7 @@ namespace RJW_Menstruation
{ {
get get
{ {
if (DNAcache == null) if (DNAcache != null) return DNAcache;
{
try try
{ {
DNAcache = pawn.def.GetModExtension<PawnDNAModExtension>(); DNAcache = pawn.def.GetModExtension<PawnDNAModExtension>();
@ -78,8 +76,6 @@ namespace RJW_Menstruation
} }
return DNAcache; return DNAcache;
} }
else return DNAcache;
}
} }
protected PawnDNAModExtension DNAcache = null; protected PawnDNAModExtension DNAcache = null;
public ThingDef FilthDef public ThingDef FilthDef
@ -130,7 +126,7 @@ namespace RJW_Menstruation
{ {
this.pawn = pawn; this.pawn = pawn;
volume = 1.0f; volume = 1.0f;
fertvolume = 1.0f; fertility = 1.0f;
} }
/// <summary> /// <summary>
@ -145,7 +141,7 @@ namespace RJW_Menstruation
{ {
this.pawn = pawn; this.pawn = pawn;
this.volume = volume; this.volume = volume;
this.fertvolume = volume; this.fertility = 0f;
this.notcum = true; this.notcum = true;
this.notcumLabel = notcumlabel; this.notcumLabel = notcumlabel;
this.notcumthickness = decayresist; this.notcumthickness = decayresist;
@ -156,7 +152,7 @@ namespace RJW_Menstruation
{ {
this.pawn = pawn; this.pawn = pawn;
this.volume = volume; this.volume = volume;
this.fertvolume = volume * fertility; this.fertility = fertility;
this.filthDef = filthDef; this.filthDef = filthDef;
} }
@ -167,9 +163,8 @@ namespace RJW_Menstruation
Scribe_References.Look(ref pawn, "pawn", true); Scribe_References.Look(ref pawn, "pawn", true);
Scribe_References.Look(ref internalThing, "internalThing", true); Scribe_References.Look(ref internalThing, "internalThing", true);
Scribe_Values.Look(ref volume, "volume", volume, true); Scribe_Values.Look(ref volume, "volume", volume, true);
Scribe_Values.Look(ref fertvolume, "fertvolume", fertvolume, true); Scribe_Values.Look(ref fertility, "fertility", fertility, true);
Scribe_Values.Look(ref notcumthickness, "notcumthickness", notcumthickness, true); Scribe_Values.Look(ref notcumthickness, "notcumthickness", notcumthickness, true);
Scribe_Values.Look(ref fertFactor, "fertFactor", fertFactor, true);
Scribe_Values.Look(ref notcum, "notcum", notcum, true); Scribe_Values.Look(ref notcum, "notcum", notcum, true);
Scribe_Values.Look(ref notcumLabel, "notcumLabel", notcumLabel, true); Scribe_Values.Look(ref notcumLabel, "notcumLabel", notcumLabel, true);
Scribe_Values.Look(ref useCustomColor, "useCustomColor", useCustomColor, true); Scribe_Values.Look(ref useCustomColor, "useCustomColor", useCustomColor, true);
@ -187,7 +182,7 @@ namespace RJW_Menstruation
{ {
if (updatefilthDef != null) filthDef = updatefilthDef; if (updatefilthDef != null) filthDef = updatefilthDef;
volume += volumein; volume += volumein;
fertvolume += volumein*fertility; this.fertility = (this.volume * this.fertility + volumein * fertility) / (this.volume + volumein);
cumthickness = Mathf.Lerp(cumthickness, 1.0f, volumein / volume); cumthickness = Mathf.Lerp(cumthickness, 1.0f, volumein / volume);
} }
@ -195,12 +190,13 @@ namespace RJW_Menstruation
{ {
if (updatefilthDef != null) filthDef = updatefilthDef; if (updatefilthDef != null) filthDef = updatefilthDef;
volume += volumein; volume += volumein;
fertility = volume * fertility / (volume + volumein);
notcumthickness = Mathf.Lerp(notcumthickness, thickness, volumein / volume); notcumthickness = Mathf.Lerp(notcumthickness, thickness, volumein / volume);
} }
public bool ShouldRemove() public bool ShouldRemove()
{ {
if ((notcum || fertvolume < 0.001f) && volume < 0.01f) return true; if ((notcum || FertVolume < 0.001f) && volume < 0.01f) return true;
return false; return false;
} }
@ -209,7 +205,7 @@ namespace RJW_Menstruation
{ {
float totalleak = volume; float totalleak = volume;
volume *= Math.Max(0, (1 - (Configurations.CumDecayRatio * (1 - DecayResist)) * leakfactor)); volume *= Math.Max(0, (1 - (Configurations.CumDecayRatio * (1 - DecayResist)) * leakfactor));
fertvolume *= Math.Max(0, 1 - (Configurations.CumFertilityDecayRatio * (1 - DecayResist) + antisperm)); fertility *= Math.Max(0, 1 - (Configurations.CumFertilityDecayRatio * (1 - DecayResist) + antisperm));
CutMinor(); CutMinor();
totalleak -= volume; totalleak -= volume;
return totalleak; return totalleak;
@ -219,7 +215,6 @@ namespace RJW_Menstruation
{ {
float totalleak = volume; float totalleak = volume;
volume *= Math.Max(0, 1 - (portion * (1 - DecayResist / 10)) * leakfactor); volume *= Math.Max(0, 1 - (portion * (1 - DecayResist / 10)) * leakfactor);
fertvolume *= Math.Max(0, 1 - (portion * (1 - DecayResist)) * leakfactor);
CutMinor(); CutMinor();
totalleak -= volume; totalleak -= volume;
return totalleak; return totalleak;
@ -227,8 +222,8 @@ namespace RJW_Menstruation
public void CumEffects(Pawn pawn) public void CumEffects(Pawn pawn)
{ {
if (!notcum && DNA != null && volume >= 1.0f) if (notcum || DNA == null || volume < 1.0f) return;
{
List<IngestionOutcomeDoer> doers = DNA.ingestionOutcomeDoers; List<IngestionOutcomeDoer> doers = DNA.ingestionOutcomeDoers;
if (!doers.NullOrEmpty()) for (int i = 0; i < doers.Count; i++) if (!doers.NullOrEmpty()) for (int i = 0; i < doers.Count; i++)
@ -236,15 +231,11 @@ namespace RJW_Menstruation
doers[i].DoIngestionOutcome(pawn, CumThing); doers[i].DoIngestionOutcome(pawn, CumThing);
} }
} }
}
protected void CutMinor() protected void CutMinor()
{ {
if (volume < 0.01f) volume = 0f; if (volume < 0.01f) volume = 0f;
if (fertvolume < 0.001f) fertvolume = 0f;
} }
} }
public class CumMixture : Cum, IDisposable public class CumMixture : Cum, IDisposable
@ -291,10 +282,5 @@ namespace RJW_Menstruation
} }
return res; return res;
} }
} }
} }

25
1.3/source/RJW_Menstruation/RJW_Menstruation/DebugActions.cs
View file

@ -9,28 +9,32 @@ namespace RJW_Menstruation
[DebugAction("RJW Menstruation", "Set pawn's state to follicular", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.Playing)] [DebugAction("RJW Menstruation", "Set pawn's state to follicular", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.Playing)]
private static void SetFollicular(Pawn p) private static void SetFollicular(Pawn p)
{ {
p.GetMenstruationComp().curStage = HediffComp_Menstruation.Stage.Follicular; foreach (HediffComp_Menstruation comp in p.GetMenstruationComps())
comp.curStage = HediffComp_Menstruation.Stage.Follicular;
Messages.Message($"{p} is now follicular", MessageTypeDefOf.NeutralEvent, false); Messages.Message($"{p} is now follicular", MessageTypeDefOf.NeutralEvent, false);
} }
[DebugAction("RJW Menstruation", "Set pawn's state to ovulatory", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.Playing)] [DebugAction("RJW Menstruation", "Set pawn's state to ovulatory", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.Playing)]
private static void SetOvulatory(Pawn p) private static void SetOvulatory(Pawn p)
{ {
p.GetMenstruationComp().curStage = HediffComp_Menstruation.Stage.Ovulatory; foreach (HediffComp_Menstruation comp in p.GetMenstruationComps())
comp.curStage = HediffComp_Menstruation.Stage.Ovulatory;
Messages.Message($"{p} is now ovulatory", MessageTypeDefOf.NeutralEvent, false); Messages.Message($"{p} is now ovulatory", MessageTypeDefOf.NeutralEvent, false);
} }
[DebugAction("RJW Menstruation", "Set pawn's state to luteal", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.Playing)] [DebugAction("RJW Menstruation", "Set pawn's state to luteal", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.Playing)]
private static void SetLuteal(Pawn p) private static void SetLuteal(Pawn p)
{ {
p.GetMenstruationComp().curStage = HediffComp_Menstruation.Stage.Luteal; foreach (HediffComp_Menstruation comp in p.GetMenstruationComps())
comp.curStage = HediffComp_Menstruation.Stage.Luteal;
Messages.Message($"{p} is now luteal", MessageTypeDefOf.NeutralEvent, false); Messages.Message($"{p} is now luteal", MessageTypeDefOf.NeutralEvent, false);
} }
[DebugAction("RJW Menstruation", "Set pawn's state to bleeding", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.Playing)] [DebugAction("RJW Menstruation", "Set pawn's state to bleeding", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.Playing)]
private static void SetBleeding(Pawn p) private static void SetBleeding(Pawn p)
{ {
p.GetMenstruationComp().curStage = HediffComp_Menstruation.Stage.Bleeding; foreach (HediffComp_Menstruation comp in p.GetMenstruationComps())
comp.curStage = HediffComp_Menstruation.Stage.Bleeding;
Messages.Message($"{p} is now bleeding", MessageTypeDefOf.NeutralEvent, false); Messages.Message($"{p} is now bleeding", MessageTypeDefOf.NeutralEvent, false);
} }
/* /*
@ -49,21 +53,24 @@ namespace RJW_Menstruation
[DebugAction("RJW Menstruation", "Remove all cum from pawn's womb", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.Playing)] [DebugAction("RJW Menstruation", "Remove all cum from pawn's womb", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.Playing)]
private static void RemoveCums(Pawn p) private static void RemoveCums(Pawn p)
{ {
p.GetMenstruationComp().RemoveAllCums(); foreach (HediffComp_Menstruation comp in p.GetMenstruationComps())
comp.RemoveAllCums();
Messages.Message($"All cum removed from {p}'s womb", MessageTypeDefOf.NeutralEvent, false); Messages.Message($"All cum removed from {p}'s womb", MessageTypeDefOf.NeutralEvent, false);
} }
[DebugAction("RJW Menstruation", "Add egg to pawn's next ovulation", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.Playing)] [DebugAction("RJW Menstruation", "Add egg to pawn's next ovulation", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.Playing)]
private static void AddEgg(Pawn p) private static void AddEgg(Pawn p)
{ {
p.GetMenstruationComp().eggstack++; foreach (HediffComp_Menstruation comp in p.GetMenstruationComps())
Messages.Message($"1 egg added to {p}'s next ovulation ({p.GetMenstruationComp().eggstack})", MessageTypeDefOf.NeutralEvent, false); comp.eggstack++;
Messages.Message($"1 egg added to {p}'s next ovulation ({p.GetFirstMenstruationComp().eggstack})", MessageTypeDefOf.NeutralEvent, false);
} }
[DebugAction("RJW Menstruation", "Recalculate pawn's ovary power", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.Playing)] [DebugAction("RJW Menstruation", "Recalculate pawn's ovary power", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.Playing)]
private static void RecalculateOvaryPower(Pawn p) private static void RecalculateOvaryPower(Pawn p)
{ {
p.GetMenstruationComp().ovarypower = p.GetMenstruationComp().GetOvaryPowerByAge(p); foreach (HediffComp_Menstruation comp in p.GetMenstruationComps())
Messages.Message($"{p}'s ovarypower recalculated ({p.GetMenstruationComp().ovarypower})", MessageTypeDefOf.NeutralEvent, false); comp.ovarypower = comp.GetOvaryPowerByAge();
Messages.Message($"{p}'s ovarypower recalculated ({p.GetFirstMenstruationComp().ovarypower})", MessageTypeDefOf.NeutralEvent, false);
} }
} }
} }

41
1.3/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs
View file

@ -1,8 +1,7 @@
using System; using RimWorld;
using System.Collections.Generic;
using RimWorld;
using Verse;
using rjw; using rjw;
using System.Collections.Generic;
using Verse;
namespace RJW_Menstruation namespace RJW_Menstruation
{ {
@ -10,13 +9,13 @@ namespace RJW_Menstruation
{ {
protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested) protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested)
{ {
HediffComp_Menstruation comp = pawn.GetMenstruationComp(); foreach (HediffComp_Menstruation comp in pawn.GetMenstruationComps())
if (comp != null && (comp.curStage.Equals(HediffComp_Menstruation.Stage.Follicular) if (comp.curStage.Equals(HediffComp_Menstruation.Stage.Follicular)
|| comp.curStage.Equals(HediffComp_Menstruation.Stage.Luteal) || comp.curStage.Equals(HediffComp_Menstruation.Stage.Luteal)
|| comp.curStage.Equals(HediffComp_Menstruation.Stage.ClimactericFollicular) || comp.curStage.Equals(HediffComp_Menstruation.Stage.ClimactericFollicular)
|| comp.curStage.Equals(HediffComp_Menstruation.Stage.ClimactericLuteal) || comp.curStage.Equals(HediffComp_Menstruation.Stage.ClimactericLuteal)
|| comp.curStage.Equals(HediffComp_Menstruation.Stage.Anestrus) || comp.curStage.Equals(HediffComp_Menstruation.Stage.Anestrus)
)) )
{ {
comp.SetEstrus(comp.Props.eggLifespanDays); comp.SetEstrus(comp.Props.eggLifespanDays);
comp.curStage = HediffComp_Menstruation.Stage.Ovulatory; comp.curStage = HediffComp_Menstruation.Stage.Ovulatory;
@ -29,11 +28,11 @@ namespace RJW_Menstruation
{ {
protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested) protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested)
{ {
HediffComp_Menstruation comp = pawn.GetMenstruationComp(); foreach (HediffComp_Menstruation comp in pawn.GetMenstruationComps())
if (comp != null && (comp.curStage.Equals(HediffComp_Menstruation.Stage.Follicular) if (comp.curStage.Equals(HediffComp_Menstruation.Stage.Follicular)
|| comp.curStage.Equals(HediffComp_Menstruation.Stage.ClimactericFollicular) || comp.curStage.Equals(HediffComp_Menstruation.Stage.ClimactericFollicular)
|| comp.curStage.Equals(HediffComp_Menstruation.Stage.Anestrus) || comp.curStage.Equals(HediffComp_Menstruation.Stage.Anestrus)
)) )
{ {
comp.SetEstrus(comp.Props.eggLifespanDays); comp.SetEstrus(comp.Props.eggLifespanDays);
comp.curStage = HediffComp_Menstruation.Stage.Ovulatory; comp.curStage = HediffComp_Menstruation.Stage.Ovulatory;
@ -62,11 +61,8 @@ namespace RJW_Menstruation
protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested) protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested)
{ {
HediffComp_Menstruation comp = pawn.GetMenstruationComp(); foreach (HediffComp_Menstruation comp in pawn.GetMenstruationComps())
if (Configurations.EnableMenopause && comp != null) if (Configurations.EnableMenopause) comp.RecoverOvary(1 + effectOffset);
{
comp.RecoverOvary(1 + effectOffset);
}
} }
} }
@ -74,14 +70,9 @@ namespace RJW_Menstruation
{ {
protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested) protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested)
{ {
HediffComp_Menstruation comp = pawn.GetMenstruationComp(); foreach (HediffComp_Menstruation comp in pawn.GetMenstruationComps())
if (comp != null)
{
comp.eggstack += Rand.Range(1, 4); comp.eggstack += Rand.Range(1, 4);
} }
}
} }
public class ContraceptiveOutcomeDoer : IngestionOutcomeDoer public class ContraceptiveOutcomeDoer : IngestionOutcomeDoer
@ -94,8 +85,7 @@ namespace RJW_Menstruation
x.def == VariousDefOf.CameInsideF x.def == VariousDefOf.CameInsideF
|| x.def == VariousDefOf.CameInsideFFetish || x.def == VariousDefOf.CameInsideFFetish
|| x.def == VariousDefOf.HaterCameInsideF); || x.def == VariousDefOf.HaterCameInsideF);
if (!memories.NullOrEmpty()) if (memories.NullOrEmpty()) return;
{
foreach (Thought_Memory m in memories) foreach (Thought_Memory m in memories)
{ {
if (m.def == VariousDefOf.HaterCameInsideF) m.moodPowerFactor = 0.5f; if (m.def == VariousDefOf.HaterCameInsideF) m.moodPowerFactor = 0.5f;
@ -106,9 +96,4 @@ namespace RJW_Menstruation
else pawn.needs.mood.thoughts.memories.TryGainMemoryFast(VariousDefOf.TookContraceptivePill); else pawn.needs.mood.thoughts.memories.TryGainMemoryFast(VariousDefOf.TookContraceptivePill);
} }
} }
}
} }

4
1.3/source/RJW_Menstruation/RJW_Menstruation/EstrusPartKindUsageRule.cs
View file

@ -1,10 +1,10 @@
using Verse; using rjw;
using rjw;
using rjw.Modules.Interactions.Contexts; using rjw.Modules.Interactions.Contexts;
using rjw.Modules.Interactions.Enums; using rjw.Modules.Interactions.Enums;
using rjw.Modules.Interactions.Rules.PartKindUsageRules; using rjw.Modules.Interactions.Rules.PartKindUsageRules;
using rjw.Modules.Shared; using rjw.Modules.Shared;
using System.Collections.Generic; using System.Collections.Generic;
using Verse;
namespace RJW_Menstruation.Interactions namespace RJW_Menstruation.Interactions
{ {

39
1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs
View file

@ -1,13 +1,10 @@
using System; using HugsLib;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Verse;
using RimWorld; using RimWorld;
using UnityEngine;
using HugsLib;
using rjw; using rjw;
using System;
using System.Collections.Generic;
using UnityEngine;
using Verse;
namespace RJW_Menstruation namespace RJW_Menstruation
{ {
@ -187,18 +184,15 @@ namespace RJW_Menstruation
public override void CompPostPostRemoved() public override void CompPostPostRemoved()
{ {
if (parent.pawn.health.hediffSet.hediffs.Contains(parent))
if (parent?.pawn?.GetBreastComp() == this)
{ {
Log.Warning("Something tried to remove hediff with wrong way."); Log.Warning($"Attempted to remove breast comp from wrong pawn ({parent.pawn}).");
return;
} }
else
{
HugsLibController.Instance.TickDelayScheduler.TryUnscheduleCallback(action); HugsLibController.Instance.TickDelayScheduler.TryUnscheduleCallback(action);
Log.Message(parent.pawn.Label + "breast tick scheduler removed"); if (Configurations.Debug) Log.Message(parent.pawn.Label + " breast tick scheduler removed");
base.CompPostPostRemoved(); base.CompPostPostRemoved();
} }
}
protected long CalculateLastBirth() protected long CalculateLastBirth()
{ {
@ -207,13 +201,16 @@ namespace RJW_Menstruation
{ {
foreach (Pawn child in parent.pawn.relations.Children) foreach (Pawn child in parent.pawn.relations.Children)
{ {
bool isFetus = false;
bool isFetus; foreach (Hediff_BasePregnancy preg in parent.pawn.health.hediffSet.GetHediffs<Hediff_BasePregnancy>())
if (PregnancyHelper.GetPregnancy(parent.pawn) is Hediff_BasePregnancy preg)
{ {
isFetus = preg.babies.Contains(child); if (preg.babies.Contains(child))
{
isFetus = true;
break;
} }
else isFetus = false; }
if ( if (
parent.pawn.ageTracker.BirthAbsTicks - child.ageTracker.BirthAbsTicks > ageOfLastBirth && parent.pawn.ageTracker.BirthAbsTicks - child.ageTracker.BirthAbsTicks > ageOfLastBirth &&
!isFetus && !isFetus &&
@ -284,7 +281,7 @@ namespace RJW_Menstruation
// Scenario B: Pregnant, grow in the second half of first trimester // Scenario B: Pregnant, grow in the second half of first trimester
else if (parent.pawn.IsPregnant()) else if (parent.pawn.IsPregnant())
{ {
float pregnancySize = Mathf.InverseLerp(BREAST_GROWTH_START, BREAST_GROWTH_END, parent.pawn.GetPregnancyProgress()) * MAX_BREAST_INCREMENT; float pregnancySize = Mathf.InverseLerp(BREAST_GROWTH_START, BREAST_GROWTH_END, parent.pawn.GetFarthestPregnancyProgress()) * MAX_BREAST_INCREMENT;
if (breastSizeIncreased > pregnancySize) if (breastSizeIncreased > pregnancySize)
{ {
debugGrowthStatus = "Shrinking due to being oversize for pregnancy"; debugGrowthStatus = "Shrinking due to being oversize for pregnancy";

71
1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_InducedOvulator.cs
View file

@ -1,10 +1,4 @@
using HugsLib; using RimWorld;
using RimWorld;
using rjw;
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using Verse; using Verse;
namespace RJW_Menstruation namespace RJW_Menstruation
@ -36,60 +30,33 @@ namespace RJW_Menstruation
} }
} }
protected override void FollicularAction() // The maximum theoretical rate of ovulation is inducing the moment it goes follicular and no pregnancies
// There will be far more eggs than will ever actually be produced, but it fits the induced ovulator philosophy
protected override float RaceCyclesPerYear()
{ {
if (!IsBreedingSeason()) int breedingSeasons = 0;
{ if (Props.breedingSeason == SeasonalBreed.Always) breedingSeasons = 4;
GoNextStage(Stage.Anestrus);
return;
}
if (curStageHrs >= FollicularIntervalHours)
{
estrusflag = false;
lutealIntervalhours = PeriodRandomizer(lutealIntervalhours, Props.deviationFactor);
GoNextStage(Stage.Luteal);
}
else else
{ {
curStageHrs += Configurations.CycleAcceleration; if ((Props.breedingSeason & SeasonalBreed.Spring) != 0) breedingSeasons++;
if (!estrusflag && curStageHrs > FollicularIntervalHours - Props.estrusDaysBeforeOvulation * 24) if ((Props.breedingSeason & SeasonalBreed.Summer) != 0) breedingSeasons++;
{ if ((Props.breedingSeason & SeasonalBreed.Fall) != 0) breedingSeasons++;
estrusflag = true; if ((Props.breedingSeason & SeasonalBreed.Winter) != 0) breedingSeasons++;
SetEstrus(Props.eggLifespanDays + Props.estrusDaysBeforeOvulation);
}
StayCurrentStage();
} }
float breedingRatio = breedingSeasons / 4.0f;
return breedingRatio * GenDate.DaysPerYear / ((float)(Props.lutealIntervalDays + Props.bleedingIntervalDays) / Configurations.CycleAccelerationDefault);
} }
protected override void ClimactericFollicularAction() // There's really no good way to estimate the number of times it's been induced, so this is all we can do
protected override int PawnEggsUsed(float pawnCyclesElapsed, float avglittersize)
{ {
if (!Configurations.EnableMenopause) return 0;
{
RemoveClimactericEffect();
StayCurrentStage();
} }
else if (curStageHrs >= (follicularIntervalhours - bleedingIntervalhours) * CycleFactor)
protected override void GoOvulatoryStage(bool climacteric)
{ {
estrusflag = false; estrusflag = false;
lutealIntervalhours = PeriodRandomizer(lutealIntervalhours, Props.deviationFactor); GoNextStage(climacteric ? Stage.ClimactericLuteal : Stage.Luteal);
GoNextStage(Stage.ClimactericLuteal);
}
else if (ovarypower < OvaryPowerThreshold / 3 && Rand.Range(0.0f, 1.0f) < 0.2f) // Might randomly skip to luteal early)
{
estrusflag = false;
lutealIntervalhours = PeriodRandomizer(lutealIntervalhours, Props.deviationFactor * 6);
GoNextStage(Stage.ClimactericLuteal);
}
else
{
curStageHrs += Configurations.CycleAcceleration;
if (!estrusflag && curStageHrs > FollicularIntervalHours - Props.estrusDaysBeforeOvulation * 24)
{
estrusflag = true;
SetEstrus(Props.eggLifespanDays + Props.estrusDaysBeforeOvulation);
}
StayCurrentStage();
}
} }
protected override void AfterCumIn(Pawn cummer) protected override void AfterCumIn(Pawn cummer)
@ -99,7 +66,7 @@ namespace RJW_Menstruation
{ {
case Stage.Follicular: case Stage.Follicular:
case Stage.ClimactericFollicular: case Stage.ClimactericFollicular:
curStage = Stage.Ovulatory; GoNextStage(Stage.Ovulatory);
break; break;
} }
} }

702
1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
View file

File diff suppressed because it is too large Load diff

109
1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs
View file

@ -1,47 +1,65 @@
using System; using RimWorld;
using rjw;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using RimWorld;
using Verse;
using rjw;
using UnityEngine; using UnityEngine;
using Verse;
namespace RJW_Menstruation namespace RJW_Menstruation
{ {
public static class MenstruationUtility public static class MenstruationUtility
{ {
[Obsolete("This method is obsolete. Use GetMenstruationComps or a related function instead", false)]
public static HediffComp_Menstruation GetMenstruationComp(this Pawn pawn) public static HediffComp_Menstruation GetMenstruationComp(this Pawn pawn)
{ {
var hedifflist = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn))?.FindAll((Hediff h) => h.def.defName.ToLower().Contains("vagina")); return pawn.GetFirstMenstruationComp();
HediffComp_Menstruation result;
if (hedifflist.NullOrEmpty()) return null;
else
{
foreach (Hediff h in hedifflist)
{
result = h.TryGetComp<HediffComp_Menstruation>();
if (result != null) return result;
} }
public static IEnumerable<HediffComp_Menstruation> GetMenstruationComps(this Pawn pawn)
{
List<Hediff> hedifflist = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn))?.FindAll(h => VariousDefOf.AllVaginas.Contains(h.def));
if (hedifflist == null) yield break;
foreach (Hediff hediff in hedifflist)
{
HediffComp_Menstruation result = hediff.TryGetComp<HediffComp_Menstruation>();
if (result != null) yield return result;
}
}
public static HediffComp_Menstruation GetFirstMenstruationComp(this Pawn pawn)
{
return pawn.GetMenstruationComps().FirstOrDefault();
}
public static HediffComp_Menstruation GetRandomMenstruationComp(this Pawn pawn)
{
return pawn.GetMenstruationComps().RandomElementWithFallback();
}
public static HediffComp_Menstruation GetFertileMenstruationComp(this Pawn pawn)
{
List<HediffComp_Menstruation> comps = pawn.GetMenstruationComps().ToList();
return comps.Where(c => c.IsDangerDay).RandomElementWithFallback() ?? comps.RandomElementWithFallback();
}
public static HediffComp_Menstruation GetMenstruationComp(this Hediff vagina)
{
if (vagina is Hediff_PartBaseNatural || vagina is Hediff_PartBaseArtifical)
{
return vagina.TryGetComp<HediffComp_Menstruation>();
} }
return null; return null;
} }
public static HediffComp_Menstruation GetMenstruationComp(this Hediff hediff) public static HediffComp_Menstruation GetMenstruationComp(this Hediff_BasePregnancy pregnancy)
{ {
if (hediff is Hediff_PartBaseNatural || hediff is Hediff_PartBaseArtifical) return pregnancy?.pawn.GetMenstruationComps().FirstOrDefault(comp => comp.Pregnancy == pregnancy);
{
return hediff.TryGetComp<HediffComp_Menstruation>();
}
return null;
} }
public static HediffComp_Anus GetAnusComp(this Pawn pawn) public static HediffComp_Anus GetAnusComp(this Pawn pawn)
{ {
var hedifflist = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn))?.FindAll((Hediff h) => h.def.defName.ToLower().Contains("anus")); List<Hediff> hedifflist = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn))?.FindAll((Hediff h) => h.def.defName.ToLower().Contains("anus"));
HediffComp_Anus result; HediffComp_Anus result;
if (!hedifflist.NullOrEmpty()) if (!hedifflist.NullOrEmpty())
{ {
@ -63,18 +81,11 @@ namespace RJW_Menstruation
return null; return null;
} }
public static float GetFertilityChance(this HediffComp_Menstruation comp) public static float GetFertilityChance(this HediffComp_Menstruation comp)
{ {
return comp.TotalFertCum * Configurations.FertilizeChance * comp.Props.basefertilizationChanceFactor; return 1.0f - Mathf.Pow(1.0f - Configurations.FertilizeChance, comp.TotalFertCum * comp.Props.basefertilizationChanceFactor);
} }
public static HediffComp_Menstruation.Stage GetCurStage(this Pawn pawn)
{
return GetMenstruationComp(pawn)?.curStage ?? HediffComp_Menstruation.Stage.Bleeding;
}
public static Texture2D GetPregnancyIcon(this HediffComp_Menstruation comp, Hediff hediff) public static Texture2D GetPregnancyIcon(this HediffComp_Menstruation comp, Hediff hediff)
{ {
string icon = ""; string icon = "";
@ -157,9 +168,9 @@ namespace RJW_Menstruation
} }
public static Texture2D GetEggIcon(this HediffComp_Menstruation comp, bool includeOvary) public static Texture2D GetEggIcon(this HediffComp_Menstruation comp, bool includeOvary)
{ {
if (comp.parent.pawn.IsPregnant(Configurations.InfoDetail != Configurations.DetailLevel.All) && !(PregnancyHelper.GetPregnancy(comp.parent.pawn) is Hediff_MechanoidPregnancy)) if (comp.Pregnancy != null && !(comp.Pregnancy is Hediff_MechanoidPregnancy))
{ {
if (comp.parent.pawn.GetPregnancyProgress() < 0.2f) return ContentFinder<Texture2D>.Get("Eggs/Egg_Implanted00", true); if (comp.GetPregnancyProgress() < 0.2f) return ContentFinder<Texture2D>.Get("Eggs/Egg_Implanted00", true);
else return ContentFinder<Texture2D>.Get("Womb/Empty", true); else return ContentFinder<Texture2D>.Get("Womb/Empty", true);
} }
@ -169,7 +180,7 @@ namespace RJW_Menstruation
case HediffComp_Menstruation.Stage.ClimactericFollicular: case HediffComp_Menstruation.Stage.ClimactericFollicular:
if (!includeOvary) break; if (!includeOvary) break;
if (comp is HediffComp_InducedOvulator) break; if (comp is HediffComp_InducedOvulator) break;
if (comp.curStageHrs > comp.FollicularIntervalHours - 30) // Approximate time for ovulation to occur if (comp.curStageHrs > comp.CurStageIntervalHours - 30) // Approximate time for ovulation to occur
return ContentFinder<Texture2D>.Get("Ovaries/Ovary_01", true); return ContentFinder<Texture2D>.Get("Ovaries/Ovary_01", true);
else break; else break;
case HediffComp_Menstruation.Stage.Ovulatory: case HediffComp_Menstruation.Stage.Ovulatory:
@ -209,7 +220,7 @@ namespace RJW_Menstruation
public static Texture2D GetGenitalIcon(this Pawn pawn, HediffComp_Menstruation comp, bool drawOrigin = false) public static Texture2D GetGenitalIcon(this Pawn pawn, HediffComp_Menstruation comp, bool drawOrigin = false)
{ {
var hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn))?.Find((Hediff h) => h.def.defName.ToLower().Contains("vagina")); Hediff hediff = comp?.parent;
if (hediff == null) return ContentFinder<Texture2D>.Get("Genitals/Vagina00", true); if (hediff == null) return ContentFinder<Texture2D>.Get("Genitals/Vagina00", true);
//HediffComp_Menstruation comp = hediff.GetMenstruationComp(); //HediffComp_Menstruation comp = hediff.GetMenstruationComp();
string icon; string icon;
@ -237,9 +248,9 @@ namespace RJW_Menstruation
public static Texture2D GetAnalIcon(this Pawn pawn, bool drawOrigin = false) public static Texture2D GetAnalIcon(this Pawn pawn, bool drawOrigin = false)
{ {
var hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_anusBPR(pawn)).FirstOrDefault((Hediff h) => h.def.defName.ToLower().Contains("anus")); Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_anusBPR(pawn)).FirstOrDefault((Hediff h) => h.def.defName.ToLower().Contains("anus"));
if (hediff != null) if (hediff == null) return ContentFinder<Texture2D>.Get(("Genitals/Anal00"), true);
{
string icon; string icon;
float severity; float severity;
HediffComp_Anus comp = hediff.GetAnusComp(); HediffComp_Anus comp = hediff.GetAnusComp();
@ -264,11 +275,6 @@ namespace RJW_Menstruation
return ContentFinder<Texture2D>.Get((icon), true); return ContentFinder<Texture2D>.Get((icon), true);
} }
else
{
return ContentFinder<Texture2D>.Get(("Genitals/Anal00"), true);
}
}
public static float GestationHours(this Hediff_BasePregnancy hediff) public static float GestationHours(this Hediff_BasePregnancy hediff)
{ {
@ -280,6 +286,21 @@ namespace RJW_Menstruation
else return (hediff.p_end_tick - hediff.p_start_tick) / GenDate.TicksPerHour; else return (hediff.p_end_tick - hediff.p_start_tick) / GenDate.TicksPerHour;
} }
public static float RandomVariabilityPercent(int recursion = 0)
{
// Humans, in days
const float mean = 1.635f;
const float stddev = 0.9138f;
const float lambda = 0.234f;
if (recursion >= 10) return mean / (28 * 2);
float variability = Rand.Gaussian(mean, stddev) - Mathf.Log(Rand.Value) / lambda;
variability /= 28 * 2; // Convert to percentage
if (variability < 0 || variability > 0.35f) return RandomVariabilityPercent(recursion + 1); // ~2% chance, about the limit on how far variability can go before things start to break
else return variability;
}
public static bool IsInEstrus(this Pawn pawn, bool visible = true) public static bool IsInEstrus(this Pawn pawn, bool visible = true)
{ {
if (pawn.Dead) return false; if (pawn.Dead) return false;

132
1.3/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs
View file

@ -17,10 +17,12 @@ namespace RJW_Menstruation
protected void PregnancyThought() protected void PregnancyThought()
{ {
if (!is_discovered && xxx.is_human(pawn)) if (is_discovered ||
{ !xxx.is_human(pawn) ||
if (!pawn.Has(Quirk.Breeder) && pawn.relations?.DirectRelations?.Find(x => x.def.Equals(PawnRelationDefOf.Spouse) || x.def.Equals(PawnRelationDefOf.Fiance)) == null) pawn.Has(Quirk.Breeder) ||
{ (pawn.relations?.DirectRelations?.Find(x => x.def.Equals(PawnRelationDefOf.Spouse) ||
x.def.Equals(PawnRelationDefOf.Fiance))) != null)
return;
if (pawn.Has(Quirk.ImpregnationFetish) || pawn.relations?.DirectRelations?.Find(x => x.def.Equals(PawnRelationDefOf.Lover)) != null) if (pawn.Has(Quirk.ImpregnationFetish) || pawn.relations?.DirectRelations?.Find(x => x.def.Equals(PawnRelationDefOf.Lover)) != null)
{ {
pawn.needs.mood.thoughts.memories.TryGainMemory(VariousDefOf.UnwantedPregnancyMild); pawn.needs.mood.thoughts.memories.TryGainMemory(VariousDefOf.UnwantedPregnancyMild);
@ -31,7 +33,10 @@ namespace RJW_Menstruation
} }
} }
} public override void Miscarry()
{
this.GetMenstruationComp().Pregnancy = null;
base.Miscarry();
} }
public override void GiveBirth() public override void GiveBirth()
@ -47,30 +52,33 @@ namespace RJW_Menstruation
Initialize(pawn, father); Initialize(pawn, father);
} }
List<Pawn> siblings = new List<Pawn>();
foreach (Pawn baby in babies) foreach (Pawn baby in babies)
{ {
if (xxx.is_animal(baby)) if (xxx.is_animal(baby))
{ {
BestialBirth(baby, siblings); BestialBirth(baby);
} }
else else
{ {
HumanlikeBirth(baby, siblings); HumanlikeBirth(baby);
} }
baby.ageTracker.AgeChronologicalTicks = 0; baby.ageTracker.AgeChronologicalTicks = 0;
} }
pawn.health.RemoveHediff(this); pawn.health.RemoveHediff(this);
HediffComp_Menstruation comp = this.GetMenstruationComp();
if(comp != null) comp.Pregnancy = null;
} }
public string GetBabyInfo() public string GetBabyInfo()
{ {
if (babies.NullOrEmpty())
return "Null";
string res = ""; string res = "";
if (!babies.NullOrEmpty())
{ IEnumerable<Pawn> babiesdistinct = babies.Distinct(new RaceComparer());
var babiesdistinct = babies.Distinct(new RaceComparer());
int iteration = 0; int iteration = 0;
foreach (Pawn baby in babiesdistinct) foreach (Pawn baby in babiesdistinct)
{ {
@ -82,8 +90,6 @@ namespace RJW_Menstruation
res += " " + Translations.Dialog_WombInfo02; res += " " + Translations.Dialog_WombInfo02;
return res; return res;
} }
return "Null";
}
public string GetFatherInfo() public string GetFatherInfo()
{ {
@ -95,7 +101,7 @@ namespace RJW_Menstruation
if (!is_parent_known && Configurations.InfoDetail != Configurations.DetailLevel.All) if (!is_parent_known && Configurations.InfoDetail != Configurations.DetailLevel.All)
return res + Translations.Dialog_FatherUnknown; return res + Translations.Dialog_FatherUnknown;
var babiesdistinct = babies.Distinct(new FatherComparer(pawn)); IEnumerable<Pawn> babiesdistinct = babies.Distinct(new FatherComparer(pawn));
int iteration = 0; int iteration = 0;
foreach (Pawn baby in babiesdistinct) foreach (Pawn baby in babiesdistinct)
{ {
@ -106,7 +112,7 @@ namespace RJW_Menstruation
return res; return res;
} }
private void HumanlikeBirth(Pawn baby, List<Pawn> siblings) private void HumanlikeBirth(Pawn baby)
{ {
Pawn mother = pawn; Pawn father = Utility.GetFather(baby, pawn); Pawn mother = pawn; Pawn father = Utility.GetFather(baby, pawn);
//backup melanin, LastName for when baby reset by other mod on spawn/backstorychange //backup melanin, LastName for when baby reset by other mod on spawn/backstorychange
@ -115,7 +121,7 @@ namespace RJW_Menstruation
PawnUtility.TrySpawnHatchedOrBornPawn(baby, mother); PawnUtility.TrySpawnHatchedOrBornPawn(baby, mother);
var sex_need = mother.needs?.TryGetNeed<Need_Sex>(); Need_Sex sex_need = mother.needs?.TryGetNeed<Need_Sex>();
if (mother.Faction != null && !(mother.Faction?.IsPlayer ?? false) && sex_need != null) if (mother.Faction != null && !(mother.Faction?.IsPlayer ?? false) && sex_need != null)
{ {
sex_need.CurLevel = 1.0f; sex_need.CurLevel = 1.0f;
@ -144,17 +150,13 @@ namespace RJW_Menstruation
baby.guest.SetGuestStatus(Faction.OfPlayer, GuestStatus.Prisoner); baby.guest.SetGuestStatus(Faction.OfPlayer, GuestStatus.Prisoner);
} }
foreach (Pawn sibling in siblings) if (xxx.is_human(mother)) TaleRecorder.RecordTale(TaleDefOf.GaveBirth, new object[] { mother, baby });
{
baby.relations.AddDirectRelation(PawnRelationDefOf.Sibling, sibling);
}
siblings.Add(baby);
PostBirth(mother, father, baby); PostBirth(mother, father, baby);
} }
private void BestialBirth(Pawn baby, List<Pawn> siblings) private void BestialBirth(Pawn baby)
{ {
Pawn mother = pawn; Pawn father = Utility.GetFather(baby, pawn); Pawn mother = pawn; Pawn father = Utility.GetFather(baby, pawn);
//backup melanin, LastName for when baby reset by other mod on spawn/backstorychange //backup melanin, LastName for when baby reset by other mod on spawn/backstorychange
@ -174,14 +176,6 @@ namespace RJW_Menstruation
baby.SetFaction(mother.Faction); baby.SetFaction(mother.Faction);
} }
if (!RJWSettings.Disable_bestiality_pregnancy_relations)
{
foreach (Pawn sibling in siblings)
{
baby.relations.AddDirectRelation(PawnRelationDefOf.Sibling, sibling);
}
siblings.Add(baby);
}
Train(baby, mother); Train(baby, mother);
PostBirth(mother, father, baby); PostBirth(mother, father, baby);
@ -198,7 +192,6 @@ namespace RJW_Menstruation
List<Trait> momtraits = new List<Trait>(); List<Trait> momtraits = new List<Trait>();
List<Trait> poptraits = new List<Trait>(); List<Trait> poptraits = new List<Trait>();
List<Trait> traits_to_inherit = new List<Trait>(); List<Trait> traits_to_inherit = new List<Trait>();
System.Random rd = new System.Random();
float max_num_momtraits_inherited = RJWPregnancySettings.max_num_momtraits_inherited; float max_num_momtraits_inherited = RJWPregnancySettings.max_num_momtraits_inherited;
float max_num_poptraits_inherited = RJWPregnancySettings.max_num_poptraits_inherited; float max_num_poptraits_inherited = RJWPregnancySettings.max_num_poptraits_inherited;
float max_num_traits_inherited = max_num_momtraits_inherited + max_num_poptraits_inherited; float max_num_traits_inherited = max_num_momtraits_inherited + max_num_poptraits_inherited;
@ -226,7 +219,7 @@ namespace RJW_Menstruation
i = 1; i = 1;
while (momtraits.Count > 0 && i <= max_num_momtraits_inherited) while (momtraits.Count > 0 && i <= max_num_momtraits_inherited)
{ {
rand_trait_index = rd.Next(0, momtraits.Count); rand_trait_index = Rand.Range(0, momtraits.Count);
traits_to_inherit.Add(momtraits[rand_trait_index]); traits_to_inherit.Add(momtraits[rand_trait_index]);
momtraits.RemoveAt(rand_trait_index); momtraits.RemoveAt(rand_trait_index);
} }
@ -236,7 +229,7 @@ namespace RJW_Menstruation
j = 1; j = 1;
while (poptraits.Count > 0 && j <= max_num_poptraits_inherited) while (poptraits.Count > 0 && j <= max_num_poptraits_inherited)
{ {
rand_trait_index = rd.Next(0, poptraits.Count); rand_trait_index = Rand.Range(0, poptraits.Count);
traits_to_inherit.Add(poptraits[rand_trait_index]); traits_to_inherit.Add(poptraits[rand_trait_index]);
poptraits.RemoveAt(rand_trait_index); poptraits.RemoveAt(rand_trait_index);
} }
@ -257,7 +250,7 @@ namespace RJW_Menstruation
{ {
while (poptraits != null && momtraits.Count() > 0 && i <= max_num_momtraits_inherited) while (poptraits != null && momtraits.Count() > 0 && i <= max_num_momtraits_inherited)
{ {
rand_trait_index = rd.Next(0, momtraits.Count); rand_trait_index = Rand.Range(0, momtraits.Count);
if (!traits_to_inherit.Contains(momtraits[rand_trait_index])) if (!traits_to_inherit.Contains(momtraits[rand_trait_index]))
{ {
traits_to_inherit.Add(momtraits[rand_trait_index]); traits_to_inherit.Add(momtraits[rand_trait_index]);
@ -269,7 +262,7 @@ namespace RJW_Menstruation
{ {
while (poptraits.Count > 0 && i < max_num_poptraits_inherited) while (poptraits.Count > 0 && i < max_num_poptraits_inherited)
{ {
rand_trait_index = rd.Next(0, poptraits.Count); rand_trait_index = Rand.Range(0, poptraits.Count);
if (!traits_to_inherit.Contains(poptraits[rand_trait_index])) if (!traits_to_inherit.Contains(poptraits[rand_trait_index]))
{ {
traits_to_inherit.Add(poptraits[rand_trait_index]); traits_to_inherit.Add(poptraits[rand_trait_index]);
@ -295,8 +288,8 @@ namespace RJW_Menstruation
protected void Train(Pawn baby, Pawn mother) protected void Train(Pawn baby, Pawn mother)
{ {
if (!xxx.is_human(baby) && baby.Faction == Faction.OfPlayer) if (xxx.is_human(baby) || baby.Faction != Faction.OfPlayer) return;
{
if (xxx.is_human(mother) && baby.Faction == Faction.OfPlayer && baby.training.CanAssignToTrain(TrainableDefOf.Obedience, out _).Accepted) if (xxx.is_human(mother) && baby.Faction == Faction.OfPlayer && baby.training.CanAssignToTrain(TrainableDefOf.Obedience, out _).Accepted)
{ {
baby.training.Train(TrainableDefOf.Obedience, mother); baby.training.Train(TrainableDefOf.Obedience, mother);
@ -306,7 +299,6 @@ namespace RJW_Menstruation
baby.training.Train(TrainableDefOf.Tameness, mother); baby.training.Train(TrainableDefOf.Tameness, mother);
} }
} }
}
public bool AddNewBaby(Pawn mother, Pawn father) public bool AddNewBaby(Pawn mother, Pawn father)
@ -421,18 +413,18 @@ namespace RJW_Menstruation
public Pawn GenerateBaby(PawnGenerationRequest request, Pawn mother, Pawn father, List<Trait> parentTraits, int traitSeed) public Pawn GenerateBaby(PawnGenerationRequest request, Pawn mother, Pawn father, List<Trait> parentTraits, int traitSeed)
{ {
Pawn baby = PawnGenerator.GeneratePawn(request); Pawn baby = PawnGenerator.GeneratePawn(request);
if (baby != null) if (baby == null)
{ {
Log.Error("Baby not generated. Request: " + request.ToString());
return null;
}
if (xxx.is_human(baby) || (baby.relations != null && !RJWSettings.Disable_bestiality_pregnancy_relations)) if (xxx.is_human(baby) || (baby.relations != null && !RJWSettings.Disable_bestiality_pregnancy_relations))
{ {
baby.SetMother(mother); baby.SetMother(mother);
if (mother != father) if (mother != father)
{ {
if (father.gender != Gender.Female) baby.SetFather(father); if (father.gender != Gender.Female) baby.SetFather(father);
else else baby.relations.AddDirectRelation(PawnRelationDefOf.Parent, father);
{
baby.relations.AddDirectRelation(PawnRelationDefOf.Parent, father);
}
} }
} }
if (xxx.is_human(baby)) if (xxx.is_human(baby))
@ -443,8 +435,6 @@ namespace RJW_Menstruation
UpdateTraits(baby, parentTraits); UpdateTraits(baby, parentTraits);
Rand.PopState(); Rand.PopState();
} }
}
else Log.Error("Baby not generated. Request: " + request.ToString());
return baby; return baby;
} }
@ -457,7 +447,10 @@ namespace RJW_Menstruation
/// <returns></returns> /// <returns></returns>
public PawnKindDef BabyPawnKindDecider(Pawn mother, Pawn father) public PawnKindDef BabyPawnKindDecider(Pawn mother, Pawn father)
{ {
PawnKindDef spawn_kind_def = mother.kindDef; PawnKindDef motherKindDef = Utility.GetRacesPawnKind(mother);
PawnKindDef fatherKindDef = Utility.GetRacesPawnKind(father);
PawnKindDef spawn_kind_def = motherKindDef;
int flag = 0; int flag = 0;
if (xxx.is_human(mother)) flag += 2; if (xxx.is_human(mother)) flag += 2;
@ -471,18 +464,18 @@ namespace RJW_Menstruation
switch (flag) switch (flag)
{ {
case 3: case 3:
if (!Rand.Chance(RJWPregnancySettings.humanlike_DNA_from_mother)) spawn_kind_def = father.kindDef; if (!Rand.Chance(RJWPregnancySettings.humanlike_DNA_from_mother)) spawn_kind_def = fatherKindDef;
break; break;
case 2: case 2:
if (RJWPregnancySettings.bestiality_DNA_inheritance == 0f) spawn_kind_def = father.kindDef; if (RJWPregnancySettings.bestiality_DNA_inheritance == 0f) spawn_kind_def = fatherKindDef;
else if (!Rand.Chance(RJWPregnancySettings.bestial_DNA_from_mother)) spawn_kind_def = father.kindDef; else if (!Rand.Chance(RJWPregnancySettings.bestial_DNA_from_mother)) spawn_kind_def = fatherKindDef;
break; break;
case 1: case 1:
if (RJWPregnancySettings.bestiality_DNA_inheritance == 1f) spawn_kind_def = father.kindDef; if (RJWPregnancySettings.bestiality_DNA_inheritance == 1f) spawn_kind_def = fatherKindDef;
else if (!Rand.Chance(RJWPregnancySettings.bestial_DNA_from_mother)) spawn_kind_def = father.kindDef; else if (!Rand.Chance(RJWPregnancySettings.bestial_DNA_from_mother)) spawn_kind_def = fatherKindDef;
break; break;
case 0: case 0:
if (!Rand.Chance(RJWPregnancySettings.bestial_DNA_from_mother)) spawn_kind_def = father.kindDef; if (!Rand.Chance(RJWPregnancySettings.bestial_DNA_from_mother)) spawn_kind_def = fatherKindDef;
break; break;
} }
@ -490,19 +483,19 @@ namespace RJW_Menstruation
bool IsAndroidfather = AndroidsCompatibility.IsAndroid(father); bool IsAndroidfather = AndroidsCompatibility.IsAndroid(father);
if (IsAndroidmother && !IsAndroidfather) if (IsAndroidmother && !IsAndroidfather)
{ {
spawn_kind_def = father.kindDef; spawn_kind_def = fatherKindDef;
} }
else if (!IsAndroidmother && IsAndroidfather) else if (!IsAndroidmother && IsAndroidfather)
{ {
spawn_kind_def = mother.kindDef; spawn_kind_def = motherKindDef;
} }
string MotherRaceName = ""; string MotherRaceName = "";
string FatherRaceName = ""; string FatherRaceName = "";
MotherRaceName = mother.kindDef?.race?.defName; MotherRaceName = motherKindDef?.race?.defName;
PawnKindDef non_hybrid_kind_def = spawn_kind_def; PawnKindDef non_hybrid_kind_def = spawn_kind_def;
if (father != null) if (father != null)
FatherRaceName = father.kindDef?.race?.defName; FatherRaceName = fatherKindDef?.race?.defName;
if (FatherRaceName != "" && Configurations.UseHybridExtention) if (FatherRaceName != "" && Configurations.UseHybridExtention)
@ -516,24 +509,24 @@ namespace RJW_Menstruation
if (!Configurations.UseHybridExtention || spawn_kind_def == null) if (!Configurations.UseHybridExtention || spawn_kind_def == null)
{ {
spawn_kind_def = non_hybrid_kind_def; spawn_kind_def = non_hybrid_kind_def;
var groups = DefDatabase<RaceGroupDef>.AllDefs.Where(x => !(x.hybridRaceParents.NullOrEmpty() || x.hybridChildKindDef.NullOrEmpty())); IEnumerable<RaceGroupDef> groups = DefDatabase<RaceGroupDef>.AllDefs.Where(x => !(x.hybridRaceParents.NullOrEmpty() || x.hybridChildKindDef.NullOrEmpty()));
//ModLog.Message(" found custom RaceGroupDefs " + groups.Count()); //ModLog.Message(" found custom RaceGroupDefs " + groups.Count());
foreach (var t in groups) foreach (RaceGroupDef t in groups)
{ {
if ((t.hybridRaceParents.Contains(MotherRaceName) && t.hybridRaceParents.Contains(FatherRaceName)) if ((t.hybridRaceParents.Contains(MotherRaceName) && t.hybridRaceParents.Contains(FatherRaceName))
|| (t.hybridRaceParents.Contains("Any") && (t.hybridRaceParents.Contains(MotherRaceName) || t.hybridRaceParents.Contains(FatherRaceName)))) || (t.hybridRaceParents.Contains("Any") && (t.hybridRaceParents.Contains(MotherRaceName) || t.hybridRaceParents.Contains(FatherRaceName))))
{ {
//ModLog.Message(" has hybridRaceParents"); //ModLog.Message(" has hybridRaceParents");
if (t.hybridChildKindDef.Contains("MotherKindDef")) if (t.hybridChildKindDef.Contains("MotherKindDef"))
spawn_kind_def = mother.kindDef; spawn_kind_def = motherKindDef;
else if (t.hybridChildKindDef.Contains("FatherKindDef") && father != null) else if (t.hybridChildKindDef.Contains("FatherKindDef") && father != null)
spawn_kind_def = father.kindDef; spawn_kind_def = fatherKindDef;
else else
{ {
//ModLog.Message(" trying hybridChildKindDef " + t.defName); //ModLog.Message(" trying hybridChildKindDef " + t.defName);
var child_kind_def_list = new List<PawnKindDef>(); List<PawnKindDef> child_kind_def_list = new List<PawnKindDef>();
child_kind_def_list.AddRange(DefDatabase<PawnKindDef>.AllDefs.Where(x => t.hybridChildKindDef.Contains(x.defName))); child_kind_def_list.AddRange(DefDatabase<PawnKindDef>.AllDefs.Where(x => t.hybridChildKindDef.Contains(x.defName)));
//ModLog.Message(" found custom hybridChildKindDefs " + t.hybridChildKindDef.Count); //ModLog.Message(" found custom hybridChildKindDefs " + t.hybridChildKindDef.Count);
@ -547,20 +540,20 @@ namespace RJW_Menstruation
} }
else if (!Configurations.UseHybridExtention || spawn_kind_def == null) else if (!Configurations.UseHybridExtention || spawn_kind_def == null)
{ {
spawn_kind_def = mother.RaceProps?.AnyPawnKind ?? mother.kindDef; spawn_kind_def = mother.RaceProps?.AnyPawnKind ?? motherKindDef;
} }
if (spawn_kind_def.defName.Contains("Nymph")) if (spawn_kind_def.defName.Contains("Nymph"))
{ {
//child is nymph, try to find other PawnKindDef //child is nymph, try to find other PawnKindDef
var spawn_kind_def_list = new List<PawnKindDef>(); List<PawnKindDef> spawn_kind_def_list = new List<PawnKindDef>();
spawn_kind_def_list.AddRange(DefDatabase<PawnKindDef>.AllDefs.Where(x => x.race == spawn_kind_def.race && !x.defName.Contains("Nymph"))); spawn_kind_def_list.AddRange(DefDatabase<PawnKindDef>.AllDefs.Where(x => x.race == spawn_kind_def.race && !x.defName.Contains("Nymph")));
//no other PawnKindDef found try mother //no other PawnKindDef found try mother
if (spawn_kind_def_list.NullOrEmpty()) if (spawn_kind_def_list.NullOrEmpty())
spawn_kind_def_list.AddRange(DefDatabase<PawnKindDef>.AllDefs.Where(x => x.race == mother.kindDef.race && !x.defName.Contains("Nymph"))); spawn_kind_def_list.AddRange(DefDatabase<PawnKindDef>.AllDefs.Where(x => x.race == motherKindDef.race && !x.defName.Contains("Nymph")));
//no other PawnKindDef found try father //no other PawnKindDef found try father
if (spawn_kind_def_list.NullOrEmpty() && father != null) if (spawn_kind_def_list.NullOrEmpty() && father != null)
spawn_kind_def_list.AddRange(DefDatabase<PawnKindDef>.AllDefs.Where(x => x.race == father.kindDef.race && !x.defName.Contains("Nymph"))); spawn_kind_def_list.AddRange(DefDatabase<PawnKindDef>.AllDefs.Where(x => x.race == fatherKindDef.race && !x.defName.Contains("Nymph")));
//no other PawnKindDef found fallback to generic colonist //no other PawnKindDef found fallback to generic colonist
if (spawn_kind_def_list.NullOrEmpty()) if (spawn_kind_def_list.NullOrEmpty())
spawn_kind_def = PawnKindDefOf.Colonist; spawn_kind_def = PawnKindDefOf.Colonist;
@ -568,9 +561,6 @@ namespace RJW_Menstruation
if (!spawn_kind_def_list.NullOrEmpty()) spawn_kind_def = spawn_kind_def_list.RandomElement(); if (!spawn_kind_def_list.NullOrEmpty()) spawn_kind_def = spawn_kind_def_list.RandomElement();
} }
return spawn_kind_def; return spawn_kind_def;
} }
@ -643,12 +633,12 @@ namespace RJW_Menstruation
numberInherited = 0; numberInherited = 0;
//Game suggested traits. //Game suggested traits.
var forcedTraits = personalTraitPool IEnumerable<Trait> forcedTraits = personalTraitPool
.Where(x => x.ScenForced) .Where(x => x.ScenForced)
.Distinct(new TraitComparer(ignoreDegree: true)); // result can be a mess, because game allows this mess to be created in scenario editor .Distinct(new TraitComparer(ignoreDegree: true)); // result can be a mess, because game allows this mess to be created in scenario editor
List<Trait> selectedTraits = new List<Trait>(); List<Trait> selectedTraits = new List<Trait>();
var comparer = new TraitComparer(); // trait comparision implementation, because without game compares traits *by reference*, makeing them all unique. TraitComparer comparer = new TraitComparer(); // trait comparision implementation, because without game compares traits *by reference*, makeing them all unique.
selectedTraits.AddRange(forcedTraits); // enforcing scenario forced traits selectedTraits.AddRange(forcedTraits); // enforcing scenario forced traits
for (int i = 0; i < numberInherited; i++) // add parent traits first for (int i = 0; i < numberInherited; i++) // add parent traits first
{ {
@ -663,7 +653,7 @@ namespace RJW_Menstruation
while (selectedTraits.Count < traitLimit && personalTraitPool.Count > 0) while (selectedTraits.Count < traitLimit && personalTraitPool.Count > 0)
{ {
int index = Rand.Range(0, personalTraitPool.Count); // getting trait and removing from the pull int index = Rand.Range(0, personalTraitPool.Count); // getting trait and removing from the pull
var trait = personalTraitPool[index]; Trait trait = personalTraitPool[index];
personalTraitPool.RemoveAt(index); personalTraitPool.RemoveAt(index);
if (!selectedTraits.Any(x => comparer.Equals(x, trait) || // skipping traits conflicting with already added if (!selectedTraits.Any(x => comparer.Equals(x, trait) || // skipping traits conflicting with already added

8
1.3/source/RJW_Menstruation/RJW_Menstruation/IngestionOutcomeDoers.cs
View file

@ -1,11 +1,5 @@
using System; using RimWorld;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using RimWorld;
using Verse; using Verse;
using rjw;
namespace RJW_Menstruation namespace RJW_Menstruation
{ {

15
1.3/source/RJW_Menstruation/RJW_Menstruation/JobDrivers.cs
View file

@ -1,5 +1,6 @@
using System.Collections.Generic; using RimWorld;
using RimWorld; using System.Collections.Generic;
using System.Linq;
using Verse; using Verse;
using Verse.AI; using Verse.AI;
@ -16,11 +17,10 @@ namespace RJW_Menstruation
protected override IEnumerable<Toil> MakeNewToils() protected override IEnumerable<Toil> MakeNewToils()
{ {
List<HediffComp_Menstruation> comps = pawn.GetMenstruationComps().ToList();
HediffComp_Menstruation Comp = pawn.GetMenstruationComp();
this.FailOn(delegate this.FailOn(delegate
{ {
return !(Comp.TotalCumPercent > 0.001); return comps.All(comp => comp.TotalCumPercent < 0.001);
}); });
Toil excreting = Toils_General.Wait(excretingTime, TargetIndex.None);//duration of Toil excreting = Toils_General.Wait(excretingTime, TargetIndex.None);//duration of
@ -30,8 +30,9 @@ namespace RJW_Menstruation
{ {
initAction = delegate () initAction = delegate ()
{ {
Comp.CumOut(null, 0.5f); foreach (HediffComp_Menstruation comp in comps)
if (Comp.TotalCumPercent > 0.001) JumpToToil(excreting); comp.CumOut(null, 0.5f);
if (comps.Any(comp => comp.TotalCumPercent > 0.001)) JumpToToil(excreting);
} }
}; };
//yield return excreting; //yield return excreting;

11
1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/GC_Patch.cs
View file

@ -1,9 +1,9 @@
using System.Collections.Generic; using HarmonyLib;
using System.Linq;
using HarmonyLib;
using Verse;
using RimWorld; using RimWorld;
using RimWorld.Planet; using RimWorld.Planet;
using System.Collections.Generic;
using System.Linq;
using Verse;
namespace RJW_Menstruation.Patch namespace RJW_Menstruation.Patch
{ {
@ -29,8 +29,7 @@ namespace RJW_Menstruation.Patch
// foreach(Pawn p in PawnsFinder.All_AliveOrDead) // foreach(Pawn p in PawnsFinder.All_AliveOrDead)
foreach (Pawn p in PawnsFinder.AllMapsCaravansAndTravelingTransportPods_Alive_OfPlayerFaction.Union(PawnsFinder.AllMapsCaravansAndTravelingTransportPods_Alive_PrisonersOfColony)) foreach (Pawn p in PawnsFinder.AllMapsCaravansAndTravelingTransportPods_Alive_OfPlayerFaction.Union(PawnsFinder.AllMapsCaravansAndTravelingTransportPods_Alive_PrisonersOfColony))
{ {
HediffComp_Menstruation comp = p.GetMenstruationComp(); foreach (HediffComp_Menstruation comp in p.GetMenstruationComps())
if (comp is null) continue;
GetCriticalPawnReason_Patch.cummedPawns.UnionWith(comp.GetCummersAndFertilizers()); GetCriticalPawnReason_Patch.cummedPawns.UnionWith(comp.GetCummersAndFertilizers());
} }
} }

8
1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/GetGizmos.cs
View file

@ -28,9 +28,7 @@ namespace RJW_Menstruation
foreach (Gizmo gizmo in gizmos) foreach (Gizmo gizmo in gizmos)
yield return gizmo; yield return gizmo;
HediffComp_Menstruation comp = __instance.GetMenstruationComp(); foreach (HediffComp_Menstruation comp in __instance.GetMenstruationComps())
if (comp == null) yield break;
foreach (Gizmo gizmo in GetMenstruationGizmos(__instance, comp)) foreach (Gizmo gizmo in GetMenstruationGizmos(__instance, comp))
yield return gizmo; yield return gizmo;
} }
@ -49,8 +47,8 @@ namespace RJW_Menstruation
else description += comp.GetCurStageLabel + "\n"; else description += comp.GetCurStageLabel + "\n";
if (pawn.IsPregnant()) if (pawn.IsPregnant())
{ {
Hediff hediff = PregnancyHelper.GetPregnancy(pawn); Hediff_BasePregnancy hediff = comp.Pregnancy;
if (Utility.ShowFetusImage((Hediff_BasePregnancy)hediff)) if (Utility.ShowFetusImage(hediff))
{ {
icon = comp.GetPregnancyIcon(hediff); icon = comp.GetPregnancyIcon(hediff);
if (hediff is Hediff_BasePregnancy h) if (hediff is Hediff_BasePregnancy h)

4
1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/Harmony.cs
View file

@ -14,14 +14,14 @@ namespace RJW_Menstruation
{ {
static First() static First()
{ {
var har = new Harmony("RJW_Menstruation"); Harmony har = new Harmony("RJW_Menstruation");
har.PatchAll(Assembly.GetExecutingAssembly()); har.PatchAll(Assembly.GetExecutingAssembly());
InjectIntoRjwInteractionServices(); InjectIntoRjwInteractionServices();
} }
private static void InjectIntoRjwInteractionServices() private static void InjectIntoRjwInteractionServices()
{ {
var log = LogManager.GetLogger("StaticConstructorOnStartup"); ILog log = LogManager.GetLogger("StaticConstructorOnStartup");
List<IPartPreferenceRule> partKindUsageRules = Unprivater.GetProtectedValue<List<IPartPreferenceRule>>("_partKindUsageRules", typeof(PartPreferenceDetectorService)); List<IPartPreferenceRule> partKindUsageRules = Unprivater.GetProtectedValue<List<IPartPreferenceRule>>("_partKindUsageRules", typeof(PartPreferenceDetectorService));
partKindUsageRules.Add(new Interactions.EstrusPartKindUsageRule()); partKindUsageRules.Add(new Interactions.EstrusPartKindUsageRule());

10
1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/Pawn_Patch.cs
View file

@ -2,10 +2,8 @@
using HugsLib; using HugsLib;
using RimWorld; using RimWorld;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using UnityEngine; using UnityEngine;
using Verse; using Verse;
using rjw;
namespace RJW_Menstruation namespace RJW_Menstruation
{ {
@ -16,20 +14,18 @@ namespace RJW_Menstruation
public static void Postfix(Pawn __instance) public static void Postfix(Pawn __instance)
{ {
//Log.Message("Initialize on spawnsetup"); //Log.Message("Initialize on spawnsetup");
HediffComp_Menstruation comp = __instance.GetMenstruationComp(); foreach (HediffComp_Menstruation comp in __instance.GetMenstruationComps())
if (comp != null)
{ {
HugsLibController.Instance.TickDelayScheduler.TryUnscheduleCallback(comp.actionref); HugsLibController.Instance.TickDelayScheduler.TryUnscheduleCallback(comp.actionref);
comp.Initialize(); comp.Initialize();
} }
HediffComp_Breast bcomp = __instance.GetBreastComp(); HediffComp_Breast bcomp = __instance.GetBreastComp();
if (bcomp != null) if (bcomp != null)
{ {
HugsLibController.Instance.TickDelayScheduler.TryUnscheduleCallback(bcomp.action); HugsLibController.Instance.TickDelayScheduler.TryUnscheduleCallback(bcomp.action);
bcomp.Initialize(); bcomp.Initialize();
} }
} }
} }
@ -38,7 +34,7 @@ namespace RJW_Menstruation
{ {
public static void Postfix(Vector3 clickPos, Pawn pawn, List<FloatMenuOption> opts) public static void Postfix(Vector3 clickPos, Pawn pawn, List<FloatMenuOption> opts)
{ {
var selftargets = GenUI.TargetsAt(clickPos, TargetingParameters.ForSelf(pawn)); IEnumerable<LocalTargetInfo> selftargets = GenUI.TargetsAt(clickPos, TargetingParameters.ForSelf(pawn));
foreach (LocalTargetInfo t in selftargets) foreach (LocalTargetInfo t in selftargets)
{ {

98
1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs
View file

@ -2,12 +2,12 @@
using rjw; using rjw;
using rjw.Modules.Interactions.Enums; using rjw.Modules.Interactions.Enums;
using rjw.Modules.Interactions.Objects; using rjw.Modules.Interactions.Objects;
using Verse;
using UnityEngine;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Reflection.Emit; using System.Reflection.Emit;
using UnityEngine;
using Verse;
namespace RJW_Menstruation namespace RJW_Menstruation
{ {
@ -15,22 +15,28 @@ namespace RJW_Menstruation
[HarmonyPatch(typeof(PregnancyHelper), nameof(PregnancyHelper.impregnate))] [HarmonyPatch(typeof(PregnancyHelper), nameof(PregnancyHelper.impregnate))]
public static class Impregnate_Patch public static class Impregnate_Patch
{ {
public static bool Prefix(SexProps props) public static bool Prefix(SexProps props, out HediffComp_Menstruation __state)
{ {
xxx.rjwSextype sextype = props.sexType; xxx.rjwSextype sextype = props.sexType;
Pawn pawn = props.pawn; Pawn pawn = props.pawn;
Pawn partner = props.partner; Pawn partner = props.partner;
if (PregnancyHelper.GetPregnancy(partner) is Hediff_BasePregnancy oldestPregnancy) __state = oldestPregnancy.GetMenstruationComp();
else __state = null;
if (sextype != xxx.rjwSextype.Vaginal && sextype != xxx.rjwSextype.DoublePenetration) return true; if (sextype != xxx.rjwSextype.Vaginal && sextype != xxx.rjwSextype.DoublePenetration) return true;
if (partner.IsAnimal() && !Configurations.EnableAnimalCycle) return true; if (partner.IsAnimal() && !Configurations.EnableAnimalCycle) return true;
if (!InteractionCanCausePregnancy(props)) return false; if (!InteractionCanCausePregnancy(props)) return false;
var pawnparts = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn)); List<Hediff> pawnparts = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn));
HediffComp_Menstruation comp = partner.GetMenstruationComp(); HediffComp_Menstruation comp;
if (comp is null) return true; if (pawn.Has(Quirk.ImpregnationFetish) || partner.Has(Quirk.ImpregnationFetish) || partner.IsInEstrus())
comp = partner.GetFertileMenstruationComp();
else comp = partner.GetRandomMenstruationComp();
if (comp == null) return true;
if (Genital_Helper.has_penis_fertile(pawn, pawnparts) && PregnancyHelper.CanImpregnate(pawn, partner, sextype)) if (Genital_Helper.has_penis_fertile(pawn, pawnparts) && PregnancyHelper.CanImpregnate(pawn, partner, sextype))
{ {
@ -44,8 +50,18 @@ namespace RJW_Menstruation
else comp.CumIn(pawn, pawn.GetCumVolume(pawnparts), 0); else comp.CumIn(pawn, pawn.GetCumVolume(pawnparts), 0);
return true; return true;
}
public static void Postfix(SexProps props, HediffComp_Menstruation __state)
{
if (__state == null || __state.Pregnancy != null) return;
// It was pregnant, but not anymore. This probably means the pregnancy was destroyed by e.g. a mech implant
Pawn pawn = props.partner;
Hediff_BasePregnancy newestPregnancy = pawn.health.hediffSet.GetHediffs<Hediff_BasePregnancy>().MaxBy(hediff => hediff.loadID);
if (newestPregnancy == null) return;
if (pawn.GetMenstruationComps().Any(comp => comp.Pregnancy == newestPregnancy)) return; // One of the wombs did get it
else __state.Pregnancy = newestPregnancy;
} }
/// <summary> /// <summary>
@ -85,10 +101,16 @@ namespace RJW_Menstruation
public static bool Prefix(Pawn pawn, Pawn partner) // partner has vagina public static bool Prefix(Pawn pawn, Pawn partner) // partner has vagina
{ {
if (partner.IsAnimal() && !Configurations.EnableAnimalCycle) return true; if (partner.IsAnimal() && !Configurations.EnableAnimalCycle) return true;
HediffComp_Menstruation comp = partner.GetMenstruationComp(); HediffComp_Menstruation comp;
if (comp != null) if (pawn.Has(Quirk.ImpregnationFetish) || partner.Has(Quirk.ImpregnationFetish) || partner.IsInEstrus())
comp = partner.GetFertileMenstruationComp();
else comp = partner.GetRandomMenstruationComp();
if (comp == null)
{ {
if (AndroidsCompatibility.IsAndroid(pawn) && !AndroidsCompatibility.AndroidPenisFertility(pawn)) if (Configurations.Debug) ModLog.Message("used original rjw method: Comp missing");
return true;
}
else if (AndroidsCompatibility.IsAndroid(pawn) && !AndroidsCompatibility.AndroidPenisFertility(pawn))
{ {
comp.CumIn(pawn, pawn.GetCumVolume(), 0); comp.CumIn(pawn, pawn.GetCumVolume(), 0);
return false; return false;
@ -96,19 +118,41 @@ namespace RJW_Menstruation
else comp.CumIn(pawn, pawn.GetCumVolume(), pawn.health.capacities.GetLevel(xxx.reproduction)); else comp.CumIn(pawn, pawn.GetCumVolume(), pawn.health.capacities.GetLevel(xxx.reproduction));
return false; return false;
} }
ModLog.Message("used original rjw method: Comp missing"); }
return true;
[HarmonyPatch(typeof(PregnancyHelper), nameof(PregnancyHelper.CanImpregnate))]
public static class CanImpregnate_Patch
{
private static bool PregnancyBlocksImpregnation(this Pawn pawn, bool _)
{
if (!Configurations.EnableAnimalCycle && pawn.IsAnimal()) return pawn.IsPregnant();
else if (pawn.GetMenstruationComps().Any()) return false;
else return pawn.IsPregnant();
}
private static readonly MethodInfo IsPregnant = AccessTools.Method(typeof(PawnExtensions), nameof(PawnExtensions.IsPregnant), new System.Type[] {typeof(Pawn), typeof(bool)});
public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
{
if (IsPregnant == null) throw new System.InvalidOperationException("IsPregnant not found");
foreach(CodeInstruction instruction in instructions)
{
if (instruction.Calls(IsPregnant))
yield return CodeInstruction.Call(typeof(CanImpregnate_Patch), nameof(PregnancyBlocksImpregnation));
else yield return instruction;
}
} }
} }
[HarmonyPatch(typeof(Hediff_BasePregnancy), nameof(Hediff_BasePregnancy.PostBirth))] [HarmonyPatch(typeof(Hediff_BasePregnancy), nameof(Hediff_BasePregnancy.PostBirth))]
public static class RJW_Patch_PostBirth public static class RJW_Patch_PostBirth
{ {
public static void Postfix(Pawn mother, Pawn baby) public static void Postfix(Hediff_BasePregnancy __instance, Pawn mother, Pawn baby)
{ {
if (Configurations.EnableBirthVaginaMorph) if (Configurations.EnableBirthVaginaMorph)
{ {
Hediff vagina = mother.health.hediffSet.hediffs.FirstOrFallback(x => x.def.defName.ToLower().Contains("vagina")); // The comp still has the pregnancy attached at this point in the process
Hediff vagina = __instance.GetMenstruationComp()?.parent;
if (vagina == null) vagina = mother.health.hediffSet.hediffs.FirstOrFallback(x => VariousDefOf.AllVaginas.Contains(x.def));
if (vagina == null) return;
float morph = Mathf.Max(baby.BodySize - Mathf.Pow(vagina.Severity * mother.BodySize, 2), 0f); float morph = Mathf.Max(baby.BodySize - Mathf.Pow(vagina.Severity * mother.BodySize, 2), 0f);
vagina.Severity += morph * Configurations.VaginaMorphPower; vagina.Severity += morph * Configurations.VaginaMorphPower;
} }
@ -123,9 +167,9 @@ namespace RJW_Menstruation
// This is stricter than can_impregnate, so quickly filter out scenarios that are negative anyways. // This is stricter than can_impregnate, so quickly filter out scenarios that are negative anyways.
if (__result == false || __instance != Quirk.ImpregnationFetish) return; if (__result == false || __instance != Quirk.ImpregnationFetish) return;
__result = __result =
((PregnancyHelper.CanImpregnate(pawn, partner) && (partner.GetMenstruationComp()?.IsDangerDay ?? true)) (PregnancyHelper.CanImpregnate(pawn, partner) && (partner.GetMenstruationComps()?.Any(comp => comp.IsDangerDay) ?? true))
|| ||
(PregnancyHelper.CanImpregnate(partner, pawn) && (pawn.GetMenstruationComp()?.IsDangerDay ?? true))); (PregnancyHelper.CanImpregnate(partner, pawn) && (pawn.GetMenstruationComps()?.Any(comp => comp.IsDangerDay) ?? true));
} }
} }
@ -144,9 +188,9 @@ namespace RJW_Menstruation
else __result--; else __result--;
if ( if (
(PregnancyHelper.CanImpregnate(pawn, partner, props.sexType) && (partner.GetMenstruationComp()?.IsDangerDay ?? true)) (PregnancyHelper.CanImpregnate(pawn, partner, props.sexType) && (partner.GetMenstruationComps()?.Any(comp => comp.IsDangerDay) ?? true))
|| ||
(PregnancyHelper.CanImpregnate(partner, pawn, props.sexType) && (pawn.GetMenstruationComp()?.IsDangerDay ?? true))) (PregnancyHelper.CanImpregnate(partner, pawn, props.sexType) && (pawn.GetMenstruationComps()?.Any(comp => comp.IsDangerDay) ?? true)))
__result++; __result++;
} }
} }
@ -195,6 +239,7 @@ namespace RJW_Menstruation
private static readonly FieldInfo MinimumFuckabilityToHookup = AccessTools.Field(typeof(RJWHookupSettings), nameof(RJWHookupSettings.MinimumFuckabilityToHookup)); private static readonly FieldInfo MinimumFuckabilityToHookup = AccessTools.Field(typeof(RJWHookupSettings), nameof(RJWHookupSettings.MinimumFuckabilityToHookup));
public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions) public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
{ {
if (MinimumFuckabilityToHookup == null) throw new System.InvalidOperationException("MinimumFuckabilityToHookup not found");
bool first_fuckability = true; bool first_fuckability = true;
foreach (CodeInstruction instruction in instructions) foreach (CodeInstruction instruction in instructions)
{ {
@ -230,6 +275,8 @@ namespace RJW_Menstruation
private static readonly FieldInfo MinimumRelationshipToHookup = AccessTools.Field(typeof(RJWHookupSettings), nameof(RJWHookupSettings.MinimumRelationshipToHookup)); private static readonly FieldInfo MinimumRelationshipToHookup = AccessTools.Field(typeof(RJWHookupSettings), nameof(RJWHookupSettings.MinimumRelationshipToHookup));
public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions) public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
{ {
if (MinimumAttractivenessToHookup == null) throw new System.InvalidOperationException("MinimumAttractivenessToHookup not found");
if (MinimumRelationshipToHookup == null) throw new System.InvalidOperationException("MinimumRelationshipToHookup not found");
LocalBuilder pawn_index = null; LocalBuilder pawn_index = null;
// Like in the last one, we switch the arguments around for the second load // Like in the last one, we switch the arguments around for the second load
bool first_attractiveness = true; bool first_attractiveness = true;
@ -237,7 +284,7 @@ namespace RJW_Menstruation
foreach (CodeInstruction instruction in instructions) foreach (CodeInstruction instruction in instructions)
{ {
// Get where the compiler decided to index the pawn at // Get where the compiler decided to index the pawn at
if (pawn_index is null && instruction.opcode == OpCodes.Stloc_S) // the first stloc.s in the IL is the pawn being loaded out of the list if (pawn_index == null && instruction.opcode == OpCodes.Stloc_S) // the first stloc.s in the IL is the pawn being loaded out of the list
{ // a future RJW or compiler update might change this, or maybe another mod's patch { // a future RJW or compiler update might change this, or maybe another mod's patch
pawn_index = (LocalBuilder)instruction.operand; pawn_index = (LocalBuilder)instruction.operand;
yield return instruction; yield return instruction;
@ -269,6 +316,21 @@ namespace RJW_Menstruation
} }
} }
[HarmonyPatch(typeof(JobDriver_Sex), nameof(JobDriver_Sex.PlayCumSound))]
public static class Orgasm_Patch
{
public static void Postfix(JobDriver_Sex __instance)
{
#if false
Pawn pawn = __instance.pawn;
foreach (HediffComp_Menstruation comp in pawn.GetMenstruationComps())
{
comp.CumIn(pawn, (comp.parent.Severity / 10) * Rand.Range(0.75f, 1.25f), pawn.Label, -5.0f, VariousDefOf.GirlCumFilth);
}
#endif
}
}
[HarmonyPatch(typeof(CompHediffBodyPart), nameof(CompHediffBodyPart.updatesize))] [HarmonyPatch(typeof(CompHediffBodyPart), nameof(CompHediffBodyPart.updatesize))]
public static class Updatesize_Patch public static class Updatesize_Patch
{ {

1
1.3/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj
View file

@ -101,6 +101,7 @@
<HintPath>..\..\..\..\..\rjw\1.3\Assemblies\RJW.dll</HintPath> <HintPath>..\..\..\..\..\rjw\1.3\Assemblies\RJW.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="UnityEngine"> <Reference Include="UnityEngine">
<HintPath>..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.dll</HintPath> <HintPath>..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.dll</HintPath>

10
1.3/source/RJW_Menstruation/RJW_Menstruation/Recipe_Surgery.cs
View file

@ -1,11 +1,7 @@
using System; using RimWorld;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using RimWorld;
using Verse;
using rjw; using rjw;
using System.Collections.Generic;
using Verse;
namespace RJW_Menstruation namespace RJW_Menstruation

8
1.3/source/RJW_Menstruation/RJW_Menstruation/TextureCache.cs
View file

@ -1,11 +1,5 @@
using System; using UnityEngine;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using RimWorld;
using Verse; using Verse;
using UnityEngine;
namespace RJW_Menstruation namespace RJW_Menstruation
{ {

35
1.3/source/RJW_Menstruation/RJW_Menstruation/Things.cs
View file

@ -1,8 +1,7 @@
using System; using RimWorld;
using System.Xml;
using System.Collections.Generic;
using RimWorld;
using rjw; using rjw;
using System.Collections.Generic;
using System.Xml;
using UnityEngine; using UnityEngine;
using Verse; using Verse;
@ -20,10 +19,7 @@ namespace RJW_Menstruation
public HybridExtension GetHybridExtension(string race) public HybridExtension GetHybridExtension(string race)
{ {
if (hybridExtension.NullOrEmpty()) return null; if (hybridExtension.NullOrEmpty()) return null;
else else return hybridExtension.Find(x => x.thingDef.defName.Equals(race));
{
return hybridExtension.Find(x => x.thingDef.defName.Equals(race));
}
} }
public PawnKindDef GetHybridWith(string race) public PawnKindDef GetHybridWith(string race)
@ -75,13 +71,7 @@ namespace RJW_Menstruation
#endif #endif
hybridInfo.Add(node.Name, ParseHelper.FromString<float>(node.InnerText)); hybridInfo.Add(node.Name, ParseHelper.FromString<float>(node.InnerText));
} }
} }
} }
public class HybridInformations : IExposable public class HybridInformations : IExposable
@ -145,9 +135,6 @@ namespace RJW_Menstruation
Scribe_Values.Look(ref thingDefName, "thingDefName"); Scribe_Values.Look(ref thingDefName, "thingDefName");
Scribe_Collections.Look(ref hybridExtension, "hybridExtension", LookMode.Deep, new object[0]); Scribe_Collections.Look(ref hybridExtension, "hybridExtension", LookMode.Deep, new object[0]);
} }
} }
public class HybridExtensionExposable : HybridExtension, IExposable public class HybridExtensionExposable : HybridExtension, IExposable
@ -197,10 +184,6 @@ namespace RJW_Menstruation
} }
} }
public class AbsorberModExtension : DefModExtension public class AbsorberModExtension : DefModExtension
{ {
public bool leakAfterDirty = false; public bool leakAfterDirty = false;
@ -222,8 +205,6 @@ namespace RJW_Menstruation
public Color fluidColor = Color.white; public Color fluidColor = Color.white;
public virtual void DirtyEffect() { } public virtual void DirtyEffect() { }
public virtual void WearEffect() public virtual void WearEffect()
@ -299,13 +280,5 @@ namespace RJW_Menstruation
color = value; color = value;
} }
} }
} }
} }

1
1.3/source/RJW_Menstruation/RJW_Menstruation/Translations.cs
View file

@ -11,7 +11,6 @@ namespace RJW_Menstruation
public static readonly string Stage_Ovulatory = "Stage_Ovulatory".Translate(); public static readonly string Stage_Ovulatory = "Stage_Ovulatory".Translate();
public static readonly string Stage_Luteal = "Stage_Luteal".Translate(); public static readonly string Stage_Luteal = "Stage_Luteal".Translate();
public static readonly string Stage_Bleeding = "Stage_Bleeding".Translate(); public static readonly string Stage_Bleeding = "Stage_Bleeding".Translate();
public static readonly string Stage_Fertilized = "Stage_Fertilized".Translate();
public static readonly string Stage_Pregnant = "Stage_Pregnant".Translate(); public static readonly string Stage_Pregnant = "Stage_Pregnant".Translate();
public static readonly string Stage_Recover = "Stage_Recover".Translate(); public static readonly string Stage_Recover = "Stage_Recover".Translate();
public static readonly string Stage_None = "Stage_None".Translate(); public static readonly string Stage_None = "Stage_None".Translate();

26
1.3/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_HybridCustom.cs
View file

@ -1,10 +1,7 @@
using System; using RimWorld;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using RimWorld;
using rjw;
using UnityEngine; using UnityEngine;
using Verse; using Verse;
using Verse.Sound; using Verse.Sound;
@ -29,23 +26,16 @@ namespace RJW_Menstruation
if (!VariousDefOf.AllRaces.NullOrEmpty()) if (!VariousDefOf.AllRaces.NullOrEmpty())
foreach (ThingDef def in VariousDefOf.AllRaces) foreach (ThingDef def in VariousDefOf.AllRaces)
{ {
if (def.race != null) if (def.race == null || Configurations.IsOverrideExist(def)) continue;
{
if (Configurations.IsOverrideExist(def)) continue;
else
{
raceList.Add(new FloatMenuOption(def.label, delegate { AddHybridOverride(def); }, def.uiIcon, Color.white)); raceList.Add(new FloatMenuOption(def.label, delegate { AddHybridOverride(def); }, def.uiIcon, Color.white));
} }
}
}
raceList.SortBy(x => x.Label); raceList.SortBy(x => x.Label);
} }
public void AddHybridOverride(ThingDef def) public void AddHybridOverride(ThingDef def)
{ {
FloatMenuOption option = raceList.FirstOrDefault(x => x.Label.Equals(def?.label)); FloatMenuOption option = raceList.FirstOrDefault(x => x.Label.Equals(def?.label));
if (option != null) if (option == null) return;
{
raceList.Remove(option); raceList.Remove(option);
if (Configurations.HybridOverride.NullOrEmpty()) if (Configurations.HybridOverride.NullOrEmpty())
{ {
@ -53,7 +43,6 @@ namespace RJW_Menstruation
} }
Configurations.HybridOverride.Add(new HybridInformations(def)); Configurations.HybridOverride.Add(new HybridInformations(def));
Configurations.HybridOverride.SortBy(x => x.GetDef?.label ?? "Undefined"); Configurations.HybridOverride.SortBy(x => x.GetDef?.label ?? "Undefined");
}
} }
@ -124,7 +113,7 @@ namespace RJW_Menstruation
buttonRect.x -= 100; buttonRect.x -= 100;
if (Widgets.ButtonText(buttonRect, "Undo")) if (Widgets.ButtonText(buttonRect, "Undo"))
{ {
var element = removeList.Last(); HybridInformations element = removeList.Last();
Configurations.HybridOverride.Add(element); Configurations.HybridOverride.Add(element);
Configurations.HybridOverride.SortBy(x => x.GetDef?.label ?? "Undefined"); Configurations.HybridOverride.SortBy(x => x.GetDef?.label ?? "Undefined");
removeList.Remove(element); removeList.Remove(element);
@ -279,7 +268,8 @@ namespace RJW_Menstruation
protected void BuildRaceList() protected void BuildRaceList()
{ {
raceList.Clear(); raceList.Clear();
if (!VariousDefOf.AllRaces.NullOrEmpty()) if (VariousDefOf.AllRaces.NullOrEmpty()) return;
foreach (ThingDef def in VariousDefOf.AllRaces) foreach (ThingDef def in VariousDefOf.AllRaces)
{ {
if (def.race != null) if (def.race != null)
@ -320,7 +310,7 @@ namespace RJW_Menstruation
buttonRect.x -= 100; buttonRect.x -= 100;
if (Widgets.ButtonText(buttonRect, "Undo")) if (Widgets.ButtonText(buttonRect, "Undo"))
{ {
var element = removeList.Last(); HybridExtensionExposable element = removeList.Last();
info.hybridExtension.Add(element); info.hybridExtension.Add(element);
removeList.Remove(element); removeList.Remove(element);
} }

35
1.3/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs
View file

@ -1,7 +1,7 @@
using System; using RimWorld;
using System.Collections.Generic;
using RimWorld;
using rjw; using rjw;
using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using UnityEngine; using UnityEngine;
using Verse; using Verse;
@ -92,7 +92,7 @@ namespace RJW_Menstruation
int index = pawns.IndexOf(window.pawn); int index = pawns.IndexOf(window.pawn);
SoundDefOf.TabOpen.PlayOneShotOnCamera(); SoundDefOf.TabOpen.PlayOneShotOnCamera();
Pawn newpawn = pawns[(index + 1) % pawns.Count]; Pawn newpawn = pawns[(index + 1) % pawns.Count];
window.ChangePawn(newpawn, newpawn.GetMenstruationComp()); window.ChangePawn(newpawn, newpawn.GetFirstMenstruationComp());
} }
else if (window.pawn != pawn) else if (window.pawn != pawn)
{ {
@ -151,16 +151,15 @@ namespace RJW_Menstruation
fontstyleleft.normal.textColor = Color.white; fontstyleleft.normal.textColor = Color.white;
float preginfoheight = 0f; float preginfoheight = 0f;
bool pregnant = pawn.IsPregnant(); Hediff_BasePregnancy hediff = comp.Pregnancy;
Hediff hediff = PregnancyHelper.GetPregnancy(pawn); if (hediff != null && Utility.ShowFetusImage(hediff))
if (pregnant && Utility.ShowFetusImage((Hediff_BasePregnancy)hediff))
{ {
womb = comp.GetPregnancyIcon(hediff); womb = comp.GetPregnancyIcon(hediff);
if (hediff is Hediff_MultiplePregnancy m) if (hediff is Hediff_MultiplePregnancy m)
{ {
if (m.GestationProgress < 0.2f) cum = comp.GetCumIcon(); if (m.GestationProgress < 0.2f) cum = comp.GetCumIcon();
else cum = ContentFinder<Texture2D>.Get(("Womb/Empty"), true); else cum = ContentFinder<Texture2D>.Get(("Womb/Empty"), true);
Pawn fetus = pawn.GetFetus(); Pawn fetus = comp.GetFetus();
if (fetus != null && Utility.ShowFetusInfo()) if (fetus != null && Utility.ShowFetusInfo())
{ {
string feinfo = m.GetBabyInfo(); string feinfo = m.GetBabyInfo();
@ -188,7 +187,7 @@ namespace RJW_Menstruation
{ {
if (b.GestationProgress < 0.2f) cum = comp.GetCumIcon(); if (b.GestationProgress < 0.2f) cum = comp.GetCumIcon();
else cum = ContentFinder<Texture2D>.Get(("Womb/Empty"), true); else cum = ContentFinder<Texture2D>.Get(("Womb/Empty"), true);
Pawn fetus = pawn.GetFetus(); Pawn fetus = comp.GetFetus();
if (fetus != null && Utility.ShowFetusInfo()) if (fetus != null && Utility.ShowFetusInfo())
{ {
preginfoheight = fontheight; preginfoheight = fontheight;
@ -409,23 +408,7 @@ namespace RJW_Menstruation
statvalue = pawn.records.GetValue(xxx.CountOfBirthEgg); statvalue = pawn.records.GetValue(xxx.CountOfBirthEgg);
FillableBarLabeled(lineRect, " " + xxx.CountOfBirthEgg.LabelCap.CapitalizeFirst() + " " + statvalue, statvalue / 100, TextureCache.NurgleTexture, Texture2D.blackTexture, xxx.CountOfBirthEgg.description); FillableBarLabeled(lineRect, " " + xxx.CountOfBirthEgg.LabelCap.CapitalizeFirst() + " " + statvalue, statvalue / 100, TextureCache.NurgleTexture, Texture2D.blackTexture, xxx.CountOfBirthEgg.description);
lineRect.y += height; lineRect.y += height * 3;
statvalue = pawn.records.GetValue(xxx.CountOfWhore);
if (statvalue > 0)
{
FillableBarLabeled(lineRect, " " + xxx.CountOfWhore.LabelCap.CapitalizeFirst() + " " + statvalue, statvalue / 50, TextureCache.SlaaneshTexture, Texture2D.blackTexture, xxx.CountOfWhore.description);
statvalue = pawn.records.GetValue(xxx.EarnedMoneyByWhore);
lineRect.y += height;
FillableBarLabeled(lineRect, " " + VariousDefOf.RJW_EarnedMoneyByWhore.label.CapitalizeFirst() + " " + statvalue, statvalue / 10000, TextureCache.GhalmarazTexture, Texture2D.blackTexture);
lineRect.y += height;
}
else
{
lineRect.y += height;
lineRect.y += height;
}
statvalue = Configurations.ImplantationChance * comp.ImplantFactor; statvalue = Configurations.ImplantationChance * comp.ImplantFactor;
float fertchance = comp.GetFertilityChance(); float fertchance = comp.GetFertilityChance();

120
1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
View file

@ -1,13 +1,11 @@
using RimWorld; using RimWorld;
using rjw; using rjw;
using System; using System;
using System.Linq;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using UnityEngine; using UnityEngine;
using Verse; using Verse;
using Verse.Sound; using Verse.Sound;
using System.Threading;
using System.Threading.Tasks;
namespace RJW_Menstruation namespace RJW_Menstruation
@ -49,10 +47,15 @@ namespace RJW_Menstruation
public static class Utility public static class Utility
{ {
public static System.Random random = new System.Random(Environment.TickCount); public static PawnKindDef GetRacesPawnKind(Pawn pawn)
{
if (pawn == null) return null;
if (pawn.kindDef?.race == pawn.def) return pawn.kindDef;
return VariousDefOf.AllKinds.Find(kind => kind.race == pawn.def && kind.defName.Contains("Colonist")) ??
VariousDefOf.AllKinds.Find(kind => kind.race == pawn.def) ??
pawn.def.race?.AnyPawnKind ??
pawn.kindDef;
}
public static float GetCumVolume(this Pawn pawn) public static float GetCumVolume(this Pawn pawn)
{ {
@ -94,17 +97,14 @@ namespace RJW_Menstruation
public static HediffComp_Breast GetBreastComp(this Pawn pawn) public static HediffComp_Breast GetBreastComp(this Pawn pawn)
{ {
var hedifflist = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_breastsBPR(pawn))?.FindAll((Hediff h) => h is Hediff_PartBaseNatural || h is Hediff_PartBaseArtifical); List<Hediff> hedifflist = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_breastsBPR(pawn))?.FindAll((Hediff h) => h is Hediff_PartBaseNatural || h is Hediff_PartBaseArtifical);
HediffComp_Breast result; HediffComp_Breast result;
if (hedifflist.NullOrEmpty()) return null; if (hedifflist.NullOrEmpty()) return null;
else
{
foreach (Hediff h in hedifflist) foreach (Hediff h in hedifflist)
{ {
result = h.TryGetComp<HediffComp_Breast>(); result = h.TryGetComp<HediffComp_Breast>();
if (result != null) return result; if (result != null) return result;
} }
}
return null; return null;
} }
@ -125,66 +125,43 @@ namespace RJW_Menstruation
public static bool HasMenstruationComp(this Pawn pawn) public static bool HasMenstruationComp(this Pawn pawn)
{ {
var hedifflist = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn))?.FindAll((Hediff h) => h.def.defName.ToLower().Contains("vagina")); return pawn.GetMenstruationComps().Any();
HediffComp_Menstruation result;
if (hedifflist.NullOrEmpty()) return false;
else
{
foreach (Hediff h in hedifflist)
{
result = h.TryGetComp<HediffComp_Menstruation>();
if (result != null) return true;
}
}
return false;
} }
public static bool HasMenstruationComp(this Hediff hediff) public static bool HasMenstruationComp(this Hediff hediff)
{ {
if (hediff is Hediff_PartBaseNatural || hediff is Hediff_PartBaseArtifical) if ((hediff is Hediff_PartBaseNatural || hediff is Hediff_PartBaseArtifical) && hediff.TryGetComp<HediffComp_Menstruation>() != null)
{ return true;
if (hediff.TryGetComp<HediffComp_Menstruation>() != null) return true; else return false;
}
return false;
} }
public static float GetPregnancyProgress(this Pawn pawn) public static float GetFarthestPregnancyProgress(this Pawn pawn)
{ {
Hediff hediff = PregnancyHelper.GetPregnancy(pawn); return pawn.health.hediffSet.GetHediffs<Hediff_BasePregnancy>().MaxBy(hediff => hediff.GestationProgress)?.GestationProgress ?? -1;
if (hediff is Hediff_BasePregnancy h)
{
return h.GestationProgress;
}
return -1;
} }
public static Pawn GetFetus(this Pawn pawn) public static float GetPregnancyProgress(this HediffComp_Menstruation comp)
{ {
Hediff hediff = PregnancyHelper.GetPregnancy(pawn); if (comp.Pregnancy == null) return -1;
if (hediff is Hediff_BasePregnancy h) else return comp.Pregnancy.GestationProgress;
}
public static Pawn GetFetus(this HediffComp_Menstruation comp)
{ {
if (!h.babies.NullOrEmpty()) return h.babies.First(); if (comp.Pregnancy == null) return null;
if (!comp.Pregnancy.babies.NullOrEmpty()) return comp.Pregnancy.babies.First();
else else
{ {
Log.Error("Baby not exist: baby was not created or removed. Remove pregnancy."); Log.Error("Baby not exist: baby was not created or removed. Remove pregnancy.");
pawn.health.RemoveHediff(hediff); comp.Pregnancy.Miscarry();
return null; return null;
} }
} }
return null;
}
public static Hediff_BasePregnancy GetRJWPregnancy(this Pawn pawn)
{
return (Hediff_BasePregnancy)pawn.health.hediffSet.hediffs.FirstOrDefault(x => x is Hediff_BasePregnancy);
}
public static void DrawBreastIcon(this Pawn pawn, Rect rect, bool drawOrigin = false) public static void DrawBreastIcon(this Pawn pawn, Rect rect, bool drawOrigin = false)
{ {
var hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_breastsBPR(pawn)).FirstOrDefault((Hediff h) => h.def.defName.ToLower().Contains("breast")); Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_breastsBPR(pawn)).FirstOrDefault((Hediff h) => h.def.defName.ToLower().Contains("breast"));
Texture2D breast, nipple, areola; Texture2D breast, nipple, areola;
if (hediff != null) if (hediff != null)
{ {
@ -299,8 +276,7 @@ namespace RJW_Menstruation
milkcomp = pawn.GetComp<CompMilkable>(); milkcomp = pawn.GetComp<CompMilkable>();
} }
if (milkcomp != null) if (milkcomp == null) return;
{
if (milkcomp is CompMilkable milkable) if (milkcomp is CompMilkable milkable)
{ {
bool active = (bool)milkcomp.GetPropertyValue("Active"); bool active = (bool)milkcomp.GetPropertyValue("Active");
@ -324,14 +300,13 @@ namespace RJW_Menstruation
} }
} }
} }
}
public static void DrawMilkBottle(Rect rect, Pawn pawn, JobDef milkjob, float fullness) public static void DrawMilkBottle(Rect rect, Pawn pawn, JobDef milkjob, float fullness)
{ {
Texture2D texture; Texture2D texture;
Rect buttonrect = new Rect(rect.x, rect.y, rect.height, rect.height); Rect buttonrect = new Rect(rect.x, rect.y, rect.height, rect.height);
if (fullness > 0.0f) if (fullness <= 0.0f) return;
{
if (fullness < 0.3f) texture = ContentFinder<Texture2D>.Get("Milk/Milkbottle_Small", false); if (fullness < 0.3f) texture = ContentFinder<Texture2D>.Get("Milk/Milkbottle_Small", false);
else if (fullness < 0.7f) texture = ContentFinder<Texture2D>.Get("Milk/Milkbottle_Medium", false); else if (fullness < 0.7f) texture = ContentFinder<Texture2D>.Get("Milk/Milkbottle_Medium", false);
else texture = ContentFinder<Texture2D>.Get("Milk/Milkbottle_Large", false); else texture = ContentFinder<Texture2D>.Get("Milk/Milkbottle_Large", false);
@ -354,23 +329,22 @@ namespace RJW_Menstruation
} }
Widgets.DrawHighlightIfMouseover(buttonrect); Widgets.DrawHighlightIfMouseover(buttonrect);
} }
}
public static string GetVaginaLabel(this Pawn pawn) public static string GetVaginaLabel(this Pawn pawn)
{ {
var hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn)).Find((Hediff h) => h.def.defName.ToLower().Contains("vagina")); Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn)).Find(h => VariousDefOf.AllVaginas.Contains(h.def));
return hediff.LabelBase.CapitalizeFirst() + "\n(" + hediff.LabelInBrackets + ")" + "\n" + xxx.CountOfSex.LabelCap.CapitalizeFirst() + ": " + pawn.records.GetAsInt(xxx.CountOfSex); return hediff.LabelBase.CapitalizeFirst() + "\n(" + hediff.LabelInBrackets + ")" + "\n" + xxx.CountOfSex.LabelCap.CapitalizeFirst() + ": " + pawn.records.GetAsInt(xxx.CountOfSex);
} }
public static string GetAnusLabel(this Pawn pawn) public static string GetAnusLabel(this Pawn pawn)
{ {
var hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_anusBPR(pawn)).FirstOrDefault((Hediff h) => h.def.defName.ToLower().Contains("anus")); Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_anusBPR(pawn)).FirstOrDefault((Hediff h) => h.def.defName.ToLower().Contains("anus"));
if (hediff != null) return hediff.LabelBase.CapitalizeFirst() + "\n(" + hediff.LabelInBrackets + ")"; if (hediff != null) return hediff.LabelBase.CapitalizeFirst() + "\n(" + hediff.LabelInBrackets + ")";
else return ""; else return "";
} }
public static string GetBreastLabel(this Pawn pawn) public static string GetBreastLabel(this Pawn pawn)
{ {
var hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_breastsBPR(pawn)).FirstOrDefault((Hediff h) => h.def.defName.ToLower().Contains("breast")); Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_breastsBPR(pawn)).FirstOrDefault((Hediff h) => h.def.defName.ToLower().Contains("breast"));
if (hediff != null) return hediff.LabelBase.CapitalizeFirst() + "\n(" + hediff.LabelInBrackets + ")"; if (hediff != null) return hediff.LabelBase.CapitalizeFirst() + "\n(" + hediff.LabelInBrackets + ")";
else return ""; else return "";
} }
@ -422,25 +396,20 @@ namespace RJW_Menstruation
{ {
Pawn res = pawn.GetFather(); Pawn res = pawn.GetFather();
if (res != null) return res; if (res != null) return res;
else else res = pawn.relations?.GetFirstDirectRelationPawn(PawnRelationDefOf.Parent, x => x != 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; return res;
} }
}
public static float RandGaussianLike(float min, float max, int iterations = 3) public static float RandGaussianLike(float min, float max, int iterations = 3)
{ {
double res = 0; float res = 0;
for (int i = 0; i < iterations; i++) for (int i = 0; i < iterations; i++)
{ {
res += random.NextDouble(); res += Rand.Value;
} }
res /= iterations; res /= iterations;
return (float)res*(max-min) + min; return res * (max - min) + min;
} }
@ -457,20 +426,7 @@ namespace RJW_Menstruation
public static bool ShouldShowWombGizmo(this Pawn pawn) public static bool ShouldShowWombGizmo(this Pawn pawn)
{ {
return Configurations.EnableWombIcon && (!pawn.IsAnimal() || Configurations.EnableAnimalCycle);
if (Configurations.EnableWombIcon)
{
if (!pawn.IsAnimal())
{
return true;
}
else if (Configurations.EnableAnimalCycle)
{
return true;
} }
} }
return false;
}
}
} }

50
1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs
View file

@ -1,8 +1,8 @@
using RimWorld; using RimWorld;
using rjw; using rjw;
using System.Linq;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using Verse; using Verse;
namespace RJW_Menstruation namespace RJW_Menstruation
@ -11,6 +11,7 @@ namespace RJW_Menstruation
{ {
public static readonly ThingDef CumFilth = DefDatabase<ThingDef>.GetNamed("FilthCum"); public static readonly ThingDef CumFilth = DefDatabase<ThingDef>.GetNamed("FilthCum");
public static readonly ThingDef GirlCumFilth = DefDatabase<ThingDef>.GetNamed("FilthGirlCum");
public static readonly ThingDef Tampon = DefDatabase<ThingDef>.GetNamed("Absorber_Tampon"); public static readonly ThingDef Tampon = DefDatabase<ThingDef>.GetNamed("Absorber_Tampon");
public static readonly ThingDef Tampon_Dirty = DefDatabase<ThingDef>.GetNamed("Absorber_Tampon_Dirty"); public static readonly ThingDef Tampon_Dirty = DefDatabase<ThingDef>.GetNamed("Absorber_Tampon_Dirty");
public static readonly ThingDef FilthMixture = DefDatabase<ThingDef>.GetNamed("FilthMixture"); public static readonly ThingDef FilthMixture = DefDatabase<ThingDef>.GetNamed("FilthMixture");
@ -22,9 +23,6 @@ namespace RJW_Menstruation
public static readonly HediffDef Hediff_Estrus_Concealed = DefDatabase<HediffDef>.GetNamed("Hediff_Estrus_Concealed"); public static readonly HediffDef Hediff_Estrus_Concealed = DefDatabase<HediffDef>.GetNamed("Hediff_Estrus_Concealed");
public static readonly HediffDef Hediff_ASA = DefDatabase<HediffDef>.GetNamed("Hediff_ASA"); public static readonly HediffDef Hediff_ASA = DefDatabase<HediffDef>.GetNamed("Hediff_ASA");
public static readonly StatDef MaxAbsorbable = DefDatabase<StatDef>.GetNamed("MaxAbsorbable"); public static readonly StatDef MaxAbsorbable = DefDatabase<StatDef>.GetNamed("MaxAbsorbable");
// Obsolete, kept for compatibility for now
public static readonly PawnRelationDef Relation_birthgiver = DefDatabase<PawnRelationDef>.AllDefs.FirstOrDefault(d => d.defName == "RJW_Sire");
public static readonly PawnRelationDef Relation_spawn = DefDatabase<PawnRelationDef>.AllDefs.FirstOrDefault(d => d.defName == "RJW_Pup");
public static readonly NeedDef SexNeed = DefDatabase<NeedDef>.GetNamed("Sex"); public static readonly NeedDef SexNeed = DefDatabase<NeedDef>.GetNamed("Sex");
public static readonly JobDef VaginaWashing = DefDatabase<JobDef>.GetNamed("VaginaWashing"); public static readonly JobDef VaginaWashing = DefDatabase<JobDef>.GetNamed("VaginaWashing");
public static readonly JobDef Job_LactateSelf = DefDatabase<JobDef>.GetNamed("LactateSelf"); public static readonly JobDef Job_LactateSelf = DefDatabase<JobDef>.GetNamed("LactateSelf");
@ -42,28 +40,26 @@ namespace RJW_Menstruation
public static readonly ThoughtDef UnwantedPregnancyMild = DefDatabase<ThoughtDef>.GetNamed("UnwantedPregnancyMild"); public static readonly ThoughtDef UnwantedPregnancyMild = DefDatabase<ThoughtDef>.GetNamed("UnwantedPregnancyMild");
public static readonly ThoughtDef TookContraceptivePill = DefDatabase<ThoughtDef>.GetNamed("TookContraceptivePill"); public static readonly ThoughtDef TookContraceptivePill = DefDatabase<ThoughtDef>.GetNamed("TookContraceptivePill");
public static readonly ThoughtDef HateTookContraceptivePill = DefDatabase<ThoughtDef>.GetNamed("HateTookContraceptivePill"); public static readonly ThoughtDef HateTookContraceptivePill = DefDatabase<ThoughtDef>.GetNamed("HateTookContraceptivePill");
public static readonly HediffDef_PartBase Vagina = DefDatabase<HediffDef_PartBase>.GetNamed("Vagina"); public static readonly CompProperties_Menstruation HumanVaginaCompProperties = (CompProperties_Menstruation)Genital_Helper.average_vagina.comps.FirstOrDefault(x => x is CompProperties_Menstruation);
public static readonly CompProperties_Menstruation VaginaCompProperties = (CompProperties_Menstruation)Vagina.comps.FirstOrDefault(x => x is CompProperties_Menstruation);
public static readonly KeyBindingDef OpenStatusWindowKey = DefDatabase<KeyBindingDef>.GetNamed("OpenStatusWindow"); public static readonly KeyBindingDef OpenStatusWindowKey = DefDatabase<KeyBindingDef>.GetNamed("OpenStatusWindow");
public static readonly PawnColumnDef RJW_EarnedMoneyByWhore = DefDatabase<PawnColumnDef>.GetNamed("RJW_EarnedMoneyByWhore");
public static readonly RecordDef AmountofCreampied = DefDatabase<RecordDef>.GetNamed("AmountofCreampied"); public static readonly RecordDef AmountofCreampied = DefDatabase<RecordDef>.GetNamed("AmountofCreampied");
public static readonly RecordDef AmountofFertilizedEggs = DefDatabase<RecordDef>.GetNamed("AmountofFertilizedEggs"); public static readonly RecordDef AmountofFertilizedEggs = DefDatabase<RecordDef>.GetNamed("AmountofFertilizedEggs");
public static readonly TaleDef TaleCameInside = DefDatabase<TaleDef>.GetNamed("CameInside");
private static List<ThingDef> allraces = null; private static List<ThingDef> allraces = null;
private static List<PawnKindDef> allkinds = null; private static List<PawnKindDef> allkinds = null;
private static HashSet<HediffDef> allvaginas = null;
public static List<ThingDef> AllRaces public static List<ThingDef> AllRaces
{ {
get get
{ {
if (allraces == null) if (allraces != null) return allraces;
{
List<ThingDef> allThings = DefDatabase<ThingDef>.AllDefsListForReading; List<ThingDef> allThings = DefDatabase<ThingDef>.AllDefsListForReading;
allraces = allThings.FindAll(x => x.race != null && x.race.IsFlesh); allraces = allThings.FindAll(x => x.race != null && x.race.IsFlesh);
}
return allraces; return allraces;
} }
} }
@ -71,16 +67,37 @@ namespace RJW_Menstruation
{ {
get get
{ {
if (allkinds == null) if (allkinds != null) return allkinds;
{
List<PawnKindDef> allKinds = DefDatabase<PawnKindDef>.AllDefsListForReading; List<PawnKindDef> allKinds = DefDatabase<PawnKindDef>.AllDefsListForReading;
allkinds = allKinds.FindAll(x => x.race != null); allkinds = allKinds.FindAll(x => x.race != null);
}
return allkinds; return allkinds;
} }
} }
public static HashSet<HediffDef> AllVaginas
{
get
{
if (allvaginas != null) return allvaginas;
allvaginas = new HashSet<HediffDef>();
List<HediffDef> allHediffs = DefDatabase<HediffDef>.AllDefsListForReading;
foreach(HediffDef hediffDef in allHediffs)
{
if (hediffDef.comps.NullOrEmpty()) continue;
foreach (HediffCompProperties comp in hediffDef.comps)
{
if (comp.compClass == typeof(HediffComp_Menstruation) || comp.compClass.IsSubclassOf(typeof(HediffComp_Menstruation)))
{
allvaginas.Add(hediffDef);
break;
}
}
}
return allvaginas;
}
}
// Defs from Milkable Colonists // Defs from Milkable Colonists
public static readonly HediffDef Hediff_Lactating_Drug = DefDatabase<HediffDef>.GetNamedSilentFail("Lactating_Drug"); public static readonly HediffDef Hediff_Lactating_Drug = DefDatabase<HediffDef>.GetNamedSilentFail("Lactating_Drug");
@ -88,12 +105,5 @@ namespace RJW_Menstruation
public static readonly HediffDef Hediff_Lactating_Permanent = DefDatabase<HediffDef>.GetNamedSilentFail("Lactating_Permanent"); public static readonly HediffDef Hediff_Lactating_Permanent = DefDatabase<HediffDef>.GetNamedSilentFail("Lactating_Permanent");
public static readonly HediffDef Hediff_Heavy_Lactating_Permanent = DefDatabase<HediffDef>.GetNamedSilentFail("Heavy_Lactating_Permanent"); public static readonly HediffDef Hediff_Heavy_Lactating_Permanent = DefDatabase<HediffDef>.GetNamedSilentFail("Heavy_Lactating_Permanent");
public static readonly JobDef Job_LactateSelf_MC = DefDatabase<JobDef>.GetNamedSilentFail("LactateSelf_MC"); public static readonly JobDef Job_LactateSelf_MC = DefDatabase<JobDef>.GetNamedSilentFail("LactateSelf_MC");
} }
} }

11
1.3/source/RJW_Menstruation/SexperienceModule/GatheredCumMixture.cs
View file

@ -1,13 +1,6 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Verse;
using RimWorld;
using RJWSexperience;
using RJW_Menstruation;
using UnityEngine; using UnityEngine;
using Verse;
namespace RJW_Menstruation.Sexperience namespace RJW_Menstruation.Sexperience
{ {

20
1.3/source/RJW_Menstruation/SexperienceModule/JobDrivers.cs
View file

@ -1,13 +1,8 @@
using System; using RJWSexperience;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using HarmonyLib;
using Verse; using Verse;
using Verse.AI; using Verse.AI;
using RimWorld;
using RJWSexperience;
namespace RJW_Menstruation.Sexperience namespace RJW_Menstruation.Sexperience
{ {
@ -23,8 +18,6 @@ namespace RJW_Menstruation.Sexperience
protected override IEnumerable<Toil> MakeNewToils() protected override IEnumerable<Toil> MakeNewToils()
{ {
HediffComp_Menstruation Comp = pawn.GetMenstruationComp();
//this.FailOn(delegate //this.FailOn(delegate
//{ //{
// return !(Comp.TotalCumPercent > 0.001); // return !(Comp.TotalCumPercent > 0.001);
@ -38,9 +31,11 @@ namespace RJW_Menstruation.Sexperience
{ {
initAction = delegate () initAction = delegate ()
{ {
if (Comp.TotalCumPercent > 0.001) bool anyExcreted = false;
foreach (HediffComp_Menstruation comp in pawn.GetMenstruationComps())
if (comp.TotalCumPercent > 0.001)
{ {
CumMixture mixture = Comp.MixtureOut(RJWSexperience.VariousDefOf.GatheredCum, 0.5f); CumMixture mixture = comp.MixtureOut(RJWSexperience.VariousDefOf.GatheredCum, 0.5f);
float amount = mixture.Volume; float amount = mixture.Volume;
if (mixture.ispurecum) if (mixture.ispurecum)
{ {
@ -52,9 +47,10 @@ namespace RJW_Menstruation.Sexperience
cummixture.InitwithCum(mixture); cummixture.InitwithCum(mixture);
Bucket.AddCum(amount, cummixture); Bucket.AddCum(amount, cummixture);
} }
anyExcreted = true;
} }
else ReadyForNextToil(); if (!anyExcreted) ReadyForNextToil();
if (Comp.TotalCumPercent > 0.001) JumpToToil(excreting); if (pawn.GetMenstruationComps().Any(c => c.TotalCumPercent > 0.001)) JumpToToil(excreting);
} }
}; };

11
1.3/source/RJW_Menstruation/SexperienceModule/Patch/GetGizmos.cs
View file

@ -1,14 +1,7 @@
using System; using HarmonyLib;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Verse;
using RimWorld;
using UnityEngine; using UnityEngine;
using RJWSexperience; using Verse;
using rjw;
using HarmonyLib;
namespace RJW_Menstruation.Sexperience namespace RJW_Menstruation.Sexperience

9
1.3/source/RJW_Menstruation/SexperienceModule/Patch/Harmony.cs
View file

@ -1,9 +1,4 @@
using System; using HarmonyLib;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using HarmonyLib;
using System.Reflection; using System.Reflection;
using Verse; using Verse;
@ -14,7 +9,7 @@ namespace RJW_Menstruation.Sexperience
{ {
static First() static First()
{ {
var har = new Harmony("RJW_Menstruation.Sexperience"); Harmony har = new Harmony("RJW_Menstruation.Sexperience");
har.PatchAll(Assembly.GetExecutingAssembly()); har.PatchAll(Assembly.GetExecutingAssembly());
} }
} }

12
1.3/source/RJW_Menstruation/SexperienceModule/Patch/Menstruation_Patch.cs
View file

@ -1,16 +1,8 @@
using System; using HarmonyLib;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using RJW_Menstruation;
using HarmonyLib;
using rjw;
using RimWorld; using RimWorld;
using UnityEngine;
using Verse; using Verse;
using Verse.Sound; using Verse.Sound;
using UnityEngine;
using RJWSexperience;
namespace RJW_Menstruation.Sexperience namespace RJW_Menstruation.Sexperience
{ {

21
1.3/source/RJW_Menstruation/SexperienceModule/Patch/Pawn_Patch.cs
View file

@ -1,14 +1,10 @@
using System; using HarmonyLib;
using RimWorld;
using RJWSexperience;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Verse;
using Verse.AI;
using RimWorld;
using HarmonyLib;
using UnityEngine; using UnityEngine;
using RJWSexperience; using Verse;
namespace RJW_Menstruation.Sexperience namespace RJW_Menstruation.Sexperience
{ {
@ -17,10 +13,9 @@ namespace RJW_Menstruation.Sexperience
{ {
public static void Postfix(Vector3 clickPos, Pawn pawn, List<FloatMenuOption> opts) public static void Postfix(Vector3 clickPos, Pawn pawn, List<FloatMenuOption> opts)
{ {
var targets = GenUI.TargetsAt(clickPos, TargetingParameters.ForBuilding()); IEnumerable<LocalTargetInfo> targets = GenUI.TargetsAt(clickPos, TargetingParameters.ForBuilding());
HediffComp_Menstruation comp = pawn.GetMenstruationComp();
if (comp != null && comp.TotalCumPercent > 0.001f) if (pawn.GetMenstruationComps().Any(comp => comp.TotalCumPercent > 0.001f))
foreach (LocalTargetInfo t in targets) foreach (LocalTargetInfo t in targets)
{ {
if (t.Thing is Building building) if (t.Thing is Building building)
@ -32,10 +27,6 @@ namespace RJW_Menstruation.Sexperience
} }
} }
} }
} }
public static FloatMenuOption MakeMenu(Pawn pawn, LocalTargetInfo target) public static FloatMenuOption MakeMenu(Pawn pawn, LocalTargetInfo target)

24
1.3/source/RJW_Menstruation/SexperienceModule/Patch/RJW_Patch.cs
View file

@ -1,15 +1,9 @@
using System; using HarmonyLib;
using System.Collections.Generic; using rjw;
using RJWSexperience;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using RimWorld;
using Verse; using Verse;
using Verse.AI; using Verse.AI;
using rjw;
using RJW_Menstruation;
using HarmonyLib;
using RJWSexperience;
namespace RJW_Menstruation.Sexperience namespace RJW_Menstruation.Sexperience
{ {
@ -20,8 +14,7 @@ namespace RJW_Menstruation.Sexperience
[HarmonyPatch("HasJobOnThing")] [HarmonyPatch("HasJobOnThing")]
public static bool HasJobOnThing(Pawn pawn, ref bool __result) public static bool HasJobOnThing(Pawn pawn, ref bool __result)
{ {
HediffComp_Menstruation comp = pawn.GetMenstruationComp(); if (pawn.GetMenstruationComps().Any(comp => comp.DoCleanWomb && comp.TotalCumPercent > 0.001f) && pawn.Map.listerBuildings.ColonistsHaveBuilding(VariousDefOf.CumBucket))
if (comp != null && comp.DoCleanWomb && comp.TotalCumPercent > 0.001f && pawn.Map.listerBuildings.ColonistsHaveBuilding(VariousDefOf.CumBucket))
{ {
__result = true; __result = true;
return false; return false;
@ -33,8 +26,7 @@ namespace RJW_Menstruation.Sexperience
[HarmonyPatch("JobOnThing")] [HarmonyPatch("JobOnThing")]
public static void JobOnThing(Pawn pawn, ref Job __result) public static void JobOnThing(Pawn pawn, ref Job __result)
{ {
HediffComp_Menstruation comp = pawn.GetMenstruationComp(); if (pawn.GetMenstruationComps().Any(comp => comp.DoCleanWomb && comp.TotalCumPercent > 0.001f))
if (comp != null && comp.DoCleanWomb && comp.TotalCumPercent > 0.001f)
{ {
Building_CumBucket bucket = pawn.FindClosestBucket(); Building_CumBucket bucket = pawn.FindClosestBucket();
@ -43,10 +35,6 @@ namespace RJW_Menstruation.Sexperience
__result = JobMaker.MakeJob(VariousDefOf.VaginaWashingwithBucket, null, bucket, bucket.Position); __result = JobMaker.MakeJob(VariousDefOf.VaginaWashingwithBucket, null, bucket, bucket.Position);
} }
} }
}
}
} }
} }

1
1.3/source/RJW_Menstruation/SexperienceModule/Properties/AssemblyInfo.cs
View file

@ -1,5 +1,4 @@
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
// 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해 // 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해

7
1.3/source/RJW_Menstruation/SexperienceModule/VariousDefOf.cs
View file

@ -1,9 +1,4 @@
using RimWorld; using Verse;
using rjw;
using System.Linq;
using System;
using System.Collections.Generic;
using Verse;
namespace RJW_Menstruation.Sexperience namespace RJW_Menstruation.Sexperience
{ {

22
changelogs.txt
View file

@ -1,3 +1,25 @@
Version 1.0.7.0
- Not save compatible with previous versions. Expect glitches and many red errors if you try. However, things should stabilize eventually.
- Designed for RJW 5.0.0, but should work with previous versions.
- Support for multiple vaginas, including each having a separate pregnancy.
- More reliably generate a baby's race correctly when using pawnkind diversification mods.
- Overhauled many things under the hood.
- Cycle randomization completely redone. Everyone now has a (hidden) cycle speed and cycle variability.
- Ovary initialization redone. All pawns now get a total number of eggs based on their age and racial properties.
- Coming inside someone with an IUD will give the same total amount of fluid as without, just at a lower fertility.
- The chance to fertilize has been changed to an exponential curve instead of a linear one. This will increase the chances of pregnancy at low amounts of semen and slightly reduce it at high amounts.
- Semen now has a fertility percentage instead of "fertile volume".
- The exact time between fertilization and implantation has been adjusted.
- Removing a vagina will end any pregnancy it has in progress. Please wait until the baby is born first.
- Your colonists can create artwork of someone being born.
- They can also create artwork of someone coming inside someone else.
- Default values changed to account for the new math. The new defaults will have the same odds of pregnancy with a 10ml ejaculation at ovulation (in a human) as before:
- Fertilization chance from 10%/mL to 15%
- Cum decay from 30%/hour to 15%
- Fertility decay from 20%/hour to 5%
Version 1.0.6.6 Version 1.0.6.6
- Ovipostors add on average 1.5x as much cum to a womb than before. - Ovipostors add on average 1.5x as much cum to a womb than before.
- The womb tick timing is now more consistent across a save and load, and also spread out across pawns. - The womb tick timing is now more consistent across a save and load, and also spread out across pawns.