Skip to content

Commit

Permalink
Merge branch 'Development' into GW-Talons
Browse files Browse the repository at this point in the history
  • Loading branch information
@N7Huntsman
N7Huntsman committed Nov 21, 2024
2 parents 98f8e70 + 20c146b commit bf8fcea
Show file tree
Hide file tree
Showing 263 changed files with 9,862 additions and 2,250 deletions.
7 changes: 7 additions & 0 deletions Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,13 @@
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="Gun_HellcatRifle"]/graphicData</xpath>
<value>
<drawSize>(1.25,1.25)</drawSize>
</value>
</Operation>

<!-- ========== Incinerator ========== -->

<Operation Class="PatchOperationReplace">
Expand Down
10 changes: 5 additions & 5 deletions Anomaly/Patches/ThingDefs_Races/Races_Entities_Misc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
<value>
<ArmorRating_Sharp>0.2</ArmorRating_Sharp>
<ArmorRating_Blunt>1</ArmorRating_Blunt>
<PainShockThreshold>90</PainShockThreshold>
<PainShockThreshold>0.90</PainShockThreshold>
<MeleeDodgeChance>0.17</MeleeDodgeChance>
<MeleeCritChance>0.08</MeleeCritChance>
<MeleeParryChance>0.06</MeleeParryChance>
Expand Down Expand Up @@ -377,7 +377,7 @@
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="Noctol"]/statBases</xpath>
<value>
<PainShockThreshold>90</PainShockThreshold>
<PainShockThreshold>0.90</PainShockThreshold>
<MeleeDodgeChance>0.23</MeleeDodgeChance>
<MeleeCritChance>0.28</MeleeCritChance>
<MeleeParryChance>0.09</MeleeParryChance>
Expand Down Expand Up @@ -505,7 +505,7 @@
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="Gorehulk"]/statBases</xpath>
<value>
<PainShockThreshold>90</PainShockThreshold>
<PainShockThreshold>0.90</PainShockThreshold>
<MeleeDodgeChance>0.11</MeleeDodgeChance>
<MeleeCritChance>0.07</MeleeCritChance>
<MeleeParryChance>0.14</MeleeParryChance>
Expand Down Expand Up @@ -606,7 +606,7 @@
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="Devourer"]/statBases</xpath>
<value>
<PainShockThreshold>90</PainShockThreshold>
<PainShockThreshold>0.90</PainShockThreshold>
<MeleeDodgeChance>0.06</MeleeDodgeChance>
<MeleeCritChance>0.46</MeleeCritChance>
<MeleeParryChance>0.51</MeleeParryChance>
Expand Down Expand Up @@ -699,7 +699,7 @@
<ArmorRating_Sharp>0.5</ArmorRating_Sharp>
<ArmorRating_Blunt>5</ArmorRating_Blunt>
<IncomingDamageFactor>0.7</IncomingDamageFactor>
<PainShockThreshold>90</PainShockThreshold>
<PainShockThreshold>0.90</PainShockThreshold>
<MeleeDodgeChance>0.06</MeleeDodgeChance>
<MeleeCritChance>0.11</MeleeCritChance>
<MeleeParryChance>0.23</MeleeParryChance>
Expand Down
2 changes: 1 addition & 1 deletion Anomaly/Patches/ThingDefs_Races/Races_Fleshbeasts.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<xpath>Defs/ThingDef[@Name="BaseFleshbeast"]/statBases</xpath>
<value>
<SmokeSensitivity>0.5</SmokeSensitivity>
<PainShockThreshold>99</PainShockThreshold>
<PainShockThreshold>0.99</PainShockThreshold>
</value>
</Operation>

Expand Down
51 changes: 51 additions & 0 deletions Biotech/Patches/Bodies/Bodies_Mechanoid_Heavy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,36 @@
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
Expand Down Expand Up @@ -108,6 +138,27 @@
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
<value>
Expand Down
51 changes: 51 additions & 0 deletions Biotech/Patches/Bodies/Bodies_Mechanoid_Light.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,36 @@
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
Expand Down Expand Up @@ -108,6 +138,27 @@
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalShoulder"]/groups</xpath>
<value>
Expand Down
51 changes: 51 additions & 0 deletions Biotech/Patches/Bodies/Bodies_Mechanoid_Medium.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,36 @@
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
Expand Down Expand Up @@ -98,6 +128,27 @@
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
<value>
Expand Down
51 changes: 51 additions & 0 deletions Biotech/Patches/Bodies/Mech_Centurion.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,36 @@
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
Expand Down Expand Up @@ -98,6 +128,27 @@
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalLeg"]/groups</xpath>
<value>
Expand Down
51 changes: 51 additions & 0 deletions Biotech/Patches/Bodies/Mech_Diabolus.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,36 @@
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]</xpath>
<value>
<groups />
</value>
</nomatch>
</Operation>

<Operation Class="PatchOperationConditional">
<xpath>Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalDiabolusBodySecondRing"]/groups</xpath>
<nomatch Class="PatchOperationAdd">
Expand Down Expand Up @@ -101,6 +131,27 @@
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</Operation>

<Operation Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalDiabolusBodySecondRing"]/groups</xpath>
<value>
Expand Down
Loading

0 comments on commit bf8fcea

Please sign in to comment.