Added ideology color to apparel color swatches

edbmods · Aug 15, 2021 · b4c14f3 · b4c14f3
1 parent 92d902b
commit b4c14f3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/Source/CustomPawn.cs b/Source/CustomPawn.cs
@@ -1226,6 +1226,22 @@ public Gender Gender {
             }
         }
 
+        public Color? FavoriteColor {
+            get {
+                if (ModsConfig.IdeologyActive) {
+                    return Pawn.story.favoriteColor;
+                }
+                else {
+                    return null;
+                }
+            }
+            set {
+                if (ModsConfig.IdeologyActive) {
+                    Pawn.story.favoriteColor = value;
+                }
+            }
+        }
+
         public Color SkinColor {
             get {
                 return pawn.story.SkinColor;

diff --git a/Source/PanelAppearance.cs b/Source/PanelAppearance.cs
@@ -407,17 +407,29 @@ protected void DrawColorSelectorForApparelStuff(CustomPawn customPawn, float cur
         }
 
         public IEnumerable<Color> PrependFavoriteAndIdeologyColors(Color? color) {
-            if (currentPawn.Pawn.story.favoriteColor.HasValue) {
-                yield return currentPawn.Pawn.story.favoriteColor.Value;
+            if (currentPawn.FavoriteColor.HasValue) {
+                yield return currentPawn.FavoriteColor.Value;
+            }
+            if (ModsConfig.IdeologyActive) {
+                Color? ideoColor = currentPawn.Pawn?.ideo?.Ideo.ApparelColor;
+                if (ideoColor.HasValue) {
+                    yield return ideoColor.Value;
+                }
             }
             if (color.HasValue) {
                 yield return color.Value;
             }
         }
 
         public IEnumerable<Color> PrependFavoriteAndIdeologyColors(IEnumerable<Color> colors) {
-            if (currentPawn.Pawn.story.favoriteColor.HasValue) {
-                yield return currentPawn.Pawn.story.favoriteColor.Value;
+            if (currentPawn.FavoriteColor.HasValue) {
+                yield return currentPawn.FavoriteColor.Value;
+            }
+            if (ModsConfig.IdeologyActive) {
+                Color? ideoColor = currentPawn.Pawn?.ideo?.Ideo.ApparelColor;
+                if (ideoColor.HasValue) {
+                    yield return ideoColor.Value;
+                }
             }
             if (colors != null) {
                 foreach (var color in colors) {