AblativeAbsolute
/
rjw_menstruation
mirror of https://gitgud.io/lutepickle/rjw_menstruation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove climacteric stages

This commit is contained in:
lutepickle 2022-10-23 19:26:59 -07:00
parent 6b3044488d
commit 9a82b4ab84
4 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs
View File

@ -12,8 +12,6 @@ namespace RJW_Menstruation
foreach (HediffComp_Menstruation comp in pawn.GetMenstruationComps()) foreach (HediffComp_Menstruation comp in pawn.GetMenstruationComps())
if (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.ClimactericLuteal)
|| comp.curStage.Equals(HediffComp_Menstruation.Stage.Anestrus) || comp.curStage.Equals(HediffComp_Menstruation.Stage.Anestrus)
) )
{ {
@ -30,7 +28,6 @@ namespace RJW_Menstruation
{ {
foreach (HediffComp_Menstruation comp in pawn.GetMenstruationComps()) foreach (HediffComp_Menstruation comp in pawn.GetMenstruationComps())
if (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.Anestrus) || comp.curStage.Equals(HediffComp_Menstruation.Stage.Anestrus)
) )
{ {

7
1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_InducedOvulator.cs
View File

@ -23,8 +23,6 @@ namespace RJW_Menstruation
{ {
case Stage.Follicular: case Stage.Follicular:
return Translations.Stage_Follicular_Induced_Desc + (EggHealth < 1f ? Translations.Stage_Climacteric_Desc : ""); return Translations.Stage_Follicular_Induced_Desc + (EggHealth < 1f ? Translations.Stage_Climacteric_Desc : "");
case Stage.ClimactericFollicular:
return Translations.Stage_Follicular_Induced_Desc + " " + Translations.Stage_Climacteric_Desc;
default: default:
return base.GetCurStageDesc; return base.GetCurStageDesc;
} }
@ -60,7 +58,6 @@ namespace RJW_Menstruation
switch (curStage) switch (curStage)
{ {
case Stage.Follicular: case Stage.Follicular:
case Stage.ClimactericFollicular:
GoNextStage(Stage.Ovulatory); GoNextStage(Stage.Ovulatory);
break; break;
} }
@ -75,11 +72,9 @@ namespace RJW_Menstruation
switch (curStage) switch (curStage)
{ {
case Stage.Follicular: case Stage.Follicular:
case Stage.ClimactericFollicular:
case Stage.Ovulatory: case Stage.Ovulatory:
return true; return true;
case Stage.Luteal: case Stage.Luteal:
case Stage.ClimactericLuteal:
return IsEggExist && curStageHrs < Props.eggLifespanDays * 24; return IsEggExist && curStageHrs < Props.eggLifespanDays * 24;
default: default:
return false; return false;
@ -94,12 +89,10 @@ namespace RJW_Menstruation
switch (curStage) switch (curStage)
{ {
case Stage.Follicular: case Stage.Follicular:
case Stage.ClimactericFollicular:
return curStageHrs > currentIntervalHours - Props.estrusDaysBeforeOvulation * 24; return curStageHrs > currentIntervalHours - Props.estrusDaysBeforeOvulation * 24;
case Stage.Ovulatory: case Stage.Ovulatory:
return true; return true;
case Stage.Luteal: case Stage.Luteal:
case Stage.ClimactericLuteal:
return IsEggExist && curStageHrs < Props.eggLifespanDays * 24; return IsEggExist && curStageHrs < Props.eggLifespanDays * 24;
default: default:
return false; return false;

29
1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
View File

@ -88,9 +88,6 @@ namespace RJW_Menstruation
Recover, Recover,
None, None,
Young, Young,
ClimactericFollicular, // obsolete
ClimactericLuteal, // obsolete
ClimactericBleeding, // obsolete
Anestrus Anestrus
} }
@ -104,11 +101,8 @@ namespace RJW_Menstruation
public static readonly Dictionary<Stage, Texture2D> StageTexture = new Dictionary<Stage, Texture2D>() public static readonly Dictionary<Stage, Texture2D> StageTexture = new Dictionary<Stage, Texture2D>()
{ {
{ Stage.Follicular, TextureCache.FollicularTexture }, { Stage.Follicular, TextureCache.FollicularTexture },
{ Stage.ClimactericFollicular, TextureCache.FollicularTexture },
{ Stage.Luteal, TextureCache.LutealTexture }, { Stage.Luteal, TextureCache.LutealTexture },
{ Stage.ClimactericLuteal, TextureCache.LutealTexture },
{ Stage.Bleeding, TextureCache.BleedingTexture }, { Stage.Bleeding, TextureCache.BleedingTexture },
{ Stage.ClimactericBleeding, TextureCache.BleedingTexture },
{ Stage.Pregnant, TextureCache.PregnantTexture }, { Stage.Pregnant, TextureCache.PregnantTexture },
{ Stage.Recover, TextureCache.RecoverTexture } { Stage.Recover, TextureCache.RecoverTexture }
}; };
@ -356,12 +350,6 @@ namespace RJW_Menstruation
case Stage.Young: case Stage.Young:
if (EggHealth <= 0f) return Translations.Stage_Menopause; if (EggHealth <= 0f) return Translations.Stage_Menopause;
else return Translations.Stage_None; else return Translations.Stage_None;
case Stage.ClimactericFollicular:
return Translations.Stage_Follicular + " - " + Translations.Stage_Climacteric;
case Stage.ClimactericLuteal:
return Translations.Stage_Luteal + " - " + Translations.Stage_Climacteric;
case Stage.ClimactericBleeding:
return Translations.Stage_Bleeding + " - " + Translations.Stage_Climacteric;
case Stage.Anestrus: case Stage.Anestrus:
return Translations.Stage_Anestrus; return Translations.Stage_Anestrus;
default: default:
@ -392,12 +380,6 @@ namespace RJW_Menstruation
case Stage.Young: case Stage.Young:
if (EggHealth <= 0f) return Translations.Stage_Menopause_Desc; if (EggHealth <= 0f) return Translations.Stage_Menopause_Desc;
else return Translations.Stage_None_Desc; else return Translations.Stage_None_Desc;
case Stage.ClimactericFollicular:
return Translations.Stage_Follicular_Desc + " " + Translations.Stage_Climacteric_Desc;
case Stage.ClimactericLuteal:
return Translations.Stage_Luteal_Desc + " " + Translations.Stage_Climacteric_Desc;
case Stage.ClimactericBleeding:
return Translations.Stage_Bleeding_Desc + " " + Translations.Stage_Climacteric_Desc;
case Stage.Anestrus: case Stage.Anestrus:
return Translations.Stage_Anestrus_Desc; return Translations.Stage_Anestrus_Desc;
default: default:
@ -493,12 +475,10 @@ namespace RJW_Menstruation
switch (curStage) switch (curStage)
{ {
case Stage.Follicular: case Stage.Follicular:
case Stage.ClimactericFollicular:
return curStageHrs > 0.7f * currentIntervalHours; return curStageHrs > 0.7f * currentIntervalHours;
case Stage.Ovulatory: case Stage.Ovulatory:
return true; return true;
case Stage.Luteal: case Stage.Luteal:
case Stage.ClimactericLuteal:
return curStageHrs < Props.eggLifespanDays * 24; return curStageHrs < Props.eggLifespanDays * 24;
default: default:
return false; return false;
@ -643,10 +623,6 @@ namespace RJW_Menstruation
CumOut(); CumOut();
if (curStage == Stage.ClimactericFollicular) curStage = Stage.Follicular;
else if (curStage == Stage.ClimactericLuteal) curStage = Stage.Luteal;
else if (curStage == Stage.ClimactericBleeding) curStage = Stage.Bleeding;
if (pregnancy == null && (Pawn.health.capacities.GetLevel(xxx.reproduction) <= 0) || EggHealth <= 0) curStage = Stage.Young; if (pregnancy == null && (Pawn.health.capacities.GetLevel(xxx.reproduction) <= 0) || EggHealth <= 0) curStage = Stage.Young;
switch (curStage) switch (curStage)
{ {
@ -1132,12 +1108,10 @@ namespace RJW_Menstruation
switch (curStage) switch (curStage)
{ {
case Stage.Follicular: case Stage.Follicular:
case Stage.ClimactericFollicular:
return curStageHrs > currentIntervalHours - Props.estrusDaysBeforeOvulation * 24; return curStageHrs > currentIntervalHours - Props.estrusDaysBeforeOvulation * 24;
case Stage.Ovulatory: case Stage.Ovulatory:
return true; return true;
case Stage.Luteal: case Stage.Luteal:
case Stage.ClimactericLuteal:
return curStageHrs < Props.eggLifespanDays * 24; return curStageHrs < Props.eggLifespanDays * 24;
default: default:
return false; return false;
@ -1692,13 +1666,10 @@ namespace RJW_Menstruation
switch (stage) switch (stage)
{ {
case Stage.Follicular: case Stage.Follicular:
case Stage.ClimactericFollicular:
return (int)(Props.follicularIntervalDays * 24 * (1 + Rand.Range(-cycleVariability, cycleVariability) * 1.5f * variabilityFactor) / (1 + (cycleSpeed - 1) * 1.5f)); return (int)(Props.follicularIntervalDays * 24 * (1 + Rand.Range(-cycleVariability, cycleVariability) * 1.5f * variabilityFactor) / (1 + (cycleSpeed - 1) * 1.5f));
case Stage.Luteal: case Stage.Luteal:
case Stage.ClimactericLuteal:
return (int)(Props.lutealIntervalDays * 24 * (1 + Rand.Range(-cycleVariability, cycleVariability) * 0.5f * variabilityFactor) / (1 + (cycleSpeed - 1) * 0.5f)); return (int)(Props.lutealIntervalDays * 24 * (1 + Rand.Range(-cycleVariability, cycleVariability) * 0.5f * variabilityFactor) / (1 + (cycleSpeed - 1) * 0.5f));
case Stage.Bleeding: case Stage.Bleeding:
case Stage.ClimactericBleeding:
return (int)(Props.bleedingIntervalDays * 24 * (1 + Rand.Range(-cycleVariability, cycleVariability) * 0.5f * variabilityFactor) / (1 + (cycleSpeed - 1) * 0.5f)); return (int)(Props.bleedingIntervalDays * 24 * (1 + Rand.Range(-cycleVariability, cycleVariability) * 0.5f * variabilityFactor) / (1 + (cycleSpeed - 1) * 0.5f));
case Stage.Recover: case Stage.Recover:
return (int)(Props.recoveryIntervalDays * 24 * Rand.Range(0.95f, 1.05f)); return (int)(Props.recoveryIntervalDays * 24 * Rand.Range(0.95f, 1.05f));

4
1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs
View File

@ -179,7 +179,7 @@ namespace RJW_Menstruation
if (wombtex != null) return wombtex; if (wombtex != null) return wombtex;
string icon = comp.WombTex; string icon = comp.WombTex;
HediffComp_Menstruation.Stage stage = comp.curStage; HediffComp_Menstruation.Stage stage = comp.curStage;
if (stage == HediffComp_Menstruation.Stage.Bleeding || stage == HediffComp_Menstruation.Stage.ClimactericBleeding) icon += "_Bleeding"; if (stage == HediffComp_Menstruation.Stage.Bleeding) icon += "_Bleeding";
wombtex = ContentFinder<Texture2D>.Get(icon, true); wombtex = ContentFinder<Texture2D>.Get(icon, true);
@ -190,7 +190,6 @@ namespace RJW_Menstruation
switch (comp.CurrentVisibleStage) switch (comp.CurrentVisibleStage)
{ {
case HediffComp_Menstruation.Stage.Follicular: case HediffComp_Menstruation.Stage.Follicular:
case HediffComp_Menstruation.Stage.ClimactericFollicular:
if (!includeOvary) break; if (!includeOvary) break;
if (comp is HediffComp_InducedOvulator) if (comp is HediffComp_InducedOvulator)
{ {
@ -208,7 +207,6 @@ namespace RJW_Menstruation
if (!includeOvary) break; if (!includeOvary) break;
return ContentFinder<Texture2D>.Get("Ovaries/Ovary_02", true); return ContentFinder<Texture2D>.Get("Ovaries/Ovary_02", true);
case HediffComp_Menstruation.Stage.Luteal: case HediffComp_Menstruation.Stage.Luteal:
case HediffComp_Menstruation.Stage.ClimactericLuteal:
if (!comp.IsEggExist) break; if (!comp.IsEggExist) break;
int fertstage = comp.IsFertilized; int fertstage = comp.IsFertilized;
if (fertstage >= 0) if (fertstage >= 0)