diff --git a/Assemblies/RJW_Menstruation.dll b/Assemblies/RJW_Menstruation.dll
index 547c954..95ec13e 100644
Binary files a/Assemblies/RJW_Menstruation.dll and b/Assemblies/RJW_Menstruation.dll differ
diff --git a/Languages/English/Keyed/RJW_Menstruation.xml b/Languages/English/Keyed/RJW_Menstruation.xml
index 00a1509..701b244 100644
--- a/Languages/English/Keyed/RJW_Menstruation.xml
+++ b/Languages/English/Keyed/RJW_Menstruation.xml
@@ -38,10 +38,10 @@
accelerate menstrution cycle
Debug
show debug informations.
-
-
-
-
+ womb status
+ draw womb icon in status window
+ vagina status
+ draw vagina and anus icon in status window
diff --git a/Languages/Korean/Keyed/RJW_Menstruation.xml b/Languages/Korean/Keyed/RJW_Menstruation.xml
index cda3226..2b4a2ec 100644
--- a/Languages/Korean/Keyed/RJW_Menstruation.xml
+++ b/Languages/Korean/Keyed/RJW_Menstruation.xml
@@ -38,10 +38,10 @@
월경주기를 더 빠르게합니다.
Debug
디버그정보를 보여줍니다.
-
-
-
-
+ 자궁 그림
+ 상태창에 자궁그림을 표시합니다.
+ 보지 그림
+ 상태창에 보지와 항문그림을 표시합니다.
diff --git a/source/RJW_Menstruation/RJW_Menstruation/Configurations.cs b/source/RJW_Menstruation/RJW_Menstruation/Configurations.cs
index c765e78..52cdab6 100644
--- a/source/RJW_Menstruation/RJW_Menstruation/Configurations.cs
+++ b/source/RJW_Menstruation/RJW_Menstruation/Configurations.cs
@@ -31,6 +31,8 @@ namespace RJW_Menstruation
public static int CycleAcceleration = CycleAccelerationDefault;
public static bool EnableWombIcon = true;
public static bool EnableAnimalCycle = false;
+ public static bool DrawWombStatus = true;
+ public static bool DrawVaginaStatus = true;
public static bool Debug = false;
public override void ExposeData()
@@ -45,6 +47,9 @@ namespace RJW_Menstruation
Scribe_Values.Look(ref CumFertilityDecayRatio, "CumFertilityDecayRatio", CumFertilityDecayRatio, true);
Scribe_Values.Look(ref EnableWombIcon, "EnableWombIcon", EnableWombIcon, true);
Scribe_Values.Look(ref EnableAnimalCycle, "EnableAnimalCycle", EnableAnimalCycle, true);
+ Scribe_Values.Look(ref DrawWombStatus, "DrawWombStatus", DrawWombStatus, true);
+ Scribe_Values.Look(ref DrawVaginaStatus, "DrawVaginaStatus", DrawVaginaStatus, true);
+ Scribe_Values.Look(ref Debug, "Debug", Debug, true);
base.ExposeData();
}
@@ -74,6 +79,13 @@ namespace RJW_Menstruation
listmain.Begin(mainRect);
listmain.CheckboxLabeled(Translations.Option1_Label, ref Configurations.EnableWombIcon, Translations.Option1_Desc);
+ if (Configurations.EnableWombIcon)
+ {
+ Listing_Standard wombsection = listmain.BeginSection_NewTemp(50);
+ wombsection.CheckboxLabeled(Translations.Option9_Label, ref Configurations.DrawWombStatus, Translations.Option9_Desc);
+ wombsection.CheckboxLabeled(Translations.Option10_Label, ref Configurations.DrawVaginaStatus, Translations.Option10_Desc);
+ listmain.EndSection(wombsection);
+ }
listmain.CheckboxLabeled(Translations.Option2_Label, ref Configurations.EnableAnimalCycle, Translations.Option2_Desc);
diff --git a/source/RJW_Menstruation/RJW_Menstruation/Dialog_WombStatus.cs b/source/RJW_Menstruation/RJW_Menstruation/Dialog_WombStatus.cs
index ba71a73..9a5577a 100644
--- a/source/RJW_Menstruation/RJW_Menstruation/Dialog_WombStatus.cs
+++ b/source/RJW_Menstruation/RJW_Menstruation/Dialog_WombStatus.cs
@@ -40,7 +40,11 @@ namespace RJW_Menstruation
{
get
{
- return new Vector2(300f + 2*windowMargin,800f);
+ float width = 300f + 2 * windowMargin;
+ float height = 800f;
+ if (!Configurations.DrawWombStatus) height -= wombRectHeight;
+ if (!Configurations.DrawVaginaStatus) height -= genitalRectHeight;
+ return new Vector2(width,height);
}
}
@@ -79,7 +83,7 @@ namespace RJW_Menstruation
}
private void MainContents(Rect mainRect)
- {
+ {
boxstyle.hover = boxstyle.normal;
boxstyle.onHover = boxstyle.normal;
@@ -121,22 +125,30 @@ namespace RJW_Menstruation
Rect pawnRect = new Rect(0, 0, pawnRectWidth, pawnRectHeight);
- Widgets.DrawTextureFitted(pawnRect,PortraitsCache.Get(pawn, pawnRect.size),1.0f);
- Rect pawnLabelRect = new Rect(0, pawnRectHeight, pawnRectWidth, fontheight-10);
- Rect pawnLabel2Rect = new Rect(0, pawnRectHeight+fontheight-10, pawnRectWidth, fontheight-10);
+ Widgets.DrawTextureFitted(pawnRect, PortraitsCache.Get(pawn, pawnRect.size), 1.0f);
+ Rect pawnLabelRect = new Rect(0, pawnRectHeight, pawnRectWidth, fontheight - 10);
+ Rect pawnLabel2Rect = new Rect(0, pawnRectHeight + fontheight - 10, pawnRectWidth, fontheight - 10);
fontstylecenter.normal.textColor = pawn.DrawColor;
GUI.Label(pawnLabelRect, pawn.Name.ToStringFull, fontstylecenter);
GUI.Label(pawnLabel2Rect, pawn.story.Title, fontstylecenter);
GUI.color = Color.white;
+ float wombrecth = 0;
+ if (Configurations.DrawWombStatus)
+ {
+ wombrecth = wombRectHeight;
+ cumcolor = comp.GetCumMixtureColor;
+ Rect wombRect = new Rect(0f, mainRect.yMax - wombRectHeight + preginfoheight, wombRectWidth, wombRectHeight);
+ DrawWomb(wombRect);
+ }
- Rect wombInfoRect = new Rect(0f, mainRect.yMax - wombRectHeight - fontheight - 2, wombRectWidth, fontheight);
+ Rect wombInfoRect = new Rect(0f, mainRect.yMax - wombrecth - fontheight - 2, wombRectWidth, fontheight);
buttonstyle.normal.textColor = Color.white;
//boxstyle.normal.background = Texture2D.whiteTexture;
buttonstyle.alignment = TextAnchor.MiddleLeft;
GUI.backgroundColor = new Color(0.24f, 0.29f, 0.35f, 1);
- GUI.Box(wombInfoRect, Translations.Dialog_WombInfo01 + ": " + comp.GetCurStageLabel,buttonstyle);
+ GUI.Box(wombInfoRect, Translations.Dialog_WombInfo01 + ": " + comp.GetCurStageLabel, buttonstyle);
GUI.color = Color.white;
@@ -144,30 +156,25 @@ namespace RJW_Menstruation
if (comp.GetFertilization) GUI.Label(wombInfoRect, Translations.Dialog_WombInfo05 + " ", fontstyleright);
else if (comp.GetEggFertilizing) GUI.Label(wombInfoRect, Translations.Dialog_WombInfo06 + " ", fontstyleright);
else if (comp.GetEgg) GUI.Label(wombInfoRect, Translations.Dialog_WombInfo07 + " ", fontstyleright);
-
+
//Widgets.Label(wombInfoRect,Translations.Dialog_WombInfo01 + ": " + comp.GetCurStageLabel);
+ if (Configurations.DrawVaginaStatus)
+ {
+ Rect genitalRect = new Rect(24, pawnRectHeight + 2 * fontheight, genitalRectWidth, genitalRectHeight + fontheight * 2);
+ DrawVagina(genitalRect);
+ }
- cumcolor = comp.GetCumMixtureColor;
- Rect wombRect = new Rect(0f, mainRect.yMax - wombRectHeight + preginfoheight, wombRectWidth, wombRectHeight);
- GUI.color = new Color(1.00f,0.47f,0.47f,1);
- GUI.Box(wombRect,"",boxstyle);
- //GUI.color = Color.white;
- //Widgets.DrawTextureFitted(wombRect, womb,1.0f);
- //GUI.color = cumcolor;
- //Widgets.DrawTextureFitted(wombRect, cum,1.0f);
- GUI.DrawTexture(wombRect, womb, ScaleMode.ScaleToFit, true, 0, Color.white, 0, 0);
- GUI.DrawTexture(wombRect, cum, ScaleMode.ScaleToFit, true, 0, cumcolor,0,0);
- GUI.color = Color.white;
+
Rect cumlistTitle = new Rect(pawnRectWidth, 0, wombRectWidth - pawnRectWidth, fontheight);
GUI.Label(cumlistTitle,Translations.Dialog_WombInfo04);
- Rect cumlistRect = new Rect(pawnRectWidth, fontheight, wombRectWidth - pawnRectWidth, mainRect.yMax - wombRectHeight - fontheight);
+
+ Rect cumlistRect = new Rect(pawnRectWidth, fontheight, wombRectWidth - pawnRectWidth, mainRect.yMax - wombrecth - fontheight);
DrawCumlist(cumlistRect);
- Rect genitalRect = new Rect(24, pawnRectHeight + 2*fontheight, genitalRectWidth, genitalRectHeight + fontheight*2);
- DrawVagina(genitalRect);
+
@@ -193,7 +200,18 @@ namespace RJW_Menstruation
cumlist.End();
}
-
+ private void DrawWomb(Rect rect)
+ {
+ GUI.color = new Color(1.00f, 0.47f, 0.47f, 1);
+ GUI.Box(rect, "", boxstyle);
+ //GUI.color = Color.white;
+ //Widgets.DrawTextureFitted(wombRect, womb,1.0f);
+ //GUI.color = cumcolor;
+ //Widgets.DrawTextureFitted(wombRect, cum,1.0f);
+ GUI.DrawTexture(rect, womb, ScaleMode.ScaleToFit, true, 0, Color.white, 0, 0);
+ GUI.DrawTexture(rect, cum, ScaleMode.ScaleToFit, true, 0, cumcolor, 0, 0);
+ GUI.color = Color.white;
+ }
private void DrawVagina(Rect rect)
{