Merge upstream CE

up until CombatExtended-Continued/CombatExtended@1c00423 Highlight PR(s): CombatExtended-Continued/CombatExtended#3134
masakitenchi · Jun 11, 2024 · 80b4596 · 80b4596
1 parent f64f5a2
commit 80b4596
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 24 deletions.
diff --git a/Mods/CombatExtended/Assemblies/CombatExtended.dll b/Mods/CombatExtended/Assemblies/CombatExtended.dll
diff --git a/Mods/CombatExtended/AssembliesCompat/BetterTurretsCompat.dll b/Mods/CombatExtended/AssembliesCompat/BetterTurretsCompat.dll
diff --git a/Mods/CombatExtended/AssembliesCompat/MiscTurretsCompat.dll b/Mods/CombatExtended/AssembliesCompat/MiscTurretsCompat.dll
diff --git a/Mods/CombatExtended/AssembliesCompat/MultiplayerCompat.dll b/Mods/CombatExtended/AssembliesCompat/MultiplayerCompat.dll
diff --git a/Mods/CombatExtended/AssembliesCompat/SRTSCompat.dll b/Mods/CombatExtended/AssembliesCompat/SRTSCompat.dll
diff --git a/Mods/CombatExtended/AssembliesCompat/VehiclesCompat.dll b/Mods/CombatExtended/AssembliesCompat/VehiclesCompat.dll
diff --git a/Mods/CombatExtended/Languages/English/Keyed/Keys.xml b/Mods/CombatExtended/Languages/English/Keyed/Keys.xml
@@ -122,7 +122,10 @@
 	<CE_degrees>&#176;</CE_degrees>
 	<CE_meters>m</CE_meters>
 	<CE_WeaponPenetrationFactor>Weapon penetration factor</CE_WeaponPenetrationFactor>
+  <CE_WeaponPenetrationSkillFactor>Skill factor</CE_WeaponPenetrationSkillFactor>
+  <CE_WeaponPenetrationOtherFactors>Other factors</CE_WeaponPenetrationOtherFactors>
 	<CE_AdjustedForWeapon>Adjusted for weapon</CE_AdjustedForWeapon>
+  <CE_RangedQualityMultiplier>Penetration quality factor</CE_RangedQualityMultiplier>
 	<CE_DPS>Damage per second</CE_DPS>
 	<CE_DamageVariation>Damage variation</CE_DamageVariation>
 	<CE_FinalAverageDamage>Final average damage</CE_FinalAverageDamage>

diff --git a/Mods/CombatExtended/Languages/Russian/Keyed/Keys.xml b/Mods/CombatExtended/Languages/Russian/Keyed/Keys.xml
@@ -121,7 +121,10 @@
 	<CE_degrees>°</CE_degrees>
 	<CE_meters>м</CE_meters>
 	<CE_WeaponPenetrationFactor>Фактор бронепробития</CE_WeaponPenetrationFactor>
+  <CE_WeaponPenetrationSkillFactor>Фактор навыка</CE_WeaponPenetrationSkillFactor>
+  <CE_WeaponPenetrationOtherFactors>Другие факторы (гены, здоровье и др.)</CE_WeaponPenetrationOtherFactors>
 	<CE_AdjustedForWeapon>С поправкой на оружие</CE_AdjustedForWeapon>
+  <CE_RangedQualityMultiplier>Фактор качества</CE_RangedQualityMultiplier>
 	<CE_DPS>Урон в секунду</CE_DPS>
 	<CE_DamageVariation>Разброс урона</CE_DamageVariation>
 	<CE_FinalAverageDamage>Итоговый средний урон</CE_FinalAverageDamage>

diff --git a/Mods/CombatExtended/Patches/Core/Storyteller/Incidents_Map_Threats.txt b/Mods/CombatExtended/Patches/Core/Storyteller/Incidents_Map_Threats.txt
diff --git a/Mods/CombatExtended/Patches/Core/Storyteller/Incidents_Map_Threats.xml b/Mods/CombatExtended/Patches/Core/Storyteller/Incidents_Map_Threats.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Delay ship crash -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/IncidentDef[defName="PsychicEmanatorShipPartCrash" or defName="PoisonShipPartCrash"]</xpath>
+		<value>
+			<earliestDay>60</earliestDay>
+		</value>
+	</Operation>
+
+</Patch>
diff --git a/Mods/CombatExtended/Royalty/Patches/IncidentDefs/Incidents_Map_Misc.xml b/Mods/CombatExtended/Royalty/Patches/IncidentDefs/Incidents_Map_Misc.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- Delay mech siege -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/IncidentDef[defName="MechCluster"]</xpath>
+		<value>
+			<earliestDay>60</earliestDay>
+		</value>
+	</Operation>
+
+</Patch>
diff --git a/Mods/CombatExtended/Royalty/Patches/PawnKindDefs_Royalty/PawnKinds_Royalty.xml b/Mods/CombatExtended/Royalty/Patches/PawnKindDefs_Royalty/PawnKinds_Royalty.xml
@@ -182,6 +182,24 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/PawnKindDef[defName="Empire_Fighter_Champion"]</xpath>
+		<value>
+			<specificApparelRequirements>
+				<li>
+					<bodyPartGroup>Torso</bodyPartGroup>
+					<apparelLayer>Shell</apparelLayer>
+					<stuff>Plasteel</stuff>
+				</li>
+				<li>
+					<bodyPartGroup>FullHead</bodyPartGroup>
+					<apparelLayer>Overhead</apparelLayer>
+					<stuff>Plasteel</stuff>
+				</li>
+			</specificApparelRequirements>
+		</value>
+	</Operation>
+
 	<!-- ====== Grenadier ====== -->
 
 	<Operation Class="PatchOperationAdd">