Skip to content

Commit

Permalink
fix for Alien races
Browse files Browse the repository at this point in the history
  • Loading branch information
@Killface1980
Killface1980 committed May 25, 2017
1 parent 53ee607 commit 132c945
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 111 deletions.
4 changes: 3 additions & 1 deletion About/About.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ModMetaData>
<name>Facial Stuff 0.17.1</name>
<name>Facial Stuff 0.17.1.1</name>
<author>Killface</author>
<url></url>
<targetVersion>0.17.1546</targetVersion>
Expand All @@ -17,6 +17,8 @@
+ includes a modified version of 'Spoonshortage's Rimworld Hairstyles 1.2' by spoonshortage
+ includes a modified version of 'Nackblad Inc Rimhair 1.1' by nackblad

REQUIRES HUGSLIB

Special thanks to Fluffy for the FaceStyling bench (adapted from 'Clutter')
Uses the detour code from Orion's 'Hospitality'

Expand Down
Binary file modified Assemblies/RW_FacialStuff.dll
View file
Binary file not shown.
190 changes: 80 additions & 110 deletions Source/RW_FacialStuff/Detouring/_PawnGraphicSet.cs
View file
Original file line number Diff line number Diff line change
@@ -1,142 +1,113 @@
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using Harmony;
using RimWorld;
using UnityEngine;
using Verse;

namespace RW_FacialStuff.Detouring
{

// ReSharper disable once UnusedMember.Global
public static class _PawnGraphicSet
[HarmonyPatch(typeof(PawnGraphicSet), "ResolveAllGraphics")]
static class ResolveAllGraphics_Postfix
{
private static Dictionary<string, Pawn> HeadIndex = new Dictionary<string, Pawn>();
public static Dictionary<string, Pawn> HeadIndex = new Dictionary<string, Pawn>();

[HarmonyPostfix]
public static void ResolveAllGraphics(PawnGraphicSet __instance)
{
if (false)
{
ExportHeadBackToPNG();
}

CompFace faceComp = __instance.pawn.TryGetComp<CompFace>();
if (faceComp == null)
return;

[Detour(typeof(PawnGraphicSet), bindingFlags = (BindingFlags.Instance | BindingFlags.Public))]
// ReSharper disable once UnusedMember.Global
public static void ResolveAllGraphics(PawnGraphicSet _this)
{
#if RebuildHeads
//This creates many empty textures. only needed for rebuilding
ExportHeadBackToPNG();
#endif
_this.ClearCache();
GraphicDatabaseHeadRecordsModded.BuildDatabaseIfNecessary();


CompFace faceComp = _this.pawn.TryGetComp<CompFace>();
if (faceComp != null)
if (!faceComp.optimized)
{
if (!faceComp.optimized)
{
faceComp.DefineFace(_this.pawn);
}
faceComp.DefineFace(__instance.pawn);
}

//if (pawnSave.optimized)
// typeof(Pawn_StoryTracker).GetField("headGraphicPath", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(pawn.story, pawnSave.headGraphicIndex);

_this.nakedGraphic = GraphicGetter_NakedHumanlike.GetNakedBodyGraphic(_this.pawn.story.bodyType, ShaderDatabase.CutoutSkin, _this.pawn.story.SkinColor);
_this.rottingGraphic = GraphicGetter_NakedHumanlike.GetNakedBodyGraphic(_this.pawn.story.bodyType, ShaderDatabase.CutoutSkin, PawnGraphicSet.RottingColor * _this.pawn.story.SkinColor);
_this.dessicatedGraphic = GraphicDatabase.Get<Graphic_Multi>("Things/Pawn/Humanlike/HumanoidDessicated", ShaderDatabase.Cutout);
_this.skullGraphic = GraphicDatabaseHeadRecords.GetSkull();
_this.headStumpGraphic = GraphicDatabaseHeadRecords.GetStump(_this.pawn.story.SkinColor);
_this.desiccatedHeadStumpGraphic = GraphicDatabaseHeadRecords.GetStump(PawnGraphicSet.RottingColor); _this.hairGraphic = GraphicDatabase.Get<Graphic_Multi>(_this.pawn.story.hairDef.texPath, ShaderDatabase.Cutout, Vector2.one, _this.pawn.story.hairColor);
_this.desiccatedHeadGraphic = GraphicDatabaseHeadRecords.GetHeadNamed(_this.pawn.story.HeadGraphicPath, _this.pawn.story.SkinColor * PawnGraphicSet.RottingColor);
_this.skullGraphic = GraphicDatabaseHeadRecords.GetSkull();
_this.ResolveApparelGraphics();
PortraitsCache.Clear();

if (!faceComp.sessionOptimized)
//if (pawnSave.optimized)
// typeof(Pawn_StoryTracker).GetField("headGraphicPath", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(pawn.story, pawnSave.headGraphicIndex);

__instance.nakedGraphic = GraphicGetter_NakedHumanlike.GetNakedBodyGraphic(__instance.pawn.story.bodyType,
ShaderDatabase.CutoutSkin, __instance.pawn.story.SkinColor);
__instance.rottingGraphic = GraphicGetter_NakedHumanlike.GetNakedBodyGraphic(
__instance.pawn.story.bodyType, ShaderDatabase.CutoutSkin,
PawnGraphicSet.RottingColor*__instance.pawn.story.SkinColor);
__instance.dessicatedGraphic = GraphicDatabase.Get<Graphic_Multi>(
"Things/Pawn/Humanlike/HumanoidDessicated", ShaderDatabase.Cutout);
__instance.skullGraphic = GraphicDatabaseHeadRecords.GetSkull();
__instance.headStumpGraphic = GraphicDatabaseHeadRecords.GetStump(__instance.pawn.story.SkinColor);
__instance.desiccatedHeadStumpGraphic = GraphicDatabaseHeadRecords.GetStump(PawnGraphicSet.RottingColor);
__instance.hairGraphic = GraphicDatabase.Get<Graphic_Multi>(__instance.pawn.story.hairDef.texPath,
ShaderDatabase.Cutout, Vector2.one, __instance.pawn.story.hairColor);
__instance.desiccatedHeadGraphic =
GraphicDatabaseHeadRecords.GetHeadNamed(__instance.pawn.story.HeadGraphicPath,
__instance.pawn.story.SkinColor*PawnGraphicSet.RottingColor);
__instance.skullGraphic = GraphicDatabaseHeadRecords.GetSkull();
__instance.ResolveApparelGraphics();
PortraitsCache.Clear();

if (!faceComp.sessionOptimized)
{
// Build the empty head index once to be used for the blank heads
{
// Build the empty head index once to be used for the blank heads
{
if (HeadIndex.Count == 0)
for (int i = 0; i < 1024; i++)
{
HeadIndex.Add(i.ToString("0000"), null);
}
}
// Get the first free index and go on
foreach (KeyValuePair<string, Pawn> pair in HeadIndex)
{
if (pair.Value == null)
if (HeadIndex.Count == 0)
for (int i = 0; i < 1024; i++)
{
string index = pair.Key;
HeadIndex.Remove(pair.Key);
HeadIndex.Add(index, _this.pawn);

faceComp.headGraphicIndex = "Heads/Blank/" + pair.Key;
GraphicDatabaseHeadRecordsModded.headsModded.Add(new GraphicDatabaseHeadRecordsModded.HeadGraphicRecordModded(_this.pawn));
break;
HeadIndex.Add(i.ToString("0000"), null);
}
}

//pawnSave.headGraphicIndex = "Heads/Blank/" + GraphicDatabaseHeadRecordsModded.headIndex.ToString("0000");
//GraphicDatabaseHeadRecordsModded.headsModded.Add(new GraphicDatabaseHeadRecordsModded.HeadGraphicRecordModded(pawn));
//GraphicDatabaseHeadRecordsModded.headIndex += 1;
}

_this.headGraphic = _this.pawn.RaceProps.hasGenders ?
GraphicDatabaseHeadRecordsModded.ModifiedVanillaHead(_this.pawn, _this.pawn.story.SkinColor, _this.hairGraphic) :
GraphicDatabaseHeadRecords.GetHeadNamed(_this.pawn.story.HeadGraphicPath, _this.pawn.story.SkinColor);

// typeof(Pawn_StoryTracker).GetField("skinColor", BindingFlags.Instance | BindingFlags.Public).SetValue(pawn.story, Color.cyan);



/*
for (int j = 0; j < apparelGraphics.Count; j++)
// Get the first free index and go on
foreach (KeyValuePair<string, Pawn> pair in HeadIndex)
{
if (apparelGraphics[j].sourceApparel.def.apparel.LastLayer == ApparelLayer.Overhead)
if (pair.Value == null)
{
// INTERESTING
pawn.Drawer.renderer.graphics.headGraphic = hairGraphic;
string index = pair.Key;
HeadIndex.Remove(pair.Key);
HeadIndex.Add(index, __instance.pawn);

faceComp.headGraphicIndex = "Heads/Blank/" + pair.Key;
GraphicDatabaseHeadRecordsModded.headsModded.Add(
new GraphicDatabaseHeadRecordsModded.HeadGraphicRecordModded(__instance.pawn));
break;
}
}
*/

//pawnSave.headGraphicIndex = "Heads/Blank/" + GraphicDatabaseHeadRecordsModded.headIndex.ToString("0000");
//GraphicDatabaseHeadRecordsModded.headsModded.Add(new GraphicDatabaseHeadRecordsModded.HeadGraphicRecordModded(pawn));
//GraphicDatabaseHeadRecordsModded.headIndex += 1;
}
else if (_this.pawn.RaceProps.Humanlike)
{
_this.nakedGraphic = GraphicGetter_NakedHumanlike.GetNakedBodyGraphic(_this.pawn.story.bodyType, ShaderDatabase.CutoutSkin, _this.pawn.story.SkinColor);
_this.rottingGraphic = GraphicGetter_NakedHumanlike.GetNakedBodyGraphic(_this.pawn.story.bodyType, ShaderDatabase.CutoutSkin, PawnGraphicSet.RottingColor);
_this.dessicatedGraphic = GraphicDatabase.Get<Graphic_Multi>("Things/Pawn/Humanlike/HumanoidDessicated", ShaderDatabase.Cutout);
_this.headGraphic = GraphicDatabaseHeadRecords.GetHeadNamed(_this.pawn.story.HeadGraphicPath, _this.pawn.story.SkinColor);
_this.desiccatedHeadGraphic = GraphicDatabaseHeadRecords.GetHeadNamed(_this.pawn.story.HeadGraphicPath, PawnGraphicSet.RottingColor);
_this.skullGraphic = GraphicDatabaseHeadRecords.GetSkull();
_this.headStumpGraphic = GraphicDatabaseHeadRecords.GetStump(_this.pawn.story.SkinColor);
_this.desiccatedHeadStumpGraphic = GraphicDatabaseHeadRecords.GetStump(PawnGraphicSet.RottingColor);
_this.hairGraphic = GraphicDatabase.Get<Graphic_Multi>(_this.pawn.story.hairDef.texPath, ShaderDatabase.Cutout, Vector2.one, _this.pawn.story.hairColor);
_this.ResolveApparelGraphics();
}
else
{
PawnKindLifeStage curKindLifeStage = _this.pawn.ageTracker.CurKindLifeStage;
if (_this.pawn.gender != Gender.Female || curKindLifeStage.femaleGraphicData == null)
{
_this.nakedGraphic = curKindLifeStage.bodyGraphicData.Graphic;
}
else
{
_this.nakedGraphic = curKindLifeStage.femaleGraphicData.Graphic;
}
_this.rottingGraphic = _this.nakedGraphic.GetColoredVersion(ShaderDatabase.CutoutSkin, PawnGraphicSet.RottingColor, PawnGraphicSet.RottingColor);
if (_this.pawn.RaceProps.packAnimal)
{
_this.packGraphic = GraphicDatabase.Get<Graphic_Multi>(_this.nakedGraphic.path + "Pack", ShaderDatabase.Cutout, _this.nakedGraphic.drawSize, Color.white);
}
if (curKindLifeStage.dessicatedBodyGraphicData != null)
{
_this.dessicatedGraphic = curKindLifeStage.dessicatedBodyGraphicData.GraphicColoredFor(_this.pawn);
}
}
}

__instance.headGraphic = __instance.pawn.RaceProps.hasGenders
? GraphicDatabaseHeadRecordsModded.ModifiedVanillaHead(__instance.pawn, __instance.pawn.story.SkinColor,
__instance.hairGraphic)
: GraphicDatabaseHeadRecords.GetHeadNamed(__instance.pawn.story.HeadGraphicPath,
__instance.pawn.story.SkinColor);

// typeof(Pawn_StoryTracker).GetField("skinColor", BindingFlags.Instance | BindingFlags.Public).SetValue(pawn.story, Color.cyan);


/*
for (int j = 0; j < apparelGraphics.Count; j++)
{
if (apparelGraphics[j].sourceApparel.def.apparel.LastLayer == ApparelLayer.Overhead)
{
// INTERESTING
pawn.Drawer.renderer.graphics.headGraphic = hairGraphic;
}
}
*/
}

private static void ExportHeadBackToPNG()
public static void ExportHeadBackToPNG()
{

Texture2D finalTexture = new Texture2D(128, 128);
Expand Down Expand Up @@ -166,6 +137,5 @@ private static void ExportHeadBackToPNG()

Object.DestroyImmediate(finalTexture);
}

}
}
5 changes: 5 additions & 0 deletions Source/RW_FacialStuff/ModConfigMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@

namespace RW_FacialStuff
{
public class FacialStuff_ModBase : HugsLib.ModBase
{
public override string ModIdentifier { get { return "FacialStuff"; } }
}

public class FS_Mod : Mod
{
#region Fields
Expand Down
8 changes: 8 additions & 0 deletions Source/RW_FacialStuff/RW_FacialStuff.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,18 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="0Harmony">
<HintPath>..\..\..\..\..\..\workshop\content\294100\818773962\Assemblies\0Harmony.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>..\..\..\..\RimWorldWin_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="HugsLib">
<HintPath>..\..\..\..\..\..\workshop\content\294100\818773962\Assemblies\HugsLib.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="UnityEngine">
Expand Down

0 comments on commit 132c945

Please sign in to comment.