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

Merge branch 'master' into No-HAR

Browse source
This commit is contained in:
Platinum 2020-04-25 11:08:17 -07:00
commit 90aa7e97ac
5 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
1.1/Assemblies/Rimworld-Animations.dll
View file

Binary file not shown.

1
Defs/AnimationDefs/Animations_vanilla.xml
View file

@ -465,7 +465,6 @@
<defNames> <defNames>
<li>Human</li> <li>Human</li>
</defNames> </defNames>
<initiator>true</initiator>
</li> </li>
<li> <li>
<defNames> <defNames>

4
Source/AnimationUtility.cs
View file

@ -22,6 +22,10 @@ namespace Rimworld_Animations {
//fucked first, fucking second //fucked first, fucking second
participants = participants.OrderBy(p => rjw.xxx.can_fuck(p)).ToList(); participants = participants.OrderBy(p => rjw.xxx.can_fuck(p)).ToList();
if(rjw.RJWPreferenceSettings.Malesex == rjw.RJWPreferenceSettings.AllowedSex.Nohomo) {
participants = participants.OrderBy(x => rjw.xxx.is_male(x)).ToList();
}
List<Pawn> localParticipants = new List<Pawn>(participants); List<Pawn> localParticipants = new List<Pawn>(participants);
IEnumerable<AnimationDef> options = DefDatabase<AnimationDef>.AllDefs.Where((AnimationDef x) => { IEnumerable<AnimationDef> options = DefDatabase<AnimationDef>.AllDefs.Where((AnimationDef x) => {

5
Source/Comps/CompBodyAnimator.cs
View file

@ -158,6 +158,7 @@ namespace Rimworld_Animations {
if (animTicks < anim.animationTimeTicks) { if (animTicks < anim.animationTimeTicks) {
tickStage(); tickStage();
} else { } else {
isAnimating = false; isAnimating = false;
} }
} }
@ -175,6 +176,10 @@ namespace Rimworld_Animations {
clipPercent = 0; clipPercent = 0;
} }
if(curStage >= anim.animationStages.Count && animTicks < anim.animationTimeTicks && pawn.jobs.curDriver is JobDriver_SexBaseInitiator) {
pawn.jobs.curDriver.ReadyForNextToil();
}
tickClip(); tickClip();
} }

6
Source/Settings/AnimationSettings.cs
View file

@ -13,13 +13,16 @@ namespace Rimworld_Animations {
public static float shiverIntensity = 2f; public static float shiverIntensity = 2f;
public override void ExposeData() { public override void ExposeData() {
base.ExposeData();
Scribe_Values.Look(ref orgasmQuiver, "orgasmQuiver"); Scribe_Values.Look(ref orgasmQuiver, "orgasmQuiver");
Scribe_Values.Look(ref rapeShiver, "rapeShiver"); Scribe_Values.Look(ref rapeShiver, "rapeShiver");
Scribe_Values.Look(ref hearts, "heartsOnLovin"); Scribe_Values.Look(ref hearts, "heartsOnLovin");
Scribe_Values.Look(ref soundOverride, "rjwAnimSoundOverride", true); Scribe_Values.Look(ref soundOverride, "rjwAnimSoundOverride", true);
Scribe_Values.Look(ref shiverIntensity, "shiverIntensity", 2f); Scribe_Values.Look(ref shiverIntensity, "shiverIntensity", 2f);
base.ExposeData();
} }
} }
@ -27,6 +30,7 @@ namespace Rimworld_Animations {
public class RJW_Animations : Mod { public class RJW_Animations : Mod {
public RJW_Animations(ModContentPack content) : base(content) { public RJW_Animations(ModContentPack content) : base(content) {
GetSettings<AnimationSettings>();
} }
public override void DoSettingsWindowContents(Rect inRect) { public override void DoSettingsWindowContents(Rect inRect) {