Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc. xml tweak and fixes. #2879

Merged
merged 6 commits into from
Nov 26, 2023
Merged

Misc. xml tweak and fixes. #2879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1b2b21f
Fix ACP bodyShape
N7Huntsman Nov 8, 2023
a72eeea
Remove real renames
N7Huntsman Nov 8, 2023
7262572
Update Skeletal Legion FindMod + Housekeeping
N7Huntsman Nov 9, 2023
6dc78ef
Update Thog's Guns More Brukka Pack patch
N7Huntsman Nov 9, 2023
09777b5
Prevent autopatching
N7Huntsman Nov 12, 2023
fa5d75a
Fixes to Archotech Weaponry.
N7Huntsman Nov 21, 2023
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
1 change: 1 addition & 0 deletions Patches/AnimalCollabProj/AnimalCollabProj_CE_Patch_AddClass.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<Operation Class="PatchOperationFindMod">
<mods>
<li>AnimalCollabProj</li>
<li>Animal Collab Project Vanilla-Style</li>
</mods>
<match Class="PatchOperationSequence">
<operations>
Expand Down
4 changes: 2 additions & 2 deletions Patches/Archotech Weaponry/ArchoDamageDefs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<DamageDef ParentName="Bullet">
<defName>CE_ArchoNL</defName>
<label>advanced ballistics that deploys archonanites(less Lethal verion)</label>
<label>archonanites (non-lethal)</label>
<additionalHediffs>
<li>
<hediff>VoidToxin</hediff>
Expand All @@ -28,7 +28,7 @@

<DamageDef ParentName="Bullet">
<defName>CE_ArchoL</defName>
<label>advanced ballistics that deploys archonanites(Lethal verion)</label>
<label>archonanites (lethal)</label>
<additionalHediffs>
<li>
<hediff>VoidNecrosisTemp</hediff>
Expand Down
50 changes: 47 additions & 3 deletions Patches/Archotech Weaponry/RangedArchotech.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,48 @@
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[
defName = "AW_ArchotechRifle" or
defName = "AW_ArchotechSniper"
]/tools</xpath>
<value>
<tools>
<li Class="CombatExtended.ToolCE">
<label>stock</label>
<capacities>
<li>Blunt</li>
</capacities>
<power>8</power>
<cooldownTime>1.55</cooldownTime>
<chanceFactor>1.5</chanceFactor>
<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
<linkedBodyPartsGroup>Stock</linkedBodyPartsGroup>
</li>
<li Class="CombatExtended.ToolCE">
<label>barrel</label>
<capacities>
<li>Blunt</li>
</capacities>
<power>5</power>
<cooldownTime>2.02</cooldownTime>
<armorPenetrationBlunt>1.630</armorPenetrationBlunt>
<linkedBodyPartsGroup>Barrel</linkedBodyPartsGroup>
</li>
<li Class="CombatExtended.ToolCE">
<label>muzzle</label>
<capacities>
<li>Poke</li>
</capacities>
<power>8</power>
<cooldownTime>1.55</cooldownTime>
<armorPenetrationBlunt>2.755</armorPenetrationBlunt>
<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
</li>
</tools>
</value>
</li>

<li Class="PatchOperationReplace">
<xpath>/Defs/ThingDef[
defName = "AW_ArchotechMinigun" or
Expand Down Expand Up @@ -95,12 +137,14 @@
defName = "AW_ArchotechCrossbow" or
defName = "AW_ArchotechBow" or
defName = "AW_ArchotechPistol" or
defName = "AW_ArchotechSMG"]/modExtensions/li[@Class="ArchotechWeaponry.Defs.ArchotechDamageExtension"] </xpath>
defName = "AW_ArchotechSMG" or
defName = "AW_ArchotechRifle" or
defName = "AW_ArchotechSniper"
]/modExtensions/li[@Class="ArchotechWeaponry.Defs.ArchotechDamageExtension"] </xpath>
</li>

<li Class="PatchOperationAdd">
<xpath>/Defs/ThingDef[
defName = "AW_ArchotechVoidlauncher"]/weaponTags </xpath>
<xpath>/Defs/ThingDef[defName = "AW_ArchotechVoidlauncher"]/weaponTags</xpath>
<value>
<li>Patched</li>
</value>
Expand Down
133 changes: 0 additions & 133 deletions Patches/Combat Enthusiast's Collection/ThingDefs_Weapons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,6 @@
<researchPrerequisite>PrecisionRifling</researchPrerequisite>
</li>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

positively remember irl names with CE was a feature in the original version of the mod

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_BurstRifle"]/label</xpath>
<value>
<label>AN-94</label>
</value>
</li>

<!-- HK G11 -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_ClockworkAR</defName>
Expand Down Expand Up @@ -104,13 +97,6 @@
<researchPrerequisite>Fabrication</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_ClockworkAR"]/label</xpath>
<value>
<label>G11</label>
</value>
</li>

<!-- AS Val -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_SSRifle</defName>
Expand Down Expand Up @@ -197,13 +183,6 @@
<researchPrerequisite>PrecisionRifling</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_MRS"]/label</xpath>
<value>
<label>A-545</label>
</value>
</li>

<!-- AKS-47UN -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_CompactSR</defName>
Expand Down Expand Up @@ -247,13 +226,6 @@
<researchPrerequisite>GasOperation</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_CompactSR"]/label</xpath>
<value>
<label>AKS-47UN</label>
</value>
</li>

<!-- Zip 22 -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_Zipper</defName>
Expand Down Expand Up @@ -295,13 +267,6 @@
<researchPrerequisite>Gunsmithing</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_Zipper"]/label</xpath>
<value>
<label>ZiP .22</label>
</value>
</li>

<!-- Colt Dragoon -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_BigIron</defName>
Expand Down Expand Up @@ -343,13 +308,6 @@
<researchPrerequisite>Gunsmithing</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_BigIron"]/label</xpath>
<value>
<label>Dragoon</label>
</value>
</li>

<!-- THUN-DER! -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_Thunder</defName>
Expand Down Expand Up @@ -436,13 +394,6 @@
<researchPrerequisite>BlowbackOperation</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_FiveSeven"]/label</xpath>
<value>
<label>FiveSeven</label>
</value>
</li>

<!-- P90 -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_PDW</defName>
Expand Down Expand Up @@ -487,13 +438,6 @@
<researchPrerequisite>BlowbackOperation</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_PDW"]/label</xpath>
<value>
<label>P90</label>
</value>
</li>

<!-- Suomi KP-31 -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_WoodlandSMG</defName>
Expand Down Expand Up @@ -537,13 +481,6 @@
<researchPrerequisite>BlowbackOperation</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_WoodlandSMG"]/label</xpath>
<value>
<label>KP-31</label>
</value>
</li>

<!-- Skorpion Evo -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_SkorpionEvo</defName>
Expand Down Expand Up @@ -588,13 +525,6 @@
<researchPrerequisite>BlowbackOperation</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_SkorpionEvo"]/label</xpath>
<value>
<label>Skorpion Evo</label>
</value>
</li>

<!-- MG-42 -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_TMG</defName>
Expand Down Expand Up @@ -646,13 +576,6 @@
<researchPrerequisite>GasOperation</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_TMG"]/label</xpath>
<value>
<label>MG 42</label>
</value>
</li>

<!-- LWAMG -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_LWAMG</defName>
Expand Down Expand Up @@ -699,13 +622,6 @@
<researchPrerequisite>PrecisionRifling</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_LWAMG"]/label</xpath>
<value>
<label>Knight's Armament LWAMG</label>
</value>
</li>

<!-- M14 -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_BattleRifle</defName>
Expand Down Expand Up @@ -751,13 +667,6 @@
<researchPrerequisite>GasOperation</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_BattleRifle"]/label</xpath>
<value>
<label>M14</label>
</value>
</li>

<!-- M200 Intervention -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_Intervention</defName>
Expand Down Expand Up @@ -843,13 +752,6 @@
<researchPrerequisite>PrecisionRifling</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_AntiMaterielRifle"]/label</xpath>
<value>
<label>NTW-20</label>
</value>
</li>

<!-- DVL-10 Saboteur -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_DVLTen</defName>
Expand Down Expand Up @@ -891,13 +793,6 @@
<researchPrerequisite>PrecisionRifling</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_DVLTen"]/label</xpath>
<value>
<label>DVL-10 Saboteur</label>
</value>
</li>

<!-- WA 2000 -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_BullpupSniper</defName>
Expand Down Expand Up @@ -939,13 +834,6 @@
<researchPrerequisite>PrecisionRifling</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_BullpupSniper"]/label</xpath>
<value>
<label>WA 2000</label>
</value>
</li>

<!-- Super Shorty -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_MuffaloCannon</defName>
Expand Down Expand Up @@ -989,13 +877,6 @@
<researchPrerequisite>Gunsmithing</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_MuffaloCannon"]/label</xpath>
<value>
<label>Super Shorty</label>
</value>
</li>

<!-- UTS-15 -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_CombatShotgun</defName>
Expand Down Expand Up @@ -1037,13 +918,6 @@
<researchPrerequisite>GasOperation</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_CombatShotgun"]/label</xpath>
<value>
<label>UTS-15</label>
</value>
</li>

<!-- PAW-20 -->
<li Class="CombatExtended.PatchOperationMakeGunCECompatible">
<defName>CEC_Neopup</defName>
Expand Down Expand Up @@ -1088,13 +962,6 @@
<researchPrerequisite>CE_Launchers</researchPrerequisite>
</li>

<li Class="PatchOperationReplace">
<xpath>Defs/ThingDef[defName="CEC_Neopup"]/label</xpath>
<value>
<label>PAW-20 Neopup</label>
</value>
</li>

<!-- Tactical Sledgehammer -->

<li Class="PatchOperationReplace">
Expand Down
18 changes: 9 additions & 9 deletions Patches/Jernalk's Skeletal Legion/Bodies/Bodies_Skeleton.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@

<Operation Class="PatchOperationFindMod">
<mods>
<li>Jernfalk's Skeletal Legion (Continued)</li>
<li>Jernalk's Skeletal Legion (continued)</li>
<li>Jernalk's Skeletal Legion</li>
</mods>

<match Class="PatchOperationSequence">
<operations>
<!--All bones should be covered-->
<li Class="PatchOperationAdd">
<xpath>
Defs/BodyDef[defName="Skeletal"]//*/groups
</xpath>

<value>
<li>CoveredByNaturalArmor</li>
</value>
</li>
<!--All bones should be covered-->
<li Class="PatchOperationAdd">
<xpath>Defs/BodyDef[defName="Skeletal"]//*/groups</xpath>
<value>
<li>CoveredByNaturalArmor</li>
</value>
</li>

</operations>
</match>
</Operation>
Expand Down
Loading