diff --git a/1.4/Assemblies/Rimworld-Animations.dll b/1.4/Assemblies/Rimworld-Animations.dll
deleted file mode 100644
index 91ec017..0000000
Binary files a/1.4/Assemblies/Rimworld-Animations.dll and /dev/null differ
diff --git a/1.4/Defs/AnimationDefs/AnimationDefs.rar b/1.4/Defs/AnimationDefs/AnimationDefs.rar
deleted file mode 100644
index e7bf2a1..0000000
Binary files a/1.4/Defs/AnimationDefs/AnimationDefs.rar and /dev/null differ
diff --git a/1.4/Defs/AnimationDefs/Animations_Beast.xml b/1.4/Defs/AnimationDefs/Animations_Beast.xml
deleted file mode 100644
index 30d14fc..0000000
--- a/1.4/Defs/AnimationDefs/Animations_Beast.xml
+++ /dev/null
@@ -1,2180 +0,0 @@
-
-
-
- Dog_Doggystyle
-
- true
-
- Anal
- Vaginal
-
-
-
- VaginalBreeding
- AnalBreeding
-
-
-
-
-
- Human
-
- true
-
-
-
- Wolf_Timber
- Wolf_Arctic
- Whitefox
- Warg
- Husky
- LabradorRetriever
-
- AEXP_WelshTerrier
- AEXP_Rottweiler
- AEXP_Poodle
- AEXP_GreatDane
- AEXP_GermanShepherd
- AEXP_FrenchBulldog
- AEXP_Corgi
- AEXP_CatAbyssinian
- AEXP_CatBengal
- AEXP_CatMaineCoon
- AEXP_CatSphynx
-
-
- QuadrupedAnimalWithHooves
- QuadrupedAnimalWithPawsAndTail
-
- true
- true
-
-
-
-
-
-
-
- Fuck
- true
- 765
- 0
-
-
- LayingPawn
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
- 0
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
-
- 10
- 56.7
- 27.5
- 0.057
- -0.038
- 1
- 2
-
-
- 6
- 53.7
- 25.4
- 0.068
- -0.038
- 1
- 2
-
-
- 1
- 56.7
- 27.5
- 0.057
- -0.038
- 1
- 2
-
-
-
-
- 10
- 56.7
- 27.5
- 0.057
- -0.038
- 1
- 2
-
-
- 6
- 53.7
- 25.4
- 0.068
- -0.038
- 1
- 2
-
-
- 1
- 56.7
- 27.5
- 0.057
- -0.038
- 1
- 2
-
-
-
-
- 10
- 56.7
- 27.5
- 0.057
- -0.038
- 1
- 2
-
-
- 6
- 53.7
- 25.4
- 0.068
- -0.038
- 1
- 2
-
-
- 1
- 56.7
- 27.5
- 0.057
- -0.038
- 1
- 2
-
-
-
-
- 10
- 56.7
- 27.5
- 0.057
- -0.038
- 1
- 2
-
-
- 6
- 53.7
- 25.4
- 0.068
- -0.038
- 1
- 2
-
-
- 1
- 56.7
- 27.5
- 0.057
- -0.038
- 1
- 2
-
-
-
-
-
- 10
- 56.7
- 27.5
- 0.057
- -0.038
- 1
- 2
-
-
- 6
- 53.7
- 25.4
- 0.068
- -0.038
- 1
- 2
-
-
- 1
- 56.7
- 27.5
- 0.057
- -0.038
- 1
- 2
-
-
-
-
- 10
- 56.7
- 27.5
- 0.057
- -0.038
- 1
- 2
-
-
- 6
- 53.7
- 25.4
- 0.068
- -0.038
- 1
- 2
-
-
- 1
- 56.7
- 27.5
- 0.057
- -0.038
- 1
- 2
-
-
-
-
- 10
- 56.7
- 27.5
- 0.057
- -0.038
- 1
- 2
-
-
- 6
- 53.7
- 25.4
- 0.068
- -0.038
- 1
- 2
-
-
- 1
- 56.7
- 27.5
- 0.057
- -0.038
- 1
- 2
-
-
-
-
- 10
- 56.7
- 27.5
- 0.057
- -0.038
- 1
- 2
-
-
- 6
- 53.7
- 25.4
- 0.068
- -0.038
- 1
- 2
-
-
- 1
- 56.7
- 27.5
- 0.057
- -0.038
- 1
- 2
-
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
-
-
- 10
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
-
-
- 6
- 53.7
- 5.4
- 0.068
- -0.038
- 1
- 1
-
-
- 1
- 56.7
- 7.5
- 0.057
- -0.038
- 1
- 1
- 0
-
-
-
-
-
-
-
-
- 8
- -33.7
- 0
- -0.492
- 0.266
- 1
- 0
- 0
-
-
- 8
- Fuck
- -39.6
- 0
- -0.353
- 0.256
- 1
- 0
-
-
- 1
- -33.7
- 0
- -0.492
- 0.266
- 1
- 0
- 0
-
-
-
-
-
-
- Knot
- False
- 71
- 0
-
-
- LayingPawn
-
-
- true
- 60
- 53.7
- 25.4
- 0.068
- -0.038
- 1
- 1
- 0
-
-
- 6
- Cum
- 53.7
- 28.4
- 0.068
- -0.038
- 1
- 1
-
-
- 4
- 51.7
- 33.4
- 0.098
- -0.038
- 1
- 1
-
-
- 1
- 53.7
- 25.4
- 0.068
- -0.038
- 1
- 1
- 0
-
-
-
-
-
-
-
-
- 60
- -33.7
- 0
- -0.492
- 0.266
- 1
- 0
- 0
-
-
- 6
- -39.6
- 0
- -0.353
- 0.256
- 1
- 0
-
-
- 4
- Fuck
- -41.6
- 0
- -0.383
- 0.256
- 1
- 0
-
-
- 1
- -39.6
- 0
- -0.353
- 0.256
- 1
- 0
- 0
-
-
-
-
-
-
-
-
- Cum
- true
- 600
- 0
-
-
- LayingPawn
-
-
- 40
- 53.7
- 25.4
- 0.068
- -0.038
- 1
- 1
- 0
-
-
- 40
- Cum
- 57.7
- 28.4
- 0.073
- -0.038
- 1
- 1
-
-
- 1
- 53.7
- 25.4
- 0.068
- -0.038
- 1
- 1
- 0
-
-
-
-
-
-
-
-
- 10
- -39.6
- 0
- -0.353
- 0.256
- 1
- 0
- 0
-
-
- 10
- -40.6
- 0
- -0.358
- 0.256
- 1
- 0
-
-
- 10
- -39.6
- 0
- -0.353
- 0.256
- 1
- 0
-
-
- 10
- -40.6
- 0
- -0.358
- 0.256
- 1
- 0
-
-
- 10
- -39.6
- 0
- -0.353
- 0.256
- 1
- 0
-
-
- 10
- -40.6
- 0
- -0.358
- 0.256
- 1
- 0
-
-
- 10
- -39.6
- 0
- -0.353
- 0.256
- 1
- 0
-
-
- 10
- -40.6
- 0
- -0.358
- 0.256
- 1
- 0
-
-
- 1
- -39.6
- 0
- -0.353
- 0.256
- 1
- 0
- 0
-
-
-
-
-
-
-
-
-
-
-
-
- Horse_Cowgirl
-
- true
-
- Anal
- Vaginal
-
-
-
- RequestVaginalBreeding
- RequestAnalBreeding
-
-
-
-
-
- Human
-
- true
- true
-
- (0, 0.2)
-
-
-
-
- Horse
-
-
- QuadrupedAnimalWithHooves
-
- true
-
-
-
-
-
-
-
- Insertion
- false
- 0
-
-
-
-
- 180
- -24.337
- -37.1218948
- 0
- 0.698042035
- -0.20718734
- 0
- 3
- 3
-
-
- 70
- -2.54239845
- 7.31265259
- 0
- 0.606091142
- -0.045959726
- 0
- 3
- 3
- Slimy
-
-
- 60
- -4.84361649
- -23.6405125
- 0
- 0.650456548
- -0.0570534021
- 0
- 3
- 3
- Slimy
-
-
- 1
- -35.01766
- -26.3706665
- 0
- 0.455286169
- -0.3646413
- 0
- 3
- 3
- Slimy
-
-
-
-
- LayingPawn
-
-
- 250
- 177.083145
- 0
- 0
- -0.256229281
- -0.362511069
- 0
- 1
- 0
-
-
-
- 60
- 177.981537
- 0
- 0
- -0.24524799
- -0.358849227
- 0
- 1
- 0
-
-
- 1
- 179.6811
- 0
- 0
- -0.267210543
- -0.3991253
- 0
- 1
- 0
-
-
-
-
-
-
-
- SlowFuck
- true
- 1300
- 0
-
-
-
-
- 80
- -35.01766
- -26.3706665
- 0
- 0.455286169
- -0.3646413
- 0
- 3
- 3
-
-
- 49
- -49.8178673
- -35.7418823
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
- Slimy
-
-
- 1
- -35.01766
- -26.3706665
- 0
- 0.455286169
- -0.3646413
- 0
- 3
- 3
- Fuck
-
-
-
-
- LayingPawn
-
-
- 80
- 179.6811
- 0
- 0
- -0.267210543
- -0.3991253
- 0
- 1
- 0
-
-
- 49
- 177.981537
- 0
- 0
- -0.24524799
- -0.358849227
- 0
- 1
- 0
-
-
- 1
- 179.6811
- 0
- 0
- -0.267210543
- -0.3991253
- 0
- 1
- 0
-
-
-
-
-
-
-
- Transition
- false
- 0
-
-
-
-
- 50
- -35.01766
- -26.3706665
- 0
- 0.455286169
- -0.3646413
- 0
- 3
- 3
- Fuck
-
-
-
- 15
- -49.8178673
- -35.7418823
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
- Slimy
-
-
-
- 80
- -49.8178673
- -8.273987
- 0
- 0.506531835
- -0.55575326
- 0
- 3
- 3
-
-
-
- 1
- -49.8178673
- -14.1647339
- 0
- 0.48456946
- -0.489136577
- 0
- 3
- 3
-
-
-
-
- LayingPawn
-
-
- 50
- 179.6811
- 0
- 0
- -0.267210543
- -0.3991253
- 0
- 1
- 0
-
-
-
- 15
- 177.981537
- 0
- 0
- -0.24524799
- -0.358849227
- 0
- 1
- 0
-
-
-
- 80
- 175.467651
- 0
- 0
- -0.2123042
- -0.5309518
- 0
- 1
- 0
- Fuck
-
-
-
- 1
- 177.981537
- 0
- 0
- -0.24524799
- -0.358849227
- 0
- 1
- 0
-
-
-
-
-
-
-
- FastFuck
- true
- 1260
- 0
-
-
-
-
-
- 10
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
- Slimy
-
-
- 24
- -49.8178673
- -8.273987
- 0
- 0.506531835
- -0.55575326
- 0
- 3
- 3
-
-
- 1
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
- Slimy
-
-
-
- 10
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
- Slimy
-
-
- 24
- -49.8178673
- -8.273987
- 0
- 0.506531835
- -0.55575326
- 0
- 3
- 3
-
-
- 1
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
- Slimy
-
-
-
- 10
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 2
- Slimy
-
-
- 24
- -49.8178673
- -8.273987
- 0
- 0.506531835
- -0.55575326
- 0
- 3
- 2
-
-
- 1
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 2
- Slimy
-
-
-
- 10
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 2
- Slimy
-
-
- 24
- -49.8178673
- -8.273987
- 0
- 0.506531835
- -0.55575326
- 0
- 3
- 2
-
-
- 1
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 2
- Slimy
-
-
-
- 10
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 2
- Slimy
-
-
- 24
- -49.8178673
- -8.273987
- 0
- 0.506531835
- -0.55575326
- 0
- 3
- 2
-
-
- 1
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 2
- Slimy
-
-
-
- 10
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 2
- Slimy
-
-
- 24
- -49.8178673
- -8.273987
- 0
- 0.506531835
- -0.55575326
- 0
- 3
- 2
-
-
- 1
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 2
- Slimy
-
-
-
- 10
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 2
- Slimy
-
-
- 24
- -49.8178673
- -8.273987
- 0
- 0.506531835
- -0.55575326
- 0
- 3
- 2
-
-
- 1
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 2
- Slimy
-
-
-
- 10
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 2
- Slimy
-
-
- 24
- -49.8178673
- -8.273987
- 0
- 0.506531835
- -0.55575326
- 0
- 3
- 2
-
-
- 1
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 2
- Slimy
-
-
-
- 10
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
- Slimy
-
-
- 24
- -49.8178673
- -8.273987
- 0
- 0.506531835
- -0.55575326
- 0
- 3
- 3
-
-
- 1
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
- Slimy
-
-
-
- 10
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
- Slimy
-
-
- 24
- -49.8178673
- -8.273987
- 0
- 0.506531835
- -0.55575326
- 0
- 3
- 3
-
-
- 1
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
- Slimy
-
-
-
- 10
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
- Slimy
-
-
- 24
- -49.8178673
- -8.273987
- 0
- 0.506531835
- -0.55575326
- 0
- 3
- 3
-
-
- 1
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
- Slimy
-
-
-
- 10
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
- Slimy
-
-
- 24
- -49.8178673
- -8.273987
- 0
- 0.506531835
- -0.55575326
- 0
- 3
- 3
-
-
- 1
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
- Slimy
-
-
-
-
- LayingPawn
-
-
-
- 10
- 177.981537
- 0
- 0
- -0.24524799
- -0.358849227
- 0
- 1
- 0
-
-
- 24
- 175.467651
- 0
- 0
- -0.2123042
- -0.5309518
- 0
- 1
- 0
- Fuck
-
-
- 1
- 177.981537
- 0
- 0
- -0.24524799
- -0.358849227
- 0
- 1
- 0
-
-
-
-
-
-
-
- FasterFuck
- true
- 418
- 0
-
-
-
-
-
- 10
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
-
-
- 8
- -49.8178673
- -8.273987
- 0
- 0.506531835
- -0.55575326
- 0
- 3
- 3
-
-
- 1
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
- Slimy
-
-
-
-
- LayingPawn
-
-
- 10
- 177.981537
- 0
- 0
- -0.24524799
- -0.358849227
- 0
- 1
- 0
-
-
- 8
- 175.467651
- 0
- 0
- -0.2123042
- -0.5309518
- 0
- 1
- 0
- Fuck
-
-
- 1
- 177.981537
- 0
- 0
- -0.24524799
- -0.358849227
- 0
- 1
- 0
-
-
-
-
-
-
-
- Cum
- True
- 318
- 0
-
-
-
-
-
- 10
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
-
-
-
- true
- 80
- -49.8178673
- -8.273987
- 0
- 0.506531835
- -0.55575326
- 0
- 3
- 3
- Cum
-
-
- 25
- -49.8178673
- 2.654541
- 0
- 0.5175133
- -0.547725141
- 0
- 3
- 3
-
-
- 1
- -49.8178673
- -14.1647339
- 0
- 0.484569454
- -0.489136577
- 0
- 3
- 3
-
-
-
-
-
- LayingPawn
-
-
-
- 10
- 177.981537
- 0
- 0
- -0.24524799
- -0.358849227
- 0
- 1
- 0
-
-
- 80
- 175.467651
- 0
- 0
- -0.2123042
- -0.5309518
- 0
- 1
- 0
-
-
- 25
- 173.81427
- 0
- 0
- -0.197662517
- -0.545600235
- 0
- 1
- 0
-
-
- 1
- 177.981537
- 0
- 0
- -0.24524799
- -0.358849227
- 0
- 1
- 0
-
-
-
-
-
-
-
-
-
-
-
diff --git a/1.4/Defs/AnimationDefs/Animations_Lesbian.xml b/1.4/Defs/AnimationDefs/Animations_Lesbian.xml
deleted file mode 100644
index 56d805a..0000000
--- a/1.4/Defs/AnimationDefs/Animations_Lesbian.xml
+++ /dev/null
@@ -1,1782 +0,0 @@
-
-
-
- Tribadism
-
- true
-
- Scissoring
-
-
-
-
-
- Human
-
- true
-
- Vagina
-
-
-
-
- Human
-
- true
- true
-
- Vagina
-
-
-
-
-
-
-
- Tribbing
- true
- 992
- 0
-
-
- LayingPawn
-
-
-
- 20
- -81.3
- -81.3
- -0.218
- 0.073
- 2
- 2
- 0
-
-
- 20
- -79.56
- -79.56
- -0.218
- 0.082
- 2
- 2
- 0
-
-
- 20
- -81.53
- -81.53
- -0.219
- 0.07
- 2
- 2
- 0
-
-
- Slimy
- 1
- -81.3
- -81.3
- -0.218
- 0.073
- 2
- 2
- 0
-
-
-
-
-
-
-
- 20
- 9.97
- -7.61
- 0.444
- 0.368
- 3
- 3
- 0
-
-
- 20
- 23.82
- -6.90
- 0.432
- 0.403
- 3
- 3
- 0
-
-
- 20
- 5.19
- -6.19
- 0.442
- 0.388
- 3
- 3
- 0
-
-
- 1
- 9.97
- -7.61
- 0.444
- 0.368
- 3
- 3
- 0
-
-
-
-
-
-
-
- TribadismFast
- true
- 682
- 0
-
-
- LayingPawn
-
-
-
- 10
- -81.3
- -81.3
- -0.218
- 0.073
- 2
- 1
- 0
-
-
- 10
- -79.56
- -79.56
- -0.218
- 0.082
- 2
- 1
- 0
-
-
- 10
- -81.53
- -81.53
- -0.219
- 0.07
- 2
- 1
- 0
-
-
- Slimy
- 1
- -81.3
- -81.3
- -0.218
- 0.073
- 2
- 1
- 0
-
-
-
- 10
- -81.3
- -81.3
- -0.218
- 0.073
- 2
- 1
- 0
-
-
- 10
- -79.56
- -79.56
- -0.218
- 0.082
- 2
- 1
- 0
-
-
- 10
- -81.53
- -81.53
- -0.219
- 0.07
- 2
- 1
- 0
-
-
- Slimy
- 1
- -81.3
- -81.3
- -0.218
- 0.073
- 2
- 1
- 0
-
-
-
-
- 10
- -81.3
- -81.3
- -0.218
- 0.073
- 2
- 1
- 0
-
-
- 10
- -79.56
- -79.56
- -0.218
- 0.082
- 2
- 1
- 0
-
-
- 10
- -81.53
- -81.53
- -0.219
- 0.07
- 2
- 1
- 0
-
-
- Slimy
- 1
- -81.3
- -81.3
- -0.218
- 0.073
- 2
- 1
- 0
-
-
-
- 10
- -81.3
- -81.3
- -0.218
- 0.073
- 2
- 1
- 0
-
-
- 10
- -79.56
- -79.56
- -0.218
- 0.082
- 2
- 1
- 0
-
-
- 10
- -81.53
- -81.53
- -0.219
- 0.07
- 2
- 1
- 0
-
-
- Slimy
- 1
- -81.3
- -81.3
- -0.218
- 0.073
- 2
- 1
- 0
-
-
-
-
-
- 10
- -81.3
- -73.04
- -0.218
- 0.073
- 2
- 2
- 0
-
-
- 10
- -79.56
- -77.66
- -0.218
- 0.082
- 2
- 2
- 0
-
-
- 10
- -81.53
- -77.74
- -0.219
- 0.07
- 2
- 2
- 0
-
-
- Slimy
- 1
- -81.3
- -73.04
- -0.218
- 0.073
- 2
- 2
- 0
-
-
-
-
-
- 10
- -81.3
- -73.04
- -0.218
- 0.073
- 2
- 2
- 0
-
-
- 10
- -79.56
- -77.66
- -0.218
- 0.082
- 2
- 2
- 0
-
-
- 10
- -81.53
- -77.74
- -0.219
- 0.07
- 2
- 2
- 0
-
-
- Slimy
- 1
- -81.3
- -73.04
- -0.218
- 0.073
- 2
- 2
- 0
-
-
-
-
-
- 10
- -81.3
- -73.04
- -0.218
- 0.073
- 2
- 2
- 0
-
-
- 10
- -79.56
- -77.66
- -0.218
- 0.082
- 2
- 2
- 0
-
-
- 10
- -81.53
- -77.74
- -0.219
- 0.07
- 2
- 2
- 0
-
-
- Slimy
- 1
- -81.3
- -73.04
- -0.218
- 0.073
- 2
- 2
- 0
-
-
-
-
-
- 10
- -81.3
- -73.04
- -0.218
- 0.073
- 2
- 2
- 0
-
-
- 10
- -79.56
- -77.66
- -0.218
- 0.082
- 2
- 2
- 0
-
-
- 10
- -81.53
- -77.74
- -0.219
- 0.07
- 2
- 2
- 0
-
-
- Slimy
- 1
- -81.3
- -73.04
- -0.218
- 0.073
- 2
- 2
- 0
-
-
-
-
-
- 10
- -81.3
- -73.04
- -0.218
- 0.073
- 2
- 2
- 0
-
-
- 10
- -79.56
- -77.66
- -0.218
- 0.082
- 2
- 2
- 0
-
-
- 10
- -81.53
- -77.74
- -0.219
- 0.07
- 2
- 2
- 0
-
-
- Slimy
- 1
- -81.3
- -73.04
- -0.218
- 0.073
- 2
- 2
- 0
-
-
-
-
-
- 10
- -81.3
- -73.04
- -0.218
- 0.073
- 2
- 2
- 0
-
-
- 10
- -79.56
- -77.66
- -0.218
- 0.082
- 2
- 2
- 0
-
-
- 10
- -81.53
- -77.74
- -0.219
- 0.07
- 2
- 2
- 0
-
-
- Slimy
- 1
- -81.3
- -73.04
- -0.218
- 0.073
- 2
- 2
- 0
-
-
-
-
- 10
- -81.3
- -81.3
- -0.218
- 0.073
- 2
- 1
- 0
-
-
- 10
- -79.56
- -79.56
- -0.218
- 0.082
- 2
- 1
- 0
-
-
- 10
- -81.53
- -81.53
- -0.219
- 0.07
- 2
- 1
- 0
-
-
- Slimy
- 1
- -81.3
- -81.3
- -0.218
- 0.073
- 2
- 1
- 0
-
-
-
-
-
-
-
- 10
- 9.97
- -7.61
- 0.444
- 0.368
- 3
- 3
- 0
-
-
- 10
- 23.82
- -6.90
- 0.432
- 0.403
- 3
- 3
- 0
-
-
- 10
- 5.19
- -6.19
- 0.442
- 0.388
- 3
- 3
- 0
-
-
- 1
- 9.97
- -7.61
- 0.444
- 0.368
- 3
- 3
- 0
-
-
-
-
-
-
-
-
-
-
- Cunnilingus
-
- true
-
- Oral
- Fingering
- Cunnilingus
-
-
-
- Cunnilingus
- CunnilingusF
- CunnilingusRape
- CunnilingusRapeF
-
- Fingering
- FingeringF
- FingeringRape
- FingeringRapeF
-
- Fisting
- FistingF
- FistingRape
- FistingRapeF
-
-
-
-
-
- Human
-
- true
-
- Vagina
-
-
- (-0.2, 0.1)
-
-
-
-
- Human
-
- true
-
- (-0.1, 0.15)
-
-
-
-
-
-
-
-
- Initial
- False
- 0
-
-
-
-
- 60
- -81.06536
- -56.4483032
- 0
- -0.0624052179
- -0.437134951
- 0
- 1
- 1
-
-
- 1
- -87.3645554
- -69.70276
- 0
- -0.0692383763
- -0.440020353
- 0
- 1
- 1
-
-
-
-
- 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
-
-
-
-
-
-
-
-
- Slow
- True
- 1497
- 0
-
-
-
-
- 98
- -87.3645554
- -69.70276
- 0
- -0.0692383763
- -0.440020353
- 0
- 1
- 1
-
-
- 40
- -87.26528
- -65.901825
- 0
- -0.0737426062
- -0.432820916
- 0
- 1
- 1
-
-
- 1
- -87.3645554
- -69.70276
- 0
- -0.0692383763
- -0.440020353
- 0
- 1
- 1
-
-
-
- 98
- -87.3645554
- -69.70276
- 0
- -0.0692383763
- -0.440020353
- 0
- 1
- 1
-
-
- 40
- -87.26528
- -65.901825
- 0
- -0.0737426062
- -0.432820916
- 0
- 1
- 1
-
-
- 1
- -87.3645554
- -69.70276
- 0
- -0.0692383763
- -0.440020353
- 0
- 1
- 1
-
-
-
- 60
- -87.3645554
- -69.70276
- 0
- -0.0692383763
- -0.440020353
- 0
- 1
- 1
-
-
- 120
- -86.52611
- -68.86432
- 0
- -0.05432228
- -0.439906
- 0
- 1
- 1
-
-
- 40
- -88.36286
- -84.3309
- 0
- -0.06637782
- -0.440140843
- 0
- 1
- 1
-
-
- 1
- -87.3645554
- -69.70276
- 0
- -0.0692383763
- -0.440020353
- 0
- 1
- 1
-
-
-
-
- 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
- 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
-
-
- 40
- -47.9400826
- -21.93164
- 0
- -0.04209958
- 0.467844343
- -0.1
- 3
- 3
- Slimy
-
-
- 30
- -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
-
-
-
-
-
-
-
- Fast
- True
- 710
- 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
-
-
-
- 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
-
-
-
-
- LayingPawn
-
-
- 40
- -47.9400826
- -21.93164
- 0
- -0.04209958
- 0.467844343
- 0
- 3
- 3
- Slimy
-
-
- 30
- -35.8792953
- -3.312592
- 0
- 0.03684573
- 0.4285702
- 0
- 3
- 3
- Slimy
-
-
- 1
- -47.9400826
- -21.93164
- 0
- -0.04209958
- 0.467844343
- 0
- 3
- 3
- Slimy
-
-
-
-
-
-
- Faster
- True
- 360
- 0
-
-
-
-
- 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
-
-
-
-
- LayingPawn
-
-
- 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
-
-
-
-
-
-
- Cum
- True
- 639
- 0
-
-
-
-
- 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
-
-
-
-
- LayingPawn
-
-
-
- 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
- -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
- -21.93164
- 0
- -0.04209958
- 0.467844343
- 0
- 3
- 3
- Slimy
-
-
- 80
- -35.8792953
- -9.312592
- 0
- 0.03684573
- 0.4285702
- 0
- 3
- 3
-
-
- 40
- -38.5277061
- -1.13140869
- 0
- 0.0376501828
- 0.42935127
- 0
- 3
- 3
-
-
- 1
- -47.9400826
- -21.93164
- 0
- -0.04209958
- 0.467844343
- 0
- 3
- 3
- Slimy
-
-
-
-
-
-
-
-
-
-
diff --git a/1.4/Defs/AnimationDefs/Animations_Masturbate.xml b/1.4/Defs/AnimationDefs/Animations_Masturbate.xml
deleted file mode 100644
index 2968fa1..0000000
--- a/1.4/Defs/AnimationDefs/Animations_Masturbate.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/1.4/Defs/AnimationDefs/Animations_Multi.xml b/1.4/Defs/AnimationDefs/Animations_Multi.xml
deleted file mode 100644
index af7ea7a..0000000
--- a/1.4/Defs/AnimationDefs/Animations_Multi.xml
+++ /dev/null
@@ -1,660 +0,0 @@
-
-
-
- Double_Penetration
-
- true
-
- DoublePenetration
- Anal
- Oral
- Vaginal
-
-
-
-
- Human
-
- true
-
-
-
- Human
-
- true
- true
- true
-
-
-
- Human
-
- true
- true
- true
-
-
-
-
-
- Slow
- true
- 976
- 0
-
-
-
-
-
- 25
- 62.7
- 0.2
- 0.01
- 0.118
- 1
- 1
- 0
-
-
- 35
- 48.1
- 16.3
- 0
- 0.188
- 1
- 1
- 0
-
-
- Suck
- 1
- 62.7
- 0.2
- 0.01
- 0.118
- 1
- 1
- 0
-
-
-
-
-
- LayingPawn
-
-
- -10
- 30
- 12
- -14.1
- 0.674
- 0.378
- 3
- 3
- 0
-
-
- 30
- 12
- -15.1
- 0.729
- 0.378
- 3
- 3
- 0
-
-
- -10
- 1
- 12
- -14.1
- 0.674
- 0.378
- 3
- 3
- 0
-
-
-
-
-
- LayingPawn
-
-
- 43
- 27
- 8.7
- 15.1
- -0.70
- 0.378
- 1
- 1
- 0
-
-
- Fuck
- 33
- -6.7
- 14.1
- -0.53
- 0.378
- 1
- 1
- 0
-
-
- 43
- 1
- 8.7
- 15.1
- -0.70
- 0.378
- 1
- 1
- 0
-
-
-
-
-
-
- Face_Fuck
- true
- 650
- 0
-
-
-
-
-
- 13
- 62.7
- 0.2
- 0.01
- 0.118
- 1
- 1
- 0
-
-
- 6
- 60.7
- 5.6
- 0.025
- 0.118
- 1
- 1
- 0
-
-
- 6
- 62.7
- 0.2
- 0.08
- 0.118
- 1
- 1
- 0
-
-
- Suck
- 1
- 62.7
- 0.2
- 0.01
- 0.118
- 1
- 1
- 0
-
-
-
-
-
- LayingPawn
-
-
- -10
- 13
- 12
- -14.1
- 0.674
- 0.378
- 3
- 3
- 0
-
-
- 12
- 2
- -15.1
- 0.729
- 0.378
- 3
- 3
- 0
-
-
- -10
- 1
- 12
- -14.1
- 0.674
- 0.378
- 3
- 3
- 0
-
-
-
-
-
- LayingPawn
-
-
- 43
- 13
- 8.7
- 15.1
- -0.70
- 0.378
- 1
- 1
- 0
-
-
- Fuck
- 12
- -6.7
- 14.1
- -0.53
- 0.378
- 1
- 1
- 0
-
-
- 43
- 1
- 8.7
- 15.1
- -0.70
- 0.378
- 1
- 1
- 0
-
-
-
-
-
-
- Cum
- true
- 392
- 0
-
-
-
-
-
- 9
- 62.7
- 0.2
- 0.01
- 0.118
- 1
- 1
- 0
-
-
- 4
- 60.7
- 5.6
- 0.025
- 0.118
- 1
- 1
- 0
-
-
- 4
- 62.7
- 0.2
- 0.056
- 0.118
- 1
- 1
- 0
-
-
- Suck
- 1
- 62.7
- 0.2
- 0.01
- 0.118
- 1
- 1
- 0
-
-
-
- 9
- 62.7
- 0.2
- 0.01
- 0.118
- 1
- 1
- 0
-
-
- 4
- 60.7
- 5.6
- 0.025
- 0.118
- 1
- 1
- 0
-
-
- 4
- 62.7
- 0.2
- 0.056
- 0.118
- 1
- 1
- 0
-
-
- Suck
- 1
- 62.7
- 0.2
- 0.01
- 0.118
- 1
- 1
- 0
-
-
-
- 9
- 62.7
- 0.2
- 0.01
- 0.118
- 1
- 1
- 0
-
-
- true
- 120
- 60.7
- 5.6
- 0.025
- 0.118
- 1
- 1
- 0
-
-
- 30
- 62.7
- 0.2
- 0.056
- 0.118
- 1
- 1
- 0
-
-
- Suck
- 1
- 62.7
- 0.2
- 0.01
- 0.118
- 1
- 1
- 0
-
-
-
-
-
- LayingPawn
-
-
- -10
- 9
- 9
- -14.1
- 0.674
- 0.378
- 3
- 3
- 0
-
-
- 8
- 0
- -15.1
- 0.729
- 0.378
- 3
- 3
- 0
-
-
- 1
- 9
- -14.1
- 0.674
- 0.378
- 3
- 3
- 0
-
-
-
- 9
- 9
- -14.1
- 0.674
- 0.378
- 3
- 3
- 0
-
-
- 8
- 0
- -15.1
- 0.729
- 0.378
- 3
- 3
- 0
-
-
- 1
- 9
- -14.1
- 0.674
- 0.378
- 3
- 3
- 0
-
-
-
-
- 9
- 9
- -14.1
- 0.674
- 0.378
- 3
- 3
- 0
-
-
- 120
- 9
- -15.1
- 0.674
- 0.378
- 3
- 3
- 0
-
-
- 30
- 9
- 7
- 0.674
- 0.378
- 3
- 3
- 0
-
-
- 1
- 9
- -14.1
- 0.674
- 0.378
- 3
- 3
- 0
- -10
-
-
-
-
-
-
- LayingPawn
-
-
- 43
- 9
- 8.7
- 15.1
- -0.70
- 0.378
- 1
- 1
- 0
-
-
- Fuck
- 8
- -6.7
- 14.1
- -0.53
- 0.378
- 1
- 1
- 0
-
-
- 1
- 8.7
- 15.1
- -0.70
- 0.378
- 1
- 1
- 0
-
-
-
- 9
- 8.7
- 15.1
- -0.70
- 0.378
- 1
- 1
- 0
-
-
- Fuck
- 8
- -6.7
- 14.1
- -0.53
- 0.378
- 1
- 1
- 0
-
-
- 1
- 8.7
- 15.1
- -0.70
- 0.378
- 1
- 1
- 0
-
-
-
- 9
- 8.7
- 15.1
- -0.70
- 0.378
- 1
- 1
- 0
-
-
- Cum
- 120
- -6.7
- 14.1
- -0.53
- 0.378
- 1
- 1
- 0
-
-
- 30
- -6.7
- -7
- -0.53
- 0.378
- 1
- 1
- 0
-
-
- 43
- 1
- 8.7
- 15.1
- -0.70
- 0.378
- 1
- 1
- 0
-
-
-
-
-
-
-
-
-
-
-
diff --git a/1.4/Defs/AnimationDefs/Animations_SexToys.xml b/1.4/Defs/AnimationDefs/Animations_SexToys.xml
deleted file mode 100644
index 320d3aa..0000000
--- a/1.4/Defs/AnimationDefs/Animations_SexToys.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
diff --git a/1.4/Defs/AnimationDefs/Animations_Vanilla2.xml b/1.4/Defs/AnimationDefs/Animations_Vanilla2.xml
deleted file mode 100644
index 71b02a9..0000000
--- a/1.4/Defs/AnimationDefs/Animations_Vanilla2.xml
+++ /dev/null
@@ -1,378 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.4/Defs/AnimationDefs/Animations_vanilla.xml b/1.4/Defs/AnimationDefs/Animations_vanilla.xml
deleted file mode 100644
index 0fd61d5..0000000
--- a/1.4/Defs/AnimationDefs/Animations_vanilla.xml
+++ /dev/null
@@ -1,2799 +0,0 @@
-
-
-
-
- Doggystyle
-
- true
-
- Vaginal
- Anal
- DoublePenetration
-
-
-
- AnalSex
- AnalSexF
- AnalRape
- VaginalSex
- VaginalSexF
- VaginalRape
-
-
-
-
-
-
- Human
-
- true
-
-
-
- Human
-
- true
- true
- true
-
- (0, 0.2)
-
-
-
-
-
-
- Slow_Fuck
- true
- 612
- 0
-
-
-
-
- 0
- 10
- 27
- 0.298
- 0.166
- 0
- 1
- 2
-
-
- 40
- 32
- 0.326
- 0.190
- 1
- 2
-
-
- 1
- 27
- 0.298
- 0.166
- 1
- 2
-
-
-
- 10
- 27
- 0.298
- 0.166
- 1
- 2
-
-
- 40
- 32
- 0.326
- 0.190
- 1
- 2
-
-
- 1
- 27
- 0.298
- 0.166
- 1
- 2
-
-
-
- 10
- 27
- 0.298
- 0.166
- 1
- 2
-
-
- 40
- 32
- 0.326
- 0.190
- 1
- 2
-
-
- 1
- 27
- 0.298
- 0.166
- 1
- 2
-
-
-
- 10
- 27
- 0.298
- 0.166
- 1
- 1
-
-
- 40
- 32
- 0.326
- 0.190
- 1
- 1
-
-
- 1
- 27
- 0.298
- 0.166
- 1
- 1
-
-
-
- 10
- 27
- 0.298
- 0.166
- 1
- 1
-
-
- 40
- 32
- 0.326
- 0.190
- 1
- 1
-
-
- 1
- 27
- 0.298
- 0.166
- 1
- 1
-
-
-
- 10
- 27
- 0.298
- 0.166
- 1
- 1
-
-
- 40
- 32
- 0.326
- 0.190
- 1
- 1
-
-
- 1
- 27
- 0.298
- 0.166
- 1
- 1
-
-
-
- 10
- 27
- 0.298
- 0.166
- 1
- 1
-
-
- 40
- 32
- 0.326
- 0.190
- 1
- 1
-
-
- 1
- 27
- 0.298
- 0.166
- 1
- 1
-
-
-
- 10
- 27
- 0.298
- 0.166
- 1
- 1
-
-
- 40
- 32
- 0.326
- 0.190
- 1
- 1
-
-
- 0
- 1
- 27
- 0.298
- 0.166
- 0
- 1
- 1
-
-
-
-
- LayingPawn
-
-
- 27
- 0
- 10
- 16.6
- -0.217
- 0.175
- 3
- 1
- 1
-
-
-
- 40
- Fuck
- -17
- -0.217
- 0.272
- 5.4
- 1
- 1
-
-
- 1
- 16.6
- -0.217
- 0.175
- 3
- 1
- 1
- 0
- 27
-
-
-
-
-
-
- Fast_Fuck
- true
- 609
- 0
-
-
-
-
- 8
- 27
- 0.298
- 0.166
- 1
- 1
- 1
- 0
-
-
- 12
- 32
- 0.326
- 0.190
- 4
- 1
- 1
-
-
- 1
- 27
- 0.298
- 0.166
- 1
- 1
- 1
- 0
-
-
-
-
- LayingPawn
-
-
- 27
- 8
- 11
- -0.217
- 0.175
- 8
- 1
- 1
- 0
-
-
-
- 12
- Fuck
- -12
- -0.217
- 0.272
- 9
- 1
- 1
-
-
- 1
- 11
- -0.217
- 0.175
- 8
- 1
- 1
- 0
- 27
-
-
-
-
-
-
- Cum
- true
- 300
- 0
-
-
-
-
- 8
- 27
- 0.298
- 0.166
- 0
- 1
- 1
- 0
-
-
- Cum
- 100
- 32
- 0.326
- 0.190
- -1
- 1
- 1
- true
-
-
- 12
- 35
- 0.326
- 0.190
- -14
- 1
- 1
-
-
- 1
- 27
- 0.298
- 0.166
- 0
- 1
- 1
- 0
-
-
-
-
- LayingPawn
-
-
- 27
- 8
- 11
- -0.217
- 0.175
- -8
- 1
- 1
- 0
-
-
- 100
- -12
- -0.217
- 0.272
- -9
- 1
- 1
-
-
- 12
- -15
- -0.227
- 0.272
- -4
- 1
- 1
-
-
- 1
- 11
- -0.217
- 0.175
- -8
- 1
- 1
- 0
- 27
-
-
-
-
-
-
-
-
- Blowjob
-
- true
-
- Oral
- Fellatio
-
-
- Handjob
- HandjobF
- HandjobRape
- HandjobRapeF
-
- Breastjob
- BreastjobF
- BreastjobRape
- BreastjobRapeF
-
- Fellatio
- FellatioF
- FellatioRape
- FellatioRapeF
-
- Beakjob
- BeakjobF
- BeakjobRape
- BeakjobRapeF
-
-
-
-
-
-
-
- Human
-
-
- (0, -0.2)
-
-
-
-
- Human
-
- true
- true
- true
-
- (0, 0.2)
-
-
-
-
-
- Slow_Suck
- true
- 1140
- 0
-
-
-
-
- 35
- 0
- 0
- 0
- -0.255
- 0
- 0
- 0
-
-
- Suck
- 59
- 0
- 0
- -0.33
- 0
- 0
- -0.16
-
-
- 1
- 0
- 0
- 0
- -0.255
- 0
- 0
- 0
-
-
-
- 35
- 0
- 0
- 0
- -0.255
- 0
- 0
- 0
-
-
- Suck
- 59
- 0
- 0
- -0.33
- 0
- 0
- -0.15
-
-
- 1
- 0
- 0
- 0
- -0.255
- 0
- 0
- 0
-
-
-
- 35
- 0
- 0
- 0
- -0.255
- 0
- 0
- 0
-
-
- Suck
- 59
-
- 6
- 0
- -0.33
- 0
- 0
- -0.13
-
-
- 1
- 0
- 0
- 0
- -0.255
- 0
- 0
- 0
-
-
-
- 35
- 0
- 0
- 0
- -0.255
- 0
- 0
- 0
-
-
- Suck
- 59
- 0
- -4
- 0
- -0.33
- 0
- 0
- -0.12
-
-
- 1
- 0
- 0
- 0
- -0.255
- 0
- 0
- 0
-
-
-
-
- LayingPawn
-
-
- 35
- 0
- 0
- 0
- 0.473
- 2
- 2
- 0
- 180
-
-
- 59
- 0
- 0
- 0.490
- 2
- 2
- -0.003
-
-
- 1
- 0
- 0
- 0
- 0.473
- 2
- 2
- 0
- 180
-
-
-
-
-
-
- Face_Fuck
- true
- 300
- 0
-
-
-
-
- 15
- 0
- 0
- 0
- -0.255
- 0
- 0
- 0
-
-
- Suck
- 14
- 0
- 0
- -0.270
- 0
- 0
- -0.06
-
-
- 1
- 0
- 0
- 0
- -0.255
- 0
- 0
- 0
-
-
-
-
- LayingPawn
-
-
- 15
- 0
- 0
- 0
- 0.473
- 2
- 2
- 0
- 180
-
-
- 14
- 0
- 0
- 0.575
- 2
- 2
- -0.051
-
-
- 1
- 0
- 0
- 0
- 0.473
- 2
- 2
- 0
- 180
-
-
-
-
-
-
- Cum
- true
- 600
- 0
-
-
-
-
- 12
- 0
- 0
- 0
- -0.255
- 0
- 0
- 0
-
-
- 7
- 0
- 0
- -0.290
- 0
- 0
- -0.06
-
-
- 7
- Suck
- 0
- 0
- -0.290
- 0
- 0
- -0.008
-
-
- 60
- 0
- 0
- -0.290
- 0
- 0
- -0.06
-
-
- 14
- 0
- 0
- -0.290
- 0
- 0
- -0.06
-
-
- 1
- 0
- 0
- 0
- -0.255
- 0
- 0
- 0
-
-
-
-
- LayingPawn
-
-
- 12
- 0
- 0
- 0
- 0.473
- 2
- 2
- 0
- 180
-
-
- 7
- Cum
- 0
- 0
- 0.575
- 2
- 2
- -0.051
-
-
- 7
- 0
- 0
- 0.50
- 2
- 2
- -0.04
-
-
- true
- 60
- 0
- 0
- 0.575
- 2
- 2
- -0.051
-
-
- 14
- 0
- 0
- 0.575
- 2
- 2
- -0.051
-
-
- 1
- 0
- 0
- 0
- 0.473
- 2
- 2
- 0
- 180
-
-
-
-
-
-
-
-
-
- ReverseStandAndCarry
-
- true
-
- Anal
- Vaginal
- DoublePenetration
-
-
- AnalSex
- AnalSexF
- AnalRape
- VaginalSex
- VaginalSexF
- VaginalRape
-
-
-
-
-
- Human
-
- true
-
- (0, 0.2)
-
-
-
-
- Human
-
- true
- true
- true
-
- (0, 0.2)
-
-
-
-
-
-
- Slow_Fuck
- true
- 1080
- 0
-
-
-
-
- 30
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 29
- 6.04
- 15
- -0.175
- 0.437
- 3
- 3
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
-
-
- LayingPawn
-
-
- 6
- 30
- -3.18
- -0.41
- 0.122
- 0.356
- 3
- 3
- 0
-
-
- 40
- Fuck
- 29
- 17.11
- -2.87
- 0.114
- 0.359
- 3
- 3
- 0
-
-
- 1
- -3.18
- -0.41
- 0.122
- 0.356
- 3
- 3
- 0
- 6
-
-
-
-
-
-
-
- Fast_Fuck
- true
- 780
- 0
-
-
-
-
- 6
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 7
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 12
- 6.04
- 15
- -0.175
- 0.437
- 3
- 3
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
-
- 6
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 7
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 12
- 6.04
- 15
- -0.175
- 0.437
- 3
- 3
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
-
-
- 6
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
- 7
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
- 12
- 6.04
- 15
- -0.175
- 0.437
- 3
- 2
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
-
- 6
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
- 7
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
- 12
- 6.04
- 15
- -0.175
- 0.437
- 3
- 2
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
-
- 6
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
- 7
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
- 12
- 6.04
- 15
- -0.175
- 0.437
- 3
- 2
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
-
- 6
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
- 7
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
- 12
- 6.04
- 15
- -0.175
- 0.437
- 3
- 2
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
-
- 6
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
- 7
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
- 12
- 6.04
- 15
- -0.175
- 0.437
- 3
- 2
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
-
- 6
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
- 7
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
- 12
- 6.04
- 15
- -0.175
- 0.437
- 3
- 2
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
-
- 6
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
- 7
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
- 12
- 6.04
- 15
- -0.175
- 0.437
- 3
- 2
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 2
- 0
-
-
-
-
-
- 6
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 7
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 12
- 6.04
- 15
- -0.175
- 0.437
- 3
- 3
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
-
- 6
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 7
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 12
- 6.04
- 15
- -0.175
- 0.437
- 3
- 3
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
-
- 6
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 7
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 12
- 6.04
- 15
- -0.175
- 0.437
- 3
- 3
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
-
- 6
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 7
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 12
- 6.04
- 15
- -0.175
- 0.437
- 3
- 3
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
-
- 6
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 7
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 12
- 6.04
- 15
- -0.175
- 0.437
- 3
- 3
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
-
- 6
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 7
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 12
- 6.04
- 15
- -0.175
- 0.437
- 3
- 3
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
-
-
- LayingPawn
-
-
- 6
- 13
- -3.18
- -0.41
- 0.122
- 0.356
- 3
- 3
- 0
-
-
- 40
- Fuck
- 12
- 17.11
- -2.87
- 0.114
- 0.359
- 3
- 3
- 0
-
-
- 1
- -3.18
- -0.41
- 0.122
- 0.356
- 3
- 3
- 0
- 6
-
-
-
-
-
-
-
- Cum
- true
- 415
- 0
-
-
-
-
- 3
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 4
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 7
- 6.04
- 15
- -0.175
- 0.437
- 3
- 3
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
-
- 3
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 4
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 7
- 6.04
- 15
- -0.175
- 0.437
- 3
- 3
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
-
- 3
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 4
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 7
- 6.04
- 15
- -0.175
- 0.437
- 3
- 3
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
-
- 3
- 10.6
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- 4
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
- true
- 75
- 6.04
- 15
- -0.175
- 0.437
- 3
- 3
- 0
-
-
- 27
- 6.04
- 15
- -0.175
- 0.437
- 3
- 3
- 0
-
-
- 1
- 11.23
- 11.23
- -0.183
- 0.468
- 3
- 3
- 0
-
-
-
-
- LayingPawn
-
-
- 6
- 7
- -3.18
- -0.41
- 0.122
- 0.356
- 3
- 3
- 0
-
-
- 40
- Fuck
- 7
- 17.11
- -2.87
- 0.114
- 0.359
- 3
- 3
- 0
-
-
- 6
- 1
- -3.18
- -0.41
- 0.122
- 0.356
- 3
- 3
- 0
-
-
-
- 6
- 7
- -3.18
- -0.41
- 0.122
- 0.356
- 3
- 3
- 0
-
-
- 40
- Fuck
- 7
- 17.11
- -2.87
- 0.114
- 0.359
- 3
- 3
- 0
-
-
- 6
- 1
- -3.18
- -0.41
- 0.122
- 0.356
- 3
- 3
- 0
-
-
-
- 6
- 7
- -3.18
- -0.41
- 0.122
- 0.356
- 3
- 3
- 0
-
-
- 40
- Fuck
- 7
- 17.11
- -2.87
- 0.114
- 0.359
- 3
- 3
- 0
-
-
- 6
- 1
- -3.18
- -0.41
- 0.122
- 0.356
- 3
- 3
- 0
-
-
-
- 6
- 7
- -3.18
- -0.41
- 0.122
- 0.356
- 3
- 3
- 0
-
-
- 40
- Cum
- 75
- 17.11
- -2.87
- 0.114
- 0.359
- 3
- 3
- 0
-
-
- 40
- 27
- 17.11
- -2.87
- 0.114
- 0.359
- 3
- 3
- 0
-
-
- 6
- 1
- -3.18
- -0.41
- 0.122
- 0.356
- 3
- 3
- 0
-
-
-
-
-
-
-
-
-
- Cowgirl
-
- true
-
- Anal
- Vaginal
- DoublePenetration
-
-
-
- AnalSex
- AnalSexF
- AnalRapeF
- VaginalSex
- VaginalSexF
- VaginalRapeF
-
-
-
-
-
-
-
- Human
-
- true
- true
-
- (0, 0.2)
-
-
-
-
-
- Human
-
- true
- true
-
- (0, -0.2)
-
-
-
-
-
-
-
- Slow_Fuck
- true
- 1340
- 0
-
-
-
-
-
- 16
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
- 17
- 3.5
- 0
- -0.03
- 0.624
- 2
- 2
- -0.02
-
-
- 16
- 0
- 0
- 0
- 0.694
- 2
- 2
- -0.03
-
-
- 17
- -3.5
- 0
- 0.03
- 0.624
- 2
- 2
- -0.02
-
-
- 1
- Fuck
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
-
- 16
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
- 17
- 3.5
- 0
- -0.03
- 0.624
- 2
- 2
- -0.02
-
-
- 16
- 0
- 0
- 0
- 0.694
- 2
- 2
- -0.03
-
-
- 17
- -3.5
- 0
- 0.03
- 0.624
- 2
- 2
- -0.02
-
-
- 1
- Fuck
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
-
-
- 33
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
- 33
- 0
- 0
- 0
- 0.694
- 2
- 2
- -0.03
-
-
- 1
- Fuck
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
-
- 33
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
- 33
- 0
- 0
- 0
- 0.694
- 2
- 2
- -0.03
-
-
- 1
- Fuck
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
-
-
- LayingPawn
-
-
- 16
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
- 0
-
-
- 17
- 180
- 180
- 0
- -0.347
- 2
- 2
- 0.015
- -15
-
-
- 16
- 180
- 180
- 0
- -0.331
- 2
- 2
- 0.03
- 0
-
-
- 17
- 180
- 180
- 0
- -0.315
- 2
- 2
- 0.045
- 15
-
-
- 1
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
- 0
-
-
- 16
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
- 0
-
-
- 17
- 180
- 180
- 0
- -0.347
- 2
- 2
- 0.015
- -15
-
-
- 16
- 180
- 180
- 0
- -0.331
- 2
- 2
- 0.03
- 0
-
-
- 17
- 180
- 180
- 0
- -0.315
- 2
- 2
- 0.045
- 15
-
-
- 1
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
- 0
-
-
- 33
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
- 0
-
-
- 33
- 180
- 180
- 0
- -0.315
- 2
- 2
- 0.045
- 0
-
-
- 1
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
- 0
-
-
- 33
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
- 0
-
-
- 33
- 180
- 180
- 0
- -0.315
- 2
- 2
- 0.045
- 0
-
-
- 1
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
- 0
-
-
-
-
-
-
- Fast_Fuck
- true
- 780
- 0
-
-
-
-
- 13
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
- 13
- 0
- 0
- 0
- 0.694
- 2
- 2
- -0.03
-
-
- 1
- Fuck
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
-
-
- LayingPawn
-
-
- 13
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
- 0
-
-
- 13
- 180
- 180
- 0
- -0.313
- 2
- 2
- 0.045
- 0
-
-
- 1
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
- 0
-
-
-
-
-
-
- Cum
- true
- 594
- 0
-
-
-
-
- 10
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
- 10
- 0
- 0
- 0
- 0.694
- 2
- 2
- -0.03
-
-
- 1
- Fuck
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
-
- 10
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
- 10
- 0
- 0
- 0
- 0.694
- 2
- 2
- -0.03
-
-
- 1
- Fuck
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
-
- 10
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
- 10
- 0
- 0
- 0
- 0.694
- 2
- 2
- -0.03
-
-
- true
- 45
- Cum
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
- true
- 40
- 0
- 0
- 0
- 0.534
- 2
- 2
- 0
-
-
- 1
- 0
- 0
- 0
- 0.554
- 2
- 2
- 0
-
-
-
-
- LayingPawn
-
-
- 10
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
- 0
-
-
- 10
- 180
- 180
- 0
- -0.313
- 2
- 2
- 0.045
-
-
- 1
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
-
-
-
- 10
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
-
-
- 10
- 180
- 180
- 0
- -0.313
- 2
- 2
- 0.045
-
-
- 1
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
-
-
-
- 10
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
-
-
- 10
- 180
- 180
- 0
- -0.313
- 2
- 2
- 0.045
-
-
- 45
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
-
-
- 40
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
-
-
- 1
- 180
- 180
- 0
- -0.363
- 2
- 2
- 0
- 0
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/1.4/Defs/AnimationDefs/TemplateAnimation.xml b/1.4/Defs/AnimationDefs/TemplateAnimation.xml
deleted file mode 100644
index 0305903..0000000
--- a/1.4/Defs/AnimationDefs/TemplateAnimation.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
diff --git a/1.4/Defs/MainTabDefs/MainButtonDef.xml b/1.4/Defs/MainTabDefs/MainButtonDef.xml
deleted file mode 100644
index 0674d24..0000000
--- a/1.4/Defs/MainTabDefs/MainButtonDef.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- OffsetManager
-
- Control pawn offsets
- Rimworld_Animations.MainTabWindow_OffsetConfigure
- 54
- false
- UI/MainTab
- true
-
-
-
\ No newline at end of file
diff --git a/1.4/Defs/SoundDefs/Sounds_Sex.xml b/1.4/Defs/SoundDefs/Sounds_Sex.xml
deleted file mode 100644
index f05a1a8..0000000
--- a/1.4/Defs/SoundDefs/Sounds_Sex.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-
-
-
-
- Cum
- MapOnly
-
- 1
- 1
-
-
-
-
- Sex/cum
-
-
-
- 30
- 40
-
-
- 0.8
- 1.2
-
-
- 0
- 51.86047
-
- False
-
-
-
-
- Sex
- MapOnly
-
- 1
- 1
-
-
-
-
- Sex/kucyu04
-
-
-
- 16
- 16
-
-
- 0.8
- 1.2
-
-
- 0
- 51.86047
-
- False
-
-
-
-
- Suck
- MapOnly
-
- 1
- 1
-
-
-
-
- Sex/Suck/Suck_1
-
-
- Sex/Suck/Suck_2
-
-
- Sex/Suck/Suck_3
-
-
- Sex/Suck/Suck_4
-
-
- Sex/Suck/Suck_5
-
-
- Sex/Suck/Suck_6
-
-
- Sex/Suck/Suck_7
-
-
- Sex/Suck/Suck_8
-
-
- Sex/Suck/Suck_9
-
-
- Sex/Suck/Suck_10
-
-
-
- 20
- 35
-
-
- 1.0
- 1.0
-
-
- 0
- 51.86047
-
- NeverTwice
- false
-
-
-
-
- Fuck
- MapOnly
-
- 1
- 1
-
-
-
-
- Sex/Clap_1
-
-
- Sex/Clap_2
-
-
- Sex/Clap_3
-
-
- Sex/Clap_4
-
-
- Sex/Clap_5
-
-
- Sex/Clap_6
-
-
- Sex/Clap_7
-
-
- Sex/Clap_8
-
-
-
- 45
- 70
-
-
- 1.0
- 1.0
-
-
- 0
- 51.86047
-
- NeverTwice
- false
-
-
-
-
- Slimy
- MapOnly
-
- 1
- 1
-
-
-
-
- Sex/Slime/Slimy1
-
-
- Sex/Slime/Slimy2
-
-
- Sex/Slime/Slimy3
-
-
- Sex/Slime/Slimy4
-
-
- Sex/Slime/Slimy5
-
-
-
- 45
- 75
-
-
- 1.4
- 1.8
-
-
- 0
- 100
-
- NeverTwice
- false
-
-
-
-
\ No newline at end of file
diff --git a/1.4/Patch_HatsDisplaySelection/Patch_HatsDisplaySelection.csproj b/1.4/Patch_HatsDisplaySelection/Patch_HatsDisplaySelection.csproj
deleted file mode 100644
index 8da21a6..0000000
--- a/1.4/Patch_HatsDisplaySelection/Patch_HatsDisplaySelection.csproj
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {BA766964-1716-422D-A09E-29426F8EB9D5}
- Library
- Properties
- Patch_HatsDisplaySelection
- Patch_HatsDisplaySelection
- v4.7.2
- 512
- true
-
-
- false
- none
- false
- 1.2\Assemblies\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
- ..\..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll
- False
-
-
- ..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll
- False
-
-
- ..\..\..\..\..\workshop\content\294100\1542291825\1.2\Assemblies\HatDisplaySelection.dll
- False
-
-
- ..\1.2\Assemblies\Rimworld-Animations.dll
- False
-
-
-
-
-
-
-
-
-
-
- ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.dll
- False
-
-
- ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll
- False
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.4/Patches/AnimationPatchHSK.xml b/1.4/Patches/AnimationPatchHSK.xml
deleted file mode 100644
index 74038ea..0000000
--- a/1.4/Patches/AnimationPatchHSK.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
- Core SK
-
-
-
-
-
- Defs/ThingDef/comps
- Always
-
- Defs/ThingDef
-
-
-
-
-
-
-
- Defs/ThingDef[@Name="BaseAnimalPawn" or @Name="SK_BasePawn" or @Name="BasePawnSkynet"]/comps
-
-
-
-
-
-
-
-
-
diff --git a/1.4/Patches/AnimationPatch_CompBodyAnimator.xml b/1.4/Patches/AnimationPatch_CompBodyAnimator.xml
deleted file mode 100644
index e645747..0000000
--- a/1.4/Patches/AnimationPatch_CompBodyAnimator.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
- Always
-
-
- Always
- Defs/ThingDef[race][not(comps)]
-
-
-
-
-
- Always
- Defs/AlienRace.ThingDef_AlienRace[not(comps)]
-
-
-
-
-
-
- Defs/ThingDef[@Name="BasePawn"]/comps
-
-
-
-
-
- Defs/AlienRace.ThingDef_AlienRace/comps
-
-
-
-
-
-
-
diff --git a/1.4/Patches/CompPatches/AutoCleaner.xml b/1.4/Patches/CompPatches/AutoCleaner.xml
deleted file mode 100644
index c2ad860..0000000
--- a/1.4/Patches/CompPatches/AutoCleaner.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="BaseBaseAutocleaner"]/comps
- Always
-
- /Defs/ThingDef[@Name="BaseBaseAutocleaner"]/comps
-
-
-
-
-
-
-
-
-
diff --git a/1.4/Patches/CompPatches/CombatExtended.xml b/1.4/Patches/CompPatches/CombatExtended.xml
deleted file mode 100644
index 7d35127..0000000
--- a/1.4/Patches/CompPatches/CombatExtended.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="BasePawnSimple"]/comps
- Always
-
- /Defs/ThingDef[@Name="BasePawnSimple"]/comps
-
-
-
-
-
-
-
-
diff --git a/1.4/Patches/CompPatches/ZombieLand.xml b/1.4/Patches/CompPatches/ZombieLand.xml
deleted file mode 100644
index e950e0e..0000000
--- a/1.4/Patches/CompPatches/ZombieLand.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- Always
-
-
- /Defs/ThingDef[@Name="BaseZombie"]/comps
- Always
-
- /Defs/ThingDef[@Name="BaseZombie"]/comps
-
-
-
-
-
-
-
-
diff --git a/1.4/Patches/CompatibilityPatch_FacialAnimation.xml b/1.4/Patches/CompatibilityPatch_FacialAnimation.xml
deleted file mode 100644
index 125d79f..0000000
--- a/1.4/Patches/CompatibilityPatch_FacialAnimation.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
-
- [NL] Facial Animation - WIP
-
-
- Always
-
-
- /Defs/FacialAnimation.FaceAnimationDef[defName="Lovin" or defName="Lovin2"]/targetJobs
- Always
-
- RJW_Masturbate
- GettinBred
- Bestiality
- BestialityForFemale
- ViolateCorpse
- Quickie
- GettingQuickie
- GettinRaped
- JoinInBed
- GettinLoved
- GettinLicked
- GettinSucked
- WhoreIsServingVisitors
- JoinInBedAnimation
- GettinLovedAnimation
-
-
-
- /Defs/FacialAnimation.FaceAnimationDef[defName="WaitCombat" or defName="Wait_Combat_Rare"]/targetJobs
- Always
-
- RapeComfortPawn
- RandomRape
- RapeEnemy
-
-
-
- /Defs/FacialAnimation.FaceAnimationDef[defName="StandAndBeSociallyActive"]/targetJobs
- Always
-
- WhoreInvitingVisitors
-
-
-
- /Defs/FacialAnimation.FaceAnimationDef[defName="Wear" or defName="Wear2" or defName="Wear3"]/targetJobs
- Always
-
- CleanSelf
- StruggleInBondageGear
-
-
-
-
- Rimworld-Animations
-
-
- Always
-
-
- /Defs/FacialAnimation.FaceAnimationDef[defName="Lovin" or defName="Lovin2"]/animationFrames/li[1]/headOffset
- Always
-
-
- /Defs/FacialAnimation.FaceAnimationDef[defName="Lovin"]/animationFrames/li[2]/headOffset
- Always
-
-
- /Defs/FacialAnimation.FaceAnimationDef[defName="Lovin"]/animationFrames/li[3]/headOffset
- Always
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.4/Patches/CompatibilityPatch_HCSK.xml b/1.4/Patches/CompatibilityPatch_HCSK.xml
deleted file mode 100644
index ead8783..0000000
--- a/1.4/Patches/CompatibilityPatch_HCSK.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
- Core SK
-
-
- Always
-
-
- /Defs/ThingDef/comps
- Always
-
- /Defs/ThingDef
-
-
-
-
-
-
-
- /Defs/ThingDef[@Name="SK_BasePawn"]/comps
-
-
-
-
-
-
- /Defs/ThingDef[@Name="BaseAnimalPawn"]/comps
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/1.4/Patches/RacePatches/Epona race Renaissance.xml b/1.4/Patches/RacePatches/Epona race Renaissance.xml
deleted file mode 100644
index f39b509..0000000
--- a/1.4/Patches/RacePatches/Epona race Renaissance.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- Epona race Renaissance
-
-
-
-
- /Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Epona"]/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[hediffGraphics/Epona_OHPG_female="Things/Pawn/Addons/Breasts/Breasts"]/drawnInBed
-
- false
-
-
-
-
-
-
-
diff --git a/1.4/Patches/RacePatches/Nyaron.xml b/1.4/Patches/RacePatches/Nyaron.xml
deleted file mode 100644
index 0a7a08e..0000000
--- a/1.4/Patches/RacePatches/Nyaron.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- Nyaron race
-
-
-
-
- /Defs/AlienRace.ThingDef_AlienRace[defName = "Alien_Nyaron"]/alienRace/generalSettings/alienPartGenerator/bodyAddons/li[bodyPart="tail"]
-
- false
-
-
-
-
-
-
-
diff --git a/1.4/Sounds/Sex/Clap_1.wav b/1.4/Sounds/Sex/Clap_1.wav
deleted file mode 100644
index bccd0f2..0000000
Binary files a/1.4/Sounds/Sex/Clap_1.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Clap_2.wav b/1.4/Sounds/Sex/Clap_2.wav
deleted file mode 100644
index a382f59..0000000
Binary files a/1.4/Sounds/Sex/Clap_2.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Clap_3.wav b/1.4/Sounds/Sex/Clap_3.wav
deleted file mode 100644
index 65cf39b..0000000
Binary files a/1.4/Sounds/Sex/Clap_3.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Clap_4.wav b/1.4/Sounds/Sex/Clap_4.wav
deleted file mode 100644
index 3ae1b3e..0000000
Binary files a/1.4/Sounds/Sex/Clap_4.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Clap_5.wav b/1.4/Sounds/Sex/Clap_5.wav
deleted file mode 100644
index 65144e7..0000000
Binary files a/1.4/Sounds/Sex/Clap_5.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Clap_6.wav b/1.4/Sounds/Sex/Clap_6.wav
deleted file mode 100644
index 0026325..0000000
Binary files a/1.4/Sounds/Sex/Clap_6.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Clap_7.wav b/1.4/Sounds/Sex/Clap_7.wav
deleted file mode 100644
index 6d7de2a..0000000
Binary files a/1.4/Sounds/Sex/Clap_7.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Clap_8.wav b/1.4/Sounds/Sex/Clap_8.wav
deleted file mode 100644
index 1af5710..0000000
Binary files a/1.4/Sounds/Sex/Clap_8.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Slime/Slimy1.wav b/1.4/Sounds/Sex/Slime/Slimy1.wav
deleted file mode 100644
index 3cfbd74..0000000
Binary files a/1.4/Sounds/Sex/Slime/Slimy1.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Slime/Slimy2.wav b/1.4/Sounds/Sex/Slime/Slimy2.wav
deleted file mode 100644
index 36a9197..0000000
Binary files a/1.4/Sounds/Sex/Slime/Slimy2.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Slime/Slimy3.wav b/1.4/Sounds/Sex/Slime/Slimy3.wav
deleted file mode 100644
index 40aff1e..0000000
Binary files a/1.4/Sounds/Sex/Slime/Slimy3.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Slime/Slimy4.wav b/1.4/Sounds/Sex/Slime/Slimy4.wav
deleted file mode 100644
index 0b6404e..0000000
Binary files a/1.4/Sounds/Sex/Slime/Slimy4.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Slime/Slimy5.wav b/1.4/Sounds/Sex/Slime/Slimy5.wav
deleted file mode 100644
index ea310db..0000000
Binary files a/1.4/Sounds/Sex/Slime/Slimy5.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Suck/Suck_1.wav b/1.4/Sounds/Sex/Suck/Suck_1.wav
deleted file mode 100644
index 4f1eafd..0000000
Binary files a/1.4/Sounds/Sex/Suck/Suck_1.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Suck/Suck_10.wav b/1.4/Sounds/Sex/Suck/Suck_10.wav
deleted file mode 100644
index 284cda3..0000000
Binary files a/1.4/Sounds/Sex/Suck/Suck_10.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Suck/Suck_2.wav b/1.4/Sounds/Sex/Suck/Suck_2.wav
deleted file mode 100644
index a8305c1..0000000
Binary files a/1.4/Sounds/Sex/Suck/Suck_2.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Suck/Suck_3.wav b/1.4/Sounds/Sex/Suck/Suck_3.wav
deleted file mode 100644
index 95e7348..0000000
Binary files a/1.4/Sounds/Sex/Suck/Suck_3.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Suck/Suck_4.wav b/1.4/Sounds/Sex/Suck/Suck_4.wav
deleted file mode 100644
index 753a023..0000000
Binary files a/1.4/Sounds/Sex/Suck/Suck_4.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Suck/Suck_5.wav b/1.4/Sounds/Sex/Suck/Suck_5.wav
deleted file mode 100644
index 8ecda9c..0000000
Binary files a/1.4/Sounds/Sex/Suck/Suck_5.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Suck/Suck_6.wav b/1.4/Sounds/Sex/Suck/Suck_6.wav
deleted file mode 100644
index 08567d6..0000000
Binary files a/1.4/Sounds/Sex/Suck/Suck_6.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Suck/Suck_7.wav b/1.4/Sounds/Sex/Suck/Suck_7.wav
deleted file mode 100644
index a63b0e4..0000000
Binary files a/1.4/Sounds/Sex/Suck/Suck_7.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Suck/Suck_8.wav b/1.4/Sounds/Sex/Suck/Suck_8.wav
deleted file mode 100644
index 320da09..0000000
Binary files a/1.4/Sounds/Sex/Suck/Suck_8.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Suck/Suck_9.wav b/1.4/Sounds/Sex/Suck/Suck_9.wav
deleted file mode 100644
index 7ab538a..0000000
Binary files a/1.4/Sounds/Sex/Suck/Suck_9.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Suck/Swallow_1.wav b/1.4/Sounds/Sex/Suck/Swallow_1.wav
deleted file mode 100644
index f3276cc..0000000
Binary files a/1.4/Sounds/Sex/Suck/Swallow_1.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Suck/Swallow_2.wav b/1.4/Sounds/Sex/Suck/Swallow_2.wav
deleted file mode 100644
index 09a7a00..0000000
Binary files a/1.4/Sounds/Sex/Suck/Swallow_2.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/Suck/Swallow_3.wav b/1.4/Sounds/Sex/Suck/Swallow_3.wav
deleted file mode 100644
index 2817b29..0000000
Binary files a/1.4/Sounds/Sex/Suck/Swallow_3.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/cum.wav b/1.4/Sounds/Sex/cum.wav
deleted file mode 100644
index ef98437..0000000
Binary files a/1.4/Sounds/Sex/cum.wav and /dev/null differ
diff --git a/1.4/Sounds/Sex/kucyu04.wav b/1.4/Sounds/Sex/kucyu04.wav
deleted file mode 100644
index 3ae1ce8..0000000
Binary files a/1.4/Sounds/Sex/kucyu04.wav and /dev/null differ
diff --git a/1.4/Source/Actors/Actor.cs b/1.4/Source/Actors/Actor.cs
deleted file mode 100644
index 3b382dd..0000000
--- a/1.4/Source/Actors/Actor.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using Verse;
-
-namespace Rimworld_Animations {
- public class Actor {
- public List defNames;
- public List requiredGenitals;
- public List raceOffsets;
- public List blacklistedRaces;
- public bool initiator = false;
- public string gender;
- public bool isFucking = false;
- public bool isFucked = false;
- public bool controlGenitalAngle = false;
- public List bodyDefTypes = new List();
- public BodyTypeOffset bodyTypeOffset = new BodyTypeOffset();
- public Vector3 offset = new Vector2(0, 0);
- public List requiredGender;
- public List tags = new List();
- }
-}
diff --git a/1.4/Source/Actors/AlienRaceOffset.cs b/1.4/Source/Actors/AlienRaceOffset.cs
deleted file mode 100644
index a5bbe20..0000000
--- a/1.4/Source/Actors/AlienRaceOffset.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-
-namespace Rimworld_Animations {
- public class AlienRaceOffset {
-
- public string defName;
- public Vector2 offset;
-
- }
-}
diff --git a/1.4/Source/Actors/BodyTypeOffset.cs b/1.4/Source/Actors/BodyTypeOffset.cs
deleted file mode 100644
index 82a23a3..0000000
--- a/1.4/Source/Actors/BodyTypeOffset.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-
-namespace Rimworld_Animations {
- public class BodyTypeOffset {
-
- public Vector2? Male;
- public Vector2? Female;
- public Vector2? Thin;
- public Vector2? Hulk;
- public Vector2? Fat;
-
- }
-}
diff --git a/1.4/Source/Animations/AnimationStage.cs b/1.4/Source/Animations/AnimationStage.cs
deleted file mode 100644
index 7a1304e..0000000
--- a/1.4/Source/Animations/AnimationStage.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Rimworld_Animations {
- public class AnimationStage
- {
- public string stageName;
- public int stageIndex;
- public int playTimeTicks = 0;
- public int playTimeTicksQuick = -1;
- public bool isLooping;
- public List animationClips;
- public List tags = new List();
-
- public void initialize() {
- foreach (BaseAnimationClip clip in animationClips) {
- clip.buildSimpleCurves();
- //select playTimeTicks as longest playtime of all the animations
- if(clip.duration > playTimeTicks) {
- playTimeTicks = clip.duration;
- }
- }
- }
- }
-}
diff --git a/1.4/Source/Animations/Clips/BaseAnimationClip.cs b/1.4/Source/Animations/Clips/BaseAnimationClip.cs
deleted file mode 100644
index aa35b31..0000000
--- a/1.4/Source/Animations/Clips/BaseAnimationClip.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using RimWorld;
-using Verse;
-
-namespace Rimworld_Animations {
- public abstract class BaseAnimationClip
- {
- public Dictionary SoundEffects = new Dictionary();
- public List types; //types of participants
- public int duration;
- public abstract void buildSimpleCurves();
- public string soundDef = null; //for playing sounds
- public int actor;
- public List tags = new List();
- }
-}
diff --git a/1.4/Source/Animations/Clips/PawnAnimationClip.cs b/1.4/Source/Animations/Clips/PawnAnimationClip.cs
deleted file mode 100644
index e9d2489..0000000
--- a/1.4/Source/Animations/Clips/PawnAnimationClip.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using RimWorld;
-using Verse;
-
-namespace Rimworld_Animations {
- public class PawnAnimationClip : BaseAnimationClip {
-
- public List keyframes;
- public AltitudeLayer layer = AltitudeLayer.Pawn;
-
- public Dictionary quiver = new Dictionary();
- public SimpleCurve GenitalAngle = new SimpleCurve();
- public SimpleCurve BodyAngle = new SimpleCurve();
- public SimpleCurve HeadAngle = new SimpleCurve();
- public SimpleCurve HeadBob = new SimpleCurve();
- public SimpleCurve BodyOffsetX = new SimpleCurve();
- public SimpleCurve BodyOffsetZ = new SimpleCurve();
- public SimpleCurve HeadFacing = new SimpleCurve();
- public SimpleCurve BodyFacing = new SimpleCurve();
-
-
- public override void buildSimpleCurves() {
-
-
- int duration = 0;
- //getting the length of the whole clip
- foreach(PawnKeyframe frame in keyframes) {
- duration += frame.tickDuration;
- }
-
- //guarantees loops don't get cut off mid-anim
- this.duration = duration;
-
- int keyframePosition = 0;
- foreach (PawnKeyframe frame in keyframes) {
-
- if (frame.atTick.HasValue) {
- if (frame.bodyAngle.HasValue)
- BodyAngle.Add((float)frame.atTick / (float)duration, frame.bodyAngle.Value, true);
-
- if (frame.headAngle.HasValue)
- HeadAngle.Add((float)frame.atTick / (float)duration, frame.headAngle.Value, true);
-
- if (frame.bodyOffsetX.HasValue)
- BodyOffsetX.Add((float)frame.atTick / (float)duration, frame.bodyOffsetX.Value, true);
-
- if (frame.bodyOffsetZ.HasValue)
- BodyOffsetZ.Add((float)frame.atTick / (float)duration, frame.bodyOffsetZ.Value, true);
-
- if (frame.headFacing.HasValue)
- HeadFacing.Add((float)frame.atTick / (float)duration, frame.headFacing.Value, true);
-
- if (frame.bodyFacing.HasValue)
- BodyFacing.Add((float)frame.atTick / (float)duration, frame.bodyFacing.Value, true);
-
- if (frame.headBob.HasValue)
- HeadBob.Add((float)frame.atTick / (float)duration, frame.headBob.Value, true);
-
- if (frame.genitalAngle.HasValue)
- GenitalAngle.Add((float)frame.atTick / (float)duration, frame.genitalAngle.Value, true);
-
- if (frame.soundEffect != null) {
- SoundEffects.Add((int)frame.atTick, frame.soundEffect);
- }
-
-
- }
- else {
- if (frame.bodyAngle.HasValue)
- BodyAngle.Add((float)keyframePosition / (float)duration, frame.bodyAngle.Value, true);
-
- if (frame.headAngle.HasValue)
- HeadAngle.Add((float)keyframePosition / (float)duration, frame.headAngle.Value, true);
-
- if (frame.bodyOffsetX.HasValue)
- BodyOffsetX.Add((float)keyframePosition / (float)duration, frame.bodyOffsetX.Value, true);
-
- if (frame.bodyOffsetZ.HasValue)
- BodyOffsetZ.Add((float)keyframePosition / (float)duration, frame.bodyOffsetZ.Value, true);
-
- if (frame.headFacing.HasValue)
- HeadFacing.Add((float)keyframePosition / (float)duration, frame.headFacing.Value, true);
-
- if (frame.bodyFacing.HasValue)
- BodyFacing.Add((float)keyframePosition / (float)duration, frame.bodyFacing.Value, true);
-
- if (frame.headBob.HasValue)
- HeadBob.Add((float)keyframePosition / (float)duration, frame.headBob.Value, true);
-
- if (frame.genitalAngle.HasValue)
- GenitalAngle.Add((float)keyframePosition / (float)duration, frame.genitalAngle.Value, true);
-
- if (frame.soundEffect != null) {
- SoundEffects.Add(keyframePosition, frame.soundEffect);
- }
-
- if(frame.tickDuration != 1 && frame.quiver.HasValue) {
-
- quiver.Add(keyframePosition, true);
- quiver.Add(keyframePosition + frame.tickDuration - 1, false);
- }
- keyframePosition += frame.tickDuration;
-
- }
-
- }
-
- }
-
- }
-}
diff --git a/1.4/Source/Animations/Clips/ThingAnimationClip.cs b/1.4/Source/Animations/Clips/ThingAnimationClip.cs
deleted file mode 100644
index 26f4d4c..0000000
--- a/1.4/Source/Animations/Clips/ThingAnimationClip.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-using RimWorld;
-
-namespace Rimworld_Animations {
- public class ThingAnimationClip : BaseAnimationClip
- {
- public List keyframes;
-
- public SimpleCurve PositionX = new SimpleCurve();
- public SimpleCurve PositionZ = new SimpleCurve();
- public SimpleCurve Rotation = new SimpleCurve();
-
-
- public override void buildSimpleCurves() {
- int duration = 0;
- //getting the length of the whole clip
- foreach (ThingKeyframe frame in keyframes)
- {
- duration += frame.tickDuration;
- }
-
- //guarantees loops don't get cut off mid-anim
- this.duration = duration;
-
- int keyframePosition = 0;
- foreach (ThingKeyframe frame in keyframes)
- {
-
- if (frame.atTick.HasValue)
- {
- if (frame.positionX.HasValue)
- PositionX.Add((float)frame.atTick / (float)duration, frame.positionX.Value, true);
-
- if (frame.positionZ.HasValue)
- PositionZ.Add((float)frame.atTick / (float)duration, frame.positionZ.Value, true);
-
- if (frame.rotation.HasValue)
- Rotation.Add((float)frame.atTick / (float)duration, frame.rotation.Value, true);
-
- if (frame.soundEffect != null)
- {
- SoundEffects.Add((int)frame.atTick, frame.soundEffect);
- }
-
-
- }
- else
- {
- if (frame.positionX.HasValue)
- PositionX.Add((float)keyframePosition / (float)duration, frame.positionX.Value, true);
-
- if (frame.positionZ.HasValue)
- PositionZ.Add((float)keyframePosition / (float)duration, frame.positionZ.Value, true);
-
- if (frame.rotation.HasValue)
- Rotation.Add((float)keyframePosition / (float)duration, frame.rotation.Value, true);
-
- if (frame.soundEffect != null)
- {
- SoundEffects.Add(keyframePosition, frame.soundEffect);
- }
- keyframePosition += frame.tickDuration;
-
- }
-
- }
- }
- }
-}
diff --git a/1.4/Source/Animations/Keyframes/Keyframe.cs b/1.4/Source/Animations/Keyframes/Keyframe.cs
deleted file mode 100644
index 8cd859d..0000000
--- a/1.4/Source/Animations/Keyframes/Keyframe.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Rimworld_Animations {
- public abstract class Keyframe
- {
- public int tickDuration = 1;
- public float? atTick;
- public string soundEffect;
- public List tags = new List();
- }
-}
diff --git a/1.4/Source/Animations/Keyframes/PawnKeyframe.cs b/1.4/Source/Animations/Keyframes/PawnKeyframe.cs
deleted file mode 100644
index e710981..0000000
--- a/1.4/Source/Animations/Keyframes/PawnKeyframe.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-
-namespace Rimworld_Animations {
- public class PawnKeyframe : Keyframe
- {
- public float? bodyAngle;
- public float? headAngle;
-
- public float? genitalAngle;
-
- public float? bodyOffsetZ;
- public float? bodyOffsetX;
-
- public float? headBob;
- //todo: add headOffsets l/r?
-
- public int? bodyFacing;
- public int? headFacing;
-
- public bool? quiver;
-
- }
-}
diff --git a/1.4/Source/Animations/Keyframes/ThingKeyframe.cs b/1.4/Source/Animations/Keyframes/ThingKeyframe.cs
deleted file mode 100644
index 6604f5e..0000000
--- a/1.4/Source/Animations/Keyframes/ThingKeyframe.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Rimworld_Animations {
- public class ThingKeyframe : Keyframe
- {
-
- public float? positionX;
- public float? positionZ;
- public float? rotation;
-
-
-
- }
-}
diff --git a/1.4/Source/Comps/CompBodyAnimator.cs b/1.4/Source/Comps/CompBodyAnimator.cs
deleted file mode 100644
index 5d355a6..0000000
--- a/1.4/Source/Comps/CompBodyAnimator.cs
+++ /dev/null
@@ -1,529 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using RimWorld;
-using rjw;
-using UnityEngine;
-using Verse;
-using Verse.Sound;
-
-namespace Rimworld_Animations {
- public class CompBodyAnimator : ThingComp
- {
- public Pawn pawn => base.parent as Pawn;
- public PawnGraphicSet Graphics;
-
- //public CompProperties_BodyAnimator Props => (CompProperties_BodyAnimator)(object)base.props;
-
- public bool isAnimating {
- get {
- return Animating;
- }
- set {
- Animating = value;
-
- if (value == true) {
- SexUtility.DrawNude(pawn);
- } else {
- pawn.Drawer.renderer.graphics.ResolveAllGraphics();
- actorsInCurrentAnimation = null;
- }
-
- PortraitsCache.SetDirty(pawn);
- }
- }
- private bool Animating = false;
- private bool mirror = false, quiver = false, shiver = false;
- private int actor;
-
- private int lastDrawFrame = -1;
-
- private int animTicks = 0, stageTicks = 0, clipTicks = 0;
- private int curStage = 0;
- private float clipPercent = 0;
-
- public Vector3 anchor = Vector3.zero, deltaPos = Vector3.zero, headBob = Vector3.zero;
- public float bodyAngle = 0, headAngle = 0, genitalAngle = 0;
- public Rot4 headFacing = Rot4.North, bodyFacing = Rot4.North;
-
- public List actorsInCurrentAnimation;
-
- public bool controlGenitalAngle = false;
- public bool fastAnimForQuickie = false;
-
- private AnimationDef anim;
- private AnimationStage stage {
- get
- {
- return anim.animationStages[curStage];
- }
-
- }
- private PawnAnimationClip clip => (PawnAnimationClip)stage.animationClips[actor];
-
- public bool Mirror {
- get {
- return mirror;
- }
- }
-
- public void setAnchor(IntVec3 pos)
- {
- anchor = pos.ToVector3Shifted();
- }
- public void setAnchor(Thing thing) {
-
- //center on bed
- if(thing is Building_Bed) {
- anchor = thing.Position.ToVector3();
- if (((Building_Bed)thing).SleepingSlotsCount == 2) {
- if (thing.Rotation.AsInt == 0) {
- anchor.x += 1;
- anchor.z += 1;
- }
- else if (thing.Rotation.AsInt == 1) {
- anchor.x += 1;
- }
- else if(thing.Rotation.AsInt == 3) {
- anchor.z += 1;
- }
-
- }
- else {
- if(thing.Rotation.AsInt == 0) {
- anchor.x += 0.5f;
- anchor.z += 1f;
- }
- else if(thing.Rotation.AsInt == 1) {
- anchor.x += 1f;
- anchor.z += 0.5f;
- }
- else if(thing.Rotation.AsInt == 2) {
- anchor.x += 0.5f;
- } else {
- anchor.z += 0.5f;
- }
- }
- }
- else {
- anchor = thing.Position.ToVector3Shifted();
- }
- }
- public void StartAnimation(AnimationDef anim, List 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);
-
- if (raceOffset != null) {
- anchor.x += mirror ? raceOffset.offset.x * -1f : raceOffset.offset.x;
- anchor.z += raceOffset.offset.y;
- }
-
- //change the offset based on pawn body type
- if(pawn?.story?.bodyType != null) {
- if (pawn.story.bodyType == BodyTypeDefOf.Fat && anim?.actors[actor]?.bodyTypeOffset?.Fat != null) {
- anchor.x += anim.actors[actor].bodyTypeOffset.Fat.Value.x * (mirror ? -1f : 1f);
- anchor.z += anim.actors[actor].bodyTypeOffset.Fat.Value.y;
- }
- else if (pawn.story.bodyType == BodyTypeDefOf.Female && anim?.actors[actor]?.bodyTypeOffset?.Female != null) {
- anchor.x += anim.actors[actor].bodyTypeOffset.Female.Value.x * (mirror ? -1f : 1f);
- anchor.z += anim.actors[actor].bodyTypeOffset.Female.Value.y;
- }
- else if (pawn.story.bodyType == BodyTypeDefOf.Male && anim?.actors[actor]?.bodyTypeOffset?.Male != null) {
- anchor.x += anim.actors[actor].bodyTypeOffset.Male.Value.x * (mirror ? -1f : 1f);
- anchor.z += anim.actors[actor].bodyTypeOffset.Male.Value.y;
- }
- else if (pawn.story.bodyType == BodyTypeDefOf.Thin && anim?.actors[actor]?.bodyTypeOffset?.Thin != null) {
- anchor.x += anim.actors[actor].bodyTypeOffset.Thin.Value.x * (mirror ? -1f : 1f);
- anchor.z += anim.actors[actor].bodyTypeOffset.Thin.Value.y;
- }
- else if (pawn.story.bodyType == BodyTypeDefOf.Hulk && anim?.actors[actor]?.bodyTypeOffset?.Hulk != null) {
- anchor.x += anim.actors[actor].bodyTypeOffset.Hulk.Value.x * (mirror ? -1f : 1f);
- anchor.z += anim.actors[actor].bodyTypeOffset.Hulk.Value.y;
- }
- }
-
- pawn.jobs.posture = PawnPosture.Standing;
-
- this.actor = actor;
- this.anim = anim;
- this.mirror = mirror;
- this.fastAnimForQuickie = fastAnimForQuickie;
-
- if (fastAnimForQuickie && anim.animationStages.Any(x => x.playTimeTicksQuick >= 0) == false)
- {
- curStage = 1;
- animTicks = anim.animationStages[0].playTimeTicks;
- } else
- {
- curStage = 0;
- animTicks = 0;
- }
-
- stageTicks = 0;
- clipTicks = 0;
-
- quiver = false;
- this.shiver = shiver && AnimationSettings.rapeShiver;
-
- controlGenitalAngle = anim.actors[actor].controlGenitalAngle;
-
- isAnimating = true;
- //tick once for initialization
- tickAnim();
-
- }
-
- public override void CompTick() {
-
- base.CompTick();
-
- if(isAnimating) {
-
- GlobalTextureAtlasManager.TryMarkPawnFrameSetDirty(pawn);
-
- if (pawn.Dead || pawn?.jobs?.curDriver == null || (pawn?.jobs?.curDriver != null && !(pawn?.jobs?.curDriver is rjw.JobDriver_Sex))) {
- isAnimating = false;
- }
- else {
- tickAnim();
- }
- }
- }
- public void animatePawnBody(ref Vector3 rootLoc, ref float angle, ref Rot4 bodyFacing) {
-
- if(!isAnimating) {
- return;
- }
- rootLoc = anchor + deltaPos;
- angle = bodyAngle;
- bodyFacing = this.bodyFacing;
-
- }
-
- public Rot4 AnimateHeadFacing()
- {
- return this.headFacing;
- }
-
-
- public void tickGraphics(PawnGraphicSet graphics) {
- this.Graphics = graphics;
- }
-
- public void tickAnim() {
-
-
-
- if (!isAnimating) return;
-
- if (anim == null) {
- isAnimating = false;
- return;
- }
-
- animTicks++;
-
- if (animTicks < anim.animationTimeTicks) {
- tickStage();
- } else {
-
- if(LoopNeverending())
- {
- ResetOnLoop();
- } else
- {
- isAnimating = false;
- }
-
-
- }
-
-
-
- }
-
- public void tickStage()
- {
-
- if(stage == null)
- {
- isAnimating = false;
- return;
- }
-
- stageTicks++;
-
- if(stageTicks >= stage.playTimeTicks || (fastAnimForQuickie && stage.playTimeTicksQuick >= 0 && stageTicks >= stage.playTimeTicksQuick)) {
-
- curStage++;
-
- stageTicks = 0;
- clipTicks = 0;
- clipPercent = 0;
- }
-
- if(curStage >= anim.animationStages.Count) {
- if (LoopNeverending())
- {
- ResetOnLoop();
- }
- else
- {
- isAnimating = false;
- pawn.jobs.curDriver.ReadyForNextToil();
- }
-
- } else {
- tickClip();
- }
-
-
-
- }
-
- public void tickClip() {
-
- clipTicks++;
-
- //play sound effect
- if(rjw.RJWSettings.sounds_enabled && clip.SoundEffects.ContainsKey(clipTicks) && AnimationSettings.soundOverride) {
-
-
- SoundInfo sound = new TargetInfo(pawn.Position, pawn.Map);
- string soundEffectName = clip.SoundEffects[clipTicks];
-
-
- if ((pawn.jobs.curDriver as JobDriver_Sex).isAnimalOnAnimal)
- {
- sound.volumeFactor *= RJWSettings.sounds_animal_on_animal_volume;
- }
-
- if(soundEffectName.StartsWith("Voiceline_"))
- {
- sound.volumeFactor *= RJWSettings.sounds_voice_volume;
- }
-
- if (clip.SoundEffects[clipTicks] == "Cum") {
-
- sound.volumeFactor *= RJWSettings.sounds_cum_volume;
- //considerApplyingSemen();
-
- } else
- {
- sound.volumeFactor *= RJWSettings.sounds_sex_volume;
- }
-
- SoundDef.Named(soundEffectName).PlayOneShot(sound);
-
- }
- if(AnimationSettings.orgasmQuiver && clip.quiver.ContainsKey(clipTicks)) {
- quiver = clip.quiver[clipTicks];
- }
-
- //loop animation if possible
- if (clipPercent >= 1 && stage.isLooping) {
- clipTicks = 1;//warning: don't set to zero or else calculations go wrong
- }
- clipPercent = (float)clipTicks / (float)clip.duration;
-
- calculateDrawValues();
- }
-
- public void considerApplyingSemen()
- {
- if(AnimationSettings.applySemenOnAnimationOrgasm && (pawn?.jobs?.curDriver is JobDriver_Sex))
- {
-
- if (anim.sexTypes.Contains((pawn.jobs.curDriver as JobDriver_Sex).Sexprops.sexType))
- {
- //SemenHelper.calculateAndApplySemen((pawn.jobs.curDriver as JobDriver_Sex).Sexprops);
- }
- }
- }
-
- public void calculateDrawValues() {
-
- /*if(Find.TickManager.TickRateMultiplier > 1 && (lastDrawFrame + 1 >= RealTime.frameCount || RealTime.deltaTime < 0.05f)) {
- return;
- }*/
-
- deltaPos = new Vector3(clip.BodyOffsetX.Evaluate(clipPercent) * (mirror ? -1 : 1), clip.layer.AltitudeFor(), clip.BodyOffsetZ.Evaluate(clipPercent));
-
- string bodyTypeDef = (pawn.story?.bodyType != null) ? pawn.story.bodyType.ToString() : "";
-
- if (AnimationSettings.offsets != null && AnimationSettings.offsets.ContainsKey(CurrentAnimation.defName + pawn.def.defName + bodyTypeDef + ActorIndex)) {
- deltaPos.x += AnimationSettings.offsets[CurrentAnimation.defName + pawn.def.defName + bodyTypeDef + ActorIndex].x * (mirror ? -1 : 1);
- deltaPos.z += AnimationSettings.offsets[CurrentAnimation.defName + pawn.def.defName + bodyTypeDef + ActorIndex].y;
- }
-
-
- bodyAngle = (clip.BodyAngle.Evaluate(clipPercent) + (quiver || shiver ? ((Rand.Value * AnimationSettings.shiverIntensity) - (AnimationSettings.shiverIntensity / 2f)) : 0f)) * (mirror ? -1 : 1);
- headAngle = clip.HeadAngle.Evaluate(clipPercent) * (mirror ? -1 : 1);
-
- if (controlGenitalAngle) {
- genitalAngle = clip.GenitalAngle.Evaluate(clipPercent) * (mirror ? -1 : 1);
- }
-
- if (AnimationSettings.rotation != null && AnimationSettings.rotation.ContainsKey(CurrentAnimation.defName + pawn.def.defName + bodyTypeDef + ActorIndex)) {
- float offsetRotation = AnimationSettings.rotation[CurrentAnimation.defName + pawn.def.defName + bodyTypeDef + ActorIndex] * (Mirror ? -1 : 1);
- genitalAngle += offsetRotation;
- bodyAngle += offsetRotation;
- headAngle += offsetRotation;
- }
-
-
- //don't go past 360 or less than 0
-
- if (bodyAngle < 0) bodyAngle = 360 - ((-1f*bodyAngle) % 360);
- if (bodyAngle > 360) bodyAngle %= 360;
-
-
- if (headAngle < 0) headAngle = 360 - ((-1f * headAngle) % 360);
- if (headAngle > 360) headAngle %= 360;
-
- if (genitalAngle < 0) genitalAngle = 360 - ((-1f * genitalAngle) % 360);
- if (genitalAngle > 360) genitalAngle %= 360;
-
-
- bodyFacing = mirror ? new Rot4((int)clip.BodyFacing.Evaluate(clipPercent)).Opposite : new Rot4((int)clip.BodyFacing.Evaluate(clipPercent));
-
- bodyFacing = new Rot4((int)clip.BodyFacing.Evaluate(clipPercent));
- if(bodyFacing.IsHorizontal && mirror) {
- bodyFacing = bodyFacing.Opposite;
- }
-
- headFacing = new Rot4((int)clip.HeadFacing.Evaluate(clipPercent));
- if(headFacing.IsHorizontal && mirror) {
- headFacing = headFacing.Opposite;
- }
- headBob = new Vector3(0, 0, clip.HeadBob.Evaluate(clipPercent));
- Vector2 bodyScale = (pawn.story?.bodyType?.bodyGraphicScale != null ? pawn.story.bodyType.bodyGraphicScale : Vector2.one);
- headBob.z *= bodyScale.x;
-
- lastDrawFrame = RealTime.frameCount;
-
- }
-
- public Vector3 getPawnHeadPosition() {
-
- Vector3 headPos = anchor + deltaPos + Quaternion.AngleAxis(bodyAngle, Vector3.up) * (pawn.Drawer.renderer.BaseHeadOffsetAt(headFacing) + headBob);
-
- return headPos;
-
- }
-
- public Vector3 getPawnHeadOffset()
- {
- return Quaternion.AngleAxis(bodyAngle, Vector3.up) * (pawn.Drawer.renderer.BaseHeadOffsetAt(headFacing) + headBob);
-
- }
-
- public AnimationDef CurrentAnimation {
- get {
- return anim;
- }
- }
-
- public int ActorIndex {
- get {
- return actor;
- }
- }
-
- public override void PostExposeData() {
- base.PostExposeData();
-
- Scribe_Defs.Look(ref anim, "RJWAnimations-Anim");
-
- 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, "RJWAnimations-mirror");
-
- Scribe_Values.Look(ref curStage, "RJWAnimations-curStage", 0);
- Scribe_Values.Look(ref actor, "RJWAnimations-actor");
-
- 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, "RJWAnimations-GenitalAngle");
- Scribe_Values.Look(ref controlGenitalAngle, "RJWAnimations-controlGenitalAngle");
-
- Scribe_Values.Look(ref headFacing, "RJWAnimations-headFacing");
- Scribe_Values.Look(ref headFacing, "RJWAnimations-bodyFacing");
-
- Scribe_Values.Look(ref quiver, "RJWAnimations-orgasmQuiver");
- }
-
- public void shiftActorPositionAndRestartAnimation() {
- actor = (actor == anim.actors.Count - 1 ? 0 : actor + 1);
-
- if (pawn?.story?.bodyType != null) {
- if (pawn.story.bodyType == BodyTypeDefOf.Fat && anim?.actors[actor]?.bodyTypeOffset?.Fat != null) {
- anchor.x += anim.actors[actor].bodyTypeOffset.Fat.Value.x * (mirror ? -1f : 1f);
- anchor.z += anim.actors[actor].bodyTypeOffset.Fat.Value.y;
- }
- else if (pawn.story.bodyType == BodyTypeDefOf.Female && anim?.actors[actor]?.bodyTypeOffset?.Female != null) {
- anchor.x += anim.actors[actor].bodyTypeOffset.Female.Value.x * (mirror ? -1f : 1f);
- anchor.z += anim.actors[actor].bodyTypeOffset.Female.Value.y;
- }
- else if (pawn.story.bodyType == BodyTypeDefOf.Male && anim?.actors[actor]?.bodyTypeOffset?.Male != null) {
- anchor.x += anim.actors[actor].bodyTypeOffset.Male.Value.x * (mirror ? -1f : 1f);
- anchor.z += anim.actors[actor].bodyTypeOffset.Male.Value.y;
- }
- else if (pawn.story.bodyType == BodyTypeDefOf.Thin && anim?.actors[actor]?.bodyTypeOffset?.Thin != null) {
- anchor.x += anim.actors[actor].bodyTypeOffset.Thin.Value.x * (mirror ? -1f : 1f);
- anchor.z += anim.actors[actor].bodyTypeOffset.Thin.Value.y;
- }
- else if (pawn.story.bodyType == BodyTypeDefOf.Hulk && anim?.actors[actor]?.bodyTypeOffset?.Hulk != null) {
- anchor.x += anim.actors[actor].bodyTypeOffset.Hulk.Value.x * (mirror ? -1f : 1f);
- anchor.z += anim.actors[actor].bodyTypeOffset.Hulk.Value.y;
- }
- }
-
- curStage = 0;
- animTicks = 0;
- stageTicks = 0;
- clipTicks = 0;
-
- controlGenitalAngle = anim.actors[actor].controlGenitalAngle;
-
- tickAnim();
- }
-
- public bool LoopNeverending()
- {
- if(pawn?.jobs?.curDriver != null &&
- (pawn.jobs.curDriver is JobDriver_Sex) && (pawn.jobs.curDriver as JobDriver_Sex).neverendingsex ||
- (pawn.jobs.curDriver is JobDriver_SexBaseReciever) && (pawn.jobs.curDriver as JobDriver_Sex).Partner?.jobs?.curDriver != null && ((pawn.jobs.curDriver as JobDriver_Sex).Partner.jobs.curDriver as JobDriver_Sex).neverendingsex)
- {
- return true;
- }
-
- return false;
- }
-
- public void ResetOnLoop()
- {
- curStage = 1;
- animTicks = 0;
- stageTicks = 0;
- clipTicks = 0;
-
- tickAnim();
- }
- }
-}
diff --git a/1.4/Source/Comps/CompProperties_BodyAnimator.cs b/1.4/Source/Comps/CompProperties_BodyAnimator.cs
deleted file mode 100644
index 09df7ce..0000000
--- a/1.4/Source/Comps/CompProperties_BodyAnimator.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-using RimWorld;
-
-namespace Rimworld_Animations {
- public class CompProperties_BodyAnimator : CompProperties
- {
- public CompProperties_BodyAnimator()
- {
- base.compClass = typeof(CompBodyAnimator);
- }
- }
-}
diff --git a/1.4/Source/Comps/CompProperties_ThingAnimator.cs b/1.4/Source/Comps/CompProperties_ThingAnimator.cs
deleted file mode 100644
index 34c67b1..0000000
--- a/1.4/Source/Comps/CompProperties_ThingAnimator.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-
-namespace Rimworld_Animations {
- public class CompProperties_ThingAnimator : CompProperties
- {
-
- public CompProperties_ThingAnimator()
- {
- base.compClass = typeof(CompThingAnimator);
- }
- }
-}
diff --git a/1.4/Source/Comps/CompThingAnimator.cs b/1.4/Source/Comps/CompThingAnimator.cs
deleted file mode 100644
index f5315e4..0000000
--- a/1.4/Source/Comps/CompThingAnimator.cs
+++ /dev/null
@@ -1,245 +0,0 @@
-using RimWorld;
-using rjw;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using Verse;
-
-namespace Rimworld_Animations {
- public class CompThingAnimator : ThingComp
- {
- Vector3 anchor;
-
- Pawn pawn;
-
- public bool isAnimating = false, mirror;
-
- int animTicks = 0, stageTicks = 0, clipTicks = 0, curStage = 0;
- float rotation = 0;
- float clipPercent = 0;
-
- public Vector3 deltaPos;
-
- AnimationDef anim;
- private ThingAnimationClip clip => (ThingAnimationClip)stage.animationClips[1];
- private AnimationStage stage
- {
- get
- {
- return anim.animationStages[curStage];
- }
-
- }
-
- public void StartAnimation(AnimationDef anim, Pawn pawn, bool mirror = false)
- {
- isAnimating = true;
-
- this.anim = anim;
- this.pawn = pawn;
- this.mirror = mirror;
-
- animTicks = 0;
- stageTicks = 0;
- clipTicks = 0;
-
- curStage = 0;
- clipPercent = 0;
-
- tickAnim();
-
- }
-
- public void setAnchor(IntVec3 position)
- {
- anchor = position.ToVector3();
- }
-
- public override void CompTick()
- {
- base.CompTick();
-
- if(isAnimating)
- {
- if (pawn.Dead || pawn?.jobs?.curDriver == null || (pawn?.jobs?.curDriver != null && !(pawn?.jobs?.curDriver is rjw.JobDriver_Sex)))
- {
- isAnimating = false;
- }
- else
- {
- tickAnim();
- }
- }
-
-
- }
-
- public void tickAnim()
- {
- if (!isAnimating) return;
- animTicks++;
-
- if (animTicks < anim.animationTimeTicks)
- {
- tickStage();
- }
- else
- {
- if (LoopNeverending())
- {
- ResetOnLoop();
- }
- else
- {
- isAnimating = false;
- }
-
-
- }
-
- }
-
- public void tickStage()
- {
- if (stage == null)
- {
- isAnimating = false;
- return;
- }
-
- stageTicks++;
-
- if (stageTicks >= stage.playTimeTicks)
- {
-
- curStage++;
-
- stageTicks = 0;
- clipTicks = 0;
- clipPercent = 0;
- }
-
- if (curStage >= anim.animationStages.Count)
- {
- if (LoopNeverending())
- {
- ResetOnLoop();
- }
- else
- {
- isAnimating = false;
- }
-
- }
- else
- {
- tickClip();
- }
- }
-
- public void tickClip()
- {
- clipTicks++;
-
- if (clipPercent >= 1 && stage.isLooping)
- {
- clipTicks = 1;//warning: don't set to zero or else calculations go wrong
- }
- clipPercent = (float)clipTicks / (float)clip.duration;
-
- calculateDrawValues();
- }
-
- public void setAnchor(Thing thing)
- {
-
- //center on bed
- if (thing is Building_Bed)
- {
- anchor = thing.Position.ToVector3();
- if (((Building_Bed)thing).SleepingSlotsCount == 2)
- {
- if (thing.Rotation.AsInt == 0)
- {
- anchor.x += 1;
- anchor.z += 1;
- }
- else if (thing.Rotation.AsInt == 1)
- {
- anchor.x += 1;
- }
- else if (thing.Rotation.AsInt == 3)
- {
- anchor.z += 1;
- }
-
- }
- else
- {
- if (thing.Rotation.AsInt == 0)
- {
- anchor.x += 0.5f;
- anchor.z += 1f;
- }
- else if (thing.Rotation.AsInt == 1)
- {
- anchor.x += 1f;
- anchor.z += 0.5f;
- }
- else if (thing.Rotation.AsInt == 2)
- {
- anchor.x += 0.5f;
- }
- else
- {
- anchor.z += 0.5f;
- }
- }
- }
- else
- {
- anchor = thing.Position.ToVector3Shifted();
- }
-
- anchor -= new Vector3(0.5f, 0, 0.5f);
- }
- private void calculateDrawValues()
- {
-
- //shift up and right 0.5f to align center
- deltaPos = new Vector3((clip.PositionX.Evaluate(clipPercent)) * (mirror ? -1 : 1) + 0.5f, AltitudeLayer.Item.AltitudeFor(), clip.PositionZ.Evaluate(clipPercent) + 0.5f);
- //Log.Message("Clip percent: " + clipPercent + " deltaPos: " + deltaPos);
- rotation = clip.Rotation.Evaluate(clipPercent) * (mirror ? -1 : 1);
- }
-
- public void AnimateThing(Thing thing)
- {
- thing.Graphic.Draw(deltaPos + anchor, mirror ? Rot4.West : Rot4.East, thing, rotation);
- }
-
- public bool LoopNeverending()
- {
- if (pawn?.jobs?.curDriver != null &&
- (pawn.jobs.curDriver is JobDriver_Sex) && (pawn.jobs.curDriver as JobDriver_Sex).neverendingsex)
- {
- return true;
- }
-
- return false;
- }
-
- public void ResetOnLoop()
- {
- curStage = 1;
- animTicks = 0;
- stageTicks = 0;
- clipTicks = 0;
-
- tickAnim();
- }
-
- }
-}
diff --git a/1.4/Source/Defs/AnimationDef.cs b/1.4/Source/Defs/AnimationDef.cs
deleted file mode 100644
index 395ff83..0000000
--- a/1.4/Source/Defs/AnimationDef.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using RimWorld;
-using Verse;
-
-namespace Rimworld_Animations {
- public class AnimationDef : Def
- {
- public List animationStages;
- public List actors;
- public int animationTimeTicks = 0; //do not set manually
- public bool sounds = false;
- public List sexTypes = null;
- public List interactionDefTypes = null;
- public List tags = new List();
-
- public override void PostLoad() {
- base.PostLoad();
- foreach(AnimationStage stage in animationStages) {
- stage.initialize();
- animationTimeTicks += stage.playTimeTicks;
- }
- }
- }
-}
diff --git a/1.4/Source/Extensions/PawnWoundDrawerExtension.cs b/1.4/Source/Extensions/PawnWoundDrawerExtension.cs
deleted file mode 100644
index 417f8ed..0000000
--- a/1.4/Source/Extensions/PawnWoundDrawerExtension.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using RimWorld;
-using UnityEngine;
-using Verse;
-using Rimworld_Animations;
-
-namespace Rimworld_Animations {
-
- [StaticConstructorOnStartup]
- public static class PawnWoundDrawerExtension
- {
- public static void RenderPawnOverlay(this PawnWoundDrawer pawnWoundDrawer, Vector3 drawLoc, Mesh bodyMesh, Quaternion quat, bool drawNow, PawnOverlayDrawer.OverlayLayer layer, Rot4 pawnRot, bool? overApparel = null, Pawn pawn = null, PawnRenderFlags flags = new PawnRenderFlags())
- {
- if (pawn == null)
- { return; }
-
- if (!flags.FlagSet(PawnRenderFlags.Portrait) && layer == PawnOverlayDrawer.OverlayLayer.Head)
- {
- CompBodyAnimator pawnAnimator = pawn.TryGetComp();
- if (pawnAnimator != null && pawnAnimator.isAnimating && pawn.Drawer.renderer.graphics.headGraphic != null)
- {
- pawnRot = pawnAnimator.headFacing;
- quat = Quaternion.AngleAxis(angle: pawnAnimator.headAngle, axis: Vector3.up);
- float y = drawLoc.y;
- drawLoc = pawnAnimator.getPawnHeadPosition() - Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up) * pawn.Drawer.renderer.BaseHeadOffsetAt(pawnAnimator.headFacing);
- drawLoc.y = y;
- }
- }
-
- pawnWoundDrawer.RenderPawnOverlay(drawLoc, bodyMesh, quat, drawNow, layer, pawnRot, overApparel);
- }
- }
-
-}
diff --git a/1.4/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs b/1.4/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs
deleted file mode 100644
index b7fef1d..0000000
--- a/1.4/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-using RimWorld;
-using UnityEngine;
-
-namespace Rimworld_Animations {
- class MainTabWindow_OffsetConfigure : MainTabWindow
- {
-
- public override Vector2 RequestedTabSize => new Vector2(505, 380);
- public override void DoWindowContents(Rect inRect) {
-
- Rect position = new Rect(inRect.x, inRect.y, inRect.width, inRect.height);
-
-
- Listing_Standard listingStandard = new Listing_Standard();
- listingStandard.Begin(position);
-
- listingStandard.Label("Animation Manager");
-
- listingStandard.GapLine();
-
-
- if (Find.Selector.SingleSelectedThing is Pawn) {
-
- Pawn curPawn = Find.Selector.SingleSelectedThing as Pawn;
-
- if (curPawn.TryGetComp().isAnimating) {
-
- AnimationDef def = curPawn.TryGetComp().CurrentAnimation;
- int ActorIndex = curPawn.TryGetComp().ActorIndex;
- float offsetX = 0, offsetZ = 0, rotation = 0;
-
- string bodyTypeDef = (curPawn.story?.bodyType != null) ? curPawn.story.bodyType.ToString() : "";
-
- if (AnimationSettings.offsets.ContainsKey(def.defName + curPawn.def.defName + bodyTypeDef + ActorIndex)) {
- offsetX = AnimationSettings.offsets[def.defName + curPawn.def.defName + bodyTypeDef + ActorIndex].x;
- offsetZ = AnimationSettings.offsets[def.defName + curPawn.def.defName + bodyTypeDef + ActorIndex].y;
- } else {
- AnimationSettings.offsets.Add(def.defName + curPawn.def.defName + bodyTypeDef + ActorIndex, new Vector2(0, 0));
- }
-
- if (AnimationSettings.rotation.ContainsKey(def.defName + curPawn.def.defName + bodyTypeDef + ActorIndex)) {
- rotation = AnimationSettings.rotation[def.defName + curPawn.def.defName + bodyTypeDef + ActorIndex];
- }
- else {
- AnimationSettings.rotation.Add(def.defName + curPawn.def.defName + bodyTypeDef + ActorIndex, 0);
- }
-
- listingStandard.Label("Name: " + curPawn.Name + " Race: " + curPawn.def.defName + " Actor Index: " + curPawn.TryGetComp().ActorIndex + " Body Type (if any): " + bodyTypeDef + " Animation: " + def.label + (curPawn.TryGetComp().Mirror ? " mirrored" : ""));
-
- if(curPawn.def.defName == "Human") {
- listingStandard.Label("Warning--You generally don't want to change human offsets, only alien offsets");
- }
-
- bool mirrored = curPawn.TryGetComp().Mirror;
-
- float.TryParse(listingStandard.TextEntryLabeled("X Offset: ", offsetX.ToString()), out offsetX);
- offsetX = listingStandard.Slider(offsetX, -2 * (mirrored ? -1 : 1), 2 * (mirrored ? -1 : 1));
-
- float.TryParse(listingStandard.TextEntryLabeled("Z Offset: ", offsetZ.ToString()), out offsetZ);
- offsetZ = listingStandard.Slider(offsetZ, -2, 2);
-
- float.TryParse(listingStandard.TextEntryLabeled("Rotation: ", rotation.ToString()), out rotation);
- rotation = listingStandard.Slider(rotation, -180, 180);
-
- if(listingStandard.ButtonText("Reset All")) {
- offsetX = 0;
- offsetZ = 0;
- rotation = 0;
- }
-
- listingStandard.GapLine();
-
- if(listingStandard.ButtonText("Shift Actors")) {
-
- if(AnimationSettings.debugMode) {
- Log.Message("Shifting actors in animation...");
- }
-
- for(int i = 0; i < curPawn.TryGetComp().actorsInCurrentAnimation.Count; i++) {
-
- Pawn actor = curPawn.TryGetComp().actorsInCurrentAnimation[i];
-
- actor.TryGetComp()?.shiftActorPositionAndRestartAnimation();
-
- //reset the clock time of every pawn in animation
- if(actor.jobs.curDriver is rjw.JobDriver_Sex) {
- (actor.jobs.curDriver as rjw.JobDriver_Sex).ticks_left = def.animationTimeTicks;
- (actor.jobs.curDriver as rjw.JobDriver_Sex).ticksLeftThisToil = def.animationTimeTicks;
- (actor.jobs.curDriver as rjw.JobDriver_Sex).duration = def.animationTimeTicks;
- }
-
- }
-
- }
-
- if (offsetX != AnimationSettings.offsets[def.defName + curPawn.def.defName + bodyTypeDef + ActorIndex].x || offsetZ != AnimationSettings.offsets[def.defName + curPawn.def.defName + bodyTypeDef + ActorIndex].y) {
- AnimationSettings.offsets[def.defName + curPawn.def.defName + bodyTypeDef + ActorIndex] = new Vector2(offsetX, offsetZ);
-
- }
-
- if(rotation != AnimationSettings.rotation[def.defName + curPawn.def.defName + bodyTypeDef + ActorIndex]) {
- AnimationSettings.rotation[def.defName + curPawn.def.defName + bodyTypeDef + ActorIndex] = rotation;
- }
-
- }
-
- }
- else {
- listingStandard.Label("Select a pawn currently in an animation to change their offsets");
- }
-
- listingStandard.End();
-
- }
-
- public override void PreOpen() {
- base.PreOpen();
- if(AnimationSettings.offsets == null) {
- if (AnimationSettings.debugMode)
- Log.Message("New offsets");
- AnimationSettings.offsets = new Dictionary();
- }
-
- if(AnimationSettings.rotation == null) {
- if (AnimationSettings.debugMode)
- Log.Message("New rotation");
- AnimationSettings.rotation = new Dictionary();
- }
- }
-
- public override void PostClose() {
- base.PostClose();
-
- LoadedModManager.GetMod().WriteSettings();
- }
- }
-}
diff --git a/1.4/Source/MainTabWindows/OffsetMainButtonDefOf.cs b/1.4/Source/MainTabWindows/OffsetMainButtonDefOf.cs
deleted file mode 100644
index e7ad9eb..0000000
--- a/1.4/Source/MainTabWindows/OffsetMainButtonDefOf.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using RimWorld;
-using Verse;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Rimworld_Animations {
-
- [DefOf]
- public static class OffsetMainButtonDefOf {
-
- public static MainButtonDef OffsetManager;
-
-
- static OffsetMainButtonDefOf() {
- DefOfHelper.EnsureInitializedInCtor(typeof(OffsetMainButtonDefOf));
- }
-
- }
-}
diff --git a/1.4/Source/MainTabWindows/WorldComponent_UpdateMainTab.cs b/1.4/Source/MainTabWindows/WorldComponent_UpdateMainTab.cs
deleted file mode 100644
index 2694419..0000000
--- a/1.4/Source/MainTabWindows/WorldComponent_UpdateMainTab.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using RimWorld;
-using RimWorld.Planet;
-using Verse;
-
-namespace Rimworld_Animations {
- public class WorldComponent_UpdateMainTab : WorldComponent {
-
- public WorldComponent_UpdateMainTab(World world) : base(world) {
-
- }
-
- public override void FinalizeInit() {
- base.FinalizeInit();
- OffsetMainButtonDefOf.OffsetManager.buttonVisible = AnimationSettings.offsetTab;
- }
-
-
- }
-}
diff --git a/1.4/Source/Patches/Harmony_PatchAll.cs b/1.4/Source/Patches/Harmony_PatchAll.cs
deleted file mode 100644
index 1c1d63f..0000000
--- a/1.4/Source/Patches/Harmony_PatchAll.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-using HarmonyLib;
-using System.Reflection;
-
-namespace Rimworld_Animations {
-
- [StaticConstructorOnStartup]
- public static class Harmony_PatchAll {
-
- static Harmony_PatchAll() {
-
- Harmony val = new Harmony("rjwanim");
- val.PatchAll(Assembly.GetExecutingAssembly());
-
- }
- }
-}
diff --git a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs b/1.4/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs
deleted file mode 100644
index 9577b0c..0000000
--- a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs
+++ /dev/null
@@ -1,416 +0,0 @@
-using HarmonyLib;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using Verse;
-using AlienRace;
-
-namespace Rimworld_Animations {
-
-
- [StaticConstructorOnStartup]
- public static class HarmonyPatch_AlienRace
- {
- static HarmonyPatch_AlienRace()
- {
- (new Harmony("rjwanim")).Patch(AccessTools.Method(AccessTools.TypeByName("AlienRace.HarmonyPatches"), "DrawAddons"),
- prefix: new HarmonyMethod(AccessTools.Method(typeof(HarmonyPatch_AlienRace), "Prefix_AnimateHeadAddons")));
- }
-
- /* todo: replace jank prefix with this
- public static void Prefix_DrawAddonsFinalHook(ref Pawn pawn, ref AlienPartGenerator.BodyAddon addon, ref Rot4 rot, ref Graphic graphic, ref Vector3 offsetVector, ref float angle, ref Material mat)
- {
- CompBodyAnimator animator = pawn.TryGetComp();
-
- if (animator == null || !animator.isAnimating)
- {
- return;
- }
-
- if(addon.alignWithHead || addon.drawnInBed)
- {
- rot = animator.headFacing;
- angle = animator.headAngle;
- offsetVector += animator.deltaPos + animator.bodyAngle * animator.headBob;
-
- }
- else
- {
- rot = animator.bodyFacing;
- angle = animator.bodyAngle;
- offsetVector += animator.deltaPos;
- }
-
- }
- */
- public static bool Prefix_AnimateHeadAddons(PawnRenderFlags renderFlags, Vector3 vector, Vector3 headOffset, Pawn pawn, Quaternion quat, Rot4 rotation)
- {
-
- if (renderFlags.FlagSet(PawnRenderFlags.Portrait) || pawn.TryGetComp() == null || !pawn.TryGetComp().isAnimating) return true;
- if (!(pawn.def is ThingDef_AlienRace alienProps) || renderFlags.FlagSet(PawnRenderFlags.Invisible)) return false;
-
- List addons = alienProps.alienRace.generalSettings.alienPartGenerator.bodyAddons;
- AlienPartGenerator.AlienComp comp = pawn.GetComp();
- CompBodyAnimator pawnAnimator = pawn.TryGetComp();
-
- bool flag = renderFlags.FlagSet(PawnRenderFlags.Portrait);
- bool flag2 = renderFlags.FlagSet(PawnRenderFlags.Invisible);
-
- for (int i = 0; i < addons.Count; i++)
- {
- AlienPartGenerator.BodyAddon ba = addons[index: i];
-
- if (!ba.CanDrawAddon(pawn: pawn)) continue;
-
- bool forceDrawForBody = false;
- if (alienProps.defName.Contains("Orassan") && ba.path.ToLower().Contains("tail"))
- {
- forceDrawForBody = true;
- }
- AlienPartGenerator.RotationOffset offset = ba.defaultOffsets.GetOffset((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead ? pawnAnimator.headFacing : pawnAnimator.bodyFacing);
- Vector3 a = (offset != null) ? offset.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, pawn.story.headType) : Vector3.zero;
- AlienPartGenerator.RotationOffset offset2 = ba.offsets.GetOffset((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead ? pawnAnimator.headFacing : pawnAnimator.bodyFacing);
- Vector3 vector2 = a + ((offset2 != null) ? offset2.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, pawn.story.headType) : Vector3.zero);
- vector2.y = (ba.inFrontOfBody ? (0.3f + vector2.y) : (-0.3f - vector2.y));
- float num = ba.angle;
- if (rotation == Rot4.North)
- {
- if (ba.layerInvert)
- {
- vector2.y = 0f - vector2.y;
- }
- num = 0f;
- }
- if (rotation == Rot4.East)
- {
- num = 0f - num;
- vector2.x = 0f - vector2.x;
- }
- Graphic addonGraphic = comp.addonGraphics[i];
-
- addonGraphic.drawSize = ((flag && ba.drawSizePortrait != Vector2.zero) ? ba.drawSizePortrait : ba.drawSize) * (ba.scaleWithPawnDrawsize ? (ba.alignWithHead ? ((flag ? comp.customPortraitHeadDrawSize : comp.customHeadDrawSize) * (ModsConfig.BiotechActive ? (pawn.ageTracker.CurLifeStage.headSizeFactor ?? 1.5f) : 1.5f)) : ((flag ? comp.customPortraitDrawSize : comp.customDrawSize) * (ModsConfig.BiotechActive ? pawn.ageTracker.CurLifeStage.bodySizeFactor : 1f) * 1.5f)) : (Vector2.one * 1.5f));
-
- Vector3 orassanv = Vector3.zero;
- bool orassan = false;
- if ((pawn.def as ThingDef_AlienRace).defName == "Alien_Orassan")
- {
- orassan = true;
-
- if (ba.path.Contains("closed"))
- {
- continue;
- }
-
- if (ba.bodyPart.defName.Contains("ear"))
-
- {
- orassan = true;
-
- orassanv = new Vector3(0, 0, 0.23f);
- if (pawnAnimator.headFacing == Rot4.North)
- {
- orassanv.z -= 0.1f;
- orassanv.y += 1f;
-
- if (ba.bodyPart.defName.Contains("left"))
- {
- orassanv.x += 0.03f;
- }
- else
- {
- orassanv.x -= 0.03f;
- }
-
- }
- else if (pawnAnimator.headFacing == Rot4.East)
- {
- orassanv.x -= 0.1f;
- }
- else if (pawnAnimator.headFacing == Rot4.West)
- {
- orassanv.x = 0.1f;
- }
- else
- {
- orassanv.z -= 0.1f;
- orassanv.y += 1f;
-
- if (ba.bodyPart.defName.Contains("right"))
- {
- //orassanv.x += 0.3f;
- }
- else
- {
- //orassanv.x -= 0.3f;
- }
- }
- orassanv = orassanv.RotatedBy(pawnAnimator.headAngle);
- }
- }
-
-
- if ((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead)
- {
-
- Quaternion addonRotation = Quaternion.AngleAxis(pawnAnimator.headAngle < 0 ? 360 - (360 % pawnAnimator.headAngle) : pawnAnimator.headAngle, Vector3.up);
-
- GenDraw.DrawMeshNowOrLater(mesh: addonGraphic.MeshAt(rot: pawnAnimator.headFacing), loc: vector + orassanv + (ba.alignWithHead && !orassan ? headOffset : headOffset - addonRotation * pawn.Drawer.renderer.BaseHeadOffsetAt(pawnAnimator.headFacing)) + vector2.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: addonRotation)) * 2f * 57.29578f),
- quat: Quaternion.AngleAxis(angle: num, axis: Vector3.up) * addonRotation, mat: addonGraphic.MatAt(rot: pawnAnimator.headFacing), renderFlags.FlagSet(PawnRenderFlags.DrawNow));
-
-
- }
-
- else
- {
- Quaternion addonRotation = Quaternion.AngleAxis(pawnAnimator.bodyAngle, Vector3.up);
- if (AnimationSettings.controlGenitalRotation && pawnAnimator.controlGenitalAngle && ba?.hediffGraphics != null && ba.hediffGraphics.Count != 0 && ba.hediffGraphics[0]?.path != null && (ba.hediffGraphics[0].path.Contains("Penis") || ba.hediffGraphics[0].path.Contains("penis")))
- {
- GenDraw.DrawMeshNowOrLater(mesh: addonGraphic.MeshAt(rot: rotation), loc: vector + (ba.alignWithHead ? headOffset : Vector3.zero) + vector2.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: addonRotation)) * 2f * 57.29578f),
- quat: Quaternion.AngleAxis(angle: pawnAnimator.genitalAngle, axis: Vector3.up), mat: addonGraphic.MatAt(rot: rotation), renderFlags.FlagSet(PawnRenderFlags.DrawNow));
- }
-
- else
- {
- GenDraw.DrawMeshNowOrLater(mesh: addonGraphic.MeshAt(rot: rotation), loc: vector + (ba.alignWithHead ? headOffset : Vector3.zero) + vector2.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: addonRotation)) * 2f * 57.29578f),
- quat: Quaternion.AngleAxis(angle: num, axis: Vector3.up) * addonRotation, mat: addonGraphic.MatAt(rot: rotation), renderFlags.FlagSet(PawnRenderFlags.DrawNow));
- }
-
- }
-
-
- }
-
- return false;
- }
- }
-
- [HarmonyPatch(typeof(PawnGraphicSet), "ResolveApparelGraphics")]
- public static class HarmonyPatch_ResolveApparelGraphics
- {
- public static bool Prefix(ref Pawn ___pawn)
- {
-
- if (___pawn.TryGetComp() != null && ___pawn.TryGetComp().isAnimating)
- {
- return false;
- }
- return true;
- }
- }
-
- /*
-
- [HarmonyPatch(typeof(AlienRace.HarmonyPatches), "DrawAddons")]
- public static class HarmonyPatch_AlienRace {
-
- public static void RenderHeadAddonInAnimation(Mesh mesh, Vector3 loc, Quaternion quat, Material mat, bool drawNow, Graphic graphic, AlienPartGenerator.BodyAddon bodyAddon, Vector3 v, Vector3 headOffset, Pawn pawn, PawnRenderFlags renderFlags, Vector3 vector, Rot4 rotation)
- {
-
- CompBodyAnimator pawnAnimator = pawn.TryGetComp();
- AlienPartGenerator.AlienComp comp = pawn.GetComp();
-
- if (pawnAnimator != null && pawnAnimator.isAnimating)
- {
-
- if((bodyAddon.drawnInBed || bodyAddon.alignWithHead))
- {
-
- AlienPartGenerator.RotationOffset offset = bodyAddon.defaultOffsets.GetOffset(rotation);
- Vector3 a = (offset != null) ? offset.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, comp.crownType) : Vector3.zero;
- AlienPartGenerator.RotationOffset offset2 = bodyAddon.offsets.GetOffset(rotation);
- Vector3 vector2 = a + ((offset2 != null) ? offset2.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, comp.crownType) : Vector3.zero);
- vector2.y = (bodyAddon.inFrontOfBody ? (0.3f + vector2.y) : (-0.3f - vector2.y));
- float num = bodyAddon.angle;
- if (rotation == Rot4.North)
- {
- if (bodyAddon.layerInvert)
- {
- vector2.y = -vector2.y;
- }
- num = 0f;
- }
- if (rotation == Rot4.East)
- {
- num = -num;
- vector2.x = -vector2.x;
- }
-
- vector = vector + Quaternion.AngleAxis(pawnAnimator.bodyAngle, Vector3.up) * pawn.Drawer.renderer.BaseHeadOffsetAt(pawnAnimator.bodyFacing) - pawnAnimator.getPawnHeadOffset(); //convert vector into pseudo body pos for head
- quat = Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up);
- loc = vector + (bodyAddon.alignWithHead ? headOffset : Vector3.zero) + vector2.RotatedBy(Mathf.Acos(Quaternion.Dot(Quaternion.identity, quat)) * 2f * 57.29578f);
- mat = graphic.MatAt(rot: pawnAnimator.headFacing);
- }
- else
- {
-
- AlienPartGenerator.RotationOffset offset = bodyAddon.defaultOffsets.GetOffset(rotation);
- Vector3 a = (offset != null) ? offset.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, comp.crownType) : Vector3.zero;
- AlienPartGenerator.RotationOffset offset2 = bodyAddon.offsets.GetOffset(rotation);
- Vector3 vector2 = a + ((offset2 != null) ? offset2.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, comp.crownType) : Vector3.zero);
- vector2.y = (bodyAddon.inFrontOfBody ? (0.3f + vector2.y) : (-0.3f - vector2.y));
- float num = bodyAddon.angle;
- if (rotation == Rot4.North)
- {
- if (bodyAddon.layerInvert)
- {
- vector2.y = -vector2.y;
- }
- num = 0f;
- }
- if (rotation == Rot4.East)
- {
- num = -num;
- vector2.x = -vector2.x;
- }
- quat = Quaternion.AngleAxis(pawnAnimator.bodyAngle, Vector3.up);
- loc = vector + (bodyAddon.alignWithHead ? headOffset : Vector3.zero) + vector2.RotatedBy(Mathf.Acos(Quaternion.Dot(Quaternion.identity, quat)) * 2f * 57.29578f);
-
- }
-
- }
- GenDraw.DrawMeshNowOrLater(mesh, loc, quat, mat, drawNow);
-
- /*
- if (pawnAnimator != null && !renderFlags.FlagSet(PawnRenderFlags.Portrait) && pawnAnimator.isAnimating && (bodyAddon.drawnInBed || bodyAddon.alignWithHead))
- {
-
-
- if ((pawn.def as ThingDef_AlienRace).defName == "Alien_Orassan")
- {
- orassan = true;
-
- if(bodyAddon.path.Contains("closed"))
- {
- return;
- }
-
- if (bodyAddon.bodyPart.Contains("ear"))
-
- {
- orassan = true;
-
- orassanv = new Vector3(0, 0, 0.23f);
- if (pawnAnimator.headFacing == Rot4.North)
- {
- orassanv.z -= 0.1f;
- orassanv.y += 1f;
-
- if(bodyAddon.bodyPart.Contains("left"))
- {
- orassanv.x += 0.03f;
- } else
- {
- orassanv.x -= 0.03f;
- }
-
- }
- else if (pawnAnimator.headFacing == Rot4.East)
- {
- orassanv.x -= 0.1f;
- }
- else if (pawnAnimator.headFacing == Rot4.West)
- {
- orassanv.x = 0.1f;
- }
- else
- {
- orassanv.z -= 0.1f;
- orassanv.y += 1f;
-
- if (bodyAddon.bodyPart.Contains("right"))
- {
- orassanv.x += 0.05f;
- }
- else
- {
- orassanv.x -= 0.05f;
- }
- }
- orassanv = orassanv.RotatedBy(pawnAnimator.headAngle);
- }
- }
-
-
-
-
-
- GenDraw.DrawMeshNowOrLater(mesh: graphic.MeshAt(rot: headRotInAnimation), loc: loc + orassanv + (bodyAddon.alignWithHead ? headOffset : Vector3.zero),// + v.RotatedBy(Mathf.Acos(Quaternion.Dot(Quaternion.identity, quat)) * 2f * 57.29578f),
- quat: Quaternion.AngleAxis(angle: num, axis: Vector3.up) * headQuatInAnimation, mat: graphic.MatAt(rot: pawnAnimator.headFacing), drawNow: drawNow);;
- }
-
- else
- {
-
- }
-
-
- }
-
-
- public static IEnumerable Transpiler(IEnumerable instructions)
- {
- List ins = instructions.ToList();
- for (int i = 0; i < ins.Count; i++)
- {
-
- Type[] type = new Type[] { typeof(Mesh), typeof(Vector3), typeof(Quaternion), typeof(Material), typeof(bool) };
-
-
- if (ins[i].OperandIs(AccessTools.Method(typeof(GenDraw), "DrawMeshNowOrLater", type)))
- {
-
- yield return new CodeInstruction(OpCodes.Ldloc, (object)7); //graphic
- yield return new CodeInstruction(OpCodes.Ldloc, (object)4); //bodyAddon
- yield return new CodeInstruction(OpCodes.Ldloc, (object)5); //offsetVector/AddonOffset (v)
- yield return new CodeInstruction(OpCodes.Ldarg, (object)2); //headOffset
- yield return new CodeInstruction(OpCodes.Ldarg, (object)3); //pawn
- yield return new CodeInstruction(OpCodes.Ldarg, (object)0); //renderflags
- yield return new CodeInstruction(OpCodes.Ldarg, (object)1); //vector
- yield return new CodeInstruction(OpCodes.Ldarg, (object)5); //rotation
-
- yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(HarmonyPatch_AlienRace), "RenderHeadAddonInAnimation"));
-
- }
-
- else
- {
- yield return ins[i];
- }
- }
- }
-
- public static bool Prefix(PawnRenderFlags renderFlags, ref Vector3 vector, ref Vector3 headOffset, Pawn pawn, ref Quaternion quat, ref Rot4 rotation)
- {
- if(pawn == null)
- {
- return true;
- }
-
- CompBodyAnimator anim = pawn.TryGetComp();
-
- if(anim == null)
- {
- return true;
- }
-
- if (anim != null && !renderFlags.FlagSet(PawnRenderFlags.Portrait) && anim.isAnimating)
- {
- //quat = Quaternion.AngleAxis(anim.bodyAngle, Vector3.up);
- }
-
- return true;
-
- }
- }
-
-
- */
-
-}
-
-
diff --git a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_CSL.cs b/1.4/Source/Patches/OtherModPatches/HarmonyPatch_CSL.cs
deleted file mode 100644
index 8345ede..0000000
--- a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_CSL.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HarmonyLib;
-using rjw;
-using Verse;
-using RimWorld;
-using System.Reflection.Emit;
-using System.Reflection;
-using UnityEngine;
-
-namespace Rimworld_Animations {
- [StaticConstructorOnStartup]
- public static class HarmonyPatch_CSL {
- static HarmonyPatch_CSL() {
- try {
- ((Action)(() => {
- if (LoadedModManager.RunningModsListForReading.Any(x => x.Name == "Children, school and learning")) {
-
- (new Harmony("rjw")).Patch(AccessTools.Method(AccessTools.TypeByName("Children.PawnRenderer_RenderPawnInternal_Patch"), "RenderPawnInternalScaled"),
- prefix: new HarmonyMethod(AccessTools.Method(typeof(HarmonyPatch_CSL), "Prefix_CSL")),
- transpiler: new HarmonyMethod(AccessTools.Method(typeof(HarmonyPatch_CSL), "Transpiler_CSL")));
- }
- }))();
- }
- catch (TypeLoadException ex) {
-
- }
- }
-
- public static void Prefix_CSL(PawnRenderer __instance, Pawn pawn, ref Vector3 rootLoc, ref float angle, bool renderBody, ref Rot4 bodyFacing, ref Rot4 headFacing, RotDrawMode bodyDrawType, bool portrait, bool headStump, bool invisible) {
-
- PawnGraphicSet graphics = __instance.graphics;
- CompBodyAnimator bodyAnim = pawn.TryGetComp();
-
- if (!graphics.AllResolved) {
- graphics.ResolveAllGraphics();
- }
-
-
- if (bodyAnim != null && bodyAnim.isAnimating && !portrait) {
- bodyAnim.tickGraphics(graphics);
- pawn.TryGetComp().animatePawn(ref rootLoc, ref angle, ref bodyFacing, ref headFacing);
-
- }
- }
-
- public static IEnumerable Transpiler_CSL(IEnumerable instructions) {
-
- MethodInfo drawMeshNowOrLater = AccessTools.Method(typeof(GenDraw), "DrawMeshNowOrLater");
- FieldInfo headGraphic = AccessTools.Field(typeof(PawnGraphicSet), "headGraphic");
-
-
- List codes = instructions.ToList();
- bool forHead = true;
- for (int i = 0; i < codes.Count(); i++) {
-
- //Instead of calling drawmeshnoworlater, add pawn to the stack and call my special static method
- if (codes[i].OperandIs(drawMeshNowOrLater) && forHead) {
-
- yield return new CodeInstruction(OpCodes.Ldarg_0);
- yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.DeclaredField(typeof(PawnRenderer), "pawn"));
- yield return new CodeInstruction(OpCodes.Ldarg_2);
- yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(AnimationUtility), nameof(AnimationUtility.RenderPawnHeadMeshInAnimation), new Type[] { typeof(Mesh), typeof(Vector3), typeof(Quaternion), typeof(Material), typeof(bool), typeof(Pawn), typeof(float) }));
-
- }
- //checking for if(graphics.headGraphic != null)
- else if (codes[i].opcode == OpCodes.Ldfld && codes[i].OperandIs(headGraphic)) {
- forHead = true;
- yield return codes[i];
- }
- //checking for if(renderbody)
- else if (codes[i].opcode == OpCodes.Ldarg_3) {
- forHead = false;
- yield return codes[i];
- }
- else {
- yield return codes[i];
- }
- }
- }
-
- }
-}*/
diff --git a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_DontShaveYourHead.cs b/1.4/Source/Patches/OtherModPatches/HarmonyPatch_DontShaveYourHead.cs
deleted file mode 100644
index 3cb2a63..0000000
--- a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_DontShaveYourHead.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using HarmonyLib;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-
-namespace Rimworld_Animations {
- class HarmonyPatch_DontShaveYourHead {
-
- [StaticConstructorOnStartup]
- public static class Patch_DontShaveYourHead {
-
- static Patch_DontShaveYourHead() {
- try {
- ((Action)(() =>
- {
- if (LoadedModManager.RunningModsListForReading.Any(x => x.Name == "Don't Shave Your Head 1.0")) {
- (new Harmony("rjwanim")).Patch(AccessTools.Method(AccessTools.TypeByName("DontShaveYourHead.Harmony_PawnRenderer"), "DrawHairReroute"), //typeof(ShowHair.Patch_PawnRenderer_RenderPawnInternal), nameof(ShowHair.Patch_PawnRenderer_RenderPawnInternal.Postfix)),
- transpiler: new HarmonyMethod(AccessTools.Method(typeof(Patch_ShowHairWithHats), "Transpiler")));
- }
- }))();
- }
- catch (TypeLoadException ex) { }
- }
- }
- }
-}
diff --git a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_FacialAnimation.cs b/1.4/Source/Patches/OtherModPatches/HarmonyPatch_FacialAnimation.cs
deleted file mode 100644
index 83ffd5b..0000000
--- a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_FacialAnimation.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using HarmonyLib;
-using RimWorld;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using Verse;
-
-namespace Rimworld_Animations {
- [StaticConstructorOnStartup]
- public static class Patch_FacialAnimation {
-
- static Patch_FacialAnimation() {
- try {
- ((Action)(() => {
- if (LoadedModManager.RunningModsListForReading.Any(x => x.Name == "[NL] Facial Animation - WIP")) {
- (new Harmony("rjwanim")).Patch(AccessTools.Method(AccessTools.TypeByName("FacialAnimation.DrawFaceGraphicsComp"), "DrawGraphics"),
- prefix: new HarmonyMethod(AccessTools.Method(typeof(Patch_FacialAnimation), "Prefix")));
- }
- }))();
- }
- catch (TypeLoadException ex) {
-
- }
- }
-
- public static bool Prefix(ref Pawn ___pawn, ref Rot4 headFacing, ref Vector3 headOrigin, ref Quaternion quaternion, ref bool portrait) {
-
- CompBodyAnimator bodyAnim = ___pawn.TryGetComp();
-
- if (bodyAnim != null && bodyAnim.isAnimating && !portrait) {
-
- headFacing = bodyAnim.headFacing;
- headOrigin = new Vector3(bodyAnim.getPawnHeadPosition().x, headOrigin.y, bodyAnim.getPawnHeadPosition().z);
- quaternion = Quaternion.AngleAxis(bodyAnim.headAngle, Vector3.up);
- }
-
- return true;
- }
- /*
- public static List rjwLovinDefNames = new List{
- "Lovin",
- "Quickie",
- "GettingQuickie",
- "JoinInBed",
- "JoinInBedAnimation",
- "GettinLovedAnimation",
- "GettinLoved",
- "GettinLicked",
- "GettinSucked",
- "GettinRaped",
- "ViolateCorpse",
- "RJW_Masturbate",
- "GettinBred",
- "Breed",
- "RJW_Mate",
- "Bestiality",
- "BestialityForFemale",
- "StruggleInBondageGear",
- "WhoreIsServingVisitors",
- "UseFM"
- };
-
- public static List rjwRapeDefNames = new List {
- "RapeComfortPawn",
- "RandomRape",
- "RapeEnemy"
- };
-
- public static bool Prefix_IsSameA(JobDef job, string ___jobDef, ref bool __result) {
-
- if(___jobDef != null && ___jobDef == "Lovin" && job?.defName != null && rjwLovinDefNames.Contains(job?.defName)) {
- __result = true;
- return false;
- }
- else if (___jobDef != null && ___jobDef == "Wait_Combat" && job?.defName != null && rjwRapeDefNames.Contains(job?.defName)) {
- __result = true;
- return false;
- }
-
-
- return true;
- }
-
- public static bool Prefix_IsSameB(string jobName, string ___jobDef, ref bool __result) {
-
- if (___jobDef != null && ___jobDef == "Lovin" && jobName != null && rjwLovinDefNames.Contains(jobName)) {
- __result = true;
- return false;
- }
- if (___jobDef != null && ___jobDef == "Wait_Combat" && jobName != null && rjwRapeDefNames.Contains(jobName)) {
- __result = true;
- return false;
- }
-
- return true;
- }
- */
- }
-}
\ No newline at end of file
diff --git a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_HatsDisplaySelection.cs b/1.4/Source/Patches/OtherModPatches/HarmonyPatch_HatsDisplaySelection.cs
deleted file mode 100644
index 1cd5707..0000000
--- a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_HatsDisplaySelection.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-/*using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HarmonyLib;
-using RimWorld;
-using Verse;
-using UnityEngine;
-using System.Reflection;
-using System.Reflection.Emit;
-
-namespace Rimworld_Animations {
- public static class HarmonyPatch_HatsDisplaySelection {
-
- public static void PatchHatsDisplaySelectionArgs() {
- (new Harmony("rjw")).Patch(AccessTools.Method(AccessTools.TypeByName("HatDisplaySelection.Patch"), "DrawHatCEWithHair"),
- transpiler: new HarmonyMethod(AccessTools.Method(typeof(HarmonyPatch_HatsDisplaySelection), "ReplaceDrawMeshOrLaterWithAnimate")));
-
- (new Harmony("rjw")).Patch(AccessTools.Method(AccessTools.TypeByName("HatDisplaySelection.Patch"), "DrawHatWithHair"),
- transpiler: new HarmonyMethod(AccessTools.Method(typeof(HarmonyPatch_HatsDisplaySelection), "ReplaceDrawMeshOrLaterWithAnimate")));
-
- (new Harmony("rjw")).Patch(AccessTools.Method(AccessTools.TypeByName("HatDisplaySelection.Patch"), "DrawHeadApparelWithHair"),
- prefix: new HarmonyMethod(AccessTools.Method(typeof(HarmonyPatch_HatsDisplaySelection), "PrefixPatchForDrawHeadApparelWithHair")));
-
-
- }
-
- public static void PrefixPatchForDrawHeadApparelWithHair(PawnRenderer renderer, ref Vector3 rootLoc, ref float angle, bool renderBody, ref Rot4 bodyFacing, ref Rot4 headFacing, RotDrawMode bodyDrawType, bool portrait, bool headStump, bool invisible)
- {
- PawnGraphicSet graphics = renderer.graphics;
- Pawn pawn = graphics.pawn;
- CompBodyAnimator bodyAnim = pawn.TryGetComp();
-
- if (!graphics.AllResolved)
- {
- graphics.ResolveAllGraphics();
- }
-
-
- if (bodyAnim != null && bodyAnim.isAnimating && !portrait && pawn.Map == Find.CurrentMap)
- {
- bodyAnim.tickGraphics(graphics);
- bodyAnim.animatePawn(ref rootLoc, ref angle, ref bodyFacing, ref headFacing);
-
- }
- }
-
-
- public static IEnumerable ReplaceDrawMeshOrLaterWithAnimate(IEnumerable instructions) {
-
- MethodInfo drawMeshNowOrLater = AccessTools.Method(typeof(GenDraw), "DrawMeshNowOrLater");
- List codes = instructions.ToList();
- for (int i = 0; i < instructions.Count(); i++) {
-
-
- if (codes[i].
-
-
-(drawMeshNowOrLater)) {
-
- yield return new CodeInstruction(OpCodes.Ldarg_0);
- yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.DeclaredField(AccessTools.TypeByName("HatDisplaySelection.Patch"), "pawn"));
- yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(AnimationUtility), nameof(AnimationUtility.RenderPawnHeadMeshInAnimation), new Type[] { typeof(Mesh), typeof(Vector3), typeof(Quaternion), typeof(Material), typeof(bool), typeof(Pawn) }));
-
- }
- else {
- yield return codes[i];
- }
-
- }
-
- }
-
- }
-}
-*/
\ No newline at end of file
diff --git a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_ShowHairWithHats.cs b/1.4/Source/Patches/OtherModPatches/HarmonyPatch_ShowHairWithHats.cs
deleted file mode 100644
index a42ab7d..0000000
--- a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_ShowHairWithHats.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using HarmonyLib;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using Verse;
-
-namespace Rimworld_Animations {
- [StaticConstructorOnStartup]
- public static class Patch_ShowHairWithHats {
-
- static Patch_ShowHairWithHats() {
- try {
- ((Action)(() =>
- {
- if (LoadedModManager.RunningModsListForReading.Any(x => x.Name == "[KV] Show Hair With Hats or Hide All Hats - 1.1")) {
- (new Harmony("rjwanim")).Patch(AccessTools.Method(AccessTools.TypeByName("ShowHair.Patch_PawnRenderer_RenderPawnInternal"), "Postfix"), //typeof(ShowHair.Patch_PawnRenderer_RenderPawnInternal), nameof(ShowHair.Patch_PawnRenderer_RenderPawnInternal.Postfix)),
- transpiler: new HarmonyMethod(AccessTools.Method(typeof(Patch_ShowHairWithHats), "Transpiler")));
- }
- }))();
- }
- catch (TypeLoadException ex) { }
- }
-
-
- public static IEnumerable Transpiler(IEnumerable instructions) {
-
- MethodInfo drawMeshNowOrLater = AccessTools.Method(typeof(GenDraw), "DrawMeshNowOrLater");
-
- List codes = instructions.ToList();
- for (int i = 0; i < codes.Count(); i++) {
-
- //Instead of calling drawmeshnoworlater, add pawn to the stack and call my special static method
- if (codes[i].OperandIs(drawMeshNowOrLater)) {
-
- yield return new CodeInstruction(OpCodes.Ldarg_0);
- yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.DeclaredField(typeof(PawnRenderer), "pawn"));
- yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(AnimationUtility), nameof(AnimationUtility.RenderPawnHeadMeshInAnimation), new Type[] { typeof(Mesh), typeof(Vector3), typeof(Quaternion), typeof(Material), typeof(bool), typeof(Pawn) }));
-
- }
- else {
- yield return codes[i];
- }
- }
- }
- }
-}
diff --git a/1.4/Source/Patches/RJWPatches/HarmonyPatch_PlaySexSounds.cs b/1.4/Source/Patches/RJWPatches/HarmonyPatch_PlaySexSounds.cs
deleted file mode 100644
index 6544f13..0000000
--- a/1.4/Source/Patches/RJWPatches/HarmonyPatch_PlaySexSounds.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using HarmonyLib;
-using rjw;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-
-namespace Rimworld_Animations
-{
- [HarmonyPatch(typeof(JobDriver_Sex), "PlaySexSound")]
- class HarmonyPatch_PlaySexSounds
- {
- public static bool Prefix(JobDriver_Sex __instance)
- {
- if (__instance.pawn.TryGetComp().isAnimating)
- {
- return false;
- }
-
- return true;
- }
- }
-}
diff --git a/1.4/Source/Patches/RJWPatches/HarmonyPatch_SexTick.cs b/1.4/Source/Patches/RJWPatches/HarmonyPatch_SexTick.cs
deleted file mode 100644
index 9ba03b2..0000000
--- a/1.4/Source/Patches/RJWPatches/HarmonyPatch_SexTick.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using HarmonyLib;
-using RimWorld;
-using rjw;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-using Verse.AI;
-
-namespace Rimworld_Animations
-{
- [HarmonyPatch(typeof(JobDriver_Sex), "SexTick")]
- public class HarmonyPatch_SexTick
- {
- public static bool Prefix(JobDriver_Sex __instance, Pawn pawn, Thing target)
- {
-
- if ((target is Pawn) &&
- !(
- (target as Pawn)?.jobs?.curDriver is JobDriver_SexBaseReciever
- &&
- ((target as Pawn).jobs.curDriver as JobDriver_SexBaseReciever).parteners.Any()
- &&
- ((target as Pawn).jobs.curDriver as JobDriver_SexBaseReciever).parteners[0] == pawn))
- {
-
- __instance.ticks_left--;
- __instance.sex_ticks--;
- __instance.Orgasm();
-
-
- if (pawn.IsHashIntervalTick(__instance.ticks_between_thrusts))
- {
- __instance.ChangePsyfocus(pawn, target);
- __instance.Animate(pawn, target);
- __instance.PlaySexSound();
- if (!__instance.Sexprops.isRape)
- {
- pawn.GainComfortFromCellIfPossible(false);
- if (target is Pawn)
- {
- (target as Pawn).GainComfortFromCellIfPossible(false);
- }
- }
- if(!__instance.isEndytophile)
- {
- SexUtility.DrawNude(pawn, false);
- }
- }
-
- return false;
- }
-
- return true;
- }
-
- }
-
-}
diff --git a/1.4/Source/Patches/RJWPatches/HarmonyPatch_WorkGiverSex.cs b/1.4/Source/Patches/RJWPatches/HarmonyPatch_WorkGiverSex.cs
deleted file mode 100644
index af4a755..0000000
--- a/1.4/Source/Patches/RJWPatches/HarmonyPatch_WorkGiverSex.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using rjw;
-using HarmonyLib;
-using Verse;
-using RimWorld;
-using Verse.AI;
-
-namespace Rimworld_Animations {
- /*
- [HarmonyPatch(typeof(WorkGiver_Sex), "JobOnThing")]
- public static class HarmonyPatch_WorkGiverSex {
-
- public static bool Prefix(ref Job __result, ref Thing t) {
-
- Building_Bed bed = RestUtility.CurrentBed(t as Pawn);
- if (bed == null) {
- return false;
- }
- __result = JobMaker.MakeJob(DefDatabase.GetNamed("JoinInBedAnimation", true), t as Pawn, bed);
- return false;
-
- }
-
- }
-
- */
-}
diff --git a/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_JoinInBed.cs b/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_JoinInBed.cs
deleted file mode 100644
index 18c955e..0000000
--- a/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_JoinInBed.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HarmonyLib;
-using RimWorld;
-using Verse;
-using rjw;
-using System.Reflection.Emit;
-using Verse.AI;
-
-namespace Rimworld_Animations
-{
-
- [HarmonyPatch(typeof(Bed_Utility), "in_same_bed")]
- public static class HarmonyPatch_JobDriver_InSameBedPatch
- {
-
- public static bool Prefix(Pawn partner, ref bool __result)
- {
-
- if(partner != null && partner.CurJobDef == xxx.casual_sex)
- {
- __result = true;
- return false;
- }
-
- return true;
-
- }
-
-
-
- }
-
- [HarmonyPatch(typeof(JobDriver_JoinInBed), "MakeNewToils")]
- public static class HarmonyPatch_JobDriver_JoinInBed
- {
-
- public static void Postfix(JobDriver_JoinInBed __instance, ref IEnumerable __result)
- {
-
- var toils = __result.ToList();
-
- Toil goToPawnInBed = Toils_Goto.GotoThing(__instance.iTarget, PathEndMode.OnCell);
- goToPawnInBed.FailOn(() => !RestUtility.InBed(__instance.Partner) && __instance.Partner.CurJobDef != xxx.gettin_loved && !Bed_Utility.in_same_bed(__instance.Partner, __instance.pawn));
-
- toils[1] = goToPawnInBed;
-
-
- Toil startPartnerSex = new Toil();
- startPartnerSex.initAction = delegate {
-
-
- if (!(__instance.Partner.jobs.curDriver is JobDriver_SexBaseReciever)) // allows threesomes
- {
- Job gettinLovedJob = JobMaker.MakeJob(xxx.gettin_loved, __instance.pawn, __instance.Bed); // new gettin loved toil that wakes up the pawn goes here
- __instance.Partner.jobs.jobQueue.EnqueueFirst(gettinLovedJob);
- __instance.Partner.jobs.EndCurrentJob(JobCondition.InterruptForced);
- }
-
- };
-
- toils[2] = startPartnerSex;
-
- toils[3].AddPreTickAction(() =>
- {
- if (!__instance.Partner.TryGetComp().isAnimating)
- {
- __instance.pawn.TryGetComp().isAnimating = false;
- }
- });
-
-
- __result = toils.AsEnumerable();
-
-
- }
-
-
-
- }
-}
diff --git a/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs
deleted file mode 100644
index 260d924..0000000
--- a/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HarmonyLib;
-using RimWorld;
-using Verse;
-using rjw;
-
-namespace Rimworld_Animations {
-
- [HarmonyPatch(typeof(JobDriver_SexBaseInitiator), "Start")]
- static class HarmonyPatch_JobDriver_SexBaseInitiator_Start {
- public static void Postfix(ref JobDriver_SexBaseInitiator __instance) {
- /*
- These particular jobs need special code
- don't play anim for now
- */
- if(__instance is JobDriver_Masturbate || __instance is JobDriver_ViolateCorpse) {
- return;
- }
-
- if(!AnimationSettings.PlayAnimForNonsexualActs && NonSexualAct(__instance))
- {
- return;
- }
-
- Pawn pawn = __instance.pawn;
-
- Building_Bed bed = __instance.Bed;
-
- if ((__instance.Target as Pawn)?.jobs?.curDriver is JobDriver_SexBaseReciever) {
-
- Pawn Target = __instance.Target as Pawn;
-
- bool quickie = (__instance is JobDriver_SexQuick) && AnimationSettings.fastAnimForQuickie;
-
- int preAnimDuration = __instance.duration;
- int AnimationTimeTicks = 0;
-
-
- if (bed != null) {
- RerollAnimations(Target, out AnimationTimeTicks, bed as Thing, __instance.Sexprops.sexType, quickie, sexProps: __instance.Sexprops);
- }
- else {
- RerollAnimations(Target, out AnimationTimeTicks, sexType: __instance.Sexprops.sexType, fastAnimForQuickie: quickie, sexProps: __instance.Sexprops);
- }
-
-
- //Modify Orgasm ticks to only orgasm as many times as RJW stock orgasm allows
- if(AnimationTimeTicks != 0)
- {
- __instance.orgasmstick = preAnimDuration * __instance.orgasmstick / AnimationTimeTicks;
- }
-
-
- }
- }
-
- public static void RerollAnimations(Pawn pawn, out int AnimationTimeTicks, Thing bed = null, xxx.rjwSextype sexType = xxx.rjwSextype.None, bool fastAnimForQuickie = false, rjw.SexProps sexProps = null) {
-
- AnimationTimeTicks = 0;
-
- if(pawn == null || !(pawn.jobs?.curDriver is JobDriver_SexBaseReciever)) {
- Log.Error("Error: Tried to reroll animations when pawn isn't sexing");
- return;
- }
-
- List pawnsToAnimate = (pawn.jobs.curDriver as JobDriver_SexBaseReciever).parteners.ToList();
-
- if (!pawnsToAnimate.Contains(pawn)) {
- pawnsToAnimate = pawnsToAnimate.Append(pawn).ToList();
- }
-
- for(int i = 0; i < pawnsToAnimate.Count; i++) {
-
- if(pawnsToAnimate[i].TryGetComp() == null) {
- Log.Error("Error: " + pawnsToAnimate[i].Name + " of race " + pawnsToAnimate[i].def.defName + " does not have CompBodyAnimator attached!");
- break;
- }
- }
-
- AnimationDef anim = AnimationUtility.tryFindAnimation(ref pawnsToAnimate, sexType, sexProps);
-
- if (anim != null) {
-
- bool mirror = GenTicks.TicksGame % 2 == 0;
-
- IntVec3 pos = pawn.Position;
-
- for (int i = 0; i < anim.actors.Count; i++)
- {
- pawnsToAnimate[i].TryGetComp().isAnimating = false;
- }
-
- for (int i = 0; i < pawnsToAnimate.Count; i++) {
-
- if (bed != null)
- pawnsToAnimate[i].TryGetComp().setAnchor(bed);
- else {
-
- pawnsToAnimate[i].TryGetComp().setAnchor(pos);
- }
-
- bool shiver = pawnsToAnimate[i].jobs.curDriver is JobDriver_SexBaseRecieverRaped;
- pawnsToAnimate[i].TryGetComp().StartAnimation(anim, pawnsToAnimate, i, mirror, shiver, fastAnimForQuickie);
-
- int animTicks = anim.animationTimeTicks - (fastAnimForQuickie ? anim.animationStages[0].playTimeTicks : 0);
- (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticks_left = animTicks;
- (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).sex_ticks = animTicks;
- (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).duration = animTicks;
-
-
- AnimationTimeTicks = animTicks;
-
- if(!AnimationSettings.hearts) {
- (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticks_between_hearts = Int32.MaxValue;
- }
-
- }
- }
- else {
- Log.Message("No animation found");
-
- /*
-
- //if pawn isn't already animating,
- if (!pawn.TryGetComp().isAnimating) {
- (pawn.jobs.curDriver as JobDriver_SexBaseReciever).increase_time(duration);
- //they'll just do the thrusting anim
- }
-
- */
- }
- }
-
-
- static IEnumerable NonSexActRulePackDefNames = new String[]
- {
- "MutualHandholdingRP",
- "MutualMakeoutRP",
- };
-
- public static bool NonSexualAct(JobDriver_SexBaseInitiator sexBaseInitiator)
- {
- if(NonSexActRulePackDefNames.Contains(sexBaseInitiator.Sexprops.rulePack))
- {
- return true;
- }
- return false;
- }
- }
-
- [HarmonyPatch(typeof(JobDriver_SexBaseInitiator), "End")]
- static class HarmonyPatch_JobDriver_SexBaseInitiator_End {
-
- public static void Postfix(ref JobDriver_SexBaseInitiator __instance) {
-
- if ((__instance.Target as Pawn)?.jobs?.curDriver is JobDriver_SexBaseReciever) {
- if (__instance.pawn.TryGetComp().isAnimating) {
-
- List parteners = ((__instance.Target as Pawn)?.jobs.curDriver as JobDriver_SexBaseReciever).parteners;
-
- for (int i = 0; i < parteners.Count; i++) {
-
- //prevents pawns who started a new anim from stopping their new anim
- if (!((parteners[i].jobs.curDriver as JobDriver_SexBaseInitiator) != null && (parteners[i].jobs.curDriver as JobDriver_SexBaseInitiator).Target != __instance.pawn))
- parteners[i].TryGetComp().isAnimating = false;
-
- }
-
- __instance.Target.TryGetComp().isAnimating = false;
-
- if (xxx.is_human((__instance.Target as Pawn))) {
- (__instance.Target as Pawn)?.Drawer.renderer.graphics.ResolveApparelGraphics();
- PortraitsCache.SetDirty((__instance.Target as Pawn));
- }
- }
-
- ((__instance.Target as Pawn)?.jobs.curDriver as JobDriver_SexBaseReciever).parteners.Remove(__instance.pawn);
-
- }
-
- if (xxx.is_human(__instance.pawn)) {
- __instance.pawn.Drawer.renderer.graphics.ResolveApparelGraphics();
- PortraitsCache.SetDirty(__instance.pawn);
- }
- }
- }
-}
diff --git a/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseReceiverLoved.cs b/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseReceiverLoved.cs
deleted file mode 100644
index dfa116e..0000000
--- a/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseReceiverLoved.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HarmonyLib;
-using RimWorld;
-using Verse;
-using rjw;
-using System.Reflection.Emit;
-using Verse.AI;
-
-namespace Rimworld_Animations
-{
-
- [HarmonyPatch(typeof(JobDriver_SexBaseRecieverLoved), "MakeSexToil")]
- public static class HarmonyPatch_JobDriver_SexBaseReceiverLoved
- {
- public static IEnumerable Transpiler(IEnumerable codeInstructions)
- {
-
- var ins = codeInstructions.ToList();
- for(int i = 0; i < ins.Count; i++)
- {
- if(i < ins.Count && ins[i].opcode == OpCodes.Call && ins[i].OperandIs(AccessTools.DeclaredMethod(typeof(Toils_LayDown), "LayDown"))) {
-
- ins[i].operand = AccessTools.DeclaredMethod(typeof(HarmonyPatch_JobDriver_SexBaseReceiverLoved), "DoNotLayDown");
- yield return ins[i];
-
- }
-
- else
- {
- yield return ins[i];
- }
- }
-
- }
-
- public static Toil DoNotLayDown(TargetIndex bedOrRestSpotIndex, bool hasBed, bool lookForOtherJobs, bool canSleep = true, bool gainRestAndHealth = true, PawnPosture noBedLayingPosture = PawnPosture.LayingMask, bool deathrest = false)
- {
- return new Toil();
- }
-
- }
-}
diff --git a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_HeadHair.cs b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_HeadHair.cs
deleted file mode 100644
index 37ba6ce..0000000
--- a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_HeadHair.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using HarmonyLib;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-using RimWorld;
-using UnityEngine;
-
-namespace Rimworld_Animations
-{
- [HarmonyPatch(typeof(PawnRenderer), "DrawHeadHair")]
- public static class HarmonyPatch_HeadHair
- {
- public static void Prefix(ref Vector3 headOffset, ref float angle)
- {
-
- }
-
- }
-}
diff --git a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderer.cs b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderer.cs
deleted file mode 100644
index b7ff70d..0000000
--- a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderer.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using HarmonyLib;
-using RimWorld;
-using Verse;
-using UnityEngine;
-using System.Reflection;
-using System.Reflection.Emit;
-
-namespace Rimworld_Animations {
-
- [HarmonyPatch(typeof(PawnRenderer), "RenderPawnInternal", new Type[]
- {
- typeof(Vector3),
- typeof(float),
- typeof(bool),
- typeof(Rot4),
- typeof(RotDrawMode),
- typeof(PawnRenderFlags)
- }
- )]
- public static class HarmonyPatch_PawnRenderer
- {
-
- [HarmonyBefore(new string[] { "showhair.kv.rw", "erdelf.HumanoidAlienRaces", "Nals.FacialAnimation" })]
- public static void Prefix(PawnRenderer __instance, ref Vector3 rootLoc, ref float angle, bool renderBody, ref Rot4 bodyFacing, RotDrawMode bodyDrawType, PawnRenderFlags flags)
- {
-
- if (flags.FlagSet(PawnRenderFlags.Portrait)) return;
-
- PawnGraphicSet graphics = __instance.graphics;
- Pawn pawn = graphics.pawn;
- CompBodyAnimator bodyAnim = pawn.TryGetComp();
-
-
- if (bodyAnim != null && bodyAnim.isAnimating && pawn.Map == Find.CurrentMap)
- {
- bodyAnim.animatePawnBody(ref rootLoc, ref angle, ref bodyFacing);
-
- }
-
- }
-
- public static IEnumerable Transpiler(IEnumerable instructions)
- {
- List ins = instructions.ToList();
-
- for(int i = 0; i < instructions.Count(); i++)
- {
-
- if (i - 3 >= 0 && ins[i - 3].opcode == OpCodes.Call && ins[i - 3].operand != null && ins[i - 3].OperandIs(AccessTools.DeclaredMethod(typeof(PawnRenderer), "BaseHeadOffsetAt")))
- {
-
- yield return new CodeInstruction(OpCodes.Ldloca, (object)0);
- yield return new CodeInstruction(OpCodes.Ldloca, (object)9);
- yield return new CodeInstruction(OpCodes.Ldloca, (object)8);
- yield return new CodeInstruction(OpCodes.Ldarga, (object)2);
- yield return new CodeInstruction(OpCodes.Ldarg_0);
- yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.DeclaredField(typeof(PawnRenderer), "pawn"));
- yield return new CodeInstruction(OpCodes.Ldarg, (object)6);
- yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(AnimationUtility), "AdjustHead"));
- yield return ins[i];
- //headFacing equals true
- }
- // Fixes the offsets for eye implants and wounds on the head during animations
- else if (ins[i].opcode == OpCodes.Callvirt && ins[i].operand != null && ins[i].OperandIs(AccessTools.DeclaredMethod(typeof(PawnOverlayDrawer), "RenderPawnOverlay")))
- {
- // Pass some additional info to a new overload of RenderOverBody
- yield return new CodeInstruction(OpCodes.Ldarg_0);
- yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.DeclaredField(typeof(PawnRenderer), "pawn"));
- yield return new CodeInstruction(OpCodes.Ldarg_S, (object)6); // renderer flags
- yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(PawnWoundDrawerExtension), "RenderPawnOverlay"));
- }
- else
- {
- yield return ins[i];
- }
- }
- }
- }
-}
diff --git a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_PawnRotation.cs b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_PawnRotation.cs
deleted file mode 100644
index 7ec75a1..0000000
--- a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_PawnRotation.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using HarmonyLib;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-
-namespace Rimworld_Animations {
- [HarmonyPatch(typeof(Thing), "Rotation", MethodType.Getter)]
- public static class HarmonyPatch_PawnRotation {
-
- public static bool Prefix(Thing __instance, ref Rot4 __result) {
-
- if(!(__instance is Pawn) || (__instance as Pawn)?.TryGetComp() == null || !(__instance as Pawn).TryGetComp().isAnimating) {
- return true;
- }
-
- Pawn pawn = (__instance as Pawn);
- __result = pawn.TryGetComp().bodyFacing;
-
- return false;
-
-
- }
-
- }
-
-}
diff --git a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_Pawn_DrawTracker.cs b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_Pawn_DrawTracker.cs
deleted file mode 100644
index 5cdcfce..0000000
--- a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_Pawn_DrawTracker.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using HarmonyLib;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using Verse;
-
-namespace Rimworld_Animations {
-
- [HarmonyPatch(typeof(Pawn_DrawTracker), "DrawPos", MethodType.Getter)]
- public static class HarmonyPatch_Pawn_DrawTracker {
- public static bool Prefix(ref Pawn ___pawn, ref Vector3 __result) {
-
- CompBodyAnimator bodyAnim = ___pawn.TryGetComp();
-
- if (bodyAnim != null && bodyAnim.isAnimating) {
- __result = ___pawn.TryGetComp().anchor + ___pawn.TryGetComp().deltaPos;
-
- return false;
- }
- return true;
- }
- }
-}
diff --git a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_SetPawnAnimatable.cs b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_SetPawnAnimatable.cs
deleted file mode 100644
index b8c66b8..0000000
--- a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_SetPawnAnimatable.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using HarmonyLib;
-using RimWorld;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection.Emit;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using Verse;
-
-namespace Rimworld_Animations
-{
- [HarmonyPatch(typeof(PawnRenderer), "RenderPawnAt")]
- public static class PawnRenderer_RenderPawnAt_Patch
- {
- static bool ClearCache(Pawn pawn)
- {
- return pawn.IsInvisible() || (pawn.TryGetComp() != null && pawn.TryGetComp().isAnimating);
- }
-
- public static IEnumerable Transpiler(IEnumerable instructions)
- {
- var list = instructions.ToList();
-
- foreach (CodeInstruction i in instructions)
- {
- if (i.OperandIs(AccessTools.Method(typeof(PawnUtility), "IsInvisible")))
- {
- yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(PawnRenderer_RenderPawnAt_Patch), "ClearCache"));
- }
- else
- {
- yield return i;
- }
- }
- }
- }
-
-}
diff --git a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_Thing.cs b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_Thing.cs
deleted file mode 100644
index 9477abf..0000000
--- a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_Thing.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HarmonyLib;
-using RimWorld;
-using Verse;
-
-namespace Rimworld_Animations
-{
- [HarmonyPatch(typeof(Thing), "DrawAt")]
- public static class HarmonyPatch_Thing
- {
-
- public static bool Prefix(Thing __instance)
- {
- CompThingAnimator thingAnimator = __instance.TryGetComp();
- if (thingAnimator != null && thingAnimator.isAnimating)
- {
- thingAnimator.AnimateThing(__instance);
- return false;
-
- }
-
- return true;
-
- }
-
- }
-}
diff --git a/1.4/Source/Settings/AnimationSettings.cs b/1.4/Source/Settings/AnimationSettings.cs
deleted file mode 100644
index 0a96621..0000000
--- a/1.4/Source/Settings/AnimationSettings.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-using UnityEngine;
-using RimWorld;
-
-namespace Rimworld_Animations {
-
- public class AnimationSettings : ModSettings {
-
- public static bool orgasmQuiver, rapeShiver, soundOverride = true, hearts = true, controlGenitalRotation = false, applySemenOnAnimationOrgasm = false, fastAnimForQuickie = false,
- PlayAnimForNonsexualActs = true;
- public static bool offsetTab = false, debugMode = false;
- public static float shiverIntensity = 2f;
-
- public static Dictionary offsets = new Dictionary();
- public static Dictionary rotation = new Dictionary();
-
- public override void ExposeData() {
-
- base.ExposeData();
-
- 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 PlayAnimForNonsexualActs, "RJWAnims-PlayAnimForNonsexualActs");
- 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, "RJWAnimations-animationOffsets");
- Scribe_Collections.Look(ref rotation, "RJWAnimations-rotationOffsets");
-
-
-
- //needs to be rewritten
- //probably somewhere in options?
-
- }
-
- }
-
- public class RJW_Animations : Mod {
-
- public RJW_Animations(ModContentPack content) : base(content) {
- GetSettings();
-
- }
-
- public override void DoSettingsWindowContents(Rect inRect) {
-
- Listing_Standard listingStandard = new Listing_Standard();
- listingStandard.Begin(inRect);
-
- listingStandard.CheckboxLabeled("Enable Sound Override", ref AnimationSettings.soundOverride);
- listingStandard.CheckboxLabeled("Control Genital Rotation", ref AnimationSettings.controlGenitalRotation);
- listingStandard.CheckboxLabeled("Play Fast Animation for Quickie", ref AnimationSettings.fastAnimForQuickie);
- listingStandard.CheckboxLabeled("Apply Semen on Animation Orgasm", ref AnimationSettings.applySemenOnAnimationOrgasm);
-
- if(AnimationSettings.applySemenOnAnimationOrgasm) {
- listingStandard.Label("Recommended--turn down \"Cum on body percent\" in RJW settings to about 33%");
- }
-
- listingStandard.CheckboxLabeled("Enable Orgasm Quiver", ref AnimationSettings.orgasmQuiver);
- listingStandard.CheckboxLabeled("Enable Rape Shiver", ref AnimationSettings.rapeShiver);
- listingStandard.CheckboxLabeled("Enable hearts during lovin'", ref AnimationSettings.hearts);
- listingStandard.CheckboxLabeled("Play animation for nonsexual acts (handholding, makeout)", ref AnimationSettings.PlayAnimForNonsexualActs);
- listingStandard.CheckboxLabeled("Enable Animation Manager Tab", ref AnimationSettings.offsetTab);
-
- listingStandard.Label("Shiver/Quiver Intensity (default 2): " + AnimationSettings.shiverIntensity);
- AnimationSettings.shiverIntensity = listingStandard.Slider(AnimationSettings.shiverIntensity, 0.0f, 12f);
-
- listingStandard.CheckboxLabeled("Debug Mode", ref AnimationSettings.debugMode);
-
-
- listingStandard.End();
- base.DoSettingsWindowContents(inRect);
- }
-
- public override void WriteSettings() {
- base.WriteSettings();
- OffsetMainButtonDefOf.OffsetManager.buttonVisible = AnimationSettings.offsetTab;
-
- }
-
- public override string SettingsCategory() {
- return "RJW Animation Settings";
- }
- }
-}
diff --git a/1.4/Source/Utilities/AnimationUtility.cs b/1.4/Source/Utilities/AnimationUtility.cs
deleted file mode 100644
index a75fc32..0000000
--- a/1.4/Source/Utilities/AnimationUtility.cs
+++ /dev/null
@@ -1,319 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using RimWorld;
-using rjw.Modules.Interactions.Helpers;
-using rjw.Modules.Interactions.Objects;
-using UnityEngine;
-using Verse;
-using Verse.AI;
-using rjw.Modules.Interactions.Enums;
-
-namespace Rimworld_Animations {
- public static class AnimationUtility {
- /*
- Note: always make the list in this order:
- Female pawns, animal female pawns, male pawns, animal male pawns
- */
- public static AnimationDef tryFindAnimation(ref List participants, rjw.xxx.rjwSextype sexType = 0, rjw.SexProps sexProps = null) {
-
-
- InteractionWithExtension interaction = InteractionHelper.GetWithExtension(sexProps.dictionaryKey);
-
-
- if(interaction.HasInteractionTag(InteractionTag.Reverse))
- {
- Pawn buffer = participants[1];
- participants[1] = participants[0];
- participants[0] = buffer;
- }
-
- participants =
- participants.OrderBy(p => p.jobs.curDriver is rjw.JobDriver_SexBaseInitiator)
- .OrderBy(p => rjw.xxx.can_fuck(p))
- .ToList();
-
-
- List localParticipants = new List(participants);
-
- IEnumerable options = DefDatabase.AllDefs.Where((AnimationDef x) => {
-
-
- if (x.actors.Count != localParticipants.Count) {
- return false;
- }
- for (int i = 0; i < x.actors.Count; i++) {
-
- if (rjw.RJWPreferenceSettings.Malesex == rjw.RJWPreferenceSettings.AllowedSex.Nohomo) {
- if (rjw.xxx.is_male(localParticipants[i]) && x.actors[i].isFucked) {
- return false;
- }
- }
- if (x.actors[i].requiredGender != null && !x.actors[i].requiredGender.Contains(localParticipants[i].gender.ToStringSafe()))
- {
- if (AnimationSettings.debugMode)
- {
- Log.Message(string.Concat(new string[]
- {
- x.defName.ToStringSafe(),
- " not selected -- ",
- localParticipants[i].def.defName.ToStringSafe(),
- " ",
- localParticipants[i].Name.ToStringSafe(),
- " does not match required gender"
- }));
- }
- return false;
- }
- if ((x.actors[i].blacklistedRaces != null) && x.actors[i].blacklistedRaces.Contains(localParticipants[i].def.defName)) {
- if(AnimationSettings.debugMode)
- Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " is blacklisted");
- return false;
- }
-
- if(x.actors[i].defNames.Contains("Human")) {
- if (!rjw.xxx.is_human(localParticipants[i])) {
- if (AnimationSettings.debugMode)
- Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " is not human");
-
- return false;
- }
-
- }
- else if (!x.actors[i].bodyDefTypes.Contains(localParticipants[i].RaceProps.body)) {
-
- if (!x.actors[i].defNames.Contains(localParticipants[i].def.defName)) {
-
- if (rjw.RJWSettings.DevMode) {
- string animInfo = x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " is not ";
- foreach(String defname in x.actors[i].defNames) {
- animInfo += defname + ", ";
- }
- if (AnimationSettings.debugMode)
- Log.Message(animInfo);
- }
-
- return false;
- }
- }
- //genitals checking
-
- if(!GenitalCheckForPawn(x.actors[i].requiredGenitals, localParticipants[i], out string failReason)) {
- Debug.Log("Didn't select " + x.defName + ", " + localParticipants[i].Name + " " + failReason);
- return false;
- }
-
- //TESTING ANIMATIONS ONLY REMEMBER TO COMMENT OUT BEFORE PUSH
- /*
- if (x.defName != "Cunnilingus")
- return false;
- */
-
-
- if (x.actors[i].isFucking && !rjw.xxx.can_fuck(localParticipants[i])) {
- if (AnimationSettings.debugMode)
- Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " can't fuck");
- return false;
- }
-
- if (x.actors[i].isFucked && !rjw.xxx.can_be_fucked(localParticipants[i])) {
- if (AnimationSettings.debugMode)
- Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " can't be fucked");
- return false;
- }
- }
- return true;
- });
- List optionsWithInteractionType = options.ToList().FindAll(x => x.interactionDefTypes != null && x.interactionDefTypes.Contains(sexProps.sexType.ToStringSafe()));
- if (optionsWithInteractionType.Any()) {
- if (AnimationSettings.debugMode)
- Log.Message("Selecting animation for interaction type " + sexProps.sexType.ToStringSafe() + "...");
- return optionsWithInteractionType.RandomElement();
- }
- List optionsWithSexType = options.ToList().FindAll(x => x.sexTypes != null && x.sexTypes.Contains(sexType));
- if (optionsWithSexType.Any()) {
- if (AnimationSettings.debugMode)
- Log.Message("Selecting animation for rjwSexType " + sexType.ToStringSafe() + "...");
- return optionsWithSexType.RandomElement();
- }
-
- /*
- if(optionsWithInitiator.Any()) {
- if (AnimationSettings.debugMode)
- Log.Message("Selecting animation for initiators...");
- }
- */
-
- if (options != null && options.Any()) {
- if (AnimationSettings.debugMode)
- Log.Message("Randomly selecting animation...");
- return options.RandomElement();
- }
- else
- return null;
- }
-
- public static void RenderPawnHeadMeshInAnimation1(Mesh mesh, Vector3 loc, Quaternion quaternion, Material material, bool drawNow, Pawn pawn) {
-
- if (pawn == null || pawn.Map != Find.CurrentMap) {
- GenDraw.DrawMeshNowOrLater(mesh, loc, quaternion, material, drawNow);
- return;
- }
-
- CompBodyAnimator pawnAnimator = pawn.TryGetComp();
-
- if (pawnAnimator == null || !pawnAnimator.isAnimating) {
- GenDraw.DrawMeshNowOrLater(mesh, loc, quaternion, material, drawNow);
- } else {
- Vector3 pawnHeadPosition = pawnAnimator.getPawnHeadPosition();
- pawnHeadPosition.y = loc.y;
- GenDraw.DrawMeshNowOrLater(MeshPool.humanlikeHeadSet.MeshAt(pawnAnimator.headFacing), pawnHeadPosition, Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up), material, true);
- }
- }
-
- public static void AdjustHead(ref Quaternion quat, ref Rot4 bodyFacing, ref Vector3 pos, ref float angle, Pawn pawn, PawnRenderFlags flags)
- {
- if (flags.FlagSet(PawnRenderFlags.Portrait)) return;
-
- CompBodyAnimator anim = pawn.TryGetComp();
- if (anim.isAnimating)
- {
- bodyFacing = anim.headFacing;
- angle = anim.headAngle;
- quat = Quaternion.AngleAxis(anim.headAngle, Vector3.up);
- pos = anim.getPawnHeadOffset();
-
- }
- }
-
- public static void RenderPawnHeadMeshInAnimation(Mesh mesh, Vector3 loc, Quaternion quaternion, Material material, bool portrait, Pawn pawn, float bodySizeFactor = 1) {
-
- if (pawn == null) {
- GenDraw.DrawMeshNowOrLater(mesh, loc, quaternion, material, portrait);
- return;
- }
-
- CompBodyAnimator pawnAnimator = pawn.TryGetComp();
-
- if (pawnAnimator == null || !pawnAnimator.isAnimating || portrait) {
- GenDraw.DrawMeshNowOrLater(mesh, loc, quaternion, material, portrait);
- }
- else {
- Vector3 pawnHeadPosition = pawnAnimator.getPawnHeadPosition();
- pawnHeadPosition.x *= bodySizeFactor;
- pawnHeadPosition.x *= bodySizeFactor;
- pawnHeadPosition.y = loc.y;
- GenDraw.DrawMeshNowOrLater(mesh, pawnHeadPosition, Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up), material, portrait);
- }
- }
-
- public static bool GenitalCheckForPawn(List requiredGenitals, Pawn pawn, out string failReason) {
-
- failReason = null;
- if (requiredGenitals != null) {
- if (requiredGenitals.Contains("Vagina")) {
-
- if (!rjw.Genital_Helper.has_vagina(pawn)) {
- failReason = "missing vagina";
- return false;
- }
-
- }
-
- if (requiredGenitals.Contains("Penis")) {
-
- if (!(rjw.Genital_Helper.has_multipenis(pawn) || rjw.Genital_Helper.has_penis_infertile(pawn) || rjw.Genital_Helper.has_penis_fertile(pawn) || rjw.Genital_Helper.has_ovipositorM(pawn) || rjw.Genital_Helper.has_ovipositorF(pawn))) {
- failReason = "missing penis";
- return false;
- }
-
- }
-
- if (requiredGenitals.Contains("Mouth")) {
-
- if (!rjw.Genital_Helper.has_mouth(pawn)) {
- failReason = "missing mouth";
- return false;
- }
-
- }
-
- if (requiredGenitals.Contains("Anus")) {
-
- if (!rjw.Genital_Helper.has_anus(pawn)) {
- failReason = "missing anus";
- return false;
- }
-
- }
-
- if (requiredGenitals.Contains("Breasts")) {
- if (!rjw.Genital_Helper.can_do_breastjob(pawn)) {
- failReason = "missing breasts";
- return false;
- }
- }
-
- if (requiredGenitals.Contains("NoVagina")) {
-
- if (rjw.Genital_Helper.has_vagina(pawn)) {
- failReason = "has vagina";
- return false;
- }
-
- }
-
- 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 = "has penis";
- return false;
- }
-
- }
-
- if (requiredGenitals.Contains("NoMouth")) {
-
- if (rjw.Genital_Helper.has_mouth(pawn)) {
- failReason = "has mouth";
- return false;
- }
-
- }
-
- if (requiredGenitals.Contains("NoAnus")) {
-
- if (rjw.Genital_Helper.has_anus(pawn)) {
- failReason = "has anus";
- return false;
- }
-
- }
-
- if (requiredGenitals.Contains("NoBreasts")) {
- if (rjw.Genital_Helper.can_do_breastjob(pawn)) {
- failReason = "has breasts";
- return false;
- }
- }
- }
-
- return true;
-
- }
-
- public static Rot4 PawnHeadRotInAnimation(Pawn pawn, Rot4 regularPos)
- {
- Debug.Log("Test");
-
- if(pawn?.TryGetComp() != null && pawn.TryGetComp().isAnimating)
- {
- return pawn.TryGetComp().headFacing;
- }
-
- return regularPos;
- }
- }
-}
diff --git a/1.4/Source/Utilities/PatchOperationAddOrReplace.cs b/1.4/Source/Utilities/PatchOperationAddOrReplace.cs
deleted file mode 100644
index 4e1bd85..0000000
--- a/1.4/Source/Utilities/PatchOperationAddOrReplace.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml;
-using Verse;
-
-namespace Rimworld_Animations
-{
- public class PatchOperationAddOrReplace : PatchOperationPathed
- {
-
- protected string key;
- private XmlContainer value;
-
- protected override bool ApplyWorker(XmlDocument xml)
- {
- XmlNode valNode = value.node;
- bool result = false;
- IEnumerator enumerator = xml.SelectNodes(xpath).GetEnumerator();
- try
- {
- while (enumerator.MoveNext())
- {
- object obj = enumerator.Current;
- result = true;
- XmlNode parentNode = obj as XmlNode;
- XmlNode xmlNode = parentNode.SelectSingleNode(key);
- if (xmlNode == null)
- {
- // Add - Add node if not existing
- xmlNode = parentNode.OwnerDocument.CreateElement(key);
- parentNode.AppendChild(xmlNode);
- }
- else
- {
- // Replace - Clear existing children
- xmlNode.RemoveAll();
- }
- // (Re)add value
- xmlNode.AppendChild(parentNode.OwnerDocument.ImportNode(valNode.FirstChild, true));
- }
- }
- finally
- {
- IDisposable disposable = enumerator as IDisposable;
- if (disposable != null)
- {
- disposable.Dispose();
- }
- }
- return result;
- }
-
- }
-
-}
diff --git a/1.4/Textures/UI/MainTab.png b/1.4/Textures/UI/MainTab.png
deleted file mode 100644
index 92f855f..0000000
Binary files a/1.4/Textures/UI/MainTab.png and /dev/null differ
diff --git a/About/About.xml b/About/About.xml
index fbfc206..d6bd75f 100644
--- a/About/About.xml
+++ b/About/About.xml
@@ -8,7 +8,6 @@
1.1
1.2
1.3
- 1.4
c0ffee.rimworld.animations
diff --git a/About/Manifest.xml b/About/Manifest.xml
index 2391026..07f5279 100644
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@@ -1,5 +1,5 @@
Rimworld-Animations
- 1.3.0
+ 1.2.8
diff --git a/LoadFolders.xml b/LoadFolders.xml
index 4fad350..b9b9fa8 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -16,13 +16,5 @@
Patch_SexToysMasturbation
Patch_SexToysMasturbation/1.3
-
- /
- 1.4
- Patch_HatsDisplaySelection/1.2
- Patch_SexToysMasturbation
- Patch_SexToysMasturbation/1.4
-
-
diff --git a/Patch_SexToysMasturbation/1.3/Assemblies/Patch_SexToysMasturbation.dll b/Patch_SexToysMasturbation/1.3/Assemblies/Patch_SexToysMasturbation.dll
index 723e4ee..b7c0a4e 100644
Binary files a/Patch_SexToysMasturbation/1.3/Assemblies/Patch_SexToysMasturbation.dll and b/Patch_SexToysMasturbation/1.3/Assemblies/Patch_SexToysMasturbation.dll differ
diff --git a/Patch_SexToysMasturbation/1.4/Assemblies/Patch_SexToysMasturbation.dll b/Patch_SexToysMasturbation/1.4/Assemblies/Patch_SexToysMasturbation.dll
deleted file mode 100644
index c8811d7..0000000
Binary files a/Patch_SexToysMasturbation/1.4/Assemblies/Patch_SexToysMasturbation.dll and /dev/null differ
diff --git a/Patch_SexToysMasturbation/Patch_SexToysMasturbation.csproj b/Patch_SexToysMasturbation/Patch_SexToysMasturbation.csproj
index 9509bd9..b25b5c2 100644
--- a/Patch_SexToysMasturbation/Patch_SexToysMasturbation.csproj
+++ b/Patch_SexToysMasturbation/Patch_SexToysMasturbation.csproj
@@ -17,7 +17,7 @@
false
none
false
- 1.4\Assemblies\
+ 1.3\Assemblies\
DEBUG;TRACE
prompt
4
@@ -46,11 +46,11 @@
False
- ..\..\rjw\1.4\Assemblies\RJW.dll
+ ..\..\rjw-master\1.3\Assemblies\RJW.dll
False
- ..\..\rjw-toys-and-masturbation\Assemblies\RJW-ToysAndMasturbation.dll
+ ..\..\rjw-toys-and-masturbation-master\Assemblies\RJW-ToysAndMasturbation.dll
False
@@ -73,8 +73,8 @@
-
+
diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj
index 8680e4e..674eb10 100644
--- a/Rimworld-Animations.csproj
+++ b/Rimworld-Animations.csproj
@@ -9,16 +9,15 @@
Properties
Rimworld_Animations
Rimworld-Animations
- v4.8
+ v4.7.2
512
true
-
false
none
false
- 1.4\Assemblies\
+ 1.3\Assemblies\
DEBUG;TRACE
prompt
4
@@ -33,11 +32,11 @@
- ..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\0Harmony.dll
+ ..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll
False
- ..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\AlienRace.dll
+ ..\..\..\..\workshop\content\294100\839005762\1.3\Assemblies\AlienRace.dll
False
@@ -45,11 +44,11 @@
False
- ..\rjw\1.4\Assemblies\RJW.dll
+ ..\rjw-master\1.3\Assemblies\RJW.dll
False
- ..\rjw-toys-and-masturbation\Assemblies\RJW-ToysAndMasturbation.dll
+ ..\rjw-toys-and-masturbation-master\Assemblies\RJW-ToysAndMasturbation.dll
False
@@ -70,102 +69,62 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -175,10 +134,8 @@
-
-
-
-
+
+
\ No newline at end of file