Compare commits

..

2 commits

Author SHA1 Message Date
Zsar
72692c880f Merge branch 'incompleteAnimationDefFix' into 'master'
fix issue #4 "Incompatible animation may cause infinite loop [...]"

Closes #4

See merge request c0ffeeeeeeee/rimworld-animations!11
2024-03-29 22:33:14 +00:00
Tory
3fb106e8f3 Updated Nyaron patch 2024-03-29 17:23:08 +00:00
3 changed files with 350 additions and 295 deletions

File diff suppressed because it is too large Load diff

View file

@ -15,6 +15,15 @@
</value>
</match>
</li>
<li Class="PatchOperationConditional">
<xpath>Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Nyaron"]/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[bodyPartLabel="tail"]</xpath>
<match Class="PatchOperationAdd">
<xpath>/Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Nyaron"]/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[bodyPartLabel="tail"]</xpath>
<value>
<drawnInBed>false</drawnInBed>
</value>
</match>
</li>
</operations>
</match>
</Operation>

View file

@ -25,7 +25,9 @@ namespace Rimworld_Animations {
participants =
participants.OrderBy(p =>
p.jobs.curDriver is rjw.JobDriver_Sex
&& !(p.jobs.curDriver as rjw.JobDriver_Sex).Sexprops.IsSubmissive()) //New Gargulefix. canFuck check is gone cuz it tends to break stuff
&& !(p.jobs.curDriver as rjw.JobDriver_Sex).Sexprops.isRevese /*Gargulefix!!!*/
&& !(p.jobs.curDriver as rjw.JobDriver_Sex).Sexprops.isReceiver)
.OrderBy(p => rjw.xxx.can_fuck(p))
.ToList();