Merge pull request CombatExtended-Continued#3235 from CombatExtended-…

…Continued/GrimWorld-Patch-Integration Grimworld 40000 Patch Integration
Tostov · Sep 4, 2024 · 05508c6 · 05508c6
2 parents fc1b92a + 247fac5
commit 05508c6
Show file tree

Hide file tree

Showing 137 changed files with 11,918 additions and 30 deletions.
diff --git a/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml b/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml
@@ -44,6 +44,7 @@
 		<tradeTags>
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting</li>
+			<li>CE_AutoEnableCrafting_GWAmmoBench</li>
 		</tradeTags>
 		<thingCategories>
 			<li>AmmoBolter75</li>
@@ -55,7 +56,7 @@
 		<defName>Ammo_Bolter75_Standard</defName>
 		<label>.75 cal bolter shell (Standard)</label>
 		<graphicData>
-			<texPath>ThirdParty/Warhammer/Bolter/Standard</texPath>
+			<texPath>ThirdParty/Warhammer/Ammo/Bolter/Standard</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -69,7 +70,7 @@
 		<defName>Ammo_Bolter75_Inferno</defName>
 		<label>.75 cal bolter shell (Inferno)</label>
 		<graphicData>
-			<texPath>ThirdParty/Warhammer/Bolter/Inferno</texPath>
+			<texPath>ThirdParty/Warhammer/Ammo/Bolter/Inferno</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -83,7 +84,7 @@
 		<defName>Ammo_Bolter75_MetalStorm</defName>
 		<label>.75 cal bolter shell (Metal Storm)</label>
 		<graphicData>
-			<texPath>ThirdParty/Warhammer/Bolter/MetalStorm</texPath>
+			<texPath>ThirdParty/Warhammer/Ammo/Bolter/MetalStorm</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -97,7 +98,7 @@
 		<defName>Ammo_Bolter75_Kraken</defName>
 		<label>.75 cal bolter shell (Kraken)</label>
 		<graphicData>
-			<texPath>ThirdParty/Warhammer/Bolter/Kraken</texPath>
+			<texPath>ThirdParty/Warhammer/Ammo/Bolter/Kraken</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>

diff --git a/Defs/Ammo/Modded/Warhammer 40k/HeavyBolter.xml b/Defs/Ammo/Modded/Warhammer 40k/HeavyBolter.xml
@@ -32,6 +32,7 @@
 		<tradeTags>
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting</li>
+			<li>CE_AutoEnableCrafting_GWAmmoBench</li>			
 		</tradeTags>
 		<thingCategories>
 			<li>AmmoBolter998</li>
@@ -43,7 +44,7 @@
 		<defName>Ammo_Bolter998_Standard</defName>
 		<label>.998 cal bolter shell (Standard)</label>
 		<graphicData>
-			<texPath>ThirdParty/Warhammer/HeavyBolter/Standard</texPath>
+			<texPath>ThirdParty/Warhammer/Ammo/HeavyBolter/Standard</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -57,7 +58,7 @@
 		<defName>Ammo_Bolter998_Inferno</defName>
 		<label>.998 cal bolter shell (Inferno)</label>
 		<graphicData>
-			<texPath>ThirdParty/Warhammer/HeavyBolter/Inferno</texPath>
+			<texPath>ThirdParty/Warhammer/Ammo/HeavyBolter/Inferno</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -71,7 +72,7 @@
 		<defName>Ammo_Bolter998_MetalStorm</defName>
 		<label>.998 cal bolter shell (Metal Storm)</label>
 		<graphicData>
-			<texPath>ThirdParty/Warhammer/HeavyBolter/MetalStorm</texPath>
+			<texPath>ThirdParty/Warhammer/Ammo/HeavyBolter/MetalStorm</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -85,7 +86,7 @@
 		<defName>Ammo_Bolter998_Kraken</defName>
 		<label>.998 cal bolter shell (Kraken)</label>
 		<graphicData>
-			<texPath>ThirdParty/Warhammer/HeavyBolter/Kraken</texPath>
+			<texPath>ThirdParty/Warhammer/Ammo/HeavyBolter/Kraken</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>

diff --git a/Defs/Ammo/Modded/Warhammer 40k/LasGun.xml b/Defs/Ammo/Modded/Warhammer 40k/LasGun.xml
@@ -54,6 +54,7 @@
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting_FabricationBench</li>
 			<li>CE_AutoEnableCrafting_TableMachining</li>
+			<li>CE_AutoEnableCrafting_GWAmmoBench</li>
 		</tradeTags>
 		<thingCategories>
 			<li>AmmoLasgunPowerPack</li>
@@ -65,7 +66,7 @@
 		<defName>Ammo_LasgunPowerPack</defName>
 		<label>lasgun power pack</label>
 		<graphicData>
-			<texPath>ThirdParty/Warhammer/Lasgun</texPath>
+			<texPath>ThirdParty/Warhammer/Ammo/Lasgun</texPath>
 			<graphicClass>CombatExtended.Graphic_StackCountRanged</graphicClass>
 		</graphicData>
 		<statBases>
@@ -122,7 +123,7 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="ChargeAmmoRecipeBase">
+	<RecipeDef ParentName="AmmoRecipeBase">
 		<defName>MakeAmmo_LasgunPowerPack</defName>
 		<label>make lasgun power pack x500</label>
 		<description>Craft 500 lasgun batteries.</description>

diff --git a/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml b/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml
@@ -17,7 +17,7 @@
 		<label>melta beam</label>
 		<thingClass>CombatExtended.Lasers.LaserBeamCE</thingClass>
 		<graphicData>
-			<texPath>ThirdParty/Warhammer/MeltaBeam</texPath>
+			<texPath>ThirdParty/Warhammer/Projectiles/MeltaBeam</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 			<shaderType>Transparent</shaderType>
 			<color>(255,255,255)</color>
@@ -26,7 +26,7 @@
 		<beamGraphic>BeamGraphic</beamGraphic>
 		<beamWidth>0.4</beamWidth>
 		<textures>
-			<li>ThirdParty/Warhammer/MeltaBeam</li>
+			<li>ThirdParty/Warhammer/Projectiles/MeltaBeam</li>
 		</textures>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<isInstant>true</isInstant>

diff --git a/Defs/Ammo/Modded/Warhammer 40k/PlasmaCannon.xml b/Defs/Ammo/Modded/Warhammer 40k/PlasmaCannon.xml
@@ -52,6 +52,16 @@
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
 
+	<!-- For Grimhammer - Vehicles -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_PlasmaCanister_Destroyer</defName>
+		<label>plasma canister</label>
+		<ammoTypes>
+			<Ammo_PlasmaCanister>Bullet_Laser_PlasmaDestroyer</Ammo_PlasmaCanister>
+		</ammoTypes>
+	</CombatExtended.AmmoSetDef>
+
 	<!-- ==================== Ammo ========================== -->
 
 	<ThingDef Class="CombatExtended.AmmoDef" Name="AmmoPlasmaCannonBase" ParentName="SmallAmmoBase" Abstract="True">
@@ -63,6 +73,7 @@
 		<tradeTags>
 			<li>CE_AutoEnableTrade</li>
 			<li>CE_AutoEnableCrafting</li>
+			<li>CE_AutoEnableCrafting_GWAmmoBench</li>			
 		</tradeTags>
 		<thingCategories>
 			<li>AmmoPlasmaCannon</li>
@@ -74,7 +85,7 @@
 		<defName>Ammo_PlasmaCanister</defName>
 		<label>plasma canister</label>
 		<graphicData>
-			<texPath>ThirdParty/Warhammer/PlasmaCanister</texPath>
+			<texPath>ThirdParty/Warhammer/Ammo/PlasmaCanister</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -98,7 +109,7 @@
 
 	<ThingDef Name="BasePlasmaBullet" ParentName="BaseBulletCE" Abstract="True">
 		<graphicData>
-			<texPath>ThirdParty/Warhammer/MeltaProjectile</texPath>
+			<texPath>ThirdParty/Warhammer/Projectiles/MeltaProjectile</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
@@ -246,6 +257,52 @@
 		</comps>
 	</ThingDef>
 
+	<!-- For Grimhammer - Vehicles -->
+
+	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="BaseBulletCE">
+		<defName>Bullet_Laser_PlasmaDestroyer</defName>
+		<label>plasma beam</label>
+		<thingClass>CombatExtended.Lasers.LaserBeamCE</thingClass>
+		<graphicData>
+			<texPath>ThirdParty/Warhammer/Projectiles/MeltaBeam</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>Transparent</shaderType>
+			<color>(255,255,255)</color>
+		</graphicData>
+		<altitudeLayer>Projectile</altitudeLayer>
+		<beamGraphic>BeamGraphic</beamGraphic>
+		<beamWidth>0.6</beamWidth>
+		<textures>
+			<li>ThirdParty/Warhammer/Projectiles/MeltaBeam</li>
+		</textures>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<isInstant>true</isInstant>
+			<damageDef>CE_Laser</damageDef>
+			<damageAmountBase>250</damageAmountBase>
+			<armorPenetrationSharp>500</armorPenetrationSharp>
+			<armorPenetrationBlunt>0.001</armorPenetrationBlunt><!-- The overall pressure exerted by a laser beam striking something is, unsuprisingly, negligable. -->
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_ExplosiveCE">
+				<damageAmountBase>140</damageAmountBase>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveRadius>2.9</explosiveRadius>
+				<explosionSound>MortarBomb_Explode</explosionSound>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>		
+		<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>
+
 	<!-- ==================== Recipes ========================== -->
 
 	<RecipeDef ParentName="AmmoRecipeBase">

diff --git a/Defs/Effects/Flecks.xml b/Defs/Effects/Flecks.xml
@@ -202,7 +202,7 @@
 			<fadeOutTime>0.2</fadeOutTime>
 		</mote>
 		<graphicData>
-			<texPath>ThirdParty/Warhammer/MeltaProjectile</texPath>
+			<texPath>ThirdParty/Warhammer/Projectiles/MeltaProjectile</texPath>
 			<shaderType>MoteGlow</shaderType>
 		</graphicData>
 	</ThingDef>

diff --git a/LoadFolders.xml b/LoadFolders.xml
@@ -195,6 +195,10 @@
 		<li IfModActive="com.distman.gastrap">ModPatches/Gas Traps and Shells</li>
 		<li IfModActive="hlx.GestaltEngine">ModPatches/Gestalt Engine</li>
 		<li IfModActive="Owlchemist.GiddyUp">ModPatches/Giddy-Up 2</li>
+		<li IfModActive="HappyPurging.AgeofDarkness">ModPatches/GrimWorld Angels of Death</li>
+		<li IfModActive="Grimworld.Core">ModPatches/Grimworld Core Imperialis</li>	
+		<li IfModActive="Grimworld.AstraMilitarum">ModPatches/GrimWorld Hammer of the Imperium</li>
+		<li IfModActive="Grimworld.Vehicles">ModPatches/GrimWorld Imperial Vehicles</li>			
 		<li IfModActive="TenMoe.GFCL">ModPatches/Girls Frontline Apparel Pack</li>
 		<li IfModActive="RicoFox233.GirlsFrontline.404Team">ModPatches/Girls Frontline Styles 404 Team</li>
 		<li IfModActive="RicoFox233.GirlsFrontline.ARTeam">ModPatches/Girls Frontline Styles AR Team</li>
@@ -611,8 +615,9 @@
 		<li IfModActive="pphhyy.ExpandedMechsScyther">ModPatches/pphhyy Expanded Scythers</li>
 		<li IfModActive="pphhyy.SanguinaryAnimals">ModPatches/pphhyy Sanguinary Animals</li>
 		<li IfModActive="pphhyy.LightlessEmpyrean">ModPatches/pphhyy's Lightless Empyrean</li>
-		<li IfModActive="SmashPhil.VehicleFramework">ModPatches/VehicleFramework</li>
+		<!-- Mod Patches (Assemblies) -->		
 		<li IfModActive="rwmt.Multiplayer">ModPatches/Multiplayer</li>
 		<li IfModActive="smashphil.neceros.srtsexpanded">ModPatches/SRTS</li>
+		<li IfModActive="SmashPhil.VehicleFramework">ModPatches/VehicleFramework</li>		
 	</v1.5>
 </loadFolders>
diff --git a/...itarum Regimentum - Krieg/Patches/Astra Militarum Regimentum - Krieg/Armor_Industrial.xml b/...itarum Regimentum - Krieg/Patches/Astra Militarum Regimentum - Krieg/Armor_Industrial.xml
@@ -33,6 +33,14 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_CombatWebbing"]/equippedStatOffsets</xpath>
+		<value>
+			<CarryBulk>20</CarryBulk>
+			<ReloadSpeed>0.1</ReloadSpeed>
+		</value>
+	</Operation>
+
 	<!-- === Flak Armor === -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="ODZ_40k_IG_DKOK_GrenadierArmor"]/statBases</xpath>

diff --git a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Apparel.xml b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Apparel.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+
+	<!-- ============ Capes ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="GW_SM_CapeBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+            <StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>2</Bulk>
+			<WornBulk>1.5</WornBulk>
+		</value>
+	</Operation>
+
+	<!-- ============ Fibrovest ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="HP_AoD_OnSkinBase"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>4</ArmorRating_Sharp>
+			<Bulk>3</Bulk>
+			<WornBulk>1</WornBulk>			
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="HP_AoD_OnSkinBase"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>6</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<!-- ============ Hoods ============ -->
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[@Name="GW_SM_HoodBase"]/statBases/StuffEffectMultiplierArmor</xpath>
+		<value>
+            <StuffEffectMultiplierArmor>3</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
+</Patch>