AblativeAbsolute/rjw_menstruation
1
0
Fork 0
mirror of https://gitgud.io/lutepickle/rjw_menstruation.git synced 2024-08-14 22:46:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

RJW can move breasts on some animals, and that seems to make the breast comp properties null, so test for that.

Browse source
This commit is contained in:
lutepickle 2022-08-11 14:31:37 -07:00
parent 9ce08ceab8
commit 26ff5f3d6c
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
1.3/Assemblies/RJW_Menstruation.dll
View file

Binary file not shown.

4
1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs
View file

@ -10,6 +10,7 @@ namespace RJW_Menstruation
{ {
public class CompProperties_Breast : HediffCompProperties public class CompProperties_Breast : HediffCompProperties
{ {
public static readonly ColorInt DefaultBlacknippleColor = new ColorInt(55, 20, 0);
public string BreastTex = "Breasts/Breast"; public string BreastTex = "Breasts/Breast";
public ColorInt BlacknippleColor = new ColorInt(55, 20, 0); public ColorInt BlacknippleColor = new ColorInt(55, 20, 0);
@ -349,7 +350,8 @@ namespace RJW_Menstruation
cachedAreola = baseAreola + nippleProgress * nippleChange; cachedAreola = baseAreola + nippleProgress * nippleChange;
cachedNipple = baseNipple + nippleProgress * nippleChange; cachedNipple = baseNipple + nippleProgress * nippleChange;
cachedColor = Colors.CMYKLerp(parent.pawn.story?.SkinColor ?? Color.white, Props.BlackNippleColor, Alpha); // For some reason, Props can go null when RJW relocates the chest (e.g. some animals), so catch that
cachedColor = Colors.CMYKLerp(parent.pawn.story?.SkinColor ?? Color.white, (Props?.BlackNippleColor ?? CompProperties_Breast.DefaultBlacknippleColor.ToColor), Alpha);
} }
public void CopyBreastProperties(HediffComp_Breast original) public void CopyBreastProperties(HediffComp_Breast original)

2
1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
View file

@ -167,7 +167,7 @@ namespace RJW_Menstruation
{ {
HediffComp_Breast comp = hediff.TryGetComp<HediffComp_Breast>(); HediffComp_Breast comp = hediff.TryGetComp<HediffComp_Breast>();
string icon; string icon;
if (comp != null) icon = comp.Props.BreastTex ?? "Breasts/Breast_Breast"; if (comp != null) icon = comp.Props?.BreastTex ?? "Breasts/Breast_Breast";
else else
{ {
breast = ContentFinder<Texture2D>.Get("Breasts/Breast_Breast00", false); breast = ContentFinder<Texture2D>.Get("Breasts/Breast_Breast00", false);