AblativeAbsolute/rimworld-animations
1
0
Fork 0
mirror of https://gitgud.io/c0ffeeeeeeee/rimworld-animations.git synced 2024-08-15 00:43:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: AblativeAbsolute:c206d1192d58b9a051803e44367acae3153e37bd
Branches Tags
AblativeAbsolute:master
AblativeAbsolute:masturbateTickFix
AblativeAbsolute:1.5
AblativeAbsolute:fixingfacialanimations
AblativeAbsolute:SimpleCurveBugfix
AblativeAbsolute:ExtraPartAnim2
AblativeAbsolute:HAR-Soft-Dependency
AblativeAbsolute:No-HAR
AblativeAbsolute:Update1.4
AblativeAbsolute:ExtraPartAnim
AblativeAbsolute:ShiftSaveTest
AblativeAbsolute:toys
AblativeAbsolute:Test_GenitalRotationFix
AblativeAbsolute:ChangeSplitJobDriversToPatchesOnMain
AblativeAbsolute:HatsDisplaySelectionPatch
AblativeAbsolute:Dev
...
compare: AblativeAbsolute:dc50482caab4373293a7cdfa02900de0aaf28ba9
Branches Tags
AblativeAbsolute:masturbateTickFix
AblativeAbsolute:1.5
AblativeAbsolute:fixingfacialanimations
AblativeAbsolute:master
AblativeAbsolute:SimpleCurveBugfix
AblativeAbsolute:ExtraPartAnim2
AblativeAbsolute:HAR-Soft-Dependency
AblativeAbsolute:No-HAR
AblativeAbsolute:Update1.4
AblativeAbsolute:ExtraPartAnim
AblativeAbsolute:ShiftSaveTest
AblativeAbsolute:toys
AblativeAbsolute:Test_GenitalRotationFix
AblativeAbsolute:ChangeSplitJobDriversToPatchesOnMain
AblativeAbsolute:HatsDisplaySelectionPatch
AblativeAbsolute:Dev

4 commits
c206d1192d ... dc50482caa

Author SHA1 Message Date
Salacian
dc50482caa Merge branch 'non-selectable-anims' into 'master' 
Added a way to make custom animation not selectable

See merge request c0ffeeeeeeee/rimworld-animations!9
 2024-03-18 07:01:53 +00:00
c0ffeeeeeeee
b5947db5ac Merge branch 'FutaFix' into 'master' 
(Probably?) Fixed futa reverse sex incorrect animations

See merge request c0ffeeeeeeee/rimworld-animations!19
 2024-03-18 02:35:50 +00:00
Gargule
328ea7ae4d (Probably?) Fixed futa reverse sex incorrect animations 2024-03-17 22:13:02 +00:00
Salacian
447c4d61b6 Added a field to the AnimationDef to prevent random selection 2023-02-21 01:25:23 +01:00
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
1.4/Source/Defs/AnimationDef.cs
View file

@ -13,6 +13,7 @@ namespace Rimworld_Animations {
public List<Actor> actors;
public int animationTimeTicks = 0; //do not set manually
public bool sounds = false;
public bool randomlySelectable = true;
public List<rjw.xxx.rjwSextype> sexTypes = null;
public List<String> interactionDefTypes = null;
public List<string> tags = new List<string>();

8
1.4/Source/Utilities/AnimationUtility.cs
View file

@ -25,6 +25,7 @@ namespace Rimworld_Animations {
participants =
participants.OrderBy(p =>
p.jobs.curDriver is rjw.JobDriver_Sex
&& !(p.jobs.curDriver as rjw.JobDriver_Sex).Sexprops.isRevese /*Gargulefix!!!*/
&& !(p.jobs.curDriver as rjw.JobDriver_Sex).Sexprops.isReceiver)
.OrderBy(p => rjw.xxx.can_fuck(p))
.ToList();
@ -33,7 +34,12 @@ namespace Rimworld_Animations {
List<Pawn> localParticipants = new List<Pawn>(participants);
IEnumerable<AnimationDef> options = DefDatabase<AnimationDef>.AllDefs.Where((AnimationDef x) => {
if (!x.randomlySelectable)
{
if (AnimationSettings.debugMode)
Log.Message(x.defName.ToStringSafe() + " not selected -- isn't randomly selectable");
return false;
}
if (x.actors.Count != localParticipants.Count) {
if (AnimationSettings.debugMode)