Merge branch 'Development' into pr/Tostov/3408

CombatExtended-Continued · Sep 24, 2024 · 355cf1c · 355cf1c
2 parents a07415c + 13c4b5b
commit 355cf1c
Show file tree

Hide file tree

Showing 198 changed files with 7,469 additions and 649 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <ModMetaData>
 
 	<name>Combat Extended</name>
@@ -55,7 +55,7 @@
 		<li>TheKingInYellow.Lope</li>
 		<li>Ludeon.RimWorld</li>
 		<li>Ludeon.RimWorld.Royalty</li>
-    <li>Ludeon.RimWorld.Anomaly</li>
+		<li>Ludeon.RimWorld.Anomaly</li>
 		<li>RunneLatki.RabbieRaceMod</li>
 		<li>HC.GiantRace</li>
 		<li>neronix17.fr.compilation</li>
@@ -87,7 +87,8 @@
 		<li>Argon.VMEu</li>
 		<li>Bonible.rimsenalfactions</li>
 		<li>kentington.saveourship2</li>
+		<li>botchjob.profaned</li>
 		<li>oskarpotocki.vfe.mechanoid</li>
 	</loadAfter>
 
-</ModMetaData>
+</ModMetaData>
diff --git a/Anomaly/Patches/Hediffs/Hediffs_BodyParts_Prosthetic.xml b/Anomaly/Patches/Hediffs/Hediffs_BodyParts_Prosthetic.xml
@@ -26,7 +26,7 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/HediffDef[defName="GhoulPlating"]/stages/li/statFactors/IncomingDamageFactor</xpath>
 		<value>
-			<IncomingDamageFactor>0.25</IncomingDamageFactor>
+			<IncomingDamageFactor>0.75</IncomingDamageFactor>
 		</value>
 	</Operation>
 
@@ -46,4 +46,4 @@
 		</value>
 	</Operation>
 
-</Patch>
+</Patch>
diff --git a/Defs/Ammo/Advanced/30x64mmFuelCell.xml b/Defs/Ammo/Advanced/30x64mmFuelCell.xml
@@ -46,7 +46,7 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>4.66</MarketValue>
+			<MarketValue>6.69</MarketValue>
 		</statBases>
 		<ammoClass>IncendiaryFuel</ammoClass>
 	</ThingDef>
@@ -59,7 +59,7 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>6.18</MarketValue>
+			<MarketValue>10.1</MarketValue>
 		</statBases>
 		<ammoClass>ThermobaricFuel</ammoClass>
 	</ThingDef>
@@ -72,7 +72,7 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>4.93</MarketValue>
+			<MarketValue>7.22</MarketValue>
 		</statBases>
 		<ammoClass>FoamFuel</ammoClass>
 		<generateAllowChance>0</generateAllowChance>
@@ -98,8 +98,8 @@
 		<label>incendiary bolt</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>PrometheumFlame</damageDef>
-			<damageAmountBase>6</damageAmountBase>
-			<explosionRadius>4.5</explosionRadius>
+			<damageAmountBase>10</damageAmountBase>
+			<explosionRadius>6</explosionRadius>
 			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
 			<preExplosionSpawnChance>0.2</preExplosionSpawnChance>
 			<ai_IsIncendiary>true</ai_IsIncendiary>
@@ -111,9 +111,9 @@
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<label>thermobaric bolt</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>2.0</explosionRadius>
+			<explosionRadius>2.5</explosionRadius>
 			<damageDef>Thermobaric</damageDef>
-			<damageAmountBase>48</damageAmountBase>
+			<damageAmountBase>78</damageAmountBase>
 			<soundExplode>MortarBomb_Explode</soundExplode>
 			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 			<ai_IsIncendiary>true</ai_IsIncendiary>
@@ -128,7 +128,7 @@
 			<damageDef>Extinguish</damageDef>
 			<suppressionFactor>0.0</suppressionFactor>
 			<dangerFactor>0.0</dangerFactor>
-			<explosionRadius>3</explosionRadius>
+			<explosionRadius>4</explosionRadius>
 			<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
 			<preExplosionSpawnChance>1</preExplosionSpawnChance>
 		</projectile>
@@ -157,7 +157,7 @@
 						<li>Prometheum</li>
 					</thingDefs>
 				</filter>
-				<count>14</count>
+				<count>30</count>
 			</li>
 			<li>
 				<filter>
@@ -178,7 +178,7 @@
 		<products>
 			<Ammo_30x64mmFuel_Incendiary>50</Ammo_30x64mmFuel_Incendiary>
 		</products>
-		<workAmount>10800</workAmount>
+		<workAmount>17200</workAmount>
 	</RecipeDef>
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
@@ -202,7 +202,7 @@
 						<li>FSX</li>
 					</thingDefs>
 				</filter>
-				<count>21</count>
+				<count>46</count>
 			</li>
 			<li>
 				<filter>
@@ -222,7 +222,7 @@
 		<products>
 			<Ammo_30x64mmFuel_Thermobaric>50</Ammo_30x64mmFuel_Thermobaric>
 		</products>
-		<workAmount>13600</workAmount>
+		<workAmount>23600</workAmount>
 	</RecipeDef>
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
@@ -250,7 +250,7 @@
 						<li>MeatRaw</li>
 					</categories>
 				</filter>
-				<count>47</count>
+				<count>100</count>
 			</li>
 			<li>
 				<filter>
@@ -273,7 +273,7 @@
 		<products>
 			<Ammo_30x64mmFuel_Foam>50</Ammo_30x64mmFuel_Foam>
 		</products>
-		<workAmount>14600</workAmount>
+		<workAmount>25200</workAmount>
 	</RecipeDef>
 
 </Defs>
diff --git a/Defs/Ammo/Grenade/20x42mmGrenade.xml b/Defs/Ammo/Grenade/20x42mmGrenade.xml
@@ -195,7 +195,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>12</amount>
+					<amount>24</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -211,7 +211,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>19</amount>
+					<amount>33</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/Grenade/25x59mmGrenade.xml b/Defs/Ammo/Grenade/25x59mmGrenade.xml
@@ -188,7 +188,7 @@
 			</li>
 			<li Class="CombatExtended.CompProperties_Fragments">
 				<fragments>
-					<Fragment_Small>12</Fragment_Small>
+					<Fragment_Small>9</Fragment_Small>
 				</fragments>
 			</li>
 		</comps>

diff --git a/Defs/Ammo/Grenade/30x29mmGrenade.xml b/Defs/Ammo/Grenade/30x29mmGrenade.xml
@@ -175,7 +175,7 @@
 		<label>30x29mm grenade (HEDP)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Bullet</damageDef>
-			<damageAmountBase>35</damageAmountBase>
+			<damageAmountBase>36</damageAmountBase>
 			<armorPenetrationSharp>45</armorPenetrationSharp>
 			<armorPenetrationBlunt>5.569</armorPenetrationBlunt>
 		</projectile>
@@ -188,7 +188,7 @@
 			</li>
 			<li Class="CombatExtended.CompProperties_Fragments">
 				<fragments>
-					<Fragment_Small>14</Fragment_Small>
+					<Fragment_Small>11</Fragment_Small>
 				</fragments>
 			</li>
 		</comps>

diff --git a/Defs/Ammo/Grenade/35x32mmSRGrenade.xml b/Defs/Ammo/Grenade/35x32mmSRGrenade.xml
@@ -150,7 +150,7 @@
 			</li>
 			<li Class="CombatExtended.CompProperties_Fragments">
 				<fragments>
-					<Fragment_Small>15</Fragment_Small>
+					<Fragment_Small>8</Fragment_Small>
 				</fragments>
 			</li>
 		</comps>

diff --git a/Defs/Ammo/Grenade/40x46mmGrenade.xml b/Defs/Ammo/Grenade/40x46mmGrenade.xml
@@ -205,7 +205,7 @@
 			</li>
 			<li Class="CombatExtended.CompProperties_Fragments">
 				<fragments>
-					<Fragment_Small>10</Fragment_Small>
+					<Fragment_Small>7</Fragment_Small>
 				</fragments>
 			</li>
 		</comps>

diff --git a/Defs/Ammo/Grenade/40x53mmGrenade.xml b/Defs/Ammo/Grenade/40x53mmGrenade.xml
@@ -177,7 +177,7 @@
 		<label>40x53mm grenade (HEDP)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Bullet</damageDef>
-			<damageAmountBase>36</damageAmountBase>
+			<damageAmountBase>37</damageAmountBase>
 			<armorPenetrationSharp>76</armorPenetrationSharp>
 			<armorPenetrationBlunt>5.768</armorPenetrationBlunt>
 		</projectile>
@@ -190,7 +190,7 @@
 			</li>
 			<li Class="CombatExtended.CompProperties_Fragments">
 				<fragments>
-					<Fragment_Small>16</Fragment_Small>
+					<Fragment_Small>13</Fragment_Small>
 				</fragments>
 			</li>
 		</comps>

diff --git a/Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml b/Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml
@@ -158,7 +158,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>16</amount>
+					<amount>15</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -174,7 +174,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>23</amount>
+					<amount>20</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml b/Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml
@@ -157,7 +157,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>16</amount>
+					<amount>15</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -173,7 +173,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>24</amount>
+					<amount>21</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml b/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml
@@ -158,7 +158,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>21</amount>
+					<amount>17</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -174,7 +174,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>32</amount>
+					<amount>24</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/2-Bore.xml b/Defs/Ammo/HighCaliber/2-Bore.xml
@@ -158,7 +158,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>22</amount>
+					<amount>37</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -174,7 +174,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>34</amount>
+					<amount>51</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/20x102mmNATO.xml b/Defs/Ammo/HighCaliber/20x102mmNATO.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>27</amount>
+					<amount>22</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>42</amount>
+					<amount>31</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/20x110mmHispano.xml b/Defs/Ammo/HighCaliber/20x110mmHispano.xml
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>39</amount>
+					<amount>35</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/20x128mmOerlikon.xml b/Defs/Ammo/HighCaliber/20x128mmOerlikon.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>30</amount>
+					<amount>25</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>45</amount>
+					<amount>35</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/20x138mmB.xml b/Defs/Ammo/HighCaliber/20x138mmB.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>27</amount>
+					<amount>26</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>41</amount>
+					<amount>35</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>

diff --git a/Defs/Ammo/HighCaliber/20x139mm.xml b/Defs/Ammo/HighCaliber/20x139mm.xml
@@ -133,7 +133,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Flame_Secondary</def>
-					<amount>30</amount>
+					<amount>26</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>
@@ -149,7 +149,7 @@
 			<secondaryDamage>
 				<li>
 					<def>Bomb_Secondary</def>
-					<amount>46</amount>
+					<amount>35</amount>
 				</li>
 			</secondaryDamage>
 		</projectile>