Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cannon shell ammoset updates and general shell housekeeping #3104

Merged
merged 15 commits into from
May 30, 2024
Merged

Cannon shell ammoset updates and general shell housekeeping #3104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d0af254
New shell types and housekeeping
SamaelGray Apr 23, 2024
07518d3
Ammo recipe tweaks and housekeeping
SamaelGray Apr 23, 2024
ca301b1
Updated ammo and projectile textures
SamaelGray Apr 24, 2024
7d30659
Minor housekeeping
SamaelGray Apr 25, 2024
9619475
thingClass consistency check
SamaelGray Apr 25, 2024
9c63cc4
prerequisite inheritance check and housekeeping
SamaelGray Apr 25, 2024
691380b
More APCR shells and housekeeping
SamaelGray May 13, 2024
f7d7522
Merge branch 'Development' into SamaelGray-ShellsUpdated
SamaelGray May 13, 2024
8c3c76e
57mm Bofors expanded and name fixed
SamaelGray May 18, 2024
c157709
Canister ammo tweaks and fixes
SamaelGray May 21, 2024
512427a
description housekeeping
SamaelGray May 21, 2024
cfbab34
Fix typo
N7Huntsman May 27, 2024
4d170ad
parent typo fix
SamaelGray May 27, 2024
8f174ed
APCR ammo type and tweaks
SamaelGray May 27, 2024
f252b59
Parent name housekeeping
N7Huntsman May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Defs/Ammo/AmmoBases.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,27 @@
</skillRequirements>
</RecipeDef>

<RecipeDef Name="ArtilleryAmmoRecipeBase" ParentName="AmmoRecipeBase" Abstract="true">
<researchPrerequisite>Mortars</researchPrerequisite>
<skillRequirements>
<Crafting>4</Crafting>
</skillRequirements>
</RecipeDef>

<RecipeDef Name="LauncherAmmoRecipeBase" ParentName="AmmoRecipeBase" Abstract="true">
<researchPrerequisite>CE_Launchers</researchPrerequisite>
<skillRequirements>
<Crafting>4</Crafting>
</skillRequirements>
</RecipeDef>

<RecipeDef Name="CannonAmmoRecipeBase" ParentName="AmmoRecipeBase" Abstract="true">
<researchPrerequisite>CE_TurretHeavyWeapons</researchPrerequisite>
<skillRequirements>
<Crafting>4</Crafting>
</skillRequirements>
</RecipeDef>

<RecipeDef Name="ChargeAmmoRecipeBase" ParentName="AmmoRecipeBase" Abstract="true">
<researchPrerequisite>ChargedShot</researchPrerequisite>
<skillRequirements>
Expand Down
10 changes: 10 additions & 0 deletions Defs/Ammo/AmmoCategoryDefs/AmmoCategories_General.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@
<label>armor-piercing discarding sabot</label>
<labelShort>Sabot</labelShort>
<description>Uses a discarding sabot to fire an undersized projectile at higher muzzle velocities, greatly improving armor penetration.</description>
<advanced>true</advanced>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>IncendiaryAP</defName>
<label>armor-piercing incendiary</label>
<labelShort>AP-I</labelShort>
<description>Filled with an incendiary compound that ignites on impact, doing additional damage and increasing armor penetration.</description>
<advanced>true</advanced>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
Expand All @@ -44,6 +46,14 @@
<advanced>true</advanced>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>CompositeRigidAP</defName>
<label>armor-piercing composite-rigid</label>
<labelShort>APCR</labelShort>
<description>Featuring a core of high-density hard material surrounded by a full-bore shell of a lighter material to reach higher muzzle velocities, greatly increasing armor penetration.</description>
<advanced>true</advanced>
</CombatExtended.AmmoCategoryDef>

<CombatExtended.AmmoCategoryDef>
<defName>TranqNonLethal</defName>
<label>tranquilizer</label>
Expand Down
Loading
Loading