edb prepc fix

Killface1980 · Nov 21, 2017 · 440ef68 · 440ef68
1 parent 908fdc3
commit 440ef68
Show file tree

Hide file tree

Showing 19 changed files with 8 additions and 6 deletions.
diff --git a/Assemblies/FacialStuff.dll b/Assemblies/FacialStuff.dll
diff --git a/Source/RW_FacialStuff/CompFace.cs b/Source/RW_FacialStuff/CompFace.cs
@@ -374,7 +374,7 @@ public override void PostDraw()
             base.PostDraw();
 
             // Children & Pregnancy || Werewolves transformed
-            if (this.pawn?.Map == null || !this.pawn.Spawned || this.pawn.Dead || this.IsChild || this.DontRender)
+            if (this.pawn.Map == null || !this.pawn.Spawned || this.pawn.Dead || this.IsChild || this.DontRender)
             {
                 return;
             }

diff --git a/Source/RW_FacialStuff/FacialStuff.csproj b/Source/RW_FacialStuff/FacialStuff.csproj
@@ -52,7 +52,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="EdBPrepareCarefully">
-      <HintPath>..\..\..\unofficial-EdBPrepareCarefully\Assemblies\EdBPrepareCarefully.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\workshop\content\294100\735106432\Assemblies\EdBPrepareCarefully.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System.Core" />

diff --git a/Source/RW_FacialStuff/Graphics/FaceGraphic.cs b/Source/RW_FacialStuff/Graphics/FaceGraphic.cs
@@ -230,13 +230,13 @@ private void InitializeGraphicsWrinkles()
 
                 this.WrinkleGraphic = GraphicDatabase.Get<Graphic_Multi_NaturalHeadParts>(
                     pawnFaceWrinkleDef.texPath + "_" + this.compFace.PawnCrownType + "_" + this.compFace.PawnHeadType,
-                    ShaderDatabase.CutoutSkin,
+                    ShaderDatabase.Transparent,
                     Vector2.one,
                     wrinkleColor);
 
                 this.RottingWrinkleGraphic = GraphicDatabase.Get<Graphic_Multi_NaturalHeadParts>(
                     pawnFaceWrinkleDef.texPath + "_" + this.compFace.PawnCrownType + "_" + this.compFace.PawnHeadType,
-                    ShaderDatabase.CutoutSkin,
+                    ShaderDatabase.Transparent,
                     Vector2.one,
                     wrinkleColor * FaceTextures.SkinRottingMultiplyColor);
             }

diff --git a/Source/RW_FacialStuff/Harmony/HarmonyPatches.cs b/Source/RW_FacialStuff/Harmony/HarmonyPatches.cs
@@ -166,7 +166,7 @@ public static void AddFaceEditButton(Page_ConfigureStartingPawns __instance, Rec
 
             GUI.DrawTexture(rect2, ContentFinder<Texture2D>.Get("Buttons/ButtonFace", true));
             GUI.color = Color.white;
-            string tip = "FacialStuffEditor.FaceStylerTitle".Translate();
+            string tip = "FacialStuffEditor.EditFace".Translate();
             TooltipHandler.TipRegion(rect2, tip);
 
             // ReSharper disable once InvertIf

diff --git a/Source/RW_FacialStuff/Harmony/optional/PrepC/PanelBackstory_Postfix.cs b/Source/RW_FacialStuff/Harmony/optional/PrepC/PanelBackstory_Postfix.cs
@@ -39,7 +39,7 @@ public static void AddFaceEditButton(PanelBackstory __instance, State state)
             }
 
             GUI.DrawTexture(rect, ContentFinder<Texture2D>.Get("Buttons/ButtonFace", true));
-            string tip = "FacialStuffEditor.FaceStylerTitle".Translate();
+            string tip = "FacialStuffEditor.EditFace".Translate();
             TooltipHandler.TipRegion(rect, tip);
 
             // ReSharper disable once InvertIf

diff --git a/Source/RW_FacialStuff/PawnExtensions.cs b/Source/RW_FacialStuff/PawnExtensions.cs
@@ -47,5 +47,7 @@ public static bool HasPawnFace([CanBeNull] this Pawn pawn)
 
             return false;
         }
+
+
     }
 }
diff --git a/Textures/MergedHair/LSB01_back.png b/Textures/MergedHair/LSB01_back.png
diff --git a/Textures/MergedHair/LSB01_front.png b/Textures/MergedHair/LSB01_front.png
diff --git a/Textures/MergedHair/LSB01_side.png b/Textures/MergedHair/LSB01_side.png
diff --git a/Textures/MergedHair/LSB03_back.png b/Textures/MergedHair/LSB03_back.png
diff --git a/Textures/MergedHair/LSB03_front.png b/Textures/MergedHair/LSB03_front.png
diff --git a/Textures/MergedHair/LSB03_side.png b/Textures/MergedHair/LSB03_side.png
diff --git a/Textures/MergedHair/LSB05_back.png b/Textures/MergedHair/LSB05_back.png
diff --git a/Textures/MergedHair/LSB05_front.png b/Textures/MergedHair/LSB05_front.png
diff --git a/Textures/MergedHair/LSB05_side.png b/Textures/MergedHair/LSB05_side.png
diff --git a/Textures/MergedHair/LSG06_back.png b/Textures/MergedHair/LSG06_back.png
diff --git a/Textures/MergedHair/LSG06_front.png b/Textures/MergedHair/LSG06_front.png
diff --git a/Textures/MergedHair/LSG06_side.png b/Textures/MergedHair/LSG06_side.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,5 +47,7 @@ public static bool HasPawnFace([CanBeNull] this Pawn pawn) @@
                 return false;
             }
         }
     }