1.0.1.15

About/Manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>RJW Menstruation</identifier>
-	<version>1.0.1.14</version>
+	<version>1.0.1.15</version>
 	<dependencies>
 	</dependencies>
 	<incompatibleWith />

Defs/Drugs/Pills_Menstruation.xml

@@ -91,7 +91,50 @@
 		</comps>
 	</ThingDef>
 	
-	
+	<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>
+		<graphicData>
+			<texPath>Things/Item/PainReliever</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<rotatable>false</rotatable>
+		<statBases>
+			<WorkToMake>1000</WorkToMake>
+			<MarketValue>12</MarketValue>
+			<Mass>0.01</Mass>
+		</statBases>
+		<techLevel>Industrial</techLevel>
+		<ingestible>
+			<drugCategory>Medical</drugCategory>
+			<outcomeDoers>
+				<li Class="IngestionOutcomeDoer_GiveHediff">
+					<hediffDef>Hediff_PainReliever</hediffDef>
+					<severity>1.0</severity>
+				</li>
+			</outcomeDoers>
+		</ingestible>
+		<recipeMaker>
+			<researchPrerequisite>DrugProduction</researchPrerequisite>
+			<recipeUsers>
+				<li>DrugLab</li>
+			</recipeUsers>
+		</recipeMaker>
+		<costList>
+			<MedicineHerbal>1</MedicineHerbal>
+		</costList>
+		<comps>
+			<li Class="CompProperties_Drug">
+			<addictiveness>0</addictiveness>
+			<listOrder>1000</listOrder>
+				<overdoseSeverityOffset>
+					<min>0.08</min>
+					<max>0.14</max>
+				</overdoseSeverityOffset>
+			</li>
+		</comps>
+	</ThingDef>
 	
 	
 </Defs>

Defs/HediffDef/Hediffs_Menstruation.xml

@@ -9,7 +9,7 @@
 		<defaultLabelColor>(0.70,0.00,0.00)</defaultLabelColor>	
 		<isBad>true</isBad>
 		<tendable>false</tendable>
-		<makesSickThought>true</makesSickThought>
+		<makesSickThought>false</makesSickThought>
 		<makesAlert>false</makesAlert>	
 		<maxSeverity>1</maxSeverity>
 		<initialSeverity>0.1</initialSeverity>
@@ -23,7 +23,7 @@
 					<SexFrequency>0.50</SexFrequency>
 					<SexSatisfaction>0.95</SexSatisfaction>
 				</statFactors>
-				<painOffset>0.05</painOffset>
+				<painOffset>0.005</painOffset>
 			</li>
 			<li>
 				<minSeverity>0.2</minSeverity>
@@ -32,7 +32,7 @@
 					<SexFrequency>0.40</SexFrequency>
 					<SexSatisfaction>0.95</SexSatisfaction>
 				</statFactors>
-				<painOffset>0.1</painOffset>
+				<painOffset>0.01</painOffset>
 			</li>
 			<li>
 				<minSeverity>0.4</minSeverity>
@@ -41,7 +41,7 @@
 					<SexFrequency>0.20</SexFrequency>
 					<SexSatisfaction>0.95</SexSatisfaction>
 				</statFactors>
-				<painOffset>0.2</painOffset>
+				<painOffset>0.10</painOffset>
 			</li>
 			<li>
 				<minSeverity>0.6</minSeverity>
@@ -50,7 +50,7 @@
 					<SexFrequency>0.0</SexFrequency>
 					<SexSatisfaction>0.95</SexSatisfaction>
 				</statFactors>
-				<painOffset>0.4</painOffset>
+				<painOffset>0.20</painOffset>
 			</li>
 		</stages>	
 		<comps>
@@ -236,4 +236,28 @@
 		</comps>
 	</HediffDef>
 	
+	
+	<HediffDef Name="Hediff_PainReliever">
+		<hediffClass>HediffWithComps</hediffClass>
+		<defName>Hediff_PainReliever</defName>
+		<label>Pain reliever</label>
+		<description>relieves pain.</description>
+		<defaultLabelColor>(0.75,0.75,1.0)</defaultLabelColor>	
+		<isBad>false</isBad>
+		<tendable>false</tendable>
+		<makesSickThought>false</makesSickThought>
+		<makesAlert>false</makesAlert>	
+		<maxSeverity>5</maxSeverity>
+		<initialSeverity>1.0</initialSeverity>
+		<stages>
+			<li>
+				<painOffset>-0.1</painOffset>
+			</li>
+		</stages>	
+		<comps>
+			<li Class="HediffCompProperties_SeverityPerDay">
+				<severityPerDay>-1.0</severityPerDay>
+			</li>
+		</comps>
+	</HediffDef>
 </Defs>

Defs/ThingDefs/Apparel_Absorbers.xml

@@ -4,7 +4,7 @@
   <ThingDef ParentName="ApparelNoQualityBase">
     <defName>Absorber_Tampon</defName>
     <label>tampon</label>
-    <description>A tampon for absorbing fluids from vagina</description>
+    <description>A tampon for absorbing fluids from vagina.&#10;May cause infection if using too long.</description>
     <thingClass>RJW_Menstruation.Absorber_Tampon</thingClass>
     <graphicData>
       <texPath>Things/Item/Tampon</texPath>
@@ -63,7 +63,7 @@
 		<li Class="RJW_Menstruation.AbsorberModExtension">
 			<leakAfterDirty>false</leakAfterDirty>
 			<effectsAfterDirty>true</effectsAfterDirty>
-			<minHourstoDirtyEffect>8</minHourstoDirtyEffect>
+			<minHourstoDirtyEffect>10</minHourstoDirtyEffect>
 			<dirtyDef>Absorber_Tampon_Dirty</dirtyDef>
 		</li>
 	</modExtensions>
@@ -72,7 +72,7 @@
   <ThingDef ParentName="ApparelNoQualityBase">
 	<defName>Absorber_Tampon_Dirty</defName>
     <label>dirty tampon</label>
-    <description>An wet used tampon</description>
+    <description>An wet used tampon.&#10;May cause infection.</description>
     <thingClass>RJW_Menstruation.Absorber_Tampon</thingClass>
     <graphicData>
       <texPath>Things/Item/Tampon</texPath>
@@ -126,7 +126,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 vagina.</description>
     <thingClass>RJW_Menstruation.Absorber</thingClass>
     <graphicData>
       <texPath>Things/Item/Pad</texPath>
@@ -192,7 +192,7 @@
   <ThingDef ParentName="ApparelNoQualityBase">
 	<defName>Absorber_Pad_Dirty</defName>
     <label>wet sanitary pad</label>
-    <description>An wet used pad</description>
+    <description>An wet used pad.</description>
     <thingClass>RJW_Menstruation.Absorber</thingClass>
     <graphicData>
       <texPath>Things/Item/Pad</texPath>

Defs/ThoughtDefs/Thoughts_sex.xml

@@ -11,7 +11,7 @@
 			<li>
 				<label>dripping fluids</label>
 				<description>It bothers me.</description>
-				<baseMoodEffect>-2</baseMoodEffect>
+				<baseMoodEffect>-1</baseMoodEffect>
 			</li>
 		</stages>
 	</ThoughtDef>

Languages/English/Keyed/RJW_Menstruation.xml

@@ -30,13 +30,13 @@
   <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</Option3_Desc>
+  <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 sperm on every hour</Option4_Desc>
+  <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</Option5_Desc>
+  <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</Option6_Desc>
+  <Option6_Desc>cum will lose fertility about this ratio&#10;this value affects on the fertility chance indirectly</Option6_Desc>
   <Option7_Label>cycle accelerate</Option7_Label>
   <Option7_Desc>accelerate menstrution cycle</Option7_Desc>
   <Option8_Label>Debug</Option8_Label>
@@ -53,7 +53,7 @@
   <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</Option13_Desc>
+  <Option13_Desc>use multiple pregnancy instead RJW's default pregnancy&#10;disable this option if you are in trouble with impregnation</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>

Languages/Korean/DefInjected/HediffDef/RJWMenstruation.xml

@@ -18,6 +18,8 @@
   <Hediff_Estrus.description>발정기입니다.</Hediff_Estrus.description>
   <Hediff_Estrus_Consealed.label>발정기(숨김)</Hediff_Estrus_Consealed.label>
   <Hediff_Estrus_Consealed.description>발정기입니다.</Hediff_Estrus_Consealed.description>
+  <Hediff_PainReliever.label>진통제</Hediff_PainReliever.label>
+  <Hediff_PainReliever.description>약간의 고통을 줄여줍니다.</Hediff_PainReliever.description>
 
   
   

Languages/Korean/DefInjected/ThingDef/RJWMenstruation.xml

@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
   <Absorber_Tampon.label>탐폰</Absorber_Tampon.label>
-  <Absorber_Tampon.description>보지에서 나오는 액체를 흡수하는 탐폰입니다.</Absorber_Tampon.description>
+  <Absorber_Tampon.description>보지에서 나오는 액체를 흡수하는 탐폰입니다.&#10;오래 착용하고 있을 경우 감염이 발생할수도 있습니다.</Absorber_Tampon.description>
   <Absorber_Tampon_Dirty.label>더러운 탐폰</Absorber_Tampon_Dirty.label>
   <Absorber_Tampon_Dirty.description>사용된 축축한 탐폰입니다.</Absorber_Tampon_Dirty.description>
   <Absorber_Pad.label>생리대</Absorber_Pad.label>
-  <Absorber_Pad.description>보지에서 나오는 액체를 흡수하는 생리대입니다.</Absorber_Pad.description>
+  <Absorber_Pad.description>보지에서 나오는 액체를 흡수하는 생리대입니다.&#10;흡수량 이상의 액체가 나올경우 샐수있습니다.</Absorber_Pad.description>
   <Absorber_Pad_Dirty.label>젖은 생리대</Absorber_Pad_Dirty.label>
   <Absorber_Pad_Dirty.description>사용된 축축한 생리대입니다.</Absorber_Pad_Dirty.description>
   <OvaryRegenerationPill.label>난소 재생약</OvaryRegenerationPill.label>
   <OvaryRegenerationPill.description>난소를 재생시켜 배출할수있는 난자의 양을 증가시킵니다.&#10;난자 소모량이 클수록 효과가 줄어듭니다.&#10;갱년기 증상을 완화시키지 않습니다.</OvaryRegenerationPill.description>
   <SuperovulationInducingAgent.label>과배란 유도제</SuperovulationInducingAgent.label>
   <SuperovulationInducingAgent.description>과배란을 유도하는 약물입니다.&#10;조기폐경을 초래할수도 있습니다.</SuperovulationInducingAgent.description>
+  <PainReliever.label>진통제</PainReliever.label>
+  <PainReliever.description>하루동안 약간의 통증을 줄여줍니다.</PainReliever.description>
   <FilthMixture.label>혼합물</FilthMixture.label>
   
   

changelogs.txt

@@ -1,3 +1,12 @@
+Version 1.0.1.15
+ - added more descrption on the mod options
+ - sick thought of in period removed
+ - pain offset of in period decreased
+ - added pain reliever
+ - added description for tampon about infection
+ - infection chance of dirty tampon decreased 2% to 1%
+
+
 Version 1.0.1.14
  - requires RJW 4.6.1 or later
  - fixed interspecies factor applied to normal pregnancy

source/RJW_Menstruation/RJW_Menstruation.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30907.101
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJW_Menstruation", "RJW_Menstruation\RJW_Menstruation.csproj", "{0E3D82EC-3048-43DC-8C7A-6377671928FA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJW_Menstruation", "RJW_Menstruation\RJW_Menstruation.csproj", "{EED2F3B9-8C20-4194-919E-8D151B29F70B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,10 +11,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0E3D82EC-3048-43DC-8C7A-6377671928FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EED2F3B9-8C20-4194-919E-8D151B29F70B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E3D82EC-3048-43DC-8C7A-6377671928FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EED2F3B9-8C20-4194-919E-8D151B29F70B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E3D82EC-3048-43DC-8C7A-6377671928FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EED2F3B9-8C20-4194-919E-8D151B29F70B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0E3D82EC-3048-43DC-8C7A-6377671928FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EED2F3B9-8C20-4194-919E-8D151B29F70B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs

@@ -1355,28 +1355,16 @@ namespace RJW_Menstruation
             switch (targetstage)
             {
                 case Stage.Follicular:
-                    action = delegate
+                    action = FollicularAction;
-                    {
-                        FollicularAction();
-                    };
                     break;
                 case Stage.Ovulatory:
-                    action = delegate
+                    action = OvulatoryAction;
-                    {
-                        OvulatoryAction();
-                    };
                     break;
                 case Stage.Luteal:
-                    action = delegate
+                    action = LutealAction;
-                    {
-                        LutealAction();
-                    };
                     break;
                 case Stage.Bleeding:
-                    action = delegate
+                    action = BleedingAction;
-                    {
-                        BleedingAction();
-                    };
                     break;
                 case Stage.Fertilized:  //Obsoleted stage. merged in luteal stage
                     action = delegate
@@ -1386,10 +1374,7 @@ namespace RJW_Menstruation
                     };
                     break;
                 case Stage.Pregnant:
-                    action = delegate
+                    action = PregnantAction;
-                    {
-                        PregnantAction();
-                    };
                     break;
                 case Stage.Recover:
                     action = delegate
@@ -1424,10 +1409,7 @@ namespace RJW_Menstruation
                     };
                     break;
                 case Stage.Young:
-                    action = delegate
+                    action = YoungAction;
-                    {
-                        YoungAction();
-                    };
                     break;
                 case Stage.ClimactericFollicular:
                     action = delegate
@@ -1509,10 +1491,7 @@ namespace RJW_Menstruation
                     };
                     break;
                 case Stage.Anestrus:
-                    action = delegate
+                    action = AnestrusAction;
-                    {
-                        AnestrusAction();
-                    };
                     break;
                 default:
                     curStage = Stage.Follicular;
@@ -1521,7 +1500,7 @@ namespace RJW_Menstruation
                     HugsLibController.Instance.TickDelayScheduler.ScheduleCallback(PeriodSimulator(Stage.Follicular), tickInterval, parent.pawn, false);
                     break;
             }
-            action += () =>
+            action += delegate
             {
                 if (parent.pawn.health.capacities.GetLevel(xxx.reproduction) <= 0) curStage = Stage.Young;
                 CumOut();

source/RJW_Menstruation/RJW_Menstruation/Things.cs

@@ -134,7 +134,7 @@ namespace RJW_Menstruation
 
         public override void DirtyEffect()
         {
-            if (wearhours > MinHrstoDirtyEffect && Rand.Chance(0.02f))
+            if (wearhours > MinHrstoDirtyEffect && Rand.Chance(0.01f))
             {
                 Wearer.health.AddHediff(HediffDefOf.WoundInfection, Genital_Helper.get_genitalsBPR(Wearer));
             }