Use hediff info in GUI instead of separate strings
This commit is contained in:
parent
cbd8ffd203
commit
340d35476a
|
@ -79,7 +79,7 @@
|
||||||
<HediffDef ParentName="DrugToleranceBase">
|
<HediffDef ParentName="DrugToleranceBase">
|
||||||
<defName>CumTolerance</defName>
|
<defName>CumTolerance</defName>
|
||||||
<label>cum addictiveness</label>
|
<label>cum addictiveness</label>
|
||||||
<description>cum addictiveness.</description>
|
<description>More likely to get addicted to cum.</description>
|
||||||
<isBad>false</isBad>
|
<isBad>false</isBad>
|
||||||
<comps>
|
<comps>
|
||||||
<li Class="HediffCompProperties_SeverityPerDay">
|
<li Class="HediffCompProperties_SeverityPerDay">
|
||||||
|
|
|
@ -45,10 +45,6 @@
|
||||||
<RS_Normal>Normal</RS_Normal>
|
<RS_Normal>Normal</RS_Normal>
|
||||||
<RS_Necrophile>Necrophile</RS_Necrophile>
|
<RS_Necrophile>Necrophile</RS_Necrophile>
|
||||||
<RS_SexSkill>Sex skill</RS_SexSkill>
|
<RS_SexSkill>Sex skill</RS_SexSkill>
|
||||||
<RS_CumAddiction>Cum addiction</RS_CumAddiction>
|
|
||||||
<RS_CumAddiction_Tooltip>Addicted to cum.</RS_CumAddiction_Tooltip>
|
|
||||||
<RS_CumAddictiveness>Cum addictiveness</RS_CumAddictiveness>
|
|
||||||
<RS_CumAddictiveness_Tooltip>More likely to get addicted to cum.</RS_CumAddictiveness_Tooltip>
|
|
||||||
<RS_NumofTimes>times</RS_NumofTimes>
|
<RS_NumofTimes>times</RS_NumofTimes>
|
||||||
<RS_Ago>ago</RS_Ago>
|
<RS_Ago>ago</RS_Ago>
|
||||||
<RS_LastSex>last sex</RS_LastSex>
|
<RS_LastSex>last sex</RS_LastSex>
|
||||||
|
|
|
@ -49,10 +49,6 @@ namespace RJWSexperience
|
||||||
public static readonly string RS_Interspecies = "RS_Interspecies".Translate();
|
public static readonly string RS_Interspecies = "RS_Interspecies".Translate();
|
||||||
public static readonly string RS_Necrophile = "RS_Necrophile".Translate();
|
public static readonly string RS_Necrophile = "RS_Necrophile".Translate();
|
||||||
public static readonly string RS_SexSkill = "RS_SexSkill".Translate();
|
public static readonly string RS_SexSkill = "RS_SexSkill".Translate();
|
||||||
public static readonly string RS_CumAddiction = "RS_CumAddiction".Translate();
|
|
||||||
public static readonly string RS_CumAddiction_Tooltip = "RS_CumAddiction_Tooltip".Translate();
|
|
||||||
public static readonly string RS_CumAddictiveness = "RS_CumAddictiveness".Translate();
|
|
||||||
public static readonly string RS_CumAddictiveness_Tooltip = "RS_CumAddictiveness_Tooltip".Translate();
|
|
||||||
public static readonly string RS_NumofTimes = "RS_NumofTimes".Translate();
|
public static readonly string RS_NumofTimes = "RS_NumofTimes".Translate();
|
||||||
public static readonly string RS_Ago = "RS_Ago".Translate();
|
public static readonly string RS_Ago = "RS_Ago".Translate();
|
||||||
public static readonly string RS_LastSex = "RS_LastSex".Translate();
|
public static readonly string RS_LastSex = "RS_LastSex".Translate();
|
||||||
|
|
|
@ -420,24 +420,18 @@ namespace RJWSexperience.SexHistory.UI
|
||||||
FillableBarLabeled(listmain.GetRect(FONTHEIGHT), String.Format(Keyed.RS_Cum_Swallowed + ": {0} mL, {1} " + Keyed.RS_NumofTimes, p, pawn.records.GetValue(VariousDefOf.NumofEatenCum)), p / 1000, Texture2D.linearGrayTexture, Texture2D.blackTexture);
|
FillableBarLabeled(listmain.GetRect(FONTHEIGHT), String.Format(Keyed.RS_Cum_Swallowed + ": {0} mL, {1} " + Keyed.RS_NumofTimes, p, pawn.records.GetValue(VariousDefOf.NumofEatenCum)), p / 1000, Texture2D.linearGrayTexture, Texture2D.blackTexture);
|
||||||
listmain.Gap(1f);
|
listmain.Gap(1f);
|
||||||
|
|
||||||
Hediff addiction = pawn.health.hediffSet.GetFirstHediffOfDef(VariousDefOf.CumAddiction);
|
Hediff addiction = pawn.health.hediffSet.GetFirstHediffOfDef(VariousDefOf.CumAddiction)
|
||||||
|
?? pawn.health.hediffSet.GetFirstHediffOfDef(VariousDefOf.CumTolerance);
|
||||||
if (addiction != null)
|
if (addiction != null)
|
||||||
{
|
{
|
||||||
p = addiction.Severity;
|
p = addiction.Severity;
|
||||||
FillableBarLabeled(listmain.GetRect(FONTHEIGHT), String.Format(Keyed.RS_CumAddiction + ": {0:P2}", p), p, Texture2D.linearGrayTexture, Texture2D.blackTexture, Keyed.RS_CumAddiction_Tooltip);
|
FillableBarLabeled(listmain.GetRect(FONTHEIGHT), $"{addiction.Label}: {p.ToStringPercent()}", p, Texture2D.linearGrayTexture, Texture2D.blackTexture, addiction.GetTooltip(pawn, false));
|
||||||
listmain.Gap(1f);
|
|
||||||
}
|
|
||||||
else if ((addiction = pawn.health.hediffSet.GetFirstHediffOfDef(VariousDefOf.CumTolerance)) != null)
|
|
||||||
{
|
|
||||||
p = addiction.Severity;
|
|
||||||
FillableBarLabeled(listmain.GetRect(FONTHEIGHT), String.Format(Keyed.RS_CumAddictiveness + ": {0:P}", p), p, Texture2D.linearGrayTexture, Texture2D.blackTexture, Keyed.RS_CumAddictiveness_Tooltip);
|
|
||||||
listmain.Gap(1f);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
listmain.GetRect(FONTHEIGHT);
|
listmain.GetRect(FONTHEIGHT);
|
||||||
listmain.Gap(1f);
|
|
||||||
}
|
}
|
||||||
|
listmain.Gap(1f);
|
||||||
|
|
||||||
p = history.RapedCount;
|
p = history.RapedCount;
|
||||||
tmp = listmain.GetRect(FONTHEIGHT);
|
tmp = listmain.GetRect(FONTHEIGHT);
|
||||||
|
|
Loading…
Reference in New Issue