Tweaks and housekeeping

no helms only for the power armored pawns
CombatExtended-Continued · Jun 7, 2024 · 9ccc59c · 9ccc59c
1 parent 297de0c
commit 9ccc59c
Showing 1 changed file with 48 additions and 23 deletions.
diff --git a/Royalty/Patches/PawnKindDefs_Royalty/PawnKinds_Royalty.xml b/Royalty/Patches/PawnKindDefs_Royalty/PawnKinds_Royalty.xml
@@ -29,12 +29,7 @@
 
 	<!-- ========== Fighters ========== -->
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/PawnKindDef[@Name="ImperialFighterBase"]</xpath>
-		<value>
-			<apparelIgnoreSeasons>true</apparelIgnoreSeasons>
-		</value>
-	</Operation>
+	<!-- ====== Trooper ====== -->
 
 	<Operation Class="PatchOperationAddModExtension">
 		<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Trooper"]</xpath>
@@ -88,8 +83,17 @@
 		</value>
 	</Operation>
 
+	<!-- ====== Janissary ====== -->
+
 	<!--removed gunlink-->
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Janissary"]</xpath>
+		<value>
+			<apparelIgnoreSeasons>true</apparelIgnoreSeasons>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationRemove">
 		<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Janissary"]/specificApparelRequirements/li[bodyPartGroup="UpperHead"]/alternateTagChoices/li[tag="Gunlink"]</xpath>
 	</Operation>
@@ -146,6 +150,8 @@
 		</value>
 	</Operation>
 
+	<!-- ====== Champion ====== -->
+
 	<Operation Class="PatchOperationAddModExtension">
 		<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Champion"]</xpath>
 		<value>
@@ -194,27 +200,26 @@
 		</value>
 	</Operation>
 
+	<!-- ====== Grenadier ====== -->
+
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/PawnKindDef[@Name="CataphractBase"]</xpath>
+		<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Grenadier"]</xpath>
 		<value>
-			<minGenerationAge>18</minGenerationAge>
+			<apparelIgnoreSeasons>true</apparelIgnoreSeasons>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Cataphract"]/weaponTags</xpath>
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Grenadier"]/weaponTags</xpath>
 		<value>
-			<li>Minigun</li>
+			<weaponTags>
+				<li>GunHeavy</li>
+			</weaponTags>
 		</value>
 	</Operation>
 
-	<!--removed gunlink-->
-	<Operation Class="PatchOperationRemove">
-		<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Cataphract"]/specificApparelRequirements/li[1]</xpath>
-	</Operation>
-
 	<Operation Class="PatchOperationAddModExtension">
-		<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Cataphract"]</xpath>
+		<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Grenadier"]</xpath>
 		<value>
 			<li Class="CombatExtended.LoadoutPropertiesExtension">
 				<primaryMagazineCount>
@@ -265,17 +270,37 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Grenadier"]/weaponTags</xpath>
+	<!-- ====== Cataphracts ====== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[@Name="CataphractBase"]</xpath>
 		<value>
-			<weaponTags>
-				<li>GunHeavy</li>
-			</weaponTags>
+			<apparelIgnoreSeasons>true</apparelIgnoreSeasons>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[@Name="CataphractBase"]</xpath>
+		<value>
+			<minGenerationAge>18</minGenerationAge>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Cataphract"]/weaponTags</xpath>
+		<value>
+			<li>Minigun</li>
 		</value>
 	</Operation>
 
+	<!--removed gunlink-->
+
+	<Operation Class="PatchOperationRemove">
+		<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Cataphract"]/specificApparelRequirements/li[1]</xpath>
+	</Operation>
+
 	<Operation Class="PatchOperationAddModExtension">
-		<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Grenadier"]</xpath>
+		<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Cataphract"]</xpath>
 		<value>
 			<li Class="CombatExtended.LoadoutPropertiesExtension">
 				<primaryMagazineCount>