diff --git a/Mods/CombatExtended/About/About.xml b/Mods/CombatExtended/About/About.xml index 906ceb91db..7a7840cccc 100644 --- a/Mods/CombatExtended/About/About.xml +++ b/Mods/CombatExtended/About/About.xml @@ -8,7 +8,7 @@
  • 1.5
    • CETeam.CombatExtended - Version: 15.6.0.0\n\nExtends combat mechanics to make them deeper and more tactical. + Version: 15.6.2.0\n\nExtends combat mechanics to make them deeper and more tactical. [Russian] @@ -38,6 +38,7 @@ Extiende la mecánica de combate para hacerlos más profundos y más tácticos
  • jelly.ProperShotguns
  • swedishmask.ProperShotgunsPatch
  • me.samboycoding.betterloading
    • +
  • me.samboycoding.betterloading.dev
  • majorhoff.rimthreaded
  • falconne.AFF
  • Sk.FlankingBonus
    • @@ -64,14 +65,12 @@ Extiende la mecánica de combate para hacerlos más profundos y más tácticos
  • sarg.alphagenes
    • -
  • brrainz.harmony
    • +
  • TheKingInYellow.Lope
  • Ludeon.RimWorld
  • Ludeon.RimWorld.Royalty
    • -
  • Ludeon.RimWorld.Biotech
    • -
  • Ludeon.RimWorld.Ideology
    • -
  • Ludeon.RimWorld.Anomaly
    • +
  • oskarpotocki.vfe.mechanoid
    •  - \ No newline at end of file + diff --git a/Mods/CombatExtended/Anomaly/Patches/Hediffs/Hediffs_Misc.xml b/Mods/CombatExtended/Anomaly/Patches/Hediffs/Hediffs_Misc.xml new file mode 100644 index 0000000000..3914a81e2f --- /dev/null +++ b/Mods/CombatExtended/Anomaly/Patches/Hediffs/Hediffs_Misc.xml @@ -0,0 +1,23 @@ + + + + + + + Defs/HediffDef[defName="Inhumanized"]/stages/li/statFactors + + Defs/HediffDef[defName="Inhumanized"]/stages/li + + + + + + + + Defs/HediffDef[defName="Inhumanized"]/stages/li/statFactors + + 0.5 + + + + \ No newline at end of file diff --git a/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml b/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml index ecff3d999f..7c98a593da 100644 --- a/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml +++ b/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml @@ -131,6 +131,13 @@ + + Defs/ThingDef[defName="Gun_HellcatRifle"]/graphicData + + (1.25,1.25) + + + @@ -246,4 +253,20 @@ + + Defs/ThingDef[defName="Gun_Incinerator"]/graphicData + + (1.16,1.16) + + + + + Defs/ThingDef[defName="Gun_Incinerator"] + +
  • + 0.04,0.0 +
    • +     +     + \ No newline at end of file diff --git a/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Races/Races_Entities_Misc.xml b/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Races/Races_Entities_Misc.xml index 425c982327..92cf8dc35f 100644 --- a/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Races/Races_Entities_Misc.xml +++ b/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Races/Races_Entities_Misc.xml @@ -254,7 +254,7 @@ 0.2 1 - 90 + 0.90 0.17 0.08 0.06 @@ -377,7 +377,7 @@ Defs/ThingDef[defName="Noctol"]/statBases - 90 + 0.90 0.23 0.28 0.09 @@ -505,7 +505,7 @@ Defs/ThingDef[defName="Gorehulk"]/statBases - 90 + 0.90 0.11 0.07 0.14 @@ -606,7 +606,7 @@ Defs/ThingDef[defName="Devourer"]/statBases - 90 + 0.90 0.06 0.46 0.51 @@ -699,7 +699,7 @@ 0.5 5 0.7 - 90 + 0.90 0.06 0.11 0.23 diff --git a/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Races/Races_Fleshbeasts.xml b/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Races/Races_Fleshbeasts.xml index 9b688c5ac0..9f5d49ceeb 100644 --- a/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Races/Races_Fleshbeasts.xml +++ b/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Races/Races_Fleshbeasts.xml @@ -5,7 +5,7 @@ Defs/ThingDef[@Name="BaseFleshbeast"]/statBases 0.5 - 99 + 0.99 diff --git a/Mods/CombatExtended/Assemblies/CombatExtended.dll b/Mods/CombatExtended/Assemblies/CombatExtended.dll index 8b1ebaaf38..81ec244bc2 100644 Binary files a/Mods/CombatExtended/Assemblies/CombatExtended.dll and b/Mods/CombatExtended/Assemblies/CombatExtended.dll differ diff --git a/Mods/CombatExtended/Assemblies/CombatExtendedLoader.dll b/Mods/CombatExtended/Assemblies/CombatExtendedLoader.dll index 225ee26087..087a1c1c9d 100644 Binary files a/Mods/CombatExtended/Assemblies/CombatExtendedLoader.dll and b/Mods/CombatExtended/Assemblies/CombatExtendedLoader.dll differ diff --git a/Mods/CombatExtended/Biotech/Patches/Bodies/Bodies_Mechanoid_Heavy.xml b/Mods/CombatExtended/Biotech/Patches/Bodies/Bodies_Mechanoid_Heavy.xml index 9f4582c70a..1350d359fd 100644 --- a/Mods/CombatExtended/Biotech/Patches/Bodies/Bodies_Mechanoid_Heavy.xml +++ b/Mods/CombatExtended/Biotech/Patches/Bodies/Bodies_Mechanoid_Heavy.xml @@ -35,6 +35,36 @@ + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalShoulder"]/groups @@ -108,6 +138,27 @@ + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="Mech_Tunneler"]/corePart/parts/li[def="MechanicalShoulder"]/groups diff --git a/Mods/CombatExtended/Biotech/Patches/Bodies/Bodies_Mechanoid_Light.xml b/Mods/CombatExtended/Biotech/Patches/Bodies/Bodies_Mechanoid_Light.xml index 40f46197be..3b281d88fa 100644 --- a/Mods/CombatExtended/Biotech/Patches/Bodies/Bodies_Mechanoid_Light.xml +++ b/Mods/CombatExtended/Biotech/Patches/Bodies/Bodies_Mechanoid_Light.xml @@ -35,6 +35,36 @@ + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalShoulder"]/groups @@ -108,6 +138,27 @@     + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Light" or defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="Mech_Agrihand"]/corePart/parts/li[def="MechanicalShoulder"]/groups diff --git a/Mods/CombatExtended/Biotech/Patches/Bodies/Bodies_Mechanoid_Medium.xml b/Mods/CombatExtended/Biotech/Patches/Bodies/Bodies_Mechanoid_Medium.xml index e14d0d635d..ae3ff1dfed 100644 --- a/Mods/CombatExtended/Biotech/Patches/Bodies/Bodies_Mechanoid_Medium.xml +++ b/Mods/CombatExtended/Biotech/Patches/Bodies/Bodies_Mechanoid_Medium.xml @@ -35,6 +35,36 @@ + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalLeg"]/groups @@ -98,6 +128,27 @@ + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="Scorcher" or defName="Apocriton"]/corePart/parts/li[def="MechanicalLeg"]/groups diff --git a/Mods/CombatExtended/Biotech/Patches/Bodies/Mech_Centurion.xml b/Mods/CombatExtended/Biotech/Patches/Bodies/Mech_Centurion.xml index 9d9ac67e07..4cae99a1ed 100644 --- a/Mods/CombatExtended/Biotech/Patches/Bodies/Mech_Centurion.xml +++ b/Mods/CombatExtended/Biotech/Patches/Bodies/Mech_Centurion.xml @@ -35,6 +35,36 @@ + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalLeg"]/groups @@ -98,6 +128,27 @@ + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="Mech_Centurion"]/corePart/parts/li[def="MechanicalLeg"]/groups diff --git a/Mods/CombatExtended/Biotech/Patches/Bodies/Mech_Diabolus.xml b/Mods/CombatExtended/Biotech/Patches/Bodies/Mech_Diabolus.xml index d5b47813d2..b903b9b392 100644 --- a/Mods/CombatExtended/Biotech/Patches/Bodies/Mech_Diabolus.xml +++ b/Mods/CombatExtended/Biotech/Patches/Bodies/Mech_Diabolus.xml @@ -25,6 +25,36 @@ + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalDiabolusBodySecondRing"]/groups @@ -101,6 +131,27 @@ + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="Mech_Diabolus"]/corePart/parts/li[def="MechanicalDiabolusBodySecondRing"]/groups diff --git a/Mods/CombatExtended/Biotech/Patches/Bodies/Mech_Warqueen.xml b/Mods/CombatExtended/Biotech/Patches/Bodies/Mech_Warqueen.xml index 867429d5fc..f718588640 100644 --- a/Mods/CombatExtended/Biotech/Patches/Bodies/Mech_Warqueen.xml +++ b/Mods/CombatExtended/Biotech/Patches/Bodies/Mech_Warqueen.xml @@ -25,6 +25,36 @@ + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/groups @@ -91,6 +121,27 @@ + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="Mech_Warqueen"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/groups diff --git a/Mods/CombatExtended/Biotech/Patches/ThingDefs_Misc/Weapons/RangedMechanoid_Medium.xml b/Mods/CombatExtended/Biotech/Patches/ThingDefs_Misc/Weapons/RangedMechanoid_Medium.xml index 32e98ed822..4f891130eb 100644 --- a/Mods/CombatExtended/Biotech/Patches/ThingDefs_Misc/Weapons/RangedMechanoid_Medium.xml +++ b/Mods/CombatExtended/Biotech/Patches/ThingDefs_Misc/Weapons/RangedMechanoid_Medium.xml @@ -94,17 +94,20 @@ Bullet_5x50mmCaseless_Toxic 1.5 75 + 12 + 4 Shot_ToxicNeedleGun GunTail_Heavy 9 - 10 + 20 4 AmmoSet_5x50mmCaselessToxic AimedShot + 2
  • CE_AI_Rifle
    • @@ -112,7 +115,7 @@     - + Defs/ThingDef[defName="Gun_NeedleLauncher"] diff --git a/Mods/CombatExtended/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml b/Mods/CombatExtended/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml index 9a841957ca..728cabe408 100644 --- a/Mods/CombatExtended/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml +++ b/Mods/CombatExtended/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml @@ -105,28 +105,6 @@ - - Defs/ThingDef[defName="Mech_Legionary" or defName="Mech_Tesseron"]/comps - -
  • - 1000 - true - 1250 - 5 - true - - 5 - 5 - - 300 - 200 - true - 100 - 0.5 -
    • -     -     - diff --git a/Mods/CombatExtended/Defs/Ammo/Advanced/164x284mmDemoShell.xml.bak b/Mods/CombatExtended/Defs/Ammo/Advanced/164x284mmDemoShell.xml.bak index 1216c6ba23..3a0bba71cc 100644 --- a/Mods/CombatExtended/Defs/Ammo/Advanced/164x284mmDemoShell.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/Advanced/164x284mmDemoShell.xml.bak @@ -33,6 +33,7 @@ 25
  • CE_AutoEnableTrade_Sellable
    • +
  • CE_AutoEnableCrafting_FabricationBench
    •  diff --git a/Mods/CombatExtended/Defs/Ammo/Advanced/70mmMechanoidGrenade.xml.bak b/Mods/CombatExtended/Defs/Ammo/Advanced/70mmMechanoidGrenade.xml.bak index 78931b8c62..6cf7c84c6c 100644 --- a/Mods/CombatExtended/Defs/Ammo/Advanced/70mmMechanoidGrenade.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/Advanced/70mmMechanoidGrenade.xml.bak @@ -3,7 +3,7 @@ Ammo70mmMechanoidGrenades - + AmmoGrenades UI/Icons/ThingCategories/CaliberGrenade @@ -12,7 +12,7 @@ AmmoSet_70mmMechanoidGrenade - + Bullet_70mmMechanoidGrenade_HE Bullet_70mmMechanoidGrenade_EMP diff --git a/Mods/CombatExtended/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml b/Mods/CombatExtended/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml index 1e331299ef..e5afa27573 100644 --- a/Mods/CombatExtended/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml +++ b/Mods/CombatExtended/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml @@ -145,6 +145,13 @@ Kraken A gyro-stabilized projectile with hardened penetrator and explosive 'kicker' charge, designed to punch through heavy armor. + + + Tempest + + Tempest + A gyro-stabilized projectile carrying a plasma shock generator that is effective against machines. + Melta diff --git a/Mods/CombatExtended/Defs/Ammo/GENERIC/AntiMateriel.xml.bak b/Mods/CombatExtended/Defs/Ammo/GENERIC/AntiMateriel.xml.bak index 577e537769..0661f6d658 100644 --- a/Mods/CombatExtended/Defs/Ammo/GENERIC/AntiMateriel.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/GENERIC/AntiMateriel.xml.bak @@ -46,8 +46,8 @@ Ammo_AntiMateriel_FMJ - Things/Ammo/STACK_RANGED/HighCaliber/FMJ - CombatExtended.Graphic_StackCountRanged + Things/Ammo/HighCaliber/FMJ + Graphic_StackCount 0.5 @@ -60,8 +60,8 @@ Ammo_AntiMateriel_AP - Things/Ammo/STACK_RANGED/HighCaliber/AP - CombatExtended.Graphic_StackCountRanged + Things/Ammo/HighCaliber/AP + Graphic_StackCount 0.5 @@ -74,8 +74,8 @@ Ammo_AntiMateriel_Incendiary - Things/Ammo/STACK_RANGED/HighCaliber/Incendiary - CombatExtended.Graphic_StackCountRanged + Things/Ammo/HighCaliber/Incendiary + Graphic_StackCount 0.82 @@ -88,8 +88,8 @@ Ammo_AntiMateriel_HE - Things/Ammo/STACK_RANGED/HighCaliber/HE - CombatExtended.Graphic_StackCountRanged + Things/Ammo/HighCaliber/HE + Graphic_StackCount 1.36 @@ -102,8 +102,8 @@ Ammo_AntiMateriel_Sabot - Things/Ammo/STACK_RANGED/HighCaliber/Sabot - CombatExtended.Graphic_StackCountRanged + Things/Ammo/HighCaliber/Sabot + Graphic_StackCount 0.57 diff --git a/Mods/CombatExtended/Defs/Ammo/GENERIC/Autocannon.xml.bak b/Mods/CombatExtended/Defs/Ammo/GENERIC/Autocannon.xml.bak index 244988c3c4..44a7ebcb71 100644 --- a/Mods/CombatExtended/Defs/Ammo/GENERIC/Autocannon.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/GENERIC/Autocannon.xml.bak @@ -45,8 +45,8 @@ Ammo_Autocannon_AP - Things/Ammo/STACK_RANGED/HighCaliber/AP - CombatExtended.Graphic_StackCountRanged + Things/Ammo/HighCaliber/AP + Graphic_StackCount 1.04 @@ -59,8 +59,8 @@ Ammo_Autocannon_Incendiary - Things/Ammo/STACK_RANGED/HighCaliber/Incendiary - CombatExtended.Graphic_StackCountRanged + Things/Ammo/HighCaliber/Incendiary + Graphic_StackCount 1.67 @@ -73,8 +73,8 @@ Ammo_Autocannon_HE - Things/Ammo/STACK_RANGED/HighCaliber/HE - CombatExtended.Graphic_StackCountRanged + Things/Ammo/HighCaliber/HE + Graphic_StackCount 2.84 @@ -87,8 +87,8 @@ Ammo_Autocannon_Sabot - Things/Ammo/STACK_RANGED/HighCaliber/Sabot - CombatExtended.Graphic_StackCountRanged + Things/Ammo/HighCaliber/Sabot + Graphic_StackCount 0.213 diff --git a/Mods/CombatExtended/Defs/Ammo/GENERIC/LauncherGrenade.xml.bak b/Mods/CombatExtended/Defs/Ammo/GENERIC/LauncherGrenade.xml.bak index 26cff458ba..861979cfce 100644 --- a/Mods/CombatExtended/Defs/Ammo/GENERIC/LauncherGrenade.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/GENERIC/LauncherGrenade.xml.bak @@ -47,8 +47,8 @@ Ammo_LauncherGrenade_HE - Things/Ammo/STACK_RANGED/GrenadeLauncher/HE - CombatExtended.Graphic_StackCountRanged + Things/Ammo/GrenadeLauncher/HE + Graphic_StackCount 2.27 @@ -61,7 +61,7 @@ Ammo_LauncherGrenade_HE_TFuzed - Things/Ammo/STACK_RANGED/GrenadeLauncher/AIR + Things/Ammo/GrenadeLauncher/AIR Graphic_StackCount @@ -75,7 +75,7 @@ Ammo_LauncherGrenade_HEDP - Things/Ammo/STACK_RANGED/GrenadeLauncher/DP + Things/Ammo/GrenadeLauncher/DP Graphic_StackCount @@ -89,8 +89,8 @@ Ammo_LauncherGrenade_EMP - Things/Ammo/STACK_RANGED/GrenadeLauncher/EMP - CombatExtended.Graphic_StackCountRanged + Things/Ammo/GrenadeLauncher/EMP + Graphic_StackCount 4.57 @@ -103,8 +103,8 @@ Ammo_LauncherGrenade_Smoke - Things/Ammo/STACK_RANGED/GrenadeLauncher/SMK - CombatExtended.Graphic_StackCountRanged + Things/Ammo/GrenadeLauncher/SMK + Graphic_StackCount 1.84 diff --git a/Mods/CombatExtended/Defs/Ammo/GENERIC/Pistol.xml.bak b/Mods/CombatExtended/Defs/Ammo/GENERIC/Pistol.xml.bak index c5f4077b13..eaff482613 100644 --- a/Mods/CombatExtended/Defs/Ammo/GENERIC/Pistol.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/GENERIC/Pistol.xml.bak @@ -43,8 +43,8 @@ Ammo_Pistol_FMJ - Things/Ammo/STACK_RANGED/Pistol/FMJ - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Pistol/FMJ + Graphic_StackCount 0.09 @@ -57,8 +57,8 @@ Ammo_Pistol_AP - Things/Ammo/STACK_RANGED/Pistol/AP - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Pistol/AP + Graphic_StackCount 0.09 @@ -71,8 +71,8 @@ Ammo_Pistol_HP - Things/Ammo/STACK_RANGED/Pistol/HP - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Pistol/HP + Graphic_StackCount 0.09 diff --git a/Mods/CombatExtended/Defs/Ammo/GENERIC/PistolMagnum.xml.bak b/Mods/CombatExtended/Defs/Ammo/GENERIC/PistolMagnum.xml.bak index 7b2b9990fe..9993446b58 100644 --- a/Mods/CombatExtended/Defs/Ammo/GENERIC/PistolMagnum.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/GENERIC/PistolMagnum.xml.bak @@ -43,8 +43,8 @@ Ammo_PistolMagnum_FMJ - Things/Ammo/STACK_RANGED/Pistol/FMJ - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Revolver/FMJ + Graphic_StackCount 0.1 @@ -57,8 +57,8 @@ Ammo_PistolMagnum_AP - Things/Ammo/STACK_RANGED/Pistol/AP - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Revolver/AP + Graphic_StackCount 0.1 @@ -71,8 +71,8 @@ Ammo_PistolMagnum_HP - Things/Ammo/STACK_RANGED/Pistol/HP - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Revolver/HP + Graphic_StackCount 0.1 diff --git a/Mods/CombatExtended/Defs/Ammo/GENERIC/Rifle.xml.bak b/Mods/CombatExtended/Defs/Ammo/GENERIC/Rifle.xml.bak index 308eaf26a4..90a29f14d4 100644 --- a/Mods/CombatExtended/Defs/Ammo/GENERIC/Rifle.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/GENERIC/Rifle.xml.bak @@ -46,8 +46,8 @@ Ammo_Rifle_FMJ - Things/Ammo/STACK_RANGED/Rifle/FMJ - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Rifle/Battlerifle/FMJ + Graphic_StackCount 0.11 @@ -60,8 +60,8 @@ Ammo_Rifle_AP - Things/Ammo/STACK_RANGED/Rifle/AP - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Rifle/Battlerifle/AP + Graphic_StackCount 0.11 @@ -74,8 +74,8 @@ Ammo_Rifle_HP - Things/Ammo/STACK_RANGED/Rifle/HP - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Rifle/Battlerifle/HP + Graphic_StackCount 0.11 @@ -88,8 +88,8 @@ Ammo_Rifle_Incendiary - Things/Ammo/STACK_RANGED/Rifle/Incendiary - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Rifle/Battlerifle/Incendiary + Graphic_StackCount 0.17 @@ -102,8 +102,8 @@ Ammo_Rifle_HE - Things/Ammo/STACK_RANGED/Rifle/HE - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Rifle/Battlerifle/HE + Graphic_StackCount 0.31 @@ -116,8 +116,8 @@ Ammo_Rifle_Sabot - Things/Ammo/STACK_RANGED/Rifle/Sabot - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Rifle/Battlerifle/Sabot + Graphic_StackCount 0.12 diff --git a/Mods/CombatExtended/Defs/Ammo/GENERIC/RifleIntermediate.xml.bak b/Mods/CombatExtended/Defs/Ammo/GENERIC/RifleIntermediate.xml.bak index 7c2af17e1e..7aa6670f35 100644 --- a/Mods/CombatExtended/Defs/Ammo/GENERIC/RifleIntermediate.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/GENERIC/RifleIntermediate.xml.bak @@ -46,8 +46,8 @@ Ammo_RifleIntermediate_FMJ - Things/Ammo/STACK_RANGED/Rifle/FMJ - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Rifle/FMJ + Graphic_StackCount 0.06 @@ -60,8 +60,8 @@ Ammo_RifleIntermediate_AP - Things/Ammo/STACK_RANGED/Rifle/AP - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Rifle/AP + Graphic_StackCount 0.06 @@ -74,8 +74,8 @@ Ammo_RifleIntermediate_HP - Things/Ammo/STACK_RANGED/Rifle/HP - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Rifle/HP + Graphic_StackCount 0.06 @@ -88,8 +88,8 @@ Ammo_RifleIntermediate_Incendiary - Things/Ammo/STACK_RANGED/Rifle/Incendiary - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Rifle/Incendiary + Graphic_StackCount 0.1 @@ -102,8 +102,8 @@ Ammo_RifleIntermediate_HE - Things/Ammo/STACK_RANGED/Rifle/HE - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Rifle/HE + Graphic_StackCount 0.17 @@ -116,8 +116,8 @@ Ammo_RifleIntermediate_Sabot - Things/Ammo/STACK_RANGED/Rifle/Sabot - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Rifle/Sabot + Graphic_StackCount 0.07 diff --git a/Mods/CombatExtended/Defs/Ammo/GENERIC/RifleMagnum.xml.bak b/Mods/CombatExtended/Defs/Ammo/GENERIC/RifleMagnum.xml.bak index 0e44b26f4f..ec0ec6b3b9 100644 --- a/Mods/CombatExtended/Defs/Ammo/GENERIC/RifleMagnum.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/GENERIC/RifleMagnum.xml.bak @@ -46,8 +46,8 @@ Ammo_RifleMagnum_FMJ - Things/Ammo/STACK_RANGED/HighCaliber/FMJ - CombatExtended.Graphic_StackCountRanged + Things/Ammo/HighCaliber/FMJ + Graphic_StackCount 0.2 @@ -60,8 +60,8 @@ Ammo_RifleMagnum_AP - Things/Ammo/STACK_RANGED/HighCaliber/AP - CombatExtended.Graphic_StackCountRanged + Things/Ammo/HighCaliber/AP + Graphic_StackCount 0.2 @@ -74,8 +74,8 @@ Ammo_RifleMagnum_Incendiary - Things/Ammo/STACK_RANGED/HighCaliber/Incendiary - CombatExtended.Graphic_StackCountRanged + Things/Ammo/HighCaliber/Incendiary + Graphic_StackCount 0.33 @@ -88,8 +88,8 @@ Ammo_RifleMagnum_HE - Things/Ammo/STACK_RANGED/HighCaliber/HE - CombatExtended.Graphic_StackCountRanged + Things/Ammo/HighCaliber/HE + Graphic_StackCount 0.52 @@ -102,8 +102,8 @@ Ammo_RifleMagnum_Sabot - Things/Ammo/STACK_RANGED/HighCaliber/Sabot - CombatExtended.Graphic_StackCountRanged + Things/Ammo/HighCaliber/Sabot + Graphic_StackCount 0.21 diff --git a/Mods/CombatExtended/Defs/Ammo/GENERIC/Shell_Mortar.xml.bak b/Mods/CombatExtended/Defs/Ammo/GENERIC/Shell_Mortar.xml.bak new file mode 100644 index 0000000000..bc6a495a04 --- /dev/null +++ b/Mods/CombatExtended/Defs/Ammo/GENERIC/Shell_Mortar.xml.bak @@ -0,0 +1,958 @@ + + + + + + + AmmoMortarShell + + AmmoShells + UI/Icons/ThingCategories/CaliberMortar + + + + AmmoMortarShellHeavy + + AmmoShells + UI/Icons/ThingCategories/CaliberCannon + + + + + + AmmoSet_MortarShell + + + Bullet_81mmMortarShell_HE + Bullet_81mmMortarShell_HE_HFuzed + Bullet_81mmMortarShell_Incendiary + Bullet_81mmMortarShell_EMP + Bullet_81mmMortarShell_Firefoam + Bullet_81mmMortarShell_Smoke + Bullet_81mmMortarShell_Antigrain + Bullet_81mmMortarShell_Tox + Bullet_81mmMortarShell_Deadlife + + true + + + + AmmoSet_ArtilleryShell + + + Bullet_155mmHowitzerShell_HE + Bullet_155mmHowitzerShell_HE_HFuzed + Bullet_155mmHowitzerShell_Incendiary + Bullet_155mmHowitzerShell_EMP + Bullet_155mmHowitzerShell_Smoke + + true + + + + + + + + Low-velocity shell designed to be fired from a mortar. + + 200 + + +
  • AmmoMortarShell
    • +     + 25 + 30 + MortarBomb_Explode + true +     + + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     +     + + + Ammo_MortarShell_HighExplosive + + + Things/Ammo/Mortar/HE + Graphic_StackCount + + + 50.09 + 5.27 + 8.17 + + GrenadeHE + Bullet_81mmMortarShell_HE + + + + Ammo_MortarShell_HighExplosive_HFuzed + + + Things/Ammo/Mortar/Airburst + Graphic_StackCount + + + 63.09 + 5.27 + 8.17 + + GrenadeHETF + Bullet_81mmMortarShell_HE + + + + Ammo_MortarShell_Incendiary + + + Things/Ammo/Mortar/Incendiary + Graphic_StackCount + + + 42.34 + 5.65 + 9.0 + + GrenadeIncendiary + Bullet_81mmMortarShell_Incendiary + + + + Ammo_MortarShell_EMP + + + Things/Ammo/Mortar/EMP + Graphic_StackCount + + + 112.42 + 5.27 + 8.17 + + GrenadeEMP + Bullet_81mmMortarShell_EMP + + + + Ammo_MortarShell_Firefoam + + + Things/Ammo/Mortar/Firefoam + Graphic_StackCount + + + 37.03 + 4.1 + 10.01 + + FoamFuel + Bullet_81mmMortarShell_Firefoam + false + + + + Ammo_MortarShell_Smoke + + + Things/Ammo/Mortar/Smoke + Graphic_StackCount + + + 37.03 + 4.1 + 10.01 + + Smoke + Bullet_81mmMortarShell_Smoke + false + + + + Ammo_MortarShell_AntigrainWarhead + + + Things/Ammo/Mortar/Antigrain + Graphic_StackCount + + + 1500 + 6.5 + 6 + + +
  • RewardStandardCore
    • +     + +
  • CE_AutoEnableTrade_Sellable
    • +     + Antigrain + false + + +
  • + 14.9 + 300 + BombSuper + 0.7 + 0.22 + true + GiantExplosion + Explosion_GiantBomb + 60~120 + True + true +
    • +     +     + + + Ammo_MortarShell_Toxic + + + Things/Ammo/Mortar/Toxic + Graphic_StackCount + + + 37.03 + 4.1 + 10.01 + + Toxic + Bullet_81mmMortarShell_Tox + + + + Ammo_MortarShell_Deadlife + + + Things/Ammo/Mortar/Deadlife + Graphic_StackCount + + + 41.03 + 4.4 + 10.01 + + Deadlife + Bullet_81mmMortarShell_Deadlife + + + + + + Large cannon shell used by howitzers. + +
  • AmmoMortarShellHeavy
    • +     + 25 + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + + 300 + 46.7 + 47.67 + + 40 + MortarBomb_Explode + true +     + + + Ammo_ArtilleryShell_HE + + + Things/Ammo/Cannon/Howitzer/HE + Graphic_StackCount + + + 384.6 + + GrenadeHE + Bullet_155mmHowitzerShell_HE + + + + Ammo_ArtilleryShell_HE_HFuzed + + + Things/Ammo/Cannon/Howitzer/AB + Graphic_StackCount + + + 449.6 + + GrenadeHETF + Bullet_155mmHowitzerShell_HE + + + + Ammo_ArtilleryShell_Incendiary + + + Things/Ammo/Cannon/Howitzer/INC + Graphic_StackCount + + + 283.1 + + GrenadeIncendiary + Bullet_155mmHowitzerShell_Incendiary + + + + Ammo_ArtilleryShell_EMP + + + Things/Ammo/Cannon/Howitzer/EMP + Graphic_StackCount + + + 673.94 + + GrenadeEMP + Bullet_155mmHowitzerShell_EMP + + + + Ammo_ArtilleryShell_Smoke + + + Things/Ammo/Cannon/Howitzer/SMK + Graphic_StackCount + + + 262.5 + + Smoke + false + Bullet_155mmHowitzerShell_Smoke + + + + + + + + MakeAmmo_MortarShell_HighExplosive + + Craft 5 mortar shells (HE). + Making mortar shells (HE). + 10600 + +
  • + + +
  • Steel
    • + + + 54 + +
  • + + +
  • FSX
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     + + + MakeAmmo_MortarShell_HighExplosive_HFuzed + + Craft 5 mortar shells (Airburst). + Making mortar shells (Airburst). + 11800 + +
  • + + +
  • Steel
    • + + + 54 + +
  • + + +
  • FSX
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 5 + +     + + + MakeAmmo_MortarShell_Incendiary + + Craft 5 mortar shells (Incendiary). + Making mortar shells (Incendiary). + 9000 + +
  • + + +
  • Steel
    • + + + 58 + +
  • + + +
  • Prometheum
    • + + + 5 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     + + + MakeAmmo_MortarShell_EMP + + Craft 5 mortar shells (EMP). + Making mortar shells (EMP). + + +
  • Mortars
    • +
  • MicroelectronicsBasics
    • +     + 13800 + +
  • + + +
  • Steel
    • + + + 54 + +
  • + + +
  • ComponentIndustrial
    • + + + 14 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     + + + MakeAmmo_MortarShell_Firefoam + + Craft 5 mortar shells (Firefoam). + Making mortar shells (Firefoam). + + +
  • Mortars
    • +
  • Firefoam
    • +     + 8800 + +
  • + + +
  • Steel
    • + + + 42 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • MeatRaw
    • + + + 17 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +     + +
  • MeatRaw
    • +     +     + + 5 + +     + + + MakeAmmo_MortarShell_Smoke + + Craft 5 mortar shells (Smoke). + Making mortar shells (Smoke). + 6600 + +
  • + + +
  • Steel
    • + + + 42 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • Prometheum
    • + + + 2 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     + + + MakeAmmo_MortarShell_Toxic + + Craft 5 mortar shells (Tox). + Making mortar shells (Tox). + + +
  • Mortars
    • +
  • ToxGas
    • +     + 6600 + +
  • + + +
  • Steel
    • + + + 42 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • Prometheum
    • + + + 2 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 5 + +     + + + MakeAmmo_MortarShell_Deadlife + + Craft 5 deadlife mortar shells. + Making deadlife mortar shells. + +
  • DeadlifeDust
    • +
  • Mortars
    • +     + +
  • BioferriteShaper
    • +     + +
  • + + +
  • Steel
    • + + + 42 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • Bioferrite
    • + + + 25 + +     + + +
  • Steel
    • +
  • Bioferrite
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + 4 + + 6600 +     + + + + + MakeAmmo_ArtilleryShell_HE + + Craft 2 artillery shells (HE). + Making artillery shells (HE). + + +
  • Mortars
    • +
  • CE_TurretHeavyWeapons
    • +     + 17400 + +
  • + + +
  • Steel
    • + + + 94 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • FSX
    • + + + 17 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +
  • FSX
    • +     +     + + 2 + +     + + + MakeAmmo_ArtilleryShell_HE_HFuzed + + Craft 2 155mm (Airburst) artillery shells. + Making 155mm (Airburst) artillery shells. + + +
  • Mortars
    • +
  • CE_TurretHeavyWeapons
    • +     + 18600 + +
  • + + +
  • Steel
    • + + + 94 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +
  • + + +
  • FSX
    • + + + 17 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +
  • FSX
    • +     +     + + 2 + + + 5 + +     + + + MakeAmmo_ArtilleryShell_Incendiary + + Craft 2 artillery shells (Incendiary). + Making artillery shell (Incendiary). + + +
  • Mortars
    • +
  • CE_TurretHeavyWeapons
    • +     + 12600 + +
  • + + +
  • Steel
    • + + + 94 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • Prometheum
    • + + + 5 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +
  • Prometheum
    • +     +     + + 2 + +     + + + MakeAmmo_ArtilleryShell_EMP + + Craft 2 artillery shells (EMP). + Making artillery shells (EMP). + + +
  • Mortars
    • +
  • CE_TurretHeavyWeapons
    • +
  • MicroelectronicsBasics
    • +     + 18400 + +
  • + + +
  • Steel
    • + + + 94 + +
  • + + +
  • ComponentIndustrial
    • + + + 15 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 2 + +     + + + MakeAmmo_ArtilleryShell_Smoke + + Craft 2 artillery shells (Smoke). + Making artillery shells (Smoke). + + +
  • Mortars
    • +
  • CE_TurretHeavyWeapons
    • +     + 11400 + +
  • + + +
  • Steel
    • + + + 90 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +
  • + + +
  • Prometheum
    • + + + 3 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 2 + +     + +     \ No newline at end of file diff --git a/Mods/CombatExtended/Defs/Ammo/GENERIC/ShotgunShell.xml.bak b/Mods/CombatExtended/Defs/Ammo/GENERIC/ShotgunShell.xml.bak index 513118ccbc..7d5aa5afed 100644 --- a/Mods/CombatExtended/Defs/Ammo/GENERIC/ShotgunShell.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/GENERIC/ShotgunShell.xml.bak @@ -44,8 +44,8 @@ Ammo_Shotgun_Buck - Things/Ammo/STACK_RANGED/Shotgun/Shot - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Shotgun/Shot + Graphic_StackCount 0.22 @@ -58,8 +58,8 @@ Ammo_Shotgun_Slug - Things/Ammo/STACK_RANGED/Shotgun/Slug - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Shotgun/Slug + Graphic_StackCount 0.048 @@ -74,8 +74,8 @@ 0 - Things/Ammo/STACK_RANGED/Shotgun/Beanbag - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Shotgun/Beanbag + Graphic_StackCount 0.059 @@ -89,8 +89,8 @@ Ammo_Shotgun_ElectroSlug - Things/Ammo/STACK_RANGED/Shotgun/EMP - CombatExtended.Graphic_StackCountRanged + Things/Ammo/Shotgun/EMP + Graphic_StackCount 0.054 diff --git a/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/Autoguns.xml.bak b/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/Autoguns.xml.bak new file mode 100644 index 0000000000..3df62c8f42 --- /dev/null +++ b/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/Autoguns.xml.bak @@ -0,0 +1,410 @@ + + + + + Ammo825mmLong + + AmmoRifles + UI/Icons/ThingCategories/CaliberRifle + + + + + + AmmoSet_825mmLong + + + Bullet_825mmLong_FMJ + Bullet_825mmLong_AP + Bullet_825mmLong_HP + Bullet_825mmLong_Incendiary + Bullet_825mmLong_HE + Bullet_825mmLong_Sabot + + AmmoSet_Rifle + + + + + + Rimmed rifle cartridge found mostly in outdated bolt-action firearms. + + 0.029 + 0.04 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting
    • +     + +
  • Ammo825mmLong
    • +     +     + + + Ammo_825mmLong_FMJ + + + Things/Ammo/Rifle/Clip/FMJ + Graphic_StackCount + + + 0.12 + + FullMetalJacket + Bullet_825mmLong_FMJ + + + + Ammo_825mmLong_AP + + + Things/Ammo/Rifle/Clip/AP + Graphic_StackCount + + + 0.12 + + ArmorPiercing + Bullet_825mmLong_AP + + + + Ammo_825mmLong_HP + + + Things/Ammo/Rifle/Clip/HP + Graphic_StackCount + + + 0.12 + + HollowPoint + Bullet_825mmLong_HP + + + + Ammo_825mmLong_Incendiary + + + Things/Ammo/Rifle/Clip/Incendiary + Graphic_StackCount + + + 0.17 + + IncendiaryAP + Bullet_825mmLong_Incendiary + + + + Ammo_825mmLong_HE + + + Things/Ammo/Rifle/Clip/HE + Graphic_StackCount + + + 0.23 + + ExplosiveAP + Bullet_825mmLong_HE + + + + Ammo_825mmLong_Sabot + + + Things/Ammo/Rifle/Clip/Sabot + Graphic_StackCount + + + 0.14 + 0.023 + + Sabot + Bullet_825mmLong_Sabot + + + + + + + Things/Projectile/Bullet_Small + Graphic_Single + + + Bullet + 154 + true + + + + + Bullet_825mmLong_FMJ + + + 22 + 6 + 88.48 + + + + + Bullet_825mmLong_AP + + + 14 + 12 + 88.48 + + + + + Bullet_825mmLong_HP + + + 28 + 3 + 88.48 + + + + + Bullet_825mmLong_Incendiary + + + 14 + 12 + 88.48 + +
  • + Flame_Secondary + 7 +
    • +     +     +     + + + Bullet_825mmLong_HE + + + 22 + 6 + 68.22 + +
  • + Bomb_Secondary + 7 +
    • +     +     +     + + + Bullet_825mmLong_Sabot + + + 13 + 21 + 115.46 + 209 + + + + + + + MakeAmmo_825mmLong_FMJ + + Craft 500 8.25mm Long (FMJ) cartridges. + Making 8.25mm Long (FMJ) cartridges. + +
  • + + +
  • Steel
    • + + + 30 + +     + + +
  • Steel
    • +     +     + + 500 + + 3000 +     + + + MakeAmmo_825mmLong_AP + + Craft 500 8.25mm Long (AP) cartridges. + Making 8.25mm Long (AP) cartridges. + +
  • + + +
  • Steel
    • + + + 30 + +     + + +
  • Steel
    • +     +     + + 500 + + 3600 +     + + + MakeAmmo_825mmLong_HP + + Craft 500 8.25mm Long (HP) cartridges. + Making 8.25mm Long (HP) cartridges. + +
  • + + +
  • Steel
    • + + + 30 + +     + + +
  • Steel
    • +     +     + + 500 + + 3000 +     + + + MakeAmmo_825mmLong_Incendiary + + Craft 500 8.25mm Long (AP-I) cartridges. + Making 8.25mm Long (AP-I) cartridges. + +
  • + + +
  • Steel
    • + + + 30 + +
  • + + +
  • Prometheum
    • + + + 4 + +     + + +
  • Steel
    • +
  • Prometheum
    • +     +     + + 500 + + 4600 +     + + + MakeAmmo_825mmLong_HE + + Craft 500 8.25mm Long (AP-HE) cartridges. + Making 8.25mm Long (AP-HE) cartridges. + +
  • + + +
  • Steel
    • + + + 30 + +
  • + + +
  • FSX
    • + + + 7 + +     + + +
  • Steel
    • +
  • FSX
    • +     +     + + 500 + + 5800 +     + + + MakeAmmo_825mmLong_Sabot + + Craft 500 8.25mm Long (Sabot) cartridges. + Making 8.25mm Long (Sabot) cartridges. + +
  • + + +
  • Steel
    • + + + 16 + +
  • + + +
  • Uranium
    • + + + 4 + +
  • + + +
  • Chemfuel
    • + + + 4 + +     + + +
  • Steel
    • +
  • Uranium
    • +
  • Chemfuel
    • +     +     + + 500 + + 4000 +     + +     \ No newline at end of file diff --git a/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml.bak b/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml.bak index a2ee769b19..6a90217794 100644 --- a/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml.bak @@ -18,6 +18,7 @@ Bullet_Bolter75_Inferno Bullet_Bolter75_MetalStorm Bullet_Bolter75_Kraken + Bullet_Bolter75_Tempest     @@ -30,6 +31,7 @@ Bullet_Bolter75_Inferno_Relic Bullet_Bolter75_MetalStorm_Relic Bullet_Bolter75_Kraken_Relic + Bullet_Bolter75_Tempest_Relic @@ -38,8 +40,8 @@ A .75 caliber, gryojet-stabilized projectile with an explosive charge and hardened tip, fired from most patterns of Astartes bolters. - 0.151 - 0.06 + 0.1 + 0.08
  • CE_AutoEnableTrade
    • @@ -60,7 +62,7 @@ Graphic_StackCount - 1.98 + 3.26 Standard Bullet_Bolter75_Standard @@ -74,7 +76,7 @@ Graphic_StackCount - 1.37 + 3.07 Inferno Bullet_Bolter75_Inferno @@ -88,7 +90,7 @@ Graphic_StackCount - 1.48 + 2.99 MetalStorm Bullet_Bolter75_MetalStorm @@ -102,11 +104,25 @@ Graphic_StackCount - 1.48 + 3.38 Kraken Bullet_Bolter75_Kraken     + + + Ammo_Bolter75_Tempest + + + ThirdParty/Warhammer/Ammo/Bolter/Tempest + Graphic_StackCount + + + 3.08 + + Tempest + Bullet_Bolter75_Tempest + @@ -118,9 +134,8 @@ CombatExtended.BulletCE Bullet - 80 - true - Mote_BolterCasing + 129 + false @@ -128,13 +143,13 @@ Bullet_Bolter75_Standard - 37 - 14 - 2.931 + 49 + 30 + 384.48
  • Bomb_Secondary - 22 + 30
    • @@ -143,44 +158,39 @@ Bullet_Bolter75_Inferno - CombatExtended.ProjectileCE_Explosive - PrometheumFlame - 3 - 0.5 - FilthPrometheum - 1 - MortarIncendiary_Explode + 38 + 30 + 384.48
  • - 4 - Thermobaric + PrometheumFlame + 33 0.5 - MortarIncendiary_Explode true + FilthPrometheum + 1
    • Bullet_Bolter75_MetalStorm - CombatExtended.ProjectileCE_Bursting - 0.5 + 1.5 Bomb - 10 - true - 1.2 - 2 + 49 + 15 + 39.494 + true
  • - 6 + 6 - -89~-5
    • @@ -190,25 +200,40 @@ Bullet - 104 - 27.6 - 2.931 + 31 + 60 + 384.48 + +
  • + Bomb_Secondary + 15 +
    • +     +     + + + + Bullet_Bolter75_Tempest + + + Bullet + 31 + 30 + 384.48 + +
  • + EMP + 12 +
    • +     + 0.80     - -
  • - 10 - Bomb - 0.25 - MortarBomb_Explode - true -
    • -     - 95 + 135 @@ -216,13 +241,13 @@ Bullet_Bolter75_Standard_Relic - 41 - 18 - 4.13 + 49 + 33 + 422.93
  • Bomb_Secondary - 26 + 30
    • @@ -231,44 +256,39 @@ Bullet_Bolter75_Inferno_Relic - CombatExtended.ProjectileCE_Explosive - PrometheumFlame - 5 - 0.75 - FilthPrometheum - 1 - MortarIncendiary_Explode + 38 + 33 + 422.93
  • - 5 - Thermobaric - 0.75 - MortarIncendiary_Explode + PrometheumFlame + 33 + 0.5 true + FilthPrometheum + 1
    • Bullet_Bolter75_MetalStorm_Relic - CombatExtended.ProjectileCE_Bursting - 0.75 + 1.5 Bomb - 14 - true - 1.2 - 2 + 49 + 16.5 + 43.44 + true
  • - 9 + 6 - -89~-5
    • @@ -278,19 +298,34 @@ Bullet - 114 - 34 - 4.13 + 31 + 66 + 422.93 + +
  • + Bomb_Secondary + 15 +
    • +     +     + + + + Bullet_Bolter75_Tempest_Relic + + + Bullet + 31 + 33 + 422.93 + +
  • + EMP + 12 +
    • +     + 1     - -
  • - 10 - Bomb - 0.25 - MortarBomb_Explode - true -
    • -     @@ -307,7 +342,15 @@
  • Steel
    • - 62 + 4 + +
  • + + +
  • Uranium
    • + + + 19
  • @@ -315,7 +358,7 @@
  • FSX
    • - 14 + 17
  • @@ -323,12 +366,13 @@
  • ComponentIndustrial
    • - 2 + 12
  • Steel
    • +
  • Uranium
  • FSX
  • ComponentIndustrial
    •  @@ -336,7 +380,7 @@ 200 - 10400 + 21840 @@ -351,7 +395,15 @@
  • Steel
    • - 62 + 4 + +
  • + + +
  • Uranium
    • + + + 19
  • @@ -359,7 +411,7 @@
  • Prometheum
    • - 7 + 15
  • @@ -367,12 +419,13 @@
  • ComponentIndustrial
    • - 4 + 12
  • Steel
    • +
  • Uranium
  • Prometheum
  • ComponentIndustrial
    •  @@ -380,7 +433,7 @@ 200 - 9400 + 20880     @@ -395,7 +448,15 @@
  • Steel
    • - 62 + 8 + +
  • + + +
  • Uranium
    • + + + 19
  • @@ -403,7 +464,7 @@
  • FSX
    • - 5 + 9
  • @@ -411,12 +472,13 @@
  • ComponentIndustrial
    • - 6 + 12
  • Steel
    • +
  • Uranium
  • FSX
  • ComponentIndustrial
    •  @@ -424,7 +486,7 @@ 200 - 12400 + 18480     @@ -439,7 +501,15 @@
  • Steel
    • - 62 + 16 + +
  • + + +
  • Uranium
    • + + + 19
  • @@ -447,7 +517,7 @@
  • FSX
    • - 4 + 17
  • @@ -455,6 +525,35 @@
  • ComponentIndustrial
    • + 12 + + + + +
  • Steel
    • +
  • Uranium
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 23280 +     + + + MakeAmmo_Bolter75_Tempest + + Craft 200 .75 Cal Bolter (tempest) shells. + Making .75 Cal Bolter (tempest) shells. + +
  • + + +
  • Steel
    • + + 4
  • @@ -463,21 +562,28 @@
  • Uranium
    • - 4 + 19 + +
  • + + +
  • ComponentIndustrial
    • + + + 15
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
  • Uranium
    • +
  • ComponentIndustrial
    •      - 200 + 200 - 13200 + 15840     \ No newline at end of file diff --git a/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/Bolter_Small.xml.bak b/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/Bolter_Small.xml.bak new file mode 100644 index 0000000000..2ee1710ac2 --- /dev/null +++ b/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/Bolter_Small.xml.bak @@ -0,0 +1,390 @@ + + + + + AmmoBolter50 + + AmmoAdvanced + UI/Icons/ThingCategories/CaliberHighCaliber + + + + + + AmmoSet_Bolter50 + + + Bullet_Bolter50_Standard + Bullet_Bolter50_Inferno + Bullet_Bolter50_Kraken + Bullet_Bolter50_Tempest + + + + + + + A .50 caliber, gryojet-stabilized projectile with an explosive charge and hardened tip, fired from most patterns of Astartes bolters. + + 0.045 + 0.03 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting
    • +
  • CE_AutoEnableCrafting_GWAmmoBench
    • +     + +
  • AmmoBolter50
    • +     + 5000 +     + + + Ammo_Bolter50_Standard + + + ThirdParty/Warhammer/Ammo/Bolter/Standard + Graphic_StackCount + + + 1.51 + + Standard + Bullet_Bolter50_Standard + + + + Ammo_Bolter50_Inferno + + + ThirdParty/Warhammer/Ammo/Bolter/Inferno + Graphic_StackCount + + + 1.39 + + Inferno + Bullet_Bolter50_Inferno + + + + Ammo_Bolter50_Kraken + + + ThirdParty/Warhammer/Ammo/Bolter/Kraken + Graphic_StackCount + + + 1.69 + + Kraken + Bullet_Bolter50_Kraken + + + + Ammo_Bolter50_Tempest + + + ThirdParty/Warhammer/Ammo/Bolter/Tempest + Graphic_StackCount + + + 1.55 + + Tempest + Bullet_Bolter50_Tempest + + + + + + + Things/Projectile/Bullet_Big + Graphic_Single + + CombatExtended.BulletCE + + Bullet + 137 + false + + + + + Bullet_Bolter50_Standard + + + 30 + 20 + 147 + +
  • + Bomb_Secondary + 15 +
    • +     +     +     + + + Bullet_Bolter50_Inferno + + + 24 + 20 + 147 + + +
  • + PrometheumFlame + 17 + 0.5 + true + FilthPrometheum + 1 +
    • +     +     + + + Bullet_Bolter50_Kraken + + + Bullet + 19 + 40 + 147 + +
  • + Bomb_Secondary + 8 +
    • +     +     +     + + + Bullet_Bolter50_Tempest + + + Bullet + 19 + 20 + 147 + +
  • + EMP + 6 +
    • +     + 0.60 +     +     + + + + + MakeAmmo_Bolter50_Standard + + Craft 200 .50 Cal Bolter (standard) shells. + Making .50 Cal Bolter (standard) shells. + +
  • + + +
  • Steel
    • + + + 6 + +
  • + + +
  • Uranium
    • + + + 6 + +
  • + + +
  • FSX
    • + + + 77 + +
  • + + +
  • ComponentIndustrial
    • + + + 6 + +     + + +
  • Steel
    • +
  • Uranium
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 9840 +     + + + MakeAmmo_Bolter50_Inferno + + Craft 200 .50 Cal Bolter (inferno) shells. + Making .50 Cal Bolter (inferno) shells. + +
  • + + +
  • Steel
    • + + + 6 + +
  • + + +
  • Uranium
    • + + + 6 + +
  • + + +
  • Prometheum
    • + + + 5 + +
  • + + +
  • ComponentIndustrial
    • + + + 6 + +     + + +
  • Steel
    • +
  • Uranium
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 8880 +     + + + MakeAmmo_Bolter50_Kraken + + Craft 200 .50 Cal Bolter (kraken) shells. + Making .50 Cal Bolter (kraken) shells. + +
  • + + +
  • Steel
    • + + + 24 + +
  • + + +
  • Uranium
    • + + + 6 + +
  • + + +
  • FSX
    • + + + 7 + +
  • + + +
  • ComponentIndustrial
    • + + + 6 + +     + + +
  • Steel
    • +
  • Uranium
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 12000 +     + + + MakeAmmo_Bolter50_Tempest + + Craft 200 .50 Cal Bolter (tempest) shells. + Making .50 Cal Bolter (tempest) shells. + +
  • + + +
  • Steel
    • + + + 6 + +
  • + + +
  • Uranium
    • + + + 6 + +
  • + + +
  • ComponentIndustrial
    • + + + 8 + +     + + +
  • Steel
    • +
  • Uranium
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 7920 +     + +     \ No newline at end of file diff --git a/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/HeavyBolter.xml.bak b/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/HeavyBolter.xml.bak index ee7d61f994..837a322ee5 100644 --- a/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/HeavyBolter.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/HeavyBolter.xml.bak @@ -18,6 +18,7 @@ Bullet_Bolter998_Inferno Bullet_Bolter998_MetalStorm Bullet_Bolter998_Kraken + Bullet_Bolter998_Tempest @@ -48,7 +49,7 @@ Graphic_StackCount - 4.44 + 6.11 Standard Bullet_Bolter998_Standard @@ -62,7 +63,7 @@ Graphic_StackCount - 2.28 + 5.65 Inferno Bullet_Bolter998_Inferno @@ -76,7 +77,7 @@ Graphic_StackCount - 2.70 + 5.42 MetalStorm Bullet_Bolter998_MetalStorm @@ -90,11 +91,25 @@ Graphic_StackCount - 2.37 + 6.41 Kraken Bullet_Bolter998_Kraken + + + Ammo_Bolter998_Tempest + + + ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest + Graphic_StackCount + + + 5.68 + + Tempest + Bullet_Bolter998_Tempest + @@ -106,9 +121,8 @@ CombatExtended.BulletCE Bullet - 96 - true - Mote_HeavyBolterCasing + 129 + false @@ -116,13 +130,13 @@ Bullet_Bolter998_Standard - 64 - 20 - 5.101 + 72 + 35 + 908.38
  • Bomb_Secondary - 38 + 50
    • @@ -131,44 +145,39 @@ Bullet_Bolter998_Inferno - CombatExtended.ProjectileCE_Explosive - PrometheumFlame - 5 - 1.5 - FilthPrometheum - 0.7 - MortarIncendiary_Explode + 57 + 35 + 908.38
  • - 7 - Thermobaric - 1 - MortarIncendiary_Explode + PrometheumFlame + 56 + 0.5 true + FilthPrometheum + 1
    • Bullet_Bolter998_MetalStorm - CombatExtended.ProjectileCE_Bursting - 1 + 1.5 Bomb - 17 - true - 1.05 - 2 + 58 + 17.5 + 59.81 + true
  • - 6 + 12 - -89~-5
    • @@ -178,19 +187,34 @@ Bullet - 142 - 46 - 5.101 + 46 + 70 + 908.38 + +
  • + Bomb_Secondary + 25 +
    • +     +     + + + + Bullet_Bolter998_Tempest + + + Bullet + 46 + 35 + 908.38 + +
  • + EMP + 21 +
    • +     + 1     - -
  • - 17 - Bomb - 0.5 - MortarBomb_Explode - true -
    • -     @@ -207,7 +231,15 @@
  • Steel
    • - 154 + 10 + +
  • + + +
  • Uranium
    • + + + 43
  • @@ -215,7 +247,7 @@
  • FSX
    • - 18 + 40
  • @@ -223,12 +255,13 @@
  • ComponentIndustrial
    • - 4 + 19
  • Steel
    • +
  • Uranium
  • FSX
  • ComponentIndustrial
    •  @@ -236,7 +269,7 @@ 200 - 36600 + 44400 @@ -251,7 +284,15 @@
  • Steel
    • - 154 + 10 + +
  • + + +
  • Uranium
    • + + + 43
  • @@ -259,7 +300,7 @@
  • Prometheum
    • - 12 + 35
  • @@ -267,12 +308,13 @@
  • ComponentIndustrial
    • - 6 + 19
  • Steel
    • +
  • Uranium
  • Prometheum
  • ComponentIndustrial
    •  @@ -280,7 +322,7 @@ 200 - 19400 + 42000     @@ -295,7 +337,15 @@
  • Steel
    • - 154 + 20 + +
  • + + +
  • Uranium
    • + + + 43
  • @@ -303,7 +353,7 @@
  • FSX
    • - 8 + 20
  • @@ -311,12 +361,13 @@
  • ComponentIndustrial
    • - 8 + 19
  • Steel
    • +
  • Uranium
  • FSX
  • ComponentIndustrial
    •  @@ -324,7 +375,7 @@ 200 - 21800 + 36000     @@ -339,7 +390,15 @@
  • Steel
    • - 154 + 40 + +
  • + + +
  • Uranium
    • + + + 43
  • @@ -347,7 +406,7 @@
  • FSX
    • - 6 + 40
  • @@ -355,7 +414,36 @@
  • ComponentIndustrial
    • - 6 + 19 + + + + +
  • Steel
    • +
  • Uranium
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 48000 +     + + + MakeAmmo_Bolter998_Tempest + + Craft 200 .998 Cal Bolter (tempest) shells. + Making .998 Cal Bolter (tempest) shells. + +
  • + + +
  • Steel
    • + + + 10
  • @@ -363,21 +451,28 @@
  • Uranium
    • - 8 + 43 + +
  • + + +
  • ComponentIndustrial
    • + + + 26
  • Steel
    • -
  • FSX
    • -
  • ComponentIndustrial
  • Uranium
    • +
  • ComponentIndustrial
    •      - 200 + 200 - 20600 + 30240     \ No newline at end of file diff --git a/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/LasGun.xml.bak b/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/LasGun.xml.bak index bfa152271e..522068ce47 100644 --- a/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/LasGun.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/LasGun.xml.bak @@ -47,8 +47,8 @@ A universal power pack for lasguns. - 0.001 - 0.005 + 0.008 + 0.01
  • CE_AutoEnableTrade
    • @@ -115,8 +115,8 @@ CE_Laser - 34 - 30 + 80 + 558 0.001     diff --git a/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml.bak b/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml.bak index e8676fa929..ac588ea051 100644 --- a/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml.bak @@ -1,17 +1,61 @@ - + + + AmmoMeltaGun + + AmmoAdvanced + ThirdParty/Warhammer/UI/MeltaGunAmmoUI + AmmoSet_MeltaCharge - Bullet_Laser_MeltaCharge + Bullet_Laser_MeltaCharge - + + + Ammo_MeltaGun + + Canister of Pyrum-petrol fuel for Meltaguns + + 0.09 + 0.081 + 2.094 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_FabricationBench
    • +
  • CE_AutoEnableCrafting_GWAmmoBench
    • +     + Melta + + ThirdParty/Warhammer/Ammo/MeltaGun + Graphic_StackCount + + +
  • AmmoMeltaGun
    • +     + +
  • + 3.5 + 12 + PrometheumFlame + 0.15 + 0.10 + true + True + 30~50 +
    • +     + 75 +     + + Bullet_Laser_MeltaCharge @@ -47,4 +91,58 @@ + + + MakeAmmo_MeltaGun + + Craft 20 meltagun canisters + Making 20 shots worth of meltagun canisters + +
  • + + +
  • Steel
    • + + + 20 + +
  • + + +
  • Plasteel
    • + + + 10 + +
  • + + +
  • Prometheum
    • + + + 20 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • Plasteel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 20 + + 15200 +     +     \ No newline at end of file diff --git a/Mods/CombatExtended/Defs/Ammo/Rifle/762x54mmR.xml.bak b/Mods/CombatExtended/Defs/Ammo/Rifle/762x54mmR.xml.bak index bf71bbb8f3..328ea09464 100644 --- a/Mods/CombatExtended/Defs/Ammo/Rifle/762x54mmR.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/Rifle/762x54mmR.xml.bak @@ -45,7 +45,7 @@ Ammo_762x54mmR_FMJ - Things/Ammo/Rifle/SovietLarge/FMJ + Things/Ammo/Rifle/SovietBattlerifle/FMJ Graphic_StackCount @@ -59,7 +59,7 @@ Ammo_762x54mmR_AP - Things/Ammo/Rifle/SovietLarge/AP + Things/Ammo/Rifle/SovietBattlerifle/AP Graphic_StackCount @@ -73,7 +73,7 @@ Ammo_762x54mmR_HP - Things/Ammo/Rifle/SovietLarge/HP + Things/Ammo/Rifle/SovietBattlerifle/HP Graphic_StackCount @@ -87,7 +87,7 @@ Ammo_762x54mmR_Incendiary - Things/Ammo/Rifle/SovietLarge/Incendiary + Things/Ammo/Rifle/SovietBattlerifle/Incendiary Graphic_StackCount @@ -101,7 +101,7 @@ Ammo_762x54mmR_HE - Things/Ammo/Rifle/SovietLarge/HE + Things/Ammo/Rifle/SovietBattlerifle/HE Graphic_StackCount @@ -115,7 +115,7 @@ Ammo_762x54mmR_Sabot - Things/Ammo/Rifle/SovietLarge/Sabot + Things/Ammo/Rifle/SovietBattlerifle/Sabot Graphic_StackCount diff --git a/Mods/CombatExtended/Defs/Ammo/Shell/105mmHowitzer.xml.bak b/Mods/CombatExtended/Defs/Ammo/Shell/105mmHowitzer.xml.bak index 203e83eea8..66f6435560 100644 --- a/Mods/CombatExtended/Defs/Ammo/Shell/105mmHowitzer.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/Shell/105mmHowitzer.xml.bak @@ -20,6 +20,7 @@ Bullet_105mmHowitzerShell_Smoke true + AmmoSet_ArtilleryShell @@ -33,6 +34,7 @@ Bullet_105mmHowitzerShell_Smoke_directfire true + AmmoSet_ArtilleryShell @@ -146,9 +148,7 @@ MortarRound_PreImpact MortarRound_Ambient true - true - Fleck_BigShell - Filth_CannonAmmoCasings + false 5 0.10 @@ -288,9 +288,7 @@ 147 MortarBomb_Explode false - true - Fleck_BigShell - Filth_CannonAmmoCasings + false diff --git a/Mods/CombatExtended/Defs/Ammo/Shell/155mmHowitzer.xml b/Mods/CombatExtended/Defs/Ammo/Shell/155mmHowitzer.xml index 553d3d57fb..200c7af67a 100644 --- a/Mods/CombatExtended/Defs/Ammo/Shell/155mmHowitzer.xml +++ b/Mods/CombatExtended/Defs/Ammo/Shell/155mmHowitzer.xml @@ -21,6 +21,7 @@ Bullet_155mmHowitzerShell_Smoke true + AmmoSet_ArtilleryShell @@ -125,6 +126,7 @@ Smoke Bullet_155mmHowitzerShell_Smoke + false @@ -141,9 +143,7 @@ MortarRound_PreImpact MortarRound_Ambient true - true - Fleck_BigShell - Filth_CannonAmmoCasings + false 5 0.12 @@ -384,7 +384,7 @@ MakeAmmo_155mmHowitzerShell_HE - Craft 1 155mm (HE) howitzer shells. + Craft a 155mm (HE) howitzer shell. Making 155mm (HE) howitzer shells. @@ -433,7 +433,7 @@ MakeAmmo_155mmHowitzerShell_HE_HFuzed - Craft 1 155mm (Airburst) howitzer shells. + Craft a 155mm (Airburst) howitzer shell. Making 155mm (Airburst) howitzer shells. @@ -485,7 +485,7 @@ MakeAmmo_155mmHowitzerShell_Incendiary - Craft 155mm (Incendiary) Howitzer shell. + Craft a 155mm (Incendiary) Howitzer shell. Making 155mm (Incendiary) Howitzer shell. @@ -534,8 +534,8 @@ MakeAmmo_155mmHowitzerShell_EMP - Craft 155mm (EMP) Howitzer shell. - Making 155mm (EMP) Howitzer shell. + Craft a 155mm (EMP) Howitzer shell. + Making 155mm (EMP) Howitzer shells.
  • Mortars
    • diff --git a/Mods/CombatExtended/Defs/Ammo/Shell/15cmNebelwerfer.xml.bak b/Mods/CombatExtended/Defs/Ammo/Shell/15cmNebelwerfer.xml.bak index e165de80a4..1a0a534ff1 100644 --- a/Mods/CombatExtended/Defs/Ammo/Shell/15cmNebelwerfer.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/Shell/15cmNebelwerfer.xml.bak @@ -90,8 +90,8 @@ MakeAmmo_15cmNebelwerfer_HE - - Craft a 15cm Nebelwerfer (HE) rockets. + + Craft 6 15cm Nebelwerfer (HE) rockets. Making 15cm Nebelwerfer (HE) rockets. 44600 diff --git a/Mods/CombatExtended/Defs/Ammo/Shell/50mmType89Mortar.xml.bak b/Mods/CombatExtended/Defs/Ammo/Shell/50mmType89Mortar.xml.bak index 08e9046f26..7c2ddd8ba7 100644 --- a/Mods/CombatExtended/Defs/Ammo/Shell/50mmType89Mortar.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/Shell/50mmType89Mortar.xml.bak @@ -20,6 +20,7 @@ Bullet_50mmType89MortarShell_Smoke true + AmmoSet_MortarShell diff --git a/Mods/CombatExtended/Defs/Ammo/Shell/60mmMortar.xml.bak b/Mods/CombatExtended/Defs/Ammo/Shell/60mmMortar.xml.bak index 6839f50e3d..f369b9f5a1 100644 --- a/Mods/CombatExtended/Defs/Ammo/Shell/60mmMortar.xml.bak +++ b/Mods/CombatExtended/Defs/Ammo/Shell/60mmMortar.xml.bak @@ -21,6 +21,7 @@ Bullet_60mmMortarShell_Smoke true + AmmoSet_MortarShell diff --git a/Mods/CombatExtended/Defs/Ammo/Shell/81mmMortar.xml b/Mods/CombatExtended/Defs/Ammo/Shell/81mmMortar.xml index ba9a5ffc43..c0324015b4 100644 --- a/Mods/CombatExtended/Defs/Ammo/Shell/81mmMortar.xml +++ b/Mods/CombatExtended/Defs/Ammo/Shell/81mmMortar.xml @@ -25,6 +25,7 @@ Bullet_81mmMortarShell_Tox Bullet_81mmMortarShell_Deadlife + AmmoSet_MortarShell true @@ -217,6 +218,7 @@     Deadlife Bullet_81mmMortarShell_Deadlife + false diff --git a/Mods/CombatExtended/Defs/ResearchProjectDefs/ResearchProjects.xml.bak b/Mods/CombatExtended/Defs/ResearchProjectDefs/ResearchProjects.xml.bak index fc1bc1d2d6..04d85c20be 100644 --- a/Mods/CombatExtended/Defs/ResearchProjectDefs/ResearchProjects.xml.bak +++ b/Mods/CombatExtended/Defs/ResearchProjectDefs/ResearchProjects.xml.bak @@ -39,10 +39,12 @@
  • subject->grenade launchers
    • +
  • subject->rocket launchers
  • subject_story->developed weapons to defeat heavily armored foes
  • subject_story->toiled in an urbworld munitions factory
  • subject_story->narrowly survived an assault by mechanoids and vowed to stop such attacks
    • +
  • subject_story->developed anti-armor tactics
  • subject_gerund->crafting grenade launchers
  • subject_gerund->crafting rocket launchers
    • @@ -101,6 +103,7 @@
  • subject_story->stumbled across a cache of advanced weapons
  • subject_story->learned to use a discarding sabot to defeat powered armor
  • subject_story->worked for a prolific arms dealer
    • +
  • subject_story->studied the aftermath of a mechanoid assault
  • subject_gerund->creating explosive ammunition
  • subject_gerund->crafting discarding sabots
    • @@ -111,7 +114,7 @@ CE_SimpleNV - Allows for the production of simple electro-optical devices, like night vision goggles. + Allows for the production of simple electro-optical devices, like night vision goggles and reflex sights. 800 Industrial @@ -121,13 +124,15 @@ 5.50 -
  • subject->night vision
    • +
  • subject->optoelectronics
  • subject_story->worked on developing basic light sensors
  • subject_story->took part in military field testing on a war-world
  • subject_story->instructed early midworld soldiers in night combat
  • subject_gerund->crafting night vision monoculars
    • + +
  • subject_gerund->conducting night assaults
    •      @@ -135,7 +140,7 @@ CE_AdvancedNV - Allows for the production of more advanced and specialized electro-optical devices, including better night vision goggles. + Allows for the production of more advanced and specialized electro-optical devices, including better night vision goggles and advanced digital optics. 1000 Industrial @@ -148,13 +153,16 @@ 5.30 -
  • subject->advanced night vision
    • +
  • subject->advanced optoelectronics
  • subject_story->meticulously studied the sensors of destroyed mechanoids
  • subject_story->uncovered an ancient cryosleep crypt containing stores of advanced armor
  • subject_story->was trained as a scout in the military of an urbworld
    • +
  • subject_story->worked in a military prototyping lab
  • subject_gerund->crafting night vision sets
    • + +
  • subject_gerund->fabricating advanced optoelectronics
    •      diff --git a/Mods/CombatExtended/Defs/ResearchProjectDefs/ResearchProjects_Turrets.xml.bak b/Mods/CombatExtended/Defs/ResearchProjectDefs/ResearchProjects_Turrets.xml.bak index 2387171152..fefa6fead9 100644 --- a/Mods/CombatExtended/Defs/ResearchProjectDefs/ResearchProjects_Turrets.xml.bak +++ b/Mods/CombatExtended/Defs/ResearchProjectDefs/ResearchProjects_Turrets.xml.bak @@ -38,9 +38,6 @@
  • PrecisionRifling
    • HiTechResearchBench - -
  • MultiAnalyzer
    • -     11 3.1 diff --git a/Mods/CombatExtended/Defs/SoundDefs/Shot_Weapons.xml b/Mods/CombatExtended/Defs/SoundDefs/Shot_Weapons.xml index c2b7323df3..33f893a4bf 100644 --- a/Mods/CombatExtended/Defs/SoundDefs/Shot_Weapons.xml +++ b/Mods/CombatExtended/Defs/SoundDefs/Shot_Weapons.xml @@ -1,4 +1,4 @@ - + @@ -244,7 +244,7 @@ 1~1.091765 - 30~60 + 45.2941~45.2941 False @@ -263,7 +263,7 @@ 1~1.091765 - 30~60 + 45.2941~45.2941 False diff --git a/Mods/CombatExtended/Defs/Stats/Stats_Pawns_Combat.xml b/Mods/CombatExtended/Defs/Stats/Stats_Pawns_Combat.xml index 1acf76ecaa..a553b08739 100644 --- a/Mods/CombatExtended/Defs/Stats/Stats_Pawns_Combat.xml +++ b/Mods/CombatExtended/Defs/Stats/Stats_Pawns_Combat.xml @@ -287,12 +287,6 @@ - - PartialArmorBody - Special armor values for certain bodyparts - - CombatExtended.StatWorker_ArmorPartial - BodyPartSharpArmor diff --git a/Mods/CombatExtended/Defs/ThingDefs_Buildings/Buildings_Turrets.xml b/Mods/CombatExtended/Defs/ThingDefs_Buildings/Buildings_Turrets.xml index 6ac8638526..aa83f7c35d 100644 --- a/Mods/CombatExtended/Defs/ThingDefs_Buildings/Buildings_Turrets.xml +++ b/Mods/CombatExtended/Defs/ThingDefs_Buildings/Buildings_Turrets.xml @@ -398,6 +398,7 @@ UI/Icons/Turrets/FlakTurret_uiIcon + 1 500 0.4 @@ -437,6 +438,20 @@
  • CE_TurretHeavyWeapons
    • Security + +
  • + Bomb + 0.66 +
    • +
  • + Bomb_Secondary + 0.66 +
    • +
  • + Bullet + 0.66 +
    • +     \ No newline at end of file diff --git a/Mods/CombatExtended/Defs/ThingDefs_Misc/Apparel_Carrying.xml b/Mods/CombatExtended/Defs/ThingDefs_Misc/Apparel_Carrying.xml index 3e275bbb75..b979013276 100644 --- a/Mods/CombatExtended/Defs/ThingDefs_Misc/Apparel_Carrying.xml +++ b/Mods/CombatExtended/Defs/ThingDefs_Misc/Apparel_Carrying.xml @@ -413,6 +413,7 @@ 28500 7 8 + 2.5     120 diff --git a/Mods/CombatExtended/Defs/ThingDefs_Misc/Weapons_Ranged.xml b/Mods/CombatExtended/Defs/ThingDefs_Misc/Weapons_Ranged.xml index 3ea1630f76..2fbf73c911 100644 --- a/Mods/CombatExtended/Defs/ThingDefs_Misc/Weapons_Ranged.xml +++ b/Mods/CombatExtended/Defs/ThingDefs_Misc/Weapons_Ranged.xml @@ -105,6 +105,17 @@ Muzzle + +
  • + true + true + 20 + -0.1,0.05 + 1.5~2 + -135 + 2 +
    • +     diff --git a/Mods/CombatExtended/Defs/ThingDefs_Races/Tytan.xml b/Mods/CombatExtended/Defs/ThingDefs_Races/Tytan.xml index 7cd8c94298..756be579a6 100644 --- a/Mods/CombatExtended/Defs/ThingDefs_Races/Tytan.xml +++ b/Mods/CombatExtended/Defs/ThingDefs_Races/Tytan.xml @@ -12,7 +12,6 @@ 1 0.85 0.75 - 0 600 600 1.0 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/BipodCategoryDef/BipodCategories.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/BipodCategoryDef/BipodCategories.xml deleted file mode 100644 index 860f213634..0000000000 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/BipodCategoryDef/BipodCategories.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - 狙击枪 - - - 反坦克步枪 - - - 精确射手步枪 - - - 轻机枪 - - - 步枪 - - - 班用机枪 - - \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/BodyPartGroupDef/BodyPartGroups.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/BodyPartGroupDef/BodyPartGroups.xml index 79c2d7a47d..1636818c11 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/BodyPartGroupDef/BodyPartGroups.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/BodyPartGroupDef/BodyPartGroups.xml @@ -52,9 +52,6 @@ 颈 - - 外溢粘液 - 尖 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Advanced.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Advanced.xml index b613f3427b..786b685f3f 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Advanced.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Advanced.xml @@ -6,6 +6,11 @@ 一种小型的超技术弹头，通常由宇宙飞船或闪耀世界使机器用，在一反物质的推动下，产生巨量高能伽玛射线，拥有巨大的湮灭性摧毁能力。 + + 活铁 + + 含有结晶活铁的浸渍物质能够在细胞层面攻击有机物，干扰再生并削弱组织。 + 浓缩提班纳 @@ -27,7 +32,7 @@ 使用提班纳气体制造的低能量光矢，可以暂时使目标昏迷并丧失行动能力。 - 普通电荷弹 + 电荷弹 拥有电荷粒子涂层，对装甲目标和人体组织都有良好的破坏力。 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Neolithic.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Neolithic.xml index 7219f313ef..ab96936f57 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Neolithic.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Neolithic.xml @@ -27,8 +27,10 @@ 神经毒素 - + 该工程表面涂覆了一种强力的生物毒素，能够使有机体目标变得晕眩和迷失方向。 + + 神经毒素 玻璃钢箭 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/12Gauge.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/12Gauge.xml index d3eb0a89f6..33b0991d25 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/12Gauge.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/12Gauge.xml @@ -4,4 +4,7 @@ 12号径霰弹 + + 12号径霰弹 + \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/57x483mmBofors.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/57x483mmBofors.xml deleted file mode 100644 index 875860ca24..0000000000 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/57x483mmBofors.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - 57x483mm 博福斯机炮炮弹 - - \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/5x100mmCaseless.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/5x100mmCaseless.xml deleted file mode 100644 index 359afaf9ec..0000000000 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/5x100mmCaseless.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - 5x100mm 无壳弹 - - - 5x100mm 无壳弹 - - - 5x100mm 无壳弹 (毒气弹) - - \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/Flamethrower_Burst.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/Flamethrower_Burst.xml index 4f2225fd1d..54e4a9b4e5 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/Flamethrower_Burst.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/Flamethrower_Burst.xml @@ -1,9 +1,7 @@ - + - - - + + 火焰喷射器燃料 - - + \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/NerveSpikerBolt.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/NerveSpikerBolt.xml index d8e3165e94..cb23f76a83 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/NerveSpikerBolt.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/NerveSpikerBolt.xml @@ -1,9 +1,7 @@ - + - - - + + 麻痹毒刺 - - + \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/PlasmaCannon.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/PlasmaCannon.xml index 87c11cdeda..aed3754d36 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/PlasmaCannon.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/PlasmaCannon.xml @@ -4,6 +4,9 @@ 罐装等离子体 + + 罐装等离子体 + 罐装等离子体 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/GunPatcherPresetDef/MachineGun.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.GunPatcherPresetDef/MachineGun.xml similarity index 100% rename from Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/GunPatcherPresetDef/MachineGun.xml rename to Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/CombatExtended.GunPatcherPresetDef/MachineGun.xml diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/DamageDef/DamageDefs_Anomaly.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/DamageDef/DamageDefs_Anomaly.xml new file mode 100644 index 0000000000..fe711b21a3 --- /dev/null +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/DamageDef/DamageDefs_Anomaly.xml @@ -0,0 +1,19 @@ + + + + + 活铁火焰 + + {0}已被烧死。 + + + 划伤 + + {0}被撕裂了. + + + 神经 + + {0}死于神经休克。 + + \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/DesignatorDropdownGroupDef/DesignatorDropdownGroupDef.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/DesignatorDropdownGroupDef/DesignatorDropdownGroupDef.xml new file mode 100644 index 0000000000..70860c2fc0 --- /dev/null +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/DesignatorDropdownGroupDef/DesignatorDropdownGroupDef.xml @@ -0,0 +1,19 @@ + + + + + 战斗扩展自动炮塔 + + + 战斗扩展黑火药炮台 + + + 战斗扩展重型手操炮塔 + + + 战斗扩展中型手操炮塔 + + + 战斗扩展新式手操炮塔 + + \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/HediffDef/Hediffs_Anomaly.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/HediffDef/Hediffs_Anomaly.xml new file mode 100644 index 0000000000..8fa352ca6e --- /dev/null +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/HediffDef/Hediffs_Anomaly.xml @@ -0,0 +1,19 @@ + + + + + 活铁毒气 + + 受到活铁毒气的影响 + + 较轻 + + 中等 + + 较重 + + 严重 + + 极重 + + \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/15cmNebelwerfer.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/15cmNebelwerfer.xml index fdc946d2f1..7420d08d67 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/15cmNebelwerfer.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/15cmNebelwerfer.xml @@ -1,10 +1,10 @@  - - 制作150mm 火箭弹 (高爆弹) - - 制作150mm 火箭弹 (高爆弹)。 + + 制作150mm 火箭弹 (高爆弹) x6 + + 制作150mm 火箭弹 (高爆弹) x6。 正在制作150mm 火箭弹 (高爆弹)。 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/357Magnum.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/357Magnum.xml index 5a36abdf53..5c20cb0b8c 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/357Magnum.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/357Magnum.xml @@ -4,21 +4,21 @@ 制作.357 马格南手枪弹 (穿甲弹) x500 - 制作500枚.357 马格南手枪弹 (穿甲弹)。 + 制作.357 马格南手枪弹 (穿甲弹) x500。 正在制作.357 马格南手枪弹 (穿甲弹)。 制作.357 马格南手枪弹 (全金属被甲弹) x500 - 制作500枚.357 马格南手枪弹 (全金属被甲弹)。 + 制作.357 马格南手枪弹 (全金属被甲弹) x500。 正在制作.357 马格南手枪弹 (全金属被甲弹)。 制作.357 马格南手枪弹 (空尖弹) x500 - 制作500枚.357 马格南手枪弹 (空尖弹)。 + 制作.357 马格南手枪弹 (空尖弹) x500。 正在制作.357 马格南手枪弹 (空尖弹)。 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/38ACP.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/38ACP.xml index 33e2c7174f..6962c164b9 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/38ACP.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/38ACP.xml @@ -4,21 +4,21 @@ 制作.38 ACP手枪弹 (穿甲弹) x500 - 制作500枚.38 ACP手枪弹 (穿甲弹)。 + 制作.38 ACP手枪弹 (穿甲弹) x500。 正在制作.38 ACP手枪弹 (穿甲弹)。 制作.38 ACP手枪弹 (全金属被甲弹) x500 - 制作500枚.38 ACP手枪弹 (全金属被甲弹)。 + 制作.38 ACP手枪弹 (全金属被甲弹) x500。 正在制作.38 ACP手枪弹 (全金属被甲弹)。 制作.38 ACP手枪弹 (空尖弹) x500 - 制作500枚.38 ACP手枪弹 (空尖弹)。 + 制作.38 ACP手枪弹 (空尖弹) x500。 正在制作.38 ACP手枪弹 (空尖弹)。 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/4570Gov.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/4570Gov.xml index 4174b253e6..14c392d30d 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/4570Gov.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/4570Gov.xml @@ -8,7 +8,7 @@ 正在制作.45-70 政府弹 (穿甲弹)。 - + 制作.45-70 政府弹 (全金属被甲弹) x500 制作500枚.45-70 政府弹 (全金属被甲弹)。 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/57x483mmBofors.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/57x483mmBofors.xml deleted file mode 100644 index 6719958f8a..0000000000 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/57x483mmBofors.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - 制作57x483mm 博福斯机炮弹 (高爆弹) x25 - - 制作25枚57x483mm 博福斯机炮弹 (高爆弹)。 - - 正在制作57x483mm 博福斯机炮弹 (高爆弹)。 - - \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/5x100mmCaseless.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/5x100mmCaseless.xml deleted file mode 100644 index 8b189fd3ee..0000000000 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/5x100mmCaseless.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - 制作5x100mm 无壳弹(脱壳穿甲弹) x500 - - 制作5x100mm 无壳弹(脱壳穿甲弹) x500。 - - 正在制作5x100mm 无壳弹(脱壳穿甲弹)。 - - \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/81mmMortar.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/81mmMortar.xml index 9dcd787357..1ae2bc0247 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/81mmMortar.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/81mmMortar.xml @@ -1,6 +1,13 @@  + + 制作81mm 迫击炮弹 (死灵尘) x5 + + 制作81mm 迫击炮弹 (死灵尘)x5。 + + 正在制作81mm 迫击炮弹 (死灵尘)。 + 制作81mm 迫击炮弹 (EMP弹) x5 @@ -50,11 +57,4 @@ 正在制作81mm 迫击炮弹 (毒气弹)。 - - 制作81mm 迫击炮弹 (死灵尘) x5 - - 制作81mm 迫击炮弹 (死灵尘)x5。 - - 正在制作81mm 迫击炮弹 (死灵尘)。 - \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/CannonBall.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/CannonBall.xml index c3398f25f6..c316afce56 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/CannonBall.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/CannonBall.xml @@ -1,11 +1,11 @@  - + 制作加农炮弹 (榴弹) x5 - + 制作5枚加农炮弹 (榴弹)。 - + 正在制作加农炮弹 (榴弹)。 @@ -15,11 +15,11 @@ 正在制作加农炮弹 (葡萄弹)。 - + 制作加农炮弹 (燃烧弹) x5 - + 制作5枚加农炮弹 (燃烧弹)。 - + 正在制作加农炮弹 (燃烧弹)。 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/Flamethrower.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/Flamethrower.xml index 2195ccac09..5e77b94914 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/Flamethrower.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/Flamethrower.xml @@ -1,6 +1,13 @@  + + 制作火焰喷射器燃料 (活铁) x100 + + 制作100份火焰喷射器燃料(活铁)。 + + 正在制作火焰喷射器燃料 (活铁)。 + 制作火焰喷射器燃料 (凝胶化合燃料) x100 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/LauncherGrenade.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/LauncherGrenade.xml index 1c2910d15d..14ed830f60 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/LauncherGrenade.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/LauncherGrenade.xml @@ -9,11 +9,18 @@ 正在制作榴弹 (EMP弹)。 - 制作榴弹 (高爆) x100 + 制作榴弹 (高爆弹) x100 - 制作榴弹 (高爆)x100。 + 制作榴弹 (高爆弹)x100。 - 正在制作榴弹 (高爆)。 + 正在制作榴弹 (高爆弹)。 + + + 制作榴弹 (空爆弹) x100 + + 制作榴弹 (空爆弹)x100。 + + 正在制作榴弹 (空爆弹)。 制作榴弹 (双效高爆弹) x100 @@ -29,4 +36,11 @@ 正在制作榴弹 (烟雾弹)。 + + 制作榴弹 (毒气弹) x100 + + 制作榴弹 (毒气弹)x100。 + + 正在制作榴弹 (毒气弹)。 + \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/NerveSpikerBolt.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/NerveSpikerBolt.xml index 988dace9d5..c7924ac188 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/NerveSpikerBolt.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/RecipeDef/NerveSpikerBolt.xml @@ -1,11 +1,11 @@ - + - - - + + 制作麻痹毒刺 x10 + 制作麻痹毒刺 x10。 + 正在制作麻痹毒刺。 - - + \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Apparel.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Apparel.xml index 22997bfc7f..ddfe984d61 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Apparel.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Apparel.xml @@ -3,7 +3,7 @@ 护甲 - 电能 - + 护甲抵御电能相关伤害的百分比减伤，比如电磁脉冲和EMP和离子弹的电磁脉冲部分。如果你身体的某个部位数值达到100%或以上则此部位完全免疫该伤害。 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Pawns_Combat.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Pawns_Combat.xml index d23e895670..ccffb28208 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Pawns_Combat.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Pawns_Combat.xml @@ -42,11 +42,6 @@ 挡住近战攻击的几率。当格挡时，装备的武器或盾牌将受到伤害，而不是持用者。如果格挡着成功格挡，他们将自动回击攻击者。\n\n最终的几率取决于对手的招架技能，同等对手将始终有20%的几率格挡。 - - 天然护甲 - - 各种身体部件的特殊护甲值 - 换弹速度 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/23x152mmB.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/23x152mmB.xml index 06f9f28177..475869652a 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/23x152mmB.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/23x152mmB.xml @@ -1,7 +1,7 @@  - + 25x152mmB机炮弹 \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/5x100mmCaseless.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/5x100mmCaseless.xml deleted file mode 100644 index eb652cc13a..0000000000 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/5x100mmCaseless.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - 5x100mm 无壳弹 - - \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/NerveSpikerBolt.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/NerveSpikerBolt.xml index 9324a17543..572da742cc 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/NerveSpikerBolt.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/NerveSpikerBolt.xml @@ -1,7 +1,7 @@ - + - + + 麻痹毒刺 - - + \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/12Gauge.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/12Gauge.xml index 2633fc5296..98c1a72d3f 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/12Gauge.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/12Gauge.xml @@ -24,13 +24,25 @@ 12号径霰弹 (豆弹) + + 12号径霰弹 (豆弹) + 12号径霰弹 (鹿弹) + + 12号径霰弹 (鹿弹) + 12号径霰弹 (EMP弹) + + 12号径霰弹 (EMP弹) + 12号径霰弹 (独头弹) + + 12号径霰弹 (独头弹) + \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/30x29mmGrenade.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/30x29mmGrenade.xml index 98a2e418db..a5248a03f0 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/30x29mmGrenade.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/30x29mmGrenade.xml @@ -18,10 +18,7 @@ 30x29mm 榴弹 (高爆双效弹) - + 相对较小的低速榴弹，用于榴弹发射器。 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/45ACP.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/45ACP.xml index ef050e2648..720eb6e072 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/45ACP.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/45ACP.xml @@ -18,11 +18,17 @@ .45 ACP手枪弹 (穿甲弹) + + 手枪 .45 ACP手枪弹 (全金属被甲弹) + + 手枪 .45 ACP手枪弹 (空尖弹) + + 手枪 \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/57x483mmBofors.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/57x483mmBofors.xml deleted file mode 100644 index c7154b567a..0000000000 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/57x483mmBofors.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - 57x483mm 博福斯机炮弹 (高爆弹) - - 海军炮使用的大口径弹药。 - - - 57x483mm 博福斯机炮弹 (高爆弹) - - \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/5x100mmCaseless.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/5x100mmCaseless.xml deleted file mode 100644 index 3e01b1e2b2..0000000000 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/5x100mmCaseless.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - 5x100mm 无壳弹 (脱壳穿甲弹) - - 一种无须抛壳的弹药，用固体推进剂包裹着细长的弹头。 - - - 5x100mm 无壳弹 (脱壳穿甲弹) - - - 5x100mm 无壳弹 (脱壳穿甲弹) - - - 5x100mm 无壳弹 (毒气弹) - - \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/5x50mmCaseless.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/5x50mmCaseless.xml index 3ed2dfe065..0a002dc58b 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/5x50mmCaseless.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/5x50mmCaseless.xml @@ -3,10 +3,7 @@ 5x50mm 无壳弹 (脱壳穿甲弹) - + 一种长型无壳弹，其中固体推进剂包裹着细长的弹头。 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/80x256mmFuelCell.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/80x256mmFuelCell.xml index e7d74f12e6..298d5a67c9 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/80x256mmFuelCell.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/80x256mmFuelCell.xml @@ -5,7 +5,6 @@ 80x256mm 燃料弹 (燃烧弹) 大型燃料弹，用于发射燃烧弹的加农炮。 - 大型燃料弹，用于发射燃烧弹的加农炮。 80x256mm 燃料弹 (燃烧弹) diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/81mmMortar.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/81mmMortar.xml index fcad8905de..eabcfecd29 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/81mmMortar.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/81mmMortar.xml @@ -4,6 +4,9 @@ 81mm 迫击炮弹 (反粒子) + + 81mm 迫击炮弹 (死灵尘) + 81mm 迫击炮弹 (EMP弹) @@ -25,14 +28,16 @@ 81mm 迫击炮弹 (毒气弹) - - 81mm 迫击炮弹 (死灵尘) - 81mm 迫击炮弹 (反粒子) 用迫击炮发射的低速炮弹。 + + 81mm 迫击炮弹 (死灵尘) + + 用迫击炮发射的低速炮弹。 + 81mm 迫击炮弹 (EMP弹) @@ -68,9 +73,4 @@ 用迫击炮发射的低速炮弹。 - - 81mm 迫击炮弹 (死灵尘) - - 用迫击炮发射的低速炮弹。 - \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/84x246mmR.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/84x246mmR.xml index d1abaef737..1cd4036f33 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/84x246mmR.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/84x246mmR.xml @@ -2,7 +2,7 @@ - 84x246mmR 炮弹 (筒弹) + 84x246mmR 炮弹 (霰弹) 为卡尔·古斯塔夫无后坐力炮设计的无后座力弹药。 @@ -52,7 +52,7 @@ 为卡尔·古斯塔夫无后坐力炮设计的无后座力弹药。 - 84x246mmR 炮弹 (筒弹) + 84x246mmR 炮弹 (霰弹) 84x246mmR 炮弹 (EMP弹) diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/90mmCannon.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/90mmCannon.xml index 20c3148597..d4944cb71d 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/90mmCannon.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/90mmCannon.xml @@ -3,18 +3,12 @@ 90mm 加农炮弹 (穿甲弹) - + 相对较小的加农炮弹。 90mm 加农炮弹 (硬芯穿甲弹) - + 相对较小的加农炮弹。 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/AntiMateriel.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/AntiMateriel.xml index 31d179efae..2c3e654132 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/AntiMateriel.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/AntiMateriel.xml @@ -11,7 +11,7 @@ 重型机枪和反器材步枪使用的大口径子弹。 - + 反器材弹 (高爆弹) 重型机枪和反器材步枪使用的大口径子弹。 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Apparel_Headgear.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Apparel_Headgear.xml index f83745aa4c..21ea94659c 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Apparel_Headgear.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Apparel_Headgear.xml @@ -3,7 +3,7 @@ 高级夜视目镜 - + 一套先进的夜视目镜，在黑暗中战斗时提供详细的全景视野。 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Autocannon.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Autocannon.xml index fb2e63d906..eabc1cf2e2 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Autocannon.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Autocannon.xml @@ -6,7 +6,7 @@ 车载机枪和反坦克步枪使用的大口径弹药 - + 机炮弹 (高爆弹) 车载机枪和反坦克步枪使用的大口径弹药 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Mech_Turrets.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Mech_Turrets.xml deleted file mode 100644 index c9b37e4eea..0000000000 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Mech_Turrets.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - 枪管 - 轻型电荷冲击炮 - - - 枪管 - 地狱火加农炮 - - \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Security_Turrets.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Security_Turrets.xml deleted file mode 100644 index a11648c2e4..0000000000 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Security_Turrets.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - 加农炮 - - - 铀弹加农炮 - - \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Flamethrower.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Flamethrower.xml index ff08929cfc..6de79450c6 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Flamethrower.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Flamethrower.xml @@ -1,16 +1,24 @@  + + 火焰喷射器燃料 (活铁) + + 一种用于火焰喷射器的燃料，燃烧时温度极高，并且不会留下任何燃料残余。/n/含有活铁的浸渍物质能够在细胞层面攻击有机物，干扰再生并削弱组织。 + 火焰喷射器燃料 (凝胶化合燃料) - + 火焰喷射器使用的燃油。 火焰喷射器燃料 (苯基液体燃料) - + 火焰喷射器使用的燃油。 + + 火焰喷射器燃料 (活铁) + 火焰喷射器燃料 (凝胶化合燃料) diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Flamethrower_Burst.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Flamethrower_Burst.xml index ed19841bfe..38fab9a2e1 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Flamethrower_Burst.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Flamethrower_Burst.xml @@ -1,10 +1,13 @@ - + - - - + + + 活铁浸渍 + + 化合燃料凝胶 + + 化合燃料凝胶 - - + \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/LauncherGrenade.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/LauncherGrenade.xml index 9cd038ac6a..f0df308c9d 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/LauncherGrenade.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/LauncherGrenade.xml @@ -11,6 +11,11 @@ 从各种榴弹发射器发射的低速榴弹。 + + 榴弹 (空爆弹) + + 从各种榴弹发射器发射的低速榴弹。 + 榴弹 (高爆双效弹) @@ -21,4 +26,9 @@ 从各种榴弹发射器发射的低速榴弹。 + + 榴弹 (毒气) + + 从各种榴弹发射器发射的低速榴弹。 + \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Mech.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Mech.xml index f71c1e53d5..a26aa0e412 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Mech.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Mech.xml @@ -11,7 +11,7 @@ 用于火炮或者重型武器的大型机械族炮弹。 - + 机械族炮弹 (燃烧弹) 用于火炮或者重型武器的大型机械族炮弹。 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/NerveSpikerBolt.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/NerveSpikerBolt.xml index 86bbad5687..ddd4c2399e 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/NerveSpikerBolt.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/NerveSpikerBolt.xml @@ -1,15 +1,12 @@ - + - - - + + 麻痹毒刺 + 一种活性铁瓷箭矢，箭头涂覆有生物毒素，并专为从麻痹毒弩设计。\n\n虽然制作简单，但这些箭矢质地脆硬，撞击时易变形或断裂，因此无法重复使用。 - - - - + + 麻痹毒刺 - - + \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/PlasmaCannon.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/PlasmaCannon.xml index eca58b0a65..d998504734 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/PlasmaCannon.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/PlasmaCannon.xml @@ -6,6 +6,9 @@ 这是一个充满高压氢气的容器，用于存储气体等离子。 + + 等离子射线 + 等离子体机炮弹 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/RangedNeolithic.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/RangedNeolithic.xml deleted file mode 100644 index bc1cf56eb9..0000000000 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/RangedNeolithic.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - 重标枪 - - \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Rifle.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Rifle.xml index ec6e255967..9162de3257 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Rifle.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Rifle.xml @@ -11,7 +11,7 @@ 用于机枪、狙击步枪和战斗步枪的步枪子弹。 - + 步枪弹 (高爆弹) 用于机枪、狙击步枪和战斗步枪的步枪子弹。 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/RifleIntermediate.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/RifleIntermediate.xml index efa4190999..ed405b85a1 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/RifleIntermediate.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/RifleIntermediate.xml @@ -11,7 +11,7 @@ 中等威力步枪弹，主要用于突击步枪。 - + 中间威力步枪弹 (高爆弹) 中等威力步枪弹，主要用于突击步枪。 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/RifleMagnum.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/RifleMagnum.xml index 0c4280c1b2..7343778c06 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/RifleMagnum.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/RifleMagnum.xml @@ -11,7 +11,7 @@ 大威力步枪弹药，主要用于远程狙击步枪。 - + 马格南步枪弹 (高爆弹) 大威力步枪弹药，主要用于远程狙击步枪。 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Grenades.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Grenades.xml index adcff17b52..d83baeb5df 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Grenades.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Grenades.xml @@ -21,49 +21,34 @@ 爆炸时，伴随著巨大的声响或者闪光，使爆炸范围内的敌人暂时失明和失去方向感，从而短暂丧失反抗能力。 - 身体 - - - 投掷震撼手榴弹 + 弹体 泡沫手榴弹 特种消防手榴弹，撞击时释放出一团灭火用泡沫。 - 身体 - - - 投掷泡沫手榴弹 + 弹体 闪光手榴弹 设计用于产生令人炫目致晕眩的强光，可以致使被攻击目标短暂失明。 - 身体 - - - 投掷闪光手榴弹 + 弹体 烟雾手榴弹 释放大量烟雾，提供隐蔽性以防止被击中。 - 身体 - - - 投掷烟雾手榴弹 + 弹体 棒状炸弹 一种原始的用导火索点燃的炸药，部落最爱使用这种炸弹重击身穿先进装甲的敌人。 - 身体 - - - 投掷棒状炸弹 + 弹体 \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Turrets.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Turrets.xml index 54b03856c5..8e6d3b47e3 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Turrets.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Turrets.xml @@ -2,11 +2,11 @@ - AGS-30榴弹发射器 + AGS-30 榴弹发射器 - 安装在三脚架上的榴弹发射器。 + 安装在三脚架上的 AGS-30榴弹发射器。 - AGS-30榴弹发射器 + AGS-30 榴弹发射器 自动电荷冲击炮塔 @@ -16,18 +16,18 @@ 自动电荷冲击炮塔 - 自动炮塔 + 自动加农炮 - 一种装在炮塔上的自动重机枪，对步兵和轻型车辆有效 + 安装在炮塔上的带有自动供弹机的大口径自动加农炮。 - 自动炮塔 + 自动加农炮 - 电荷冲击炮 + 爆能枪炮塔 - 装在炮塔底座上的电荷冲击炮。 + 安装在炮塔座上的充能爆能枪。 - 电荷冲击炮 + 爆能枪炮塔 轻型电荷冲击炮 @@ -39,14 +39,14 @@ 90mm高射炮 - 安装在固定支架上的90mm 高射炮。 + 安装在固定炮台上的90毫米高射炮。 90mm高射炮 重型机枪塔 - 大口径机枪，安装在底座上。 + 安装在炮塔座上的大口径机枪。 重型机枪塔 @@ -74,15 +74,15 @@ 中型机枪塔 - 一挺全威力弹机枪。 + 安装在炮塔座上的全威力弹机枪。 中型机枪塔 - 自动加农炮塔 + 铀弹加农炮 - 装在炮塔上的自动装填的重型加农炮。 + 安装在炮塔上的带有自动供弹机的铀弹加农炮。远距离精度高，不擅长追踪近距离目标。 - 自动加农炮塔 + 铀弹加农炮 \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ToolCapacityDef/ToolCapacity.xml b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ToolCapacityDef/ToolCapacity.xml new file mode 100644 index 0000000000..eb3114c5f8 --- /dev/null +++ b/Mods/CombatExtended/Languages/ChineseSimplified/DefInjected/ToolCapacityDef/ToolCapacity.xml @@ -0,0 +1,7 @@ + + + + + 划伤 + + \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/AmmoContainerKeyed.xml b/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/AmmoContainerKeyed.xml index 2b25b33d43..e330b42593 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/AmmoContainerKeyed.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/AmmoContainerKeyed.xml @@ -11,6 +11,10 @@ 立即重新装填邻近的炮塔。被禁止的炮塔和当前正在发射的炮塔将被忽略。 + + {0} 需要操作员才能运行。 + + {0} 需要电力才能运行。 ｛0｝在附近找不到任何可装填的｛1｝炮塔。 @@ -24,6 +28,8 @@ 自动装载机将只会装填与携带的弹药类型相同的炮塔。 + + 需要人员操作 剩余重载时间：｛0｝秒 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/Descriptions.xml b/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/Descriptions.xml index c16a972ebb..e91835a775 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/Descriptions.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/Descriptions.xml @@ -15,6 +15,8 @@ 利器穿透 钝器穿透 + + 护甲衰减 弹丸数量 diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/Keys.xml b/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/Keys.xml index 152abd84ec..1a994ca504 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/Keys.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/Keys.xml @@ -77,6 +77,24 @@ 预计命中率 + + + 超出边界 + + 不能以自己为目标 + + 没有视线 + + 被屋顶阻挡 + + 射击被禁止 + + 超出射程 + + 在最小射程内 + + 子弹 + 距离：{0}/{1} 格 @@ -217,13 +235,13 @@ m 武器穿甲系数 - + 技能因素 - + 其他因素 调整的武器 - + 穿透效能系数 每秒输出伤害 @@ -270,6 +288,7 @@ 重整军备 + 未编译的CE开发版本\n\n您正在运行的Combat Extended开发版本，如果您尝试玩殖民地，这将产生大量错误。\n\n请从GitHub的“发布”部分下载官方CE版本，或者如果您需要最新的开发快照进行测试，从下面的链接获取它。 @@ -282,5 +301,11 @@ 此武器没有CE补丁，虽然它可以使用原版的模式射击，但请联系补丁制作者制作兼容性补丁。 没有CE兼容性补丁 + + + + 护盾覆盖范围 + + 由护盾保护免受远程和近战攻击的身体部位。 \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/ModMenu.xml b/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/ModMenu.xml index 3b04ef1868..c92002d5b1 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/ModMenu.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/ModMenu.xml @@ -166,4 +166,36 @@ 载具护甲可以根据相对值降低伤害，但可以被高穿甲攻击穿透。。 + + + + 启用自动补丁程序详细日志 + + 这将启用自动补丁程序的详细日志记录。 + + + 启用服装自动补丁程序 + + 尝试为未打补丁的服装应用合适的服装预设，以调整其护甲值。(不推荐开启) + + + 启用种族自动补丁程序 + + 自动补丁程序将为未打补丁的种族应用预设，以允许基本功能。 + + + 启用武器自动补丁程序 + + 尝试为未打补丁的远程武器应用合适的武器预设。(不推荐开启) + + + 启用武器韧性自动补丁程序 + + 为武器应用自动计算的韧性属性，该属性会影响在近战中使用时武器所受的伤害。 + + + 启用pawnkind自动补丁程序 + + 为装备了已打补丁的远程武器但未打补丁的pawnkind添加少量弹药。 + \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/Wind.xml b/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/Wind.xml index accddd9b6d..218137dde4 100644 --- a/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/Wind.xml +++ b/Mods/CombatExtended/Languages/ChineseSimplified/Keyed/Wind.xml @@ -4,27 +4,27 @@ 无风 - 轻微微风 + 微软风 - 温和微风 + 微和风 - 强劲微风 + 微强风 - 轻风 + 微风 - 温和风 + 和风 强风 - 弱烈风 + 疾风 - 烈风 + 大风 - 强烈风 + 烈风 暴风 - 猛烈暴风 + 狂风 飓风 diff --git a/Mods/CombatExtended/Languages/English/Keyed/Messages.xml b/Mods/CombatExtended/Languages/English/Keyed/Messages.xml index 8f50e13a60..d906df7b51 100644 --- a/Mods/CombatExtended/Languages/English/Keyed/Messages.xml +++ b/Mods/CombatExtended/Languages/English/Keyed/Messages.xml @@ -12,6 +12,6 @@ A group of fighters from {0} have arrived nearby.\n\nThey are preparing to attack in retaliation for the shelling of {1}. Artillery fire incoming from {0} ({1}). - A group from {0} is planning to raid {1} soon in retaliation for recent events. + A group from {0} is planning to raid {1} at {2} soon in retaliation for recent events. \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/Russian/DefInjected/ThingDef/Apparel_Carrying.xml b/Mods/CombatExtended/Languages/Russian/DefInjected/ThingDef/Apparel_Carrying.xml index 0a99271d30..fc233e4166 100644 --- a/Mods/CombatExtended/Languages/Russian/DefInjected/ThingDef/Apparel_Carrying.xml +++ b/Mods/CombatExtended/Languages/Russian/DefInjected/ThingDef/Apparel_Carrying.xml @@ -4,14 +4,10 @@ тактический жилет Разгрузочный жилет с карманами для хранения боеприпасов, и другого снаряжения.\n\nПовышает скорость перезарядки, но довольно громоздкий. - рюкзак - - Удобный и просторный рюкзак для хранения всех видов предметов. - + рюкзак + Удобный и просторный рюкзак для хранения всех видов предметов. - первобытный рюкзак - - Примитивный рюкзак из меха животных, полезен для хранения предметов во время путешествия. - + первобытный рюкзак + Примитивный рюкзак из меха животных, полезен для хранения предметов во время путешествия. \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/Russian/DefInjected/ThingDef/Apparel_Shield.xml b/Mods/CombatExtended/Languages/Russian/DefInjected/ThingDef/Apparel_Shield.xml index 788cfb7288..0f9d75e37a 100644 --- a/Mods/CombatExtended/Languages/Russian/DefInjected/ThingDef/Apparel_Shield.xml +++ b/Mods/CombatExtended/Languages/Russian/DefInjected/ThingDef/Apparel_Shield.xml @@ -1,14 +1,10 @@  - щит ближнего боя - - Простой щит, который может блокировать простые снаряды и удары рукопашным оружием. - + щит ближнего боя + Простой щит, который может блокировать простые снаряды и удары рукопашным оружием. - баллистический щит - - Тяжелый щит, предназначенный для защиты от стрельбы. Он может охватывать большую часть тела пользователя, но не позволяет использовать двуручное оружие. Его тяжелый вес и масса делают его громоздким в бою. - + баллистический щит + Тяжелый щит, предназначенный для защиты от стрельбы. Он может охватывать большую часть тела пользователя, но не позволяет использовать двуручное оружие. Его тяжелый вес и масса делают его громоздким в бою. \ No newline at end of file diff --git a/Mods/CombatExtended/Languages/Russian/DefInjected/ThingDef/Apparel_Various.xml b/Mods/CombatExtended/Languages/Russian/DefInjected/ThingDef/Apparel_Various.xml index e137044530..9df6cfe0f6 100644 --- a/Mods/CombatExtended/Languages/Russian/DefInjected/ThingDef/Apparel_Various.xml +++ b/Mods/CombatExtended/Languages/Russian/DefInjected/ThingDef/Apparel_Various.xml @@ -3,10 +3,8 @@ - композитный бронежилет - - Жилет с бронепластинами, прикрывающими грудь и спину. Композитная керамика обеспечивает лучшую защиту, чем простая сталь, но не так прочна. - + композитный бронежилет + Жилет с бронепластинами, прикрывающими грудь и спину. Композитная керамика обеспечивает лучшую защиту, чем простая сталь, но не так прочна. diff --git a/Mods/CombatExtended/LoadFolders.xml b/Mods/CombatExtended/LoadFolders.xml index 990f7148b9..ad66170e7b 100644 --- a/Mods/CombatExtended/LoadFolders.xml +++ b/Mods/CombatExtended/LoadFolders.xml @@ -11,6 +11,11 @@
  • ModPatches/A Rimworld of Magic
  • ModPatches/ADE Advanced Turrets
    • +
  • ModPatches/ABF Civil Synstructs
    • +
  • ModPatches/ABF Martial Synstructs
    • +
  • ModPatches/ABF Synstruct Biomimetics
    • +
  • ModPatches/ABF Synstructs Core
    • +
  • ModPatches/ABF Utility Synstructs
  • ModPatches/ADE Advanced turrets PLUS
  • ModPatches/ADE Pulse Turrets PLUS
  • ModPatches/ADogSaid
    • @@ -34,9 +39,7 @@
  • ModPatches/Ancient Eastern Armory
  • ModPatches/Ancient Fallout Armory
  • ModPatches/Ancient Human
    • -
  • ModPatches/Android Tiers - TX Series
  • ModPatches/Android Tiers Reforged
    • -
  • ModPatches/Android Tiers SM7 Overhaul
  • ModPatches/Androids
  • ModPatches/Androids Expanded
  • ModPatches/Anima Animals - Community Temp
    • @@ -55,8 +58,8 @@
  • ModPatches/Arasaka Corporation [1.3]
  • ModPatches/Archotech Expanded
  • ModPatches/Archotech Expanded Prosthetics
    • -
  • ModPatches/Archotech PowerArmor
    • -
  • ModPatches/Archotech Weaponry
    • +
  • ModPatches/Archotech PowerArmor
    • +
  • ModPatches/Archotech Weaponry
  • ModPatches/Archotech+
  • ModPatches/Argonians of Blackmarsh
  • ModPatches/Arrow Please
    • @@ -66,9 +69,11 @@
  • ModPatches/Astra Militarum Regimentum - Krieg
  • ModPatches/Astra Militarum Regimentum - Krieg Officer Helmet
  • ModPatches/Auto-Mortars
    • +
  • ModPatches/AV Work Queen
  • ModPatches/Autocleaner
  • ModPatches/Beast Man Tribes
  • ModPatches/Beeralope Squad
    • +
  • ModPatches/Beliar Xenotype
  • ModPatches/Better Wool Production
  • ModPatches/Big and Small - Heaven and Hell
  • ModPatches/Big and Small - MO
    • @@ -101,7 +106,7 @@
  • ModPatches/Charge-Loading Lee-Enfield
  • ModPatches/Civilization Beyond Earth Armor Sets
  • ModPatches/Clay Soldier Race
    • -
  • ModPatches/Colonial Shuttle
    • +
  • ModPatches/Colonial Shuttle
  • ModPatches/Colony Leadership
  • ModPatches/Combat Enthusiast's Collection
  • ModPatches/Comigo's Fancy Floating Turrets
    • @@ -125,6 +130,7 @@
  • ModPatches/Devilstrand Animals
  • ModPatches/Devilstrand Colour Bundle
  • ModPatches/Dinosauria
    • +
  • ModPatches/Diverse Mechanoid War Procedure
  • ModPatches/Divine Order
  • ModPatches/Doom Factions
  • ModPatches/Dragons Descent
    • @@ -140,9 +146,11 @@
  • ModPatches/Edge of Descension - Hovercraft
  • ModPatches/Edge of Descension - Monoblades
  • ModPatches/Edge of Descension - Vanguard
    • +
  • ModPatches/EdoThemedExpansion
  • ModPatches/Eisenhans Power Armor
  • ModPatches/Eltex Bodysuit
  • ModPatches/Enchanted Sword
    • +
  • ModPatches/Epochs - Pyrinth
  • ModPatches/Epona Race
  • ModPatches/Equium
  • ModPatches/Erin's Au Ra
    • @@ -162,8 +170,8 @@
  • ModPatches/Erin's Viera
  • ModPatches/Erin's Wildlife
  • ModPatches/EvolvedOrgansRedux
    • -
  • ModPatches/Exotic Arsenal
    • -
  • ModPatches/Expanded Materials - Metals
    • +
  • ModPatches/Exotic Arsenal
    • +
  • ModPatches/Expanded Materials - Metals
  • ModPatches/Expanded Materials - Plastics
  • ModPatches/Expanded Woodworking
  • ModPatches/Extended Storage
    • @@ -175,7 +183,7 @@
  • ModPatches/FSF Vanilla Bionics Expansion
  • ModPatches/Faction - Mafia
  • ModPatches/Fallout New Vegas - Elite Riot Gear
    • -
  • ModPatches/Fallout Vault 111 Starter Pack
    • +
  • ModPatches/Fallout Vault 111 Starter Pack
  • ModPatches/Fantasy Metals Reforged
  • ModPatches/Farming Expansion
  • ModPatches/FashionRIMsta
    • @@ -197,10 +205,15 @@
  • ModPatches/Gas Traps and Shells
  • ModPatches/Gestalt Engine
  • ModPatches/Giddy-Up 2
    • +
  • ModPatches/GREG
  • ModPatches/GrimWorld Angels of Death
    • +
  • ModPatches/Grimworld Autoguns
  • ModPatches/Grimworld Core Imperialis
  • ModPatches/GrimWorld Hammer of the Imperium
  • ModPatches/GrimWorld Imperial Vehicles
    • +
  • ModPatches/Grimworld Lasguns
    • +
  • ModPatches/Grimworld Melee
    • +
  • ModPatches/GrimWorld Talons of the Emperor
  • ModPatches/Girls Frontline Apparel Pack
  • ModPatches/Girls Frontline Styles 404 Team
  • ModPatches/Girls Frontline Styles AR Team
    • @@ -209,9 +222,6 @@
  • ModPatches/Glitter Weaponry
  • ModPatches/Gloomy Dragonian Race
  • ModPatches/GouRIMet
    • -
  • ModPatches/Grimworld Autoguns
    • -
  • ModPatches/Grimworld Lasguns
    • -
  • ModPatches/Grimworld Melee
  • ModPatches/Gulden Mod
  • ModPatches/Half Dragons
  • ModPatches/Halo - UNSC Armoury
    • @@ -222,6 +232,7 @@
  • ModPatches/High Caliber
  • ModPatches/High Tech Laboratory Facilities
  • ModPatches/Hive Armory
    • +
  • ModPatches/Hyena (Continued)
  • ModPatches/Idhale Race
  • ModPatches/Impact Weaponry
  • ModPatches/Imperial Arsenal Royal Warcasket
    • @@ -231,6 +242,7 @@
  • ModPatches/Infused 2 Expansion
  • ModPatches/Infusion 2
  • ModPatches/Insects have chitin
    • +
  • ModPatches/Ion Weaponry
  • ModPatches/JDS Castle Walls
  • ModPatches/JDS EFT Apparel
  • ModPatches/JDS Exiled Dawn
    • @@ -242,6 +254,7 @@
  • ModPatches/Jin-Roh Kerberos Panzer Cop Armor
  • ModPatches/K4G Empires of Old - Core
  • ModPatches/K4G Empires of Old - Engineers Institute
    • +
  • ModPatches/K4G Empires of Old - The Alekeepers
  • ModPatches/K4G Empires of Old - The Faceless Sultainate
  • ModPatches/K4G Empires of Old - The Polluted Legion
  • ModPatches/K4G Empires of Old - The Rising Sun
    • @@ -250,6 +263,7 @@
  • ModPatches/KV Hand n Footwear
  • ModPatches/Kaiser Armory
  • ModPatches/Kemomimihouse
    • +
  • ModPatches/kemomimihouse Kz
  • ModPatches/Kenshi Armory
  • ModPatches/Kijin 3.0
  • ModPatches/Kill la Kill Styles Pack
    • @@ -276,6 +290,7 @@
  • ModPatches/MH Military Tiers
  • ModPatches/Machines of War
  • ModPatches/Makeshift Melee Weapons
    • +
  • ModPatches/Mantis Race
  • ModPatches/Mantodean Insectoid Race
  • ModPatches/Marilyn the Mincho Worshipper Witch
  • ModPatches/Martens - Nature's Most Adorable Assassins
    • @@ -370,11 +385,16 @@
  • ModPatches/Paniel the Automata
  • ModPatches/Pawnbold Race
  • ModPatches/Penguin
    • +
  • ModPatches/Persona Warcasket Weapons
  • ModPatches/Polarisbloc Core Lab
  • ModPatches/Polarisbloc Security Force
  • ModPatches/Poleepkwa Race
  • ModPatches/Possessed Weapons
  • ModPatches/PowerArmour T-45b
    • +
  • ModPatches/pphhyy Demigryph
    • +
  • ModPatches/pphhyy Expanded Scythers
    • +
  • ModPatches/pphhyy's Lightless Empyrean
    • +
  • ModPatches/pphhyy Sanguinary Animals
  • ModPatches/Pratt WWII Weapons Pack
  • ModPatches/Prestige Specialist Armor
  • ModPatches/Profaned
    • @@ -440,6 +460,7 @@
  • ModPatches/RimFantasy - Medieval Overhaul Edition
  • ModPatches/RimHammer40k -Dreadnought
  • ModPatches/RimNauts 2
    • +
  • ModPatches/Rimrats
  • ModPatches/RimSec-Security
  • ModPatches/RimTraits - General Traits
  • ModPatches/RimTraits - Medieval Talents
    • @@ -466,6 +487,7 @@
  • ModPatches/Rimsenal Xenotype Pack - Askbarn
  • ModPatches/Rimworld - The Dark Descent
  • ModPatches/Risk of Rain UES Contact Light Armory
    • +
  • ModPatches/Robotic Servitude
  • ModPatches/Rockmen Race
  • ModPatches/Roren Race
  • ModPatches/Royal Arsenal
    • @@ -486,6 +508,8 @@
  • ModPatches/Simply More Melee
  • ModPatches/Slime Rancher
  • ModPatches/Solark Race
    • +
  • ModPatches/Spacer Arsenal
    • +
  • ModPatches/Spacer Pack
  • ModPatches/Spacer Shields
  • ModPatches/Spaceworm
  • ModPatches/Spartan Foundry
    • @@ -527,6 +551,7 @@
  • ModPatches/VGP Drinks
  • ModPatches/VGP Garden Fabrics
  • ModPatches/VRE Android Factions
    • +
  • ModPatches/Valorant Weapon Pack
  • ModPatches/Vampire, Demons, and the Undead
  • ModPatches/Vanilla Animals Expanded
  • ModPatches/Vanilla Animals Expanded - Endangered
    • @@ -559,6 +584,7 @@
  • ModPatches/Vanilla Plants Expanded - Mushrooms
  • ModPatches/Vanilla Psycasts Expanded
  • ModPatches/Vanilla Psycasts Expanded - Hemosage
    • +
  • ModPatches/Vanilla Psycasts Expanded - Runesmith
  • ModPatches/Vanilla Races Expanded - Android
  • ModPatches/Vanilla Races Expanded - Archon
  • ModPatches/Vanilla Races Expanded - Fungoid
    • @@ -599,15 +625,16 @@
  • ModPatches/Wall Mounted Turrets
  • ModPatches/WarCasket Barbatos Gundam Addon
  • ModPatches/WarCasket Expanded
    • -
  • ModPatches/Warcasket Persona Weapons
  • ModPatches/Warcaskets - Adeptus Astartes
  • ModPatches/Warhammer - Dryad
  • ModPatches/Warhammer 40.000 - Imperium Materials
  • ModPatches/Warhammer 40.000 - Imperium Weaponry
    • -
  • ModPatches/Warhammer 40k - Genes and Psycasts
    • +
  • ModPatches/Warhammer 40k Genes
    • +
  • ModPatches/Warhammer 40k Factions
  • ModPatches/Waster Toxic Breather
  • ModPatches/Weapons+
  • ModPatches/Windows
    • +
  • ModPatches/Xen's Spirit Wolf
  • ModPatches/Xenn
  • ModPatches/Xenohumans
  • ModPatches/Xenohumans - Anthromorphs
    • @@ -615,13 +642,7 @@
  • ModPatches/Xenoorca Race
  • ModPatches/YetAnotherProsthetics - Core
  • ModPatches/Zombieland
    • -
  • ModPatches/kemomimihouse Kz
    • -
  • ModPatches/pphhyy Demigryph
    • -
  • ModPatches/pphhyy Expanded Scythers
    • -
  • ModPatches/pphhyy Sanguinary Animals
    • -
  • ModPatches/pphhyy's Lightless Empyrean
    • -
  • ModPatches/EdoThemedExpansion
    • - +
  • ModPatches/Multiplayer
  • ModPatches/SRTS
  • ModPatches/VehicleFramework
    • diff --git a/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Animal_Insect/Beetlelike.xml b/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Animal_Insect/Beetlelike.xml index 24eef2a1de..ad320aaf11 100644 --- a/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Animal_Insect/Beetlelike.xml +++ b/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Animal_Insect/Beetlelike.xml @@ -70,6 +70,23 @@     + + Defs/BodyDef[defName="BeetleLike"]/corePart/parts/li[def="InsectLeg"]/groups + + Defs/BodyDef[defName="BeetleLike"]/corePart/parts/li[def="InsectLeg"] + + + + + + + + Defs/BodyDef[defName="BeetleLike"]/corePart/parts/li[def="InsectLeg"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + @@ -137,4 +154,21 @@ + + Defs/BodyDef[defName="BeetleLikeWithClaw"]/corePart/parts/li[def="InsectLeg"]/groups + + Defs/BodyDef[defName="BeetleLikeWithClaw"]/corePart/parts/li[def="InsectLeg"] + + + + + + + + Defs/BodyDef[defName="BeetleLikeWithClaw"]/corePart/parts/li[def="InsectLeg"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + \ No newline at end of file diff --git a/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalCentipede.xml b/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalCentipede.xml index 48d9271d39..b98a2467d4 100644 --- a/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalCentipede.xml +++ b/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalCentipede.xml @@ -25,6 +25,36 @@ + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/groups @@ -91,26 +121,47 @@ - + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/groups - -
  • CoveredByNaturalArmor
    • -     -     + +
  • CoveredByNaturalArmor
    • +     +     - + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/groups - -
  • CoveredByNaturalArmor
    • -     -     + +
  • CoveredByNaturalArmor
    • +     +     - + Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/groups - -
  • CoveredByNaturalArmor
    • -     -     + +
  • CoveredByNaturalArmor
    • +     +     Defs/BodyDef[defName="MechanicalCentipede"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/parts/li[def="MechanicalCentipedeBodyThirdRing"]/parts/li[def="MechanicalCentipedeBodyFourthRing"]/parts/li[def="MechanicalCentipedeBodyFifthRing"]/groups diff --git a/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalTermite.xml b/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalTermite.xml index cfd3575a6c..2f96e75890 100644 --- a/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalTermite.xml +++ b/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalTermite.xml @@ -25,6 +25,65 @@ + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalTermiteBodySecondRing"]/groups @@ -61,6 +120,27 @@ + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="MechanicalTermite"]/corePart/parts/li[def="MechanicalTermiteBodySecondRing"]/groups diff --git a/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Mechanoid/Pikeman.xml b/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Mechanoid/Pikeman.xml index b10045caa9..2d8d09a853 100644 --- a/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Mechanoid/Pikeman.xml +++ b/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Mechanoid/Pikeman.xml @@ -35,6 +35,36 @@ + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalLeg"]/groups @@ -98,6 +128,27 @@ + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="Pikeman"]/corePart/parts/li[def="MechanicalLeg"]/groups diff --git a/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Mechanoid/Scyther.xml b/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Mechanoid/Scyther.xml index 874f4aba12..96279b3334 100644 --- a/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Mechanoid/Scyther.xml +++ b/Mods/CombatExtended/Patches/Core/Bodies/Bodies_Mechanoid/Scyther.xml @@ -35,6 +35,36 @@ + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + + + + + + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + + + + + + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + + + + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalShoulder"]/groups @@ -108,6 +138,27 @@ + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="Scyther" or defName="Lancer"]/corePart/parts/li[def="MechanicalShoulder"]/groups diff --git a/Mods/CombatExtended/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.txt b/Mods/CombatExtended/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.txt index 53efcc9659..0deb6664d5 100644 --- a/Mods/CombatExtended/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.txt +++ b/Mods/CombatExtended/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.txt @@ -57,7 +57,17 @@ - --> + + + + Defs/HediffDef[defName="PowerClaw"]/stages/li/capMods + + + -0.37 + -0.03 + + + diff --git a/Mods/CombatExtended/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml b/Mods/CombatExtended/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml index af2a339b89..9abdbd9216 100644 --- a/Mods/CombatExtended/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml +++ b/Mods/CombatExtended/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml @@ -123,15 +123,16 @@ 1.39 0.49 0.7 - 0.18 - 1.27 - 2.41 + 0.16 + 1.39 + 2.79 - 7000 + 4500 - 30 + 25 + 5 2 @@ -166,8 +167,8 @@ Defs/ThingDef[defName="Gun_Revolver"]
  • - 1.00,1.00 - 0.0,0.0 + 1.00,1.00 + 0.0,-0.04 true true 20 @@ -226,12 +227,18 @@ BlowbackOperation + + Defs/ThingDef[defName="Gun_Autopistol"]/graphicData + + (0.9,0.9) + + + Defs/ThingDef[defName="Gun_Autopistol"]
  • - 0.93,0.93 - 0.0,0.0 + 0.0,-0.04
    • @@ -281,12 +288,18 @@ Gunsmithing + + Defs/ThingDef[defName="Gun_PumpShotgun"]/graphicData + + (1.2,1.2) + + + Defs/ThingDef[defName="Gun_PumpShotgun"]
  • - 1.03,1.25 - 0.05,0.0 + 0.1,0.0
    • @@ -342,12 +355,18 @@ GasOperation + + Defs/ThingDef[defName="Gun_ChainShotgun"]/graphicData + + (1.1,1.1) + + + Defs/ThingDef[defName="Gun_ChainShotgun"]
  • - 1.04,1.23 - 0.05,-0.05 + 0.06,0.0 0,0.2 -30
    • @@ -399,12 +418,18 @@ false     + + Defs/ThingDef[defName="Gun_BoltActionRifle"]/graphicData + + (1.3,1.3) + + + Defs/ThingDef[defName="Gun_BoltActionRifle"]
  • - 1.3,1.3 - 0.12,0.04 + 0.18,0.01 -0.1,0.1
    • @@ -457,11 +482,17 @@ PrecisionRifling     + + Defs/ThingDef[defName="Gun_AssaultRifle"]/graphicData + + (1.2,1.2) + + + Defs/ThingDef[defName="Gun_AssaultRifle"]
  • - 1.16,1.16 0.08,0.0 -0.05,0
    • @@ -513,13 +544,19 @@ false     + + Defs/ThingDef[defName="Gun_SniperRifle"]/graphicData + + (1.35,1.35) + + + Defs/ThingDef[defName="Gun_SniperRifle"]
  • - 1.25,1.45 - 0.15,-0.05 - -0.3,0.1 + 0.2,0.0 + -0.1,0.04
    • @@ -572,12 +609,18 @@ BlowbackOperation + + Defs/ThingDef[defName="Gun_MachinePistol"]/graphicData + + (0.84,0.84) + + + Defs/ThingDef[defName="Gun_MachinePistol"]
  • - 0.84,0.84 - -0.10,-0.07 + -0.1,-0.1 0.1,0.1 -30
    • @@ -636,9 +679,8 @@ Defs/ThingDef[defName="Gun_HeavySMG"]
  • - 0.85,0.85 - 0.00,-0.03 - 0.1,0 + 0.0,0.0 + 0.08,0.01
    • @@ -702,11 +744,17 @@ + + Defs/ThingDef[defName="Gun_IncendiaryLauncher"]/graphicData + + (1.16,1.16) + + + Defs/ThingDef[defName="Gun_IncendiaryLauncher"]
  • - 1.16,1.16 0.1,-0.05
    • @@ -766,11 +814,17 @@ false     + + Defs/ThingDef[defName="Gun_LMG"]/graphicData + + (1.35,1.35) + + + Defs/ThingDef[defName="Gun_LMG"]
  • - 1.35,1.18 0.13,-0.03
    • @@ -826,12 +880,18 @@ ChargedShot     + + Defs/ThingDef[defName="Gun_ChargeRifle"]/graphicData + + (1.03,1.03) + + + Defs/ThingDef[defName="Gun_ChargeRifle"]
  • - 1.03,1.03 - 0.05,0.0 + 0.06,0.01
    • @@ -947,7 +1007,6 @@ Defs/ThingDef[defName="Gun_Minigun"]
  • - 1.00,1.00 0.1,-0.15 -0.2,-0.1 -30 @@ -1061,11 +1120,17 @@ false + + Defs/ThingDef[defName="Gun_DoomsdayRocket"]/graphicData + + (1.45,1.45) + + + Defs/ThingDef[defName="Gun_DoomsdayRocket"]
  • - 1.45,1.45 -0.15,0
    • @@ -1165,11 +1230,17 @@ false + + Defs/ThingDef[defName="Gun_TripleRocket"]/graphicData + + (1.16,1.16) + + + Defs/ThingDef[defName="Gun_TripleRocket"]
  • - 1.16,1.16 -0.25,0
    • diff --git a/Mods/CombatExtended/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml b/Mods/CombatExtended/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml index 3df9f719f9..ceef773ed2 100644 --- a/Mods/CombatExtended/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml +++ b/Mods/CombatExtended/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml @@ -17,13 +17,6 @@     - - Defs/PawnKindDef[defName="Mech_Pikeman"]/combatPower - - 180 - - - Defs/PawnKindDef[ defName="Mech_Lancer" or @@ -99,17 +92,19 @@
  • - false 0.25
  • SightSensor
    • +
  • HearingSensor
    • +
  • SmellSensor
  • - false 0.25
  • SightSensor
    • +
  • HearingSensor
    • +
  • SmellSensor
    • @@ -117,13 +112,6 @@     - - Defs/ThingDef[@Name="BaseMechanoid"]/statBases - - 0 - - - diff --git a/Mods/CombatExtended/Patches/Core/ThinkTreeDefs/Humanlike.xml b/Mods/CombatExtended/Patches/Core/ThinkTreeDefs/Humanlike.xml index 4e974d3085..c96f19cc2b 100644 --- a/Mods/CombatExtended/Patches/Core/ThinkTreeDefs/Humanlike.xml +++ b/Mods/CombatExtended/Patches/Core/ThinkTreeDefs/Humanlike.xml @@ -52,10 +52,4 @@ Prepend - - \ No newline at end of file diff --git a/Mods/CombatExtended/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml b/Mods/CombatExtended/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml index 75964f91c8..814434f06f 100644 --- a/Mods/CombatExtended/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml +++ b/Mods/CombatExtended/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml @@ -3,6 +3,18 @@ + + Defs/HediffDef[defName="DrillArm"]/stages/li/statOffsets + + -0.37 + -0.03 + + + + + Defs/HediffDef[defName="DrillArm"]/stages/li/capMods + + Defs/HediffDef[defName="DrillArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools @@ -24,6 +36,18 @@ + + Defs/HediffDef[defName="FieldHand"]/stages/li/statOffsets + + -0.37 + -0.03 + + + + + Defs/HediffDef[defName="FieldHand"]/stages/li/capMods + + Defs/HediffDef[defName="FieldHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools diff --git a/Mods/CombatExtended/Sounds/Shot/Shot_AssaultRifleSlow.ogg b/Mods/CombatExtended/Sounds/Shot/Shot_AssaultRifleSlow.ogg index aad7dbd1b2..d6fdde70d6 100644 Binary files a/Mods/CombatExtended/Sounds/Shot/Shot_AssaultRifleSlow.ogg and b/Mods/CombatExtended/Sounds/Shot/Shot_AssaultRifleSlow.ogg differ diff --git a/Mods/CombatExtended/Sounds/Shot/Shot_BattleRifle.ogg b/Mods/CombatExtended/Sounds/Shot/Shot_BattleRifle.ogg index eac1a04e9d..5c5e4f46c8 100644 Binary files a/Mods/CombatExtended/Sounds/Shot/Shot_BattleRifle.ogg and b/Mods/CombatExtended/Sounds/Shot/Shot_BattleRifle.ogg differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_a.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_a.png new file mode 100644 index 0000000000..ead2c749bc Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_a.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_b.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_b.png new file mode 100644 index 0000000000..fee8cc975c Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_b.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_c.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_c.png new file mode 100644 index 0000000000..4e8d88908f Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_c.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_a.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_a.png new file mode 100644 index 0000000000..baa683bf43 Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_a.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_b.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_b.png new file mode 100644 index 0000000000..24d847f920 Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_b.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_c.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_c.png new file mode 100644 index 0000000000..4814c62ffe Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_c.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_a.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_a.png new file mode 100644 index 0000000000..d1371702bd Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_a.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_b.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_b.png new file mode 100644 index 0000000000..71acf6b804 Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_b.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_c.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_c.png new file mode 100644 index 0000000000..70e4b0df2e Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_c.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_a.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_a.png new file mode 100644 index 0000000000..883b13d010 Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_a.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_b.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_b.png new file mode 100644 index 0000000000..8727e1e7d6 Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_b.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_c.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_c.png new file mode 100644 index 0000000000..cb84da8a11 Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_c.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_a.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_a.png new file mode 100644 index 0000000000..c8607fcb8d Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_a.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_b.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_b.png new file mode 100644 index 0000000000..a96dacd8ee Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_b.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_c.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_c.png new file mode 100644 index 0000000000..ae120f5a86 Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_c.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_a.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_a.png new file mode 100644 index 0000000000..6ba9ba57e4 Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_a.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_b.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_b.png new file mode 100644 index 0000000000..a1bf7d0fba Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_b.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_c.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_c.png new file mode 100644 index 0000000000..96a5a67859 Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_c.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_a.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_a.png index 3052ff1564..ead2c749bc 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_a.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_a.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_b.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_b.png index 0920c1c9b6..f09cfa7f8c 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_b.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_b.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_c.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_c.png index 4367f595a7..f7b8034fdf 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_c.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_c.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_a.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_a.png index 9b0e7ea3e4..baa683bf43 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_a.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_a.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_b.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_b.png index 47c3daa822..6a935df147 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_b.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_b.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_c.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_c.png index ba5b30e60c..c8a59a59a8 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_c.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_c.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_a.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_a.png index f5ce4bbccb..d1371702bd 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_a.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_a.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_b.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_b.png index aa779ed041..14a8f119d7 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_b.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_b.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_c.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_c.png index 735faddad5..454975616a 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_c.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_c.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_a.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_a.png index d0aa1af2ed..883b13d010 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_a.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_a.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_b.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_b.png index be2ca9e84e..ba688c0f71 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_b.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_b.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_c.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_c.png index 4d447bd986..1481e49792 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_c.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_c.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_a.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_a.png index b9a190d19b..c8607fcb8d 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_a.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_a.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_b.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_b.png index 462d355171..28f597df67 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_b.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_b.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_c.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_c.png index 34736904b4..d8d8db5b59 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_c.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_c.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_a.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_a.png index 2484643535..6ba9ba57e4 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_a.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_a.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_b.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_b.png index 868f1d99f5..287ccdc89b 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_b.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_b.png differ diff --git a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_c.png b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_c.png index a38ce254bf..45cfe9dc30 100644 Binary files a/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_c.png and b/Mods/CombatExtended/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_c.png differ diff --git a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Autopistol.png b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Autopistol.png index 66af911053..7be41f8038 100644 Binary files a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Autopistol.png and b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Autopistol.png differ diff --git a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/ChainShotgun.png b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/ChainShotgun.png index c464a3c706..3313359bc0 100644 Binary files a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/ChainShotgun.png and b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/ChainShotgun.png differ diff --git a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/ChargeRifle.png b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/ChargeRifle.png index 0242cad62e..071412e3c4 100644 Binary files a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/ChargeRifle.png and b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/ChargeRifle.png differ diff --git a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/HeavySMG.png b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/HeavySMG.png index 6d4ca63a95..e5db4029ad 100644 Binary files a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/HeavySMG.png and b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/HeavySMG.png differ diff --git a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/IncendiaryLauncher.png b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/IncendiaryLauncher.png index e0b1d74bd4..7745e1e8f9 100644 Binary files a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/IncendiaryLauncher.png and b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/IncendiaryLauncher.png differ diff --git a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Incinerator.png b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Incinerator.png new file mode 100644 index 0000000000..2fa2c3f9bc Binary files /dev/null and b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Incinerator.png differ diff --git a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/MachinePistol.png b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/MachinePistol.png index d5f7c921a0..37bec74c2c 100644 Binary files a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/MachinePistol.png and b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/MachinePistol.png differ diff --git a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Minigun.png b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Minigun.png index 4b28cad9ea..1c7b6bcc29 100644 Binary files a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Minigun.png and b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Minigun.png differ diff --git a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Revolver.png b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Revolver.png index e979769563..d90809367d 100644 Binary files a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Revolver.png and b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Revolver.png differ diff --git a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Shotgun.png b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Shotgun.png index f6d928f4b1..1ef850146c 100644 Binary files a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Shotgun.png and b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/Shotgun.png differ diff --git a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/SniperRifle.png b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/SniperRifle.png index d41bb1c2be..09f0179d36 100644 Binary files a/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/SniperRifle.png and b/Mods/CombatExtended/Textures/Things/Item/Equipment/WeaponRanged/SniperRifle.png differ diff --git a/Mods/CombatExtended/Textures/Things/Weapons/MechanoidMinigun.png b/Mods/CombatExtended/Textures/Things/Weapons/MechanoidMinigun.png index e7201995e6..de974a1340 100644 Binary files a/Mods/CombatExtended/Textures/Things/Weapons/MechanoidMinigun.png and b/Mods/CombatExtended/Textures/Things/Weapons/MechanoidMinigun.png differ diff --git a/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_a.png b/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_a.png new file mode 100644 index 0000000000..d2896f782e Binary files /dev/null and b/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_a.png differ diff --git a/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_b.png b/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_b.png new file mode 100644 index 0000000000..b614607061 Binary files /dev/null and b/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_b.png differ diff --git a/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_c.png b/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_c.png new file mode 100644 index 0000000000..6afa5f1daf Binary files /dev/null and b/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_c.png differ diff --git a/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_a.png b/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_a.png new file mode 100644 index 0000000000..d082b5ff52 Binary files /dev/null and b/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_a.png differ diff --git a/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_b.png b/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_b.png new file mode 100644 index 0000000000..cb64e5d00e Binary files /dev/null and b/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_b.png differ diff --git a/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_c.png b/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_c.png new file mode 100644 index 0000000000..3322ca4dcb Binary files /dev/null and b/Mods/CombatExtended/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_c.png differ diff --git a/Mods/Core_SK/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml b/Mods/Core_SK/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml index fc6867b39e..4f5561a091 100644 --- a/Mods/Core_SK/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml +++ b/Mods/Core_SK/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml @@ -1,23 +1,26 @@ - - Defs/ThingDef[defName="Mech_Legionary" or defName="Mech_Tesseron"]/comps/li[@Class="CombatExtended.CompProperties_ArmorDurability"] + + Defs/ThingDef[defName="Mech_Legionary" or defName="Mech_Tesseron"]/comps - 1000 - true - 1250 - 5 - true - - 6 - 6 - - 300 - 200 - true - 100 - 0.75 +
  • + 1000 + true + 1250 + 5 + true + + 6 + 6 + + 300 + 200 + true + 100 + 0.75 +
    • +     diff --git a/Mods/Core_SK/Patches/CombatExtended/Ammo/Shell/155mmHowitzer.xml b/Mods/Core_SK/Patches/CombatExtended/Ammo/Shell/155mmHowitzer.xml index db11e16f08..748adb2ae7 100644 --- a/Mods/Core_SK/Patches/CombatExtended/Ammo/Shell/155mmHowitzer.xml +++ b/Mods/Core_SK/Patches/CombatExtended/Ammo/Shell/155mmHowitzer.xml @@ -1,6 +1,9 @@ + + Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_155mmHowitzerShell" or defName="AmmoSet_155mmHowitzerShell_directfire"]/similarTo + Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_155mmHowitzerShell" or defName="AmmoSet_155mmHowitzerShell_directfire"] /ammoTypes/*[name()="Ammo_155mmHowitzerShell_Smoke" or diff --git a/Mods/Core_SK/Patches/CombatExtended/Ammo/Shell/81mmMortar.xml b/Mods/Core_SK/Patches/CombatExtended/Ammo/Shell/81mmMortar.xml index 3051704639..3f09aca3f9 100644 --- a/Mods/Core_SK/Patches/CombatExtended/Ammo/Shell/81mmMortar.xml +++ b/Mods/Core_SK/Patches/CombatExtended/Ammo/Shell/81mmMortar.xml @@ -1,6 +1,9 @@ + + Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_81mmMortarShell"]/similarTo + Defs/ThingDef[@Name="81mmMortarShellBase"]/statBases diff --git a/Mods/Core_SK/Patches/CombatExtended/ThingDefs_Buildings/Buildings_Security.xml b/Mods/Core_SK/Patches/CombatExtended/ThingDefs_Buildings/Buildings_Security.xml index 3e0d7ae9f2..0105661012 100644 --- a/Mods/Core_SK/Patches/CombatExtended/ThingDefs_Buildings/Buildings_Security.xml +++ b/Mods/Core_SK/Patches/CombatExtended/ThingDefs_Buildings/Buildings_Security.xml @@ -114,6 +114,7 @@
  • Mortars
    • 14 +