diff --git a/1.4/Defs/AnimationDefs/Animations_Lesbian.xml b/1.4/Defs/AnimationDefs/Animations_Lesbian.xml index 9edb838..56d805a 100644 --- a/1.4/Defs/AnimationDefs/Animations_Lesbian.xml +++ b/1.4/Defs/AnimationDefs/Animations_Lesbian.xml @@ -1,4 +1,4 @@ - + Tribadism @@ -8,6 +8,7 @@
  • Scissoring
    • +
  • Human
    • @@ -27,7 +28,9 @@
  • Vagina
    • +     +
  • Tribbing @@ -127,6 +130,7 @@
    • +
  • @@ -222,6 +226,7 @@ 1 0
    • +
  • 10 @@ -306,6 +311,7 @@ 1 0
    • +
  • @@ -349,6 +355,7 @@ 2 0
    • +
  • @@ -392,6 +399,7 @@ 2 0
    • +
  • @@ -435,6 +443,7 @@ 2 0
    • +
  • @@ -478,6 +487,7 @@ 2 0
    • +
  • @@ -521,6 +531,7 @@ 2 0
    • +
  • @@ -564,6 +575,7 @@ 2 0
    • +
  • 10 @@ -655,7 +667,9 @@
    • +     +     Cunnilingus @@ -667,29 +681,24 @@
  • Cunnilingus
    • +
  • Cunnilingus
  • CunnilingusF
  • CunnilingusRape
  • CunnilingusRapeF
    • +
  • Fingering
  • FingeringF
  • FingeringRape
  • FingeringRapeF
    • +
  • Fisting
  • FistingF
  • FistingRape
  • FistingRapeF
    • +     -
  • - -
  • Human
    • - - true - - (-0.1, 0.15) - -
  • Human
    • @@ -702,41 +711,25 @@ (-0.2, 0.1) +
  • + +
  • Human
    • + + true + + (-0.1, 0.15) + +     + + +
  • Initial - false + False 0 -
  • - LayingPawn - -
  • - 60 - -27.578373 - 0.2816162 - 0 - 0.102704488 - 0.50675 - 0 - 3 - 3 -
    • -
  • - 1 - -47.9400826 - -21.93164 - 0 - -0.04209958 - 0.467844343 - -0.1 - 3 - 3 - Slimy -
    • - -
  • @@ -763,176 +756,19 @@
    • - - -
  • - Slow - true - 1497 - 0 -
  • LayingPawn -
  • - 80 - -47.9400826 - -21.93164 - 0 - -0.04209958 - 0.467844343 - -0.1 - 3 - 3 -
    • -
  • - 18 - -41.1054764 - -10.1737061 - 0 - 0.04582855 - 0.462155169 - 0 - 3 - 3 -
    • -
  • - 40 - -38.1903877 - -31.6517334 - 0 - 0.0384018831 - 0.4874894 - 0 - 3 - 3 -
    • -
  • - 1 - -47.9400826 - -21.93164 - 0 - -0.04209958 - 0.467844343 - -0.1 - 3 - 3 - Slimy -
    • -
  • - 80 - -47.9400826 - -21.93164 - 0 - -0.04209958 - 0.467844343 - -0.1 - 3 - 3 -
    • -
  • - 18 - -41.1054764 - -10.1737061 - 0 - 0.04582855 - 0.462155169 - 0 - 3 - 3 -
    • -
  • - 40 - -38.1903877 - -31.6517334 - 0 - 0.0384018831 - 0.4874894 - 0 - 3 - 3 -
    • -
  • - 1 - -47.9400826 - -21.93164 - 0 - -0.04209958 - 0.467844343 - -0.1 - 3 - 3 - Slimy -
  • 60 - -47.9400826 - -21.93164 + -27.578373 + 0.2816162 0 - -0.04209958 - 0.467844343 - -0.1 - 3 - 3 - Slimy -
    • -
  • - 40 - -45.2595444 - -13.57782 - 0 - 0.009577712 - 0.4726282 + 0.102704488 + 0.50675 0 3 3 - Slimy -
    • -
  • - 20 - -45.2595444 - -24.2278748 - 0 - 0.0315402448 - 0.415024319 - 0 - 3 - 3 -
    • -
  • - 40 - -45.2595444 - -13.57782 - 0 - 0.009577712 - 0.4726282 - 0 - 3 - 3 - Slimy -
    • -
  • - 20 - -45.2595444 - -24.2278748 - 0 - 0.0315402448 - 0.415024319 - 0 - 3 - 3 -
    • -
  • - 40 - -45.2595444 - -13.57782 - 0 - 0.009577712 - 0.4726282 - 0 - 3 - 3 - Slimy
  • 1 @@ -946,8 +782,18 @@ 3 Slimy
    • + + + + +
  • + Slow + True + 1497 + 0 +
  • @@ -983,6 +829,7 @@ 1 1
    • +
  • 98 -87.3645554 @@ -1016,6 +863,7 @@ 1 1
    • +
  • 60 -87.3645554 @@ -1062,13 +910,233 @@
    • +
  • + LayingPawn + +
  • + 80 + -47.9400826 + -21.93164 + 0 + -0.04209958 + 0.467844343 + -0.1 + 3 + 3 +
    • +
  • + 18 + -41.1054764 + -10.1737061 + 0 + 0.04582855 + 0.462155169 + 0 + 3 + 3 +
    • +
  • + 40 + -38.1903877 + -31.6517334 + 0 + 0.0384018831 + 0.4874894 + 0 + 3 + 3 +
    • +
  • + 1 + -47.9400826 + -21.93164 + 0 + -0.04209958 + 0.467844343 + -0.1 + 3 + 3 + Slimy +
    • + +
  • + 80 + -47.9400826 + -21.93164 + 0 + -0.04209958 + 0.467844343 + -0.1 + 3 + 3 +
    • +
  • + 18 + -41.1054764 + -10.1737061 + 0 + 0.04582855 + 0.462155169 + 0 + 3 + 3 +
    • +
  • + 40 + -38.1903877 + -31.6517334 + 0 + 0.0384018831 + 0.4874894 + 0 + 3 + 3 +
    • +
  • + 1 + -47.9400826 + -21.93164 + 0 + -0.04209958 + 0.467844343 + -0.1 + 3 + 3 + Slimy +
    • + +
  • + 60 + -47.9400826 + -21.93164 + 0 + -0.04209958 + 0.467844343 + -0.1 + 3 + 3 + Slimy +
    • +
  • + 40 + -45.2595444 + -13.57782 + 0 + 0.009577712 + 0.4726282 + 0 + 3 + 3 + Slimy +
    • +
  • + 20 + -45.2595444 + -24.2278748 + 0 + 0.0315402448 + 0.415024319 + 0 + 3 + 3 + +
    • +
  • + 40 + -45.2595444 + -13.57782 + 0 + 0.009577712 + 0.4726282 + 0 + 3 + 3 + Slimy +
    • +
  • + 20 + -45.2595444 + -24.2278748 + 0 + 0.0315402448 + 0.415024319 + 0 + 3 + 3 + +
    • +
  • + 40 + -45.2595444 + -13.57782 + 0 + 0.009577712 + 0.4726282 + 0 + 3 + 3 + Slimy +
    • +
  • + 1 + -47.9400826 + -21.93164 + 0 + -0.04209958 + 0.467844343 + -0.1 + 3 + 3 + Slimy +
    • + + + +
  • Transition - false + False 0 +
  • + +
  • + 40 + -87.3645554 + -69.70276 + 0 + -0.06923838 + -0.440020353 + 0 + 1 + 1 +
    • +
  • + 30 + -97.90959 + -69.72717 + 0 + -0.0259781852 + -0.445601642 + 0 + 1 + 1 +
    • +
  • + 1 + -87.3645554 + -69.70276 + 0 + -0.06923838 + -0.440020353 + 0 + 1 + 1 +
    • + +
  • LayingPawn @@ -1110,6 +1178,15 @@
    • + + + +
  • + Fast + True + 710 + 0 +
  • @@ -1145,16 +1222,178 @@ 1 1
    • + +
  • + 40 + -87.3645554 + -69.70276 + 0 + -0.06923838 + -0.440020353 + 0 + 1 + 1 +
    • +
  • + 30 + -97.90959 + -69.72717 + 0 + -0.0259781852 + -0.445601642 + 0 + 1 + 1 +
    • +
  • + 1 + -87.3645554 + -69.70276 + 0 + -0.06923838 + -0.440020353 + 0 + 1 + 1 +
    • + +
  • + 40 + -87.3645554 + -79.70276 + 0 + -0.06923838 + -0.440020353 + 0 + 1 + 2 +
    • +
  • + 30 + -97.90959 + -79.72717 + 0 + -0.0259781852 + -0.445601642 + 0 + 1 + 2 +
    • +
  • + 1 + -87.3645554 + -79.70276 + 0 + -0.06923838 + -0.440020353 + 0 + 1 + 2 +
    • + +
  • + 40 + -87.3645554 + -79.70276 + 0 + -0.06923838 + -0.440020353 + 0 + 1 + 2 +
    • +
  • + 30 + -97.90959 + -79.72717 + 0 + -0.0259781852 + -0.445601642 + 0 + 1 + 2 +
    • +
  • + 1 + -87.3645554 + -79.70276 + 0 + -0.06923838 + -0.440020353 + 0 + 1 + 2 +
    • + +
  • + 40 + -87.3645554 + -79.70276 + 0 + -0.06923838 + -0.440020353 + 0 + 1 + 2 +
    • +
  • + 30 + -97.90959 + -79.72717 + 0 + -0.0259781852 + -0.445601642 + 0 + 1 + 2 +
    • +
  • + 1 + -87.3645554 + -79.70276 + 0 + -0.06923838 + -0.440020353 + 0 + 1 + 2 +
    • + +
  • + 40 + -87.3645554 + -69.70276 + 0 + -0.06923838 + -0.440020353 + 0 + 1 + 1 +
    • +
  • + 30 + -97.90959 + -69.72717 + 0 + -0.0259781852 + -0.445601642 + 0 + 1 + 1 +
    • +
  • + 1 + -87.3645554 + -69.70276 + 0 + -0.06923838 + -0.440020353 + 0 + 1 + 1 +
    • - - -
  • - Fast - true - 710 - 0 -
  • LayingPawn @@ -1196,10 +1435,18 @@
    • + + +
  • + Faster + True + 360 + 0 +
  • - 40 + 20 -87.3645554 -69.70276 0 @@ -1210,172 +1457,7 @@ 1
  • - 30 - -97.90959 - -69.72717 - 0 - -0.0259781852 - -0.445601642 - 0 - 1 - 1 -
    • -
  • - 1 - -87.3645554 - -69.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 1 -
    • -
  • - 40 - -87.3645554 - -69.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 1 -
    • -
  • - 30 - -97.90959 - -69.72717 - 0 - -0.0259781852 - -0.445601642 - 0 - 1 - 1 -
    • -
  • - 1 - -87.3645554 - -69.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 1 -
    • -
  • - 40 - -87.3645554 - -79.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 2 -
    • -
  • - 30 - -97.90959 - -79.72717 - 0 - -0.0259781852 - -0.445601642 - 0 - 1 - 2 -
    • -
  • - 1 - -87.3645554 - -79.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 2 -
    • -
  • - 40 - -87.3645554 - -79.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 2 -
    • -
  • - 30 - -97.90959 - -79.72717 - 0 - -0.0259781852 - -0.445601642 - 0 - 1 - 2 -
    • -
  • - 1 - -87.3645554 - -79.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 2 -
    • -
  • - 40 - -87.3645554 - -79.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 2 -
    • -
  • - 30 - -97.90959 - -79.72717 - 0 - -0.0259781852 - -0.445601642 - 0 - 1 - 2 -
    • -
  • - 1 - -87.3645554 - -79.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 2 -
    • -
  • - 40 - -87.3645554 - -69.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 1 -
    • -
  • - 30 + 15 -97.90959 -69.72717 0 @@ -1398,14 +1480,6 @@
    • - - -
  • - Faster - true - 360 - 0 -
  • LayingPawn @@ -1447,90 +1521,136 @@
    • -
  • - -
  • - 20 - -87.3645554 - -69.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 1 -
    • -
  • - 15 - -97.90959 - -69.72717 - 0 - -0.0259781852 - -0.445601642 - 0 - 1 - 1 -
    • -
  • - 1 - -87.3645554 - -69.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 1 -
    • - -
  • Cum - true + True 639 0
  • - LayingPawn
  • 20 - -47.9400826 - -21.93164 + -87.3645554 + -69.70276 0 - -0.04209958 - 0.467844343 + -0.06923838 + -0.440020353 0 - 3 - 3 - Slimy + 1 + 1
  • 15 - -35.8792953 - -9.312592 + -97.90959 + -69.72717 0 - 0.03684573 - 0.4285702 + -0.0259781852 + -0.445601642 0 - 3 - 3 - Slimy + 1 + 1
  • 1 - -47.9400826 - -21.93164 + -87.3645554 + -69.70276 0 - -0.04209958 - 0.467844343 + -0.06923838 + -0.440020353 0 - 3 - 3 - Slimy + 1 + 1
    • + +
  • + 20 + -87.3645554 + -69.70276 + 0 + -0.06923838 + -0.440020353 + 0 + 1 + 1 +
    • +
  • + 15 + -97.90959 + -69.72717 + 0 + -0.0259781852 + -0.445601642 + 0 + 1 + 1 +
    • +
  • + 1 + -87.3645554 + -69.70276 + 0 + -0.06923838 + -0.440020353 + 0 + 1 + 1 +
    • + +
  • + 20 + -87.3645554 + -69.70276 + 0 + -0.06923838 + -0.440020353 + 0 + 1 + 1 +
    • +
  • + True + 80 + -97.90959 + -69.72717 + 0 + -0.0259781852 + -0.445601642 + 0 + 1 + 1 + Cum +
    • +
  • + 40 + -99.80413 + -94.4023743 + 0 + -0.01950606 + -0.447728932 + 0 + 1 + 1 +
    • +
  • + 1 + -87.3645554 + -69.70276 + 0 + -0.06923838 + -0.440020353 + 0 + 1 + 1 +
    • + + +
  • + LayingPawn + +
  • 20 -47.9400826 @@ -1567,6 +1687,44 @@ 3 Slimy
    • + +
  • + 20 + -47.9400826 + -21.93164 + 0 + -0.04209958 + 0.467844343 + 0 + 3 + 3 + Slimy +
    • +
  • + 15 + -35.8792953 + -9.312592 + 0 + 0.03684573 + 0.4285702 + 0 + 3 + 3 + Slimy +
    • +
  • + 1 + -47.9400826 + -21.93164 + 0 + -0.04209958 + 0.467844343 + 0 + 3 + 3 + Slimy +
    • +
  • 20 -47.9400826 @@ -1615,124 +1773,10 @@
    • -
  • - -
  • - 20 - -87.3645554 - -69.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 1 -
    • -
  • - 15 - -97.90959 - -69.72717 - 0 - -0.0259781852 - -0.445601642 - 0 - 1 - 1 -
    • -
  • - 1 - -87.3645554 - -69.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 1 -
    • -
  • - 20 - -87.3645554 - -69.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 1 -
    • -
  • - 15 - -97.90959 - -69.72717 - 0 - -0.0259781852 - -0.445601642 - 0 - 1 - 1 -
    • -
  • - 1 - -87.3645554 - -69.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 1 -
    • -
  • - 20 - -87.3645554 - -69.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 1 -
    • -
  • - true - 80 - -97.90959 - -69.72717 - 0 - -0.0259781852 - -0.445601642 - 0 - 1 - 1 - Cum -
    • -
  • - 40 - -99.80413 - -94.4023743 - 0 - -0.01950606 - -0.447728932 - 0 - 1 - 1 -
    • -
  • - 1 - -87.3645554 - -69.70276 - 0 - -0.06923838 - -0.440020353 - 0 - 1 - 1 -
    • - - +     +     -     \ No newline at end of file + diff --git a/1.4/Patches/RacePatches/Nyaron.xml b/1.4/Patches/RacePatches/Nyaron.xml index be62f20..c176521 100644 --- a/1.4/Patches/RacePatches/Nyaron.xml +++ b/1.4/Patches/RacePatches/Nyaron.xml @@ -15,6 +15,15 @@ +
  • + Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Nyaron"]/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[bodyPartLabel="tail"] + + /Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Nyaron"]/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[bodyPartLabel="tail"] + + false + + +
    • diff --git a/1.4/Source/Utilities/AnimationUtility.cs b/1.4/Source/Utilities/AnimationUtility.cs index a02a9ff..fa60198 100644 --- a/1.4/Source/Utilities/AnimationUtility.cs +++ b/1.4/Source/Utilities/AnimationUtility.cs @@ -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();