Compare commits

...

4 commits

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

See merge request c0ffeeeeeeee/rimworld-animations!9
2023-06-22 03:24:47 +00:00
c0ffeeeeeeee
5ef758c294 Merge branch 'gc-fix-orgasm-progress' into 'master'
Fix orgasm progress

See merge request c0ffeeeeeeee/rimworld-animations!13
2023-06-21 20:10:05 +00:00
ghostclinic3YTB
3a0b9deb11 Fix orgasm progress 2023-06-21 20:10:05 +00:00
Salacian
447c4d61b6 Added a field to the AnimationDef to prevent random selection 2023-02-21 01:25:23 +01:00
4 changed files with 9 additions and 1 deletions

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

View file

@ -109,6 +109,7 @@ namespace Rimworld_Animations {
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).orgasmStartTick = animTicks;
(pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).duration = animTicks;

View file

@ -33,7 +33,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)

View file

@ -59,6 +59,7 @@ namespace Patch_SexToysMasturbation
(pawn.jobs.curDriver as JobDriver_Sex).ticks_left = anim.animationTimeTicks;
(pawn.jobs.curDriver as JobDriver_Sex).sex_ticks = anim.animationTimeTicks;
(pawn.jobs.curDriver as JobDriver_Sex).orgasmStartTick = anim.animationTimeTicks;
(pawn.jobs.curDriver as JobDriver_Sex).duration = anim.animationTimeTicks;
}
else