Merge branch 'Development' of https://github.com/CombatExtended-Conti…

…nued/CombatExtended into world-tile-damage-change
CombatExtended-Continued · Oct 24, 2023 · cb03bbb · cb03bbb
2 parents ba96587 + 74fc44e
commit cb03bbb
Show file tree

Hide file tree

Showing 450 changed files with 14,816 additions and 4,105 deletions.
diff --git a/Biotech/Patches/ThingDefs_Misc/Weapons/RangedIndustrial_Biotech.xml b/Biotech/Patches/ThingDefs_Misc/Weapons/RangedIndustrial_Biotech.xml
@@ -155,7 +155,7 @@
 			<Bulk>1.05</Bulk>
 			<MarketValue>10.15</MarketValue>
 			<RangedWeapon_Cooldown>1</RangedWeapon_Cooldown>
-			<SightsEfficiency>0.65</SightsEfficiency>
+			<SightsEfficiency>1.0</SightsEfficiency>
 		</statBases>
 		<Properties>
 			<label>throw tox grenade</label>

diff --git a/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml b/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml
@@ -87,7 +87,7 @@
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Mech_Legionary"]/statBases</xpath>
 		<value>
-			<CarryWeight>60</CarryWeight>
+			<CarryWeight>75</CarryWeight>
 			<CarryBulk>40</CarryBulk>
 			<MeleeDodgeChance>0.12</MeleeDodgeChance>
 			<MeleeCritChance>0.11</MeleeCritChance>
@@ -265,7 +265,7 @@
 		<xpath>Defs/ThingDef[defName="Mech_Apocriton"]/statBases</xpath>
 		<value>
 			<ArmorRating_Heat>0.5</ArmorRating_Heat>
-			<CarryWeight>60</CarryWeight>
+			<CarryWeight>75</CarryWeight>
 			<CarryBulk>30</CarryBulk>
 			<MeleeDodgeChance>0.07</MeleeDodgeChance>
 			<MeleeCritChance>0.13</MeleeCritChance>

diff --git a/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_SuperHeavy.xml b/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_SuperHeavy.xml
@@ -52,22 +52,22 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Mech_Centurion"]/statBases/EnergyShieldRechargeRate</xpath>
 		<value>
-			<EnergyShieldRechargeRate>0.75</EnergyShieldRechargeRate>
+			<EnergyShieldRechargeRate>1.0</EnergyShieldRechargeRate>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Mech_Centurion"]/statBases/EnergyShieldEnergyMax</xpath>
 		<value>
-			<EnergyShieldEnergyMax>4.5</EnergyShieldEnergyMax>
+			<EnergyShieldEnergyMax>6.0</EnergyShieldEnergyMax>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Mech_Centurion"]/statBases</xpath>
 		<value>
 			<ArmorRating_Heat>0.25</ArmorRating_Heat>
-			<CarryWeight>100</CarryWeight>
+			<CarryWeight>50</CarryWeight>
 			<CarryBulk>50</CarryBulk>
 			<AimingAccuracy>1.0</AimingAccuracy>
 			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
@@ -81,7 +81,7 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Mech_Centurion"]/comps/li[@Class="CompProperties_ProjectileInterceptor"]/hitPoints</xpath>
 		<value>
-			<hitPoints>450</hitPoints>
+			<hitPoints>600</hitPoints>
 		</value>
 	</Operation>
 
@@ -167,7 +167,7 @@
 		<xpath>Defs/ThingDef[defName="Mech_Warqueen"]/statBases</xpath>
 		<value>
 			<ArmorRating_Heat>0.5</ArmorRating_Heat>
-			<CarryWeight>100</CarryWeight>
+			<CarryWeight>75</CarryWeight>
 			<CarryBulk>50</CarryBulk>
 			<AimingAccuracy>1.0</AimingAccuracy>
 			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
@@ -247,7 +247,7 @@
 		<xpath>Defs/ThingDef[defName="Mech_Diabolus"]/statBases</xpath>
 		<value>
 			<ArmorRating_Heat>0.5</ArmorRating_Heat>
-			<CarryWeight>300</CarryWeight>
+			<CarryWeight>75</CarryWeight>
 			<CarryBulk>60</CarryBulk>
 			<AimingAccuracy>1.0</AimingAccuracy>
 			<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>

diff --git a/Defs/Ammo/Advanced/10x18mmCharged.xml b/Defs/Ammo/Advanced/10x18mmCharged.xml
@@ -41,7 +41,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="10x18mmChargedBase">
 		<defName>Ammo_10x18mmCharged</defName>
-		<label>10x18mm Charged cartridge</label>
+		<label>10x18mm Charged</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/SmallRegular</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -54,7 +54,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="10x18mmChargedBase">
 		<defName>Ammo_10x18mmCharged_AP</defName>
-		<label>10x18mm Charged cartridge (Conc.)</label>
+		<label>10x18mm Charged (Conc.)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/SmallConc</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -67,7 +67,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="10x18mmChargedBase">
 		<defName>Ammo_10x18mmCharged_Ion</defName>
-		<label>10x18mm Charged cartridge (Ion)</label>
+		<label>10x18mm Charged (Ion)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/SmallIon</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>

diff --git a/Defs/Ammo/Advanced/12GaugeCharged.xml b/Defs/Ammo/Advanced/12GaugeCharged.xml
@@ -40,7 +40,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugeChargedBase">
 		<defName>Ammo_12GaugeCharged</defName>
-		<label>12 gauge charged shell</label>
+		<label>12 gauge charged</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/ShotgunRegular</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -53,7 +53,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugeChargedBase">
 		<defName>Ammo_12GaugeCharged_Slug</defName>
-		<label>12 gauge charged shell (Slug)</label>
+		<label>12 gauge charged (Slug)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/ShotgunConc</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -67,7 +67,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="12GaugeChargedBase">
 		<defName>Ammo_12GaugeCharged_Ion</defName>
-		<label>12 gauge charged shell (Ion Shot)</label>
+		<label>12 gauge charged (Ion Shot)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/ShotgunIon</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>

diff --git a/Defs/Ammo/Advanced/12mmRailgun.xml b/Defs/Ammo/Advanced/12mmRailgun.xml
@@ -22,7 +22,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerMediumAmmoBase">
 		<defName>Ammo_12mmRailgun_Sabot</defName>
-		<label>12mm Railgun cartridge (Sabot)</label>
+		<label>12mm Railgun (Sabot)</label>
 		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for large-caliber railgun weapons.</description>
 		<statBases>
 			<Mass>0.051</Mass>

diff --git a/Defs/Ammo/Advanced/12x64mmCharged.xml b/Defs/Ammo/Advanced/12x64mmCharged.xml
@@ -39,7 +39,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="12x64mmChargedBase">
 		<defName>Ammo_12x64mmCharged</defName>
-		<label>12x64mm Charged cartridge</label>
+		<label>12x64mm Charged</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/LargeMech</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>

diff --git a/Defs/Ammo/Advanced/12x72mmCharged.xml b/Defs/Ammo/Advanced/12x72mmCharged.xml
@@ -41,7 +41,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="12x72mmChargedBase">
 		<defName>Ammo_12x72mmCharged</defName>
-		<label>12x72mm Charged cartridge</label>
+		<label>12x72mm Charged</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/LargeRegular</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -54,7 +54,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="12x72mmChargedBase">
 		<defName>Ammo_12x72mmCharged_AP</defName>
-		<label>12x72mm Charged cartridge (Conc.)</label>
+		<label>12x72mm Charged (Conc.)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/LargeConc</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -67,7 +67,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="12x72mmChargedBase">
 		<defName>Ammo_12x72mmCharged_Ion</defName>
-		<label>12x72mm Charged cartridge (Ion)</label>
+		<label>12x72mm Charged (Ion)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/LargeIon</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>

diff --git a/Defs/Ammo/Advanced/15x65mmDiffusingCharged.xml b/Defs/Ammo/Advanced/15x65mmDiffusingCharged.xml
@@ -37,7 +37,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="15x65mmDiffusingChargedBase">
 		<defName>Ammo_15x65mmDiffusingCharged</defName>
-		<label>15x65mm Diffusing Charged cartridge</label>
+		<label>15x65mm Diffusing Charged</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/ShotgunMech</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>

diff --git a/Defs/Ammo/Advanced/164x284mmDemoShell.xml b/Defs/Ammo/Advanced/164x284mmDemoShell.xml
@@ -38,7 +38,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="164x284mmDemoBase">
 		<defName>Ammo_164x284mmDemo</defName>
-		<label>164x284mm Demolition Shell</label>
+		<label>164x284mm demolition shell</label>
 		<graphicData>
 			<texPath>Things/Ammo/FuelCell/Large</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>

diff --git a/Defs/Ammo/Advanced/20x105mmCharged.xml b/Defs/Ammo/Advanced/20x105mmCharged.xml
@@ -41,7 +41,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="20x105mmChargedBase">
 		<defName>Ammo_20x105mmCharged</defName>
-		<label>20x105mm Charged cartridge</label>
+		<label>20x105mm Charged</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/LargeRegular</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -54,7 +54,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="20x105mmChargedBase">
 		<defName>Ammo_20x105mmCharged_AP</defName>
-		<label>20x105mm Charged cartridge (Conc.)</label>
+		<label>20x105mm Charged (Conc.)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/LargeConc</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -67,7 +67,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="20x105mmChargedBase">
 		<defName>Ammo_20x105mmCharged_Ion</defName>
-		<label>20x105mm Charged cartridge (Ion)</label>
+		<label>20x105mm Charged (Ion)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/LargeIon</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>

diff --git a/Defs/Ammo/Advanced/5x16mmCharged.xml b/Defs/Ammo/Advanced/5x16mmCharged.xml
@@ -39,7 +39,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="5x16mmChargedBase">
 		<defName>Ammo_5x16mmCharged</defName>
-		<label>5x16mm Charged cartridge</label>
+		<label>5x16mm Charged</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/SmallMech</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>

diff --git a/Defs/Ammo/Advanced/5x35mmCharged.xml b/Defs/Ammo/Advanced/5x35mmCharged.xml
@@ -39,7 +39,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="5x35mmChargedBase">
 		<defName>Ammo_5x35mmCharged</defName>
-		<label>5x35mm Charged cartridge</label>
+		<label>5x35mm Charged</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/MediumMech</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>

diff --git a/Defs/Ammo/Advanced/60x225mmGammaShell.xml b/Defs/Ammo/Advanced/60x225mmGammaShell.xml
@@ -37,7 +37,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="60x225mmGammaBase">
 		<defName>Ammo_60x225mmGamma_Standard</defName>
-		<label>60x225mm Gamma Shell (Standard)</label>
+		<label>60x225mm gamma shell (Standard)</label>
 		<graphicData>
 			<texPath>Things/Ammo/FuelCell/Large</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>

diff --git a/Defs/Ammo/Advanced/6mmRailgun.xml b/Defs/Ammo/Advanced/6mmRailgun.xml
@@ -22,7 +22,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerSmallAmmoBase">
 		<defName>Ammo_6mmRailgun_Sabot</defName>
-		<label>6mm Railgun cartridge (Sabot)</label>
+		<label>6mm Railgun (Sabot)</label>
 		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles.</description>
 		<statBases>
 			<Mass>0.01</Mass>

diff --git a/Defs/Ammo/Advanced/6x18mmCharged.xml b/Defs/Ammo/Advanced/6x18mmCharged.xml
@@ -41,7 +41,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x18mmChargedBase">
 		<defName>Ammo_6x18mmCharged</defName>
-		<label>6x18mm Charged cartridge</label>
+		<label>6x18mm Charged</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/SmallRegular</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -54,7 +54,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x18mmChargedBase">
 		<defName>Ammo_6x18mmCharged_AP</defName>
-		<label>6x18mm Charged cartridge (Conc.)</label>
+		<label>6x18mm Charged (Conc.)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/SmallConc</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -67,7 +67,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x18mmChargedBase">
 		<defName>Ammo_6x18mmCharged_Ion</defName>
-		<label>6x18mm Charged cartridge (Ion)</label>
+		<label>6x18mm Charged (Ion)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/SmallIon</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>

diff --git a/Defs/Ammo/Advanced/6x22mmCharged.xml b/Defs/Ammo/Advanced/6x22mmCharged.xml
@@ -39,7 +39,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x22mmChargedBase">
 		<defName>Ammo_6x22mmCharged</defName>
-		<label>6x22mm Charged cartridge</label>
+		<label>6x22mm Charged</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/MediumMech</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>

diff --git a/Defs/Ammo/Advanced/6x24mmCharged.xml b/Defs/Ammo/Advanced/6x24mmCharged.xml
@@ -41,7 +41,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x24mmChargedBase">
 		<defName>Ammo_6x24mmCharged</defName>
-		<label>6x24mm Charged cartridge</label>
+		<label>6x24mm Charged</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/MediumRegular</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -54,7 +54,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x24mmChargedBase">
 		<defName>Ammo_6x24mmCharged_AP</defName>
-		<label>6x24mm Charged cartridge (Conc.)</label>
+		<label>6x24mm Charged (Conc.)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/MediumConc</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -67,7 +67,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="6x24mmChargedBase">
 		<defName>Ammo_6x24mmCharged_Ion</defName>
-		<label>6x24mm Charged cartridge (Ion)</label>
+		<label>6x24mm Charged (Ion)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/MediumIon</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>

diff --git a/Defs/Ammo/Advanced/8mmRailgun.xml b/Defs/Ammo/Advanced/8mmRailgun.xml
@@ -22,7 +22,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="SpacerAmmoBase">
 		<defName>Ammo_8mmRailgun_Sabot</defName>
-		<label>8mm Railgun cartridge (Sabot)</label>
+		<label>8mm Railgun (Sabot)</label>
 		<description>Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun pistols.</description>
 		<statBases>
 			<Mass>0.009</Mass>

diff --git a/Defs/Ammo/Advanced/8x35mmCharged.xml b/Defs/Ammo/Advanced/8x35mmCharged.xml
@@ -41,7 +41,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x35mmChargedBase">
 		<defName>Ammo_8x35mmCharged</defName>
-		<label>8x35mm Charged cartridge</label>
+		<label>8x35mm Charged</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/MediumRegular</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -54,7 +54,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x35mmChargedBase">
 		<defName>Ammo_8x35mmCharged_AP</defName>
-		<label>8x35mm Charged cartridge (Conc.)</label>
+		<label>8x35mm Charged (Conc.)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/MediumConc</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -67,7 +67,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x35mmChargedBase">
 		<defName>Ammo_8x35mmCharged_Ion</defName>
-		<label>8x35mm Charged cartridge (Ion)</label>
+		<label>8x35mm Charged (Ion)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/MediumIon</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>

diff --git a/Defs/Ammo/Advanced/8x40mmCharged.xml b/Defs/Ammo/Advanced/8x40mmCharged.xml
@@ -39,7 +39,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x40mmChargedBase">
 		<defName>Ammo_8x40mmCharged</defName>
-		<label>8x40mm Charged cartridge</label>
+		<label>8x40mm Charged</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/MediumMech</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>

diff --git a/Defs/Ammo/Advanced/8x50mmCharged.xml b/Defs/Ammo/Advanced/8x50mmCharged.xml
@@ -41,7 +41,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x50mmChargedBase">
 		<defName>Ammo_8x50mmCharged</defName>
-		<label>8x50mm Charged cartridge</label>
+		<label>8x50mm Charged</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/MediumRegular</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -54,7 +54,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x50mmChargedBase">
 		<defName>Ammo_8x50mmCharged_AP</defName>
-		<label>8x50mm Charged cartridge (Conc.)</label>
+		<label>8x50mm Charged (Conc.)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/MediumConc</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -67,7 +67,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="8x50mmChargedBase">
 		<defName>Ammo_8x50mmCharged_Ion</defName>
-		<label>8x50mm Charged cartridge (Ion)</label>
+		<label>8x50mm Charged (Ion)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Charged/MediumIon</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>