Skip to content

Commit

Permalink
Merge pull request #1777 from CombatExtended-Continued/4.8-final-patc…
Browse files Browse the repository at this point in the history
…h-fixes

final tweaks
  • Loading branch information
N7Huntsman authored Aug 17, 2022
2 parents 244b7ab + 0dd67bb commit 8d1a1d2
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 30 deletions.
45 changes: 21 additions & 24 deletions Patches/Archotech PowerArmor/Apparel_JDS.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@

<!-- ===== Add Bodypart Groups and Layers ===== -->
<li Class="PatchOperationAdd">
<xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]/apparel/layers</xpath>
<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/apparel/layers</xpath>
<value>
<li>OnHead</li>
<li>StrappedHead</li>
</value>
</li>

<li Class="PatchOperationAdd">
<xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]/apparel/bodyPartGroups</xpath>
<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/apparel/bodyPartGroups</xpath>
<value>
<li>Hands</li>
<li>Feet</li>
Expand All @@ -26,15 +26,15 @@

<!-- ===== Add Costlist ===== -->
<li Class="PatchOperationAdd">
<xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]/costList</xpath>
<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/costList</xpath>
<value>
<Uranium>20</Uranium>
<Hyperweave>30</Hyperweave>
</value>
</li>

<li Class="PatchOperationAdd">
<xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]/costList</xpath>
<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/costList</xpath>
<value>
<Uranium>45</Uranium>
<Hyperweave>90</Hyperweave>
Expand All @@ -45,14 +45,14 @@

<!-- === Archotech Power Helmet === -->
<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]/statBases/WorkToMake</xpath>
<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/WorkToMake</xpath>
<value>
<WorkToMake>26250</WorkToMake>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]/statBases/MaxHitPoints</xpath>
<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/MaxHitPoints</xpath>
<value>
<MaxHitPoints>360</MaxHitPoints>
<Bulk>5.5</Bulk>
Expand All @@ -61,14 +61,14 @@
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]/statBases/Mass</xpath>
<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/Mass</xpath>
<value>
<Mass>5</Mass>
</value>
</li>

<li Class="PatchOperationAdd">
<xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]/equippedStatOffsets</xpath>
<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/equippedStatOffsets</xpath>
<value>
<AimingAccuracy>0.20</AimingAccuracy>
<ToxicSensitivity>-0.50</ToxicSensitivity>
Expand All @@ -78,21 +78,21 @@
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]/statBases/ArmorRating_Sharp</xpath>
<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/ArmorRating_Sharp</xpath>
<value>
<ArmorRating_Sharp>24</ArmorRating_Sharp>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]/statBases/ArmorRating_Blunt</xpath>
<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/ArmorRating_Blunt</xpath>
<value>
<ArmorRating_Blunt>52</ArmorRating_Blunt>
</value>
</li>

<li Class="PatchOperationAddModExtension">
<xpath>Defs/ThingDef[@Name="Trooper_HelmetBase"]</xpath>
<xpath>Defs/ThingDef[@Name="APA_HelmetBase"]</xpath>
<value>
<li Class="CombatExtended.PartialArmorExt">
<stats>
Expand All @@ -115,14 +115,14 @@

<!-- === Archotech Power Armor === -->
<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]/statBases/WorkToMake</xpath>
<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/WorkToMake</xpath>
<value>
<WorkToMake>80000</WorkToMake>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]/statBases/MaxHitPoints</xpath>
<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/MaxHitPoints</xpath>
<value>
<MaxHitPoints>650</MaxHitPoints>
<Bulk>100</Bulk>
Expand All @@ -131,40 +131,37 @@
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]/statBases/Mass</xpath>
<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/Mass</xpath>
<value>
<Mass>60</Mass>
</value>
</li>

<li Class="PatchOperationAdd">
<xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]</xpath>
<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/equippedStatOffsets</xpath>
<value>
<equippedStatOffsets>
<CarryWeight>90</CarryWeight>
<CarryBulk>12.5</CarryBulk>
<ShootingAccuracyPawn>0.20</ShootingAccuracyPawn>
<ToxicSensitivity>-0.50</ToxicSensitivity>
</equippedStatOffsets>
<CarryWeight>90</CarryWeight>
<CarryBulk>12.5</CarryBulk>
<ShootingAccuracyPawn>0.20</ShootingAccuracyPawn>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]/statBases/ArmorRating_Sharp</xpath>
<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/ArmorRating_Sharp</xpath>
<value>
<ArmorRating_Sharp>30</ArmorRating_Sharp>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]/statBases/ArmorRating_Blunt</xpath>
<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/ArmorRating_Blunt</xpath>
<value>
<ArmorRating_Blunt>62</ArmorRating_Blunt>
</value>
</li>

<li Class="PatchOperationAddModExtension">
<xpath>Defs/ThingDef[@Name="Trooper_ArmorBase"]</xpath>
<xpath>Defs/ThingDef[@Name="APA_ArmorBase"]</xpath>
<value>
<li Class="CombatExtended.PartialArmorExt">
<stats>
Expand Down
10 changes: 4 additions & 6 deletions Patches/RH2 Rimmu-Nation² - Weapons/RM2_Swords_CE.xml
Original file line number Diff line number Diff line change
Expand Up @@ -256,13 +256,11 @@
</li>

<li Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="RNMeleeWeapon_ZKiller_Sword"]</xpath>
<xpath>Defs/ThingDef[defName="RNMeleeWeapon_ZKiller_Sword"]/equippedStatOffsets</xpath>
<value>
<equippedStatOffsets>
<MeleeCritChance>0.30</MeleeCritChance>
<MeleeParryChance>0.25</MeleeParryChance>
<MeleeDodgeChance>0.08</MeleeDodgeChance>
</equippedStatOffsets>
<MeleeCritChance>0.30</MeleeCritChance>
<MeleeParryChance>0.25</MeleeParryChance>
<MeleeDodgeChance>0.08</MeleeDodgeChance>
</value>
</li>

Expand Down

0 comments on commit 8d1a1d2

Please sign in to comment.