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:023d4f2ba56cf76e398ff513330d834c52a8c8b1
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:31db7806619102e42294ad331077ff13d8ea2322
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
023d4f2ba5 ... 31db780661

Author SHA1 Message Date
Usagirei
31db780661 Merge branch 'nre-partner' into 'master' 
Fix NRE when jobdriver partner is null

See merge request c0ffeeeeeeee/rimworld-animations!5
 2024-03-18 07:01:50 +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
Reisen Usagi
8888f76708
Fix NRE when jobdriver partner is null 2022-03-22 20:15:38 -03:00
2 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
1.3/Source/Comps/CompBodyAnimator.cs
View file

@ -504,14 +504,29 @@ namespace Rimworld_Animations {
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 IsNeverEndingSex(pawn) || IsNeverEndingSexPartner(pawn);
}
public static bool IsNeverEndingSex(Pawn pawn)
{
bool hasDriver = pawn?.jobs?.curDriver != null;
if (!hasDriver)
return false;
return (pawn.jobs.curDriver is JobDriver_Sex jds) && jds.neverendingsex;
}
public static bool IsNeverEndingSexPartner(Pawn pawn)
{
bool hasDriver = pawn?.jobs?.curDriver != null;
if (!hasDriver)
return false;
var partner = (pawn.jobs.curDriver is JobDriver_SexBaseReciever jds) ? jds.Partner : null;
if (partner == null)
return false;
return IsNeverEndingSex(partner);
}
public void ResetOnLoop()

1
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();