diff --git a/Assemblies/CombatExtendedLoader.dll b/Assemblies/CombatExtendedLoader.dll index 225ee26087..f856aab14a 100644 Binary files a/Assemblies/CombatExtendedLoader.dll and b/Assemblies/CombatExtendedLoader.dll differ 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 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/LoadFolders.xml b/LoadFolders.xml index 050d4190c8..fa2d57d8c8 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
    • @@ -245,7 +245,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
    • @@ -471,6 +471,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
    • @@ -491,7 +492,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
    • @@ -565,6 +566,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
    • @@ -609,7 +611,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
    • @@ -626,7 +629,8 @@
  • ModPatches/pphhyy Sanguinary Animals
  • ModPatches/pphhyy's Lightless Empyrean
  • ModPatches/EdoThemedExpansion
    • - +
  • ModPatches/Beliar Xenotype
    • +
  • ModPatches/Multiplayer
  • ModPatches/SRTS
  • ModPatches/VehicleFramework
    • 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..c1ccf472b4 --- /dev/null +++ b/ModPatches/Beliar Xenotype/Patches/Beliar Xenotype/Weapons.xml @@ -0,0 +1,64 @@ + + + + + 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
    • + + 14 + 0.94 + 1.28 + 23 + Point + +
  • + + +
  • GS_BleedDamage
    • + + 32 + 0.83 + 2.88 + 14 + Edge + +     +     +     + +     \ No newline at end of file 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..5e3f1cc93a --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml @@ -0,0 +1,69 @@ + + + + + + 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.35 + + + + + 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..2fb5d01f26 --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff_Leather.xml @@ -0,0 +1,74 @@ + + + + + + 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.625 + + + + + Defs/ThingDef[defName="Grimstone_Leather_Griffar"]/statBases + + 0.1 + + + + + + Defs/ThingDef[defName="Grimstone_Leather_Belloceros"]/statBases/StuffPower_Armor_Sharp + + 0.15 + + + + + Defs/ThingDef[defName="Grimstone_Leather_Belloceros"]/statBases/StuffPower_Armor_Blunt + + 0.085 + + + +     \ 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..0ddd7f663a --- /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..da63ed3314 --- /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 + +
  • + 2750 + 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..bd05e27260 --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Grimshadow.xml @@ -0,0 +1,136 @@ + + + + + Defs/ThingDef[defName="Grimstone_Grimshadow"] + +
  • + Birdlike +
    • +     +     + + + 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 +
    • +     +     + 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 + +
  • + 4000 + true + 800 + 5 + 0.25 +
    • +     +     + +     \ 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..6109fa09ff --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Sheepdog.xml @@ -0,0 +1,97 @@ + + + + + Defs/ThingDef[defName="Grimstone_Sheepdog"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="Grimstone_Sheepdog"]/statBases + + 0.20 + 0.06 + 0.05 + + + + + 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 + +     +     +     + +     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..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 @@ -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,51 @@ + + + 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 + + + + + + + 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 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 deleted file mode 100644 index f366528813..0000000000 --- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml +++ /dev/null @@ -1,382 +0,0 @@ - - - - - - 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 - -     -     -     -     \ No newline at end of file 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..d64e042a9a --- /dev/null +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_NonStuffable.xml @@ -0,0 +1,156 @@ + + + + + + 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
    • +     +     + + + + + 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 diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_Stuffable.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_Stuffable.xml new file mode 100644 index 0000000000..639a578fce --- /dev/null +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_Stuffable.xml @@ -0,0 +1,805 @@ + + + + + + + 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 + + 8 + 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 + +
  • + + +
  • Demolish
    • + + 8 + 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.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 + +     +     +     + + + + + 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 + +     +     +     + + + + + 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 fdb8b97f9f..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 @@ -1,5 +1,6 @@ + @@ -8,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 @@ -45,8 +48,8 @@ defName="K4G_Gun_HeavyShotgun" or defName="K4G_Gun_LightSMG" or defName="K4G_Gun_AdvancedSMG" or - defName="K4G_Gun_CompactRifle" or - defName="K4G_Gun_BattleRifle" + defName="K4G_Gun_BattleRifle" or + defName="K4G_Gun_DrumRifle" ]/tools @@ -85,6 +88,12 @@ + + + + Defs/ThingDef[defName="K4G_Gun_Brawler"] + + @@ -507,35 +516,109 @@ - + - K4G_Gun_CompactRifle + K4G_Gun_BattleRifle - 2.90 - 0.36 - 1.00 - 0.1 - 1.13 - 7.56 + 1 + 0.08 + 1.46 + 10.5 + 4.50 + 0.37 - 1.58 CombatExtended.Verb_ShootCE - true - Bullet_556x45mmNATO_FMJ + True + Bullet_762x51mmNATO_FMJ + 2.00 + 6 + 7 1.1 55 - 6 - 4 Shot_AssaultRifle GunTail_Medium + 12 + + + 20 + 4 + AmmoSet_762x51mmNATO + + + TRUE + AimedShot + 3 + + + + + + + K4G_Gun_ComradePistol + + 0.73 + 0.35 + 0.70 + 0.18 + 0.78 + 1.62 + + + CombatExtended.Verb_ShootCE + true + Bullet_9x18mmMakarov_FMJ + 0.6 + 12 + Shot_Autopistol + GunTail_Light 9 - 30 + 8 + 4 + AmmoSet_9x18mmMakarov + + + FALSE + + +
  • CE_AI_Pistol
    • +
  • CE_Sidearm
    • +
  • CE_OneHandedWeapon
    • +     +     + + + + + 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_556x45mmNATO + AmmoSet_762x51mmNATO TRUE @@ -544,33 +627,33 @@ - + - K4G_Gun_BattleRifle + K4G_Gun_DrumRifle 1 0.08 - 1.46 - 10.5 - 4.50 - 0.37 + 1.81 + 10.21 + 7.92 + 0.36 CombatExtended.Verb_ShootCE True Bullet_762x51mmNATO_FMJ - 2.00 + 1.42 6 - 7 + 4 1.1 - 57 + 55 Shot_AssaultRifle GunTail_Medium 12 - 20 + 50 4 AmmoSet_762x51mmNATO @@ -579,6 +662,49 @@ 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 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 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..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 - 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..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     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..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,249 +1,175 @@ - - 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_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_WristBlaster"] - - -
  • - 100 - Ammo_PlasmaGasCartridge_Standard - 2 - 60 - Standard_Reload - Misc4 - shot - false -
    • -     -     -     - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_TwinWristBlaster"] + + Defs/ThingDef[@Name="OuterRimBase_DroidWeapon"]/tools - -
  • - - 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 + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle -     +     - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_TwinWristBlaster"] - - -
  • - 100 - Ammo_PlasmaGasCartridge_Standard - 2 - 60 - Standard_Reload - Misc4 - shot - false -
    • -     -     -     - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_BlasterCannon"] - - -
  • - - 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 -
    • -     -     -     - - - 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 -
    • -     -     - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlasterIon"] - - -
  • - 100 - Ammo_PlasmaGasCartridge_Ion - 2 - 60 - Standard_Reload - Misc4 - shot - false -
    • -     -     + + + Defs/ThingDef[defName="OuterRim_GNKDroid"]/modExtensions/li[@Class="Asimov.DefModExt_AutomatonApparel"]/apparelWhitelist/li[.="OuterRim_DroidWeapon_WristBlasterIon"] - - - 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_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"] - - -
  • - 3 - Ammo_OR_MiniRocket_Standard - 1 - 60 - Standard_Reload - Misc4 - rocket - false -
    • -     -     + + + 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 + + + + + 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_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 - 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     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 diff --git a/ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Laborer.xml b/ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Laborer.xml new file mode 100644 index 0000000000..b2deebe5c6 --- /dev/null +++ b/ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Laborer.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..8ab09a5246 --- /dev/null +++ b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml @@ -0,0 +1,208 @@ + + + + + + + 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 + 0.4 + + + + + 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 + 2.0 + HeadAttackTool + true + 0.5 + +     +     +     + + + + + Defs/ThingDef[defName="Gha_Corpse_Laborer" or defName="Gha_Combat_Laborer" or defName="Gha_Assassin_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.15 + + + + + 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/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml b/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml index 0db59b7c29..18f444f3b4 100644 --- a/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml +++ b/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml @@ -32,6 +32,41 @@ + + dvd_Projectile_RipperRack_CE + + + Graphic_Single + Things/Projectile/Grenade_RipperMechanites + + + 20 + 3 + dvd_RipperBomb + 50 + 3.0 + 0.25 + 3.0 + 50 + 3.9 + dvd_Filth_RipperMechanites + 1 + + +
  • + +
  • + dvd_Fleck_RipperMechanites_Random + 0.5 + 0 + 0.5 + 1 +
    • + + +     +     + dvd_SkipBolt_CE @@ -52,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/Backpacks.xml b/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml index 809ee84417..4d7df8809a 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,62 @@ + + + + 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"]/verbs + + +
  • + + CombatExtended.Verb_LaunchProjectileStaticCE + true + True + 1.0 + 21 + 6 + 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..eb9872e8fd --- /dev/null +++ b/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml @@ -0,0 +1,37 @@ + + + + + + + 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 + + + + + + Defs/ThingDef[defName="dvd_Projectile_RipperRack"] + + + \ 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 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 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..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 @@ -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 +
    • +     +     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..e60e5c3f5a --- /dev/null +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Defs/Vanilla Psycasts Expanded - Runesmith/Projectiles.xml @@ -0,0 +1,46 @@ + + + + + + + Things/Projectile/Projectile_Obelisk + Graphic_Single + + + 50 + false + + + + + Bullet_Obelisk_Basic + + Frostbite + 12 + 2 + 4 + + + + + Bullet_Obelisk_Intermediate + + VPER_Slow_Frostbite + 12 + 2 + 4 + + + + + Bullet_Obelisk_Advanced + + VPER_SlowFragile_Frostbite + 12 + 2 + 4 + + + + \ 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..7c3a85f953 --- /dev/null +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Buildings_Turrets.xml @@ -0,0 +1,167 @@ + + + + + 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 + + + + \ 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 new file mode 100644 index 0000000000..a0fd34b044 --- /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 + LeftHand + 4 + 8 + +
  • + + +
  • Cut
    • + + 22 + 2.6 + RightHand + 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..087df430c6 --- /dev/null +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Turret_Gun.xml @@ -0,0 +1,168 @@ + + + + + + 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..581a49f5ca --- /dev/null +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Weapons_Melee.xml @@ -0,0 +1,51 @@ + + + + + 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 + + + +     diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml b/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/PawnKinds.xml similarity index 93% rename from ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml rename to ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/PawnKinds.xml index ca213fc3c7..8d2a363921 100644 --- a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/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/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/TraderKinds.xml b/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/TraderKinds.xml similarity index 100% rename from ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/TraderKinds.xml rename to ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/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/Patches/Warhammer 40k Genes/Abilities_SpaceMarine.xml similarity index 100% rename from ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Abilities_SpaceMarine.xml rename to ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Abilities_SpaceMarine.xml diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/GeneDefs.xml similarity index 88% rename from ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml rename to ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/GeneDefs.xml index ecc7db998d..78b80b5bf3 100644 --- a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml +++ b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/GeneDefs.xml @@ -71,7 +71,7 @@ - Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/ArmorRating_Blunt + Defs/GeneDef[defName="BEWH_CustodesToughness"]/statOffsets/ArmorRating_Blunt 24.5 0.8 @@ -80,14 +80,14 @@ - Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/ArmorRating_Sharp + Defs/GeneDef[defName="BEWH_CustodesToughness"]/statOffsets/ArmorRating_Sharp 8 - Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/CarryingCapacity + Defs/GeneDef[defName="BEWH_CustodesStrength"]/statOffsets/CarryingCapacity 200 @@ -96,7 +96,7 @@ - Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/ArmorRating_Blunt + Defs/GeneDef[defName="BEWH_PrimarchToughness"]/statOffsets/ArmorRating_Blunt 33.75 0.8 @@ -105,14 +105,14 @@ - Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/ArmorRating_Sharp + Defs/GeneDef[defName="BEWH_PrimarchToughness"]/statOffsets/ArmorRating_Sharp 11 - Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/CarryingCapacity + Defs/GeneDef[defName="BEWH_PrimarchStrength"]/statOffsets/CarryingCapacity 250 diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Hediffs_Attacks.xml b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Hediffs_Attacks.xml similarity index 100% rename from ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Hediffs_Attacks.xml rename to ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Hediffs_Attacks.xml diff --git a/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.xml b/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.xml index b510204dd5..490dd7c15f 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.37 + -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..0ccef31748 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.37 + -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.37 + -0.03 + + + + + Defs/HediffDef[defName="FieldHand"]/stages/li/capMods + + Defs/HediffDef[defName="FieldHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools 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/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; diff --git a/Source/CombatExtended/CombatExtended/PatchOperation_ConditionalGeneric.cs b/Source/CombatExtended/CombatExtended/PatchOperation_ConditionalGeneric.cs new file mode 100644 index 0000000000..2ef98f1f9f --- /dev/null +++ b/Source/CombatExtended/CombatExtended/PatchOperation_ConditionalGeneric.cs @@ -0,0 +1,28 @@ +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) + { + if (generic != null) + { + return generic.Apply(xml); + } + } + else if (standard != null) + { + return standard.Apply(xml); + } + + return true; + } + } +} diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs index 0d0146dfc1..2f0566e40f 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; } @@ -1258,7 +1260,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 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..243bcc8592 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); } @@ -156,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); } } } 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; 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) { diff --git a/Source/Loader/Loader/Loader.cs b/Source/Loader/Loader/Loader.cs index f9fada4428..a20c6dfb81 100644 --- a/Source/Loader/Loader/Loader.cs +++ b/Source/Loader/Loader/Loader.cs @@ -34,11 +34,6 @@ public UncompiledWarning(ModContentPack content) : base(content) LongEventHandler.QueueLongEvent(ShowUncompiledBuildWarning, "CE_LongEvent_ShowUncompiledBuildWarning", false, null); } - public override string SettingsCategory() - { - return "Combat Extended"; - } - private static void ShowUncompiledBuildWarning() { Log.Error("You are running CE Uncompiled. See https://github.com/CombatExtended-Continued/CombatExtended#development-version for details"); diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index 3160772508..172c22dda3 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 @@ -253,6 +254,7 @@ Glitter Tech | Glitter Weaponry | Gloomy Dragonian Race | GouRIMet | +Grimstone Beasts | Grimworld: Autoguns | Grimworld: Lasguns | Grimworld: Melee | @@ -459,6 +461,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 | @@ -547,6 +550,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 | @@ -588,6 +592,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 |