Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions Defs/Ammo/Modded/Warhammer 40k/LasGun.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,14 @@
</ammoTypes>
</CombatExtended.AmmoSetDef>

<CombatExtended.AmmoSetDef>
<defName>AmmoSet_Lasgun_CannonDouble</defName>
<label>lasgun power pack</label>
<ammoTypes>
<Ammo_LasgunPowerPack>Bullet_Lasgun_CannonDouble</Ammo_LasgunPowerPack>
</ammoTypes>
</CombatExtended.AmmoSetDef>

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

<ThingDef Class="CombatExtended.AmmoDef" Name="LasgunPowerPackBase" ParentName="SpacerSmallAmmoBase" Abstract="True">
Expand Down Expand Up @@ -119,6 +127,18 @@
</projectile>
</ThingDef>

<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletRed">
<defName>Bullet_Lasgun_CannonDouble</defName>
<label>laser beam</label>
<projectile Class="CombatExtended.ProjectilePropertiesCE">
<damageDef>CE_Laser</damageDef>
<damageAmountBase>80</damageAmountBase>
<armorPenetrationSharp>558</armorPenetrationSharp>
<armorPenetrationBlunt>0.01</armorPenetrationBlunt>
<pelletCount>2</pelletCount>
</projectile>
</ThingDef>

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

<RecipeDef ParentName="AmmoRecipeBase">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
</li>

<!-- Vehicle -->
<!--
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleDef[defName="GW_Predator"]/statBases/ArmorRating_Blunt</xpath>
<value>
Expand Down Expand Up @@ -260,10 +261,10 @@
<health>750</health>
</value>
</li>

-->
<!-- Probably intended to be unarmored? -->

<!-- <li Class="PatchOperationReplace">
<!--
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleDef[defName="GW_Predator"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Blunt</xpath>
<value>
<ArmorRating_Blunt>40</ArmorRating_Blunt>
Expand All @@ -275,7 +276,7 @@
<value>
<ArmorRating_Sharp>20</ArmorRating_Sharp>
</value>
</li> -->
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleDef[defName="GW_Predator"]/components/li[key="Roof"]/health</xpath>
Expand All @@ -297,6 +298,7 @@
<ArmorRating_Sharp>16</ArmorRating_Sharp>
</value>
</li>
-->
</operations>
</match>
</Operation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@
</li>
</value>
</li>

</operations>
</match>
</Operation>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<!--===== Rhino =====-->

<!-- Vehicle -->

<!--
<li Class="PatchOperationReplace">
<xpath>Defs/Vehicles.VehicleDef[defName="GW_Rhino"]/statBases/ArmorRating_Blunt</xpath>
<value>
Expand Down Expand Up @@ -202,6 +202,7 @@
<ArmorRating_Sharp>16</ArmorRating_Sharp>
</value>
</li>
-->
</operations>
</match>
</Operation>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<li Class="CombatExtended.ToolCE">
<label>head</label>
<capacities>
<li>CE_Kit_CryptoBlunt</li>
<li>VQE_CryptoCut</li>
</capacities>
<power>36</power>
<cooldownTime>2.61</cooldownTime>
Expand All @@ -28,13 +28,15 @@
</tools>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="KIT_CryptoHammer"]/statBases</xpath>
<value>
<MeleeCounterParryBonus>0.25</MeleeCounterParryBonus>
<Bulk>3.5</Bulk>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="KIT_CryptoHammer"]</xpath>
<value>
Expand Down Expand Up @@ -77,13 +79,15 @@
</tools>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="KIT_CryptoKnife"]/statBases</xpath>
<value>
<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
<Bulk>1.5</Bulk>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="KIT_CryptoKnife"]</xpath>
<value>
Expand All @@ -103,6 +107,7 @@
<Bulk>12.50</Bulk>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="KIT_CryptoSpear"]</xpath>
<value>
Expand All @@ -113,6 +118,7 @@
</equippedStatOffsets>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="KIT_CryptoSpear"]/tools</xpath>
<value>
Expand Down Expand Up @@ -176,13 +182,15 @@
</tools>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="KIT_CryptoSword"]/statBases</xpath>
<value>
<MeleeCounterParryBonus>0.39</MeleeCounterParryBonus>
<Bulk>1.5</Bulk>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="KIT_CryptoSword"]</xpath>
<value>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,46 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>
<!-- ========== Huntress =========== -->

<Operation Class="PatchOperationReplace">
<xpath>Defs/HediffDef[defName="Miho_Huntress_I_Hediff"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
<value>
<ShootingAccuracyPawn>0.25</ShootingAccuracyPawn>
<AimingAccuracy>0.10</AimingAccuracy>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/HediffDef[defName="Miho_Huntress_II_Hediff"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
<value>
<ShootingAccuracyPawn>0.75</ShootingAccuracyPawn>
<AimingAccuracy>0.30</AimingAccuracy>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/HediffDef[defName="Miho_Huntress_III_Hediff"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
<value>
<ShootingAccuracyPawn>1.00</ShootingAccuracyPawn>
<AimingAccuracy>0.40</AimingAccuracy>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/HediffDef[defName="Miho_Huntress_IV_Hediff"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
<value>
<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
<AimingAccuracy>0.5</AimingAccuracy>
</value>
</Operation>

<Operation Class="PatchOperationReplace">
<xpath>Defs/HediffDef[defName="Miho_Huntress_V_Hediff"]/stages/li/statOffsets/ShootingAccuracyPawn</xpath>
<value>
<ShootingAccuracyPawn>1.5</ShootingAccuracyPawn>
<AimingAccuracy>0.6</AimingAccuracy>
</value>
</Operation>

<!-- ========== Fatale =========== -->

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/ThingDef[defName="RH_RedWine"]/weaponTags</xpath>
<xpath>Defs/ThingDef[defName="RH2_DragonVodka"]/weaponTags</xpath>
<match Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="RH2_DragonVodka"]/weaponTags</xpath>
<value>
Expand Down