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

Vanilla Expanded Weapons Compat Patch Updates #1183

Merged
merged 17 commits into from
Apr 6, 2020
Merged

Vanilla Expanded Weapons Compat Patch Updates #1183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0f3a29c
Merge pull request #4 from CombatExtendedRWMod/master
N7Huntsman Apr 1, 2020
fda3cf1
Remove '1.0' version, update supported mods list
N7Huntsman Apr 1, 2020
7501228
VWE fix def.
N7Huntsman Apr 2, 2020
c0b0917
VWE fix rocket frag
N7Huntsman Apr 2, 2020
4a88b69
Fix VFE - Med, fix stuff, VWE to core musket ammo
N7Huntsman Apr 3, 2020
2f32887
Patch sawed off, longbow, throwing rocks.
N7Huntsman Apr 3, 2020
5665602
Remove VWE specific musket ammo.
N7Huntsman Apr 3, 2020
66b55e2
Merge branch 'master' into Compat-Patches
N7Huntsman Apr 3, 2020
36b01ec
Remove stuff meant for 'master'
N7Huntsman Apr 3, 2020
c8bbcef
Merge branch 'Compat-Patches' of https://github.com/N7Huntsman/Combat…
N7Huntsman Apr 3, 2020
a92b479
More.
N7Huntsman Apr 3, 2020
99e1edc
Stuff.
N7Huntsman Apr 3, 2020
2f455f3
Patch axe.
N7Huntsman Apr 3, 2020
eb0f067
Tweak.
N7Huntsman Apr 3, 2020
a7777c9
Add CE core musket ammo.
N7Huntsman Apr 5, 2020
fba40c7
Fixed Throwing Knives and Whip
waifuenjoyer Apr 5, 2020
84191f8
Merge pull request #5 from onigamii/Compat-Patches
N7Huntsman Apr 5, 2020
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
129 changes: 129 additions & 0 deletions Defs/Ammo/Medieval/MusketBall.xml
View file
Open in desktop
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>
2 changes: 1 addition & 1 deletion Patches/Vanilla Factions Expanded - Medieval/ThingDef_Misc/VanillaMedieval_Ranged.xml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

137 changes: 0 additions & 137 deletions Patches/Vanilla Weapons Expanded/Ammo/LeadBall.xml
View file
Open in desktop

This file was deleted.

Loading