Merge 1.0.6.4

This commit is contained in:
lutepickle 2022-05-30 20:32:18 -07:00
commit 6ac50ea7fe
19 changed files with 133 additions and 124 deletions

Binary file not shown.

View file

@ -4,7 +4,7 @@
<ThingDef ParentName="MakeableDrugPillBase">
<defName>OvaryRegenerationPill</defName>
<label>Ovary regeneration pill</label>
<description>Recovers ovary's health.&#10;Less effective on unhealthy ovary.&#10;Does not recover menopause.</description>
<description>Recovers an ovary's health, restoring some quantity of eggs.&#10;Less effective on ovaries with few eggs remaining.&#10;Cannot recover menopause.</description>
<graphicData>
<texPath>Things/Item/ORPill</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
@ -19,7 +19,7 @@
<ingestible>
<drugCategory>Medical</drugCategory>
<outcomeDoers>
<li Class="RJW_Menstruation.OvaryPillOutcomDoer">
<li Class="RJW_Menstruation.OvaryPillOutcomeDoer">
<effectOffset>0.3</effectOffset>
</li>
</outcomeDoers>
@ -50,7 +50,7 @@
<ThingDef ParentName="MakeableDrugPillBase">
<defName>SuperovulationInducingAgent</defName>
<label>Superovulation inducing agent</label>
<description>Induce superovulation&#10;&#10;May cause early menopause</description>
<description>Induce superovulation, causing the next ovulation to produce 1-4 extra eggs.&#10;&#10;May hasten the onset of menopause.</description>
<graphicData>
<texPath>Things/Item/SIA</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
@ -65,7 +65,7 @@
<ingestible>
<drugCategory>Medical</drugCategory>
<outcomeDoers>
<li Class="RJW_Menstruation.SuperOvulationOutcomDoer">
<li Class="RJW_Menstruation.SuperOvulationOutcomeDoer">
</li>
</outcomeDoers>
</ingestible>
@ -94,7 +94,7 @@
<ThingDef ParentName="MakeableDrugPillBase">
<defName>PainReliever</defName>
<label>Pain reliever</label>
<description>Relieves menstrual pain for a day.&#10;&#10;Also effective on generic pain.</description>
<description>Relieves menstrual pain for 24 hours.&#10;&#10;Also effective on other sources of pain.</description>
<graphicData>
<texPath>Things/Item/PainReliever</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
@ -139,7 +139,7 @@
<ThingDef ParentName="MakeableDrugPillBase">
<defName>Cyclosporine</defName>
<label>cyclosporine</label>
<description>An immunosuppressant.&#10;Can cure antisperm antibody.</description>
<description>An immunosuppressant.&#10;Can cure antisperm antibody, but harms the body's ability to fight off infection and disease for 24 hours.</description>
<graphicData>
<texPath>Things/Item/Cyclosporine</texPath>
<graphicClass>Graphic_StackCount</graphicClass>

View file

@ -6,7 +6,7 @@
<label>Antisperm antibody</label>
<labelNoun>antisperm antibody</labelNoun>
<description>Antisperm antibody.&#10;Increases death rate of sperm.</description>
<labelNounPretty>{0} got antisperm antibody</labelNounPretty>
<labelNounPretty>{0} has an antisperm antibody</labelNounPretty>
<defaultLabelColor>(0.8,0.1,0.1)</defaultLabelColor>
<isBad>false</isBad>
<tendable>false</tendable>
@ -33,7 +33,7 @@
<HediffDef>
<hediffClass>HediffWithComps</hediffClass>
<defName>Hediff_ForceFertile</defName>
<label>fertile</label>
<label>Fertile</label>
<labelNoun>fertile</labelNoun>
<description>fertile</description>
<labelNounPretty>{0} is fertile</labelNounPretty>

View file

@ -5,7 +5,7 @@
<defName>Hediff_MenstrualCramp</defName>
<label>In period</label>
<labelNoun>in period</labelNoun>
<description>in period</description>
<description>Bleeding from the vagina at the end of the menstrual cycle.&#10;Often painful.</description>
<defaultLabelColor>(0.70,0.00,0.00)</defaultLabelColor>
<isBad>true</isBad>
<tendable>false</tendable>
@ -65,8 +65,8 @@
<defName>Hediff_Menopause</defName>
<label>Menopause</label>
<labelNoun>menopause</labelNoun>
<description>reached menopause</description>
<labelNounPretty>{0} reached menopause</labelNounPretty>
<description>A condition caused by exhaustion of the ovaries' eggs. Without eggs, the womb can no longer produce children.</description>
<labelNounPretty>{0} has entered menopause</labelNounPretty>
<defaultLabelColor>(0.70,0.70,0.00)</defaultLabelColor>
<isBad>false</isBad>
<tendable>false</tendable>
@ -100,7 +100,7 @@
<defName>Hediff_Climacteric</defName>
<label>Climacteric</label>
<labelNoun>climacteric</labelNoun>
<description>climacteric</description>
<description>The ovaries have produced their final eggs. Menopause will soon occur.</description>
<defaultLabelColor>(0.70,0.70,0.00)</defaultLabelColor>
<isBad>false</isBad>
<tendable>false</tendable>
@ -178,7 +178,7 @@
<defName>Hediff_Estrus</defName>
<label>Estrus</label>
<labelNoun>estrus</labelNoun>
<description>estrus</description>
<description>A condition caused by a womb entering its most fertile phase of the menstrual cycle. Sexual arousal and desire increase dramatically as the body yearns to become pregnant.&#10;Increased chance of vaginal sex occurring and potentially lower standards in mate selection.</description>
<defaultLabelColor>(1.00,0.60,0.75)</defaultLabelColor>
<isBad>false</isBad>
<tendable>false</tendable>
@ -207,9 +207,9 @@
<HediffDef Name="Hediff_Estrus_Concealed">
<hediffClass>HediffWithComps</hediffClass>
<defName>Hediff_Estrus_Concealed</defName>
<label>Estrus(concealed)</label>
<label>Estrus (concealed)</label>
<labelNoun>estrus</labelNoun>
<description>estrus</description>
<description>A condition caused by a womb its most fertile phase of the menstrual cycle. Sexual arousal and desire increase slightly.&#10;Slightly increased chance of vaginal sex.</description>
<defaultLabelColor>(1.00,0.60,0.75)</defaultLabelColor>
<isBad>false</isBad>
<tendable>false</tendable>
@ -241,7 +241,7 @@
<hediffClass>HediffWithComps</hediffClass>
<defName>Hediff_PainReliever</defName>
<label>Pain reliever</label>
<description>relieves pain.</description>
<description>A mild reprieve from menstrual (and other) sources of pain.</description>
<defaultLabelColor>(0.75,0.75,1.0)</defaultLabelColor>
<isBad>false</isBad>
<tendable>false</tendable>
@ -265,7 +265,7 @@
<hediffClass>HediffWithComps</hediffClass>
<defName>Hediff_Cyclosporine</defName>
<label>Cyclosporine</label>
<description>Immunosuppressant.</description>
<description>Under the effect of an immunosuppressant, hampering the body's ability to fight off infection and disease.</description>
<defaultLabelColor>(0.75,0.75,1.0)</defaultLabelColor>
<isBad>false</isBad>
<tendable>false</tendable>

View file

@ -3,7 +3,7 @@
<Defs>
<KeyBindingDef ParentName="GameKeyBinding">
<defName>OpenStatusWindow</defName>
<label>menstruation: open status window</label>
<label>Menstruation: open status window</label>
<defaultKeyCodeA>Q</defaultKeyCodeA>
</KeyBindingDef>
</Defs>

View file

@ -31,34 +31,34 @@
<RecipeDef ParentName="BaseBreastSurgery">
<defName>Surgery_ExpandAreola</defName>
<label>expand areola</label>
<description>expand areola.</description>
<label>expand areolae</label>
<description>Expand the areolae.</description>
<workerClass>RJW_Menstruation.Recipe_ExpandAreola</workerClass>
<jobString>expanding areola</jobString>
<jobString>expanding areolae</jobString>
</RecipeDef>
<RecipeDef ParentName="BaseBreastSurgery">
<defName>Surgery_ContractAreola</defName>
<label>contract areola</label>
<description>contract areola.</description>
<label>contract areolae</label>
<description>Contract the areolae.</description>
<workerClass>RJW_Menstruation.Recipe_ContractAreola</workerClass>
<jobString>contracting areola</jobString>
<jobString>contracting areolae</jobString>
</RecipeDef>
<RecipeDef ParentName="BaseBreastSurgery">
<defName>Surgery_ExpandNipple</defName>
<label>expand nipple</label>
<description>expand nipple.</description>
<label>Expand nipple</label>
<description>Expand the nipples.</description>
<workerClass>RJW_Menstruation.Recipe_ExpandNipple</workerClass>
<jobString>expanding nipple</jobString>
<jobString>expanding nipples</jobString>
</RecipeDef>
<RecipeDef ParentName="BaseBreastSurgery">
<defName>Surgery_ContractNipple</defName>
<label>contract nipple</label>
<description>contract nipple.</description>
<label>Contract nipples</label>
<description>Constract the nipples.</description>
<workerClass>RJW_Menstruation.Recipe_ContractNipple</workerClass>
<jobString>contracting nipple</jobString>
<jobString>contracting nipples</jobString>
</RecipeDef>

View file

@ -4,14 +4,14 @@
<RecordDef>
<defName>AmountofCreampied</defName>
<label>creampied</label>
<description>The amount of cums I have been creampied.</description>
<description>The milliliters of cum that's been ejaculated into my womb.</description>
<type>Float</type>
</RecordDef>
<RecordDef>
<defName>AmountofFertilizedEggs</defName>
<label>fertilized eggs</label>
<description>The amount of my eggs being raped by sperm.</description>
<description>The number of my eggs that sperm has fertilized.</description>
<type>Int</type>
</RecordDef>

View file

@ -4,7 +4,7 @@
<StatDef>
<defName>MaxAbsorbable</defName>
<label>Absorbable</label>
<description>Maximum fluids can be absorbed.</description>
<description>Maximum amount of fluid that this item can absorb.</description>
<category>Apparel</category>
<minValue>0</minValue>
<toStringStyle>FloatOne</toStringStyle>

View file

@ -4,7 +4,7 @@
<ThingDef ParentName="ApparelNoQualityBase">
<defName>Absorber_Tampon</defName>
<label>tampon</label>
<description>A tampon for absorbing fluids from vagina.&#10;May cause infection if using too long.</description>
<description>A tampon for absorbing fluids from a vagina.&#10;May cause an infection if worn for too long.</description>
<thingClass>RJW_Menstruation.Absorber_Tampon</thingClass>
<graphicData>
<texPath>Things/Item/Tampon</texPath>
@ -73,7 +73,7 @@
<ThingDef ParentName="ApparelNoQualityBase">
<defName>Absorber_Tampon_Dirty</defName>
<label>dirty tampon</label>
<description>An wet used tampon.&#10;May cause infection.</description>
<description>A wet used tampon.&#10;May cause infection if left in.</description>
<thingClass>RJW_Menstruation.Absorber_Tampon</thingClass>
<graphicData>
<texPath>Things/Item/Tampon</texPath>
@ -128,7 +128,7 @@
<ThingDef ParentName="ApparelNoQualityBase">
<defName>Absorber_Pad</defName>
<label>sanitary pad</label>
<description>A pad for absorbing fluids from vagina.</description>
<description>A pad for absorbing fluids from a vagina.</description>
<thingClass>RJW_Menstruation.Absorber</thingClass>
<graphicData>
<texPath>Things/Item/Pad</texPath>
@ -203,7 +203,7 @@
<ThingDef ParentName="ApparelNoQualityBase">
<defName>Absorber_Pad_Dirty</defName>
<label>wet sanitary pad</label>
<description>An wet used pad.</description>
<description>A wet used pad.</description>
<thingClass>RJW_Menstruation.Absorber</thingClass>
<graphicData>
<texPath>Things/Item/Pad</texPath>

View file

@ -10,7 +10,7 @@
<stages>
<li>
<label>dripping fluids</label>
<description>It bothers me.</description>
<description>Can't I get something to absorb this?</description>
<baseMoodEffect>-2</baseMoodEffect>
</li>
</stages>
@ -26,7 +26,7 @@
<stages>
<li>
<label>{0} came inside</label>
<description>I'm worried i might get pregnant.</description>
<description>I'm worried I might get pregnant.</description>
<baseMoodEffect>-3</baseMoodEffect>
<baseOpinionOffset>-2</baseOpinionOffset>
</li>
@ -43,7 +43,7 @@
<stages>
<li>
<label>{0} came inside</label>
<description>I'm worried i might get pregnant.&#10;The chance is low, but...</description>
<description>I'm worried I might get pregnant.&#10;The chance is low, but...</description>
<baseMoodEffect>-1</baseMoodEffect>
</li>
</stages>
@ -59,7 +59,7 @@
<stages>
<li>
<label>{0} came inside</label>
<description>I might get pregnant.</description>
<description>I hope I get pregnant.</description>
<baseMoodEffect>10</baseMoodEffect>
<baseOpinionOffset>5</baseOpinionOffset>
</li>
@ -76,7 +76,7 @@
<stages>
<li>
<label>{0} came inside</label>
<description>I loved it.</description>
<description>I don't think I'll get pregnant, but it's fun to fantasize.</description>
<baseMoodEffect>3</baseMoodEffect>
<baseOpinionOffset>1</baseOpinionOffset>
</li>
@ -92,7 +92,7 @@
<stages>
<li>
<label>came inside of {0}</label>
<description>Feel so good.</description>
<description>That felt so good.</description>
<baseMoodEffect>2</baseMoodEffect>
<baseOpinionOffset>1</baseOpinionOffset>
</li>
@ -109,7 +109,7 @@
<stages>
<li>
<label>{0} came inside</label>
<description>The chance is low. But i don't like it.</description>
<description>I probably won't get pregnant, but I still don't like it.</description>
<baseMoodEffect>-2</baseMoodEffect>
<baseOpinionOffset>-5</baseOpinionOffset>
</li>
@ -126,7 +126,7 @@
<stages>
<li>
<label>{0} came inside</label>
<description>I don't want to be pregnant with his baby</description>
<description>I don't want to be pregnant with his baby!</description>
<baseMoodEffect>-5</baseMoodEffect>
<baseOpinionOffset>-10</baseOpinionOffset>
</li>
@ -159,7 +159,7 @@
<stages>
<li>
<label>came inside of {0}</label>
<description>i came inside of that bitch</description>
<description>I came inside of that bitch!</description>
<baseMoodEffect>5</baseMoodEffect>
<baseOpinionOffset>1</baseOpinionOffset>
</li>
@ -175,7 +175,7 @@
<stages>
<li>
<label>unwanted pregnancy</label>
<description>How do i...</description>
<description>How will I take care of a baby? What am I going to do?</description>
<baseMoodEffect>-10</baseMoodEffect>
</li>
</stages>
@ -190,36 +190,36 @@
<stages>
<li>
<label>unwanted pregnancy</label>
<description>How do i...</description>
<description>I'm having a baby. I hope I can manage.</description>
<baseMoodEffect>-3</baseMoodEffect>
</li>
</stages>
</ThoughtDef>
<ThoughtDef>
<defName>TookContraptivePill</defName>
<defName>TookContraceptivePill</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>7.0</durationDays>
<stackLimit>5</stackLimit>
<stackedEffectMultiplier>0.1</stackedEffectMultiplier>
<stages>
<li>
<label>took contraptive pill</label>
<description>It will be okay.</description>
<label>took contraceptive pill</label>
<description>Everything will be okay now.</description>
<baseMoodEffect>1</baseMoodEffect>
</li>
</stages>
</ThoughtDef>
<ThoughtDef>
<defName>HateTookContraptivePill</defName>
<defName>HateTookContraceptivePill</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>7.0</durationDays>
<stackLimit>5</stackLimit>
<stackedEffectMultiplier>0.1</stackedEffectMultiplier>
<stages>
<li>
<label>took contraptive pill</label>
<label>took contraceptive pill</label>
<description>I want to get pregnant.</description>
<baseMoodEffect>-3</baseMoodEffect>
</li>

View file

@ -25,68 +25,68 @@
<Dialog_WombInfo07>Ovulation</Dialog_WombInfo07>
<Dialog_WombInfo08></Dialog_WombInfo08>
<Dialog_WombInfo09></Dialog_WombInfo09>
<Dialog_DoCleanWomb_Tooltip>Gather cums into bucket</Dialog_DoCleanWomb_Tooltip>
<Dialog_DontCleanWomb_Tooltip>Store cums in womb</Dialog_DontCleanWomb_Tooltip>
<Dialog_DoCleanWomb_Tooltip>Gather cum into bucket</Dialog_DoCleanWomb_Tooltip>
<Dialog_DontCleanWomb_Tooltip>Store cum in womb</Dialog_DontCleanWomb_Tooltip>
<Dialog_FatherUnknown>Unknown</Dialog_FatherUnknown>
<Option1_Label_1>enable womb icon</Option1_Label_1>
<Option1_Label_2>enable button in health tab</Option1_Label_2>
<Option2_Label>enable animal cycle</Option2_Label>
<Option2_Desc>simulate animal's cycle.&#10;this option will apply after save loaded&#10;not recommended</Option2_Desc>
<Option3_Label>implantation chance</Option3_Label>
<Option3_Desc>set implantation chance of fertilized egg&#10;this value determines finalizing chacne of impregnation</Option3_Desc>
<Option4_Label>fertilization chance</Option4_Label>
<Option4_Desc>set fertilize chance of 1mL of sperm on every hour&#10;this value determines beginning chance of impregnation</Option4_Desc>
<Option5_Label>cum decay ratio per hour</Option5_Label>
<Option5_Desc>cum will decrease about this ratio&#10;this value affects on the fertility chacne indirectly</Option5_Desc>
<Option6_Label>cum fertility decay ratio per hour</Option6_Label>
<Option6_Desc>cum will lose fertility about this ratio&#10;this value affects on the fertility chance indirectly&#10;estimated sperm lifespan: cum lose most of fertility at this time.</Option6_Desc>
<Option7_Label>cycle accelerate</Option7_Label>
<Option7_Desc>accelerate menstrution cycle&#10;This can cause early menopause and infertility.&#10;Setting this lower than x12 is recommended.&#10;Rimworld's timescale: x6(default)&#10;</Option7_Desc>
<Option1_Label_1>Enable womb icon</Option1_Label_1>
<Option1_Label_2>Enable button in health tab</Option1_Label_2>
<Option2_Label>Enable animal cycle</Option2_Label>
<Option2_Desc>Simulate animal cycles.&#10;This option will apply after next load&#10;Not recommended.</Option2_Desc>
<Option3_Label>Implantation chance</Option3_Label>
<Option3_Desc>Base implantation chance of fertilized egg&#10;This value affects the chance of impregnation.</Option3_Desc>
<Option4_Label>Fertilization chance</Option4_Label>
<Option4_Desc>The fertilization chance per ml of sperm per hour&#10;This value affects the chance of impregnation.</Option4_Desc>
<Option5_Label>Cum decay ratio per hour</Option5_Label>
<Option5_Desc>The amount of cum in the womb will drop by this amount every hour&#10;This value affects the chance of impregnation.</Option5_Desc>
<Option6_Label>Cum fertility decay ratio per hour</Option6_Label>
<Option6_Desc>Cum will lose fertility by this amount every hour&#10;This value affects fertilization chance indirectly.</Option6_Desc>
<Option7_Label>Cycle acceleration</Option7_Label>
<Option7_Desc>Accelerate menstruation cycle&#10;This can cause early menopause and infertility.&#10;Setting this lower than x12 is recommended.&#10;Rimworld's timescale: x6(default)</Option7_Desc>
<Option8_Label>Debug</Option8_Label>
<Option8_Desc>Show debug informations.&#10;Also overrides "Fetus information level" to All</Option8_Desc>
<Option9_Label>womb status</Option9_Label>
<Option9_Desc>draw womb icon in status window</Option9_Desc>
<Option10_Label>vagina and breast status</Option10_Label>
<Option10_Desc>draw vagina, anus and breast icon in status window</Option10_Desc>
<Option8_Desc>Show debug information.&#10;Also overrides "Fetus information level" to All.</Option8_Desc>
<Option9_Label>Womb status</Option9_Label>
<Option9_Desc>Draw womb icon in status window.</Option9_Desc>
<Option10_Label>Vagina and breast status</Option10_Label>
<Option10_Desc>Draw vagina, anus and breast icons in the status window.</Option10_Desc>
<Option11_Label>Fetus information level</Option11_Label>
<Option11_Desc_1>Show all informations about fetus</Option11_Desc_1>
<Option11_Desc_2>Show all informations about fetus after noticed pregnancy</Option11_Desc_2>
<Option11_Desc_3>Do not show informations about fetus, but display image of fetus after noticed pregnancy</Option11_Desc_3>
<Option11_Desc_4>Do not show fetus image and informations</Option11_Desc_4>
<Option12_Label>enable menopause</Option12_Label>
<Option12_Desc>enable menopause effect that makes pawn infertile in time progress&#10;if you have problems with long life races, turn off this option.&#10;this option will apply after save loaded</Option12_Desc>
<Option13_Label>use multiple pregnancy</Option13_Label>
<Option13_Desc>use multiple pregnancy instead RJW's default pregnancy&#10;disable this option if you are in trouble with impregnation&#10;RJW pregnancy should be turned on.</Option13_Desc>
<Option14_Label>enable hetero ovular twins</Option14_Label>
<Option14_Desc>enable multiple eggs can get pregnant</Option14_Desc>
<Option15_Label>enable enzygotic twins</Option15_Label>
<Option15_Desc>enable single egg to result multiple offsprings</Option15_Desc>
<Option16_Label>enzygotic twins chance</Option16_Label>
<Option16_Desc>set chance of twins</Option16_Desc>
<Option17_Label>max enzygotic twins</Option17_Label>
<Option17_Desc>set max number of twins</Option17_Desc>
<Option18_Label>enable egg overlay</Option18_Label>
<Option18_Desc>enable egg overlay on womb icon</Option18_Desc>
<Option19_Label_1>bleeding amount</Option19_Label_1>
<Option19_Label_2>estimated total bleeding amount</Option19_Label_2>
<Option19_Desc>set bleeding amount&#10;actual bleeding amount can be different depending on vagina&#10;the generic bleeding amount of human female is about 20~80ml per month</Option19_Desc>
<Option11_Desc_1>Show all information about a fetus.</Option11_Desc_1>
<Option11_Desc_2>Show all information about a fetus after discovered pregnancy.</Option11_Desc_2>
<Option11_Desc_3>Show only image of a fetus after discovered pregnancy.</Option11_Desc_3>
<Option11_Desc_4>Do not show any information about a fetus.</Option11_Desc_4>
<Option12_Label>Enable menopause</Option12_Label>
<Option12_Desc>Enable menopause effect that makes pawn infertile in time progress&#10;If you have problems with long life races, turn off this option.&#10;This option will apply after save loaded.</Option12_Desc>
<Option13_Label>Use multiple pregnancy</Option13_Label>
<Option13_Desc>Use multiple pregnancy instead RJW's default pregnancy&#10;Disable this option if you are in trouble with impregnation&#10;RJW pregnancy should be turned on.</Option13_Desc>
<Option14_Label>Enable hetero ovular twins</Option14_Label>
<Option14_Desc>Allow pregnancy from multiple eggs at the same time.</Option14_Desc>
<Option15_Label>Enable enzygotic twins</Option15_Label>
<Option15_Desc>Enable a single egg to result in multiple identical offspring.</Option15_Desc>
<Option16_Label>Enzygotic twins chance</Option16_Label>
<Option16_Desc>The chance of identical twins.</Option16_Desc>
<Option17_Label>Max enzygotic twins</Option17_Label>
<Option17_Desc>The maximum number of identical siblings.</Option17_Desc>
<Option18_Label>Enable egg overlay</Option18_Label>
<Option18_Desc>Enable egg overlay on womb icon.</Option18_Desc>
<Option19_Label_1>Bleeding amount</Option19_Label_1>
<Option19_Label_2>Estimated total bleeding amount</Option19_Label_2>
<Option19_Desc>The approximate bleeding amount.&#10;The normal bleeding amount of a human is about 20~80ml per cycle.</Option19_Desc>
<Option20_Label_1>Colonist</Option20_Label_1>
<Option20_Label_2>Prisoner</Option20_Label_2>
<Option20_Label_3>Ally Faction</Option20_Label_3>
<Option20_Label_3>Allied Faction</Option20_Label_3>
<Option20_Label_4>Neutral</Option20_Label_4>
<Option20_Label_5>Hostile Faction</Option20_Label_5>
<Option21_Label>target pawns</Option21_Label>
<Option21_Desc>the gizmo and button will appear for these pawns</Option21_Desc>
<Option22_Label>use hybrid extension</Option22_Label>
<Option22_Desc>overrides RJW and RaceSupport's hybrid definition&#10;Dominant hybrid extension determines whose definition used first. Not recommended to change this</Option22_Desc>
<Option21_Label>Target pawns:</Option21_Label>
<Option21_Desc>The gizmo and button will appear for these pawns</Option21_Desc>
<Option22_Label>Use hybrid extension</Option22_Label>
<Option22_Desc>Overrides RJW and RaceSupport's hybrid definition.&#10;Dominant hybrid extension determines whose definition used first. Not recommended to change this.</Option22_Desc>
<Option23_Label>Dominant hybrid extension</Option23_Label>
<Option23_Label_1>Mother</Option23_Label_1>
<Option23_Label_2>Father</Option23_Label_2>
<Option24_Label>Transition variance of nipples after pregnancy</Option24_Label>
<Option24_Desc>Set how much nipples/areolas be darker/wider on every pregnancy.</Option24_Desc>
<Option25_Label>Permanent transition variance of Nipples</Option25_Label>
<Option25_Desc>Set how much nipples/areolas be darker/wider permanently on every pregnancy.</Option25_Desc>
<Option24_Desc>Set how much nipples/areolas should darken/widen on every pregnancy.</Option24_Desc>
<Option25_Label>Permanent transition variance of nipples</Option25_Label>
<Option25_Desc>Set how much nipples/areolas should darken/widen permanently on every pregnancy.</Option25_Desc>
<Option26_Label>Maximum transition</Option26_Label>
<Option26_Desc>Nipples/areolas won't be darker/wider than this value.</Option26_Desc>
<Option27_Label>Transition speed of nipples</Option27_Label>
@ -94,14 +94,14 @@
<Option28_Label>Customize Hybrids</Option28_Label>
<Option28_Tooltip>Open custom hybrid editor.&#10;This will overrides hybrid definitions of XML files.</Option28_Tooltip>
<Option29_Label>Allow shrink icon</Option29_Label>
<Option29_Desc>Let icon become smaller If needed.</Option29_Desc>
<Option29_Desc>Let icon become smaller if needed.</Option29_Desc>
<Option30_Label>Egg lifespan multiplier</Option30_Label>
<Option30_Desc>Multiply egg's lifespan.&#10;Eggs will die at end of luteal stage regardless of this setting.</Option30_Desc>
<Option30_Desc>Multiply egg's lifespan.&#10;All non-implanted eggs will die at end of luteal stage regardless of this setting.</Option30_Desc>
<Option31_Label>Enable vagina morph after birth</Option31_Label>
<Option31_Desc>Enable permanent vagina stretch after birth.&#10;If you are using another mod handling this, turn off this option.</Option31_Desc>
<Option32_Label>Morph power</Option32_Label>
<Option32_Desc>Set morph power.</Option32_Desc>
<Option_EnableGatherCumGizmo_Label>Enable Gather Cum Gizmo</Option_EnableGatherCumGizmo_Label>
<Option_EnableGatherCumGizmo_Label>Enable gather cum gizmo</Option_EnableGatherCumGizmo_Label>
<Option_EstrusOverride_Label>Estrus overrides RJW hookup settings</Option_EstrusOverride_Label>
<Option_EstrusOverride_Desc>If enabled, a pawn in visible estrus will use these settings for potential impregnation hookups instead of the RJW settings.&#10;All settings default to their RJW counterparts.</Option_EstrusOverride_Desc>
<Option_EstrusFuckability_Label>Hookup minimum fuckability in estrus</Option_EstrusFuckability_Label>
@ -109,7 +109,7 @@
<Option_EstrusRelationship_Label>Hookup minimum opinion in estrus</Option_EstrusRelationship_Label>
<EstimatedCumLifespan>Estimated sperm lifespan</EstimatedCumLifespan>
<EstimatedEggLifespan>Estimated egg lifespan</EstimatedEggLifespan>
<FertilityDesc>Chance of fertilization within an hour: {0}%&#10;The chance of pregnancy of fertilized egg.&#10;The white overlay is indicates fertilization chance of sperms in womb.</FertilityDesc>
<FertilityDesc>Chance of fertilization in the next hour: {0}%&#10;The chance of pregnancy of a fertilized egg.&#10;The white overlay indicates fertilization chance of sperm in womb.</FertilityDesc>
<Button_ResetToDefault>Reset to default</Button_ResetToDefault>
<FloatMenu_CleanSelf>Vaginal washing</FloatMenu_CleanSelf>

View file

@ -22,8 +22,8 @@
<UnwantedPregnancy.stages.0.description>어떻게 해야하지?...</UnwantedPregnancy.stages.0.description> <HaterCameInsideM.stages.0.description>그년한테 질싸를했어</HaterCameInsideM.stages.0.description>
<UexpectedPregnancyMild.stages.0.label>원치않은 임신</UexpectedPregnancyMild.stages.0.label>
<UexpectedPregnancyMild.stages.0.description>어떻게 해야하지?...</UexpectedPregnancyMild.stages.0.description>
<TookContraptivePill.stages.0.label>피임약 복용</TookContraptivePill.stages.0.label>
<TookContraptivePill.stages.0.description>괜찮을거야</TookContraptivePill.stages.0.description>
<TookContraceptivePill.stages.0.label>피임약 복용</TookContraceptivePill.stages.0.label>
<TookContraceptivePill.stages.0.description>괜찮을거야</TookContraceptivePill.stages.0.description>
<HateTookContraptivePill.stages.0.label>피임약 복용</HateTookContraptivePill.stages.0.label>
<HateTookContraptivePill.stages.0.description>임신하고싶어</HateTookContraptivePill.stages.0.description>
</LanguageData>

View file

@ -4,14 +4,14 @@
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="RJW_FertPill"]/ingestible/outcomeDoers</xpath>
<value>
<li Class="RJW_Menstruation.FertPillOutcomDoer"/>
<li Class="RJW_Menstruation.FertPillOutcomeDoer"/>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="RJW_Contraceptive"]/ingestible/outcomeDoers</xpath>
<value>
<li Class="RJW_Menstruation.ContraptiveOutcomDoer"/>
<li Class="RJW_Menstruation.ContraceptiveOutcomeDoer"/>
</value>
</Operation>
</Patch>

View file

@ -394,7 +394,7 @@ namespace RJW_Menstruation
Adjust = (int)(Configurations.EggLifespanMultiplier * 20);
float lifespan = (24f / Configurations.CycleAcceleration * Configurations.EggLifespanMultiplier);
listmain.LabelDouble(Translations.Option30_Label + " x" + Configurations.EggLifespanMultiplier, Translations.EstimatedEggLifespan + String.Format(": {0:0}h {1:0}h {2:0}h", (int)lifespan, (int)(lifespan * 2), (int)(lifespan * 3)), Translations.Option30_Desc);
listmain.LabelDouble(Translations.Option30_Label + " x" + Configurations.EggLifespanMultiplier, Translations.EstimatedEggLifespan + String.Format(": {0:0}h", (int)lifespan), Translations.Option30_Desc);
Adjust = (int)listmain.Slider(Adjust, 20, 1000);
Configurations.EggLifespanMultiplier = (float)Adjust / 20;

View file

@ -6,7 +6,7 @@ using rjw;
namespace RJW_Menstruation
{
public class FertPillOutcomDoer : IngestionOutcomeDoer
public class FertPillOutcomeDoer : IngestionOutcomeDoer
{
protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested)
{
@ -25,7 +25,7 @@ namespace RJW_Menstruation
}
}
public class InduceOvulationOutcomDoer : IngestionOutcomeDoer
public class InduceOvulationOutcomeDoer : IngestionOutcomeDoer
{
protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested)
{
@ -55,7 +55,7 @@ namespace RJW_Menstruation
}
public class OvaryPillOutcomDoer : IngestionOutcomeDoer
public class OvaryPillOutcomeDoer : IngestionOutcomeDoer
{
public float effectOffset;
@ -70,7 +70,7 @@ namespace RJW_Menstruation
}
}
public class SuperOvulationOutcomDoer : IngestionOutcomeDoer
public class SuperOvulationOutcomeDoer : IngestionOutcomeDoer
{
protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested)
{
@ -84,7 +84,7 @@ namespace RJW_Menstruation
}
}
public class ContraptiveOutcomDoer : IngestionOutcomeDoer
public class ContraceptiveOutcomeDoer : IngestionOutcomeDoer
{
protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested)
{
@ -102,8 +102,8 @@ namespace RJW_Menstruation
else m.moodPowerFactor = 0.3f;
}
if (pawn.Has(Quirk.Breeder)) pawn.needs.mood.thoughts.memories.TryGainMemoryFast(VariousDefOf.HateTookContraptivePill);
else pawn.needs.mood.thoughts.memories.TryGainMemoryFast(VariousDefOf.TookContraptivePill);
if (pawn.Has(Quirk.Breeder)) pawn.needs.mood.thoughts.memories.TryGainMemoryFast(VariousDefOf.HateTookContraceptivePill);
else pawn.needs.mood.thoughts.memories.TryGainMemoryFast(VariousDefOf.TookContraceptivePill);
}
}

View file

@ -948,7 +948,8 @@ namespace RJW_Menstruation
float avglittersize;
try
{
avglittersize = Rand.ByCurveAverage(pawn.def.race.litterSizeCurve);
if (pawn.def.race.litterSizeCurve.Points.Count < 3) avglittersize = 1; // Account for busted littersizecurves
else avglittersize = Rand.ByCurveAverage(pawn.def.race.litterSizeCurve);
}
catch (NullReferenceException)
{
@ -1049,7 +1050,10 @@ namespace RJW_Menstruation
public bool IsBreedingSeason()
{
if (Props.breedingSeason == SeasonalBreed.Always) return true;
switch (GenLocalDate.Season(parent.pawn.Map))
Map map = parent.pawn.Map;
if (map is null) map = Find.AnyPlayerHomeMap;
if (map is null) return true;
switch (GenLocalDate.Season(map))
{
case Season.Spring:
if ((Props.breedingSeason & SeasonalBreed.Spring) != 0) return true;

View file

@ -61,6 +61,7 @@
<Compile Include="Configurations.cs" />
<Compile Include="Cum.cs" />
<Compile Include="DebugActions.cs" />
<Compile Include="DrugOutcomeDoers.cs" />
<Compile Include="EstrusPartKindUsageRule.cs" />
<Compile Include="HediffComps\HediffComp_InducedOvulator.cs" />
<Compile Include="HediffComps\MenstruationUtility.cs" />
@ -68,7 +69,6 @@
<Compile Include="Recipe_Surgery.cs" />
<Compile Include="UI\Dialog_HybridCustom.cs" />
<Compile Include="UI\Dialog_WombStatus.cs" />
<Compile Include="DrugOutcomDoers.cs" />
<Compile Include="FilthMaker_Colored.cs" />
<Compile Include="HARCompatibility.cs" />
<Compile Include="HediffComps\HediffComp_Breast.cs" />

View file

@ -39,8 +39,8 @@ namespace RJW_Menstruation
public static readonly ThoughtDef HaterCameInsideM = DefDatabase<ThoughtDef>.GetNamed("HaterCameInsideM");
public static readonly ThoughtDef UnwantedPregnancy = DefDatabase<ThoughtDef>.GetNamed("UnwantedPregnancy");
public static readonly ThoughtDef UnwantedPregnancyMild = DefDatabase<ThoughtDef>.GetNamed("UnwantedPregnancyMild");
public static readonly ThoughtDef TookContraptivePill = DefDatabase<ThoughtDef>.GetNamed("TookContraptivePill");
public static readonly ThoughtDef HateTookContraptivePill = DefDatabase<ThoughtDef>.GetNamed("HateTookContraptivePill");
public static readonly ThoughtDef TookContraceptivePill = DefDatabase<ThoughtDef>.GetNamed("TookContraceptivePill");
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 VaginaCompProperties = (CompProperties_Menstruation)Vagina.comps.FirstOrDefault(x => x is CompProperties_Menstruation);
public static readonly KeyBindingDef OpenStatusWindowKey = DefDatabase<KeyBindingDef>.GetNamed("OpenStatusWindow");

View file

@ -1,3 +1,8 @@
Version 1.0.6.4
- Fix a bug with pawns not being generated.
- Fix ovary initialization for races with invalid litter sizes.
- A whole mess of spelling, grammar, and description updates.
Version 1.0.6.3
- Fix pawn generation for races with a single lifestage.
- Show womb gizmo for males with vaginas, too.