Fixed the aline race-patches. Should now work regardless of mod-names

emipa606 · Oct 20, 2023 · e44becf · e44becf
1 parent 66d4f3a
commit e44becf
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 47 deletions.
diff --git a/1.4/Patches/Aliens/Argonians.xml b/1.4/Patches/Aliens/Argonians.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
-  <Operation Class="PatchOperationFindMod">
+  <Operation Class="PatchOperationConditional">
+    <xpath>/Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Argonian"]</xpath>
     <success>Always</success>
-    <mods>
-      <li>Argonians of Blackmarsh</li>
-    </mods>
     <match Class="PatchOperationSequence">
       <operations>
         <li Class="PatchOperationAdd">

diff --git a/1.4/Patches/Aliens/BeastTribes.xml b/1.4/Patches/Aliens/BeastTribes.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
-  <Operation Class="PatchOperationFindMod">
+  <Operation Class="PatchOperationConditional">
+    <xpath>/Defs/AlienRace.ThingDef_AlienRace[defName="BearMan"]</xpath>
     <success>Always</success>
-    <mods>
-      <li>Beast Man Tribes</li>
-    </mods>
     <match Class="PatchOperationSequence">
       <operations>
         <li Class="PatchOperationAdd">

diff --git a/1.4/Patches/Aliens/Gerzee-Race.xml b/1.4/Patches/Aliens/Gerzee-Race.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
-  <Operation Class="PatchOperationFindMod">
+  <Operation Class="PatchOperationConditional">
+    <xpath>/Defs/AlienRace.ThingDef_AlienRace[defName="GerzeeRace"]</xpath>
     <success>Always</success>
-    <mods>
-      <li>Gerzee Race</li>
-    </mods>
     <match Class="PatchOperationSequence">
       <operations>
         <li Class="PatchOperationAdd">

diff --git a/1.4/Patches/Aliens/Goblins.xml b/1.4/Patches/Aliens/Goblins.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
   <Operation Class="PatchOperationConditional">
-    <xpath>Defs/AlienRace.ThingDef_AlienRace[defName="Fantasy_Goblin"]</xpath>
+    <xpath>/Defs/AlienRace.ThingDef_AlienRace[defName="Fantasy_Goblin"]</xpath>
+    <success>Always</success>
     <match Class="PatchOperationSequence">
       <operations>
         <li Class="PatchOperationAdd">

diff --git a/1.4/Patches/Aliens/Lotr-Dwarves.xml b/1.4/Patches/Aliens/Lotr-Dwarves.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
-  <Operation Class="PatchOperationFindMod">
+  <Operation Class="PatchOperationConditional">
+    <xpath>/Defs/AlienRace.ThingDef_AlienRace[defName="LotRD_DwarfStandardRace"]</xpath>
     <success>Always</success>
-    <mods>
-      <li>Lord of the Rims - Dwarves</li>
-    </mods>
     <match Class="PatchOperationSequence">
       <operations>
         <li Class="PatchOperationAdd">

diff --git a/1.4/Patches/Aliens/Lotr-Elves.xml b/1.4/Patches/Aliens/Lotr-Elves.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
-  <Operation Class="PatchOperationFindMod">
+  <Operation Class="PatchOperationConditional">
+    <xpath>/Defs/AlienRace.ThingDef_AlienRace[defName="LotRE_ElfStandardRace"]</xpath>
     <success>Always</success>
-    <mods>
-      <li>Lord of the Rims - Elves</li>
-    </mods>
     <match Class="PatchOperationSequence">
       <operations>
         <li Class="PatchOperationAdd">

diff --git a/1.4/Patches/Aliens/Lotr-Hobbits.xml b/1.4/Patches/Aliens/Lotr-Hobbits.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
-  <Operation Class="PatchOperationFindMod">
+  <Operation Class="PatchOperationConditional">
+    <xpath>/Defs/AlienRace.ThingDef_AlienRace[defName="LotRH_HobbitStandardRace"]</xpath>
     <success>Always</success>
-    <mods>
-      <li>Lord of the Rims - Hobbits</li>
-    </mods>
     <match Class="PatchOperationSequence">
       <operations>
         <li Class="PatchOperationAdd">

diff --git a/1.4/Patches/Aliens/NiHal.xml b/1.4/Patches/Aliens/NiHal.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
-  <Operation Class="PatchOperationFindMod">
+  <Operation Class="PatchOperationConditional">
+    <xpath>/Defs/AlienRace.ThingDef_AlienRace[defName="Alien_NiHal"]</xpath>
     <success>Always</success>
-    <mods>
-      <li>Ni'Hal 1.0/1.1</li>
-      <li>Ni'Hal 1.0/1.1 UltraLite</li>
-    </mods>
     <match Class="PatchOperationSequence">
       <operations>
         <li Class="PatchOperationAdd">

diff --git a/1.4/Patches/Aliens/Orassans.xml b/1.4/Patches/Aliens/Orassans.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
-  <Operation Class="PatchOperationFindMod">
+  <Operation Class="PatchOperationConditional">
+    <xpath>/Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Orassan"]</xpath>
     <success>Always</success>
-    <mods>
-      <li>Orassans</li>
-      <li>Orassans Lite</li>
-    </mods>
     <match Class="PatchOperationSequence">
       <operations>
         <li Class="PatchOperationAdd">

diff --git a/1.4/Patches/Aliens/Orcs.xml b/1.4/Patches/Aliens/Orcs.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
-  <Operation Class="PatchOperationFindMod">
+  <Operation Class="PatchOperationConditional">
+    <xpath>/Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Orc"]</xpath>
     <success>Always</success>
-    <mods>
-      <li>Orcs</li>
-    </mods>
     <match Class="PatchOperationSequence">
       <operations>
         <li Class="PatchOperationAdd">

diff --git a/1.4/Patches/Aliens/Tree-People.xml b/1.4/Patches/Aliens/Tree-People.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
-  <Operation Class="PatchOperationFindMod">
+  <Operation Class="PatchOperationConditional">
+    <xpath>/Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Tree"]</xpath>
     <success>Always</success>
-    <mods>
-      <li>Tree People</li>
-    </mods>
     <match Class="PatchOperationSequence">
       <operations>
         <li Class="PatchOperationAdd">

diff --git a/About/About.xml b/About/About.xml
@@ -73,10 +73,11 @@ Since modding is just a hobby for me I expect no donations to keep modding. If y
 [list]
 [*] See if the the error persists if you just have this mod and its requirements active.
 [*] If not, try adding your other mods until it happens again.
-[*] Post your error-log using [url=https://steamcommunity.com/workshop/filedetails/?id=818773962]HugsLib[/url] and command Ctrl+F12
+[*] Post your error-log using [url=https://steamcommunity.com/workshop/filedetails/?id=818773962]HugsLib[/url] or the standalone [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2873415404]Uploader[/url] and command Ctrl+F12
 [*] For best support, please use the Discord-channel for error-reporting.
 [*] Do not report errors by making a discussion-thread, I get no notification of that.
 [*] If you have the solution for a problem, please post it to the GitHub repository.
+[*] Use [url=https://github.com/RimSort/RimSort/releases/latest]RimSort[/url] to sort your mods
 [/list]
 
 [url=https://steamcommunity.com/sharedfiles/filedetails/changelog/1558455017][img]https://img.shields.io/github/v/release/emipa606/CannibalMeals?label=latest%20version&amp;style=plastic&amp;labelColor=0070cd&amp;color=white[/img][/url]</description>

diff --git a/About/Changelog.txt b/About/Changelog.txt
@@ -1,5 +1,8 @@
 # Changelog for CannibalMeals
 
+1.4.6 - Fixed the aline race-patches. Should now work regardless of mod-names
+
+
 1.4.5 - Updated goblin patch to also work for [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2011680079]Fantasy Goblins Updated[/url], thanks to Barsimmon!
 
 

diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>CannibalMeals</identifier>
-  <version>1.4.5</version>
+  <version>1.4.6</version>
   <dependencies />
   <incompatibleWith />
   <loadBefore />

diff --git a/About/ModSync.xml b/About/ModSync.xml
@@ -2,7 +2,7 @@
 <ModSyncNinjaData>
   <ID>8b08a139-8d92-40e2-b62a-cb740ec54ecb</ID>
   <ModName>Cannibal and Insect Meals</ModName>
-  <Version>1.4.5</Version>
+  <Version>1.4.6</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>emipa606</Owner>

diff --git a/README.md b/README.md
@@ -57,10 +57,11 @@ https://ko-fi.com/G2G55DDYD]![Image](https://i.imgur.com/VWG0yff.png)
 
 -  See if the the error persists if you just have this mod and its requirements active.
 -  If not, try adding your other mods until it happens again.
--  Post your error-log using https://steamcommunity.com/workshop/filedetails/?id=818773962]HugsLib and command Ctrl+F12
+-  Post your error-log using https://steamcommunity.com/workshop/filedetails/?id=818773962]HugsLib or the standalone https://steamcommunity.com/sharedfiles/filedetails/?id=2873415404]Uploader and command Ctrl+F12
 -  For best support, please use the Discord-channel for error-reporting.
 -  Do not report errors by making a discussion-thread, I get no notification of that.
 -  If you have the solution for a problem, please post it to the GitHub repository.
+-  Use https://github.com/RimSort/RimSort/releases/latest]RimSort to sort your mods