1.3.0

About/About.xml

@@ -18,6 +18,7 @@
 	</modDependencies>
 	<loadAfter>
 		<li>c0ffee.rimworld.animations</li>
+		<li>abscon.rimworld.animations.patch</li>
 	</loadAfter>
 	<loadBefore>
 		<li>Tory187.RJWAnimAddons.XtraAnims</li>

About/Manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>RJW-AA-VoicePatch</identifier>
-	<version>1.2.8</version>
+	<version>1.3.0</version>
 	<manifestUri>https://gitgud.io/Tory/animaddons-voicepatch/-/raw/master/About/Manifest.xml</manifestUri>
     <downloadUri>https://gitgud.io/Tory/animaddons-voicepatch/</downloadUri>
 </Manifest>

Changelog.txt

@@ -1,5 +1,7 @@
 RJWAnimAddons-Voicepatch:
 
+8/19/2022: 0.3.0 Restructured for better compatibility for AC's animation patch (currently 99% of anims are not voice supported while using AC's patch. Will update all anims in AC's patch later)
+
 7/22/2021: 1.2.8 Added 1.3 tag. Added URI to manifest to keep track of future versions in mod manager
 
 6/28/2021: 1.2.7 Fixed a mistake I made back in March update. Fast moan sounds should play again.

Common/1.1/Patches/RemoveDefaultAnims.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+  </Operation>
+  	<Operation Class="PatchOperationRemove">
+		<xpath>/Defs/Rimworld_Animations.AnimationDef[
+		defName="Dog_Doggystyle" and
+		defName="Doggystyle" and
+		defName="Blowjob" and
+		defName="ReverseStandAndCarry" and
+		defName="Cowgirl" and
+		defName="Tribadism" and
+		defName="Double_Penetration" and
+		defName="Horse_Cowgirl" and
+		defName="ReverseCowgirl" and
+		defName="Cunnilingus"]</xpath>
+	</Operation>
+</Patch>

Common/1.2 and 1.3/Defs/AnimationDefs/VoicePatchFemaleFuta.xml

@@ -4217,8 +4217,8 @@
         </defNames>
         <initiator>true</initiator>
         <requiredGenitals>
-          <li>Vagina</li>
         </requiredGenitals>
+		<requiredGender><li>Female</li></requiredGender>
       </li>
       
     </actors>

Common/1.2 and 1.3/Patches/RemoveDefaultAnims.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+  </Operation>
+  	<Operation Class="PatchOperationRemove">
+		<xpath>/Defs/Rimworld_Animations.AnimationDef[
+		defName="Dog_Doggystyle" and
+		defName="Doggystyle" and
+		defName="Blowjob" and
+		defName="ReverseStandAndCarry" and
+		defName="Cowgirl" and
+		defName="Tribadism" and
+		defName="Double_Penetration" and
+		defName="Horse_Cowgirl" and
+		defName="ReverseCowgirl" and
+		defName="Cunnilingus"]</xpath>
+	</Operation>
+</Patch>

Common/Defs/SoundDefs/Quick Refrence.txt

@@ -0,0 +1,15 @@
+<soundEffect>Voiceline_FGrunt</soundEffect>
+
+<soundEffect>Voiceline_FScream</soundEffect>
+
+<soundEffect>Voiceline_FMoan</soundEffect>
+
+<soundEffect>Voiceline_FMoanShort</soundEffect>
+
+<soundEffect>Voiceline_MGrunt</soundEffect>
+
+<soundEffect>Voiceline_MScream</soundEffect>
+
+<soundEffect>Voiceline_MMoan</soundEffect>
+
+<soundEffect>Voiceline_MMoanShort</soundEffect>

Extra/Abstract Concept/Patches/RemoveACAnims.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<Operation Class="PatchOperationRemove">
+		<xpath>/Defs/Rimworld_Animations.AnimationDef[
+		defName="SixtyNine" and
+		defName="Butterfly" and
+		defName="BreastJob" and
+		defName="Handjob" and
+		defName="Fisting" and
+		defName="Fingering" and
+		defName="CunnilingusStanding" and
+		defName="Rimming" and
+		defName="ReverseCowgirl" and
+		defName="FaceSitting" and
+		defName="Footjob" and
+		defName="KissMakeout" and
+		defName="MutualMasturbation" and
+		defName="Threesome1Male2Female" and
+		defName="MasturbationWithPenis_Standing" and
+		defName="MasturbationWithPenis_InBed" and
+		defName="MasturbationWithVagina_Standing" and
+		defName="MasturbationWithVagina_InBed" and
+		defName="MasturbationWithBreasts_Standing" and
+		defName="MasturbationWithBreasts_InBed" and
+		defName="MasturbationWithBreastsPlusPenis_Standing" and
+		defName="MasturbationWithBreastsPlusPenis_InBed" and
+		defName="MasturbationWithAnus_Standing" and
+		defName="MasturbationWithAnus_InBed" and
+		defName="MasturbationHumping_InBed"]</xpath>
+	</Operation>
+</Patch>

LoadFolders.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<loadFolders>
+	<v1.1>
+		<li>Common/1.1</li><!--Load 1.1 defs and patches-->
+		<li>Common</li><!--Sounds and sound defs-->
+	</v1.1>
+	<v1.2>
+		<li>Common/1.2 and 1.3</li><!--Load 1.2 defs and patches-->
+		<li>Common</li><!--Sounds and sound defs-->
+	</v1.2>
+	<v1.3>
+		<li IfModNotActive="abscon.rimworld.animations.patch">Common/1.2 and 1.3</li><!--Load 1.3 defs and patches-->
+		<!--<li IfModActive="abscon.rimworld.animations.patch">Extra/Abstract Concept</li>--><!--AC patch with voice DISABLED, WIP-->
+		<li>Common</li><!--Sounds and sound defs-->
+	</v1.3>
+</loadFolders>

Patches/RemoveDefaultAnims.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-  <Operation Class="PatchOperationSequence">
-      <success>Always</success>
-      <operations>
-        <li Class="PatchOperationRemove">
-          <xpath>/Defs/Rimworld_Animations.AnimationDef[defName="Dog_Doggystyle"]</xpath>
-          <success>Always</success>
-        </li>
-		<li Class="PatchOperationRemove">
-          <xpath>/Defs/Rimworld_Animations.AnimationDef[defName="Doggystyle"]</xpath>
-          <success>Always</success>
-        </li>
-		<li Class="PatchOperationRemove">
-          <xpath>/Defs/Rimworld_Animations.AnimationDef[defName="Blowjob"]</xpath>
-          <success>Always</success>
-        </li>
-		<li Class="PatchOperationRemove">
-          <xpath>/Defs/Rimworld_Animations.AnimationDef[defName="ReverseStandAndCarry"]</xpath>
-          <success>Always</success>
-        </li>
-		<li Class="PatchOperationRemove">
-          <xpath>/Defs/Rimworld_Animations.AnimationDef[defName="Cowgirl"]</xpath>
-          <success>Always</success>
-        </li>
-		<li Class="PatchOperationRemove">
-          <xpath>/Defs/Rimworld_Animations.AnimationDef[defName="Tribadism"]</xpath>
-          <success>Always</success>
-        </li>
-		<li Class="PatchOperationRemove">
-          <xpath>/Defs/Rimworld_Animations.AnimationDef[defName="Double_Penetration"]</xpath>
-          <success>Always</success>
-        </li>
-		<li Class="PatchOperationRemove">
-          <xpath>/Defs/Rimworld_Animations.AnimationDef[defName="Horse_Cowgirl"]</xpath>
-          <success>Always</success>
-        </li>
-		<li Class="PatchOperationRemove">
-          <xpath>/Defs/Rimworld_Animations.AnimationDef[defName="Cunnilingus"]</xpath>
-          <success>Always</success>
-        </li>
-      </operations>
-  </Operation>
-</Patch>