diff --git a/1.3/Assemblies/RJW_Menstruation.dll b/1.3/Assemblies/RJW_Menstruation.dll index acca031..a8b78df 100644 Binary files a/1.3/Assemblies/RJW_Menstruation.dll and b/1.3/Assemblies/RJW_Menstruation.dll differ diff --git a/1.3/Defs/Drugs/Pills_Menstruation.xml b/1.3/Defs/Drugs/Pills_Menstruation.xml index da90ab8..8325b19 100644 --- a/1.3/Defs/Drugs/Pills_Menstruation.xml +++ b/1.3/Defs/Drugs/Pills_Menstruation.xml @@ -4,7 +4,7 @@ OvaryRegenerationPill - Recovers ovary's health. Less effective on unhealthy ovary. Does not recover menopause. + Recovers an ovary's health, restoring some quantity of eggs. Less effective on ovaries with few eggs remaining. Cannot recover menopause. Things/Item/ORPill Graphic_StackCount @@ -19,7 +19,7 @@ Medical -
  • +
  • 0.3
    • @@ -50,7 +50,7 @@ SuperovulationInducingAgent - Induce superovulation May cause early menopause + Induce superovulation, causing the next ovulation to produce 1-4 extra eggs. May hasten the onset of menopause. Things/Item/SIA Graphic_StackCount @@ -65,7 +65,7 @@ Medical -
  • +
    • @@ -94,7 +94,7 @@ PainReliever - Relieves menstrual pain for a day. Also effective on generic pain. + Relieves menstrual pain for 24 hours. Also effective on other sources of pain. Things/Item/PainReliever Graphic_StackCount @@ -139,7 +139,7 @@ Cyclosporine - An immunosuppressant. Can cure antisperm antibody. + An immunosuppressant. Can cure antisperm antibody, but harms the body's ability to fight off infection and disease for 24 hours. Things/Item/Cyclosporine Graphic_StackCount diff --git a/1.3/Defs/HediffDef/Hediffs_Cum.xml b/1.3/Defs/HediffDef/Hediffs_Cum.xml index fa33c17..8ad5b54 100644 --- a/1.3/Defs/HediffDef/Hediffs_Cum.xml +++ b/1.3/Defs/HediffDef/Hediffs_Cum.xml @@ -6,7 +6,7 @@ antisperm antibody Antisperm antibody. Increases death rate of sperm. - {0} got antisperm antibody + {0} has an antisperm antibody (0.8,0.1,0.1) false false @@ -33,7 +33,7 @@ HediffWithComps Hediff_ForceFertile - + fertile fertile {0} is fertile diff --git a/1.3/Defs/HediffDef/Hediffs_Menstruation.xml b/1.3/Defs/HediffDef/Hediffs_Menstruation.xml index ea8d9e0..eb0cf90 100644 --- a/1.3/Defs/HediffDef/Hediffs_Menstruation.xml +++ b/1.3/Defs/HediffDef/Hediffs_Menstruation.xml @@ -5,7 +5,7 @@ Hediff_MenstrualCramp in period - in period + Bleeding from the vagina at the end of the menstrual cycle. Often painful. (0.70,0.00,0.00) true false @@ -65,8 +65,8 @@ Hediff_Menopause menopause - reached menopause - {0} reached menopause + A condition caused by exhaustion of the ovaries' eggs. Without eggs, the womb can no longer produce children. + {0} has entered menopause (0.70,0.70,0.00) false false @@ -100,7 +100,7 @@ Hediff_Climacteric climacteric - climacteric + The ovaries have produced their final eggs. Menopause will soon occur. (0.70,0.70,0.00) false false @@ -178,7 +178,7 @@ Hediff_Estrus estrus - estrus + 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. Increased chance of vaginal sex occurring and potentially lower standards in mate selection. (1.00,0.60,0.75) false false @@ -207,9 +207,9 @@ HediffWithComps Hediff_Estrus_Concealed - + estrus - estrus + A condition caused by a womb its most fertile phase of the menstrual cycle. Sexual arousal and desire increase slightly. Slightly increased chance of vaginal sex. (1.00,0.60,0.75) false false @@ -241,7 +241,7 @@ HediffWithComps Hediff_PainReliever - relieves pain. + A mild reprieve from menstrual (and other) sources of pain. (0.75,0.75,1.0) false false @@ -265,7 +265,7 @@ HediffWithComps Hediff_Cyclosporine - Immunosuppressant. + Under the effect of an immunosuppressant, hampering the body's ability to fight off infection and disease. (0.75,0.75,1.0) false false diff --git a/1.3/Defs/KeyBindings/KeyBindings_Menstruation.xml b/1.3/Defs/KeyBindings/KeyBindings_Menstruation.xml index 1c4bcdf..6044f12 100644 --- a/1.3/Defs/KeyBindings/KeyBindings_Menstruation.xml +++ b/1.3/Defs/KeyBindings/KeyBindings_Menstruation.xml @@ -3,7 +3,7 @@ OpenStatusWindow - + Q diff --git a/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Breast.xml b/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Breast.xml index 4041c52..b15a8bd 100644 --- a/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Breast.xml +++ b/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Breast.xml @@ -31,34 +31,34 @@ Surgery_ExpandAreola - - expand areola. + + Expand the areolae. RJW_Menstruation.Recipe_ExpandAreola - expanding areola + expanding areolae Surgery_ContractAreola - - contract areola. + + Contract the areolae. RJW_Menstruation.Recipe_ContractAreola - contracting areola + contracting areolae Surgery_ExpandNipple - - expand nipple. + + Expand the nipples. RJW_Menstruation.Recipe_ExpandNipple - expanding nipple + expanding nipples Surgery_ContractNipple - - contract nipple. + + Constract the nipples. RJW_Menstruation.Recipe_ContractNipple - contracting nipple + contracting nipples diff --git a/1.3/Defs/RecordDefs/Records_Womb.xml b/1.3/Defs/RecordDefs/Records_Womb.xml index e42a0a9..6228687 100644 --- a/1.3/Defs/RecordDefs/Records_Womb.xml +++ b/1.3/Defs/RecordDefs/Records_Womb.xml @@ -4,14 +4,14 @@ AmountofCreampied - The amount of cums I have been creampied. + The milliliters of cum that's been ejaculated into my womb. Float AmountofFertilizedEggs - The amount of my eggs being raped by sperm. + The number of my eggs that sperm has fertilized. Int diff --git a/1.3/Defs/Stats/Stats_Absorber.xml b/1.3/Defs/Stats/Stats_Absorber.xml index 5a6521d..b45fda3 100644 --- a/1.3/Defs/Stats/Stats_Absorber.xml +++ b/1.3/Defs/Stats/Stats_Absorber.xml @@ -4,7 +4,7 @@ MaxAbsorbable - Maximum fluids can be absorbed. + Maximum amount of fluid that this item can absorb. Apparel 0 FloatOne diff --git a/1.3/Defs/ThingDefs/Apparel_Absorbers.xml b/1.3/Defs/ThingDefs/Apparel_Absorbers.xml index c9dec8a..c27e718 100644 --- a/1.3/Defs/ThingDefs/Apparel_Absorbers.xml +++ b/1.3/Defs/ThingDefs/Apparel_Absorbers.xml @@ -4,7 +4,7 @@ Absorber_Tampon - A tampon for absorbing fluids from vagina. May cause infection if using too long. + A tampon for absorbing fluids from a vagina. May cause an infection if worn for too long. RJW_Menstruation.Absorber_Tampon Things/Item/Tampon @@ -73,7 +73,7 @@ Absorber_Tampon_Dirty - An wet used tampon. May cause infection. + A wet used tampon. May cause infection if left in. RJW_Menstruation.Absorber_Tampon Things/Item/Tampon @@ -128,7 +128,7 @@ Absorber_Pad - A pad for absorbing fluids from vagina. + A pad for absorbing fluids from a vagina. RJW_Menstruation.Absorber Things/Item/Pad @@ -203,7 +203,7 @@ Absorber_Pad_Dirty - An wet used pad. + A wet used pad. RJW_Menstruation.Absorber Things/Item/Pad diff --git a/1.3/Defs/ThoughtDefs/Thoughts_sex.xml b/1.3/Defs/ThoughtDefs/Thoughts_sex.xml index a328574..9327937 100644 --- a/1.3/Defs/ThoughtDefs/Thoughts_sex.xml +++ b/1.3/Defs/ThoughtDefs/Thoughts_sex.xml @@ -10,7 +10,7 @@
  • - It bothers me. + Can't I get something to absorb this? -2
    • @@ -26,7 +26,7 @@
  • - I'm worried i might get pregnant. + I'm worried I might get pregnant. -3 -2
    • @@ -43,7 +43,7 @@
  • - I'm worried i might get pregnant. The chance is low, but... + I'm worried I might get pregnant. The chance is low, but... -1
    • @@ -59,7 +59,7 @@
  • - I might get pregnant. + I hope I get pregnant. 10 5
    • @@ -76,7 +76,7 @@
  • - I loved it. + I don't think I'll get pregnant, but it's fun to fantasize. 3 1
    • @@ -92,7 +92,7 @@
  • - Feel so good. + That felt so good. 2 1
    • @@ -109,7 +109,7 @@
  • - The chance is low. But i don't like it. + I probably won't get pregnant, but I still don't like it. -2 -5
    • @@ -126,7 +126,7 @@
  • - I don't want to be pregnant with his baby + I don't want to be pregnant with his baby! -5 -10
    • @@ -159,7 +159,7 @@
  • - i came inside of that bitch + I came inside of that bitch! 5 1
    • @@ -175,7 +175,7 @@
  • - How do i... + How will I take care of a baby? What am I going to do? -10
    • @@ -190,36 +190,36 @@
  • - How do i... + I'm having a baby. I hope I can manage. -3
    • - TookContraptivePill + TookContraceptivePill Thought_Memory 7.0 5 0.1
  • - - It will be okay. + + Everything will be okay now. 1
    • - HateTookContraptivePill + HateTookContraceptivePill Thought_Memory 7.0 5 0.1
  • - + I want to get pregnant. -3
    • diff --git a/1.3/Languages/English/Keyed/RJW_Menstruation.xml b/1.3/Languages/English/Keyed/RJW_Menstruation.xml index b87ce62..c173ac6 100644 --- a/1.3/Languages/English/Keyed/RJW_Menstruation.xml +++ b/1.3/Languages/English/Keyed/RJW_Menstruation.xml @@ -25,68 +25,68 @@ Ovulation - Gather cums into bucket - Store cums in womb + Gather cum into bucket + Store cum in womb Unknown - enable womb icon - enable button in health tab - enable animal cycle - simulate animal's cycle. this option will apply after save loaded not recommended - implantation chance - set implantation chance of fertilized egg this value determines finalizing chacne of impregnation - fertilization chance - set fertilize chance of 1mL of sperm on every hour this value determines beginning chance of impregnation - cum decay ratio per hour - cum will decrease about this ratio this value affects on the fertility chacne indirectly - cum fertility decay ratio per hour - cum will lose fertility about this ratio this value affects on the fertility chance indirectly estimated sperm lifespan: cum lose most of fertility at this time. - cycle accelerate - accelerate menstrution cycle This can cause early menopause and infertility. Setting this lower than x12 is recommended. Rimworld's timescale: x6(default) + Enable womb icon + Enable button in health tab + Enable animal cycle + Simulate animal cycles. This option will apply after next load Not recommended. + Implantation chance + Base implantation chance of fertilized egg This value affects the chance of impregnation. + Fertilization chance + The fertilization chance per ml of sperm per hour This value affects the chance of impregnation. + Cum decay ratio per hour + The amount of cum in the womb will drop by this amount every hour This value affects the chance of impregnation. + Cum fertility decay ratio per hour + Cum will lose fertility by this amount every hour This value affects fertilization chance indirectly. + Cycle acceleration + Accelerate menstruation cycle This can cause early menopause and infertility. Setting this lower than x12 is recommended. Rimworld's timescale: x6(default) Debug - Show debug informations. Also overrides "Fetus information level" to All - womb status - draw womb icon in status window - vagina and breast status - draw vagina, anus and breast icon in status window + Show debug information. Also overrides "Fetus information level" to All. + Womb status + Draw womb icon in status window. + Vagina and breast status + Draw vagina, anus and breast icons in the status window. Fetus information level - Show all informations about fetus - Show all informations about fetus after noticed pregnancy - Do not show informations about fetus, but display image of fetus after noticed pregnancy - Do not show fetus image and informations - enable menopause - enable menopause effect that makes pawn infertile in time progress if you have problems with long life races, turn off this option. this option will apply after save loaded - use multiple pregnancy - use multiple pregnancy instead RJW's default pregnancy disable this option if you are in trouble with impregnation RJW pregnancy should be turned on. - enable hetero ovular twins - enable multiple eggs can get pregnant - enable enzygotic twins - enable single egg to result multiple offsprings - enzygotic twins chance - set chance of twins - max enzygotic twins - set max number of twins - enable egg overlay - enable egg overlay on womb icon - bleeding amount - estimated total bleeding amount - set bleeding amount actual bleeding amount can be different depending on vagina the generic bleeding amount of human female is about 20~80ml per month + Show all information about a fetus. + Show all information about a fetus after discovered pregnancy. + Show only image of a fetus after discovered pregnancy. + Do not show any information about a fetus. + Enable menopause + Enable menopause effect that makes pawn infertile in time progress If you have problems with long life races, turn off this option. This option will apply after save loaded. + Use multiple pregnancy + Use multiple pregnancy instead RJW's default pregnancy Disable this option if you are in trouble with impregnation RJW pregnancy should be turned on. + Enable hetero ovular twins + Allow pregnancy from multiple eggs at the same time. + Enable enzygotic twins + Enable a single egg to result in multiple identical offspring. + Enzygotic twins chance + The chance of identical twins. + Max enzygotic twins + The maximum number of identical siblings. + Enable egg overlay + Enable egg overlay on womb icon. + Bleeding amount + Estimated total bleeding amount + The approximate bleeding amount. The normal bleeding amount of a human is about 20~80ml per cycle. Colonist Prisoner - Ally Faction + Allied Faction Neutral Hostile Faction - target pawns - the gizmo and button will appear for these pawns - use hybrid extension - overrides RJW and RaceSupport's hybrid definition Dominant hybrid extension determines whose definition used first. Not recommended to change this + Target pawns: + The gizmo and button will appear for these pawns + Use hybrid extension + Overrides RJW and RaceSupport's hybrid definition. Dominant hybrid extension determines whose definition used first. Not recommended to change this. Dominant hybrid extension Mother Father Transition variance of nipples after pregnancy - Set how much nipples/areolas be darker/wider on every pregnancy. - Permanent transition variance of Nipples - Set how much nipples/areolas be darker/wider permanently on every pregnancy. + Set how much nipples/areolas should darken/widen on every pregnancy. + Permanent transition variance of nipples + Set how much nipples/areolas should darken/widen permanently on every pregnancy. Maximum transition Nipples/areolas won't be darker/wider than this value. Transition speed of nipples @@ -94,14 +94,14 @@ Customize Hybrids Open custom hybrid editor. This will overrides hybrid definitions of XML files. Allow shrink icon - Let icon become smaller If needed. + Let icon become smaller if needed. Egg lifespan multiplier - Multiply egg's lifespan. Eggs will die at end of luteal stage regardless of this setting. + Multiply egg's lifespan. All non-implanted eggs will die at end of luteal stage regardless of this setting. Enable vagina morph after birth Enable permanent vagina stretch after birth. If you are using another mod handling this, turn off this option. Morph power Set morph power. - Enable Gather Cum Gizmo + Enable gather cum gizmo Estrus overrides RJW hookup settings If enabled, a pawn in visible estrus will use these settings for potential impregnation hookups instead of the RJW settings. All settings default to their RJW counterparts. Hookup minimum fuckability in estrus @@ -109,7 +109,7 @@ Hookup minimum opinion in estrus Estimated sperm lifespan Estimated egg lifespan - Chance of fertilization within an hour: {0}% The chance of pregnancy of fertilized egg. The white overlay is indicates fertilization chance of sperms in womb. + Chance of fertilization in the next hour: {0}% The chance of pregnancy of a fertilized egg. The white overlay indicates fertilization chance of sperm in womb. Reset to default Vaginal washing diff --git a/1.3/Languages/Korean/DefInjected/ThoughtDef/RJWMenstruation.xml b/1.3/Languages/Korean/DefInjected/ThoughtDef/RJWMenstruation.xml index 046a17e..9509437 100644 --- a/1.3/Languages/Korean/DefInjected/ThoughtDef/RJWMenstruation.xml +++ b/1.3/Languages/Korean/DefInjected/ThoughtDef/RJWMenstruation.xml @@ -22,8 +22,8 @@ 어떻게 해야하지?... 그년한테 질싸를했어 원치않은 임신 어떻게 해야하지?... - 피임약 복용 - 괜찮을거야 + 피임약 복용 + 괜찮을거야 피임약 복용 임신하고싶어 \ No newline at end of file diff --git a/1.3/Patches/Drugs.xml b/1.3/Patches/Drugs.xml index ff03d15..f601a1c 100644 --- a/1.3/Patches/Drugs.xml +++ b/1.3/Patches/Drugs.xml @@ -4,14 +4,14 @@ Defs/ThingDef[defName="RJW_FertPill"]/ingestible/outcomeDoers -
  • +
  • Defs/ThingDef[defName="RJW_Contraceptive"]/ingestible/outcomeDoers -
  • +
  • \ No newline at end of file diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/Configurations.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/Configurations.cs index 348b666..739e645 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/Configurations.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/Configurations.cs @@ -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; diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomDoers.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs similarity index 89% rename from 1.3/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomDoers.cs rename to 1.3/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs index d37651f..9693d7b 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomDoers.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs @@ -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); } } diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj b/1.3/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj index 213ca88..b043271 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj @@ -61,6 +61,7 @@ + @@ -68,7 +69,6 @@ - diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs index 58de25e..cb1faee 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs @@ -39,8 +39,8 @@ namespace RJW_Menstruation public static readonly ThoughtDef HaterCameInsideM = DefDatabase.GetNamed("HaterCameInsideM"); public static readonly ThoughtDef UnwantedPregnancy = DefDatabase.GetNamed("UnwantedPregnancy"); public static readonly ThoughtDef UnwantedPregnancyMild = DefDatabase.GetNamed("UnwantedPregnancyMild"); - public static readonly ThoughtDef TookContraptivePill = DefDatabase.GetNamed("TookContraptivePill"); - public static readonly ThoughtDef HateTookContraptivePill = DefDatabase.GetNamed("HateTookContraptivePill"); + public static readonly ThoughtDef TookContraceptivePill = DefDatabase.GetNamed("TookContraceptivePill"); + public static readonly ThoughtDef HateTookContraceptivePill = DefDatabase.GetNamed("HateTookContraceptivePill"); public static readonly HediffDef_PartBase Vagina = DefDatabase.GetNamed("Vagina"); public static readonly CompProperties_Menstruation VaginaCompProperties = (CompProperties_Menstruation)Vagina.comps.FirstOrDefault(x => x is CompProperties_Menstruation); public static readonly KeyBindingDef OpenStatusWindowKey = DefDatabase.GetNamed("OpenStatusWindow");