From b7492dfce81f0fe7ea7dc8e2df62ad7564e095f7 Mon Sep 17 00:00:00 2001
From: Tory <Toryanhaltzer@gmail.com>
Date: Fri, 19 Aug 2022 18:25:13 -0700
Subject: [PATCH] 0.3.0

---
 .../Animations_XtraOverwritesAC.xml           | 110 ------------------
 About/Manifest.xml                            |   2 +-
 Changelog.txt                                 |   2 +
 .../Animations_XtraFemaleFutaAC.xml           |   0
 .../AbstractConcept/Animations_XtraMaleAC.xml |   0
 .../Animations_XtraOverwritesAC.xml           |   0
 .../Group/Animations_XtraDoublePen.xml        |   0
 .../Group/Animations_XtraDoublePenAndOral.xml |   0
 .../1.1}/Defs/AnimationDefs/Group/WIP.zip     | Bin
 .../1.1}/Defs/AnimationDefs/WIP.zip           | Bin
 .../1.1}/Patches/interactionDefs.xml          |   0
 .../Group/Animations_XtraDoublePen.xml        |   0
 .../Group/Animations_XtraDoublePenAndOral.xml |   0
 .../Defs/AnimationDefs/Group/WIP.zip          | Bin
 .../1.2 and 1.3}/Defs/AnimationDefs/WIP.zip   | Bin
 .../Animations_XtraFemaleFutaAC.xml           |   0
 .../AbstractConcept/Animations_XtraMaleAC.xml |   0
 .../Patches/interactionDefs.xml               |   0
 LoadFolders.xml                               |  14 +++
 19 files changed, 17 insertions(+), 111 deletions(-)
 delete mode 100644 1.2/Defs/AnimationDefs/AbstractConcept/Animations_XtraOverwritesAC.xml
 rename {1.1 => Common/1.1}/Defs/AnimationDefs/AbstractConcept/Animations_XtraFemaleFutaAC.xml (100%)
 rename {1.1 => Common/1.1}/Defs/AnimationDefs/AbstractConcept/Animations_XtraMaleAC.xml (100%)
 rename {1.1 => Common/1.1}/Defs/AnimationDefs/AbstractConcept/Animations_XtraOverwritesAC.xml (100%)
 rename {1.1 => Common/1.1}/Defs/AnimationDefs/Group/Animations_XtraDoublePen.xml (100%)
 rename {1.1 => Common/1.1}/Defs/AnimationDefs/Group/Animations_XtraDoublePenAndOral.xml (100%)
 rename {1.1 => Common/1.1}/Defs/AnimationDefs/Group/WIP.zip (100%)
 rename {1.1 => Common/1.1}/Defs/AnimationDefs/WIP.zip (100%)
 rename {1.1 => Common/1.1}/Patches/interactionDefs.xml (100%)
 rename {1.2 => Common/1.2 and 1.3}/Defs/AnimationDefs/Group/Animations_XtraDoublePen.xml (100%)
 rename {1.2 => Common/1.2 and 1.3}/Defs/AnimationDefs/Group/Animations_XtraDoublePenAndOral.xml (100%)
 rename {1.2 => Common/1.2 and 1.3}/Defs/AnimationDefs/Group/WIP.zip (100%)
 rename {1.2 => Common/1.2 and 1.3}/Defs/AnimationDefs/WIP.zip (100%)
 rename {1.2 => Extra/Abstract Concept}/Defs/AnimationDefs/AbstractConcept/Animations_XtraFemaleFutaAC.xml (100%)
 rename {1.2 => Extra/Abstract Concept}/Defs/AnimationDefs/AbstractConcept/Animations_XtraMaleAC.xml (100%)
 rename {1.2 => Extra/Abstract Concept}/Patches/interactionDefs.xml (100%)
 create mode 100644 LoadFolders.xml

diff --git a/1.2/Defs/AnimationDefs/AbstractConcept/Animations_XtraOverwritesAC.xml b/1.2/Defs/AnimationDefs/AbstractConcept/Animations_XtraOverwritesAC.xml
deleted file mode 100644
index 0836aa8..0000000
--- a/1.2/Defs/AnimationDefs/AbstractConcept/Animations_XtraOverwritesAC.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-  	<Rimworld_Animations.AnimationDef>
-    <defName>SixtyNine</defName>
-    <label>sixty nine</label>
-    <sounds>true</sounds>
-    <sexTypes>
-    </sexTypes>
-    <actors>
-    </actors>
-	<animationStages>
-	</animationStages>
-	</Rimworld_Animations.AnimationDef>
-	
-  	<Rimworld_Animations.AnimationDef>
-    <defName>Butterfly</defName>
-    <label>butterfly</label>
-    <sounds>true</sounds>
-    <sexTypes>
-    </sexTypes>
-    <actors>
-    </actors>
-	<animationStages>
-	</animationStages>
-	</Rimworld_Animations.AnimationDef>
-	
-	<Rimworld_Animations.AnimationDef>
-    <defName>Boobjob</defName>
-    <label>boobjob</label>
-    <sounds>true</sounds>
-    <sexTypes>
-    </sexTypes>
-    <actors>
-    </actors>
-	<animationStages>
-	</animationStages>
-	</Rimworld_Animations.AnimationDef>
-	
-  	<Rimworld_Animations.AnimationDef>
-    <defName>Handjob</defName>
-    <label>handjob</label>
-    <sounds>true</sounds>
-    <sexTypes>
-    </sexTypes>
-    <actors>
-    </actors>
-	<animationStages>
-	</animationStages>
-	</Rimworld_Animations.AnimationDef>
-	
-	<Rimworld_Animations.AnimationDef>
-    <defName>Fisting</defName>
-    <label>fisting</label>
-    <sounds>true</sounds>
-    <sexTypes>
-    </sexTypes>
-    <actors>
-    </actors>
-	<animationStages>
-	</animationStages>
-	</Rimworld_Animations.AnimationDef>
-	
-  	<Rimworld_Animations.AnimationDef>
-    <defName>Fingering</defName>
-    <label>fingering</label>
-    <sounds>true</sounds>
-    <sexTypes>
-    </sexTypes>
-    <actors>
-    </actors>
-	<animationStages>
-	</animationStages>
-	</Rimworld_Animations.AnimationDef>
-	
-	<Rimworld_Animations.AnimationDef>
-    <defName>Rimming</defName>
-    <label>rimming</label>
-    <sounds>true</sounds>
-    <sexTypes>
-    </sexTypes>
-    <actors>
-    </actors>
-	<animationStages>
-	</animationStages>
-	</Rimworld_Animations.AnimationDef>
-	
-	<Rimworld_Animations.AnimationDef>
-    <defName>Footjob</defName>
-    <label>footjob</label>
-    <sounds>true</sounds>
-    <sexTypes>
-    </sexTypes>
-    <actors>
-    </actors>
-	<animationStages>
-	</animationStages>
-	</Rimworld_Animations.AnimationDef>
-	
-	<Rimworld_Animations.AnimationDef>
-    <defName>MutualMasturbation</defName>
-    <label>mutual masturbation</label>
-    <sounds>true</sounds>
-    <sexTypes>
-    </sexTypes>
-    <actors>
-    </actors>
-	<animationStages>
-	</animationStages>
-	</Rimworld_Animations.AnimationDef>
-</Defs>
diff --git a/About/Manifest.xml b/About/Manifest.xml
index a1fd8a4..96153bc 100644
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>RJW-AA-XtraAnims</identifier>
-	<version>0.2.10</version>
+	<version>0.3.0</version>
 	<manifestUri>https://gitgud.io/Tory/rjwanimaddons-xtraanims/-/raw/master/About/Manifest.xml</manifestUri>
     <downloadUri>https://gitgud.io/Tory/rjwanimaddons-xtraanims/</downloadUri>
 </Manifest>
diff --git a/Changelog.txt b/Changelog.txt
index e29c874..ce84ff3 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,7 @@
 RJWAnimAddons-XtraAnims:
 
+8/19/2022: 0.3.0 Restructured for better compatiblity for AC's animation patch
+
 6/22/2022: 0.2.10 Added genital rotation to AC's Butterfly anim, thanks Shaua!
 
 7/22/2021: 0.2.9 Added 1.3 tag. Added URI to manifest to keep track of future versions in mod manager
diff --git a/1.1/Defs/AnimationDefs/AbstractConcept/Animations_XtraFemaleFutaAC.xml b/Common/1.1/Defs/AnimationDefs/AbstractConcept/Animations_XtraFemaleFutaAC.xml
similarity index 100%
rename from 1.1/Defs/AnimationDefs/AbstractConcept/Animations_XtraFemaleFutaAC.xml
rename to Common/1.1/Defs/AnimationDefs/AbstractConcept/Animations_XtraFemaleFutaAC.xml
diff --git a/1.1/Defs/AnimationDefs/AbstractConcept/Animations_XtraMaleAC.xml b/Common/1.1/Defs/AnimationDefs/AbstractConcept/Animations_XtraMaleAC.xml
similarity index 100%
rename from 1.1/Defs/AnimationDefs/AbstractConcept/Animations_XtraMaleAC.xml
rename to Common/1.1/Defs/AnimationDefs/AbstractConcept/Animations_XtraMaleAC.xml
diff --git a/1.1/Defs/AnimationDefs/AbstractConcept/Animations_XtraOverwritesAC.xml b/Common/1.1/Defs/AnimationDefs/AbstractConcept/Animations_XtraOverwritesAC.xml
similarity index 100%
rename from 1.1/Defs/AnimationDefs/AbstractConcept/Animations_XtraOverwritesAC.xml
rename to Common/1.1/Defs/AnimationDefs/AbstractConcept/Animations_XtraOverwritesAC.xml
diff --git a/1.1/Defs/AnimationDefs/Group/Animations_XtraDoublePen.xml b/Common/1.1/Defs/AnimationDefs/Group/Animations_XtraDoublePen.xml
similarity index 100%
rename from 1.1/Defs/AnimationDefs/Group/Animations_XtraDoublePen.xml
rename to Common/1.1/Defs/AnimationDefs/Group/Animations_XtraDoublePen.xml
diff --git a/1.1/Defs/AnimationDefs/Group/Animations_XtraDoublePenAndOral.xml b/Common/1.1/Defs/AnimationDefs/Group/Animations_XtraDoublePenAndOral.xml
similarity index 100%
rename from 1.1/Defs/AnimationDefs/Group/Animations_XtraDoublePenAndOral.xml
rename to Common/1.1/Defs/AnimationDefs/Group/Animations_XtraDoublePenAndOral.xml
diff --git a/1.1/Defs/AnimationDefs/Group/WIP.zip b/Common/1.1/Defs/AnimationDefs/Group/WIP.zip
similarity index 100%
rename from 1.1/Defs/AnimationDefs/Group/WIP.zip
rename to Common/1.1/Defs/AnimationDefs/Group/WIP.zip
diff --git a/1.1/Defs/AnimationDefs/WIP.zip b/Common/1.1/Defs/AnimationDefs/WIP.zip
similarity index 100%
rename from 1.1/Defs/AnimationDefs/WIP.zip
rename to Common/1.1/Defs/AnimationDefs/WIP.zip
diff --git a/1.1/Patches/interactionDefs.xml b/Common/1.1/Patches/interactionDefs.xml
similarity index 100%
rename from 1.1/Patches/interactionDefs.xml
rename to Common/1.1/Patches/interactionDefs.xml
diff --git a/1.2/Defs/AnimationDefs/Group/Animations_XtraDoublePen.xml b/Common/1.2 and 1.3/Defs/AnimationDefs/Group/Animations_XtraDoublePen.xml
similarity index 100%
rename from 1.2/Defs/AnimationDefs/Group/Animations_XtraDoublePen.xml
rename to Common/1.2 and 1.3/Defs/AnimationDefs/Group/Animations_XtraDoublePen.xml
diff --git a/1.2/Defs/AnimationDefs/Group/Animations_XtraDoublePenAndOral.xml b/Common/1.2 and 1.3/Defs/AnimationDefs/Group/Animations_XtraDoublePenAndOral.xml
similarity index 100%
rename from 1.2/Defs/AnimationDefs/Group/Animations_XtraDoublePenAndOral.xml
rename to Common/1.2 and 1.3/Defs/AnimationDefs/Group/Animations_XtraDoublePenAndOral.xml
diff --git a/1.2/Defs/AnimationDefs/Group/WIP.zip b/Common/1.2 and 1.3/Defs/AnimationDefs/Group/WIP.zip
similarity index 100%
rename from 1.2/Defs/AnimationDefs/Group/WIP.zip
rename to Common/1.2 and 1.3/Defs/AnimationDefs/Group/WIP.zip
diff --git a/1.2/Defs/AnimationDefs/WIP.zip b/Common/1.2 and 1.3/Defs/AnimationDefs/WIP.zip
similarity index 100%
rename from 1.2/Defs/AnimationDefs/WIP.zip
rename to Common/1.2 and 1.3/Defs/AnimationDefs/WIP.zip
diff --git a/1.2/Defs/AnimationDefs/AbstractConcept/Animations_XtraFemaleFutaAC.xml b/Extra/Abstract Concept/Defs/AnimationDefs/AbstractConcept/Animations_XtraFemaleFutaAC.xml
similarity index 100%
rename from 1.2/Defs/AnimationDefs/AbstractConcept/Animations_XtraFemaleFutaAC.xml
rename to Extra/Abstract Concept/Defs/AnimationDefs/AbstractConcept/Animations_XtraFemaleFutaAC.xml
diff --git a/1.2/Defs/AnimationDefs/AbstractConcept/Animations_XtraMaleAC.xml b/Extra/Abstract Concept/Defs/AnimationDefs/AbstractConcept/Animations_XtraMaleAC.xml
similarity index 100%
rename from 1.2/Defs/AnimationDefs/AbstractConcept/Animations_XtraMaleAC.xml
rename to Extra/Abstract Concept/Defs/AnimationDefs/AbstractConcept/Animations_XtraMaleAC.xml
diff --git a/1.2/Patches/interactionDefs.xml b/Extra/Abstract Concept/Patches/interactionDefs.xml
similarity index 100%
rename from 1.2/Patches/interactionDefs.xml
rename to Extra/Abstract Concept/Patches/interactionDefs.xml
diff --git a/LoadFolders.xml b/LoadFolders.xml
new file mode 100644
index 0000000..86fbb74
--- /dev/null
+++ b/LoadFolders.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<loadFolders>
+	<v1.1>
+		<li>Common/1.1</li><!--Load 1.1 defs and patches-->
+	</v1.1>
+	<v1.2>
+		<li>Common/1.2 and 1.3</li><!--Load 1.2 defs and patches-->
+		<li>Extra/Abstract Concept</li><!--Load AC's animations-->
+	</v1.2>
+	<v1.3>
+		<li>Common/1.2 and 1.3</li><!--Load 1.3 defs and patches-->
+		<li IfModNotActive="abscon.rimworld.animations.patch">Extra/Abstract Concept</li><!--Load AC's animations-->
+	</v1.3>
+</loadFolders>
\ No newline at end of file