From 04aeeb616de89b8ec827a51bed5848ee165fc6f8 Mon Sep 17 00:00:00 2001
From: Lennart <lennartkobosil@gmail.com>
Date: Wed, 24 Jun 2026 20:53:40 +0200
Subject: [PATCH 1/5] Patch Anomalies Expected Addon

---
 LoadFolders.xml                               |   1 +
 .../Weapons_Melee.xml                         | 110 ++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Weapons_Melee.xml

diff --git a/LoadFolders.xml b/LoadFolders.xml
index acf032ee2b..a3b43ad677 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -53,6 +53,7 @@
 		<li IfModActive="OhGodSpidersNo.AnimalArmor.Vanilla">ModPatches/Animal Armor - Vanilla</li>
 		<li IfModActive="Owlchemist.AnimalGear.Equipment">ModPatches/Animal Equipment</li>
 		<li IfModActive="ACPteam.ACPVanillaStyle">ModPatches/AnimalCollabProj</li>
+		<li IfModActive="Fallen.AnomaliesExpectedAddon">ModPatches/Anomalies Expected Addon</li>
 		<li IfModActive="rmk.anthrorace">ModPatches/Anthro Race</li>
 		<li IfModActive="Mlie.Antinium">ModPatches/Antinium</li>
 		<li IfModActive="Roo.AntyRaceMod">ModPatches/Anty the war Ant</li>
diff --git a/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Weapons_Melee.xml b/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Weapons_Melee.xml
new file mode 100644
index 0000000000..6b684416fa
--- /dev/null
+++ b/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Weapons_Melee.xml	
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Anomalies Expected Addon</li>
+		</mods>
+		<match Class="PatchOperationSequence">
+			<operations>
+
+				<!-- ========== Razor Shard ========== -->
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/tools</xpath>
+					<value>
+						<tools>
+							<li Class="CombatExtended.ToolCE">
+								<label>handle</label>
+								<capacities>
+									<li>Blunt</li>
+								</capacities>
+								<power>12</power>
+								<cooldownTime>1.6</cooldownTime>
+								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>point</label>
+								<capacities>
+									<li>Stab</li>
+								</capacities>
+								<power>25</power>
+								<cooldownTime>2</cooldownTime>
+								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+								<armorPenetrationSharp>18</armorPenetrationSharp>
+							</li>
+							<li Class="CombatExtended.ToolCE">
+								<label>edge</label>
+								<capacities>
+									<li>Cut</li>
+								</capacities>
+								<power>25</power>
+								<cooldownTime>2</cooldownTime>
+								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+								<armorPenetrationSharp>15</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+							</li>
+						</tools>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/statBases</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]</xpath>
+						<value>
+							<statBases />
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/statBases</xpath>
+					<value>
+						<Bulk>3.5</Bulk>
+						<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/equippedStatOffsets</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]</xpath>
+						<value>
+							<equippedStatOffsets />
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/equippedStatOffsets</xpath>
+					<value>
+						<MeleeCritChance>1.00</MeleeCritChance>
+						<MeleeParryChance>0.40</MeleeParryChance>
+						<MeleeDodgeChance>0.27</MeleeDodgeChance>
+					</value>
+				</li>
+
+				<li Class="PatchOperationConditional">
+					<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/weaponTags</xpath>
+					<nomatch Class="PatchOperationAdd">
+						<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]</xpath>
+						<value>
+							<weaponTags />
+						</value>
+					</nomatch>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/weaponTags</xpath>
+					<value>
+						<li>CE_OneHandedWeapon</li>
+					</value>
+				</li>
+
+			</operations>
+		</match>
+	</Operation>
+
+</Patch>

From 14060f1cfd7aa4567ab69e898913a8e1acd98665 Mon Sep 17 00:00:00 2001
From: Lennart <lennartkobosil@gmail.com>
Date: Wed, 24 Jun 2026 21:06:42 +0200
Subject: [PATCH 2/5] Match vanilla MonoSword tool stats

---
 .../Weapons_Melee.xml                         | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Weapons_Melee.xml b/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Weapons_Melee.xml
index 6b684416fa..fe8573edbe 100644
--- a/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Weapons_Melee.xml	
+++ b/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Weapons_Melee.xml	
@@ -17,33 +17,34 @@
 							<li Class="CombatExtended.ToolCE">
 								<label>handle</label>
 								<capacities>
-									<li>Blunt</li>
+									<li>Poke</li>
 								</capacities>
-								<power>12</power>
-								<cooldownTime>1.6</cooldownTime>
+								<power>2</power>
+								<cooldownTime>1.5</cooldownTime>
 								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+								<chanceFactor>0.1</chanceFactor>
 								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
 							</li>
 							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
+								<label>edge</label>
 								<capacities>
-									<li>Stab</li>
+									<li>Cut</li>
 								</capacities>
-								<power>25</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+								<power>35</power>
+								<cooldownTime>0.83</cooldownTime>
+								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
 								<armorPenetrationSharp>18</armorPenetrationSharp>
+								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
 							</li>
 							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
+								<label>point</label>
 								<capacities>
-									<li>Cut</li>
+									<li>Stab</li>
 								</capacities>
-								<power>25</power>
-								<cooldownTime>2</cooldownTime>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>15</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
+								<power>16</power>
+								<cooldownTime>0.94</cooldownTime>
+								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+								<armorPenetrationSharp>25</armorPenetrationSharp>
 							</li>
 						</tools>
 					</value>
@@ -62,7 +63,7 @@
 				<li Class="PatchOperationAdd">
 					<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/statBases</xpath>
 					<value>
-						<Bulk>3.5</Bulk>
+						<Bulk>4</Bulk>
 						<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
 					</value>
 				</li>

From ec7966d60df792a5840bf0c6311a5818ab6310c7 Mon Sep 17 00:00:00 2001
From: Lennart <lennartkobosil@gmail.com>
Date: Wed, 24 Jun 2026 21:42:56 +0200
Subject: [PATCH 3/5] Tier up Razor Shard to archotech Monosword-plus

---
 .../Patches/Anomalies Expected Addon/Weapons_Melee.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Weapons_Melee.xml b/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Weapons_Melee.xml
index fe8573edbe..6d5fb12031 100644
--- a/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Weapons_Melee.xml	
+++ b/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Weapons_Melee.xml	
@@ -33,7 +33,7 @@
 								<power>35</power>
 								<cooldownTime>0.83</cooldownTime>
 								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>18</armorPenetrationSharp>
+								<armorPenetrationSharp>22</armorPenetrationSharp>
 								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
 							</li>
 							<li Class="CombatExtended.ToolCE">
@@ -44,7 +44,7 @@
 								<power>16</power>
 								<cooldownTime>0.94</cooldownTime>
 								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>25</armorPenetrationSharp>
+								<armorPenetrationSharp>30</armorPenetrationSharp>
 							</li>
 						</tools>
 					</value>
@@ -63,8 +63,8 @@
 				<li Class="PatchOperationAdd">
 					<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/statBases</xpath>
 					<value>
-						<Bulk>4</Bulk>
-						<MeleeCounterParryBonus>0.40</MeleeCounterParryBonus>
+						<Bulk>5</Bulk>
+						<MeleeCounterParryBonus>0.48</MeleeCounterParryBonus>
 					</value>
 				</li>
 
@@ -83,7 +83,7 @@
 					<value>
 						<MeleeCritChance>1.00</MeleeCritChance>
 						<MeleeParryChance>0.40</MeleeParryChance>
-						<MeleeDodgeChance>0.27</MeleeDodgeChance>
+						<MeleeDodgeChance>0.30</MeleeDodgeChance>
 					</value>
 				</li>
 

From f23b1c71a332084e293554c7f64516ff2e741b39 Mon Sep 17 00:00:00 2001
From: Lennart <lennartkobosil@gmail.com>
Date: Thu, 25 Jun 2026 03:23:19 +0200
Subject: [PATCH 4/5] Add Anomalies Expected Addon to supported mods list

---
 SupportedThirdPartyMods.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md
index 780614e532..bd30204407 100644
--- a/SupportedThirdPartyMods.md
+++ b/SupportedThirdPartyMods.md
@@ -105,6 +105,7 @@ Anima Gear  |
 Animal Collab Project Vanilla-Style |
 Animal Armor: Vanilla	|
 Animal Equipment	|
+Anomalies Expected Addon |
 Anthro Race |
 Antinium    |
 Anty the War Ant Race |

From dcd5f3e16f5706bfe9a5b4731dc6babb976cf7c7 Mon Sep 17 00:00:00 2001
From: Lennart <lennartkobosil@gmail.com>
Date: Sat, 11 Jul 2026 12:05:32 +0200
Subject: [PATCH 5/5] Address review feedback from #4637 on this patch

- Drop PatchOperationFindMod wrapper; LoadFolders gates the folder
- Rescale archo connector and subcore hediff armor offsets to CE values
---
 .../Anomalies Expected Addon/Hediffs.xml      |  35 ++++
 .../Weapons_Melee.xml                         | 181 ++++++++----------
 2 files changed, 120 insertions(+), 96 deletions(-)
 create mode 100644 ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Hediffs.xml

diff --git a/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Hediffs.xml b/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Hediffs.xml
new file mode 100644
index 0000000000..bb6333f834
--- /dev/null
+++ b/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Hediffs.xml	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Rescale hediff armor offsets: sharp in mm RHA, blunt in MPa; heat keeps the vanilla scale. -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Hediff_AE_ArchoConnector"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>3</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Hediff_AE_ArchoConnector"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>2</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- Boss transformation hediff; described as unkillable by conventional means -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Hediff_AE_SubcoreSecond"]/stages/li/statOffsets/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>15</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/HediffDef[defName="Hediff_AE_SubcoreSecond"]/stages/li/statOffsets/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>10</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+</Patch>
diff --git a/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Weapons_Melee.xml b/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Weapons_Melee.xml
index 6d5fb12031..24fe88bbc1 100644
--- a/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Weapons_Melee.xml	
+++ b/ModPatches/Anomalies Expected Addon/Patches/Anomalies Expected Addon/Weapons_Melee.xml	
@@ -1,111 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Anomalies Expected Addon</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
+	<!-- ========== Razor Shard ========== -->
 
-				<!-- ========== Razor Shard ========== -->
-
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/tools</xpath>
-					<value>
-						<tools>
-							<li Class="CombatExtended.ToolCE">
-								<label>handle</label>
-								<capacities>
-									<li>Poke</li>
-								</capacities>
-								<power>2</power>
-								<cooldownTime>1.5</cooldownTime>
-								<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
-								<chanceFactor>0.1</chanceFactor>
-								<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>edge</label>
-								<capacities>
-									<li>Cut</li>
-								</capacities>
-								<power>35</power>
-								<cooldownTime>0.83</cooldownTime>
-								<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
-								<armorPenetrationSharp>22</armorPenetrationSharp>
-								<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
-							</li>
-							<li Class="CombatExtended.ToolCE">
-								<label>point</label>
-								<capacities>
-									<li>Stab</li>
-								</capacities>
-								<power>16</power>
-								<cooldownTime>0.94</cooldownTime>
-								<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
-								<armorPenetrationSharp>30</armorPenetrationSharp>
-							</li>
-						</tools>
-					</value>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/tools</xpath>
+		<value>
+			<tools>
+				<li Class="CombatExtended.ToolCE">
+					<label>handle</label>
+					<capacities>
+						<li>Poke</li>
+					</capacities>
+					<power>2</power>
+					<cooldownTime>1.5</cooldownTime>
+					<armorPenetrationBlunt>0.5</armorPenetrationBlunt>
+					<chanceFactor>0.1</chanceFactor>
+					<linkedBodyPartsGroup>Handle</linkedBodyPartsGroup>
 				</li>
-
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/statBases</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]</xpath>
-						<value>
-							<statBases />
-						</value>
-					</nomatch>
+				<li Class="CombatExtended.ToolCE">
+					<label>edge</label>
+					<capacities>
+						<li>Cut</li>
+					</capacities>
+					<power>35</power>
+					<cooldownTime>0.83</cooldownTime>
+					<armorPenetrationBlunt>2.88</armorPenetrationBlunt>
+					<armorPenetrationSharp>22</armorPenetrationSharp>
+					<linkedBodyPartsGroup>Edge</linkedBodyPartsGroup>
 				</li>
-
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/statBases</xpath>
-					<value>
-						<Bulk>5</Bulk>
-						<MeleeCounterParryBonus>0.48</MeleeCounterParryBonus>
-					</value>
+				<li Class="CombatExtended.ToolCE">
+					<label>point</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>16</power>
+					<cooldownTime>0.94</cooldownTime>
+					<armorPenetrationBlunt>1.28</armorPenetrationBlunt>
+					<armorPenetrationSharp>30</armorPenetrationSharp>
 				</li>
+			</tools>
+		</value>
+	</Operation>
 
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/equippedStatOffsets</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]</xpath>
-						<value>
-							<equippedStatOffsets />
-						</value>
-					</nomatch>
-				</li>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/statBases</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]</xpath>
+			<value>
+				<statBases />
+			</value>
+		</nomatch>
+	</Operation>
 
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/equippedStatOffsets</xpath>
-					<value>
-						<MeleeCritChance>1.00</MeleeCritChance>
-						<MeleeParryChance>0.40</MeleeParryChance>
-						<MeleeDodgeChance>0.30</MeleeDodgeChance>
-					</value>
-				</li>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<MeleeCounterParryBonus>0.48</MeleeCounterParryBonus>
+		</value>
+	</Operation>
 
-				<li Class="PatchOperationConditional">
-					<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/weaponTags</xpath>
-					<nomatch Class="PatchOperationAdd">
-						<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]</xpath>
-						<value>
-							<weaponTags />
-						</value>
-					</nomatch>
-				</li>
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/equippedStatOffsets</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]</xpath>
+			<value>
+				<equippedStatOffsets />
+			</value>
+		</nomatch>
+	</Operation>
 
-				<li Class="PatchOperationAdd">
-					<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/weaponTags</xpath>
-					<value>
-						<li>CE_OneHandedWeapon</li>
-					</value>
-				</li>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/equippedStatOffsets</xpath>
+		<value>
+			<MeleeCritChance>1.00</MeleeCritChance>
+			<MeleeParryChance>0.40</MeleeParryChance>
+			<MeleeDodgeChance>0.30</MeleeDodgeChance>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/weaponTags</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]</xpath>
+			<value>
+				<weaponTags />
+			</value>
+		</nomatch>
+	</Operation>
 
-			</operations>
-		</match>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AE_ShardMonosword"]/weaponTags</xpath>
+		<value>
+			<li>CE_OneHandedWeapon</li>
+		</value>
 	</Operation>
 
 </Patch>