From 41ffce5d6c0dfe9f80f819eacc34146793dc2d4d Mon Sep 17 00:00:00 2001 From: Safairette <71556532+Safairette@users.noreply.github.com> Date: Fri, 27 Sep 2024 14:20:11 +0300 Subject: [PATCH 01/64] Add Generic-only patch ops --- ...PatchOperationAddModExtension_GenericOnly.cs | 17 +++++++++++++++++ .../PatchOperationAdd_GenericOnly.cs | 17 +++++++++++++++++ .../PatchOperationRemove_GenericOnly.cs | 17 +++++++++++++++++ .../PatchOperationReplace_GenericOnly.cs | 17 +++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 Source/CombatExtended/CombatExtended/PatchOperationAddModExtension_GenericOnly.cs create mode 100644 Source/CombatExtended/CombatExtended/PatchOperationAdd_GenericOnly.cs create mode 100644 Source/CombatExtended/CombatExtended/PatchOperationRemove_GenericOnly.cs create mode 100644 Source/CombatExtended/CombatExtended/PatchOperationReplace_GenericOnly.cs diff --git a/Source/CombatExtended/CombatExtended/PatchOperationAddModExtension_GenericOnly.cs b/Source/CombatExtended/CombatExtended/PatchOperationAddModExtension_GenericOnly.cs new file mode 100644 index 0000000000..49a401959e --- /dev/null +++ b/Source/CombatExtended/CombatExtended/PatchOperationAddModExtension_GenericOnly.cs @@ -0,0 +1,17 @@ +using System.Xml; +using Verse; + +namespace CombatExtended +{ + public class PatchOperationAddModExtension_GenericOnly : PatchOperationAddModExtension + { + public override bool ApplyWorker(XmlDocument xml) + { + if (!Controller.settings.GenericAmmo) + { + return true; + } + return base.ApplyWorker(xml); + } + } +} diff --git a/Source/CombatExtended/CombatExtended/PatchOperationAdd_GenericOnly.cs b/Source/CombatExtended/CombatExtended/PatchOperationAdd_GenericOnly.cs new file mode 100644 index 0000000000..b3e48ecfbe --- /dev/null +++ b/Source/CombatExtended/CombatExtended/PatchOperationAdd_GenericOnly.cs @@ -0,0 +1,17 @@ +using System.Xml; +using Verse; + +namespace CombatExtended +{ + public class PatchOperationAdd_GenericOnly : PatchOperationAdd + { + public override bool ApplyWorker(XmlDocument xml) + { + if (!Controller.settings.GenericAmmo) + { + return true; + } + return base.ApplyWorker(xml); + } + } +} diff --git a/Source/CombatExtended/CombatExtended/PatchOperationRemove_GenericOnly.cs b/Source/CombatExtended/CombatExtended/PatchOperationRemove_GenericOnly.cs new file mode 100644 index 0000000000..bcabf88659 --- /dev/null +++ b/Source/CombatExtended/CombatExtended/PatchOperationRemove_GenericOnly.cs @@ -0,0 +1,17 @@ +using System.Xml; +using Verse; + +namespace CombatExtended +{ + public class PatchOperationRemove_GenericOnly : PatchOperationRemove + { + public override bool ApplyWorker(XmlDocument xml) + { + if (!Controller.settings.GenericAmmo) + { + return true; + } + return base.ApplyWorker(xml); + } + } +} diff --git a/Source/CombatExtended/CombatExtended/PatchOperationReplace_GenericOnly.cs b/Source/CombatExtended/CombatExtended/PatchOperationReplace_GenericOnly.cs new file mode 100644 index 0000000000..d2ac7b92fa --- /dev/null +++ b/Source/CombatExtended/CombatExtended/PatchOperationReplace_GenericOnly.cs @@ -0,0 +1,17 @@ +using System.Xml; +using Verse; + +namespace CombatExtended +{ + public class PatchOperationReplace_GenericOnly : PatchOperationReplace + { + public override bool ApplyWorker(XmlDocument xml) + { + if (!Controller.settings.GenericAmmo) + { + return true; //Early return without a failure + } + return base.ApplyWorker(xml); + } + } +} From f64c808ca482923895f3d085593afc698d00450a Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Sun, 13 Oct 2024 13:42:33 +0330 Subject: [PATCH 02/64] Prosthetic Moving stat replaced --- .../HediffDefs/Hediffs_Local_AddedParts.xml | 10 ++++++++ .../Patches/HeDiffDefs/Hediffs_Implants.xml | 24 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.xml b/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.xml index b510204dd5..94debb406d 100644 --- a/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.xml +++ b/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.xml @@ -56,6 +56,16 @@ + + Defs/HediffDef[defName="PowerClaw"]/stages/li/capMods + + + -0.35 + -0.03 + + + + Defs/HediffDef[defName="PowerClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools diff --git a/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml b/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml index a834aa06e7..372c205b97 100644 --- a/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml +++ b/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml @@ -3,6 +3,18 @@ + + Defs/HediffDef[defName="DrillArm"]/stages/li/statOffsets + + -0.35 + -0.03 + + + + + Defs/HediffDef[defName="DrillArm"]/stages/li/capMods + + Defs/HediffDef[defName="DrillArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools @@ -24,6 +36,18 @@ + + Defs/HediffDef[defName="FieldHand"]/stages/li/statOffsets + + -0.35 + -0.03 + + + + + Defs/HediffDef[defName="FieldHand"]/stages/li/capMods + + Defs/HediffDef[defName="FieldHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools From 8d4f1b8be1872045af2db29b976ffb59acc6610c Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 21 Oct 2024 03:44:01 -0400 Subject: [PATCH 03/64] wip update --- .../WeaponsMelee.xml | 1054 +++++++++++------ .../WeaponsRanged.xml | 81 +- 2 files changed, 722 insertions(+), 413 deletions(-) diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml index f366528813..a3a6e03596 100644 --- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml @@ -1,382 +1,686 @@ + - - Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/statBases - - 3.5 - 0.35 - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"] - - - 0.2 - 0.35 - 0.2 - - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/weaponTags - -
  • CE_OneHandedWeapon
    • -     -     - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/tools - - -
  • - - -
  • Poke
    • - - 2 - 1.44 - 0.425 - Handle - -
  • - - -
  • Stab
    • - - 27 - 1.44 - 0.425 - 0.48 - Point - -
  • - - -
  • Cut
    • - - 20 - 1.34 - 1.33 - 0.956 - 0.43 - Edge - -     -     -     - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"]/tools - - -
  • - - -
  • Poke
    • - - 2 - 1.42 - 0.15 - 0.4 - Handle - -
  • - - -
  • Stab
    • - - 13 - 1.42 - 1 - 1.34 - 0.4 - Point - -
  • - - -
  • Cut
    • - - 28 - 0.88 - 1 - 1.3 - 1.936 - Head - -     -     -     - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"]/statBases - - 8 - 1.27 - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"] - - - 0.95 - 0.54 - 0.33 - - - - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"]/tools - - -
  • - - -
  • Poke
    • - - 4 - 1.83 - 0.15 - 1.1 - Handle - -
  • - - -
  • Stab
    • - - 30 - 1.89 - 1 - 0.84 - 1.25 - Point - -
  • - - -
  • Cut
    • - - 44 - 1.75 - 1 - 0.3 - 4.05 - Head - -     -     -     - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"]/statBases - - 11 - 0.35 - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"] - - - 0.50 - 0.4 - 0.27 - - - - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"]/tools - - -
  • - - -
  • Poke
    • - - 2 - 1.54 - 0.55 - 0.15 - Handle - -
  • - - -
  • Stab
    • - - 23 - 1.54 - 0.55 - 0.31 - Point - -
  • - - -
  • Cut
    • - - 28 - 1.25 - 1.782 - 0.8 - Edge - -     -     -     - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"]/statBases - - 4 - 0.38 - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"] - - - 0.24 - 0.38 - 0.28 - - - - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"]/tools - - -
  • - - -
  • Blunt
    • - - 6 - 1.16 - 2.025 - Shaft - -
  • - - -
  • Cut
    • - - 47 - 1.74 - 1.165 - 8.1 - 1.62 - Edge - -
  • - - -
  • Stab
    • - - 40 - 1.16 - 1.165 - 2.025 - 2.03 - Point - -     -     -     - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"]/statBases - - 10 - 0.89 - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"] - - + + Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/statBases + + 3.5 + 0.35 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"] + + + 0.2 + 0.35 + 0.2 + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.44 + 0.425 + Handle + +
  • + + +
  • Stab
    • + + 27 + 1.44 + 0.425 + 0.48 + Point + +
  • + + +
  • Cut
    • + + 20 + 1.34 + 1.33 + 0.956 + 0.43 + Edge + +     +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.42 + 0.15 + 0.4 + Handle + +
  • + + +
  • Stab
    • + + 13 + 1.42 + 1 + 1.34 + 0.4 + Point + +
  • + + +
  • Cut
    • + + 28 + 0.88 + 1 + 1.3 + 1.936 + Head + +     +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"]/statBases + + 8 + 1.27 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"] + + + 0.95 + 0.54 + 0.33 + + + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"]/tools + + +
  • + + +
  • Poke
    • + + 4 + 1.83 + 0.15 + 1.1 + Handle + +
  • + + +
  • Stab
    • + + 30 + 1.89 + 1 + 0.84 + 1.25 + Point + +
  • + + +
  • Cut
    • + + 44 + 1.75 + 1 + 0.3 + 4.05 + Head + +     +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"]/statBases + + 11 + 0.35 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"] + + + 0.50 + 0.4 + 0.27 + + + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.54 + 0.55 + 0.15 + Handle + +
  • + + +
  • Stab
    • + + 23 + 1.54 + 0.55 + 0.31 + Point + +
  • + + +
  • Cut
    • + + 28 + 1.25 + 1.782 + 0.8 + Edge + +     +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"]/statBases + + 4 + 0.38 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"] + + + 0.24 + 0.38 + 0.28 + + + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"]/tools + + +
  • + + +
  • Blunt
    • + + 6 + 1.16 + 2.025 + Shaft + +
  • + + +
  • Cut
    • + + 47 + 1.74 + 1.165 + 8.1 + 1.62 + Edge + +
  • + + +
  • Stab
    • + + 40 + 1.16 + 1.165 + 2.025 + 2.03 + Point + +     +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"]/statBases + + 10 + 0.89 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"] + + + 0.22 + 1.33 + 0.57 + + + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/statBases + + 2.75 + 0.9 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"] + + + 0.17 + 0.9 + 0.3 + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/weaponTags + +
  • CE_Sidearm_Melee
    • +
  • CE_OneHandedWeapon
    • +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 0.33 + 1.59 + 0.625 + Handle + +
  • + + +
  • Blunt
    • + + 9 + 1.68 + 3.375 + Head + +     +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Staff"]/statBases + + 8 + 1.76 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Staff"]/equippedStatOffsets + + 0.19 + 1.54 + 0.83 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Staff"]/tools + + +
  • + + +
  • Blunt
    • + + 7 + 1.21 + 1.33 + 2.24 + Shaft + +
  • + + +
  • Poke
    • + + 4 + 1.44 + 1.26 + Point + +     +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_NobleCane"]/statBases + + 4 + 1.85 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_NobleCane"]/equippedStatOffsets + + 0.33 + 1.38 + 0.3 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_NobleCane"]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.75 + 1.33 + 0.55 + Shaft + +
  • + + +
  • Poke
    • + + 2 + 1.35 + 0.325 + Point + +     +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Pickaxe"]/statBases + + 10 + 0.22 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Pickaxe"]/equippedStatOffsets + + 0.9 + 0.22 + 0.23 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Pickaxe"]/tools + + +
  • + + +
  • Poke
    • + + 3 + 2.0 + 0.05 + 0.8 + Shaft + +
  • + + +
  • Stab
    • + + 19 + 2.3 + 0.95 + 8.5 + 0.72 + Point + +     +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Shovel"]/statBases + + 5 + 0.56 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Shovel"]/equippedStatOffsets + 0.22 + 0.20 + 0.17 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Shovel"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 0.33 + 1.44 + 0.375 + Handle + +
  • + + +
  • Cut
    • + + 14 + 1.24 + 0.17 + 0.844 + Head + +     +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_BrandingIron"]/statBases + + 3.5 + 1.25 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_BrandingIron"] + + + 0.33 + 1.22 + 0.3 + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_BrandingIron"]/tools + + +
  • + + false + +
  • Poke
    • + + +
  • + Flame + 5 +
    • +     + 2 + 1.75 + 1.33 + 0.55 + Shaft + +
  • + + +
  • Poke
    • + + 2 + 1.35 + 0.325 + Point + +     +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Pitchfork"]/statBases + + 5 + 1 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Pitchfork"]/equippedStatOffsets + + 0.44 1.33 - 0.57 -     -     -     - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/statBases - - 2.75 - 0.9 - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"] - - - 0.17 - 0.9 - 0.3 - - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/weaponTags - -
  • CE_Sidearm_Melee
    • -
  • CE_OneHandedWeapon
    • -     -     - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/tools - - -
  • - - -
  • Poke
    • - - 2 - 0.33 - 1.59 - 0.625 - Handle - -
  • - - -
  • Blunt
    • - - 9 - 1.68 - 3.375 - Head - -     -     -     + 0.5 +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Pitchfork"]/tools + + +
  • + + +
  • Poke
    • + + 3 + 1.3 + 0.05 + 0.8 + Shaft + +
  • + + +
  • Stab
    • + + 17 + 1.3 + 0.95 + 1.6 + 0.25 + Point + +     +     +     + \ No newline at end of file diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml index fdb8b97f9f..96ca906e0a 100644 --- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml @@ -1,5 +1,6 @@ + @@ -45,7 +46,6 @@ defName="K4G_Gun_HeavyShotgun" or defName="K4G_Gun_LightSMG" or defName="K4G_Gun_AdvancedSMG" or - defName="K4G_Gun_CompactRifle" or defName="K4G_Gun_BattleRifle" ]/tools @@ -507,43 +507,6 @@ - - - - K4G_Gun_CompactRifle - - 2.90 - 0.36 - 1.00 - 0.1 - 1.13 - 7.56 - - - 1.58 - CombatExtended.Verb_ShootCE - true - Bullet_556x45mmNATO_FMJ - 1.1 - 55 - 6 - 4 - Shot_AssaultRifle - GunTail_Medium - 9 - - - 30 - 4 - AmmoSet_556x45mmNATO - - - TRUE - AimedShot - 3 - - - @@ -581,4 +544,46 @@ + + + + K4G_Gun_ComradePistol + + 0.73 + 0.35 + 0.70 + 0.18 + 0.78 + 1.62 + 7000 + + + 30 + 1 + + + CombatExtended.Verb_ShootCE + true + Bullet_9x18mmMakarov_FMJ + 0.6 + 12 + Shot_Autopistol + GunTail_Light + 9 + + + 8 + 4 + AmmoSet_9x18mmMakarov + + + FALSE + + +
  • CE_AI_Pistol
    • +
  • CE_Sidearm
    • +
  • CE_OneHandedWeapon
    • +     +     +     \ No newline at end of file From 4f856c2fe90c6f95d477fdd24abe16049226165e Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 21 Oct 2024 03:59:18 -0400 Subject: [PATCH 04/64] Fix typo --- LoadFolders.xml | 2 +- .../Pawnkinds_Alekeepers.xml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/LoadFolders.xml b/LoadFolders.xml index b863b20001..bf77a6d508 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -243,7 +243,7 @@
  • ModPatches/Jin-Roh Kerberos Panzer Cop Armor
  • ModPatches/K4G Empires of Old - Core
  • ModPatches/K4G Empires of Old - Engineers Institute
    • -
  • ModPatches/K4G Empires of Old - The Alekeepers
    • +
  • ModPatches/K4G Empires of Old - The Alekeepers
  • ModPatches/K4G Empires of Old - The Faceless Sultainate
  • ModPatches/K4G Empires of Old - The Polluted Legion
  • ModPatches/K4G Empires of Old - The Rising Sun
    • diff --git a/ModPatches/K4G Empires of Old - The Alekeepers/Patches/K4G Empires of Old - The Alekeepers/Pawnkinds_Alekeepers.xml b/ModPatches/K4G Empires of Old - The Alekeepers/Patches/K4G Empires of Old - The Alekeepers/Pawnkinds_Alekeepers.xml index b0b66e7fbe..28bad7559b 100644 --- a/ModPatches/K4G Empires of Old - The Alekeepers/Patches/K4G Empires of Old - The Alekeepers/Pawnkinds_Alekeepers.xml +++ b/ModPatches/K4G Empires of Old - The Alekeepers/Patches/K4G Empires of Old - The Alekeepers/Pawnkinds_Alekeepers.xml @@ -14,4 +14,11 @@     + + Defs/PawnKindDef[defName="K4G_Fellowship_Monk"]/weaponMoney + + 6~500 + + + \ No newline at end of file From 92873c9971e46a69a893d4d0c6d4517469173a00 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 21 Oct 2024 03:59:26 -0400 Subject: [PATCH 05/64] more wip --- .../WeaponsMelee.xml | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml index a3a6e03596..7f7686edad 100644 --- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml @@ -683,4 +683,41 @@ + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Rock"]/statBases + + 0.25 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Rock"]/tools + + +
  • + + +
  • Cut
    • + + 2 + 1.5 + 0.075 + 0.5 + +
  • + + +
  • Poke
    • +
  • Blunt
    • + + 2 + 1.5 + 0.5 + +     +     +     + \ No newline at end of file From 714707d670fa19e58cfd4061292abaf79329bb71 Mon Sep 17 00:00:00 2001 From: Killian Date: Sun, 20 Oct 2024 00:21:43 +0100 Subject: [PATCH 06/64] outer rim 1.5 update wip --- .../Outer Rim - Core/Outer_Rim_Core_Ammo.xml | 173 ++++--- .../Outer_Rim_Core_Armour.xml | 7 - .../Outer_Rim_Core_Grenades.xml | 4 +- .../Outer_Rim_Core_Jetpacks.xml | 2 +- .../Outer_Rim_Core_Vambraces.xml | 12 +- .../Outer_Rim_Droid_Jetpacks.xml | 2 +- .../Outer_Rim_Droid_MountedWeapons.xml | 447 +++++++++--------- ...ter_Rim_Galactic_Empire_Ranged_Weapons.xml | 10 +- 8 files changed, 319 insertions(+), 338 deletions(-) diff --git a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml index c5b8bad1e9..ecfc231087 100644 --- a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml +++ b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml @@ -7,13 +7,6 @@ AmmoAdvanced UI/Icons/ThingCategories/CaliberCharge - - - AmmoOuterRimTranqDart - - AmmoAdvanced - UI/Icons/ThingCategories/CaliberRocket - @@ -157,6 +150,17 @@ + + AmmoSet_PlasmaGasCartridge_DualShot + + + Bullet_BlasterBolt_DualShot + Bullet_BlasterBolt_DualShotAP + Bullet_BlasterBolt_DualShotIon + Bullet_BlasterBolt_DualShotStun + + + AmmoSet_PlasmaGasCartridgeIon_Pistol @@ -180,14 +184,6 @@ Bullet_BlasterSniper_Ion - - - AmmoSet_OuterRim_KnockoutDarts - - - Bullet_OR_KnockoutDart - - @@ -268,25 +264,6 @@ Bullet_BlasterPistol_Stun - - Ammo_OuterRim_KnockoutDart - A small durasteel dart with an integrated injector that's laden with an extremely potent and fast-acting anesthetic. Favoured by bounty hunters who want to bring their targets in alive. - - - ThirdParty/StarWars/Ammo/KnockoutDart - Graphic_StackCount - - - 3.00 - - -
  • AmmoOuterRimTranqDart
    • -     - TranqNonLethal - 0 - Bullet_OR_KnockoutDart -     - @@ -600,11 +577,11 @@ TransparentPostLight - 8 + 4
  • EMP - 5 + 9
    • 0.2 @@ -619,11 +596,11 @@ TransparentPostLight - 12 + 6
  • EMP - 8 + 14
    • 0.33 @@ -638,11 +615,11 @@ TransparentPostLight - 14 + 7
  • EMP - 11 + 18
    • 0.66 @@ -706,6 +683,75 @@ 15     + + + Bullet_BlasterBolt_DualShot + + OuterRim/Projectile/BlasterBolt_Red + Graphic_Single + TransparentPostLight + + + 18 + 3 + 22 + 2 + 4 + + + + + Bullet_BlasterBolt_DualShotAP + + OuterRim/Projectile/BlasterBolt_Red + Graphic_Single + TransparentPostLight + + + 12 + 4 + 33 + 2 + 4 + + + + + Bullet_BlasterBolt_DualShotIon + + OuterRim/Projectile/BlasterBolt_Blue + Graphic_Single + TransparentPostLight + + + 7 + +
  • + EMP + 18 +
    • +     + 0.33 + 2 + 4 +     +     + + + Bullet_BlasterBolt_DualShotStun + + OuterRim/Projectile/Proj_StunPulse + Graphic_Single + TransparentPostLight + + + Neuralizer + 1 + 90 + 2 + 4 + + @@ -1220,51 +1266,4 @@ OuterRim_HypertechFabrication - - MakeAmmo_OuterRim_KnockoutDarts - - Craft 5 knockout darts. - Making knockout darts. - -
  • - - -
  • OuterRim_Durasteel
    • - - - 30 - -
  • - - -
  • Neutroamine
    • - - - 10 - -
  • - - -
  • OuterRim_ComponentHypertech
    • - - - 1 - -     - - -
  • OuterRim_Durasteel
    • -
  • Neutroamine
    • -
  • OuterRim_ComponentHypertech
    • -     -     - -
  • OuterRim_HypertechFabricator
    • -     - - 5 - - OuterRim_HypertechFabrication -     - \ No newline at end of file diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml index f0dfc80e54..4531d9cd90 100644 --- a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml +++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml @@ -71,13 +71,6 @@ - - Defs/ThingDef[@Name="OuterRim_HelmetFabricatedBase"]/apparel/layers - -
  • StrappedHead
    • -     -     - Defs/ThingDef[@Name="OuterRim_PauldronsFabricatedBase"] diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml index 63417244f0..7e20dd24b8 100644 --- a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml +++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml @@ -781,14 +781,14 @@ - Defs/ThingDef[defName="OuterRim_FragGrenadeBelt" or defName="OuterRim_CryoBanGrenadeBelt" or defName="OuterRim_IonGrenadeBelt" or defName="OuterRim_PlasmaGrenadeBelt" or defName="OuterRim_SonicGrenadeBelt" or defName="OuterRim_StunGrenadeBelt" or defName="OuterRim_ThermalDetonatorBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill + Defs/ThingDef[defName="OuterRim_FragGrenadeBelt" or defName="OuterRim_CryoBanGrenadeBelt" or defName="OuterRim_IonGrenadeBelt" or defName="OuterRim_PlasmaGrenadeBelt" or defName="OuterRim_SonicGrenadeBelt" or defName="OuterRim_StunGrenadeBelt" or defName="OuterRim_ThermalDetonatorBelt"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoCountToRefill 1 - Defs/ThingDef[defName="OuterRim_FragGrenadeBelt" or defName="OuterRim_CryoBanGrenadeBelt" or defName="OuterRim_IonGrenadeBelt" or defName="OuterRim_PlasmaGrenadeBelt" or defName="OuterRim_SonicGrenadeBelt" or defName="OuterRim_StunGrenadeBelt" or defName="OuterRim_ThermalDetonatorBelt"]/comps/li[@Class="CompProperties_Reloadable"]/chargeNoun + Defs/ThingDef[defName="OuterRim_FragGrenadeBelt" or defName="OuterRim_CryoBanGrenadeBelt" or defName="OuterRim_IonGrenadeBelt" or defName="OuterRim_PlasmaGrenadeBelt" or defName="OuterRim_SonicGrenadeBelt" or defName="OuterRim_StunGrenadeBelt" or defName="OuterRim_ThermalDetonatorBelt"]/comps/li[@Class="CompProperties_ApparelReloadable"]/chargeNoun grenade diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml index 5a836c0211..0952ddcbd5 100644 --- a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml +++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml @@ -38,7 +38,7 @@ -
  • +
  • 8 Chemfuel 10 diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Vambraces.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Vambraces.xml index 284b538608..b15f907da4 100644 --- a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Vambraces.xml +++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Vambraces.xml @@ -45,7 +45,7 @@ Defs/ThingDef[defName="OuterRim_Vambrace_FlameProjector"] -
  • +
  • 5 Chemfuel 10 @@ -66,7 +66,7 @@
  • - CombatExtended.Verb_ShootCE + CombatExtended.Verb_LaunchProjectileStaticCE true True 0.5 @@ -92,10 +92,10 @@ Defs/ThingDef[defName="OuterRim_Vambrace_KnockoutDart"] -
  • +
  • 5 - Ammo_OuterRim_KnockoutDart - 1 + Neutroamine + 10 60 Standard_Reload Misc4 @@ -139,7 +139,7 @@ Defs/ThingDef[defName="OuterRim_Vambrace_Cryoban"] -
  • +
  • 5 Neutroamine 10 diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Jetpacks.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Jetpacks.xml index b9b29cabcb..66a92f9b68 100644 --- a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Jetpacks.xml +++ b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Jetpacks.xml @@ -40,7 +40,7 @@
    • -
  • +
  • 10 Chemfuel 5 diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_MountedWeapons.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_MountedWeapons.xml index 419ee7425f..92a87bc886 100644 --- a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_MountedWeapons.xml +++ b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_MountedWeapons.xml @@ -1,249 +1,238 @@ - + - Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket" or defName="OuterRim_DroidWeapon_WristBlasterIon" or defName="OuterRim_DroidWeapon_TwinWristBlaster" or defName="OuterRim_DroidWeapon_BlasterCannon" or defName="OuterRim_DroidWeapon_WristBlaster"]/comps + Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlaster"]/statBases/AccuracyTouch + | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlaster"]/statBases/AccuracyShort + | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlaster"]/statBases/AccuracyMedium + | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlaster"]/statBases/AccuracyLong - + - Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket" or defName="OuterRim_DroidWeapon_WristBlasterIon" or defName="OuterRim_DroidWeapon_TwinWristBlaster" or defName="OuterRim_DroidWeapon_BlasterCannon" or defName="OuterRim_DroidWeapon_WristBlaster"]/verbs - - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlaster"] - - -
  • - - CombatExtended.Verb_ShootCE - true - False - 0.5 - 36 - 0 - true - OuterRim_Shot_BlasterBolt - GunTail_Medium - 0 - true - - true - true - - true - Bullet_BlasterRifle_Red - Combat_RangedFire -
    • - -     + Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlasterIon"]/statBases/AccuracyTouch + | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlasterIon"]/statBases/AccuracyShort + | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlasterIon"]/statBases/AccuracyMedium + | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlasterIon"]/statBases/AccuracyLong     - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlaster"] - - -
  • - 100 - Ammo_PlasmaGasCartridge_Standard - 2 - 60 - Standard_Reload - Misc4 - shot - false -
    • -     -     + + + Defs/ThingDef[defName="OuterRim_DroidWeapon_TwinWristBlaster"]/statBases/AccuracyTouch + | Defs/ThingDef[defName="OuterRim_DroidWeapon_TwinWristBlaster"]/statBases/AccuracyShort + | Defs/ThingDef[defName="OuterRim_DroidWeapon_TwinWristBlaster"]/statBases/AccuracyMedium + | Defs/ThingDef[defName="OuterRim_DroidWeapon_TwinWristBlaster"]/statBases/AccuracyLong - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_TwinWristBlaster"] - - -
  • - - CombatExtended.Verb_ShootCE - true - False - 0.5 - 32 - 12 - 2 - 0 - true - OuterRim_Shot_BlasterBolt - GunTail_Medium - 0 - true - - true - true - - true - Bullet_BlasterRifle_Red - Combat_RangedFire -
    • -     -     + + + Defs/ThingDef[defName="OuterRim_DroidWeapon_BlasterCannon"]/statBases/AccuracyTouch + | Defs/ThingDef[defName="OuterRim_DroidWeapon_BlasterCannon"]/statBases/AccuracyShort + | Defs/ThingDef[defName="OuterRim_DroidWeapon_BlasterCannon"]/statBases/AccuracyMedium + | Defs/ThingDef[defName="OuterRim_DroidWeapon_BlasterCannon"]/statBases/AccuracyLong - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_TwinWristBlaster"] - - -
  • - 100 - Ammo_PlasmaGasCartridge_Standard - 2 - 60 - Standard_Reload - Misc4 - shot - false -
    • -     -     + + + Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket"]/statBases/AccuracyTouch + | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket"]/statBases/AccuracyShort + | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket"]/statBases/AccuracyMedium + | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket"]/statBases/AccuracyLong - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_BlasterCannon"] + + + Defs/ThingDef[@Name="OuterRimBase_DroidWeapon"]/tools - -
  • - - CombatExtended.Verb_ShootCE - true - False - 0.5 - 48 - 0 - true - OuterRim_Shot_HeavyMinigunBlasterBolt - GunTail_Medium - 0 - true - - true - true - - true - Bullet_BlasterSniper_RedAP - Combat_RangedFire + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle -     +     - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_BlasterCannon"] - - -
  • - 20 - Ammo_PlasmaGasCartridge_AP - 3 - 60 - Standard_Reload - Misc4 - shot - false -
    • -     -     + + + OuterRim_DroidWeapon_WristBlaster + + 0.95 + 0.16 + 1.2 + 1.00 + 1.00 + 0.5 + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterRifle_Red + 1 + 55 + 4 + 3 + OuterRim_Shot_BlasterBolt + GunTail_Medium + 9 + 2 + + true + + + + AimedShot + + + 200 + 3 + AmmoSet_PlasmaGasCartridgeRed_Rifle + - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlasterIon"] - - -
  • - - CombatExtended.Verb_ShootCE - true - False - 0.5 - 36 - 0 - false - OuterRim_Shot_BlasterBolt - GunTail_Medium - 0 - true - - true - true - - true - Bullet_BlasterRifle_Ion - Combat_RangedFire -
    • -     -     + + + OuterRim_DroidWeapon_WristBlasterIon + + 1.1 + 0.08 + 1.2 + 1.00 + 1.00 + 0.5 + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterRifle_Ion + 1 + 55 + 4 + 3 + OuterRim_Shot_BlasterBolt + GunTail_Medium + 9 + 2 + + true + + + + AimedShot + + + 200 + 3 + AmmoSet_PlasmaGasCartridgeIon_Rifle + - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlasterIon"] - - -
  • - 100 - Ammo_PlasmaGasCartridge_Ion - 2 - 60 - Standard_Reload - Misc4 - shot - false -
    • -     -     + + + OuterRim_DroidWeapon_TwinWristBlaster + + 0.95 + 0.16 + 0.75 + 1.00 + 1.00 + 0.5 + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterBolt_DualShot + 1 + 44 + 6 + 4 + OuterRim_Shot_BlasterBolt + GunTail_Medium + 9 + 4 + + true + + + + AimedShot + 2 + + + 200 + 3 + AmmoSet_PlasmaGasCartridge_DualShot + - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket"] - - -
  • - - CombatExtended.Verb_ShootCE - true - True - 0.75 - 45 - 0 - true - OuterRim_Shot_RocketLauncher - GunTail_Medium - 0 - true - - true - true - - true - Bullet_OR_WristRocket - Combat_RangedFire -
    • -     -     + + + OuterRim_DroidWeapon_BlasterCannon + + 2.5 + 0.01 + 2.25 + 1.00 + 1.00 + 0.5 + + + 1.5 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterSniper_Red + 2.0 + 75 + OuterRim_Shot_DLT19DBlasterBolt + GunTail_Medium + 12 + 3 + + true + + + + AimedShot + + + 120 + 3 + AmmoSet_PlasmaGasCartridgeRed_Sniper + - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket"] - - -
  • - 3 - Ammo_OR_MiniRocket_Standard - 1 - 60 - Standard_Reload - Misc4 - rocket - false -
    • -     -     + + + OuterRim_DroidWeapon_WristRocket + + 1.0 + 0.39 + 1.10 + 0.08 + 1.20 + 1.00 + + + 1.45 + CombatExtended.Verb_ShootCE + true + Bullet_OR_WristRocket + 3.0 + 75 + OuterRim_Shot_RocketLauncher + GunTail_Medium + 9 + + true + + + + 1 + 3 + AmmoSet_OuterRimMiniRockets + + + AimedShot + \ No newline at end of file diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml index 2bee6d0687..e9515fdb67 100644 --- a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml +++ b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml @@ -204,11 +204,11 @@ 1.2 CombatExtended.Verb_ShootCE true - Bullet_BlasterRifle_Red + Bullet_BlasterBolt_DualShot 1 44 - 2 - 8 + 6 + 4 OuterRim_Shot_E11BlasterBolt GunTail_Medium 12 @@ -219,12 +219,12 @@ AimedShot - 4 + 2 112 4.4 - AmmoSet_PlasmaGasCartridgeRed_Rifle + AmmoSet_PlasmaGasCartridge_DualShot     From b1a7e714cebe36bc0417c7f8f31170962af74701 Mon Sep 17 00:00:00 2001 From: Safairette <71556532+Safairette@users.noreply.github.com> Date: Fri, 25 Oct 2024 20:30:41 +0300 Subject: [PATCH 07/64] Add conditional for generics --- .../PatchOperation_ConditionalGeneric.cs | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Source/CombatExtended/CombatExtended/PatchOperation_ConditionalGeneric.cs diff --git a/Source/CombatExtended/CombatExtended/PatchOperation_ConditionalGeneric.cs b/Source/CombatExtended/CombatExtended/PatchOperation_ConditionalGeneric.cs new file mode 100644 index 0000000000..ea49a6f893 --- /dev/null +++ b/Source/CombatExtended/CombatExtended/PatchOperation_ConditionalGeneric.cs @@ -0,0 +1,25 @@ +using System.Xml; +using Verse; + +namespace CombatExtended +{ + public class PatchOperation_ConditionalGeneric : PatchOperation + { + public PatchOperation standard; + public PatchOperation generic; + + public override bool ApplyWorker(XmlDocument xml) + { + if (Controller.settings.GenericAmmo && generic != null) + { + return generic.Apply(xml); + } + else if (standard != null) + { + return standard.Apply(xml); + } + + return true; + } + } +} From 1519be7f940a38c00c48abba6839c18b2caef366 Mon Sep 17 00:00:00 2001 From: Safairette <71556532+Safairette@users.noreply.github.com> Date: Sat, 26 Oct 2024 00:10:58 +0300 Subject: [PATCH 08/64] Remove the other patch ops --- ...PatchOperationAddModExtension_GenericOnly.cs | 17 ----------------- .../PatchOperationAdd_GenericOnly.cs | 17 ----------------- .../PatchOperationRemove_GenericOnly.cs | 17 ----------------- .../PatchOperationReplace_GenericOnly.cs | 17 ----------------- 4 files changed, 68 deletions(-) delete mode 100644 Source/CombatExtended/CombatExtended/PatchOperationAddModExtension_GenericOnly.cs delete mode 100644 Source/CombatExtended/CombatExtended/PatchOperationAdd_GenericOnly.cs delete mode 100644 Source/CombatExtended/CombatExtended/PatchOperationRemove_GenericOnly.cs delete mode 100644 Source/CombatExtended/CombatExtended/PatchOperationReplace_GenericOnly.cs diff --git a/Source/CombatExtended/CombatExtended/PatchOperationAddModExtension_GenericOnly.cs b/Source/CombatExtended/CombatExtended/PatchOperationAddModExtension_GenericOnly.cs deleted file mode 100644 index 49a401959e..0000000000 --- a/Source/CombatExtended/CombatExtended/PatchOperationAddModExtension_GenericOnly.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Xml; -using Verse; - -namespace CombatExtended -{ - public class PatchOperationAddModExtension_GenericOnly : PatchOperationAddModExtension - { - public override bool ApplyWorker(XmlDocument xml) - { - if (!Controller.settings.GenericAmmo) - { - return true; - } - return base.ApplyWorker(xml); - } - } -} diff --git a/Source/CombatExtended/CombatExtended/PatchOperationAdd_GenericOnly.cs b/Source/CombatExtended/CombatExtended/PatchOperationAdd_GenericOnly.cs deleted file mode 100644 index b3e48ecfbe..0000000000 --- a/Source/CombatExtended/CombatExtended/PatchOperationAdd_GenericOnly.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Xml; -using Verse; - -namespace CombatExtended -{ - public class PatchOperationAdd_GenericOnly : PatchOperationAdd - { - public override bool ApplyWorker(XmlDocument xml) - { - if (!Controller.settings.GenericAmmo) - { - return true; - } - return base.ApplyWorker(xml); - } - } -} diff --git a/Source/CombatExtended/CombatExtended/PatchOperationRemove_GenericOnly.cs b/Source/CombatExtended/CombatExtended/PatchOperationRemove_GenericOnly.cs deleted file mode 100644 index bcabf88659..0000000000 --- a/Source/CombatExtended/CombatExtended/PatchOperationRemove_GenericOnly.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Xml; -using Verse; - -namespace CombatExtended -{ - public class PatchOperationRemove_GenericOnly : PatchOperationRemove - { - public override bool ApplyWorker(XmlDocument xml) - { - if (!Controller.settings.GenericAmmo) - { - return true; - } - return base.ApplyWorker(xml); - } - } -} diff --git a/Source/CombatExtended/CombatExtended/PatchOperationReplace_GenericOnly.cs b/Source/CombatExtended/CombatExtended/PatchOperationReplace_GenericOnly.cs deleted file mode 100644 index d2ac7b92fa..0000000000 --- a/Source/CombatExtended/CombatExtended/PatchOperationReplace_GenericOnly.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Xml; -using Verse; - -namespace CombatExtended -{ - public class PatchOperationReplace_GenericOnly : PatchOperationReplace - { - public override bool ApplyWorker(XmlDocument xml) - { - if (!Controller.settings.GenericAmmo) - { - return true; //Early return without a failure - } - return base.ApplyWorker(xml); - } - } -} From 6e0ad029669c2603ab32f2e39b354619707af6ac Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Sat, 26 Oct 2024 01:19:31 -0400 Subject: [PATCH 09/64] Remove brawler --- .../Patches/K4G Empires of Old - Core/WeaponsRanged.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml index 96ca906e0a..822215b257 100644 --- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml @@ -85,6 +85,12 @@     + + + + Defs/ThingDef[defName="K4G_Gun_Brawler"] + + From af464661a768ace7e504967df4d562e5a787c35d Mon Sep 17 00:00:00 2001 From: MoManaCha <2805671972@qq.com> Date: Sat, 26 Oct 2024 14:02:01 +0800 Subject: [PATCH 10/64] Remove unnecessary translations Remove unnecessary translations and correct some translation errors --- .../ThingDef/Buildings_Mech_Turrets.xml | 12 --------- .../ThingDef/Buildings_Security_Turrets.xml | 10 -------- .../DefInjected/ThingDef/RangedNeolithic.xml | 7 ------ .../DefInjected/ThingDef/Weapons_Grenades.xml | 25 ++++--------------- .../ThingDef/Weapons_Turretsgun.xml | 25 ------------------- 5 files changed, 5 insertions(+), 74 deletions(-) delete mode 100644 Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Mech_Turrets.xml delete mode 100644 Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Security_Turrets.xml delete mode 100644 Languages/ChineseSimplified/DefInjected/ThingDef/RangedNeolithic.xml delete mode 100644 Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Turretsgun.xml diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Mech_Turrets.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Mech_Turrets.xml deleted file mode 100644 index c9b37e4eea..0000000000 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Mech_Turrets.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - 枪管 - 轻型电荷冲击炮 - - - 枪管 - 地狱火加农炮 - - \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Security_Turrets.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Security_Turrets.xml deleted file mode 100644 index a11648c2e4..0000000000 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Security_Turrets.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - 加农炮 - - - 铀弹加农炮 - - \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/RangedNeolithic.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/RangedNeolithic.xml deleted file mode 100644 index bc1cf56eb9..0000000000 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/RangedNeolithic.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - 重标枪 - - \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Grenades.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Grenades.xml index adcff17b52..d83baeb5df 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Grenades.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Grenades.xml @@ -21,49 +21,34 @@ 爆炸时，伴随著巨大的声响或者闪光，使爆炸范围内的敌人暂时失明和失去方向感，从而短暂丧失反抗能力。 - 身体 - - - 投掷震撼手榴弹 + 弹体 泡沫手榴弹 特种消防手榴弹，撞击时释放出一团灭火用泡沫。 - 身体 - - - 投掷泡沫手榴弹 + 弹体 闪光手榴弹 设计用于产生令人炫目致晕眩的强光，可以致使被攻击目标短暂失明。 - 身体 - - - 投掷闪光手榴弹 + 弹体 烟雾手榴弹 释放大量烟雾，提供隐蔽性以防止被击中。 - 身体 - - - 投掷烟雾手榴弹 + 弹体 棒状炸弹 一种原始的用导火索点燃的炸药，部落最爱使用这种炸弹重击身穿先进装甲的敌人。 - 身体 - - - 投掷棒状炸弹 + 弹体 \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Turretsgun.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Turretsgun.xml deleted file mode 100644 index e142b8815f..0000000000 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Turretsgun.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - 自动电荷冲击炮塔 - - 一个装配有电荷冲击炮的自供电炮塔。 - - 自动电荷冲击炮塔 - - - 轻型电荷冲击炮 - - 发射高能电荷冲击弹的范围压制性武器。 - - 轻型电荷冲击炮 - - - 地狱火加农炮 - - 发射燃烧弹的小型火炮，它开火时会发射一个大型的燃烧弹。 - - 地狱火加农炮 - - \ No newline at end of file From 09735ea6c5227a3cdf960d1c6ba1b79f7da94ebd Mon Sep 17 00:00:00 2001 From: Safairette <71556532+Safairette@users.noreply.github.com> Date: Sat, 26 Oct 2024 14:30:32 +0300 Subject: [PATCH 11/64] Fix standard-only patches --- .../CombatExtended/PatchOperation_ConditionalGeneric.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/CombatExtended/CombatExtended/PatchOperation_ConditionalGeneric.cs b/Source/CombatExtended/CombatExtended/PatchOperation_ConditionalGeneric.cs index ea49a6f893..2ef98f1f9f 100644 --- a/Source/CombatExtended/CombatExtended/PatchOperation_ConditionalGeneric.cs +++ b/Source/CombatExtended/CombatExtended/PatchOperation_ConditionalGeneric.cs @@ -10,9 +10,12 @@ public class PatchOperation_ConditionalGeneric : PatchOperation public override bool ApplyWorker(XmlDocument xml) { - if (Controller.settings.GenericAmmo && generic != null) + if (Controller.settings.GenericAmmo) { - return generic.Apply(xml); + if (generic != null) + { + return generic.Apply(xml); + } } else if (standard != null) { From 24e6508c23e1d3fc37991a270558c15819d5edf1 Mon Sep 17 00:00:00 2001 From: Safairette <71556532+Safairette@users.noreply.github.com> Date: Sat, 26 Oct 2024 14:30:52 +0300 Subject: [PATCH 12/64] Generics for contraband --- .../Contraband.xml | 167 +++++++++++------- 1 file changed, 106 insertions(+), 61 deletions(-) diff --git a/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml index 9c76cd29f7..f2a7387cc9 100644 --- a/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml +++ b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml @@ -3,40 +3,79 @@ - - Defs/ThingDef[defName="Ammo_6x24mmCharged"] - -
  • - VFED_Imperial - 5 - false - 100 -
    • -     + + + Defs/ThingDef[defName="Ammo_6x24mmCharged"] + +
  • + VFED_Imperial + 5 + false + 100 +
    • +     +     + + Defs/ThingDef[defName="Ammo_RifleCharged"] + +
  • + VFED_Imperial + 5 + false + 100 +
    • +     +     - - Defs/ThingDef[defName="Ammo_6x24mmCharged_AP"] - -
  • - VFED_Imperial - 5 - false - 100 -
    • -     + + + Defs/ThingDef[defName="Ammo_6x24mmCharged_AP"] + +
  • + VFED_Imperial + 5 + false + 100 +
    • +     +     + + Defs/ThingDef[defName="Ammo_RifleCharged_AP"] + +
  • + VFED_Imperial + 5 + false + 100 +
    • +     +     - - Defs/ThingDef[defName="Ammo_6x24mmCharged_Ion"] - -
  • - VFED_Imperial - 5 - false - 100 -
    • -     + + + Defs/ThingDef[defName="Ammo_6x24mmCharged_Ion"] + +
  • + VFED_Imperial + 5 + false + 100 +
    • +     +     + + Defs/ThingDef[defName="Ammo_RifleCharged_Ion"] + +
  • + VFED_Imperial + 5 + false + 100 +
    • +     +     @@ -57,40 +96,46 @@     - - Defs/ThingDef[defName="Ammo_8x50mmCharged"] - -
  • - VFED_Imperial - 6 - false - 100 -
    • -     + + + Defs/ThingDef[defName="Ammo_8x50mmCharged"] + +
  • + VFED_Imperial + 6 + false + 100 +
    • +     +     - - - Defs/ThingDef[defName="Ammo_8x50mmCharged_AP"] - -
  • - VFED_Imperial - 6 - false - 100 -
    • -     +> + + + Defs/ThingDef[defName="Ammo_8x50mmCharged_AP"] + +
  • + VFED_Imperial + 6 + false + 100 +
    • +     +     - - Defs/ThingDef[defName="Ammo_8x50mmCharged_Ion"] - -
  • - VFED_Imperial - 6 - false - 100 -
    • -     + + + Defs/ThingDef[defName="Ammo_8x50mmCharged_Ion"] + +
  • + VFED_Imperial + 6 + false + 100 +
    • +     +     From b3cabf2c2f110c8bf619be17e2327e8039d1505c Mon Sep 17 00:00:00 2001 From: Safairette <71556532+Safairette@users.noreply.github.com> Date: Sat, 26 Oct 2024 17:41:24 +0300 Subject: [PATCH 13/64] Generify the ancients vault gen --- .../SymbolDefs.xml | 30 +++ .../CustomGenDefs_Vaults.xml | 216 +++++++++++++----- 2 files changed, 186 insertions(+), 60 deletions(-) diff --git a/ModPatches/Vanilla Factions Expanded - Ancients/Defs/Vanilla Factions Expanded - Ancients/SymbolDefs.xml b/ModPatches/Vanilla Factions Expanded - Ancients/Defs/Vanilla Factions Expanded - Ancients/SymbolDefs.xml index 496db68b9f..f8dc61224e 100644 --- a/ModPatches/Vanilla Factions Expanded - Ancients/Defs/Vanilla Factions Expanded - Ancients/SymbolDefs.xml +++ b/ModPatches/Vanilla Factions Expanded - Ancients/Defs/Vanilla Factions Expanded - Ancients/SymbolDefs.xml @@ -6,16 +6,31 @@ Ammo_556x45mmNATO_Incendiary + + Ammo_RifleIntermediate_Incendiary + Ammo_RifleIntermediate_Incendiary + + Ammo_12Gauge_Buck Ammo_12Gauge_Buck + + Ammo_Shotgun_Buck + Ammo_Shotgun_Buck + + Ammo_45ACP_AP Ammo_45ACP_AP + + Ammo_Pistol_AP + Ammo_Pistol_AP + + Ammo_762x51mmNATO_Incendiary Ammo_762x51mmNATO_Incendiary @@ -26,9 +41,24 @@ Ammo_762x54mmR_HE + + Ammo_Rifle_Incendiary + Ammo_Rifle_Incendiary + + + + Ammo_Rifle_HE + Ammo_Rifle_HE + + Ammo_6x24mmCharged Ammo_6x24mmCharged + + Ammo_RifleCharged + Ammo_RifleCharged + + \ No newline at end of file diff --git a/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/CustomGenDefs_Vaults.xml b/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/CustomGenDefs_Vaults.xml index e3a209ddf2..bca5d968a7 100644 --- a/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/CustomGenDefs_Vaults.xml +++ b/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/CustomGenDefs_Vaults.xml @@ -3,88 +3,184 @@ - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultAlpha"]/layouts/li[1]/li[66] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_AssaultRifle,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultAlpha"]/layouts/li[1]/li[66] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_AssaultRifle,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultAlpha"]/layouts/li[1]/li[66] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_AssaultRifle,Gun_AssaultRifle,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Apparel_PowerArmor,Ammo_RifleIntermediate_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultBravo"]/layouts/li[1]/li[14] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultBravo"]/layouts/li[1]/li[14] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultBravo"]/layouts/li[1]/li[14] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_RifleIntermediate_Incendiary,Gun_AssaultRifle,Ammo_RifleIntermediate_Incendiary,Gun_AssaultRifle,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Apparel_PowerArmor,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultCharlie"]/layouts/li[1]/li[10] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultCharlie"]/layouts/li[1]/li[10] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultCharlie"]/layouts/li[1]/li[10] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_RifleIntermediate_Incendiary,Gun_AssaultRifle,Ammo_RifleIntermediate_Incendiary,Apparel_PowerArmor,Gun_AssaultRifle,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultDelta"]/layouts/li[1]/li[19] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultDelta"]/layouts/li[1]/li[19] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultDelta"]/layouts/li[1]/li[19] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_AssaultRifle,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Gun_AssaultRifle,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultF"]/layouts/li[1]/li[35] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultF"]/layouts/li[1]/li[35] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultF"]/layouts/li[1]/li[35] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_RifleIntermediate_Incendiary,Gun_AssaultRifle,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultG"]/layouts/li[1]/li[23] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,MealSurvivalPack,MealSurvivalPack,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_12Gauge_Buck,Gun_ChainShotgun,Ammo_12Gauge_Buck,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultG"]/layouts/li[1]/li[23] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,MealSurvivalPack,MealSurvivalPack,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_12Gauge_Buck,Gun_ChainShotgun,Ammo_12Gauge_Buck,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultG"]/layouts/li[1]/li[23] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,MealSurvivalPack,MealSurvivalPack,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Ammo_Shotgun_Buck,Gun_ChainShotgun,Ammo_Shotgun_Buck,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultH"]/layouts/li[1]/li[31] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_762x51mmNATO_Incendiary,Ammo_762x54mmR_HE,Ammo_762x54mmR_HE,Gun_LMG,Ammo_45ACP_AP,Gun_Minigun,Gun_Autopistol,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultH"]/layouts/li[1]/li[31] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_762x51mmNATO_Incendiary,Ammo_762x54mmR_HE,Ammo_762x54mmR_HE,Gun_LMG,Ammo_45ACP_AP,Gun_Minigun,Gun_Autopistol,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultH"]/layouts/li[1]/li[31] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_Rifle_Incendiary,Ammo_Rifle_HE,Ammo_Rifle_HE,Gun_LMG,Ammo_Pistol_AP,Gun_Minigun,Gun_Autopistol,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultH"]/layouts/li[1]/li[35] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,MealSurvivalPack,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,.,.,.,.,.,MealSurvivalPack,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_45ACP_AP,Ammo_45ACP_AP,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Gun_Autopistol,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultH"]/layouts/li[1]/li[35] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,MealSurvivalPack,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,.,.,.,.,.,MealSurvivalPack,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_45ACP_AP,Ammo_45ACP_AP,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Gun_Autopistol,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultH"]/layouts/li[1]/li[35] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,MealSurvivalPack,Ammo_Rifle_Incendiary,Ammo_Rifle_Incendiary,Ammo_Rifle_Incendiary,Ammo_Rifle_Incendiary,.,.,.,.,.,MealSurvivalPack,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_Pistol_AP,Ammo_Pistol_AP,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Apparel_PowerArmor,Gun_Autopistol,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultI"]/layouts/li[1]/li[19] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Gun_ChargeRifle,Ammo_6x24mmCharged,Ammo_6x24mmCharged,Gun_HeavySMG,Ammo_45ACP_AP,Ammo_45ACP_AP,Apparel_PowerArmorHelmet,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultI"]/layouts/li[1]/li[19] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Gun_ChargeRifle,Ammo_6x24mmCharged,Ammo_6x24mmCharged,Gun_HeavySMG,Ammo_45ACP_AP,Ammo_45ACP_AP,Apparel_PowerArmorHelmet,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultI"]/layouts/li[1]/li[19] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Gun_ChargeRifle,Ammo_RifleCharged,Ammo_RifleCharged,Gun_HeavySMG,Ammo_Pistol_AP,Ammo_Pistol_AP,Apparel_PowerArmorHelmet,Ammo_RifleIntermediate_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[35] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_MachinePistol,Ammo_45ACP_AP,Apparel_PowerArmorHelmet,Ammo_45ACP_AP,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[35] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_MachinePistol,Ammo_45ACP_AP,Apparel_PowerArmorHelmet,Ammo_45ACP_AP,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[35] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_MachinePistol,Ammo_Pistol_AP,Apparel_PowerArmorHelmet,Ammo_Pistol_AP,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[36] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_762x54mmR_HE,Gun_LMG,Ammo_762x54mmR_HE,Apparel_PowerArmor,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[36] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_762x54mmR_HE,Gun_LMG,Ammo_762x54mmR_HE,Apparel_PowerArmor,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[36] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_Rifle_HE,Gun_LMG,Ammo_Rifle_HE,Apparel_PowerArmor,Ammo_RifleIntermediate_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[36] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_MachinePistol,Ammo_45ACP_AP,Ammo_45ACP_AP,Ammo_762x54mmR_HE,Gun_LMG,Ammo_762x54mmR_HE,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[36] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_MachinePistol,Ammo_45ACP_AP,Ammo_45ACP_AP,Ammo_762x54mmR_HE,Gun_LMG,Ammo_762x54mmR_HE,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[36] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_RifleIntermediate_Incendiary,Gun_MachinePistol,Ammo_Pistol_AP,Ammo_Pistol_AP,Ammo_Rifle_HE,Gun_LMG,Ammo_Rifle_HE,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     \ No newline at end of file From e64e9bcd91f124b2fd78d1728cac1ca2dcbb32d6 Mon Sep 17 00:00:00 2001 From: mszabo Date: Sun, 27 Oct 2024 00:39:07 +0200 Subject: [PATCH 14/64] Disregard burning ammunition when reloading turrets The reload jobgiver ignores ammo that is burning, but the jobgiver does not. Keep the two in sync to avoid spamming jobs when the best available ammo for a given turret is on fire. --- .../CombatExtended/Jobs/Utils/JobGiverUtils_Reload.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Source/CombatExtended/CombatExtended/Jobs/Utils/JobGiverUtils_Reload.cs b/Source/CombatExtended/CombatExtended/Jobs/Utils/JobGiverUtils_Reload.cs index 70f5faa4a5..8fdd3f5b70 100644 --- a/Source/CombatExtended/CombatExtended/Jobs/Utils/JobGiverUtils_Reload.cs +++ b/Source/CombatExtended/CombatExtended/Jobs/Utils/JobGiverUtils_Reload.cs @@ -217,6 +217,11 @@ private static Thing FindBestAmmo(Pawn pawn, AmmoDef requestedAmmo) return false; } + if (potentialAmmo.IsBurning()) + { + return false; + } + if (potentialAmmo.IsForbidden(pawn) || !pawn.CanReserve(potentialAmmo)) { return false; From 0e3928d58cfa795051dce79e5173470d1b63f62b Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Sat, 26 Oct 2024 22:43:23 -0400 Subject: [PATCH 15/64] Weapons and apparel --- .../K4G Empires of Old - Core/Apparel.xml | 142 +++++++++++++++--- .../Apparel_Royalty.xml | 63 +++++++- .../WeaponsMelee.xml | 86 ++++++++++- .../WeaponsRanged.xml | 131 +++++++++++++++- 4 files changed, 393 insertions(+), 29 deletions(-) diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml index 07b0e9f5a7..3fc0661f00 100644 --- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml @@ -4,8 +4,8 @@ Defs/ThingDef[ - @Name="K4GThawb" or - @Name="K4GKimono" + @Name="K4GThawb" or + @Name="K4GKimono" ]/statBases/StuffEffectMultiplierArmor 1.5 @@ -14,14 +14,31 @@ + + + Defs/ThingDef[defName="K4G_Apparel_TatteredRags"]/statBases/StuffEffectMultiplierArmor + + 0.5 + 0 + + + Defs/ThingDef[ - @Name="K4GTurban" or - @Name="K4GHeadScarf" or - defName="K4G_Apparel_TricornHat" or - defName="K4G_Apparel_ConeHat" or - defName="K4G_Apparel_HoodedMask" + @Name="K4GTurban" or + @Name="K4GHeadScarf" or + @Name="K4GUshanka" or + defName="K4G_Apparel_TricornHat" or + defName="K4G_Apparel_ConeHat" or + defName="K4G_Apparel_HoodedMask" or + defName="K4G_Apparel_Fedora" or + defName="K4G_Apparel_Flatcap" or + defName="K4G_Apparel_WinterHood" or + defName="K4G_Apparel_Balaclava" or + defName="K4G_Apparel_PatrolCap" or + defName="K4G_Apparel_BaseballCap" or + defName="K4G_Apparel_SheriffHat" ]/statBases/StuffEffectMultiplierArmor 2 @@ -50,9 +67,9 @@ Defs/ThingDef[ - defName="K4G_Apparel_AdvancedOutlanderHelmet" or - defName="K4G_Apparel_GoggledHelmet" or - defName="K4G_Apparel_LegionaryHelmet" + @Name="LegionaryHelmet" or + defName="K4G_Apparel_AdvancedOutlanderHelmet" or + defName="K4G_Apparel_GoggledHelmet" ]/statBases/StuffEffectMultiplierArmor 8 @@ -63,15 +80,61 @@ Defs/ThingDef[ - defName="K4G_Apparel_AdvancedOutlanderHelmet" or - defName="K4G_Apparel_GoggledHelmet" or - defName="K4G_Apparel_LegionaryHelmet" + @Name="LegionaryHelmet" or + defName="K4G_Apparel_AdvancedOutlanderHelmet" or + defName="K4G_Apparel_GoggledHelmet" ]/stuffCategories/li[.="Metallic"]
  • Steeled
    •      + + + Defs/ThingDef[defName="K4G_Apparel_RiotHelmet"]/statBases/StuffEffectMultiplierArmor + + 6 + 5 + 2.5 + + + + + Defs/ThingDef[defName="K4G_Apparel_RiotHelmet"] + +
  • + +
  • + 0.50 + +
  • Eye
    • +
  • Nose
    • +
  • Jaw
    • + + +
  • + 0.50 + +
  • Eye
    • +
  • Nose
    • +
  • Jaw
    • + + + + +     +     + + + + Defs/ThingDef[defName="K4G_Apparel_WorkmanHelmet" or defName="K4G_Apparel_MiningHelmet"]/statBases/StuffEffectMultiplierArmor + + 1.2 + 2 + 1 + + + Defs/ThingDef[defName="K4G_Apparel_FlakMask"]/statBases/ArmorRating_Sharp @@ -104,10 +167,25 @@     - + + + Defs/ThingDef[defName="K4G_Apparel_ServiceParka"]/statBases/StuffEffectMultiplierArmor + + 4 + + + + Defs/ThingDef[defName="K4G_Apparel_ServiceParka"]/statBases + + 10 + 5 + + + + - Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/ArmorRating_Sharp + Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/ArmorRating_Sharp 6 5 @@ -116,7 +194,7 @@ - Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/ArmorRating_Blunt + Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/ArmorRating_Blunt 8 @@ -154,9 +232,8 @@ - - Defs/ThingDef[defName="K4G_Apparel_Goggles"]/statBases/StuffEffectMultiplierArmor + Defs/ThingDef[defName="K4G_Apparel_Goggles" or defName="K4G_Apparel_SnowGoggles"]/statBases/StuffEffectMultiplierArmor 0.5 0.5 @@ -174,4 +251,33 @@ + + + Defs/ThingDef[defName="K4G_Apparel_MilitaryMedal" or @Name="Eyepatch"]/statBases + + 0.15 + 0 + + + + + + Defs/ThingDef[defName="K4G_Apparel_Scarf"]/statBases/StuffEffectMultiplierArmor + + 1 + 0 + 2 + + + + + + Defs/ThingDef[defName="K4G_Apparel_WeldingMask"]/statBases/StuffEffectMultiplierArmor + + 1 + 1 + 2 + + + \ No newline at end of file diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel_Royalty.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel_Royalty.xml index afee66c76e..073ecb02c3 100644 --- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel_Royalty.xml +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel_Royalty.xml @@ -9,7 +9,6 @@ -
  • Defs/ThingDef[defName="K4G_Apparel_DynastyCrown"]/statBases/StuffEffectMultiplierArmor @@ -17,6 +16,68 @@
    • + +
  • + Defs/ThingDef[defName="K4G_Apparel_GarrisonCap" or defName="K4G_Apparel_PeakedCap"]/statBases/StuffEffectMultiplierArmor + + 2 + 1 + 0 + +
    • + + +
  • + Defs/ThingDef[defName="K4G_Apparel_PrestigeAdvancedFlakVest"]/statBases + + 5 + 3.5 + +
    • + +
  • + Defs/ThingDef[defName="K4G_Apparel_PrestigeAdvancedFlakVest"] + +
  • + +
  • + 0.60 + +
  • Neck
    • +
  • Shoulder
    • + + +
  • + 0.60 + +
  • Neck
    • +
  • Shoulder
    • + + + + +     + + + +
  • + Defs/ThingDef[defName="K4G_Apparel_MilitaryUniform"]/statBases/StuffEffectMultiplierArmor + + 5 + 1 + 6 + +
    • + + +
  • + Defs/ThingDef[defName="K4G_Apparel_Monocle"]/statBases + + 0.15 + 0 + +
    • +     diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml index 7f7686edad..639a578fce 100644 --- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml @@ -482,7 +482,7 @@ Defs/ThingDef[defName="K4G_MeleeWeapon_Pickaxe"]/statBases - 10 + 8 0.22 @@ -512,7 +512,7 @@ Shaft
  • - +
  • Stab
    • @@ -523,6 +523,18 @@ 0.72 Point +
  • + + +
  • Demolish
    • + + 8 + 2.3 + 0.95 + 8.5 + 0.72 + Point +     @@ -720,4 +732,74 @@     + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_IceAxe"]/statBases + + 4.5 + 0.33 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_IceAxe"]/equippedStatOffsets + + 0.19 + 0.23 + 0.3 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_IceAxe"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_IceAxe"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.46 + 0.05 + 0.45 + Shaft + +
  • + + +
  • Stab
    • +
  • Cut
    • + + 11 + 1.83 + 0.95 + 0.648 + 0.29 + Point + +
  • + + +
  • Stab
    • + + 11 + 1.22 + 0.95 + 0.648 + 0.29 + Point + +     +     +     + \ No newline at end of file diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml index 822215b257..b39049b411 100644 --- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml @@ -9,7 +9,9 @@ defName="K4G_Gun_Bolter" or defName="K4G_Gun_AdvancedAutopistol" or defName="K4G_Gun_PrecisionPistol" or - defName="K4G_Gun_ComradePistol" + defName="K4G_Gun_ComradePistol" or + defName="K4G_Gun_Shortbarrel" or + defName="K4G_Gun_Nailgun" ]/tools @@ -46,7 +48,8 @@ defName="K4G_Gun_HeavyShotgun" or defName="K4G_Gun_LightSMG" or defName="K4G_Gun_AdvancedSMG" or - defName="K4G_Gun_BattleRifle" + defName="K4G_Gun_BattleRifle" or + defName="K4G_Gun_DrumRifle" ]/tools @@ -533,7 +536,7 @@ 6 7 1.1 - 57 + 55 Shot_AssaultRifle GunTail_Medium 12 @@ -561,12 +564,7 @@ 0.18 0.78 1.62 - 7000 - - 30 - 1 - CombatExtended.Verb_ShootCE true @@ -592,4 +590,121 @@     + + + + K4G_Gun_Shortbarrel + + 2.95 + 0.38 + 0.7 + 0.14 + 3.00 + 6.05 + + + 2.43 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 1.1 + 55 + 6 + 5 + Shot_HeavySMG + GunTail_Heavy + 9 + + + 20 + 4 + AmmoSet_762x51mmNATO + + + TRUE + AimedShot + 3 + + + + + + + K4G_Gun_DrumRifle + + 1 + 0.08 + 1.81 + 10.21 + 7.92 + 0.36 + + + CombatExtended.Verb_ShootCE + True + Bullet_762x51mmNATO_FMJ + 1.42 + 6 + 4 + 1.1 + 55 + Shot_AssaultRifle + GunTail_Medium + 12 + + + 50 + 4 + AmmoSet_762x51mmNATO + + + TRUE + AimedShot + 3 + + +
  • CE_AI_LMG
    • +
  • Bipod_LMG
    • +     +     + + + + + K4G_Gun_Nailgun + + 1.80 + 0.37 + 0.5 + 0.16 + 1.07 + 2.50 + + + 0.24 + CombatExtended.Verb_ShootCE + true + Bullet_Nail + 0.6 + 12 + 10 + 6 + Shot_Autopistol + GunTail_Light + + + 60 + 4.6 + AmmoSet_Nail + + + 5 + FALSE + Snapshot + + +
  • CE_OneHandedWeapon
    • +     +     + \ No newline at end of file From 2b14d2e29a51a432d1a7d7dbe1061891faf90b2d Mon Sep 17 00:00:00 2001 From: mszabo Date: Sun, 27 Oct 2024 16:50:42 +0100 Subject: [PATCH 16/64] Fix retaliation raids and shelling As reported in #3419, retaliation raids currently cause infinite error spam if the bombardment that triggered the retaliation was from a temporary map that was disposed of by the time the raid was actually executed. Fix it by checking whether the target map for the raid is actually valid. While testing this, I found that retaliation shelling has also been broken since d90f3e1395438165e9bade2780299cb2b64b177d. Fix it by accounting for the case where the launcher is not spawned at all, since retaliation bombardment shells are "launched" by world pawns. --- .../CombatExtended/Projectiles/ProjectileCE.cs | 6 ++++-- .../CombatExtended/WorldObjects/HostilityRaider.cs | 2 +- .../CombatExtended/WorldObjects/TravelingShell.cs | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs index 0d0146dfc1..dd47c8de88 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs @@ -551,7 +551,9 @@ protected void RayCastSuppression(IntVec3 muzzle, IntVec3 destination, Map map = /// The shot speed (default: def.projectile.speed) /// The equipment used to fire the projectile. /// The distance to the estimated intercept point - /// The number of ticks before the bullet is drawn at its true height instead of the muzzle height + /// + /// Note that the launcher may not be spawned at all, e.g. for projectiles launched by enemy bases as retaliation. + /// public virtual void Launch(Thing launcher, Vector2 origin, float shotAngle, float shotRotation, float shotHeight = 0f, float shotSpeed = -1f, Thing equipment = null, float distance = -1) { this.shotAngle = shotAngle; @@ -565,7 +567,7 @@ public virtual void Launch(Thing launcher, Vector2 origin, float shotAngle, floa this.lerpPosition = props.lerpPosition; this.GravityFactor = props.Gravity; } - if (shotHeight >= CollisionVertical.WallCollisionHeight && Position.Roofed(launcher.Map)) + if (shotHeight >= CollisionVertical.WallCollisionHeight && launcher.Spawned && Position.Roofed(launcher.Map)) { ignoreRoof = true; } diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/HostilityRaider.cs b/Source/CombatExtended/CombatExtended/WorldObjects/HostilityRaider.cs index ae64ed5dde..88fb43ebf4 100644 --- a/Source/CombatExtended/CombatExtended/WorldObjects/HostilityRaider.cs +++ b/Source/CombatExtended/CombatExtended/WorldObjects/HostilityRaider.cs @@ -67,7 +67,7 @@ public virtual void ThrottledTick() ticksToRaid -= WorldObjectTrackerCE.THROTTLED_TICK_INTERVAL; return; } - if (parms != null) + if (parms != null && Find.Maps.Contains(parms.target)) { IncidentDef incidentDef = IncidentDefOf.RaidEnemy; incidentDef.Worker.TryExecute(parms); diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/TravelingShell.cs b/Source/CombatExtended/CombatExtended/WorldObjects/TravelingShell.cs index ce5a108318..4449079be7 100644 --- a/Source/CombatExtended/CombatExtended/WorldObjects/TravelingShell.cs +++ b/Source/CombatExtended/CombatExtended/WorldObjects/TravelingShell.cs @@ -109,7 +109,7 @@ protected override void Arrived() private bool TryShell(WorldObject worldObject) { bool shelled = false; - if (worldObject is MapParent mapParent && mapParent.HasMap) + if (worldObject is MapParent mapParent && mapParent.HasMap && Find.Maps.Contains(mapParent.Map)) { shelled = true; Map map = mapParent.Map; From 9f67729015259fe24fdc1bc0fd24940f27ab8a3c Mon Sep 17 00:00:00 2001 From: Safairette <71556532+Safairette@users.noreply.github.com> Date: Mon, 28 Oct 2024 11:43:27 +0200 Subject: [PATCH 17/64] Revert projectile shadows --- .../CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs index 0d0146dfc1..6e580cdb56 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs @@ -1258,7 +1258,7 @@ public override void DrawAt(Vector3 drawLoc, bool flip = false) //TODO : EXPERIMENTAL Add edifice height var shadowPos = new Vector3(ExactPosition.x, def.Altitude - 0.001f, - ExactPosition.z - Mathf.Max(0f, ExactPosition.y)); + ExactPosition.z); //EXPERIMENTAL: + (new CollisionVertical(ExactPosition.ToIntVec3().GetEdifice(Map))).Max); //TODO : Vary ShadowMat plane From fbe0bc7d05c552338d8069237259be2afea4cd67 Mon Sep 17 00:00:00 2001 From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com> Date: Mon, 28 Oct 2024 21:51:47 +0800 Subject: [PATCH 18/64] New pack --- .../Defs/Spacer Pack/Defs_Projectiles.xml | 33 +++++++++ .../Patches/Spacer Pack/Backpacks.xml | 72 ++++++++++++++++++- .../Patches/Spacer Pack/Damage.xml | 32 +++++++++ .../Patches/Spacer Pack/Hediff.xml | 36 ++++++++++ 4 files changed, 172 insertions(+), 1 deletion(-) create mode 100644 ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml create mode 100644 ModPatches/Spacer Pack/Patches/Spacer Pack/Hediff.xml diff --git a/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml b/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml index 0db59b7c29..4706d7f5ce 100644 --- a/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml +++ b/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml @@ -32,6 +32,39 @@ + + dvd_Projectile_RipperRack_CE + CombatExtended.ProjectileCE_Explosive + + + Graphic_Single + Things/Projectile/Grenade_RipperMechanites + + + 0 + True + 5 + dvd_RipperBomb + 50 + 3.0 + dvd_Filth_RipperMechanites + 1 + + +
  • + +
  • + dvd_Fleck_RipperMechanites_Random + 0.5 + 0 + .5 + 1 +
    • + + +     +     + dvd_SkipBolt_CE diff --git a/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml b/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml index 809ee84417..897bb4d7be 100644 --- a/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml +++ b/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml @@ -131,7 +131,7 @@ CombatExtended.Verb_LaunchProjectileStaticCE true True - 2 + 1.5 35 5 true @@ -170,6 +170,76 @@     + + + + Defs/ThingDef[defName="dvd_minerpack"]/equippedStatOffsets/VEF_MassCarryCapacity + + 80 + + + + + Defs/ThingDef[defName="dvd_minerpack"]/costList + + 1 + + + + + Defs/ThingDef[defName="dvd_minerpack"]/equippedStatOffsets/MoveSpeed + + + + Defs/ThingDef[defName="dvd_minerpack"]/statBases/Mass + + 4 + 5 + + + + + Defs/ThingDef[defName="dvd_minerpack"]/comps + +
  • + +
  • 30
    • +
  • 50
    • +
  • 70
    • +
  • 90
    • + + +     +     + + + Defs/ThingDef[defName="dvd_minerpack"]/verbs + + +
  • + + CombatExtended.Verb_LaunchProjectileStaticCE + true + True + 1.0 + 17 + 4 + true + ThrowGrenade + GunTail_Medium + 14 + true + + true + + true + dvd_Projectile_RipperRack_CE + Combat_RangedFire_Thrown +
    • +     +     +     + diff --git a/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml b/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml new file mode 100644 index 0000000000..3fb5c2d589 --- /dev/null +++ b/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml @@ -0,0 +1,32 @@ + + + + + + + Defs/DamageDef[defName="dvd_SkipBolt"] + ParentName + Bullet + + + + Defs/DamageDef[defName="dvd_RipperBomb"] + ParentName + Bomb + + + + Defs/DamageDef[defName="dvd_RipperBomb"]/defaultArmorPenetration + + 62 + + + + + Defs/DamageDef[defName="dvd_RipperBomb"]/armorCategory + + Blunt + + + + \ No newline at end of file diff --git a/ModPatches/Spacer Pack/Patches/Spacer Pack/Hediff.xml b/ModPatches/Spacer Pack/Patches/Spacer Pack/Hediff.xml new file mode 100644 index 0000000000..63621ffc43 --- /dev/null +++ b/ModPatches/Spacer Pack/Patches/Spacer Pack/Hediff.xml @@ -0,0 +1,36 @@ + + + + + + + Defs/HediffDef[defName="dvd_RipperMechanites"]/stages/li[label="limited"]/statOffsets + + + -3 + -5 + + + + + + Defs/HediffDef[defName="dvd_RipperMechanites"]/stages/li[label="moderate"]/statOffsets + + + -7 + -10 + + + + + + Defs/HediffDef[defName="dvd_RipperMechanites"]/stages/li[label="extensive"]/statOffsets + + + -15 + -20 + + + + + \ No newline at end of file From 3bd377446bf6d57d0481d1cb0cd6960036a57917 Mon Sep 17 00:00:00 2001 From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com> Date: Mon, 28 Oct 2024 22:23:51 +0800 Subject: [PATCH 19/64] remove mortar behavior --- .../Defs/Spacer Pack/Defs_Projectiles.xml | 7 +++---- .../Patches/Spacer Pack/Backpacks.xml | 18 ++---------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml b/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml index 4706d7f5ce..f7142da932 100644 --- a/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml +++ b/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml @@ -41,12 +41,11 @@ Things/Projectile/Grenade_RipperMechanites - 0 - True - 5 + 20 + 3 dvd_RipperBomb 50 - 3.0 + 5.0 dvd_Filth_RipperMechanites 1 diff --git a/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml b/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml index 897bb4d7be..1a96cbae8a 100644 --- a/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml +++ b/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml @@ -198,20 +198,6 @@ - - Defs/ThingDef[defName="dvd_minerpack"]/comps - -
  • - -
  • 30
    • -
  • 50
    • -
  • 70
    • -
  • 90
    • - - -     -     - Defs/ThingDef[defName="dvd_minerpack"]/verbs @@ -222,8 +208,8 @@ true True 1.0 - 17 - 4 + 21 + 6 true ThrowGrenade GunTail_Medium From e1ba14cb494adb0eae54e277b4ada3fe6b61ab11 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 28 Oct 2024 20:04:16 -0400 Subject: [PATCH 20/64] Remove jetpack patches --- .../Outer_Rim_Core_Jetpacks.xml | 46 ++----------------- .../Outer_Rim_Galactic_Empire_Jetpacks.xml | 8 ---- .../Outer_Rim_Mandalorian_Jetpacks.xml | 8 ---- .../Outer_Rim_Rebel_Jetpacks.xml | 8 ---- 4 files changed, 3 insertions(+), 67 deletions(-) delete mode 100644 ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Jetpacks.xml delete mode 100644 ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Jetpacks.xml delete mode 100644 ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Jetpacks.xml diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml index 0952ddcbd5..7a43d5f3f6 100644 --- a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml +++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml @@ -6,54 +6,14 @@ 8 3 - 30 - - - Defs/ThingDef[@Name="OuterRim_JetpackBase"]/equippedStatOffsets - - - Defs/ThingDef[@Name="OuterRim_JetpackBase"] + + Defs/VFECore.Abilities.AbilityDef[@Name="OuterRimJetpackAbilityBase"]/range - -
  • - Verb_Jump - - false - true - True - false - 0.5 - JumpWarmupEffect - true - JumpFlightEffect - JumpPackLand - - true - false - false - -
    • -     - -
  • - 8 - Chemfuel - 10 - 60 - Standard_Reload - Misc4 - jump - false -
    • -     + 30     - - - Defs/ThingDef[defName="OuterRim_JT12Jetpack" or defName="OuterRim_IndustrialJetpack" or defName="OuterRim_MakeshiftJetpack"]/comps - \ No newline at end of file diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Jetpacks.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Jetpacks.xml deleted file mode 100644 index 59066ea3db..0000000000 --- a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Jetpacks.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - Defs/ThingDef[defName="OuterRim_ImperialJetpack"]/comps - - - \ No newline at end of file diff --git a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Jetpacks.xml b/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Jetpacks.xml deleted file mode 100644 index fa12f917cf..0000000000 --- a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Jetpacks.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - Defs/ThingDef[defName="OuterRim_Z6Jetpack" or defName="OuterRim_SupercommandoJetpack"]/comps - - - \ No newline at end of file diff --git a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Jetpacks.xml b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Jetpacks.xml deleted file mode 100644 index 8a820ebf79..0000000000 --- a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Jetpacks.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - Defs/ThingDef[defName="OuterRim_RebelJetpack"]/comps - - - \ No newline at end of file From 599c7b6e89840bd990096b0f784e0c1c53d6ea22 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 28 Oct 2024 20:43:05 -0400 Subject: [PATCH 21/64] Clean up, remove ion wrist blaster --- .../Outer_Rim_Droid_MountedWeapons.xml | 77 ++----------------- 1 file changed, 7 insertions(+), 70 deletions(-) diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_MountedWeapons.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_MountedWeapons.xml index 92a87bc886..545bcb1730 100644 --- a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_MountedWeapons.xml +++ b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_MountedWeapons.xml @@ -1,40 +1,5 @@ - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlaster"]/statBases/AccuracyTouch - | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlaster"]/statBases/AccuracyShort - | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlaster"]/statBases/AccuracyMedium - | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlaster"]/statBases/AccuracyLong - - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlasterIon"]/statBases/AccuracyTouch - | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlasterIon"]/statBases/AccuracyShort - | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlasterIon"]/statBases/AccuracyMedium - | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlasterIon"]/statBases/AccuracyLong - - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_TwinWristBlaster"]/statBases/AccuracyTouch - | Defs/ThingDef[defName="OuterRim_DroidWeapon_TwinWristBlaster"]/statBases/AccuracyShort - | Defs/ThingDef[defName="OuterRim_DroidWeapon_TwinWristBlaster"]/statBases/AccuracyMedium - | Defs/ThingDef[defName="OuterRim_DroidWeapon_TwinWristBlaster"]/statBases/AccuracyLong - - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_BlasterCannon"]/statBases/AccuracyTouch - | Defs/ThingDef[defName="OuterRim_DroidWeapon_BlasterCannon"]/statBases/AccuracyShort - | Defs/ThingDef[defName="OuterRim_DroidWeapon_BlasterCannon"]/statBases/AccuracyMedium - | Defs/ThingDef[defName="OuterRim_DroidWeapon_BlasterCannon"]/statBases/AccuracyLong - - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket"]/statBases/AccuracyTouch - | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket"]/statBases/AccuracyShort - | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket"]/statBases/AccuracyMedium - | Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket"]/statBases/AccuracyLong - Defs/ThingDef[@Name="OuterRimBase_DroidWeapon"]/tools @@ -91,41 +56,13 @@ - - OuterRim_DroidWeapon_WristBlasterIon - - 1.1 - 0.08 - 1.2 - 1.00 - 1.00 - 0.5 - - - 1.2 - CombatExtended.Verb_ShootCE - true - Bullet_BlasterRifle_Ion - 1 - 55 - 4 - 3 - OuterRim_Shot_BlasterBolt - GunTail_Medium - 9 - 2 - - true - - - - AimedShot - - - 200 - 3 - AmmoSet_PlasmaGasCartridgeIon_Rifle - + + + Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlasterIon"] + + + + Defs/ThingDef[defName="OuterRim_GNKDroid"]/modExtensions/li[@Class="Asimov.DefModExt_AutomatonApparel"]/apparelWhitelist/li[.="OuterRim_DroidWeapon_WristBlasterIon"] From c3bc90de53187256dc40ad98e6afb63e8f6c0cde Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 28 Oct 2024 20:47:27 -0400 Subject: [PATCH 22/64] Adjust droid jump pack patches --- .../Outer_Rim_Droid_Jetpacks.xml | 50 +------------------ 1 file changed, 2 insertions(+), 48 deletions(-) diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Jetpacks.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Jetpacks.xml index 66a92f9b68..6e18050193 100644 --- a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Jetpacks.xml +++ b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Jetpacks.xml @@ -2,55 +2,9 @@ - Defs/ThingDef[defName="OuterRim_DroidPropulsionJets"]/statBases + Defs/VFECore.Abilities.AbilityDef[defName="OuterRim_DroidJetpackJump"] - 20 - - - - - Defs/ThingDef[defName="OuterRim_DroidPropulsionJets"]/equippedStatOffsets - - - - Defs/ThingDef[defName="OuterRim_DroidPropulsionJets"]/comps - - - - Defs/ThingDef[defName="OuterRim_DroidPropulsionJets"] - - -
  • - Verb_Jump - - false - true - True - false - 0.25 - JumpWarmupEffect - true - JumpFlightEffect - JumpPackLand - - true - false - false - -
    • -     - -
  • - 10 - Chemfuel - 5 - 60 - Standard_Reload - Misc4 - jet-jump - false -
    • -     + 20     From 00eea96fd31dadadf28af6b80aafbd6500b6c4aa Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 28 Oct 2024 21:21:06 -0400 Subject: [PATCH 23/64] Split up melee weapons file --- .../WeaponsMelee_NonStuffable.xml | 113 ++++++++++++++++++ ...nsMelee.xml => WeaponsMelee_Stuffable.xml} | 0 2 files changed, 113 insertions(+) create mode 100644 ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_NonStuffable.xml rename ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/{WeaponsMelee.xml => WeaponsMelee_Stuffable.xml} (100%) diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_NonStuffable.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_NonStuffable.xml new file mode 100644 index 0000000000..fa8a32a9a4 --- /dev/null +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_NonStuffable.xml @@ -0,0 +1,113 @@ + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_ShockProd"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.59 + 0.625 + Handle + +
  • + + +
  • Poke
    • + + 5 + +
  • + Flame + 1 + 0.2 +
    • +
  • + Stun + 1 +
    • +
  • + EMP + 1 + 0.4 +
    • +     + 1.68 + 1.33 + 3.375 + Head + +     +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_ShockProd"]/statBases + + 0.9 + 5 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_ShockProd"] + + + 0.17 + 0.9 + 0.3 + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_ShockProd"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_ShatteredBottle"]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.8 + 0.430 + +
  • + + +
  • Cut
    • + + 3 + 1.8 + 0.175 + 0.255 + +     +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_ShatteredBottle"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + + +     \ No newline at end of file diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_Stuffable.xml similarity index 100% rename from ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml rename to ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_Stuffable.xml From 7d348e60a24ab676ebf8788ed789dd223d072d4f Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Mon, 28 Oct 2024 21:21:23 -0400 Subject: [PATCH 24/64] Patch beer helmet --- .../K4G Empires of Old - Core/Apparel.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml index 3fc0661f00..3628f6c0c9 100644 --- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml @@ -280,4 +280,22 @@     + + + + Defs/ThingDef[defName="K4G_Apparel_BeerHelmet"]/statBases/ArmorRating_Sharp + + 4 + 4 + 1.5 + + + + + Defs/ThingDef[defName="K4G_Apparel_FlakMask"]/statBases/ArmorRating_Blunt + + 6 + + +     \ No newline at end of file From 3d94c9aa9704a7e2c29e88a1b9a1009f86acbae7 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Tue, 29 Oct 2024 03:17:53 -0400 Subject: [PATCH 25/64] Match speed offset --- Patches/Core/HediffDefs/Hediffs_Local_AddedParts.xml | 2 +- Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.xml b/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.xml index 94debb406d..490dd7c15f 100644 --- a/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.xml +++ b/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.xml @@ -60,7 +60,7 @@ Defs/HediffDef[defName="PowerClaw"]/stages/li/capMods - -0.35 + -0.37 -0.03 diff --git a/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml b/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml index 372c205b97..0ccef31748 100644 --- a/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml +++ b/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml @@ -6,7 +6,7 @@ Defs/HediffDef[defName="DrillArm"]/stages/li/statOffsets - -0.35 + -0.37 -0.03 @@ -39,7 +39,7 @@ Defs/HediffDef[defName="FieldHand"]/stages/li/statOffsets - -0.35 + -0.37 -0.03 From c8d51a98e0fd798ad547262cc68c71b09092fc11 Mon Sep 17 00:00:00 2001 From: Mint <93885293+Mint-Vanilla@users.noreply.github.com> Date: Tue, 29 Oct 2024 21:48:30 +0000 Subject: [PATCH 26/64] Add files via upload --- .../Projectiles.xml | 50 +++++ .../Buildings_Turrets.xml | 175 ++++++++++++++++++ .../Race_Spirit.xml | 77 ++++++++ .../Turret_Gun.xml | 169 +++++++++++++++++ .../Weapons_Melee.xml | 49 +++++ 5 files changed, 520 insertions(+) create mode 100644 ModPatches/Vanilla Psycasts Expanded - Runesmith/Defs/Vanilla Psycasts Expanded - Runesmith/Projectiles.xml create mode 100644 ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Buildings_Turrets.xml create mode 100644 ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Race_Spirit.xml create mode 100644 ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Turret_Gun.xml create mode 100644 ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Weapons_Melee.xml diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Defs/Vanilla Psycasts Expanded - Runesmith/Projectiles.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Defs/Vanilla Psycasts Expanded - Runesmith/Projectiles.xml new file mode 100644 index 0000000000..f96375f2fb --- /dev/null +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Defs/Vanilla Psycasts Expanded - Runesmith/Projectiles.xml @@ -0,0 +1,50 @@ + + + + + + + Things/Projectile/Projectile_Obelisk + Graphic_Single + + + Bullet + 170 + false + + + + + Bullet_Obelisk_Basic + + Frostbite + 12 + 2 + 4 + 50 + + + + + Bullet_Obelisk_Intermediate + + VPER_Slow_Frostbite + 12 + 2 + 4 + 50 + + + + + Bullet_Obelisk_Advanced + + VPER_SlowFragile_Frostbite + 12 + 2 + 4 + 50 + + + + \ No newline at end of file diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Buildings_Turrets.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Buildings_Turrets.xml new file mode 100644 index 0000000000..ac9253c606 --- /dev/null +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Buildings_Turrets.xml @@ -0,0 +1,175 @@ + + + + + Defs/ThingDef[ + defName="VPER_Turret_Monolith_1Tier" + ] + + CombatExtended.Building_TurretGunCE + + + + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"]/statBases + + 0.25 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"]/statBases/ShootingAccuracyTurret + + 0.5 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"] + + 1.5 + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"]/building/turretBurstCooldownTime + + 1.0 + + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_2Tier"]/statBases + + 0.25 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_2Tier"]/statBases/ShootingAccuracyTurret + + 0.5 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_2Tier"] + + 1.5 + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_2Tier"]/building/turretBurstCooldownTime + + 1.0 + + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_3Tier"]/statBases + + 0.25 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_3Tier"]/statBases/ShootingAccuracyTurret + + 0.5 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_3Tier"] + + 1.5 + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_3Tier"]/building/turretBurstCooldownTime + + 1.0 + + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_4Tier"]/statBases + + 0.25 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_4Tier"]/statBases/ShootingAccuracyTurret + + 0.5 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_4Tier"] + + 1.5 + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_4Tier"]/building/turretBurstCooldownTime + + 1.0 + + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_5Tier"]/statBases + + 0.25 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_5Tier"]/statBases/ShootingAccuracyTurret + + 0.5 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_5Tier"] + + 1.5 + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_5Tier"]/building/turretBurstCooldownTime + + 1.0 + + + + + + + + + diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Race_Spirit.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Race_Spirit.xml new file mode 100644 index 0000000000..44e376ac67 --- /dev/null +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Race_Spirit.xml @@ -0,0 +1,77 @@ + + + + + + Defs/ThingDef[defName="VPER_WarriorSpirit"] + +
  • + Humanoid +
    • +     +     + + + Defs/ThingDef[defName="VPER_WarriorSpirit"]/statBases + + 0.4 + 0.6 + 1.5 + + + + + Defs/ThingDef[defName="VPER_WarriorSpirit"]/tools + + +
  • + + +
  • Cut
    • + + 22 + 2.6 + 4 + 8 + +
  • + + +
  • Cut
    • + + 22 + 2.6 + 4 + 8 + +
  • + + +
  • Blunt
    • + + 5 + 2 + HeadAttackTool + 0.2 + 0.625 + +     +     +     + + + Defs/ThingDef[defName="VPER_WarriorSpirit"]/statBases/ArmorRating_Sharp + + 4.20 + + + + + Defs/ThingDef[defName="VPER_WarriorSpirit"]/statBases/ArmorRating_Blunt + + 6.30 + + + + +     \ No newline at end of file diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Turret_Gun.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Turret_Gun.xml new file mode 100644 index 0000000000..1810459444 --- /dev/null +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Turret_Gun.xml @@ -0,0 +1,169 @@ + + + + + + VPER_Gun_Monolith_1Tier + + 0.6 + 1.00 + 0.10 + 1.00 + + + CombatExtended.Verb_ShootCE + true + Bullet_Obelisk_Basic + 0.5 + 35 + 1 + 36 + VPER_IsaObelisk_Fire + GunTail_Light + 7 + Mounted + + + AimedShot + true + true + + +
  • TurretGun
    • +     +     + + + + + VPER_Gun_Monolith_2Tier + + 0.6 + 1.00 + 0.10 + 1.00 + + + 1.19 + CombatExtended.Verb_ShootCE + true + Bullet_Obelisk_Basic + 0.5 + 40 + 36 + 2 + VPER_IsaObelisk_Fire + GunTail_Light + 7 + Mounted + + + AimedShot + true + true + + +
  • TurretGun
    • +     +     + + + + VPER_Gun_Monolith_3Tier + + 0.6 + 1.00 + 0.10 + 1.00 + + + 1.19 + CombatExtended.Verb_ShootCE + true + Bullet_Obelisk_Intermediate + 0.5 + 45 + 36 + 3 + VPER_IsaObelisk_Fire + GunTail_Light + 7 + Mounted + + + AimedShot + true + true + + +
  • TurretGun
    • +     +     + + + + VPER_Gun_Monolith_4Tier + + 0.6 + 1.00 + 0.10 + 1.00 + + + 1.19 + CombatExtended.Verb_ShootCE + true + Bullet_Obelisk_Intermediate + 0.5 + 50 + 36 + 4 + VPER_IsaObelisk_Fire + GunTail_Light + 7 + Mounted + + + AimedShot + true + true + + +
  • TurretGun
    • +     +     + + + + VPER_Gun_Monolith_5Tier + + 0.6 + 1.00 + 0.10 + 1.00 + + + 1.19 + CombatExtended.Verb_ShootCE + true + Bullet_Obelisk_Advanced + 0.5 + 55 + 36 + 5 + VPER_IsaObelisk_Fire + GunTail_Light + 7 + Mounted + + + AimedShot + true + true + + +
  • TurretGun
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Weapons_Melee.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Weapons_Melee.xml new file mode 100644 index 0000000000..a98f9d0a5c --- /dev/null +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Weapons_Melee.xml @@ -0,0 +1,49 @@ + + + + Defs/ThingDef[defName="VPER_MeleeWeapon_RunesmithBattleaxe"]/tools + + +
  • + + +
  • Blunt
    • + + 3 + 1.66 + 0.10 + 0.75 + Handle + +
  • + + +
  • Cut
    • + + 25 + 2.47 + 4.69 + 1.57 + Edge + +     +     +     + + + Defs/ThingDef[defName="VPER_MeleeWeapon_RunesmithBattleaxe"]/statBases + + 4 + 0.2 + + + + + Defs/ThingDef[defName="VPER_MeleeWeapon_RunesmithBattleaxe"]/equippedStatOffsets + + 0.13 + 0.2 + 0.20 + + +     From a51fd6700ea58ca9339069f2f72b7ce37405e36f Mon Sep 17 00:00:00 2001 From: Mint <93885293+Mint-Vanilla@users.noreply.github.com> Date: Tue, 29 Oct 2024 21:49:16 +0000 Subject: [PATCH 27/64] Add files via upload --- LoadFolders.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LoadFolders.xml b/LoadFolders.xml index 0faed28a68..3c902adde0 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -56,7 +56,7 @@
  • ModPatches/Archotech Expanded
  • ModPatches/Archotech Expanded Prosthetics
  • ModPatches/Archotech PowerArmor
    • -
  • ModPatches/Archotech Weaponry
    • +
  • ModPatches/Archotech Weaponry
  • ModPatches/Archotech+
  • ModPatches/Argonians of Blackmarsh
  • ModPatches/Arrow Please
    • @@ -144,7 +144,6 @@
  • ModPatches/Eisenhans Power Armor
  • ModPatches/Eltex Bodysuit
  • ModPatches/Enchanted Sword
    • -
  • ModPatches/Epochs - Pyrinth
  • ModPatches/Epona Race
  • ModPatches/Equium
  • ModPatches/Erin's Au Ra
    • @@ -165,7 +164,7 @@
  • ModPatches/Erin's Wildlife
  • ModPatches/EvolvedOrgansRedux
  • ModPatches/Exotic Arsenal
    • -
  • ModPatches/Expanded Materials - Metals
    • +
  • ModPatches/Expanded Materials - Metals
  • ModPatches/Expanded Materials - Plastics
  • ModPatches/Expanded Woodworking
  • ModPatches/Extended Storage
    • @@ -625,6 +624,7 @@
  • ModPatches/pphhyy Sanguinary Animals
  • ModPatches/pphhyy's Lightless Empyrean
  • ModPatches/EdoThemedExpansion
    • +
  • ModPatches/Vanilla Psycasts Expanded - Runesmith
  • ModPatches/Multiplayer
  • ModPatches/SRTS
    • From 302d5edede340ac79285b03516f6b940b9a4c36d Mon Sep 17 00:00:00 2001 From: Mint <93885293+Mint-Vanilla@users.noreply.github.com> Date: Tue, 29 Oct 2024 21:50:55 +0000 Subject: [PATCH 28/64] Add files via upload --- LoadFolders.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LoadFolders.xml b/LoadFolders.xml index 3c902adde0..0faed28a68 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -56,7 +56,7 @@
  • ModPatches/Archotech Expanded
  • ModPatches/Archotech Expanded Prosthetics
  • ModPatches/Archotech PowerArmor
    • -
  • ModPatches/Archotech Weaponry
    • +
  • ModPatches/Archotech Weaponry
  • ModPatches/Archotech+
  • ModPatches/Argonians of Blackmarsh
  • ModPatches/Arrow Please
    • @@ -144,6 +144,7 @@
  • ModPatches/Eisenhans Power Armor
  • ModPatches/Eltex Bodysuit
  • ModPatches/Enchanted Sword
    • +
  • ModPatches/Epochs - Pyrinth
  • ModPatches/Epona Race
  • ModPatches/Equium
  • ModPatches/Erin's Au Ra
    • @@ -164,7 +165,7 @@
  • ModPatches/Erin's Wildlife
  • ModPatches/EvolvedOrgansRedux
  • ModPatches/Exotic Arsenal
    • -
  • ModPatches/Expanded Materials - Metals
    • +
  • ModPatches/Expanded Materials - Metals
  • ModPatches/Expanded Materials - Plastics
  • ModPatches/Expanded Woodworking
  • ModPatches/Extended Storage
    • @@ -624,7 +625,6 @@
  • ModPatches/pphhyy Sanguinary Animals
  • ModPatches/pphhyy's Lightless Empyrean
  • ModPatches/EdoThemedExpansion
    • -
  • ModPatches/Vanilla Psycasts Expanded - Runesmith
  • ModPatches/Multiplayer
  • ModPatches/SRTS
    • From e504a97198b6ed97a4a49bbe2656d461691cb1aa Mon Sep 17 00:00:00 2001 From: Mint <93885293+Mint-Vanilla@users.noreply.github.com> Date: Tue, 29 Oct 2024 21:52:15 +0000 Subject: [PATCH 29/64] Update LoadFolders.xml Added VPE - Runesmith Load Line --- LoadFolders.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/LoadFolders.xml b/LoadFolders.xml index 0faed28a68..48180ec6d3 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -625,6 +625,7 @@
  • ModPatches/pphhyy Sanguinary Animals
  • ModPatches/pphhyy's Lightless Empyrean
  • ModPatches/EdoThemedExpansion
    • +
  • ModPatches/Vanilla Psycasts Expanded - Runesmith
  • ModPatches/Multiplayer
  • ModPatches/SRTS
    • From 7efb8c7c60fd428e91287624d8d0139817df0dec Mon Sep 17 00:00:00 2001 From: Mint <93885293+Mint-Vanilla@users.noreply.github.com> Date: Tue, 29 Oct 2024 22:08:39 +0000 Subject: [PATCH 30/64] Patched Spacer Arsenal & Updated Vanilla Arsenal Including Spacer ammo provided by DetVisor --- .../Defs/Spacer Arsenal/Ammo.xml | 326 ++++++++++++++++++ .../Spacer Arsenal/Damages_LocalInjury.xml | 17 + .../Patches/Spacer Arsenal/Apparel_Body.xml | 61 ++++ .../Patches/Spacer Arsenal/Apparel_Helmet.xml | 79 +++++ .../Spacer Arsenal/Weapons_Grenades.xml | 120 +++++++ .../Patches/Spacer Arsenal/Weapons_Melee.xml | 104 ++++++ .../Patches/Spacer Arsenal/Weapons_Ranged.xml | 262 ++++++++++++++ .../PhotonCell/PhotonCell_a.png | Bin 0 -> 16215 bytes .../PhotonCell/PhotonCell_b.png | Bin 0 -> 26626 bytes .../PhotonCell/PhotonCell_c.png | Bin 0 -> 28051 bytes .../PlasmaCell/HotPlasmaCell_a.png | Bin 0 -> 10872 bytes .../PlasmaCell/HotPlasmaCell_b.png | Bin 0 -> 18440 bytes .../PlasmaCell/HotPlasmaCell_c.png | Bin 0 -> 22510 bytes ModPatches/Vanilla Arsenal/Defs/Ammo.xml | 141 ++++++++ .../Patches/RangedIndustrial.xml | 37 +- 15 files changed, 1146 insertions(+), 1 deletion(-) create mode 100644 ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml create mode 100644 ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml create mode 100644 ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Body.xml create mode 100644 ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml create mode 100644 ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml create mode 100644 ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml create mode 100644 ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml create mode 100644 ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_a.png create mode 100644 ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_b.png create mode 100644 ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_c.png create mode 100644 ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_a.png create mode 100644 ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_b.png create mode 100644 ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_c.png create mode 100644 ModPatches/Vanilla Arsenal/Defs/Ammo.xml diff --git a/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml new file mode 100644 index 0000000000..4d8216fd37 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml @@ -0,0 +1,326 @@ + + + + + + + AmmoSet_8mmRailgun_CoilgunLance + + + Bullet_CoilGunLance + + + + + Bullet_CoilGunLance + + + true + False + Bullet + 25 + 47 + 310 + + + + + + + + + AmmoHotPlasmaCell + + AmmoAdvanced + Spacer Arsenal/PlasmaCell/HotPlasmaCell_c + + + + + + PlasmaBolt + + A concentrated bolt of radiation, imparting disruptive energy into the target. + + + + + + AmmoSet_PlasmaBlaster + + + Bullet_Bolt_PlasmaBlaster + + + + + + + A hot plasma cell utilised by spacer tech assault weapons. + + 0.008 + 0.01 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_FabricationBench
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • AmmoHotPlasmaCell
    • +     + 5000 +     + + + Ammo_HotPlasmaCell + + + Spacer Arsenal/PlasmaCell + Graphic_StackCount + + + 0.69 + + PlasmaBolt + Bullet_Bolt_PlasmaBlaster + + + + + + + + Things/Projectiles/Bullet_Plasma + Graphic_Single + TransparentPostLight + + + CE_Laser + 170 + false + + + + + + Bullet_Bolt_PlasmaBlaster + + Bullet + 5 + 15 + 5 + +
  • + Flame_Secondary + 17 +
    • +     +     +     + + + + + MakeAmmo_HotPlasmaCell + + Craft 500 hot plasma cells. + Making hot plasma cells. + +
  • + + +
  • Plasteel
    • + + + 8 + +
  • + + +
  • Steel
    • + + + 4 + +
  • + + +
  • ComponentIndustrial
    • + + + 8 + +
  • + + +
  • Prometheum
    • + + + 8 + +
  • + + +
  • Chemfuel
    • + + + 12 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +
  • Prometheum
    • +
  • Chemfuel
    • +     +     + + 500 + + 8400 +     + + + + + + + + AmmoPhotonCell + + AmmoAdvanced + Spacer Arsenal/PhotonCell/PhotonCell_c + + + + + + PhotonCell + + A concentrated bolt of radiation, imparting disruptive energy into the target. + + + + + + AmmoSet_PhotonBlaster + + + Bullet_Bolt_PhotonBlaster + + + + + + + A charged photon cell utilised by spacer tech assault weapons. + + 0.008 + 0.01 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_FabricationBench
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • AmmoPhotonCell
    • +     + 5000 +     + + + Ammo_PhotonCell + + + Spacer Arsenal/PhotonCell + Graphic_StackCount + + + 0.69 + + PhotonCell + Bullet_Bolt_PhotonBlaster + + + + + + + + Things/Projectiles/Bullet_Photon + Graphic_Single + TransparentPostLight + + + Photon + 156 + false + + + + + Bullet_Bolt_PhotonBlaster + + Photon + 12 + 10.5 + 7 + + + + + + + MakeAmmo_PhotonCell + + Craft 500 photon cells. + Making photon cells. + +
  • + + +
  • Plasteel
    • + + + 8 + +
  • + + +
  • Steel
    • + + + 4 + +
  • + + +
  • ComponentSpacer
    • + + + 4 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentSpacer
    • +     +     + + 500 + + 8400 +     + + +     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml new file mode 100644 index 0000000000..6087fd0024 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml @@ -0,0 +1,17 @@ + + + + + Photon + + {0} has been scorched to death. + BurnSecondary + false + 99999 + 1 + 0 + 0.1 + 2 + + + \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Body.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Body.xml new file mode 100644 index 0000000000..052fb741fe --- /dev/null +++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Body.xml @@ -0,0 +1,61 @@ + + + + + + + Defs/ThingDef[defName="DV_Apparel_EnsignArmor"] + + + 80 + 12 + 0.1 + 30 + 16 + 38.25 + 400 + + + + + + + Defs/ThingDef[defName="DV_Apparel_EnsignArmor"] + + + 60 + 140 + 20 + 5 + + + + + + Defs/ThingDef[defName="DV_Apparel_EnsignArmor"] + + + 50 + 8 + 0.50 + 0 + + + + + + Defs/ThingDef[defName="DV_Apparel_EnsignArmor"]/apparel + + +
  • Torso
    • +
  • Neck
    • +
  • Shoulders
    • +
  • Arms
    • +
  • Legs
    • +
  • Hands
    • +
  • Feet
    • +     +     +     + +     diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml new file mode 100644 index 0000000000..d02b88634c --- /dev/null +++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml @@ -0,0 +1,79 @@ + + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases + + 4 + 1 + 0.7 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/Mass + + 3.0 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/ArmorRating_Sharp + + 10 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/ArmorRating_Blunt + + 26 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/MaxHitPoints + + 190 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/equippedStatOffsets + + 0.15 + -1 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/equippedStatOffsets/MentalBreakThreshold + + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/costList/Plasteel + + 50 + + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/costList + + 35 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/apparel/layers + +
  • OnHead
    • +
  • StrappedHead
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml new file mode 100644 index 0000000000..5218d8c1df --- /dev/null +++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml @@ -0,0 +1,120 @@ + + + + + + + + Defs/ThingDef[defName="DV_Proj_GrenadeThump"]/thingClass + + CombatExtended.ProjectileCE_Explosive + + + + + Defs/ThingDef[defName="DV_Proj_GrenadeThump"]/projectile + + + + Defs/ThingDef[defName="DV_Proj_GrenadeThump"] + + + 1.5 + Thump + 56 + 60 + true + Fleck_GrenadePin + Filth_GrenadeAmmoCasings + true + 12 + 3.0 + 2.0 + 0.25 + + + + + + Defs/ThingDef[defName="DV_Proj_GrenadeThump"]/comps + + Defs/ThingDef[defName="DV_Proj_GrenadeThump"] + + + + + + + + + + Defs/ThingDef[defName="DV_Weapon_GrenadeThump"]/smeltable + + false + + + + + Defs/ThingDef[defName="DV_Weapon_GrenadeThump"] + + CombatExtended.AmmoThing + 75 + First + + + + + Defs/ThingDef[defName="DV_Weapon_GrenadeThump"] + Class + CombatExtended.AmmoDef + + + + Defs/ThingDef[defName="DV_Weapon_GrenadeThump"]/comps + + +
  • + 56 + Thump + 3.9 +
    • +     +     +     + + + + DV_Weapon_GrenadeThump + + 0.4 + 0.87 + 11.22 + 1 + 1.0 + + + + CombatExtended.Verb_ShootCEOneUse + true + 12.0 + 4 + 1 + 6 + true + ThrowGrenade + + true + + DV_Proj_GrenadeThump + true + true + 7 + + +
  • CE_AI_Grenade
    • +
  • CE_AI_AOE
    • +
  • CE_OneHandedWeapon
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml new file mode 100644 index 0000000000..194bca0c26 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml @@ -0,0 +1,104 @@ + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 0.1 + 1.5 + 0.5 + Handle + +
  • + + +
  • Cut
    • + + 35 + 0.83 + 2.88 + 4.5 + Edge + +
  • + Stun + 10 + 0.4 +
    • +     + +
  • + + +
  • Stab
    • + + 16 + 0.94 + 1.28 + 6.25 + +
  • + Stun + 10 + 0.4 +
    • +     + +     +     +     + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/statBases + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"] + + + + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/statBases + + 4 + 0.40 + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"] + + + 1.00 + 0.40 + 0.27 + + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/weaponTags + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"] + + + + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml new file mode 100644 index 0000000000..01e905c665 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml @@ -0,0 +1,262 @@ + + + + + + + + Defs/ThingDef[ + defName="DV_Gun_ClashHMG" or + defName="DV_Gun_SonicStunner" or + defName="DV_Gun_BruteRifle" or + defName="DV_Gun_PhotonSMG" or + defName="DV_Gun_PlasmaBlaster" or + defName="DV_Gun_CoilgunLance" + ]/tools + + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + +     +     +     + + + + + + + + + + DV_Gun_ClashHMG + + 25 + 2.07 + 0.07 + 1 + 0.47 + + + 2.33 + CombatExtended.Verb_ShootCE + True + Bullet_20x82mmMauser_AP + 10 + 10 + 2.1 + 60 + Shot_Autocannon + GunTail_Medium + 12 + + + 60 + 4.9 + AmmoSet_20x82mmMauser + + + FALSE + SuppressFire + 5 + + +
  • CE_MachineGun
    • +
  • CE_AI_LMG
    • +     +     + + + Defs/ThingDef[defName="DV_Gun_ClashHMG"]/equippedStatOffsets/MoveSpeed + + + + + + DV_Gun_CoilgunLance + + 4.0 + 9.0 + 1.30 + 0.07 + 1.10 + 0.38 + + + 2.09 + CombatExtended.Verb_ShootCE + True + Bullet_CoilGunLance + 1.1 + 60 + Shot_TurretSniper + GunTail_Heavy + 9 + + + 1 + 4 + AmmoSet_8mmRailgun_CoilgunLance + + + AimedShot + False + + +
  • SpacerGun
    • +
  • Coilgun
    • +     +     + + + + + DV_Gun_PhotonSMG + + 2.50 + 0.37 + 1.00 + 0.14 + 0.94 + 4.50 + + + 1.79 + CombatExtended.Verb_ShootCE + true + Bullet_Bolt_PhotonBlaster + 0.6 + 25 + 6 + 6 + DV_Shot_PhotonSMG + GunTail_Medium + 9 + + + 25 + 4 + AmmoSet_PhotonBlaster + + + 3 + FALSE + Snapshot + + +
  • CE_SMG
    • +
  • CE_AI_BROOM
    • +     +     + + + + DV_Gun_PlasmaBlaster + + 8.7 + 0.56 + 1 + 0.05 + 1.37 + 12.9 + + + 1.38 + CombatExtended.Verb_ShootCE + true + Bullet_Bolt_PlasmaBlaster + 1.3 + 62 + 7 + 10 + DV_Shot_PlasmaBlaster + GunTail_Medium + 9 + + + 40 + 4.9 + AmmoSet_PlasmaBlaster + + + 5 + FALSE + SuppressFire + + +
  • CE_MachineGun
    • +
  • CE_AI_LMG
    • +     +     + + + + + DV_Gun_BruteRifle + + 25 + 2.07 + 0.07 + 1 + 0.47 + + + 2.33 + CombatExtended.Verb_ShootCE + True + Bullet_50BMG_FMJ + 4 + 10 + 2.1 + 40 + Shot_Autocannon + GunTail_Medium + 12 + + + 15 + 4.9 + AmmoSet_50BMG + + + true + Snapshot + 2 + + + + + Defs/ThingDef[defName="DV_Gun_BruteRifle"]/equippedStatOffsets/MoveSpeed + + +     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_a.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_a.png new file mode 100644 index 0000000000000000000000000000000000000000..c1fd2c146c0fd79aa26cad968bfe317153ef5e1c GIT binary patch literal 16215 zcmeHu^;=tAuywHFUYz3Y?p|D5pt!rcTW~2Zh2qd6#kIIoym)bUcL|>Fy!ZPX?r)a| zp5#fwIg{D5XV0v)Cgzi>96Aay3J3&3SCE%h2Z3OKr!XL-cff;z+b=8N0og@f*Bu0c zz4`ACX66Wm33!pnLq^9#!`aHi+tkex!{4oqaAs3<6Pr6r?3J zeR9q^eRB-7eGgtmo68|8Ypi9(^IdH$x+$!troR2Cv9;#=X0TSS?~p!PaXDZ2DdBKY z_IIGMhli`drgCIXBKBbsA|(Y!k-+tvgDNZm0%qIp#LRt`t4DwHS zi9!a`G!Vmk+Bh6g#E&$YAOo=B|9)wrc%` zIn{_CSZSd5(WZpX@Na}Z)L4vtv{Av@Az@wle1;3-R0jHm3`n#fK@PN!aAfdrq&}~t zt6a!Abh8>hx(jzPf-TKI;6KA+g_;t!ht$Bd@3%4{&-6!y^-yl|(xQAd`*aO!LO7_n zNw&#m!d;7E1C#!VR2$4E4>L4ED%Mec@^skIq*!;zpa8>x_7ld3{gTpTQiQ)$=X(z$ zm&{gD^-0*xGSfh4NfCSxN1WB>Wbg)Jd93UBT!nUn-<@4~MFqALR*W=<3N9n9xw*NA zx3~Mz3~kDY1*a4L7aEsz<hR(s z;m*zu5@nJ)tPl7(f0ify>B)~O83}mt_V(80YFlRe>Onc1%aCpR2B%i0(7lWJ=XddH zf8b)~B$w!$p4^@D@%-z<`QrR9?5YvXe~Rh5PHbbWtpz9wk& zcRcJe3bBvtAFL*R(7v3MAYJe@+z_SxMKHQ1Dp9QIB4lVIuz4^(2{}zdtt` z2~t1~D^l_=lOg?+mc8*Y8{O9M^6T3}^FCtBKd07xq?C-QXa*$amt41bVa!8=zGp{X zZETRqqDSt+sLCxk7uA@)yM9kbP^77J@FX00_OU%PGqbIuV{v6=-1PKkts0~Fv=mLI zZ>Ecqk$Eb2IPv^%L8$y|ZCTgy5s(hX)Z1dABUJ+`r}zWMSs%6V>9IXDgQ*rjs)=N4 zHut;jj+j2sL~Sp`UD1-4O|@DW#%1t%1A&Zf_ocp`i_B*e=KgGDXr@>xM)qtEyTtbT zpN5+2_Me#0^Aqo9>=eW|8-(W7u7qD&>8`43$6UEr4d30KBzv!5MtTH$<>iRXbFtqE zr{)A!MWNDHt3GFOTZE73#?yNks*P)hy^nA;L=K+40i*hOce&f!+doc4iT$ZIY@cfU zE0YYwgUH*%e~Spp+<9=wAm{1~L2uT&b{1>PjLiD0vlGrc8WBSsm))-sWPF7^vIm!P zPe9XYO|ui&d+>!7`(Kld=3IIqa_^&gXO3@``6z@LM^ZPw=CCbqWAF1{qJ?-6VI*ZR z7Z8=SHg=J*1As(~sxU;GPmg#@%@wv#P}4(nO2<#&u0$L#1RvyOu| zQ+5|2tZZ+3W)Zi==wo9`kYV-t3mqwUCDysQFVZsa;dN$c@{~D*gk*;vCD};H_75Ah z1#kZ$u(%sVUMXxcWajm4nZ*E`?u$gj4ekJ0_3bZ%XqRewm!DrFM$9?BEl`_?a+G&nDth~fq9?f#08gtT5ns1tV;bGn+)Jg4hd`;k}#VR59zs_2KM|?##$GA^*cI!VYE*WWkBK2VdF0Vi!7;I*f!D30yNqs!+j} z0E;y3Jb}r@;f`G&4oMPk;N=_{7zs^U8yg* z1i7A_TKDkZE-|4TQ+tTQn~OxAC&|z9{=LcJ3G|nCpGz^nv!%&&t#u&>TTnsY~Su`p~$ky5p^1%mHb(>KIPg-5PqVNvVF@FzSS}ZO604(DqhwBC2qWuo z{p}b({W(59e&{3U!V=m?6h4IHUIbW=3O+i&gjuczLGk_LSg)us6__W=>If7@`>Ge# z=zNc7@nfb(M7yyr-=IwqRV(_P2Q)KYpq#oub-ETF*SK(A;bNHTE;>Oc9S^dU!rtMh zJ#4Sj8tc7zyQ~Gx&qhRrl?EU6Ql_T`s5=>}b7S4FE;(vMTw|)08ZL_eVmtO2gEsX3 zW+um~gK`u_C(Y!*aE}$;Pt1CHbdaf_pqCwT_qUfv#x?)`b*A;_e6IpzbQgEHo)r9p zAxv(ENaY!8PM6QuH{z&#L9DRkFEd(vj)q6kaktX4Lg3O$8Up%+OUnBoS}acMds@Oj3(POr*$_F~T;&z2g{ox%{Jo z9S75VUA88twb67|{a-aTr4z_WZL!s=xk3X|Q&Vvl*nO!z-3y+ts}5@>e7cn%gCQyX z59EQj(;b80`_m;x60qmT@Mf?Bch(f?$F$%-DN`98>a|yi5bWg}xPVRP=2};K)bz$v z|A)8@ylmze4H^EoKfiXT_-U+zoUnQ9%VZF|18ZYMF&jU9F^t4b0=_%7mH5XpBXutC z;99eoA~S{1VqqMI7uJ?nHN9xeN|Q$J(cy1MhV;NG(3;o;rwzNZS?{pKMHcj6>UFx< zn?kE31=j&8(?l7oCnO>H+1Z&(Ethclax*!*!0*1*TaEpgWlESo<@tK?)wQ?PV%is^ zTJB6z%X#QyZ_k|ndTQ;S@QfP+zwtEROh|&7X^*-k3jUp?qOaFE!n=akJhW9hWHgxe zSo&=o{^e9nOhmp35HQN_z4TU4&cgUOJWwm#^lu}gS%A`q_rzo~~yxwCmY)e~l?*2dtUt&A6 zurSmxDK<97-W_L)pVRv&X;NiM*j;t<^aII@g$byksJ|Lc(kY2|j8xAUL#gIxb4z91z<4FdJuRnSYRyBo`p!SXIPH&5i0e6bT<(#3Tj}BZbI*lP zy)%E);KaBb2eBl-%9tUr$@gIV&KPE89qtNoyJGm#AQpkwkMR$ey9nCqis@{Iqy3oTf9oyB ztUPM2u3Vp2x440TL*z;~wip+U;Cx8CNz;$b1#+&zK6>nh&2#&vfXTfMBT3fcmN+R+imP;ndFcpN)Y z8u-e%Z7rFYulRYR>wB?!OUnq^c62?<$IxorzW1q-5_m=(Nxpd3{u*ELQ{;)CBj8&=w@hmgn + + + AmmoThermoRifle + + AmmoAdvanced + Things/Ammo/HighCaliber/Bofors/HE/HE_c + + + + + + ThermoRound + + A high calibre explosive shell fired from a large spacer tech rifle. + + + + + + AmmoSet_ThermoRifle + + + Bullet_ThermoRifle + + + + + + + A high calibre explosive shell fired from a large spacer tech rifle. + + 3 + 1 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_FabricationBench
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • AmmoThermoRifle
    • +     + 50 +     + + + Ammo_ThermoRifleShell + + + Things/Ammo/HighCaliber/Bofors/HE + Graphic_StackCount + + + 0.69 + + ThermoRound + Bullet_ThermoRifle + + + + + + + + Things/Projectile/Bullet_Big + Graphic_Single + TransparentPostLight + + + Bomb + 120 + True + Fleck_RifleAmmoCasings_HighCal + Filth_RifleAmmoCasings_HighCal + + + + + + Bullet_ThermoRifle + + Bomb + 40 + 10 + 25 + + + + + + + MakeAmmo_ThermoRifleShell + + Craft 50 ThermoRifle Shells. + Making ThermoRifle Shells. + +
  • + + +
  • Plasteel
    • + + + 10 + +
  • + + +
  • Steel
    • + + + 10 + +
  • + + +
  • FSX
    • + + + 15 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • FSX
    • +     +     + + 50 + + 8400 +     + + + \ No newline at end of file diff --git a/ModPatches/Vanilla Arsenal/Patches/RangedIndustrial.xml b/ModPatches/Vanilla Arsenal/Patches/RangedIndustrial.xml index ce8ef56f9a..229e643394 100644 --- a/ModPatches/Vanilla Arsenal/Patches/RangedIndustrial.xml +++ b/ModPatches/Vanilla Arsenal/Patches/RangedIndustrial.xml @@ -38,7 +38,8 @@ defName="DV_Gun_LeverShotgun" or defName="DV_Gun_LightCarbine" or defName="DV_Gun_CombatShotgun" or - defName="DV_Gun_DMR" + defName="DV_Gun_DMR" or + defName="DV_Gun_ThermoRifle" ]/tools @@ -306,4 +307,38 @@     + + + + DV_Gun_ThermoRifle + + 1.60 + 0.15 + 1.8 + 15 + 10 + 1.50 + + + 2 + CombatExtended.Verb_ShootCE + true + Bullet_ThermoRifle + 2 + 60 + 8 + Shot_Autocannon + 9 + GunTail_Heavy + + + 4 + 6 + AmmoSet_ThermoRifle + + + AimedShot + + + \ No newline at end of file From b473f26e85dada01504de07b1355ddfff190a046 Mon Sep 17 00:00:00 2001 From: Mint <93885293+Mint-Vanilla@users.noreply.github.com> Date: Tue, 29 Oct 2024 22:13:22 +0000 Subject: [PATCH 31/64] Delete ModPatches/Spacer Arsenal directory Put this in the wrong area --- .../Defs/Spacer Arsenal/Ammo.xml | 326 ------------------ .../Spacer Arsenal/Damages_LocalInjury.xml | 17 - .../Patches/Spacer Arsenal/Apparel_Body.xml | 61 ---- .../Patches/Spacer Arsenal/Apparel_Helmet.xml | 79 ----- .../Spacer Arsenal/Weapons_Grenades.xml | 120 ------- .../Patches/Spacer Arsenal/Weapons_Melee.xml | 104 ------ .../Patches/Spacer Arsenal/Weapons_Ranged.xml | 262 -------------- .../PhotonCell/PhotonCell_a.png | Bin 16215 -> 0 bytes .../PhotonCell/PhotonCell_b.png | Bin 26626 -> 0 bytes .../PhotonCell/PhotonCell_c.png | Bin 28051 -> 0 bytes .../PlasmaCell/HotPlasmaCell_a.png | Bin 10872 -> 0 bytes .../PlasmaCell/HotPlasmaCell_b.png | Bin 18440 -> 0 bytes .../PlasmaCell/HotPlasmaCell_c.png | Bin 22510 -> 0 bytes 13 files changed, 969 deletions(-) delete mode 100644 ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml delete mode 100644 ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml delete mode 100644 ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Body.xml delete mode 100644 ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml delete mode 100644 ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml delete mode 100644 ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml delete mode 100644 ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml delete mode 100644 ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_a.png delete mode 100644 ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_b.png delete mode 100644 ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_c.png delete mode 100644 ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_a.png delete mode 100644 ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_b.png delete mode 100644 ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_c.png diff --git a/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml deleted file mode 100644 index 4d8216fd37..0000000000 --- a/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml +++ /dev/null @@ -1,326 +0,0 @@ - - - - - - - AmmoSet_8mmRailgun_CoilgunLance - - - Bullet_CoilGunLance - - - - - Bullet_CoilGunLance - - - true - False - Bullet - 25 - 47 - 310 - - - - - - - - - AmmoHotPlasmaCell - - AmmoAdvanced - Spacer Arsenal/PlasmaCell/HotPlasmaCell_c - - - - - - PlasmaBolt - - A concentrated bolt of radiation, imparting disruptive energy into the target. - - - - - - AmmoSet_PlasmaBlaster - - - Bullet_Bolt_PlasmaBlaster - - - - - - - A hot plasma cell utilised by spacer tech assault weapons. - - 0.008 - 0.01 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_FabricationBench
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • AmmoHotPlasmaCell
    • -     - 5000 -     - - - Ammo_HotPlasmaCell - - - Spacer Arsenal/PlasmaCell - Graphic_StackCount - - - 0.69 - - PlasmaBolt - Bullet_Bolt_PlasmaBlaster - - - - - - - - Things/Projectiles/Bullet_Plasma - Graphic_Single - TransparentPostLight - - - CE_Laser - 170 - false - - - - - - Bullet_Bolt_PlasmaBlaster - - Bullet - 5 - 15 - 5 - -
  • - Flame_Secondary - 17 -
    • -     -     -     - - - - - MakeAmmo_HotPlasmaCell - - Craft 500 hot plasma cells. - Making hot plasma cells. - -
  • - - -
  • Plasteel
    • - - - 8 - -
  • - - -
  • Steel
    • - - - 4 - -
  • - - -
  • ComponentIndustrial
    • - - - 8 - -
  • - - -
  • Prometheum
    • - - - 8 - -
  • - - -
  • Chemfuel
    • - - - 12 - -     - - -
  • Plasteel
    • -
  • Steel
    • -
  • ComponentIndustrial
    • -
  • Prometheum
    • -
  • Chemfuel
    • -     -     - - 500 - - 8400 -     - - - - - - - - AmmoPhotonCell - - AmmoAdvanced - Spacer Arsenal/PhotonCell/PhotonCell_c - - - - - - PhotonCell - - A concentrated bolt of radiation, imparting disruptive energy into the target. - - - - - - AmmoSet_PhotonBlaster - - - Bullet_Bolt_PhotonBlaster - - - - - - - A charged photon cell utilised by spacer tech assault weapons. - - 0.008 - 0.01 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_FabricationBench
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • AmmoPhotonCell
    • -     - 5000 -     - - - Ammo_PhotonCell - - - Spacer Arsenal/PhotonCell - Graphic_StackCount - - - 0.69 - - PhotonCell - Bullet_Bolt_PhotonBlaster - - - - - - - - Things/Projectiles/Bullet_Photon - Graphic_Single - TransparentPostLight - - - Photon - 156 - false - - - - - Bullet_Bolt_PhotonBlaster - - Photon - 12 - 10.5 - 7 - - - - - - - MakeAmmo_PhotonCell - - Craft 500 photon cells. - Making photon cells. - -
  • - - -
  • Plasteel
    • - - - 8 - -
  • - - -
  • Steel
    • - - - 4 - -
  • - - -
  • ComponentSpacer
    • - - - 4 - -     - - -
  • Plasteel
    • -
  • Steel
    • -
  • ComponentSpacer
    • -     -     - - 500 - - 8400 -     - - -     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml deleted file mode 100644 index 6087fd0024..0000000000 --- a/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Photon - - {0} has been scorched to death. - BurnSecondary - false - 99999 - 1 - 0 - 0.1 - 2 - - - \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Body.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Body.xml deleted file mode 100644 index 052fb741fe..0000000000 --- a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Body.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - Defs/ThingDef[defName="DV_Apparel_EnsignArmor"] - - - 80 - 12 - 0.1 - 30 - 16 - 38.25 - 400 - - - - - - - Defs/ThingDef[defName="DV_Apparel_EnsignArmor"] - - - 60 - 140 - 20 - 5 - - - - - - Defs/ThingDef[defName="DV_Apparel_EnsignArmor"] - - - 50 - 8 - 0.50 - 0 - - - - - - Defs/ThingDef[defName="DV_Apparel_EnsignArmor"]/apparel - - -
  • Torso
    • -
  • Neck
    • -
  • Shoulders
    • -
  • Arms
    • -
  • Legs
    • -
  • Hands
    • -
  • Feet
    • -     -     -     - -     diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml deleted file mode 100644 index d02b88634c..0000000000 --- a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases - - 4 - 1 - 0.7 - - - - - Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/Mass - - 3.0 - - - - - Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/ArmorRating_Sharp - - 10 - - - - - Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/ArmorRating_Blunt - - 26 - - - - - Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/MaxHitPoints - - 190 - - - - - Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/equippedStatOffsets - - 0.15 - -1 - - - - - Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/equippedStatOffsets/MentalBreakThreshold - - - - - - Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/costList/Plasteel - - 50 - - - - - - Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/costList - - 35 - - - - - Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/apparel/layers - -
  • OnHead
    • -
  • StrappedHead
    • -     -     - -     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml deleted file mode 100644 index 5218d8c1df..0000000000 --- a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - Defs/ThingDef[defName="DV_Proj_GrenadeThump"]/thingClass - - CombatExtended.ProjectileCE_Explosive - - - - - Defs/ThingDef[defName="DV_Proj_GrenadeThump"]/projectile - - - - Defs/ThingDef[defName="DV_Proj_GrenadeThump"] - - - 1.5 - Thump - 56 - 60 - true - Fleck_GrenadePin - Filth_GrenadeAmmoCasings - true - 12 - 3.0 - 2.0 - 0.25 - - - - - - Defs/ThingDef[defName="DV_Proj_GrenadeThump"]/comps - - Defs/ThingDef[defName="DV_Proj_GrenadeThump"] - - - - - - - - - - Defs/ThingDef[defName="DV_Weapon_GrenadeThump"]/smeltable - - false - - - - - Defs/ThingDef[defName="DV_Weapon_GrenadeThump"] - - CombatExtended.AmmoThing - 75 - First - - - - - Defs/ThingDef[defName="DV_Weapon_GrenadeThump"] - Class - CombatExtended.AmmoDef - - - - Defs/ThingDef[defName="DV_Weapon_GrenadeThump"]/comps - - -
  • - 56 - Thump - 3.9 -
    • -     -     -     - - - - DV_Weapon_GrenadeThump - - 0.4 - 0.87 - 11.22 - 1 - 1.0 - - - - CombatExtended.Verb_ShootCEOneUse - true - 12.0 - 4 - 1 - 6 - true - ThrowGrenade - - true - - DV_Proj_GrenadeThump - true - true - 7 - - -
  • CE_AI_Grenade
    • -
  • CE_AI_AOE
    • -
  • CE_OneHandedWeapon
    • -     -     - -     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml deleted file mode 100644 index 194bca0c26..0000000000 --- a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/tools - - -
  • - - -
  • Poke
    • - - 2 - 0.1 - 1.5 - 0.5 - Handle - -
  • - - -
  • Cut
    • - - 35 - 0.83 - 2.88 - 4.5 - Edge - -
  • - Stun - 10 - 0.4 -
    • -     - -
  • - - -
  • Stab
    • - - 16 - 0.94 - 1.28 - 6.25 - -
  • - Stun - 10 - 0.4 -
    • -     - -     -     -     - - - Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/statBases - - Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"] - - - - - - - - Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/statBases - - 4 - 0.40 - - - - - Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"] - - - 1.00 - 0.40 - 0.27 - - - - - - Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/weaponTags - - Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"] - - - - - - - - Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/weaponTags - -
  • CE_OneHandedWeapon
    • -     -     - -     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml deleted file mode 100644 index 01e905c665..0000000000 --- a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml +++ /dev/null @@ -1,262 +0,0 @@ - - - - - - - - Defs/ThingDef[ - defName="DV_Gun_ClashHMG" or - defName="DV_Gun_SonicStunner" or - defName="DV_Gun_BruteRifle" or - defName="DV_Gun_PhotonSMG" or - defName="DV_Gun_PlasmaBlaster" or - defName="DV_Gun_CoilgunLance" - ]/tools - - - -
  • - - -
  • Blunt
    • - - 8 - 1.55 - 1.5 - 2.755 - Stock - -
  • - - -
  • Blunt
    • - - 5 - 2.02 - 1.630 - Barrel - -
  • - - -
  • Poke
    • - - 8 - 1.55 - 2.755 - Muzzle - -     -     -     - - - - - - - - - - DV_Gun_ClashHMG - - 25 - 2.07 - 0.07 - 1 - 0.47 - - - 2.33 - CombatExtended.Verb_ShootCE - True - Bullet_20x82mmMauser_AP - 10 - 10 - 2.1 - 60 - Shot_Autocannon - GunTail_Medium - 12 - - - 60 - 4.9 - AmmoSet_20x82mmMauser - - - FALSE - SuppressFire - 5 - - -
  • CE_MachineGun
    • -
  • CE_AI_LMG
    • -     -     - - - Defs/ThingDef[defName="DV_Gun_ClashHMG"]/equippedStatOffsets/MoveSpeed - - - - - - DV_Gun_CoilgunLance - - 4.0 - 9.0 - 1.30 - 0.07 - 1.10 - 0.38 - - - 2.09 - CombatExtended.Verb_ShootCE - True - Bullet_CoilGunLance - 1.1 - 60 - Shot_TurretSniper - GunTail_Heavy - 9 - - - 1 - 4 - AmmoSet_8mmRailgun_CoilgunLance - - - AimedShot - False - - -
  • SpacerGun
    • -
  • Coilgun
    • -     -     - - - - - DV_Gun_PhotonSMG - - 2.50 - 0.37 - 1.00 - 0.14 - 0.94 - 4.50 - - - 1.79 - CombatExtended.Verb_ShootCE - true - Bullet_Bolt_PhotonBlaster - 0.6 - 25 - 6 - 6 - DV_Shot_PhotonSMG - GunTail_Medium - 9 - - - 25 - 4 - AmmoSet_PhotonBlaster - - - 3 - FALSE - Snapshot - - -
  • CE_SMG
    • -
  • CE_AI_BROOM
    • -     -     - - - - DV_Gun_PlasmaBlaster - - 8.7 - 0.56 - 1 - 0.05 - 1.37 - 12.9 - - - 1.38 - CombatExtended.Verb_ShootCE - true - Bullet_Bolt_PlasmaBlaster - 1.3 - 62 - 7 - 10 - DV_Shot_PlasmaBlaster - GunTail_Medium - 9 - - - 40 - 4.9 - AmmoSet_PlasmaBlaster - - - 5 - FALSE - SuppressFire - - -
  • CE_MachineGun
    • -
  • CE_AI_LMG
    • -     -     - - - - - DV_Gun_BruteRifle - - 25 - 2.07 - 0.07 - 1 - 0.47 - - - 2.33 - CombatExtended.Verb_ShootCE - True - Bullet_50BMG_FMJ - 4 - 10 - 2.1 - 40 - Shot_Autocannon - GunTail_Medium - 12 - - - 15 - 4.9 - AmmoSet_50BMG - - - true - Snapshot - 2 - - - - - Defs/ThingDef[defName="DV_Gun_BruteRifle"]/equippedStatOffsets/MoveSpeed - - -     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_a.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_a.png deleted file mode 100644 index c1fd2c146c0fd79aa26cad968bfe317153ef5e1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16215 zcmeHu^;=tAuywHFUYz3Y?p|D5pt!rcTW~2Zh2qd6#kIIoym)bUcL|>Fy!ZPX?r)a| zp5#fwIg{D5XV0v)Cgzi>96Aay3J3&3SCE%h2Z3OKr!XL-cff;z+b=8N0og@f*Bu0c zz4`ACX66Wm33!pnLq^9#!`aHi+tkex!{4oqaAs3<6Pr6r?3J zeR9q^eRB-7eGgtmo68|8Ypi9(^IdH$x+$!troR2Cv9;#=X0TSS?~p!PaXDZ2DdBKY z_IIGMhli`drgCIXBKBbsA|(Y!k-+tvgDNZm0%qIp#LRt`t4DwHS zi9!a`G!Vmk+Bh6g#E&$YAOo=B|9)wrc%` zIn{_CSZSd5(WZpX@Na}Z)L4vtv{Av@Az@wle1;3-R0jHm3`n#fK@PN!aAfdrq&}~t zt6a!Abh8>hx(jzPf-TKI;6KA+g_;t!ht$Bd@3%4{&-6!y^-yl|(xQAd`*aO!LO7_n zNw&#m!d;7E1C#!VR2$4E4>L4ED%Mec@^skIq*!;zpa8>x_7ld3{gTpTQiQ)$=X(z$ zm&{gD^-0*xGSfh4NfCSxN1WB>Wbg)Jd93UBT!nUn-<@4~MFqALR*W=<3N9n9xw*NA zx3~Mz3~kDY1*a4L7aEsz<hR(s z;m*zu5@nJ)tPl7(f0ify>B)~O83}mt_V(80YFlRe>Onc1%aCpR2B%i0(7lWJ=XddH zf8b)~B$w!$p4^@D@%-z<`QrR9?5YvXe~Rh5PHbbWtpz9wk& zcRcJe3bBvtAFL*R(7v3MAYJe@+z_SxMKHQ1Dp9QIB4lVIuz4^(2{}zdtt` z2~t1~D^l_=lOg?+mc8*Y8{O9M^6T3}^FCtBKd07xq?C-QXa*$amt41bVa!8=zGp{X zZETRqqDSt+sLCxk7uA@)yM9kbP^77J@FX00_OU%PGqbIuV{v6=-1PKkts0~Fv=mLI zZ>Ecqk$Eb2IPv^%L8$y|ZCTgy5s(hX)Z1dABUJ+`r}zWMSs%6V>9IXDgQ*rjs)=N4 zHut;jj+j2sL~Sp`UD1-4O|@DW#%1t%1A&Zf_ocp`i_B*e=KgGDXr@>xM)qtEyTtbT zpN5+2_Me#0^Aqo9>=eW|8-(W7u7qD&>8`43$6UEr4d30KBzv!5MtTH$<>iRXbFtqE zr{)A!MWNDHt3GFOTZE73#?yNks*P)hy^nA;L=K+40i*hOce&f!+doc4iT$ZIY@cfU zE0YYwgUH*%e~Spp+<9=wAm{1~L2uT&b{1>PjLiD0vlGrc8WBSsm))-sWPF7^vIm!P zPe9XYO|ui&d+>!7`(Kld=3IIqa_^&gXO3@``6z@LM^ZPw=CCbqWAF1{qJ?-6VI*ZR z7Z8=SHg=J*1As(~sxU;GPmg#@%@wv#P}4(nO2<#&u0$L#1RvyOu| zQ+5|2tZZ+3W)Zi==wo9`kYV-t3mqwUCDysQFVZsa;dN$c@{~D*gk*;vCD};H_75Ah z1#kZ$u(%sVUMXxcWajm4nZ*E`?u$gj4ekJ0_3bZ%XqRewm!DrFM$9?BEl`_?a+G&nDth~fq9?f#08gtT5ns1tV;bGn+)Jg4hd`;k}#VR59zs_2KM|?##$GA^*cI!VYE*WWkBK2VdF0Vi!7;I*f!D30yNqs!+j} z0E;y3Jb}r@;f`G&4oMPk;N=_{7zs^U8yg* z1i7A_TKDkZE-|4TQ+tTQn~OxAC&|z9{=LcJ3G|nCpGz^nv!%&&t#u&>TTnsY~Su`p~$ky5p^1%mHb(>KIPg-5PqVNvVF@FzSS}ZO604(DqhwBC2qWuo z{p}b({W(59e&{3U!V=m?6h4IHUIbW=3O+i&gjuczLGk_LSg)us6__W=>If7@`>Ge# z=zNc7@nfb(M7yyr-=IwqRV(_P2Q)KYpq#oub-ETF*SK(A;bNHTE;>Oc9S^dU!rtMh zJ#4Sj8tc7zyQ~Gx&qhRrl?EU6Ql_T`s5=>}b7S4FE;(vMTw|)08ZL_eVmtO2gEsX3 zW+um~gK`u_C(Y!*aE}$;Pt1CHbdaf_pqCwT_qUfv#x?)`b*A;_e6IpzbQgEHo)r9p zAxv(ENaY!8PM6QuH{z&#L9DRkFEd(vj)q6kaktX4Lg3O$8Up%+OUnBoS}acMds@Oj3(POr*$_F~T;&z2g{ox%{Jo z9S75VUA88twb67|{a-aTr4z_WZL!s=xk3X|Q&Vvl*nO!z-3y+ts}5@>e7cn%gCQyX z59EQj(;b80`_m;x60qmT@Mf?Bch(f?$F$%-DN`98>a|yi5bWg}xPVRP=2};K)bz$v z|A)8@ylmze4H^EoKfiXT_-U+zoUnQ9%VZF|18ZYMF&jU9F^t4b0=_%7mH5XpBXutC z;99eoA~S{1VqqMI7uJ?nHN9xeN|Q$J(cy1MhV;NG(3;o;rwzNZS?{pKMHcj6>UFx< zn?kE31=j&8(?l7oCnO>H+1Z&(Ethclax*!*!0*1*TaEpgWlESo<@tK?)wQ?PV%is^ zTJB6z%X#QyZ_k|ndTQ;S@QfP+zwtEROh|&7X^*-k3jUp?qOaFE!n=akJhW9hWHgxe zSo&=o{^e9nOhmp35HQN_z4TU4&cgUOJWwm#^lu}gS%A`q_rzo~~yxwCmY)e~l?*2dtUt&A6 zurSmxDK<97-W_L)pVRv&X;NiM*j;t<^aII@g$byksJ|Lc(kY2|j8xAUL#gIxb4z91z<4FdJuRnSYRyBo`p!SXIPH&5i0e6bT<(#3Tj}BZbI*lP zy)%E);KaBb2eBl-%9tUr$@gIV&KPE89qtNoyJGm#AQpkwkMR$ey9nCqis@{Iqy3oTf9oyB ztUPM2u3Vp2x440TL*z;~wip+U;Cx8CNz;$b1#+&zK6>nh&2#&vfXTfMBT3fcmN+R+imP;ndFcpN)Y z8u-e%Z7rFYulRYR>wB?!OUnq^c62?<$IxorzW1q-5_m=(Nxpd3{u*ELQ{;)CBj8&=w@hmgn - - DV_Gun_ThermoRifle - - 1.60 - 0.15 - 1.8 - 15 - 10 - 1.50 - - - 2 - CombatExtended.Verb_ShootCE - true - Bullet_ThermoRifle - 2 - 60 - 8 - Shot_Autocannon - 9 - GunTail_Heavy - - - 4 - 6 - AmmoSet_ThermoRifle - - - AimedShot - - - \ No newline at end of file From d4d6ff162cc7df838fb5d009b067a220f36165a9 Mon Sep 17 00:00:00 2001 From: Mint <93885293+Mint-Vanilla@users.noreply.github.com> Date: Tue, 29 Oct 2024 22:14:40 +0000 Subject: [PATCH 33/64] Delete ModPatches/Vanilla Arsenal/Defs directory --- ModPatches/Vanilla Arsenal/Defs/Ammo.xml | 141 ----------------------- 1 file changed, 141 deletions(-) delete mode 100644 ModPatches/Vanilla Arsenal/Defs/Ammo.xml diff --git a/ModPatches/Vanilla Arsenal/Defs/Ammo.xml b/ModPatches/Vanilla Arsenal/Defs/Ammo.xml deleted file mode 100644 index 8de6cfbb10..0000000000 --- a/ModPatches/Vanilla Arsenal/Defs/Ammo.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - AmmoThermoRifle - - AmmoAdvanced - Things/Ammo/HighCaliber/Bofors/HE/HE_c - - - - - - ThermoRound - - A high calibre explosive shell fired from a large spacer tech rifle. - - - - - - AmmoSet_ThermoRifle - - - Bullet_ThermoRifle - - - - - - - A high calibre explosive shell fired from a large spacer tech rifle. - - 3 - 1 - - -
  • CE_AutoEnableTrade
    • -
  • CE_AutoEnableCrafting_FabricationBench
    • -
  • CE_AutoEnableCrafting_TableMachining
    • -     - -
  • AmmoThermoRifle
    • -     - 50 -     - - - Ammo_ThermoRifleShell - - - Things/Ammo/HighCaliber/Bofors/HE - Graphic_StackCount - - - 0.69 - - ThermoRound - Bullet_ThermoRifle - - - - - - - - Things/Projectile/Bullet_Big - Graphic_Single - TransparentPostLight - - - Bomb - 120 - True - Fleck_RifleAmmoCasings_HighCal - Filth_RifleAmmoCasings_HighCal - - - - - - Bullet_ThermoRifle - - Bomb - 40 - 10 - 25 - - - - - - - MakeAmmo_ThermoRifleShell - - Craft 50 ThermoRifle Shells. - Making ThermoRifle Shells. - -
  • - - -
  • Plasteel
    • - - - 10 - -
  • - - -
  • Steel
    • - - - 10 - -
  • - - -
  • FSX
    • - - - 15 - -     - - -
  • Plasteel
    • -
  • Steel
    • -
  • FSX
    • -     -     - - 50 - - 8400 -     - - -     \ No newline at end of file From 46a544f04f1c694c4c94ea3ba90f180e3b475112 Mon Sep 17 00:00:00 2001 From: Safairette <71556532+Safairette@users.noreply.github.com> Date: Wed, 30 Oct 2024 02:21:36 +0300 Subject: [PATCH 34/64] Remove empty duplicate setting tab (#3509) --- Assemblies/CombatExtendedLoader.dll | Bin 7168 -> 7168 bytes Source/Loader/Loader/Loader.cs | 5 ----- 2 files changed, 5 deletions(-) diff --git a/Assemblies/CombatExtendedLoader.dll b/Assemblies/CombatExtendedLoader.dll index 225ee260879b2ecde093783ebb3c843b425053f3..f856aab14aef2340425892c1963f27718ef8c49a 100644 GIT binary patch delta 1154 zcmZ8fU1%It6#nkaWH#i_-TZHw)J?WY*1BD1_9wd=HB^!`vCV48HV>r(>uh#X*09+) zyXz0sWNT{_k+jPNQ6Ueu5UeGlOc1IdRnTaCP^k~a7hj|xzDVgq5g$A=Y4PXIobTT6 zobTLw?&VYy)x?F@rOP{>8?`rkg(0=}!Tv58_ePawVQ($snc6S?>?h9HaNW&EfaAPh z2=WtbSO|LfD{R$UukI#`&!95)=4!A=uo2jlFF>FhAq_L@%r3 zG4a75ohp}lfQG@U2uO|Qrwl8BUUHbX?ymxUL}jyqSH(b&LIs2KvCl9Wjhlf?Ax9~A;i<{_YOtkP2+rm|RK^_@N z_B>TFj3tzX5E@ZoA+%wYa33}a{n#RW7{Pe+5H4i^W8-r%QQA*S*xu7M^squ{ZzWG16#RKD%F zizE~yM?JutY908kaQH*8)U4gPXUKvIS?fP>TiQl8Otww2?SI8=mE8=^Si3jRr6`7c*j)Z}yx*|`<5QBm+vWU}{gaH)`h>|ZyUY+=B4WD#3Pt?!V?bm~p%hUN#1B!dkB`AZTSQRsN9IRAr0q^JpyzPb-fP`;&OLi` zD(Oo4@{i`kU)RU07kiD8uFfp$GO;i!5{+iAu)g|tABCAH!iivvcT>bT<>zxW)sxjt z&z6SWgNJ=UwjCgj1yj7kI8BNl7^^j5QS-n6O1FSxzE!YRBB*`1B)S4b|5Nm#9>9kw zgQKd4Bg$Uw1+2-XA`Vu>WiBecAaV7IP_m4LY$znuDy`%LYKS~sRo(PG$SL$YOH z3Ye4F;*or`T$(ttf3kk(e_DVKQsKa^QOwEZ{GttP-nDh3#5ckZv2Dg}`8`NhzpS=} zT=72h1ij~H=I=ohNlf4{b&Bh_;2Ip~D;|5peY`ODNCR7?A3zoNjT2MHt()NlBTuHiQBiee!{C*=+i z97NHGN}o?t6hWL5`~p`62QVYJ3aVBN9z5#z#X0MZDrZddtT*hFh_&Bj#>O1J;q51<_SE}>*)duym+Q?Q z$(4)ykCr&w8m16GY3t>mT7Ox#d;~{v7%p-sBaBTrC9#MjC5{fbF}2_ zrW-wv=fA!4{v+@0m^PJ{+G{U6!bBNXfwYCC1Y2`9uybVGjXNn_OeTt{;g}mwCX%k! z`C%s!PdoX%lgZ@rg@T)R`;sq7ZAT}k z>=0@Gqb~@tE<-9%kNvS=zb<^nW`pn2Xy7YJBQe_+tQqWRc5(&W+h7oJ%b)J+= n%gl@F2#+HzF)!0WMrKa3f=pMUTYKD Date: Wed, 30 Oct 2024 00:42:19 -0400 Subject: [PATCH 35/64] Housekeeping, update modlist --- LoadFolders.xml | 2 +- .../Buildings_Turrets.xml | 79 +++++++++---------- .../Race_Spirit.xml | 12 ++- .../Turret_Gun.xml | 1 - .../Weapons_Melee.xml | 8 +- SupportedThirdPartyMods.md | 1 + 6 files changed, 48 insertions(+), 55 deletions(-) diff --git a/LoadFolders.xml b/LoadFolders.xml index 48180ec6d3..22243a5297 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -564,6 +564,7 @@
  • ModPatches/Vanilla Plants Expanded - Mushrooms
  • ModPatches/Vanilla Psycasts Expanded
  • ModPatches/Vanilla Psycasts Expanded - Hemosage
    • +
  • ModPatches/Vanilla Psycasts Expanded - Runesmith
  • ModPatches/Vanilla Races Expanded - Android
  • ModPatches/Vanilla Races Expanded - Archon
  • ModPatches/Vanilla Races Expanded - Fungoid
    • @@ -625,7 +626,6 @@
  • ModPatches/pphhyy Sanguinary Animals
  • ModPatches/pphhyy's Lightless Empyrean
  • ModPatches/EdoThemedExpansion
    • -
  • ModPatches/Vanilla Psycasts Expanded - Runesmith
  • ModPatches/Multiplayer
  • ModPatches/SRTS
    • diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Buildings_Turrets.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Buildings_Turrets.xml index ac9253c606..75c811b983 100644 --- a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Buildings_Turrets.xml +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Buildings_Turrets.xml @@ -1,47 +1,45 @@  - - Defs/ThingDef[ - defName="VPER_Turret_Monolith_1Tier" - ] - - CombatExtended.Building_TurretGunCE - - - + + Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"] + + CombatExtended.Building_TurretGunCE + + + - - Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"]/statBases - - 0.25 - - - - - Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"]/statBases/ShootingAccuracyTurret - - 0.5 - - - - - Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"] - - 1.5 - - - - - - Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"]/building/turretBurstCooldownTime - - 1.0 - - + + Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"]/statBases + + 0.25 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"]/statBases/ShootingAccuracyTurret + + 0.5 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"] + + 1.5 + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"]/building/turretBurstCooldownTime + + 1.0 + + @@ -166,10 +164,5 @@ 1.0     - - - - - - + \ No newline at end of file diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Race_Spirit.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Race_Spirit.xml index 44e376ac67..13cbe9d4d0 100644 --- a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Race_Spirit.xml +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Race_Spirit.xml @@ -1,7 +1,6 @@  - Defs/ThingDef[defName="VPER_WarriorSpirit"] @@ -66,12 +65,11 @@ - - Defs/ThingDef[defName="VPER_WarriorSpirit"]/statBases/ArmorRating_Blunt - - 6.30 - - + + Defs/ThingDef[defName="VPER_WarriorSpirit"]/statBases/ArmorRating_Blunt + + 6.30 + \ No newline at end of file diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Turret_Gun.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Turret_Gun.xml index 1810459444..087df430c6 100644 --- a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Turret_Gun.xml +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Turret_Gun.xml @@ -33,7 +33,6 @@     - VPER_Gun_Monolith_2Tier diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Weapons_Melee.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Weapons_Melee.xml index a98f9d0a5c..581a49f5ca 100644 --- a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Weapons_Melee.xml +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Weapons_Melee.xml @@ -1,5 +1,6 @@  + Defs/ThingDef[defName="VPER_MeleeWeapon_RunesmithBattleaxe"]/tools @@ -41,9 +42,10 @@ Defs/ThingDef[defName="VPER_MeleeWeapon_RunesmithBattleaxe"]/equippedStatOffsets - 0.13 - 0.2 - 0.20 + 0.13 + 0.2 + 0.20 + diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index 1b2ab0d89e..921bdadcbf 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -546,6 +546,7 @@ Vanilla Persona Weapons Expanded | Vanilla Plants Expanded - Mushrooms | Vanilla Psycasts Expanded | Vanilla Psycasts Expanded - Hemosage | +Vanilla Psycasts Expanded - Runesmith | Vanilla Races Expanded - Android | Vanilla Races Expanded - Archon | Vanilla Races Expanded - Fungoid | From f92f651f9a9e389de1e8554a1b5cba3ec2f4b161 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Wed, 30 Oct 2024 20:44:35 +0330 Subject: [PATCH 36/64] Robotic Servitude patch --- LoadFolders.xml | 21 +- .../Bodies/Bodies_Mechanoid_Medium.xml | 56 +++++ .../Patches/ThingDefs_Misc/Melee_Assassin.xml | 64 ++++++ .../ThingDefs_Races/Races_Mechanoid.xml | 206 ++++++++++++++++++ SupportedThirdPartyMods.md | 1 + 5 files changed, 338 insertions(+), 10 deletions(-) create mode 100644 ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Medium.xml create mode 100644 ModPatches/Robotic Servitude/Patches/ThingDefs_Misc/Melee_Assassin.xml create mode 100644 ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml diff --git a/LoadFolders.xml b/LoadFolders.xml index 0faed28a68..4cb924136f 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -66,7 +66,7 @@
  • ModPatches/Astra Militarum Regimentum - Krieg
  • ModPatches/Astra Militarum Regimentum - Krieg Officer Helmet
  • ModPatches/Auto-Mortars
    • -
  • ModPatches/AV Work Queen
    • +
  • ModPatches/AV Work Queen
  • ModPatches/Autocleaner
  • ModPatches/Beast Man Tribes
  • ModPatches/Beeralope Squad
    • @@ -102,7 +102,7 @@
  • ModPatches/Charge-Loading Lee-Enfield
  • ModPatches/Civilization Beyond Earth Armor Sets
  • ModPatches/Clay Soldier Race
    • -
  • ModPatches/Colonial Shuttle
    • +
  • ModPatches/Colonial Shuttle
  • ModPatches/Colony Leadership
  • ModPatches/Combat Enthusiast's Collection
  • ModPatches/Comigo's Fancy Floating Turrets
    • @@ -144,7 +144,7 @@
  • ModPatches/Eisenhans Power Armor
  • ModPatches/Eltex Bodysuit
  • ModPatches/Enchanted Sword
    • -
  • ModPatches/Epochs - Pyrinth
    • +
  • ModPatches/Epochs - Pyrinth
  • ModPatches/Epona Race
  • ModPatches/Equium
  • ModPatches/Erin's Au Ra
    • @@ -165,7 +165,7 @@
  • ModPatches/Erin's Wildlife
  • ModPatches/EvolvedOrgansRedux
  • ModPatches/Exotic Arsenal
    • -
  • ModPatches/Expanded Materials - Metals
    • +
  • ModPatches/Expanded Materials - Metals
  • ModPatches/Expanded Materials - Plastics
  • ModPatches/Expanded Woodworking
  • ModPatches/Extended Storage
    • @@ -177,7 +177,7 @@
  • ModPatches/FSF Vanilla Bionics Expansion
  • ModPatches/Faction - Mafia
  • ModPatches/Fallout New Vegas - Elite Riot Gear
    • -
  • ModPatches/Fallout Vault 111 Starter Pack
    • +
  • ModPatches/Fallout Vault 111 Starter Pack
  • ModPatches/Fantasy Metals Reforged
  • ModPatches/Farming Expansion
  • ModPatches/FashionRIMsta
    • @@ -200,7 +200,7 @@
  • ModPatches/Gestalt Engine
  • ModPatches/Giddy-Up 2
  • ModPatches/GrimWorld Angels of Death
    • -
  • ModPatches/Grimworld Core Imperialis
    • +
  • ModPatches/Grimworld Core Imperialis
  • ModPatches/GrimWorld Hammer of the Imperium
  • ModPatches/GrimWorld Imperial Vehicles
  • ModPatches/Girls Frontline Apparel Pack
    • @@ -244,7 +244,7 @@
  • ModPatches/Jin-Roh Kerberos Panzer Cop Armor
  • ModPatches/K4G Empires of Old - Core
  • ModPatches/K4G Empires of Old - Engineers Institute
    • -
  • ModPatches/K4G Empires of Old - The Alekeepers
    • +
  • ModPatches/K4G Empires of Old - The Alekeepers
  • ModPatches/K4G Empires of Old - The Faceless Sultainate
  • ModPatches/K4G Empires of Old - The Polluted Legion
  • ModPatches/K4G Empires of Old - The Rising Sun
    • @@ -470,6 +470,7 @@
  • ModPatches/Rimsenal Xenotype Pack - Askbarn
  • ModPatches/Rimworld - The Dark Descent
  • ModPatches/Risk of Rain UES Contact Light Armory
    • +
  • ModPatches/Robotic Servitude
  • ModPatches/Rockmen Race
  • ModPatches/Roren Race
  • ModPatches/Royal Arsenal
    • @@ -490,7 +491,7 @@
  • ModPatches/Simply More Melee
  • ModPatches/Slime Rancher
  • ModPatches/Solark Race
    • -
  • ModPatches/Spacer Pack
    • +
  • ModPatches/Spacer Pack
  • ModPatches/Spacer Shields
  • ModPatches/Spaceworm
  • ModPatches/Spartan Foundry
    • @@ -625,9 +626,9 @@
  • ModPatches/pphhyy Sanguinary Animals
  • ModPatches/pphhyy's Lightless Empyrean
  • ModPatches/EdoThemedExpansion
    • - +
  • ModPatches/Multiplayer
  • ModPatches/SRTS
  • ModPatches/VehicleFramework
    • - + \ No newline at end of file diff --git a/ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Medium.xml b/ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Medium.xml new file mode 100644 index 0000000000..b2deebe5c6 --- /dev/null +++ b/ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Medium.xml @@ -0,0 +1,56 @@ + + + + + + Defs/BodyDef[defName="Gha_Laborer"]//*[ + def="MechanicalThoraxCanManipulate" or + def="MechanicalNeck" or + def="SightSensor" or + def="HearingSensor" or + def="SmellSensor" or + def="MechanicalLeg"] + + + + + + + + Defs/BodyDef[defName="Gha_Laborer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[customLabel="rear left foot"]/groups + + Defs/BodyDef[defName="Gha_Laborer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[customLabel="rear left foot"] + + + + + + + + Defs/BodyDef[defName="Gha_Laborer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[customLabel="rear right foot"]/groups + + Defs/BodyDef[defName="Gha_Laborer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[customLabel="rear right foot"] + + + + + + + + + Defs/BodyDef[defName="Gha_Laborer"]//*[ + def="MechanicalThoraxCanManipulate" or + def="MechanicalNeck" or + def="MechanicalHead" or + def="SightSensor" or + def="HearingSensor" or + def="SmellSensor" or + def="MechanicalLeg" or + def="MechanicalFoot"]/groups + + +
  • CoveredByNaturalArmor
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Misc/Melee_Assassin.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Misc/Melee_Assassin.xml new file mode 100644 index 0000000000..3954f889d8 --- /dev/null +++ b/ModPatches/Robotic Servitude/Patches/ThingDefs_Misc/Melee_Assassin.xml @@ -0,0 +1,64 @@ + + + + + Defs/ThingDef[defName="Gha_MeleeWeapon_AssassinBlade"]/tools + + +
  • + + +
  • Poke
    • + + 6 + 1.27 + 0.10 + 1.96 + Handle + +
  • + + +
  • Stab
    • + + 19 + 1.27 + 1.96 + 3.92 + Point + +
  • + + +
  • Cut
    • + + 48 + 1.25 + 4.84 + 1.08 + Edge + +     +     +     + + + Defs/ThingDef[defName="Gha_MeleeWeapon_AssassinBlade"]/statBases + + 7 + 0.93 + + + + + Defs/ThingDef[defName="Gha_MeleeWeapon_AssassinBlade"] + + + 0.67 + 0.7 + 0.47 + + + + +     \ No newline at end of file diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml new file mode 100644 index 0000000000..a42f1e9939 --- /dev/null +++ b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml @@ -0,0 +1,206 @@ + + + + + + + Defs/PawnKindDef[defName="Gha_Combat_Laborer"] + +
  • + + 4 + 6 + +
    • +     +     + + + + + Defs/ThingDef[@Name="Gha_MediumMechanoid"]/statBases + + 50 + 20 + 1.3 + 1.25 + 0.09 + 0.08 + 0.07 + 150 + + + + + Defs/ThingDef[@Name="Gha_MediumMechanoid"]/statBases/ArmorRating_Blunt + + 3 + + + + + Defs/ThingDef[@Name="Gha_MediumMechanoid"]/statBases/ArmorRating_Sharp + + 2 + + + + + Defs/ThingDef[@Name="Gha_MediumMechanoid"]/tools + + +
  • + + +
  • Blunt
    • + + 4 + 1.85 + HeadAttackTool + 0.625 + +     +     +     + + + + + Defs/ThingDef[defName="Gha_Corpse_Laborer" or defName="Gha_Combat_Laborer" or defName="Gha_Assassin_Laborer"] + +
  • + Humanoid +
    • +     +     + + + Defs/ThingDef[defName="Gha_Corpse_Laborer"]/statBases + + 0.12 + 0.12 + 0.07 + + + + + Defs/ThingDef[defName="Gha_Corpse_Laborer"]/tools + + +
  • + + +
  • Blunt
    • + + 13 + 2.67 + FrontLeftLeg + 5 + true + +
  • + + +
  • Blunt
    • + + 13 + 2.67 + FrontRightLeg + 5 + true + +
  • + + +
  • Blunt
    • + + 15 + 3.51 + HeadAttackTool + 12 + true + 0.2 + +     +     +     + + + Defs/ThingDef[defName="Gha_Corpse_Laborer"]/comps + + Defs/ThingDef[defName="Gha_Corpse_Laborer"] + + + + + + + + Defs/ThingDef[defName="Gha_Corpse_Laborer"]/comps + +
  • + 700 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 70 + 0.5 +
    • +     +     + + + + + Defs/ThingDef[defName="Gha_Combat_Laborer"]/statBases/ArmorRating_Blunt + + 11 + + + + + Defs/ThingDef[defName="Gha_Combat_Laborer"]/statBases/ArmorRating_Sharp + + 5.5 + + + + + Defs/ThingDef[defName="Gha_Combat_Laborer"]/race/baseHealthScale + + 1.0 + + + + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases + + 0.17 + 0.17 + 0.09 + + + + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Blunt + + 12 + + + + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Sharp + + 4.5 + + + +     \ No newline at end of file diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index 1b2ab0d89e..8a67fb0948 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -458,6 +458,7 @@ Rimworld - Witcher Monster Hunt | Rimworld-Style Pilas and Bows Strapped with Grenades and Shells Extended | Rimworld of Magic | Risk of Rain: UES Contact Light Armory (Continued) | +Robotic Servitude | Rockmen race | Roren, People of Rorensia | Royal Arsenal | From 4161bb333d7561cf1ac9c7eb42975d6209033e88 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Wed, 30 Oct 2024 20:49:21 +0330 Subject: [PATCH 37/64] Duplicate file name fix --- .../{Bodies_Mechanoid_Medium.xml => Bodies_Mechanoid_Laborer.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ModPatches/Robotic Servitude/Patches/Bodies/{Bodies_Mechanoid_Medium.xml => Bodies_Mechanoid_Laborer.xml} (100%) diff --git a/ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Medium.xml b/ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Laborer.xml similarity index 100% rename from ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Medium.xml rename to ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Laborer.xml From d7b2da91ebda611acb9d25dba04e548ca852e1ab Mon Sep 17 00:00:00 2001 From: The-Great-Ninth Date: Wed, 30 Oct 2024 18:22:46 +0100 Subject: [PATCH 38/64] LoadFolders update --- LoadFolders.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LoadFolders.xml b/LoadFolders.xml index 0faed28a68..38c98b0e74 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -608,7 +608,8 @@
  • ModPatches/Warhammer - Dryad
  • ModPatches/Warhammer 40.000 - Imperium Materials
  • ModPatches/Warhammer 40.000 - Imperium Weaponry
    • -
  • ModPatches/Warhammer 40k - Genes and Psycasts
    • +
  • ModPatches/Warhammer 40k Genes
    • +
  • ModPatches/Warhammer 40k Factions
  • ModPatches/Waster Toxic Breather
  • ModPatches/Weapons+
  • ModPatches/Windows
    • From 594d505ccf0833ed557089ae4cb08eb9d214f2ef Mon Sep 17 00:00:00 2001 From: The-Great-Ninth Date: Wed, 30 Oct 2024 18:28:27 +0100 Subject: [PATCH 39/64] Add files via upload --- .../Warhammer 40k Factions/PawnKinds.xml | 56 ++++++ .../Warhammer 40k Factions/TraderKinds.xml | 148 +++++++++++++++ .../Abilities_SpaceMarine.xml | 28 +++ .../Patches/Warhammer 40k Genes/GeneDefs.xml | 179 ++++++++++++++++++ .../Warhammer 40k Genes/Hediffs_Attacks.xml | 40 ++++ 5 files changed, 451 insertions(+) create mode 100644 ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/PawnKinds.xml create mode 100644 ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/TraderKinds.xml create mode 100644 ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Abilities_SpaceMarine.xml create mode 100644 ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/GeneDefs.xml create mode 100644 ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Hediffs_Attacks.xml diff --git a/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/PawnKinds.xml b/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/PawnKinds.xml new file mode 100644 index 0000000000..ca213fc3c7 --- /dev/null +++ b/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/PawnKinds.xml @@ -0,0 +1,56 @@ + + + + + + Defs/PawnKindDef[@Name="ChaosCultistBasePawn" or defName="BEWH_ImperiumTrader"] + +
  • + + 4 + 6 + +
    • +     +     + + + + Defs/PawnKindDef[@Name="ChaosCultistBasePawn"] + +
  • + + 4 + 6 + +
    • +     +     + + + + Defs/PawnKindDef[@Name="DaemonPrincePawnBase"] + +
  • + + 6 + 12 + +
    • +     +     + + + + Defs/PawnKindDef[@Name="ChaosMarineBasePawn" or @Name="SpaceMarineBasePawn"] + +
  • + + 6 + 10 + +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/TraderKinds.xml b/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/TraderKinds.xml new file mode 100644 index 0000000000..26db83b8e3 --- /dev/null +++ b/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/TraderKinds.xml @@ -0,0 +1,148 @@ + + + + + + + Defs/TraderKindDef[defName="BEWH_ImperiumTraderBase"]/stockGenerators + +
  • + FSX + + 25 + 100 + +
    • +
  • + Prometheum + + 25 + 100 + +
    • +
  • + CE_Ammo + + 500 + 2000 + + + 5 + 9 + +
    • +
  • + CE_MediumAmmo + + 30 + 100 + + + 5 + 8 + +
    • +
  • + CE_HeavyAmmo + + 10 + 50 + + + 4 + 6 + +
    • +
  • + Ammo + + 0 + 0 + +
    • +
  • + CE_Turret + + -2 + 4 + + + 1 + 2 + +
    • +
  • + WeaponsTurrets + + 0 + 0 + +
    • +
  • + +
  • CE_AnimalBoom
    • + + +
  • CE_AnimalBoom
    • +     + + 1 + 2 + + + -2 + 4 + + +     +     + + + + + Defs/TraderKindDef[defName="BEWH_ImperiumTraderCaravan"]/stockGenerators + +
  • + CE_Ammo + + 200 + 400 + + + 1 + 4 + +
    • +
  • + CE_MediumAmmo + + 20 + 40 + + + 2 + 6 + +
    • +
  • + CE_HeavyAmmo + + 5 + 10 + + + 2 + 4 + +
    • +
  • + Ammo + + 0 + 0 + +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Abilities_SpaceMarine.xml b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Abilities_SpaceMarine.xml new file mode 100644 index 0000000000..acdb085542 --- /dev/null +++ b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Abilities_SpaceMarine.xml @@ -0,0 +1,28 @@ + + + + + + + Defs/AbilityDef[defName="BEWH_BetchersSpit"]/verbProperties/range + + 32 + + + + + Defs/ThingDef[defName="BEWH_SpitProjectile"]/projectile + + + AcidBurn + 48 + 18 + 8 + 0 + Filth_SpentAcid + 1 + 0.4 + + + + \ No newline at end of file diff --git a/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/GeneDefs.xml b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/GeneDefs.xml new file mode 100644 index 0000000000..78b80b5bf3 --- /dev/null +++ b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/GeneDefs.xml @@ -0,0 +1,179 @@ + + + + + + + Defs/GeneDef[defName="BEWH_ProgenoidGlands"] + + + -1 + + + + + + + + Defs/GeneDef[defName="BEWH_MultiLung"]/statOffsets + + -1 + + + + + + + Defs/GeneDef[defName="BEWH_Occulobe"] + + + 0.8 + + + + + + + + Defs/GeneDef[defName="BEWH_Ossmodula"]/statOffsets/ArmorRating_Blunt + + 6 + + + + + Defs/GeneDef[defName="BEWH_Ossmodula"]/statOffsets/ArmorRating_Sharp + + 1.5 + + + + + + + Defs/GeneDef[defName="BEWH_Biscopea"]/statOffsets/CarryingCapacity + + 100 + + + + + + + Defs/GeneDef[defName="BEWH_SinewCoil"]/statOffsets + + + 100 + + + + + + + + Defs/GeneDef[defName="BEWH_CustodesToughness"]/statOffsets/ArmorRating_Blunt + + 24.5 + 0.8 + -1 + + + + + Defs/GeneDef[defName="BEWH_CustodesToughness"]/statOffsets/ArmorRating_Sharp + + 8 + + + + + Defs/GeneDef[defName="BEWH_CustodesStrength"]/statOffsets/CarryingCapacity + + 200 + + + + + + + Defs/GeneDef[defName="BEWH_PrimarchToughness"]/statOffsets/ArmorRating_Blunt + + 33.75 + 0.8 + -1 + + + + + Defs/GeneDef[defName="BEWH_PrimarchToughness"]/statOffsets/ArmorRating_Sharp + + 11 + + + + + Defs/GeneDef[defName="BEWH_PrimarchStrength"]/statOffsets/CarryingCapacity + + 250 + + + + + + + Defs/GeneDef[defName="BEWH_NurgleMark"]/statOffsets/ArmorRating_Blunt + + 4 + + + + + Defs/GeneDef[defName="BEWH_NurgleMark"]/statOffsets/ArmorRating_Sharp + + 2 + + + + + + + Defs/GeneDef[defName="BEWH_UndividedMark"]/statOffsets/ArmorRating_Blunt + + 2 + + + + + Defs/GeneDef[defName="BEWH_UndividedMark"]/statOffsets/ArmorRating_Sharp + + 0.5 + + + + + + + Defs/GeneDef[defName="BEWH_DaemonHide"]/statOffsets/ArmorRating_Blunt + + 17 + + + + + Defs/GeneDef[defName="BEWH_DaemonHide"]/statOffsets/ArmorRating_Sharp + + 4.5 + + + + + + + Defs/GeneDef[defName="BEWH_DaemonWings"]/statOffsets + + + 100 + + + + \ No newline at end of file diff --git a/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Hediffs_Attacks.xml b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Hediffs_Attacks.xml new file mode 100644 index 0000000000..d533bdff79 --- /dev/null +++ b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Hediffs_Attacks.xml @@ -0,0 +1,40 @@ + + + + + + + Defs/HediffDef[defName="BEWH_DaemonicHornAttack"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • Stab
    • + + 18 + 0.82 + 8 + 12 + +     +     +     + + + Defs/HediffDef[defName="BEWH_DaemonicTailAttack"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • Blunt
    • + + 4 + 0.4 + 0.76 + +     +     +     +     \ No newline at end of file From e1db2c94a039d9d10d6823f539a7178d47c21076 Mon Sep 17 00:00:00 2001 From: The-Great-Ninth Date: Wed, 30 Oct 2024 18:32:21 +0100 Subject: [PATCH 40/64] Delete ModPatches/Warhammer 40k - Genes and Psycasts directory --- .../Abilities_SpaceMarine.xml | 28 --- .../GeneDefs.xml | 179 ------------------ .../Hediffs_Attacks.xml | 40 ---- .../PawnKinds.xml | 56 ------ .../TraderKinds.xml | 148 --------------- 5 files changed, 451 deletions(-) delete mode 100644 ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Abilities_SpaceMarine.xml delete mode 100644 ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml delete mode 100644 ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Hediffs_Attacks.xml delete mode 100644 ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml delete mode 100644 ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/TraderKinds.xml diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Abilities_SpaceMarine.xml b/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Abilities_SpaceMarine.xml deleted file mode 100644 index acdb085542..0000000000 --- a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Abilities_SpaceMarine.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - Defs/AbilityDef[defName="BEWH_BetchersSpit"]/verbProperties/range - - 32 - - - - - Defs/ThingDef[defName="BEWH_SpitProjectile"]/projectile - - - AcidBurn - 48 - 18 - 8 - 0 - Filth_SpentAcid - 1 - 0.4 - - - - \ No newline at end of file diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml b/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml deleted file mode 100644 index ecc7db998d..0000000000 --- a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - Defs/GeneDef[defName="BEWH_ProgenoidGlands"] - - - -1 - - - - - - - - Defs/GeneDef[defName="BEWH_MultiLung"]/statOffsets - - -1 - - - - - - - Defs/GeneDef[defName="BEWH_Occulobe"] - - - 0.8 - - - - - - - - Defs/GeneDef[defName="BEWH_Ossmodula"]/statOffsets/ArmorRating_Blunt - - 6 - - - - - Defs/GeneDef[defName="BEWH_Ossmodula"]/statOffsets/ArmorRating_Sharp - - 1.5 - - - - - - - Defs/GeneDef[defName="BEWH_Biscopea"]/statOffsets/CarryingCapacity - - 100 - - - - - - - Defs/GeneDef[defName="BEWH_SinewCoil"]/statOffsets - - - 100 - - - - - - - - Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/ArmorRating_Blunt - - 24.5 - 0.8 - -1 - - - - - Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/ArmorRating_Sharp - - 8 - - - - - Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/CarryingCapacity - - 200 - - - - - - - Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/ArmorRating_Blunt - - 33.75 - 0.8 - -1 - - - - - Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/ArmorRating_Sharp - - 11 - - - - - Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/CarryingCapacity - - 250 - - - - - - - Defs/GeneDef[defName="BEWH_NurgleMark"]/statOffsets/ArmorRating_Blunt - - 4 - - - - - Defs/GeneDef[defName="BEWH_NurgleMark"]/statOffsets/ArmorRating_Sharp - - 2 - - - - - - - Defs/GeneDef[defName="BEWH_UndividedMark"]/statOffsets/ArmorRating_Blunt - - 2 - - - - - Defs/GeneDef[defName="BEWH_UndividedMark"]/statOffsets/ArmorRating_Sharp - - 0.5 - - - - - - - Defs/GeneDef[defName="BEWH_DaemonHide"]/statOffsets/ArmorRating_Blunt - - 17 - - - - - Defs/GeneDef[defName="BEWH_DaemonHide"]/statOffsets/ArmorRating_Sharp - - 4.5 - - - - - - - Defs/GeneDef[defName="BEWH_DaemonWings"]/statOffsets - - - 100 - - - - \ No newline at end of file diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Hediffs_Attacks.xml b/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Hediffs_Attacks.xml deleted file mode 100644 index d533bdff79..0000000000 --- a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Hediffs_Attacks.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - Defs/HediffDef[defName="BEWH_DaemonicHornAttack"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • Stab
    • - - 18 - 0.82 - 8 - 12 - -     -     -     - - - Defs/HediffDef[defName="BEWH_DaemonicTailAttack"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • Blunt
    • - - 4 - 0.4 - 0.76 - -     -     -     -     \ No newline at end of file diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml b/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml deleted file mode 100644 index ca213fc3c7..0000000000 --- a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - Defs/PawnKindDef[@Name="ChaosCultistBasePawn" or defName="BEWH_ImperiumTrader"] - -
  • - - 4 - 6 - -
    • -     -     - - - - Defs/PawnKindDef[@Name="ChaosCultistBasePawn"] - -
  • - - 4 - 6 - -
    • -     -     - - - - Defs/PawnKindDef[@Name="DaemonPrincePawnBase"] - -
  • - - 6 - 12 - -
    • -     -     - - - - Defs/PawnKindDef[@Name="ChaosMarineBasePawn" or @Name="SpaceMarineBasePawn"] - -
  • - - 6 - 10 - -
    • -     -     - -     \ No newline at end of file diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/TraderKinds.xml b/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/TraderKinds.xml deleted file mode 100644 index 26db83b8e3..0000000000 --- a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/TraderKinds.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - Defs/TraderKindDef[defName="BEWH_ImperiumTraderBase"]/stockGenerators - -
  • - FSX - - 25 - 100 - -
    • -
  • - Prometheum - - 25 - 100 - -
    • -
  • - CE_Ammo - - 500 - 2000 - - - 5 - 9 - -
    • -
  • - CE_MediumAmmo - - 30 - 100 - - - 5 - 8 - -
    • -
  • - CE_HeavyAmmo - - 10 - 50 - - - 4 - 6 - -
    • -
  • - Ammo - - 0 - 0 - -
    • -
  • - CE_Turret - - -2 - 4 - - - 1 - 2 - -
    • -
  • - WeaponsTurrets - - 0 - 0 - -
    • -
  • - -
  • CE_AnimalBoom
    • - - -
  • CE_AnimalBoom
    • -     - - 1 - 2 - - - -2 - 4 - - -     -     - - - - - Defs/TraderKindDef[defName="BEWH_ImperiumTraderCaravan"]/stockGenerators - -
  • - CE_Ammo - - 200 - 400 - - - 1 - 4 - -
    • -
  • - CE_MediumAmmo - - 20 - 40 - - - 2 - 6 - -
    • -
  • - CE_HeavyAmmo - - 5 - 10 - - - 2 - 4 - -
    • -
  • - Ammo - - 0 - 0 - -
    • -     -     - -     \ No newline at end of file From 82de6a4bd16bcd84c74fdd471f6ca7663eaa2fda Mon Sep 17 00:00:00 2001 From: mszabo Date: Wed, 30 Oct 2024 22:36:31 +0100 Subject: [PATCH 41/64] Memoize Y-offset for pawn rendering Matrix4x4.rotation and Quaternion.eulerAngles are, somewhat confusingly, not fields but relatively costly property accessors. When rendering many pawns, repeated calls to them can have a measurable impact, so store the result in a local variable and reuse it. --- Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs b/Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs index 3ba9f318b4..d952256b27 100644 --- a/Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs +++ b/Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs @@ -60,11 +60,13 @@ private static void DrawMesh(Mesh mesh, Matrix4x4 matrix, Material mat, int laye muzzleJump = -muzzleJump; casingOffset.x *= -1; } - matrix.SetTRS(position + posVec.RotatedBy(matrix.rotation.eulerAngles.y) + recoilOffset, Quaternion.AngleAxis(matrix.rotation.eulerAngles.y + muzzleJump, Vector3.up), scale); + + float yAngle = matrix.rotation.eulerAngles.y; + matrix.SetTRS(position + posVec.RotatedBy(yAngle) + recoilOffset, Quaternion.AngleAxis(yAngle + muzzleJump, Vector3.up), scale); CompEquippable compEquippable = eq.TryGetComp(); if (compEquippable != null && compEquippable.PrimaryVerb is Verb_ShootCE verbCE) { - verbCE.drawPos = casingDrawPos + (casingOffset + posVec).RotatedBy(matrix.rotation.eulerAngles.y); + verbCE.drawPos = casingDrawPos + (casingOffset + posVec).RotatedBy(yAngle); } if (eq is WeaponPlatform platform) { From b0d24ad1781ef538558f0173d26ea5c5a068051f Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Wed, 30 Oct 2024 20:56:40 -0400 Subject: [PATCH 42/64] Cleanup and tweaks --- .../Vanilla Psycasts Expanded - Runesmith/Projectiles.xml | 6 +----- .../Buildings_Turrets.xml | 3 +-- .../Vanilla Psycasts Expanded - Runesmith/Race_Spirit.xml | 2 ++ 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Defs/Vanilla Psycasts Expanded - Runesmith/Projectiles.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Defs/Vanilla Psycasts Expanded - Runesmith/Projectiles.xml index f96375f2fb..e60e5c3f5a 100644 --- a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Defs/Vanilla Psycasts Expanded - Runesmith/Projectiles.xml +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Defs/Vanilla Psycasts Expanded - Runesmith/Projectiles.xml @@ -8,8 +8,7 @@ Graphic_Single - Bullet - 170 + 50 false @@ -21,7 +20,6 @@ 12 2 4 - 50 @@ -32,7 +30,6 @@ 12 2 4 - 50 @@ -43,7 +40,6 @@ 12 2 4 - 50 diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Buildings_Turrets.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Buildings_Turrets.xml index 75c811b983..7c3a85f953 100644 --- a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Buildings_Turrets.xml +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Buildings_Turrets.xml @@ -8,8 +8,7 @@     - - + diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Race_Spirit.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Race_Spirit.xml index 13cbe9d4d0..a0fd34b044 100644 --- a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Race_Spirit.xml +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Race_Spirit.xml @@ -30,6 +30,7 @@ 22 2.6 + LeftHand 4 8 @@ -40,6 +41,7 @@ 22 2.6 + RightHand 4 8 From 0e271eb3fcaf82e8eeb4b710572a482a7db80842 Mon Sep 17 00:00:00 2001 From: mszabo Date: Sun, 27 Oct 2024 16:50:42 +0100 Subject: [PATCH 43/64] Fix retaliation raids and shelling As reported in #3419, retaliation raids currently cause infinite error spam if the bombardment that triggered the retaliation was from a temporary map that was disposed of by the time the raid was actually executed. Fix it by checking whether the target map for the raid is actually valid. While testing this, I found that retaliation shelling has also been broken since d90f3e1395438165e9bade2780299cb2b64b177d. Fix it by accounting for the case where the launcher is not spawned at all, since retaliation bombardment shells are "launched" by world pawns. Also ensure bombardments from other factions' settlements do not trigger a retaliation bombardment if the target faction isn't hostile to the owner of the tile, and introduce a configurable retaliation fire delay that scales with how damaged a site is. --- .../Defs/ShellingResponseDef.cs | 7 +++++ .../Projectiles/ProjectileCE.cs | 6 ++-- .../CombatExtended/WorldObjects/HealthComp.cs | 28 +++++++++++++------ .../WorldObjects/HostilityComp.cs | 12 ++++++-- .../WorldObjects/HostilityRaider.cs | 2 +- .../WorldObjects/HostilitySheller.cs | 20 +++++++++++-- .../WorldObjects/TravelingShell.cs | 4 +-- 7 files changed, 62 insertions(+), 17 deletions(-) diff --git a/Source/CombatExtended/CombatExtended/Defs/ShellingResponseDef.cs b/Source/CombatExtended/CombatExtended/Defs/ShellingResponseDef.cs index ca649f6c44..b6ff22151e 100644 --- a/Source/CombatExtended/CombatExtended/Defs/ShellingResponseDef.cs +++ b/Source/CombatExtended/CombatExtended/Defs/ShellingResponseDef.cs @@ -12,6 +12,13 @@ public class ShellingResponseDef : Def public float defaultRaidPropability = 0.0f; public float defaultRaidMTBDays = 0.0f; + /// + /// Penalty to be applied to retaliation shelling based on the current health status of a world object. + /// The lower bound of this range represents the multiplier to be applied at 100% health, + /// while the upper bound at 0% health. + /// + public FloatRange retaliationShellingCooldownImpact = new FloatRange(1f, 10f); + /// /// The list of projectiles that can be used in response when shelled /// diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs index 0d0146dfc1..dd47c8de88 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs @@ -551,7 +551,9 @@ protected void RayCastSuppression(IntVec3 muzzle, IntVec3 destination, Map map = /// The shot speed (default: def.projectile.speed) /// The equipment used to fire the projectile. /// The distance to the estimated intercept point - /// The number of ticks before the bullet is drawn at its true height instead of the muzzle height + /// + /// Note that the launcher may not be spawned at all, e.g. for projectiles launched by enemy bases as retaliation. + /// public virtual void Launch(Thing launcher, Vector2 origin, float shotAngle, float shotRotation, float shotHeight = 0f, float shotSpeed = -1f, Thing equipment = null, float distance = -1) { this.shotAngle = shotAngle; @@ -565,7 +567,7 @@ public virtual void Launch(Thing launcher, Vector2 origin, float shotAngle, floa this.lerpPosition = props.lerpPosition; this.GravityFactor = props.Gravity; } - if (shotHeight >= CollisionVertical.WallCollisionHeight && Position.Roofed(launcher.Map)) + if (shotHeight >= CollisionVertical.WallCollisionHeight && launcher.Spawned && Position.Roofed(launcher.Map)) { ignoreRoof = true; } diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/HealthComp.cs b/Source/CombatExtended/CombatExtended/WorldObjects/HealthComp.cs index 26772583ec..ee35dbf85a 100644 --- a/Source/CombatExtended/CombatExtended/WorldObjects/HealthComp.cs +++ b/Source/CombatExtended/CombatExtended/WorldObjects/HealthComp.cs @@ -170,8 +170,16 @@ public virtual void ThrottledCompTick() } } } - protected virtual void TryFinishDestroyQuests(Map launcherMap) + + /// + /// Clean up quests associated with a world object and update ideology raiding state. + /// + /// The faction that destroyed this world object via intertile shelling. + /// The tile the shelling originated from. + protected virtual void TryFinishDestroyQuests(Faction attackingFaction, GlobalTargetInfo sourceInfo) { + Map launcherMap = sourceInfo.Map; + QuestUtility.SendQuestTargetSignals(parent.questTags, "AllEnemiesDefeated", parent.Named("SUBJECT"), new NamedArgument(launcherMap, "MAP")); int num; List quests = Find.QuestManager.QuestsListForReading; @@ -189,11 +197,15 @@ protected virtual void TryFinishDestroyQuests(Map launcherMap) { quest.End(QuestEndOutcome.Fail); } - IdeoUtility.Notify_PlayerRaidedSomeone(launcherMap.mapPawns.FreeColonistsSpawned); + + if (attackingFaction == Faction.OfPlayer && Find.Maps.Contains(launcherMap)) + { + IdeoUtility.Notify_PlayerRaidedSomeone(launcherMap.mapPawns.FreeColonistsSpawned); + } } IEnumerable RelatedQuests => Find.QuestManager.QuestsListForReading.Where(x => !x.Historical && x.QuestLookTargets.Contains(parent)); - public void ApplyDamage(ThingDef shellDef, Faction attackingFaction, Map launcherMap) + public void ApplyDamage(ThingDef shellDef, Faction attackingFaction, GlobalTargetInfo sourceInfo) { if (Rand.Chance(NegateChance)) { @@ -201,13 +213,13 @@ public void ApplyDamage(ThingDef shellDef, Faction attackingFaction, Map launche } if (DestoyedInstantly) { - TryFinishDestroyQuests(launcherMap); + TryFinishDestroyQuests(attackingFaction, sourceInfo); TryDestroy(); return; } var damage = shellDef.GetWorldObjectDamageWorker().ApplyDamage(this, shellDef); recentShells.Add(new WorldDamageInfo() { Value = damage, ShellDef = shellDef }); - Notify_DamageTaken(attackingFaction, launcherMap); + Notify_DamageTaken(attackingFaction, sourceInfo); } @@ -218,12 +230,12 @@ void TryDestroy() parent.Destroy(); } } - public virtual void Notify_DamageTaken(Faction attackingFaction, Map launcherMap) + public virtual void Notify_DamageTaken(Faction attackingFaction, GlobalTargetInfo sourceInfo) { if (health <= 1e-4) { - TryFinishDestroyQuests(launcherMap); - Notify_PreDestroyed(attackingFaction, new GlobalTargetInfo(launcherMap.Parent)); + TryFinishDestroyQuests(attackingFaction, sourceInfo); + Notify_PreDestroyed(attackingFaction, sourceInfo); Destroy(); return; } diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs b/Source/CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs index d13a501728..86d0654cd3 100644 --- a/Source/CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs +++ b/Source/CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs @@ -101,6 +101,11 @@ public virtual void ThrottledCompTick() raider.ThrottledTick(); } + /// + /// Retaliate against a world object due to hostile shelling. + /// + /// The faction to retaliate against. + /// The tile the shelling came from. public virtual void TryHostilityResponse(Faction attackingFaction, GlobalTargetInfo sourceInfo) { @@ -115,9 +120,9 @@ public virtual void TryHostilityResponse(Faction attackingFaction, GlobalTargetI return; } Map attackerMap = sourceInfo.Map; + MapParent attackerMapParent = Find.World.worldObjects.MapParentAt(sourceInfo.Tile); if (attackerMap == null) { - MapParent attackerMapParent = Find.World.worldObjects.MapParentAt(sourceInfo.Tile); if (attackerMapParent != null && attackerMapParent.HasMap && attackerMapParent.Map != null && Find.Maps.Contains(attackerMapParent.Map)) { attackerMap = attackerMapParent.Map; @@ -145,7 +150,10 @@ public virtual void TryHostilityResponse(Faction attackingFaction, GlobalTargetI Log.Warning($"CE: Threat points {revengePoints}"); } #endif - if (!sheller.Shooting && Rand.Chance(ShellingPropability)) + // Only allow retaliation shelling if this faction is hostile to the owner of the site at the source location, + // in case players shell world objects from other faction maps. + Faction sourceTileFaction = attackerMapParent?.Faction; + if (!sheller.Shooting && Rand.Chance(ShellingPropability) && parent.Faction.HostileTo(sourceTileFaction)) { sheller.TryStartShelling(sourceInfo, revengePoints, attackingFaction); } diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/HostilityRaider.cs b/Source/CombatExtended/CombatExtended/WorldObjects/HostilityRaider.cs index ae64ed5dde..88fb43ebf4 100644 --- a/Source/CombatExtended/CombatExtended/WorldObjects/HostilityRaider.cs +++ b/Source/CombatExtended/CombatExtended/WorldObjects/HostilityRaider.cs @@ -67,7 +67,7 @@ public virtual void ThrottledTick() ticksToRaid -= WorldObjectTrackerCE.THROTTLED_TICK_INTERVAL; return; } - if (parms != null) + if (parms != null && Find.Maps.Contains(parms.target)) { IncidentDef incidentDef = IncidentDefOf.RaidEnemy; incidentDef.Worker.TryExecute(parms); diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/HostilitySheller.cs b/Source/CombatExtended/CombatExtended/WorldObjects/HostilitySheller.cs index fc85dad140..e2640176a9 100644 --- a/Source/CombatExtended/CombatExtended/WorldObjects/HostilitySheller.cs +++ b/Source/CombatExtended/CombatExtended/WorldObjects/HostilitySheller.cs @@ -246,9 +246,25 @@ private ShellingResponseDef.ShellingResponsePart_Projectile RandomAvailableShell .Where(p => (budget - p.points) > 0 && p.projectile.projectile is ProjectilePropertiesCE propEC && propEC.shellingProps.range >= Find.WorldGrid.TraversalDistanceBetween(target.Tile, comp.parent.Tile, true) * 0.5f) .RandomElementByWeightWithFallback(p => p.weight, null); - private int GetTicksToCooldown() => Rand.Range(SHELLER_MINCOOLDOWNTICKS, Mathf.Clamp(7 - (int)comp.parent.Faction.def.techLevel, 1, SHELLER_MAXCOOLDOWNTICKS_TECHMULMAX) * SHELLER_MAXCOOLDOWNTICKS); + private int GetTicksToCooldown() => Rand.Range(SHELLER_MINCOOLDOWNTICKS, + Mathf.Clamp(7 - (int)comp.parent.Faction.def.techLevel, 1, SHELLER_MAXCOOLDOWNTICKS_TECHMULMAX) * + SHELLER_MAXCOOLDOWNTICKS) * HealthMultiplier(); - private int GetTicksToShot() => Rand.Range(SHELLER_MIN_TICKSBETWEENSHOTS, SHELLER_MAX_TICKSBETWEENSHOTS); + private int GetTicksToShot() => Rand.Range(SHELLER_MIN_TICKSBETWEENSHOTS, SHELLER_MAX_TICKSBETWEENSHOTS) * HealthMultiplier(); + + /// + /// Compute the multiplier to be applied to retaliation fire rate based on the current health of this world object. + /// + /// The computed multiplier. + private int HealthMultiplier() + { + var retaliationShellingCooldownMultiplier = + comp.parent.Faction.GetShellingResponseDef().retaliationShellingCooldownImpact; + + var curHealth = comp.parent.GetComponent()?.Health ?? 1f; + + return Mathf.FloorToInt(retaliationShellingCooldownMultiplier.LerpThroughRange(1f - curHealth)); + } } } diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/TravelingShell.cs b/Source/CombatExtended/CombatExtended/WorldObjects/TravelingShell.cs index ce5a108318..22c3a5cbf7 100644 --- a/Source/CombatExtended/CombatExtended/WorldObjects/TravelingShell.cs +++ b/Source/CombatExtended/CombatExtended/WorldObjects/TravelingShell.cs @@ -109,7 +109,7 @@ protected override void Arrived() private bool TryShell(WorldObject worldObject) { bool shelled = false; - if (worldObject is MapParent mapParent && mapParent.HasMap) + if (worldObject is MapParent mapParent && mapParent.HasMap && Find.Maps.Contains(mapParent.Map)) { shelled = true; Map map = mapParent.Map; @@ -143,7 +143,7 @@ private bool TryShell(WorldObject worldObject) if (!shelled) { shelled = true; - healthComp.ApplyDamage(shellDef, Faction, globalSource.Map); + healthComp.ApplyDamage(shellDef, Faction, globalSource); } } return shelled; From 6546e3f9feddcb291576c3360e550bbec0a48d18 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Thu, 31 Oct 2024 02:45:38 -0400 Subject: [PATCH 44/64] Minor tweaks --- .../Patches/Warhammer 40k Factions/PawnKinds.xml | 2 +- SupportedThirdPartyMods.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/PawnKinds.xml b/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/PawnKinds.xml index ca213fc3c7..8d2a363921 100644 --- a/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/PawnKinds.xml +++ b/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/PawnKinds.xml @@ -3,7 +3,7 @@ - Defs/PawnKindDef[@Name="ChaosCultistBasePawn" or defName="BEWH_ImperiumTrader"] + Defs/PawnKindDef[@Name="ChaosCultistBasePawn" or @Name="BEWH_HumanBase"]
  • diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index 1b2ab0d89e..0726f8b8e3 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -587,6 +587,7 @@ WarCasket Barbatos Gundam Addon | Warcaskets: Adeptus Astartes | Warhammer 40.000 - Imperium Weaponry | Warhammer 40.000 - Imperium Materials | +Warhammer 40k - Factions | Warhammer 40k - Genes and Psycasts | Warhammer"ish" - Dryad | Wasters Toxic Breather | From b452d0b04a2bb2fc26373f65d7ecc30c40279817 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Thu, 31 Oct 2024 03:53:14 -0400 Subject: [PATCH 45/64] Adjust stats, split off assassin --- .../ThingDefs_Races/Races_Mechanoid.xml | 35 ++------- .../Races_Mechanoid_Anomaly.xml | 72 +++++++++++++++++++ 2 files changed, 79 insertions(+), 28 deletions(-) create mode 100644 ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid_Anomaly.xml diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml index a42f1e9939..5a991e614c 100644 --- a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml @@ -28,6 +28,7 @@ 0.08 0.07 150 + 0.4 @@ -55,9 +56,10 @@
  • Blunt
    • 4 - 1.85 + 2.0 HeadAttackTool - 0.625 + true + 0.5     @@ -162,44 +164,21 @@ Defs/ThingDef[defName="Gha_Combat_Laborer"]/statBases/ArmorRating_Blunt - 11 + 5.25 Defs/ThingDef[defName="Gha_Combat_Laborer"]/statBases/ArmorRating_Sharp - 5.5 + 3.5 Defs/ThingDef[defName="Gha_Combat_Laborer"]/race/baseHealthScale - 1.0 - - - - - Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases - - 0.17 - 0.17 - 0.09 - - - - - Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Blunt - - 12 - - - - - Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Sharp - - 4.5 + 1.15 diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid_Anomaly.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid_Anomaly.xml new file mode 100644 index 0000000000..5007a829f6 --- /dev/null +++ b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid_Anomaly.xml @@ -0,0 +1,72 @@ + + + + + +
  • Anomaly
    • +     + + + + + + +
  • + Defs/ThingDef[defName="Gha_Assassin_Laborer"] + +
  • + Humanoid +
    • + + + +
  • + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases + + 0.17 + 0.17 + 0.09 + +
    • + +
  • + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Blunt + + 12 + +
    • + +
  • + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Sharp + + 6 + +
    • + +
  • + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/comps + +
  • + 700 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 70 + 0.5 +
    • + + + +     +     +     + +     \ No newline at end of file From abfd07469c7772adc95ec42cd90100fe6c5ea440 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Thu, 31 Oct 2024 03:57:00 -0400 Subject: [PATCH 46/64] Revert split--misread file. --- .../ThingDefs_Races/Races_Mechanoid.xml | 47 +++++++++++- .../Races_Mechanoid_Anomaly.xml | 72 ------------------- 2 files changed, 46 insertions(+), 73 deletions(-) delete mode 100644 ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid_Anomaly.xml diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml index 5a991e614c..bd251c131a 100644 --- a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml @@ -68,7 +68,7 @@ - Defs/ThingDef[defName="Gha_Corpse_Laborer" or defName="Gha_Combat_Laborer" or defName="Gha_Assassin_Laborer"] + Defs/ThingDef[defName="Gha_Corpse_Laborer" or defName="Gha_Combat_Laborer" or defName="Gha_Assassin_Laborer" or defName="Gha_Assassin_Laborer"]
  • Humanoid @@ -182,4 +182,49 @@ + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases + + 0.17 + 0.17 + 0.09 + + + + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Blunt + + 12 + + + + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Sharp + + 6 + + + + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/comps + +
  • + 700 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 70 + 0.5 +
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid_Anomaly.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid_Anomaly.xml deleted file mode 100644 index 5007a829f6..0000000000 --- a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid_Anomaly.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - -
  • Anomaly
    • -     - - - - - - -
  • - Defs/ThingDef[defName="Gha_Assassin_Laborer"] - -
  • - Humanoid -
    • - - - -
  • - Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases - - 0.17 - 0.17 - 0.09 - -
    • - -
  • - Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Blunt - - 12 - -
    • - -
  • - Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Sharp - - 6 - -
    • - -
  • - Defs/ThingDef[defName="Gha_Assassin_Laborer"]/comps - -
  • - 700 - true - 1250 - 5 - true - - 5 - 5 - - 300 - 200 - true - 70 - 0.5 -
    • - - - -     -     -     - -     \ No newline at end of file From 51f5a9dcec57460366ea9c6abafc601f8b965778 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Thu, 31 Oct 2024 04:00:26 -0400 Subject: [PATCH 47/64] Housekeeping --- .../ThingDefs_Races/Races_Mechanoid.xml | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml index bd251c131a..41e81eea67 100644 --- a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml @@ -205,26 +205,4 @@     - - Defs/ThingDef[defName="Gha_Assassin_Laborer"]/comps - -
  • - 700 - true - 1250 - 5 - true - - 5 - 5 - - 300 - 200 - true - 70 - 0.5 -
    • -     -     - \ No newline at end of file From e9586d784541c9b700eae173b0f2994cecdc7b93 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Thu, 31 Oct 2024 04:56:30 -0400 Subject: [PATCH 48/64] Last one i think --- .../WeaponsMelee_NonStuffable.xml | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_NonStuffable.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_NonStuffable.xml index fa8a32a9a4..d64e042a9a 100644 --- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_NonStuffable.xml +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_NonStuffable.xml @@ -110,4 +110,47 @@ + + Defs/ThingDef[defName="K4G_MeleeWeapon_Blowtorch"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.59 + 0.625 + +
  • + + false + +
  • Blunt
    • +
  • Poke
    • + + 8 + 2.02 + +
  • + Flame + 1 + 1 +
    • +     + 1.630 + +     +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Blowtorch"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + \ No newline at end of file From 011d57753b2c159b7b9c9435f9a673d485b6de52 Mon Sep 17 00:00:00 2001 From: Mint <93885293+Mint-Vanilla@users.noreply.github.com> Date: Thu, 31 Oct 2024 18:34:29 +0000 Subject: [PATCH 49/64] Update LoadFolders.xml --- LoadFolders.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LoadFolders.xml b/LoadFolders.xml index ff792a1133..9a591b2120 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -211,6 +211,7 @@
  • ModPatches/Glitter Weaponry
  • ModPatches/Gloomy Dragonian Race
  • ModPatches/GouRIMet
    • +
  • ModPatches/Grimstone Beasts
  • ModPatches/Grimworld Autoguns
  • ModPatches/Grimworld Lasguns
  • ModPatches/Grimworld Melee
    • @@ -633,4 +634,4 @@
  • ModPatches/SRTS
  • ModPatches/VehicleFramework
    • - \ No newline at end of file + From 9db015b2d427a435daa62559054fc8ad570eb543 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Thu, 31 Oct 2024 23:24:26 +0330 Subject: [PATCH 50/64] Robotic Servitude armor patch fixes --- .../Patches/ThingDefs_Races/Races_Mechanoid.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml index 41e81eea67..8ab09a5246 100644 --- a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml @@ -164,14 +164,14 @@ Defs/ThingDef[defName="Gha_Combat_Laborer"]/statBases/ArmorRating_Blunt - 5.25 + 11 Defs/ThingDef[defName="Gha_Combat_Laborer"]/statBases/ArmorRating_Sharp - 3.5 + 5.5 @@ -201,7 +201,7 @@ Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Sharp - 6 + 4.5 From 5546088ad13391f4523f4ad6def4454d4d84d875 Mon Sep 17 00:00:00 2001 From: Mint <93885293+Mint-Vanilla@users.noreply.github.com> Date: Thu, 31 Oct 2024 21:53:22 +0000 Subject: [PATCH 51/64] Grimstone Beasts Patch --- .../Bodies/Bodies_Animal_Griffar.xml | 126 ++++++++++++ .../Bodies/Bodies_Animal_Grimshadow.xml | 194 ++++++++++++++++++ .../ThingDefs_Items/Items_Resource_Stuff.xml | 71 +++++++ .../Items_Resource_Stuff_Leather.xml | 76 +++++++ .../Races_Animals_Belloceros.xml | 106 ++++++++++ .../Races_Animals_EmperorVulture.xml | 62 ++++++ .../ThingDefs_Races/Races_Animals_Griffar.xml | 136 ++++++++++++ .../Races_Animals_Grimshadow.xml | 137 +++++++++++++ .../Races_Animals_Sheepdog.xml | 99 +++++++++ .../ThingDefs_Races/Races_Animals_Tetras.xml | 69 +++++++ 10 files changed, 1076 insertions(+) create mode 100644 ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/Bodies/Bodies_Animal_Griffar.xml create mode 100644 ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/Bodies/Bodies_Animal_Grimshadow.xml create mode 100644 ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml create mode 100644 ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff_Leather.xml create mode 100644 ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Belloceros.xml create mode 100644 ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_EmperorVulture.xml create mode 100644 ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Griffar.xml create mode 100644 ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Grimshadow.xml create mode 100644 ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Sheepdog.xml create mode 100644 ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Tetras.xml diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/Bodies/Bodies_Animal_Griffar.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/Bodies/Bodies_Animal_Griffar.xml new file mode 100644 index 0000000000..433a103f8e --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/Bodies/Bodies_Animal_Griffar.xml @@ -0,0 +1,126 @@ + + + + + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/groups + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart + + + + + + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Tail"]/groups + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Tail"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"]/groups + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Beak"]/groups + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Beak"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Leg"]/groups + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Leg"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"] + + + + + + + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Tail"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Beak"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Leg"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/Bodies/Bodies_Animal_Grimshadow.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/Bodies/Bodies_Animal_Grimshadow.xml new file mode 100644 index 0000000000..5db08bbc6b --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/Bodies/Bodies_Animal_Grimshadow.xml @@ -0,0 +1,194 @@ + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Tail"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Tail"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="FrontClaw"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="FrontClaw"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Leg"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Leg"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"] + + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Tail"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Leg"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="FrontClaw"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml new file mode 100644 index 0000000000..8a52ef8a94 --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml @@ -0,0 +1,71 @@ + + + + + + Defs/ThingDef[defName="Grimstone_BellocerosHorn"]/tools + + + + + Defs/ThingDef[defName="Grimstone_BellocerosHorn"] + ParentName + ResourceBase + + + + Defs/ThingDef[defName="Grimstone_BellocerosHorn"]/statBases/Mass + + 50 + 25 + + + + + + + Defs/ThingDef[defName="Grimstone_Ivory"]/statBases + + 0.07 + + + + + Defs/ThingDef[defName="Grimstone_Ivory"]/statBases/StuffPower_Armor_Sharp + + 0.1 + + + + + Defs/ThingDef[defName="Grimstone_Ivory"]/statBases/StuffPower_Armor_Blunt + + 0.2 + + + + + Defs/ThingDef[defName="Grimstone_Ivory"]/statBases/StuffPower_Armor_Heat + + 0.025 + + + + + Defs/ThingDef[defName="Grimstone_Ivory"]/stuffProps/statFactors + + 0.5 + + + + + + + Defs/ThingDef[defName="Grimstone_GrimshadowSkull"]/statBases/Mass + + 60 + 30 + + + + \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff_Leather.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff_Leather.xml new file mode 100644 index 0000000000..7ee3500e99 --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff_Leather.xml @@ -0,0 +1,76 @@ + + + + + + + Defs/ThingDef[defName="Grimstone_Leather_Grimshadow"]/statBases/StuffPower_Armor_Sharp + + 0.9 + + + + + Defs/ThingDef[defName="Grimstone_Leather_Grimshadow"]/statBases/StuffPower_Armor_Blunt + + 0.2 + + + + + Defs/ThingDef[defName="Grimstone_Leather_Grimshadow"]/statBases + + 0.03 + + + + + Defs/ThingDef[defName="Grimstone_Leather_Grimshadow"]/stuffProps/categories + + Defs/ThingDef[defName="Grimstone_Leather_Grimshadow"]/stuffProps + + +
  • SoftArmor
    • +     +     +     + + Defs/ThingDef[defName="Grimstone_Leather_Grimshadow"]/stuffProps/categories + +
  • SoftArmor
    • +     +     +     + + + + + Defs/ThingDef[defName="Grimstone_Leather_Griffar"]/statBases/StuffPower_Armor_Sharp + + 0.35 + + + + + Defs/ThingDef[defName="Grimstone_Leather_Griffar"]/statBases + + 0.1 + + + + + + Defs/ThingDef[defName="Grimstone_Leather_Belloceros"]/statBases/StuffPower_Armor_Sharp + + 0.12 + + + + + Defs/ThingDef[defName="Grimstone_Leather_Belloceros"]/statBases/StuffPower_Armor_Blunt + + 0.1 + + + +     \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Belloceros.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Belloceros.xml new file mode 100644 index 0000000000..4c47210049 --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Belloceros.xml @@ -0,0 +1,106 @@ + + + + + Defs/ThingDef[defName="Grimstone_Belloceros"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="Grimstone_Belloceros"]/statBases + + 0.11 + 0.52 + 0.33 + 0.5 + 0.2 + + + + + Defs/ThingDef[defName="Grimstone_Belloceros"]/statBases/MoveSpeed + + 5.2 + + + + + Defs/ThingDef[defName="Grimstone_Belloceros"]/tools + + +
  • + + +
  • Scratch
    • + + 32 + 2.85 + HornAttackTool + 2 + 22 + +
  • + + +
  • Blunt
    • + + 28 + 2.4 + HornAttackTool + 2 + 22 + +
  • + +
  • Bite
    • + + 12 + 2.44 + 0.7 + Teeth + 0.04 + 4 + +
  • + + +
  • Blunt
    • + + 22 + 3 + HeadAttackTool + 0.2 + 9 + +     +     +     + + + Defs/ThingDef[defName="Grimstone_Belloceros"]/comps + + Defs/ThingDef[defName="Grimstone_Belloceros"] + + + + + + + + Defs/ThingDef[defName="Grimstone_Belloceros"]/comps + +
  • + 1625 + true + 600 + 5 + 0.5 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_EmperorVulture.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_EmperorVulture.xml new file mode 100644 index 0000000000..69d6ba46fb --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_EmperorVulture.xml @@ -0,0 +1,62 @@ + + + + + Defs/ThingDef[defName="Grimstone_EmperorVulture"]/statBases + + 0.2 + 0.02 + 0.03 + + + + + Defs/ThingDef[defName="Grimstone_EmperorVulture"]/tools + + +
  • + + +
  • Scratch
    • + + 6 + 2.08 + Feet + + +
  • + Stun + 14 +
    • +     +     + 0.1 + 0.480 + +
  • + + +
  • Bite
    • + + 8 + 2.08 + Beak + 0.15 + 0.5 + +
  • + + +
  • Blunt
    • + + 2 + 2.08 + HeadAttackTool + 0.2 + 0.480 + +     +     +     + +     diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Griffar.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Griffar.xml new file mode 100644 index 0000000000..d45124fdc6 --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Griffar.xml @@ -0,0 +1,136 @@ + + + + + Defs/ThingDef[defName="Grimstone_Griffar"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="Grimstone_Griffar"]/statBases/MoveSpeed + + 5.6 + 0.35 + 0.23 + 0.18 + + + + + Defs/ThingDef[defName="Grimstone_Griffar"]/statBases/ArmorRating_Sharp + + 1.5 + + + + + Defs/ThingDef[defName="Grimstone_Griffar"]/statBases/ArmorRating_Blunt + + 2.25 + + + + + Defs/ThingDef[defName="Grimstone_Griffar"]/tools + + +
  • + + +
  • Scratch
    • + + 22 + 1.3 + FrontLeftPaw + + +
  • + Stun + 21 +
    • +     +     + 0.3 + 5 + +
  • + + +
  • Scratch
    • + + 22 + 1.3 + FrontRightPaw + + +
  • + Stun + 21 +
    • +     +     + 0.3 + 5 + +
  • + + +
  • Bite
    • + + 12 + 2.08 + Beak + + +
  • + Stun + 14 +
    • +     +     + 1.15 + 2.5 + +
  • + + +
  • Blunt
    • + + 12 + 2.22 + HeadAttackTool + 0.2 + 4.235 + +     +     +     + + + Defs/ThingDef[defName="Grimstone_Griffar"]/comps + + Defs/ThingDef[defName="Grimstone_Griffar"] + + + + + + + + Defs/ThingDef[defName="Grimstone_Griffar"]/comps + +
  • + 1162 + true + 600 + 5 + 0.5 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Grimshadow.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Grimshadow.xml new file mode 100644 index 0000000000..1ddf9a34f2 --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Grimshadow.xml @@ -0,0 +1,137 @@ + + + + + Defs/ThingDef[defName="Grimstone_Grimshadow"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="Grimstone_Grimshadow"]/statBases/MoveSpeed + + 4.5 + 0.35 + 0.23 + 0.18 + + + + + Defs/ThingDef[defName="Grimstone_Grimshadow"]/statBases/ArmorRating_Sharp + + 30 + + + + + Defs/ThingDef[defName="Grimstone_Grimshadow"]/statBases/ArmorRating_Blunt + + 55 + + + + + Defs/ThingDef[defName="Grimstone_Grimshadow"]/tools + + +
  • + + +
  • Scratch
    • + + 40 + 1.3 + FrontLeftClaws + + +
  • + Stun + 21 +
    • +     +     + 23 + 36 + +
  • + + +
  • Scratch
    • + + 40 + 1.3 + FrontRightClaws + + +
  • + Stun + 21 +
    • +     +     + 23 + 36 + +
  • + + +
  • Blunt
    • + + 35 + 2.08 + Tail + + +
  • + Stun + 30 +
    • +     +     + 10 + 45 + +
  • + + +
  • Bite
    • + + 50 + 2.22 + Teeth + 0.2 + 30 + 50 + +     +     +     + + + Defs/ThingDef[defName="Grimstone_Grimshadow"]/comps + + Defs/ThingDef[defName="Grimstone_Grimshadow"] + + + + + + + + Defs/ThingDef[defName="Grimstone_Grimshadow"]/comps + +
  • + 5000 + true + 1300 + 5 + 0.5 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Sheepdog.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Sheepdog.xml new file mode 100644 index 0000000000..dadf617312 --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Sheepdog.xml @@ -0,0 +1,99 @@ + + + + + Defs/ThingDef[defName="Grimstone_Sheepdog"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="Grimstone_Sheepdog"]/statBases + + 0.20 + 0.06 + 0.05 + 0.76 + 0.23 + + + + + Defs/ThingDef[defName="Grimstone_Sheepdog"]/tools + + +
  • + + +
  • Scratch
    • + + 5 + 0.99 + FrontLeftPaw + 0.288 + 0.03 + +
  • + + +
  • Scratch
    • + + 5 + 0.99 + FrontRightPaw + 0.288 + 0.03 + +
  • + +
  • Bite
    • + + 12 + 1.77 + 0.7 + Teeth + 2.880 + 0.1 + +
  • + + +
  • Blunt
    • + + 1 + 1.19 + HeadAttackTool + 0.2 + 0.2 + +     +     +     + + + Defs/ThingDef[defName="Grimstone_Sheepdog"]/comps + + Defs/ThingDef[defName="Grimstone_Sheepdog"] + + + + + + + + Defs/ThingDef[defName="Grimstone_Sheepdog"]/comps + +
  • + 437 + true + 600 + 5 + 0.5 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Tetras.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Tetras.xml new file mode 100644 index 0000000000..750c87c15c --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Tetras.xml @@ -0,0 +1,69 @@ + + + + + Defs/ThingDef[defName="Grimstone_Tetras"]/statBases + + 0.2 + 0.02 + 0.03 + + + + + Defs/ThingDef[defName="Grimstone_Tetras"]/tools + + +
  • + + +
  • Scratch
    • + + 5 + 2.08 + Feet + + +
  • + Stun + 14 +
    • +     +     + 0.1 + 0.480 + +
  • + +
  • Bite
    • + + 6 + 2.08 + Beak + + +
  • + Stun + 14 +
    • +     +     + 0.01 + 0.480 + +
  • + + +
  • Blunt
    • + + 2 + 2.08 + HeadAttackTool + 0.2 + 0.480 + +     +     +     + +     From 05990d35393ba69cfe13f62cb9026986ec39e9b3 Mon Sep 17 00:00:00 2001 From: mszabo Date: Fri, 1 Nov 2024 23:10:57 +0100 Subject: [PATCH 52/64] Indicate target site for retaliation raids Currently, the message that pops up when a retaliation raid is impending does not indicate which world object the raid is targeting, which can be confusing if the player has multiple colonies or launched a bombardment from a temporary map. So, make the target explicit in the notification. --- Languages/English/Keyed/Messages.xml | 2 +- .../CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Languages/English/Keyed/Messages.xml b/Languages/English/Keyed/Messages.xml index 8f50e13a60..d906df7b51 100644 --- a/Languages/English/Keyed/Messages.xml +++ b/Languages/English/Keyed/Messages.xml @@ -12,6 +12,6 @@ A group of fighters from {0} have arrived nearby.\n\nThey are preparing to attack in retaliation for the shelling of {1}. Artillery fire incoming from {0} ({1}). - A group from {0} is planning to raid {1} soon in retaliation for recent events. + A group from {0} is planning to raid {1} at {2} soon in retaliation for recent events. \ No newline at end of file diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs b/Source/CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs index 86d0654cd3..243bcc8592 100644 --- a/Source/CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs +++ b/Source/CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs @@ -164,7 +164,7 @@ public virtual void TryHostilityResponse(Faction attackingFaction, GlobalTargetI if (ticksSinceRaided != raidMTBTicks && ticksSinceRaided > raidMTBTicks / 2f && Rand.Chance(RaidPropability / Mathf.Max(raidMTBTicks - ticksSinceRaided, 1)) && raider.TryRaid(attackerMap, revengePoints)) { lastRaidTick = GenTicks.TicksGame; - Messages.Message("CE_Message_CounterRaid".Translate(parent.Label, attackingFaction.Name), MessageTypeDefOf.ThreatBig); + Messages.Message("CE_Message_CounterRaid".Translate(parent.Label, attackingFaction.Name, attackerMap.Parent.Label), MessageTypeDefOf.ThreatBig); } } } From 18fec96c49881ff2ce0b45027042813c50e188cc Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Fri, 1 Nov 2024 19:46:25 -0400 Subject: [PATCH 53/64] Housekeeping --- LoadFolders.xml | 2 +- .../Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml | 2 -- .../ThingDefs_Items/Items_Resource_Stuff_Leather.xml | 1 - .../ThingDefs_Races/Races_Animals_Belloceros.xml | 2 +- SupportedThirdPartyMods.md | 1 + 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/LoadFolders.xml b/LoadFolders.xml index e753625e8b..c078bbcb68 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -211,7 +211,7 @@
  • ModPatches/Glitter Weaponry
  • ModPatches/Gloomy Dragonian Race
  • ModPatches/GouRIMet
    • -
  • ModPatches/Grimstone Beasts
    • +
  • ModPatches/Grimstone Beasts
  • ModPatches/Grimworld Autoguns
  • ModPatches/Grimworld Lasguns
  • ModPatches/Grimworld Melee
    • diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml index 8a52ef8a94..dee7250867 100644 --- a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml @@ -6,7 +6,6 @@ Defs/ThingDef[defName="Grimstone_BellocerosHorn"]/tools     - Defs/ThingDef[defName="Grimstone_BellocerosHorn"] ParentName @@ -21,7 +20,6 @@ - Defs/ThingDef[defName="Grimstone_Ivory"]/statBases diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff_Leather.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff_Leather.xml index 7ee3500e99..f66a76acec 100644 --- a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff_Leather.xml +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff_Leather.xml @@ -42,7 +42,6 @@ - Defs/ThingDef[defName="Grimstone_Leather_Griffar"]/statBases/StuffPower_Armor_Sharp diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Belloceros.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Belloceros.xml index 4c47210049..0ddd7f663a 100644 --- a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Belloceros.xml +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Belloceros.xml @@ -10,7 +10,7 @@ - + Defs/ThingDef[defName="Grimstone_Belloceros"]/statBases 0.11 diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index be986822d7..4edb656293 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -253,6 +253,7 @@ Glitter Tech | Glitter Weaponry | Gloomy Dragonian Race | GouRIMet | +/Grimstone Beasts | Grimworld: Autoguns | Grimworld: Lasguns | Grimworld: Melee | From ad98d255621057322c7421c39e39b44242e01cf3 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Fri, 1 Nov 2024 20:08:22 -0400 Subject: [PATCH 54/64] Adjust leather, ivory, and durability values --- .../ThingDefs_Items/Items_Resource_Stuff.xml | 2 +- .../ThingDefs_Items/Items_Resource_Stuff_Leather.xml | 7 +++---- .../ThingDefs_Races/Races_Animals_Grimshadow.xml | 9 ++++----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml index dee7250867..5e3f1cc93a 100644 --- a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml @@ -31,7 +31,7 @@ Defs/ThingDef[defName="Grimstone_Ivory"]/statBases/StuffPower_Armor_Sharp - 0.1 + 0.35 diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff_Leather.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff_Leather.xml index f66a76acec..2fb5d01f26 100644 --- a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff_Leather.xml +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff_Leather.xml @@ -1,7 +1,6 @@  - Defs/ThingDef[defName="Grimstone_Leather_Grimshadow"]/statBases/StuffPower_Armor_Sharp @@ -46,7 +45,7 @@ Defs/ThingDef[defName="Grimstone_Leather_Griffar"]/statBases/StuffPower_Armor_Sharp - 0.35 + 0.625 @@ -61,14 +60,14 @@ Defs/ThingDef[defName="Grimstone_Leather_Belloceros"]/statBases/StuffPower_Armor_Sharp - 0.12 + 0.15 Defs/ThingDef[defName="Grimstone_Leather_Belloceros"]/statBases/StuffPower_Armor_Blunt - 0.1 + 0.085 diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Grimshadow.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Grimshadow.xml index 1ddf9a34f2..bd05e27260 100644 --- a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Grimshadow.xml +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Grimshadow.xml @@ -5,7 +5,7 @@ Defs/ThingDef[defName="Grimstone_Grimshadow"]
  • - Quadruped + Birdlike
    • @@ -92,7 +92,6 @@ - 10 45
  • @@ -125,11 +124,11 @@ Defs/ThingDef[defName="Grimstone_Grimshadow"]/comps
  • - 5000 + 4000 true - 1300 + 800 5 - 0.5 + 0.25
    • From f42297db14bfa980ddea9dc6e49ba1daccda9fdf Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Fri, 1 Nov 2024 20:10:37 -0400 Subject: [PATCH 55/64] Fix typo --- SupportedThirdPartyMods.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index 4edb656293..0ed6fd3b03 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -253,7 +253,7 @@ Glitter Tech | Glitter Weaponry | Gloomy Dragonian Race | GouRIMet | -/Grimstone Beasts | +Grimstone Beasts | Grimworld: Autoguns | Grimworld: Lasguns | Grimworld: Melee | From 371440264c6a263201991df58b0c7365056ce95a Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Fri, 1 Nov 2024 20:19:33 -0400 Subject: [PATCH 56/64] Remove sheepdog armor --- .../Grimstone Beasts/ThingDefs_Races/Races_Animals_Sheepdog.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Sheepdog.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Sheepdog.xml index dadf617312..6109fa09ff 100644 --- a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Sheepdog.xml +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Sheepdog.xml @@ -16,8 +16,6 @@ 0.20 0.06 0.05 - 0.76 - 0.23     From 0fbca060d6b5265b3191d72db879638256b162e8 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Fri, 1 Nov 2024 20:20:04 -0400 Subject: [PATCH 57/64] Tweak armor durability --- .../Grimstone Beasts/ThingDefs_Races/Races_Animals_Griffar.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Griffar.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Griffar.xml index d45124fdc6..da63ed3314 100644 --- a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Griffar.xml +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Griffar.xml @@ -124,7 +124,7 @@ Defs/ThingDef[defName="Grimstone_Griffar"]/comps
  • - 1162 + 2750 true 600 5 From 0c3f04cf1a54ef39f7037d17a9701ac1b77dde61 Mon Sep 17 00:00:00 2001 From: Mint <93885293+Mint-Vanilla@users.noreply.github.com> Date: Mon, 4 Nov 2024 20:26:46 +0000 Subject: [PATCH 58/64] Update LoadFolders.xml --- LoadFolders.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/LoadFolders.xml b/LoadFolders.xml index c078bbcb68..f7db528497 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -629,6 +629,7 @@
  • ModPatches/pphhyy Sanguinary Animals
  • ModPatches/pphhyy's Lightless Empyrean
  • ModPatches/EdoThemedExpansion
    • +
  • ModPatches/Beliar Xenotype
  • ModPatches/Multiplayer
  • ModPatches/SRTS
    • From bbfe3975e6873be072c928e0ae8c17c1b194e118 Mon Sep 17 00:00:00 2001 From: Mint <93885293+Mint-Vanilla@users.noreply.github.com> Date: Mon, 4 Nov 2024 20:29:44 +0000 Subject: [PATCH 59/64] Patch Beliar Sword --- .../Patches/Beliar Xenotype/Weapons.xml | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 ModPatches/Beliar Xenotype/Patches/Beliar Xenotype/Weapons.xml diff --git a/ModPatches/Beliar Xenotype/Patches/Beliar Xenotype/Weapons.xml b/ModPatches/Beliar Xenotype/Patches/Beliar Xenotype/Weapons.xml new file mode 100644 index 0000000000..7dc9933ffe --- /dev/null +++ b/ModPatches/Beliar Xenotype/Patches/Beliar Xenotype/Weapons.xml @@ -0,0 +1,65 @@ + + + + + + Defs/ThingDef[defName="BX_BloodletterBlade"]/statBases + + 4 + 0.40 + + + + + Defs/ThingDef[defName="BX_BloodletterBlade"] + + + 1.00 + 0.40 + 0.27 + + + + + + Defs/ThingDef[defName="BX_BloodletterBlade"]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.5 + 0.1 + 1.2 + Handle + +
  • + + +
  • GS_BleedDamage
    • + + 35 + 0.94 + 1.28 + 23 + Point + +
  • + + +
  • GS_BleedDamage
    • + + 35 + 0.83 + 2.88 + 14 + Edge + +     +     +     + +     \ No newline at end of file From cdce8d909f87a74e3a0644d41dab6d38e0c7bb6a Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Tue, 5 Nov 2024 01:41:25 -0500 Subject: [PATCH 60/64] Housekeeping, adjust damage --- .../Beliar Xenotype/Patches/Beliar Xenotype/Weapons.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ModPatches/Beliar Xenotype/Patches/Beliar Xenotype/Weapons.xml b/ModPatches/Beliar Xenotype/Patches/Beliar Xenotype/Weapons.xml index 7dc9933ffe..c1ccf472b4 100644 --- a/ModPatches/Beliar Xenotype/Patches/Beliar Xenotype/Weapons.xml +++ b/ModPatches/Beliar Xenotype/Patches/Beliar Xenotype/Weapons.xml @@ -1,6 +1,5 @@  - Defs/ThingDef[defName="BX_BloodletterBlade"]/statBases @@ -41,7 +40,7 @@
  • GS_BleedDamage
    •  - 35 + 14 0.94 1.28 23 @@ -52,7 +51,7 @@
  • GS_BleedDamage
    •  - 35 + 32 0.83 2.88 14 From 23356226587affd3efc5c24ac8d6f2b7a7153e1e Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Tue, 5 Nov 2024 01:44:15 -0500 Subject: [PATCH 61/64] Update modlist --- SupportedThirdPartyMods.md | 1 + 1 file changed, 1 insertion(+) diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index 0ed6fd3b03..7122d468e3 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -124,6 +124,7 @@ Autocleaner | Auto-Mortars | Beast Man Tribes | Beeralope Squad | +Beliar Xenotype | Better Wool Production - C# Edition | Big and Small - Genes & More | Big and Small - Heaven and Hell From 78e24cf0f4ff6569c0b2b3f5e6ebf9e7c366f5f8 Mon Sep 17 00:00:00 2001 From: Safairette <71556532+Safairette@users.noreply.github.com> Date: Tue, 5 Nov 2024 12:56:31 +0200 Subject: [PATCH 62/64] ...literally how? --- .../Vanilla Factions Expanded - Deserters/Contraband.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml index f2a7387cc9..a9fc2f5836 100644 --- a/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml +++ b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml @@ -109,7 +109,7 @@     -> + Defs/ThingDef[defName="Ammo_8x50mmCharged_AP"] From efc29b1b3d8c852061ca16dc8aa8b3876088b529 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Thu, 7 Nov 2024 19:57:53 -0500 Subject: [PATCH 63/64] Housekeeping --- ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml b/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml index 1a96cbae8a..4d7df8809a 100644 --- a/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml +++ b/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml @@ -170,7 +170,7 @@ - + Defs/ThingDef[defName="dvd_minerpack"]/equippedStatOffsets/VEF_MassCarryCapacity @@ -179,7 +179,7 @@ - + Defs/ThingDef[defName="dvd_minerpack"]/costList 1 From 3581ae3a4dcd8974949a8b7b97f5b0d8cb3d573d Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Thu, 7 Nov 2024 20:10:41 -0500 Subject: [PATCH 64/64] Tweaks and housekeeping --- .../Defs/Spacer Pack/Defs_Projectiles.xml | 15 +++++++++------ .../Spacer Pack/Patches/Spacer Pack/Damage.xml | 5 +++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml b/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml index f7142da932..18f444f3b4 100644 --- a/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml +++ b/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml @@ -32,9 +32,8 @@ - + dvd_Projectile_RipperRack_CE - CombatExtended.ProjectileCE_Explosive Graphic_Single @@ -45,7 +44,11 @@ 3 dvd_RipperBomb 50 - 5.0 + 3.0 + 0.25 + 3.0 + 50 + 3.9 dvd_Filth_RipperMechanites 1 @@ -56,7 +59,7 @@ dvd_Fleck_RipperMechanites_Random 0.5 0 - .5 + 0.5 1 @@ -84,14 +87,14 @@ dvd_Fleck_ArchoPack_Main 0.5 0 - .5 + 0.5 1
  • dvd_Fleck_ArchoPack_Smoke 0.5 0 - .5 + 0.5 1 120~240
    • diff --git a/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml b/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml index 3fb5c2d589..eb9872e8fd 100644 --- a/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml +++ b/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml @@ -29,4 +29,9 @@     + + + Defs/ThingDef[defName="dvd_Projectile_RipperRack"] + + \ No newline at end of file