Skip to content

Commit

Permalink
Merge pull request CombatExtended-Continued#3371 from CombatExtended-…
Browse files Browse the repository at this point in the history 
…Continued/ArmoredTail

Generic Grenade Recipes & Quadruped Tail Fixes
  • Loading branch information
@N7Huntsman
N7Huntsman authored Aug 26, 2024
2 parents fb23992 + d5cf86a commit d3129ed
Show file tree
Hide file tree
Showing 3 changed files with 143 additions and 0 deletions.
7 changes: 7 additions & 0 deletions Biotech/Patches/ThingDefs_Misc/Weapons/RangedIndustrial_Biotech.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_LauncherGrenade"]/ammoTypes</xpath>
<value>
<Ammo_LauncherGrenade_Tox>Bullet_40x46mmGrenade_Tox</Ammo_LauncherGrenade_Tox>
</value>
</Operation>

<!-- ========== Tox Grenades ========== -->

<!-- Kill recipe maker -->
Expand Down
108 changes: 108 additions & 0 deletions Defs/Ammo/Generic/LauncherGrenade.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,21 @@
<detonateProjectile>Bullet_40x46mmGrenade_Smoke</detonateProjectile>
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoLauncherGrenadeBase" MayRequire="Ludeon.RimWorld.Biotech">
<defName>Ammo_LauncherGrenade_Tox</defName>
<label>launcher grenade (Tox)</label>
<graphicData>
<texPath>Things/Ammo/GrenadeLauncher/Tox</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>1.84</MarketValue>
</statBases>
<ammoClass>Toxic</ammoClass>
<generateAllowChance>0</generateAllowChance>
<detonateProjectile>Bullet_40x46mmGrenade_Tox</detonateProjectile>
</ThingDef>

<!-- ==================== Recipes ========================== -->

<RecipeDef ParentName="LauncherAmmoRecipeBase">
Expand Down Expand Up @@ -160,6 +175,51 @@
<workAmount>9000</workAmount>
</RecipeDef>

<RecipeDef ParentName="LauncherAmmoRecipeBase">
<defName>MakeAmmo_LauncherGrenade_HE_TFuzed</defName>
<label>make launcher HE Time-Fuzed grenades x100</label>
<description>Craft 100 launcher HE Time-Fuzed grenades.</description>
<jobString>Making launcher HE Time-Fuzed grenades.</jobString>
<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>50</count>
</li>
<li>
<filter>
<thingDefs>
<li>FSX</li>
</thingDefs>
</filter>
<count>8</count>
</li>
<li>
<filter>
<thingDefs>
<li>ComponentIndustrial</li>
</thingDefs>
</filter>
<count>5</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
<li>FSX</li>
<li>ComponentIndustrial</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_LauncherGrenade_HE_TFuzed>100</Ammo_LauncherGrenade_HE_TFuzed>
</products>
<workAmount>11200</workAmount>
</RecipeDef>

<RecipeDef ParentName="LauncherAmmoRecipeBase">
<defName>MakeAmmo_LauncherGrenade_HEDP</defName>
<label>make launcher HEDP grenades x100</label>
Expand Down Expand Up @@ -287,4 +347,52 @@
<workAmount>7400</workAmount>
</RecipeDef>

<RecipeDef ParentName="LauncherAmmoRecipeBase" MayRequire="Ludeon.RimWorld.Biotech">
<defName>MakeAmmo_LauncherGrenade_Tox</defName>
<label>make launcher tox grenades x100</label>
<description>Craft 100 launcher tox grenades.</description>
<jobString>Making launcher tox grenades.</jobString>
<researchPrerequisites>
<li>CE_Launchers</li>
<li>ToxGas</li>
</researchPrerequisites>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>50</count>
</li>
<li>
<filter>
<thingDefs>
<li>Prometheum</li>
</thingDefs>
</filter>
<count>3</count>
</li>
<li>
<filter>
<thingDefs>
<li>ComponentIndustrial</li>
</thingDefs>
</filter>
<count>2</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
<li>Prometheum</li>
<li>ComponentIndustrial</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_LauncherGrenade_Tox>100</Ammo_LauncherGrenade_Tox>
</products>
<workAmount>7400</workAmount>
</RecipeDef>

</Defs>
28 changes: 28 additions & 0 deletions Patches/Core/Bodies/Bodies_Animal_Quadruped/QuadrupedAnimalWithPawsAndTail.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,27 @@
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="QuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Tail"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="QuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Tail"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="QuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="QuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>


<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="QuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
Expand Down Expand Up @@ -104,6 +125,13 @@
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="QuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Tail"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="QuadrupedAnimalWithPawsAndTail"]/corePart/parts/li[def="Neck"]/groups</xpath>
<value>
Expand Down

0 comments on commit d3129ed

Please sign in to comment.