diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Shields/MO_Shields.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Shields/MO_Shields.xml
index ba9543e3c1..428eb5f550 100644
--- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Shields/MO_Shields.xml
+++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/Shields/MO_Shields.xml
@@ -18,20 +18,21 @@
- Defs/ThingDef[@Name="DankPyon_BaseShield"]/apparel/layers
+ Defs/ThingDef[@Name="DankPyon_BaseShield"]/apparel
-
- Shield
-
-
-
-
-
- Defs/ThingDef[@Name="DankPyon_BaseShield"]/apparel/bodyPartGroups
-
-
- LeftShoulder
-
+
+ false
+ false
+
+ LeftShoulder
+
+
+ Shield
+
+
+
+ Armor
+
@@ -40,8 +41,21 @@
Defs/ThingDef[@Name="DankPyon_BaseShield"]/tools
-
- Defs/ThingDef[defName="DankPyon_Shield" or defName="DankPyon_ShieldKite" or defName="DankPyon_ShieldHeater" or defName="DankPyon_ShieldHeater_Amboise" or defName="DankPyon_ShieldHeater_Soren" or defName="DankPyon_ShieldHeater_Oswin" or defName="DankPyon_ShieldHeater_Hesse" or defName="DankPyon_ShieldLiving" or defName="DankPyon_ShieldLindwurm"]/comps/li[@Class="VFECore.CompProperties_Shield"]
+
+
+
+ Defs/ThingDef[@Name="DankPyon_BaseShield"]/equippedStatOffsets
+
+
+ -0.2
+ -1
+ -0.15
+ -0.08
+ -0.25
+ -0.05
+ 1.0
+
+
@@ -60,42 +74,84 @@
+
+ Defs/ThingDef[
+ defName="DankPyon_Shield" or
+ defName="DankPyon_ShieldKite" or
+ defName="DankPyon_ShieldHeater" or
+ defName="DankPyon_ShieldHeater_Amboise" or
+ defName="DankPyon_ShieldHeater_Soren" or
+ defName="DankPyon_ShieldHeater_Oswin" or
+ defName="DankPyon_ShieldHeater_Hesse" or
+ defName="DankPyon_ShieldLiving" or
+ defName="DankPyon_ShieldLindwurm"]/comps/li[@Class="VFECore.CompProperties_Shield"]
+
+
- Defs/ThingDef[defName="DankPyon_Shield" or defName="DankPyon_ShieldKite" or defName="DankPyon_ShieldHeater" or @Name="DankPyon_ShieldHeaterBase" or defName="DankPyon_ShieldLiving" or defName="DankPyon_ShieldLindwurm"
- ]/statBases
+ Defs/ThingDef[
+ defName="DankPyon_Shield" or
+ defName="DankPyon_ShieldKite" or
+ defName="DankPyon_ShieldHeater" or
+ @Name="DankPyon_ShieldHeaterBase" or
+ defName="DankPyon_ShieldLiving" or
+ defName="DankPyon_ShieldLindwurm"]/statBases
8
5
-
-
+
- Defs/ThingDef[@Name="DankPyon_BaseShield"]/equippedStatOffsets
+ Defs/ThingDef[defName="DankPyon_Shield"]/statBases/StuffEffectMultiplierArmor
-
- -0.2
- -1
- -0.15
- -0.08
- -0.25
- -0.05
- 1.0
-
+ 2.5
-
-
-
- Defs/ThingDef[defName="DankPyon_Shield"]/statBases/StuffEffectMultiplierArmor
+
+ Defs/ThingDef[defName="DankPyon_Shield"]
- 2.5
+
+
+ DankPyon_RoundShield
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/IconShield
+ CutoutComplex
+ ApparelBody
+
+ 0.6
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.15)
+
+
+ (0.15, 0, -0.15)
+
+
+
+
+
+
Defs/ThingDef[defName="DankPyon_ShieldKite"]/statBases/StuffEffectMultiplierArmor
@@ -103,6 +159,48 @@
+
+ Defs/ThingDef[defName="DankPyon_ShieldKite"]
+
+
+
+ DankPyon_ShieldKite
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/IconKite
+ CutoutComplex
+ ApparelBody
+
+ 0.55
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.2, 0, -0.2)
+
+
+ (0.2, 0, -0.2)
+
+
+
+
+
+
+
+
+
Defs/ThingDef[defName="DankPyon_ShieldHeater"]/statBases/StuffEffectMultiplierArmor
@@ -110,14 +208,224 @@
+
+ Defs/ThingDef[defName="DankPyon_ShieldHeater"]
+
+
+
+ DankPyon_ShieldHeater
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/IconHeater
+ CutoutComplex
+ ApparelBody
+
+ 0.55
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.2, 0, -0.2)
+
+
+ (0.2, 0, -0.2)
+
+
+
+
+
+
+
+
+
Defs/ThingDef[@Name="DankPyon_ShieldHeaterBase"]/statBases/StuffEffectMultiplierArmor
2.85
-
-
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldHeater_Amboise"]
+
+
+
+ DankPyon_ShieldHeater_Amboise
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/HeaterAmboise/HeaterAmboise
+ CutoutComplex
+ ApparelBody
+
+ 0.55
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.2, 0, -0.2)
+
+
+ (0.2, 0, -0.2)
+
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldHeater_Soren"]
+
+
+
+ DankPyon_ShieldHeater_Soren
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/HeaterSoren/HeaterSoren
+ CutoutComplex
+ ApparelBody
+
+ 0.55
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.2, 0, -0.2)
+
+
+ (0.2, 0, -0.2)
+
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldHeater_Oswin"]
+
+
+
+ DankPyon_ShieldHeater_Oswin
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/HeaterOswin/HeaterOswin
+ CutoutComplex
+ ApparelBody
+
+ 0.55
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.2, 0, -0.2)
+
+
+ (0.2, 0, -0.2)
+
+
+
+
+
+
+
+
+
+
+ Defs/ThingDef[defName="DankPyon_ShieldHeater_Hesse"]
+
+
+
+ DankPyon_ShieldHeater_Hesse
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/HeaterHesse/HeaterHesse
+ CutoutComplex
+ ApparelBody
+
+ 0.55
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.2, 0, -0.2)
+
+
+ (0.2, 0, -0.2)
+
+
+
+
+
+
+
+
+
Defs/ThingDef[defName="DankPyon_ShieldLiving"]/statBases/ArmorRating_Sharp
@@ -139,7 +447,49 @@
-
+
+ Defs/ThingDef[defName="DankPyon_ShieldLiving"]
+
+
+
+ DankPyon_ShieldSchrat
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/HeaterSchrat/HeaterSchrat
+ CutoutComplex
+ ApparelBody
+
+ 0.55
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.15, 0, -0.15)
+
+
+ (0.15, 0, -0.15)
+
+
+
+
+
+
+
+
+
+
Defs/ThingDef[defName="DankPyon_ShieldLindwurm"]/statBases/ArmorRating_Sharp
@@ -161,4 +511,46 @@
+
+ Defs/ThingDef[defName="DankPyon_ShieldLindwurm"]
+
+
+
+ DankPyon_ShieldSchrat
+
+
+
+ CombatExtended.PawnRenderNode_Apparel
+ CombatExtended.PawnRenderNodeWorker_Drafted
+ Apparel/Utility/HeaterLindwurm/HeaterLindwurm
+ CutoutComplex
+ ApparelBody
+
+ 0.55
+
+ 80
+
+
+ -5
+ (0, 0, -0.1)
+ 30
+
+
+ -30
+
+
+ -5
+ (0.2, 0, -0.2)
+
+
+ (0.2, 0, -0.2)
+
+
+
+
+
+
+
+
+
\ No newline at end of file