Compare commits

..

4 commits

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

See merge request c0ffeeeeeeee/rimworld-animations!11
2025-09-10 03:41:12 +02:00
c0ffeeeeeeee
6efa16a24f Merge branch 'fixes' into '1.4'
Finaly, fixes for cunnilingus and some more

See merge request c0ffeeeeeeee/rimworld-animations!21
2025-09-10 01:38:12 +00:00
Gargule
17ef5abd35 I suppose, in standart animation set it's only broken file 2024-03-24 04:10:34 +00:00
Gargule
8f2617c1ab Simplier check for giver in list. Also, removed canFuck because it breaks some anims in some cases 2024-03-24 04:07:52 +00:00
3 changed files with 291 additions and 346 deletions

File diff suppressed because it is too large Load diff

View file

@ -15,15 +15,6 @@
</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,9 +25,7 @@ namespace Rimworld_Animations {
participants =
participants.OrderBy(p =>
p.jobs.curDriver is rjw.JobDriver_Sex
&& !(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))
&& !(p.jobs.curDriver as rjw.JobDriver_Sex).Sexprops.IsSubmissive()) //New Gargulefix. canFuck check is gone cuz it tends to break stuff
.ToList();