Tentative build for 4.9.0

This commit is contained in:
c0ffee 2021-11-18 07:38:53 -08:00
parent 644fca21bf
commit 17bbd94af6
7 changed files with 10 additions and 4 deletions

Binary file not shown.

BIN
1.3/Assemblies/RJW.dll Normal file

Binary file not shown.

View File

@ -4,6 +4,8 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using RimWorld; using RimWorld;
using rjw.Modules.Interactions.Helpers;
using rjw.Modules.Interactions.Objects;
using UnityEngine; using UnityEngine;
using Verse; using Verse;
using Verse.AI; using Verse.AI;
@ -16,9 +18,11 @@ namespace Rimworld_Animations {
*/ */
public static AnimationDef tryFindAnimation(ref List<Pawn> participants, rjw.xxx.rjwSextype sexType = 0, rjw.SexProps sexProps = null) { public static AnimationDef tryFindAnimation(ref List<Pawn> participants, rjw.xxx.rjwSextype sexType = 0, rjw.SexProps sexProps = null) {
InteractionWithExtension interaction = InteractionHelper.GetWithExtension(sexProps.dictionaryKey);
participants = participants =
participants.OrderBy(p => p.jobs.curDriver is rjw.JobDriver_SexBaseInitiator) participants.OrderBy(p => p.jobs.curDriver is rjw.JobDriver_SexBaseInitiator)
.OrderBy(p => p == sexProps.giver)
.OrderBy(p => rjw.xxx.can_fuck(p)) .OrderBy(p => rjw.xxx.can_fuck(p))
.ToList(); .ToList();

View File

@ -113,7 +113,10 @@ namespace Rimworld_Animations {
} }
public void StartAnimation(AnimationDef anim, List<Pawn> actors, int actor, bool mirror = false, bool shiver = false, bool fastAnimForQuickie = false) { public void StartAnimation(AnimationDef anim, List<Pawn> actors, int actor, bool mirror = false, bool shiver = false, bool fastAnimForQuickie = false) {
actorsInCurrentAnimation = actors; if (anim.actors.Count <= actor)
{
return;
}
AlienRaceOffset raceOffset = anim?.actors[actor]?.raceOffsets?.Find(x => x.defName == pawn.def.defName); AlienRaceOffset raceOffset = anim?.actors[actor]?.raceOffsets?.Find(x => x.defName == pawn.def.defName);
if (raceOffset != null) { if (raceOffset != null) {

View File

@ -83,7 +83,7 @@ namespace Rimworld_Animations {
bool mirror = GenTicks.TicksGame % 2 == 0; bool mirror = GenTicks.TicksGame % 2 == 0;
IntVec3 pos = pawn.Position; IntVec3 pos = pawn.Position;
for (int i = 0; i < anim.actors.Count; i++) for (int i = 0; i < anim.actors.Count; i++)
{ {
pawnsToAnimate[i].TryGetComp<CompBodyAnimator>().isAnimating = false; pawnsToAnimate[i].TryGetComp<CompBodyAnimator>().isAnimating = false;

View File

@ -45,7 +45,6 @@
</Reference> </Reference>
<Reference Include="RJW"> <Reference Include="RJW">
<HintPath>..\rjw\1.3\Assemblies\RJW.dll</HintPath> <HintPath>..\rjw\1.3\Assemblies\RJW.dll</HintPath>
<Private>False</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />