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

Animation selection refactor, now accounts for interactiondef

Browse source
This commit is contained in:
c0ffeeeeeeee 2021-01-30 10:25:46 -08:00
parent 150d93d549
commit 1d80bcb9ca
5 changed files with 115 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.

5
Defs/AnimationDefs/Animations_Lesbian.xml
View file

@ -679,6 +679,11 @@
<li>Oral</li> <li>Oral</li>
<li>Fingering</li> <li>Fingering</li>
</sexTypes> </sexTypes>
<interactionDefTypes>
<li>Fingering</li>
<li>Fisting</li>
<li>Cunnilingus</li>
</interactionDefTypes>
<actors> <actors>
<li> <li>
<defNames> <defNames>

6
Defs/AnimationDefs/Animations_vanilla.xml
View file

@ -462,6 +462,12 @@
<sexTypes> <sexTypes>
<li>Oral</li> <li>Oral</li>
</sexTypes> </sexTypes>
<interactionDefTypes>
<li>Handjob</li>
<li>Breastjob</li>
<li>Fellatio</li>
<li>Beakjob</li>
</interactionDefTypes>
<actors> <actors>
<li> <li>
<!--each type cooresponds to an animation clip in each animationStage--> <!--each type cooresponds to an animation clip in each animationStage-->

250
Source/AnimationUtility.cs
View file

@ -75,106 +75,12 @@ namespace Rimworld_Animations {
} }
} }
//genitals checking //genitals checking
if(x.actors[i].requiredGenitals != null) {
if (x.actors[i].requiredGenitals.Contains("Vagina")) {
if (!rjw.Genital_Helper.has_vagina(localParticipants[i])) { if(!GenitalCheckForPawn(x.actors[i].requiredGenitals, localParticipants[i], out string failReason)) {
if (AnimationSettings.debugMode) Debug.Log("Didn't select " + x.defName + ", " + localParticipants[i].Name + " " + failReason);
Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " doesn't have vagina"); return false;
return false;
}
}
if (x.actors[i].requiredGenitals.Contains("Penis")) {
if (!(rjw.Genital_Helper.has_multipenis(localParticipants[i]) || rjw.Genital_Helper.has_penis_infertile(localParticipants[i]) || rjw.Genital_Helper.has_penis_fertile(localParticipants[i]) || rjw.Genital_Helper.has_ovipositorM(localParticipants[i]) || rjw.Genital_Helper.has_ovipositorF(localParticipants[i]))) {
if (AnimationSettings.debugMode)
Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " doesn't have penis or ovipositor");
return false;
}
}
if (x.actors[i].requiredGenitals.Contains("Mouth")) {
if (!rjw.Genital_Helper.has_mouth(localParticipants[i])) {
if (AnimationSettings.debugMode)
Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " doesn't have mouth");
return false;
}
}
if (x.actors[i].requiredGenitals.Contains("Anus")) {
if (!rjw.Genital_Helper.has_anus(localParticipants[i])) {
if (AnimationSettings.debugMode)
Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " doesn't have anus");
return false;
}
}
if(x.actors[i].requiredGenitals.Contains("Breasts")) {
if (!rjw.Genital_Helper.can_do_breastjob(localParticipants[i])) {
if (AnimationSettings.debugMode)
Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " doesn't have breasts");
return false;
}
}
if (x.actors[i].requiredGenitals.Contains("NoVagina")) {
if (rjw.Genital_Helper.has_vagina(localParticipants[i])) {
if (AnimationSettings.debugMode)
Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " has vagina");
return false;
}
}
if (x.actors[i].requiredGenitals.Contains("NoPenis")) {
if ((rjw.Genital_Helper.has_multipenis(localParticipants[i]) || rjw.Genital_Helper.has_penis_infertile(localParticipants[i]) || rjw.Genital_Helper.has_penis_fertile(localParticipants[i]))) {
if (AnimationSettings.debugMode)
Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " has penis");
return false;
}
}
if (x.actors[i].requiredGenitals.Contains("NoMouth")) {
if (rjw.Genital_Helper.has_mouth(localParticipants[i])) {
if (AnimationSettings.debugMode)
Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " has mouth");
return false;
}
}
if (x.actors[i].requiredGenitals.Contains("NoAnus")) {
if (rjw.Genital_Helper.has_anus(localParticipants[i])) {
if (AnimationSettings.debugMode)
Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " has anus");
return false;
}
}
if (x.actors[i].requiredGenitals.Contains("NoBreasts")) {
if (rjw.Genital_Helper.can_do_breastjob(localParticipants[i])) {
if (AnimationSettings.debugMode)
Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " has breasts");
return false;
}
}
} }
//TESTING ANIMATIONS ONLY REMEMBER TO COMMENT OUT BEFORE PUSH //TESTING ANIMATIONS ONLY REMEMBER TO COMMENT OUT BEFORE PUSH
/* /*
if (x.defName != "Cunnilingus") if (x.defName != "Cunnilingus")
@ -196,58 +102,13 @@ namespace Rimworld_Animations {
} }
return true; return true;
}); });
List<AnimationDef> optionsWithSexType = options.ToList().FindAll(x => x.sexTypes.Contains(sexType)); List<AnimationDef> optionsWithInteractionType = options.ToList().FindAll(x => x.interactionDefTypes != null && x.interactionDefTypes.Contains(sexProps.DictionaryKey));
if (optionsWithInteractionType.Any()) {
/*
List<AnimationDef> optionsWithSexTypeAndInitiator = optionsWithSexType.FindAll(x => {
bool initiatorsAlignWithSexType = true;
for (int i = 0; i < x.actors.Count; i++) {
//if the animation not for initiators, but an initiator is playing it
if(sexProps != null) {
if((x.actors[i].initiator && localParticipants[i] == sexProps.Reciever) || (!x.actors[i].initiator && localParticipants[i] == sexProps.Giver)) {
initiatorsAlignWithSexType = false;
}
}
else if (x.actors[i].initiator && !(localParticipants[i].jobs.curDriver is rjw.JobDriver_SexBaseInitiator)) {
initiatorsAlignWithSexType = false;
}
}
return initiatorsAlignWithSexType;
});
List<AnimationDef> optionsWithInitiator = options.ToList().FindAll(x => {
bool initiatorsAlignWithSexType = true;
for (int i = 0; i < x.actors.Count; i++) {
//if the animation not for initiators, but an initiator is playing it
if (sexProps != null) {
if (x.actors[i].initiator && localParticipants[i] == sexProps.Giver) {
initiatorsAlignWithSexType = false;
}
}
else if (x.actors[i].initiator && !(localParticipants[i].jobs.curDriver is rjw.JobDriver_SexBaseInitiator)) {
initiatorsAlignWithSexType = false;
}
}
return initiatorsAlignWithSexType;
});
*/
/*
if (optionsWithSexTypeAndInitiator.Any()) {
if (AnimationSettings.debugMode) if (AnimationSettings.debugMode)
Log.Message("Selecting animation for rjwSexType " + sexType.ToStringSafe() + " and initiators..."); Log.Message("Selecting animation for interaction type " + sexProps.DictionaryKey.defName + "...");
return optionsWithSexTypeAndInitiator.RandomElement(); return optionsWithInteractionType.RandomElement();
} }
*/ List<AnimationDef> optionsWithSexType = options.ToList().FindAll(x => x.sexTypes.Contains(sexType));
if (optionsWithSexType.Any()) { if (optionsWithSexType.Any()) {
if (AnimationSettings.debugMode) if (AnimationSettings.debugMode)
Log.Message("Selecting animation for rjwSexType " + sexType.ToStringSafe() + "..."); Log.Message("Selecting animation for rjwSexType " + sexType.ToStringSafe() + "...");
@ -308,5 +169,100 @@ namespace Rimworld_Animations {
GenDraw.DrawMeshNowOrLater(mesh, pawnHeadPosition, Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up), material, portrait); GenDraw.DrawMeshNowOrLater(mesh, pawnHeadPosition, Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up), material, portrait);
} }
} }
public static bool GenitalCheckForPawn(List<string> 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 = "missing 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 = "missing 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;
}
} }
} }

1
Source/Defs/AnimationDef.cs
View file

@ -14,6 +14,7 @@ namespace Rimworld_Animations {
public int animationTimeTicks = 0; //do not set manually public int animationTimeTicks = 0; //do not set manually
public bool sounds = false; public bool sounds = false;
public List<rjw.xxx.rjwSextype> sexTypes; public List<rjw.xxx.rjwSextype> sexTypes;
public List<InteractionDef> interactionDefTypes = null;
public override void PostLoad() { public override void PostLoad() {
base.PostLoad(); base.PostLoad();