diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index e4865de..ba7dc0e 100644 Binary files a/1.2/Assemblies/Rimworld-Animations.dll and b/1.2/Assemblies/Rimworld-Animations.dll differ diff --git a/About/Manifest.xml b/About/Manifest.xml index 37f30d2..5062923 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,5 +1,5 @@  Rimworld-Animations - 1.0.11 + 1.0.12 \ No newline at end of file diff --git a/Source/AnimationUtility.cs b/Source/AnimationUtility.cs index 1a94c9b..02899dd 100644 --- a/Source/AnimationUtility.cs +++ b/Source/AnimationUtility.cs @@ -16,15 +16,12 @@ namespace Rimworld_Animations { */ public static AnimationDef tryFindAnimation(ref List participants, rjw.xxx.rjwSextype sexType = 0, rjw.SexProps sexProps = null) { - //aggressors last - participants = participants.OrderBy(p => p.jobs.curDriver is rjw.JobDriver_SexBaseInitiator).ToList(); - - participants = participants.OrderBy(p => p == sexProps.Giver).ToList(); - - participants = participants.OrderByDescending(p => rjw.GenderHelper.GetSex(p) == rjw.GenderHelper.Sex.futa).ToList(); - - //pawns that can fuck last - participants = participants.OrderBy(p => rjw.xxx.can_fuck(p)).ToList(); + participants = + participants.OrderBy(p => p.jobs.curDriver is rjw.JobDriver_SexBaseInitiator) + .OrderBy(p => p == sexProps.Giver) + .OrderByDescending(p => rjw.GenderHelper.GetSex(p) == rjw.GenderHelper.Sex.futa) + .OrderBy(p => rjw.xxx.can_fuck(p)) + .ToList(); List localParticipants = new List(participants); @@ -220,7 +217,7 @@ namespace Rimworld_Animations { if (requiredGenitals.Contains("NoVagina")) { if (rjw.Genital_Helper.has_vagina(pawn)) { - failReason = "missing vagina"; + failReason = "has vagina"; return false; } @@ -229,7 +226,7 @@ namespace Rimworld_Animations { if (requiredGenitals.Contains("NoPenis")) { if ((rjw.Genital_Helper.has_multipenis(pawn) || rjw.Genital_Helper.has_penis_infertile(pawn) || rjw.Genital_Helper.has_penis_fertile(pawn))) { - failReason = "missing penis"; + failReason = "has penis"; return false; } diff --git a/Source/Comps/CompBodyAnimator.cs b/Source/Comps/CompBodyAnimator.cs index 2c6fbe2..a6b814c 100644 --- a/Source/Comps/CompBodyAnimator.cs +++ b/Source/Comps/CompBodyAnimator.cs @@ -345,32 +345,32 @@ namespace Rimworld_Animations { public override void PostExposeData() { base.PostExposeData(); - Scribe_Defs.Look(ref anim, "anim"); + Scribe_Defs.Look(ref anim, "RJWAnimations-Anim"); - Scribe_Values.Look(ref animTicks, "animTicks", 1); - Scribe_Values.Look(ref stageTicks, "stageTicks", 1); - Scribe_Values.Look(ref clipTicks, "clipTicks", 1); - Scribe_Values.Look(ref clipPercent, "clipPercent", 1); + Scribe_Values.Look(ref animTicks, "RJWAnimations-animTicks", 1); + Scribe_Values.Look(ref stageTicks, "RJWAnimations-stageTicks", 1); + Scribe_Values.Look(ref clipTicks, "RJWAnimations-clipTicks", 1); + Scribe_Values.Look(ref clipPercent, "RJWAnimations-clipPercent", 1); - Scribe_Values.Look(ref mirror, "mirror"); + Scribe_Values.Look(ref mirror, "RJWAnimations-mirror"); - Scribe_Values.Look(ref curStage, "curStage", 0); - Scribe_Values.Look(ref actor, "actor"); + Scribe_Values.Look(ref curStage, "RJWAnimations-curStage", 0); + Scribe_Values.Look(ref actor, "RJWAnimations-actor"); - Scribe_Values.Look(ref Animating, "Animating"); - Scribe_Values.Look(ref anchor, "anchor"); - Scribe_Values.Look(ref deltaPos, "deltaPos"); - Scribe_Values.Look(ref headBob, "headBob"); - Scribe_Values.Look(ref bodyAngle, "bodyAngle"); - Scribe_Values.Look(ref headAngle, "headAngle"); + Scribe_Values.Look(ref Animating, "RJWAnimations-Animating"); + Scribe_Values.Look(ref anchor, "RJWAnimations-anchor"); + Scribe_Values.Look(ref deltaPos, "RJWAnimations-deltaPos"); + Scribe_Values.Look(ref headBob, "RJWAnimations-headBob"); + Scribe_Values.Look(ref bodyAngle, "RJWAnimations-bodyAngle"); + Scribe_Values.Look(ref headAngle, "RJWAnimations-headAngle"); - Scribe_Values.Look(ref genitalAngle, "GenitalAngle"); - Scribe_Values.Look(ref controlGenitalAngle, "controlGenitalAngle"); + Scribe_Values.Look(ref genitalAngle, "RJWAnimations-GenitalAngle"); + Scribe_Values.Look(ref controlGenitalAngle, "RJWAnimations-controlGenitalAngle"); - Scribe_Values.Look(ref headFacing, "headFacing"); - Scribe_Values.Look(ref headFacing, "bodyFacing"); + Scribe_Values.Look(ref headFacing, "RJWAnimations-headFacing"); + Scribe_Values.Look(ref headFacing, "RJWAnimations-bodyFacing"); - Scribe_Values.Look(ref quiver, "orgasmQuiver"); + Scribe_Values.Look(ref quiver, "RJWAnimations-orgasmQuiver"); } public void shiftActorPositionAndRestartAnimation() { diff --git a/Source/Settings/AnimationSettings.cs b/Source/Settings/AnimationSettings.cs index a0f172d..7759262 100644 --- a/Source/Settings/AnimationSettings.cs +++ b/Source/Settings/AnimationSettings.cs @@ -22,20 +22,20 @@ namespace Rimworld_Animations { base.ExposeData(); - Scribe_Values.Look(ref debugMode, "AnimsDebugMode", false); - Scribe_Values.Look(ref offsetTab, "EnableOffsetTab", false); - Scribe_Values.Look(ref controlGenitalRotation, "controlGenitalRotation", false); - Scribe_Values.Look(ref orgasmQuiver, "orgasmQuiver"); - Scribe_Values.Look(ref fastAnimForQuickie, "fastAnimForQuickie"); - Scribe_Values.Look(ref rapeShiver, "rapeShiver"); - Scribe_Values.Look(ref hearts, "heartsOnLovin"); - Scribe_Values.Look(ref applySemenOnAnimationOrgasm, "applySemenOnOrgasm", false); - Scribe_Values.Look(ref soundOverride, "rjwAnimSoundOverride", true); - Scribe_Values.Look(ref shiverIntensity, "shiverIntensity", 2f); + Scribe_Values.Look(ref debugMode, "RJWAnimations-AnimsDebugMode", false); + Scribe_Values.Look(ref offsetTab, "RJWAnimations-EnableOffsetTab", false); + Scribe_Values.Look(ref controlGenitalRotation, "RJWAnimations-controlGenitalRotation", false); + Scribe_Values.Look(ref orgasmQuiver, "RJWAnimations-orgasmQuiver"); + Scribe_Values.Look(ref fastAnimForQuickie, "RJWAnimations-fastAnimForQuickie"); + Scribe_Values.Look(ref rapeShiver, "RJWAnimations-rapeShiver"); + Scribe_Values.Look(ref hearts, "RJWAnimation-sheartsOnLovin"); + Scribe_Values.Look(ref applySemenOnAnimationOrgasm, "RJWAnimations-applySemenOnOrgasm", false); + Scribe_Values.Look(ref soundOverride, "RJWAnimations-rjwAnimSoundOverride", true); + Scribe_Values.Look(ref shiverIntensity, "RJWAnimations-shiverIntensity", 2f); //todo: save offsetsByDefName - Scribe_Collections.Look(ref offsets, "animationOffsets"); - Scribe_Collections.Look(ref rotation, "rotationOffsets"); + Scribe_Collections.Look(ref offsets, "RJWAnimations-animationOffsets"); + Scribe_Collections.Look(ref rotation, "RJWAnimations-rotationOffsets");