Development merge

CombatExtended-Continued · Jan 17, 2024 · 3473d87 · 3473d87
2 parents 8c3a115 + c810231
commit 3473d87
Show file tree

Hide file tree

Showing 238 changed files with 21,737 additions and 18,834 deletions.
diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -11,4 +11,4 @@
 	<showCrossPromotions>true</showCrossPromotions>
 	<manifestUri>https://raw.githubusercontent.com/CombatExtended-Continued/CombatExtended/master/About/Manifest.xml</manifestUri>
 	<downloadUri>https://github.com/CombatExtended-Continued/CombatExtended/releases/latest</downloadUri>
-</Manifest>
+</Manifest>
diff --git a/Biotech/Patches/GeneDefs/GeneDefs_Misc.xml b/Biotech/Patches/GeneDefs/GeneDefs_Misc.xml
@@ -44,15 +44,15 @@
 			</statFactors>
 		</value>
 	</Operation>
-	
+
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/GeneDef[defName="FireResistant"]/damageFactors</xpath>
 		<value>
 			<PrometheumFlame>0.25</PrometheumFlame>
 			<Flame_Secondary>0.25</Flame_Secondary>
 		</value>
 	</Operation>
-	
+
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/GeneDef[defName="FireWeakness"]/damageFactors</xpath>
 		<value>
@@ -61,4 +61,4 @@
 		</value>
 	</Operation>
 
-</Patch>
+</Patch>
diff --git a/Defs/Ammo/Lasers/BaseLaserProjectiles.xml b/Defs/Ammo/Lasers/BaseLaserProjectiles.xml
@@ -36,7 +36,7 @@
 		<textures>
 			<li>Things/Projectile/Laser_CE</li>
 		</textures>
-	</ThingDef>	
+	</ThingDef>
 
 	<!-- ================== White Laser ================== -->
 	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" Name="LaserBulletWhite" ParentName="BaseLaserBulletTextured" Abstract="True">

diff --git a/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml b/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml
@@ -33,7 +33,6 @@
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
-
 	<!-- ==================== Ammo ========================== -->
 
 	<ThingDef Class="CombatExtended.AmmoDef" Name="AmmoBolter75Base" ParentName="SmallAmmoBase" Abstract="True">
@@ -205,7 +204,7 @@
 		</comps>
 	</ThingDef>
 
-	<!-- For Warhammer 40k - Imperium Weaponry -->				
+	<!-- For Warhammer 40k - Imperium Weaponry -->
 	<ThingDef Name="BaseBolter75Bullet_Relic" ParentName="BaseBolter75Bullet" Abstract="true">
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<speed>95</speed>

diff --git a/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml b/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
-		<!-- "Whatever happens, we have got The Emperor's blessing. They have not." -->
+	<!-- "Whatever happens, we have got The Emperor's blessing. They have not." -->
 
-		<!-- === Ammo Sets === -->
-		<CombatExtended.AmmoSetDef>
-			<defName>AmmoSet_MeltaCharge</defName>
-			<label>melta charge</label>
-			<ammoTypes>
-				<Ammo_Flamethrower_Prometheum>Bullet_Laser_MeltaCharge</Ammo_Flamethrower_Prometheum>
-			</ammoTypes>
-		</CombatExtended.AmmoSetDef>
+	<!-- === Ammo Sets === -->
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_MeltaCharge</defName>
+		<label>melta charge</label>
+		<ammoTypes>
+			<Ammo_Flamethrower_Prometheum>Bullet_Laser_MeltaCharge</Ammo_Flamethrower_Prometheum>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
 
-		<!-- === Projectiles === -->
-		<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseBulletCE">
-			<defName>Bullet_Laser_MeltaCharge</defName>
-			<label>melta beam</label>
-			<thingClass>CombatExtended.Lasers.LaserBeamCE</thingClass>
-			<graphicData>
-				<texPath>ThirdParty/Warhammer/MeltaBeam</texPath>
-				<graphicClass>Graphic_Single</graphicClass>
-				<shaderType>Transparent</shaderType>
-				<color>(255,255,255)</color>
-			</graphicData>
-			<altitudeLayer>Projectile</altitudeLayer>
-			<beamGraphic>BeamGraphic</beamGraphic>
-			<beamWidth>0.4</beamWidth>
-			<textures>
-				<li>ThirdParty/Warhammer/MeltaBeam</li>
-			</textures>
-			<projectile Class="CombatExtended.ProjectilePropertiesCE">
-				<isInstant>true</isInstant>
-				<damageDef>Bullet</damageDef>
-				<damageAmountBase>150</damageAmountBase>
-				<armorPenetrationSharp>500</armorPenetrationSharp>
-				<armorPenetrationBlunt>0.001</armorPenetrationBlunt><!-- The overall pressure exerted by a laser beam striking something is, unsuprisingly, negligable. -->
-			</projectile>
-			<modExtensions>
-				<li Class="ProjectileImpactFX.EffectProjectileExtension">
-					<AutoAssign>false</AutoAssign>
-					<CreateTerrainEffects>false</CreateTerrainEffects>
-					<explosionFleckDef>Fleck_HeatGlow_API</explosionFleckDef>
-					<explosionFleckSize>4</explosionFleckSize>
-					<ImpactGlowFleckDef>ExplosionFlash</ImpactGlowFleckDef>
-					<ImpactGlowFleckSize>5</ImpactGlowFleckSize>
-				</li>
-			</modExtensions>
-		</ThingDef>
+	<!-- === Projectiles === -->
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseBulletCE">
+		<defName>Bullet_Laser_MeltaCharge</defName>
+		<label>melta beam</label>
+		<thingClass>CombatExtended.Lasers.LaserBeamCE</thingClass>
+		<graphicData>
+			<texPath>ThirdParty/Warhammer/MeltaBeam</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>Transparent</shaderType>
+			<color>(255,255,255)</color>
+		</graphicData>
+		<altitudeLayer>Projectile</altitudeLayer>
+		<beamGraphic>BeamGraphic</beamGraphic>
+		<beamWidth>0.4</beamWidth>
+		<textures>
+			<li>ThirdParty/Warhammer/MeltaBeam</li>
+		</textures>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<isInstant>true</isInstant>
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>150</damageAmountBase>
+			<armorPenetrationSharp>500</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt><!-- The overall pressure exerted by a laser beam striking something is, unsuprisingly, negligable. -->
+		</projectile>
+		<modExtensions>
+			<li Class="ProjectileImpactFX.EffectProjectileExtension">
+				<AutoAssign>false</AutoAssign>
+				<CreateTerrainEffects>false</CreateTerrainEffects>
+				<explosionFleckDef>Fleck_HeatGlow_API</explosionFleckDef>
+				<explosionFleckSize>4</explosionFleckSize>
+				<ImpactGlowFleckDef>ExplosionFlash</ImpactGlowFleckDef>
+				<ImpactGlowFleckSize>5</ImpactGlowFleckSize>
+			</li>
+		</modExtensions>
+	</ThingDef>
 
 </Defs>
diff --git a/Defs/Ammo/Modded/Warhammer 40k/PlasmaCannon.xml b/Defs/Ammo/Modded/Warhammer 40k/PlasmaCannon.xml
@@ -104,7 +104,7 @@
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Bullet</damageDef>
-		</projectile>					
+		</projectile>
 		<thingClass>CombatExtended.BulletCE</thingClass>
 	</ThingDef>
 
@@ -177,8 +177,8 @@
 					<amount>14</amount>
 					<armorPenetration>3</armorPenetration>
 					<chance>0.7</chance>
-				</li>							
-			</extraDamages>						
+				</li>
+			</extraDamages>
 		</projectile>
 		<comps>
 			<li Class="CombatExtended.CompProperties_ExplosiveCE">
@@ -278,7 +278,7 @@
 					</thingDefs>
 				</filter>
 				<count>2</count>
-			</li>						
+			</li>
 		</ingredients>
 		<fixedIngredientFilter>
 			<thingDefs>

diff --git a/Defs/Ammo/Projectiles_Fragments.xml b/Defs/Ammo/Projectiles_Fragments.xml
@@ -59,7 +59,7 @@
 		<graphicData>
 			<texPath>Things/Projectile/Bullet_Big</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-		</graphicData>		
+		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Bullet</damageDef>
 			<damageAmountBase>50</damageAmountBase>

diff --git a/Defs/Ammo/Rifle/5x100mmCaseless.xml b/Defs/Ammo/Rifle/5x100mmCaseless.xml
@@ -27,7 +27,7 @@
 		</ammoTypes>
 		<similarTo>AmmoSet_Rifle</similarTo>
 	</CombatExtended.AmmoSetDef>
-	
+
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_5x100mmCaseless_LV</defName>
 		<label>5x100mm Caseless</label>
@@ -104,7 +104,7 @@
 			<speed>204</speed>
 		</projectile>
 	</ThingDef>
-	
+
 	<ThingDef ParentName="Base5x100mmCaselessBullet">
 		<defName>Bullet_5x100mmCaseless_Sabot_LV</defName>
 		<label>5x100 Caseless bullet (Sabot)</label>