AblativeAbsolute/rimnude-unofficial
1
0
Fork 0
mirror of https://gitgud.io/Tory/rimnude-unofficial.git synced 2024-08-15 00:03:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

2.2.15

Browse source
This commit is contained in:
Tory 2022-10-24 15:04:05 -07:00
parent 965eb5486b
commit 56a64a367b
10 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Source/RimNudeWorld/RimNudeWorld/RimNudeWorld.csproj
View file

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>RimNudeWorld</RootNamespace>
<AssemblyName>RimNudeWorld</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
@ -18,7 +18,7 @@
<DebugSymbols>false</DebugSymbols>
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\1.3 Assembly\Assemblies\</OutputPath>
<OutputPath>..\..\..\Assembly Folders\1.4 Assembly\Assemblies\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@ -35,19 +35,19 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="0Harmony">
<HintPath>..\..\..\..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll</HintPath>
<HintPath>G:\SteamLibrary\steamapps\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="AlienRace">
<HintPath>..\..\..\..\..\..\..\workshop\content\294100\839005762\1.3\Assemblies\AlienRace.dll</HintPath>
<HintPath>G:\SteamLibrary\steamapps\workshop\content\294100\839005762\1.4\Assemblies\AlienRace.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>..\..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>G:\SteamLibrary\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RJW">
<HintPath>..\..\..\..\rjw\1.3\Assemblies\RJW.dll</HintPath>
<HintPath>G:\SteamLibrary\steamapps\common\RimWorld\Mods\rjwrepository\1.4\Assemblies\RJW.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
@ -57,11 +57,11 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="UnityEngine.CoreModule">
<HintPath>..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<HintPath>G:\SteamLibrary\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.IMGUIModule">
<HintPath>..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
<HintPath>G:\SteamLibrary\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>

2
Source/RimNudeWorld/RimNudeWorld/patches/BodyTypeAddon.cs
View file

@ -40,7 +40,7 @@ namespace RimNudeWorld
}
//[HarmonyAfter(new string[] { "net.example.plugin2" })]
[HarmonyPatch(typeof(AlienPartGenerator.BodyAddon), "GetPath")]
[HarmonyPatch(typeof(AlienPartGenerator.BodyAddon), "GetGraphic")]
class HARPatch
{

2
Source/RimNudeWorld/RimNudeWorld/patches/HarmonyPatch_GetErect.cs
View file

@ -27,7 +27,7 @@ namespace RimNudeWorld
}
[HarmonyPatch(typeof(AlienPartGenerator.BodyAddon), "GetPath")]
[HarmonyPatch(typeof(AlienPartGenerator.BodyAddon), "GetGraphic")]
public static class GenitalPatch {
public static readonly char[] NUMBERS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};

7
Source/RimNudeWorld/RimNudeWorld/patches/Ideology/StylingStation.cs
View file

@ -34,7 +34,7 @@ namespace RimNudeWorld
all_pubes.Add(race.defName, new List<AlienPartGenerator.BodyAddon>());
}
List<AlienPartGenerator.BodyAddon> ba_pubes = race?.alienRace?.generalSettings?.alienPartGenerator?.bodyAddons.Where(x => x.bodyPart == "Genitals" && x.path.ToLower().Contains("pubes")).ToList();
List<AlienPartGenerator.BodyAddon> ba_pubes = race?.alienRace?.generalSettings?.alienPartGenerator?.bodyAddons.Where(x => x.bodyPart.defName == "Genitals" && x.path.ToLower().Contains("pubes")).ToList();
if (ba_pubes == null || ba_pubes.Count() <= 0)
continue;
@ -298,7 +298,8 @@ namespace RimNudeWorld
Color _desiredHairColor = desiredHairColor;
float num = newrect.y;
Widgets.ColorSelector(new Rect(newrect.x, num, newrect.width, 92f), ref _desiredHairColor, AllHairColors, null, 22, 2);
float height;
Widgets.ColorSelector(new Rect(newrect.x, num, newrect.width, 92f), ref _desiredHairColor, AllHairColors, out height, null, 22, 2);
if (_desiredHairColor != desiredHairColor)
{
var desiredHairColor_ = dialog_StylingStation.GetType().GetField("desiredHairColor", System.Reflection.BindingFlags.NonPublic
@ -306,7 +307,7 @@ namespace RimNudeWorld
desiredHairColor_.SetValue(dialog_StylingStation, _desiredHairColor);
}
num += 60f;
if (desiredHairColor != pawn.story.hairColor && desiredHairColor != pawn.style.nextHairColor)
if (desiredHairColor != pawn.story.HairColor && desiredHairColor != pawn.style.nextHairColor)
{
Widgets.ThingIcon(new Rect(newrect.x, num, Text.LineHeight, Text.LineHeight), ThingDefOf.Dye, null, null, 1.1f, null);
string text = "Required".Translate() + ": 1 " + ThingDefOf.Dye.label;

14
Source/RimNudeWorld/RimNudeWorld/patches/RevealingApparel.cs
View file

@ -99,7 +99,7 @@ namespace RevealingApparel
Building_Bed building_Bed = pawn.CurrentBed();
if ((building_Bed == null || building_Bed.def.building.bed_showSleeperBody || bodyAddon.drawnInBed) && (bodyAddon.backstoryRequirement.NullOrEmpty() || pawn.story.AllBackstories.Any((Backstory b) => b.identifier == bodyAddon.backstoryRequirement)))
if ((building_Bed == null || building_Bed.def.building.bed_showSleeperBody || bodyAddon.drawnInBed) && (bodyAddon.backstoryRequirement == null || pawn.story.AllBackstories.Any((BackstoryDef b) => b.identifier == bodyAddon.backstoryRequirement.identifier)))
{
if (!bodyAddon.drawnDesiccated)
{
@ -110,9 +110,9 @@ namespace RevealingApparel
}
}
if (!bodyAddon.bodyPart.NullOrEmpty() && !pawn.health.hediffSet.GetNotMissingParts(BodyPartHeight.Undefined, BodyPartDepth.Undefined, null, null).Any((BodyPartRecord bpr) => bpr.untranslatedCustomLabel == bodyAddon.bodyPart || bpr.def.defName == bodyAddon.bodyPart))
if (bodyAddon.bodyPart != null && !pawn.health.hediffSet.GetNotMissingParts(BodyPartHeight.Undefined, BodyPartDepth.Undefined, null, null).Any((BodyPartRecord bpr) => bpr.untranslatedCustomLabel == bodyAddon.bodyPartLabel || bpr.def.defName == bodyAddon.bodyPart.defName))
{
List<AlienPartGenerator.BodyAddonHediffGraphic> list = bodyAddon.hediffGraphics;
List<AlienPartGenerator.ExtendedHediffGraphic> list = bodyAddon.hediffGraphics;
bool flag;
if (list == null)
{
@ -120,7 +120,7 @@ namespace RevealingApparel
}
else
{
flag = list.Any((AlienPartGenerator.BodyAddonHediffGraphic bahg) => bahg.hediff == HediffDefOf.MissingBodyPart);
flag = list.Any((AlienPartGenerator.ExtendedHediffGraphic bahg) => bahg.hediff == HediffDefOf.MissingBodyPart);
}
if (!flag)
{
@ -130,7 +130,7 @@ namespace RevealingApparel
if ((pawn.gender == Gender.Female) ? bodyAddon.drawForFemale : bodyAddon.drawForMale)
{
//return bodyAddon.bodyTypeRequirement.NullOrEmpty() || pawn.story.bodyType.ToString() == bodyAddon.bodyTypeRequirement;
return bodyAddon.bodyTypeRequirement.NullOrEmpty() || pawn.story.bodyType.ToString() == bodyAddon.bodyTypeRequirement;
return bodyAddon.bodyTypeRequirement != null || pawn.story.bodyType == bodyAddon.bodyTypeRequirement;
}
}
}
@ -189,9 +189,9 @@ namespace RevealingApparel
AlienPartGenerator.RotationOffset offset = bodyAddon.defaultOffsets.GetOffset(rotation);
Vector3 a = (offset != null) ? offset.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, comp.crownType) : Vector3.zero;
Vector3 a = (offset != null) ? offset.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, pawn.story.headType) : Vector3.zero;
AlienPartGenerator.RotationOffset offset2 = bodyAddon.offsets.GetOffset(rotation);
Vector3 vector2 = a + ((offset2 != null) ? offset2.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, comp.crownType) : Vector3.zero);
Vector3 vector2 = a + ((offset2 != null) ? offset2.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, pawn.story.headType) : Vector3.zero);
vector2.y = (bodyAddon.inFrontOfBody ? (0.3f + vector2.y - underClothingOffset) : (-0.3f - vector2.y + underClothingOffset));