fix ...

Killface1980 · Oct 9, 2017 · cdcdf0e · cdcdf0e
1 parent 40a85e4
commit cdcdf0e
Show file tree

Hide file tree

Showing 69 changed files with 22 additions and 31 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ModMetaData>
-  <name>Facial Stuff 0.17.3.4g</name>
+  <name>Facial Stuff 0.17.3.4h</name>
   <author>Killface</author>
   <url></url>
   <targetVersion>0.17.1557</targetVersion>

diff --git a/Assemblies/FacialStuff.dll b/Assemblies/FacialStuff.dll
diff --git a/Source/RW_FacialStuff/CompFace.cs b/Source/RW_FacialStuff/CompFace.cs
@@ -428,12 +428,8 @@ public void CheckForAddedOrMissingParts(Pawn p)
                 return;
             }
 
-            foreach (Hediff diff in hediffs)
+            foreach (Hediff diff in hediffs.Where(diff => diff?.def?.defName != null))
             {
-                if (diff?.def?.defName == null)
-                {
-                    continue;
-                }
                 this.CheckPart(body, diff);
             }
         }
@@ -879,7 +875,6 @@ private void CheckPart([NotNull] List<BodyPartRecord> body, [NotNull] Hediff hed
                 return;
             }
 
-
             BodyPartRecord leftEye = body.Find(x => x.def == BodyPartDefOf.LeftEye);
             BodyPartRecord rightEye = body.Find(x => x.def == BodyPartDefOf.RightEye);
             BodyPartRecord jaw = body.Find(x => x.def == BodyPartDefOf.Jaw);
@@ -1121,6 +1116,12 @@ private void ResetBoolsAndPaths()
             {
                 SetPawnFace(new PawnFace(this.pawn, Faction.OfPlayer.def));
             }
+
+            if (this.PawnFace.BrowDef == null)
+            {
+                this.PawnFace.BrowDef = PawnFaceMaker.RandomBrowDefFor(this.pawn, Faction.OfPlayer.def);
+            }
+
             this.texPathEyeLeftPatch = null;
             this.texPathEyeRightPatch = null;
             this.texPathJawAddedPart = null;

diff --git a/Source/RW_FacialStuff/Defs/BrowDef.cs b/Source/RW_FacialStuff/Defs/BrowDef.cs
@@ -18,15 +18,10 @@ public class BrowDef : Def
     {
         public HairGender hairGender = HairGender.Any;
 
-
-
         public List<string> hairTags = new List<string>();
 
-
-
         public List<ThingDef> raceList = new List<ThingDef>();
 
-
         public string texPath;
     }
 }
diff --git a/Source/RW_FacialStuff/Graphics/Graphic_Multi_AddedHeadParts.cs b/Source/RW_FacialStuff/Graphics/Graphic_Multi_AddedHeadParts.cs
@@ -117,7 +117,7 @@ public override void Init(GraphicRequest req)
             {
                 Log.Message(
                     "Facial Stuff: No texture found at " + addedpartName + "_" + crowntype + "_side"
-                    + " - Graphic_Multi_AddedHeadParts");
+                    + " - Graphic_Multi_AddedHeadParts. This message is just a note, no error.");
                 array[3] = FaceTextures.BlankTexture;
             }
 

diff --git a/Source/RW_FacialStuff/PawnFaceMaker.cs b/Source/RW_FacialStuff/PawnFaceMaker.cs
@@ -314,24 +314,23 @@ where beard.raceList.Contains(pawn.def)
         public static BrowDef RandomBrowDefFor([NotNull] Pawn pawn, FactionDef factionType)
         {
             IEnumerable<BrowDef> source = from brow in DefDatabase<BrowDef>.AllDefs
-                                          where brow.raceList.Contains(pawn.def)
+                                         // where brow.raceList.Contains(pawn.def)
                                           where brow.hairTags.SharesElementWith(factionType.hairTags)
                                           select brow;
 
-            IEnumerable<BrowDef> browDefs = source as IList<BrowDef> ?? source.ToList();
-            if (!browDefs.Any())
+            if (!source.Any())
             {
-                browDefs = from brow in DefDatabase<BrowDef>.AllDefs select brow;
+                source = from brow in DefDatabase<BrowDef>.AllDefs select brow;
             }
 
             BrowDef chosenBrows;
-
+            /*
             switch (pawn.story.traits.DegreeOfTrait(TraitDef.Named("NaturalMood")))
             {
                 case 2:
                     {
                         IEnumerable<BrowDef> filtered = browDefs.Where(x => x.label.Contains("Nice"));
-                        chosenBrows = filtered.RandomElementByWeight(eye => BrowChoiceLikelihoodFor(eye, pawn));
+                        chosenBrows = filtered.RandomElementByWeight(brow => BrowChoiceLikelihoodFor(brow, pawn));
                         return chosenBrows;
                     }
 
@@ -364,10 +363,9 @@ where brow.hairTags.SharesElementWith(factionType.hairTags)
                         return chosenBrows;
                     }
             }
+            */
 
-            chosenBrows = browDefs.RandomElementByWeight(brow => BrowChoiceLikelihoodFor(brow, pawn));
-
-            return chosenBrows;
+            return source.RandomElementByWeight(brow => BrowChoiceLikelihoodFor(brow, pawn));
         }
 
 
@@ -376,7 +374,7 @@ public static EyeDef RandomEyeDefFor(Pawn pawn,
         {
             // Log.Message("Selecting eyes.");
             IEnumerable<EyeDef> source = from eye in DefDatabase<EyeDef>.AllDefs
-                                         where eye.raceList.Contains(pawn.def)
+                                       //  where eye.raceList.Contains(pawn.def)
                                          where eye.hairTags.SharesElementWith(factionType.hairTags)
                                          select eye;
 
@@ -386,12 +384,9 @@ where eye.hairTags.SharesElementWith(factionType.hairTags)
                 source = from eye in DefDatabase<EyeDef>.AllDefs select eye;
             }
 
-            EyeDef chosenEyes;
-
-            chosenEyes = source.RandomElementByWeight(eye => EyeChoiceLikelihoodFor(eye, pawn));
+            return source.RandomElementByWeight(eye => EyeChoiceLikelihoodFor(eye, pawn));
 
             // Log.Message("Chosen eyes: " + chosenEyes);
-            return chosenEyes;
         }
 
         #endregion Public Methods
@@ -479,8 +474,8 @@ private static float BrowChoiceLikelihoodFor(BrowDef brow, Pawn pawn)
                     case HairGender.Male: return 70f;
                     case HairGender.MaleUsually: return 30f;
                     case HairGender.Any: return 60f;
-                    case HairGender.FemaleUsually: return 0f;
-                    case HairGender.Female: return 0f;
+                    case HairGender.FemaleUsually: return 5f;
+                    case HairGender.Female: return 1f;
                 }
             }
 
@@ -491,8 +486,8 @@ private static float BrowChoiceLikelihoodFor(BrowDef brow, Pawn pawn)
                     case HairGender.Female: return 70f;
                     case HairGender.FemaleUsually: return 30f;
                     case HairGender.Any: return 60f;
-                    case HairGender.MaleUsually: return 0f;
-                    case HairGender.Male: return 0f;
+                    case HairGender.MaleUsually: return 5f;
+                    case HairGender.Male: return 1f;
                 }
             }
 

diff --git a/Textures/MergedHair/SPSThor_back.png b/Textures/MergedHair/SPSThor_back.png
diff --git a/Textures/MergedHair/SPSThor_front.png b/Textures/MergedHair/SPSThor_front.png
diff --git a/Textures/MergedHair/SPSThor_side.png b/Textures/MergedHair/SPSThor_side.png
diff --git a/Textures/MergedHair/Scorpiontail_back.png b/Textures/MergedHair/Scorpiontail_back.png
diff --git a/Textures/MergedHair/Scorpiontail_front.png b/Textures/MergedHair/Scorpiontail_front.png
diff --git a/Textures/MergedHair/Scorpiontail_side.png b/Textures/MergedHair/Scorpiontail_side.png
diff --git a/Textures/MergedHair/Wavy_Bald02_back.png b/Textures/MergedHair/Wavy_Bald02_back.png
diff --git a/Textures/MergedHair/Wavy_Bald02_front.png b/Textures/MergedHair/Wavy_Bald02_front.png
diff --git a/Textures/MergedHair/Wavy_Bald02_side.png b/Textures/MergedHair/Wavy_Bald02_side.png
diff --git a/Textures/MergedHair/laijde_back.png b/Textures/MergedHair/laijde_back.png
diff --git a/Textures/MergedHair/laijde_front.png b/Textures/MergedHair/laijde_front.png
diff --git a/Textures/MergedHair/laijde_side.png b/Textures/MergedHair/laijde_side.png
diff --git a/Textures/MergedHair/nora_back.png b/Textures/MergedHair/nora_back.png
diff --git a/Textures/MergedHair/nora_front.png b/Textures/MergedHair/nora_front.png
diff --git a/Textures/MergedHair/nora_side.png b/Textures/MergedHair/nora_side.png
diff --git a/Textures/MergedHair/ro_f03_back.png b/Textures/MergedHair/ro_f03_back.png
diff --git a/Textures/MergedHair/ro_f03_front.png b/Textures/MergedHair/ro_f03_front.png
diff --git a/Textures/MergedHair/ro_f03_side.png b/Textures/MergedHair/ro_f03_side.png
diff --git a/Textures/MergedHair/ro_f06_back.png b/Textures/MergedHair/ro_f06_back.png
diff --git a/Textures/MergedHair/ro_f06_front.png b/Textures/MergedHair/ro_f06_front.png
diff --git a/Textures/MergedHair/ro_f06_side.png b/Textures/MergedHair/ro_f06_side.png
diff --git a/Textures/MergedHair/ro_f07_back.png b/Textures/MergedHair/ro_f07_back.png
diff --git a/Textures/MergedHair/ro_f07_front.png b/Textures/MergedHair/ro_f07_front.png
diff --git a/Textures/MergedHair/ro_f07_side.png b/Textures/MergedHair/ro_f07_side.png
diff --git a/Textures/MergedHair/ro_f15_back.png b/Textures/MergedHair/ro_f15_back.png
diff --git a/Textures/MergedHair/ro_f15_front.png b/Textures/MergedHair/ro_f15_front.png
diff --git a/Textures/MergedHair/ro_f15_side.png b/Textures/MergedHair/ro_f15_side.png
diff --git a/Textures/MergedHair/ro_f28_back.png b/Textures/MergedHair/ro_f28_back.png
diff --git a/Textures/MergedHair/ro_f28_front.png b/Textures/MergedHair/ro_f28_front.png
diff --git a/Textures/MergedHair/ro_f28_side.png b/Textures/MergedHair/ro_f28_side.png
diff --git a/Textures/MergedHair/ro_m02_back.png b/Textures/MergedHair/ro_m02_back.png
diff --git a/Textures/MergedHair/ro_m02_front.png b/Textures/MergedHair/ro_m02_front.png
diff --git a/Textures/MergedHair/ro_m02_side.png b/Textures/MergedHair/ro_m02_side.png
diff --git a/Textures/MergedHair/ro_m03_back.png b/Textures/MergedHair/ro_m03_back.png
diff --git a/Textures/MergedHair/ro_m03_front.png b/Textures/MergedHair/ro_m03_front.png
diff --git a/Textures/MergedHair/ro_m03_side.png b/Textures/MergedHair/ro_m03_side.png
diff --git a/Textures/MergedHair/ro_m04_back.png b/Textures/MergedHair/ro_m04_back.png
diff --git a/Textures/MergedHair/ro_m04_front.png b/Textures/MergedHair/ro_m04_front.png
diff --git a/Textures/MergedHair/ro_m04_side.png b/Textures/MergedHair/ro_m04_side.png
diff --git a/Textures/MergedHair/ro_m08_back.png b/Textures/MergedHair/ro_m08_back.png
diff --git a/Textures/MergedHair/ro_m08_front.png b/Textures/MergedHair/ro_m08_front.png
diff --git a/Textures/MergedHair/ro_m08_side.png b/Textures/MergedHair/ro_m08_side.png
diff --git a/Textures/MergedHair/ro_m09_back.png b/Textures/MergedHair/ro_m09_back.png
diff --git a/Textures/MergedHair/ro_m09_front.png b/Textures/MergedHair/ro_m09_front.png
diff --git a/Textures/MergedHair/ro_m09_side.png b/Textures/MergedHair/ro_m09_side.png
diff --git a/Textures/MergedHair/ro_m12_back.png b/Textures/MergedHair/ro_m12_back.png
diff --git a/Textures/MergedHair/ro_m12_front.png b/Textures/MergedHair/ro_m12_front.png
diff --git a/Textures/MergedHair/ro_m12_side.png b/Textures/MergedHair/ro_m12_side.png
diff --git a/Textures/MergedHair/ro_m18_back.png b/Textures/MergedHair/ro_m18_back.png
diff --git a/Textures/MergedHair/ro_m18_front.png b/Textures/MergedHair/ro_m18_front.png
diff --git a/Textures/MergedHair/ro_m18_side.png b/Textures/MergedHair/ro_m18_side.png
diff --git a/Textures/MergedHair/ro_m19_back.png b/Textures/MergedHair/ro_m19_back.png
diff --git a/Textures/MergedHair/ro_m19_front.png b/Textures/MergedHair/ro_m19_front.png
diff --git a/Textures/MergedHair/ro_m19_side.png b/Textures/MergedHair/ro_m19_side.png
diff --git a/Textures/MergedHair/ro_m20_back.png b/Textures/MergedHair/ro_m20_back.png
diff --git a/Textures/MergedHair/ro_m20_front.png b/Textures/MergedHair/ro_m20_front.png
diff --git a/Textures/MergedHair/ro_m20_side.png b/Textures/MergedHair/ro_m20_side.png
diff --git a/Textures/MergedHair/ro_m22_back.png b/Textures/MergedHair/ro_m22_back.png
diff --git a/Textures/MergedHair/ro_m22_front.png b/Textures/MergedHair/ro_m22_front.png
diff --git a/Textures/MergedHair/ro_m22_side.png b/Textures/MergedHair/ro_m22_side.png
diff --git a/Textures/MergedHair/upchuck_back.png b/Textures/MergedHair/upchuck_back.png
diff --git a/Textures/MergedHair/upchuck_front.png b/Textures/MergedHair/upchuck_front.png
diff --git a/Textures/MergedHair/upchuck_side.png b/Textures/MergedHair/upchuck_side.png