diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index 55af9b2..4336fb4 100644 Binary files a/1.2/Assemblies/Rimworld-Animations.dll and b/1.2/Assemblies/Rimworld-Animations.dll differ diff --git a/Source/AnimationUtility.cs b/Source/AnimationUtility.cs index 38c2de3..04eed9c 100644 --- a/Source/AnimationUtility.cs +++ b/Source/AnimationUtility.cs @@ -88,7 +88,7 @@ namespace Rimworld_Animations { if (x.actors[i].requiredGenitals.Contains("Penis")) { - if (!(rjw.Genital_Helper.has_multipenis(localParticipants[i]) || rjw.Genital_Helper.has_penis_infertile(localParticipants[i]) || rjw.Genital_Helper.has_penis_fertile(localParticipants[i]))) { + if (!(rjw.Genital_Helper.has_multipenis(localParticipants[i]) || rjw.Genital_Helper.has_penis_infertile(localParticipants[i]) || rjw.Genital_Helper.has_penis_fertile(localParticipants[i]) || rjw.Genital_Helper.has_ovipositorM(localParticipants[i]))) { if (AnimationSettings.debugMode) Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " doesn't have penis"); return false; @@ -197,6 +197,8 @@ namespace Rimworld_Animations { return true; }); List optionsWithSexType = options.ToList().FindAll(x => x.sexTypes.Contains(sexType)); + + /* List optionsWithSexTypeAndInitiator = optionsWithSexType.FindAll(x => { bool initiatorsAlignWithSexType = true; for (int i = 0; i < x.actors.Count; i++) { @@ -217,6 +219,7 @@ namespace Rimworld_Animations { } return initiatorsAlignWithSexType; }); + List optionsWithInitiator = options.ToList().FindAll(x => { bool initiatorsAlignWithSexType = true; for (int i = 0; i < x.actors.Count; i++) { @@ -237,24 +240,26 @@ namespace Rimworld_Animations { } return initiatorsAlignWithSexType; }); - - + */ + /* if (optionsWithSexTypeAndInitiator.Any()) { if (AnimationSettings.debugMode) Log.Message("Selecting animation for rjwSexType " + sexType.ToStringSafe() + " and initiators..."); return optionsWithSexTypeAndInitiator.RandomElement(); } - + */ if (optionsWithSexType.Any()) { if (AnimationSettings.debugMode) Log.Message("Selecting animation for rjwSexType " + sexType.ToStringSafe() + "..."); return optionsWithSexType.RandomElement(); } + /* if(optionsWithInitiator.Any()) { if (AnimationSettings.debugMode) Log.Message("Selecting animation for initiators..."); } + */ if (options != null && options.Any()) { if (AnimationSettings.debugMode) diff --git a/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs b/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs index fdc1370..4b76b17 100644 --- a/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs +++ b/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs @@ -50,7 +50,7 @@ namespace Rimworld_Animations { } - listingStandard.Label("Offset for race " + curPawn.def.defName + " in actor position " + curPawn.TryGetComp().ActorIndex + (curPawn.TryGetComp().Mirror ? " mirrored" : "")); + listingStandard.Label("Offset for race " + curPawn.def.defName + " in actor position " + curPawn.TryGetComp().ActorIndex + " for animation " + def.label + (curPawn.TryGetComp().Mirror ? " mirrored" : "")); if(curPawn.def.defName == "Human") { listingStandard.Label("Warning--You generally don't want to change human offsets, only alien offsets"); @@ -83,7 +83,6 @@ namespace Rimworld_Animations { } - } else { listingStandard.Label("Select a pawn currently in an animation to change their offsets");