diff --git a/About/Manifest.xml b/About/Manifest.xml index dfd708b..21f3a47 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,6 +1,6 @@ - 2.2.14.14 + 2.2.15 https://gitgud.io/Tory/rimnude-unofficial/-/raw/master/About/Manifest.xml https://gitgud.io/Tory/rimnude-unofficial/ diff --git a/Assembly Folders/1.4 Assembly/Assemblies/RimNudeWorld.dll b/Assembly Folders/1.4 Assembly/Assemblies/RimNudeWorld.dll index d1544c6..e1dfb01 100644 Binary files a/Assembly Folders/1.4 Assembly/Assemblies/RimNudeWorld.dll and b/Assembly Folders/1.4 Assembly/Assemblies/RimNudeWorld.dll differ diff --git a/Common/Patches/NudePatch - Humans.xml b/Common/Patches/NudePatch - Humans.xml index ad0713f..433923c 100644 --- a/Common/Patches/NudePatch - Humans.xml +++ b/Common/Patches/NudePatch - Humans.xml @@ -179,7 +179,7 @@ (-0.006,0.0291) (0.0004,0.087) (0,-0.1109) - (-0.42, -0.25) + (0, 0.342) (0, 0.342) @@ -634,7 +634,7 @@ (0.06,0.46) (0.013,0.537) (0,0.41) - (0.013,0.537) + (0.0, 0.347) (-0.0, 0.347) diff --git a/LoadFolders.xml b/LoadFolders.xml index 6001101..caa2d76 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -26,10 +26,10 @@
  • Extra Patches/1.3 Offset Patch
    • - +
  • Extra Patches/Revealing Apparel
  • Extra Patches/Debug Patch
  • Extra Patches/1.2 Plus Colored Nudes
  • Common
    • - +
  • Assembly Folders/1.4 Assembly
    •  \ No newline at end of file diff --git a/Source/RimNudeWorld/RimNudeWorld/RimNudeWorld.csproj b/Source/RimNudeWorld/RimNudeWorld/RimNudeWorld.csproj index e7906a1..642383b 100644 --- a/Source/RimNudeWorld/RimNudeWorld/RimNudeWorld.csproj +++ b/Source/RimNudeWorld/RimNudeWorld/RimNudeWorld.csproj @@ -9,7 +9,7 @@ Properties RimNudeWorld RimNudeWorld - v4.7.2 + v4.8 512 true @@ -18,7 +18,7 @@ false none false - ..\..\..\1.3 Assembly\Assemblies\ + ..\..\..\Assembly Folders\1.4 Assembly\Assemblies\ DEBUG;TRACE prompt 4 @@ -35,19 +35,19 @@ - ..\..\..\..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll + G:\SteamLibrary\steamapps\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll False - ..\..\..\..\..\..\..\workshop\content\294100\839005762\1.3\Assemblies\AlienRace.dll + G:\SteamLibrary\steamapps\workshop\content\294100\839005762\1.4\Assemblies\AlienRace.dll False - ..\..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll + G:\SteamLibrary\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll False - ..\..\..\..\rjw\1.3\Assemblies\RJW.dll + G:\SteamLibrary\steamapps\common\RimWorld\Mods\rjwrepository\1.4\Assemblies\RJW.dll False @@ -57,11 +57,11 @@ - ..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll + G:\SteamLibrary\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll False - ..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll + G:\SteamLibrary\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll False diff --git a/Source/RimNudeWorld/RimNudeWorld/patches/BodyTypeAddon.cs b/Source/RimNudeWorld/RimNudeWorld/patches/BodyTypeAddon.cs index 549acc5..8adc684 100644 --- a/Source/RimNudeWorld/RimNudeWorld/patches/BodyTypeAddon.cs +++ b/Source/RimNudeWorld/RimNudeWorld/patches/BodyTypeAddon.cs @@ -40,7 +40,7 @@ namespace RimNudeWorld } //[HarmonyAfter(new string[] { "net.example.plugin2" })] - [HarmonyPatch(typeof(AlienPartGenerator.BodyAddon), "GetPath")] + [HarmonyPatch(typeof(AlienPartGenerator.BodyAddon), "GetGraphic")] class HARPatch { diff --git a/Source/RimNudeWorld/RimNudeWorld/patches/HarmonyPatch_GetErect.cs b/Source/RimNudeWorld/RimNudeWorld/patches/HarmonyPatch_GetErect.cs index c8e839e..1bdd071 100644 --- a/Source/RimNudeWorld/RimNudeWorld/patches/HarmonyPatch_GetErect.cs +++ b/Source/RimNudeWorld/RimNudeWorld/patches/HarmonyPatch_GetErect.cs @@ -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'}; diff --git a/Source/RimNudeWorld/RimNudeWorld/patches/Ideology/StylingStation.cs b/Source/RimNudeWorld/RimNudeWorld/patches/Ideology/StylingStation.cs index cf24942..79efdd9 100644 --- a/Source/RimNudeWorld/RimNudeWorld/patches/Ideology/StylingStation.cs +++ b/Source/RimNudeWorld/RimNudeWorld/patches/Ideology/StylingStation.cs @@ -34,7 +34,7 @@ namespace RimNudeWorld all_pubes.Add(race.defName, new List()); } - List ba_pubes = race?.alienRace?.generalSettings?.alienPartGenerator?.bodyAddons.Where(x => x.bodyPart == "Genitals" && x.path.ToLower().Contains("pubes")).ToList(); + List 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; diff --git a/Source/RimNudeWorld/RimNudeWorld/patches/RevealingApparel.cs b/Source/RimNudeWorld/RimNudeWorld/patches/RevealingApparel.cs index 417f94c..d8b126f 100644 --- a/Source/RimNudeWorld/RimNudeWorld/patches/RevealingApparel.cs +++ b/Source/RimNudeWorld/RimNudeWorld/patches/RevealingApparel.cs @@ -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 list = bodyAddon.hediffGraphics; + List 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)); diff --git a/changelog.txt b/changelog.txt index 304ec3e..e15bea3 100644 --- a/changelog.txt +++ b/changelog.txt @@ -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 - Human child offsets added