AblativeAbsolute
/
rimnude-unofficial
mirror of https://gitgud.io/Tory/rimnude-unofficial.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2.2.15

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
About/Manifest.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest> <Manifest>
<version>2.2.14.14</version> <version>2.2.15</version>
<manifestUri>https://gitgud.io/Tory/rimnude-unofficial/-/raw/master/About/Manifest.xml</manifestUri> <manifestUri>https://gitgud.io/Tory/rimnude-unofficial/-/raw/master/About/Manifest.xml</manifestUri>
<downloadUri>https://gitgud.io/Tory/rimnude-unofficial/</downloadUri> <downloadUri>https://gitgud.io/Tory/rimnude-unofficial/</downloadUri>
</Manifest> </Manifest>

BIN
Assembly Folders/1.4 Assembly/Assemblies/RimNudeWorld.dll
View File

Binary file not shown.

4
Common/Patches/NudePatch - Humans.xml
View File

@ -179,7 +179,7 @@
<Fat>(-0.006,0.0291)</Fat> <Fat>(-0.006,0.0291)</Fat>
<Thin>(0.0004,0.087)</Thin> <Thin>(0.0004,0.087)</Thin>
<Hulk>(0,-0.1109)</Hulk> <Hulk>(0,-0.1109)</Hulk>
<Baby MayRequire="ludeon.rimworld.biotech">(-0.42, -0.25)</Baby> <Baby MayRequire="ludeon.rimworld.biotech">(0, 0.342)</Baby>
<Child MayRequire="ludeon.rimworld.biotech">(0, 0.342)</Child> <Child MayRequire="ludeon.rimworld.biotech">(0, 0.342)</Child>
</bodyTypes> </bodyTypes>
</north> </north>
@ -634,7 +634,7 @@
<Fat>(0.06,0.46)</Fat> <Fat>(0.06,0.46)</Fat>
<Thin>(0.013,0.537)</Thin> <Thin>(0.013,0.537)</Thin>
<Hulk>(0,0.41)</Hulk> <Hulk>(0,0.41)</Hulk>
<Baby MayRequire="ludeon.rimworld.biotech">(0.013,0.537)</Baby> <Baby MayRequire="ludeon.rimworld.biotech">(0.0, 0.347)</Baby>
<Child MayRequire="ludeon.rimworld.biotech">(-0.0, 0.347)</Child> <Child MayRequire="ludeon.rimworld.biotech">(-0.0, 0.347)</Child>
</bodyTypes> </bodyTypes>
</north> </north>

4
LoadFolders.xml
View File

@ -26,10 +26,10 @@
<v1.4> <v1.4>
<li>Extra Patches/1.3 Offset Patch</li><!--Fixes all offsets to work same way in 1.3 as did in 1.1 and 1.2--> <li>Extra Patches/1.3 Offset Patch</li><!--Fixes all offsets to work same way in 1.3 as did in 1.1 and 1.2-->
<!--<li>Extra Patches/Female BB textures</li>--><!--REMOVE COMMENT TO ENABLE--> <!--<li>Extra Patches/Female BB textures</li>--><!--REMOVE COMMENT TO ENABLE-->
<!--<li IfModNotActive="otyoty.sizedapparel">Extra Patches/Revealing Apparel</li>--><!--UNDER CONSTRUCTION Designed to only work with 1.3+ assembly--> <li IfModNotActive="otyoty.sizedapparel">Extra Patches/Revealing Apparel</li><!--UNDER CONSTRUCTION Designed to only work with 1.3+ assembly-->
<li>Extra Patches/Debug Patch</li><!--Silences Rimnude body addons from logs--> <li>Extra Patches/Debug Patch</li><!--Silences Rimnude body addons from logs-->
<li>Extra Patches/1.2 Plus Colored Nudes</li><!--Colored genitals and breasts meant for 1.2+ HAR--> <li>Extra Patches/1.2 Plus Colored Nudes</li><!--Colored genitals and breasts meant for 1.2+ HAR-->
<li>Common</li><!--General rimnude patches and textures--> <li>Common</li><!--General rimnude patches and textures-->
<!--<li>Assembly Folders/1.4 Assembly</li>--><!--UNDER CONSTRUCTION--> <li>Assembly Folders/1.4 Assembly</li><!--UNDER CONSTRUCTION-->
</v1.4> </v1.4>
</loadFolders> </loadFolders>

16
Source/RimNudeWorld/RimNudeWorld/RimNudeWorld.csproj
View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>RimNudeWorld</RootNamespace> <RootNamespace>RimNudeWorld</RootNamespace>
<AssemblyName>RimNudeWorld</AssemblyName> <AssemblyName>RimNudeWorld</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
@ -18,7 +18,7 @@
<DebugSymbols>false</DebugSymbols> <DebugSymbols>false</DebugSymbols>
<DebugType>none</DebugType> <DebugType>none</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>..\..\..\1.3 Assembly\Assemblies\</OutputPath> <OutputPath>..\..\..\Assembly Folders\1.4 Assembly\Assemblies\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
@ -35,19 +35,19 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="0Harmony"> <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> <Private>False</Private>
</Reference> </Reference>
<Reference Include="AlienRace"> <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> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Assembly-CSharp"> <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> <Private>False</Private>
</Reference> </Reference>
<Reference Include="RJW"> <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> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -57,11 +57,11 @@
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="UnityEngine.CoreModule"> <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> <Private>False</Private>
</Reference> </Reference>
<Reference Include="UnityEngine.IMGUIModule"> <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> <Private>False</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>

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

@ -40,7 +40,7 @@ namespace RimNudeWorld
} }
//[HarmonyAfter(new string[] { "net.example.plugin2" })] //[HarmonyAfter(new string[] { "net.example.plugin2" })]
[HarmonyPatch(typeof(AlienPartGenerator.BodyAddon), "GetPath")] [HarmonyPatch(typeof(AlienPartGenerator.BodyAddon), "GetGraphic")]
class HARPatch 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 class GenitalPatch {
public static readonly char[] NUMBERS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; 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>()); 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) if (ba_pubes == null || ba_pubes.Count() <= 0)
continue; continue;
@ -298,7 +298,8 @@ namespace RimNudeWorld
Color _desiredHairColor = desiredHairColor; Color _desiredHairColor = desiredHairColor;
float num = newrect.y; 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) if (_desiredHairColor != desiredHairColor)
{ {
var desiredHairColor_ = dialog_StylingStation.GetType().GetField("desiredHairColor", System.Reflection.BindingFlags.NonPublic var desiredHairColor_ = dialog_StylingStation.GetType().GetField("desiredHairColor", System.Reflection.BindingFlags.NonPublic
@ -306,7 +307,7 @@ namespace RimNudeWorld
desiredHairColor_.SetValue(dialog_StylingStation, _desiredHairColor); desiredHairColor_.SetValue(dialog_StylingStation, _desiredHairColor);
} }
num += 60f; 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); 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; 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(); 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) 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; bool flag;
if (list == null) if (list == null)
{ {
@ -120,7 +120,7 @@ namespace RevealingApparel
} }
else else
{ {
flag = list.Any((AlienPartGenerator.BodyAddonHediffGraphic bahg) => bahg.hediff == HediffDefOf.MissingBodyPart); flag = list.Any((AlienPartGenerator.ExtendedHediffGraphic bahg) => bahg.hediff == HediffDefOf.MissingBodyPart);
} }
if (!flag) if (!flag)
{ {
@ -130,7 +130,7 @@ namespace RevealingApparel
if ((pawn.gender == Gender.Female) ? bodyAddon.drawForFemale : bodyAddon.drawForMale) 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.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); 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); 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)); vector2.y = (bodyAddon.inFrontOfBody ? (0.3f + vector2.y - underClothingOffset) : (-0.3f - vector2.y + underClothingOffset));

4
changelog.txt
View File

@ -1,3 +1,7 @@
ver 2.2.15 Unofficial
- STABLE 1.4 SUPPORT
- Rain (matthewes) fixed c# (Revealing apparel seems nonfunctional atm)
ver 2.2.14.14 Unofficial ver 2.2.14.14 Unofficial
- Human child offsets added - Human child offsets added