Skip to content
This repository was archived by the owner on Apr 14, 2020. It is now read-only.

Commit

Permalink
Merge pull request #1183 from N7Huntsman/Compat-Patches
Browse files Browse the repository at this point in the history
Vanilla Expanded Weapons Compat Patch Updates
  • Loading branch information
N7Huntsman authored Apr 6, 2020
2 parents 7404196 + 84191f8 commit c830daf
Show file tree
Hide file tree
Showing 13 changed files with 537 additions and 232 deletions.
129 changes: 129 additions & 0 deletions Defs/Ammo/Medieval/MusketBall.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<ThingCategoryDef>
<defName>AmmoMusketBall</defName>
<label>Musket ball</label>
<parent>AmmoRifles</parent>
<iconPath>UI/Icons/ThingCategories/CaliberRifle</iconPath>
</ThingCategoryDef>

<!-- ==================== AmmoSet ========================== -->

<!-- High Velocity -->
<CombatExtended.AmmoSetDef>
<defName>AmmoSet_FastMusketBall</defName>
<label>Musket Ball</label>
<ammoTypes>
<Ammo_MusketBall>Bullet_FastMusketBall</Ammo_MusketBall>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<!-- Low Velocity -->
<CombatExtended.AmmoSetDef>
<defName>AmmoSet_SlowMusketBall</defName>
<label>Musket Ball</label>
<ammoTypes>
<Ammo_MusketBall>Bullet_SlowMusketBall</Ammo_MusketBall>
</ammoTypes>
</CombatExtended.AmmoSetDef>

<!-- ==================== Ammo ========================== -->

<ThingDef Class="CombatExtended.AmmoDef" Name="MusketBallBase" ParentName="SmallAmmoBase" Abstract="True">
<description>A paper cartridge sealed with wax containing a round projectile and black powder, fired by early, smoothbore firearms.</description>
<statBases>
<Mass>0.12</Mass>
<Bulk>0.14</Bulk>
</statBases>
<tradeTags>
<li>CE_AutoEnableTrade</li>
<li>CE_AutoEnableCrafting_FueledSmithy</li>
<li>CE_AutoEnableCrafting_ElectricSmithy</li>
</tradeTags>
<thingCategories>
<li>AmmoMusketBall</li>
</thingCategories>
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="MusketBallBase">
<defName>Ammo_MusketBall</defName>
<label>Musket ball</label>
<graphicData>
<texPath>Things/Ammo/Neolithic/SlingBullet/Steel</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<statBases>
<MarketValue>0.5</MarketValue>
</statBases>
<ammoClass>FullMetalJacket</ammoClass>
</ThingDef>

<!-- ================== Projectile Base ================== -->

<ThingDef Name="MusketBallBullet" ParentName="BaseBullet" Abstract="true">
<graphicData>
<texPath>Things/Projectile/Bullet_big</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>
<projectile>
<damageDef>Bullet</damageDef>
<dropsCasings>false</dropsCasings>
</projectile>
</ThingDef>

<!-- ================== Projectiles (High Velocity) ================== -->

<ThingDef ParentName="MusketBallBullet">
<defName>Bullet_FastMusketBall</defName>
<label>lead ball</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<speed>60</speed>
<damageAmountBase>20</damageAmountBase>
<armorPenetrationSharp>6.7</armorPenetrationSharp>
<armorPenetrationBlunt>28.8</armorPenetrationBlunt>
</projectile>
</ThingDef>

<!-- ================== Projectiles (Low Velocity) ================== -->

<ThingDef ParentName="MusketBallBullet">
<defName>Bullet_SlowMusketBall</defName>
<label>lead ball</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<speed>80</speed>
<damageAmountBase>17</damageAmountBase>
<armorPenetrationSharp>5.3</armorPenetrationSharp>
<armorPenetrationBlunt>20</armorPenetrationBlunt>
</projectile>
</ThingDef>

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

<RecipeDef ParentName="AmmoRecipeBase">
<defName>MakeAmmo_MusketBall</defName>
<label>make lead ball x500</label>
<description>Craft 500 lead balls.</description>
<jobString>Making lead balls.</jobString>
<workAmount>6800</workAmount>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>68</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<Ammo_MusketBall>500</Ammo_MusketBall>
</products>
</RecipeDef>

</Defs>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<Operation Class="PatchOperationFindMod">
<mods>
<li>Vanilla Weapons Expanded</li>
<li>Vanilla Factions Expanded - Medieval</li>
</mods>

<match Class="PatchOperationSequence">
Expand Down
24 changes: 13 additions & 11 deletions Patches/Vanilla Weapons Expanded/Ammo/AntiGrainRocket.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,19 @@
<soundAmbient>RocketPropelledLoop_Small</soundAmbient>
</projectile>
<comps>
<li Class="CombatExtended.CompProperties_ExplosiveCE">
<damageAmountBase>50</damageAmountBase>
<explosiveDamageType>VWE_Shock</explosiveDamageType>
<explosiveRadius>4.5</explosiveRadius>
<explosionSound>MortarBomb_Explode</explosionSound>
<fragments>
<Fragment_Large>5</Fragment_Large>
<Fragment_Small>50</Fragment_Small>
</fragments>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
</li>
<li Class="CombatExtended.CompProperties_ExplosiveCE">
<damageAmountBase>50</damageAmountBase>
<explosiveDamageType>VWE_Shock</explosiveDamageType>
<explosiveRadius>4.5</explosiveRadius>
<explosionSound>MortarBomb_Explode</explosionSound>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
</li>
<li Class="CombatExtended.CompProperties_Fragments">
<fragments>
<Fragment_Large>5</Fragment_Large>
<Fragment_Small>50</Fragment_Small>
</fragments>
</li>
</comps>
</ThingDef>
</value>
Expand Down
15 changes: 0 additions & 15 deletions Patches/Vanilla Weapons Expanded/Ammo/CompoundArrow.txt

This file was deleted.

137 changes: 0 additions & 137 deletions Patches/Vanilla Weapons Expanded/Ammo/LeadBall.xml

This file was deleted.

Loading

0 comments on commit c830daf

Please sign in to comment.