Skip to content

Commit

Permalink
Merge pull request #2908 from SamaelGray/SamaelGray-AmmoHousekeeping
Browse files Browse the repository at this point in the history 
Misc ammo housekeeping and fixes
  • Loading branch information
@N7Huntsman
N7Huntsman authored Jan 7, 2024
2 parents 23f8fd5 + 1b0a07c commit 320668a
Show file tree
Hide file tree
Showing 8 changed files with 89 additions and 42 deletions.
7 changes: 1 addition & 6 deletions Biotech/Patches/Misc/Ammo_Generic.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<!-- Charged Rifle -->
<Operation Class="PatchOperationReplace">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_5x35mmCharged" or defName="AmmoSet_6x22mmCharged"]/similarTo</xpath>
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_6x22mmCharged"]/similarTo</xpath>
<value>
<similarTo>AmmoSet_ChargedRifle</similarTo>
</value>
Expand All @@ -25,9 +25,4 @@
</value>
</Operation>

<!-- Mech Shells -->
<Operation Class="PatchOperationRemove">
<xpath>Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_66mmThermalBolt" or defName="AmmoSet_80x256mmFuel"]/similarTo</xpath>
</Operation>

</Patch>
49 changes: 48 additions & 1 deletion Defs/Ammo/Advanced/164x284mmDemoShell.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>10.97</MarketValue><!-- value intentionally decreased to help reduce wealth bloat/free silver -->
<MarketValue>20.09</MarketValue><!-- value intentionally decreased to help reduce wealth bloat/free silver -->
</statBases>
<ammoClass>Demolition</ammoClass>
<detonateProjectile>Bullet_164x284mmDemo</detonateProjectile>
Expand Down Expand Up @@ -164,4 +164,51 @@

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

<RecipeDef ParentName="ChargeAmmoRecipeBase" MayRequire="Ludeon.RimWorld.Biotech">
<defName>MakeAmmo_164x284mmDemo</defName>
<label>make 164x284mm demolition shell x5</label>
<description>Craft 5 164x284mm demolition shells.</description>
<jobString>Making 164x284mm demolition shell.</jobString>
<ingredients>
<li>
<filter>
<thingDefs>
<li>FSX</li>
</thingDefs>
</filter>
<count>5</count>
</li>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>16</count>
</li>
<li>
<filter>
<thingDefs>
<li>ComponentIndustrial</li>
</thingDefs>
</filter>
<count>4</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>FSX</li>
<li>Steel</li>
<li>ComponentIndustrial</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_164x284mmDemo>5</Ammo_164x284mmDemo>
</products>
<skillRequirements>
<Crafting>8</Crafting>
</skillRequirements>
<workAmount>6600</workAmount><!-- 10% more work -->
</RecipeDef>

</Defs>
2 changes: 1 addition & 1 deletion Defs/Ammo/Advanced/66mmThermalBolt.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ammoTypes>
<Ammo_66mmThermalBolt_Incendiary>Bullet_66mmThermalBolt_Incendiary</Ammo_66mmThermalBolt_Incendiary>
</ammoTypes>
<similarTo>AmmoSet_MechShell</similarTo>
<similarTo>AmmoSet_MechShell_Incendiary</similarTo>
</CombatExtended.AmmoSetDef>

<!-- ==================== Ammo ========================== -->
Expand Down
2 changes: 1 addition & 1 deletion Defs/Ammo/Advanced/80x256mmFuelCell.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ammoTypes>
<Ammo_80x256mmFuel_Incendiary>Bullet_80x256mmFuel_Incendiary</Ammo_80x256mmFuel_Incendiary>
</ammoTypes>
<similarTo>AmmoSet_MechShell</similarTo>
<similarTo>AmmoSet_MechShell_Incendiary</similarTo>
</CombatExtended.AmmoSetDef>

<!-- ==================== Ammo ========================== -->
Expand Down
8 changes: 4 additions & 4 deletions Defs/Ammo/Generic/Charged.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<ammoClass>Ionized</ammoClass>
<generateAllowChance>0</generateAllowChance>
<generateAllowChance>0.5</generateAllowChance>
</ThingDef>

<!-- Charged Rifle -->
Expand Down Expand Up @@ -174,7 +174,7 @@
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<ammoClass>Ionized</ammoClass>
<generateAllowChance>0</generateAllowChance>
<generateAllowChance>0.5</generateAllowChance>
</ThingDef>

<!-- Heavy Charged -->
Expand Down Expand Up @@ -224,7 +224,7 @@
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<ammoClass>Ionized</ammoClass>
<generateAllowChance>0.25</generateAllowChance>
<generateAllowChance>0.5</generateAllowChance>
</ThingDef>

<!-- Charge Shotgun -->
Expand Down Expand Up @@ -272,7 +272,7 @@
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<ammoClass>Ionized</ammoClass>
<generateAllowChance>0.25</generateAllowChance>
<generateAllowChance>0.5</generateAllowChance>
</ThingDef>

<!-- ==================== Recipes ========================== -->
Expand Down
37 changes: 20 additions & 17 deletions Defs/Ammo/Generic/Mech.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@
<defName>AmmoSet_MechCharged</defName>
<label>mech charged ammo</label>
<ammoTypes>
<Ammo_MechCharged>Bullet_5x35mmCharged</Ammo_MechCharged>
<Ammo_Mech_Charged>Bullet_5x35mmCharged</Ammo_Mech_Charged>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_MechShell</defName>
<label>mech shell</label>
<defName>AmmoSet_MechShell_Incendiary</defName>
<label>mech shell (Incendiary)</label>
<ammoTypes>
<Ammo_MechShell>Bullet_80x256mmFuel_Incendiary</Ammo_MechShell>
<Ammo_MechShell_Incendiary>Bullet_80x256mmFuel_Incendiary</Ammo_MechShell_Incendiary>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_MechShell_Demo</defName>
<label>mech shell</label>
<label>mech shell (Demo)</label>
<ammoTypes>
<Ammo_MechShell_Demo>Bullet_164x284mmDemo</Ammo_MechShell_Demo>
</ammoTypes>
Expand All @@ -58,6 +58,7 @@
</statBases>
<tradeTags>
<li>CE_AutoEnableTrade_Sellable</li>
<li MayRequire="Ludeon.RimWorld.Biotech">CE_AutoEnableCrafting_FabricationBench</li>
</tradeTags>
<thingCategories>
<li>AmmoMechCharged</li>
Expand All @@ -66,7 +67,7 @@
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="MechChargedAmmo">
<defName>Ammo_MechCharged</defName>
<defName>Ammo_Mech_Charged</defName>
<label>Mech Charged cartridge</label>
<graphicData>
<texPath>Things/Ammo/Charged/MediumMech</texPath>
Expand All @@ -86,6 +87,7 @@
</statBases>
<tradeTags>
<li>CE_AutoEnableTrade_Sellable</li>
<li MayRequire="Ludeon.RimWorld.Biotech">CE_AutoEnableCrafting_FabricationBench</li>
</tradeTags>
<thingCategories>
<li>AmmoMechShell</li>
Expand All @@ -94,13 +96,14 @@
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="MechShellAmmo">
<defName>Ammo_MechShell</defName>
<label>mechanoid shell</label>
<defName>Ammo_MechShell_Incendiary</defName>
<label>mechanoid shell (Incendiary)</label>
<graphicData>
<texPath>Things/Ammo/FuelCell/Large</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<ammoClass>GrenadeIncendiary</ammoClass>
<detonateProjectile>Bullet_80x256mmFuel_Incendiary</detonateProjectile>
<comps>
<li Class="CompProperties_Explosive">
<explosiveRadius>1.9</explosiveRadius>
Expand All @@ -115,9 +118,9 @@
</comps>
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="164x284mmDemoBase">
<ThingDef Class="CombatExtended.AmmoDef" ParentName="MechShellAmmo">
<defName>Ammo_MechShell_Demo</defName>
<label>mech shell (demo)</label>
<label>mech shell (Demo)</label>
<graphicData>
<texPath>Things/Ammo/FuelCell/Large</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
Expand All @@ -144,7 +147,7 @@
<!-- ==================== Recipes ========================== -->

<RecipeDef ParentName="ChargeAmmoRecipeBase" MayRequire="Ludeon.RimWorld.Biotech">
<defName>MakeAmmo_MechCharged</defName>
<defName>MakeAmmo_Mech_Charged</defName>
<label>make Mech Charged cartridge x200</label>
<description>Craft 200 Mech Charged cartridges.</description>
<jobString>Making Mech Charged cartridges.</jobString>
Expand Down Expand Up @@ -182,7 +185,7 @@
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_MechCharged>200</Ammo_MechCharged>
<Ammo_Mech_Charged>200</Ammo_Mech_Charged>
</products>
<skillRequirements>
<Crafting>8</Crafting>
Expand All @@ -191,10 +194,10 @@
</RecipeDef>

<RecipeDef ParentName="ChargeAmmoRecipeBase" MayRequire="Ludeon.RimWorld.Biotech">
<defName>MakeAmmo_MechShell</defName>
<label>make Mech Shell x5</label>
<description>Craft 5 Mech Shells.</description>
<jobString>Making Mech Shells.</jobString>
<defName>MakeAmmo_MechShell_Incendiary</defName>
<label>make Mech Shell (Incendiary) x5</label>
<description>Craft 5 Mech Shells (Incendiary).</description>
<jobString>Making Mech Shells (Incendiary).</jobString>
<ingredients>
<li>
<filter>
Expand Down Expand Up @@ -229,7 +232,7 @@
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_MechShell>5</Ammo_MechShell>
<Ammo_MechShell_Incendiary>5</Ammo_MechShell_Incendiary>
</products>
<skillRequirements>
<Crafting>8</Crafting>
Expand Down
14 changes: 8 additions & 6 deletions Defs/RecipeDefs/Recipes_Production.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<li>Ammo_5x35mmCharged</li>
<li>Ammo_6x22mmCharged</li>
<li>Ammo_12x64mmCharged</li>
<li>Ammo_MechCharged</li>
<li>Ammo_Mech_Charged</li>
</thingDefs>
</filter>
<count>200</count>
Expand All @@ -98,7 +98,7 @@
<li>Ammo_5x35mmCharged</li>
<li>Ammo_6x22mmCharged</li>
<li>Ammo_12x64mmCharged</li>
<li>Ammo_MechCharged</li>
<li>Ammo_Mech_Charged</li>
</thingDefs>
</fixedIngredientFilter>
<products>
Expand Down Expand Up @@ -127,7 +127,7 @@
<li>Ammo_5x35mmCharged</li>
<li>Ammo_6x22mmCharged</li>
<li>Ammo_12x64mmCharged</li>
<li>Ammo_MechCharged</li>
<li>Ammo_Mech_Charged</li>
</thingDefs>
</filter>
<count>200</count>
Expand All @@ -138,7 +138,7 @@
<li>Ammo_5x35mmCharged</li>
<li>Ammo_6x22mmCharged</li>
<li>Ammo_12x64mmCharged</li>
<li>Ammo_MechCharged</li>
<li>Ammo_Mech_Charged</li>
</thingDefs>
</fixedIngredientFilter>
<products>
Expand Down Expand Up @@ -167,7 +167,8 @@
<li>Ammo_66mmThermalBolt_Incendiary</li>
<li>Ammo_80x256mmFuel_Incendiary</li>
<li>Ammo_164x284mmDemo</li>
<li>Ammo_MechShell</li>
<li>Ammo_MechShell_Incendiary</li>
<li>Ammo_MechShell_Demo</li>
</thingDefs>
</filter>
<count>5</count>
Expand All @@ -178,7 +179,8 @@
<li>Ammo_66mmThermalBolt_Incendiary</li>
<li>Ammo_80x256mmFuel_Incendiary</li>
<li>Ammo_164x284mmDemo</li>
<li>Ammo_MechShell</li>
<li>Ammo_MechShell_Incendiary</li>
<li>Ammo_MechShell_Demo</li>
</thingDefs>
</fixedIngredientFilter>
<products>
Expand Down
12 changes: 6 additions & 6 deletions Patches/Vanilla Factions Expanded - Mechanoids/CombinationDefs/CombinationDefs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@
<amount>
<li>32</li>
<li>8</li>
<li>32</li>
<li>14</li>
</amount>
<outputLimitControlled>true</outputLimitControlled>
<maxTotalOutput>2000</maxTotalOutput>
Expand All @@ -659,7 +659,7 @@
<amount>
<li>8</li>
<li>10</li>
<li>8</li>
<li>5</li>
</amount>
<outputLimitControlled>true</outputLimitControlled>
<maxTotalOutput>2000</maxTotalOutput>
Expand All @@ -683,7 +683,7 @@
<amount>
<li>8</li>
<li>6</li>
<li>8</li>
<li>5</li>
</amount>
<outputLimitControlled>true</outputLimitControlled>
<maxTotalOutput>2000</maxTotalOutput>
Expand All @@ -696,7 +696,7 @@
<defName>VFEM_VersatileAssembler_Ammo_164x284mmDemo</defName>
<building>VFEM_VersatileAssembler</building>
<items>
<li>Plasteel</li>
<li>Steel</li>
</items>
<secondItems>
<li>FSX</li>
Expand All @@ -705,7 +705,7 @@
<li>ComponentIndustrial</li>
</thirdItems>
<amount>
<li>50</li>
<li>16</li>
<li>5</li>
<li>4</li>
</amount>
Expand Down Expand Up @@ -779,7 +779,7 @@
<amount>
<li>18</li>
<li>12</li>
<li>18</li>
<li>9</li>
</amount>
<outputLimitControlled>true</outputLimitControlled>
<maxTotalOutput>2000</maxTotalOutput>
Expand Down

0 comments on commit 320668a

Please sign in to comment.