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

Commit

Permalink
Merge pull request #5 from onigamii/Compat-Patches
Browse files Browse the repository at this point in the history
Vanilla Weapons Expanded
  • Loading branch information
N7Huntsman authored Apr 5, 2020
2 parents a7777c9 + fba40c7 commit 84191f8
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 90 deletions.
26 changes: 13 additions & 13 deletions Patches/Vanilla Weapons Expanded/Ammo/AntiGrainRocket.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +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>
<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
</li>
<li Class="CombatExtended.CompProperties_Fragments">
<fragments>
<Fragment_Large>5</Fragment_Large>
<Fragment_Small>50</Fragment_Small>
</fragments>
</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.

57 changes: 4 additions & 53 deletions Patches/Vanilla Weapons Expanded/Ammo/Whip.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,70 +8,21 @@

<match Class="PatchOperationSequence">
<operations>

<!-- === Ammo Set === -->
<li Class="PatchOperationAdd">
<xpath>Defs</xpath>

<value>
<CombatExtended.AmmoSetDef>
<defName>AmmoSet_VWE_Whip</defName>
<label>whip</label>
<ammoTypes>
<Ammo_VWE_Whip>Projectile_VWE_Whip</Ammo_VWE_Whip>
</ammoTypes>
</CombatExtended.AmmoSetDef>
</value>
</li>

<!-- === Ammo === -->
<li Class="PatchOperationAdd">
<xpath>Defs</xpath>

<value>
<ThingDef Class="CombatExtended.AmmoDef" Name="VWEWhipBase" ParentName="SmallAmmoBase" Abstract="True">
<description>.</description>

<statBases>
<Mass>0.01</Mass>
<Bulk>0.02</Bulk>
</statBases>
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="VWEWhipBase">
<defName>Ammo_VWE_Whip</defName>
<label>whip slash</label>

<graphicData>
<texPath>Things/Ammo/Neolithic/SlingBullet/Steel</texPath>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
</ThingDef>
</value>
</li>

<!-- === Projectile === -->
<li Class="PatchOperationAdd">
<xpath>Defs</xpath>

<value>
<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBullet" Name="VWEWhipProj" Abstract="true">
<ThingDef Class="CombatExtended.AmmoDef" ParentName="BaseBullet">
<defName>Bullet_VWE_Whip</defName>
<thingClass>CombatExtended.BulletCE</thingClass>
<label>whip slash</label>
<graphicData>
<texPath>Things/Projectile/WhipSlash</texPath>
<graphicClass>Graphic_Single</graphicClass>
</graphicData>

<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>RangedStab</damageDef>
<speed>80</speed>
</projectile>
</ThingDef>

<ThingDef Class="CombatExtended.AmmoDef" ParentName="VWEWhipProj">
<defName>Projectile_VWE_Whip</defName>
<label>whip slash</label>

<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>RangedStab</damageDef>
<damageAmountBase>14</damageAmountBase>
</projectile>
Expand Down
43 changes: 34 additions & 9 deletions Patches/Vanilla Weapons Expanded/Medieval_Ranged.xml
Original file line number Diff line number Diff line change
Expand Up @@ -277,18 +277,43 @@
</li>

<!-- Weapon -->
<li Class="PatchOperationAttributeSet">
<xpath>/Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>
<attribute>ParentName</attribute>
<value>BaseWeapon</value>
</li>

<li Class="PatchOperationRemove">
<xpath>/Defs/ThingDef[defName="VWE_Throwing_Knives"]/recipeMaker</xpath>
</li>

<li Class="PatchOperationRemove">
<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]/costStuffCount</xpath>
</li>

<li Class="PatchOperationRemove">
<xpath>/Defs/ThingDef[defName="VWE_Throwing_Knives"]/stuffCategories</xpath>
</li>

<li Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>
<xpath>/Defs/ThingDef[defName="VWE_Throwing_Knives"]/graphicData</xpath>
<value>
<color>(105,105,105)</color>
</value>
</li>

<li Class="PatchOperationAdd">
<xpath>/Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>

<value>
<thingClass>CombatExtended.AmmoThing</thingClass>
<stackLimit>50</stackLimit>
<stackLimit>75</stackLimit>
<resourceReadoutPriority>First</resourceReadoutPriority>
</value>
</li>

<li Class="PatchOperationAttributeSet">
<xpath>Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>
<xpath>/Defs/ThingDef[defName="VWE_Throwing_Knives"]</xpath>

<attribute>Class</attribute>
<value>CombatExtended.AmmoDef</value>
Expand All @@ -298,10 +323,9 @@
<defName>VWE_Throwing_Knives</defName>

<statBases>
<WorkToMake>4600</WorkToMake>
<SightsEfficiency>0.7</SightsEfficiency>
<Bulk>1</Bulk>
<Mass>1</Mass>
<SightsEfficiency>1</SightsEfficiency>
<Bulk>0.35</Bulk>
<Mass>0.15</Mass>
<RangedWeapon_Cooldown>0.38</RangedWeapon_Cooldown>
</statBases>

Expand All @@ -311,8 +335,9 @@
<hasStandardCommand>True</hasStandardCommand>
<defaultProjectile>VWE_FlyingBlade</defaultProjectile>
<warmupTime>1</warmupTime>
<range>15</range>
<range>10</range>
<soundCast>ThrowGrenade</soundCast>
<ai_IsBuildingDestroyer>false</ai_IsBuildingDestroyer>
</Properties>
</li>

Expand Down Expand Up @@ -390,7 +415,7 @@
<Properties>
<verbClass>CombatExtended.Verb_ShootCE</verbClass>
<hasStandardCommand>True</hasStandardCommand>
<defaultProjectile>Projectile_VWE_Whip</defaultProjectile>
<defaultProjectile>Bullet_VWE_Whip</defaultProjectile>
<warmupTime>1</warmupTime>
<range>15</range>
<soundCast>VWE_Shot_Whip</soundCast>
Expand Down

0 comments on commit 84191f8

Please sign in to comment.