From 95bb17ff6ad601a76fbef29ed3428628db3f5287 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Tue, 6 Aug 2024 18:15:51 +0330 Subject: [PATCH 001/451] Armor implants and hediffs buffed --- .../Alpha Genes/GeneDefs/GeneDefs_Armour.xml | 8 +- .../Alpha Genes/HediffDefs/Hediffs_Armour.xml | 8 +- .../Alpha Implants/Hediffs_Implants.xml | 14 +- .../Royalty/Hediffs_Implants.xml | 132 +++++----- .../HediffDefs/Hediffs_Global_Misc.xml | 6 +- .../Anima Bionics/Hediffs_Anima_Bionics.xml | 4 +- .../Genes/GeneDefs_Armor.xml | 6 +- .../HediffDefs/Hediffs_Armor.xml | 6 +- ...diffs_Weapons..xml => Hediffs_Weapons.xml} | 0 .../BEI_Hediffs_BodyParts.xml | 8 +- .../Patches/EPOE Forked/Bionics_Patch.xml | 2 +- .../Erin's Sephyr/Hediff_Racial_Sephyr.xml | 2 +- .../FSFAdvancedBionics_AddedParts.xml | 246 +++++++++--------- .../Patches/Save Our Ship 2/Hediffs_SOS2.xml | 4 +- .../Hediff_Glitter.xml | 2 +- .../Hediffs_Local_Implants_Animals.xml | 30 +-- .../GeneDefs/GeneDefs.xml | 4 +- .../GeneDefs/GeneDefs_BarkSkin.xml | 1 + .../GeneDefs/GeneDefs_ScaleSkin.xml | 2 +- .../Patches/Bionics_Patch.xml | 4 +- .../Core/ThingDefs_Races/Races_Humanlike.xml | 2 +- .../Patches/HeDiffDefs/Hediffs_Implants.xml | 14 +- 22 files changed, 253 insertions(+), 252 deletions(-) rename ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/{Hediffs_Weapons..xml => Hediffs_Weapons.xml} (100%) diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml index b17dfb14d6..df51fa0037 100644 --- a/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml @@ -5,7 +5,7 @@ Defs/GeneDef[defName="AG_FungalSkin"]/customEffectDescriptions -
  • +3/4.5 blunt/sharp natural armour. +25% injury healing factor.
    • +
  • +3/9 blunt/sharp natural armour. +25% injury healing factor.
  • Fires will cause permanent wounds.
    •      @@ -15,7 +15,7 @@ Defs/GeneDef[defName="AG_ArmourMinor"]/customEffectDescriptions -
  • +1/1.5 blunt/sharp natural armour.
    • +
  • +1/3 blunt/sharp natural armour.
    •      @@ -24,7 +24,7 @@ Defs/GeneDef[defName="AG_ArmourMedium"]/customEffectDescriptions -
  • +2/3 blunt/sharp natural armour.
    • +
  • +2/6 blunt/sharp natural armour.
    •      @@ -33,7 +33,7 @@ Defs/GeneDef[defName="AG_ArmourMajor"]/customEffectDescriptions -
  • +2.5/3.75 blunt/sharp natural armour.
    • +
  • +2.5/7.5 blunt/sharp natural armour.
    •      diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml index ce0b952016..6d2438ea79 100644 --- a/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml @@ -6,7 +6,7 @@ 3.0 - 4.5 + 9.0 0.25 @@ -17,7 +17,7 @@ 1.0 - 1.5 + 3.0 @@ -27,7 +27,7 @@ 2.0 - 3.0 + 6.0 @@ -37,7 +37,7 @@ 2.5 - 3.75 + 7.5 diff --git a/ModPatches/Alpha Implants/Hediffs_Implants.xml b/ModPatches/Alpha Implants/Hediffs_Implants.xml index 77daeb4938..edf9127454 100644 --- a/ModPatches/Alpha Implants/Hediffs_Implants.xml +++ b/ModPatches/Alpha Implants/Hediffs_Implants.xml @@ -62,7 +62,7 @@ Defs/HediffDef[defName="AI_AnimalProstheticShell"]/stages/li/statOffsets/ArmorRating_Sharp - 0.5 + 1.0 @@ -76,7 +76,7 @@ Defs/HediffDef[defName="AI_AnimalProstheticWing"]/stages/li/statOffsets/ArmorRating_Sharp - 0.2 + 0.4 @@ -162,7 +162,7 @@ 0.5 1.4 MeleeHit_BionicPunch - MeleeMiss_BionicPunch + MeleeMiss_BionicPunch @@ -182,7 +182,7 @@ 0.4 1.4 MeleeHit_BionicPunch - MeleeMiss_BionicPunch + MeleeMiss_BionicPunch @@ -211,7 +211,7 @@ Defs/HediffDef[defName="AI_AnimalBionicShell"]/stages/li/statOffsets/ArmorRating_Sharp - 1 + 2 @@ -303,7 +303,7 @@ 0.75 1.4 MeleeHit_BionicPunch - MeleeMiss_BionicPunch + MeleeMiss_BionicPunch @@ -323,7 +323,7 @@ 0.6 1.4 MeleeHit_BionicPunch - MeleeMiss_BionicPunch + MeleeMiss_BionicPunch diff --git a/ModPatches/Alpha Implants/Royalty/Hediffs_Implants.xml b/ModPatches/Alpha Implants/Royalty/Hediffs_Implants.xml index 87886ba224..76af992315 100644 --- a/ModPatches/Alpha Implants/Royalty/Hediffs_Implants.xml +++ b/ModPatches/Alpha Implants/Royalty/Hediffs_Implants.xml @@ -9,78 +9,78 @@ - -
  • - Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/capMods -
    • - + +
  • + Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/capMods +
    • + +
  • + Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/statOffsets/ArmorRating_Sharp + + 2 + +
    • +
  • - Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/statOffsets/ArmorRating_Sharp - - 1 - -
    • - -
  • - Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/statOffsets/ArmorRating_Blunt - - 1.5 - -
    • + Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/statOffsets/ArmorRating_Blunt + + 1.5 + + -
  • - Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/statOffsets - - -0.25 - -0.01 - -
    • +
  • + Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/statOffsets + + -0.25 + -0.01 + +
    • -
  • - Defs/HediffDef[defName="AI_AnimalVenomFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • ToxicBite
    • - - 5 - 1.11 - 0.15 - 1.5 - HeadAttackTool - true - - - - +
  • + Defs/HediffDef[defName="AI_AnimalVenomFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • ToxicBite
    • + + 5 + 1.11 + 0.15 + 1.5 + HeadAttackTool + true + + + + + + +
  • + Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/capMods +
    • + +
  • + Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/statOffsets/ArmorRating_Sharp + + 4 + +
    • - -
  • - Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/capMods -
    • -
  • - Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/statOffsets/ArmorRating_Sharp - - 2 - -
    • - -
  • - Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/statOffsets/ArmorRating_Blunt - - 3.5 - -
    • + Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/statOffsets/ArmorRating_Blunt + + 3.5 + + -
  • - Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/statOffsets - - -0.02 - -
    • +
  • + Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/statOffsets + + -0.02 + +
    • diff --git a/ModPatches/Alpha Memes/Patches/Alpha Memes/HediffDefs/Hediffs_Global_Misc.xml b/ModPatches/Alpha Memes/Patches/Alpha Memes/HediffDefs/Hediffs_Global_Misc.xml index 09d0dc3799..5ae2981bf3 100644 --- a/ModPatches/Alpha Memes/Patches/Alpha Memes/HediffDefs/Hediffs_Global_Misc.xml +++ b/ModPatches/Alpha Memes/Patches/Alpha Memes/HediffDefs/Hediffs_Global_Misc.xml @@ -11,7 +11,7 @@ Defs/HediffDef[defName="AM_UtilityDryadHediff"]/stages/li/statOffsets/ArmorRating_Sharp - 0.5 + 1.0 @@ -25,7 +25,7 @@ Defs/HediffDef[defName="AM_CombatDryadHediff"]/stages/li/statOffsets/ArmorRating_Sharp - 1.25 + 2.5 @@ -40,7 +40,7 @@ Defs/HediffDef[defName="AM_GenericDryadHediff"]/stages/li/statOffsets/ArmorRating_Sharp - 0.75 + 1.5 diff --git a/ModPatches/Anima Bionics/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml b/ModPatches/Anima Bionics/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml index 085296a7ea..4c602e15f0 100644 --- a/ModPatches/Anima Bionics/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml +++ b/ModPatches/Anima Bionics/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml @@ -31,7 +31,7 @@ Defs/HediffDef[defName="AnimaPlateHediff"]/stages/li/statOffsets/ArmorRating_Sharp - 1.25 + 2.5 @@ -53,7 +53,7 @@ Defs/HediffDef[defName="AnimaspineHediff"]/stages/li/statOffsets/ArmorRating_Sharp - 0.85 + 1.7 diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Armor.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Armor.xml index 3f15f9943e..cf761b6bb2 100644 --- a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Armor.xml +++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Armor.xml @@ -6,7 +6,7 @@ Defs/GeneDef[defName="BS_ToughSkin"]/customEffectDescriptions -
  • +0.5 mm natural sharp armor
    • +
  • +1 mm natural sharp armor
  • +1.0 mPA natural blunt armor
    •      @@ -16,7 +16,7 @@ Defs/GeneDef[defName="BS_NaturalArmor"]/customEffectDescriptions -
  • +1 mm natural sharp armor
    • +
  • +2 mm natural sharp armor
  • +1.5 mPA natural blunt armor
    •      @@ -26,7 +26,7 @@ Defs/GeneDef[defName="BS_NaturalArmor_Great"]/customEffectDescriptions -
  • +1.5 mm natural sharp armor
    • +
  • +3 mm natural sharp armor
  • +2 mPA natural blunt armor
    •      diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Armor.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Armor.xml index bc4691324a..d023d10564 100644 --- a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Armor.xml +++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Armor.xml @@ -6,7 +6,7 @@ 1 - 0.5 + 1 @@ -16,7 +16,7 @@ 1.5 - 1 + 2 @@ -26,7 +26,7 @@ 2 - 1.5 + 3 diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Weapons..xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Weapons.xml similarity index 100% rename from ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Weapons..xml rename to ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Weapons.xml diff --git a/ModPatches/Biotech Expansion - Insectoid/Patches/Biotech Expansion - Insectoid/BEI_Hediffs_BodyParts.xml b/ModPatches/Biotech Expansion - Insectoid/Patches/Biotech Expansion - Insectoid/BEI_Hediffs_BodyParts.xml index 4df25b115b..b087c34a3a 100644 --- a/ModPatches/Biotech Expansion - Insectoid/Patches/Biotech Expansion - Insectoid/BEI_Hediffs_BodyParts.xml +++ b/ModPatches/Biotech Expansion - Insectoid/Patches/Biotech Expansion - Insectoid/BEI_Hediffs_BodyParts.xml @@ -26,8 +26,8 @@ Defs/GeneDef[defName="BTEIst_HardenedChitin"]/statOffsets - 2.25 - 3.375 + 3.0 + 4.0 @@ -36,8 +36,8 @@ Defs/HediffDef[defName="BTEIst_Exogelatin"]/stages/li/statOffsets - 2.25 - 3.375 + 3.0 + 4.0 diff --git a/ModPatches/EPOE Forked/Patches/EPOE Forked/Bionics_Patch.xml b/ModPatches/EPOE Forked/Patches/EPOE Forked/Bionics_Patch.xml index 53c4c4ecf5..96e1aa27b6 100644 --- a/ModPatches/EPOE Forked/Patches/EPOE Forked/Bionics_Patch.xml +++ b/ModPatches/EPOE Forked/Patches/EPOE Forked/Bionics_Patch.xml @@ -371,7 +371,7 @@ Defs/HediffDef[defName="EPIA_Harden_ProtectiveExoskeleton"]/stages/li/statOffsets/ArmorRating_Sharp - 5 + 7.5 diff --git a/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml b/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml index 1889a080ac..133b43561a 100644 --- a/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml +++ b/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml @@ -13,7 +13,7 @@ Defs/HediffDef[defName="ERN_SephyrToughen"]/stages/li/statOffsets/ArmorRating_Sharp - 0.70 + 1.4 diff --git a/ModPatches/FSF Advanced Bionics Expansion/Patches/FSF Advanced Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml b/ModPatches/FSF Advanced Bionics Expansion/Patches/FSF Advanced Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml index 86969b5207..0da41fb2aa 100644 --- a/ModPatches/FSF Advanced Bionics Expansion/Patches/FSF Advanced Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml +++ b/ModPatches/FSF Advanced Bionics Expansion/Patches/FSF Advanced Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml @@ -222,14 +222,14 @@ Defs/HediffDef[defName="FSFArchotechSkinI"]/stages/li/statOffsets/ArmorRating_Sharp - 6 + 12 Defs/HediffDef[defName="FSFArchotechSkinI"]/stages/li/statOffsets/ArmorRating_Blunt - 15 + 20 0.5 @@ -346,133 +346,133 @@ -
  • - Defs/HediffDef[defName="FSFAdvBionicMedicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • Blunt
    • - - 14 - 2 - 2.0 - MeleeHit_BionicPunch - MeleeMiss_BionicPunch - - - - +
  • + Defs/HediffDef[defName="FSFAdvBionicMedicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • Blunt
    • + + 14 + 2 + 2.0 + MeleeHit_BionicPunch + MeleeMiss_BionicPunch + + + + -
  • - Defs/HediffDef[defName="FSFArchotechMedicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • Blunt
    • - - 14 - 2 - 3.0 - MeleeHit_BionicPunch - MeleeMiss_BionicPunch - - - - +
  • + Defs/HediffDef[defName="FSFArchotechMedicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • Blunt
    • + + 14 + 2 + 3.0 + MeleeHit_BionicPunch + MeleeMiss_BionicPunch + + + + -
  • - Defs/HediffDef[defName="FSFBionicConstructionArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • Blunt
    • - - 14 - 2 - 2.0 - MeleeHit_BionicPunch - MeleeMiss_BionicPunch - - - - +
  • + Defs/HediffDef[defName="FSFBionicConstructionArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • Blunt
    • + + 14 + 2 + 2.0 + MeleeHit_BionicPunch + MeleeMiss_BionicPunch + + + + -
  • - Defs/HediffDef[defName="FSFAdvBionicConstructionArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • Blunt
    • - - 14 - 2 - 2.0 - MeleeHit_BionicPunch - MeleeMiss_BionicPunch - - - - +
  • + Defs/HediffDef[defName="FSFAdvBionicConstructionArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • Blunt
    • + + 14 + 2 + 2.0 + MeleeHit_BionicPunch + MeleeMiss_BionicPunch + + + + -
  • - Defs/HediffDef[defName="FSFAdvBionicDrillArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • Stab
    • - - 14 - 2 - 6.0 - MeleeHit_BionicPunch - MeleeMiss_BionicPunch - - - - +
  • + Defs/HediffDef[defName="FSFAdvBionicDrillArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • Stab
    • + + 14 + 2 + 6.0 + MeleeHit_BionicPunch + MeleeMiss_BionicPunch + + + + -
  • - Defs/HediffDef[defName="FSFAdvBionicFieldArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • Blunt
    • - - 3 - 1.66 - 0.00 - 0.75 - true - MeleeHit_FieldHand - MeleeMiss_FieldHand - - - - +
  • + Defs/HediffDef[defName="FSFAdvBionicFieldArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • Blunt
    • + + 3 + 1.66 + 0.00 + 0.75 + true + MeleeHit_FieldHand + MeleeMiss_FieldHand + + + + -
  • - Defs/HediffDef[defName="FSFArchotechSkinI"]/stages/li/statOffsets - - - 7 - 12 - 1.5 - 1 - - -
    • +
  • + Defs/HediffDef[defName="FSFArchotechSkinI"]/stages/li/statOffsets + + + 7 + 12 + 1.5 + 1 + + +
    • diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Hediffs_SOS2.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Hediffs_SOS2.xml index 6c04147f68..ebce1b585d 100644 --- a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Hediffs_SOS2.xml +++ b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Hediffs_SOS2.xml @@ -17,7 +17,7 @@ Defs/HediffDef[defName="SoSArchotechSkin"]/stages/li/statOffsets/ArmorRating_Sharp - 8 + 16 @@ -65,7 +65,7 @@
  • Defs/HediffDef[defName="SoSHologramArchotech"]/stages/li/statOffsets/ArmorRating_Sharp - 12.0 + 24.0
    • diff --git a/ModPatches/Ushankas Glitterworld Uprising/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml b/ModPatches/Ushankas Glitterworld Uprising/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml index 8eb4414bd1..38c96d4ec3 100644 --- a/ModPatches/Ushankas Glitterworld Uprising/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml +++ b/ModPatches/Ushankas Glitterworld Uprising/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml @@ -9,7 +9,7 @@ Defs/HediffDef[defName="USH_InstalledGoldenSkinReplacement"]/stages/li/statOffsets/ArmorRating_Sharp - 0.85 + 1.7 diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Animals.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Animals.xml index dc2baea331..7a2173adb4 100644 --- a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Animals.xml +++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Animals.xml @@ -480,7 +480,7 @@ Defs/HediffDef[defName="GR_ScytherTail"]/stages/li/statOffsets/ArmorRating_Sharp - 0.15 + 0.3 @@ -514,7 +514,7 @@ Defs/HediffDef[defName="GR_MechaTail"]/stages/li/statOffsets/ArmorRating_Sharp - 0.4 + 0.8 @@ -532,7 +532,7 @@ Defs/HediffDef[defName="GR_InsectileEye"]/stages/li/statOffsets/ArmorRating_Sharp - 0.05 + 0.1 @@ -548,7 +548,7 @@ Defs/HediffDef[defName="GR_ThrumboEye"]/stages/li/statOffsets/ArmorRating_Sharp - 0.15 + 0.3 @@ -566,7 +566,7 @@ Defs/HediffDef[defName="GR_MothTympanalOrgan"]/stages/li/statOffsets/ArmorRating_Sharp - 0.1 + 0.2 @@ -582,7 +582,7 @@ Defs/HediffDef[defName="GR_MechaReceptors"]/stages/li/statOffsets/ArmorRating_Sharp - 0.2 + 0.4 @@ -600,7 +600,7 @@ Defs/HediffDef[defName="GR_InsectoidPheromones"]/stages/li/statOffsets/ArmorRating_Sharp - 0.1 + 0.2 @@ -635,7 +635,7 @@ Defs/HediffDef[defName="GR_MiniatureThrumboHorn"]/stages/li/statOffsets/ArmorRating_Sharp - 0.2 + 0.4 @@ -671,7 +671,7 @@ Defs/HediffDef[defName="GR_InsectMandibles"]/stages/li/statOffsets/ArmorRating_Sharp - 0.1 + 0.2 @@ -705,7 +705,7 @@ Defs/HediffDef[defName="GR_ThrumboJaws"]/stages/li/statOffsets/ArmorRating_Sharp - 0.2 + 0.4 @@ -723,7 +723,7 @@ Defs/HediffDef[defName="GR_MuffaloSpine"]/stages/li/statOffsets/ArmorRating_Sharp - 0.1 + 0.2 @@ -739,7 +739,7 @@ Defs/HediffDef[defName="GR_CrocodileSpine"]/stages/li/statOffsets/ArmorRating_Sharp - 0.2 + 0.4 @@ -755,7 +755,7 @@ Defs/HediffDef[defName="GR_MechaSpine"]/stages/li/statOffsets/ArmorRating_Sharp - 0.4 + 0.8 @@ -773,7 +773,7 @@ Defs/HediffDef[defName="GR_ChitinousHeart"]/stages/li/statOffsets/ArmorRating_Sharp - 0.15 + 0.3 @@ -789,7 +789,7 @@ Defs/HediffDef[defName="GR_MechaHeart"]/stages/li/statOffsets/ArmorRating_Sharp - 0.4 + 0.8 diff --git a/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/GeneDefs/GeneDefs.xml b/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/GeneDefs/GeneDefs.xml index 34a89510e6..134e0a712f 100644 --- a/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/GeneDefs/GeneDefs.xml +++ b/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/GeneDefs/GeneDefs.xml @@ -7,8 +7,8 @@ Defs/GeneDef[defName="VRE_InsectSkin"]/statOffsets - 2.2 - 1.35 + 3 + 2 diff --git a/ModPatches/Vanilla Races Expanded - Phytokin/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/GeneDefs_BarkSkin.xml b/ModPatches/Vanilla Races Expanded - Phytokin/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/GeneDefs_BarkSkin.xml index e1682aa21e..50fc03bafe 100644 --- a/ModPatches/Vanilla Races Expanded - Phytokin/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/GeneDefs_BarkSkin.xml +++ b/ModPatches/Vanilla Races Expanded - Phytokin/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/GeneDefs_BarkSkin.xml @@ -5,6 +5,7 @@ Defs/GeneDef[defName="VRE_BarkSkin"]/statOffsets/ArmorRating_Blunt 8.5 + 0.5 diff --git a/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml b/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml index f772356042..17ac52d97b 100644 --- a/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml +++ b/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml @@ -4,7 +4,7 @@ Defs/GeneDef[defName="VRESaurids_ScaleSkin"]/statOffsets/ArmorRating_Sharp - 0.5 + 1.0 diff --git a/ModPatches/YetAnotherProsthetics - Core/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml b/ModPatches/YetAnotherProsthetics - Core/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml index 25de774453..c3689485a7 100644 --- a/ModPatches/YetAnotherProsthetics - Core/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml +++ b/ModPatches/YetAnotherProsthetics - Core/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml @@ -184,7 +184,7 @@ Defs/HediffDef[defName="BIE_UltratechBionicSkin"]/stages/li/statOffsets/ArmorRating_Sharp - 1.75 + 3.5 @@ -199,7 +199,7 @@ Defs/HediffDef[defName="SoSArchotechSkin"]/stages/li/statOffsets/ArmorRating_Sharp - 3 + 6 diff --git a/Patches/Core/ThingDefs_Races/Races_Humanlike.xml b/Patches/Core/ThingDefs_Races/Races_Humanlike.xml index 570fe087c5..ffa8c07952 100644 --- a/Patches/Core/ThingDefs_Races/Races_Humanlike.xml +++ b/Patches/Core/ThingDefs_Races/Races_Humanlike.xml @@ -102,7 +102,7 @@ 200 true 500 --> - 0.75 + 0.5 Defs/PawnKindDef[ - defName="Mech_ArchotechMilitor" or - defName="Mech_BochiMilitor" or - defName="Mech_ChickenCrusaderMilitor" or - defName="Mech_EasterBunnyMilitor" or - defName="Mech_GuraMilitor" or - defName="Mech_JorisMilitor" or - defName="Mech_KnightMilitor"] + defName="Mech_ArchotechMilitor" or + defName="Mech_BochiMilitor" or + defName="Mech_ChickenCrusaderMilitor" or + defName="Mech_EasterBunnyMilitor" or + defName="Mech_GuraMilitor" or + defName="Mech_JorisMilitor" or + defName="Mech_KnightMilitor"]
  • @@ -138,20 +138,20 @@
    • - + Defs/ThingDef[defName="Mech_ChristmasUrchin"]/comps -
  • -
  • +
  • +
  • - + Defs/ThingDef[ - defName="Mech_ChristmasUrchin" or - defName="Mech_MiniShark" or - defName="Mech_MiniChicken"] + defName="Mech_ChristmasUrchin" or + defName="Mech_MiniShark" or + defName="Mech_MiniChicken"]
  • Vehicle @@ -161,9 +161,9 @@ Defs/ThingDef[ - defName="Mech_ChristmasUrchin" or - defName="Mech_MiniShark" or - defName="Mech_MiniChicken"]/statBases/ArmorRating_Blunt + defName="Mech_ChristmasUrchin" or + defName="Mech_MiniShark" or + defName="Mech_MiniChicken"]/statBases/ArmorRating_Blunt 3 @@ -172,9 +172,9 @@ Defs/ThingDef[ - defName="Mech_ChristmasUrchin" or - defName="Mech_MiniShark" or - defName="Mech_MiniChicken"]/statBases/ArmorRating_Sharp + defName="Mech_ChristmasUrchin" or + defName="Mech_MiniShark" or + defName="Mech_MiniChicken"]/statBases/ArmorRating_Sharp 2 @@ -183,9 +183,9 @@ Defs/ThingDef[ - defName="Mech_ChristmasUrchin" or - defName="Mech_MiniShark" or - defName="Mech_MiniChicken"]/statBases + defName="Mech_ChristmasUrchin" or + defName="Mech_MiniShark" or + defName="Mech_MiniChicken"]/statBases 30 @@ -198,8 +198,8 @@ Defs/ThingDef[ - defName="Mech_ChristmasUrchin" or - defName="Mech_MiniShark"]/tools + defName="Mech_ChristmasUrchin" or + defName="Mech_MiniShark"]/tools
  • @@ -241,7 +241,7 @@ Defs/ThingDef[defName="Mech_ChristmasUrchin"] - + @@ -251,7 +251,7 @@ Defs/ThingDef[defName="Mech_MiniShark"] - + @@ -261,16 +261,16 @@ Defs/ThingDef[defName="Mech_MiniChicken"] - + Defs/ThingDef[ - defName="Mech_ChristmasUrchin" or - defName="Mech_MiniShark" or - defName="Mech_MiniChicken"]/comps + defName="Mech_ChristmasUrchin" or + defName="Mech_MiniShark" or + defName="Mech_MiniChicken"]/comps
  • @@ -287,7 +287,7 @@ 200 true 70 - 0.75 + 0.5
    • diff --git a/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Lox.xml b/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Lox.xml index 01fc413e9b..8706eba9e2 100644 --- a/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Lox.xml +++ b/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Lox.xml @@ -93,7 +93,7 @@ Defs/ThingDef[defName="ERN_Lox"] - + @@ -106,7 +106,7 @@ true 600 8 - 0.75 + 0.5 diff --git a/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Races/Race_Dragonian.xml b/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Races/Race_Dragonian.xml index 44140b0fe7..3812e83029 100644 --- a/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Races/Race_Dragonian.xml +++ b/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Races/Race_Dragonian.xml @@ -7,13 +7,13 @@
  • CombatExtended.CompPawnGizmo
    • -
  • +
  • 500 true 600 5 - 0.75 + 0.5
    • diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml index 86d38eb2b9..a2cf2e400f 100644 --- a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml +++ b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml @@ -73,7 +73,7 @@ Defs/ThingDef[defName="MOW_Mech_Cicada"] - + @@ -111,9 +111,7 @@ 200 true 158 - 0.75 - 5 - 10 + 0.5 diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml index 047c286758..a3bbf7d5ab 100644 --- a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml +++ b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml @@ -74,7 +74,7 @@ Defs/ThingDef[defName="MOW_Mech_Demolisher"] - + @@ -113,8 +113,6 @@ true 395 0.5 - 14 - 36 diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml index b8c5631ffb..13cdea17dd 100644 --- a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml +++ b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml @@ -73,7 +73,7 @@ Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"] - + @@ -111,7 +111,7 @@ 200 true 131 - 0.75 + 0.5 diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml index 589e875729..7c288948fd 100644 --- a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml +++ b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml @@ -73,7 +73,7 @@ Defs/ThingDef[defName="MOW_Mech_Enforcer"] - + @@ -111,7 +111,7 @@ 200 true 131 - 0.75 + 0.5 diff --git a/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml index 5cc17aef8b..8ab91f96e4 100644 --- a/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml @@ -177,8 +177,6 @@ true 300 0.5 - 10 - 22 diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml index 7285d4bebb..6c438652dd 100644 --- a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml +++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml @@ -8,13 +8,13 @@
  • CombatExtended.CompPawnGizmo
    • -
  • +
  • 500 true 600 5 - 0.75 + 0.5
    • @@ -25,13 +25,13 @@
  • CombatExtended.CompPawnGizmo
    • -
  • +
  • 500 true 600 5 - 0.75 + 0.5
    • diff --git a/ModPatches/MoreMechanoids/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/MoreMechanoids/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml index 69e1b2134d..5c1b48b693 100644 --- a/ModPatches/MoreMechanoids/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/MoreMechanoids/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml @@ -98,7 +98,7 @@ 200 true 27 - 0.75 + 0.5 @@ -198,7 +198,7 @@ 200 true 85 - 0.75 + 0.5 @@ -289,7 +289,7 @@ 200 true 40 - 0.75 + 0.5 @@ -419,8 +419,6 @@ true 550 0.5 - 12 - 27 @@ -532,8 +530,6 @@ true 152 0.5 - 10 - 22 diff --git a/ModPatches/Moyo 2/Patches/Moyo 2/Race/AlienRace_Moyo.xml b/ModPatches/Moyo 2/Patches/Moyo 2/Race/AlienRace_Moyo.xml index c809b8903c..2d60f0f7a5 100644 --- a/ModPatches/Moyo 2/Patches/Moyo 2/Race/AlienRace_Moyo.xml +++ b/ModPatches/Moyo 2/Patches/Moyo 2/Race/AlienRace_Moyo.xml @@ -1,4 +1,4 @@ - + @@ -17,13 +17,13 @@
  • CombatExtended.CompPawnGizmo
    • -
  • +
  • 500 true 600 5 - 0.75 + 0.5
    • @@ -46,7 +46,7 @@ - /Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Moyo"]/tools + /Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Moyo"]/tools
  • diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Droids.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Droids.xml index b5539c7b44..2446157791 100644 --- a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Droids.xml +++ b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Droids.xml @@ -18,7 +18,7 @@ 1 - + Defs/Asimov.PawnDef[defName="OuterRim_BattleDroid" or defName="OuterRim_BattleDroidAdvanced" or defName="OuterRim_MagnaGuardDroid" or defName="OuterRim_ProtocolDroid" or defName="OuterRim_CommandoDroid" or defName="OuterRim_HKDroid" or defName="OuterRim_ImperialLaborDroid" or defName="OuterRim_KXSecurityDroid" or defName="OuterRim_SuperTacticalDroid" or defName="OuterRim_TacticalDroid"]/tools @@ -93,7 +93,7 @@ Defs/Asimov.PawnDef[@Name="OuterRim_BaseHumanoidDroid"] - + @@ -118,7 +118,7 @@ 200 true 500 --> - 0.75 + 0.5 - + + Defs/ThingDef[defName="RG_SabertoothTiger"]/statBases 0.19 @@ -439,9 +439,9 @@ true 600 5 - 0.75 + 0.5
    • -     + \ No newline at end of file diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BasiliskCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BasiliskCE.xml index 801b3f34c1..c18e6691ab 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BasiliskCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BasiliskCE.xml @@ -101,7 +101,7 @@ Defs/ThingDef[defName="WMH_Basilisk"] - + @@ -114,7 +114,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BearofleetCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BearofleetCE.xml index e756da1e1d..b89e6b7bb0 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BearofleetCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BearofleetCE.xml @@ -70,7 +70,7 @@ Defs/ThingDef[defName="WMH_Bearofleet"] - + @@ -83,7 +83,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_CyclopsCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_CyclopsCE.xml index a36a27a0ba..d3ca86ec13 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_CyclopsCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_CyclopsCE.xml @@ -89,7 +89,7 @@ Defs/ThingDef[defName="WMH_Cyclops"] - + @@ -102,7 +102,7 @@ true 300 5 - 0.75 + 0.5 diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_EkimmaraCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_EkimmaraCE.xml index 0bf8615dd4..d8e40db46f 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_EkimmaraCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_EkimmaraCE.xml @@ -92,7 +92,7 @@ Defs/ThingDef[defName="WMH_Ekimmara"] - + @@ -105,7 +105,7 @@ true 500 5 - 0.75 + 0.5 diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FlederCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FlederCE.xml index 9153a60c6d..17ff5b3ef9 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FlederCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FlederCE.xml @@ -90,7 +90,7 @@ Defs/ThingDef[defName="WMH_Fleder"] - + @@ -103,7 +103,7 @@ true 400 5 - 0.75 + 0.5 diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FoglerCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FoglerCE.xml index a38c8e11dd..2e1ebebace 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FoglerCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FoglerCE.xml @@ -89,7 +89,7 @@ Defs/ThingDef[defName="WMH_Fogler"] - + @@ -102,7 +102,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml index 1cdd10a2ab..0f1b8a0a48 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml @@ -86,7 +86,7 @@ Defs/ThingDef[defName="WMAux_KikimoreWorker"] - + @@ -99,7 +99,7 @@ true 600 5 - 0.5 + 0.25 @@ -172,7 +172,7 @@ Defs/ThingDef[defName="WMAux_KikimoreWorker"] - + @@ -185,7 +185,7 @@ true 600 5 - 0.5 + 0.25 @@ -257,7 +257,7 @@ Defs/ThingDef[defName="WMH_KikimoreQueen"] - + @@ -270,7 +270,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WerewolfCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WerewolfCE.xml index c28693a23e..55d7c50c0b 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WerewolfCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WerewolfCE.xml @@ -89,7 +89,7 @@ Defs/ThingDef[defName="WMH_Werewolf"] - + @@ -102,7 +102,7 @@ true 300 5 - 0.75 + 0.5 diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WyvernCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WyvernCE.xml index e33d546fcb..9eb7fa7b49 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WyvernCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WyvernCE.xml @@ -102,7 +102,7 @@ Defs/ThingDef[defName="WMH_Wyvern"] - + @@ -115,7 +115,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml b/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml index 7da35231bf..1bcf7f5967 100644 --- a/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml +++ b/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml @@ -61,7 +61,7 @@ - + Defs/ThingDef[@Name="BaseMechanoidTagma"] @@ -81,15 +81,11 @@ true 116 0.50 - - + Defs/ThingDef[defName="Mech_Skutaton"]/statBases/ArmorRating_Sharp @@ -203,7 +199,7 @@ - + Defs/ThingDef[@Name="RSMechanoid"] @@ -222,11 +218,7 @@ 200 true 86 - 0.75 - + 0.5 @@ -266,5 +258,5 @@ 6 - + \ No newline at end of file diff --git a/ModPatches/Roren Race/Patches/Roren Race/Race_Roren.xml b/ModPatches/Roren Race/Patches/Roren Race/Race_Roren.xml index 3b169bceba..afa1523fb3 100644 --- a/ModPatches/Roren Race/Patches/Roren Race/Race_Roren.xml +++ b/ModPatches/Roren Race/Patches/Roren Race/Race_Roren.xml @@ -9,13 +9,13 @@
  • CombatExtended.CompPawnGizmo
    • -
  • +
  • 500 true 600 5 - 0.75 + 0.5
    • @@ -26,13 +26,13 @@
  • CombatExtended.CompPawnGizmo
    • -
  • +
  • 500 true 600 5 - 0.75 + 0.5
    • @@ -111,5 +111,5 @@
  • CE_Apparel_ImprovGasMask
    • - + \ No newline at end of file diff --git a/ModPatches/The Vanity Project - Shiba Inu/Patches/The Vanity Project - Shiba Inu/Vanity_Project_Shiba_Inu_Patch.xml b/ModPatches/The Vanity Project - Shiba Inu/Patches/The Vanity Project - Shiba Inu/Vanity_Project_Shiba_Inu_Patch.xml index bbff5338be..918e04f1fd 100644 --- a/ModPatches/The Vanity Project - Shiba Inu/Patches/The Vanity Project - Shiba Inu/Vanity_Project_Shiba_Inu_Patch.xml +++ b/ModPatches/The Vanity Project - Shiba Inu/Patches/The Vanity Project - Shiba Inu/Vanity_Project_Shiba_Inu_Patch.xml @@ -60,13 +60,13 @@ - + Defs/ThingDef[defName="TVP_ShibaInu"]/comps Defs/ThingDef[defName="TVP_ShibaInu"] - + @@ -79,7 +79,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Megatardi.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Megatardi.xml index abdaca88f8..8c7764f634 100644 --- a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Megatardi.xml +++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Megatardi.xml @@ -69,7 +69,7 @@ Defs/ThingDef[defName="VAEWaste_Megatardi"] - + @@ -82,7 +82,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Pestigator.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Pestigator.xml index 765a14575b..81c3997882 100644 --- a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Pestigator.xml +++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Pestigator.xml @@ -64,7 +64,7 @@ Defs/ThingDef[defName="VAEWaste_Pestigator"] - + @@ -77,7 +77,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml index db3fc6340a..772044e8da 100644 --- a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml +++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml @@ -116,7 +116,7 @@ Defs/ThingDef[defName="VAEWaste_Toxscorpion"] - + @@ -129,7 +129,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml index 40ad758eac..8ea9b26f79 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml @@ -100,7 +100,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid.xml index e10a02c5a1..f3aa908865 100644 --- a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid.xml +++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid.xml @@ -133,8 +133,6 @@ true 366 0.5 - 12 - 27 @@ -324,7 +322,7 @@ 200 true 116 - 0.75 + 0.5 @@ -356,7 +354,7 @@ 200 true 100 - 0.75 + 0.5 @@ -459,9 +457,7 @@ 200 true 100 - 0.75 - 4 - 8 + 0.5 @@ -583,7 +579,7 @@ 200 true 100 - 0.75 + 0.5 @@ -700,8 +696,6 @@ true 120 0.5 - 5 - 7.5 @@ -792,8 +786,6 @@ true 356 0.5 - 12 - 27 @@ -888,8 +880,6 @@ true 188 0.5 - 10 - 22 diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid_PlayerControlled.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid_PlayerControlled.xml index 9157c62d18..76f8ab4a37 100644 --- a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid_PlayerControlled.xml +++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid_PlayerControlled.xml @@ -96,8 +96,6 @@ true 366 0.5 - 12 - 27 @@ -279,7 +277,7 @@ 200 true 116 - 0.75 + 0.5 @@ -311,7 +309,7 @@ 200 true 100 - 0.75 + 0.5 @@ -426,9 +424,7 @@ 200 true 100 - 0.75 - 4 - 8 + 0.5 @@ -550,7 +546,7 @@ 200 true 100 - 0.75 + 0.5 @@ -667,8 +663,6 @@ true 120 0.5 - 5 - 7.5 @@ -760,8 +754,6 @@ true 188 0.5 - 10 - 22 diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml index e7a86c2c23..ca8fbee2de 100644 --- a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml +++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml @@ -220,7 +220,7 @@ 200 true 100 - 0.75 + 0.5 @@ -423,7 +423,7 @@ 200 true 250 - 0.75 + 0.5 @@ -455,7 +455,7 @@ 200 true 275 - 0.75 + 0.5 @@ -543,7 +543,7 @@ 200 true 350 - 0.75 + 0.5 @@ -648,7 +648,7 @@ 200 true 250 - 0.75 + 0.5 diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml index b107369531..1d1b009e14 100644 --- a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml @@ -157,8 +157,6 @@ true 366 0.5 - 12 - 27 @@ -348,7 +346,7 @@ 200 true 116 - 0.75 + 0.5 @@ -380,7 +378,7 @@ 200 true 100 - 0.75 + 0.5 @@ -483,9 +481,7 @@ 200 true 100 - 0.75 - 4 - 8 + 0.5 @@ -607,7 +603,7 @@ 200 true 100 - 0.75 + 0.5 @@ -724,8 +720,6 @@ true 120 0.5 - 5 - 7.5 @@ -826,8 +820,6 @@ true 356 0.5 - 12 - 27 @@ -920,8 +912,6 @@ true 188 0.5 - 10 - 22 diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid_PlayerControlled.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid_PlayerControlled.xml index 22514d93f5..77b7ca9b4c 100644 --- a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid_PlayerControlled.xml +++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid_PlayerControlled.xml @@ -95,8 +95,6 @@ true 188 0.5 - 10 - 22 @@ -218,7 +216,7 @@ 200 true 100 - 0.75 + 0.5 @@ -335,8 +333,6 @@ true 120 0.5 - 5 - 7.5 diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Giant.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Giant.xml index 7f0cd47504..1f1b34a5d8 100644 --- a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Giant.xml +++ b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Giant.xml @@ -119,7 +119,7 @@ Defs/ThingDef[defName="VFEV_Lothurr"] - + @@ -132,7 +132,7 @@ true 600 5 - 0.75 + 0.5 @@ -252,7 +252,7 @@ Defs/ThingDef[defName="VFEV_Fenrir"] - + @@ -265,7 +265,7 @@ true 600 5 - 0.75 + 0.5 @@ -346,7 +346,7 @@ Defs/ThingDef[defName="VFEV_Njorun"] - + @@ -359,7 +359,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Mechanoid.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Mechanoid.xml index 4207908b0f..662606014d 100644 --- a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Mechanoid.xml +++ b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Mechanoid.xml @@ -207,7 +207,7 @@ Defs/ThingDef[defName="VFEV_Mech_Odin"] - + @@ -229,7 +229,7 @@ 200 true 300 - 0.75 + 0.5 diff --git a/ModPatches/Zombieland/Patches/Zombieland/Zombieland_Patches.xml b/ModPatches/Zombieland/Patches/Zombieland/Zombieland_Patches.xml index a1b07f3571..99b0c09b57 100644 --- a/ModPatches/Zombieland/Patches/Zombieland/Zombieland_Patches.xml +++ b/ModPatches/Zombieland/Patches/Zombieland/Zombieland_Patches.xml @@ -126,7 +126,7 @@ Defs/ThingDef[defName="ZombieSpitter"] - + @@ -139,7 +139,7 @@ false 600 5 - 0.5 + 0.25 diff --git a/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechKind_CE.xml b/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechKind_CE.xml index 3591f2c101..2c6cae5f4d 100644 --- a/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechKind_CE.xml +++ b/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechKind_CE.xml @@ -155,7 +155,7 @@ 200 true 116 - 0.75 + 0.5 @@ -436,7 +436,7 @@ 200 true 116 - 0.75 + 0.5 @@ -592,7 +592,7 @@ 200 true 116 - 0.75 + 0.5 @@ -721,7 +721,7 @@ 200 true 150 - 0.75 + 0.5 diff --git a/ModPatches/pphhyy's Lightless Empyrean/Patches/pphhyy's Lightless Empyrean/Race_Animals.xml b/ModPatches/pphhyy's Lightless Empyrean/Patches/pphhyy's Lightless Empyrean/Race_Animals.xml index 956bc5dc7a..39bf4fef06 100644 --- a/ModPatches/pphhyy's Lightless Empyrean/Patches/pphhyy's Lightless Empyrean/Race_Animals.xml +++ b/ModPatches/pphhyy's Lightless Empyrean/Patches/pphhyy's Lightless Empyrean/Race_Animals.xml @@ -16,7 +16,7 @@ 0.05 0.02 - 0.18 + 0.18 @@ -33,7 +33,7 @@ 1.26 pphhyy_LightlessEmpyrean_TentacleAttackTool 0.450 - 0.25 + 0.25
  • @@ -73,7 +73,7 @@ 1.26 pphhyy_LightlessEmpyrean_TentacleAttackTool 1.25 - 0.85 + 0.85
  • @@ -171,7 +171,7 @@ true 600 5 - 0.5 + 0.25
    • @@ -192,10 +192,10 @@ 6 -
  • - Stun - 14 -
    • +
  • + Stun + 14 +
    • @@ -210,10 +210,10 @@ 6 -
  • - Stun - 14 -
    • +
  • + Stun + 14 +
    • @@ -284,10 +284,10 @@ 6 -
  • - Stun - 14 -
    • +
  • + Stun + 14 +
    • @@ -302,10 +302,10 @@ 6 -
  • - Stun - 14 -
    • +
  • + Stun + 14 +
    • diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml index c5bae57f45..abe8c30e21 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml @@ -108,7 +108,7 @@ true 600 5 - 0.75 + 0.5 @@ -363,7 +363,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml index 62a60d6c4d..434d67b4f1 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml @@ -57,7 +57,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml b/Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml index c86504ac39..fbe8f11cda 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml @@ -115,7 +115,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml index 8a00c9a532..e8b8bca310 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml @@ -91,7 +91,7 @@ true 600 5 - 0.75 + 0.5 @@ -186,7 +186,7 @@ true 600 5 - 0.75 + 0.5 @@ -324,7 +324,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml index 4362976354..52c2b87e41 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml @@ -87,21 +87,14 @@ Defs/ThingDef[defName="Megascarab"]/statBases/ArmorRating_Blunt - 2.25 + 6 Defs/ThingDef[defName="Megascarab"]/statBases/ArmorRating_Sharp - 0.7 - - - - - Defs/ThingDef[defName="Megascarab"]/race/baseHealthScale - - 0.3 + 3 @@ -123,7 +116,7 @@ true 600 5 - 0.5 + 0.25 @@ -195,13 +188,6 @@ - - Defs/ThingDef[defName="Spelopede"]/race/baseHealthScale - - 1.2 - - - Defs/ThingDef[defName="Spelopede"]/comps @@ -216,11 +202,11 @@ Defs/ThingDef[defName="Spelopede"]/comps
  • - 500 + 625 true 600 5 - 0.5 + 0.25
    • @@ -292,13 +278,6 @@ - - Defs/ThingDef[defName="Megaspider"]/race/baseHealthScale - - 1.8 - - - Defs/ThingDef[defName="Megaspider"]/comps @@ -313,11 +292,11 @@ Defs/ThingDef[defName="Megaspider"]/comps
  • - 750 + 925 true 600 5 - 0.5 + 0.25
    • diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Pet.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Pet.xml index 576838a724..4825c80b52 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Pet.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Pet.xml @@ -154,7 +154,7 @@ true 600 5 - 0.75 + 0.5 @@ -249,7 +249,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Temperate.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Temperate.xml index 1c0073da6a..f0c0a8d9bf 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Temperate.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Temperate.xml @@ -599,7 +599,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml b/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml index 59b87d4af0..279ab193e3 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml @@ -132,7 +132,7 @@ true 600 5 - 0.75 + 0.5 @@ -258,7 +258,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/Patches/Core/ThingDefs_Races/Races_Humanlike.xml b/Patches/Core/ThingDefs_Races/Races_Humanlike.xml index 570fe087c5..ffa8c07952 100644 --- a/Patches/Core/ThingDefs_Races/Races_Humanlike.xml +++ b/Patches/Core/ThingDefs_Races/Races_Humanlike.xml @@ -102,7 +102,7 @@ 200 true 500 --> - 0.75 + 0.5 + 0.5 @@ -450,11 +446,7 @@ 200 true 100 - 0.75 - + 0.5 @@ -557,11 +549,7 @@ 200 true 100 - 0.75 - 4 - 8 - + 0.5 @@ -668,10 +656,6 @@ true 188 0.5 - 10 - 22 - From 6b9dc5f5834b6ba3d2f6ec7b859df83ce2734596 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Tue, 13 Aug 2024 00:23:59 +0330 Subject: [PATCH 003/451] large animal natural armor --- .../ThingDefs_Races/Royal_Animals.xml | 25 +++++++++ .../ThingDefs_Races/WasteAnimals_Toxbear.xml | 25 +++++++++ .../ThingDefs_Races/WasteAnimals_Toxlion.xml | 25 +++++++++ .../AridShrubland_Animals.xml | 50 ++++++++++++++++++ .../BorealForest_Animals.xml | 2 + .../Desert_Animals.xml | 25 +++++++++ .../ExtremeDesert_Animals.xml | 25 +++++++++ .../IceSheet_Animals.xml | 25 +++++++++ .../TropicalRainforest_Animals.xml | 52 +++++++++++++++++++ .../TropicalSwamp_Animals.xml | 50 ++++++++++++++++++ .../Tundra_Animals.xml | 25 +++++++++ .../ThingDefs_Races/Races_Animal_Arid.xml | 2 +- .../ThingDefs_Races/Races_Animal_Bears.xml | 2 + .../ThingDefs_Races/Races_Animal_BigCat.xml | 2 + .../ThingDefs_Races/Races_Animal_Giant.xml | 6 ++- .../Races_Animal_WildCanines.xml | 2 + 16 files changed, 340 insertions(+), 3 deletions(-) diff --git a/ModPatches/Vanilla Animals Expanded - Royal Animals/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml b/ModPatches/Vanilla Animals Expanded - Royal Animals/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml index 7b0541904b..d9cc0160e0 100644 --- a/ModPatches/Vanilla Animals Expanded - Royal Animals/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded - Royal Animals/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml @@ -461,6 +461,8 @@ 0.18 0.09 0.07 + 1 + 0.1 @@ -539,6 +541,29 @@ + + Defs/ThingDef[defName="VAERoy_RoyalTiger"]/comps + + Defs/ThingDef[defName="VAERoy_RoyalTiger"] + + + + + + + + Defs/ThingDef[defName="VAERoy_RoyalTiger"]/comps + +
  • + 690 + true + 600 + 5 + 0.5 +
    • +     +     + diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml index c028ead569..50ef82e77b 100644 --- a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml +++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml @@ -17,6 +17,8 @@ 0.1 0.3 0.25 + 1 + 0.1 @@ -96,4 +98,27 @@ + + Defs/ThingDef[defName="VAEWaste_Toxbear"]/comps + + Defs/ThingDef[defName="VAEWaste_Toxbear"] + + + + + + + + Defs/ThingDef[defName="VAEWaste_Toxbear"]/comps + +
  • + 1625 + true + 600 + 5 + 0.5 +
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml index afca1f15a2..65b06b398a 100644 --- a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml +++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml @@ -16,6 +16,8 @@ 0.19 0.18 0.17 + 0.5 + 0.05 @@ -97,4 +99,27 @@ + + Defs/ThingDef[defName="VAEWaste_Toxlion"]/comps + + Defs/ThingDef[defName="VAEWaste_Toxlion"] + + + + + + + + Defs/ThingDef[defName="VAEWaste_Toxlion"]/comps + +
  • + 660 + true + 600 + 5 + 0.5 +
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml index 6acc72b8d0..847a4520ef 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml @@ -143,6 +143,8 @@ 0.1 0.24 0.31 + 2 + 0.2 @@ -198,6 +200,29 @@ + + Defs/ThingDef[defName="AEXP_Crocodile"]/comps + + Defs/ThingDef[defName="AEXP_Crocodile"] + + + + + + + + Defs/ThingDef[defName="AEXP_Crocodile"]/comps + +
  • + 800 + true + 600 + 5 + 0.5 +
    • +     +     + Defs/ThingDef[defName="AEXP_Giraffe"]/statBases @@ -269,6 +294,8 @@ 0.07 0.6 0.35 + 1 + 0.1 @@ -324,6 +351,29 @@ + + Defs/ThingDef[defName="AEXP_Hippopotamus"]/comps + + Defs/ThingDef[defName="AEXP_Hippopotamus"] + + + + + + + + Defs/ThingDef[defName="AEXP_Hippopotamus"]/comps + +
  • + 1850 + true + 600 + 5 + 0.5 +
    • +     +     + Defs/ThingDef[defName="AEXP_Wildebeest"]/statBases diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml index 63bf1982af..6c3d882544 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml @@ -72,6 +72,8 @@ 0.15 0.15 0.15 + 0.5 + 0.05 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml index 8ea9b26f79..306003bd36 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml @@ -236,6 +236,8 @@ 0.19 0.18 0.17 + 0.5 + 0.05 @@ -317,4 +319,27 @@ + + Defs/ThingDef[defName="AEXP_Lion"]/comps + + Defs/ThingDef[defName="AEXP_Lion"] + + + + + + + + Defs/ThingDef[defName="AEXP_Lion"]/comps + +
  • + 800 + true + 600 + 5 + 0.5 +
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml index ee4d22e2bd..c0ce4f3b96 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml @@ -72,6 +72,8 @@ 0.19 0.33 0.17 + 1 + 0.5 @@ -124,6 +126,29 @@ + + Defs/ThingDef[defName="AEXP_Megascorpion"]/comps + + Defs/ThingDef[defName="AEXP_Megascorpion"] + + + + + + + + Defs/ThingDef[defName="AEXP_Megascorpion"]/comps + +
  • + 150 + true + 600 + 5 + 0.5 +
    • +     +     + Defs/ThingDef[defName="AEXP_Rattlesnake"]/statBases diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml index c1329a4064..9e05385ea7 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml @@ -125,6 +125,8 @@ 0.06 0.25 0.23 + 2 + 0.2 @@ -160,4 +162,27 @@ + + Defs/ThingDef[defName="AEXP_Walrus"]/comps + + Defs/ThingDef[defName="AEXP_Walrus"] + + + + + + + + Defs/ThingDef[defName="AEXP_Walrus"]/comps + +
  • + 1700 + true + 600 + 5 + 0.5 +
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml index 9d8a8d8c53..aa6ccfe1cb 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml @@ -9,6 +9,8 @@ 0.2 0.20 0.15 + 1 + 0.1 @@ -79,6 +81,29 @@ + + Defs/ThingDef[defName="AEXP_Gorilla"]/comps + + Defs/ThingDef[defName="AEXP_Gorilla"] + + + + + + + + Defs/ThingDef[defName="AEXP_Gorilla"]/comps + +
  • + 975 + true + 600 + 5 + 0.5 +
    • +     +     + Defs/ThingDef[defName="AEXP_Jaguar"]/statBases @@ -87,6 +112,8 @@ 0.26 0.20 0.07 + 0.5 + 0.05 @@ -266,6 +293,8 @@ 0.27 0.50 0.15 + 0.5 + 0.05 @@ -347,4 +376,27 @@ + + Defs/ThingDef[defName="AEXP_Tiger"]/comps + + Defs/ThingDef[defName="AEXP_Tiger"] + + + + + + + + Defs/ThingDef[defName="AEXP_Tiger"]/comps + +
  • + 900 + true + 600 + 5 + 0.5 +
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml index 5b19f5d505..2ca6339c6e 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml @@ -9,6 +9,8 @@ 0.1 0.24 0.31 + 3 + 0.3 @@ -40,6 +42,29 @@ + + Defs/ThingDef[defName="AEXP_Alligator"]/comps + + Defs/ThingDef[defName="AEXP_Alligator"] + + + + + + + + Defs/ThingDef[defName="AEXP_Alligator"]/comps + +
  • + 925 + true + 600 + 5 + 0.5 +
    • +     +     + Defs/ThingDef[defName="AEXP_Anaconda"]/statBases @@ -99,6 +124,8 @@ 0.10 0.50 0.30 + 1.5 + 0.15 @@ -142,4 +169,27 @@ + + Defs/ThingDef[defName="AEXP_IndianElephant"]/comps + + Defs/ThingDef[defName="AEXP_IndianElephant"] + + + + + + + + Defs/ThingDef[defName="AEXP_IndianElephant"]/comps + +
  • + 1575 + true + 600 + 5 + 0.5 +
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Animals.xml index 9d865bc28f..b35822403f 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Animals.xml @@ -9,6 +9,8 @@ 0.07 0.59 0.29 + 2 + 0.3 @@ -87,6 +89,29 @@ + + Defs/ThingDef[defName="AEXP_MegaWolverine"]/comps + + Defs/ThingDef[defName="AEXP_MegaWolverine"] + + + + + + + + Defs/ThingDef[defName="AEXP_MegaWolverine"]/comps + +
  • + 1850 + true + 600 + 5 + 0.5 +
    • +     +     + Defs/ThingDef[defName="AEXP_Moose"]/statBases diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml index abe8c30e21..55b3fc1c36 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml @@ -282,7 +282,7 @@ 0.52 0.33 8 - 0.28 + 0.35 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml index 434d67b4f1..fff284a21c 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml @@ -25,6 +25,8 @@ 0.16 0.23 0.18 + 1 + 0.1 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml b/Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml index fbe8f11cda..821dd0874c 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml @@ -18,6 +18,8 @@ 0.19 0.08 0.07 + 0.5 + 0.05 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml index e8b8bca310..94341abd53 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml @@ -10,8 +10,8 @@ 0.08 0.79 0.51 - 0.205 - 0.1 + 2 + 0.2 @@ -104,6 +104,8 @@ 0.09 0.67 0.48 + 2 + 0.3 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml b/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml index 279ab193e3..28eca3bc72 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml @@ -27,6 +27,8 @@ 0.23 0.20 0.11 + 1.5 + 0.15 From aaabc299d05e3b6ad77f5aee09ef258185ef8c69 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Mon, 19 Aug 2024 21:51:50 +0330 Subject: [PATCH 004/451] duplicate node housekeeping --- Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml b/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml index 28eca3bc72..cc5927ff4f 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml @@ -22,13 +22,11 @@ Defs/ThingDef[defName="Warg"]/statBases - 0.075 - 0.05 + 1.5 + 0.15 0.23 0.20 0.11 - 1.5 - 0.15 From bec00fc14ce2da329248e323d2aac76c1ef1e4ee Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Wed, 21 Aug 2024 11:46:40 +0330 Subject: [PATCH 005/451] animal implants updated adjustments from upstream --- ModPatches/Alpha Implants/Hediffs_Implants.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ModPatches/Alpha Implants/Hediffs_Implants.xml b/ModPatches/Alpha Implants/Hediffs_Implants.xml index edf9127454..935d695735 100644 --- a/ModPatches/Alpha Implants/Hediffs_Implants.xml +++ b/ModPatches/Alpha Implants/Hediffs_Implants.xml @@ -62,14 +62,14 @@ Defs/HediffDef[defName="AI_AnimalProstheticShell"]/stages/li/statOffsets/ArmorRating_Sharp - 1.0 + 2.0 Defs/HediffDef[defName="AI_AnimalProstheticShell"]/stages/li/statOffsets/ArmorRating_Blunt - 0.75 + 1.5 @@ -211,14 +211,14 @@ Defs/HediffDef[defName="AI_AnimalBionicShell"]/stages/li/statOffsets/ArmorRating_Sharp - 2 + 3.5 Defs/HediffDef[defName="AI_AnimalBionicShell"]/stages/li/statOffsets/ArmorRating_Blunt - 1.5 + 2.5 From d90f3e1395438165e9bade2780299cb2b64b177d Mon Sep 17 00:00:00 2001 From: CMDR-Bill-Doors Date: Thu, 22 Aug 2024 18:42:18 +0100 Subject: [PATCH 006/451] Update ProjectileCE.cs --- .../CombatExtended/Projectiles/ProjectileCE.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs index ee3cd03a43..551b29dbd0 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs @@ -106,6 +106,7 @@ public virtual float DamageAmount public bool canTargetSelf; public bool castShadow = true; public bool logMisses = true; + protected bool ignoreRoof; public GlobalTargetInfo globalTargetInfo = GlobalTargetInfo.Invalid; public GlobalTargetInfo globalSourceInfo = GlobalTargetInfo.Invalid; @@ -348,6 +349,7 @@ public override void ExposeData() Scribe_Values.Look(ref logMisses, "logMisses", true); Scribe_Values.Look(ref castShadow, "castShadow", true); Scribe_Values.Look(ref lerpPosition, "lerpPosition", true); + Scribe_Values.Look(ref ignoreRoof, "ignoreRoof", true); //To fix landed grenades sl problem Scribe_Values.Look(ref exactPosition, "exactPosition"); @@ -551,6 +553,10 @@ public virtual void Launch(Thing launcher, Vector2 origin, float shotAngle, floa this.lerpPosition = props.lerpPosition; this.GravityFactor = props.Gravity; } + if (shotHeight >= CollisionVertical.WallCollisionHeight && launcher.Position.Roofed(launcher.Map)) + { + ignoreRoof = true; + } Launch(launcher, origin, equipment); } @@ -867,7 +873,7 @@ protected bool CheckCellForCollision(IntVec3 cell) protected virtual bool TryCollideWithRoof(IntVec3 cell) { - if (!cell.Roofed(Map)) + if (!cell.Roofed(Map) || ignoreRoof) { return false; } From 6254c8d5272d5e43dfbcca3a1b1aedb5432ed512 Mon Sep 17 00:00:00 2001 From: CMDR-Bill-Doors Date: Thu, 22 Aug 2024 18:52:25 +0100 Subject: [PATCH 007/451] not fly overhead --- .../CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs index 551b29dbd0..d3688f6109 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs @@ -553,7 +553,7 @@ public virtual void Launch(Thing launcher, Vector2 origin, float shotAngle, floa this.lerpPosition = props.lerpPosition; this.GravityFactor = props.Gravity; } - if (shotHeight >= CollisionVertical.WallCollisionHeight && launcher.Position.Roofed(launcher.Map)) + if (shotHeight >= CollisionVertical.WallCollisionHeight && launcher.Position.Roofed(launcher.Map) && !def.projectile.flyOverhead) { ignoreRoof = true; } From e76c8f5d825a8a263d5a057a170e378d6fe62b91 Mon Sep 17 00:00:00 2001 From: CMDR-Bill-Doors Date: Thu, 22 Aug 2024 18:58:31 +0100 Subject: [PATCH 008/451] Update ProjectileCE.cs --- .../CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs index d3688f6109..527b98cb34 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs @@ -553,7 +553,7 @@ public virtual void Launch(Thing launcher, Vector2 origin, float shotAngle, floa this.lerpPosition = props.lerpPosition; this.GravityFactor = props.Gravity; } - if (shotHeight >= CollisionVertical.WallCollisionHeight && launcher.Position.Roofed(launcher.Map) && !def.projectile.flyOverhead) + if (shotHeight >= CollisionVertical.WallCollisionHeight && Position.Roofed(launcher.Map) && !def.projectile.flyOverhead) { ignoreRoof = true; } From 85e18c5cccfa86e933ede130268c60bb370f49d6 Mon Sep 17 00:00:00 2001 From: CMDR-Bill-Doors Date: Thu, 22 Aug 2024 19:05:55 +0100 Subject: [PATCH 009/451] fly overhead fix --- .../CombatExtended/Projectiles/ProjectileCE.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs index 527b98cb34..5cdf7846d6 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs @@ -553,7 +553,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) && !def.projectile.flyOverhead) + if (shotHeight >= CollisionVertical.WallCollisionHeight && Position.Roofed(launcher.Map)) { ignoreRoof = true; } @@ -1200,6 +1200,11 @@ public override void Tick() { DangerTracker?.Notify_BulletAt(Position, def.projectile.damageAmountBase * dangerFactor); } + //If a flyoverhead ignore roof projectile is descending, enable roof check. + if (ignoreRoof && def.projectile.flyOverhead && shotAngle < 0) + { + ignoreRoof = false; + } } /// From ee055889c1e5e292c14619e66fc9d59f06dab7be Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Fri, 23 Aug 2024 14:46:38 +0330 Subject: [PATCH 010/451] sharp armor value readjustments --- .../Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml | 8 ++++---- .../Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml | 8 ++++---- ModPatches/Alpha Implants/Royalty/Hediffs_Implants.xml | 8 ++++---- .../Patches/Anima Bionics/Hediffs_Anima_Bionics.xml | 4 ++-- .../Big and Small Genes/Genes/GeneDefs_Armor.xml | 6 +++--- .../Big and Small Genes/HediffDefs/Hediffs_Armor.xml | 10 +++++----- .../BEI_Hediffs_BodyParts.xml | 4 ++-- .../Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml | 2 +- .../HediffDefs/FSFAdvancedBionics_AddedParts.xml | 2 +- .../Patches/Save Our Ship 2/Hediffs_SOS2.xml | 4 ++-- .../Ushankas Glitterworld Uprising/Hediff_Glitter.xml | 2 +- .../GeneDefs/GeneDefs_BarkSkin.xml | 1 - .../GeneDefs/GeneDefs_ScaleSkin.xml | 2 +- .../Patches/Bionics_Patch.xml | 4 ++-- Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml | 6 +++--- 15 files changed, 35 insertions(+), 36 deletions(-) diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml index df51fa0037..73b9e9120e 100644 --- a/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml @@ -5,7 +5,7 @@ Defs/GeneDef[defName="AG_FungalSkin"]/customEffectDescriptions -
  • +3/9 blunt/sharp natural armour. +25% injury healing factor.
    • +
  • +3/7.5 blunt/sharp natural armour. +25% injury healing factor.
  • Fires will cause permanent wounds.
    •      @@ -15,7 +15,7 @@ Defs/GeneDef[defName="AG_ArmourMinor"]/customEffectDescriptions -
  • +1/3 blunt/sharp natural armour.
    • +
  • +1/2.5 blunt/sharp natural armour.
    •      @@ -24,7 +24,7 @@ Defs/GeneDef[defName="AG_ArmourMedium"]/customEffectDescriptions -
  • +2/6 blunt/sharp natural armour.
    • +
  • +2/4.5 blunt/sharp natural armour.
    •      @@ -33,7 +33,7 @@ Defs/GeneDef[defName="AG_ArmourMajor"]/customEffectDescriptions -
  • +2.5/7.5 blunt/sharp natural armour.
    • +
  • +2.5/6 blunt/sharp natural armour.
    •      diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml index 6d2438ea79..ed7365d633 100644 --- a/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml @@ -6,7 +6,7 @@ 3.0 - 9.0 + 7.5 0.25 @@ -17,7 +17,7 @@ 1.0 - 3.0 + 2.5 @@ -27,7 +27,7 @@ 2.0 - 6.0 + 4.5 @@ -37,7 +37,7 @@ 2.5 - 7.5 + 6.0 diff --git a/ModPatches/Alpha Implants/Royalty/Hediffs_Implants.xml b/ModPatches/Alpha Implants/Royalty/Hediffs_Implants.xml index 76af992315..f69f30c2b7 100644 --- a/ModPatches/Alpha Implants/Royalty/Hediffs_Implants.xml +++ b/ModPatches/Alpha Implants/Royalty/Hediffs_Implants.xml @@ -17,7 +17,7 @@
  • Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/statOffsets/ArmorRating_Sharp - 2 + 1.5
    • @@ -32,7 +32,7 @@ Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/statOffsets -0.25 - -0.01 + -0.02 @@ -64,7 +64,7 @@
  • Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/statOffsets/ArmorRating_Sharp - 4 + 3
    • @@ -78,7 +78,7 @@
  • Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/statOffsets - -0.02 + -0.05
    • diff --git a/ModPatches/Anima Bionics/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml b/ModPatches/Anima Bionics/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml index 4c602e15f0..6d66da1ccc 100644 --- a/ModPatches/Anima Bionics/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml +++ b/ModPatches/Anima Bionics/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml @@ -31,7 +31,7 @@ Defs/HediffDef[defName="AnimaPlateHediff"]/stages/li/statOffsets/ArmorRating_Sharp - 2.5 + 2.0 @@ -53,7 +53,7 @@ Defs/HediffDef[defName="AnimaspineHediff"]/stages/li/statOffsets/ArmorRating_Sharp - 1.7 + 1.4 diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Armor.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Armor.xml index cf761b6bb2..f72db3982a 100644 --- a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Armor.xml +++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Armor.xml @@ -6,7 +6,7 @@ Defs/GeneDef[defName="BS_ToughSkin"]/customEffectDescriptions -
  • +1 mm natural sharp armor
    • +
  • +0.75 mm natural sharp armor
  • +1.0 mPA natural blunt armor
    •      @@ -16,7 +16,7 @@ Defs/GeneDef[defName="BS_NaturalArmor"]/customEffectDescriptions -
  • +2 mm natural sharp armor
    • +
  • +1.5 mm natural sharp armor
  • +1.5 mPA natural blunt armor
    •      @@ -26,7 +26,7 @@ Defs/GeneDef[defName="BS_NaturalArmor_Great"]/customEffectDescriptions -
  • +3 mm natural sharp armor
    • +
  • +2.5 mm natural sharp armor
  • +2 mPA natural blunt armor
    •      diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Armor.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Armor.xml index d023d10564..21ac9f143a 100644 --- a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Armor.xml +++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Armor.xml @@ -6,7 +6,7 @@ 1 - 1 + 0.75 @@ -16,7 +16,7 @@ 1.5 - 2 + 1.5 @@ -26,7 +26,7 @@ 2 - 3 + 2.5 @@ -36,7 +36,7 @@ 1 - 0.5 + 0.75 @@ -46,7 +46,7 @@ 2 - 1.5 + 2.5 diff --git a/ModPatches/Biotech Expansion - Insectoid/Patches/Biotech Expansion - Insectoid/BEI_Hediffs_BodyParts.xml b/ModPatches/Biotech Expansion - Insectoid/Patches/Biotech Expansion - Insectoid/BEI_Hediffs_BodyParts.xml index b087c34a3a..988c265576 100644 --- a/ModPatches/Biotech Expansion - Insectoid/Patches/Biotech Expansion - Insectoid/BEI_Hediffs_BodyParts.xml +++ b/ModPatches/Biotech Expansion - Insectoid/Patches/Biotech Expansion - Insectoid/BEI_Hediffs_BodyParts.xml @@ -26,7 +26,7 @@ Defs/GeneDef[defName="BTEIst_HardenedChitin"]/statOffsets - 3.0 + 2.5 4.0 @@ -36,7 +36,7 @@ Defs/HediffDef[defName="BTEIst_Exogelatin"]/stages/li/statOffsets - 3.0 + 2.5 4.0 diff --git a/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml b/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml index 133b43561a..40e7709363 100644 --- a/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml +++ b/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml @@ -13,7 +13,7 @@ Defs/HediffDef[defName="ERN_SephyrToughen"]/stages/li/statOffsets/ArmorRating_Sharp - 1.4 + 1.1 diff --git a/ModPatches/FSF Advanced Bionics Expansion/Patches/FSF Advanced Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml b/ModPatches/FSF Advanced Bionics Expansion/Patches/FSF Advanced Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml index 0da41fb2aa..f101f5b450 100644 --- a/ModPatches/FSF Advanced Bionics Expansion/Patches/FSF Advanced Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml +++ b/ModPatches/FSF Advanced Bionics Expansion/Patches/FSF Advanced Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml @@ -222,7 +222,7 @@ Defs/HediffDef[defName="FSFArchotechSkinI"]/stages/li/statOffsets/ArmorRating_Sharp - 12 + 9 diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Hediffs_SOS2.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Hediffs_SOS2.xml index ebce1b585d..dee44e71df 100644 --- a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Hediffs_SOS2.xml +++ b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Hediffs_SOS2.xml @@ -17,7 +17,7 @@ Defs/HediffDef[defName="SoSArchotechSkin"]/stages/li/statOffsets/ArmorRating_Sharp - 16 + 12 @@ -65,7 +65,7 @@
  • Defs/HediffDef[defName="SoSHologramArchotech"]/stages/li/statOffsets/ArmorRating_Sharp - 24.0 + 18.0
    • diff --git a/ModPatches/Ushankas Glitterworld Uprising/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml b/ModPatches/Ushankas Glitterworld Uprising/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml index 38c96d4ec3..33154204c3 100644 --- a/ModPatches/Ushankas Glitterworld Uprising/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml +++ b/ModPatches/Ushankas Glitterworld Uprising/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml @@ -9,7 +9,7 @@ Defs/HediffDef[defName="USH_InstalledGoldenSkinReplacement"]/stages/li/statOffsets/ArmorRating_Sharp - 1.7 + 1.3 diff --git a/ModPatches/Vanilla Races Expanded - Phytokin/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/GeneDefs_BarkSkin.xml b/ModPatches/Vanilla Races Expanded - Phytokin/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/GeneDefs_BarkSkin.xml index 50fc03bafe..e1682aa21e 100644 --- a/ModPatches/Vanilla Races Expanded - Phytokin/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/GeneDefs_BarkSkin.xml +++ b/ModPatches/Vanilla Races Expanded - Phytokin/Patches/Vanilla Races Expanded - Phytokin/GeneDefs/GeneDefs_BarkSkin.xml @@ -5,7 +5,6 @@ Defs/GeneDef[defName="VRE_BarkSkin"]/statOffsets/ArmorRating_Blunt 8.5 - 0.5 diff --git a/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml b/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml index 17ac52d97b..7cb35739d3 100644 --- a/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml +++ b/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml @@ -4,7 +4,7 @@ Defs/GeneDef[defName="VRESaurids_ScaleSkin"]/statOffsets/ArmorRating_Sharp - 1.0 + 0.75 diff --git a/ModPatches/YetAnotherProsthetics - Core/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml b/ModPatches/YetAnotherProsthetics - Core/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml index c3689485a7..e8a9c28824 100644 --- a/ModPatches/YetAnotherProsthetics - Core/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml +++ b/ModPatches/YetAnotherProsthetics - Core/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml @@ -184,7 +184,7 @@ Defs/HediffDef[defName="BIE_UltratechBionicSkin"]/stages/li/statOffsets/ArmorRating_Sharp - 3.5 + 2.5 @@ -199,7 +199,7 @@ Defs/HediffDef[defName="SoSArchotechSkin"]/stages/li/statOffsets/ArmorRating_Sharp - 6 + 4.5 diff --git a/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml b/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml index 0bbff9fad9..a834aa06e7 100644 --- a/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml +++ b/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml @@ -182,14 +182,14 @@ Defs/HediffDef[defName="ArmorskinGland"]/stages/li/statOffsets/ArmorRating_Sharp - 4 + 3.5 Defs/HediffDef[defName="ArmorskinGland"]/stages/li/statOffsets/ArmorRating_Blunt - 3.5 + 3.25 @@ -208,7 +208,7 @@ Defs/HediffDef[defName="StoneskinGland"]/stages/li/statOffsets/ArmorRating_Sharp - 10 + 8 From 4bae453029225c153456bf615d9acceab5a6d347 Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Fri, 23 Aug 2024 19:43:38 +0330 Subject: [PATCH 011/451] natural armor readjustments --- .../ThingDefs_Races/Royal_Animals.xml | 2 +- .../ThingDefs_Races/WasteAnimals_Toxbear.xml | 2 +- .../ThingDefs_Races/WasteAnimals_Toxlion.xml | 2 +- .../Vanilla Animals Expanded/AridShrubland_Animals.xml | 4 ++-- .../Vanilla Animals Expanded/BorealForest_Animals.xml | 2 +- .../Patches/Vanilla Animals Expanded/Desert_Animals.xml | 2 +- .../Patches/Vanilla Animals Expanded/IceSheet_Animals.xml | 2 +- .../Vanilla Animals Expanded/TropicalRainforest_Animals.xml | 6 ++---- .../Vanilla Animals Expanded/TropicalSwamp_Animals.xml | 4 ++-- .../Patches/Vanilla Animals Expanded/Tundra_Animals.xml | 2 +- Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml | 2 +- Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml | 2 +- Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml | 2 +- Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml | 4 ++-- Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml | 2 +- 15 files changed, 19 insertions(+), 21 deletions(-) diff --git a/ModPatches/Vanilla Animals Expanded - Royal Animals/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml b/ModPatches/Vanilla Animals Expanded - Royal Animals/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml index d9cc0160e0..ece4bbe415 100644 --- a/ModPatches/Vanilla Animals Expanded - Royal Animals/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded - Royal Animals/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml @@ -461,7 +461,7 @@ 0.18 0.09 0.07 - 1 + 0.3 0.1 diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml index 50ef82e77b..7510251c9f 100644 --- a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml +++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml @@ -17,7 +17,7 @@ 0.1 0.3 0.25 - 1 + 0.3 0.1 diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml index 65b06b398a..b111e769b9 100644 --- a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml +++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml @@ -16,7 +16,7 @@ 0.19 0.18 0.17 - 0.5 + 0.15 0.05 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml index 847a4520ef..07ad546ed6 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml @@ -143,7 +143,7 @@ 0.1 0.24 0.31 - 2 + 0.6 0.2 @@ -294,7 +294,7 @@ 0.07 0.6 0.35 - 1 + 0.3 0.1 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml index 6c3d882544..8f682ef2f1 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml @@ -72,7 +72,7 @@ 0.15 0.15 0.15 - 0.5 + 0.15 0.05 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml index 306003bd36..afb014a8a3 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml @@ -236,7 +236,7 @@ 0.19 0.18 0.17 - 0.5 + 0.15 0.05 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml index 9e05385ea7..54e68531a6 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml @@ -125,7 +125,7 @@ 0.06 0.25 0.23 - 2 + 0.6 0.2 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml index aa6ccfe1cb..de8aea6094 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml @@ -9,8 +9,6 @@ 0.2 0.20 0.15 - 1 - 0.1 @@ -112,7 +110,7 @@ 0.26 0.20 0.07 - 0.5 + 0.15 0.05 @@ -293,7 +291,7 @@ 0.27 0.50 0.15 - 0.5 + 0.15 0.05 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml index 2ca6339c6e..4b223089bd 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml @@ -9,7 +9,7 @@ 0.1 0.24 0.31 - 3 + 1.0 0.3 @@ -124,7 +124,7 @@ 0.10 0.50 0.30 - 1.5 + 0.45 0.15 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Animals.xml index b35822403f..d95ec7e554 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Animals.xml @@ -9,7 +9,7 @@ 0.07 0.59 0.29 - 2 + 1.0 0.3 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml index 55b3fc1c36..fa70dcd0fe 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml @@ -281,7 +281,7 @@ 0.11 0.52 0.33 - 8 + 1.0 0.35 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml index fff284a21c..04b1093b14 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml @@ -25,7 +25,7 @@ 0.16 0.23 0.18 - 1 + 0.3 0.1 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml b/Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml index 821dd0874c..22dae3c057 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml @@ -18,7 +18,7 @@ 0.19 0.08 0.07 - 0.5 + 0.15 0.05 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml index 94341abd53..470346314a 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml @@ -10,7 +10,7 @@ 0.08 0.79 0.51 - 2 + 0.6 0.2 @@ -104,7 +104,7 @@ 0.09 0.67 0.48 - 2 + 1.0 0.3 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml b/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml index cc5927ff4f..95fe7b6494 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml @@ -22,7 +22,7 @@ Defs/ThingDef[defName="Warg"]/statBases - 1.5 + 0.45 0.15 0.23 0.20 From 5dba41d4e1e4216b4ffa25df1c475ee204d21c05 Mon Sep 17 00:00:00 2001 From: ViralReaction <136116069+ViralReaction@users.noreply.github.com> Date: Sat, 24 Aug 2024 11:55:56 -0600 Subject: [PATCH 012/451] Profane Patch --- LoadFolders.xml | 1 + .../Defs/Profaned/PossessedWeapons_Ammo.xml | 104 +++ .../Defs/Profaned/Profaned_DamageDef.xml | 19 + .../Defs/Profaned/Profaned_ManueverDef.xml | 18 + .../Profaned/Profaned_ToolCapacityDef.xml | 30 + .../Profaned_ToxicBreathProjectile.xml | 70 ++ .../DamageDef/Profaned_DamagedDef.xml | 18 + .../Scenarios/Profaned_Scenario_Patch.xml | 15 + .../Profaned_Items_Resources.xml | 29 + .../ThingDefs_Misc/Profaned_Apparel_Armor.xml | 301 +++++++++ .../Profaned_Apparel_Helmets.xml | 139 ++++ .../Profaned_Apparel_Shields.xml | 107 +++ .../Profaned_CE_Patch_Projectiles.xml | 107 +++ .../Profaned_CE_Patch_VerbShoot.xml | 121 ++++ .../Weapons/Profaned_Weapons_Melee.xml | 631 ++++++++++++++++++ .../Weapons/Profaned_Weapons_Ranged.xml | 147 ++++ .../Profaned_Race_Colossus.xml | 124 ++++ .../ThingDefs_Races/Profaned_Race_Ghoul.xml | 98 +++ .../Profaned_Race_Skeleton.xml | 64 ++ .../Profaned_Race_UndeadCat.xml | 99 +++ .../Profaned_Race_UndeadDragon.xml | 146 ++++ .../Profaned_Race_UndeadHorse.xml | 93 +++ .../Profaned_Race_UndeadWarg.xml | 140 ++++ .../ThingDefs_Races/Profaned_Race_Wraith.xml | 64 ++ 24 files changed, 2685 insertions(+) create mode 100644 ModPatches/Profaned/Defs/Profaned/PossessedWeapons_Ammo.xml create mode 100644 ModPatches/Profaned/Defs/Profaned/Profaned_DamageDef.xml create mode 100644 ModPatches/Profaned/Defs/Profaned/Profaned_ManueverDef.xml create mode 100644 ModPatches/Profaned/Defs/Profaned/Profaned_ToolCapacityDef.xml create mode 100644 ModPatches/Profaned/Defs/Profaned/Profaned_ToxicBreathProjectile.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/DamageDef/Profaned_DamagedDef.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/Scenarios/Profaned_Scenario_Patch.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/ThingDefs_Items/Profaned_Items_Resources.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Armor.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Helmets.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Shields.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_Projectiles.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_VerbShoot.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Melee.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Ranged.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Colossus.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Ghoul.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Skeleton.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadCat.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadDragon.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadHorse.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadWarg.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Wraith.xml diff --git a/LoadFolders.xml b/LoadFolders.xml index 2025ead21f..7f02e27c13 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -371,6 +371,7 @@
  • ModPatches/PowerArmour T-45b
  • ModPatches/Pratt WWII Weapons Pack
  • ModPatches/Prestige Specialist Armor
    • +
  • ModPatches/Profaned
  • ModPatches/Project RimFactory - Materials
  • ModPatches/Prostheses+
  • ModPatches/Protoswords
    • diff --git a/ModPatches/Profaned/Defs/Profaned/PossessedWeapons_Ammo.xml b/ModPatches/Profaned/Defs/Profaned/PossessedWeapons_Ammo.xml new file mode 100644 index 0000000000..25ce6f71f3 --- /dev/null +++ b/ModPatches/Profaned/Defs/Profaned/PossessedWeapons_Ammo.xml @@ -0,0 +1,104 @@ + + + + + Profaned_RotStinkArrow + + rot stink + The arrow head is made from steel to enhance armor penetration. Attached is rotting meat to inflict dangerous infection. + + + + + AmmoSet_ProfanedGreatbowArrow + + + Projectile_GreatArrow_Stone + Projectile_GreatArrow_Steel + Projectile_GreatArrow_Plasteel + Projectile_GreatArrow_Venom + Projectile_GreatArrow_Flame + Projectile_ProfanedGreatbowArrow + + + + + Ammo_ProfanedGreatbowArrow + + + Things/Projectiles/ProfanedGreatbowArrow + Graphic_Single + + + 0.045 + 0.26 + + Profaned_RotStinkArrow + +
  • CE_AutoEnableCrafting_CraftingSpot
    • +     +     + + + Projectile_ProfanedGreatbowArrow + + + Things/Projectiles/ProfanedGreatbowArrow + Graphic_Single + + + 26 + BotchJob_RotArrow + 12 + 2.96 + 3 + + + + + MakeAmmo_ProfanedGreatbowArrow + + Craft 10 rot stink great arrows. + Making rot stink great arrows. + 1600 + +
  • + + +
  • WoodLog
    • + + + 2 + +
  • + + +
  • Steel
    • + + + 2 + +
  • + + +
  • MeatRaw
    • + + + 3 + +     + + +
  • WoodLog
    • +
  • Steel
    • +     + +
  • MeatRaw
    • +     +     + + 10 + +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Defs/Profaned/Profaned_DamageDef.xml b/ModPatches/Profaned/Defs/Profaned/Profaned_DamageDef.xml new file mode 100644 index 0000000000..0aa04fef60 --- /dev/null +++ b/ModPatches/Profaned/Defs/Profaned/Profaned_DamageDef.xml @@ -0,0 +1,19 @@ + + + + + BotchJob_CE_RotStabDamage + + +
  • + LungRotExposure + 0.005 + ToxicResistance + true + true +
    • +     + false +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Defs/Profaned/Profaned_ManueverDef.xml b/ModPatches/Profaned/Defs/Profaned/Profaned_ManueverDef.xml new file mode 100644 index 0000000000..fc85a7abda --- /dev/null +++ b/ModPatches/Profaned/Defs/Profaned/Profaned_ManueverDef.xml @@ -0,0 +1,18 @@ + + + + + BotchJob_CE_RotStabManeuver + BotchJob_CE_RotStab + + Verb_MeleeAttackDamage + BotchJob_CE_RotStabDamage + + MeleeAttack + Maneuver_Slash_MeleeHit + Maneuver_Slash_MeleeDeflect + Maneuver_Slash_MeleeMiss + Maneuver_Slash_MeleeDodge + + + \ No newline at end of file diff --git a/ModPatches/Profaned/Defs/Profaned/Profaned_ToolCapacityDef.xml b/ModPatches/Profaned/Defs/Profaned/Profaned_ToolCapacityDef.xml new file mode 100644 index 0000000000..1ecdb3e546 --- /dev/null +++ b/ModPatches/Profaned/Defs/Profaned/Profaned_ToolCapacityDef.xml @@ -0,0 +1,30 @@ + + + + + BotchJob_CE_RotStab + + + + + BotchJob_CE_ProfanedStaffCast + MapOnly + 2 + True + PrioritizeNearest + +
  • + +
  • + Misc/BotchJob_ProfanedStaffCast +
    • + + 30~30 + 0.95~1.05 + 0~70 + False + +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Defs/Profaned/Profaned_ToxicBreathProjectile.xml b/ModPatches/Profaned/Defs/Profaned/Profaned_ToxicBreathProjectile.xml new file mode 100644 index 0000000000..a91ade8980 --- /dev/null +++ b/ModPatches/Profaned/Defs/Profaned/Profaned_ToxicBreathProjectile.xml @@ -0,0 +1,70 @@ + + + + + Projectile_ProfanedDragon_ToxicBreath_CE + + CombatExtended.ProjectileCE_Explosive + + +
  • + 1.0 + 1 + (255, 161, 0, 0.19) +
    • +     + + Things/Projectiles/ToxicflameSurge/ToxicflameSurgeA + Graphic_Single + MoteGlow + + + false + BotchJob_DragonToxicBreathDamage + 3 + 3.0 + 2.0 + 30 + 3.5 + true + Filth_Ash + .3 + 30 + +     + + + Projectile_Profaned_BloodFlameSurge_CE + + CombatExtended.ProjectileCE_Explosive + + +
  • + 1.0 + 1 + (255, 161, 0, 0.19) +
    • +     + + Things/Projectiles/BloodflameSurge/BloodflameSurgeA + Graphic_Single + MoteGlow + + + false + Flame + 3 + 3.0 + 2.0 + 30 + 3.5 + true + Filth_Ash + .3 + 30 + 6 + 4 + +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/DamageDef/Profaned_DamagedDef.xml b/ModPatches/Profaned/Patches/Profaned/DamageDef/Profaned_DamagedDef.xml new file mode 100644 index 0000000000..1daa40cd4d --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/DamageDef/Profaned_DamagedDef.xml @@ -0,0 +1,18 @@ + + + + + Defs/DamageDef[defName="BotchJob_GraspingDeadDamage"]/defaultArmorPenetration + + 10 + + + + + Defs/DamageDef[defName="BotchJob_IceShardsDamage"]/defaultArmorPenetration + + 3 + + + + \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/Scenarios/Profaned_Scenario_Patch.xml b/ModPatches/Profaned/Patches/Profaned/Scenarios/Profaned_Scenario_Patch.xml new file mode 100644 index 0000000000..7d3ad9b999 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/Scenarios/Profaned_Scenario_Patch.xml @@ -0,0 +1,15 @@ + + + + < + Defs/ScenarioDef[defName="BotchJob_ProfanedStart"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_Arrow_Steel + 100 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Items/Profaned_Items_Resources.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Items/Profaned_Items_Resources.xml new file mode 100644 index 0000000000..a5dc92e888 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Items/Profaned_Items_Resources.xml @@ -0,0 +1,29 @@ + + + + + Defs/ThingDef[defName="BotchJob_ColossusHeart"]/statBases + + 2 + + + + + Defs/ThingDef[ + defName="BotchJob_LuminousDust" or + defName="BotchJob_CorruptedBlood" or + defName="BotchJob_TaintedBone"]/statBases + + + 0.5 + + + + + Defs/ThingDef[@Name="BotchJob_ProfanePotionBase"]/statBases + + 0.2 + + + + \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Armor.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Armor.xml new file mode 100644 index 0000000000..87df78c0e8 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Armor.xml @@ -0,0 +1,301 @@ + + + + + + Defs/ThingDef[defName="BotchJob_TatteredUndershirt" or defName="BotchJob_RaggedLegwraps"]/statBases + + 2 + 1 + + + + + Defs/ThingDef[defName="BotchJob_TatteredUndershirt" or defName="BotchJob_RaggedLegwraps"]/statBases/StuffEffectMultiplierArmor + + 3 + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedCloak"]/statBases + + 3 + 0.5 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedCloak"]/statBases/StuffEffectMultiplierArmor + + 3 + + + + + + Defs/ThingDef[defName="BotchJob_WeatheredChainmail"]/statBases + + 30 + 12 + + + + + Defs/ThingDef[defName="BotchJob_WeatheredChainmail"]/statBases/StuffEffectMultiplierArmor + + 1.85 + + + + + Defs/ThingDef[defName="BotchJob_WeatheredChainmail"]/statBases/Mass + + 6 + + + + + Defs/ThingDef[defName="BotchJob_WeatheredChainmail"]/apparel/bodyPartGroups + + +
  • Torso
    • +
  • Shoulders
    • +
  • Arms
    • +     +     +     + + + Defs/ThingDef[defName="BotchJob_WeatheredChainmail"]/equippedStatOffsets/MoveSpeed + + + + + Defs/ThingDef[defName="BotchJob_WeatheredPauldron"]/statBases + + 5 + 1 + + + + + Defs/ThingDef[defName="BotchJob_WeatheredPauldron"]/statBases/StuffEffectMultiplierArmor + + 2.25 + + + + + Defs/ThingDef[defName="BotchJob_WeatheredPauldron"]/statBases/Mass + + 3 + + + + + Defs/ThingDef[defName="BotchJob_WeatheredPauldron"]/apparel/bodyPartGroups + + +
  • Shoulders
    • +
  • Arms
    • +     +     +     + + + Defs/ThingDef[defName="BotchJob_WeatheredPauldron"] + +
  • + +
  • + 0.80 + +
  • Arm
    • + + +
  • + 0.80 + +
  • Arm
    • + + + + +     +     + + + + Defs/ThingDef[defName="BotchJob_HeadhunterPauldron"]/statBases + + 5 + 1 + + + + + Defs/ThingDef[defName="BotchJob_HeadhunterPauldron"]/statBases/StuffEffectMultiplierArmor + + 3 + + + + + Defs/ThingDef[defName="BotchJob_HeadhunterPauldron"]/statBases/Mass + + 3 + + + + + Defs/ThingDef[defName="BotchJob_HeadhunterPauldron"]/apparel/bodyPartGroups + + +
  • Shoulders
    • +
  • Arms
    • +     +     +     + + + Defs/ThingDef[defName="BotchJob_HeadhunterPauldron"] + +
  • + +
  • + 0.80 + +
  • Arm
    • + + +
  • + 0.80 + +
  • Arm
    • + + + + +     +     + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightArmor"]/statBases + + 100 + 10 + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightArmor"]/statBases/StuffEffectMultiplierArmor + + 3 + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightArmor"]/equippedStatOffsets/MoveSpeed + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightArmor"]/equippedStatOffsets + + -0.15 + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightArmor"]/apparel/bodyPartGroups + +
  • Hands
    • +
  • Feet
    • +     +     + + + Defs/ThingDef[defName="BotchJob_ScourgeknightArmor"] + +
  • + +
  • + 0.70 + +
  • Neck
    • + + +
  • + 0.70 + +
  • Neck
    • + + +
  • + 0.90 + +
  • Leg
    • + + +
  • + 0.90 + +
  • Leg
    • + + +
  • + 0.80 + +
  • Arm
    • + + +
  • + 0.80 + +
  • Arm
    • + + +
  • + 0.60 + +
  • Hand
    • + + +
  • + 0.60 + +
  • Hand
    • + + + + +     +     + + + + Defs/ThingDef[defName="BotchJob_GravetenderRobes"]/statBases + + 20 + 6 + + + + + Defs/ThingDef[defName="BotchJob_GravetenderRobes"]/statBases/StuffEffectMultiplierArmor + + 3 + + + + + Defs/ThingDef[defName="BotchJob_GravetenderRobes"]/statBases + + 0.45 + 0.9 + + + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Helmets.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Helmets.xml new file mode 100644 index 0000000000..435656525b --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Helmets.xml @@ -0,0 +1,139 @@ + + + + + + Defs/ThingDef[defName="BotchJob_TatteredCowl"]/statBases + + 3 + 0.5 + + + + + Defs/ThingDef[defName="BotchJob_TatteredCowl"]/statBases/StuffEffectMultiplierArmor + + 5 + + + + + + Defs/ThingDef[defName="BotchJob_HeadhunterBandages"]/statBases + + 1 + 0.5 + + + + + Defs/ThingDef[defName="BotchJob_HeadhunterBandages"]/statBases/StuffEffectMultiplierArmor + + 3 + + + + + + Defs/ThingDef[defName="BotchJob_WeatheredKettleHelmet"]/apparel/bodyPartGroups + + +
  • UpperHead
    • +
  • Neck
    • +     +     +     + + + Defs/ThingDef[defName="BotchJob_WeatheredKettleHelmet"]/statBases + + 4 + 1 + + + + + Defs/ThingDef[defName="BotchJob_WeatheredKettleHelmet"]/statBases/StuffEffectMultiplierArmor + + 2.2 + + + + + + Defs/ThingDef[ defName="BotchJob_WeatheredChainmailCoif"]/apparel/bodyPartGroups + +
  • Teeth
    • +     +     + + + Defs/ThingDef[defName="BotchJob_WeatheredChainmailCoif"]/statBases + + 4 + 1 + + + + + Defs/ThingDef[defName="BotchJob_WeatheredChainmailCoif"]/statBases/StuffEffectMultiplierArmor + + 1.65 + + + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightHelmet"]/statBases + + 6 + 1 + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightHelmet"]/equippedStatOffsets/ShootingAccuracyPawn + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightHelmet"]/equippedStatOffsets + + -0.4 + -2 + -0.20 + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightHelmet"]/statBases/StuffEffectMultiplierArmor + + 3.75 + + + + + + Defs/ThingDef[defName="BotchJob_BoneCrown"]/statBases + + 3 + 1 + + + + + Defs/ThingDef[defName="BotchJob_BoneCrown"]/statBases/StuffEffectMultiplierArmor + + 4 + + + + + Defs/ThingDef[defName="BotchJob_BoneCrown"]/statBases + + 0.45 + 0.9 + + + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Shields.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Shields.xml new file mode 100644 index 0000000000..7132f2b1a2 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Shields.xml @@ -0,0 +1,107 @@ + + + + + +
  • Vanilla Expanded Framework
    • +     + + + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/thingClass + + CombatExtended.Apparel_Shield + +
    • + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"] + ParentName + ArmorSmithableBase +
    • + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/apparel/layers + + +
  • Shield
    • + +     + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/apparel/bodyPartGroups + + +
  • LeftShoulder
    • + + + + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/tools +
    • + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/comps/li[@Class="VFECore.CompProperties_Shield"] +
    • + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"] + +
  • + +
  • Hands
    • +
  • Arms
    • +
  • Shoulders
    • +
  • Torso
    • +
  • Neck
    • + + + + + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/statBases + + 8 + 5 + +
    • + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/equippedStatOffsets + + + -0.2 + -1 + -0.15 + -0.08 + -0.25 + -0.05 + 1.0 + + +
    • + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/statBases/StuffEffectMultiplierArmor + + 2.85 + +
    • + + + +     + + \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_Projectiles.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_Projectiles.xml new file mode 100644 index 0000000000..f70b2261a1 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_Projectiles.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + Defs/ThingDef[ + defName="BotchJob_BoneProjectile"]/thingClass + + CombatExtended.BulletCE + + + + + Defs/ThingDef[ + defName="BotchJob_ColossusSmashProj" or + defName="BotchJob_WraithClaw" or + defName="BotchJob_DragonToxicBreath" or + defName="BotchJob_PutridMass"]/thingClass + + CombatExtended.ProjectileCE_Explosive + + + + + + Defs/ThingDef[defName="BotchJob_ColossusSmashProj"]/projectile + + + 3 + 3.0 + 2.0 + BotchJob_ColossusSmash + 15 + MortarBomb_Explode + 30 + 5 + 25 + true + BotchJob_ColossusSmashEffect + + + + + + Defs/ThingDef[defName="BotchJob_WraithClaw"]/projectile + + + 1.5 + 3.0 + 2.0 + BotchJob_WraithClawBlast + 15 + MortarBomb_Explode + 10 + 20 + 40 + true + + + + + + Defs/ThingDef[defName="BotchJob_BoneProjectile"]/projectile + + + true + BotchJob_BoneImpact + 15 + 19 + 0 + 3 + 1.2 + + + + + + Defs/ThingDef[defName="BotchJob_PutridMass"]/projectile + + + 4.5 + 3.0 + 2.0 + BotchJob_RotstinkBlast + 27 + 38 + RotStink + BotchJob_Filth_Undead + 0.5 + 20 + + + + + + + \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_VerbShoot.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_VerbShoot.xml new file mode 100644 index 0000000000..3395b9b16d --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_VerbShoot.xml @@ -0,0 +1,121 @@ + + + + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"]/verbs + + +
  • + CombatExtended.Verb_ShootCE + true + BotchJob_ColossusSmashProj + 4 + 1 + 2 + 1 + 5 + BotchJob_ColossusRoar + 0 + true + + 0.5 +
    • +     +     +     + + + + Defs/ThingDef[defName="BotchJob_Wraith"]/verbs + + +
  • + CombatExtended.Verb_ShootCE + true + BotchJob_WraithClaw + 2.4 + 1 + 2 + 1 + 20 + Interact_BeatFire + 0 + + 0.8 +
    • +     +     +     + + + + Defs/ThingDef[defName="BotchJob_Skeleton"]/verbs + + +
  • + CombatExtended.Verb_ShootCE + true + BotchJob_BoneProjectile + 2 + 1 + 2 + 1 + 14 + Interact_BeatFire + 0 + + 0.8 +
    • +     +     +     + + + + + Defs/ThingDef[defName="BotchJob_UndeadDragon"]/verbs + + + +
  • + CombatExtended.Verb_ShootCE + true + Projectile_ProfanedDragon_ToxicBreath_CE + 1.4 + 10 + 4 + 24 + BotchJob_ProfanedStaffCast + 2 + + 10 + UI/Icons/Misc/BotchJob_ToxicflameSurgeIcon + + true + + 0.8 +
    • +
  • + CombatExtended.Verb_ShootCE + true + BotchJob_PutridMass + 2.2 + 5 + 32 + 3 + 20 + CocoonDestroyed + 1 + + + true + + UI/Icons/Misc/BotchJob_PutridMassIcon + 0.8 +
    • +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Melee.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Melee.xml new file mode 100644 index 0000000000..55439d4a33 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Melee.xml @@ -0,0 +1,631 @@ + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedWarAxe"]/statBases + + 3 + 0.22 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedWarAxe"] + + + 0.31 + 0.22 + 0.22 + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedWarAxe"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + + Defs/ThingDef[defName="BotchJob_ProfanedWarAxe"]/tools + + +
  • + + +
  • Poke
    • + + 3 + 0.95 + 0.05 + 0.8 + Shaft + +
  • + + +
  • BotchJob_RotCut
    • + + 15 + 1.59 + 0.25 + 3.6 + 2.32 + Point + +
  • + + +
  • BotchJob_RotCut
    • + + 23 + 1.58 + 0.70 + 3.6 + 0.75 + Edge + +     +     +     + + + + Defs/ThingDef[defName="BotchJob_ProfanedScimitar"]/statBases + + 4 + 0.38 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedScimitar"]/statBases/Mass + + 1.1 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedScimitar"] + + + 0.24 + 0.38 + 0.28 + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedScimitar"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + + Defs/ThingDef[defName="BotchJob_ProfanedScimitar"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.54 + 0.55 + 0.15 + Handle + +
  • + + +
  • BotchJob_CE_RotStab
    • + + 23 + 1.54 + 0.55 + 0.31 + Point + +
  • + + +
  • BotchJob_RotCut
    • + + 28 + 1.25 + 1.782 + 0.8 + Edge + +     +     +     + + + + Defs/ThingDef[defName="BotchJob_ProfanedShotel"]/statBases + + 4 + 0.27 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedShotel"]/statBases/Mass + + 1.8 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedShotel"] + + + 0.19 + 0.17 + 0.3 + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedShotel"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + + Defs/ThingDef[defName="BotchJob_ProfanedShotel"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.44 + 0.425 + 0.15 + Handle + +
  • + + +
  • BotchJob_CE_RotStab
    • + + 18 + 1.74 + 0.9 + 1 + Point + +
  • + + +
  • BotchJob_RotCut
    • + + 28 + 1.62 + 2.025 + 0.90 + Edge + +     +     +     + + + + Defs/ThingDef[defName="BotchJob_ProfanedClub"]/tools + + +
  • + + +
  • Poke
    • + + 4 + 0.33 + 1.78 + 1 + Handle + +
  • + + +
  • Blunt
    • + + 11 + 3.48 + 4 + Head + +     +     +     + + + Defs/ThingDef[defName="BotchJob_ProfanedClub"]/statBases + + 4 + 0.15 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedClub"] + + + 0.67 + 0.15 + 0.2 + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedClub"]/weaponTags + + Defs/ThingDef[defName="BotchJob_ProfanedClub"] + + + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedClub"]/weaponTags + +
  • CE_Sidearm_Tribal
    • +
  • CE_OneHandedWeapon
    • +     +     + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightGreatsword" or defName="BotchJob_GraspingDeadGreatsword"]/statBases + + 12 + 0.70 + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightGreatsword" or defName="BotchJob_GraspingDeadGreatsword"] + + + 0.30 + 1.20 + 0.50 + + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightGreatsword" or defName="BotchJob_GraspingDeadGreatsword"]/tools + + +
  • + + +
  • Poke
    • + + 5 + 1.97 + 0.05 + 1.5 + Handle + +
  • + + +
  • BotchJob_CE_RotStab
    • + + 24 + 1.98 + 0.50 + 0.8 + 1.90 + Point + +
  • + + +
  • BotchJob_RotCut
    • + + 48 + 2.86 + 0.45 + 3.592 + 0.58 + Edge + +     +     +     + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightGreataxe"]/statBases + + 7 + 0.35 + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightGreataxe"] + + + 0.30 + 0.40 + 0.23 + + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightGreataxe"]/tools + + +
  • + + +
  • Poke
    • + + 3 + 1.3 + 0.05 + 0.8 + Shaft + +
  • + + +
  • Blunt
    • + + 15 + 2.18 + 0.25 + 9.6 + Head + +
  • + + +
  • BotchJob_RotCut
    • + + 37 + 2.18 + 0.70 + 9.6 + 0.95 + Edge + +     +     +     + + + + Defs/ThingDef[defName="BotchJob_FrostboundGreataxe"]/statBases + + 7 + 0.35 + + + + + Defs/ThingDef[defName="BotchJob_FrostboundGreataxe"] + + + 0.30 + 0.40 + 0.23 + + + + + + Defs/ThingDef[defName="BotchJob_FrostboundGreataxe"]/tools + + +
  • + + +
  • Poke
    • + + 3 + 1.3 + 0.05 + 0.8 + Shaft + +
  • + + +
  • Blunt
    • + + 15 + 2.18 + 0.25 + 9.6 + Head + +
  • + + +
  • Cut
    • + + 37 + 2.18 + 0.70 + 9.6 + 0.95 + Edge + +
  • + Frostbite + 10 +
    • +     + +     +     +     + + + + Defs/ThingDef[defName="BotchJob_ProfanedScythe" or defName="BotchJob_FadingSoulScythe"]/statBases + + 12 + 0.33 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedScythe" or defName="BotchJob_FadingSoulScythe"] + + + 0.30 + 0.40 + 0.23 + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedScythe" or defName="BotchJob_FadingSoulScythe"]/tools + + +
  • + + +
  • Blunt
    • + + 4 + 1.78 + 1 + Shaft + + +
  • + + +
  • BotchJob_CE_RotStab
    • + + 28 + 3.57 + 1.33 + 2.250 + 2.5 + Blade + +
  • + + +
  • BotchJob_RotCut
    • + + 29 + 3.57 + 2.250 + 0.5 + Edge + +     +     +     + + + + BotchJob_BloodflameStaff + + 6 + 0 + 0.0 + 1 + 6 + 0.93 + + + Verb_Shoot + True + BotchJob_BloodflameStaffBolt + 4.5 + 25 + 2 + 1 + + true + false + + BotchJob_ProfanedStaffCast + 2.9 + + + AimedShot + + + + + Defs/ThingDef[defName="BotchJob_BloodflameStaff"]/tools + + +
  • + + +
  • Blunt
    • + + 5 + 2.85 + 0.30 + 1.69 + Head + +     +     +     + + + Defs/ThingDef[defName="BotchJob_BloodflameStaff"] + + + 1.00 + 0.70 + 0.47 + + + + + + Defs/ThingDef[defName="BotchJob_BloodflameStaff"]/verbs + +
  • + Verb_LaunchProjectile + + true + true + Projectile_Profaned_BloodFlameSurge_CE + 6 + 3 + 1.1 + 12 + BotchJob_ProfanedStaffCast + false + + true + + UI/Icons/Misc/BotchJob_BloodflameSurgeIcon +
    • +     +     + + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Ranged.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Ranged.xml new file mode 100644 index 0000000000..32f60df178 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Ranged.xml @@ -0,0 +1,147 @@ + + + + + + + BotchJob_WeatheredShortbow + + 0.8 + 1 + 2 + 3.00 + 1 + + + 15 + + + CombatExtended.Verb_ShootCE + true + Projectile_Arrow_Stone + 1 + 14 + Bow_Small + + + AmmoSet_Arrow + + + +
  • CE_Bow
    • +     + false +     + + + Defs/ThingDef[defName="BotchJob_WeatheredShortbow"]/tools + + +
  • + +
  • Blunt
    • + + 7 + 1.6 + 0.65 + +     +     +     + + + + BotchJob_ProfanedGreatbow + + 0.8 + 1 + 2 + 10.00 + 1 + + + CombatExtended.Verb_ShootCE + true + Projectile_ProfanedGreatbowArrow + 1.3 + 30 + Bow_Large + + + AmmoSet_ProfanedGreatbowArrow + + + +
  • BotchJob_ProfanedGreatbow
    • +     + false +     + + + Defs/ThingDef[defName="BotchJob_ProfanedGreatbow"]/tools + + +
  • + +
  • Blunt
    • + + 7 + 1.44 + 0.79 + +     +     +     + + + + BotchJob_SpectralGreatbow + + 0.8 + 1 + 2 + 10.00 + 1 + + + CombatExtended.Verb_ShootCE + true + Projectile_GreatArrow_Steel + 1.8 + 30 + 3 + Bow_Large + + + 3 + 0 + AmmoSet_ProfanedGreatbowArrow + + + TRUE + AimedShot + 3 + + +
  • BotchJob_SpectralGreatbow
    • +     + false +     + + + Defs/ThingDef[defName="BotchJob_SpectralGreatbow"]/tools + + +
  • + +
  • Blunt
    • + + 7 + 1.44 + 0.79 + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Colossus.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Colossus.xml new file mode 100644 index 0000000000..776747ad78 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Colossus.xml @@ -0,0 +1,124 @@ + + + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"] + +
  • + Humanoid +
    • +     +     + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"]/statBases + + 0.09 + 0.82 + 0.16 + 1.0 + + + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"]/statBases/ArmorRating_Blunt + + 21 + + + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"]/statBases/ArmorRating_Sharp + + 14 + + + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"]/statBases/ArmorRating_Heat + + 0.6 + + + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"]/tools + + +
  • + + +
  • Blunt
    • + + 35 + 2 + LeftHand + + +
  • + Stun + 14 +
    • +     +     + 0 + 17 + +
  • + + +
  • Blunt
    • + + 35 + 2 + RightHand + + +
  • + Stun + 14 +
    • +     +     + 0 + 17 + +
  • + + +
  • Blunt
    • + + 18 + 1.8 + HeadAttackTool + 8 + 0.2 + +     +     +     + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"]/comps + + Defs/ThingDef[defName="BotchJob_UndeadColossus"] + + + + + + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"]/comps + +
  • + 3000 + true + 600 + 5 + 0.75 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Ghoul.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Ghoul.xml new file mode 100644 index 0000000000..0d4e022f8c --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Ghoul.xml @@ -0,0 +1,98 @@ + + + + + Defs/ThingDef[defName="BotchJob_Ghoul"] + +
  • + Humanoid +
    • +     +     + + + Defs/ThingDef[defName="BotchJob_Ghoul"]/statBases + + 0.23 + 0.20 + 0.11 + + + + + Defs/ThingDef[defName="BotchJob_Ghoul"]/tools + + +
  • + + +
  • Scratch
    • + + 11 + 1.19 + LeftHand + + +
  • + Stun + 20 +
    • +     +     + 2.250 + 0.75 + +
  • + + +
  • Scratch
    • + + 11 + 1.19 + RightHand + + +
  • + Stun + 20 +
    • +     +     + 2.250 + 0.75 + +
  • + +
  • Bite
    • + + 24 + 1.46 + Teeth + + +
  • + Stun + 20 +
    • +     +     + 2 + 1.6 + 8.863 + +
  • + + +
  • Blunt
    • + + 4 + 3.2 + HeadAttackTool + 0.2 + 1.225 + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Skeleton.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Skeleton.xml new file mode 100644 index 0000000000..127ef10a50 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Skeleton.xml @@ -0,0 +1,64 @@ + + + + + Defs/ThingDef[defName="BotchJob_Skeleton"] + +
  • + Humanoid +
    • +     +     + + + Defs/ThingDef[defName="BotchJob_Skeleton"]/statBases + + 1 + 1 + 1 + 0.7 + + + + + Defs/ThingDef[defName="BotchJob_Skeleton"]/tools + + +
  • + + +
  • Blunt
    • + + 13 + 2 + 0 + 1.44 + LeftHand + +
  • + + +
  • Blunt
    • + + 13 + 2 + 0 + 1.44 + RightHand + +
  • + + +
  • Blunt
    • + + 2 + 4.49 + HeadAttackTool + 0.2 + 0.625 + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadCat.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadCat.xml new file mode 100644 index 0000000000..c9486c47fc --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadCat.xml @@ -0,0 +1,99 @@ + + + + + + Defs/ThingDef[defName="BotchJob_UndeadCat"]/statBases + + 0.23 + 0.02 + 0.01 + + + + + Defs/ThingDef[defName="BotchJob_UndeadCat"]/tools + + +
  • + + +
  • Scratch
    • + + 2 + 0.55 + FrontLeftPaw + + +
  • + Stun + 20 +
    • +     +     + 0.042 + 0.01 + +
  • + + +
  • Scratch
    • + + 2 + 0.55 + FrontRightPaw + + +
  • + Stun + 20 +
    • +     +     + 0.042 + 0.01 + +
  • + +
  • Bite
    • + + 5 + 0.85 + Teeth + + +
  • + Stun + 20 +
    • +     +     + 0.7 + 0.254 + 0.03 + +
  • + + +
  • Blunt
    • + + 1 + 0.55 + HeadAttackTool + 0.2 + 0.042 + +     +     +     + + + Defs/ThingDef[defName="BotchJob_UndeadCat"] + +
  • + Quadruped +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadDragon.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadDragon.xml new file mode 100644 index 0000000000..15dadd8b57 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadDragon.xml @@ -0,0 +1,146 @@ + + + + + + Defs/ThingDef[defName="BotchJob_UndeadDragon"]/statBases + + 1.75 + 0.54 + 1.0 + 1.5 + 0.13 + + + + + Defs/ThingDef[defName="BotchJob_UndeadDragon"]/statBases/ArmorRating_Blunt + + 40 + + + + + Defs/ThingDef[defName="BotchJob_UndeadDragon"]/statBases/ArmorRating_Sharp + + 16 + + + + + Defs/ThingDef[defName="BotchJob_UndeadDragon"]/tools + + +
  • + + +
  • DD_Knockback
    • + + 110 + 115.115 + 0.2 + 4.0 + Tail + +
  • + + +
  • Scratch
    • +
  • Cut
    • +
  • Stab
    • + + 76 + 3 + 16.09 + 120.417 + FrontLeftPaw + +
  • + + +
  • Scratch
    • +
  • Cut
    • +
  • Stab
    • + + 76 + 3 + 16.09 + 120.417 + FrontRightPaw + +
  • + 3.6 + 100 + +
  • ToxicBite
    • + + Teeth + + 24.26 + 460.97 + +
  • + + +
  • Cut
    • + + + +
  • + Stun + 30 +
    • +     +     + 69 + 5.68 + 3 + 24.725 + Horns + +
  • + + +
  • Stab
    • + + + +
  • + Stun + 30 +
    • +     +     + 38 + 5.68 + 14 + 21.725 + Horns + +     +     +     + + + Defs/ThingDef[defName="BotchJob_UndeadDragon"] + +
  • + Birdlike +
    • +     +     + + + Defs/ThingDef[defName="BotchJob_UndeadDragon"]/comps + +
  • + 4250 + true + 600 + 5 + 0.5 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadHorse.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadHorse.xml new file mode 100644 index 0000000000..12d96cca29 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadHorse.xml @@ -0,0 +1,93 @@ + + + + + + Defs/ThingDef[defName="BotchJob_UndeadHorse"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="BotchJob_UndeadHorse"]/statBases/MoveSpeed + + 6 + 0.15 + 0.37 + 0.24 + + + + + Defs/ThingDef[defName="BotchJob_UndeadHorse"]/tools + + +
  • + + +
  • Blunt
    • + + 11 + 1.37 + FrontLeftLeg + 3.938 + +
  • + + +
  • Poke
    • + + 11 + 1.37 + FrontLeftLeg_2 + 3.938 + +
  • + + +
  • Blunt
    • + + 11 + 1.37 + FrontRightLeg + 3.938 + +
  • + + +
  • Poke
    • + + 11 + 1.37 + FrontRightLeg_2 + 3.938 + +
  • + +
  • Bite
    • + + 5 + 1.97 + 0.5 + Teeth + 1.5 + +
  • + + +
  • Blunt
    • + + 6 + 2.12 + HeadAttackTool + 0.2 + 2 + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadWarg.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadWarg.xml new file mode 100644 index 0000000000..51c69ef1c9 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadWarg.xml @@ -0,0 +1,140 @@ + + + + + + + Defs/ThingDef[defName="BotchJob_UndeadWarg"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="BotchJob_UndeadWarg"]/statBases/MoveSpeed + + 7 + + + + + Defs/ThingDef[defName="BotchJob_UndeadWarg"]/statBases + + 0.075 + 0.05 + 0.23 + 0.20 + 0.11 + + + + + Defs/ThingDef[defName="BotchJob_UndeadWarg"]/tools + + +
  • + + +
  • Scratch
    • + + 11 + 1.19 + FrontLeftPaw + + +
  • + Stun + 20 +
    • +     +     + 2.250 + 0.75 + +
  • + + +
  • Scratch
    • + + 11 + 1.19 + FrontRightPaw + + +
  • + Stun + 20 +
    • +     +     + 2.250 + 0.75 + +
  • + + +
  • Bite
    • + + 24 + 1.46 + Teeth + + +
  • + Stun + 20 +
    • +     +     + 2 + 1.6 + 8.863 + +
  • + + +
  • Blunt
    • + + 4 + 3.2 + HeadAttackTool + 0.2 + 1.225 + +     +     +     + + + Defs/ThingDef[defName="BotchJob_UndeadWarg"]/race/wildness + + 0.3 + + + + + Defs/ThingDef[defName="BotchJob_UndeadWarg"]/comps + + Defs/ThingDef[defName="BotchJob_UndeadWarg"] + + + + + + + + Defs/ThingDef[defName="BotchJob_UndeadWarg"]/comps + +
  • + 700 + true + 600 + 5 + 0.75 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Wraith.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Wraith.xml new file mode 100644 index 0000000000..5993fbd078 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Wraith.xml @@ -0,0 +1,64 @@ + + + + + Defs/ThingDef[defName="BotchJob_Wraith"] + +
  • + Humanoid +
    • +     +     + + + Defs/ThingDef[defName="BotchJob_Wraith"]/statBases + + 0.45 + 0.2 + 0.7 + + + + + Defs/ThingDef[defName="BotchJob_Wraith"]/tools + + +
  • + + +
  • Scratch
    • + + 20 + 3.2 + LeftHand + +
  • + Frostbite + 2 +
    • +     + 20 + 40 + +
  • + + +
  • Scratch
    • + + 20 + 3.2 + RightHand + +
  • + Frostbite + 2 +
    • +     + 20 + 40 + +     +     +     + +     \ No newline at end of file From 8d58ccc5f76e09c94114a62a3f9570d201b8839d Mon Sep 17 00:00:00 2001 From: ViralReaction <136116069+ViralReaction@users.noreply.github.com> Date: Sat, 24 Aug 2024 12:07:56 -0600 Subject: [PATCH 013/451] Fix typos --- ...ed_ToxicBreathProjectile.xml => Profaned_CE_Projectiles.xml} | 2 -- .../Patches/Profaned/Scenarios/Profaned_Scenario_Patch.xml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) rename ModPatches/Profaned/Defs/Profaned/{Profaned_ToxicBreathProjectile.xml => Profaned_CE_Projectiles.xml} (97%) diff --git a/ModPatches/Profaned/Defs/Profaned/Profaned_ToxicBreathProjectile.xml b/ModPatches/Profaned/Defs/Profaned/Profaned_CE_Projectiles.xml similarity index 97% rename from ModPatches/Profaned/Defs/Profaned/Profaned_ToxicBreathProjectile.xml rename to ModPatches/Profaned/Defs/Profaned/Profaned_CE_Projectiles.xml index a91ade8980..445532ea6c 100644 --- a/ModPatches/Profaned/Defs/Profaned/Profaned_ToxicBreathProjectile.xml +++ b/ModPatches/Profaned/Defs/Profaned/Profaned_CE_Projectiles.xml @@ -62,8 +62,6 @@ Filth_Ash .3 30 - 6 - 4 diff --git a/ModPatches/Profaned/Patches/Profaned/Scenarios/Profaned_Scenario_Patch.xml b/ModPatches/Profaned/Patches/Profaned/Scenarios/Profaned_Scenario_Patch.xml index 7d3ad9b999..bedd33f5b8 100644 --- a/ModPatches/Profaned/Patches/Profaned/Scenarios/Profaned_Scenario_Patch.xml +++ b/ModPatches/Profaned/Patches/Profaned/Scenarios/Profaned_Scenario_Patch.xml @@ -1,7 +1,7 @@ - < + Defs/ScenarioDef[defName="BotchJob_ProfanedStart"]/scenario/parts
  • From 20370ade9ff8b7cc1daa85d6d6d3c251296609cd Mon Sep 17 00:00:00 2001 From: ViralReaction <136116069+ViralReaction@users.noreply.github.com> Date: Sat, 24 Aug 2024 13:19:49 -0600 Subject: [PATCH 014/451] Profaned Faction/Pawnkinds --- .../Defs/Profaned/Profaned_PawnKindDef.xml | 63 +++++++++++++++++++ .../Patches/Profaned/FactionDef_AddRanged.xml | 13 ++++ .../Profaned_PawnkindDef_Patch.xml | 58 +++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 ModPatches/Profaned/Defs/Profaned/Profaned_PawnKindDef.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/FactionDef_AddRanged.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/PawnKindDef/Profaned_PawnkindDef_Patch.xml diff --git a/ModPatches/Profaned/Defs/Profaned/Profaned_PawnKindDef.xml b/ModPatches/Profaned/Defs/Profaned/Profaned_PawnKindDef.xml new file mode 100644 index 0000000000..afce50f179 --- /dev/null +++ b/ModPatches/Profaned/Defs/Profaned/Profaned_PawnKindDef.xml @@ -0,0 +1,63 @@ + + + + + BotchJob_ProfanedDrudge_Ranged + + +
  • + +
  • Tribal
    • + + + + 50 + true + + 0.2 + 1.1 + + +
  • BotchJob_TatteredUndershirt
    • +
  • BotchJob_TatteredCowl
    • +
  • BotchJob_RaggedLegwraps
    • +
  • BotchJob_ProfanedApparel
    • +     + 60~300 + +
  • CE_Apparel_TribalBackpack
    • +     + 45~300 + +
  • BotchJob_WeatheredShortbow
    • +     + + 50 + 50 + + +
  • Poor
    • +     + 0.15 + 1~2 + 3~8 + +
  • + + 15 + 30 + + + + 150 + 350 + + +
  • CE_Sidearm_Tribal
    • + + + +     + + + \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/FactionDef_AddRanged.xml b/ModPatches/Profaned/Patches/Profaned/FactionDef_AddRanged.xml new file mode 100644 index 0000000000..32074ce10c --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/FactionDef_AddRanged.xml @@ -0,0 +1,13 @@ + + + + + + Defs/FactionDef[defName="BotchJob_ProfanedFaction"]/pawnGroupMakers/li/options/BotchJob_ProfanedDrudge + + 20 + 20 + + + + \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/PawnKindDef/Profaned_PawnkindDef_Patch.xml b/ModPatches/Profaned/Patches/Profaned/PawnKindDef/Profaned_PawnkindDef_Patch.xml new file mode 100644 index 0000000000..a8e80cd1eb --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/PawnKindDef/Profaned_PawnkindDef_Patch.xml @@ -0,0 +1,58 @@ + + + + + Defs/PawnKindDef[defName="BotchJob_ProfanedDrudge"]/weaponTags/li[.="BotchJob_WeatheredShortbow"] + + + + Defs/PawnKindDef[defName="BotchJob_ProfanedDrudge"]/weaponMoney + + 100~300 + + + + + Defs/PawnKindDef[defName="BotchJob_ProfanedHeadhunter"] + +
  • + + 20 + 40 + + 20 + +
  • + 0.5 + + 20 + 120 + + +
  • CE_Sidearm_Melee
    • + + + + +     +     + + + Defs/PawnKindDef[defName="BotchJob_ProfanedHeadhunter"]/apparelRequired + + Defs/PawnKindDef[defName="BotchJob_ProfanedHeadhunter"] + + +
  • CE_Apparel_TribalBackpack
    • +     +     +     + + Defs/PawnKindDef[defName="BotchJob_ProfanedHeadhunter"]/apparelRequired + +
  • CE_Apparel_TribalBackpack
    • +     +     +     + +     \ No newline at end of file From 25419031dcf6b031eaf1d6c506124e9e06cdbc38 Mon Sep 17 00:00:00 2001 From: ViralReaction <136116069+ViralReaction@users.noreply.github.com> Date: Sat, 24 Aug 2024 15:05:46 -0600 Subject: [PATCH 015/451] Profane Patching --- .../Defs/Profaned/Profaned_PawnKindDef.xml | 78 +++++++++++++++++++ .../AnimalGear/Profaned_AnimalGear_Patch.xml | 22 ++++++ .../DamageDef/Profaned_DamagedDef.xml | 4 +- .../Patches/Profaned/FactionDef_AddRanged.xml | 10 +++ .../GeneDefs/Profaned_GeneDef_Patch.xml | 11 +++ .../Profaned_PawnkindDef_Patch.xml | 11 +++ .../Weapons/Profaned_Weapons_Melee.xml | 35 +++++++++ .../Weapons/Profaned_Weapons_Ranged.xml | 4 +- 8 files changed, 171 insertions(+), 4 deletions(-) create mode 100644 ModPatches/Profaned/Patches/Profaned/AnimalGear/Profaned_AnimalGear_Patch.xml create mode 100644 ModPatches/Profaned/Patches/Profaned/GeneDefs/Profaned_GeneDef_Patch.xml diff --git a/ModPatches/Profaned/Defs/Profaned/Profaned_PawnKindDef.xml b/ModPatches/Profaned/Defs/Profaned/Profaned_PawnKindDef.xml index afce50f179..efc13cc173 100644 --- a/ModPatches/Profaned/Defs/Profaned/Profaned_PawnKindDef.xml +++ b/ModPatches/Profaned/Defs/Profaned/Profaned_PawnKindDef.xml @@ -59,5 +59,83 @@ + + + BotchJob_ScourgeLord_Ranged + + 200 + true + Masterwork + 50 + +
  • BotchJob_TatteredUndershirt
    • +
  • BotchJob_RaggedLegwraps
    • +
  • BotchJob_ProfanedApparel
    • +     + 3000~9999 + +
  • CE_Apparel_TribalBackpack
    • +     + +
  • BotchJob_SpectralGreatbow
    • +     + 1000~5000 + 4~5 + 25~30 + +
  • + Melee + 8~18 +
    • +
  • + Shooting + 8~18 +
    • +     + +
  • + UpperHead + BotchJob_BoneCrown + (51, 51, 51) +
    • +
  • + Torso + BotchJob_ScourgeknightArmor + (51, 51, 51) +
    • +
  • + Legs + BotchJob_RaggedLegwraps +
    • +     + +
  • Violent
    • +     + + +
  • + BotchJob_SoulGem + 1~3 +
    • +     +     + +
  • + + 15 + 30 + + + + 150 + 350 + + +
  • CE_Sidearm_Tribal
    • + + + +     +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/AnimalGear/Profaned_AnimalGear_Patch.xml b/ModPatches/Profaned/Patches/Profaned/AnimalGear/Profaned_AnimalGear_Patch.xml new file mode 100644 index 0000000000..d659555ce0 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/AnimalGear/Profaned_AnimalGear_Patch.xml @@ -0,0 +1,22 @@ + + + + + +
  • Animal Gear
    • +     + + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedHorseBarding"]/statBases/StuffEffectMultiplierArmor + + 6 + +
    • + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/DamageDef/Profaned_DamagedDef.xml b/ModPatches/Profaned/Patches/Profaned/DamageDef/Profaned_DamagedDef.xml index 1daa40cd4d..10fb28d75c 100644 --- a/ModPatches/Profaned/Patches/Profaned/DamageDef/Profaned_DamagedDef.xml +++ b/ModPatches/Profaned/Patches/Profaned/DamageDef/Profaned_DamagedDef.xml @@ -7,12 +7,12 @@ 10     - + Defs/DamageDef[defName="BotchJob_IceShardsDamage"]/defaultArmorPenetration 3 - +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/FactionDef_AddRanged.xml b/ModPatches/Profaned/Patches/Profaned/FactionDef_AddRanged.xml index 32074ce10c..1633a53f51 100644 --- a/ModPatches/Profaned/Patches/Profaned/FactionDef_AddRanged.xml +++ b/ModPatches/Profaned/Patches/Profaned/FactionDef_AddRanged.xml @@ -1,6 +1,7 @@ + Defs/FactionDef[defName="BotchJob_ProfanedFaction"]/pawnGroupMakers/li/options/BotchJob_ProfanedDrudge @@ -9,5 +10,14 @@ 20 + + + + Defs/FactionDef[defName="BotchJob_ProfanedFaction"]/pawnGroupMakers/li/options/BotchJob_ScourgeLord + + 0.75 + 0.25 + + \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/GeneDefs/Profaned_GeneDef_Patch.xml b/ModPatches/Profaned/Patches/Profaned/GeneDefs/Profaned_GeneDef_Patch.xml new file mode 100644 index 0000000000..a07c3f8da6 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/GeneDefs/Profaned_GeneDef_Patch.xml @@ -0,0 +1,11 @@ + + + + + Defs/GeneDef[defName="BotchJob_SkeletalBody"]/statOffsets/ArmorRating_Blunt + + -1.0 + + + + \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/PawnKindDef/Profaned_PawnkindDef_Patch.xml b/ModPatches/Profaned/Patches/Profaned/PawnKindDef/Profaned_PawnkindDef_Patch.xml index a8e80cd1eb..a4e5ab10ba 100644 --- a/ModPatches/Profaned/Patches/Profaned/PawnKindDef/Profaned_PawnkindDef_Patch.xml +++ b/ModPatches/Profaned/Patches/Profaned/PawnKindDef/Profaned_PawnkindDef_Patch.xml @@ -36,6 +36,17 @@ + + + Defs/PawnKindDef[defName="BotchJob_ScourgeLord"]/weaponTags/li[.="BotchJob_SpectralGreatbow"] + + + + Defs/PawnKindDef[defName="BotchJob_ScourgeLord"]/weaponMoney + + 2000~5000 + + Defs/PawnKindDef[defName="BotchJob_ProfanedHeadhunter"]/apparelRequired diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Melee.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Melee.xml index 55439d4a33..9cf518d673 100644 --- a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Melee.xml +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Melee.xml @@ -351,6 +351,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightGreataxe"]/statBases diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Ranged.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Ranged.xml index 32f60df178..2453c49a8b 100644 --- a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Ranged.xml +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Ranged.xml @@ -100,7 +100,7 @@ 0.8 1 2 - 10.00 + 5.00 1 @@ -120,7 +120,7 @@ TRUE AimedShot - 3 + 1
  • BotchJob_SpectralGreatbow
    • From 3c47a1e29a8dc7910035975c2f99b7c9d28d238c Mon Sep 17 00:00:00 2001 From: CMDR-Bill-Doors Date: Sun, 25 Aug 2024 20:49:44 +0100 Subject: [PATCH 016/451] Create ThingSetMaker_CountEnabledAmmoOnly.cs --- .../ThingSetMaker_CountEnabledAmmoOnly.cs | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Source/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs diff --git a/Source/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs b/Source/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs new file mode 100644 index 0000000000..fd3b53f483 --- /dev/null +++ b/Source/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs @@ -0,0 +1,22 @@ +using System.Collections.Generic; +using RimWorld; +using Verse; + +namespace CombatExtended +{ + public class ThingSetMaker_CountEnabledAmmoOnly : ThingSetMaker_Count + { + public override void Generate(ThingSetMakerParams parms, List outThings) + { + parms.validator = delegate (ThingDef d) + { + if (d is AmmoDef ammodef && (ammodef.tradeTags?.Contains(AmmoInjector.destroyWithAmmoDisabledTag) ?? false)) + { + return AmmoUtility.IsAmmoSystemActive(ammodef); + } + return true; + }; + base.Generate(parms, outThings); + } + } +} From 70c6dbed89bb027e54c0dfa7cc4f1ec0d598e54a Mon Sep 17 00:00:00 2001 From: ViralReaction <136116069+ViralReaction@users.noreply.github.com> Date: Sun, 25 Aug 2024 20:52:56 -0600 Subject: [PATCH 017/451] Update SupportedThirdPartyMods.md --- SupportedThirdPartyMods.md | 1 + 1 file changed, 1 insertion(+) diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index 37d7db57df..96d72bf1b2 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -383,6 +383,7 @@ phynilla Expanded Mechs Scyther | pphhyy's Lightless Empyrean | pphhyy Sanguinary Animals | Prestige Specialist Armours | +Profaned | Project RimFactory - Materials | Prostheses+ | Protoswords | From 320e047c11033d28bded0f56ea9fc0bd111f44ee Mon Sep 17 00:00:00 2001 From: Tostov <57082718+Tostov@users.noreply.github.com> Date: Sun, 1 Sep 2024 22:18:10 +1000 Subject: [PATCH 018/451] Boost Fuel Cell Increase the effective filler load for 30x64 fuel cells up to 0.6 --- Defs/Ammo/Advanced/30x64mmFuelCell.xml | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Defs/Ammo/Advanced/30x64mmFuelCell.xml b/Defs/Ammo/Advanced/30x64mmFuelCell.xml index cbdd232a0b..ef38f1e2d3 100644 --- a/Defs/Ammo/Advanced/30x64mmFuelCell.xml +++ b/Defs/Ammo/Advanced/30x64mmFuelCell.xml @@ -46,7 +46,7 @@ Graphic_StackCount - 4.66 + 6.69 IncendiaryFuel @@ -59,7 +59,7 @@ Graphic_StackCount - 6.18 + 10.1 ThermobaricFuel @@ -72,7 +72,7 @@ Graphic_StackCount - 4.93 + 7.22 FoamFuel 0 @@ -98,8 +98,8 @@ PrometheumFlame - 6 - 4.5 + 10 + 6 FilthPrometheum 0.2 true @@ -111,9 +111,9 @@ CombatExtended.ProjectileCE_Explosive - 2.0 + 2.5 Thermobaric - 48 + 78 MortarBomb_Explode true true @@ -128,7 +128,7 @@ Extinguish 0.0 0.0 - 3 + 4 Filth_FireFoam 1 @@ -157,7 +157,7 @@
  • Prometheum
    • - 14 + 30
  • @@ -178,7 +178,7 @@ 50 - 10800 + 17200 @@ -202,7 +202,7 @@
  • FSX
    • - 21 + 46
  • @@ -222,7 +222,7 @@ 50 - 13600 + 23600 @@ -250,7 +250,7 @@
  • MeatRaw
    • - 47 + 100
  • @@ -273,7 +273,7 @@ 50 - 14600 + 25200 \ No newline at end of file From 17a6b64ac10ee1ad9f9920de6f9b9229fc83b970 Mon Sep 17 00:00:00 2001 From: Tostov <57082718+Tostov@users.noreply.github.com> Date: Sun, 1 Sep 2024 22:21:32 +1000 Subject: [PATCH 019/451] Thump Cell Changes Increase with regular fuel cell efficiency, also boosted damage from 1/2 reduction in damage to 1/3 reduction in damage. --- .../Defs/Rimsenal Enhanced Vanilla/Ammo_EnhancedVanilla.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ModPatches/Rimsenal Enhanced Vanilla/Defs/Rimsenal Enhanced Vanilla/Ammo_EnhancedVanilla.xml b/ModPatches/Rimsenal Enhanced Vanilla/Defs/Rimsenal Enhanced Vanilla/Ammo_EnhancedVanilla.xml index 44519317be..5c690d9827 100644 --- a/ModPatches/Rimsenal Enhanced Vanilla/Defs/Rimsenal Enhanced Vanilla/Ammo_EnhancedVanilla.xml +++ b/ModPatches/Rimsenal Enhanced Vanilla/Defs/Rimsenal Enhanced Vanilla/Ammo_EnhancedVanilla.xml @@ -208,9 +208,9 @@ r = resource cost. --> CombatExtended.ProjectileCE_Explosive - 2.0 + 2.5 Thump - 24 + 52 0 0 ThumpCannon_Impact From 8a648c431f7808cc73b3ca871fd984057f508ed2 Mon Sep 17 00:00:00 2001 From: CMDR-Bill-Doors Date: Sun, 1 Sep 2024 17:48:59 +0100 Subject: [PATCH 020/451] init commit --- .../Projectiles/ProjectileCE.cs | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs index ee3cd03a43..5538fba47b 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs @@ -1078,11 +1078,23 @@ protected Vector3 MoveForward() } Vector3 newPosition = curPosition + velocity; Accelerate(); + shotSpeed = velocity.magnitude; return newPosition; } - // This can also be made virtual, and would be the ideal entry point for guided ammunition and rockets. - protected void Accelerate() + // This is the ideal entry point for guided ammunition and rockets. + protected virtual void Accelerate() + { + AffectedByDrag(); + AffectedByGravity(); + } + + protected void AffectedByGravity() + { + velocity.y -= gravity / GenTicks.TicksPerRealSecond; + } + + protected void AffectedByDrag() { float crossSectionalArea = radius; crossSectionalArea *= crossSectionalArea * 3.14159f; @@ -1091,12 +1103,11 @@ protected void Accelerate() var dragForce = q * crossSectionalArea / ballisticCoefficient; // F = mA // A = F / m - var a = (float)((-dragForce / (float)mass)); + var a = (float)-dragForce / mass; var normalized = velocity.normalized; velocity.x += a * normalized.x; - velocity.y += a * normalized.y - (float)(1 / ballisticCoefficient) * (float)gravity / GenTicks.TicksPerRealSecond; + velocity.y += a * normalized.y; velocity.z += a * normalized.z; - shotSpeed = velocity.magnitude; } #region Tick/Draw From 19f398d30e7e726ab3435fc3b734eae3e9780382 Mon Sep 17 00:00:00 2001 From: CMDR-Bill-Doors Date: Sun, 1 Sep 2024 18:24:55 +0100 Subject: [PATCH 021/451] make AP scale with velocity --- Source/CombatExtended/CombatExtended/Projectiles/BulletCE.cs | 5 ++++- .../CombatExtended/Projectiles/ProjectileCE.cs | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/CombatExtended/CombatExtended/Projectiles/BulletCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/BulletCE.cs index ba690a7966..6db179dd76 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/BulletCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/BulletCE.cs @@ -27,7 +27,10 @@ public virtual float PenetrationAmount { var projectilePropsCE = (ProjectilePropertiesCE)def.projectile; var isSharpDmg = def.projectile.damageDef.armorCategory == DamageArmorCategoryDefOf.Sharp; - return (equipment?.GetStatValue(StatDefOf.RangedWeapon_DamageMultiplier) ?? 1f) * (isSharpDmg ? projectilePropsCE.armorPenetrationSharp : projectilePropsCE.armorPenetrationBlunt); + + float penetrationAmount = (equipment?.GetStatValue(StatDefOf.RangedWeapon_DamageMultiplier) ?? 1f) * (isSharpDmg ? projectilePropsCE.armorPenetrationSharp : projectilePropsCE.armorPenetrationBlunt); + + return lerpPosition ? penetrationAmount : penetrationAmount * RemainingKineticEnergyPct; } } diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs index 5538fba47b..afcbe21654 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs @@ -90,10 +90,12 @@ public virtual float DamageAmount { return (float)this.damageAmount; } - return ((float)this.damageAmount) * (shotSpeed * shotSpeed) / (initialSpeed * initialSpeed); + return ((float)this.damageAmount) * RemainingKineticEnergyPct; } } + public float RemainingKineticEnergyPct => (shotSpeed * shotSpeed) / (initialSpeed * initialSpeed); + /// /// Reference to the weapon that fired this projectile, may be null. /// From 7ff91eb02bb51edde5c2e3f2e1fdf985206aefcd Mon Sep 17 00:00:00 2001 From: CMDR-Bill-Doors Date: Mon, 2 Sep 2024 15:23:28 +0100 Subject: [PATCH 022/451] Update ProjectileCE.cs --- .../CombatExtended/Projectiles/ProjectileCE.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs index afcbe21654..a33ebd0573 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs @@ -239,6 +239,12 @@ public Quaternion DrawRotation { get { + if (!lerpPosition) + { + return Quaternion.AngleAxis( + Mathf.Rad2Deg * Mathf.Atan2(-velocity.y, velocity.x) + 90f + , Vector3.up); + } Vector2 w = (Destination - origin); var vx = w.x / startingTicksToImpact; @@ -894,7 +900,6 @@ protected virtual bool TryCollideWithRoof(IntVec3 cell) { MoteMakerCE.ThrowText(cell.ToVector3Shifted(), Map, "x", Color.red); } - Impact(null); return true; } @@ -974,7 +979,6 @@ protected bool TryCollideWith(Thing thing) { MoteMakerCE.ThrowText(thing.Position.ToVector3Shifted(), thing.Map, "x", Color.red); } - Impact(thing); return true; } @@ -1078,8 +1082,8 @@ protected Vector3 MoveForward() velocity = new Vector3(Mathf.Cos(sr) * Mathf.Cos(shotAngle) * sspt, Mathf.Sin(shotAngle) * sspt, Mathf.Sin(sr) * Mathf.Cos(shotAngle) * sspt); initialSpeed = sspt; } - Vector3 newPosition = curPosition + velocity; Accelerate(); + Vector3 newPosition = curPosition + velocity; shotSpeed = velocity.magnitude; return newPosition; } @@ -1177,7 +1181,7 @@ public override void Tick() def.projectile.soundImpactAnticipate.PlayOneShot(this); } //TODO : It appears that the final steps in the arc (past ticksToImpact == 0) don't CheckForCollisionBetween. - if (ticksToImpact <= 0 || nextPosition.y <= 0f) + if ((lerpPosition && ticksToImpact <= 0) || nextPosition.y <= 0f) { ImpactSomething(); return; From 77085c300d4eb5db8126e605466e941a74ee917b Mon Sep 17 00:00:00 2001 From: CMDR-Bill-Doors Date: Wed, 4 Sep 2024 04:37:37 +0100 Subject: [PATCH 023/451] Update ProjectileCE.cs --- .../CombatExtended/Projectiles/ProjectileCE.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs index a33ebd0573..087b3fef75 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs @@ -239,12 +239,6 @@ public Quaternion DrawRotation { get { - if (!lerpPosition) - { - return Quaternion.AngleAxis( - Mathf.Rad2Deg * Mathf.Atan2(-velocity.y, velocity.x) + 90f - , Vector3.up); - } Vector2 w = (Destination - origin); var vx = w.x / startingTicksToImpact; From e1142201eb158a0d799286733aef98e1704c304b Mon Sep 17 00:00:00 2001 From: CMDR-Bill-Doors Date: Wed, 4 Sep 2024 04:49:17 +0100 Subject: [PATCH 024/451] Update ThingSetMaker_CountEnabledAmmoOnly.cs --- .../ThingSetMaker_CountEnabledAmmoOnly.cs | 87 ++++++++++++++++++- 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/Source/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs b/Source/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs index fd3b53f483..ec4a5b4fb4 100644 --- a/Source/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs +++ b/Source/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Linq; using RimWorld; using Verse; @@ -6,17 +7,99 @@ namespace CombatExtended { public class ThingSetMaker_CountEnabledAmmoOnly : ThingSetMaker_Count { - public override void Generate(ThingSetMakerParams parms, List outThings) + bool basic = true; + + bool advanced = false; + + bool CanSpawn(AmmoDef def) + { + if (def.ammoClass != null) + { + return def.ammoClass.advanced ? basic : advanced; + } + return true; + } + + protected override void Generate(ThingSetMakerParams parms, List outThings) + { + parms.validator = delegate (ThingDef d) + { + if (d is AmmoDef ammodef && (ammodef.tradeTags?.Contains(AmmoInjector.destroyWithAmmoDisabledTag) ?? false)) + { + return AmmoUtility.IsAmmoSystemActive(ammodef) && CanSpawn(ammodef); + } + return true; + }; + base.Generate(parms, outThings); + } + } + public class ThingSetMaker_StackCountEnabledAmmoOnly : ThingSetMaker_StackCount + { + bool basic = true; + + bool advanced = false; + + bool CanSpawn(AmmoDef def) + { + if (def.ammoClass != null) + { + return def.ammoClass.advanced ? basic : advanced; + } + return true; + } + + protected override void Generate(ThingSetMakerParams parms, List outThings) { parms.validator = delegate (ThingDef d) { if (d is AmmoDef ammodef && (ammodef.tradeTags?.Contains(AmmoInjector.destroyWithAmmoDisabledTag) ?? false)) { - return AmmoUtility.IsAmmoSystemActive(ammodef); + return AmmoUtility.IsAmmoSystemActive(ammodef) && CanSpawn(ammodef); } return true; }; base.Generate(parms, outThings); } } + public class ThingSetMaker_CountWithAmmo : ThingSetMaker_Count + { + IntRange magCount = new IntRange(2, 5); + + bool random; + + bool canGenerateAdvanced; + + protected override void Generate(ThingSetMakerParams parms, List outThings) + { + base.Generate(parms, outThings); + List ammos = new List(); + foreach (var thing in outThings) + { + if (thing.TryGetComp() is CompAmmoUser ammoUser && ammoUser.UseAmmo) + { + Thing ammo = ThingMaker.MakeThing(GetAmmoDef(ammoUser.Props)); + ammo.stackCount = Math.Max(Math.Max(ammoUser.Props.AmmoGenPerMagOverride, ammoUser.Props.magazineSize), 1) * magCount.RandomInRange; + ammos.Add(ammo); + } + } + foreach (var t in ammos) + { + outThings.Add(t); + } + } + + ThingDef GetAmmoDef(CompProperties_AmmoUser comp) + { + if (random) + { + var ammoDefs = comp.ammoSet.ammoTypes.Select(v => v.ammo).Where(d => canGenerateAdvanced ? true : !d.ammoClass.advanced); + if (ammoDefs.EnumerableNullOrEmpty()) + { + ammoDefs = comp.ammoSet.ammoTypes.Select(v => v.ammo); + } + return ammoDefs.RandomElement(); + } + return comp.ammoSet.ammoTypes.First().ammo; + } + } } From 332df3aa4693b7c568a01e8e2a8f9565dccc914c Mon Sep 17 00:00:00 2001 From: CMDR-Bill-Doors Date: Wed, 4 Sep 2024 04:52:52 +0100 Subject: [PATCH 025/451] Update ThingSetMaker_CountEnabledAmmoOnly.cs --- .../ThingSetMaker_CountEnabledAmmoOnly.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs b/Source/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs index ec4a5b4fb4..c7c3d8364a 100644 --- a/Source/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs +++ b/Source/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using RimWorld; using Verse; @@ -20,7 +21,7 @@ bool CanSpawn(AmmoDef def) return true; } - protected override void Generate(ThingSetMakerParams parms, List outThings) + public override void Generate(ThingSetMakerParams parms, List outThings) { parms.validator = delegate (ThingDef d) { @@ -48,7 +49,7 @@ bool CanSpawn(AmmoDef def) return true; } - protected override void Generate(ThingSetMakerParams parms, List outThings) + public override void Generate(ThingSetMakerParams parms, List outThings) { parms.validator = delegate (ThingDef d) { @@ -65,11 +66,11 @@ public class ThingSetMaker_CountWithAmmo : ThingSetMaker_Count { IntRange magCount = new IntRange(2, 5); - bool random; + bool random = false; - bool canGenerateAdvanced; + bool canGenerateAdvanced = false; - protected override void Generate(ThingSetMakerParams parms, List outThings) + public override void Generate(ThingSetMakerParams parms, List outThings) { base.Generate(parms, outThings); List ammos = new List(); From 8dd5c3d933e0ea1f978bc2caa8b12683aa6efe9c Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Wed, 4 Sep 2024 10:43:36 +0330 Subject: [PATCH 026/451] HEDP bullet damage tweaks --- Defs/Ammo/Grenade/30x29mmGrenade.xml | 2 +- Defs/Ammo/Grenade/40x53mmGrenade.xml | 2 +- Defs/Ammo/Rocket/84x246mmR.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Defs/Ammo/Grenade/30x29mmGrenade.xml b/Defs/Ammo/Grenade/30x29mmGrenade.xml index f621ab8c48..91e3b12a79 100644 --- a/Defs/Ammo/Grenade/30x29mmGrenade.xml +++ b/Defs/Ammo/Grenade/30x29mmGrenade.xml @@ -175,7 +175,7 @@ Bullet - 35 + 36 45 5.569 diff --git a/Defs/Ammo/Grenade/40x53mmGrenade.xml b/Defs/Ammo/Grenade/40x53mmGrenade.xml index 3e3cb13674..588f0d1616 100644 --- a/Defs/Ammo/Grenade/40x53mmGrenade.xml +++ b/Defs/Ammo/Grenade/40x53mmGrenade.xml @@ -177,7 +177,7 @@ Bullet - 36 + 37 76 5.768 diff --git a/Defs/Ammo/Rocket/84x246mmR.xml b/Defs/Ammo/Rocket/84x246mmR.xml index fb46909272..538778bf14 100644 --- a/Defs/Ammo/Rocket/84x246mmR.xml +++ b/Defs/Ammo/Rocket/84x246mmR.xml @@ -372,7 +372,7 @@ CombatExtended.BulletCE Bullet - 400 + 189 150 33.371 59 From 10cd7d9d0e3da60b84a50bcdcb0af773ec5795ef Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Thu, 5 Sep 2024 10:36:38 +0330 Subject: [PATCH 027/451] small frag amount adjustments --- Defs/Ammo/Grenade/25x59mmGrenade.xml | 2 +- Defs/Ammo/Grenade/30x29mmGrenade.xml | 2 +- Defs/Ammo/Grenade/35x32mmSRGrenade.xml | 2 +- Defs/Ammo/Grenade/40x46mmGrenade.xml | 2 +- Defs/Ammo/Grenade/40x53mmGrenade.xml | 2 +- Defs/Ammo/Rocket/127mmJavelinMissile.xml | 2 +- Defs/Ammo/Rocket/132mmM13.xml | 2 +- Defs/Ammo/Rocket/84x246mmR.xml | 5 ++--- Defs/Ammo/Rocket/RPG7.xml | 2 +- Defs/Ammo/Rocket/SPG9.xml | 2 +- Defs/Ammo/Rocket/TomahawkLAM.xml | 2 +- Defs/Ammo/Shell/105x607mmR.xml | 2 +- Defs/Ammo/Shell/120mmCannon.xml | 2 +- 13 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Defs/Ammo/Grenade/25x59mmGrenade.xml b/Defs/Ammo/Grenade/25x59mmGrenade.xml index 997a403d2b..b147d1f871 100644 --- a/Defs/Ammo/Grenade/25x59mmGrenade.xml +++ b/Defs/Ammo/Grenade/25x59mmGrenade.xml @@ -188,7 +188,7 @@
  • - 12 + 9
    • diff --git a/Defs/Ammo/Grenade/30x29mmGrenade.xml b/Defs/Ammo/Grenade/30x29mmGrenade.xml index 91e3b12a79..e153cdbdf7 100644 --- a/Defs/Ammo/Grenade/30x29mmGrenade.xml +++ b/Defs/Ammo/Grenade/30x29mmGrenade.xml @@ -188,7 +188,7 @@
  • - 14 + 11
    • diff --git a/Defs/Ammo/Grenade/35x32mmSRGrenade.xml b/Defs/Ammo/Grenade/35x32mmSRGrenade.xml index c4d121f1b5..e1463c3e54 100644 --- a/Defs/Ammo/Grenade/35x32mmSRGrenade.xml +++ b/Defs/Ammo/Grenade/35x32mmSRGrenade.xml @@ -150,7 +150,7 @@
  • - 15 + 8
    • diff --git a/Defs/Ammo/Grenade/40x46mmGrenade.xml b/Defs/Ammo/Grenade/40x46mmGrenade.xml index aa3549fb0a..8dc35f2afe 100644 --- a/Defs/Ammo/Grenade/40x46mmGrenade.xml +++ b/Defs/Ammo/Grenade/40x46mmGrenade.xml @@ -205,7 +205,7 @@
  • - 10 + 7
    • diff --git a/Defs/Ammo/Grenade/40x53mmGrenade.xml b/Defs/Ammo/Grenade/40x53mmGrenade.xml index 588f0d1616..8ba6e74c78 100644 --- a/Defs/Ammo/Grenade/40x53mmGrenade.xml +++ b/Defs/Ammo/Grenade/40x53mmGrenade.xml @@ -190,7 +190,7 @@
  • - 16 + 13
    • diff --git a/Defs/Ammo/Rocket/127mmJavelinMissile.xml b/Defs/Ammo/Rocket/127mmJavelinMissile.xml index 28c1323703..c0eb3e6b7c 100644 --- a/Defs/Ammo/Rocket/127mmJavelinMissile.xml +++ b/Defs/Ammo/Rocket/127mmJavelinMissile.xml @@ -30,7 +30,7 @@
  • 2 - 80 + 113
    • diff --git a/Defs/Ammo/Rocket/132mmM13.xml b/Defs/Ammo/Rocket/132mmM13.xml index 92265a04c5..003c17775e 100644 --- a/Defs/Ammo/Rocket/132mmM13.xml +++ b/Defs/Ammo/Rocket/132mmM13.xml @@ -81,7 +81,7 @@
  • 40 - 80 + 91
  • diff --git a/Defs/Ammo/Rocket/84x246mmR.xml b/Defs/Ammo/Rocket/84x246mmR.xml index 538778bf14..a17e89fcdd 100644 --- a/Defs/Ammo/Rocket/84x246mmR.xml +++ b/Defs/Ammo/Rocket/84x246mmR.xml @@ -386,8 +386,7 @@
  • - 4 - 8 + 86
    • @@ -410,7 +409,7 @@
  • - 80 + 150
    • diff --git a/Defs/Ammo/Rocket/RPG7.xml b/Defs/Ammo/Rocket/RPG7.xml index ae8bba21a7..8c80971ce3 100644 --- a/Defs/Ammo/Rocket/RPG7.xml +++ b/Defs/Ammo/Rocket/RPG7.xml @@ -198,7 +198,7 @@
  • - 50 + 150
    • diff --git a/Defs/Ammo/Rocket/SPG9.xml b/Defs/Ammo/Rocket/SPG9.xml index a51511e6b5..9e9e536a93 100644 --- a/Defs/Ammo/Rocket/SPG9.xml +++ b/Defs/Ammo/Rocket/SPG9.xml @@ -210,7 +210,7 @@
  • - 80 + 150
    • diff --git a/Defs/Ammo/Rocket/TomahawkLAM.xml b/Defs/Ammo/Rocket/TomahawkLAM.xml index 4370610dbd..70f06e0825 100644 --- a/Defs/Ammo/Rocket/TomahawkLAM.xml +++ b/Defs/Ammo/Rocket/TomahawkLAM.xml @@ -118,7 +118,7 @@
  • 40 - 80 + 150
    • diff --git a/Defs/Ammo/Shell/105x607mmR.xml b/Defs/Ammo/Shell/105x607mmR.xml index 145429ae8f..f2924ba669 100644 --- a/Defs/Ammo/Shell/105x607mmR.xml +++ b/Defs/Ammo/Shell/105x607mmR.xml @@ -134,7 +134,7 @@
  • 16 - 80 + 88
    • diff --git a/Defs/Ammo/Shell/120mmCannon.xml b/Defs/Ammo/Shell/120mmCannon.xml index c4591b7825..1539c6200c 100644 --- a/Defs/Ammo/Shell/120mmCannon.xml +++ b/Defs/Ammo/Shell/120mmCannon.xml @@ -133,7 +133,7 @@
  • 30 - 80 + 81
    • From 032d287756cf0a7bf6b48b8bcf8173ae3cfcc061 Mon Sep 17 00:00:00 2001 From: Tostov <57082718+Tostov@users.noreply.github.com> Date: Sat, 7 Sep 2024 18:38:43 +1000 Subject: [PATCH 028/451] GetAfterArmorDamage and GetAmbientPostArmorDamage moved penAmount to immediately after dmgAmount changed it to use dinfo.ArmorPenetrationInt rather than originalDinfo.ArmorPenetrationInt Added new penAmount update if isAmbientDamage to set to default penetration for the damage type (the penetration amount passed by explosive projectiles is not scaled properly and it'd be a large scale task since that would require redoing explosive pen I suspect) For GetAmbientPostArmorDamage New field for penAmount penAmount is added to dmgMult before the subtraction of armor Clamped to maximum of 1 before deflection is checked to prevent over-damage. --- .../CombatExtended/ArmorUtilityCE.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Source/CombatExtended/CombatExtended/ArmorUtilityCE.cs b/Source/CombatExtended/CombatExtended/ArmorUtilityCE.cs index f6cafbdf4b..0db1576162 100644 --- a/Source/CombatExtended/CombatExtended/ArmorUtilityCE.cs +++ b/Source/CombatExtended/CombatExtended/ArmorUtilityCE.cs @@ -58,13 +58,15 @@ public static DamageInfo GetAfterArmorDamage(DamageInfo originalDinfo, Pawn pawn var dinfo = new DamageInfo(originalDinfo); var dmgAmount = dinfo.Amount; + var penAmount = dinfo.ArmorPenetrationInt; //GetPenetrationValue(originalDinfo); var involveArmor = dinfo.Def.harmAllLayersUntilOutside || hitPart.depth == BodyPartDepth.Outside; bool isAmbientDamage = dinfo.IsAmbientDamage(); - // In case of ambient damage (fire, electricity) we apply a percentage reduction formula based on the sum of all applicable armor + // In case of ambient damage (fire, electricity) we apply a percentage reduction formula based on the sum of all applicable armor, using the penetration from the type of damagedef if (isAmbientDamage) { - dinfo.SetAmount(Mathf.CeilToInt(GetAmbientPostArmorDamage(dmgAmount, originalDinfo.Def.armorCategory.armorRatingStat, pawn, hitPart))); + penAmount = dinfo.defInt.defaultArmorPenetration; + dinfo.SetAmount(Mathf.CeilToInt(GetAmbientPostArmorDamage(dmgAmount, penAmount, originalDinfo.Def.armorCategory.armorRatingStat, pawn, hitPart))); armorDeflected = dinfo.Amount <= 0; return dinfo; } @@ -73,7 +75,6 @@ public static DamageInfo GetAfterArmorDamage(DamageInfo originalDinfo, Pawn pawn deflectionComp.deflectedSharp = false; } - var penAmount = originalDinfo.ArmorPenetrationInt; //GetPenetrationValue(originalDinfo); // Apply worn armor if (involveArmor && pawn.apparel != null && !pawn.apparel.WornApparel.NullOrEmpty()) @@ -419,9 +420,9 @@ private static bool TryDamageArmor(DamageDef def, float penAmount, float armorAm /// The damaged pawn /// The body part affected /// The post-armor damage ranging from 0 to the original amount - private static float GetAmbientPostArmorDamage(float dmgAmount, StatDef armorRatingStat, Pawn pawn, BodyPartRecord part) + private static float GetAmbientPostArmorDamage(float dmgAmount, float penAmount, StatDef armorRatingStat, Pawn pawn, BodyPartRecord part) { - var dmgMult = 1f; + var dmgMult = 1f + penAmount; if (part.IsInGroup(CE_BodyPartGroupDefOf.CoveredByNaturalArmor)) { dmgMult -= pawn.GetStatValue(armorRatingStat); @@ -447,7 +448,10 @@ private static float GetAmbientPostArmorDamage(float dmgAmount, StatDef armorRat } } } - + if (dmgMult > 1f) + { + dmgMult = 1f; + } var deflectionComp = pawn.TryGetComp(); if (deflectionComp != null) { From 7b841d015c8c862dc12d28f3401c0b1a8fee8eac Mon Sep 17 00:00:00 2001 From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com> Date: Sat, 7 Sep 2024 20:40:21 +0800 Subject: [PATCH 029/451] Initial patch --- .../Addon Weapons/VWEBFRangedWarcasket.xml | 114 ++++++ .../Patches/VWE-BioferriteRanged.xml | 345 ++++++++++++++++++ .../Patches/VWEHRanged.xml | 126 +++++++ 3 files changed, 585 insertions(+) create mode 100644 ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml create mode 100644 ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml create mode 100644 ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWEHRanged.xml diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml new file mode 100644 index 0000000000..6141ee3aa2 --- /dev/null +++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml @@ -0,0 +1,114 @@ + + + + + +
  • Vanilla Weapons Expanded - Bioferrite
    • +     + + + +
  • + Defs/ThingDef[defName = "VWEB_Warbolter"]/tools + + +
  • + + +
  • Blunt
    • + + 35 + 2.44 + 16 + Barrel + + + + + +
  • + VWEB_Warbolter + + 23.6 + 0.58 + 1 + 0.13 + 1 + 18.2 + 61000 + + + CombatExtended.Verb_ShootCE + true + Bullet_Bolter998_Standard + 0.6 + 50 + 20 + HP_Heavy_Bolt_Gun_Sound + GunTail_Medium + 8 + 2.3 + 10 + + + 60 + 6.8 + AmmoSet_Bolter998 + + + 5 + FALSE + Snapshot + + +
  • CE_AI_BROOM
    • +
  • CE_SMG
    • +
  • IndustrialGunAdvanced
    • +     + + +
  • + Defs/ThingDef[defName="VWEB_Warbolter"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"] + +
  • + switch to rifle + switch to flamethrower + + 40 + 5 + AmmoSet_Flamethrower + + + 0.35 + CombatExtended.Verb_ShootCE + true + Bullet_Flamethrower_Prometheum + 3 + 1.1 + 30 + 1 + 3 + 20 + HissFlamethrower + 0 + + true + + + + FALSE + AimedShot + 5 + true + +
    • +
  • + CompEquippable +
    • + + + + + +     + \ No newline at end of file diff --git a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml new file mode 100644 index 0000000000..7c08083eec --- /dev/null +++ b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml @@ -0,0 +1,345 @@ + + + + + + + + Defs/ThingDef[defName="VWEB_Gun_FlarestrikeRifle" or + defName="VWEB_Gun_FirestormShotgun"]/tools + + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + +     +     +     + + + + Defs/ThingDef[defName="VWEB_Gun_PiercerRifle"]/tools + + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Stab
    • + + 10 + 1.62 + 2.304 + 1.5 + Muzzle + +     +     +     + + + + + VWEB_Gun_FlarestrikeRifle + + 3.63 + 7.58 + 0.07 + 1.25 + 1.10 + 0.36 + + + 1.38 + CombatExtended.Verb_ShootCE + true + Bullet_556x45mmNATO_FMJ + 1 + 58 + 6 + 5 + Shot_AssaultRifle + GunTail_Medium + 9 + + + 30 + 4 + AmmoSet_556x45mmNATO + + + Snapshot + True + 3 + + +
  • CE_AI_AR
    • +     +     + + + Defs/AbilityDef[defName="VWEB_FlarestrikeFlare"]/verbProperties + + + CombatExtended.Verb_LaunchProjectileStaticCE + Grenade_DisruptorFlare + + 0.5 + 40 + 1 + true + true + true + false + + false + false + true + + FlareLaunch + Combat_RangedFire_Thrown + false + (0.8, 0.8, 0.4, 1) + true + true + + + + + + + + VWEB_Gun_FirestormShotgun + + 4.40 + 0.44 + 1.0 + 0.13 + 1.48 + 8.20 + 17500 + + + 5 + 55 + 3 + + + CombatExtended.Verb_ShootCE + true + Bullet_12Gauge_Buck + 0.6 + 16 + Shot_Shotgun + GunTail_Heavy + 9 + + + + 9 + true + 0.8 + AmmoSet_12Gauge + + + + FALSE + Snapshot + + + +
  • CE_AI_AssaultWeapon
    • +     +     + + + Defs/ThingDef[defName="VWEB_Gun_FirestormShotgun"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"]/ammoDef + + Ammo_Flamethrower_Bioferrite + + + + + Defs/ThingDef[defName ="VWEB_Gun_CycloneMinigun"]/equippedStatOffsets + + + + VWEB_Gun_CycloneMinigun + + 25.00 + 0.35 + 1 + 0.06 + 3.22 + 12 + 60000 + + + 150 + 15 + 20 + + + 0.97 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 2.1 + 62 + 50 + 2 + Shot_Minigun + GunTail_Medium + 9 + + + 250 + 9.2 + AmmoSet_762x51mmNATO + + + 25 + Snapshot + + +
  • CE_AI_Suppressive
    • +     +     + + + Defs/ThingDef[defName="VWEB_Gun_CycloneMinigun"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"]/ammoDef + + Ammo_762x51mmNATO_FMJ + + + + + Defs/ThingDef[defName="VWEB_Gun_CycloneMinigun"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"]/ammoCountPerCharge + + 50 + + + + + Defs/AbilityDef[defName="VWEB_CycloneRapidBurst"]/verbProperties + + + CombatExtended.Verb_LaunchProjectileStaticCE + Bullet_762x51mmNATO_FMJ + 0.5 + 62 + 50 + 1 + true + true + true + true + + true + true + false + + Shot_Minigun + GunTail_Medium + 9 + + + + + + + + VWEB_Gun_PiercerRifle + + 4.19 + 1.17 + 1 + 0.02 + 1.68 + 12.60 + 16000 + + + 55 + 15 + 1 + 20 + + + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_303British_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 + + + 10 + 4.3 + AmmoSet_303British + + + AimedShot + + +
  • SimpleGun
    • +
  • CE_AI_SR
    • +     + Gunsmithing + false +     + +     \ No newline at end of file diff --git a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWEHRanged.xml b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWEHRanged.xml new file mode 100644 index 0000000000..e135115093 --- /dev/null +++ b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWEHRanged.xml @@ -0,0 +1,126 @@ + + + + + +
  • Vanilla Weapons Expanded - Bioferrite
    • +     + + + +
  • + + Defs/ThingDef[defName = "VWEB_HeavyIncinerator"]/verbs/li/verbClass + + + Verb_Shoot + +
    • + + +
  • + + Defs/ThingDef[defName = "VWEB_HeavyIncinerator"]/tools + + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + + + + + + +
  • + VWEB_HeavyIncinerator + + 18 + 7.10 + 0.5 + 0.60 + 0.35 + + + CombatExtended.Verb_ShootCE + 0.85 + True + Bullet_Flamethrower_Prometheum + 40 + 1 + 1 + 26 + 3 + HissFlamethrower + GunTail_Light + 12 + + true + + true + + + 200 + 5.6 + AmmoSet_Flamethrower + + + SuppressFire + 20 + True + + false +
    • + +
  • + Defs/ThingDef[defName="VWEB_Warbolter"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"] + +
  • + switch to flamethrower + switch to vaporizer + + 120 + 6 + AmmoSet_Flamethrower + + + 0.35 + CombatExtended.Verb_ShootCE + true + Bullet_Flamethrower_Prometheum + 3 + 1.1 + 16 + 1 + 2 + 40 + HissFlamethrower + 0 + + true + + + + FALSE + AimedShot + 10 + true + +
    • +
  • + CompEquippable +
    • + + + +     +     +     +     \ No newline at end of file From fb776d58e700cacabc289cd0303462936d174598 Mon Sep 17 00:00:00 2001 From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com> Date: Sat, 7 Sep 2024 20:44:10 +0800 Subject: [PATCH 030/451] minigun melee --- .../Patches/VWE-BioferriteRanged.xml | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml index 7c08083eec..2dba260c2b 100644 --- a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml +++ b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml @@ -44,6 +44,45 @@ + + + Defs/ThingDef[defName="VWEB_Gun_CycloneMinigun"]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2 + 0.86 + Stock + +
  • + + +
  • Blunt
    • +
  • Poke
    • + + 7 + 2 + 0.118 + Barrel + +
  • + + +
  • Poke
    • + + 9 + 2 + 0.86 + Muzzle + +     +     +     @@ -209,6 +248,8 @@ + + Defs/ThingDef[defName ="VWEB_Gun_CycloneMinigun"]/equippedStatOffsets From a49e474f2761413cf37660f75ca44bd623c5199f Mon Sep 17 00:00:00 2001 From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com> Date: Sat, 7 Sep 2024 20:54:05 +0800 Subject: [PATCH 031/451] loadorder and test ammo bench --- LoadFolders.xml | 1 + .../Addon Weapons/VWEBFRangedWarcasket.xml | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/LoadFolders.xml b/LoadFolders.xml index 9c0df97218..b0409a8ffa 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -573,6 +573,7 @@
  • ModPatches/Vanilla Vehicles Expanded - Tier 3
  • ModPatches/Vanilla Vehicles Expanded - Upgrades
  • ModPatches/Vanilla Weapons Expanded
    • +
  • ModPatches/Vanilla Weapons Expanded - Bioferrite
  • ModPatches/Vanilla Weapons Expanded - Coilguns
  • ModPatches/Vanilla Weapons Expanded - Frontier
  • ModPatches/Vanilla Weapons Expanded - Grenades
    • diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml index 6141ee3aa2..60284810bc 100644 --- a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml +++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml @@ -8,6 +8,31 @@ +
  • + Defs/ThingDef[@Name = "AmmoBolter998Base"]/tradeTags + +
  • CE_AutoEnableCrafting_FabricationBench
    • + + + +
  • + Defs/ThingDef[defName = "VWEB_Warbolter"]/tools + + +
  • + + +
  • Blunt
    • + + 35 + 2.44 + 16 + Barrel + + + + +
  • Defs/ThingDef[defName = "VWEB_Warbolter"]/tools From c5b5458d1b972b9d94cfca21437139b15d53bf99 Mon Sep 17 00:00:00 2001 From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com> Date: Sat, 7 Sep 2024 21:01:35 +0800 Subject: [PATCH 032/451] sound and los line --- .../ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml | 2 +- .../Patches/VWE-BioferriteRanged.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml index 60284810bc..7df43eee82 100644 --- a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml +++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml @@ -69,7 +69,7 @@ 0.6 50 20 - HP_Heavy_Bolt_Gun_Sound + VWEB_Warbolter_Fire GunTail_Medium 8 2.3 diff --git a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml index 2dba260c2b..db42457e85 100644 --- a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml +++ b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml @@ -44,7 +44,7 @@ - + Defs/ThingDef[defName="VWEB_Gun_CycloneMinigun"]/tools @@ -189,7 +189,6 @@ Combat_RangedFire_Thrown false (0.8, 0.8, 0.4, 1) - true true From 7c463701355df5ffb4f49faba68e6a93d73fee3c Mon Sep 17 00:00:00 2001 From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com> Date: Sat, 7 Sep 2024 21:07:27 +0800 Subject: [PATCH 033/451] typo --- .../Patches/VWEHRanged.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWEHRanged.xml b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWEHRanged.xml index e135115093..c6a915852b 100644 --- a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWEHRanged.xml +++ b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWEHRanged.xml @@ -3,7 +3,7 @@ -
  • Vanilla Weapons Expanded - Bioferrite
    • +
  • Vanilla Weapons Expanded - Heavy Weapons
    • @@ -80,7 +80,7 @@
  • - Defs/ThingDef[defName="VWEB_Warbolter"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"] + Defs/ThingDef[defName="VWEB_HeavyIncinerator"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"]
  • switch to flamethrower From f14d61f52601d489f9e1df7bc5b2a644358a58bf Mon Sep 17 00:00:00 2001 From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com> Date: Sun, 8 Sep 2024 18:19:57 +0800 Subject: [PATCH 034/451] change bolter ammo to 50mm --- .../Ammo/Ammo_Mods.xml | 67 +++++++++++++++++++ .../Addon Weapons/VWEBFRangedWarcasket.xml | 24 +++---- 2 files changed, 75 insertions(+), 16 deletions(-) diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Mods.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Mods.xml index 305fec7af2..b648feca5a 100644 --- a/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Mods.xml +++ b/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Mods.xml @@ -36,6 +36,15 @@ + + + AmmoSet_50mmRocket_DF + + + Bullet_50mmRocket_HEDF + + + @@ -85,4 +94,62 @@ + + + Bullet_50mmRocket_HEDF + CombatExtended.ProjectileCE_Explosive + + + Things/Projectile/Rocket/70mmAPKWS + Graphic_Single + 0.70 + + + Bomb + 147 + 2.5 + 80 + RocketPropelledLoop_Small + false + false + + Things/WorldObjects/Munitions/Rocket + 0.35 + 12 + 0.43 + + + +
  • + + 23 + +
    • +
  • + +
  • + Fleck_CERocketFlame + 7 + 3 + 60~120 +
    • +
  • + Fleck_CERocketSmokeTrail + 0.5 + 0~360 + 2 + 1 +
    • +
  • + Fleck_CERocketSmoke + 0.5 + 0~360 + 1 + 120~240 +
    • + + + + + \ No newline at end of file diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml index 7df43eee82..85a7693e9f 100644 --- a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml +++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml @@ -8,13 +8,6 @@ -
  • - Defs/ThingDef[@Name = "AmmoBolter998Base"]/tradeTags - -
  • CE_AutoEnableCrafting_FabricationBench
    • - - -
  • Defs/ThingDef[defName = "VWEB_Warbolter"]/tools @@ -65,29 +58,28 @@ CombatExtended.Verb_ShootCE true - Bullet_Bolter998_Standard + Bullet_50mmRocket_HEDF 0.6 50 - 20 + 3 VWEB_Warbolter_Fire GunTail_Medium 8 2.3 - 10 + 12 - 60 - 6.8 - AmmoSet_Bolter998 + 10 + 8 + AmmoSet_50mmRocket_DF - 5 + 1 FALSE Snapshot
  • CE_AI_BROOM
    • -
  • CE_SMG
  • IndustrialGunAdvanced
    • @@ -96,7 +88,7 @@ Defs/ThingDef[defName="VWEB_Warbolter"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"]
  • - switch to rifle + switch to bolter switch to flamethrower 40 From 9b6a62a0ed9f353c0938ed43f8b81b192c92b431 Mon Sep 17 00:00:00 2001 From: CMDR-Bill-Doors Date: Mon, 9 Sep 2024 07:24:13 +0100 Subject: [PATCH 035/451] Added market value version, Moved logic to static class --- .../CombatExtended/CE_ThingSetMakerUtility.cs | 54 +++++++++ .../ThingSetMaker_CountEnabledAmmoOnly.cs | 60 ++++++++++ .../ThingSetMaker_CountEnabledAmmoOnly.cs | 106 ------------------ 3 files changed, 114 insertions(+), 106 deletions(-) create mode 100644 Source/CombatExtended/CombatExtended/CE_ThingSetMakerUtility.cs create mode 100644 Source/CombatExtended/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs delete mode 100644 Source/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs diff --git a/Source/CombatExtended/CombatExtended/CE_ThingSetMakerUtility.cs b/Source/CombatExtended/CombatExtended/CE_ThingSetMakerUtility.cs new file mode 100644 index 0000000000..2b6dcbe8d6 --- /dev/null +++ b/Source/CombatExtended/CombatExtended/CE_ThingSetMakerUtility.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Verse; + +namespace CombatExtended.CombatExtended +{ + public static class CE_ThingSetMakerUtility + { + public static bool CanGenerate(ThingDef d, bool allowBasic, bool allowAdvanced) + { + return d is AmmoDef ammodef && (ammodef.tradeTags?.Contains(AmmoInjector.destroyWithAmmoDisabledTag) ?? false) + ? AmmoUtility.IsAmmoSystemActive(ammodef) && AdvancedOrBasic(ammodef, allowBasic, allowAdvanced) + : true; + } + + public static bool AdvancedOrBasic(AmmoDef d, bool allowBasic, bool allowAdvanced) + { + return d.ammoClass == null || (d.ammoClass.advanced ? allowBasic : allowAdvanced); + } + + public static ThingDef GetAmmoDef(CompProperties_AmmoUser comp, bool random, bool canGenerateAdvanced) + { + if (random) + { + var ammoDefs = comp.ammoSet.ammoTypes.Select(v => v.ammo).Where(d => canGenerateAdvanced || !d.ammoClass.advanced); + if (ammoDefs.EnumerableNullOrEmpty()) + { + ammoDefs = comp.ammoSet.ammoTypes.Select(v => v.ammo); + } + return ammoDefs.RandomElement(); + } + return comp.ammoSet.ammoTypes.First().ammo; + } + + public static void GenerateAmmoForWeapon(List outThings, bool random, bool canGenerateAdvanced, IntRange magCount) + { + List ammos = new List(); + foreach (var thing in outThings) + { + if (thing.TryGetComp() is CompAmmoUser ammoUser && ammoUser.UseAmmo) + { + Thing ammo = ThingMaker.MakeThing(GetAmmoDef(ammoUser.Props, random, canGenerateAdvanced)); + ammo.stackCount = Math.Max(Math.Max(ammoUser.Props.AmmoGenPerMagOverride, ammoUser.Props.magazineSize), 1) * magCount.RandomInRange; + ammos.Add(ammo); + } + } + foreach (var t in ammos) + { + outThings.Add(t); + } + } + } +} diff --git a/Source/CombatExtended/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs b/Source/CombatExtended/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs new file mode 100644 index 0000000000..90ccc428ca --- /dev/null +++ b/Source/CombatExtended/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs @@ -0,0 +1,60 @@ +using System.Collections.Generic; +using RimWorld; +using Verse; + +namespace CombatExtended.CombatExtended +{ + public class ThingSetMaker_CountEnabledAmmoOnly : ThingSetMaker_Count + { + bool basic = true; + + bool advanced = false; + + public override void Generate(ThingSetMakerParams parms, List outThings) + { + parms.validator = d => CE_ThingSetMakerUtility.CanGenerate(d, basic, advanced); + base.Generate(parms, outThings); + } + } + public class ThingSetMaker_StackCountEnabledAmmoOnly : ThingSetMaker_StackCount + { + bool basic = true; + + bool advanced = false; + + public override void Generate(ThingSetMakerParams parms, List outThings) + { + parms.validator = d => CE_ThingSetMakerUtility.CanGenerate(d, basic, advanced); + base.Generate(parms, outThings); + } + } + public class ThingSetMaker_CountWithAmmo : ThingSetMaker_Count + { + IntRange magCount = new IntRange(2, 5); + + bool random = false; + + bool canGenerateAdvanced = false; + + public override void Generate(ThingSetMakerParams parms, List outThings) + { + base.Generate(parms, outThings); + CE_ThingSetMakerUtility.GenerateAmmoForWeapon(outThings, random, canGenerateAdvanced, magCount); + } + } + + public class ThingSetMaker_MarketValueWithAmmo : ThingSetMaker_MarketValue + { + IntRange magCount = new IntRange(2, 5); + + bool random = false; + + bool canGenerateAdvanced = false; + + public override void Generate(ThingSetMakerParams parms, List outThings) + { + base.Generate(parms, outThings); + CE_ThingSetMakerUtility.GenerateAmmoForWeapon(outThings, random, canGenerateAdvanced, magCount); + } + } +} diff --git a/Source/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs b/Source/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs deleted file mode 100644 index c7c3d8364a..0000000000 --- a/Source/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs +++ /dev/null @@ -1,106 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using RimWorld; -using Verse; - -namespace CombatExtended -{ - public class ThingSetMaker_CountEnabledAmmoOnly : ThingSetMaker_Count - { - bool basic = true; - - bool advanced = false; - - bool CanSpawn(AmmoDef def) - { - if (def.ammoClass != null) - { - return def.ammoClass.advanced ? basic : advanced; - } - return true; - } - - public override void Generate(ThingSetMakerParams parms, List outThings) - { - parms.validator = delegate (ThingDef d) - { - if (d is AmmoDef ammodef && (ammodef.tradeTags?.Contains(AmmoInjector.destroyWithAmmoDisabledTag) ?? false)) - { - return AmmoUtility.IsAmmoSystemActive(ammodef) && CanSpawn(ammodef); - } - return true; - }; - base.Generate(parms, outThings); - } - } - public class ThingSetMaker_StackCountEnabledAmmoOnly : ThingSetMaker_StackCount - { - bool basic = true; - - bool advanced = false; - - bool CanSpawn(AmmoDef def) - { - if (def.ammoClass != null) - { - return def.ammoClass.advanced ? basic : advanced; - } - return true; - } - - public override void Generate(ThingSetMakerParams parms, List outThings) - { - parms.validator = delegate (ThingDef d) - { - if (d is AmmoDef ammodef && (ammodef.tradeTags?.Contains(AmmoInjector.destroyWithAmmoDisabledTag) ?? false)) - { - return AmmoUtility.IsAmmoSystemActive(ammodef) && CanSpawn(ammodef); - } - return true; - }; - base.Generate(parms, outThings); - } - } - public class ThingSetMaker_CountWithAmmo : ThingSetMaker_Count - { - IntRange magCount = new IntRange(2, 5); - - bool random = false; - - bool canGenerateAdvanced = false; - - public override void Generate(ThingSetMakerParams parms, List outThings) - { - base.Generate(parms, outThings); - List ammos = new List(); - foreach (var thing in outThings) - { - if (thing.TryGetComp() is CompAmmoUser ammoUser && ammoUser.UseAmmo) - { - Thing ammo = ThingMaker.MakeThing(GetAmmoDef(ammoUser.Props)); - ammo.stackCount = Math.Max(Math.Max(ammoUser.Props.AmmoGenPerMagOverride, ammoUser.Props.magazineSize), 1) * magCount.RandomInRange; - ammos.Add(ammo); - } - } - foreach (var t in ammos) - { - outThings.Add(t); - } - } - - ThingDef GetAmmoDef(CompProperties_AmmoUser comp) - { - if (random) - { - var ammoDefs = comp.ammoSet.ammoTypes.Select(v => v.ammo).Where(d => canGenerateAdvanced ? true : !d.ammoClass.advanced); - if (ammoDefs.EnumerableNullOrEmpty()) - { - ammoDefs = comp.ammoSet.ammoTypes.Select(v => v.ammo); - } - return ammoDefs.RandomElement(); - } - return comp.ammoSet.ammoTypes.First().ammo; - } - } -} From c54e8350a26047d5adcfa85f9c394058a567b794 Mon Sep 17 00:00:00 2001 From: CMDR-Bill-Doors Date: Mon, 9 Sep 2024 07:28:29 +0100 Subject: [PATCH 036/451] brun --- Source/CombatExtended/CombatExtended/CE_ThingSetMakerUtility.cs | 2 +- .../CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/CombatExtended/CombatExtended/CE_ThingSetMakerUtility.cs b/Source/CombatExtended/CombatExtended/CE_ThingSetMakerUtility.cs index 2b6dcbe8d6..24e505d358 100644 --- a/Source/CombatExtended/CombatExtended/CE_ThingSetMakerUtility.cs +++ b/Source/CombatExtended/CombatExtended/CE_ThingSetMakerUtility.cs @@ -3,7 +3,7 @@ using System.Linq; using Verse; -namespace CombatExtended.CombatExtended +namespace CombatExtended { public static class CE_ThingSetMakerUtility { diff --git a/Source/CombatExtended/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs b/Source/CombatExtended/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs index 90ccc428ca..f42d85f161 100644 --- a/Source/CombatExtended/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs +++ b/Source/CombatExtended/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs @@ -2,7 +2,7 @@ using RimWorld; using Verse; -namespace CombatExtended.CombatExtended +namespace CombatExtended { public class ThingSetMaker_CountEnabledAmmoOnly : ThingSetMaker_Count { From 14178988fdcdad47af4e66b3876514f5a23ee875 Mon Sep 17 00:00:00 2001 From: CMDR-Bill-Doors Date: Mon, 9 Sep 2024 08:12:15 +0100 Subject: [PATCH 037/451] Create ThingSetMakers_Reward.xml --- .../ThingSetMakers_Reward.xml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 Patches/Core/ThingSetMakerDefs/ThingSetMakers_Reward.xml diff --git a/Patches/Core/ThingSetMakerDefs/ThingSetMakers_Reward.xml b/Patches/Core/ThingSetMakerDefs/ThingSetMakers_Reward.xml new file mode 100644 index 0000000000..869bf7c107 --- /dev/null +++ b/Patches/Core/ThingSetMakerDefs/ThingSetMakers_Reward.xml @@ -0,0 +1,26 @@ + + + + + + Defs/ThingSetMakerDef[defName="Reward_ItemsStandard"] + /root/options/li[1] + /thingSetMaker/options/li[thingSetMaker[@Class="ThingSetMaker_MarketValue"]/fixedParams/filter/thingSetMakerTagsToAllow/li[text()="RewardStandardHighFreq" or text()="RewardStandardMidFreq" or text()="RewardStandardLowFreq" or text()="RewardStandardQualitySuper"]] + /thingSetMaker + + Class + CombatExtended.ThingSetMaker_MarketValueWithAmmo + + + + + Defs/ThingSetMakerDef[defName="Reward_ItemsStandard"] + /root/options/li[1] + /thingSetMaker/options/li[thingSetMaker[@Class="CombatExtended.ThingSetMaker_MarketValueWithAmmo"]] + /thingSetMaker + + + true + + + \ No newline at end of file From 354bf9ec0a463d94ed75dbd868e3af4bf1fa4979 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Tue, 10 Sep 2024 01:49:49 -0400 Subject: [PATCH 038/451] Update modlist --- SupportedThirdPartyMods.md | 1 + 1 file changed, 1 insertion(+) diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index 06c75ccdcd..ebe12b6397 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -551,6 +551,7 @@ Vanilla Vehicles Expanded | Vanilla Vehicles Expanded - Tier 3 | Vanilla Vehicles Expanded - Upgrades | Vanilla Weapons Expanded | +Vanilla Weapons Expanded - Bioferrite | Vanilla Weapons Expanded - Coilguns | Vanilla Weapons Expanded - Frontier | Vanilla Weapons Expanded - Grenades | From 9ca439451b62d75f8b0c2c5ad4391d50c989a49b Mon Sep 17 00:00:00 2001 From: ViralReaction <136116069+ViralReaction@users.noreply.github.com> Date: Tue, 10 Sep 2024 18:01:05 -0600 Subject: [PATCH 039/451] More profaned patching --- About/About.xml | 3 +- .../Defs/Profaned/Profaned_CE_Projectiles.xml | 32 --- .../DamageDef/Profaned_DamagedDef.xml | 14 ++ .../Profaned_CE_Patch_Projectiles.xml | 95 +++++--- .../Weapons/Profaned_Weapons_Melee.xml | 221 +++++++++++++----- 5 files changed, 253 insertions(+), 112 deletions(-) diff --git a/About/About.xml b/About/About.xml index 9cf07a5f08..26297d5fdc 100644 --- a/About/About.xml +++ b/About/About.xml @@ -55,7 +55,7 @@
  • TheKingInYellow.Lope
  • Ludeon.RimWorld
  • Ludeon.RimWorld.Royalty
    • -
  • Ludeon.RimWorld.Anomaly
    • +
  • Ludeon.RimWorld.Anomaly
  • RunneLatki.RabbieRaceMod
  • HC.GiantRace
  • neronix17.fr.compilation
    • @@ -87,6 +87,7 @@
  • Argon.VMEu
  • Bonible.rimsenalfactions
  • kentington.saveourship2
    • +
  • botchjob.profaned
    • diff --git a/ModPatches/Profaned/Defs/Profaned/Profaned_CE_Projectiles.xml b/ModPatches/Profaned/Defs/Profaned/Profaned_CE_Projectiles.xml index 445532ea6c..d2d1c4a5a0 100644 --- a/ModPatches/Profaned/Defs/Profaned/Profaned_CE_Projectiles.xml +++ b/ModPatches/Profaned/Defs/Profaned/Profaned_CE_Projectiles.xml @@ -32,37 +32,5 @@ 30 - - - Projectile_Profaned_BloodFlameSurge_CE - - CombatExtended.ProjectileCE_Explosive - - -
  • - 1.0 - 1 - (255, 161, 0, 0.19) -
    • -     - - Things/Projectiles/BloodflameSurge/BloodflameSurgeA - Graphic_Single - MoteGlow - - - false - Flame - 3 - 3.0 - 2.0 - 30 - 3.5 - true - Filth_Ash - .3 - 30 - -     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/DamageDef/Profaned_DamagedDef.xml b/ModPatches/Profaned/Patches/Profaned/DamageDef/Profaned_DamagedDef.xml index 10fb28d75c..97d256a4df 100644 --- a/ModPatches/Profaned/Patches/Profaned/DamageDef/Profaned_DamagedDef.xml +++ b/ModPatches/Profaned/Patches/Profaned/DamageDef/Profaned_DamagedDef.xml @@ -14,5 +14,19 @@ 3     + + + Defs/DamageDef[defName="BotchJob_AbyssalDamage"]/defaultArmorPenetration + + 10 + + + + + Defs/DamageDef[defName="BotchJob_RotstinkBlast"]/defaultArmorPenetration + + 5 + + \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_Projectiles.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_Projectiles.xml index f70b2261a1..2df0aa389f 100644 --- a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_Projectiles.xml +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_Projectiles.xml @@ -1,20 +1,12 @@ - - - - - - - - - - - + Defs/ThingDef[ - defName="BotchJob_BoneProjectile"]/thingClass + defName="BotchJob_BoneProjectile" or + defName="BotchJob_SoulShard"]/thingClass + CombatExtended.BulletCE @@ -25,7 +17,10 @@ defName="BotchJob_ColossusSmashProj" or defName="BotchJob_WraithClaw" or defName="BotchJob_DragonToxicBreath" or - defName="BotchJob_PutridMass"]/thingClass + defName="BotchJob_PutridMass" or + defName="BotchJob_BloodflameStaffBolt" or + defName="BotchJob_ProfanedStaffBolt"]/thingClass + CombatExtended.ProjectileCE_Explosive @@ -68,7 +63,58 @@ + + + Defs/ThingDef[defName="BotchJob_PutridMass"]/projectile + + + 4.5 + 3.0 + 2.0 + BotchJob_RotstinkBlast + 27 + 38 + RotStink + BotchJob_Filth_Undead + 0.5 + 20 + + + + + + Defs/ThingDef[defName="BotchJob_BloodflameStaffBolt"]/projectile + + + 3 + 3.0 + 2.0 + BotchJob_BloodflameRotstinkBlast + 27 + 16 + RotStink + 20 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedStaffBolt"]/projectile + + + 2 + 3.0 + 2.0 + BotchJob_BloodflameRotstinkBlast + 27 + 16 + RotStink + 20 + + + + + Defs/ThingDef[defName="BotchJob_BoneProjectile"]/projectile @@ -85,23 +131,18 @@ - Defs/ThingDef[defName="BotchJob_PutridMass"]/projectile + Defs/ThingDef[defName="BotchJob_SoulShard"]/projectile - 4.5 - 3.0 - 2.0 - BotchJob_RotstinkBlast - 27 - 38 - RotStink - BotchJob_Filth_Undead - 0.5 - 20 + true + RangedStab + 15 + 19 + 3 + 1 + 1.2 - - - + \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Melee.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Melee.xml index 9cf518d673..e9644a7e0f 100644 --- a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Melee.xml +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Melee.xml @@ -145,7 +145,7 @@ - + Defs/ThingDef[defName="BotchJob_ProfanedShotel"]/statBases @@ -220,7 +220,7 @@ - + Defs/ThingDef[defName="BotchJob_ProfanedClub"]/tools @@ -287,7 +287,7 @@
  • CE_OneHandedWeapon
    •  - + Defs/ThingDef[defName="BotchJob_ScourgeknightGreatsword" or defName="BotchJob_GraspingDeadGreatsword"]/statBases @@ -350,41 +350,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -515,16 +480,45 @@ - + + + BotchJob_FadingSoulScythe + + 12 + 0 + 0.0 + 1 + 2 + 0.33 + + + Verb_Shoot + True + BotchJob_SoulShard + 3 + 12 + 1 + + false + true + + BotchJob_ProfanedStaffCast + 0 + + + AimedShot + + + - Defs/ThingDef[defName="BotchJob_ProfanedScythe" or defName="BotchJob_FadingSoulScythe"]/statBases + Defs/ThingDef[defName="BotchJob_ProfanedScythe"]/statBases 12 0.33 - + Defs/ThingDef[defName="BotchJob_ProfanedScythe" or defName="BotchJob_FadingSoulScythe"] @@ -578,6 +572,132 @@ + + Defs/ThingDef[defName="BotchJob_FadingSoulScythe"]/comps/li[@Class="MVCF.Comps.CompProperties_VerbProps"] + + + + + Defs/ThingDef[defName="BotchJob_ProfanedGlaive" or defName="BotchJob_AbyssalGlaive"]/statBases + + 12 + 0.33 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedGlaive" or defName="BotchJob_AbyssalGlaive"] + + + 0.30 + 0.40 + 0.23 + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedGlaive" or defName="BotchJob_AbyssalGlaive"]/tools + + +
  • + + +
  • Blunt
    • + + 4 + 1.78 + 1 + Shaft + + +
  • + + +
  • BotchJob_CE_RotStab
    • + + 28 + 3.57 + 1.33 + 2.250 + 2.5 + Blade + +
  • + + +
  • BotchJob_RotCut
    • + + 29 + 3.57 + 2.250 + 0.5 + Edge + +     +     +     + + + + BotchJob_ProfanedStaff + + 6 + 0 + 0.0 + 1 + 6 + 0.93 + + + CombatExtended.Verb_ShootCE + True + BotchJob_BloodflameStaffBolt + 4.5 + 35 + 1 + + true + true + + BotchJob_ProfanedStaffCast + 3.9 + + + AimedShot + + + + + Defs/ThingDef[defName="BotchJob_ProfanedStaff"]/tools + + +
  • + + +
  • Blunt
    • + + 5 + 2.85 + 0.30 + 1.69 + Head + +     +     +     + + + Defs/ThingDef[defName="BotchJob_ProfanedStaff"] + + + 1.00 + 0.70 + 0.47 + + + + BotchJob_BloodflameStaff @@ -590,19 +710,18 @@ 0.93 - Verb_Shoot + CombatExtended.Verb_ShootCE True BotchJob_BloodflameStaffBolt 4.5 - 25 - 2 + 35 1 true - false + true BotchJob_ProfanedStaffCast - 2.9 + 3.9 AimedShot @@ -638,7 +757,7 @@ - + Defs/ThingDef[defName="BotchJob_BloodflameStaff"]/verbs @@ -647,10 +766,9 @@ true true - Projectile_Profaned_BloodFlameSurge_CE - 6 - 3 - 1.1 + BotchJob_BloodflameSurgeProj + 1 + 0.5 12 BotchJob_ProfanedStaffCast false @@ -661,6 +779,5 @@ - \ No newline at end of file From 4788fa3175027dc9e3f8eec4edba67384bca4047 Mon Sep 17 00:00:00 2001 From: Tostov <57082718+Tostov@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:58:33 +1000 Subject: [PATCH 040/451] Cap penetration and total, update readouts Added limiter to set negative ambient penetration to 0% Adjusted ammo description details to allow for readout and to eliminate penetration rating when there is no damage, and add armor reduction for ambient when electric/heat damage. --- .../CombatExtended/AmmoUtility.cs | 40 +++++++++++-------- .../CombatExtended/ArmorUtilityCE.cs | 4 ++ 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/Source/CombatExtended/CombatExtended/AmmoUtility.cs b/Source/CombatExtended/CombatExtended/AmmoUtility.cs index 05bc128bf4..f6c753bfe7 100644 --- a/Source/CombatExtended/CombatExtended/AmmoUtility.cs +++ b/Source/CombatExtended/CombatExtended/AmmoUtility.cs @@ -51,23 +51,29 @@ public static string GetProjectileReadout(this ThingDef projectileDef, Thing wea { stringBuilder.AppendLine(" " + "CE_DescExplosionRadius".Translate() + ": " + props.explosionRadius.ToStringByStyle(ToStringStyle.FloatOne)); } - - // Sharp / blunt AP - if (props.explosionRadius > 0) - { - if (props.damageDef.armorCategory != CE_DamageArmorCategoryDefOf.Heat - && props.damageDef.armorCategory != CE_DamageArmorCategoryDefOf.Electric - && props.damageDef != DamageDefOf.Stun - && props.damageDef != DamageDefOf.Extinguish - && props.damageDef != DamageDefOf.Smoke) - { - stringBuilder.AppendLine(" " + "CE_DescBluntPenetration".Translate() + ": " + props.GetExplosionArmorPenetration() + " " + "CE_MPa".Translate()); - } - } - else - { - stringBuilder.AppendLine(" " + "CE_DescSharpPenetration".Translate() + ": " + (props.armorPenetrationSharp * multiplier).ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_mmRHA".Translate()); - stringBuilder.AppendLine(" " + "CE_DescBluntPenetration".Translate() + ": " + (props.armorPenetrationBlunt * multiplier).ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_MPa".Translate()); + // Thermal/Electric Penetration + if ((props.damageDef.armorCategory == CE_DamageArmorCategoryDefOf.Heat + || props.damageDef.armorCategory == CE_DamageArmorCategoryDefOf.Electric) && props.damageDef.defaultArmorPenetration > 0f) + { + stringBuilder.AppendLine(" " + "CE_DescAmbientPenetration".Translate() + ": " + (props.damageDef.defaultArmorPenetration).ToStringByStyle(ToStringStyle.PercentZero)); + } + // Sharp / blunt AP + if (props.damageDef.armorCategory != CE_DamageArmorCategoryDefOf.Heat + && props.damageDef.armorCategory != CE_DamageArmorCategoryDefOf.Electric + && props.damageDef != DamageDefOf.Stun + && props.damageDef != DamageDefOf.Extinguish + && props.damageDef != DamageDefOf.Smoke + && props.GetDamageAmount(weapon) != 0) + { + if (props.explosionRadius > 0) + { + stringBuilder.AppendLine(" " + "CE_DescBluntPenetration".Translate() + ": " + props.GetExplosionArmorPenetration() + " " + "CE_MPa".Translate()); + } + else + { + stringBuilder.AppendLine(" " + "CE_DescSharpPenetration".Translate() + ": " + (props.armorPenetrationSharp * multiplier).ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_mmRHA".Translate()); + stringBuilder.AppendLine(" " + "CE_DescBluntPenetration".Translate() + ": " + (props.armorPenetrationBlunt * multiplier).ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_MPa".Translate()); + } } // Secondary explosion diff --git a/Source/CombatExtended/CombatExtended/ArmorUtilityCE.cs b/Source/CombatExtended/CombatExtended/ArmorUtilityCE.cs index 0db1576162..3118837021 100644 --- a/Source/CombatExtended/CombatExtended/ArmorUtilityCE.cs +++ b/Source/CombatExtended/CombatExtended/ArmorUtilityCE.cs @@ -422,6 +422,10 @@ private static bool TryDamageArmor(DamageDef def, float penAmount, float armorAm /// The post-armor damage ranging from 0 to the original amount private static float GetAmbientPostArmorDamage(float dmgAmount, float penAmount, StatDef armorRatingStat, Pawn pawn, BodyPartRecord part) { + if (penAmount < 0f) + { + penAmount = 0f; + } var dmgMult = 1f + penAmount; if (part.IsInGroup(CE_BodyPartGroupDefOf.CoveredByNaturalArmor)) { From 5445285121f6935641ffe14fe752e71bdfe5c326 Mon Sep 17 00:00:00 2001 From: Tostov <57082718+Tostov@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:59:14 +1000 Subject: [PATCH 041/451] Desciption change for armor electric From 085d53f4df194b1b15e944554e9357f1fd534e7e Mon Sep 17 00:00:00 2001 From: Tostov <57082718+Tostov@users.noreply.github.com> Date: Wed, 11 Sep 2024 17:00:21 +1000 Subject: [PATCH 042/451] Heat damage description update --- Patches/Core/Stats/Stats_Apparel.xml | 56 ++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 Patches/Core/Stats/Stats_Apparel.xml diff --git a/Patches/Core/Stats/Stats_Apparel.xml b/Patches/Core/Stats/Stats_Apparel.xml new file mode 100644 index 0000000000..d07ad08e7a --- /dev/null +++ b/Patches/Core/Stats/Stats_Apparel.xml @@ -0,0 +1,56 @@ + + + + + WornBulk + + How bulky this apparel is to wear. + Apparel + 0 + 0 + 0 + false + +
  • + 100 + WornBulk + StuffEffectMultiplierArmor +
    • +
  • + 1.2 + 1.05 + 1 + 1.0 + 0.95 + 0.9 + 0.8 +
    • +     +     + + + ArmorRating_Electric + + Percentage reduction of damage from electricity such as EMP pulses and the EMP part of EMP and ion projectiles.\n\nThe total across all sources of this armor is added for a protected part, then reduced by the armor reduction value of the incoming attack. If the resulting value is 100% or greater, protected parts of the pawn will be immune to the incoming attack's electrical damage in that body region. + 39 + +
  • + 100 + StuffPower_Armor_Electric + StuffEffectMultiplierArmor +
    • +     +     + + + ElectricDamageMultiplier + + A multiplier on damage from electric-type attacks for weapons made of this material. + StuffStatFactors + 1 + 0.05 + PercentZero + false + + +     \ No newline at end of file From ebf69a35f6557b98b68f866f5ef00a304deafe8e Mon Sep 17 00:00:00 2001 From: Tostov <57082718+Tostov@users.noreply.github.com> Date: Wed, 11 Sep 2024 17:01:26 +1000 Subject: [PATCH 043/451] Add key for ambient penetration --- Languages/English/Keyed/Descriptions.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/Languages/English/Keyed/Descriptions.xml b/Languages/English/Keyed/Descriptions.xml index 2d918db487..517e077367 100644 --- a/Languages/English/Keyed/Descriptions.xml +++ b/Languages/English/Keyed/Descriptions.xml @@ -8,6 +8,7 @@ Armor penetration Sharp penetration Blunt penetration + Armor reduction Pellet count Spread factor Fragments From f07a84a559269174ba155b0bfc4d714eadac1c4c Mon Sep 17 00:00:00 2001 From: Tostov <57082718+Tostov@users.noreply.github.com> Date: Wed, 11 Sep 2024 17:09:33 +1000 Subject: [PATCH 044/451] Update Stats_Apparel.xml --- Patches/Core/Stats/Stats_Apparel.xml | 55 ---------------------------- 1 file changed, 55 deletions(-) diff --git a/Patches/Core/Stats/Stats_Apparel.xml b/Patches/Core/Stats/Stats_Apparel.xml index d07ad08e7a..1e33fe81ce 100644 --- a/Patches/Core/Stats/Stats_Apparel.xml +++ b/Patches/Core/Stats/Stats_Apparel.xml @@ -1,56 +1 @@ - - - - WornBulk - - How bulky this apparel is to wear. - Apparel - 0 - 0 - 0 - false - -
  • - 100 - WornBulk - StuffEffectMultiplierArmor -
    • -
  • - 1.2 - 1.05 - 1 - 1.0 - 0.95 - 0.9 - 0.8 -
    • -     -     - - - ArmorRating_Electric - - Percentage reduction of damage from electricity such as EMP pulses and the EMP part of EMP and ion projectiles.\n\nThe total across all sources of this armor is added for a protected part, then reduced by the armor reduction value of the incoming attack. If the resulting value is 100% or greater, protected parts of the pawn will be immune to the incoming attack's electrical damage in that body region. - 39 - -
  • - 100 - StuffPower_Armor_Electric - StuffEffectMultiplierArmor -
    • -     -     - - - ElectricDamageMultiplier - - A multiplier on damage from electric-type attacks for weapons made of this material. - StuffStatFactors - 1 - 0.05 - PercentZero - false - - -     \ No newline at end of file From 44754aeaec3c09191758fd47eca1214d49f0772e Mon Sep 17 00:00:00 2001 From: Tostov <57082718+Tostov@users.noreply.github.com> Date: Wed, 11 Sep 2024 17:10:11 +1000 Subject: [PATCH 045/451] Heat armor (proper) --- Patches/Core/Stats/Stats.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Patches/Core/Stats/Stats.xml b/Patches/Core/Stats/Stats.xml index cd800d07ce..f08ff1fcfb 100644 --- a/Patches/Core/Stats/Stats.xml +++ b/Patches/Core/Stats/Stats.xml @@ -121,7 +121,7 @@ Defs/StatDef[defName="ArmorRating_Heat"]/description - Percentage reduction of attack damage from extreme heat or cold, such as fire, incendiary explosions, or frostbite-inflicting attacks.\n\nThis value is reduced by the Heat armor penetration value of the incoming attack. If the resulting value is 100% or greater, protected parts of the pawn will be immune to the incoming attack's hot or cold damage. + Percentage reduction of attack damage from extreme heat or cold, such as fire, incendiary explosions, or frostbite-inflicting attacks.\n\nThe total across all sources of this armor is added for a protected part, then reduced by the armor reduction value of the incoming attack. If the resulting value is 100% or greater, protected parts of the pawn will be immune to the incoming attack's hot or cold damage. From 1f8389ac4d29714dc0bd7a795e05cf667777e3a4 Mon Sep 17 00:00:00 2001 From: Tostov <57082718+Tostov@users.noreply.github.com> Date: Wed, 11 Sep 2024 17:11:44 +1000 Subject: [PATCH 046/451] Apparel --- Defs/Stats/Stats_Apparel.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Defs/Stats/Stats_Apparel.xml b/Defs/Stats/Stats_Apparel.xml index 39427bc805..d07ad08e7a 100644 --- a/Defs/Stats/Stats_Apparel.xml +++ b/Defs/Stats/Stats_Apparel.xml @@ -31,7 +31,7 @@ ArmorRating_Electric - Percentage reduction of damage from electricity such as EMP pulses and the EMP part of EMP and ion projectiles.\n\nHaving a value of 100% or above makes the creature immune to all electrical damage in that body region. + Percentage reduction of damage from electricity such as EMP pulses and the EMP part of EMP and ion projectiles.\n\nThe total across all sources of this armor is added for a protected part, then reduced by the armor reduction value of the incoming attack. If the resulting value is 100% or greater, protected parts of the pawn will be immune to the incoming attack's electrical damage in that body region. 39
  • From 40dce012c79fa28d3690eada3dc7c04ad06f33ad Mon Sep 17 00:00:00 2001 From: Tostov <57082718+Tostov@users.noreply.github.com> Date: Wed, 11 Sep 2024 17:36:00 +1000 Subject: [PATCH 047/451] Formatting fixes I think? --- .../CombatExtended/AmmoUtility.cs | 264 +++++++++--------- 1 file changed, 132 insertions(+), 132 deletions(-) diff --git a/Source/CombatExtended/CombatExtended/AmmoUtility.cs b/Source/CombatExtended/CombatExtended/AmmoUtility.cs index f6c753bfe7..ae81397841 100644 --- a/Source/CombatExtended/CombatExtended/AmmoUtility.cs +++ b/Source/CombatExtended/CombatExtended/AmmoUtility.cs @@ -1,58 +1,58 @@ -using System.Text; -using RimWorld; -using Verse; - -namespace CombatExtended -{ - public static class AmmoUtility - { - /// - /// Multiplier used to scale the armor penetration of a given projectile's explosion - /// - private const float ExplosiveArmorPenetrationMultiplier = 0.4f; - - /// - /// Generates a readout text for a projectile with the damage amount, type, secondary explosion and other CE stats for - /// display in info-box - /// - /// The projectile's ThingDef - /// Formatted string listing projectile stats - public static string GetProjectileReadout(this ThingDef projectileDef, Thing weapon) - { - // Append ammo stats - var props = projectileDef?.projectile as ProjectilePropertiesCE; - if (props == null) - { - Log.Warning("CE tried getting projectile readout with null props"); - return "CE_UnpatchedWeaponShort".Translate(); - } - - var multiplier = weapon?.GetStatValue(StatDefOf.RangedWeapon_DamageMultiplier) ?? 1f; - var stringBuilder = new StringBuilder(); - // Damage type/amount - var dmgList = " " + "CE_DescDamage".Translate() + ": "; - if (!props.secondaryDamage.NullOrEmpty()) - { - // If we have multiple damage types, put every one in its own line - stringBuilder.AppendLine(dmgList); - stringBuilder.AppendLine(" " + GenText.ToStringByStyle(props.GetDamageAmount(weapon), ToStringStyle.Integer) + " (" + props.damageDef.LabelCap + ")"); - foreach (var sec in props.secondaryDamage) - { - var secondaryChance = sec.chance >= 1.0f ? "" : $"({GenText.ToStringByStyle(sec.chance, ToStringStyle.PercentZero)} {"CE_Chance".Translate()})"; - stringBuilder.AppendLine($" {GenText.ToStringByStyle(sec.amount, ToStringStyle.Integer)} ({sec.def.LabelCap}) {secondaryChance}"); - } - } - else - { - stringBuilder.AppendLine(dmgList + GenText.ToStringByStyle(props.GetDamageAmount(weapon), ToStringStyle.Integer) + " (" + props.damageDef.LabelCap + ")"); - } - // Explosion radius - if (props.explosionRadius > 0) - { - stringBuilder.AppendLine(" " + "CE_DescExplosionRadius".Translate() + ": " + props.explosionRadius.ToStringByStyle(ToStringStyle.FloatOne)); - } - // Thermal/Electric Penetration - if ((props.damageDef.armorCategory == CE_DamageArmorCategoryDefOf.Heat +using System.Text; +using RimWorld; +using Verse; + +namespace CombatExtended +{ + public static class AmmoUtility + { + /// + /// Multiplier used to scale the armor penetration of a given projectile's explosion + /// + private const float ExplosiveArmorPenetrationMultiplier = 0.4f; + + /// + /// Generates a readout text for a projectile with the damage amount, type, secondary explosion and other CE stats for + /// display in info-box + /// + /// The projectile's ThingDef + /// Formatted string listing projectile stats + public static string GetProjectileReadout(this ThingDef projectileDef, Thing weapon) + { + // Append ammo stats + var props = projectileDef?.projectile as ProjectilePropertiesCE; + if (props == null) + { + Log.Warning("CE tried getting projectile readout with null props"); + return "CE_UnpatchedWeaponShort".Translate(); + } + + var multiplier = weapon?.GetStatValue(StatDefOf.RangedWeapon_DamageMultiplier) ?? 1f; + var stringBuilder = new StringBuilder(); + // Damage type/amount + var dmgList = " " + "CE_DescDamage".Translate() + ": "; + if (!props.secondaryDamage.NullOrEmpty()) + { + // If we have multiple damage types, put every one in its own line + stringBuilder.AppendLine(dmgList); + stringBuilder.AppendLine(" " + GenText.ToStringByStyle(props.GetDamageAmount(weapon), ToStringStyle.Integer) + " (" + props.damageDef.LabelCap + ")"); + foreach (var sec in props.secondaryDamage) + { + var secondaryChance = sec.chance >= 1.0f ? "" : $"({GenText.ToStringByStyle(sec.chance, ToStringStyle.PercentZero)} {"CE_Chance".Translate()})"; + stringBuilder.AppendLine($" {GenText.ToStringByStyle(sec.amount, ToStringStyle.Integer)} ({sec.def.LabelCap}) {secondaryChance}"); + } + } + else + { + stringBuilder.AppendLine(dmgList + GenText.ToStringByStyle(props.GetDamageAmount(weapon), ToStringStyle.Integer) + " (" + props.damageDef.LabelCap + ")"); + } + // Explosion radius + if (props.explosionRadius > 0) + { + stringBuilder.AppendLine(" " + "CE_DescExplosionRadius".Translate() + ": " + props.explosionRadius.ToStringByStyle(ToStringStyle.FloatOne)); + } + // Thermal/Electric Penetration + if ((props.damageDef.armorCategory == CE_DamageArmorCategoryDefOf.Heat || props.damageDef.armorCategory == CE_DamageArmorCategoryDefOf.Electric) && props.damageDef.defaultArmorPenetration > 0f) { stringBuilder.AppendLine(" " + "CE_DescAmbientPenetration".Translate() + ": " + (props.damageDef.defaultArmorPenetration).ToStringByStyle(ToStringStyle.PercentZero)); @@ -74,80 +74,80 @@ public static string GetProjectileReadout(this ThingDef projectileDef, Thing wea stringBuilder.AppendLine(" " + "CE_DescSharpPenetration".Translate() + ": " + (props.armorPenetrationSharp * multiplier).ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_mmRHA".Translate()); stringBuilder.AppendLine(" " + "CE_DescBluntPenetration".Translate() + ": " + (props.armorPenetrationBlunt * multiplier).ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_MPa".Translate()); } - } - - // Secondary explosion - var secExpProps = projectileDef.GetCompProperties(); - if (secExpProps != null) - { - if (secExpProps.explosiveRadius > 0) - { - stringBuilder.AppendLine(" " + "CE_DescSecondaryExplosion".Translate() + ":"); - stringBuilder.AppendLine(" " + " " + "CE_DescDamage".Translate() + ": " + secExpProps.damageAmountBase.ToStringByStyle(ToStringStyle.Integer) + " (" + secExpProps.explosiveDamageType.LabelCap + ")"); - stringBuilder.AppendLine(" " + " " + "CE_DescExplosionRadius".Translate() + ": " + secExpProps.explosiveRadius.ToStringByStyle(ToStringStyle.FloatOne)); - } - } - - // Pellets - if (props.pelletCount > 1) - { - stringBuilder.AppendLine(" " + "CE_DescPelletCount".Translate() + ": " + GenText.ToStringByStyle(props.pelletCount, ToStringStyle.Integer)); - } - if (props.spreadMult != 1) - { - stringBuilder.AppendLine(" " + "CE_DescSpreadMult".Translate() + ": " + props.spreadMult.ToStringByStyle(ToStringStyle.PercentZero)); - } - - // Fragments - var fragmentComp = projectileDef.GetCompProperties(); - if (fragmentComp != null) - { - stringBuilder.AppendLine(" " + "CE_DescFragments".Translate() + ":"); - foreach (var fragmentDef in fragmentComp.fragments) - { - var fragmentProps = fragmentDef?.thingDef?.projectile as ProjectilePropertiesCE; - stringBuilder.AppendLine(" " + " " + fragmentDef.LabelCap); - stringBuilder.AppendLine(" " + " " + " " + "CE_DescDamage".Translate() + ": " + fragmentProps?.damageAmountBase.ToString() + " (" + fragmentProps?.damageDef.LabelCap.ToString() + ")"); - stringBuilder.AppendLine(" " + " " + " " + "CE_DescSharpPenetration".Translate() + ": " + fragmentProps?.armorPenetrationSharp.ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_mmRHA".Translate()); - stringBuilder.AppendLine(" " + " " + " " + "CE_DescBluntPenetration".Translate() + ": " + fragmentProps?.armorPenetrationBlunt.ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_MPa".Translate()); - } - } - - return stringBuilder.ToString(); - } - - /// - /// Determine the armor penetration value of a given projectile type's explosion. - /// - public static float GetExplosionArmorPenetration(this ProjectileProperties props) => props.damageAmountBase * ExplosiveArmorPenetrationMultiplier; - - /// - /// Determine the armor penetration value of a given explosive type's explosion. - /// - public static float GetExplosionArmorPenetration(this CompProperties_ExplosiveCE props) => props.damageAmountBase * ExplosiveArmorPenetrationMultiplier; - - public static bool IsShell(ThingDef def) - { - var ammo = ThingDefOf.Turret_Mortar.building.turretGunDef.GetCompProperties(); - return ammo?.ammoSet.ammoTypes.Any(l => l.ammo == def) ?? false; - } - - public static bool IsAmmoSystemActive(AmmoDef def) - { - if (Controller.settings.EnableAmmoSystem) - { - return true; - } - return (def != null && def.isMortarAmmo); - } - - public static bool IsAmmoSystemActive(AmmoSetDef ammoSet) - { - if (Controller.settings.EnableAmmoSystem) - { - return true; - } - return (ammoSet != null && ammoSet.isMortarAmmoSet); - } - } -} + } + + // Secondary explosion + var secExpProps = projectileDef.GetCompProperties(); + if (secExpProps != null) + { + if (secExpProps.explosiveRadius > 0) + { + stringBuilder.AppendLine(" " + "CE_DescSecondaryExplosion".Translate() + ":"); + stringBuilder.AppendLine(" " + " " + "CE_DescDamage".Translate() + ": " + secExpProps.damageAmountBase.ToStringByStyle(ToStringStyle.Integer) + " (" + secExpProps.explosiveDamageType.LabelCap + ")"); + stringBuilder.AppendLine(" " + " " + "CE_DescExplosionRadius".Translate() + ": " + secExpProps.explosiveRadius.ToStringByStyle(ToStringStyle.FloatOne)); + } + } + + // Pellets + if (props.pelletCount > 1) + { + stringBuilder.AppendLine(" " + "CE_DescPelletCount".Translate() + ": " + GenText.ToStringByStyle(props.pelletCount, ToStringStyle.Integer)); + } + if (props.spreadMult != 1) + { + stringBuilder.AppendLine(" " + "CE_DescSpreadMult".Translate() + ": " + props.spreadMult.ToStringByStyle(ToStringStyle.PercentZero)); + } + + // Fragments + var fragmentComp = projectileDef.GetCompProperties(); + if (fragmentComp != null) + { + stringBuilder.AppendLine(" " + "CE_DescFragments".Translate() + ":"); + foreach (var fragmentDef in fragmentComp.fragments) + { + var fragmentProps = fragmentDef?.thingDef?.projectile as ProjectilePropertiesCE; + stringBuilder.AppendLine(" " + " " + fragmentDef.LabelCap); + stringBuilder.AppendLine(" " + " " + " " + "CE_DescDamage".Translate() + ": " + fragmentProps?.damageAmountBase.ToString() + " (" + fragmentProps?.damageDef.LabelCap.ToString() + ")"); + stringBuilder.AppendLine(" " + " " + " " + "CE_DescSharpPenetration".Translate() + ": " + fragmentProps?.armorPenetrationSharp.ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_mmRHA".Translate()); + stringBuilder.AppendLine(" " + " " + " " + "CE_DescBluntPenetration".Translate() + ": " + fragmentProps?.armorPenetrationBlunt.ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_MPa".Translate()); + } + } + + return stringBuilder.ToString(); + } + + /// + /// Determine the armor penetration value of a given projectile type's explosion. + /// + public static float GetExplosionArmorPenetration(this ProjectileProperties props) => props.damageAmountBase * ExplosiveArmorPenetrationMultiplier; + + /// + /// Determine the armor penetration value of a given explosive type's explosion. + /// + public static float GetExplosionArmorPenetration(this CompProperties_ExplosiveCE props) => props.damageAmountBase * ExplosiveArmorPenetrationMultiplier; + + public static bool IsShell(ThingDef def) + { + var ammo = ThingDefOf.Turret_Mortar.building.turretGunDef.GetCompProperties(); + return ammo?.ammoSet.ammoTypes.Any(l => l.ammo == def) ?? false; + } + + public static bool IsAmmoSystemActive(AmmoDef def) + { + if (Controller.settings.EnableAmmoSystem) + { + return true; + } + return (def != null && def.isMortarAmmo); + } + + public static bool IsAmmoSystemActive(AmmoSetDef ammoSet) + { + if (Controller.settings.EnableAmmoSystem) + { + return true; + } + return (ammoSet != null && ammoSet.isMortarAmmoSet); + } + } +} From 0fd6a3e9c11513286f60a22505d262f56f923961 Mon Sep 17 00:00:00 2001 From: n7huntsman Date: Wed, 11 Sep 2024 19:43:04 -0400 Subject: [PATCH 048/451] Housekeeping --- .../Addon Weapons/VWEBFRangedWarcasket.xml | 18 ------------------ .../Patches/VWE-BioferriteRanged.xml | 11 ++--------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml index 85a7693e9f..b853b3a221 100644 --- a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml +++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml @@ -26,24 +26,6 @@
    • -
  • - Defs/ThingDef[defName = "VWEB_Warbolter"]/tools - - -
  • - - -
  • Blunt
    • - - 35 - 2.44 - 16 - Barrel - - - - -
  • VWEB_Warbolter diff --git a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml index db42457e85..015d134302 100644 --- a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml +++ b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml @@ -4,9 +4,7 @@ - - Defs/ThingDef[defName="VWEB_Gun_FlarestrikeRifle" or - defName="VWEB_Gun_FirestormShotgun"]/tools + Defs/ThingDef[defName="VWEB_Gun_FlarestrikeRifle" or defName="VWEB_Gun_FirestormShotgun"]/tools @@ -85,9 +83,7 @@ - - Defs/ThingDef[defName="VWEB_Gun_PiercerRifle"]/tools - + Defs/ThingDef[defName="VWEB_Gun_PiercerRifle"]/tools
  • @@ -222,19 +218,16 @@ GunTail_Heavy 9 - 9 true 0.8 AmmoSet_12Gauge - FALSE Snapshot -
  • CE_AI_AssaultWeapon
    • From 4fd14c53f4ac252040c9b05b1af1665163d85282 Mon Sep 17 00:00:00 2001 From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:25:19 +0800 Subject: [PATCH 049/451] update costlist --- .../Patches/VWE-BioferriteRanged.xml | 49 +++++++++++-------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml index db42457e85..53639e169b 100644 --- a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml +++ b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml @@ -138,6 +138,12 @@ 1.10 0.36 + + 10 + 55 + 7 + 20 + 1.38 CombatExtended.Verb_ShootCE @@ -211,6 +217,7 @@ 5 55 3 + 20 CombatExtended.Verb_ShootCE @@ -248,7 +255,7 @@ - + Defs/ThingDef[defName ="VWEB_Gun_CycloneMinigun"]/equippedStatOffsets @@ -266,8 +273,8 @@ 150 - 15 - 20 + 20 + 40 0.97 @@ -314,24 +321,24 @@ Defs/AbilityDef[defName="VWEB_CycloneRapidBurst"]/verbProperties - CombatExtended.Verb_LaunchProjectileStaticCE - Bullet_762x51mmNATO_FMJ - 0.5 - 62 - 50 - 1 - true - true - true - true - - true - true - false - - Shot_Minigun - GunTail_Medium - 9 + CombatExtended.Verb_LaunchProjectileStaticCE + Bullet_762x51mmNATO_FMJ + 0.5 + 62 + 50 + 1 + true + true + true + true + + true + true + false + + Shot_Minigun + GunTail_Medium + 9 From 5edf502bb28db662f1145738837a58acafabff1b Mon Sep 17 00:00:00 2001 From: SamaelGray <56392968+SamaelGray@users.noreply.github.com> Date: Thu, 12 Sep 2024 09:42:27 +0330 Subject: [PATCH 050/451] revert maximum frag counts --- Defs/Ammo/Rocket/127mmJavelinMissile.xml | 2 +- Defs/Ammo/Rocket/132mmM13.xml | 2 +- Defs/Ammo/Rocket/84x246mmR.xml | 4 ++-- Defs/Ammo/Rocket/RPG7.xml | 2 +- Defs/Ammo/Rocket/SPG9.xml | 2 +- Defs/Ammo/Rocket/TomahawkLAM.xml | 2 +- Defs/Ammo/Shell/105x607mmR.xml | 2 +- Defs/Ammo/Shell/120mmCannon.xml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Defs/Ammo/Rocket/127mmJavelinMissile.xml b/Defs/Ammo/Rocket/127mmJavelinMissile.xml index c0eb3e6b7c..28c1323703 100644 --- a/Defs/Ammo/Rocket/127mmJavelinMissile.xml +++ b/Defs/Ammo/Rocket/127mmJavelinMissile.xml @@ -30,7 +30,7 @@
  • 2 - 113 + 80
    • diff --git a/Defs/Ammo/Rocket/132mmM13.xml b/Defs/Ammo/Rocket/132mmM13.xml index 003c17775e..92265a04c5 100644 --- a/Defs/Ammo/Rocket/132mmM13.xml +++ b/Defs/Ammo/Rocket/132mmM13.xml @@ -81,7 +81,7 @@
  • 40 - 91 + 80
  • diff --git a/Defs/Ammo/Rocket/84x246mmR.xml b/Defs/Ammo/Rocket/84x246mmR.xml index a17e89fcdd..3bee5af45f 100644 --- a/Defs/Ammo/Rocket/84x246mmR.xml +++ b/Defs/Ammo/Rocket/84x246mmR.xml @@ -386,7 +386,7 @@
  • - 86 + 80
    • @@ -409,7 +409,7 @@
  • - 150 + 80
    • diff --git a/Defs/Ammo/Rocket/RPG7.xml b/Defs/Ammo/Rocket/RPG7.xml index 8c80971ce3..b57dc2f8fa 100644 --- a/Defs/Ammo/Rocket/RPG7.xml +++ b/Defs/Ammo/Rocket/RPG7.xml @@ -198,7 +198,7 @@
  • - 150 + 80
    • diff --git a/Defs/Ammo/Rocket/SPG9.xml b/Defs/Ammo/Rocket/SPG9.xml index 9e9e536a93..a51511e6b5 100644 --- a/Defs/Ammo/Rocket/SPG9.xml +++ b/Defs/Ammo/Rocket/SPG9.xml @@ -210,7 +210,7 @@
  • - 150 + 80
    • diff --git a/Defs/Ammo/Rocket/TomahawkLAM.xml b/Defs/Ammo/Rocket/TomahawkLAM.xml index 70f06e0825..4370610dbd 100644 --- a/Defs/Ammo/Rocket/TomahawkLAM.xml +++ b/Defs/Ammo/Rocket/TomahawkLAM.xml @@ -118,7 +118,7 @@
  • 40 - 150 + 80
    • diff --git a/Defs/Ammo/Shell/105x607mmR.xml b/Defs/Ammo/Shell/105x607mmR.xml index f2924ba669..145429ae8f 100644 --- a/Defs/Ammo/Shell/105x607mmR.xml +++ b/Defs/Ammo/Shell/105x607mmR.xml @@ -134,7 +134,7 @@
  • 16 - 88 + 80
    • diff --git a/Defs/Ammo/Shell/120mmCannon.xml b/Defs/Ammo/Shell/120mmCannon.xml index 1539c6200c..c4591b7825 100644 --- a/Defs/Ammo/Shell/120mmCannon.xml +++ b/Defs/Ammo/Shell/120mmCannon.xml @@ -133,7 +133,7 @@
  • 30 - 81 + 80
    • From a07415ced86e0fa582f7045c580c1c4a183fb89b Mon Sep 17 00:00:00 2001 From: Tostov <57082718+Tostov@users.noreply.github.com> Date: Thu, 12 Sep 2024 17:54:18 +1000 Subject: [PATCH 051/451] Actually fix formatting --- .../CombatExtended/AmmoUtility.cs | 306 +++++++++--------- 1 file changed, 153 insertions(+), 153 deletions(-) diff --git a/Source/CombatExtended/CombatExtended/AmmoUtility.cs b/Source/CombatExtended/CombatExtended/AmmoUtility.cs index ae81397841..4d3b0e76cb 100644 --- a/Source/CombatExtended/CombatExtended/AmmoUtility.cs +++ b/Source/CombatExtended/CombatExtended/AmmoUtility.cs @@ -1,153 +1,153 @@ -using System.Text; -using RimWorld; -using Verse; - -namespace CombatExtended -{ - public static class AmmoUtility - { - /// - /// Multiplier used to scale the armor penetration of a given projectile's explosion - /// - private const float ExplosiveArmorPenetrationMultiplier = 0.4f; - - /// - /// Generates a readout text for a projectile with the damage amount, type, secondary explosion and other CE stats for - /// display in info-box - /// - /// The projectile's ThingDef - /// Formatted string listing projectile stats - public static string GetProjectileReadout(this ThingDef projectileDef, Thing weapon) - { - // Append ammo stats - var props = projectileDef?.projectile as ProjectilePropertiesCE; - if (props == null) - { - Log.Warning("CE tried getting projectile readout with null props"); - return "CE_UnpatchedWeaponShort".Translate(); - } - - var multiplier = weapon?.GetStatValue(StatDefOf.RangedWeapon_DamageMultiplier) ?? 1f; - var stringBuilder = new StringBuilder(); - // Damage type/amount - var dmgList = " " + "CE_DescDamage".Translate() + ": "; - if (!props.secondaryDamage.NullOrEmpty()) - { - // If we have multiple damage types, put every one in its own line - stringBuilder.AppendLine(dmgList); - stringBuilder.AppendLine(" " + GenText.ToStringByStyle(props.GetDamageAmount(weapon), ToStringStyle.Integer) + " (" + props.damageDef.LabelCap + ")"); - foreach (var sec in props.secondaryDamage) - { - var secondaryChance = sec.chance >= 1.0f ? "" : $"({GenText.ToStringByStyle(sec.chance, ToStringStyle.PercentZero)} {"CE_Chance".Translate()})"; - stringBuilder.AppendLine($" {GenText.ToStringByStyle(sec.amount, ToStringStyle.Integer)} ({sec.def.LabelCap}) {secondaryChance}"); - } - } - else - { - stringBuilder.AppendLine(dmgList + GenText.ToStringByStyle(props.GetDamageAmount(weapon), ToStringStyle.Integer) + " (" + props.damageDef.LabelCap + ")"); - } - // Explosion radius - if (props.explosionRadius > 0) - { - stringBuilder.AppendLine(" " + "CE_DescExplosionRadius".Translate() + ": " + props.explosionRadius.ToStringByStyle(ToStringStyle.FloatOne)); - } - // Thermal/Electric Penetration - if ((props.damageDef.armorCategory == CE_DamageArmorCategoryDefOf.Heat - || props.damageDef.armorCategory == CE_DamageArmorCategoryDefOf.Electric) && props.damageDef.defaultArmorPenetration > 0f) - { - stringBuilder.AppendLine(" " + "CE_DescAmbientPenetration".Translate() + ": " + (props.damageDef.defaultArmorPenetration).ToStringByStyle(ToStringStyle.PercentZero)); - } - // Sharp / blunt AP - if (props.damageDef.armorCategory != CE_DamageArmorCategoryDefOf.Heat - && props.damageDef.armorCategory != CE_DamageArmorCategoryDefOf.Electric - && props.damageDef != DamageDefOf.Stun - && props.damageDef != DamageDefOf.Extinguish - && props.damageDef != DamageDefOf.Smoke - && props.GetDamageAmount(weapon) != 0) - { - if (props.explosionRadius > 0) - { - stringBuilder.AppendLine(" " + "CE_DescBluntPenetration".Translate() + ": " + props.GetExplosionArmorPenetration() + " " + "CE_MPa".Translate()); - } - else - { - stringBuilder.AppendLine(" " + "CE_DescSharpPenetration".Translate() + ": " + (props.armorPenetrationSharp * multiplier).ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_mmRHA".Translate()); - stringBuilder.AppendLine(" " + "CE_DescBluntPenetration".Translate() + ": " + (props.armorPenetrationBlunt * multiplier).ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_MPa".Translate()); - } - } - - // Secondary explosion - var secExpProps = projectileDef.GetCompProperties(); - if (secExpProps != null) - { - if (secExpProps.explosiveRadius > 0) - { - stringBuilder.AppendLine(" " + "CE_DescSecondaryExplosion".Translate() + ":"); - stringBuilder.AppendLine(" " + " " + "CE_DescDamage".Translate() + ": " + secExpProps.damageAmountBase.ToStringByStyle(ToStringStyle.Integer) + " (" + secExpProps.explosiveDamageType.LabelCap + ")"); - stringBuilder.AppendLine(" " + " " + "CE_DescExplosionRadius".Translate() + ": " + secExpProps.explosiveRadius.ToStringByStyle(ToStringStyle.FloatOne)); - } - } - - // Pellets - if (props.pelletCount > 1) - { - stringBuilder.AppendLine(" " + "CE_DescPelletCount".Translate() + ": " + GenText.ToStringByStyle(props.pelletCount, ToStringStyle.Integer)); - } - if (props.spreadMult != 1) - { - stringBuilder.AppendLine(" " + "CE_DescSpreadMult".Translate() + ": " + props.spreadMult.ToStringByStyle(ToStringStyle.PercentZero)); - } - - // Fragments - var fragmentComp = projectileDef.GetCompProperties(); - if (fragmentComp != null) - { - stringBuilder.AppendLine(" " + "CE_DescFragments".Translate() + ":"); - foreach (var fragmentDef in fragmentComp.fragments) - { - var fragmentProps = fragmentDef?.thingDef?.projectile as ProjectilePropertiesCE; - stringBuilder.AppendLine(" " + " " + fragmentDef.LabelCap); - stringBuilder.AppendLine(" " + " " + " " + "CE_DescDamage".Translate() + ": " + fragmentProps?.damageAmountBase.ToString() + " (" + fragmentProps?.damageDef.LabelCap.ToString() + ")"); - stringBuilder.AppendLine(" " + " " + " " + "CE_DescSharpPenetration".Translate() + ": " + fragmentProps?.armorPenetrationSharp.ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_mmRHA".Translate()); - stringBuilder.AppendLine(" " + " " + " " + "CE_DescBluntPenetration".Translate() + ": " + fragmentProps?.armorPenetrationBlunt.ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_MPa".Translate()); - } - } - - return stringBuilder.ToString(); - } - - /// - /// Determine the armor penetration value of a given projectile type's explosion. - /// - public static float GetExplosionArmorPenetration(this ProjectileProperties props) => props.damageAmountBase * ExplosiveArmorPenetrationMultiplier; - - /// - /// Determine the armor penetration value of a given explosive type's explosion. - /// - public static float GetExplosionArmorPenetration(this CompProperties_ExplosiveCE props) => props.damageAmountBase * ExplosiveArmorPenetrationMultiplier; - - public static bool IsShell(ThingDef def) - { - var ammo = ThingDefOf.Turret_Mortar.building.turretGunDef.GetCompProperties(); - return ammo?.ammoSet.ammoTypes.Any(l => l.ammo == def) ?? false; - } - - public static bool IsAmmoSystemActive(AmmoDef def) - { - if (Controller.settings.EnableAmmoSystem) - { - return true; - } - return (def != null && def.isMortarAmmo); - } - - public static bool IsAmmoSystemActive(AmmoSetDef ammoSet) - { - if (Controller.settings.EnableAmmoSystem) - { - return true; - } - return (ammoSet != null && ammoSet.isMortarAmmoSet); - } - } -} +using System.Text; +using RimWorld; +using Verse; + +namespace CombatExtended +{ + public static class AmmoUtility + { + /// + /// Multiplier used to scale the armor penetration of a given projectile's explosion + /// + private const float ExplosiveArmorPenetrationMultiplier = 0.4f; + + /// + /// Generates a readout text for a projectile with the damage amount, type, secondary explosion and other CE stats for + /// display in info-box + /// + /// The projectile's ThingDef + /// Formatted string listing projectile stats + public static string GetProjectileReadout(this ThingDef projectileDef, Thing weapon) + { + // Append ammo stats + var props = projectileDef?.projectile as ProjectilePropertiesCE; + if (props == null) + { + Log.Warning("CE tried getting projectile readout with null props"); + return "CE_UnpatchedWeaponShort".Translate(); + } + + var multiplier = weapon?.GetStatValue(StatDefOf.RangedWeapon_DamageMultiplier) ?? 1f; + var stringBuilder = new StringBuilder(); + // Damage type/amount + var dmgList = " " + "CE_DescDamage".Translate() + ": "; + if (!props.secondaryDamage.NullOrEmpty()) + { + // If we have multiple damage types, put every one in its own line + stringBuilder.AppendLine(dmgList); + stringBuilder.AppendLine(" " + GenText.ToStringByStyle(props.GetDamageAmount(weapon), ToStringStyle.Integer) + " (" + props.damageDef.LabelCap + ")"); + foreach (var sec in props.secondaryDamage) + { + var secondaryChance = sec.chance >= 1.0f ? "" : $"({GenText.ToStringByStyle(sec.chance, ToStringStyle.PercentZero)} {"CE_Chance".Translate()})"; + stringBuilder.AppendLine($" {GenText.ToStringByStyle(sec.amount, ToStringStyle.Integer)} ({sec.def.LabelCap}) {secondaryChance}"); + } + } + else + { + stringBuilder.AppendLine(dmgList + GenText.ToStringByStyle(props.GetDamageAmount(weapon), ToStringStyle.Integer) + " (" + props.damageDef.LabelCap + ")"); + } + // Explosion radius + if (props.explosionRadius > 0) + { + stringBuilder.AppendLine(" " + "CE_DescExplosionRadius".Translate() + ": " + props.explosionRadius.ToStringByStyle(ToStringStyle.FloatOne)); + } + // Thermal/Electric Penetration + if ((props.damageDef.armorCategory == CE_DamageArmorCategoryDefOf.Heat + || props.damageDef.armorCategory == CE_DamageArmorCategoryDefOf.Electric) && props.damageDef.defaultArmorPenetration > 0f) + { + stringBuilder.AppendLine(" " + "CE_DescAmbientPenetration".Translate() + ": " + (props.damageDef.defaultArmorPenetration).ToStringByStyle(ToStringStyle.PercentZero)); + } + // Sharp / blunt AP + if (props.damageDef.armorCategory != CE_DamageArmorCategoryDefOf.Heat + && props.damageDef.armorCategory != CE_DamageArmorCategoryDefOf.Electric + && props.damageDef != DamageDefOf.Stun + && props.damageDef != DamageDefOf.Extinguish + && props.damageDef != DamageDefOf.Smoke + && props.GetDamageAmount(weapon) != 0) + { + if (props.explosionRadius > 0) + { + stringBuilder.AppendLine(" " + "CE_DescBluntPenetration".Translate() + ": " + props.GetExplosionArmorPenetration() + " " + "CE_MPa".Translate()); + } + else + { + stringBuilder.AppendLine(" " + "CE_DescSharpPenetration".Translate() + ": " + (props.armorPenetrationSharp * multiplier).ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_mmRHA".Translate()); + stringBuilder.AppendLine(" " + "CE_DescBluntPenetration".Translate() + ": " + (props.armorPenetrationBlunt * multiplier).ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_MPa".Translate()); + } + } + + // Secondary explosion + var secExpProps = projectileDef.GetCompProperties(); + if (secExpProps != null) + { + if (secExpProps.explosiveRadius > 0) + { + stringBuilder.AppendLine(" " + "CE_DescSecondaryExplosion".Translate() + ":"); + stringBuilder.AppendLine(" " + " " + "CE_DescDamage".Translate() + ": " + secExpProps.damageAmountBase.ToStringByStyle(ToStringStyle.Integer) + " (" + secExpProps.explosiveDamageType.LabelCap + ")"); + stringBuilder.AppendLine(" " + " " + "CE_DescExplosionRadius".Translate() + ": " + secExpProps.explosiveRadius.ToStringByStyle(ToStringStyle.FloatOne)); + } + } + + // Pellets + if (props.pelletCount > 1) + { + stringBuilder.AppendLine(" " + "CE_DescPelletCount".Translate() + ": " + GenText.ToStringByStyle(props.pelletCount, ToStringStyle.Integer)); + } + if (props.spreadMult != 1) + { + stringBuilder.AppendLine(" " + "CE_DescSpreadMult".Translate() + ": " + props.spreadMult.ToStringByStyle(ToStringStyle.PercentZero)); + } + + // Fragments + var fragmentComp = projectileDef.GetCompProperties(); + if (fragmentComp != null) + { + stringBuilder.AppendLine(" " + "CE_DescFragments".Translate() + ":"); + foreach (var fragmentDef in fragmentComp.fragments) + { + var fragmentProps = fragmentDef?.thingDef?.projectile as ProjectilePropertiesCE; + stringBuilder.AppendLine(" " + " " + fragmentDef.LabelCap); + stringBuilder.AppendLine(" " + " " + " " + "CE_DescDamage".Translate() + ": " + fragmentProps?.damageAmountBase.ToString() + " (" + fragmentProps?.damageDef.LabelCap.ToString() + ")"); + stringBuilder.AppendLine(" " + " " + " " + "CE_DescSharpPenetration".Translate() + ": " + fragmentProps?.armorPenetrationSharp.ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_mmRHA".Translate()); + stringBuilder.AppendLine(" " + " " + " " + "CE_DescBluntPenetration".Translate() + ": " + fragmentProps?.armorPenetrationBlunt.ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_MPa".Translate()); + } + } + + return stringBuilder.ToString(); + } + + /// + /// Determine the armor penetration value of a given projectile type's explosion. + /// + public static float GetExplosionArmorPenetration(this ProjectileProperties props) => props.damageAmountBase * ExplosiveArmorPenetrationMultiplier; + + /// + /// Determine the armor penetration value of a given explosive type's explosion. + /// + public static float GetExplosionArmorPenetration(this CompProperties_ExplosiveCE props) => props.damageAmountBase * ExplosiveArmorPenetrationMultiplier; + + public static bool IsShell(ThingDef def) + { + var ammo = ThingDefOf.Turret_Mortar.building.turretGunDef.GetCompProperties(); + return ammo?.ammoSet.ammoTypes.Any(l => l.ammo == def) ?? false; + } + + public static bool IsAmmoSystemActive(AmmoDef def) + { + if (Controller.settings.EnableAmmoSystem) + { + return true; + } + return (def != null && def.isMortarAmmo); + } + + public static bool IsAmmoSystemActive(AmmoSetDef ammoSet) + { + if (Controller.settings.EnableAmmoSystem) + { + return true; + } + return (ammoSet != null && ammoSet.isMortarAmmoSet); + } + } +} From 5f7abb3dbe0ddfec7ad517d209c30eac77754bb0 Mon Sep 17 00:00:00 2001 From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com> Date: Fri, 13 Sep 2024 09:58:52 +0800 Subject: [PATCH 052/451] Revert "Merge branch 'Bioferrite' of https://github.com/SaltyKarl/CombatExtended into Bioferrite" This reverts commit 853adc23a87811c222e5e12503cddd37285e90de, reversing changes made to 4fd14c53f4ac252040c9b05b1af1665163d85282. --- .../Hediffs/Hediffs_BodyParts_Prosthetic.xml | 4 +- Defs/Ammo/Grenade/20x42mmGrenade.xml | 4 +- Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml | 4 +- Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml | 4 +- Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml | 4 +- Defs/Ammo/HighCaliber/2-Bore.xml | 4 +- Defs/Ammo/HighCaliber/20x102mmNATO.xml | 4 +- Defs/Ammo/HighCaliber/20x110mmHispano.xml | 2 +- Defs/Ammo/HighCaliber/20x128mmOerlikon.xml | 4 +- Defs/Ammo/HighCaliber/20x138mmB.xml | 4 +- Defs/Ammo/HighCaliber/20x139mm.xml | 4 +- Defs/Ammo/HighCaliber/20x82mmMauser.xml | 4 +- Defs/Ammo/HighCaliber/20x99mmShVAK.xml | 2 +- Defs/Ammo/HighCaliber/23x152mmB.xml | 4 +- Defs/Ammo/HighCaliber/25x137mmNATO.xml | 4 +- Defs/Ammo/HighCaliber/300WinchesterMagnum.xml | 4 +- Defs/Ammo/HighCaliber/30x113mmB.xml | 4 +- Defs/Ammo/HighCaliber/30x165mm.xml | 2 +- Defs/Ammo/HighCaliber/30x173mmNATO.xml | 2 +- Defs/Ammo/HighCaliber/338LapuaMagnum.xml | 4 +- Defs/Ammo/HighCaliber/338NormaMagnum.xml | 4 +- Defs/Ammo/HighCaliber/408CheyenneTactical.xml | 4 +- Defs/Ammo/HighCaliber/40x311mmR.xml | 4 +- Defs/Ammo/HighCaliber/470NitroExpress.xml | 2 +- Defs/Ammo/HighCaliber/50BMG.xml | 4 +- Defs/Ammo/HighCaliber/55Boys.xml | 4 +- Defs/Ammo/HighCaliber/600NitroExpress.xml | 2 +- Defs/Ammo/HighCaliber/7.92x94mm Patronen.xml | 4 +- Defs/Ammo/HighCaliber/950JDJ.xml | 4 +- Defs/Ammo/Pistols/45ACP.xml | 1 - Defs/Ammo/Rifle/127x55mm.xml | 4 +- Defs/Ammo/Rifle/243Winchester.xml | 4 +- Defs/Ammo/Rifle/277Fury.xml | 4 +- Defs/Ammo/Rifle/280British.xml | 4 +- Defs/Ammo/Rifle/30-30Winchester.xml | 4 +- Defs/Ammo/Rifle/3006Springfield.xml | 4 +- Defs/Ammo/Rifle/300AACBlackout.xml | 4 +- Defs/Ammo/Rifle/303British.xml | 4 +- Defs/Ammo/Rifle/30Carbine.xml | 2 +- Defs/Ammo/Rifle/38-55Winchester.xml | 2 +- Defs/Ammo/Rifle/44-40Winchester.xml | 4 +- Defs/Ammo/Rifle/4570Gov.xml | 2 +- Defs/Ammo/Rifle/458SOCOM.xml | 2 +- Defs/Ammo/Rifle/473x33mmCaseless.xml | 4 +- Defs/Ammo/Rifle/485x49mm.xml | 4 +- Defs/Ammo/Rifle/50Beowulf.xml | 2 +- Defs/Ammo/Rifle/545x39mmSoviet.xml | 8 +- Defs/Ammo/Rifle/556x45mmNATO.xml | 8 +- Defs/Ammo/Rifle/56-56Spencer.xml | 4 +- Defs/Ammo/Rifle/58x42mmDBP10.xml | 4 +- Defs/Ammo/Rifle/6.5Creedmoor.xml | 4 +- Defs/Ammo/Rifle/6.5x52mm Carcano.xml | 4 +- Defs/Ammo/Rifle/65x50mmSRArisaka.xml | 4 +- Defs/Ammo/Rifle/7.92x57mmMauser.xml | 4 +- Defs/Ammo/Rifle/75x54mmFrench.xml | 4 +- Defs/Ammo/Rifle/762x39mmSoviet.xml | 8 +- Defs/Ammo/Rifle/762x51mmNATO.xml | 4 +- Defs/Ammo/Rifle/762x54mmR.xml | 4 +- Defs/Ammo/Rifle/77x58mmArisaka.xml | 4 +- Defs/Ammo/Rifle/792x33mmKurz.xml | 4 +- Defs/Ammo/Rifle/8.6mmBlackout.xml | 4 +- Defs/Ammo/Rifle/8x50mmRLebel.xml | 4 +- Defs/Ammo/Rifle/8x50mmRMannlicher.xml | 4 +- Defs/Ammo/Rifle/9x39mmSoviet.xml | 4 +- Languages/English/Keyed/Keys.xml | 7 +- LoadFolders.xml | 5 +- .../AbilityDefs/AbilityDefs_Patch.xml | 40 ------- .../AA_VFEI2/HediffDefs/Hediffs_Patch.xml | 34 ------ .../ThingDefs_Races/Races_BlackEmpress.xml | 112 ------------------ .../ThingDefs_Races/Races_BlackQueen.xml | 112 ------------------ .../ThingDefs_Races/Races_BlackSwarmling.xml | 45 ------- .../ThingDefs_Races/Races_BlackQueen.xml | 17 +-- .../AlphaAnimals_CE_Patch_DamageDef.xml | 3 +- .../AlphaAnimals_CE_Patch_Projectiles.xml | 15 --- .../AlphaAnimals_CE_Patch_VerbShootCE.xml | 4 +- .../AlphaAnimals_CE_Patch_Race_Black_Hive.xml | 12 +- ...lphaAnimals_CE_Patch_Race_Mammoth_Worm.xml | 4 +- .../Patches/Vault-111_CE.xml | 68 ----------- .../ThingDefs_Races/AlienRace_Miho.xml | 6 + .../Patches/Recon Mechanoid/RangedRecon.xml | 6 - .../Addon Weapons/VWEBFRangedWarcasket.xml | 18 +++ .../VFE-I2/AbilityDefs/AbilityDefs.xml | 23 ---- .../VFE-I2/GeneDefs/GeneDefs.xml | 26 ---- .../VFE-I2/HediffDefs/Hediffs.xml | 57 --------- .../Patches/VWE-BioferriteRanged.xml | 11 +- .../Waster Toxic Breather/WasterBreather.xml | 7 ++ .../CombatExtended/AmmoGeneralizer.cs | 3 +- .../CombatExtended/Comps_CCL/CompPawnGizmo.cs | 57 ++++----- .../CombatExtended/Defs/AmmoDef.cs | 1 - .../CombatExtended/Defs/ShieldDefExtension.cs | 7 -- .../CombatExtended/Loadouts/ITab_Inventory.cs | 10 -- .../PatchOperationMakeGunCECompatible.cs | 12 -- .../Projectiles/ProjectileCE.cs | 12 +- .../Projectiles/ProjectileCE_Bursting.cs | 2 +- .../Projectiles/ProjectilePropertiesCE.cs | 2 - .../CombatExtended/Things/Apparel_Shield.cs | 26 +--- .../CombatExtended/Verbs/VerbPropertiesCE.cs | 2 - .../Verbs/Verb_LaunchProjectileCE.cs | 6 +- .../Harmony/Harmony_PawnRenderer.cs | 10 +- .../Harmony/Harmony_ThingDef.cs | 80 ------------- SupportedThirdPartyMods.md | 2 - 101 files changed, 206 insertions(+), 901 deletions(-) delete mode 100644 ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/AbilityDefs/AbilityDefs_Patch.xml delete mode 100644 ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/HediffDefs/Hediffs_Patch.xml delete mode 100644 ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackEmpress.xml delete mode 100644 ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackQueen.xml delete mode 100644 ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackSwarmling.xml delete mode 100644 ModPatches/Fallout Vault 111 Starter Pack/Patches/Vault-111_CE.xml delete mode 100644 ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/VFE-I2/AbilityDefs/AbilityDefs.xml delete mode 100644 ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/VFE-I2/GeneDefs/GeneDefs.xml delete mode 100644 ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/VFE-I2/HediffDefs/Hediffs.xml diff --git a/Anomaly/Patches/Hediffs/Hediffs_BodyParts_Prosthetic.xml b/Anomaly/Patches/Hediffs/Hediffs_BodyParts_Prosthetic.xml index 76677a054d..bf2e68b94a 100644 --- a/Anomaly/Patches/Hediffs/Hediffs_BodyParts_Prosthetic.xml +++ b/Anomaly/Patches/Hediffs/Hediffs_BodyParts_Prosthetic.xml @@ -26,7 +26,7 @@ Defs/HediffDef[defName="GhoulPlating"]/stages/li/statFactors/IncomingDamageFactor - 0.75 + 0.25 @@ -46,4 +46,4 @@ - + \ No newline at end of file diff --git a/Defs/Ammo/Grenade/20x42mmGrenade.xml b/Defs/Ammo/Grenade/20x42mmGrenade.xml index ae3b2fabb9..e0a1cb2107 100644 --- a/Defs/Ammo/Grenade/20x42mmGrenade.xml +++ b/Defs/Ammo/Grenade/20x42mmGrenade.xml @@ -195,7 +195,7 @@
  • Flame_Secondary - 24 + 12
    • @@ -211,7 +211,7 @@
  • Bomb_Secondary - 33 + 19
    • diff --git a/Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml b/Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml index 79b6b920ba..d6cbb7c6e0 100644 --- a/Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml +++ b/Defs/Ammo/HighCaliber/12.7x108mmSoviet.xml @@ -158,7 +158,7 @@
  • Flame_Secondary - 15 + 16
    • @@ -174,7 +174,7 @@
  • Bomb_Secondary - 20 + 23
    • diff --git a/Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml b/Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml index bf95890b2a..3ba50817f2 100644 --- a/Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml +++ b/Defs/Ammo/HighCaliber/13.2x92mmSRTuF.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 15 + 16
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 21 + 24
    • diff --git a/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml b/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml index ffceafa66d..d89338946a 100644 --- a/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml +++ b/Defs/Ammo/HighCaliber/14.5x114mmSoviet.xml @@ -158,7 +158,7 @@
  • Flame_Secondary - 17 + 21
    • @@ -174,7 +174,7 @@
  • Bomb_Secondary - 24 + 32
    • diff --git a/Defs/Ammo/HighCaliber/2-Bore.xml b/Defs/Ammo/HighCaliber/2-Bore.xml index a30d0e6dd4..448968e54f 100644 --- a/Defs/Ammo/HighCaliber/2-Bore.xml +++ b/Defs/Ammo/HighCaliber/2-Bore.xml @@ -158,7 +158,7 @@
  • Flame_Secondary - 37 + 22
    • @@ -174,7 +174,7 @@
  • Bomb_Secondary - 51 + 34
    • diff --git a/Defs/Ammo/HighCaliber/20x102mmNATO.xml b/Defs/Ammo/HighCaliber/20x102mmNATO.xml index a6f64ac1ef..94c78e5a2b 100644 --- a/Defs/Ammo/HighCaliber/20x102mmNATO.xml +++ b/Defs/Ammo/HighCaliber/20x102mmNATO.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 22 + 27
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 31 + 42
    • diff --git a/Defs/Ammo/HighCaliber/20x110mmHispano.xml b/Defs/Ammo/HighCaliber/20x110mmHispano.xml index e80897140d..c70eef2227 100644 --- a/Defs/Ammo/HighCaliber/20x110mmHispano.xml +++ b/Defs/Ammo/HighCaliber/20x110mmHispano.xml @@ -149,7 +149,7 @@
  • Bomb_Secondary - 35 + 39
    • diff --git a/Defs/Ammo/HighCaliber/20x128mmOerlikon.xml b/Defs/Ammo/HighCaliber/20x128mmOerlikon.xml index 1534cc9ba4..b64779de2a 100644 --- a/Defs/Ammo/HighCaliber/20x128mmOerlikon.xml +++ b/Defs/Ammo/HighCaliber/20x128mmOerlikon.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 25 + 30
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 35 + 45
    • diff --git a/Defs/Ammo/HighCaliber/20x138mmB.xml b/Defs/Ammo/HighCaliber/20x138mmB.xml index 7445798f07..8d7aa0cf7f 100644 --- a/Defs/Ammo/HighCaliber/20x138mmB.xml +++ b/Defs/Ammo/HighCaliber/20x138mmB.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 26 + 27
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 35 + 41
    • diff --git a/Defs/Ammo/HighCaliber/20x139mm.xml b/Defs/Ammo/HighCaliber/20x139mm.xml index c20cd09e97..a7a210f70f 100644 --- a/Defs/Ammo/HighCaliber/20x139mm.xml +++ b/Defs/Ammo/HighCaliber/20x139mm.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 26 + 30
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 35 + 46
    • diff --git a/Defs/Ammo/HighCaliber/20x82mmMauser.xml b/Defs/Ammo/HighCaliber/20x82mmMauser.xml index 7630b773ba..510b6df233 100644 --- a/Defs/Ammo/HighCaliber/20x82mmMauser.xml +++ b/Defs/Ammo/HighCaliber/20x82mmMauser.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 24 + 22
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 33 + 34
    • diff --git a/Defs/Ammo/HighCaliber/20x99mmShVAK.xml b/Defs/Ammo/HighCaliber/20x99mmShVAK.xml index ba555f936f..ca0b295457 100644 --- a/Defs/Ammo/HighCaliber/20x99mmShVAK.xml +++ b/Defs/Ammo/HighCaliber/20x99mmShVAK.xml @@ -149,7 +149,7 @@
  • Bomb_Secondary - 31 + 33
    • diff --git a/Defs/Ammo/HighCaliber/23x152mmB.xml b/Defs/Ammo/HighCaliber/23x152mmB.xml index 48356aea2d..2bb76f8b0a 100644 --- a/Defs/Ammo/HighCaliber/23x152mmB.xml +++ b/Defs/Ammo/HighCaliber/23x152mmB.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 34 + 35
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 46 + 53
    • diff --git a/Defs/Ammo/HighCaliber/25x137mmNATO.xml b/Defs/Ammo/HighCaliber/25x137mmNATO.xml index a253ab9367..f9e204df0b 100644 --- a/Defs/Ammo/HighCaliber/25x137mmNATO.xml +++ b/Defs/Ammo/HighCaliber/25x137mmNATO.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 33 + 39
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 45 + 59
    • diff --git a/Defs/Ammo/HighCaliber/300WinchesterMagnum.xml b/Defs/Ammo/HighCaliber/300WinchesterMagnum.xml index cbb60ecab8..c87eca6ccc 100644 --- a/Defs/Ammo/HighCaliber/300WinchesterMagnum.xml +++ b/Defs/Ammo/HighCaliber/300WinchesterMagnum.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 6 + 9
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 8 + 14
    • diff --git a/Defs/Ammo/HighCaliber/30x113mmB.xml b/Defs/Ammo/HighCaliber/30x113mmB.xml index fd6c965341..7f908f3bbd 100644 --- a/Defs/Ammo/HighCaliber/30x113mmB.xml +++ b/Defs/Ammo/HighCaliber/30x113mmB.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 42 + 37
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 58 + 57
    • diff --git a/Defs/Ammo/HighCaliber/30x165mm.xml b/Defs/Ammo/HighCaliber/30x165mm.xml index 2f16e014e3..edc7b6c72c 100644 --- a/Defs/Ammo/HighCaliber/30x165mm.xml +++ b/Defs/Ammo/HighCaliber/30x165mm.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 52 + 46
    • diff --git a/Defs/Ammo/HighCaliber/30x173mmNATO.xml b/Defs/Ammo/HighCaliber/30x173mmNATO.xml index 4eae92b1a1..0d01fd80ec 100644 --- a/Defs/Ammo/HighCaliber/30x173mmNATO.xml +++ b/Defs/Ammo/HighCaliber/30x173mmNATO.xml @@ -149,7 +149,7 @@
  • Bomb_Secondary - 69 + 76
    • diff --git a/Defs/Ammo/HighCaliber/338LapuaMagnum.xml b/Defs/Ammo/HighCaliber/338LapuaMagnum.xml index a23ce9dc8d..44d70c8e07 100644 --- a/Defs/Ammo/HighCaliber/338LapuaMagnum.xml +++ b/Defs/Ammo/HighCaliber/338LapuaMagnum.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 8 + 10
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 11 + 15
    • diff --git a/Defs/Ammo/HighCaliber/338NormaMagnum.xml b/Defs/Ammo/HighCaliber/338NormaMagnum.xml index 5030e9096b..4931880f13 100644 --- a/Defs/Ammo/HighCaliber/338NormaMagnum.xml +++ b/Defs/Ammo/HighCaliber/338NormaMagnum.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 9 + 10
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 12 + 15
    • diff --git a/Defs/Ammo/HighCaliber/408CheyenneTactical.xml b/Defs/Ammo/HighCaliber/408CheyenneTactical.xml index a138e35833..88a6625def 100644 --- a/Defs/Ammo/HighCaliber/408CheyenneTactical.xml +++ b/Defs/Ammo/HighCaliber/408CheyenneTactical.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 9 + 13
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 12 + 14
    • diff --git a/Defs/Ammo/HighCaliber/40x311mmR.xml b/Defs/Ammo/HighCaliber/40x311mmR.xml index 03371f0bd6..b4d3365c81 100644 --- a/Defs/Ammo/HighCaliber/40x311mmR.xml +++ b/Defs/Ammo/HighCaliber/40x311mmR.xml @@ -133,7 +133,7 @@
  • Flame_Secondary - 86 + 66
    • @@ -149,7 +149,7 @@
  • Bomb_Secondary - 117 + 101
    • diff --git a/Defs/Ammo/HighCaliber/470NitroExpress.xml b/Defs/Ammo/HighCaliber/470NitroExpress.xml index 87be208c4b..b3acb14b0d 100644 --- a/Defs/Ammo/HighCaliber/470NitroExpress.xml +++ b/Defs/Ammo/HighCaliber/470NitroExpress.xml @@ -173,7 +173,7 @@
  • Bomb_Secondary - 16 + 18
    • diff --git a/Defs/Ammo/HighCaliber/50BMG.xml b/Defs/Ammo/HighCaliber/50BMG.xml index b6cacb3cc1..d6f8b1d665 100644 --- a/Defs/Ammo/HighCaliber/50BMG.xml +++ b/Defs/Ammo/HighCaliber/50BMG.xml @@ -158,7 +158,7 @@
  • Flame_Secondary - 14 + 16
    • @@ -174,7 +174,7 @@
  • Bomb_Secondary - 20 + 24
    • diff --git a/Defs/Ammo/HighCaliber/55Boys.xml b/Defs/Ammo/HighCaliber/55Boys.xml index a646269473..cad36955d1 100644 --- a/Defs/Ammo/HighCaliber/55Boys.xml +++ b/Defs/Ammo/HighCaliber/55Boys.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 17 + 19
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 23 + 29
    • diff --git a/Defs/Ammo/HighCaliber/600NitroExpress.xml b/Defs/Ammo/HighCaliber/600NitroExpress.xml index a20f2c3173..04a310c509 100644 --- a/Defs/Ammo/HighCaliber/600NitroExpress.xml +++ b/Defs/Ammo/HighCaliber/600NitroExpress.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 17 + 15
    • diff --git a/Defs/Ammo/HighCaliber/7.92x94mm Patronen.xml b/Defs/Ammo/HighCaliber/7.92x94mm Patronen.xml index b697ad21b3..aa5bb3e47d 100644 --- a/Defs/Ammo/HighCaliber/7.92x94mm Patronen.xml +++ b/Defs/Ammo/HighCaliber/7.92x94mm Patronen.xml @@ -158,7 +158,7 @@
  • Flame_Secondary - 7 + 12
    • @@ -174,7 +174,7 @@
  • Bomb_Secondary - 10 + 18
    • diff --git a/Defs/Ammo/HighCaliber/950JDJ.xml b/Defs/Ammo/HighCaliber/950JDJ.xml index 0b3b496533..9839f8a987 100644 --- a/Defs/Ammo/HighCaliber/950JDJ.xml +++ b/Defs/Ammo/HighCaliber/950JDJ.xml @@ -157,7 +157,7 @@
  • Flame_Secondary - 38 + 29
    • @@ -173,7 +173,7 @@
  • Bomb_Secondary - 52 + 45
    • diff --git a/Defs/Ammo/Pistols/45ACP.xml b/Defs/Ammo/Pistols/45ACP.xml index 1e5b7fd428..c6f54f0416 100644 --- a/Defs/Ammo/Pistols/45ACP.xml +++ b/Defs/Ammo/Pistols/45ACP.xml @@ -108,7 +108,6 @@ true Fleck_PistolAmmoCasings Filth_PistolAmmoCasings - pistol diff --git a/Defs/Ammo/Rifle/127x55mm.xml b/Defs/Ammo/Rifle/127x55mm.xml index 4d63e4ee9c..ef21d25ce5 100644 --- a/Defs/Ammo/Rifle/127x55mm.xml +++ b/Defs/Ammo/Rifle/127x55mm.xml @@ -181,7 +181,7 @@
  • Flame_Secondary - 17 + 8
    • 14 @@ -197,7 +197,7 @@
  • Bomb_Secondary - 23 + 13
    • 7 diff --git a/Defs/Ammo/Rifle/243Winchester.xml b/Defs/Ammo/Rifle/243Winchester.xml index 95931e39de..23e71ab318 100644 --- a/Defs/Ammo/Rifle/243Winchester.xml +++ b/Defs/Ammo/Rifle/243Winchester.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 4 + 6
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 6 + 10
    • diff --git a/Defs/Ammo/Rifle/277Fury.xml b/Defs/Ammo/Rifle/277Fury.xml index 7602604914..1dc6529c94 100644 --- a/Defs/Ammo/Rifle/277Fury.xml +++ b/Defs/Ammo/Rifle/277Fury.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 5 + 8
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 7 + 12
    • diff --git a/Defs/Ammo/Rifle/280British.xml b/Defs/Ammo/Rifle/280British.xml index 2b7ecab255..c40c32f46d 100644 --- a/Defs/Ammo/Rifle/280British.xml +++ b/Defs/Ammo/Rifle/280British.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 5 + 7
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 7 + 12
    • diff --git a/Defs/Ammo/Rifle/30-30Winchester.xml b/Defs/Ammo/Rifle/30-30Winchester.xml index ed71bab020..0bdf9b0b19 100644 --- a/Defs/Ammo/Rifle/30-30Winchester.xml +++ b/Defs/Ammo/Rifle/30-30Winchester.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 7
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 8 + 11
    • diff --git a/Defs/Ammo/Rifle/3006Springfield.xml b/Defs/Ammo/Rifle/3006Springfield.xml index 344e77ad35..3b1ba1188c 100644 --- a/Defs/Ammo/Rifle/3006Springfield.xml +++ b/Defs/Ammo/Rifle/3006Springfield.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 8
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 8 + 12
    • diff --git a/Defs/Ammo/Rifle/300AACBlackout.xml b/Defs/Ammo/Rifle/300AACBlackout.xml index 9e1f6d607f..a2ac2c1bcf 100644 --- a/Defs/Ammo/Rifle/300AACBlackout.xml +++ b/Defs/Ammo/Rifle/300AACBlackout.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 5 + 6
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 7 + 10
    • diff --git a/Defs/Ammo/Rifle/303British.xml b/Defs/Ammo/Rifle/303British.xml index 2f8270d156..46b1e11cd2 100644 --- a/Defs/Ammo/Rifle/303British.xml +++ b/Defs/Ammo/Rifle/303British.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 8
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 8 + 12
    • diff --git a/Defs/Ammo/Rifle/30Carbine.xml b/Defs/Ammo/Rifle/30Carbine.xml index 4f31a523c1..8c79378fbf 100644 --- a/Defs/Ammo/Rifle/30Carbine.xml +++ b/Defs/Ammo/Rifle/30Carbine.xml @@ -196,7 +196,7 @@
  • Bomb_Secondary - 6 + 8
    • diff --git a/Defs/Ammo/Rifle/38-55Winchester.xml b/Defs/Ammo/Rifle/38-55Winchester.xml index 982aab799f..a7196e91ad 100644 --- a/Defs/Ammo/Rifle/38-55Winchester.xml +++ b/Defs/Ammo/Rifle/38-55Winchester.xml @@ -196,7 +196,7 @@
  • Bomb_Secondary - 11 + 12
    • diff --git a/Defs/Ammo/Rifle/44-40Winchester.xml b/Defs/Ammo/Rifle/44-40Winchester.xml index 6f50628dc5..b7bbff3502 100644 --- a/Defs/Ammo/Rifle/44-40Winchester.xml +++ b/Defs/Ammo/Rifle/44-40Winchester.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 6
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 9 + 8
    • diff --git a/Defs/Ammo/Rifle/4570Gov.xml b/Defs/Ammo/Rifle/4570Gov.xml index c94a38e1dd..8ed624752a 100644 --- a/Defs/Ammo/Rifle/4570Gov.xml +++ b/Defs/Ammo/Rifle/4570Gov.xml @@ -196,7 +196,7 @@
  • Bomb_Secondary - 12 + 14
    • diff --git a/Defs/Ammo/Rifle/458SOCOM.xml b/Defs/Ammo/Rifle/458SOCOM.xml index 1a960aacca..83c82cc6a9 100644 --- a/Defs/Ammo/Rifle/458SOCOM.xml +++ b/Defs/Ammo/Rifle/458SOCOM.xml @@ -196,7 +196,7 @@
  • Bomb_Secondary - 12 + 13
    • diff --git a/Defs/Ammo/Rifle/473x33mmCaseless.xml b/Defs/Ammo/Rifle/473x33mmCaseless.xml index 2c27375412..6959713083 100644 --- a/Defs/Ammo/Rifle/473x33mmCaseless.xml +++ b/Defs/Ammo/Rifle/473x33mmCaseless.xml @@ -179,7 +179,7 @@
  • Flame_Secondary - 3 + 5
    • @@ -195,7 +195,7 @@
  • Bomb_Secondary - 4 + 7
    • diff --git a/Defs/Ammo/Rifle/485x49mm.xml b/Defs/Ammo/Rifle/485x49mm.xml index a0f427b183..fe1cca5b2d 100644 --- a/Defs/Ammo/Rifle/485x49mm.xml +++ b/Defs/Ammo/Rifle/485x49mm.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 3 + 5
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 4 + 8
    • diff --git a/Defs/Ammo/Rifle/50Beowulf.xml b/Defs/Ammo/Rifle/50Beowulf.xml index cd965a42ec..9cfb2dacc5 100644 --- a/Defs/Ammo/Rifle/50Beowulf.xml +++ b/Defs/Ammo/Rifle/50Beowulf.xml @@ -196,7 +196,7 @@
  • Bomb_Secondary - 13 + 14
    • diff --git a/Defs/Ammo/Rifle/545x39mmSoviet.xml b/Defs/Ammo/Rifle/545x39mmSoviet.xml index bde04ba16d..30a639234f 100644 --- a/Defs/Ammo/Rifle/545x39mmSoviet.xml +++ b/Defs/Ammo/Rifle/545x39mmSoviet.xml @@ -196,7 +196,7 @@
  • Flame_Secondary - 3 + 5
    • @@ -212,7 +212,7 @@
  • Bomb_Secondary - 4 + 8
    • @@ -274,7 +274,7 @@
  • Flame_Secondary - 3 + 4
    • 142 @@ -291,7 +291,7 @@
  • Bomb_Secondary - 4 + 7
    • 142 diff --git a/Defs/Ammo/Rifle/556x45mmNATO.xml b/Defs/Ammo/Rifle/556x45mmNATO.xml index f89fa9ae70..7e27338406 100644 --- a/Defs/Ammo/Rifle/556x45mmNATO.xml +++ b/Defs/Ammo/Rifle/556x45mmNATO.xml @@ -194,7 +194,7 @@
  • Flame_Secondary - 3 + 5
    • @@ -210,7 +210,7 @@
  • Bomb_Secondary - 5 + 8
    • @@ -272,7 +272,7 @@
  • Flame_Secondary - 3 + 5
    • 142 @@ -289,7 +289,7 @@
  • Bomb_Secondary - 5 + 7
    • 142 diff --git a/Defs/Ammo/Rifle/56-56Spencer.xml b/Defs/Ammo/Rifle/56-56Spencer.xml index 74e2c13780..e375a58148 100644 --- a/Defs/Ammo/Rifle/56-56Spencer.xml +++ b/Defs/Ammo/Rifle/56-56Spencer.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 9 + 7
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 13 + 11
    • diff --git a/Defs/Ammo/Rifle/58x42mmDBP10.xml b/Defs/Ammo/Rifle/58x42mmDBP10.xml index 20c27fce87..a9158d5946 100644 --- a/Defs/Ammo/Rifle/58x42mmDBP10.xml +++ b/Defs/Ammo/Rifle/58x42mmDBP10.xml @@ -182,7 +182,7 @@
  • Flame_Secondary - 3 + 6
    • @@ -198,7 +198,7 @@
  • Bomb_Secondary - 5 + 9
    • diff --git a/Defs/Ammo/Rifle/6.5Creedmoor.xml b/Defs/Ammo/Rifle/6.5Creedmoor.xml index d9db2a7be4..3d0929285c 100644 --- a/Defs/Ammo/Rifle/6.5Creedmoor.xml +++ b/Defs/Ammo/Rifle/6.5Creedmoor.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 8
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 8 + 12
    • diff --git a/Defs/Ammo/Rifle/6.5x52mm Carcano.xml b/Defs/Ammo/Rifle/6.5x52mm Carcano.xml index 14481c0ef1..e911ddf6b5 100644 --- a/Defs/Ammo/Rifle/6.5x52mm Carcano.xml +++ b/Defs/Ammo/Rifle/6.5x52mm Carcano.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 7
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 8 + 10
    • diff --git a/Defs/Ammo/Rifle/65x50mmSRArisaka.xml b/Defs/Ammo/Rifle/65x50mmSRArisaka.xml index 394792818d..7b4c0c5f32 100644 --- a/Defs/Ammo/Rifle/65x50mmSRArisaka.xml +++ b/Defs/Ammo/Rifle/65x50mmSRArisaka.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 5 + 7
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 7 + 10
    • diff --git a/Defs/Ammo/Rifle/7.92x57mmMauser.xml b/Defs/Ammo/Rifle/7.92x57mmMauser.xml index cb99f6e921..90e916d853 100644 --- a/Defs/Ammo/Rifle/7.92x57mmMauser.xml +++ b/Defs/Ammo/Rifle/7.92x57mmMauser.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 8
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 9 + 13
    • diff --git a/Defs/Ammo/Rifle/75x54mmFrench.xml b/Defs/Ammo/Rifle/75x54mmFrench.xml index 906a5e96a1..62253a6992 100644 --- a/Defs/Ammo/Rifle/75x54mmFrench.xml +++ b/Defs/Ammo/Rifle/75x54mmFrench.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 5 + 7
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 7 + 11
    • diff --git a/Defs/Ammo/Rifle/762x39mmSoviet.xml b/Defs/Ammo/Rifle/762x39mmSoviet.xml index dbb7357373..52227160f0 100644 --- a/Defs/Ammo/Rifle/762x39mmSoviet.xml +++ b/Defs/Ammo/Rifle/762x39mmSoviet.xml @@ -196,7 +196,7 @@
  • Flame_Secondary - 5 + 7
    • @@ -212,7 +212,7 @@
  • Bomb_Secondary - 7 + 10
    • @@ -275,7 +275,7 @@
  • Flame_Secondary - 5 + 6
    • @@ -292,7 +292,7 @@
  • Bomb_Secondary - 7 + 9
    • diff --git a/Defs/Ammo/Rifle/762x51mmNATO.xml b/Defs/Ammo/Rifle/762x51mmNATO.xml index 769d35e14c..d8f704899b 100644 --- a/Defs/Ammo/Rifle/762x51mmNATO.xml +++ b/Defs/Ammo/Rifle/762x51mmNATO.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 8
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 8 + 12
    • diff --git a/Defs/Ammo/Rifle/762x54mmR.xml b/Defs/Ammo/Rifle/762x54mmR.xml index bf71bbb8f3..e1fcdf6b2c 100644 --- a/Defs/Ammo/Rifle/762x54mmR.xml +++ b/Defs/Ammo/Rifle/762x54mmR.xml @@ -182,7 +182,7 @@
  • Flame_Secondary - 6 + 8
    • @@ -198,7 +198,7 @@
  • Bomb_Secondary - 8 + 12
    • diff --git a/Defs/Ammo/Rifle/77x58mmArisaka.xml b/Defs/Ammo/Rifle/77x58mmArisaka.xml index 2f4c00544e..e510e92f03 100644 --- a/Defs/Ammo/Rifle/77x58mmArisaka.xml +++ b/Defs/Ammo/Rifle/77x58mmArisaka.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 7
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 8 + 11
    • diff --git a/Defs/Ammo/Rifle/792x33mmKurz.xml b/Defs/Ammo/Rifle/792x33mmKurz.xml index 880b1e99c8..90bde6c0ef 100644 --- a/Defs/Ammo/Rifle/792x33mmKurz.xml +++ b/Defs/Ammo/Rifle/792x33mmKurz.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 5 + 6
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 7 + 10
    • diff --git a/Defs/Ammo/Rifle/8.6mmBlackout.xml b/Defs/Ammo/Rifle/8.6mmBlackout.xml index c1fbd69cd7..a6cc1fe328 100644 --- a/Defs/Ammo/Rifle/8.6mmBlackout.xml +++ b/Defs/Ammo/Rifle/8.6mmBlackout.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 6 + 8
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 8 + 12
    • diff --git a/Defs/Ammo/Rifle/8x50mmRLebel.xml b/Defs/Ammo/Rifle/8x50mmRLebel.xml index 1dfc68cf29..6105c976e6 100644 --- a/Defs/Ammo/Rifle/8x50mmRLebel.xml +++ b/Defs/Ammo/Rifle/8x50mmRLebel.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 7 + 8
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 9 + 12
    • diff --git a/Defs/Ammo/Rifle/8x50mmRMannlicher.xml b/Defs/Ammo/Rifle/8x50mmRMannlicher.xml index 52303f1493..9505461b5c 100644 --- a/Defs/Ammo/Rifle/8x50mmRMannlicher.xml +++ b/Defs/Ammo/Rifle/8x50mmRMannlicher.xml @@ -180,7 +180,7 @@
  • Flame_Secondary - 8 + 7
    • @@ -196,7 +196,7 @@
  • Bomb_Secondary - 10 + 11
    • diff --git a/Defs/Ammo/Rifle/9x39mmSoviet.xml b/Defs/Ammo/Rifle/9x39mmSoviet.xml index 6ad902297e..882c8b223f 100644 --- a/Defs/Ammo/Rifle/9x39mmSoviet.xml +++ b/Defs/Ammo/Rifle/9x39mmSoviet.xml @@ -181,7 +181,7 @@
  • Flame_Secondary - 8 + 5
    • @@ -197,7 +197,7 @@
  • Bomb_Secondary - 10 + 8
    • diff --git a/Languages/English/Keyed/Keys.xml b/Languages/English/Keyed/Keys.xml index df82f099bd..bf00261847 100644 --- a/Languages/English/Keyed/Keys.xml +++ b/Languages/English/Keyed/Keys.xml @@ -49,12 +49,11 @@ Out of bounds Can't target self - No line of sight + No line of sight Blocked by roof Shooting disallowed by Outside of range Within minimum range - bullet Distance: {0}/{1} Tiles @@ -172,9 +171,5 @@ This weapon is yet patched for CE, while it will behave in vanilla way as fallback, please contact a patcher for compatibility patches. Not patched for CE - - - Shield coverage - Body parts protected from ranged and melee attacks by the shield. \ No newline at end of file diff --git a/LoadFolders.xml b/LoadFolders.xml index 9dce69f67b..b0409a8ffa 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -174,7 +174,6 @@
  • ModPatches/FSF Vanilla Bionics Expansion
  • ModPatches/Faction - Mafia
  • ModPatches/Fallout New Vegas - Elite Riot Gear
    • -
  • ModPatches/Fallout Vault 111 Starter Pack
  • ModPatches/Fantasy Metals Reforged
  • ModPatches/Farming Expansion
  • ModPatches/FashionRIMsta
    • @@ -199,7 +198,7 @@
  • ModPatches/GrimWorld Angels of Death
  • ModPatches/Grimworld Core Imperialis
  • ModPatches/GrimWorld Hammer of the Imperium
    • -
  • ModPatches/GrimWorld Imperial Vehicles
    • +
  • ModPatches/GrimWorld Imperial Vehicles
  • ModPatches/Girls Frontline Apparel Pack
  • ModPatches/Girls Frontline Styles 404 Team
  • ModPatches/Girls Frontline Styles AR Team
    • @@ -620,6 +619,6 @@
  • ModPatches/Multiplayer
  • ModPatches/SRTS
    • -
  • ModPatches/VehicleFramework
    • +
  • ModPatches/VehicleFramework
    • \ No newline at end of file diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/AbilityDefs/AbilityDefs_Patch.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/AbilityDefs/AbilityDefs_Patch.xml deleted file mode 100644 index dcd206f652..0000000000 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/AbilityDefs/AbilityDefs_Patch.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - -
  • Vanilla Factions Expanded - Insectoids 2
    • -     - - - - -
  • - Defs/AbilityDef[defName="AA_GreaterVileSpit"]/verbProperties/range - - 30.9 - -
    • - -
  • - Defs/ThingDef[defName="AA_GreaterBlackHiveBolt"]/projectile - - - AA_BlackHiveBolt - 30 - 20 - 9 - 12 - 5 - 1 - 0 - AA_FilthSlimyPuke - - -
    • - -     -     -     - -     \ No newline at end of file diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/HediffDefs/Hediffs_Patch.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/HediffDefs/Hediffs_Patch.xml deleted file mode 100644 index 237a20d351..0000000000 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/HediffDefs/Hediffs_Patch.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - -
  • Vanilla Factions Expanded - Insectoids 2
    • -     - - - - -
  • - Defs/HediffDef[defName="AA_MechanoidRendingClaws"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • AA_EMPSlash
    • - - 16 - 1.5 - 2.0 - 1.5 - - - - - -     -     -     - -     \ No newline at end of file diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackEmpress.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackEmpress.xml deleted file mode 100644 index 32d1040e3e..0000000000 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackEmpress.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - -
  • Vanilla Factions Expanded - Insectoids 2
    • -     - - - - -
  • - Defs/ThingDef[defName="VFEI2_BlackEmpress"] - -
  • - Quadruped -
    • - - - -
  • - Defs/ThingDef[defName="VFEI2_BlackEmpress"]/statBases - - 0.05 - 0.33 - 0.57 - -
    • - -
  • - Defs/ThingDef[defName="VFEI2_BlackEmpress"]/statBases/ArmorRating_Blunt - - 25 - -
    • - -
  • - Defs/ThingDef[defName="VFEI2_BlackEmpress"]/statBases/ArmorRating_Sharp - - 14 - -
    • - -
  • - Defs/ThingDef[defName="VFEI2_BlackEmpress"]/tools - - -
  • - - -
  • AA_ExtraDamageMechanoidsClaws
    • - - 25 - 1.28 - HeadClaw - 50 - 30 - -
  • - - -
  • AA_ExtraDamageMechanoidsClaws
    • - - 51 - 1.45 - HeadClaw - 7.5 - 15 - -
  • - - -
  • Blunt
    • - - 12 - 2.64 - HeadAttackTool - 0.2 - 5.1 - - - - - -
  • - Defs/ThingDef[defName="VFEI2_BlackEmpress"]/comps - - Defs/ThingDef[defName="VFEI2_BlackEmpress"] - - - - -
    • - -
  • - Defs/ThingDef[defName="VFEI2_BlackEmpress"]/comps - -
  • - 2750 - true - 400 - 5 - 0.25 -
    • - - - -     -     -     - -     \ No newline at end of file diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackQueen.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackQueen.xml deleted file mode 100644 index df86982c29..0000000000 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackQueen.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - -
  • Vanilla Factions Expanded - Insectoids 2
    • -     - - - - -
  • - Defs/ThingDef[defName="VFEI2_BlackQueen"] - -
  • - Birdlike -
    • - - - -
  • - Defs/ThingDef[defName="VFEI2_BlackQueen"]/statBases - - 0.03 - 0.30 - 0.57 - -
    • - -
  • - Defs/ThingDef[defName="VFEI2_BlackQueen"]/statBases/ArmorRating_Blunt - - 30 - -
    • - -
  • - Defs/ThingDef[defName="VFEI2_BlackQueen"]/statBases/ArmorRating_Sharp - - 12 - -
    • - -
  • - Defs/ThingDef[defName="VFEI2_BlackQueen"]/tools - - -
  • - - -
  • AA_ExtraDamageMechanoidsClaws
    • - - 37 - 1.48 - HeadClaw - 50 - 30 - -
  • - - -
  • Cut
    • - - 65 - 1.65 - HeadClaw - 5 - 10 - -
  • - - -
  • Blunt
    • - - 34 - 2.64 - HeadAttackTool - 0.2 - 14.4 - - - - - -
  • - Defs/ThingDef[defName="VFEI2_BlackQueen"]/comps - - Defs/ThingDef[defName="VFEI2_BlackQueen"] - - - - -
    • - -
  • - Defs/ThingDef[defName="VFEI2_BlackQueen"]/comps - -
  • - 3000 - true - 400 - 5 - 0.25 -
    • - - - -     -     -     - -     \ No newline at end of file diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackSwarmling.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackSwarmling.xml deleted file mode 100644 index a3eee9328a..0000000000 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackSwarmling.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - -
  • Vanilla Factions Expanded - Insectoids 2
    • -     - - - - -
  • - Defs/ThingDef[defName="VFEI2_BlackSwarmling"]/statBases/MoveSpeed - - 1.9 - 0.1 - 0.02 - 0.01 - -
    • - -
  • - Defs/ThingDef[defName="VFEI2_BlackSwarmling"]/tools - - -
  • - - -
  • Bite
    • - - 3 - 1.5 - Mouth - 0.1 - 0.25 - - - - - -     -     -     - -     \ No newline at end of file diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml index 8e6dfadcca..616c4a14e0 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml @@ -3,21 +3,12 @@ -
  • Vanilla Factions Expanded - Insectoids 2
    • +
  • Vanilla Psycasts Expanded
    •  -
  • - Defs/ThingDef[defName="AAVPE_BlackQueen"] - -
  • - Birdlike -
    • - - -
  • Defs/ThingDef[defName="AAVPE_BlackQueen"]/statBases @@ -57,9 +48,9 @@ 30
  • - + -
  • AAVPE_InfectedMandibles
    • +
  • Cut
    • 65 1.65 @@ -87,7 +78,7 @@ Defs/ThingDef[defName="AAVPE_BlackQueen"] - + diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/DamageDef/AlphaAnimals_CE_Patch_DamageDef.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/DamageDef/AlphaAnimals_CE_Patch_DamageDef.xml index 7e1a404d84..8569c0e7d9 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/DamageDef/AlphaAnimals_CE_Patch_DamageDef.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/DamageDef/AlphaAnimals_CE_Patch_DamageDef.xml @@ -16,8 +16,7 @@ Defs/DamageDef[defName="AA_ToxicSting" or defName="AA_InfectedClaws" or defName="AA_ToxicBite" or - defName="AA_ToxicBolt" or - defName="AA_BlackHiveBolt"]/additionalHediffs/li[hediff="AA_ToxicBuildup"]/severityPerDamageDealt + defName="AA_ToxicBolt"]/additionalHediffs/li[hediff="AA_ToxicBuildup"]/severityPerDamageDealt 0.01 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Projectiles.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Projectiles.xml index fcba9ae43e..1b5167e392 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Projectiles.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_Projectiles.xml @@ -21,7 +21,6 @@ defName="AA_FrostWeb" or defName="AA_Plasma" or defName="AA_PoisonBolt" or - defName="AA_BlackHiveBolt" or defName="AA_Quill" or defName="AA_RedPoisonBolt" or defName="AA_Web" or @@ -121,20 +120,6 @@ false AA_ToxicBolt - 9 - 25 - 2.3 - 1.5 - - -     - - - Defs/ThingDef[defName="AA_BlackHiveBolt"]/projectile - - - false - AA_BlackHiveBolt 10 27 2.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE.xml index 488c07d29c..c4bee251e0 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Misc/AlphaAnimals_CE_Patch_VerbShootCE.xml @@ -23,7 +23,7 @@
  • CombatExtended.Verb_ShootCE true - AA_BlackHiveBolt + AA_PoisonBolt 2.4 1 2 @@ -45,7 +45,7 @@
  • CombatExtended.Verb_ShootCE true - AA_BlackHiveBolt + AA_PoisonBolt 1.6 1 2 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml index 179426ef88..9f6125c8fd 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml @@ -54,7 +54,7 @@
  • -
  • AA_ExtraDamageMechanoidsBite
    • +
  • Bite
    • 9 1.33 @@ -83,7 +83,7 @@ Defs/ThingDef[defName="AA_BlackScarab"] - +     @@ -164,7 +164,7 @@
  • -
  • AA_ExtraDamageMechanoidsClaws
    • +
  • Cut
    • 22 1.68 @@ -204,7 +204,7 @@ Defs/ThingDef[defName="AA_BlackSpelopede"] - + @@ -285,7 +285,7 @@
  • -
  • AA_ExtraDamageMechanoidsClaws
    • +
  • Cut
    • 44 2.0 @@ -325,7 +325,7 @@ Defs/ThingDef[defName="AA_BlackSpider"] - + diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml index 152ea22351..7b30f7b79f 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml @@ -64,7 +64,7 @@
  • -
  • AA_ExtraDamageMechanoidsTusk
    • +
  • Stab
    • 48 2.68 @@ -81,7 +81,7 @@ Defs/ThingDef[defName="AA_MammothWorm"] - + diff --git a/ModPatches/Fallout Vault 111 Starter Pack/Patches/Vault-111_CE.xml b/ModPatches/Fallout Vault 111 Starter Pack/Patches/Vault-111_CE.xml deleted file mode 100644 index b2020e6945..0000000000 --- a/ModPatches/Fallout Vault 111 Starter Pack/Patches/Vault-111_CE.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - Defs/ThingDef[defName="Phaneron_VaultSuit"]/statBases/Mass - - 1.5 - - - - - Defs/ThingDef[defName="Phaneron_VaultSuit"]/statBases/StuffEffectMultiplierArmor - - 3.5 - - - - - Defs/ThingDef[defName="Phaneron_VaultSuit"]/statBases - - 2.25 - 1.5 - - - - - - - Defs/ThingDef[defName="Phaneron_FalloutPipBoy"]/statBases - - 1 - 0.5 - - - - - Defs/ThingDef[defName="Phaneron_FalloutPipBoy"]/equippedStatOffsets - - - 0.1 - 0.15 - 0.1 - 10 - - - - - - - - Defs/ThingDef[defName="Phaneron_FalloutPipBoy"]/costList/Plasteel - - 35 - - - - - - - Defs/ThingDef[defName="Phaneron_FalloutPipBoy"]/statBases/WorkToMake - - 12500 - - - - \ No newline at end of file diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml index 86f263df73..7285d4bebb 100644 --- a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml +++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml @@ -5,6 +5,9 @@ Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]/comps +
  • + CombatExtended.CompPawnGizmo +
  • 500 @@ -19,6 +22,9 @@ Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"] +
  • + CombatExtended.CompPawnGizmo +
  • 500 diff --git a/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/RangedRecon.xml b/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/RangedRecon.xml index e0468662c7..0f4e8467da 100644 --- a/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/RangedRecon.xml +++ b/ModPatches/Recon Mechanoid/Patches/Recon Mechanoid/RangedRecon.xml @@ -84,7 +84,6 @@
  • CE_SMG
  • CE_AI_BROOM
    • -
  • NoSwitch
    • @@ -122,9 +121,6 @@ FALSE Snapshot - -
  • NoSwitch
    • -     @@ -160,7 +156,6 @@
  • CE_AI_AR
    • -
  • NoSwitch
    •  @@ -197,7 +192,6 @@
  • CE_AI_AR
    • -
  • NoSwitch
    •  diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml index b853b3a221..85a7693e9f 100644 --- a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml +++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml @@ -26,6 +26,24 @@     +
  • + Defs/ThingDef[defName = "VWEB_Warbolter"]/tools + + +
  • + + +
  • Blunt
    • + + 35 + 2.44 + 16 + Barrel + + + + +
  • VWEB_Warbolter diff --git a/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/VFE-I2/AbilityDefs/AbilityDefs.xml b/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/VFE-I2/AbilityDefs/AbilityDefs.xml deleted file mode 100644 index 7a90c5bb9b..0000000000 --- a/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/VFE-I2/AbilityDefs/AbilityDefs.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - -
  • Vanilla Factions Expanded - Insectoids 2
    • - - - - - -
  • - Defs/AbilityDef[defName="VFEI2_InsectGlide_Far_Colonists"]/verbProperties/range - - 27.9 - -
    • - -     -     - - - \ No newline at end of file diff --git a/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/VFE-I2/GeneDefs/GeneDefs.xml b/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/VFE-I2/GeneDefs/GeneDefs.xml deleted file mode 100644 index 7c48c27acb..0000000000 --- a/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/VFE-I2/GeneDefs/GeneDefs.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - -
  • Vanilla Factions Expanded - Insectoids 2
    • -     - - - - -
  • - Defs/VanillaRacesExpandedInsector.GenelineGeneDef[defName="VRE_InfraredSensors"]/statFactors - - - 0.05 - 0.75 - - -
    • - -     -     -     - -     \ No newline at end of file diff --git a/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/VFE-I2/HediffDefs/Hediffs.xml b/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/VFE-I2/HediffDefs/Hediffs.xml deleted file mode 100644 index f750d9e80a..0000000000 --- a/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/VFE-I2/HediffDefs/Hediffs.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - -
  • Vanilla Factions Expanded - Insectoids 2
    • -     - - - - -
  • - Defs/HediffDef[defName="VRE_InsectRostrum"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • Stab
    • - - 24 - 3.0 - 6.0 - 2.0 - true - - - - - -
  • - Defs/HediffDef[defName="VRE_MineralRichInsectskin"]/stages - - -
  • - 0.1 - - 2.5 - 3 - -
    • -
  • - 1 - - 7.5 - 9 - -
    • - - - - -     -     -     - -     \ No newline at end of file diff --git a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml index 3456fc2ece..53639e169b 100644 --- a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml +++ b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-BioferriteRanged.xml @@ -4,7 +4,9 @@ - Defs/ThingDef[defName="VWEB_Gun_FlarestrikeRifle" or defName="VWEB_Gun_FirestormShotgun"]/tools + + Defs/ThingDef[defName="VWEB_Gun_FlarestrikeRifle" or + defName="VWEB_Gun_FirestormShotgun"]/tools @@ -83,7 +85,9 @@ - Defs/ThingDef[defName="VWEB_Gun_PiercerRifle"]/tools + + Defs/ThingDef[defName="VWEB_Gun_PiercerRifle"]/tools +
  • @@ -225,16 +229,19 @@ GunTail_Heavy 9 + 9 true 0.8 AmmoSet_12Gauge + FALSE Snapshot +
  • CE_AI_AssaultWeapon
    • diff --git a/ModPatches/Waster Toxic Breather/Patches/Waster Toxic Breather/WasterBreather.xml b/ModPatches/Waster Toxic Breather/Patches/Waster Toxic Breather/WasterBreather.xml index f3e95af43f..fbff8f2f66 100644 --- a/ModPatches/Waster Toxic Breather/Patches/Waster Toxic Breather/WasterBreather.xml +++ b/ModPatches/Waster Toxic Breather/Patches/Waster Toxic Breather/WasterBreather.xml @@ -36,6 +36,13 @@     + + Defs/ThingDef[defName="WTM_ToxicBreather"]/apparel/hatRenderedFrontOfFace + + false + + + Defs/ThingDef[defName="WTM_ToxicBreather"]/apparel/layers diff --git a/Source/CombatExtended/CombatExtended/AmmoGeneralizer.cs b/Source/CombatExtended/CombatExtended/AmmoGeneralizer.cs index 7f1f1f674b..3a7225fa65 100644 --- a/Source/CombatExtended/CombatExtended/AmmoGeneralizer.cs +++ b/Source/CombatExtended/CombatExtended/AmmoGeneralizer.cs @@ -30,8 +30,7 @@ static AmmoGeneralizer() var sameClass = ammoSource.ammoTypes.Find(x => x.ammo.ammoClass == link.ammo.ammoClass); if (sameClass != null) { - string labelNew = (link.projectile.projectile is ProjectilePropertiesCE projPropCE && projPropCE.genericLabelOverride != null) ? projPropCE.genericLabelOverride : ammoSource.label; - link.projectile.label = labelNew + " " + "CE_GenericBullet".Translate() + " (" + link.ammo.ammoClass.labelShort + ")"; + link.projectile.label = ammoSource.label + " bullet " + "(" + link.ammo.ammoClass.labelShort + ")"; newAmmos.Add(new AmmoLink { ammo = sameClass.ammo, projectile = link.projectile }); } diff --git a/Source/CombatExtended/CombatExtended/Comps_CCL/CompPawnGizmo.cs b/Source/CombatExtended/CombatExtended/Comps_CCL/CompPawnGizmo.cs index 33f222d45b..e788dedcb8 100644 --- a/Source/CombatExtended/CombatExtended/Comps_CCL/CompPawnGizmo.cs +++ b/Source/CombatExtended/CombatExtended/Comps_CCL/CompPawnGizmo.cs @@ -5,52 +5,35 @@ namespace CombatExtended { public class CompPawnGizmo : ThingComp { - bool duplicate = false; - - public override void Initialize(CompProperties props) - { - base.Initialize(props); - foreach (var comp in parent.comps) - { - if (comp is CompPawnGizmo && comp != this) - { - duplicate = true; - Log.ErrorOnce($"{parent.def.defName} has multiple CompPawnGizmo, duplicates has been deactivated. Please report this to the patch provider of {parent.def.modContentPack.Name} or CE team if the patch is integrated in CE.", parent.def.GetHashCode()); - } - } - } - - public override IEnumerable CompGetGizmosExtra() { - if (!duplicate) - { - var pawn = parent as Pawn; - var equip = pawn != null - ? pawn.equipment.Primary - : null; + var pawn = parent as Pawn; + var equip = pawn != null + ? pawn.equipment.Primary + : null; - if ( - (equip != null) && - (!equip.AllComps.NullOrEmpty()) - ) + if ( + (equip != null) && + (!equip.AllComps.NullOrEmpty()) + ) + { + foreach (var comp in equip.AllComps) { - foreach (var comp in equip.AllComps) + var gizmoGiver = comp as CompRangedGizmoGiver; + if ( + (gizmoGiver != null) && + (gizmoGiver.isRangedGiver) + ) { - var gizmoGiver = comp as CompRangedGizmoGiver; - if ( - (gizmoGiver != null) && - (gizmoGiver.isRangedGiver) - ) + foreach (var gizmo in gizmoGiver.CompGetGizmosExtra()) { - foreach (var gizmo in gizmoGiver.CompGetGizmosExtra()) - { - yield return gizmo; - } + yield return gizmo; } } } - }; + } } + } + } diff --git a/Source/CombatExtended/CombatExtended/Defs/AmmoDef.cs b/Source/CombatExtended/CombatExtended/Defs/AmmoDef.cs index bd80bc59a0..351f7c187f 100644 --- a/Source/CombatExtended/CombatExtended/Defs/AmmoDef.cs +++ b/Source/CombatExtended/CombatExtended/Defs/AmmoDef.cs @@ -111,7 +111,6 @@ public List AmmoSetDefs } } - [NoTranslate] private string oldDescription; public void AddDescriptionParts() { diff --git a/Source/CombatExtended/CombatExtended/Defs/ShieldDefExtension.cs b/Source/CombatExtended/CombatExtended/Defs/ShieldDefExtension.cs index 5d9182e56c..0e22f414f8 100644 --- a/Source/CombatExtended/CombatExtended/Defs/ShieldDefExtension.cs +++ b/Source/CombatExtended/CombatExtended/Defs/ShieldDefExtension.cs @@ -38,12 +38,5 @@ public bool PartIsCoveredByShield(BodyPartRecord part, Pawn pawn) } return false; } - public static string GetShieldProtectedAreas(BodyDef body, ThingDef thingDef) - { - return (from part in (from x in body.AllParts - where x.depth == BodyPartDepth.Outside && x.groups.Any((BodyPartGroupDef y) => thingDef.GetModExtension().shieldCoverage.Contains(y)) - select x).Distinct() - select part.Label).ToCommaList(false, false).CapitalizeFirst(); - } } } diff --git a/Source/CombatExtended/CombatExtended/Loadouts/ITab_Inventory.cs b/Source/CombatExtended/CombatExtended/Loadouts/ITab_Inventory.cs index 92d5c43ec3..378fe1870a 100644 --- a/Source/CombatExtended/CombatExtended/Loadouts/ITab_Inventory.cs +++ b/Source/CombatExtended/CombatExtended/Loadouts/ITab_Inventory.cs @@ -8,7 +8,6 @@ using Verse; using Verse.AI; using Verse.Sound; -using CombatExtended.HarmonyCE; namespace CombatExtended { @@ -518,7 +517,6 @@ private void RebuildArmorCache(Dictionary armorCache, Sta armorCache.Clear(); float naturalArmor = SelPawnForGear.GetStatValue(stat); List wornApparel = SelPawnForGear.apparel?.WornApparel; - var shield = wornApparel.FirstOrDefault(x => x is Apparel_Shield); foreach (BodyPartRecord part in SelPawnForGear.RaceProps.body.AllParts) { //TODO: 1.5 should be Neck @@ -535,14 +533,6 @@ private void RebuildArmorCache(Dictionary armorCache, Sta } } } - if (shield != null) - { - var shieldCoverage = shield.def?.GetModExtension()?.PartIsCoveredByShield(part, SelPawnForGear); - if (shieldCoverage == true) - { - armorValue += shield.GetStatValue(stat); - } - } armorCache[part] = armorValue; } } diff --git a/Source/CombatExtended/CombatExtended/PatchOperationMakeGunCECompatible.cs b/Source/CombatExtended/CombatExtended/PatchOperationMakeGunCECompatible.cs index d32e4b7df8..64c9ba9212 100644 --- a/Source/CombatExtended/CombatExtended/PatchOperationMakeGunCECompatible.cs +++ b/Source/CombatExtended/CombatExtended/PatchOperationMakeGunCECompatible.cs @@ -17,7 +17,6 @@ public class PatchOperationMakeGunCECompatible : PatchOperation public XmlContainer AmmoUser; public XmlContainer FireModes; public XmlContainer weaponTags; - public XmlContainer weaponClasses; public XmlContainer costList; public XmlContainer researchPrerequisite; public XmlContainer attachmentLinks; @@ -68,10 +67,6 @@ public override bool ApplyWorker(XmlDocument xml) { AddOrReplaceCompsCE(xml, xmlNode); } - if (weaponClasses != null && weaponClasses.node.HasChildNodes) - { - AddOrReplaceWeaponClasses(xml, xmlNode); - } if (weaponTags != null && weaponTags.node.HasChildNodes) { AddOrReplaceWeaponTags(xml, xmlNode); @@ -217,13 +212,6 @@ private void AddOrReplaceCompsCE(XmlDocument xml, XmlNode xmlNode) comps.AppendChild(CreateListElementAndPopulate(xml, FireModes.node, "CombatExtended.CompProperties_FireModes")); } } - private void AddOrReplaceWeaponClasses(XmlDocument xml, XmlNode xmlNode) - { - XmlElement weaponClassesElement; - GetOrCreateNode(xml, xmlNode, "weaponClasses", out weaponClassesElement); - - Populate(xml, this.weaponClasses.node, ref weaponClassesElement); - } private void AddOrReplaceWeaponTags(XmlDocument xml, XmlNode xmlNode) { diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs index 35783f8f07..ee3cd03a43 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs @@ -37,10 +37,6 @@ public abstract class ProjectileCE : ThingWithComps protected float initialSpeed; #endregion - #region Drawing - protected int ticksToTruePosition; - #endregion - #region Origin destination public bool OffMapOrigin = false; @@ -203,10 +199,6 @@ public override Vector3 DrawPos get { var sh = Mathf.Max(0f, (ExactPosition.y) * 0.84f); - if (FlightTicks < ticksToTruePosition) - { - sh *= FlightTicks / ticksToTruePosition; - } return new Vector3(ExactPosition.x, def.Altitude, ExactPosition.z + sh); } } @@ -547,14 +539,12 @@ 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 - public virtual void Launch(Thing launcher, Vector2 origin, float shotAngle, float shotRotation, float shotHeight = 0f, float shotSpeed = -1f, Thing equipment = null, float distance = -1, int ticksToTruePosition = 3) + 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; this.shotHeight = shotHeight; this.shotRotation = shotRotation; this.shotSpeed = Math.Max(shotSpeed, def.projectile.speed); - this.ticksToTruePosition = ticksToTruePosition; if (def.projectile is ProjectilePropertiesCE props) { this.castShadow = props.castShadow; diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE_Bursting.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE_Bursting.cs index 5e777de4c8..e0855ea4c8 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE_Bursting.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE_Bursting.cs @@ -23,7 +23,7 @@ public override void ExposeData() Scribe_Values.Look(ref this.ticksToBurst, "ticksToBurst", -1, false); } - public override void Launch(Thing launcher, Vector2 origin, float shotAngle, float shotRotation, float shotHeight = 0f, float shotSpeed = -1f, Thing equipment = null, float distance = -1, int ticksToTruePosition = 3) + public override void Launch(Thing launcher, Vector2 origin, float shotAngle, float shotRotation, float shotHeight = 0f, float shotSpeed = -1f, Thing equipment = null, float distance = -1) { int armingDelay = 0; if (def.projectile is ProjectilePropertiesCE props) diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs index 2fc86e8742..3a55f3ae30 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs @@ -39,8 +39,6 @@ public class ProjectilePropertiesCE : ProjectileProperties public ThingDef detonateMoteDef; public FleckDef detonateFleckDef; public float detonateEffectsScaleOverride = -1; - [MustTranslate] - public string genericLabelOverride = null; #region Bunker Buster fields /// diff --git a/Source/CombatExtended/CombatExtended/Things/Apparel_Shield.cs b/Source/CombatExtended/CombatExtended/Things/Apparel_Shield.cs index a31200c1a3..2aede24fc1 100644 --- a/Source/CombatExtended/CombatExtended/Things/Apparel_Shield.cs +++ b/Source/CombatExtended/CombatExtended/Things/Apparel_Shield.cs @@ -36,30 +36,7 @@ public override bool AllowVerbCast(Verb verb) ThingWithComps primary = Wearer.equipment?.Primary; return primary == null || (primary.def.weaponTags?.Contains(OneHandedTag) ?? false); } - public override IEnumerable SpecialDisplayStats() - { - foreach (StatDrawEntry statDrawEntry in base.SpecialDisplayStats()) - { - yield return statDrawEntry; - } - RoyalTitleDef royalTitleDef = (from t in DefDatabase.AllDefsListForReading.SelectMany((FactionDef f) => f.RoyalTitlesAwardableInSeniorityOrderForReading) - where t.requiredApparel != null && t.requiredApparel.Any((ApparelRequirement req) => req.ApparelMeetsRequirement(this.def, false)) - orderby t.seniority descending - select t).FirstOrDefault(); - if (royalTitleDef != null) - { - yield return new StatDrawEntry(StatCategoryDefOf.Apparel, "Stat_Thing_Apparel_MaxSatisfiedTitle".Translate(), royalTitleDef.GetLabelCapForBothGenders(), "Stat_Thing_Apparel_MaxSatisfiedTitle_Desc".Translate(), 2752, null, new Dialog_InfoCard.Hyperlink[] - { - new Dialog_InfoCard.Hyperlink(royalTitleDef, -1) - }, false, false); - } - var shieldCoverage = this.def.GetModExtension()?.shieldCoverage; - if (shieldCoverage != null) - { - yield return new StatDrawEntry(StatCategoryDefOf.Apparel, "CE_Shield_Coverage".Translate(), ShieldDefExtension.GetShieldProtectedAreas(BodyDefOf.Human, this.def), "CE_Shield_Coverage_Desc".Translate(), 800, null); - } - yield break; - } + public override void DrawWornExtras() { if (Wearer == null || !Wearer.Spawned) @@ -117,7 +94,6 @@ public override void DrawWornExtras() Matrix4x4 matrix = default(Matrix4x4); matrix.SetTRS(vector, Quaternion.AngleAxis(num, Vector3.up), s); Graphics.DrawMesh(MeshPool.plane10, matrix, mat, 0); - } } } diff --git a/Source/CombatExtended/CombatExtended/Verbs/VerbPropertiesCE.cs b/Source/CombatExtended/CombatExtended/Verbs/VerbPropertiesCE.cs index 525a9b5aba..d9fc9fa63c 100644 --- a/Source/CombatExtended/CombatExtended/Verbs/VerbPropertiesCE.cs +++ b/Source/CombatExtended/CombatExtended/Verbs/VerbPropertiesCE.cs @@ -16,8 +16,6 @@ public class VerbPropertiesCE : VerbProperties public float indirectFirePenalty = 0; public float circularError = 0; public float meleeArmorPenetration = 0; - public float firingOffset = 0.19f; - public int ticksToTruePosition = 5; public bool ejectsCasings = true; public bool ignorePartialLoSBlocker = false; public bool interruptibleBurst = true; diff --git a/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs b/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs index b253de73f4..7b8862b0a0 100644 --- a/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs +++ b/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs @@ -243,7 +243,7 @@ protected LightingTracker LightingTracker { get { - if (_lightingTracker == null || _lightingTracker.map == null || _lightingTracker.map.Index < 0 || _lightingTracker.map != caster.Map) + if (_lightingTracker == null || _lightingTracker.map == null || _lightingTracker.map.Index < 0) { _lightingTracker = caster.Map.GetLightingTracker(); } @@ -1064,7 +1064,6 @@ public override bool TryCastShot() float spreadDegrees = 0; float aperatureSize = 0; - int ticksToTruePosition = VerbPropsCE.ticksToTruePosition; if (Projectile.projectile is ProjectilePropertiesCE pprop) { @@ -1119,8 +1118,7 @@ public override bool TryCastShot() ShotHeight, ShotSpeed, EquipmentSource, - distance, - ticksToTruePosition); + distance); } pelletMechanicsOnly = true; } diff --git a/Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs b/Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs index e399e195cc..3ba9f318b4 100644 --- a/Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs +++ b/Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs @@ -49,19 +49,10 @@ private static void RecoilCE(Thing eq, Vector3 position, float aimAngle, float n private static void DrawMesh(Mesh mesh, Matrix4x4 matrix, Material mat, int layer, Thing eq, Vector3 position, float aimAngle) { - CompEquippable compEquippable = eq.TryGetComp(); GunDrawExtension drawData = eq.def.GetModExtension() ?? new GunDrawExtension() { DrawSize = eq.def.graphicData.drawSize }; if (drawData.DrawSize == Vector2.one) { drawData.DrawSize = eq.def.graphicData.drawSize; } Vector3 scale = new Vector3(drawData.DrawSize.x, 1, drawData.DrawSize.y); Vector3 posVec = new Vector3(drawData.DrawOffset.x, 0, drawData.DrawOffset.y); - if (compEquippable != null && compEquippable.PrimaryVerb is Verb_LaunchProjectileCE verbLPCE) - { - VerbPropertiesCE vpce = verbLPCE.VerbPropsCE; - if (verbLPCE.ShooterPawn != null && verbLPCE.WarmingUp || muzzleJump != 0) - { - posVec.z += verbLPCE.ShotHeight * vpce.firingOffset * Mathf.Abs(Mathf.Sin(aimAngle * 2 * 3.14f / 360f)); - } - } Vector3 casingOffset = new Vector3(drawData.CasingOffset.x, 0, drawData.CasingOffset.y); if (aimAngle > 200 && aimAngle < 340) { @@ -70,6 +61,7 @@ private static void DrawMesh(Mesh mesh, Matrix4x4 matrix, Material mat, int laye casingOffset.x *= -1; } matrix.SetTRS(position + posVec.RotatedBy(matrix.rotation.eulerAngles.y) + recoilOffset, Quaternion.AngleAxis(matrix.rotation.eulerAngles.y + 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); diff --git a/Source/CombatExtended/Harmony/Harmony_ThingDef.cs b/Source/CombatExtended/Harmony/Harmony_ThingDef.cs index 9d0422bbe3..3e17aa2e3a 100644 --- a/Source/CombatExtended/Harmony/Harmony_ThingDef.cs +++ b/Source/CombatExtended/Harmony/Harmony_ThingDef.cs @@ -2,10 +2,7 @@ using System.Globalization; using System.Linq; using System.Reflection; -using System.Reflection.Emit; -using System.Text; using HarmonyLib; -using Mono.Cecil.Cil; using RimWorld; using Verse; using Verse.Noise; @@ -143,81 +140,4 @@ public static void Postfix(ThingDef __instance) } } } - [HarmonyPatch(typeof(ThingDef), "DescriptionDetailed", MethodType.Getter)] - - internal static class ThingDef_DescriptionDetailed - { - private static StringBuilder AddShieldCover(ThingDef thingDef, StringBuilder stringBuilder) - { - if (thingDef.GetModExtension()?.shieldCoverage != null) - { - stringBuilder.Append(string.Format("{0}: {1}", "CE_Shield_Coverage".Translate(), ShieldDefExtension.GetShieldProtectedAreas(BodyDefOf.Human, thingDef))); - } - else - { - stringBuilder.Append(string.Format("{0}: {1}", "Covers".Translate(), thingDef.apparel.GetCoveredOuterPartsString(BodyDefOf.Human))); - } - return stringBuilder; - } - internal static IEnumerable Transpiler(IEnumerable instructions, - ILGenerator generator) - { - var code = new List(instructions); - int startIndex = -1; - int endIndex = -1; - bool foundCovers = false; - - for (int i = 0; i < code.Count; i++) - { - if (code[i].opcode == OpCodes.Ldloc_0) - { - startIndex = i; - - // Search for the next Pop, and check if "Covers" is in between - for (int j = i + 1; j < code.Count; j++) - { - if (code[j].opcode == OpCodes.Ldstr && code[j].operand as string == "Covers") - { - foundCovers = true; - } - - if (code[j].opcode == OpCodes.Pop) - { - if (foundCovers) - { - endIndex = j; - break; - } - else - { - // If no "Covers" was found, reset startIndex and move to the next possible sequence - startIndex = -1; - break; - } - } - } - } - - if (endIndex > -1) - { - break; - } - } - - // Remove the code between startIndex and endIndex if a valid range was found - if (startIndex > -1 && endIndex > -1) - { - code[startIndex].opcode = OpCodes.Nop; - //code[endIndex].opcode = OpCodes.Nop; - code.RemoveRange(startIndex + 1, endIndex - startIndex - 1); - code.Insert(startIndex + 1, new CodeInstruction(OpCodes.Ldarg_0)); - code.Insert(startIndex + 2, new CodeInstruction(OpCodes.Ldloc_0)); - code.Insert(startIndex + 3, new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(ThingDef_DescriptionDetailed), "AddShieldCover", null, null))); - } - foreach (var c in code) - { - yield return c; - } - } - } } diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index c0262b2a7f..06c75ccdcd 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -220,7 +220,6 @@ Expanded Woodworking (Forked) | Extended Storage | Faction: Mafia | Fallout New Vegas - Elite Riot Gear | -Fallout: Vault 111 Starter Pack | Fantasy Metals Reforged | Farming Expansion | FashionRIMsta | @@ -552,7 +551,6 @@ Vanilla Vehicles Expanded | Vanilla Vehicles Expanded - Tier 3 | Vanilla Vehicles Expanded - Upgrades | Vanilla Weapons Expanded | -Vanilla Weapons Expanded - Bioferrite | Vanilla Weapons Expanded - Coilguns | Vanilla Weapons Expanded - Frontier | Vanilla Weapons Expanded - Grenades | From d318d5e04ad82cc2bd8fe616c5389912038631f2 Mon Sep 17 00:00:00 2001 From: SaltyKarl <84060664+SaltyKarl@users.noreply.github.com> Date: Fri, 13 Sep 2024 10:34:21 +0800 Subject: [PATCH 053/451] New* ammo --- .../Ammo/Ammo_Bioferrite.xml | 380 ++++++++++++++++++ .../Ammo/Ammo_Mods.xml | 67 --- .../VanillaExpanded/Bioferrite/AT/a.png | Bin 0 -> 6335 bytes .../VanillaExpanded/Bioferrite/AT/b.png | Bin 0 -> 16728 bytes .../VanillaExpanded/Bioferrite/AT/c.png | Bin 0 -> 13089 bytes .../VanillaExpanded/Bioferrite/Frag/a.png | Bin 0 -> 6922 bytes .../VanillaExpanded/Bioferrite/Frag/b.png | Bin 0 -> 18073 bytes .../VanillaExpanded/Bioferrite/Frag/c.png | Bin 0 -> 13331 bytes .../Bioferrite/Incendiary/a.png | Bin 0 -> 7106 bytes .../Bioferrite/Incendiary/b.png | Bin 0 -> 19259 bytes .../Bioferrite/Incendiary/c.png | Bin 0 -> 14094 bytes .../VanillaExpanded/Bioferrite/Standard/a.png | Bin 0 -> 6250 bytes .../VanillaExpanded/Bioferrite/Standard/b.png | Bin 0 -> 15990 bytes .../VanillaExpanded/Bioferrite/Standard/c.png | Bin 0 -> 13055 bytes 14 files changed, 380 insertions(+), 67 deletions(-) create mode 100644 ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Bioferrite.xml create mode 100644 Textures/ThirdParty/VanillaExpanded/Bioferrite/AT/a.png create mode 100644 Textures/ThirdParty/VanillaExpanded/Bioferrite/AT/b.png create mode 100644 Textures/ThirdParty/VanillaExpanded/Bioferrite/AT/c.png create mode 100644 Textures/ThirdParty/VanillaExpanded/Bioferrite/Frag/a.png create mode 100644 Textures/ThirdParty/VanillaExpanded/Bioferrite/Frag/b.png create mode 100644 Textures/ThirdParty/VanillaExpanded/Bioferrite/Frag/c.png create mode 100644 Textures/ThirdParty/VanillaExpanded/Bioferrite/Incendiary/a.png create mode 100644 Textures/ThirdParty/VanillaExpanded/Bioferrite/Incendiary/b.png create mode 100644 Textures/ThirdParty/VanillaExpanded/Bioferrite/Incendiary/c.png create mode 100644 Textures/ThirdParty/VanillaExpanded/Bioferrite/Standard/a.png create mode 100644 Textures/ThirdParty/VanillaExpanded/Bioferrite/Standard/b.png create mode 100644 Textures/ThirdParty/VanillaExpanded/Bioferrite/Standard/c.png diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Bioferrite.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Bioferrite.xml new file mode 100644 index 0000000000..850ece4d6d --- /dev/null +++ b/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Bioferrite.xml @@ -0,0 +1,380 @@ + + + + + AmmoWarBolter + + AmmoRockets + UI/Icons/ThingCategories/CaliberRocket + + + + + + AmmoSet_WarBolter + + + Bullet_WarBolter_HE + Bullet_WarBolter_Incendiary + Bullet_WarBolter_Frag + Bullet_WarBolter_HEAT + + + + + + + Small self propelled rockets used by WarBolter. + + 0.385 + 0.15 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting
    • +     + +
  • AmmoWarBolter
    • +     + 2000 +     + + + Ammo_WarBolter_HE + + + ThirdParty/VanillaExpanded/Bioferrite/Standard + Graphic_StackCount + + + 4.44 + + RocketHE + Bullet_WarBolter_HE + + + + Ammo_WarBolter_Incendiary + + + ThirdParty/VanillaExpanded/Bioferrite/Incendiary + Graphic_StackCount + + + 2.28 + + GrenadeIncendiary + Bullet_WarBolter_Incendiary + + + + Ammo_WarBolter_Frag + + + ThirdParty/VanillaExpanded/Bioferrite/Frag + Graphic_StackCount + + + 2.70 + + RocketFrag + Bullet_WarBolter_Frag + + + + Ammo_WarBolter_HEAT + + + ThirdParty/VanillaExpanded/Bioferrite/HEAT + Graphic_StackCount + + + 2.37 + + RocketHEAT + Bullet_WarBolter_HEAT + + + + + + + Things/Projectile/Bullet_Big + Graphic_Single + + CombatExtended.BulletCE + + Bullet + 96 + + + + + Bullet_WarBolter_HE + + + 64 + 20 + 5.101 + +
  • + Bomb_Secondary + 38 +
    • +     +     +     + + + Bullet_WarBolter_Inferno + + CombatExtended.ProjectileCE_Explosive + + PrometheumFlame + 5 + 1.5 + FilthPrometheum + 0.7 + MortarIncendiary_Explode + + +
  • + 7 + Thermobaric + 1 + MortarIncendiary_Explode + true +
    • +     +     + + + Bullet_WarBolter_Frag + CombatExtended.ProjectileCE_Bursting + + + 1 + Bomb + 17 + true + 1.05 + 2 + + +
  • + + 6 + + -89~-5 +
    • +     +     + + + Bullet_WarBolter_HEAT + + + Bullet + 142 + 46 + 5.101 + + +
  • + 17 + Bomb + 0.5 + MortarBomb_Explode + true +
    • +     +     + + + + + MakeAmmo_WarBolter_HE + + Craft 200 WarBolter Rockets (HE). + Making WarBolter Rockets (HE). + +
  • + + +
  • Steel
    • + + + 154 + +
  • + + +
  • FSX
    • + + + 18 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 36600 +     + + + MakeAmmo_WarBolter_Inferno + + Craft 200 WarBolter Rockets (Incendiary). + Making WarBolter Rockets (Incendiary). + +
  • + + +
  • Steel
    • + + + 154 + +
  • + + +
  • Prometheum
    • + + + 12 + +
  • + + +
  • ComponentIndustrial
    • + + + 6 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 19400 +     + + + MakeAmmo_WarBolter_Frag + + Craft 200 WarBolter Rockets (Frag). + Making WarBolter Rockets (Frag). + +
  • + + +
  • Steel
    • + + + 154 + +
  • + + +
  • FSX
    • + + + 8 + +
  • + + +
  • ComponentIndustrial
    • + + + 8 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 21800 +     + + + MakeAmmo_WarBolter_HEAT + + Craft 200 WarBolter Rockets (HEAT). + Making WarBolter Rockets (HEAT). + +
  • + + +
  • Steel
    • + + + 154 + +
  • + + +
  • FSX
    • + + + 6 + +
  • + + +
  • ComponentIndustrial
    • + + + 6 + +
  • + + +
  • Uranium
    • + + + 8 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +
  • Uranium
    • +     +     + + 200 + + 20600 +     + +     \ No newline at end of file diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Mods.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Mods.xml index b648feca5a..305fec7af2 100644 --- a/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Mods.xml +++ b/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Mods.xml @@ -36,15 +36,6 @@ - - - AmmoSet_50mmRocket_DF - - - Bullet_50mmRocket_HEDF - - - @@ -94,62 +85,4 @@ - - - Bullet_50mmRocket_HEDF - CombatExtended.ProjectileCE_Explosive - - - Things/Projectile/Rocket/70mmAPKWS - Graphic_Single - 0.70 - - - Bomb - 147 - 2.5 - 80 - RocketPropelledLoop_Small - false - false - - Things/WorldObjects/Munitions/Rocket - 0.35 - 12 - 0.43 - - - -
  • - - 23 - -
    • -
  • - -
  • - Fleck_CERocketFlame - 7 - 3 - 60~120 -
    • -
  • - Fleck_CERocketSmokeTrail - 0.5 - 0~360 - 2 - 1 -
    • -
  • - Fleck_CERocketSmoke - 0.5 - 0~360 - 1 - 120~240 -
    • - - -     -     - \ No newline at end of file diff --git a/Textures/ThirdParty/VanillaExpanded/Bioferrite/AT/a.png b/Textures/ThirdParty/VanillaExpanded/Bioferrite/AT/a.png new file mode 100644 index 0000000000000000000000000000000000000000..156e65a40b0a7f7092c9d3cefebab13659c67293 GIT binary patch literal 6335 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 literal 0 HcmV?d00001 diff --git a/Textures/ThirdParty/VanillaExpanded/Bioferrite/AT/c.png b/Textures/ThirdParty/VanillaExpanded/Bioferrite/AT/c.png new file mode 100644 index 0000000000000000000000000000000000000000..e2a23f8207c53767f0cd69745ef77b5477d9194f GIT binary patch literal 13089 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