Dev to Master Dummy PR

About/About.xml

@@ -102,6 +102,7 @@
 		<li>DankPyon.Medieval.Overhaul</li>
 		<li>vanillaquestsexpanded.deadlife</li>
 		<li>vanillaracesexpanded.android</li>
+		<li>UracosVereches.bettergrenadehandling</li>
 	</loadAfter>
 
 </ModMetaData>

Anomaly/Patches/Anomaly/CreepjoinderDefs/Forms.xml

@@ -13,8 +13,9 @@
 		</value>
 	</Operation>
 
-	<Operation Class="CombatExtended.PatchOperation_ConditionalGeneric">
-		<standard Class="PatchOperationAdd">
+	<Operation Class="CombatExtended.PatchOperationSettingsConditional">
+		<settingName>genericAmmo</settingName>
+		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/CreepJoinerFormKindDef[defName="LeatheryStranger"]</xpath>
 			<value>
 				<inventoryOptions>
@@ -34,8 +35,8 @@
 					</subOptionsChooseOne>
 				</inventoryOptions>
 			</value>
-		</standard>
-		<generic Class="PatchOperationAdd">
+		</nomatch>
+		<match Class="PatchOperationAdd">
 			<xpath>Defs/CreepJoinerFormKindDef[defName="LeatheryStranger"]</xpath>
 			<value>
 				<inventoryOptions>
@@ -55,7 +56,7 @@
 					</subOptionsChooseOne>
 				</inventoryOptions>
 			</value>
-		</generic>
+		</match>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
@@ -68,8 +69,9 @@
 		</value>
 	</Operation>
 
-	<Operation Class="CombatExtended.PatchOperation_ConditionalGeneric">
-		<standard Class="PatchOperationAdd">
+	<Operation Class="CombatExtended.PatchOperationSettingsConditional">
+		<settingName>genericAmmo</settingName>
+		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/CreepJoinerFormKindDef[defName="DealMaker"]</xpath>
 			<value>
 				<inventoryOptions>
@@ -89,8 +91,8 @@
 					</subOptionsChooseOne>
 				</inventoryOptions>
 			</value>
-		</standard>
-		<generic Class="PatchOperationAdd">
+		</nomatch>
+		<match Class="PatchOperationAdd">
 			<xpath>Defs/CreepJoinerFormKindDef[defName="DealMaker"]</xpath>
 			<value>
 				<inventoryOptions>
@@ -110,7 +112,7 @@
 					</subOptionsChooseOne>
 				</inventoryOptions>
 			</value>
-		</generic>
+		</match>
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
@@ -130,8 +132,9 @@
 		</value>
 	</Operation>
 
-	<Operation Class="CombatExtended.PatchOperation_ConditionalGeneric">
-		<standard Class="PatchOperationAdd">
+	<Operation Class="CombatExtended.PatchOperationSettingsConditional">
+		<settingName>genericAmmo</settingName>
+		<nomatch Class="PatchOperationAdd">
 			<xpath>Defs/CreepJoinerFormKindDef[defName="LoneGenius"]</xpath>
 			<value>
 				<inventoryOptions>
@@ -147,8 +150,8 @@
 					</subOptionsChooseOne>
 				</inventoryOptions>
 			</value>
-		</standard>
-		<generic Class="PatchOperationAdd">
+		</nomatch>
+		<match Class="PatchOperationAdd">
 			<xpath>Defs/CreepJoinerFormKindDef[defName="LoneGenius"]</xpath>
 			<value>
 				<inventoryOptions>
@@ -164,7 +167,7 @@
 					</subOptionsChooseOne>
 				</inventoryOptions>
 			</value>
-		</generic>
+		</match>
 	</Operation>
 
 </Patch>

ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/Ammo_ChargedRockets.xml → Defs/Ammo/Advanced/Ammo_ChargedRockets.xml

@@ -6,7 +6,9 @@
 		<parent>AmmoRockets</parent>
 		<iconPath>UI/Icons/ThingCategories/CaliberRocket</iconPath>
 	</ThingCategoryDef>
+
 	<!-- AmmoSet -->
+
 	<CombatExtended.AmmoSetDef>
 		<defName>AmmoSet_ChargedRockets</defName>
 		<label>Charged rockets</label>
@@ -16,7 +18,9 @@
 			<Ammo_ChargedRocket_BB>Bullet_ThermobaricRocket</Ammo_ChargedRocket_BB>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
+
 	<!-- Ammo -->
+
 	<ThingDef Class="CombatExtended.AmmoDef" Name="ChargedRocketBase" ParentName="MediumAmmoBase" Abstract="True">
 		<description>An advanced rocket with a charged-ion payload. The warhead explodes in the air, releasing a wave of deadly electroshock.</description>
 		<statBases>
@@ -48,6 +52,7 @@
 		<ammoClass>ChargedRocketHEC</ammoClass>
 		<detonateProjectile>Bullet_AntiGrainRocket</detonateProjectile>
 	</ThingDef>
+
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ChargedRocketBase">
 		<defName>Ammo_ChargedRocket_ICP</defName>
 		<description>An advanced rocket with a prometheum payload. The magnesium warhead is exploded upon impact, launching molten slag and flaming liquid in all directions.</description>
@@ -64,6 +69,7 @@
 		<ammoClass>ChargedRocketICP</ammoClass>
 		<detonateProjectile>Bullet_PrometheumRocket</detonateProjectile>
 	</ThingDef>
+
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="ChargedRocketBase">
 		<defName>Ammo_ChargedRocket_BB</defName>
 		<description>An advanced rocket with a thermobaric payload. The warhead is designed to destroy fortifications and structures.</description>
@@ -80,22 +86,71 @@
 		<ammoClass>ChargedRocketBB</ammoClass>
 		<detonateProjectile>Bullet_ThermobaricRocket</detonateProjectile>
 	</ThingDef>
+
 	<!-- Projectiles -->
-	<ThingDef ParentName="BaseSPG9Rocket">
-		<defName>Bullet_AntiGrainRocket</defName>
+
+	<ThingDef Name="BaseChargedMissile" ParentName="BaseExplosiveBullet" Abstract="true">
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>0</speed>
+			<gravityFactor>16</gravityFactor>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<flyOverhead>true</flyOverhead>
+			<dropsCasings>false</dropsCasings>
+			<shellingProps>
+				<iconPath>Things/WorldObjects/Munitions/Mortar</iconPath>
+				<tilesPerTick>0.03</tilesPerTick>
+				<range>3</range>
+			</shellingProps>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ProjectileFleck">
+				<FleckDatas>
+					<li>
+						<fleck>Fleck_CERocketFlame</fleck>
+						<emissionsPerTick>7</emissionsPerTick>
+						<flecksPerEmission>3</flecksPerEmission>
+						<scale>1.5</scale>
+						<cutoffTickRange>25~60</cutoffTickRange>
+						<originOffset>0.4</originOffset>
+					</li>
+					<li>
+						<fleck>Fleck_CERocketSmokeTrail</fleck>
+						<emissionsPerTick>1</emissionsPerTick>
+						<rotation>0~360</rotation>
+						<scale>3</scale>
+						<flecksPerEmission>1</flecksPerEmission>
+					</li>
+					<li>
+						<fleck>Fleck_CERocketSmoke</fleck>
+						<emissionsPerTick>2</emissionsPerTick>
+						<rotation>0~360</rotation>
+						<scale>2</scale>
+						<flecksPerEmission>1</flecksPerEmission>
+						<cutoffTickRange>25~60</cutoffTickRange>
+					</li>
+				</FleckDatas>
+			</li>
+		</comps>		
+	</ThingDef>
+
+	<ThingDef ParentName="BaseChargedMissile">
+		<defName>Bullet_AntiGrainRocket</defName>
 		<label>charged rocket (HE-C)</label>
 		<graphicData>
 			<texPath>Things/Projectile/RPG/Frag</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<speed>100</speed>
 			<damageDef>EMP</damageDef>
 			<explosionRadius>8</explosionRadius>
 			<damageAmountBase>300</damageAmountBase>
-			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
 			<suppressionFactor>3.0</suppressionFactor>
 		</projectile>
 		<comps>
@@ -113,24 +168,22 @@
 			</li>
 		</comps>
 	</ThingDef>
-	<ThingDef ParentName="BaseSPG9Rocket">
+
+	<ThingDef ParentName="BaseChargedMissile">
 		<defName>Bullet_PrometheumRocket</defName>
-		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<label>charged rocket (ICP)</label>
 		<graphicData>
 			<texPath>Things/Projectile/RPG/Frag</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<speed>100</speed>
 			<damageDef>PrometheumFlame</damageDef>
 			<explosionRadius>6</explosionRadius>
 			<damageAmountBase>45</damageAmountBase>
 			<postExplosionSpawnThingDef>FilthPrometheum</postExplosionSpawnThingDef>
 			<preExplosionSpawnChance>0.8</preExplosionSpawnChance>
 			<soundExplode>MortarIncendiary_Explode</soundExplode>
-			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
 			<suppressionFactor>3.0</suppressionFactor>
 			<ai_IsIncendiary>true</ai_IsIncendiary>
 		</projectile>
@@ -148,6 +201,7 @@
 			</li>
 		</comps>
 	</ThingDef>
+
 	<ThingDef ParentName="BaseFragment">
 		<defName>Bullet_MoltenSlag</defName>
 		<label>molten slag</label>
@@ -161,13 +215,11 @@
 			<explosionRadius>1.9</explosionRadius>
 			<postExplosionSpawnThingDef>FilthPrometheum</postExplosionSpawnThingDef>
 			<preExplosionSpawnChance>0.5</preExplosionSpawnChance>
-			<speed>80</speed>
-			<gravityFactor>12</gravityFactor>
 		</projectile>
 	</ThingDef>
-	<ThingDef ParentName="BaseSPG9Rocket">
+
+	<ThingDef ParentName="BaseChargedMissile">
 		<defName>Bullet_ThermobaricRocket</defName>
-		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<label>charged rocket (BB)</label>
 		<graphicData>
 			<texPath>Things/Projectile/RPG/Frag</texPath>
@@ -179,8 +231,6 @@
 			<damageDef>Thump</damageDef>
 			<armorPenetrationSharp>1.2</armorPenetrationSharp>
 			<armorPenetrationBlunt>12.4</armorPenetrationBlunt>
-			<speed>100</speed>
-			<flyOverhead>false</flyOverhead>
 			<explosionRadius>3.9</explosionRadius>
 			<soundExplode>MortarIncendiary_Explode</soundExplode>
 			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
@@ -206,7 +256,9 @@
 			</li>
 		</comps>
 	</ThingDef>
+
 	<!-- Recipes -->
+
 	<RecipeDef ParentName="ChargeAmmoRecipeBase">
 		<defName>MakeAmmo_ChargedRocket</defName>
 		<label>make charged rocket (HE-C) x1</label>
@@ -259,6 +311,7 @@
 			<Ammo_ChargedRocket>1</Ammo_ChargedRocket>
 		</products>
 	</RecipeDef>
+
 	<RecipeDef ParentName="ChargeAmmoRecipeBase">
 		<defName>MakeAmmo_ChargedRocket_ICP</defName>
 		<label>make charged rocket (ICP) x1</label>
@@ -311,6 +364,7 @@
 			<Ammo_ChargedRocket_ICP>1</Ammo_ChargedRocket_ICP>
 		</products>
 	</RecipeDef>
+
 	<RecipeDef ParentName="ChargeAmmoRecipeBase">
 		<defName>MakeAmmo_ChargedRocket_BB</defName>
 		<label>make charged rocket (BB) x1</label>
@@ -363,4 +417,5 @@
 			<Ammo_ChargedRocket_BB>1</Ammo_ChargedRocket_BB>
 		</products>
 	</RecipeDef>
-</Defs>
+
+</Defs>

Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml

@@ -184,8 +184,8 @@
 
 	<CombatExtended.AmmoCategoryDef>
 		<defName>BlasterAP</defName>
-		<label>concentrated tibanna</label>
-		<labelShort>conc.</labelShort>
+		<label>pressurized tibanna</label>
+		<labelShort>AP</labelShort>
 		<description>Energy bolts created with tibanna gas. Causes neat punctures and burns that tend to carbonize and char. Low chance of wound infection. Spun to a higher pressure to create bolts with improved penetration, at the loss of wounding potential.</description>
 	</CombatExtended.AmmoCategoryDef>
 

ModPatches/Vanilla Weapons Expanded/Defs/Vanilla Weapons Expanded/Ammo/AmmoCategories_ChargedRocket.xml → Defs/Ammo/AmmoCategoryDefs/AmmoCategories_ChargedRocket.xml

@@ -22,4 +22,4 @@
 		<description>A thermobaric payload designed to destroy fortifications and structures.</description>
 	</CombatExtended.AmmoCategoryDef>
 
-</Defs>
+</Defs>

Defs/Ammo/Grenade/40x46mmGrenade.xml

@@ -23,6 +23,15 @@
 		<similarTo>AmmoSet_LauncherGrenade</similarTo>
 	</CombatExtended.AmmoSetDef>
 
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_40x46mmOnlyEMP</defName>
+		<label>40x46mm Grenades</label>
+		<ammoTypes>
+			<Ammo_40x46mmGrenade_EMP>Bullet_40x46mmGrenade_EMP</Ammo_40x46mmGrenade_EMP>
+		</ammoTypes>
+		<similarTo>AmmoSet_LauncherGrenade</similarTo>
+	</CombatExtended.AmmoSetDef>
+
 	<!-- ==================== Ammo ========================== -->
 
 	<ThingDef Class="CombatExtended.AmmoDef" Name="40x46mmGrenadeBase" ParentName="MediumAmmoBase" Abstract="True">
@@ -496,4 +505,4 @@
 		<workAmount>7400</workAmount>
 	</RecipeDef>
 
-</Defs>
+</Defs>

Defs/Ammo/HighCaliber/27x145mmMauser.xml

@@ -121,7 +121,7 @@
 		<label>27x145mm Mauser bullet (AP-I)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageAmountBase>72</damageAmountBase>
-			<armorPenetrationSharp>30</armorPenetrationSharp>
+			<armorPenetrationSharp>60</armorPenetrationSharp>
 			<armorPenetrationBlunt>3146</armorPenetrationBlunt>
 			<secondaryDamage>
 				<li>

Defs/Ammo/Other/Flamethrower.xml

@@ -58,6 +58,7 @@
 				<preExplosionSpawnChance>1</preExplosionSpawnChance>
 			</li>
 		</comps>
+		<detonateProjectile>Bullet_Flamethrower_Napalm</detonateProjectile>
 	</ThingDef>
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="FlamethrowerBase">
@@ -78,6 +79,7 @@
 				<preExplosionSpawnChance>1</preExplosionSpawnChance>
 			</li>
 		</comps>
+		<detonateProjectile>Bullet_Flamethrower_Prometheum</detonateProjectile>
 	</ThingDef>
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="FlamethrowerBase" MayRequire="Ludeon.Rimworld.Anomaly">
@@ -99,6 +101,7 @@
 				<preExplosionSpawnChance>1</preExplosionSpawnChance>
 			</li>
 		</comps>
+		<detonateProjectile>Bullet_Flamethrower_Bioferrite</detonateProjectile>
 	</ThingDef>
 
 	<!-- ================== Projectiles ================== -->