Skip to content

Commit

Permalink
Merge pull request #3281 from SamaelGray/SamaelGray-AirburstShellFragFix
Browse files Browse the repository at this point in the history 
Aitburst shell frag amount fix
  • Loading branch information
@N7Huntsman
N7Huntsman authored Aug 6, 2024
2 parents 093e38d + 1a5e6d5 commit 7543361
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 61 deletions.
2 changes: 1 addition & 1 deletion Defs/Ammo/Shell/105mmHowitzer.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
<li Class="CombatExtended.CompProperties_Fragments">
<fragments>
<Fragment_Large>40</Fragment_Large>
<Fragment_Small>44</Fragment_Small>
<Fragment_Small>65</Fragment_Small>
</fragments>
<fragAngleRange>-90~-40</fragAngleRange>
</li>
Expand Down
120 changes: 60 additions & 60 deletions Defs/Ammo/Shell/81mmMortar.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Shell_Smoke>Bullet_81mmMortarShell_Smoke</Shell_Smoke>
<Shell_AntigrainWarhead>Bullet_81mmMortarShell_Antigrain</Shell_AntigrainWarhead>
<Shell_Toxic MayRequire="Ludeon.RimWorld.Biotech">Bullet_81mmMortarShell_Tox</Shell_Toxic>
<Shell_Deadlife MayRequire="Ludeon.RimWorld.Anomaly">Bullet_81mmMortarShell_Deadlife</Shell_Deadlife>
<Shell_Deadlife MayRequire="Ludeon.RimWorld.Anomaly">Bullet_81mmMortarShell_Deadlife</Shell_Deadlife>
</ammoTypes>
<isMortarAmmoSet>true</isMortarAmmoSet>
</CombatExtended.AmmoSetDef>
Expand Down Expand Up @@ -292,8 +292,8 @@
<comps>
<li Class="CombatExtended.CompProperties_Fragments">
<fragments>
<Fragment_Large>12</Fragment_Large>
<Fragment_Small>24</Fragment_Small>
<Fragment_Large>23</Fragment_Large>
<Fragment_Small>38</Fragment_Small>
</fragments>
<fragAngleRange>-90~-48</fragAngleRange>
</li>
Expand Down Expand Up @@ -381,7 +381,7 @@
<explosionEffect>ExtinguisherExplosion</explosionEffect>
<shellingProps>
<damage>0</damage>
</shellingProps>
</shellingProps>
</projectile>
</ThingDef>

Expand Down Expand Up @@ -431,7 +431,7 @@
<postExplosionSpawnThingDefWater>Shell_Toxic_Releasing_Water</postExplosionSpawnThingDefWater>
<shellingProps>
<damage>0.12</damage>
</shellingProps>
</shellingProps>
</projectile>
</ThingDef>

Expand All @@ -455,7 +455,7 @@
<postExplosionSpawnThingDef>Shell_Deadlife_Releasing</postExplosionSpawnThingDef>
<shellingProps>
<damage>0</damage>
</shellingProps>
</shellingProps>
</projectile>
</ThingDef>

Expand Down Expand Up @@ -779,59 +779,59 @@
<Shell_Toxic>5</Shell_Toxic>
</products>
</RecipeDef>
<RecipeDef ParentName="AmmoRecipeBase" MayRequire="Ludeon.RimWorld.Anomaly">
<defName>MakeShell_Deadlife</defName>
<label>make 81mm deadlife mortar shells x5</label>
<description>Craft 5 81mm deadlife mortar shells.</description>
<jobString>Making 81mm deadlife mortar shells.</jobString>
<researchPrerequisites>
<li>DeadlifeDust</li>
<li>Mortars</li>
</researchPrerequisites>
<recipeUsers Inherit="false">
<li>BioferriteShaper</li>
</recipeUsers>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>42</count>
</li>
<li>
<filter>
<thingDefs>
<li>ComponentIndustrial</li>
</thingDefs>
</filter>
<count>2</count>
</li>
<li>
<filter>
<thingDefs>
<li>Bioferrite</li>
</thingDefs>
</filter>
<count>25</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
<li>Bioferrite</li>
<li>ComponentIndustrial</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Shell_Deadlife>5</Shell_Deadlife>
</products>
<skillRequirements>
<Crafting>4</Crafting>
</skillRequirements>
<workAmount>6600</workAmount>
</RecipeDef>

<RecipeDef ParentName="AmmoRecipeBase" MayRequire="Ludeon.RimWorld.Anomaly">
<defName>MakeShell_Deadlife</defName>
<label>make 81mm deadlife mortar shells x5</label>
<description>Craft 5 81mm deadlife mortar shells.</description>
<jobString>Making 81mm deadlife mortar shells.</jobString>
<researchPrerequisites>
<li>DeadlifeDust</li>
<li>Mortars</li>
</researchPrerequisites>
<recipeUsers Inherit="false">
<li>BioferriteShaper</li>
</recipeUsers>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>42</count>
</li>
<li>
<filter>
<thingDefs>
<li>ComponentIndustrial</li>
</thingDefs>
</filter>
<count>2</count>
</li>
<li>
<filter>
<thingDefs>
<li>Bioferrite</li>
</thingDefs>
</filter>
<count>25</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
<li>Bioferrite</li>
<li>ComponentIndustrial</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Shell_Deadlife>5</Shell_Deadlife>
</products>
<skillRequirements>
<Crafting>4</Crafting>
</skillRequirements>
<workAmount>6600</workAmount>
</RecipeDef>

</Defs>

0 comments on commit 7543361

Please sign in to comment.