diff --git a/1.4/Assemblies/Rimworld-Animations-Patch.dll b/1.4/Assemblies/Rimworld-Animations-Patch.dll index 160e387..2190479 100644 Binary files a/1.4/Assemblies/Rimworld-Animations-Patch.dll and b/1.4/Assemblies/Rimworld-Animations-Patch.dll differ diff --git a/About/About.xml b/About/About.xml index 8ffdeda..12fd375 100644 --- a/About/About.xml +++ b/About/About.xml @@ -24,6 +24,12 @@ Rimworld-Animations https://gitgud.io/c0ffeeeeeeee/rimworld-animations + +
  • + erdelf.HumanoidAlienRaces + Humanoid Alien Races + https://github.com/erdelf/AlienRaces +
  • Dubwise.DubsApparelTweaks
    • @@ -40,7 +46,7 @@ A patch for RimWorld Animations and RJW, adding some additional functions and tweaks -This mod requires both RimWorld Animations and RJW to function - RimNudeWorld isn't required, but it is recommended +This mod requires RimWorld Animations, RJW and Humanoid Alien Races to function - RimNudeWorld isn't required, but it is recommended Here's a brief overview of what's included in this mod - 12 animations for casual sex diff --git a/About/Changelog_v2.0.0.txt b/About/Changelog_v2.0.0.txt deleted file mode 100644 index ecaa6bf..0000000 --- a/About/Changelog_v2.0.0.txt +++ /dev/null @@ -1,2 +0,0 @@ -Change log v 2.0.0 -- Initial re-release (for RimWorld 1.4) \ No newline at end of file diff --git a/About/Changelog_v2.0.1.txt b/About/Changelog_v2.0.1.txt new file mode 100644 index 0000000..76b72fc --- /dev/null +++ b/About/Changelog_v2.0.1.txt @@ -0,0 +1,8 @@ +Change log v 2.0.1 +- Fixed issue with a hand animation calling a missing method +- Fixed errored that was triggering at the end of sex +- Dependency on Humanoid Alien Race is now listed and enforced in the mod load screen +- Made XML patching more robust + +Change log v 2.0.0 +- Initial re-release (for RimWorld 1.4) \ No newline at end of file diff --git a/About/Manifest.xml b/About/Manifest.xml index c1dba00..8df9d3d 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,5 +1,5 @@ - 2.0.0 + 2.0.1 https://gitgud.io/AbstractConcept/rimworld-animations-patch \ No newline at end of file diff --git a/Patches/ApparelCompProperties.xml b/Patches/ApparelCompProperties.xml deleted file mode 100644 index bea1e19..0000000 --- a/Patches/ApparelCompProperties.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - Normal - - - -
  • - Always - Defs/ThingDef[race][not(comps)] - - - -
    • -
  • - Always - Defs/AlienRace.ThingDef_AlienRace[not(comps)] - - - -
    • - -
  • - Defs/ThingDef[@Name="BasePawn"]/comps - -
  • - -
    • -
  • - Defs/AlienRace.ThingDef_AlienRace/comps - -
  • - -
    • - -
  • - /Defs/ThingDef[thingClass="Apparel"]/comps - - Defs/ThingDef[thingClass="Apparel"]/comps - -
  • - Rimworld_Animations_Patch.CompApparelVisibility -
    • - - - - /Defs/ThingDef[thingClass="Apparel"] - - -
  • - Rimworld_Animations_Patch.CompApparelVisibility -
    • -     -     -     - - - - -     -     -     \ No newline at end of file diff --git a/Patches/BodyParts_Humanoid.xml b/Patches/BodyParts_Humanoid.xml index 0911a38..5ac4c4f 100644 --- a/Patches/BodyParts_Humanoid.xml +++ b/Patches/BodyParts_Humanoid.xml @@ -1,24 +1,32 @@ - - - /Defs/BodyDef/corePart/parts/li[def = "Genitals"]/groups - - -
  • Legs
    • -
  • GenitalsBPG
    • -     -     + + + + Defs/BodyDef/corePart/parts/li[def = "Genitals"]/groups + + Defs/BodyDef/corePart/parts/li[def = "Genitals"]/groups + + +
  • Legs
    • +
  • GenitalsBPG
    • +     +     +     - - /Defs/BodyDef/corePart/parts/li[def = "Anus"]/groups - - -
  • Legs
    • -
  • AnusBPG
    • -     -     + + + Defs/BodyDef/corePart/parts/li[def = "Anus"]/groups + + Defs/BodyDef/corePart/parts/li[def = "Anus"]/groups + + +
  • Legs
    • +
  • AnusBPG
    • +     +     +     \ No newline at end of file diff --git a/Patches/CompProperties.xml b/Patches/CompProperties.xml new file mode 100644 index 0000000..0227ddd --- /dev/null +++ b/Patches/CompProperties.xml @@ -0,0 +1,65 @@ + + + + + Defs/ThingDef[@Name="BasePawn"]/comps + + Defs/ThingDef[@Name="BasePawn"]/comps + +
  • + + + + Defs/ThingDef[@Name="BasePawn"] + + +
  • + + + + + + + Defs/AlienRace.ThingDef_AlienRace + + Defs/AlienRace.ThingDef_AlienRace/comps + + Defs/AlienRace.ThingDef_AlienRace/comps + +
  • + + + + Defs/AlienRace.ThingDef_AlienRace + + +
  • + + + + + + + + /Defs/ThingDef[thingClass="Apparel"]/comps + + Defs/ThingDef[thingClass="Apparel"]/comps + +
  • + Rimworld_Animations_Patch.CompApparelVisibility +
    • +     +     + + /Defs/ThingDef[thingClass="Apparel"] + + +
  • + Rimworld_Animations_Patch.CompApparelVisibility +
    • +     +     +     +     + +     \ No newline at end of file diff --git a/Patches/OTYNude_AnusPatch.xml b/Patches/OTYNude_AnusPatch.xml index 47eb613..96d05a6 100644 --- a/Patches/OTYNude_AnusPatch.xml +++ b/Patches/OTYNude_AnusPatch.xml @@ -5,20 +5,27 @@
  • OTY_NUDE Unofficial Update
    • - Normal - -
  • + + +
  • Defs/ThingDef/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[bodyPart="Anus"]/inFrontOfBody - - false - + + Defs/ThingDef/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[bodyPart="Anus"]/inFrontOfBody + + false + +
    • -
  • + +
  • Defs/ThingDef/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[bodyPart="Anus"]/hiddenUnderApparelFor + + Defs/ThingDef/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[bodyPart="Anus"]/hiddenUnderApparelFor +
    • - +     diff --git a/Patches/RimNudeWorld_AlienPartGenerator.xml b/Patches/RimNudeWorld_AlienPartGenerator.xml index 4e51fd4..c102665 100644 --- a/Patches/RimNudeWorld_AlienPartGenerator.xml +++ b/Patches/RimNudeWorld_AlienPartGenerator.xml @@ -5,38 +5,52 @@
  • RimNudeWorld
    • - Normal -
  • +
  • Defs/ThingDef/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[bodyPart="Genitals"]/hiddenUnderApparelFor + + Defs/ThingDef/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[bodyPart="Genitals"]/hiddenUnderApparelFor +
    • -
  • +
  • Defs/ThingDef/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[bodyPart="Chest"]/hiddenUnderApparelFor + + Defs/ThingDef/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[bodyPart="Chest"]/hiddenUnderApparelFor +
    • - + -
  • +
  • Defs/ThingDef/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[hediffGraphics/RJW_pregnancy]/offsets/south/layerOffset - - -0.291 - + + Defs/ThingDef/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[hediffGraphics/RJW_pregnancy]/offsets/south/layerOffset + + -0.291 + +
    • -
  • +
  • Defs/ThingDef/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[hediffGraphics/RJW_pregnancy]/offsets/north/layerOffset - - -0.294 - + + Defs/ThingDef/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[hediffGraphics/RJW_pregnancy]/offsets/north/layerOffset + + -0.294 + +
    • -
  • +
  • Defs/ThingDef/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[hediffGraphics/RJW_pregnancy]/offsets/east/layerOffset - - -0.291 - + + Defs/ThingDef/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[hediffGraphics/RJW_pregnancy]/offsets/north/layerOffset + + -0.291 + +
    • diff --git a/Source/.vs/Rimworld-Animations-Patch/v16/.suo b/Source/.vs/Rimworld-Animations-Patch/v16/.suo index 699cf20..ef3888e 100644 Binary files a/Source/.vs/Rimworld-Animations-Patch/v16/.suo and b/Source/.vs/Rimworld-Animations-Patch/v16/.suo differ diff --git a/Source/Scripts/HandMotions/StrokeGenitalsUpAndDown_FacingNS.cs b/Source/Scripts/HandMotions/StrokeGenitalsUpAndDown_FacingNS.cs index d3cf120..f951eea 100644 --- a/Source/Scripts/HandMotions/StrokeGenitalsUpAndDown_FacingNS.cs +++ b/Source/Scripts/HandMotions/StrokeGenitalsUpAndDown_FacingNS.cs @@ -11,7 +11,7 @@ using Verse; namespace Rimworld_Animations_Patch { - public class Motion_StrokeGenitalsUpAndDown_FacingNS : HandMotion + public class StrokeGenitalsUpAndDown_FacingNS : HandMotion { public override Vector3 GetHandPosition(Pawn pawn, HandAnimationData handAnimationData, float baseAngle) { diff --git a/Source/Scripts/Patches/HarmonyPatch_RJW.cs b/Source/Scripts/Patches/HarmonyPatch_RJW.cs index debb74f..8f3378e 100644 --- a/Source/Scripts/Patches/HarmonyPatch_RJW.cs +++ b/Source/Scripts/Patches/HarmonyPatch_RJW.cs @@ -320,12 +320,13 @@ namespace Rimworld_Animations_Patch // Clear all partners out when sex ends to prevent issues with threesome animations public static void Postfix(ref JobDriver_SexBaseInitiator __instance) { - if (__instance.Partner != null && __instance?.Partner?.jobs?.curDriver != null && __instance.Partner.Dead == false && __instance.Partner?.jobs.curDriver is JobDriver_SexBaseReciever) + if (__instance.Partner != null &&__instance.Partner.Dead == false && __instance.Partner?.jobs?.curDriver != null && __instance.Partner?.jobs?.curDriver is JobDriver_SexBaseReciever) { foreach (Pawn participant in (__instance.Partner?.jobs.curDriver as JobDriver_SexBaseReciever).parteners) - { participant.jobs.EndCurrentJob(JobCondition.Succeeded, false, true); } - - (__instance.Partner?.jobs.curDriver as JobDriver_SexBaseReciever).parteners.Clear(); + { + if (__instance.pawn != participant) + { participant.jobs.EndCurrentJob(JobCondition.Succeeded, false, true); } + } } } } diff --git a/Source/obj/Debug/Rimworld-Animations-Patch.dll b/Source/obj/Debug/Rimworld-Animations-Patch.dll index 160e387..2190479 100644 Binary files a/Source/obj/Debug/Rimworld-Animations-Patch.dll and b/Source/obj/Debug/Rimworld-Animations-Patch.dll differ diff --git a/Source/obj/Debug/Rimworld-Animations-Patch.pdb b/Source/obj/Debug/Rimworld-Animations-Patch.pdb index 267db58..479ee54 100644 Binary files a/Source/obj/Debug/Rimworld-Animations-Patch.pdb and b/Source/obj/Debug/Rimworld-Animations-Patch.pdb differ