diff --git a/About/Manifest.xml b/About/Manifest.xml index b6ce083..2608cf3 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ RJW Menstruation - 1.0.1.14 + 1.0.1.15 diff --git a/Assemblies/RJW_Menstruation.dll b/Assemblies/RJW_Menstruation.dll index 24913f1..9864ab0 100644 Binary files a/Assemblies/RJW_Menstruation.dll and b/Assemblies/RJW_Menstruation.dll differ diff --git a/Defs/Drugs/Pills_Menstruation.xml b/Defs/Drugs/Pills_Menstruation.xml index a3b0659..ed9dca1 100644 --- a/Defs/Drugs/Pills_Menstruation.xml +++ b/Defs/Drugs/Pills_Menstruation.xml @@ -91,7 +91,50 @@ - + + PainReliever + + Relieves menstrual pain for a day. Also effective on generic pain. + + Things/Item/PainReliever + Graphic_StackCount + + false + + 1000 + 12 + 0.01 + + Industrial + + Medical + +
  • + Hediff_PainReliever + 1.0 +
    • +     +     + + DrugProduction + +
  • DrugLab
    • +     +     + + 1 + + +
  • + 0 + 1000 + + 0.08 + 0.14 + +
    • +     +     \ No newline at end of file diff --git a/Defs/HediffDef/Hediffs_Menstruation.xml b/Defs/HediffDef/Hediffs_Menstruation.xml index eb9c0db..5c33a91 100644 --- a/Defs/HediffDef/Hediffs_Menstruation.xml +++ b/Defs/HediffDef/Hediffs_Menstruation.xml @@ -9,7 +9,7 @@ (0.70,0.00,0.00) true false - true + false false 1 0.1 @@ -23,7 +23,7 @@ 0.50 0.95 - 0.05 + 0.005
  • 0.2 @@ -32,7 +32,7 @@ 0.40 0.95 - 0.1 + 0.01
  • 0.4 @@ -41,7 +41,7 @@ 0.20 0.95 - 0.2 + 0.10
  • 0.6 @@ -50,7 +50,7 @@ 0.0 0.95 - 0.4 + 0.20
    • @@ -236,4 +236,28 @@ + + + HediffWithComps + Hediff_PainReliever + + relieves pain. + (0.75,0.75,1.0) + false + false + false + false + 5 + 1.0 + +
  • + -0.1 +
    • +     + +
  • + -1.0 +
    • +     +     \ No newline at end of file diff --git a/Defs/ThingDefs/Apparel_Absorbers.xml b/Defs/ThingDefs/Apparel_Absorbers.xml index aa7573a..81239da 100644 --- a/Defs/ThingDefs/Apparel_Absorbers.xml +++ b/Defs/ThingDefs/Apparel_Absorbers.xml @@ -4,7 +4,7 @@ Absorber_Tampon - A tampon for absorbing fluids from vagina + A tampon for absorbing fluids from vagina. May cause infection if using too long. RJW_Menstruation.Absorber_Tampon Things/Item/Tampon @@ -63,7 +63,7 @@
  • false true - 8 + 10 Absorber_Tampon_Dirty
    • @@ -72,7 +72,7 @@ Absorber_Tampon_Dirty - An wet used tampon + An wet used tampon. May cause infection. RJW_Menstruation.Absorber_Tampon Things/Item/Tampon @@ -126,7 +126,7 @@ Absorber_Pad - A pad for absorbing fluids from vagina + A pad for absorbing fluids from vagina. RJW_Menstruation.Absorber Things/Item/Pad @@ -192,7 +192,7 @@ Absorber_Pad_Dirty - An wet used pad + An wet used pad. RJW_Menstruation.Absorber Things/Item/Pad diff --git a/Defs/ThoughtDefs/Thoughts_sex.xml b/Defs/ThoughtDefs/Thoughts_sex.xml index 4ad87dc..3d8d1d6 100644 --- a/Defs/ThoughtDefs/Thoughts_sex.xml +++ b/Defs/ThoughtDefs/Thoughts_sex.xml @@ -11,7 +11,7 @@
  • It bothers me. - -2 + -1
    • diff --git a/Languages/English/Keyed/RJW_Menstruation.xml b/Languages/English/Keyed/RJW_Menstruation.xml index 273f16a..f3201ff 100644 --- a/Languages/English/Keyed/RJW_Menstruation.xml +++ b/Languages/English/Keyed/RJW_Menstruation.xml @@ -30,13 +30,13 @@ enable animal cycle simulate animal's cycle. this option will apply after save loaded not recommended implantation chance - set implantation chance of fertilized egg + set implantation chance of fertilized egg this value determines finalizing chacne of impregnation fertilization chance - set fertilize chance of sperm on every hour + 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 + 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 + cum will lose fertility about this ratio this value affects on the fertility chance indirectly cycle accelerate accelerate menstrution cycle Debug @@ -53,7 +53,7 @@ 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 + use multiple pregnancy instead RJW's default pregnancy disable this option if you are in trouble with impregnation enable hetero ovular twins enable multiple eggs can get pregnant enable enzygotic twins diff --git a/Languages/Korean/DefInjected/HediffDef/RJWMenstruation.xml b/Languages/Korean/DefInjected/HediffDef/RJWMenstruation.xml index 33f0660..02a1238 100644 --- a/Languages/Korean/DefInjected/HediffDef/RJWMenstruation.xml +++ b/Languages/Korean/DefInjected/HediffDef/RJWMenstruation.xml @@ -18,6 +18,8 @@ 발정기입니다. 발정기(숨김) 발정기입니다. + 진통제 + 약간의 고통을 줄여줍니다. diff --git a/Languages/Korean/DefInjected/ThingDef/RJWMenstruation.xml b/Languages/Korean/DefInjected/ThingDef/RJWMenstruation.xml index 83450f2..b973e40 100644 --- a/Languages/Korean/DefInjected/ThingDef/RJWMenstruation.xml +++ b/Languages/Korean/DefInjected/ThingDef/RJWMenstruation.xml @@ -1,17 +1,19 @@  탐폰 - 보지에서 나오는 액체를 흡수하는 탐폰입니다. + 보지에서 나오는 액체를 흡수하는 탐폰입니다. 오래 착용하고 있을 경우 감염이 발생할수도 있습니다. 더러운 탐폰 사용된 축축한 탐폰입니다. 생리대 - 보지에서 나오는 액체를 흡수하는 생리대입니다. + 보지에서 나오는 액체를 흡수하는 생리대입니다. 흡수량 이상의 액체가 나올경우 샐수있습니다. 젖은 생리대 사용된 축축한 생리대입니다. 난소 재생약 난소를 재생시켜 배출할수있는 난자의 양을 증가시킵니다. 난자 소모량이 클수록 효과가 줄어듭니다. 갱년기 증상을 완화시키지 않습니다. 과배란 유도제 과배란을 유도하는 약물입니다. 조기폐경을 초래할수도 있습니다. + 진통제 + 하루동안 약간의 통증을 줄여줍니다. 혼합물 diff --git a/Textures/Things/Item/PainReliever/PainReliever_a.png b/Textures/Things/Item/PainReliever/PainReliever_a.png new file mode 100644 index 0000000..bad8d0b Binary files /dev/null and b/Textures/Things/Item/PainReliever/PainReliever_a.png differ diff --git a/Textures/Things/Item/PainReliever/PainReliever_b.png b/Textures/Things/Item/PainReliever/PainReliever_b.png new file mode 100644 index 0000000..3e8d7c3 Binary files /dev/null and b/Textures/Things/Item/PainReliever/PainReliever_b.png differ diff --git a/changelogs.txt b/changelogs.txt index d0137d1..b07ec8e 100644 --- a/changelogs.txt +++ b/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 diff --git a/source/RJW_Menstruation/RJW_Menstruation.sln b/source/RJW_Menstruation/RJW_Menstruation.sln index 99c2de2..aa715b2 100644 --- a/source/RJW_Menstruation/RJW_Menstruation.sln +++ b/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 - {0E3D82EC-3048-43DC-8C7A-6377671928FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E3D82EC-3048-43DC-8C7A-6377671928FA}.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}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EED2F3B9-8C20-4194-919E-8D151B29F70B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EED2F3B9-8C20-4194-919E-8D151B29F70B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EED2F3B9-8C20-4194-919E-8D151B29F70B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs index a7c2ef2..bf9d725 100644 --- a/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs +++ b/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs @@ -1355,28 +1355,16 @@ namespace RJW_Menstruation switch (targetstage) { case Stage.Follicular: - action = delegate - { - FollicularAction(); - }; + action = FollicularAction; break; case Stage.Ovulatory: - action = delegate - { - OvulatoryAction(); - }; + action = OvulatoryAction; break; case Stage.Luteal: - action = delegate - { - LutealAction(); - }; + action = LutealAction; break; case Stage.Bleeding: - action = delegate - { - BleedingAction(); - }; + action = 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 - { - PregnantAction(); - }; + action = PregnantAction; break; case Stage.Recover: action = delegate @@ -1424,10 +1409,7 @@ namespace RJW_Menstruation }; break; case Stage.Young: - action = delegate - { - YoungAction(); - }; + action = YoungAction; break; case Stage.ClimactericFollicular: action = delegate @@ -1509,10 +1491,7 @@ namespace RJW_Menstruation }; break; case Stage.Anestrus: - action = delegate - { - AnestrusAction(); - }; + action = 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(); diff --git a/source/RJW_Menstruation/RJW_Menstruation/Things.cs b/source/RJW_Menstruation/RJW_Menstruation/Things.cs index d28a4ee..bc4a5af 100644 --- a/source/RJW_Menstruation/RJW_Menstruation/Things.cs +++ b/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)); } diff --git a/source/RJW_Menstruation/TextFile1.txt b/source/RJW_Menstruation/TextFile1.txt new file mode 100644 index 0000000..e69de29