Merge pull request #3285 from SaltyKarl/DD-BW-fix

Dragons descent patch update tag Royalty content, and tag Biological warfare Anomaly content

ModPatches/BiologicalWarfare/Defs/Ammo.xml

@@ -22,7 +22,7 @@
 		<advanced>true</advanced>
 	</CombatExtended.AmmoCategoryDef>
 
-	<CombatExtended.AmmoCategoryDef>
+	<CombatExtended.AmmoCategoryDef  MayRequire="Ludeon.RimWorld.Anomaly">
 		<defName>Necroa</defName>
 		<label>Necroa</label>
 		<description>Filled with gas containing Necroa archovirus, This archovirus turns pawns into shamblers post-mortem</description>
@@ -854,7 +854,7 @@
 
 	<!-- Necroa -->
 	<!-- 40x46mmGrenade -->
-	<ThingDef Class="CombatExtended.AmmoDef" ParentName="40x46mmGrenadeBase">
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="40x46mmGrenadeBase" MayRequire="Ludeon.RimWorld.Anomaly">
 		<defName>Ammo_40x46mmGrenade_Necroa</defName>
 		<label>40x46mm grenade (necroa)</label>
 		<graphicData>
@@ -868,7 +868,7 @@
 		<detonateProjectile>Bullet_40x46mmGrenade_Necroa</detonateProjectile>
 	</ThingDef>
 
-	<ThingDef ParentName="Base40x46mmGrenadeBullet">
+	<ThingDef ParentName="Base40x46mmGrenadeBullet" MayRequire="Ludeon.RimWorld.Anomaly">
 		<defName>Bullet_40x46mmGrenade_Necroa</defName>
 		<label>40x46mm grenade (necroa)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
@@ -879,7 +879,7 @@
 		</projectile>
 	</ThingDef>
 
-	<RecipeDef ParentName="LauncherAmmoRecipeBase">
+	<RecipeDef ParentName="LauncherAmmoRecipeBase" MayRequire="Ludeon.RimWorld.Anomaly">
 		<defName>MakeAmmo_40x46mmGrenade_Necroa</defName>
 		<label>make 40x46mm necroa grenades x100</label>
 		<description>Craft 100 40x46mm necroa grenades.</description>
@@ -925,7 +925,7 @@
 	</RecipeDef>
 
 	<!-- 81mm mortar -->
-	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase" MayRequire="Ludeon.RimWorld.Anomaly">
 		<defName>Ammo_81mmMortarShell_Necroa</defName>
 		<label>81mm mortar shell (necroa)</label>
 		<graphicData>
@@ -942,7 +942,7 @@
 		<detonateProjectile>Bullet_81mmMortarShell_Necroa</detonateProjectile>
 	</ThingDef>
 
-	<ThingDef ParentName="Base81mmMortarShell">
+	<ThingDef ParentName="Base81mmMortarShell" MayRequire="Ludeon.RimWorld.Anomaly">
 		<defName>Bullet_81mmMortarShell_Necroa</defName>
 		<label>81mm mortar shell (necroa)</label>
 		<graphicData>
@@ -963,7 +963,7 @@
 		</projectile>
 	</ThingDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="AmmoRecipeBase" MayRequire="Ludeon.RimWorld.Anomaly">
 		<defName>MakeAmmo_81mmMortarShell_Necroa</defName>
 		<label>make 81mm necroa mortar shells x5</label>
 		<description>Craft 5 81mm necroa mortar shells.</description>
@@ -1012,7 +1012,7 @@
 	</RecipeDef>
 
 	<!-- 50mmrocket -->
-	<ThingDef Class="CombatExtended.AmmoDef" ParentName="50mmRocketBase">
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="50mmRocketBase" MayRequire="Ludeon.RimWorld.Anomaly">
 		<defName>Ammo_50mmRocket_Necroa</defName>
 		<label>50mm rocket (necroa)</label>
 		<graphicData>
@@ -1029,7 +1029,7 @@
 		<detonateProjectile>Bullet_50mmRocket_Necroa</detonateProjectile>
 	</ThingDef>
 
-	<ThingDef ParentName="Base50mmRocket">
+	<ThingDef ParentName="Base50mmRocket" MayRequire="Ludeon.RimWorld.Anomaly">
 		<defName>Bullet_50mmRocket_Necroa</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<label>50mm rocket (necroa)</label>
@@ -1074,7 +1074,7 @@
 		</comps>
 	</ThingDef>
 
-	<RecipeDef ParentName="LauncherAmmoRecipeBase">
+	<RecipeDef ParentName="LauncherAmmoRecipeBase" MayRequire="Ludeon.RimWorld.Anomaly">
 		<defName>MakeAmmo_50mmRocket_Necroa</defName>
 		<label>make 50mm necroa rockets x10</label>
 		<description>Craft 10 50mm necroa rockets.</description>

ModPatches/BiologicalWarfare/Patches/Patches.xml

@@ -7,7 +7,7 @@
 			<Ammo_40x46mmGrenade_FleshBreaker>Bullet_40x46mmGrenade_FleshBreaker</Ammo_40x46mmGrenade_FleshBreaker>
 			<Ammo_40x46mmGrenade_Flu>Bullet_40x46mmGrenade_Flu</Ammo_40x46mmGrenade_Flu>
 			<Ammo_40x46mmGrenade_Malaria>Bullet_40x46mmGrenade_Malaria</Ammo_40x46mmGrenade_Malaria>
-			<Ammo_40x46mmGrenade_Necroa>Bullet_40x46mmGrenade_Necroa</Ammo_40x46mmGrenade_Necroa>
+			<Ammo_40x46mmGrenade_Necroa MayRequire="Ludeon.RimWorld.Anomaly">Bullet_40x46mmGrenade_Necroa</Ammo_40x46mmGrenade_Necroa>
 			<Ammo_40x46mmGrenade_Plague>Bullet_40x46mmGrenade_Plague</Ammo_40x46mmGrenade_Plague>
 			<Ammo_40x46mmGrenade_Scaria>Bullet_40x46mmGrenade_Scaria</Ammo_40x46mmGrenade_Scaria>
 			<Ammo_40x46mmGrenade_SleepingSickness>Bullet_40x46mmGrenade_SleepingSickness</Ammo_40x46mmGrenade_SleepingSickness>
@@ -20,7 +20,7 @@
 			<Ammo_81mmMortarShell_FleshBreaker>Bullet_81mmMortarShell_FleshBreaker</Ammo_81mmMortarShell_FleshBreaker>
 			<Ammo_81mmMortarShell_Flu>Bullet_81mmMortarShell_Flu</Ammo_81mmMortarShell_Flu>
 			<Ammo_81mmMortarShell_Malaria>Bullet_81mmMortarShell_Malaria</Ammo_81mmMortarShell_Malaria>
-			<Ammo_81mmMortarShell_Necroa>Bullet_81mmMortarShell_Necroa</Ammo_81mmMortarShell_Necroa>
+			<Ammo_81mmMortarShell_Necroa MayRequire="Ludeon.RimWorld.Anomaly">Bullet_81mmMortarShell_Necroa</Ammo_81mmMortarShell_Necroa>
 			<Ammo_81mmMortarShell_Plague>Bullet_81mmMortarShell_Plague</Ammo_81mmMortarShell_Plague>
 			<Ammo_81mmMortarShell_Scaria>Bullet_81mmMortarShell_Scaria</Ammo_81mmMortarShell_Scaria>
 			<Ammo_81mmMortarShell_SleepingSickness>Bullet_81mmMortarShell_SleepingSickness</Ammo_81mmMortarShell_SleepingSickness>
@@ -33,7 +33,7 @@
 			<Ammo_50mmRocket_FleshBreaker>Bullet_50mmRocket_FleshBreaker</Ammo_50mmRocket_FleshBreaker>
 			<Ammo_50mmRocket_Flu>Bullet_50mmRocket_Flu</Ammo_50mmRocket_Flu>
 			<Ammo_50mmRocket_Malaria>Bullet_50mmRocket_Malaria</Ammo_50mmRocket_Malaria>
-			<Ammo_50mmRocket_Necroa>Bullet_50mmRocket_Necroa</Ammo_50mmRocket_Necroa>
+			<Ammo_50mmRocket_Necroa MayRequire="Ludeon.RimWorld.Anomaly">Bullet_50mmRocket_Necroa</Ammo_50mmRocket_Necroa>
 			<Ammo_50mmRocket_Plague>Bullet_50mmRocket_Plague</Ammo_50mmRocket_Plague>
 			<Ammo_50mmRocket_Scaria>Bullet_50mmRocket_Scaria</Ammo_50mmRocket_Scaria>
 			<Ammo_50mmRocket_SleepingSickness>Bullet_50mmRocket_SleepingSickness</Ammo_50mmRocket_SleepingSickness>
@@ -182,7 +182,7 @@
 			defName="USH_MalariaGrenadeBullet"]</xpath>
 	</Operation>
 	<!-- Necroa -->
-	<Operation Class="PatchOperationRemove">
+	<Operation Class="PatchOperationRemove" MayRequire="Ludeon.RimWorld.Anomaly">
 		<xpath>Defs/BiologicalWarfare.CombatDiseaseDef[defName="USH_Necroa"]/thingDefsToFormatAndColor/li[
 			.="USH_NecroaShell" or
 			.="USH_NecroaShellBullet" or
@@ -192,15 +192,15 @@
 			.="USH_NecroaGrenadeBullet"]</xpath>
 	</Operation>
 
-	<Operation Class="PatchOperationRemove">
+	<Operation Class="PatchOperationRemove" MayRequire="Ludeon.RimWorld.Anomaly">
 		<xpath>Defs/BiologicalWarfare.CombatDiseaseDef[defName="USH_Necroa"]/thingDefsToColorIcons/li[.="USH_NecroaMissileLauncher"]</xpath>
 	</Operation>
 
-	<Operation Class="PatchOperationRemove">
+	<Operation Class="PatchOperationRemove" MayRequire="Ludeon.RimWorld.Anomaly">
 		<xpath>Defs/BiologicalWarfare.CombatDiseaseDef[defName="USH_Necroa"]/thingDefsToFormat/li[.="USH_NecroaMissileLauncher"]</xpath>
 	</Operation>
 
-	<Operation Class="PatchOperationRemove">
+	<Operation Class="PatchOperationRemove" MayRequire="Ludeon.RimWorld.Anomaly">
 		<xpath>Defs/ThingDef[defName="USH_NecroaShell" or
 			defName="USH_NecroaMissileLauncher" or
 			defName="USH_NecroaMissileLauncherTurret" or
@@ -209,7 +209,7 @@
 			defName="USH_NecroaGrenadeBullet"]</xpath>
 	</Operation>
 	<!-- Plague -->
-	<Operation Class="PatchOperationRemove">
+	<Operation Class="PatchOperationRemove" MayRequire="Ludeon.RimWorld.Anomaly">
 		<xpath>Defs/BiologicalWarfare.CombatDiseaseDef[defName="USH_Plague"]/thingDefsToFormatAndColor/li[
 			.="USH_PlagueShell" or
 			.="USH_PlagueShellBullet" or

ModPatches/Dragons Descent/Patches/Dragons Descent/DamageDefs/DamageDef_DragonMelee.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
 	<Operation Class="PatchOperationAddModExtension">
-		<xpath>Defs/DamageDef[defName="Pyro_Bite"]</xpath>
+		<xpath>Defs/DamageDef[defName="DD_Pyro_Bite"]</xpath>
 		<value>
 			<li Class="CombatExtended.DamageDefExtensionCE">
 				<isAmbientDamage>true</isAmbientDamage>

ModPatches/Dragons Descent/Patches/Dragons Descent/Projectiles/Projectile_Dragon.xml

@@ -2,14 +2,14 @@
 <Patch>
 	<!-- Spit Blunt -->
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Projectile_DragonSpitBlunt"]/thingClass</xpath>
+		<xpath>Defs/ThingDef[defName="DD_Projectile_DragonSpitBlunt"]/thingClass</xpath>
 		<value>
 			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Projectile_DragonSpitBlunt"]/projectile</xpath>
+		<xpath>Defs/ThingDef[defName="DD_Projectile_DragonSpitBlunt"]/projectile</xpath>
 		<value>
 			<projectile Class="CombatExtended.ProjectilePropertiesCE">
 				<speed>26</speed>
@@ -28,14 +28,14 @@
 	</Operation>
 	<!-- Fire Spit (Probably not used) -->
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Projectile_DragonSpit"]/thingClass</xpath>
+		<xpath>Defs/ThingDef[defName="DD_Projectile_DragonSpit"]/thingClass</xpath>
 		<value>
 			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Projectile_DragonSpit"]/projectile</xpath>
+		<xpath>Defs/ThingDef[defName="DD_Projectile_DragonSpit"]/projectile</xpath>
 		<value>
 			<projectile Class="CombatExtended.ProjectilePropertiesCE">
 				<speed>38</speed>
@@ -54,31 +54,5 @@
 			</projectile>
 		</value>
 	</Operation>
-	<!-- Placeholder Spit -->
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Projectile_DragonBreath_AOE"]/thingClass</xpath>
-		<value>
-			<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="Projectile_DragonBreath_AOE"]/projectile</xpath>
-		<value>
-			<projectile Class="CombatExtended.ProjectilePropertiesCE">
-				<speed>38</speed>
-				<damageDef>DraconicFlame</damageDef>
-				<explosionRadius>4.5</explosionRadius>
-				<suppressionFactor>3.0</suppressionFactor>
-				<dangerFactor>2.0</dangerFactor>
-				<damageAmountBase>27</damageAmountBase>
-				<preExplosionSpawnThingDef>Filth_Ash</preExplosionSpawnThingDef>
-				<preExplosionSpawnChance>0.3</preExplosionSpawnChance>
-				<ai_IsIncendiary>true</ai_IsIncendiary>
-				<arcHeightFactor>0.2</arcHeightFactor>
-				<shadowSize>1</shadowSize>
-			</projectile>
-		</value>
-	</Operation>
 
 </Patch>

ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Apparel_Headgear.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
+
 	<!-- scale helmet -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="DD_Apparel_ScaleHelm"]/statBases</xpath>
@@ -24,7 +25,16 @@
 			</bodyPartGroups>
 		</value>
 	</Operation>
+
 	<!-- dragon crown -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="DD_Apparel_DragonCrown"]/statBases</xpath>
+		<value>
+			<Bulk>2</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="DD_Apparel_DragonCrown"]/statBases/StuffEffectMultiplierArmor</xpath>
 		<value>
@@ -38,4 +48,5 @@
 			<AimingAccuracy>-0.1</AimingAccuracy>
 		</value>
 	</Operation>
+
 </Patch>

ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Weapons/MeleeDD.xml

@@ -168,15 +168,15 @@
 		</value>
 	</Operation>
 	<!-- focusing tome -->
-	<Operation Class="PatchOperationAdd">
+	<Operation Class="PatchOperationAdd" MayRequire="Ludeon.RimWorld.Royalty">
 		<xpath>Defs/ThingDef[defName="DDMeleeWeapon_FocusingTome"]/statBases</xpath>
 		<value>
 			<Bulk>2</Bulk>
 			<MeleeCounterParryBonus>0.14</MeleeCounterParryBonus>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd">
+	<Operation Class="PatchOperationAdd" MayRequire="Ludeon.RimWorld.Royalty">
 		<xpath>Defs/ThingDef[defName="DDMeleeWeapon_FocusingTome"]/equippedStatOffsets</xpath>
 		<value>
 			<MeleeCritChance>0.23</MeleeCritChance>
@@ -185,7 +185,7 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationReplace">
+	<Operation Class="PatchOperationReplace" MayRequire="Ludeon.RimWorld.Royalty">
 		<xpath>Defs/ThingDef[defName="DDMeleeWeapon_FocusingTome"]/tools</xpath>
 		<value>
 			<tools>
@@ -202,7 +202,7 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd">
+	<Operation Class="PatchOperationAdd" MayRequire="Ludeon.RimWorld.Royalty">
 		<xpath>Defs/ThingDef[defName="DDMeleeWeapon_FocusingTome"]</xpath>
 		<value>
 			<weaponTags>

ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Common_Dragon.xml

@@ -222,7 +222,7 @@
 				<li Class="CombatExtended.VerbPropertiesCE">
 					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Projectile_DragonSpitBlunt</defaultProjectile>
+					<defaultProjectile>DD_Projectile_DragonSpitBlunt</defaultProjectile>
 					<warmupTime>2.2</warmupTime>
 					<minRange>5</minRange>
 					<range>32</range>

ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Rare_Dragon.xml

@@ -164,7 +164,7 @@
 				<li Class="CombatExtended.VerbPropertiesCE">
 					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
 					<hasStandardCommand>true</hasStandardCommand>
-					<defaultProjectile>Projectile_DragonSpitBlunt</defaultProjectile>
+					<defaultProjectile>DD_Projectile_DragonSpitBlunt</defaultProjectile>
 					<warmupTime>2.0</warmupTime>
 					<minRange>5</minRange>
 					<range>34</range>