diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f314aa9c7f..e67d14c72c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,21 +12,23 @@ jobs: - uses: actions/checkout@v3 - name: prebuild run: | - rm -rf AssemblyPublicizer + rm -rf AssemblyPublicizer csc.zip csc git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer mkdir -p Assemblies mkdir -p ${{ runner.temp }}/downloads + wget https://github.com/CombatExtended-Continued/roslyn/releases/download/CSC-13/csc.zip + unzip csc.zip - name: remove loader run: | rm Assemblies/CombatExtendedLoader.dll - name: build core run: | - TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer + TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer --csc $PWD/csc - name: build compat run: | - TEMP=${{ runner.temp }}/ python BuildCompat.py + TEMP=${{ runner.temp }}/ python BuildCompat.py --csc $PWD/csc - name: package run: | diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 5196edc729..cf54dd0713 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -22,12 +22,15 @@ jobs: git config --global user.name "GitHub Actions" git pull --no-ff --no-commit --allow-unrelated-histories -X theirs origin pull/${{ github.event.pull_request.number }}${{ github.event.inputs.PR }}/head: git status + rm -rf *.py *.so ./*/*.py ./*/*.so wget https://raw.githubusercontent.com/CombatExtended-Continued/CombatExtended/Development/Make.py -O Make.py wget https://raw.githubusercontent.com/CombatExtended-Continued/CombatExtended/Development/BuildCompat.py -O BuildCompat.py mkdir -p Assemblies mkdir -p ${{ runner.temp }}/downloads - rm -rf AssemblyPublicizer + rm -rf AssemblyPublicizer csc.zip csc git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer + wget https://github.com/CombatExtended-Continued/roslyn/releases/download/CSC-13/csc.zip + unzip csc.zip - name: remove loader run: | @@ -35,11 +38,11 @@ jobs: - name: build core run: | - TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer + TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer --csc $PWD/csc - name: build compat run: | - TEMP=${{ runner.temp }}/ python BuildCompat.py + TEMP=${{ runner.temp }}/ python BuildCompat.py --csc $PWD/csc - name: package run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 50669e0cd7..da305ae8ea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,20 +13,21 @@ jobs: - uses: actions/checkout@v2 - name: prebuild run: | - rm -rf AssemblyPublicizer + rm -rf AssemblyPublicizer csc csc.zip git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer mkdir -p Assemblies mkdir -p ${{ runner.temp }}/downloads - + wget https://github.com/CombatExtended-Continued/roslyn/releases/download/CSC-13/csc.zip + unzip csc.zip - name: remove loader run: | rm Assemblies/CombatExtendedLoader.dll - name: build core run: | - TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer + TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer --csc $PWD/csc - name: build compat run: | - TEMP=${{ runner.temp }}/ python BuildCompat.py + TEMP=${{ runner.temp }}/ python BuildCompat.py --csc $PWD/csc - name: package run: | mkdir CombatExtended diff --git a/About/About.xml b/About/About.xml index 6c6b4c9aa5..e146cfedd5 100644 --- a/About/About.xml +++ b/About/About.xml @@ -1,4 +1,4 @@ - + Combat Extended @@ -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.1.0\n\nExtends combat mechanics to make them deeper and more tactical. UI/Icons/CE_ModIcon_JustHat
  • @@ -24,6 +24,7 @@
  • jelly.ProperShotguns
  • swedishmask.ProperShotgunsPatch
  • me.samboycoding.betterloading
    • +
  • me.samboycoding.betterloading.dev
  • majorhoff.rimthreaded
  • falconne.AFF
  • Sk.FlankingBonus
    • @@ -55,7 +56,7 @@
  • TheKingInYellow.Lope
  • Ludeon.RimWorld
  • Ludeon.RimWorld.Royalty
    • -
  • Ludeon.RimWorld.Anomaly
    • +
  • Ludeon.RimWorld.Anomaly
  • RunneLatki.RabbieRaceMod
  • HC.GiantRace
  • neronix17.fr.compilation
    • diff --git a/Anomaly/Patches/Hediffs/Hediffs_Misc.xml b/Anomaly/Patches/Hediffs/Hediffs_Misc.xml new file mode 100644 index 0000000000..3914a81e2f --- /dev/null +++ b/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/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml b/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml index ecff3d999f..7c98a593da 100644 --- a/Anomaly/Patches/ThingDefs_Misc/Weapons_Ranged.xml +++ b/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/Anomaly/Patches/ThingDefs_Races/Races_Entities_Misc.xml b/Anomaly/Patches/ThingDefs_Races/Races_Entities_Misc.xml index 425c982327..92cf8dc35f 100644 --- a/Anomaly/Patches/ThingDefs_Races/Races_Entities_Misc.xml +++ b/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/Anomaly/Patches/ThingDefs_Races/Races_Fleshbeasts.xml b/Anomaly/Patches/ThingDefs_Races/Races_Fleshbeasts.xml index 9b688c5ac0..9f5d49ceeb 100644 --- a/Anomaly/Patches/ThingDefs_Races/Races_Fleshbeasts.xml +++ b/Anomaly/Patches/ThingDefs_Races/Races_Fleshbeasts.xml @@ -5,7 +5,7 @@ Defs/ThingDef[@Name="BaseFleshbeast"]/statBases 0.5 - 99 + 0.99 diff --git a/Assemblies/CombatExtendedLoader.dll b/Assemblies/CombatExtendedLoader.dll index 225ee26087..f856aab14a 100644 Binary files a/Assemblies/CombatExtendedLoader.dll and b/Assemblies/CombatExtendedLoader.dll differ diff --git a/Biotech/Patches/Bodies/Bodies_Mechanoid_Heavy.xml b/Biotech/Patches/Bodies/Bodies_Mechanoid_Heavy.xml index 9f4582c70a..1350d359fd 100644 --- a/Biotech/Patches/Bodies/Bodies_Mechanoid_Heavy.xml +++ b/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/Biotech/Patches/Bodies/Bodies_Mechanoid_Light.xml b/Biotech/Patches/Bodies/Bodies_Mechanoid_Light.xml index 40f46197be..3b281d88fa 100644 --- a/Biotech/Patches/Bodies/Bodies_Mechanoid_Light.xml +++ b/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/Biotech/Patches/Bodies/Bodies_Mechanoid_Medium.xml b/Biotech/Patches/Bodies/Bodies_Mechanoid_Medium.xml index e14d0d635d..ae3ff1dfed 100644 --- a/Biotech/Patches/Bodies/Bodies_Mechanoid_Medium.xml +++ b/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/Biotech/Patches/Bodies/Mech_Centurion.xml b/Biotech/Patches/Bodies/Mech_Centurion.xml index 9d9ac67e07..4cae99a1ed 100644 --- a/Biotech/Patches/Bodies/Mech_Centurion.xml +++ b/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/Biotech/Patches/Bodies/Mech_Diabolus.xml b/Biotech/Patches/Bodies/Mech_Diabolus.xml index d5b47813d2..b903b9b392 100644 --- a/Biotech/Patches/Bodies/Mech_Diabolus.xml +++ b/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/Biotech/Patches/Bodies/Mech_Warqueen.xml b/Biotech/Patches/Bodies/Mech_Warqueen.xml index 867429d5fc..f718588640 100644 --- a/Biotech/Patches/Bodies/Mech_Warqueen.xml +++ b/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/Biotech/Patches/ThingDefs_Misc/Apparel_BiotechHeadgear.xml b/Biotech/Patches/ThingDefs_Misc/Apparel_BiotechHeadgear.xml index 6e48e4dd01..9c978ae7f7 100644 --- a/Biotech/Patches/ThingDefs_Misc/Apparel_BiotechHeadgear.xml +++ b/Biotech/Patches/ThingDefs_Misc/Apparel_BiotechHeadgear.xml @@ -165,6 +165,16 @@ + + Defs/ThingDef[defName="Apparel_GasMask"]/apparel/tags + + +
  • IndustrialMilitaryBasic
    • +
  • GasMask
    • +     +     +     + Defs/ThingDef[defName="Apparel_ClothMask"]/statBases @@ -197,4 +207,4 @@ - \ No newline at end of file + diff --git a/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Heavy.xml b/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Heavy.xml index 4c0f81270d..2298e5fd2f 100644 --- a/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Heavy.xml +++ b/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Heavy.xml @@ -118,7 +118,7 @@ 200 true 250 - 0.75 + 0.5 diff --git a/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Light.xml b/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Light.xml index cb20fdca7d..0add1c9e9d 100644 --- a/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Light.xml +++ b/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Light.xml @@ -143,7 +143,7 @@ 200 true 70 - 0.75 + 0.5 @@ -315,7 +315,7 @@ 200 true 50 - 0.75 + 0.5 @@ -371,7 +371,7 @@ 200 true 100 - 0.75 + 0.5 diff --git a/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml b/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml index 9b68f11baa..728cabe408 100644 --- a/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml +++ b/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.75 -
    • -     -     - @@ -224,7 +202,7 @@ 200 true 100 - 0.75 + 0.5 diff --git a/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_SuperHeavy.xml b/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_SuperHeavy.xml index 023b0e16dc..0a70982ee8 100644 --- a/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_SuperHeavy.xml +++ b/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_SuperHeavy.xml @@ -160,8 +160,6 @@ true 310 0.5 - 14 - 35 @@ -260,8 +258,6 @@ true 330 0.5 - 14 - 35 @@ -354,8 +350,6 @@ true 460 0.5 - 14 - 35 @@ -433,8 +427,6 @@ true 425 0.5 - 14 - 35 diff --git a/BuildCompat.py b/BuildCompat.py index caf130e938..8fcc6dd5a7 100644 --- a/BuildCompat.py +++ b/BuildCompat.py @@ -10,6 +10,8 @@ parallel = '-j' in sys.argv +csc = sys.argv[sys.argv.index("--csc") + 1] + PROJECT_PATTERN = re.compile(r'''Project.".[0-9A-Za-z]{8}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{12}.". = ''' r'''"([0-9a-zA-Z]+Compat)", ''' r'''"([0-9A-zA-Z\/]+.csproj)", ''' @@ -52,7 +54,7 @@ def system(*cmd): output = od.child(name+".dll") print(f"Building {name}") - system("python3", "Make.py", "--csproj", csproj.path, "--output", output.path, DOWNLOAD_LIBS, "--all-libs", "--publicizer", PUBLICIZER, "--", "-r:Assemblies/CombatExtended.dll") + system("python3", "Make.py", "--csproj", csproj.path, "--output", output.path, DOWNLOAD_LIBS, "--all-libs", "--publicizer", PUBLICIZER, "--csc", csc, "--", "-r:Assemblies/CombatExtended.dll") for t in tasks: t.wait() diff --git a/Defs/Ammo/Advanced/164x284mmDemoShell.xml b/Defs/Ammo/Advanced/164x284mmDemoShell.xml index 5d10b87abd..a210789b2c 100644 --- a/Defs/Ammo/Advanced/164x284mmDemoShell.xml +++ b/Defs/Ammo/Advanced/164x284mmDemoShell.xml @@ -33,6 +33,7 @@ 25
  • CE_AutoEnableTrade_Sellable
    • +
  • CE_AutoEnableCrafting_FabricationBench
    •  diff --git a/Defs/Ammo/Advanced/30x64mmFuelCell.xml b/Defs/Ammo/Advanced/30x64mmFuelCell.xml index cbdd232a0b..ef38f1e2d3 100644 --- a/Defs/Ammo/Advanced/30x64mmFuelCell.xml +++ b/Defs/Ammo/Advanced/30x64mmFuelCell.xml @@ -46,7 +46,7 @@ Graphic_StackCount - 4.66 + 6.69 IncendiaryFuel @@ -59,7 +59,7 @@ Graphic_StackCount - 6.18 + 10.1 ThermobaricFuel @@ -72,7 +72,7 @@ Graphic_StackCount - 4.93 + 7.22 FoamFuel 0 @@ -98,8 +98,8 @@ PrometheumFlame - 6 - 4.5 + 10 + 6 FilthPrometheum 0.2 true @@ -111,9 +111,9 @@ CombatExtended.ProjectileCE_Explosive - 2.0 + 2.5 Thermobaric - 48 + 78 MortarBomb_Explode true true @@ -128,7 +128,7 @@ Extinguish 0.0 0.0 - 3 + 4 Filth_FireFoam 1 @@ -157,7 +157,7 @@
  • Prometheum
    • - 14 + 30
  • @@ -178,7 +178,7 @@ 50 - 10800 + 17200 @@ -202,7 +202,7 @@
  • FSX
    • - 21 + 46
  • @@ -222,7 +222,7 @@ 50 - 13600 + 23600 @@ -250,7 +250,7 @@
  • MeatRaw
    • - 47 + 100
  • @@ -273,7 +273,7 @@ 50 - 14600 + 25200 \ No newline at end of file diff --git a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml index 4c3cdd7558..fc22e7545a 100644 --- a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_Advanced.xml +++ b/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/Defs/Ammo/Generic/AntiMateriel.xml b/Defs/Ammo/Generic/AntiMateriel.xml index 577e537769..0661f6d658 100644 --- a/Defs/Ammo/Generic/AntiMateriel.xml +++ b/Defs/Ammo/Generic/AntiMateriel.xml @@ -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/Defs/Ammo/Generic/Autocannon.xml b/Defs/Ammo/Generic/Autocannon.xml index 244988c3c4..44a7ebcb71 100644 --- a/Defs/Ammo/Generic/Autocannon.xml +++ b/Defs/Ammo/Generic/Autocannon.xml @@ -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/Defs/Ammo/Generic/LauncherGrenade.xml b/Defs/Ammo/Generic/LauncherGrenade.xml index 26cff458ba..861979cfce 100644 --- a/Defs/Ammo/Generic/LauncherGrenade.xml +++ b/Defs/Ammo/Generic/LauncherGrenade.xml @@ -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/Defs/Ammo/Generic/Mech.xml b/Defs/Ammo/Generic/Mech.xml index 833960cbee..a0c7adf957 100644 --- a/Defs/Ammo/Generic/Mech.xml +++ b/Defs/Ammo/Generic/Mech.xml @@ -97,7 +97,7 @@ Ammo_MechShell_Incendiary - + Things/Ammo/FuelCell/Large Graphic_StackCount @@ -287,4 +287,4 @@ 6600 - \ No newline at end of file + diff --git a/Defs/Ammo/Generic/Pistol.xml b/Defs/Ammo/Generic/Pistol.xml index c5f4077b13..eaff482613 100644 --- a/Defs/Ammo/Generic/Pistol.xml +++ b/Defs/Ammo/Generic/Pistol.xml @@ -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/Defs/Ammo/Generic/PistolMagnum.xml b/Defs/Ammo/Generic/PistolMagnum.xml index 7b2b9990fe..9993446b58 100644 --- a/Defs/Ammo/Generic/PistolMagnum.xml +++ b/Defs/Ammo/Generic/PistolMagnum.xml @@ -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/Defs/Ammo/Generic/Rifle.xml b/Defs/Ammo/Generic/Rifle.xml index 308eaf26a4..90a29f14d4 100644 --- a/Defs/Ammo/Generic/Rifle.xml +++ b/Defs/Ammo/Generic/Rifle.xml @@ -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/Defs/Ammo/Generic/RifleIntermediate.xml b/Defs/Ammo/Generic/RifleIntermediate.xml index 7c2af17e1e..7aa6670f35 100644 --- a/Defs/Ammo/Generic/RifleIntermediate.xml +++ b/Defs/Ammo/Generic/RifleIntermediate.xml @@ -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/Defs/Ammo/Generic/RifleMagnum.xml b/Defs/Ammo/Generic/RifleMagnum.xml index 0e44b26f4f..ec0ec6b3b9 100644 --- a/Defs/Ammo/Generic/RifleMagnum.xml +++ b/Defs/Ammo/Generic/RifleMagnum.xml @@ -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/Defs/Ammo/Generic/Shell_Mortar.xml b/Defs/Ammo/Generic/Shell_Mortar.xml new file mode 100644 index 0000000000..bc6a495a04 --- /dev/null +++ b/Defs/Ammo/Generic/Shell_Mortar.xml @@ -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/Defs/Ammo/Generic/ShotgunShell.xml b/Defs/Ammo/Generic/ShotgunShell.xml index 513118ccbc..7d5aa5afed 100644 --- a/Defs/Ammo/Generic/ShotgunShell.xml +++ b/Defs/Ammo/Generic/ShotgunShell.xml @@ -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/Defs/Ammo/Grenade/25x59mmGrenade.xml b/Defs/Ammo/Grenade/25x59mmGrenade.xml index 997a403d2b..b147d1f871 100644 --- a/Defs/Ammo/Grenade/25x59mmGrenade.xml +++ b/Defs/Ammo/Grenade/25x59mmGrenade.xml @@ -188,7 +188,7 @@
  • - 12 + 9
    • diff --git a/Defs/Ammo/Grenade/30x29mmGrenade.xml b/Defs/Ammo/Grenade/30x29mmGrenade.xml index f621ab8c48..e153cdbdf7 100644 --- a/Defs/Ammo/Grenade/30x29mmGrenade.xml +++ b/Defs/Ammo/Grenade/30x29mmGrenade.xml @@ -175,7 +175,7 @@ Bullet - 35 + 36 45 5.569 @@ -188,7 +188,7 @@
  • - 14 + 11
    • diff --git a/Defs/Ammo/Grenade/35x32mmSRGrenade.xml b/Defs/Ammo/Grenade/35x32mmSRGrenade.xml index c4d121f1b5..e1463c3e54 100644 --- a/Defs/Ammo/Grenade/35x32mmSRGrenade.xml +++ b/Defs/Ammo/Grenade/35x32mmSRGrenade.xml @@ -150,7 +150,7 @@
  • - 15 + 8
    • diff --git a/Defs/Ammo/Grenade/40x46mmGrenade.xml b/Defs/Ammo/Grenade/40x46mmGrenade.xml index aa3549fb0a..8dc35f2afe 100644 --- a/Defs/Ammo/Grenade/40x46mmGrenade.xml +++ b/Defs/Ammo/Grenade/40x46mmGrenade.xml @@ -205,7 +205,7 @@
  • - 10 + 7
    • diff --git a/Defs/Ammo/Grenade/40x53mmGrenade.xml b/Defs/Ammo/Grenade/40x53mmGrenade.xml index 3e3cb13674..8ba6e74c78 100644 --- a/Defs/Ammo/Grenade/40x53mmGrenade.xml +++ b/Defs/Ammo/Grenade/40x53mmGrenade.xml @@ -177,7 +177,7 @@ Bullet - 36 + 37 76 5.768 @@ -190,7 +190,7 @@
  • - 16 + 13
    • diff --git a/Defs/Ammo/HighCaliber/20x82mmMauser.xml b/Defs/Ammo/HighCaliber/20x82mmMauser.xml index 7630b773ba..9325ad4929 100644 --- a/Defs/Ammo/HighCaliber/20x82mmMauser.xml +++ b/Defs/Ammo/HighCaliber/20x82mmMauser.xml @@ -27,7 +27,7 @@ Large caliber cartridge used by autocannons and a handful of anti-tank rifles. - 0.175 + 0.205 0.22 @@ -48,7 +48,7 @@ Graphic_StackCount - 0.7 + 0.82 ArmorPiercing Bullet_20x82mmMauser_AP @@ -62,7 +62,7 @@ Graphic_StackCount - 1.05 + 1.17 IncendiaryAP Bullet_20x82mmMauser_Incendiary @@ -76,7 +76,7 @@ Graphic_StackCount - 1.56 + 1.68 ExplosiveAP Bullet_20x82mmMauser_HE @@ -90,8 +90,8 @@ Graphic_StackCount - 0.83 - 0.128 + 0.95 + 0.158 Sabot Bullet_20x82mmMauser_Sabot @@ -180,7 +180,7 @@
  • Steel
    • - 70 + 82 @@ -191,7 +191,7 @@ 200 - 8400 + 9840 @@ -206,7 +206,7 @@
  • Steel
    • - 70 + 82
  • @@ -226,7 +226,7 @@ 200 - 11400 + 12600 @@ -241,7 +241,7 @@
  • Steel
    • - 70 + 82
  • @@ -261,7 +261,7 @@ 200 - 15800 + 17000 @@ -276,7 +276,7 @@
  • Steel
    • - 26 + 38
  • @@ -305,7 +305,7 @@ 200 - 10400 + 11600 \ No newline at end of file diff --git a/Defs/Ammo/Modded/Warhammer 40k/Autoguns.xml b/Defs/Ammo/Modded/Warhammer 40k/Autoguns.xml new file mode 100644 index 0000000000..3df62c8f42 --- /dev/null +++ b/Defs/Ammo/Modded/Warhammer 40k/Autoguns.xml @@ -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/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml b/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml index a2ee769b19..6a90217794 100644 --- a/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml +++ b/Defs/Ammo/Modded/Warhammer 40k/Bolter.xml @@ -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/Defs/Ammo/Modded/Warhammer 40k/Bolter_Small.xml b/Defs/Ammo/Modded/Warhammer 40k/Bolter_Small.xml new file mode 100644 index 0000000000..2ee1710ac2 --- /dev/null +++ b/Defs/Ammo/Modded/Warhammer 40k/Bolter_Small.xml @@ -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/Defs/Ammo/Modded/Warhammer 40k/HeavyBolter.xml b/Defs/Ammo/Modded/Warhammer 40k/HeavyBolter.xml index ee7d61f994..837a322ee5 100644 --- a/Defs/Ammo/Modded/Warhammer 40k/HeavyBolter.xml +++ b/Defs/Ammo/Modded/Warhammer 40k/HeavyBolter.xml @@ -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/Defs/Ammo/Modded/Warhammer 40k/LasGun.xml b/Defs/Ammo/Modded/Warhammer 40k/LasGun.xml index bfa152271e..522068ce47 100644 --- a/Defs/Ammo/Modded/Warhammer 40k/LasGun.xml +++ b/Defs/Ammo/Modded/Warhammer 40k/LasGun.xml @@ -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/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml b/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml index e8676fa929..ac588ea051 100644 --- a/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml +++ b/Defs/Ammo/Modded/Warhammer 40k/MeltaGun.xml @@ -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/Defs/Ammo/Rifle/4570Gov.xml b/Defs/Ammo/Rifle/4570Gov.xml index c94a38e1dd..171038260c 100644 --- a/Defs/Ammo/Rifle/4570Gov.xml +++ b/Defs/Ammo/Rifle/4570Gov.xml @@ -217,7 +217,7 @@ MakeAmmo_4570Gov_FMJ - + Craft 500 .45-70 Government cartridge (FMJ) cartridges. Making .45-70 Government cartridge (FMJ) cartridges. diff --git a/Defs/Ammo/Rifle/762x54mmR.xml b/Defs/Ammo/Rifle/762x54mmR.xml index bf71bbb8f3..328ea09464 100644 --- a/Defs/Ammo/Rifle/762x54mmR.xml +++ b/Defs/Ammo/Rifle/762x54mmR.xml @@ -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/Defs/Ammo/Rocket/84x246mmR.xml b/Defs/Ammo/Rocket/84x246mmR.xml index fb46909272..3bee5af45f 100644 --- a/Defs/Ammo/Rocket/84x246mmR.xml +++ b/Defs/Ammo/Rocket/84x246mmR.xml @@ -372,7 +372,7 @@ CombatExtended.BulletCE Bullet - 400 + 189 150 33.371 59 @@ -386,8 +386,7 @@
  • - 4 - 8 + 80
    • diff --git a/Defs/Ammo/Rocket/RPG7.xml b/Defs/Ammo/Rocket/RPG7.xml index 2fb53e69b9..4d6c99c847 100644 --- a/Defs/Ammo/Rocket/RPG7.xml +++ b/Defs/Ammo/Rocket/RPG7.xml @@ -198,7 +198,7 @@
  • - 50 + 80
    • diff --git a/Defs/Ammo/Shell/105mmHowitzer.xml b/Defs/Ammo/Shell/105mmHowitzer.xml index f3ede8934f..5475863422 100644 --- a/Defs/Ammo/Shell/105mmHowitzer.xml +++ b/Defs/Ammo/Shell/105mmHowitzer.xml @@ -21,6 +21,7 @@ Bullet_105mmHowitzerShell_Smoke true + AmmoSet_ArtilleryShell @@ -34,6 +35,7 @@ Bullet_105mmHowitzerShell_Smoke_directfire true + AmmoSet_ArtilleryShell @@ -161,9 +163,7 @@ MortarRound_PreImpact MortarRound_Ambient true - true - Fleck_BigShell - Filth_CannonAmmoCasings + false 5 0.10 @@ -303,9 +303,7 @@ 147 MortarBomb_Explode false - true - Fleck_BigShell - Filth_CannonAmmoCasings + false     diff --git a/Defs/Ammo/Shell/155mmHowitzer.xml b/Defs/Ammo/Shell/155mmHowitzer.xml index 553d3d57fb..200c7af67a 100644 --- a/Defs/Ammo/Shell/155mmHowitzer.xml +++ b/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/Defs/Ammo/Shell/15cmNebelwerfer.xml b/Defs/Ammo/Shell/15cmNebelwerfer.xml index e165de80a4..1a0a534ff1 100644 --- a/Defs/Ammo/Shell/15cmNebelwerfer.xml +++ b/Defs/Ammo/Shell/15cmNebelwerfer.xml @@ -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/Defs/Ammo/Shell/50mmType89Mortar.xml b/Defs/Ammo/Shell/50mmType89Mortar.xml index 08e9046f26..7c2ddd8ba7 100644 --- a/Defs/Ammo/Shell/50mmType89Mortar.xml +++ b/Defs/Ammo/Shell/50mmType89Mortar.xml @@ -20,6 +20,7 @@ Bullet_50mmType89MortarShell_Smoke true + AmmoSet_MortarShell diff --git a/Defs/Ammo/Shell/60mmMortar.xml b/Defs/Ammo/Shell/60mmMortar.xml index 59d4e8b801..acbaae418e 100644 --- a/Defs/Ammo/Shell/60mmMortar.xml +++ b/Defs/Ammo/Shell/60mmMortar.xml @@ -21,6 +21,7 @@ Bullet_60mmMortarShell_Smoke true + AmmoSet_MortarShell diff --git a/Defs/Ammo/Shell/81mmMortar.xml b/Defs/Ammo/Shell/81mmMortar.xml index ba9a5ffc43..c0324015b4 100644 --- a/Defs/Ammo/Shell/81mmMortar.xml +++ b/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/Defs/Ammo/Shotgun/12Gauge.xml b/Defs/Ammo/Shotgun/12Gauge.xml index 90d99d892c..612e4097b9 100644 --- a/Defs/Ammo/Shotgun/12Gauge.xml +++ b/Defs/Ammo/Shotgun/12Gauge.xml @@ -22,6 +22,18 @@ AmmoSet_Shotgun + + AmmoSet_12Gauge_SB + + + Bullet_12Gauge_Buck_SB + Bullet_12Gauge_Slug_SB + Bullet_12Gauge_Beanbag_SB + Bullet_12Gauge_ElectroSlug_SB + + AmmoSet_Shotgun + + @@ -185,6 +197,81 @@     + + + + Bullet_12Gauge_Buck_SB + + + Things/Projectile/Shotgun_Pellet + Graphic_Single + + + 75 + 7 + 9 + 3.5 + 3.46 + 11.0 + + + + + Bullet_12Gauge_Slug_SB + + + Things/Projectile/Bullet_big + Graphic_Single + + + 106 + 26 + 5 + 70.76 + Fleck_ShotgunShell_Green + Filth_ShotgunAmmoCasings_Green + + + + + Bullet_12Gauge_Beanbag_SB + + + Things/Projectile/Bullet_big + Graphic_Single + + + 26 + Beanbag + 8 + 0 + 2.26 + 2 + Fleck_ShotgunShell_White + Filth_ShotgunAmmoCasings_White + + + + + Bullet_12Gauge_ElectroSlug_SB + + + Things/Projectile/Bullet_big + Graphic_Single + (68,210,215) + + + 33 + EMP + 12 + 0 + 0 + 0.2 + Fleck_ShotgunShell_Black + Filth_ShotgunAmmoCasings_Black + + + diff --git a/Defs/Ammo/Shotgun/410Bore.xml b/Defs/Ammo/Shotgun/410Bore.xml index 77e2e54f55..a7723b5b12 100644 --- a/Defs/Ammo/Shotgun/410Bore.xml +++ b/Defs/Ammo/Shotgun/410Bore.xml @@ -197,6 +197,8 @@ + + Bullet_410Bore_Buck_SB diff --git a/Defs/SoundDefs/Shot_Weapons.xml b/Defs/SoundDefs/Shot_Weapons.xml index c2b7323df3..c87cae5e51 100644 --- a/Defs/SoundDefs/Shot_Weapons.xml +++ b/Defs/SoundDefs/Shot_Weapons.xml @@ -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/Defs/Stats/Stats_Apparel.xml b/Defs/Stats/Stats_Apparel.xml index 39427bc805..d07ad08e7a 100644 --- a/Defs/Stats/Stats_Apparel.xml +++ b/Defs/Stats/Stats_Apparel.xml @@ -31,7 +31,7 @@ ArmorRating_Electric - Percentage reduction of damage from electricity such as EMP pulses and the EMP part of EMP and ion projectiles.\n\nHaving a value of 100% or above makes the creature immune to all electrical damage in that body region. + Percentage reduction of damage from electricity such as EMP pulses and the EMP part of EMP and ion projectiles.\n\nThe total across all sources of this armor is added for a protected part, then reduced by the armor reduction value of the incoming attack. If the resulting value is 100% or greater, protected parts of the pawn will be immune to the incoming attack's electrical damage in that body region. 39
  • diff --git a/Defs/Stats/Stats_Pawns_Combat.xml b/Defs/Stats/Stats_Pawns_Combat.xml index 1acf76ecaa..a553b08739 100644 --- a/Defs/Stats/Stats_Pawns_Combat.xml +++ b/Defs/Stats/Stats_Pawns_Combat.xml @@ -287,12 +287,6 @@ - - PartialArmorBody - Special armor values for certain bodyparts - - CombatExtended.StatWorker_ArmorPartial - BodyPartSharpArmor diff --git a/Defs/ThingDefs_Buildings/Buildings_Turrets.xml b/Defs/ThingDefs_Buildings/Buildings_Turrets.xml index 6ac8638526..aa83f7c35d 100644 --- a/Defs/ThingDefs_Buildings/Buildings_Turrets.xml +++ b/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/Defs/ThingDefs_Misc/Apparel_Carrying.xml b/Defs/ThingDefs_Misc/Apparel_Carrying.xml index 3e275bbb75..b979013276 100644 --- a/Defs/ThingDefs_Misc/Apparel_Carrying.xml +++ b/Defs/ThingDefs_Misc/Apparel_Carrying.xml @@ -413,6 +413,7 @@ 28500 7 8 + 2.5 120 diff --git a/Defs/ThingDefs_Misc/Apparel_Shield.xml b/Defs/ThingDefs_Misc/Apparel_Shield.xml index 9c7f04098a..796ee97726 100644 --- a/Defs/ThingDefs_Misc/Apparel_Shield.xml +++ b/Defs/ThingDefs_Misc/Apparel_Shield.xml @@ -64,34 +64,34 @@ 1.0 - Child, Adult + Child, Adult
  • TribalShield
    •
  • - CombatExtended.PawnRenderNode_Apparel - CombatExtended.PawnRenderNodeWorker_Drafted - Things/Apparel/Shield/CE_Shield - CutoutComplex - ApparelBody - - 0.8 - - 80 - - - -5 - (0, 0, -0.1) - - - -5 - (0.15, 0, -0.1) - - - (0.3, 0, -0.2) - - + CombatExtended.PawnRenderNode_Apparel + CombatExtended.PawnRenderNodeWorker_Drafted + Things/Apparel/Shield/CE_Shield + CutoutComplex + ApparelBody + + 0.8 + + 80 + + + -5 + (0, 0, -0.1) + + + -5 + (0.15, 0, -0.1) + + + (0.25, 0, -0.15) + +
    • @@ -158,34 +158,34 @@
  • - CombatExtended.PawnRenderNode_Apparel - CombatExtended.PawnRenderNodeWorker_Drafted - Things/Apparel/BallisticShield/CE_BallisticShield - CutoutComplex - ApparelBody - - 0.8 - - 80 - - - -5 - (0, 0, -0.1) - 30 - - - -30 - - - -5 - (0.15, 0, -0.1) - - - (0.15, 0, -0.1) - - + CombatExtended.PawnRenderNode_Apparel + CombatExtended.PawnRenderNodeWorker_Drafted + Things/Apparel/BallisticShield/CE_BallisticShield + CutoutComplex + ApparelBody + + 0.8 + + 80 + + + -5 + (0, 0, -0.1) + 30 + + + -30 + + + -5 + (0.15, 0, -0.1) + + + (0.15, 0, -0.1) + +
    • -     +
  • diff --git a/Defs/ThingDefs_Misc/Weapons_Ranged.xml b/Defs/ThingDefs_Misc/Weapons_Ranged.xml index 3ea1630f76..2fbf73c911 100644 --- a/Defs/ThingDefs_Misc/Weapons_Ranged.xml +++ b/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/Defs/ThingDefs_Races/Tytan.xml b/Defs/ThingDefs_Races/Tytan.xml index a768e17cac..a0ef647af8 100644 --- a/Defs/ThingDefs_Races/Tytan.xml +++ b/Defs/ThingDefs_Races/Tytan.xml @@ -12,7 +12,6 @@ 1 0.85 0.75 - 0 600 600 1.0 diff --git a/Ideology/Patches/ThingDefs_Misc/Race_Animal_Dryads.xml b/Ideology/Patches/ThingDefs_Misc/Race_Animal_Dryads.xml index 011e6bd4d1..2875575024 100644 --- a/Ideology/Patches/ThingDefs_Misc/Race_Animal_Dryads.xml +++ b/Ideology/Patches/ThingDefs_Misc/Race_Animal_Dryads.xml @@ -224,7 +224,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/Languages/ChineseSimplified/DefInjected/BipodCategoryDef/BipodCategories.xml b/Languages/ChineseSimplified/DefInjected/BipodCategoryDef/BipodCategories.xml deleted file mode 100644 index 860f213634..0000000000 --- a/Languages/ChineseSimplified/DefInjected/BipodCategoryDef/BipodCategories.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - 狙击枪 - - - 反坦克步枪 - - - 精确射手步枪 - - - 轻机枪 - - - 步枪 - - - 班用机枪 - - \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/BodyPartGroupDef/BodyPartGroups.xml b/Languages/ChineseSimplified/DefInjected/BodyPartGroupDef/BodyPartGroups.xml index 79c2d7a47d..1636818c11 100644 --- a/Languages/ChineseSimplified/DefInjected/BodyPartGroupDef/BodyPartGroups.xml +++ b/Languages/ChineseSimplified/DefInjected/BodyPartGroupDef/BodyPartGroups.xml @@ -52,9 +52,6 @@ 颈 - - 外溢粘液 - 尖 diff --git a/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Advanced.xml b/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Advanced.xml index b613f3427b..786b685f3f 100644 --- a/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Advanced.xml +++ b/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Advanced.xml @@ -6,6 +6,11 @@ 一种小型的超技术弹头，通常由宇宙飞船或闪耀世界使机器用，在一反物质的推动下，产生巨量高能伽玛射线，拥有巨大的湮灭性摧毁能力。 + + 活铁 + + 含有结晶活铁的浸渍物质能够在细胞层面攻击有机物，干扰再生并削弱组织。 + 浓缩提班纳 @@ -27,7 +32,7 @@ 使用提班纳气体制造的低能量光矢，可以暂时使目标昏迷并丧失行动能力。 - 普通电荷弹 + 电荷弹 拥有电荷粒子涂层，对装甲目标和人体组织都有良好的破坏力。 diff --git a/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Neolithic.xml b/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Neolithic.xml index 7219f313ef..ab96936f57 100644 --- a/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Neolithic.xml +++ b/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoCategoryDef/AmmoCategories_Neolithic.xml @@ -27,8 +27,10 @@ 神经毒素 - + 该工程表面涂覆了一种强力的生物毒素，能够使有机体目标变得晕眩和迷失方向。 + + 神经毒素 玻璃钢箭 diff --git a/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/12Gauge.xml b/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/12Gauge.xml index d3eb0a89f6..33b0991d25 100644 --- a/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/12Gauge.xml +++ b/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/12Gauge.xml @@ -4,4 +4,7 @@ 12号径霰弹 + + 12号径霰弹 + \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/57x483mmBofors.xml b/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/57x483mmBofors.xml deleted file mode 100644 index 875860ca24..0000000000 --- a/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/57x483mmBofors.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - 57x483mm 博福斯机炮炮弹 - - \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/5x100mmCaseless.xml b/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/5x100mmCaseless.xml deleted file mode 100644 index 359afaf9ec..0000000000 --- a/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/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/Flamethrower_Burst.xml b/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/Flamethrower_Burst.xml index 4f2225fd1d..54e4a9b4e5 100644 --- a/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/Flamethrower_Burst.xml +++ b/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/Flamethrower_Burst.xml @@ -1,9 +1,7 @@ - + - - - + + 火焰喷射器燃料 - - + \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/NerveSpikerBolt.xml b/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/NerveSpikerBolt.xml index d8e3165e94..cb23f76a83 100644 --- a/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/NerveSpikerBolt.xml +++ b/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/NerveSpikerBolt.xml @@ -1,9 +1,7 @@ - + - - - + + 麻痹毒刺 - - + \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/PlasmaCannon.xml b/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/PlasmaCannon.xml index 87c11cdeda..aed3754d36 100644 --- a/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/PlasmaCannon.xml +++ b/Languages/ChineseSimplified/DefInjected/CombatExtended.AmmoSetDef/PlasmaCannon.xml @@ -4,6 +4,9 @@ 罐装等离子体 + + 罐装等离子体 + 罐装等离子体 diff --git a/Languages/ChineseSimplified/DefInjected/GunPatcherPresetDef/MachineGun.xml b/Languages/ChineseSimplified/DefInjected/CombatExtended.GunPatcherPresetDef/MachineGun.xml similarity index 100% rename from Languages/ChineseSimplified/DefInjected/GunPatcherPresetDef/MachineGun.xml rename to Languages/ChineseSimplified/DefInjected/CombatExtended.GunPatcherPresetDef/MachineGun.xml diff --git a/Languages/ChineseSimplified/DefInjected/DamageDef/DamageDefs_Anomaly.xml b/Languages/ChineseSimplified/DefInjected/DamageDef/DamageDefs_Anomaly.xml new file mode 100644 index 0000000000..fe711b21a3 --- /dev/null +++ b/Languages/ChineseSimplified/DefInjected/DamageDef/DamageDefs_Anomaly.xml @@ -0,0 +1,19 @@ + + + + + 活铁火焰 + + {0}已被烧死。 + + + 划伤 + + {0}被撕裂了. + + + 神经 + + {0}死于神经休克。 + + \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/DesignatorDropdownGroupDef/DesignatorDropdownGroupDef.xml b/Languages/ChineseSimplified/DefInjected/DesignatorDropdownGroupDef/DesignatorDropdownGroupDef.xml new file mode 100644 index 0000000000..70860c2fc0 --- /dev/null +++ b/Languages/ChineseSimplified/DefInjected/DesignatorDropdownGroupDef/DesignatorDropdownGroupDef.xml @@ -0,0 +1,19 @@ + + + + + 战斗扩展自动炮塔 + + + 战斗扩展黑火药炮台 + + + 战斗扩展重型手操炮塔 + + + 战斗扩展中型手操炮塔 + + + 战斗扩展新式手操炮塔 + + \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/HediffDef/Hediffs_Anomaly.xml b/Languages/ChineseSimplified/DefInjected/HediffDef/Hediffs_Anomaly.xml new file mode 100644 index 0000000000..8fa352ca6e --- /dev/null +++ b/Languages/ChineseSimplified/DefInjected/HediffDef/Hediffs_Anomaly.xml @@ -0,0 +1,19 @@ + + + + + 活铁毒气 + + 受到活铁毒气的影响 + + 较轻 + + 中等 + + 较重 + + 严重 + + 极重 + + \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/RecipeDef/15cmNebelwerfer.xml b/Languages/ChineseSimplified/DefInjected/RecipeDef/15cmNebelwerfer.xml index fdc946d2f1..7420d08d67 100644 --- a/Languages/ChineseSimplified/DefInjected/RecipeDef/15cmNebelwerfer.xml +++ b/Languages/ChineseSimplified/DefInjected/RecipeDef/15cmNebelwerfer.xml @@ -1,10 +1,10 @@  - - 制作150mm 火箭弹 (高爆弹) - - 制作150mm 火箭弹 (高爆弹)。 + + 制作150mm 火箭弹 (高爆弹) x6 + + 制作150mm 火箭弹 (高爆弹) x6。 正在制作150mm 火箭弹 (高爆弹)。 diff --git a/Languages/ChineseSimplified/DefInjected/RecipeDef/357Magnum.xml b/Languages/ChineseSimplified/DefInjected/RecipeDef/357Magnum.xml index 5a36abdf53..5c20cb0b8c 100644 --- a/Languages/ChineseSimplified/DefInjected/RecipeDef/357Magnum.xml +++ b/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/Languages/ChineseSimplified/DefInjected/RecipeDef/38ACP.xml b/Languages/ChineseSimplified/DefInjected/RecipeDef/38ACP.xml index 33e2c7174f..6962c164b9 100644 --- a/Languages/ChineseSimplified/DefInjected/RecipeDef/38ACP.xml +++ b/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/Languages/ChineseSimplified/DefInjected/RecipeDef/4570Gov.xml b/Languages/ChineseSimplified/DefInjected/RecipeDef/4570Gov.xml index 4174b253e6..14c392d30d 100644 --- a/Languages/ChineseSimplified/DefInjected/RecipeDef/4570Gov.xml +++ b/Languages/ChineseSimplified/DefInjected/RecipeDef/4570Gov.xml @@ -8,7 +8,7 @@ 正在制作.45-70 政府弹 (穿甲弹)。 - + 制作.45-70 政府弹 (全金属被甲弹) x500 制作500枚.45-70 政府弹 (全金属被甲弹)。 diff --git a/Languages/ChineseSimplified/DefInjected/RecipeDef/57x483mmBofors.xml b/Languages/ChineseSimplified/DefInjected/RecipeDef/57x483mmBofors.xml deleted file mode 100644 index 6719958f8a..0000000000 --- a/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/Languages/ChineseSimplified/DefInjected/RecipeDef/5x100mmCaseless.xml b/Languages/ChineseSimplified/DefInjected/RecipeDef/5x100mmCaseless.xml deleted file mode 100644 index 8b189fd3ee..0000000000 --- a/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/Languages/ChineseSimplified/DefInjected/RecipeDef/81mmMortar.xml b/Languages/ChineseSimplified/DefInjected/RecipeDef/81mmMortar.xml index 9dcd787357..1ae2bc0247 100644 --- a/Languages/ChineseSimplified/DefInjected/RecipeDef/81mmMortar.xml +++ b/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/Languages/ChineseSimplified/DefInjected/RecipeDef/CannonBall.xml b/Languages/ChineseSimplified/DefInjected/RecipeDef/CannonBall.xml index c3398f25f6..c316afce56 100644 --- a/Languages/ChineseSimplified/DefInjected/RecipeDef/CannonBall.xml +++ b/Languages/ChineseSimplified/DefInjected/RecipeDef/CannonBall.xml @@ -1,11 +1,11 @@  - + 制作加农炮弹 (榴弹) x5 - + 制作5枚加农炮弹 (榴弹)。 - + 正在制作加农炮弹 (榴弹)。 @@ -15,11 +15,11 @@ 正在制作加农炮弹 (葡萄弹)。 - + 制作加农炮弹 (燃烧弹) x5 - + 制作5枚加农炮弹 (燃烧弹)。 - + 正在制作加农炮弹 (燃烧弹)。 diff --git a/Languages/ChineseSimplified/DefInjected/RecipeDef/Flamethrower.xml b/Languages/ChineseSimplified/DefInjected/RecipeDef/Flamethrower.xml index 2195ccac09..5e77b94914 100644 --- a/Languages/ChineseSimplified/DefInjected/RecipeDef/Flamethrower.xml +++ b/Languages/ChineseSimplified/DefInjected/RecipeDef/Flamethrower.xml @@ -1,6 +1,13 @@  + + 制作火焰喷射器燃料 (活铁) x100 + + 制作100份火焰喷射器燃料(活铁)。 + + 正在制作火焰喷射器燃料 (活铁)。 + 制作火焰喷射器燃料 (凝胶化合燃料) x100 diff --git a/Languages/ChineseSimplified/DefInjected/RecipeDef/LauncherGrenade.xml b/Languages/ChineseSimplified/DefInjected/RecipeDef/LauncherGrenade.xml index 1c2910d15d..14ed830f60 100644 --- a/Languages/ChineseSimplified/DefInjected/RecipeDef/LauncherGrenade.xml +++ b/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/Languages/ChineseSimplified/DefInjected/RecipeDef/NerveSpikerBolt.xml b/Languages/ChineseSimplified/DefInjected/RecipeDef/NerveSpikerBolt.xml index 988dace9d5..c7924ac188 100644 --- a/Languages/ChineseSimplified/DefInjected/RecipeDef/NerveSpikerBolt.xml +++ b/Languages/ChineseSimplified/DefInjected/RecipeDef/NerveSpikerBolt.xml @@ -1,11 +1,11 @@ - + - - - + + 制作麻痹毒刺 x10 + 制作麻痹毒刺 x10。 + 正在制作麻痹毒刺。 - - + \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Apparel.xml b/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Apparel.xml index 22997bfc7f..ddfe984d61 100644 --- a/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Apparel.xml +++ b/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Apparel.xml @@ -3,7 +3,7 @@ 护甲 - 电能 - + 护甲抵御电能相关伤害的百分比减伤，比如电磁脉冲和EMP和离子弹的电磁脉冲部分。如果你身体的某个部位数值达到100%或以上则此部位完全免疫该伤害。 diff --git a/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Pawns_Combat.xml b/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Pawns_Combat.xml index d23e895670..ccffb28208 100644 --- a/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Pawns_Combat.xml +++ b/Languages/ChineseSimplified/DefInjected/StatDef/Stats_Pawns_Combat.xml @@ -42,11 +42,6 @@ 挡住近战攻击的几率。当格挡时，装备的武器或盾牌将受到伤害，而不是持用者。如果格挡着成功格挡，他们将自动回击攻击者。\n\n最终的几率取决于对手的招架技能，同等对手将始终有20%的几率格挡。 - - 天然护甲 - - 各种身体部件的特殊护甲值 - 换弹速度 diff --git a/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/23x152mmB.xml b/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/23x152mmB.xml index 06f9f28177..475869652a 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/23x152mmB.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/23x152mmB.xml @@ -1,7 +1,7 @@  - + 25x152mmB机炮弹 \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/5x100mmCaseless.xml b/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/5x100mmCaseless.xml deleted file mode 100644 index eb652cc13a..0000000000 --- a/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/5x100mmCaseless.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - 5x100mm 无壳弹 - - \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/NerveSpikerBolt.xml b/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/NerveSpikerBolt.xml index 9324a17543..572da742cc 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/NerveSpikerBolt.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingCategoryDef/NerveSpikerBolt.xml @@ -1,7 +1,7 @@ - + - + + 麻痹毒刺 - - + \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/12Gauge.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/12Gauge.xml index 2633fc5296..98c1a72d3f 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/12Gauge.xml +++ b/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/Languages/ChineseSimplified/DefInjected/ThingDef/30x29mmGrenade.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/30x29mmGrenade.xml index 98a2e418db..a5248a03f0 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/30x29mmGrenade.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/30x29mmGrenade.xml @@ -18,10 +18,7 @@ 30x29mm 榴弹 (高爆双效弹) - + 相对较小的低速榴弹，用于榴弹发射器。 diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/45ACP.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/45ACP.xml index ef050e2648..720eb6e072 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/45ACP.xml +++ b/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/Languages/ChineseSimplified/DefInjected/ThingDef/57x483mmBofors.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/57x483mmBofors.xml deleted file mode 100644 index c7154b567a..0000000000 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/57x483mmBofors.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - 57x483mm 博福斯机炮弹 (高爆弹) - - 海军炮使用的大口径弹药。 - - - 57x483mm 博福斯机炮弹 (高爆弹) - - \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/5x100mmCaseless.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/5x100mmCaseless.xml deleted file mode 100644 index 3e01b1e2b2..0000000000 --- a/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/Languages/ChineseSimplified/DefInjected/ThingDef/5x50mmCaseless.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/5x50mmCaseless.xml index 3ed2dfe065..0a002dc58b 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/5x50mmCaseless.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/5x50mmCaseless.xml @@ -3,10 +3,7 @@ 5x50mm 无壳弹 (脱壳穿甲弹) - + 一种长型无壳弹，其中固体推进剂包裹着细长的弹头。 diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/80x256mmFuelCell.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/80x256mmFuelCell.xml index e7d74f12e6..298d5a67c9 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/80x256mmFuelCell.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/80x256mmFuelCell.xml @@ -5,7 +5,6 @@ 80x256mm 燃料弹 (燃烧弹) 大型燃料弹，用于发射燃烧弹的加农炮。 - 大型燃料弹，用于发射燃烧弹的加农炮。 80x256mm 燃料弹 (燃烧弹) diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/81mmMortar.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/81mmMortar.xml index fcad8905de..eabcfecd29 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/81mmMortar.xml +++ b/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/Languages/ChineseSimplified/DefInjected/ThingDef/84x246mmR.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/84x246mmR.xml index d1abaef737..1cd4036f33 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/84x246mmR.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/84x246mmR.xml @@ -2,7 +2,7 @@ - 84x246mmR 炮弹 (筒弹) + 84x246mmR 炮弹 (霰弹) 为卡尔·古斯塔夫无后坐力炮设计的无后座力弹药。 @@ -52,7 +52,7 @@ 为卡尔·古斯塔夫无后坐力炮设计的无后座力弹药。 - 84x246mmR 炮弹 (筒弹) + 84x246mmR 炮弹 (霰弹) 84x246mmR 炮弹 (EMP弹) diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/90mmCannon.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/90mmCannon.xml index 20c3148597..d4944cb71d 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/90mmCannon.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/90mmCannon.xml @@ -3,18 +3,12 @@ 90mm 加农炮弹 (穿甲弹) - + 相对较小的加农炮弹。 90mm 加农炮弹 (硬芯穿甲弹) - + 相对较小的加农炮弹。 diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/AntiMateriel.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/AntiMateriel.xml index 31d179efae..2c3e654132 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/AntiMateriel.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/AntiMateriel.xml @@ -11,7 +11,7 @@ 重型机枪和反器材步枪使用的大口径子弹。 - + 反器材弹 (高爆弹) 重型机枪和反器材步枪使用的大口径子弹。 diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/Apparel_Headgear.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/Apparel_Headgear.xml index f83745aa4c..21ea94659c 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/Apparel_Headgear.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/Apparel_Headgear.xml @@ -3,7 +3,7 @@ 高级夜视目镜 - + 一套先进的夜视目镜，在黑暗中战斗时提供详细的全景视野。 diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/Autocannon.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/Autocannon.xml index fb2e63d906..eabc1cf2e2 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/Autocannon.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/Autocannon.xml @@ -6,7 +6,7 @@ 车载机枪和反坦克步枪使用的大口径弹药 - + 机炮弹 (高爆弹) 车载机枪和反坦克步枪使用的大口径弹药 diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Mech_Turrets.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Mech_Turrets.xml deleted file mode 100644 index c9b37e4eea..0000000000 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Mech_Turrets.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - 枪管 - 轻型电荷冲击炮 - - - 枪管 - 地狱火加农炮 - - \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Security_Turrets.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Security_Turrets.xml deleted file mode 100644 index a11648c2e4..0000000000 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/Buildings_Security_Turrets.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - 加农炮 - - - 铀弹加农炮 - - \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/Flamethrower.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/Flamethrower.xml index ff08929cfc..6de79450c6 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/Flamethrower.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/Flamethrower.xml @@ -1,16 +1,24 @@  + + 火焰喷射器燃料 (活铁) + + 一种用于火焰喷射器的燃料，燃烧时温度极高，并且不会留下任何燃料残余。/n/含有活铁的浸渍物质能够在细胞层面攻击有机物，干扰再生并削弱组织。 + 火焰喷射器燃料 (凝胶化合燃料) - + 火焰喷射器使用的燃油。 火焰喷射器燃料 (苯基液体燃料) - + 火焰喷射器使用的燃油。 + + 火焰喷射器燃料 (活铁) + 火焰喷射器燃料 (凝胶化合燃料) diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/Flamethrower_Burst.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/Flamethrower_Burst.xml index ed19841bfe..38fab9a2e1 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/Flamethrower_Burst.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/Flamethrower_Burst.xml @@ -1,10 +1,13 @@ - + - - - + + + 活铁浸渍 + + 化合燃料凝胶 + + 化合燃料凝胶 - - + \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/LauncherGrenade.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/LauncherGrenade.xml index 9cd038ac6a..f0df308c9d 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/LauncherGrenade.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/LauncherGrenade.xml @@ -11,6 +11,11 @@ 从各种榴弹发射器发射的低速榴弹。 + + 榴弹 (空爆弹) + + 从各种榴弹发射器发射的低速榴弹。 + 榴弹 (高爆双效弹) @@ -21,4 +26,9 @@ 从各种榴弹发射器发射的低速榴弹。 + + 榴弹 (毒气) + + 从各种榴弹发射器发射的低速榴弹。 + \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/Mech.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/Mech.xml index f71c1e53d5..a26aa0e412 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/Mech.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/Mech.xml @@ -11,7 +11,7 @@ 用于火炮或者重型武器的大型机械族炮弹。 - + 机械族炮弹 (燃烧弹) 用于火炮或者重型武器的大型机械族炮弹。 diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/NerveSpikerBolt.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/NerveSpikerBolt.xml index 86bbad5687..ddd4c2399e 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/NerveSpikerBolt.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/NerveSpikerBolt.xml @@ -1,15 +1,12 @@ - + - - - + + 麻痹毒刺 + 一种活性铁瓷箭矢，箭头涂覆有生物毒素，并专为从麻痹毒弩设计。\n\n虽然制作简单，但这些箭矢质地脆硬，撞击时易变形或断裂，因此无法重复使用。 - - - - + + 麻痹毒刺 - - + \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/PlasmaCannon.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/PlasmaCannon.xml index eca58b0a65..d998504734 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/PlasmaCannon.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/PlasmaCannon.xml @@ -6,6 +6,9 @@ 这是一个充满高压氢气的容器，用于存储气体等离子。 + + 等离子射线 + 等离子体机炮弹 diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/RangedNeolithic.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/RangedNeolithic.xml deleted file mode 100644 index bc1cf56eb9..0000000000 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/RangedNeolithic.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - 重标枪 - - \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/Rifle.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/Rifle.xml index ec6e255967..9162de3257 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/Rifle.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/Rifle.xml @@ -11,7 +11,7 @@ 用于机枪、狙击步枪和战斗步枪的步枪子弹。 - + 步枪弹 (高爆弹) 用于机枪、狙击步枪和战斗步枪的步枪子弹。 diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/RifleIntermediate.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/RifleIntermediate.xml index efa4190999..ed405b85a1 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/RifleIntermediate.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/RifleIntermediate.xml @@ -11,7 +11,7 @@ 中等威力步枪弹，主要用于突击步枪。 - + 中间威力步枪弹 (高爆弹) 中等威力步枪弹，主要用于突击步枪。 diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/RifleMagnum.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/RifleMagnum.xml index 0c4280c1b2..7343778c06 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/RifleMagnum.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/RifleMagnum.xml @@ -11,7 +11,7 @@ 大威力步枪弹药，主要用于远程狙击步枪。 - + 马格南步枪弹 (高爆弹) 大威力步枪弹药，主要用于远程狙击步枪。 diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Grenades.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Grenades.xml index adcff17b52..d83baeb5df 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Grenades.xml +++ b/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Grenades.xml @@ -21,49 +21,34 @@ 爆炸时，伴随著巨大的声响或者闪光，使爆炸范围内的敌人暂时失明和失去方向感，从而短暂丧失反抗能力。 - 身体 - - - 投掷震撼手榴弹 + 弹体 泡沫手榴弹 特种消防手榴弹，撞击时释放出一团灭火用泡沫。 - 身体 - - - 投掷泡沫手榴弹 + 弹体 闪光手榴弹 设计用于产生令人炫目致晕眩的强光，可以致使被攻击目标短暂失明。 - 身体 - - - 投掷闪光手榴弹 + 弹体 烟雾手榴弹 释放大量烟雾，提供隐蔽性以防止被击中。 - 身体 - - - 投掷烟雾手榴弹 + 弹体 棒状炸弹 一种原始的用导火索点燃的炸药，部落最爱使用这种炸弹重击身穿先进装甲的敌人。 - 身体 - - - 投掷棒状炸弹 + 弹体 \ No newline at end of file diff --git a/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Turrets.xml b/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Turrets.xml index 54b03856c5..8e6d3b47e3 100644 --- a/Languages/ChineseSimplified/DefInjected/ThingDef/Weapons_Turrets.xml +++ b/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/Languages/ChineseSimplified/DefInjected/ToolCapacityDef/ToolCapacity.xml b/Languages/ChineseSimplified/DefInjected/ToolCapacityDef/ToolCapacity.xml new file mode 100644 index 0000000000..eb3114c5f8 --- /dev/null +++ b/Languages/ChineseSimplified/DefInjected/ToolCapacityDef/ToolCapacity.xml @@ -0,0 +1,7 @@ + + + + + 划伤 + + \ No newline at end of file diff --git a/Languages/ChineseSimplified/Keyed/AmmoContainerKeyed.xml b/Languages/ChineseSimplified/Keyed/AmmoContainerKeyed.xml index 2b25b33d43..e330b42593 100644 --- a/Languages/ChineseSimplified/Keyed/AmmoContainerKeyed.xml +++ b/Languages/ChineseSimplified/Keyed/AmmoContainerKeyed.xml @@ -11,6 +11,10 @@ 立即重新装填邻近的炮塔。被禁止的炮塔和当前正在发射的炮塔将被忽略。 + + {0} 需要操作员才能运行。 + + {0} 需要电力才能运行。 ｛0｝在附近找不到任何可装填的｛1｝炮塔。 @@ -24,6 +28,8 @@ 自动装载机将只会装填与携带的弹药类型相同的炮塔。 + + 需要人员操作 剩余重载时间：｛0｝秒 diff --git a/Languages/ChineseSimplified/Keyed/Descriptions.xml b/Languages/ChineseSimplified/Keyed/Descriptions.xml index c16a972ebb..e91835a775 100644 --- a/Languages/ChineseSimplified/Keyed/Descriptions.xml +++ b/Languages/ChineseSimplified/Keyed/Descriptions.xml @@ -15,6 +15,8 @@ 利器穿透 钝器穿透 + + 护甲衰减 弹丸数量 diff --git a/Languages/ChineseSimplified/Keyed/Keys.xml b/Languages/ChineseSimplified/Keyed/Keys.xml index 152abd84ec..1a994ca504 100644 --- a/Languages/ChineseSimplified/Keyed/Keys.xml +++ b/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/Languages/ChineseSimplified/Keyed/ModMenu.xml b/Languages/ChineseSimplified/Keyed/ModMenu.xml index 3b04ef1868..c92002d5b1 100644 --- a/Languages/ChineseSimplified/Keyed/ModMenu.xml +++ b/Languages/ChineseSimplified/Keyed/ModMenu.xml @@ -166,4 +166,36 @@ 载具护甲可以根据相对值降低伤害，但可以被高穿甲攻击穿透。。 + + + + 启用自动补丁程序详细日志 + + 这将启用自动补丁程序的详细日志记录。 + + + 启用服装自动补丁程序 + + 尝试为未打补丁的服装应用合适的服装预设，以调整其护甲值。(不推荐开启) + + + 启用种族自动补丁程序 + + 自动补丁程序将为未打补丁的种族应用预设，以允许基本功能。 + + + 启用武器自动补丁程序 + + 尝试为未打补丁的远程武器应用合适的武器预设。(不推荐开启) + + + 启用武器韧性自动补丁程序 + + 为武器应用自动计算的韧性属性，该属性会影响在近战中使用时武器所受的伤害。 + + + 启用pawnkind自动补丁程序 + + 为装备了已打补丁的远程武器但未打补丁的pawnkind添加少量弹药。 + \ No newline at end of file diff --git a/Languages/ChineseSimplified/Keyed/Wind.xml b/Languages/ChineseSimplified/Keyed/Wind.xml index accddd9b6d..218137dde4 100644 --- a/Languages/ChineseSimplified/Keyed/Wind.xml +++ b/Languages/ChineseSimplified/Keyed/Wind.xml @@ -4,27 +4,27 @@ 无风 - 轻微微风 + 微软风 - 温和微风 + 微和风 - 强劲微风 + 微强风 - 轻风 + 微风 - 温和风 + 和风 强风 - 弱烈风 + 疾风 - 烈风 + 大风 - 强烈风 + 烈风 暴风 - 猛烈暴风 + 狂风 飓风 diff --git a/Languages/English/Keyed/Descriptions.xml b/Languages/English/Keyed/Descriptions.xml index 2d918db487..517e077367 100644 --- a/Languages/English/Keyed/Descriptions.xml +++ b/Languages/English/Keyed/Descriptions.xml @@ -8,6 +8,7 @@ Armor penetration Sharp penetration Blunt penetration + Armor reduction Pellet count Spread factor Fragments diff --git a/Languages/English/Keyed/Messages.xml b/Languages/English/Keyed/Messages.xml index 8f50e13a60..d906df7b51 100644 --- a/Languages/English/Keyed/Messages.xml +++ b/Languages/English/Keyed/Messages.xml @@ -12,6 +12,6 @@ A group of fighters from {0} have arrived nearby.\n\nThey are preparing to attack in retaliation for the shelling of {1}. Artillery fire incoming from {0} ({1}). - A group from {0} is planning to raid {1} soon in retaliation for recent events. + A group from {0} is planning to raid {1} at {2} soon in retaliation for recent events. \ No newline at end of file diff --git a/Languages/Russian/DefInjected/ThingDef/Apparel_Carrying.xml b/Languages/Russian/DefInjected/ThingDef/Apparel_Carrying.xml index d8b7d82746..fc233e4166 100644 --- a/Languages/Russian/DefInjected/ThingDef/Apparel_Carrying.xml +++ b/Languages/Russian/DefInjected/ThingDef/Apparel_Carrying.xml @@ -1,19 +1,13 @@  - тактический жилет - - Разгрузочный жилет с карманами для хранения боеприпасов, и другого снаряжения.\n\nПовышает скорость перезарядки, но довольно громоздкий. - + тактический жилет + Разгрузочный жилет с карманами для хранения боеприпасов, и другого снаряжения.\n\nПовышает скорость перезарядки, но довольно громоздкий. - рюкзак - - Удобный и просторный рюкзак для хранения всех видов предметов. - + рюкзак + Удобный и просторный рюкзак для хранения всех видов предметов. - первобытный рюкзак - - Примитивный рюкзак из меха животных, полезен для хранения предметов во время путешествия. - + первобытный рюкзак + Примитивный рюкзак из меха животных, полезен для хранения предметов во время путешествия. \ No newline at end of file diff --git a/Languages/Russian/DefInjected/ThingDef/Apparel_Shield.xml b/Languages/Russian/DefInjected/ThingDef/Apparel_Shield.xml index 788cfb7288..0f9d75e37a 100644 --- a/Languages/Russian/DefInjected/ThingDef/Apparel_Shield.xml +++ b/Languages/Russian/DefInjected/ThingDef/Apparel_Shield.xml @@ -1,14 +1,10 @@  - щит ближнего боя - - Простой щит, который может блокировать простые снаряды и удары рукопашным оружием. - + щит ближнего боя + Простой щит, который может блокировать простые снаряды и удары рукопашным оружием. - баллистический щит - - Тяжелый щит, предназначенный для защиты от стрельбы. Он может охватывать большую часть тела пользователя, но не позволяет использовать двуручное оружие. Его тяжелый вес и масса делают его громоздким в бою. - + баллистический щит + Тяжелый щит, предназначенный для защиты от стрельбы. Он может охватывать большую часть тела пользователя, но не позволяет использовать двуручное оружие. Его тяжелый вес и масса делают его громоздким в бою. \ No newline at end of file diff --git a/Languages/Russian/DefInjected/ThingDef/Apparel_Various.xml b/Languages/Russian/DefInjected/ThingDef/Apparel_Various.xml index e137044530..9df6cfe0f6 100644 --- a/Languages/Russian/DefInjected/ThingDef/Apparel_Various.xml +++ b/Languages/Russian/DefInjected/ThingDef/Apparel_Various.xml @@ -3,10 +3,8 @@ - композитный бронежилет - - Жилет с бронепластинами, прикрывающими грудь и спину. Композитная керамика обеспечивает лучшую защиту, чем простая сталь, но не так прочна. - + композитный бронежилет + Жилет с бронепластинами, прикрывающими грудь и спину. Композитная керамика обеспечивает лучшую защиту, чем простая сталь, но не так прочна. diff --git a/LoadFolders.xml b/LoadFolders.xml index 9d9ff58597..c211b615b9 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -40,7 +40,7 @@
  • ModPatches/Androids
  • ModPatches/Androids Expanded
  • ModPatches/Anima Animals - Community Temp
    • -
  • ModPatches/Anima Bionics
    • +
  • ModPatches/Anima Bionics
  • ModPatches/Anima Gear
  • ModPatches/Animal Armor - Vanilla
  • ModPatches/Animal Equipment
    • @@ -55,8 +55,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 +66,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 +103,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 +127,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 +143,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 +167,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 +180,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 +202,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 +219,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 +229,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 +239,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 +251,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 +260,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
    • @@ -370,17 +381,24 @@
  • 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
  • ModPatches/Project RimFactory - Materials
  • ModPatches/Prostheses+
  • ModPatches/Protoswords
  • ModPatches/PsiTech
    • +
  • ModPatches/PsyBlasters
  • ModPatches/Pulse Weaponry
  • ModPatches/Pulsefire Turret
  • ModPatches/RBSE
    • @@ -438,6 +456,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
    • @@ -464,6 +483,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
    • @@ -484,11 +504,13 @@
  • ModPatches/Simply More Melee
  • ModPatches/Slime Rancher
  • ModPatches/Solark Race
    • +
  • ModPatches/Spacer Arsenal
    • +
  • ModPatches/Spacer Pack
  • ModPatches/Spacer Shields
  • ModPatches/Spaceworm
  • ModPatches/Spartan Foundry
  • ModPatches/Spidercamp's Horses
    • -
  • ModPatches/Star Crafter's Armory
    • +
  • ModPatches/Star Crafter's Armory
  • ModPatches/Star Wars - Factions
  • ModPatches/Starship Troopers Arachnids
  • ModPatches/Steamworld Uniforms
    • @@ -525,6 +547,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
    • @@ -557,6 +580,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
    • @@ -575,6 +599,7 @@
  • ModPatches/Vanilla Vehicles Expanded - Tier 3
  • ModPatches/Vanilla Vehicles Expanded - Upgrades
  • ModPatches/Vanilla Weapons Expanded
    • +
  • ModPatches/Vanilla Weapons Expanded - Bioferrite
  • ModPatches/Vanilla Weapons Expanded - Coilguns
  • ModPatches/Vanilla Weapons Expanded - Frontier
  • ModPatches/Vanilla Weapons Expanded - Grenades
    • @@ -596,15 +621,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
    • @@ -612,13 +638,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/Make.py b/Make.py index 8e696d2a23..0af42c8ec0 100644 --- a/Make.py +++ b/Make.py @@ -49,6 +49,7 @@ def parseArgs(argv): argParser.add_argument("--publicizer", type=str, metavar="PATH", help="Location of AssemblyPublicizer source code or parent directory of AssemblyPublicizer.exe") argParser.add_argument("--debug", action="store_true", default=False, help="Define `DEBUG` when calling csc") argParser.add_argument("--refout", metavar="PATH", default=None, help="Specify where to save a reference library") + argParser.add_argument("--csc", metavar="CSC", default=None, help="Specify directory containing updated csc.exe") options = argParser.parse_args(argv[1:]) if not options.download_libs and options.reference is None: @@ -61,6 +62,10 @@ def parseArgs(argv): if options.reference is None: options.reference = f"{tdir}/rwreference" + if options.csc is not None: + args[0] = options.csc + "/csc.exe" + args.insert(0, "mono") + return options diff --git a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/BodyDef.xml b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/BodyDef.xml index 2a4751f8f8..be85ecd813 100644 --- a/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/BodyDef.xml +++ b/ModPatches/AOC The Cleanup Devil/Patches/AOC The Cleanup Devil/BodyDef.xml @@ -101,7 +101,6 @@ def="Foot" or def="Toe"]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/AV Work Queen/Patches/AV Work Queen/WorkQueen.xml b/ModPatches/AV Work Queen/Patches/AV Work Queen/WorkQueen.xml new file mode 100644 index 0000000000..2ac1100a95 --- /dev/null +++ b/ModPatches/AV Work Queen/Patches/AV Work Queen/WorkQueen.xml @@ -0,0 +1,83 @@ + + + + + + + Defs/ThingDef[defName="AV_Mech_Workerqueen"] + +
  • + QuadrupedLow +
    • +     +     + + + Defs/ThingDef[defName="AV_Mech_Workerqueen"]/statBases/EnergyShieldRechargeRate + + 0.75 + + + + + Defs/ThingDef[defName="AV_Mech_Workerqueen"]/statBases/EnergyShieldEnergyMax + + 4.5 + + + + + Defs/ThingDef[defName="AV_Mech_Workerqueen"]/statBases + + 0.5 + 75 + 50 + 0.02 + 0.22 + 0.64 + 600 + + + + + Defs/ThingDef[defName="AV_Mech_Workerqueen"]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2.0 + HeadAttackTool + true + 2.0 + 0.2 + +     +     +     + + + Defs/ThingDef[defName="AV_Mech_Workerqueen"]/comps + +
  • + 4600 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 460 + 0.5 +
    • +     +     +     diff --git a/ModPatches/AV Work Queen/Patches/AV Work Queen/WorkUrchins.xml b/ModPatches/AV Work Queen/Patches/AV Work Queen/WorkUrchins.xml new file mode 100644 index 0000000000..13dde87ebe --- /dev/null +++ b/ModPatches/AV Work Queen/Patches/AV Work Queen/WorkUrchins.xml @@ -0,0 +1,94 @@ + + + + + + + Defs/ThingDef[@Name="AV_WorkerUrchin_Base"]/statBases + + 4 + 2.5 + 0.14 + 0.06 + 0.05 + + + + + Defs/ThingDef[ + defName="AV_Mech_MinerUrchin" or + defName="AV_Mech_HaulerUrchin" or + defName="AV_Mech_BuilderUrchin" or + defName="AV_Mech_GrowerUrchin" or + defName="AV_Mech_CleanerUrchin"] + +
  • + Vehicle +
    • +     +     + + + Defs/ThingDef[ + defName="AV_Mech_MinerUrchin" or + defName="AV_Mech_HaulerUrchin" or + defName="AV_Mech_BuilderUrchin" or + defName="AV_Mech_GrowerUrchin" or + defName="AV_Mech_CleanerUrchin"]/comps + +
  • + 500 + true + 1250 + 5 + true + + 2 + 2 + + 200 + 100 + true + 100 + 0.5 +
    • +     +     + + + + + Defs/ThingDef[defName="AV_Mech_MinerUrchin"]/tools + + +
  • + + power claw + +
  • Scratch
    • + + 20 + 3 + 1 + 5 + LeftPowerClaw + true + +
  • + + power claw + +
  • Scratch
    • + + 20 + 3 + 1 + 5 + RightPowerClaw + true + +     +     +     + +     diff --git a/ModPatches/Alpha Animals/Defs/Alpha Animals/Defs_DamageDef.xml b/ModPatches/Alpha Animals/Defs/Alpha Animals/Defs_DamageDef.xml new file mode 100644 index 0000000000..c6685eaa13 --- /dev/null +++ b/ModPatches/Alpha Animals/Defs/Alpha Animals/Defs_DamageDef.xml @@ -0,0 +1,26 @@ + + + + + AA_BlackHiveExplosion + + AlphaBehavioursAndEvents.DamageWorker_ExtraDamageMechanoidsAcid + true + {0} has been poisoned to death. + Stab + Crack + +
  • + AA_ToxicBuildup + 0.01 + ToxicResistance + true +
    • +     + true + true + Blunt + Heat +     + +     \ No newline at end of file diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Buildings/Buildings_Insectoid_AlphaAnimals.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Buildings/Buildings_Insectoid_AlphaAnimals.xml new file mode 100644 index 0000000000..c1838bc70c --- /dev/null +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Buildings/Buildings_Insectoid_AlphaAnimals.xml @@ -0,0 +1,101 @@ + + + + + +
  • Vanilla Factions Expanded - Insectoids 2
    • +     + + + + + + +
  • + Defs/ThingDef[defName="AA_BlackDefiler"] + + CombatExtended.Building_TurretGunCE + +
    • + +
  • + Defs/ThingDef[defName="AA_BlackDefiler"]/statBases + + + 500 + 1.0 + 0.5 + + +
    • + +
  • + Defs/ThingDef[defName="AA_BlackDefiler"]/building/turretBurstCooldownTime + + 4 + +
    • + +
  • + Defs/ThingDef[defName="AA_BlackDefiler_Gun"]/statBases/RangedWeapon_Cooldown + + 4 + +
    • + +
  • + Defs/ThingDef[defName="AA_BlackDefiler_Gun"]/verbs + + +
  • + 0.5 + CombatExtended.Verb_ShootCE + true + AA_BlackDefiler_Projectile + 3.5 + 4.9 + 44 + VFEI2_AcidSpray_Resolve + 9 +
    • + + + + +
  • + Defs/ThingDef[defName="AA_BlackDefiler_Projectile"] + + + AA_BlackDefiler_Projectile + + + Things/Projectiles/AA_PoisonBolt + Graphic_Single + 2 + + + 50 + AA_BlackHiveBolt + 10 + 9 + 6 + + +
  • + 20 + AA_BlackHiveExplosion + 3.9 + 0.4 + AA_FilthSlimyPuke + VFEI2_AcidSpray_Resolve +
    • + + + + + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackEmpress.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackEmpress.xml index 32d1040e3e..5b4c5c5b1b 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackEmpress.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackEmpress.xml @@ -21,6 +21,7 @@
  • Defs/ThingDef[defName="VFEI2_BlackEmpress"]/statBases + 0.99 0.05 0.33 0.57 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackQueen.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackQueen.xml index df86982c29..f401aa4b94 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackQueen.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VFEI2/ThingDefs_Races/Races_BlackQueen.xml @@ -21,6 +21,7 @@
  • Defs/ThingDef[defName="VFEI2_BlackQueen"]/statBases + 0.95 0.03 0.30 0.57 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackHive_Psycasts.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackHive_Psycasts.xml index 4a552955d6..586b4967f3 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackHive_Psycasts.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackHive_Psycasts.xml @@ -28,14 +28,14 @@
  • Defs/ThingDef[defName="AA_BlackScarab_Temporary"]/statBases/ArmorRating_Blunt - 2.55 + 2.85
  • Defs/ThingDef[defName="AA_BlackScarab_Temporary"]/statBases/ArmorRating_Sharp - 0.85 + 0.75
    • @@ -91,7 +91,7 @@ Defs/ThingDef[defName="AA_BlackScarab_Temporary"] - + @@ -104,7 +104,7 @@ true 600 5 - 0.5 + 0.25 @@ -158,13 +158,6 @@ -
  • - Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/race/baseHealthScale - - 1.4 - -
    • -
  • Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/tools @@ -234,7 +227,7 @@ Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"] - +
    • @@ -243,11 +236,11 @@ Defs/ThingDef[defName="AA_BlackSpelopede_Temporary"]/comps
  • - 600 + 625 true 600 5 - 0.5 + 0.25
    • @@ -261,13 +254,6 @@ -
  • - Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/race/baseHealthScale - - 2.1 - -
    • -
  • Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/statBases/ArmorRating_Blunt @@ -377,7 +363,7 @@ Defs/ThingDef[defName="AA_BlackSpider_Temporary"] - +
    • @@ -386,11 +372,11 @@ Defs/ThingDef[defName="AA_BlackSpider_Temporary"]/comps
  • - 900 + 925 true 600 5 - 0.5 + 0.25
    • @@ -475,7 +461,7 @@ Defs/ThingDef[defName="AA_MammothWorm_Temporary"] - + @@ -488,7 +474,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml index 8e6dfadcca..91d0106a34 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/AA_VPE/ThingDefs_Races/Races_BlackQueen.xml @@ -3,7 +3,7 @@ -
  • Vanilla Factions Expanded - Insectoids 2
    • +
  • Vanilla Psycasts Expanded
    •  @@ -21,6 +21,7 @@
  • Defs/ThingDef[defName="AAVPE_BlackQueen"]/statBases + 0.95 0.03 0.30 0.57 @@ -100,7 +101,7 @@ true 400 5 - 0.5 + 0.25
    • diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Arachnid.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Arachnid.xml index 1f10035526..b9cf5aca7a 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Arachnid.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Arachnid.xml @@ -91,4 +91,52 @@     + + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[customLabel="left second leg"]/groups + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[customLabel="left second leg"] + + + + + + + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[customLabel="right second leg"]/groups + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[customLabel="right second leg"] + + + + + + + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[customLabel="left third leg"]/groups + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[customLabel="left third leg"] + + + + + + + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[customLabel="right third leg"]/groups + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[customLabel="right third leg"] + + + + + + + + Defs/BodyDef[defName="AA_Arachnid"]/corePart/parts/li[def="InsectLeg"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ScorpionLike.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ScorpionLike.xml index 8ca2debbb4..bd17a093e8 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ScorpionLike.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_ScorpionLike.xml @@ -92,6 +92,20 @@ + + Defs/BodyDef[defName="AA_ScorpionLike"]//*[def="InsectLeg"] + + + + + + + Defs/BodyDef[defName="AA_ScorpionLike"]//*[def="InsectLeg" or def="AA_LeftPincer" or def="AA_RightPincer"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + Defs/BodyDef[defName="AA_ScorpionLike"]/corePart/parts/li[def="AA_InsectTail"]/groups diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slurrypede.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slurrypede.xml index 99ddf9c9cf..aaefd402db 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slurrypede.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/BodyDefs/Bodies_CE_Patch_Slurrypede.xml @@ -38,6 +38,60 @@ + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + Defs/BodyDef[defName="AA_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/groups diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Animalisk.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Animalisk.xml index 760c57e05a..b8ca0b25c4 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Animalisk.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Animalisk.xml @@ -12,14 +12,14 @@ Defs/ThingDef[defName="AA_Animalisk"]/statBases/ArmorRating_Blunt - 2 + 5 Defs/ThingDef[defName="AA_Animalisk"]/statBases/ArmorRating_Sharp - 2 + 3 @@ -96,7 +96,7 @@ Defs/ThingDef[defName="AA_Animalisk"] - + @@ -109,7 +109,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Atispec.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Atispec.xml index 61d25e6dbb..eb290d1f6a 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Atispec.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Atispec.xml @@ -143,7 +143,7 @@ Defs/ThingDef[defName="AA_Atispec"] - + @@ -156,7 +156,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Barb_Slinger.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Barb_Slinger.xml index 07c672f5ec..af44afeaf5 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Barb_Slinger.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Barb_Slinger.xml @@ -29,7 +29,7 @@ Defs/ThingDef[defName="AA_Barbslinger"]/statBases/ArmorRating_Sharp - 2 + 3 @@ -90,7 +90,6 @@
  • - false 0.5
  • AA_LeftPincer
    • @@ -98,7 +97,6 @@
  • - false 0.5
  • AA_LeftPincer
    • @@ -115,7 +113,7 @@ Defs/ThingDef[defName="AA_Barbslinger"] - + @@ -128,7 +126,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml index d7c9873b61..9c4d3db7ae 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Base.xml @@ -14,14 +14,12 @@
  • - false 0.25
  • InsectLeg
  • - false 0.25
  • InsectLeg
    • @@ -32,10 +30,4 @@ - - Defs/ThingDef[@Name="AA_AlphaBaseInsect" or @Name="BaseInsect2"]/statBases - - 0 - - \ No newline at end of file diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bed_Bug.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bed_Bug.xml index 3e1c1c4c4e..99b4feaf46 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bed_Bug.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bed_Bug.xml @@ -69,7 +69,7 @@ Defs/ThingDef[defName="AA_BedBug"] - + @@ -82,7 +82,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Behemoth.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Behemoth.xml index 490930221f..a1b447dbc8 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Behemoth.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Behemoth.xml @@ -137,7 +137,7 @@ Defs/ThingDef[defName="AA_Behemoth"] - + @@ -150,7 +150,7 @@ true 400 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml index 179426ef88..acfa8670d5 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Black_Hive.xml @@ -92,11 +92,11 @@ Defs/ThingDef[defName="AA_BlackScarab"]/comps
  • - 187 + 150 true 600 5 - 0.5 + 0.25
    • @@ -150,13 +150,6 @@ - - Defs/ThingDef[defName="AA_BlackSpelopede"]/race/baseHealthScale - - 1.4 - - - Defs/ThingDef[defName="AA_BlackSpelopede"]/tools @@ -213,11 +206,11 @@ Defs/ThingDef[defName="AA_BlackSpelopede"]/comps
  • - 600 + 625 true 600 5 - 0.5 + 0.25
    • @@ -231,13 +224,6 @@ - - Defs/ThingDef[defName="AA_BlackSpider"]/race/baseHealthScale - - 2.1 - - - Defs/ThingDef[defName="AA_BlackSpider"]/statBases/ArmorRating_Blunt @@ -334,11 +320,11 @@ Defs/ThingDef[defName="AA_BlackSpider"]/comps
  • - 900 + 925 true 600 5 - 0.5 + 0.25
    • diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Blizzarisk.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Blizzarisk.xml index ab7bacc5d2..e8c0c2fbbe 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Blizzarisk.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Blizzarisk.xml @@ -13,14 +13,14 @@ Defs/ThingDef[defName="AA_Blizzarisk"]/statBases/ArmorRating_Blunt - 2 + 5 Defs/ThingDef[defName="AA_Blizzarisk"]/statBases/ArmorRating_Sharp - 2 + 3 @@ -97,7 +97,7 @@ Defs/ThingDef[defName="AA_Blizzarisk"] - + @@ -110,7 +110,7 @@ true 600 5 - 0.5 + 0.25 @@ -143,7 +143,7 @@ Defs/ThingDef[defName="AA_BlizzariskClutchMother"]/statBases/ArmorRating_Sharp - 4 + 5 @@ -220,7 +220,7 @@ Defs/ThingDef[defName="AA_BlizzariskClutchMother"] - + @@ -233,7 +233,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bloodshrimp.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bloodshrimp.xml index cd409c63e5..6a87bec222 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bloodshrimp.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Bloodshrimp.xml @@ -100,7 +100,7 @@ Defs/ThingDef[defName="AA_BloodShrimp"] - + @@ -113,7 +113,7 @@ true 300 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Boulder_Mit.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Boulder_Mit.xml index 0007e624b0..a9fb2d4b72 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Boulder_Mit.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Boulder_Mit.xml @@ -67,7 +67,7 @@ Defs/ThingDef[defName="AA_BoulderMit"] - + @@ -80,7 +80,7 @@ true 600 5 - 0.5 + 0.25 @@ -160,7 +160,7 @@ Defs/ThingDef[defName="AA_SummitCrab"] - + @@ -173,7 +173,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ChemfuelMyrmidon.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ChemfuelMyrmidon.xml index 001b6c9391..64f730437b 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ChemfuelMyrmidon.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_ChemfuelMyrmidon.xml @@ -76,7 +76,7 @@ Defs/ThingDef[defName="AA_ChemfuelMyrmidon"] - + @@ -89,7 +89,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Cinderlisk.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Cinderlisk.xml index 09ad7b2e40..aaa9355cdd 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Cinderlisk.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Cinderlisk.xml @@ -12,14 +12,14 @@ Defs/ThingDef[defName="AA_Cinderlisk"]/statBases/ArmorRating_Blunt - 2 + 5 Defs/ThingDef[defName="AA_Cinderlisk"]/statBases/ArmorRating_Sharp - 2 + 3 @@ -105,7 +105,7 @@ Defs/ThingDef[defName="AA_Cinderlisk"] - + @@ -118,7 +118,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrepuscularBeetle.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrepuscularBeetle.xml index cfdf1d25dc..729bfab8c4 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrepuscularBeetle.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrepuscularBeetle.xml @@ -68,7 +68,7 @@ Defs/ThingDef[defName="AA_CrepuscularBeetle"] - + @@ -81,7 +81,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrystalMit.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrystalMit.xml index 0db2cdaa5c..1970341a7c 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrystalMit.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_CrystalMit.xml @@ -67,7 +67,7 @@ Defs/ThingDef[defName="AA_CrystalMit"] - + @@ -80,7 +80,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DarkBeast.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DarkBeast.xml index f585247d3d..a842a80051 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DarkBeast.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DarkBeast.xml @@ -78,7 +78,7 @@ Defs/ThingDef[defName="AA_Darkbeast"] - + @@ -91,7 +91,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Dunealisk.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Dunealisk.xml index 1b568ef93e..325bfe1870 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Dunealisk.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Dunealisk.xml @@ -13,14 +13,14 @@ Defs/ThingDef[defName="AA_Dunealisk"]/statBases/ArmorRating_Blunt - 2 + 5 Defs/ThingDef[defName="AA_Dunealisk"]/statBases/ArmorRating_Sharp - 2 + 3 @@ -97,7 +97,7 @@ Defs/ThingDef[defName="AA_Dunealisk"] - + @@ -110,7 +110,7 @@ true 600 5 - 0.5 + 0.25 @@ -127,14 +127,14 @@ Defs/ThingDef[defName="AA_DunealiskClutchMother"]/statBases/ArmorRating_Blunt - 8 + 10 Defs/ThingDef[defName="AA_DunealiskClutchMother"]/statBases/ArmorRating_Sharp - 4 + 5 @@ -211,7 +211,7 @@ Defs/ThingDef[defName="AA_DunealiskClutchMother"] - + @@ -224,7 +224,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DuskProwler.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DuskProwler.xml index 2f3edd22d4..ac92c776f1 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DuskProwler.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_DuskProwler.xml @@ -111,7 +111,7 @@ Defs/ThingDef[defName="AA_DuskProwler"] - + @@ -124,7 +124,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Feralisk.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Feralisk.xml index 9c08f905e0..cf013470b0 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Feralisk.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Feralisk.xml @@ -13,14 +13,14 @@ Defs/ThingDef[defName="AA_Feralisk"]/statBases/ArmorRating_Blunt - 4 + 5 Defs/ThingDef[defName="AA_Feralisk"]/statBases/ArmorRating_Sharp - 2 + 3 @@ -97,7 +97,7 @@ Defs/ThingDef[defName="AA_Feralisk"] - + @@ -110,7 +110,7 @@ true 600 5 - 0.5 + 0.25 @@ -127,14 +127,14 @@ Defs/ThingDef[defName="AA_FeraliskClutchMother"]/statBases/ArmorRating_Blunt - 8 + 10 Defs/ThingDef[defName="AA_FeraliskClutchMother"]/statBases/ArmorRating_Sharp - 4 + 5 @@ -211,7 +211,7 @@ Defs/ThingDef[defName="AA_FeraliskClutchMother"] - + @@ -224,7 +224,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FrostboundBehemoth.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FrostboundBehemoth.xml index 7c8a3ab8b5..a3525c27ca 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FrostboundBehemoth.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_FrostboundBehemoth.xml @@ -13,14 +13,14 @@ Defs/ThingDef[defName="AA_FrostboundBehemoth"]/statBases/ArmorRating_Blunt - 2 + 6 Defs/ThingDef[defName="AA_FrostboundBehemoth"]/statBases/ArmorRating_Sharp - 2 + 3 @@ -63,7 +63,7 @@ Defs/ThingDef[defName="AA_FrostboundBehemoth"] - + @@ -76,7 +76,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostling.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostling.xml index 577a6aea3c..c102345cdb 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostling.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostling.xml @@ -89,7 +89,7 @@ Defs/ThingDef[defName="AA_Frostling"] - + @@ -102,7 +102,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostmite.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostmite.xml index c5c1b597b1..f1e5c9c756 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostmite.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Frostmite.xml @@ -78,7 +78,7 @@ Defs/ThingDef[defName="AA_Frostmite"] - + @@ -91,7 +91,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Gallatross.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Gallatross.xml index a1b5d6183c..9dae121037 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Gallatross.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Gallatross.xml @@ -66,7 +66,7 @@ Defs/ThingDef[defName="AA_Gallatross"] - + @@ -79,7 +79,7 @@ true 600 5 - 0.75 + 0.5 @@ -91,7 +91,7 @@ Defs/ThingDef[defName="AA_Gallatross"] - + diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Great_Devourer.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Great_Devourer.xml index 8beaf0f258..a444ffa522 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Great_Devourer.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Great_Devourer.xml @@ -74,7 +74,7 @@ Defs/ThingDef[defName="AA_GreatDevourer"] - + @@ -87,7 +87,7 @@ true 400 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Groundrunner.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Groundrunner.xml index 1bc8c5fa98..aa61f859c9 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Groundrunner.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Groundrunner.xml @@ -107,7 +107,7 @@ Defs/ThingDef[defName="AA_Groundrunner"] - + @@ -120,7 +120,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ironhusk_Beetle.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ironhusk_Beetle.xml index 5851758f6e..e4698c8b4c 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ironhusk_Beetle.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ironhusk_Beetle.xml @@ -75,7 +75,7 @@ Defs/ThingDef[defName="AA_IronhuskBeetle"] - + @@ -88,7 +88,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Junglelisk.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Junglelisk.xml index 41c4287132..ba34ea9748 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Junglelisk.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Junglelisk.xml @@ -13,14 +13,14 @@ Defs/ThingDef[defName="AA_Junglelisk"]/statBases/ArmorRating_Blunt - 2 + 5 Defs/ThingDef[defName="AA_Junglelisk"]/statBases/ArmorRating_Sharp - 2 + 3 @@ -97,7 +97,7 @@ Defs/ThingDef[defName="AA_Junglelisk"] - + @@ -110,7 +110,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Luciferbug.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Luciferbug.xml index 30a4ddd8a5..c9cdd894e6 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Luciferbug.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Luciferbug.xml @@ -67,7 +67,7 @@ Defs/ThingDef[defName="AA_LuciferBug"] - + @@ -80,7 +80,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml index 152ea22351..dad02cd5ae 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mammoth_Worm.xml @@ -94,7 +94,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mantrap.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mantrap.xml index e650e9a78a..abf88dbf36 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mantrap.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Mantrap.xml @@ -72,7 +72,7 @@ Defs/ThingDef[defName="AA_Mantrap"] - + @@ -85,7 +85,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MegaLouse.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MegaLouse.xml index 2246f82db3..c49671f13e 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MegaLouse.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MegaLouse.xml @@ -81,7 +81,7 @@ Defs/ThingDef[defName="AA_MegaLouse"] - + @@ -94,7 +94,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MoribundGallatross.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MoribundGallatross.xml index a50d0979d0..ab9817c21d 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MoribundGallatross.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_MoribundGallatross.xml @@ -66,7 +66,7 @@ Defs/ThingDef[defName="AA_GallatrossMoribund"] - + @@ -79,7 +79,7 @@ true 600 5 - 0.75 + 0.5 @@ -91,7 +91,7 @@ Defs/ThingDef[defName="AA_GallatrossMoribund"] - + diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needlepost.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needlepost.xml index 05a8161481..624e5f1802 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needlepost.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needlepost.xml @@ -71,7 +71,7 @@ Defs/ThingDef[defName="AA_Needlepost"] - + @@ -84,7 +84,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needleroll.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needleroll.xml index 9f4d229230..021ccbbd73 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needleroll.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Needleroll.xml @@ -59,7 +59,7 @@ Defs/ThingDef[defName="AA_Needleroll"] - + @@ -72,7 +72,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Pebble_Mit.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Pebble_Mit.xml index 2e79eb5f67..aee33c97ac 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Pebble_Mit.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Pebble_Mit.xml @@ -66,7 +66,7 @@ Defs/ThingDef[defName="AA_PebbleMit"] - + @@ -79,7 +79,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Plasmorph.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Plasmorph.xml index c140836bbb..1441aa7490 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Plasmorph.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Plasmorph.xml @@ -65,7 +65,7 @@ Defs/ThingDef[defName="AA_Plasmorph"] - + @@ -78,7 +78,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Raptor_Shrimp.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Raptor_Shrimp.xml index b7e96378ed..c406b23050 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Raptor_Shrimp.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Raptor_Shrimp.xml @@ -100,7 +100,7 @@ Defs/ThingDef[defName="AA_RaptorShrimp"] - + @@ -113,7 +113,7 @@ true 200 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ravager.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ravager.xml index 956efbf5d5..fb5a2f0f38 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ravager.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Ravager.xml @@ -1,5 +1,6 @@ + Defs/ThingDef[defName="AA_Ravager"] @@ -23,16 +24,10 @@ - - Defs/ThingDef[defName="AA_Ravager"]/race/baseHealthScale - - 3.1 - - - Defs/ThingDef[defName="AA_Ravager"]/statBases + 0.9 0.01 0.36 0.2 @@ -75,7 +70,7 @@ Defs/ThingDef[defName="AA_Ravager"] - + @@ -84,12 +79,13 @@ Defs/ThingDef[defName="AA_Ravager"]/comps
  • - 1400 + 1875 true 600 5 - 0.5 + 0.25
    • +     \ No newline at end of file diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Rayhound.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Rayhound.xml index 55ee3bbc75..1aca40068a 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Rayhound.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Rayhound.xml @@ -88,7 +88,7 @@ Defs/ThingDef[defName="AA_RayHound"] - + @@ -101,7 +101,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RipperHound.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RipperHound.xml index b68a8bf450..f4b4e22f90 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RipperHound.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RipperHound.xml @@ -89,7 +89,7 @@ Defs/ThingDef[defName="AA_RipperHound"] - + @@ -102,7 +102,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RoughPlatedMonitor.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RoughPlatedMonitor.xml index f5d207fa00..959ebe0095 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RoughPlatedMonitor.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_RoughPlatedMonitor.xml @@ -108,7 +108,7 @@ Defs/ThingDef[defName="AA_RoughPlatedMonitor"] - + @@ -121,7 +121,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Sand_Squid.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Sand_Squid.xml index feb5e14207..c4413ad980 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Sand_Squid.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Sand_Squid.xml @@ -65,7 +65,7 @@ Defs/ThingDef[defName="AA_SandSquid"] - + @@ -78,7 +78,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Skyeel.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Skyeel.xml index 668c8d821e..0841d6c2b2 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Skyeel.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Skyeel.xml @@ -67,7 +67,7 @@ Defs/ThingDef[defName="AA_Skyeel"] - + @@ -80,7 +80,7 @@ true 450 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml index c683df6410..e6172a7324 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Slurrypede.xml @@ -1,5 +1,6 @@ + Defs/ThingDef[defName="AA_Slurrypede"] @@ -50,12 +51,38 @@ + + Defs/ThingDef[defName="AA_Slurrypede"] + +
  • + +
  • + 0.25 + +
  • SightSensor
    • +
  • HearingSensor
    • +
  • SmellSensor
    • + + +
  • + 0.25 + +
  • SightSensor
    • +
  • HearingSensor
    • +
  • SmellSensor
    • + + + + +     +     + Defs/ThingDef[defName="AA_Slurrypede"]/comps Defs/ThingDef[defName="AA_Slurrypede"] - + @@ -78,9 +105,8 @@ true 350 0.5 - 6 - 12 +     \ No newline at end of file diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Terramorph.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Terramorph.xml index 1f11acface..c35cdfa6d4 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Terramorph.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Terramorph.xml @@ -76,7 +76,7 @@ Defs/ThingDef[defName="AA_Terramorph"] - + @@ -89,7 +89,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thermadon.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thermadon.xml index 4762d330ac..c45df01547 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thermadon.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thermadon.xml @@ -33,13 +33,6 @@ - - Defs/ThingDef[defName="AA_Thermadon"]/race/baseHealthScale - - 2 - - - Defs/ThingDef[defName="AA_Thermadon"] @@ -97,7 +90,7 @@ Defs/ThingDef[defName="AA_Thermadon"] - + @@ -110,7 +103,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thunderbeast.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thunderbeast.xml index 5699280101..94b59bdcd4 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thunderbeast.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Thunderbeast.xml @@ -78,7 +78,7 @@ Defs/ThingDef[defName="AA_Thunderbeast"] - + @@ -91,7 +91,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_UnblinkingEye.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_UnblinkingEye.xml index 764a84ac87..70a3d35a50 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_UnblinkingEye.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_UnblinkingEye.xml @@ -32,13 +32,13 @@
  • Defs/ThingDef[defName="AA_UnblinkingEye"]/statBases/ArmorRating_Blunt - 9.85 + 10
  • Defs/ThingDef[defName="AA_UnblinkingEye"]/statBases/ArmorRating_Sharp - 4.25 + 4.5
    • @@ -85,7 +85,7 @@ Defs/ThingDef[defName="AA_UnblinkingEye"] - + @@ -98,7 +98,7 @@ true 450 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Windbeast.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Windbeast.xml index 0143bdff60..42a5990845 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Windbeast.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/ThingDefs_Races/AlphaAnimals_CE_Patch_Race_Windbeast.xml @@ -12,14 +12,14 @@ Defs/ThingDef[defName="AA_WindBeast"]/statBases/ArmorRating_Blunt - 2.8 + 2.85 Defs/ThingDef[defName="AA_WindBeast"]/statBases/ArmorRating_Sharp - 0.65 + 0.75 @@ -77,7 +77,7 @@ Defs/ThingDef[defName="AA_WindBeast"] - + @@ -90,7 +90,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Animals/Patches/Alpha Animals/VFE_Mechs/VFESlurrymaster.xml b/ModPatches/Alpha Animals/Patches/Alpha Animals/VFE_Mechs/VFESlurrymaster.xml index eafbaec4cb..eaa321e6dc 100644 --- a/ModPatches/Alpha Animals/Patches/Alpha Animals/VFE_Mechs/VFESlurrymaster.xml +++ b/ModPatches/Alpha Animals/Patches/Alpha Animals/VFE_Mechs/VFESlurrymaster.xml @@ -64,7 +64,7 @@ Defs/ThingDef[defName="VFE_Mech_Slurrymaster"] - + @@ -87,8 +87,6 @@ true 450 0.5 - 6 - 12 diff --git a/ModPatches/Alpha Genes/Defs/Alpha Genes/Ammo/Forsakens_Ammo_ProjReskin.xml b/ModPatches/Alpha Genes/Defs/Alpha Genes/Ammo/Forsakens_Ammo_ProjReskin.xml new file mode 100644 index 0000000000..dfad620e27 --- /dev/null +++ b/ModPatches/Alpha Genes/Defs/Alpha Genes/Ammo/Forsakens_Ammo_ProjReskin.xml @@ -0,0 +1,350 @@ + + + + + + + AmmoSet_8x35mmCharged_ForsakenSniper + + + Bullet_8x35mmCharged_ForsakenSniper + Bullet_8x35mmCharged_AP_ForsakenSniper + Bullet_8x35mmCharged_Ion_ForsakenSniper + + + + + Bullet_8x35mmCharged_ForsakenSniper + + + Things/Item/Weapon/AG_ForsakenSniper/AG_SniperPulse + Graphic_Single + + + 19 + +
  • + Bomb_Secondary + 6 +
    • +     + 16 + 57.6 +     +     + + + Bullet_8x35mmCharged_AP_ForsakenSniper + + + Things/Item/Weapon/AG_ForsakenSniper/AG_SniperPulse + Graphic_Single + + + 15 + +
  • + Bomb_Secondary + 2 +
    • +     + 30 + 57.6 +     +     + + + Bullet_8x35mmCharged_Ion_ForsakenSniper + + + Things/Item/Weapon/AG_ForsakenSniper/AG_SniperPulse + Graphic_Single + + + 15 + +
  • + EMP + 9 +
    • +     + 22.5 + 57.6 + 0.2 +     +     + + + + + AmmoSet_12GaugeCharged_ForsakenShotGun + + + Bullet_12GaugeCharged_ForsakenShotGun + Bullet_12GaugeCharged_Slug_ForsakenShotGun + Bullet_12GaugeCharged_Ion_ForsakenShotGun + + + + + Bullet_12GaugeCharged_ForsakenShotGun + + + Things/Item/Weapon/AG_ForsakenShotgun/AG_ForsakenShotgun + Graphic_Single + TransparentPostLight + 0.5,0.5 + + + + 15 + +
  • + Bomb_Secondary + 5 +
    • +     + 8 + 24.4 + 4 + 17.8 +     +     + + + Bullet_12GaugeCharged_Slug_ForsakenShotGun + + + Things/Item/Weapon/AG_ForsakenShotgun/AG_ForsakenShotgun + Graphic_Single + TransparentPostLight + + + 25 + +
  • + Bomb_Secondary + 13 +
    • +     + 12 + 90 +     +     + + + Bullet_12GaugeCharged_Ion_ForsakenShotGun + + + Things/Item/Weapon/AG_ForsakenShotgun/AG_ForsakenShotgun + Graphic_Single + TransparentPostLight + + + 10 + +
  • + EMP + 6 +
    • +     + 8 + 14.4 + 4 + 17.8 + 0.025 +     +     + + + + + AmmoSet_5x35mmCharged_ForsakenAR + + + Bullet_5x35mmCharged_ForsakenAR + + + + + Bullet_5x35mmCharged_ForsakenAR + + + Things/Item/Weapon/AG_ForsakenAssaultRifle/AG_ForsakenAssaultRifle + Graphic_Single + + + Bullet + 13 + 200 + +
  • + Bomb_Secondary + 2 +
    • +     + 30 + 40 +     +     + + + + + + + AmmoSet_ForsakensArrows + + + Projectile_ForsakensArrows + Projectile_GreatArrow_StoneFO + Projectile_GreatArrow_SteelFO + Projectile_GreatArrow_PlasteelFO + Projectile_GreatArrow_VenomFO + Projectile_GreatArrow_Flame + + + + + + + Ammo_ForsakensArrows + + Heavy arrow designed to be fired from a forsaken bow. + + ThirdParty/Forsakens/FAmmoArrow + Graphic_StackCount + + + 0.115 + 0.66 + 0 + + ForsakenArrow + + + + + + Projectile_ForsakensArrows + + + Things/Item/Weapon/AG_ForsakenBow/AG_ForsakenArrow + Graphic_Single + + + 12 + 4.5 + 5 + 0.5 + 39 + + Ammo_ForsakensArrows + + + + + Projectile_GreatArrow_StoneFO + + + Things/Projectile/Arrows/Arrow_Stone + Graphic_Single + + + 26 + 8 + 1.660 + 1 + 0.2 + Ammo_GreatArrow_Stone + + + + + Projectile_GreatArrow_SteelFO + + + Things/Projectile/Arrows/Arrow_Steel + Graphic_Single + + + 31 + 10 + 2.340 + 2 + 0.6 + Ammo_GreatArrow_Steel + + + + + Projectile_GreatArrow_PlasteelFO + + + Things/Projectile/Arrows/Arrow_Plasteel + Graphic_Single + + + 36 + 9 + 2.140 + 3 + 0.75 + Ammo_GreatArrow_Plasteel + + + + + Projectile_GreatArrow_VenomFO + + + Things/Projectile/Arrows/Arrow_Venom + Graphic_Single + + + 31 + Arrow + 10 + +
  • + ArrowVenom + 2 +
    • +     + 2.340 + 2 + 0.6 + Ammo_GreatArrow_Steel +     +     + + + + + MakeAmmo_ForsakensArrows + + Craft 10 forsakens arrows. + Making forsaken arrows. + 400 + + +
  • + + +
  • Steel
    • + + + 10 + +     + + +
  • Steel
    • +     +     + + 10 + +     + +     \ No newline at end of file diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml index b17dfb14d6..dc263293b9 100644 --- a/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/GeneDefs/GeneDefs_Armour.xml @@ -5,7 +5,7 @@ Defs/GeneDef[defName="AG_FungalSkin"]/customEffectDescriptions -
  • +3/4.5 blunt/sharp natural armour. +25% injury healing factor.
    • +
  • +3/5 blunt/sharp natural armour. +25% injury healing factor.
  • Fires will cause permanent wounds.
    •      @@ -15,7 +15,7 @@ Defs/GeneDef[defName="AG_ArmourMinor"]/customEffectDescriptions -
  • +1/1.5 blunt/sharp natural armour.
    • +
  • +1/2 blunt/sharp natural armour.
    •      @@ -24,7 +24,7 @@ Defs/GeneDef[defName="AG_ArmourMedium"]/customEffectDescriptions -
  • +2/3 blunt/sharp natural armour.
    • +
  • +2/3.75 blunt/sharp natural armour.
    •      @@ -33,7 +33,7 @@ Defs/GeneDef[defName="AG_ArmourMajor"]/customEffectDescriptions -
  • +2.5/3.75 blunt/sharp natural armour.
    • +
  • +2.5/5 blunt/sharp natural armour.
    •      diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml index ce0b952016..e978a10a45 100644 --- a/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/HediffDefs/Hediffs_Armour.xml @@ -6,7 +6,7 @@ 3.0 - 4.5 + 5 0.25 @@ -17,7 +17,7 @@ 1.0 - 1.5 + 2 @@ -27,7 +27,7 @@ 2.0 - 3.0 + 3.75 @@ -37,7 +37,7 @@ 2.5 - 3.75 + 5.0 diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ScenarioDefs/Scenarios_Forsaken.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ScenarioDefs/Scenarios_Forsaken.xml new file mode 100644 index 0000000000..987d14e3e4 --- /dev/null +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/ScenarioDefs/Scenarios_Forsaken.xml @@ -0,0 +1,16 @@ + + + + + + Defs/ScenarioDef[defName="AG_ForsakenCrashlanded"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_ForsakensArrows + 100 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Items/Items_Resource_Stuff.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Items/Items_Resource_Stuff.xml new file mode 100644 index 0000000000..cc43e79d12 --- /dev/null +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Items/Items_Resource_Stuff.xml @@ -0,0 +1,54 @@ + + + + + + + Defs/ThingDef[defName="AG_Ultima"]/statBases/StuffPower_Armor_Sharp + + + 0.2 + + + + + Defs/ThingDef[defName="AG_Ultima"]/statBases/StuffPower_Armor_Blunt + + + 0.18 + + + + Defs/ThingDef[defName="AG_Ultima"]/statBases/StuffPower_Armor_Heat + + + 0.08 + + + + + Defs/ThingDef[defName="AG_Ultima"]/stuffProps/categories + + Defs/ThingDef[defName="AG_Ultima"]/stuffProps + + +
  • SoftArmor
    • +     +     +     + + Defs/ThingDef[defName="AG_Ultima"]/stuffProps/categories + +
  • SoftArmor
    • +     +     +     + + + Defs/ThingDef[defName="AG_Ultima"]/statBases + + 0.05 + + + +     \ No newline at end of file diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/AG_ApparelDefs.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/AG_ApparelDefs.xml new file mode 100644 index 0000000000..589fa79035 --- /dev/null +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/AG_ApparelDefs.xml @@ -0,0 +1,255 @@ + + + + + + + + + Defs/ThingDef[defName="AG_Forsaken_Hood" or defName="AG_Forsaken_Hood_Child"]/statBases + + 1 + + + + + Defs/ThingDef[defName="AG_ForsakenCloak"]/statBases + + 7.5 + 1 + + + + + Defs/ThingDef[defName="AG_ForsakenCloak_Child"]/statBases + + 3.5 + 1 + + + + + Defs/ThingDef[ + defName="AG_Forsaken_Hood"or + defName="AG_Forsaken_Hood_Child" or + defName="AG_ForsakenCloak" or + defName="AG_ForsakenCloak_Child" + ]/statBases/ArmorRating_Sharp + + + 1.25 + + + + + Defs/ThingDef[ + defName="AG_Forsaken_Hood"or + defName="AG_Forsaken_Hood_Child" or + defName="AG_ForsakenCloak" or + defName="AG_ForsakenCloak_Child" + ]/statBases/ArmorRating_Blunt + + + 0.35 + + + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet" or defName="AG_ForsakenMarineHelmetPsy"]/statBases + + 6 + 1.5 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet" or defName="AG_ForsakenMarineHelmetPsy"]/statBases/ArmorRating_Sharp + + 16 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet" or defName="AG_ForsakenMarineHelmetPsy"]/statBases/ArmorRating_Blunt + + 36 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet"]/apparel/immuneToToxGasExposure + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet"]/apparel + + true + + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmetPsy"]/apparel/immuneToToxGasExposure + + Defs/ThingDef[defName="AG_ForsakenMarineHelmetPsy"]/apparel + + true + + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet" or defName="AG_ForsakenMarineHelmetPsy"]/equippedStatOffsets + + 0.50 + -1 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet" or defName="AG_ForsakenMarineHelmetPsy"]/statBases + + 0 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet" or defName="AG_ForsakenMarineHelmetPsy"]/statBases/MaxHitPoints + + 250 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet" or defName="AG_ForsakenMarineHelmetPsy"]/apparel/layers + +
  • OnHead
    • +
  • StrappedHead
    • +     +     + + + Defs/ThingDef[defName="AG_ForsakenMarineHelmet" or defName="AG_ForsakenMarineHelmetPsy"] + +
  • + +
  • + 0.80 + +
  • Eye
    • +
  • Nose
    • + + +
  • + 0.80 + +
  • Eye
    • +
  • Nose
    • + + + + +     +     + + + + + Defs/ThingDef[defName="AG_ForsakenMarineArmor"]/statBases + + 100 + 15 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineArmor"]/equippedStatOffsets + + 20 + 80 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineArmor"]/statBases/ArmorRating_Sharp + + 20 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineArmor"]/statBases/ArmorRating_Blunt + + 45 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineArmor"]/statBases/Mass + + 40 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineArmor"]/statBases/Flammability + + 0 + + + + + Defs/ThingDef[defName="AG_ForsakenMarineArmor"]/apparel/bodyPartGroups + +
  • Hands
    • +
  • Feet
    • +     +     + + + Defs/ThingDef[defName="AG_ForsakenMarineArmor"] + +
  • + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.70 + +
  • Hand
    • + + +
  • + 0.70 + +
  • Hand
    • + + + + +     +     + +     \ No newline at end of file diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/Projectiles_Patch.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/Projectiles_Patch.xml index f225387411..1329aaf620 100644 --- a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/Projectiles_Patch.xml +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/Projectiles_Patch.xml @@ -29,4 +29,38 @@ + + + + Defs/ThingDef[defName="AG_Bullet_HydraBlast"] + + + AG_Bullet_HydraBlast + + + Things/Item/Weapon/AG_BlackHydra/AG_BigPulse + Graphic_Single + + + Bullet + 50 + 76 + 42.273 + 90 + true + + +
  • + 120 + Bomb + 3 + true + Filth_Fuel + 0.5 +
    • +     +     +     +     + \ No newline at end of file diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/WeaponsMelee_Forsaken.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/WeaponsMelee_Forsaken.xml new file mode 100644 index 0000000000..e8675d6553 --- /dev/null +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/WeaponsMelee_Forsaken.xml @@ -0,0 +1,260 @@ + + + + + + + Defs/ThingDef[defName="AG_ForsakenLongBlade"]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 0.33 + 1.52 + 0.500 + Handle + +
  • + + +
  • Stab
    • + + 20 + 1 + 2 + 20 + Point + +
  • + + +
  • Cut
    • + + 34 + 0.88 + 3 + 10 + Edge + +     +     +     + + + Defs/ThingDef[defName="AG_ForsakenLongBlade"]/statBases + + 8 + 1.33 + + + + + Defs/ThingDef[defName="AG_ForsakenLongBlade"] + + + 1.6 + 1.0 + 0.4 + + + + + + + + + Defs/ThingDef[defName="AG_ForsakenBattleAxe"]/tools + + +
  • + + +
  • Blunt
    • + + 7 + 1.35 + 0.15 + 3 + Shaft + +
  • + + +
  • Stab
    • + + 12 + 2.2 + 1.165 + 1 + 14 + Point + +
  • + + +
  • Cut
    • + + 45 + 2.2 + 1.165 + 25.4 + 16 + Edge + +     +     +     + + + Defs/ThingDef[defName="AG_ForsakenBattleAxe"]/statBases + + 12 + 1.08 + + + + + Defs/ThingDef[defName="AG_ForsakenBattleAxe"]/equippedStatOffsets + + + 0.33 + 1.2 + 0.6 + + + + + + + + + Defs/ThingDef[defName="AG_ForsakenBulkSword"]/tools + + +
  • + + +
  • Poke
    • + + 3 + 0.5 + 0.10 + 0.8 + Handle + +
  • + + +
  • Stab
    • + + 12 + 0.6 + 0.60 + 1 + 14 + Point + +
  • + + +
  • Cut
    • + + 22 + 0.6 + 0.30 + 2.592 + 7 + Edge + +     +     +     + + + Defs/ThingDef[defName="AG_ForsakenBulkSword"]/statBases + + + 9 + 1 + + + + + Defs/ThingDef[defName="AG_ForsakenBulkSword"] + + + 0.63 + 0.75 + 0.4 + + + + + + + + Defs/ThingDef[defName="AG_ForsakenSpear"]/tools + + +
  • + + +
  • Blunt
    • + + 7 + 1.35 + 0.15 + 2.25 + Shaft + +
  • + + +
  • Poke
    • + + 8 + 1.78 + 0.05 + 1 + Point + +
  • + + +
  • Stab
    • + + 21 + 1.18 + 1.00 + 3 + 18 + Head + +     +     +     + + + Defs/ThingDef[defName="AG_ForsakenSpear"]/statBases + + 10 + 1.68 + + + + + Defs/ThingDef[defName="AG_ForsakenSpear"] + + + 0.17 + 1.45 + 0.9 + + + + +     \ No newline at end of file diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/WeaponsRanged_Forsaken.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/WeaponsRanged_Forsaken.xml new file mode 100644 index 0000000000..14cb66f58a --- /dev/null +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Misc/WeaponsRanged_Forsaken.xml @@ -0,0 +1,300 @@ + + + + + + + Defs/ThingDef[ + defName="AG_ForsakenSniper" or + defName="AG_ForsakenShotgun" or + defName="AG_ForsakenAssaultRifle" + ]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + +     +     +     + + + Defs/ThingDef[defName="AG_ForsakenBow"]/tools + + +
  • + +
  • Blunt
    • + + 7 + 1.6 + 0.65 + +     +     +     + + + Defs/ThingDef[defName="AG_ForsakenHydra"] + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + +     +     +     + + + + + AG_ForsakenSniper + + 7.18 + 0.56 + 2.80 + 0.02 + 1.6 + 12.60 + 50500 + + + + 2 + 50 + 15 + 35 + 1 + 6 + + + CombatExtended.Verb_ShootCE + true + Bullet_8x35mmCharged_ForsakenSniper + 1.6 + 86 + Shot_SniperRifle + GunTail_Heavy + 12 + + + 10 + 4 + AmmoSet_8x35mmCharged_ForsakenSniper + + + FALSE + AimedShot + + +
  • Bipod_AMR
    • +     + false +     + + + + + + AG_ForsakenShotgun + + 3.10 + 0.56 + 1.0 + 0.14 + 1.03 + 7.20 + 54500 + + + + 1 + 50 + 15 + 30 + 1 + 4 + + + CombatExtended.Verb_ShootCE + true + Bullet_12GaugeCharged_ForsakenShotGun + 0.6 + 18 + Shot_Shotgun + GunTail_Heavy + 14 + + + + 8 + 4 + AmmoSet_12GaugeCharged_ForsakenShotGun + + + FALSE + Snapshot + + + + + + + + + + AG_ForsakenAssaultRifle + + 3 + 0.36 + 1.00 + 0.1 + 1.33 + 10.03 + 60500 + + + 1 + 50 + 15 + 35 + 1 + 3 + + + 1.29 + CombatExtended.Verb_ShootCE + true + Bullet_5x35mmCharged_ForsakenAR + 1.1 + 55 + 8 + 4 + Shot_ChargeRifle + GunTail_Heavy + 1 + + + 40 + 4 + AmmoSet_5x35mmCharged_ForsakenAR + + + TRUE + AimedShot + 4 + + + + + + + + + AG_ForsakenBow + + 0.7 + 0.75 + 2 + 4.00 + 1 + + + 100 + + + CombatExtended.Verb_ShootCE + true + Projectile_ForsakensArrows + 1.2 + 26 + Bow_Large + + + AmmoSet_ForsakensArrows + + + RecurveBow + true + + + + AG_ForsakenHydra + + 10.00 + 1.20 + 1.00 + 0.01 + 2 + 13.00 + 80000 + + + 10 + 100 + 100 + 50 + 6 + + + CombatExtended.Verb_ShootCE + true + AG_Bullet_HydraBlast + 3 + 4 + 62 + ChargeLance_Fire + GunTail_Heavy + false + 1 + false + + true + + + + 1 + 6 + + + AimedShot + + false + + +     \ No newline at end of file diff --git a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml index 43da453774..45de0071ad 100644 --- a/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml +++ b/ModPatches/Alpha Genes/Patches/Alpha Genes/ThingDefs_Races/Races_OcularSlinger.xml @@ -15,14 +15,12 @@
  • - false 0.25
  • InsectLeg
  • - false 0.25
  • InsectLeg
    • @@ -39,7 +37,6 @@
  • - false 0.5
  • AG_LeftPincer
    • @@ -47,7 +44,6 @@
  • - false 0.5
  • AG_LeftPincer
    • @@ -59,13 +55,6 @@ -
  • - Defs/ThingDef[@Name="AG_BaseInsect"]/statBases - - 0 - -
    • -
  • @@ -118,7 +107,7 @@
  • Defs/ThingDef[defName="AG_OcularSlinger"]/statBases/ArmorRating_Sharp - 2 + 3
    • @@ -201,7 +190,7 @@ Defs/ThingDef[defName="AG_OcularSlinger"] - + @@ -214,7 +203,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Alpha Implants/Abilities.xml b/ModPatches/Alpha Implants/Patches/Alpha Implants/Abilities.xml similarity index 100% rename from ModPatches/Alpha Implants/Abilities.xml rename to ModPatches/Alpha Implants/Patches/Alpha Implants/Abilities.xml diff --git a/ModPatches/Alpha Implants/Alpha Animals/Hediffs_RangedImplants.xml b/ModPatches/Alpha Implants/Patches/Alpha Implants/Alpha Animals/Hediffs_RangedImplants.xml similarity index 100% rename from ModPatches/Alpha Implants/Alpha Animals/Hediffs_RangedImplants.xml rename to ModPatches/Alpha Implants/Patches/Alpha Implants/Alpha Animals/Hediffs_RangedImplants.xml diff --git a/ModPatches/Alpha Implants/Alpha Mythology/Hediffs_RangedImplants.xml b/ModPatches/Alpha Implants/Patches/Alpha Implants/Alpha Mythology/Hediffs_RangedImplants.xml similarity index 100% rename from ModPatches/Alpha Implants/Alpha Mythology/Hediffs_RangedImplants.xml rename to ModPatches/Alpha Implants/Patches/Alpha Implants/Alpha Mythology/Hediffs_RangedImplants.xml diff --git a/ModPatches/Alpha Implants/Anomaly/Abilities.xml b/ModPatches/Alpha Implants/Patches/Alpha Implants/Anomaly/Abilities.xml similarity index 100% rename from ModPatches/Alpha Implants/Anomaly/Abilities.xml rename to ModPatches/Alpha Implants/Patches/Alpha Implants/Anomaly/Abilities.xml diff --git a/ModPatches/Alpha Implants/Anomaly/Hediffs_Implants.xml b/ModPatches/Alpha Implants/Patches/Alpha Implants/Anomaly/Hediffs_Implants.xml similarity index 100% rename from ModPatches/Alpha Implants/Anomaly/Hediffs_Implants.xml rename to ModPatches/Alpha Implants/Patches/Alpha Implants/Anomaly/Hediffs_Implants.xml diff --git a/ModPatches/Alpha Implants/Biotech/Abilities.xml b/ModPatches/Alpha Implants/Patches/Alpha Implants/Biotech/Abilities.xml similarity index 100% rename from ModPatches/Alpha Implants/Biotech/Abilities.xml rename to ModPatches/Alpha Implants/Patches/Alpha Implants/Biotech/Abilities.xml diff --git a/ModPatches/Alpha Implants/DamageDefs.xml b/ModPatches/Alpha Implants/Patches/Alpha Implants/DamageDefs.xml similarity index 100% rename from ModPatches/Alpha Implants/DamageDefs.xml rename to ModPatches/Alpha Implants/Patches/Alpha Implants/DamageDefs.xml diff --git a/ModPatches/Alpha Implants/Hediffs_Implants.xml b/ModPatches/Alpha Implants/Patches/Alpha Implants/Hediffs_Implants.xml similarity index 95% rename from ModPatches/Alpha Implants/Hediffs_Implants.xml rename to ModPatches/Alpha Implants/Patches/Alpha Implants/Hediffs_Implants.xml index 77daeb4938..9036fe5d8c 100644 --- a/ModPatches/Alpha Implants/Hediffs_Implants.xml +++ b/ModPatches/Alpha Implants/Patches/Alpha Implants/Hediffs_Implants.xml @@ -62,14 +62,14 @@ Defs/HediffDef[defName="AI_AnimalProstheticShell"]/stages/li/statOffsets/ArmorRating_Sharp - 0.5 + 1.5 Defs/HediffDef[defName="AI_AnimalProstheticShell"]/stages/li/statOffsets/ArmorRating_Blunt - 0.75 + 1 @@ -83,7 +83,7 @@ Defs/HediffDef[defName="AI_AnimalProstheticWing"]/stages/li/statOffsets/ArmorRating_Blunt - 0.35 + 0.25 @@ -162,7 +162,7 @@ 0.5 1.4 MeleeHit_BionicPunch - MeleeMiss_BionicPunch + MeleeMiss_BionicPunch @@ -182,7 +182,7 @@ 0.4 1.4 MeleeHit_BionicPunch - MeleeMiss_BionicPunch + MeleeMiss_BionicPunch @@ -211,14 +211,14 @@ Defs/HediffDef[defName="AI_AnimalBionicShell"]/stages/li/statOffsets/ArmorRating_Sharp - 1 + 3 Defs/HediffDef[defName="AI_AnimalBionicShell"]/stages/li/statOffsets/ArmorRating_Blunt - 1.5 + 2 @@ -303,7 +303,7 @@ 0.75 1.4 MeleeHit_BionicPunch - MeleeMiss_BionicPunch + MeleeMiss_BionicPunch @@ -323,7 +323,7 @@ 0.6 1.4 MeleeHit_BionicPunch - MeleeMiss_BionicPunch + MeleeMiss_BionicPunch diff --git a/ModPatches/Alpha Implants/Royalty/Abilities.xml b/ModPatches/Alpha Implants/Patches/Alpha Implants/Royalty/Abilities.xml similarity index 100% rename from ModPatches/Alpha Implants/Royalty/Abilities.xml rename to ModPatches/Alpha Implants/Patches/Alpha Implants/Royalty/Abilities.xml diff --git a/ModPatches/Alpha Implants/Patches/Alpha Implants/Royalty/Hediffs_Implants.xml b/ModPatches/Alpha Implants/Patches/Alpha Implants/Royalty/Hediffs_Implants.xml new file mode 100644 index 0000000000..c54bcc7d1d --- /dev/null +++ b/ModPatches/Alpha Implants/Patches/Alpha Implants/Royalty/Hediffs_Implants.xml @@ -0,0 +1,89 @@ + + + + + +
  • Royalty
    • +     + + + + + +
  • + Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/capMods +
    • + +
  • + Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/statOffsets/ArmorRating_Sharp + + 2.5 + +
    • + +
  • + Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/statOffsets/ArmorRating_Blunt + + 1.5 + +
    • + +
  • + Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/statOffsets + + -0.25 + -0.02 + +
    • + +
  • + Defs/HediffDef[defName="AI_AnimalVenomFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • ToxicBite
    • + + 5 + 1.11 + 0.15 + 1.5 + HeadAttackTool + true + + + + + + +
  • + Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/capMods +
    • + +
  • + Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/statOffsets/ArmorRating_Sharp + + 4.5 + +
    • + +
  • + Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/statOffsets/ArmorRating_Blunt + + 3.5 + +
    • + +
  • + Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/statOffsets + + -0.05 + +
    • + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Alpha Implants/Royalty/Hediffs_Implants.xml b/ModPatches/Alpha Implants/Royalty/Hediffs_Implants.xml deleted file mode 100644 index 87886ba224..0000000000 --- a/ModPatches/Alpha Implants/Royalty/Hediffs_Implants.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - -
  • Royalty
    • -     - - - - - -
  • - Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/capMods -
    • - -
  • - Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/statOffsets/ArmorRating_Sharp - - 1 - -
    • - -
  • - Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/statOffsets/ArmorRating_Blunt - - 1.5 - -
    • - -
  • - Defs/HediffDef[defName="AI_AnimalSkinHardener"]/stages/li/statOffsets - - -0.25 - -0.01 - -
    • - -
  • - Defs/HediffDef[defName="AI_AnimalVenomFangs"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • ToxicBite
    • - - 5 - 1.11 - 0.15 - 1.5 - HeadAttackTool - true - - - - - - -
  • - Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/capMods -
    • - -
  • - Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/statOffsets/ArmorRating_Sharp - - 2 - -
    • - -
  • - Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/statOffsets/ArmorRating_Blunt - - 3.5 - -
    • - -
  • - Defs/HediffDef[defName="AI_AnimalDermalArmorGland"]/stages/li/statOffsets - - -0.02 - -
    • - -     -     -     - -     \ No newline at end of file diff --git a/ModPatches/Alpha Mechs/Defs/Alpha Mechs/Ammo_Alpha.xml b/ModPatches/Alpha Mechs/Defs/Alpha Mechs/Ammo_Alpha.xml index e9fc58b78a..169f8da3d5 100644 --- a/ModPatches/Alpha Mechs/Defs/Alpha Mechs/Ammo_Alpha.xml +++ b/ModPatches/Alpha Mechs/Defs/Alpha Mechs/Ammo_Alpha.xml @@ -71,7 +71,7 @@ Bullet_5x50mmCaseless_Acidic - + Things/Projectile/ToxicNeedleShot Graphic_Single diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Apocriton.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Apocriton.xml index e18bf8469b..fd5861ecd8 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Apocriton.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Apocriton.xml @@ -57,6 +57,60 @@ + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + Defs/BodyDef[defName="AM_ApocritonWinged"]/corePart/parts/li[def="MechanicalLeg"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Aura.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Aura.xml index fcc3cc8231..834f09a783 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Aura.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Aura.xml @@ -57,6 +57,60 @@ + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + Defs/BodyDef[defName="AM_AuraBody"]/corePart/parts/li[def="MechanicalShoulder"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Daggersnout.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Daggersnout.xml index 51edf670a0..bf6726229a 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Daggersnout.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Daggersnout.xml @@ -57,6 +57,60 @@ + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + Defs/BodyDef[defName="AM_DaggerSnoutBody"]/corePart/parts/li[def="AM_TankPlateThird"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Demolisher.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Demolisher.xml index b7d2bea835..5843242377 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Demolisher.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Demolisher.xml @@ -39,6 +39,60 @@ + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + Defs/BodyDef[defName="AM_DemolisherBody"]/corePart/parts/li[def="AM_TankPlateThird"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Siegebreaker.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Siegebreaker.xml index 6bc200e517..0c4a3d6098 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Siegebreaker.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/BodyDefs/Bodies_Siegebreaker.xml @@ -39,6 +39,60 @@ + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • +     +     +     + + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankTurret"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     +     + Defs/BodyDef[defName="AM_SiegebreakerBody"]/corePart/parts/li[def="AM_TankPlateSecond"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/AlphaBees/Apiarist.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/AlphaBees/Apiarist.xml index e79c6cc65e..7e8a592004 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/AlphaBees/Apiarist.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/AlphaBees/Apiarist.xml @@ -42,7 +42,7 @@ Defs/ThingDef[defName="AM_Mech_Apiarist"] - + @@ -64,7 +64,7 @@ 200 true 70 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Assembler.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Assembler.xml index 535821497d..39c704c5ee 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Assembler.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Assembler.xml @@ -45,6 +45,60 @@ +
  • + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • + + +     + + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + +
  • + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + +
  • + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + +
  • Defs/BodyDef[defName="AM_Assembler"]/corePart/parts/li[def="AM_MechanicalBodyCarapace"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Guttersnipe.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Guttersnipe.xml index 973131eea4..3b7a2300ab 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Guttersnipe.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Guttersnipe.xml @@ -63,6 +63,60 @@
    • +
  • + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + +
  • + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + +
  • + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + +
  • Defs/BodyDef[defName="AM_Mech_Guttersnipe"]/corePart/parts/li[def="AM_CircularSaw"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Slurrypede.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Slurrypede.xml index 78ab537b57..9d69bf2bf3 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Slurrypede.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_Slurrypede.xml @@ -45,6 +45,60 @@
    • +
  • + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + +
  • + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + +
  • + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + +
  • Defs/BodyDef[defName="AM_SlurrypedeBody"]/corePart/parts/li[def="MechanicalCentipedeBodySecondRing"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_WarEmpress.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_WarEmpress.xml index 93a3f6ab7a..42af4fe4a2 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_WarEmpress.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/Bodies/Bodies_WarEmpress.xml @@ -45,6 +45,60 @@
    • +
  • + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SightSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + +
  • + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="HearingSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + +
  • + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"] + + +
  • CoveredByNaturalArmor
    • + + + + + Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalHead"]/parts/li[def="SmellSensor"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + +
  • Defs/BodyDef[defName="AM_Mech_WarEmpress"]/corePart/parts/li[def="MechanicalWarqueenBodySecondRing"]/groups diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Apoptosis.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Apoptosis.xml index 03f0b960cc..37106be5fe 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Apoptosis.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Apoptosis.xml @@ -130,8 +130,6 @@ true 525 0.5 - 14 - 35
    • diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor.xml index d5eeb84f1f..4817664f17 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor.xml @@ -92,7 +92,7 @@ 200 true 100 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor_Mortar.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor_Mortar.xml index 529305c89c..05580b43f0 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor_Mortar.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Bellicor_Mortar.xml @@ -92,7 +92,7 @@ 200 true 525 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Blitzkrieg.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Blitzkrieg.xml index 12cd1fa5df..7688b1a9bc 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Blitzkrieg.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Blitzkrieg.xml @@ -41,7 +41,7 @@ Defs/ThingDef[defName="AM_Blitzkrieg"] - + @@ -63,7 +63,7 @@ 200 true 70 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Guttersnipe.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Guttersnipe.xml index 7b291eb4a1..9ea7169bf3 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Guttersnipe.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Guttersnipe.xml @@ -79,7 +79,7 @@ Defs/ThingDef[defName="AM_Mech_Guttersnipe"] - + @@ -101,7 +101,7 @@ 200 true 160 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Infernus.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Infernus.xml index 60057e3c04..fc8f27e4a7 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Infernus.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Infernus.xml @@ -80,8 +80,6 @@ true 425 0.5 - 14 - 35 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Legate.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Legate.xml index c4a475b7ae..684abf109a 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Legate.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Legate.xml @@ -101,8 +101,6 @@ true 380 0.5 - 14 - 35 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Lux.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Lux.xml index 3894609bf0..2e870f030b 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Lux.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Lux.xml @@ -64,7 +64,7 @@ Defs/ThingDef[defName="AM_Mech_Lux"] - + @@ -86,7 +86,7 @@ 200 true 100 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_MasterChef.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_MasterChef.xml index 63bd5b526c..c3dcdcb697 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_MasterChef.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_MasterChef.xml @@ -23,7 +23,7 @@ Defs/ThingDef[defName="AM_Mech_MasterChef"] - + @@ -45,7 +45,7 @@ 200 true 70 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Munifex.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Munifex.xml index 6517d6107e..29f57f931c 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Munifex.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Munifex.xml @@ -64,7 +64,7 @@ Defs/ThingDef[defName="AM_Mech_Munifex"] - + @@ -86,7 +86,7 @@ 200 true 100 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Optio.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Optio.xml index 23ee4f8e74..c5e2ce74b2 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Optio.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Optio.xml @@ -58,7 +58,7 @@ Defs/ThingDef[defName="AM_Mech_Optio"] - + @@ -80,7 +80,7 @@ 200 true 86 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Polychoron.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Polychoron.xml index 6e3bb0dcd6..129365f66e 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Polychoron.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Polychoron.xml @@ -38,7 +38,7 @@ Defs/ThingDef[defName="AM_Mech_Polychoron"] - + @@ -60,7 +60,7 @@ 200 true 135 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineAssembler.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineAssembler.xml index ce1cb00f33..54381ce4e3 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineAssembler.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineAssembler.xml @@ -71,7 +71,7 @@ Defs/ThingDef[defName="AM_Mech_PristineAssembler"] - + @@ -94,8 +94,6 @@ true 350 0.5 - 4 - 10 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineSlurrypede.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineSlurrypede.xml index 80749d3a6d..652de28f36 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineSlurrypede.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineSlurrypede.xml @@ -63,7 +63,7 @@ Defs/ThingDef[defName="AM_Mech_PristineSlurrypede"] - + @@ -86,8 +86,6 @@ true 350 0.5 - 6 - 12 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineStrider.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineStrider.xml index 2a9f92aa29..087f5e5f2d 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineStrider.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_PristineStrider.xml @@ -77,7 +77,7 @@ 200 true 100 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Sagittarius.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Sagittarius.xml index 469dab009f..ae4b0c6400 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Sagittarius.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Sagittarius.xml @@ -71,7 +71,7 @@ Defs/ThingDef[defName="AM_Mech_Sagittarius"] - + @@ -93,7 +93,7 @@ 200 true 100 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Siegemelter.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Siegemelter.xml index ea18fdfd53..c04e6ddd34 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Siegemelter.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Siegemelter.xml @@ -93,8 +93,6 @@ true 425 0.5 - 14 - 35 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Starfire.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Starfire.xml index e8524b22d0..de36a87280 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Starfire.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_Starfire.xml @@ -93,8 +93,6 @@ true 450 0.5 - 16 - 40 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_TurboCleaner.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_TurboCleaner.xml index a64c6cefaa..a9716d38e2 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_TurboCleaner.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_TurboCleaner.xml @@ -41,7 +41,7 @@ Defs/ThingDef[defName="AM_Mech_TurboCleaner"] - + @@ -63,7 +63,7 @@ 200 true 60 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_WarEmpress.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_WarEmpress.xml index e8f2d7a467..d330787f39 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_WarEmpress.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Biotech/ThingDef_Races/Races_WarEmpress.xml @@ -117,8 +117,6 @@ true 575 0.5 - 14 - 35 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Rimatomics/Nucleotron.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Rimatomics/Nucleotron.xml index f3d72b0625..47e37887a8 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Rimatomics/Nucleotron.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/Rimatomics/Nucleotron.xml @@ -23,7 +23,7 @@ Defs/ThingDef[defName="AM_Mech_Nucleotron"] - + @@ -45,7 +45,7 @@ 200 true 70 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Books/Librarian.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Books/Librarian.xml index d57135de35..456e1c34bb 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Books/Librarian.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Books/Librarian.xml @@ -23,7 +23,7 @@ Defs/ThingDef[defName="AM_Mech_Librarian"] - + @@ -45,7 +45,7 @@ 200 true 70 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Fishing/Angler.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Fishing/Angler.xml index b79fb8369f..f65cfa21c2 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Fishing/Angler.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Fishing/Angler.xml @@ -41,7 +41,7 @@ Defs/ThingDef[defName="AM_Mech_Angler"] - + @@ -63,7 +63,7 @@ 200 true 70 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Genetics/Geneticor.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Genetics/Geneticor.xml index b8c84ddc8e..054d1245c6 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Genetics/Geneticor.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VE_Genetics/Geneticor.xml @@ -23,7 +23,7 @@ Defs/ThingDef[defName="AM_Mech_Geneticor"] - + @@ -45,7 +45,7 @@ 200 true 70 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvAura.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvAura.xml index 8ba98363cd..0a2a734bab 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvAura.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvAura.xml @@ -81,7 +81,7 @@ Defs/ThingDef[defName="VFE_Mech_Advanced_Aura"] - + @@ -103,7 +103,7 @@ 200 true 142 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvDaggersnout.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvDaggersnout.xml index 86a8cbba7a..3bad12ca0d 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvDaggersnout.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvDaggersnout.xml @@ -90,7 +90,7 @@ Defs/ThingDef[defName="VFE_Mech_Advanced_Daggersnout"] - + @@ -112,7 +112,7 @@ 200 true 100 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvFireworm.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvFireworm.xml index 8265a2a525..e1a2e1cc7d 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvFireworm.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvFireworm.xml @@ -92,8 +92,6 @@ true 340 0.5 - 8 - 16 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvGoliath.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvGoliath.xml index bdb12896fe..d7cac696be 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvGoliath.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvGoliath.xml @@ -94,8 +94,6 @@ true 365 0.5 - 12 - 27 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvPhalanx.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvPhalanx.xml index 9acb48099c..02a04ec8c4 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvPhalanx.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvPhalanx.xml @@ -92,8 +92,6 @@ true 310 0.5 - 7 - 16 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvSiegebreaker.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvSiegebreaker.xml index 37fa879b31..ffd0e3f4ae 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvSiegebreaker.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Advanced/AdvSiegebreaker.xml @@ -94,8 +94,6 @@ true 425 0.5 - 14 - 35 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEAura.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEAura.xml index 48a930af32..21a3247c2c 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEAura.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEAura.xml @@ -79,7 +79,7 @@ Defs/ThingDef[defName="VFE_Mech_Aura"] - + @@ -101,7 +101,7 @@ 200 true 142 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEDaggersnout.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEDaggersnout.xml index 13d02c411a..4ba0f2ec75 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEDaggersnout.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEDaggersnout.xml @@ -90,7 +90,7 @@ Defs/ThingDef[defName="VFE_Mech_Daggersnout"] - + @@ -112,7 +112,7 @@ 200 true 90 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEFireworm.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEFireworm.xml index f97b1b3151..d2225479a7 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEFireworm.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEFireworm.xml @@ -92,8 +92,6 @@ true 290 0.5 - 8 - 16 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEGoliath.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEGoliath.xml index 0da37c2f87..d2366892ec 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEGoliath.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEGoliath.xml @@ -94,8 +94,6 @@ true 320 0.5 - 12 - 27 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEPhalanx.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEPhalanx.xml index a1e2983075..a203653d77 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEPhalanx.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFEPhalanx.xml @@ -91,8 +91,6 @@ true 272 0.5 - 7 - 16 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFESiegebreaker.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFESiegebreaker.xml index 493fddb683..df6c6dbba9 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFESiegebreaker.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/Clean/VFESiegebreaker.xml @@ -94,8 +94,6 @@ true 350 0.5 - 14 - 35 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Aura.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Aura.xml index f353e2f217..1760ffc978 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Aura.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Aura.xml @@ -107,7 +107,7 @@ 200 true 142 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Daggersnout.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Daggersnout.xml index cd8503f30f..9f75ae2e84 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Daggersnout.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Daggersnout.xml @@ -118,7 +118,7 @@ 200 true 100 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Fireworm.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Fireworm.xml index aced427cae..598ac7f306 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Fireworm.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Fireworm.xml @@ -97,8 +97,6 @@ true 340 0.5 - 8 - 16 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Goliath.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Goliath.xml index 20895a1c2c..83655c8961 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Goliath.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Goliath.xml @@ -99,8 +99,6 @@ true 365 0.5 - 12 - 27 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Phalanx.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Phalanx.xml index 70ae797b58..6ca23169b4 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Phalanx.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Phalanx.xml @@ -96,8 +96,6 @@ true 310 0.5 - 7 - 16 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Siegebreaker.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Siegebreaker.xml index f7ee34a27f..ea913abeb8 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Siegebreaker.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Siegebreaker.xml @@ -99,8 +99,6 @@ true 425 0.5 - 14 - 35 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Slurrymaster.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Slurrymaster.xml index 7034cda20a..2301623ffb 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Slurrymaster.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VFE_Mechs/PlayerControlled/PC_Slurrymaster.xml @@ -92,8 +92,6 @@ true 400 0.5 - 6 - 12 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VRE_Sanguophage/Sanguinarius.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VRE_Sanguophage/Sanguinarius.xml index 814f3da4de..d7bf1ab3f0 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VRE_Sanguophage/Sanguinarius.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/Mods/VRE_Sanguophage/Sanguinarius.xml @@ -83,7 +83,7 @@ Defs/ThingDef[defName="AM_Mech_Sanguinarius"] - + @@ -105,7 +105,7 @@ 200 true 100 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Aura.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Aura.xml index bc33b50a25..403a2f112a 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Aura.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Aura.xml @@ -69,7 +69,7 @@ Defs/ThingDef[defName="AM_Aura"] - +     @@ -91,7 +91,7 @@ 200 true 100 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Daggersnout.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Daggersnout.xml index c0cbc521c0..76eaf4cdf8 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Daggersnout.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Daggersnout.xml @@ -82,7 +82,7 @@ Defs/ThingDef[defName="AM_Daggersnout"] - + @@ -104,7 +104,7 @@ 200 true 90 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Demolisher.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Demolisher.xml index d6a97781ed..d3bb738e43 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Demolisher.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Demolisher.xml @@ -88,8 +88,6 @@ true 350 0.5 - 8 - 16 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Fireworm.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Fireworm.xml index c281320b63..632ca59c4f 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Fireworm.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Fireworm.xml @@ -84,8 +84,6 @@ true 290 0.5 - 8 - 16 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Goliath.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Goliath.xml index e2e85cd098..fb9d6624a9 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Goliath.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Goliath.xml @@ -86,8 +86,6 @@ true 320 0.5 - 12 - 27 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Phalanx.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Phalanx.xml index ed30bd96ec..9e91b2bc64 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Phalanx.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Phalanx.xml @@ -84,8 +84,6 @@ true 272 0.5 - 7 - 16 diff --git a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Siegebreaker.xml b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Siegebreaker.xml index 0dbc8ae6d9..fe7807220c 100644 --- a/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Siegebreaker.xml +++ b/ModPatches/Alpha Mechs/Patches/Alpha Mechs/ThingDefs_Races/AlphaMechs_Race_Siegebreaker.xml @@ -86,8 +86,6 @@ true 350 0.5 - 14 - 35 diff --git a/ModPatches/Alpha Memes/Patches/Alpha Memes/HediffDefs/Hediffs_Global_Misc.xml b/ModPatches/Alpha Memes/Patches/Alpha Memes/HediffDefs/Hediffs_Global_Misc.xml index 09d0dc3799..4c343ff0b5 100644 --- a/ModPatches/Alpha Memes/Patches/Alpha Memes/HediffDefs/Hediffs_Global_Misc.xml +++ b/ModPatches/Alpha Memes/Patches/Alpha Memes/HediffDefs/Hediffs_Global_Misc.xml @@ -4,28 +4,28 @@ Defs/HediffDef[defName="AM_CatharsisHediff"]/stages/li/statOffsets/ArmorRating_Blunt - 0.5 + 0.75 Defs/HediffDef[defName="AM_UtilityDryadHediff"]/stages/li/statOffsets/ArmorRating_Sharp - 0.5 + 1.25 Defs/HediffDef[defName="AM_UtilityDryadHediff"]/stages/li/statOffsets/ArmorRating_Blunt - 0.75 + 0.85 Defs/HediffDef[defName="AM_CombatDryadHediff"]/stages/li/statOffsets/ArmorRating_Sharp - 1.25 + 2.75 @@ -40,14 +40,14 @@ Defs/HediffDef[defName="AM_GenericDryadHediff"]/stages/li/statOffsets/ArmorRating_Sharp - 0.75 + 2 Defs/HediffDef[defName="AM_GenericDryadHediff"]/stages/li/statOffsets/ArmorRating_Blunt - 1.25 + 1.5 diff --git a/ModPatches/Alpha Memes/Patches/Alpha Memes/ThingDefs_Races/Races_Animal_Special_Ideology.xml b/ModPatches/Alpha Memes/Patches/Alpha Memes/ThingDefs_Races/Races_Animal_Special_Ideology.xml index fa74e56364..375dbb120e 100644 --- a/ModPatches/Alpha Memes/Patches/Alpha Memes/ThingDefs_Races/Races_Animal_Special_Ideology.xml +++ b/ModPatches/Alpha Memes/Patches/Alpha Memes/ThingDefs_Races/Races_Animal_Special_Ideology.xml @@ -93,7 +93,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Races.xml b/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Races.xml index 20a8a7d12b..0a2fb60878 100644 --- a/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Races.xml +++ b/ModPatches/Alpha Mythology/Patches/Alpha Mythology/AM_CE_Patch_Races.xml @@ -1243,7 +1243,7 @@ Defs/ThingDef[defName="MM_LesserWyvern"] - + @@ -1256,7 +1256,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Apparel.xml b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Apparel.xml index 174f7eec55..8a2f35803e 100644 --- a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Apparel.xml +++ b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Apparel.xml @@ -3,7 +3,7 @@ - Defs/ThingDef[@Name="AC_HuntersHelmet"]/apparel + Defs/ThingDef[@Name="AC_ApparelArmorHelmetChrysalisMakeableBase"]/apparel true ApparelHead @@ -11,7 +11,7 @@ - Defs/ThingDef[@Name="AC_HuntersHelmet"]/apparel/layers + Defs/ThingDef[@Name="AC_ApparelArmorHelmetChrysalisMakeableBase"]/apparel/layers
  • OnHead
  • StrappedHead
    • @@ -19,23 +19,32 @@     - Defs/ThingDef[@Name="AC_HuntersArmourBase"]/apparel/bodyPartGroups + Defs/ThingDef[@Name="AC_ApparelArmorChrysalisMakeableBase"]/apparel/bodyPartGroups
  • Hands
  • Feet
    •      + + Defs/ThingDef[ - defName="AC_Apparel_OverseerHelmet" or - defName="VFEU_Apparel_ProtectorHelmet" or + defName="AC_Apparel_ChrysalisHelmet" or defName="AC_Apparel_FusilierHelmet"]/statBases/VEF_RangedCooldownFactor - + + Defs/ThingDef[ + @Name="AC_ApparelArmorChrysalisMakeableBase" or + defName="AC_Apparel_FusilierArmor" or + defName="AC_EnviroSuit" or + defName="AC_Apparel_HayabusaArmor"]/equippedStatOffsets/MoveSpeed + + + - Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/statBases + Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/statBases 5 1 @@ -43,154 +52,77 @@ - - Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/statBases/Flammability - - 0 - - - - - Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/statBases/MaxHitPoints - - 250 - - - - - Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/statBases/Mass - - 3.0 - - - - - Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/statBases/ArmorRating_Sharp - - 16 - - - - - Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/statBases/ArmorRating_Blunt - - 36 - - - - - Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"] - -
  • - -
  • - 0.75 - -
  • Eye
    • - - -
  • - 0.75 - -
  • Eye
    • - - - - -     -     - - Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/equippedStatOffsets - - 0.50 - -1 - - - - - Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/equippedStatOffsets/ShootingAccuracyPawn + Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/statBases - 4 - - - - - Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/costList/Plasteel - - 50 + 19 - Defs/ThingDef[defName="AC_Apparel_OverseerHelmet"]/costList + Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/statBases - 25 + 43 - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases + Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/statBases - 5 - 1 - 0.7 + 0 - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/Flammability + + Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/statBases - 0 + 3.0 - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/MaxHitPoints + + Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/statBases - 275 + 250 - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/Mass + + Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"] - 3.0 + - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/ArmorRating_Sharp + + Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/costList - 20 + 75 - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/statBases/ArmorRating_Blunt + + Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/costList - 45 + 25 - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"] + Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]
  • - 0.80 + 0.85
  • Eye
    • -
  • Nose
  • - 0.80 + 0.85
  • Eye
    • -
  • Nose
    • @@ -199,87 +131,75 @@     - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/equippedStatOffsets + Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/equippedStatOffsets 0.50 -1 - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/equippedStatOffsets/ShootingAccuracyPawn - - 2.5 - - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList/ComponentSpacer + Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/equippedStatOffsets/AimingDelayFactor - 2 + -0.1 - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList/Plasteel + Defs/ThingDef[defName="AC_Apparel_ChrysalisHelmet"]/equippedStatOffsets/ShootingAccuracyPawn - 75 + 1 + - Defs/ThingDef[defName="VFEU_Apparel_ProtectorHelmet"]/costList + Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"] - 30 + - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases + Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/statBases 100 15 - - - - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/Flammability - 0 - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/MaxHitPoints + + Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/statBases 600 - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/Mass + + Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/statBases - 50 + 60 - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/ArmorRating_Sharp + + Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/statBases - 24 + 22 - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/statBases/ArmorRating_Blunt + + Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/statBases - 56 + 58.5 - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"] + Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]
  • @@ -325,37 +245,52 @@ - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/equippedStatOffsets + Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"] - 80 - 10 + + + + + + Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/equippedStatOffsets + + 90 + 15 + 0.15 0.50 - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/ComponentSpacer + + Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"] + + + + + + + Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/costList 5 - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/Plasteel + + Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/costList - 200 + 225 - - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList/Uranium + + Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/costList 50 - Defs/ThingDef[defName="VFEU_Apparel_ProtectorArmor"]/costList + Defs/ThingDef[defName="AC_Apparel_ChrysalisArmor"]/costList 60 @@ -365,8 +300,8 @@ Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases - 6 - 1 + 8 + 2 0.75 @@ -388,61 +323,44 @@ Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/Mass - 6.6 + 8 Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/ArmorRating_Sharp - 25 + 24 Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/statBases/ArmorRating_Blunt - 56 - - - - - Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"] - -
  • - -
  • - 0.80 - -
  • Eye
    • -
  • Nose
    • - - -
  • - 0.80 - -
  • Eye
    • -
  • Nose
    • - - - - + 65     Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/equippedStatOffsets - 0.20 + 0.30 0.50 -1 + + Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/equippedStatOffsets/AimingDelayFactor + + -0.25 + + + Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/equippedStatOffsets/ShootingAccuracyPawn - 5 + 3 @@ -456,14 +374,14 @@ Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/costList/Plasteel - 115 + 140 Defs/ThingDef[defName="AC_Apparel_FusilierHelmet"]/costList - 35 + 30 @@ -471,14 +389,8 @@ Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases - 100 - 15 - - - - - Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/Flammability - + 130 + 20 0 @@ -493,21 +405,21 @@ Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/Mass - 80 + 100 Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/ArmorRating_Sharp - 30 + 33 Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/statBases/ArmorRating_Blunt - 68 + 85 @@ -517,13 +429,13 @@
  • - 0.80 + 0.85
  • Neck
  • - 0.80 + 0.85
  • Neck
    • @@ -541,13 +453,13 @@
  • - 0.70 + 0.85
  • Hand
  • - 0.70 + 0.85
  • Hand
    • @@ -576,7 +488,7 @@ Defs/ThingDef[defName="AC_Apparel_FusilierArmor"]/costList/Plasteel - 270 + 300 @@ -594,6 +506,106 @@     + + + Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/statBases + + 5 + 1 + 0.40 + + + + + Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/apparel/immuneToToxGasExposure + + Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/apparel + + true + + + + + + Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/apparel/layers + +
  • OnHead
    • +
  • StrappedHead
    • +     +     + + + Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/statBases/MaxHitPoints + + 150 + + + + + Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/statBases/Mass + + 2.6 + + + + + Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/statBases/ArmorRating_Sharp + + 6.5 + + + + + Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/statBases/ArmorRating_Blunt + + 20 + + + + + Defs/ThingDef[defName="AC_EnviroSuitHelmet"]/equippedStatOffsets + + -1 + + + + + + Defs/ThingDef[defName="AC_EnviroSuit"]/statBases + + 6 + 4 + + + + + Defs/ThingDef[defName="AC_EnviroSuit"]/statBases/Flammability + + 0 + + + + + Defs/ThingDef[defName="AC_EnviroSuit"]/statBases/MaxHitPoints + + 200 + + + + + Defs/ThingDef[defName="AC_EnviroSuit"]/statBases/ArmorRating_Sharp + + 6.5 + + + + + Defs/ThingDef[defName="AC_EnviroSuit"]/statBases/ArmorRating_Blunt + + 20 + + + Defs/ThingDef[defName="AC_CuirassierBelt"]/statBases @@ -610,7 +622,6 @@ -
  • Royalty
    • @@ -622,44 +633,47 @@
  • Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases - 6 + 5 1 + 0 0.75
    • -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/Flammability +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"] - 0 +
  • + true +
  • Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/MaxHitPoints - 300 + 225
  • Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/Mass - 6.6 + 4
  • Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/ArmorRating_Sharp - 28 + 14.4
  • Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/statBases/ArmorRating_Blunt - 62 + 31.2
    • @@ -705,29 +719,27 @@
  • Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/costList/Plasteel - 125 + 65
  • Defs/ThingDef[defName="AC_Apparel_DragoonHelmet"]/costList - 35 + 20
    • +
  • + Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/equippedStatOffsets/MoveSpeed +
    • +
  • Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases - 100 + 80 15 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/Flammability - 0
    • @@ -735,28 +747,28 @@
  • Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/MaxHitPoints - 700 + 500
  • Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/Mass - 80 + 40
  • Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/ArmorRating_Sharp - 32 + 19.2
  • Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/statBases/ArmorRating_Blunt - 75 + 40.8
    • @@ -809,8 +821,9 @@
  • Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/equippedStatOffsets - 100 - 20 + 60 + 10 + 0.5 0.50
    • @@ -825,21 +838,14 @@
  • Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList/Plasteel - 275 - -
    • - -
  • - Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList/Uranium - - 90 + 185
  • Defs/ThingDef[defName="AC_Apparel_DragoonArmor"]/costList - 75 + 65
    • @@ -851,6 +857,7 @@ 3 +
  • Defs/ThingDef[defName="AC_Apparel_WingJump"]/statBases/JumpRange @@ -862,4 +869,246 @@ + + + Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/apparel/layers + +
  • OnHead
    • +
  • StrappedHead
    • + +     + + + Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/apparel + + true + ApparelHead + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/statBases + + 5 + 1 + 0.6 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/statBases/Flammability + + 0 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/statBases/MaxHitPoints + + 240 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/statBases/ArmorRating_Sharp + + 16 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/statBases/ArmorRating_Blunt + + 36 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"] + +
  • + +
  • + 0.80 + +
  • Eye
    • +
  • Nose
    • + + +
  • + 0.80 + +
  • Eye
    • +
  • Nose
    • + + + + +     +     + + + Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/costList + + 30 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/equippedStatOffsets/ToxicEnvironmentResistance + + -0.08 + 0.5 + 0.15 + 0.35 + 0.05 + 0.1 + -1 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/equippedStatOffsets/ShootingAccuracyPawn + + 2.5 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaHelmet"]/equippedStatOffsets/AimingDelayFactor + + -0.2 + + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/apparel/bodyPartGroups + +
  • Hands
    • +
  • Feet
    • +     +     + + + Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/statBases + + 106.7 + 16 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/statBases/Flammability + + 0 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/statBases/MaxHitPoints + + 1200 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/statBases/Mass + + 53.3 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/statBases/ArmorRating_Sharp + + 16 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/statBases/ArmorRating_Blunt + + 36 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"] + +
  • + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.70 + +
  • Hand
    • + + +
  • + 0.70 + +
  • Hand
    • + + + + +     +     + + + Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/equippedStatOffsets/CarryingCapacity + + 88.1 + 10.7 + 0.05 + 0.1 + 0.3 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/equippedStatOffsets/ToxicEnvironmentResistance + + 0.5 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/equippedStatOffsets/MeleeDodgeChance + + 0.15 + + + + + Defs/ThingDef[defName="AC_Apparel_HayabusaArmor"]/costList + + 100 + + + \ No newline at end of file diff --git a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Hediff.xml b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Hediff.xml new file mode 100644 index 0000000000..947c5b28ff --- /dev/null +++ b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Hediff.xml @@ -0,0 +1,248 @@ + + + + + Defs/HediffDef[defName="AC_PainProtection"]/stages/li/statFactors + + Defs/HediffDef[defName="AC_PainProtection"]/stages/li + + + + + + + + Defs/HediffDef[defName="AC_PainProtection"]/stages/li/statFactors + + 0.5 + + + + + Defs/HediffDef[defName="AC_RogianArmBlade"]/comps/li[@Class="AlteredCarbon.HediffCompProperties_MeleeWeapon"]/tools + + +
  • + + +
  • Cut
    • + + 25 + 2.16 + 0.87 + 2 + true + Blade + MeleeHit_BionicSlash + MeleeMiss_BionicSlash + +
  • + + +
  • Stab
    • + + 20 + 3.6 + 3.6 + 2 + true + Blade + MeleeHit_BionicSlash + MeleeMiss_BionicSlash + +     +     +     + + + +
  • Royalty
    • +     + + + +
  • + Defs/HediffDef[defName="AC_RogianArmBlade_Mono"]/comps/li[@Class="AlteredCarbon.HediffCompProperties_MeleeWeapon"]/tools + + +
  • + + +
  • Cut
    • + + 25 + 1.5 + 2.88 + 13.5 + Blade + true + MeleeHit_MonoSword + MeleeMiss_BionicSlash + +
  • + + +
  • Stab
    • + + 12 + 1.5 + 1.28 + 18.75 + Blade + true + MeleeHit_MonoSword + MeleeMiss_BionicSlash + + + + + +
  • + Defs/HediffDef[defName="AC_RogianArmBlade_Plasma"]/comps/li[@Class="AlteredCarbon.HediffCompProperties_MeleeWeapon"]/tools + + +
  • + + +
  • Cut
    • + + 25 + +
  • + Flame + 5 + 0.3 +
    • +     + 2 + true + 3.06 + 18 + Blade + MeleeHit_PlasmaSword + MeleeMiss_BionicSlash + +
  • + + +
  • Stab
    • + + 12 + +
  • + Flame + 3 + 0.2 +
    • +     + 2 + true + 0.9 + 24 + Blade + MeleeHit_PlasmaSword + MeleeMiss_BionicSlash + + + + + +
  • + Defs/HediffDef[defName="AC_RogianArmBlade_Zeus"]/comps/li[@Class="AlteredCarbon.HediffCompProperties_MeleeWeapon"]/tools + + +
  • + + +
  • Cut
    • + + 25 + +
  • + EMP + 5 +
    • +     + 2 + true + 4.06 + 18 + Blade + MeleeHit_ZeusHammer + MeleeMiss_BionicSlash + +
  • + + +
  • Stab
    • + + 12 + +
  • + EMP + 5 +
    • +     + 2 + true + 0.9 + 24 + Blade + MeleeHit_ZeusHammer + MeleeMiss_BionicSlash + + + + + +     +     +     + + + +
  • Vanilla Factions Expanded - Empire
    • +     + + + +
  • + Defs/HediffDef[defName="AC_RogianArmBlade_Toxblade"]/comps/li[@Class="AlteredCarbon.HediffCompProperties_MeleeWeapon"]/tools + + +
  • + + +
  • Cut
    • + + 14 + 1.4 + true + 4.06 + 9 + Blade + Interact_MonoSword + MeleeMiss_BionicSlash + +
  • + + +
  • VFEE_StabToxblade
    • + + 14 + 1.4 + true + 0.9 + 13 + Blade + Interact_MonoSword + MeleeMiss_BionicSlash + + + + + +     +     +     +     \ No newline at end of file diff --git a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Weapons.xml b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Weapons.xml index 07e1bf6bea..f4d162e61f 100644 --- a/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Weapons.xml +++ b/ModPatches/Altered Carbon Ultratech Unleashed/Patches/Altered Carbon Ultratech Unleashed/AC_Weapons.xml @@ -43,128 +43,6 @@     - - - AC_Gun_ChargeIncursionar - - 55000 - 6 - 11.50 - 1.25 - 0.10 - 1.15 - 0.36 - - - 20 - 10 - 2 - 70 - 3 - - - 1.46 - CombatExtended.Verb_ShootCE - true - Bullet_6x24mmCharged - 1.0 - 55 - 5 - 6 - Shot_ChargeRifle - GunTail_Medium - 9 - - - 30 - 4 - AmmoSet_6x24mmCharged - - - 3 - TRUE - AimedShot - - -
  • CE_AI_AR
    • -
  • AdvancedGun
    • -     -     - - - Defs/ThingDef[defName="AC_Gun_ChargeIncursionar"]/comps - -
  • - switch to rifle mode - switch to shotgun mode - - 4 - true - 0.85 - AmmoSet_12GaugeCharged - - - CombatExtended.Verb_ShootCE - true - Bullet_12GaugeCharged - 0.6 - 1 - 20 - 2.75 - AC_Shot_ChargeShotgun - GunTail_Heavy - 9 - - - Snapshot - -
    • -     -     - - - Defs/ThingDef[defName="AC_Gun_ChargeIncursionar"]/comps/li[@Class="MVCF.Comps.CompProperties_VerbProps"] - - - - Defs/ThingDef[defName = "AC_Gun_ChargeIncursionar"]/tools - - -
  • - - -
  • Blunt
    • - - 8 - 1.55 - 1.5 - 2.755 - Stock - -
  • - - -
  • Blunt
    • - - 5 - 2.02 - 1.630 - Barrel - -
  • - - -
  • Poke
    • - - 8 - 1.55 - 2.755 - Muzzle - -     -     -     - Defs/ThingDef[defName="AC_Gun_Autorevolver"]/tools diff --git a/ModPatches/Androids Expanded/Patches/Androids Expanded/Bodies/Bodies_DroidsExpanded.xml b/ModPatches/Androids Expanded/Patches/Androids Expanded/Bodies/Bodies_DroidsExpanded.xml index 9eb2cdc6ae..f2a5a8b40f 100644 --- a/ModPatches/Androids Expanded/Patches/Androids Expanded/Bodies/Bodies_DroidsExpanded.xml +++ b/ModPatches/Androids Expanded/Patches/Androids Expanded/Bodies/Bodies_DroidsExpanded.xml @@ -37,7 +37,6 @@ def="RightDroidFoot" ]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/Anima Animals - Community Temp/Patches/Anima Animals - Community Temp/ThingDefs_AnimaCreatures.xml b/ModPatches/Anima Animals - Community Temp/Patches/Anima Animals - Community Temp/ThingDefs_AnimaCreatures.xml index b386576d3c..f5f9d3455d 100644 --- a/ModPatches/Anima Animals - Community Temp/Patches/Anima Animals - Community Temp/ThingDefs_AnimaCreatures.xml +++ b/ModPatches/Anima Animals - Community Temp/Patches/Anima Animals - Community Temp/ThingDefs_AnimaCreatures.xml @@ -227,13 +227,6 @@     - - Defs/ThingDef[defName="AnimaWarg"]/race/wildness - - 0.3 - - - Defs/PawnKindDef[defName="AnimaWarg"]/combatPower @@ -272,13 +265,6 @@ Defs/ThingDef[defName="AnimaBear"]/tools - - Defs/ThingDef[defName="AnimaBear"]/race/wildness - - 0.6 - - - Defs/PawnKindDef[defName="AnimaBear"]/combatPower @@ -630,22 +616,15 @@ - - Defs/ThingDef[defName="AnimaMegaspider"]/race/baseHealthScale - - 1.8 - - - Defs/ThingDef[defName="AnimaMegaspider"]/comps
  • - 750 + 925 true 600 5 - 0.5 + 0.25
    • diff --git a/ModPatches/Anima Bionics/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml b/ModPatches/Anima Bionics/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml index 085296a7ea..a875d1f152 100644 --- a/ModPatches/Anima Bionics/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml +++ b/ModPatches/Anima Bionics/Patches/Anima Bionics/Hediffs_Anima_Bionics.xml @@ -5,13 +5,13 @@ - Defs/HediffDef[defName="AnimaWarArmHeddiff"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + Defs/HediffDef[defName="AnimaWarArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools
  • - + -
  • Stab
    • +
  • ToxinScratch
    • 21 1.29 @@ -23,44 +23,30 @@     - - - - - + - Defs/HediffDef[defName="AnimaPlateHediff"]/stages/li/statOffsets/ArmorRating_Sharp + Defs/HediffDef[defName="AnimaLeg"]/stages/li/statOffsets/CarryingCapacity - 1.25 + 30 - - Defs/HediffDef[defName="AnimaPlateHediff"]/stages/li/statOffsets/ArmorRating_Blunt - - 1.8 - - + - - - Defs/HediffDef[defName="AnimaspineHediff"]/stages/li/statOffsets - - 10 - - + + - Defs/HediffDef[defName="AnimaspineHediff"]/stages/li/statOffsets/ArmorRating_Sharp + Defs/HediffDef[defName="AnimaPlate"]/stages/li/statOffsets/ArmorRating_Sharp - 0.85 + 1.5 - Defs/HediffDef[defName="AnimaspineHediff"]/stages/li/statOffsets/ArmorRating_Blunt + Defs/HediffDef[defName="AnimaPlate"]/stages/li/statOffsets/ArmorRating_Blunt - 1.2 + 1.3 diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Buildings/Buildings_Turrets.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Buildings/Buildings_Turrets.xml index 7e50263378..027cc39e60 100644 --- a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Buildings/Buildings_Turrets.xml +++ b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Buildings/Buildings_Turrets.xml @@ -73,7 +73,6 @@ true - 240 7.8 @@ -110,7 +109,6 @@ GunTail_Light 9 - 200 7.8 diff --git a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/Weapons.xml b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/Weapons.xml index 4cb21c029e..558227331b 100644 --- a/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/Weapons.xml +++ b/ModPatches/Anty the war Ant/Patches/Anty the war Ant/ThingDefs_Misc/Weapons.xml @@ -185,7 +185,6 @@ GunTail_Heavy 9 - 18 4 @@ -223,7 +222,6 @@ GunTail_Heavy 9 - 30 4 @@ -261,7 +259,6 @@ GunTail_Heavy 9 - 30 4 @@ -307,7 +304,6 @@ true - 120 7.8 @@ -344,7 +340,6 @@ true - 6 4 @@ -384,7 +379,6 @@ Mounted - 100 7.8 diff --git a/ModPatches/Archotech PowerArmor/Patches/Archotech PowerArmor/Apparel_JDS.xml b/ModPatches/Archotech PowerArmor/Patches/Archotech PowerArmor/Apparel_JDS.xml index 0cada9d57a..1a9fc2f4bf 100644 --- a/ModPatches/Archotech PowerArmor/Patches/Archotech PowerArmor/Apparel_JDS.xml +++ b/ModPatches/Archotech PowerArmor/Patches/Archotech PowerArmor/Apparel_JDS.xml @@ -27,36 +27,39 @@     - Defs/ThingDef[@Name="APA_ArmorBase"]/costList + Defs/ThingDef[defName="APA_Archotech_Palatine_Helmet"]/costList - 45 - 90 + 30 + 45 - - - - - Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/WorkToMake + + Defs/ThingDef[@Name="APA_ArmorBase"]/costList - 26250 + 45 + 90 - - Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/MaxHitPoints + + Defs/ThingDef[defName="APA_Archotech_Palatine_Armor"]/costList - 360 - 5.5 - 1.25 + 70 + 135 + + + + Defs/ThingDef[@Name="APA_HelmetBase"]/statBases/Mass 5 + 5.5 + 1 @@ -116,27 +119,81 @@ - + + - Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/WorkToMake + Defs/ThingDef[defName="APA_Archotech_Palatine_Helmet"]/statBases/Mass - 80000 + 5 + 7.5 + 1 + + + + + Defs/ThingDef[defName="APA_Archotech_Palatine_Helmet"]/apparel/immuneToToxGasExposure + + Defs/ThingDef[defName="APA_Archotech_Palatine_Helmet"]/apparel + + true + + + + + + Defs/ThingDef[defName="APA_Archotech_Palatine_Helmet"]/equippedStatOffsets + + 0.20 + 0.50 + -1 + 1.0 - Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/MaxHitPoints + Defs/ThingDef[defName="APA_Archotech_Palatine_Helmet"]/statBases/ArmorRating_Sharp - 650 - 100 - 15 + 32 + + Defs/ThingDef[defName="APA_Archotech_Palatine_Helmet"]/statBases/ArmorRating_Blunt + + 64 + + + + + Defs/ThingDef[defName="APA_Archotech_Palatine_Helmet"] + +
  • + +
  • + 1.05 + +
  • Eye
    • + + +
  • + 1.05 + +
  • Eye
    • + + + + +     +     + + + Defs/ThingDef[@Name="APA_ArmorBase"]/statBases/Mass 60 + 100 + 15 @@ -144,7 +201,7 @@ Defs/ThingDef[@Name="APA_ArmorBase"]/equippedStatOffsets 90 - 12.5 + 15 0.20     @@ -185,4 +242,60 @@     + + + + Defs/ThingDef[defName="APA_Archotech_Palatine_Armor"]/statBases/Mass + + 60 + 110 + 15 + + + + + Defs/ThingDef[defName="APA_Archotech_Palatine_Armor"]/equippedStatOffsets + + 110 + 30 + 0.20 + + + + + Defs/ThingDef[defName="APA_Archotech_Palatine_Armor"]/statBases/ArmorRating_Sharp + + 45 + + + + + Defs/ThingDef[defName="APA_Archotech_Palatine_Armor"]/statBases/ArmorRating_Blunt + + 94 + + + + + Defs/ThingDef[defName="APA_Archotech_Palatine_Armor"] + +
  • + +
  • + 0.95 + +
  • Hand
    • + + +
  • + 0.95 + +
  • Hand
    • + + + + +     +     + \ No newline at end of file diff --git a/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Scenarios_Astoriel.xml b/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Scenarios_Astoriel.xml index 468544350b..cbda128cdb 100644 --- a/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Scenarios_Astoriel.xml +++ b/ModPatches/Astoriel Legacy/Patches/Astoriel Legacy/Scenarios_Astoriel.xml @@ -4,7 +4,6 @@ Defs/ScenarioDef[defName="AstorielScenario"]/scenario/parts -
  • StartingThing_Defined diff --git a/ModPatches/Beliar Xenotype/Patches/Beliar Xenotype/Weapons.xml b/ModPatches/Beliar Xenotype/Patches/Beliar Xenotype/Weapons.xml new file mode 100644 index 0000000000..c1ccf472b4 --- /dev/null +++ b/ModPatches/Beliar Xenotype/Patches/Beliar Xenotype/Weapons.xml @@ -0,0 +1,64 @@ + + + + + Defs/ThingDef[defName="BX_BloodletterBlade"]/statBases + + 4 + 0.40 + + + + + Defs/ThingDef[defName="BX_BloodletterBlade"] + + + 1.00 + 0.40 + 0.27 + + + + + + Defs/ThingDef[defName="BX_BloodletterBlade"]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.5 + 0.1 + 1.2 + Handle + +
  • + + +
  • GS_BleedDamage
    • + + 14 + 0.94 + 1.28 + 23 + Point + +
  • + + +
  • GS_BleedDamage
    • + + 32 + 0.83 + 2.88 + 14 + Edge + + +     +     + + \ No newline at end of file diff --git a/ModPatches/Big and Small Genes/Defs/Big and Small Genes/Weapons/ThingDef_Ammo.xml b/ModPatches/Big and Small Genes/Defs/Big and Small Genes/Weapons/ThingDef_Ammo.xml index 9634c1f4b2..f5a884fa11 100644 --- a/ModPatches/Big and Small Genes/Defs/Big and Small Genes/Weapons/ThingDef_Ammo.xml +++ b/ModPatches/Big and Small Genes/Defs/Big and Small Genes/Weapons/ThingDef_Ammo.xml @@ -37,7 +37,7 @@ Smelt UnfinishedAmmo 18000 - Making pila. + Making a giant javelin.
  • diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Armor.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Armor.xml index 3f15f9943e..f5e7fb6fda 100644 --- a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Armor.xml +++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Genes/GeneDefs_Armor.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Armor.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Armor.xml index bc4691324a..f4204f809b 100644 --- a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Armor.xml +++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Armor.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Weapons..xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Weapons.xml similarity index 100% rename from ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Weapons..xml rename to ModPatches/Big and Small Genes/Patches/Big and Small Genes/HediffDefs/Hediffs_Weapons.xml diff --git a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml index c70faf7b57..fd561cd74f 100644 --- a/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml +++ b/ModPatches/Big and Small Genes/Patches/Big and Small Genes/Weapons/ThingDef_RangedNeolithic.xml @@ -24,6 +24,9 @@ Medieval true true + +
  • WeaponsRanged
    • +     diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/Biomes_Cavern_CE_Patch_Resources_Leathers.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/Biomes_Cavern_CE_Patch_Resources_Leathers.xml index af31f9cd14..228e38ad55 100644 --- a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/Biomes_Cavern_CE_Patch_Resources_Leathers.xml +++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/Biomes_Cavern_CE_Patch_Resources_Leathers.xml @@ -125,70 +125,70 @@ Defs/ThingDef[defName="BMT_WeakChitin"]/statBases/StuffPower_Armor_Sharp - 0.21 + 0.11 - Defs/ThingDef[defName="BMT_MediumChitin"]/statBases/StuffPower_Armor_Sharp + Defs/ThingDef[defName="BMT_WeakChitin"]/statBases/StuffPower_Armor_Blunt - 1.1 + 0.055 - Defs/ThingDef[defName="BMT_MediumChitin"]/statBases/StuffPower_Armor_Blunt + Defs/ThingDef[defName="BMT_MediumChitin"]/statBases/StuffPower_Armor_Sharp - 0.5 + 0.15 - Defs/ThingDef[defName="BMT_WeakChitin"]/statBases/StuffPower_Armor_Blunt + Defs/ThingDef[defName="BMT_MediumChitin"]/statBases/StuffPower_Armor_Blunt - 0.09 + 0.075 Defs/ThingDef[defName="BMT_CrystalChitin"]/statBases/StuffPower_Armor_Sharp - 1.7 + 0.24 Defs/ThingDef[defName="BMT_CrystalChitin"]/statBases/StuffPower_Armor_Blunt - 0.9 + 0.12 Defs/ThingDef[defName="BMT_RoyalChitin"]/statBases/StuffPower_Armor_Sharp - 2.2 + 0.32 Defs/ThingDef[defName="BMT_RoyalChitin"]/statBases/StuffPower_Armor_Blunt - 1.1 + 0.16 Defs/ThingDef[defName="BMT_DeepChitin"]/statBases/StuffPower_Armor_Sharp - 2.0 + 0.46 Defs/ThingDef[defName="BMT_DeepChitin"]/statBases/StuffPower_Armor_Blunt - 0.95 + 0.23 @@ -219,4 +219,5 @@ 0.4     + \ No newline at end of file diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/CE_Chitin_armor.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/CE_Chitin_armor.xml index cff2378a83..852a572f5a 100644 --- a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/CE_Chitin_armor.xml +++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Misc/CE_Chitin_armor.xml @@ -1,7 +1,20 @@ - + + + Defs/ThingDef[ + defName="BMT_Apparel_ChitinMediumArmor" or + defName="BMT_Apparel_ChitinHeavyArmor" or + defName="BMT_Apparel_ChitinFullArmor"]/apparel/layers + + +
  • Shell
    • +     +     +     + + Defs/ThingDef[defName="BMT_Apparel_ChitinLightArmor"]/statBases/Mass @@ -15,21 +28,12 @@ Defs/ThingDef[defName="BMT_Apparel_ChitinLightArmor"]/statBases/StuffEffectMultiplierArmor 3 + 0.6 + 1.2 - - Defs/ThingDef[ - defName="BMT_Apparel_ChitinMediumArmor" or - defName="BMT_Apparel_ChitinHeavyArmor" or - defName="BMT_Apparel_ChitinFullArmor"]/apparel/layers - - -
  • Shell
    • -     -     -     - + Defs/ThingDef[defName="BMT_Apparel_ChitinMediumArmor"]/statBases @@ -41,10 +45,13 @@ Defs/ThingDef[defName="BMT_Apparel_ChitinMediumArmor"]/statBases/StuffEffectMultiplierArmor - 2.0 + 3.5 + 1.2 + 2.4 + Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/statBases @@ -56,16 +63,14 @@ Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/statBases/StuffEffectMultiplierArmor - 3.0 + 4.5 + 2.4 + 4.8 - + Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/equippedStatOffsets/MoveSpeed - - - - Defs/ThingDef[defName="BMT_Apparel_ChitinHeavyArmor"]/equippedStatOffsets -0.15 @@ -127,6 +132,7 @@ + Defs/ThingDef[defName="BMT_Apparel_ChitinFullArmor"]/statBases @@ -138,7 +144,9 @@ Defs/ThingDef[defName="BMT_Apparel_ChitinFullArmor"]/statBases/StuffEffectMultiplierArmor - 3.5 + 5 + 2.8 + 5.2 @@ -209,19 +217,22 @@ + - Defs/ThingDef[defName="BMT_Apparel_ChitinFullHelmet" - or defName="BMT_Apparel_ChitinBeetleHelmet" - or defName="BMT_Apparel_ChitinSpiderHelmet"]/statBases/StuffEffectMultiplierArmor + Defs/ThingDef[ + defName="BMT_Apparel_ChitinFullHelmet" or + defName="BMT_Apparel_ChitinBeetleHelmet" or + defName="BMT_Apparel_ChitinSpiderHelmet"]/statBases/StuffEffectMultiplierArmor 3.5 - Defs/ThingDef[defName="BMT_Apparel_ChitinFullHelmet" - or defName="BMT_Apparel_ChitinBeetleHelmet" - or defName="BMT_Apparel_ChitinSpiderHelmet"] + Defs/ThingDef[ + defName="BMT_Apparel_ChitinFullHelmet" or + defName="BMT_Apparel_ChitinBeetleHelmet" or + defName="BMT_Apparel_ChitinSpiderHelmet"]
  • diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_DarkAxolotl.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_DarkAxolotl.xml index 70ca842085..bcc45b38b7 100644 --- a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_DarkAxolotl.xml +++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_DarkAxolotl.xml @@ -5,7 +5,6 @@ Defs/ThingDef[defName="BMT_DarkAxolotl"] -
  • Quadruped @@ -15,7 +14,6 @@ Defs/ThingDef[defName="BMT_DarkAxolotl"]/statBases - 0.12 0.05 @@ -25,7 +23,6 @@ Defs/ThingDef[defName="BMT_DarkAxolotl"]/tools -
  • diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Jellypot.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Jellypot.xml index d28a6679bb..3bd6536a97 100644 --- a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Jellypot.xml +++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Jellypot.xml @@ -3,7 +3,6 @@ Defs/ThingDef[defName="BMT_Jellypot"]/statBases/MoveSpeed - 2.0 0.04 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="BMT_Jellypot"]/statBases/ArmorRating_Blunt - 2 @@ -22,7 +20,6 @@ Defs/ThingDef[defName="BMT_Jellypot"]/statBases/ArmorRating_Sharp - 4 @@ -30,7 +27,6 @@ Defs/ThingDef[defName="BMT_Jellypot"]/tools -
  • diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Megapleura.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Megapleura.xml index 7c1e1838a8..0b472c5191 100644 --- a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Megapleura.xml +++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Megapleura.xml @@ -3,7 +3,6 @@ Defs/ThingDef[defName="BMT_Megapleura"]/statBases/MoveSpeed - 7.5 0.06 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="BMT_Megapleura"]/statBases/ArmorRating_Blunt - 3 @@ -22,7 +20,6 @@ Defs/ThingDef[defName="BMT_Megapleura"]/statBases/ArmorRating_Sharp - 3 @@ -30,7 +27,6 @@ Defs/ThingDef[defName="BMT_Megapleura"]/tools -
  • diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Mole.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Mole.xml index e9f7135790..2612036c77 100644 --- a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Mole.xml +++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Mole.xml @@ -3,7 +3,6 @@ Defs/ThingDef[defName="BMT_Mole"] -
  • QuadrupedLow @@ -13,7 +12,6 @@ Defs/ThingDef[defName="BMT_Mole"]/statBases - 0.22 0.01 @@ -30,7 +28,6 @@ Defs/ThingDef[defName="BMT_Mole"]/tools -
  • diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Pillbug.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Pillbug.xml index f7ff6b7b1c..82ced4faba 100644 --- a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Pillbug.xml +++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Pillbug.xml @@ -3,7 +3,6 @@ Defs/ThingDef[defName="BMT_Pillbug"]/statBases/MoveSpeed - 2.3 0.11 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="BMT_Pillbug"]/race/baseHealthScale - 0.3 @@ -22,7 +20,6 @@ Defs/ThingDef[defName="BMT_Pillbug"]/tools -
  • diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Podworm.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Podworm.xml index 73e7640501..aa74305a2f 100644 --- a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Podworm.xml +++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Podworm.xml @@ -3,7 +3,6 @@ Defs/ThingDef[defName="BMT_PodWorm"]/statBases/MoveSpeed - 2.5 0.04 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="BMT_PodWorm"]/statBases/ArmorRating_Blunt - 4.65 @@ -22,7 +20,6 @@ Defs/ThingDef[defName="BMT_PodWorm"]/statBases/ArmorRating_Sharp - 2.25 @@ -30,7 +27,6 @@ Defs/ThingDef[defName="BMT_PodWorm"]/tools -
  • diff --git a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Yooka.xml b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Yooka.xml index f307af679d..64544ecf2f 100644 --- a/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Yooka.xml +++ b/ModPatches/Biomes Caverns/Patches/Biomes Caverns/ThingDefs_Races/CE_Yooka.xml @@ -3,7 +3,6 @@ Defs/ThingDef[defName="BMT_Yooka"]/statBases - 0.15 0.38 @@ -13,7 +12,6 @@ Defs/ThingDef[defName="BMT_Yooka"]/tools -
  • diff --git a/ModPatches/Biomes Core/Patches/Biomes Core/CE_Biomes_Core_Leathers.xml b/ModPatches/Biomes Core/Patches/Biomes Core/CE_Biomes_Core_Leathers.xml index 8c8e870b7d..1fa2a66c99 100644 --- a/ModPatches/Biomes Core/Patches/Biomes Core/CE_Biomes_Core_Leathers.xml +++ b/ModPatches/Biomes Core/Patches/Biomes Core/CE_Biomes_Core_Leathers.xml @@ -1,17 +1,18 @@ + Defs/ThingDef[defName="BiomesCore_CrabShell"]/statBases/StuffPower_Armor_Sharp - 1.0 + 0.17 Defs/ThingDef[defName="BiomesCore_CrabShell"]/statBases/StuffPower_Armor_Blunt - 0.2 + 0.085 @@ -19,28 +20,28 @@ Defs/ThingDef[defName="BiomesCore_GreenChitin"]/statBases/StuffPower_Armor_Sharp - 0.6 + 0.16 Defs/ThingDef[defName="BiomesCore_GreenChitin"]/statBases/StuffPower_Armor_Blunt - 0.6 + 0.08 Defs/ThingDef[defName="BMT_GrayChitin"]/statBases/StuffPower_Armor_Sharp - 0.4 + 0.12 Defs/ThingDef[defName="BMT_GrayChitin"]/statBases/StuffPower_Armor_Blunt - 0.7 + 0.06 @@ -48,14 +49,14 @@ Defs/ThingDef[defName="BMT_Molluskshell"]/statBases/StuffPower_Armor_Sharp - 1.3 + 0.2 Defs/ThingDef[defName="BMT_Molluskshell"]/statBases/StuffPower_Armor_Blunt - 0.4 + 0.1 @@ -70,7 +71,7 @@ Defs/ThingDef[defName="BMT_Leather_Gastropoda"]/statBases/StuffPower_Armor_Blunt - 0.032 + 0.015 @@ -131,4 +132,5 @@ 0.03 + \ No newline at end of file diff --git a/ModPatches/Biotech Expansion - Insectoid/Patches/Biotech Expansion - Insectoid/BEI_Hediffs_BodyParts.xml b/ModPatches/Biotech Expansion - Insectoid/Patches/Biotech Expansion - Insectoid/BEI_Hediffs_BodyParts.xml index 4df25b115b..854a6345e8 100644 --- a/ModPatches/Biotech Expansion - Insectoid/Patches/Biotech Expansion - Insectoid/BEI_Hediffs_BodyParts.xml +++ b/ModPatches/Biotech Expansion - Insectoid/Patches/Biotech Expansion - Insectoid/BEI_Hediffs_BodyParts.xml @@ -8,11 +8,11 @@
  • -
  • Cut
    • +
  • Stab
    • 15 - 0.25 - 0.22 + 0.5 + 0.85 true 1.4 MeleeHit_BionicSlash @@ -26,8 +26,8 @@ Defs/GeneDef[defName="BTEIst_HardenedChitin"]/statOffsets - 2.25 - 3.375 + 2.75 + 3.5     @@ -36,8 +36,8 @@ Defs/HediffDef[defName="BTEIst_Exogelatin"]/stages/li/statOffsets - 2.25 - 3.375 + 2.75 + 3.5     diff --git a/ModPatches/Diverse Mechanoid War Procedure/Defs/Diverse Mechanoid War Procedure/Ammo.xml b/ModPatches/Diverse Mechanoid War Procedure/Defs/Diverse Mechanoid War Procedure/Ammo.xml new file mode 100644 index 0000000000..584fcf3b6f --- /dev/null +++ b/ModPatches/Diverse Mechanoid War Procedure/Defs/Diverse Mechanoid War Procedure/Ammo.xml @@ -0,0 +1,76 @@ + + + + + Ammo_70mmMechanoidGrenade_Tox + + + Things/Ammo/GrenadeLauncher/Tox + Graphic_StackCount + + + 18.34 + + Toxic + Bullet_70mmMechanoidGrenade_Tox + + + + Bullet_70mmMechanoidGrenade_Tox + + + ToxGas + 6.5 + ToxGas + 1 + + + + + MakeAmmo_70mmMechanoidGrenade_Tox + + Craft 5 70mm Mechanoid Tox Grenades. + Making 70mm Mechanoid Tox Grenades. + +
  • + + +
  • Steel
    • + + + 18 + +
  • + + +
  • Prometheum
    • + + + 3 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • ComponentIndustrial
    • +
  • Prometheum
    • +     +     + + 5 + + + 8 + + 9240 +     + +     \ No newline at end of file diff --git a/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/Ammo/70mmToxAmmo.xml b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/Ammo/70mmToxAmmo.xml new file mode 100644 index 0000000000..138f8d25a7 --- /dev/null +++ b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/Ammo/70mmToxAmmo.xml @@ -0,0 +1,13 @@ + + + + + + + Defs/CombatExtended.AmmoSetDef[defName="AmmoSet_70mmMechanoidGrenade"]/ammoTypes + + Bullet_70mmMechanoidGrenade_Tox + + + + diff --git a/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/BodyDefs/Knight.xml b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/BodyDefs/Knight.xml new file mode 100644 index 0000000000..e538a58740 --- /dev/null +++ b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/BodyDefs/Knight.xml @@ -0,0 +1,197 @@ + + + + + + + + + Defs/BodyDef[defName="Knight"]/corePart/groups + + Defs/BodyDef[defName="Knight"]/corePart + + + + + + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalNeck"]/groups + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalNeck"] + + + + + + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"] + + + + + + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalShoulder"]/groups + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalShoulder"] + + + + + + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"] + + + + + + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"] + + + + + + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalLeg"]/groups + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalLeg"] + + + + + + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"] + + + + + + + + + + Defs/BodyDef[defName="Knight"]/corePart/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalNeck"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalNeck"]/parts/li[def="MechanicalHead"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalShoulder"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="Blade"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="Shield"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="MechanicalHand"]/parts/li[def="MechanicalFinger"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalLeg"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[def="MechanicalFoot"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalShoulder"]/coverage + + 0.15 + + + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="Blade"]/coverage + + 0.2 + + + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="MechanicalShoulder"]/parts/li[def="MechanicalArm"]/parts/li[def="Shield"]/coverage + + 0.7 + + + + + Defs/BodyDef[defName="Knight"]/corePart/parts/li[def="FluidReprocessor"]/coverage + + 0.05 + + + +     \ No newline at end of file diff --git a/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/HediffDefs/MechanoidHediffs.xml b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/HediffDefs/MechanoidHediffs.xml new file mode 100644 index 0000000000..56581feb03 --- /dev/null +++ b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/HediffDefs/MechanoidHediffs.xml @@ -0,0 +1,25 @@ + + + + + Defs/HediffDef[defName="AM_MechanoidCommandBuffPikeman"]/stages/li/statOffsets/ShootingAccuracyPawn + + 0.3 + + + + + Defs/HediffDef[defName="AM_MechanoidCommandBuffPikeman"]/stages/li/statOffsets + + 0.3 + + + + + Defs/HediffDef[defName="AM_MechanoidCommandBuffPraetorian"]/stages/li/statOffsets/ArmorRating_Sharp + + 3 + + + + diff --git a/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/ThingDefs_Misc/RangedMechanoid.xml b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/ThingDefs_Misc/RangedMechanoid.xml new file mode 100644 index 0000000000..6550563fde --- /dev/null +++ b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/ThingDefs_Misc/RangedMechanoid.xml @@ -0,0 +1,327 @@ + + + + + + + Defs/ThingDef[defName="Gun_SlugPistol"]/tools + + +
  • + + +
  • Blunt
    • + + 6 + 2.0 + 3.0 + Barrel + +     +     +     + + + Defs/ThingDef[ + defName="Gun_MiniNeedleGun" or + defName="Gun_ChargeLanceRifle" or + defName="Gun_BeamRifle" + ]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + +     +     +     + + + Defs/ThingDef[ + defName="Gun_ToxCannon" or + defName="Gun_MechanoidAutocannon" + ]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + +     +     +     + + + + + Gun_SlugPistol + + 0.38 + 0.7 + 0.17 + 1.07 + 2.10 + + + 2.72 + CombatExtended.Verb_ShootCE + true + Bullet_45ACP_FMJ + 0.6 + 12 + Shot_Slugthrower + GunTail_Light + 9 + + + 7 + 4 + AmmoSet_45ACP + + + Snapshot + + +
  • MechanoidGunMinipistol
    • +     +     + + + + + Gun_MiniNeedleGun + + 0.38 + 2.06 + 0.05 + 0.6 + 7.00 + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_5x50mmCaseless_Sabot_LV + 1.35 + 75 + Shot_NeedleGun + GunTail_Heavy + 9 + + + 5 + 10 + 4 + AmmoSet_5x50mmCaseless_LV + + + AimedShot + + +
  • NoSwitch
    • +     +     + + + + + Gun_ChargeLanceRifle + + 3.0 + 0.36 + 1.10 + 0.08 + 1.20 + 7.00 + + + 1.46 + CombatExtended.Verb_ShootCE + true + Bullet_6x22mmCharged + 1.0 + 55 + 5 + 6 + ChargeLance_Fire + GunTail_Heavy + 9 + + + 30 + 4 + AmmoSet_6x22mmCharged + + + 3 + AimedShot + + +
  • CE_AI_Rifle
    • +
  • NoSwitch
    • +     +     + + + + + Gun_ToxCannon + + 75.00 + 2.2 + 1 + 0.01 + 0.21 + 20.00 + + + 0.1 + CombatExtended.Verb_ShootCE + true + Bullet_70mmMechanoidGrenade_Tox + 2 + 42 + + true + + 1 + ThumpCannon_Fire + GunTail_Heavy + 14 + 3 + 4 + + + 1 + 2 + 9.8 + AmmoSet_70mmMechanoidGrenade + + + AimedShot + + +
  • CE_AI_Launcher
    • +
  • NoSwitch
    • +     +     + + + + + Defs/ThingDef[defName="Gun_EMPCannon"] + + + + + + Gun_MechanoidAutocannon + + 30 + 25 + 2.07 + 0.07 + 1 + 0.47 + + + 2.42 + CombatExtended.Verb_ShootCE + True + Bullet_20x82mmMauser_AP + 3 + 10 + 2.1 + 60 + Shot_Autocannon + GunTail_Medium + 12 + + + 30 + 7.8 + AmmoSet_20x82mmMauser + + + 4 + true + 2 + AimedShot + + +
  • CE_AI_Suppressive
    • +
  • NoSwitch
    • +     +     + + + + Defs/ThingDef[defName="Gun_BeamRifle"]/statBases/RangedWeapon_Cooldown + + 0.56 + + + + + Defs/ThingDef[defName="Gun_BeamRifle"]/verbs/li/warmupTime + + 1.3 + + + + + Defs/ThingDef[defName="Gun_BeamRifle"]/verbs/li/range + + 50 + + + + + Defs/ThingDef[defName="Gun_BeamRifle"]/verbs/li/burstShotCount + + 20 + + + + + Defs/ThingDef[defName="Gun_BeamRifle"]/verbs/li/ticksBetweenBurstShots + + 10 + + + +     \ No newline at end of file diff --git a/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/ThingDefs_Races/PawnKinds_Mechanoids.xml b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/ThingDefs_Races/PawnKinds_Mechanoids.xml new file mode 100644 index 0000000000..3a4baf0e6c --- /dev/null +++ b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/ThingDefs_Races/PawnKinds_Mechanoids.xml @@ -0,0 +1,152 @@ + + + + + + + Defs/PawnKindDef[defName="Mech_Pikeman_Defender"]/combatPower + + 250 + + + + + Defs/PawnKindDef[defName="Mech_Knight"]/combatPower + + 250 + + + + + Defs/PawnKindDef[defName="Mech_Militor_Scout"]/combatPower + + 60 + + + + + Defs/PawnKindDef[defName="Mech_Militor_Sniper"]/combatPower + + 60 + + + + + + + Defs/PawnKindDef[defName="Mech_Lancer_Assault"] + +
  • + + 4 + 5 + +
    • +     +     + + + Defs/PawnKindDef[defName="Mech_Pikeman_Defender"] + +
  • + + 3 + 4 + +
    • +     +     + + + Defs/PawnKindDef[defName="Mech_Pikeman_Commander"] + +
  • + + 4 + 6 + +
    • +     +     + + + Defs/PawnKindDef[defName="Mech_Termite_Shocker"]/weaponTags/li[.="MechanoidGunEMP"] + +
  • MechanoidGunTox
    • +     +     + + + Defs/PawnKindDef[defName="Mech_Termite_Shocker"] + +
  • + + 4 + 5 + + GrenadeEMP +
    • +     +     + + + Defs/PawnKindDef[defName="Mech_Termite_Toxer"] + +
  • + + 4 + 5 + + Toxic +
    • +     +     + + + Defs/PawnKindDef[defName="Mech_Praetorian"] + +
  • + + 3 + 5 + +
    • +     +     + + + Defs/PawnKindDef[defName="Mech_Militor_Scout"] + +
  • + + 4 + 5 + +
    • +     +     + + + Defs/PawnKindDef[defName="Mech_Militor_Sniper"] + +
  • + + 4 + 5 + +
    • +     +     + + + + + Defs/PawnKindDef[defName="Mech_Praetorian"]/weaponTags + + +
  • MechanoidGunIndirect
    • +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/ThingDefs_Races/Races_Mechanoids_Light.xml b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/ThingDefs_Races/Races_Mechanoids_Light.xml new file mode 100644 index 0000000000..b20c11ff52 --- /dev/null +++ b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/ThingDefs_Races/Races_Mechanoids_Light.xml @@ -0,0 +1,74 @@ + + + + + + + Defs/ThingDef[defName="Mech_Militor_Scout"]/comps + + Defs/ThingDef[defName="Mech_Militor_Scout"] + + + + + + + + Defs/ThingDef[defName="Mech_Militor_Sniper"]/comps + + Defs/ThingDef[defName="Mech_Militor_Sniper"] + + + + + + + + Defs/ThingDef[defName="Mech_Militor_Sniper" or defName="Mech_Militor_Scout"]/comps + +
  • + 700 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 70 + 0.75 +
    • +     +     + + + + + Defs/ThingDef[defName="Mech_Militor_Sniper" or defName="Mech_Militor_Scout"] + +
  • + Humanoid +
    • +     +     + + + Defs/ThingDef[defName="Mech_Militor_Sniper" or defName="Mech_Militor_Scout"]/statBases + + 4 + 2.5 + 0.6 + 0.769 + 0.13 + 0.05 + 0.05 + 150 + 0.4 + + + +     \ No newline at end of file diff --git a/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/ThingDefs_Races/Races_Mechanoids_Medium.xml b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/ThingDefs_Races/Races_Mechanoids_Medium.xml new file mode 100644 index 0000000000..533724ab06 --- /dev/null +++ b/ModPatches/Diverse Mechanoid War Procedure/Patches/Diverse Mechanoid War Procedure/ThingDefs_Races/Races_Mechanoids_Medium.xml @@ -0,0 +1,656 @@ + + + + + + + Defs/ThingDef[defName="Mech_Lancer_Assault" or defName="Mech_Knight" or defName="Mech_Washer" or defName="Mech_Praetorian"] + +
  • + Humanoid +
    • +     +     + + + Defs/ThingDef[defName="Mech_Termite_Shocker" or defName="Mech_Termite_Toxer"] + +
  • + QuadrupedLow +
    • +     +     + + + Defs/ThingDef[defName="Mech_Pikeman_Defender" or defName="Mech_Pikeman_Commander"] + +
  • + Quadruped +
    • +     +     + + + + + Defs/ThingDef[defName="Mech_Knight"]/tools + + +
  • + + +
  • Blunt
    • + + 30 + 3 + Shield + 27 + true + +
  • + + +
  • Cut
    • + + 43 + 3 + Blade + 2.16 + 5.4 + true + +
  • + + +
  • Stab
    • + + 24 + 2 + Blade + 40 + 20 + true + +
  • + + +
  • Blunt
    • + + 6 + 5.9 + HeadAttackTool + 0.2 + 1.875 + +     +     +     + + + Defs/ThingDef[defName="Mech_Pikeman_Defender"]/tools + + +
  • + + +
  • Blunt
    • + + 13 + 2.67 + FrontLeftLeg + 5 + true + +
  • + + +
  • Blunt
    • + + 13 + 2.67 + FrontRightLeg + 5 + true + +
  • + + +
  • Blunt
    • + + 15 + 3.51 + HeadAttackTool + 12 + true + 0.2 + +     +     +     + + + Defs/ThingDef[defName="Mech_Pikeman_Commander"]/tools + + +
  • + + +
  • Blunt
    • + + 13 + 2.67 + FrontLeftLeg + 5 + true + +
  • + + +
  • Blunt
    • + + 13 + 2.67 + FrontRightLeg + 5 + true + +
  • + + +
  • Blunt
    • + + 15 + 3.51 + HeadAttackTool + 12 + true + 0.2 + +     +     +     + + + Defs/ThingDef[defName="Mech_Termite_Shocker"]/tools + + +
  • + + +
  • Blunt
    • + + 25 + 3.01 + HeadAttackTool + 13.5 + true + +     +     +     + + + Defs/ThingDef[defName="Mech_Termite_Toxer"]/tools + + +
  • + + +
  • Blunt
    • + + 25 + 3.01 + HeadAttackTool + 13.5 + true + +     +     +     + + + Defs/ThingDef[defName="Mech_Washer"]/tools + + +
  • + + +
  • Blunt
    • + + 7 + 1.11 + FrontLeftLeg + 1.75 + true + +
  • + + +
  • Blunt
    • + + 7 + 1.11 + FrontRightLeg + 1.75 + true + +
  • + + +
  • Blunt
    • + + 6 + 1.85 + HeadAttackTool + 0.2 + 0.7 + +     +     +     + + + + + Defs/ThingDef[defName="Mech_Washer"]/comps + + Defs/ThingDef[defName="Mech_Washer"] + + + + + + + + Defs/ThingDef[defName="Mech_Washer"]/comps + +
  • + 1000 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 100 + 0.75 +
    • +     +     + + + Defs/ThingDef[defName="Mech_Termite_Shocker"]/statBases/ArmorRating_Blunt + + 40 + + + + + Defs/ThingDef[defName="Mech_Termite_Shocker"]/statBases/ArmorRating_Sharp + + 18 + + + + + Defs/ThingDef[defName="Mech_Termite_Toxer"]/statBases/ArmorRating_Blunt + + 40 + + + + + Defs/ThingDef[defName="Mech_Termite_Toxer"]/statBases/ArmorRating_Sharp + + 18 + + + + + Defs/ThingDef[defName="Mech_Termite_Shocker"]/comps + + Defs/ThingDef[defName="Mech_Termite_Shocker"] + + + + + + + + Defs/ThingDef[defName="Mech_Termite_Shocker"]/comps + +
  • + 1880 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 188 + 0.5 + 10 + 22 + +
    • +     +     + + + Defs/ThingDef[defName="Mech_Termite_Toxer"]/comps + + Defs/ThingDef[defName="Mech_Termite_Toxer"] + + + + + + + + Defs/ThingDef[defName="Mech_Termite_Toxer"]/comps + +
  • + 1880 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 188 + 0.5 + 10 + 22 + +
    • +     +     + + + Defs/ThingDef[defName="Mech_Pikeman_Defender"]/comps + + Defs/ThingDef[defName="Mech_Pikeman_Defender"] + + + + + + + + Defs/ThingDef[defName="Mech_Pikeman_Defender"]/comps + +
  • + 1000 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 100 + 0.75 + 4 + 8 + +
    • +     +     + + + Defs/ThingDef[defName="Mech_Pikeman_Commander"]/comps + + Defs/ThingDef[defName="Mech_Pikeman_Commander"] + + + + + + + + Defs/ThingDef[defName="Mech_Pikeman_Commander"]/comps + +
  • + 1000 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 100 + 0.75 + 4 + 8 + +
    • +     +     + + + Defs/ThingDef[defName="Mech_Knight"]/comps + +
  • + 1400 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 188 + 0.5 + 3 + 4.5 + +
    • +     +     + + + Defs/ThingDef[defName="Mech_Praetorian"]/comps + + Defs/ThingDef[defName="Mech_Praetorian"] + + + + + + + + Defs/ThingDef[defName="Mech_Praetorian"]/comps + +
  • + 1000 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 100 + 0.75 +
    • +     +     + + + + + Defs/ThingDef[defName="Mech_Pikeman_Defender"]/statBases + + 7 + 15 + 80 + 40 + 0.04 + 0.13 + 0.15 + 200 + + + + + Defs/ThingDef[defName="Mech_Pikeman_Defender"]/race/baseHealthScale + + 1.0 + + + + + Defs/ThingDef[defName="Mech_Pikeman_Defender"]/comps/li[@Class="CompProperties_ProjectileInterceptor"]/hitPoints + + 50 + + + + + Defs/ThingDef[defName="Mech_Pikeman_Commander"]/statBases + + 7 + 15 + 80 + 40 + 0.5 + 0.04 + 0.13 + 0.15 + 200 + + + + + Defs/ThingDef[defName="Mech_Pikeman_Commander"]/race/baseHealthScale + + 1.0 + + + + + Defs/ThingDef[defName="Mech_Pikeman_Commander"]/statBases/ShootingAccuracyPawn + + 0.5 + + + + + Defs/ThingDef[defName="Mech_Termite_Shocker"]/statBases + + 0.25 + 150 + 60 + 1.3 + 1.25 + 0.04 + 0.14 + 0.24 + 350 + + + + + Defs/ThingDef[defName="Mech_Termite_Toxer"]/statBases + + 0.25 + 150 + 60 + 1.3 + 1.25 + 0.04 + 0.14 + 0.24 + 350 + + + + + Defs/ThingDef[defName="Mech_Knight"]/statBases + + 18 + 12 + 40 + 10 + 0.04 + 0.12 + 1.09 + -4 + 200 + + + + + Defs/ThingDef[defName="Mech_Knight"]/statBases + + 4.2 + + + + + Defs/ThingDef[defName="Mech_Washer"]/statBases + + 0.5 + 30 + 0.13 + 0.12 + 0.09 + + + + + Defs/ThingDef[defName="Mech_Washer"]/race/baseHealthScale + + 1.0 + + + + + Defs/ThingDef[defName="Mech_Praetorian"]/statBases + + 75 + 60 + 0.12 + 0.11 + 0.09 + + + +     \ No newline at end of file diff --git a/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Melee.xml b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Melee.xml index cb9c6d3f69..a57b88f5a4 100644 --- a/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Melee.xml +++ b/ModPatches/Divine Order/Patches/Divine Order/ThingDef_Misc/Weapons/Divine_Order_CE_Melee.xml @@ -316,5 +316,56 @@     + + + + + Defs/ThingDef[defName="BotchJob_DivineOrderWarhammer"]/statBases + + 10 + 0.54 + + + + + Defs/ThingDef[defName="BotchJob_DivineOrderWarhammer"] + + + 1.38 + 0.38 + 0.27 + + + + + + Defs/ThingDef[defName="BotchJob_DivineOrderWarhammer"]/tools + + +
  • + + +
  • Poke
    • + + 6 + 1.97 + 0.10 + 1.42 + Handle + +
  • + + +
  • Blunt
    • + + 30 + 2.45 + 0.95 + 12.15 + Head + +     +     +     \ No newline at end of file diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Leather.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Leather.xml index 155e880820..189fe03334 100644 --- a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Leather.xml +++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Items/Items_Resource_Leather.xml @@ -3,7 +3,6 @@ Defs/ThingDef[defName="Dragon_Leather"]/statBases/StuffPower_Armor_Sharp - 0.907 @@ -48,7 +47,6 @@ Defs/ThingDef[defName="Rare_Dragon_Leather"]/statBases/StuffPower_Armor_Heat - 0.2 @@ -79,7 +77,6 @@ Defs/ThingDef[defName="True_Dragon_Leather"]/statBases/StuffPower_Armor_Heat - 0.226 diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Weapons/MeleeDD.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Weapons/MeleeDD.xml index 81035ccbfb..effc981c55 100644 --- a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Weapons/MeleeDD.xml +++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Misc/Weapons/MeleeDD.xml @@ -31,6 +31,7 @@ 8 1.43 + 0.15 2.813 Handle @@ -39,10 +40,10 @@
  • Stab
    •  - 16 + 18 1.89 - 1.25 - 1.25 + 2.25 + 2.25 Point
  • @@ -50,9 +51,9 @@
  • Cut
    • - 17 + 16 6.98 - 1.25 + 2.25 0.3 Edge @@ -88,9 +89,10 @@
  • Blunt
    •  - 3 - 1.81 - 0.9 + 4 + 1.78 + 0.10 + 1.0 Handle
  • @@ -98,10 +100,10 @@
  • Stab
    • - 19 - 1.74 - 0.9 - 1.8 + 18 + 1.78 + 1.0 + 2.0 Point
  • @@ -110,9 +112,9 @@
  • Cut
    • 40 - 1.72 - 2.916 - 0.65 + 1.64 + 3.24 + 0.72 Edge diff --git a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Dragon_Base.xml b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Dragon_Base.xml index 8945b64d2d..da3a5fdfd2 100644 --- a/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Dragon_Base.xml +++ b/ModPatches/Dragons Descent/Patches/Dragons Descent/ThingDefs_Races/Races_Animal_Dragon_Base.xml @@ -53,7 +53,7 @@ true 600 5 - 0.5 + 0.25     @@ -99,7 +99,7 @@ true 600 5 - 0.5 + 0.25     diff --git a/ModPatches/Dusk Armory/Patches/Dusk Armory/Weapons_Dusk_Melee.xml b/ModPatches/Dusk Armory/Patches/Dusk Armory/Weapons_Dusk_Melee.xml index a6ad486f2f..b76fb74ea6 100644 --- a/ModPatches/Dusk Armory/Patches/Dusk Armory/Weapons_Dusk_Melee.xml +++ b/ModPatches/Dusk Armory/Patches/Dusk Armory/Weapons_Dusk_Melee.xml @@ -134,7 +134,6 @@ /Defs/ThingDef[defName="DF_Dusk_Saw"]/tools -
  • diff --git a/ModPatches/EPOE Forked/Patches/EPOE Forked/Bionics_Patch.xml b/ModPatches/EPOE Forked/Patches/EPOE Forked/Bionics_Patch.xml index 53c4c4ecf5..e709ac179e 100644 --- a/ModPatches/EPOE Forked/Patches/EPOE Forked/Bionics_Patch.xml +++ b/ModPatches/EPOE Forked/Patches/EPOE Forked/Bionics_Patch.xml @@ -1,6 +1,26 @@ + + Defs/ThingDef[defName="AdvancedBionicEye"]/statBases + + 0.4 + + + + + Defs/HediffDef[defName="AdvancedBionicEye"] + + +
  • + + 0.4 + +
    • + +     +     + Defs/HediffDef[defName="EPOE_ScytherBlade"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools @@ -147,6 +167,44 @@ + + Defs/ThingDef[defName="TacticalCorneaImplant"]/thingClass + + Defs/ThingDef[defName="TacticalCorneaImplant"] + + ThingWithComps + + + + + + Defs/ThingDef[defName="TacticalCorneaImplant"]/statBases + + 0.4 + + + + + Defs/HediffDef[defName="TacticalCorneaImplant"]/stages/li/statOffsets + + 0.4 + + + + + Defs/ThingDef[defName="EPIA_TacticalBionicEye"]/statBases + + 0.4 + + + + + Defs/HediffDef[defName="EPIA_TacticalBionicEye"]/stages/li/statOffsets + + 0.3 + + + @@ -281,6 +339,13 @@ + + Defs/HediffDef[defName="EPOE_InstinctOptimizedEyes"]/stages/li[minSeverity="0.99"]/statOffsets + + 0.3 + + + Defs/HediffDef[defName="EPOE_InstinctOptimizedHand"]/stages/li[label="Optimizing"]/statOffsets @@ -371,14 +436,14 @@ Defs/HediffDef[defName="EPIA_Harden_ProtectiveExoskeleton"]/stages/li/statOffsets/ArmorRating_Sharp - 5 + 7.5 Defs/HediffDef[defName="EPIA_Harden_ProtectiveExoskeleton"]/stages/li/statOffsets/ArmorRating_Blunt - 7.5 + 10 diff --git a/ModPatches/EPOE/Patches/EPOE/Bionics.xml b/ModPatches/EPOE/Patches/EPOE/Bionics.xml index bb43eb8443..c257b4a411 100644 --- a/ModPatches/EPOE/Patches/EPOE/Bionics.xml +++ b/ModPatches/EPOE/Patches/EPOE/Bionics.xml @@ -104,4 +104,50 @@ + + Defs/ThingDef[defName="AdvancedBionicEye"]/statBases + + 0.4 + + + + + Defs/HediffDef[defName="AdvancedBionicEye"] + + +
  • + + 0.4 + +
    • +     +     +     + + + + + Defs/ThingDef[defName="TacticalCorneaImplant"]/thingClass + + Defs/ThingDef[defName="TacticalCorneaImplant"] + + ThingWithComps + + + + + + Defs/ThingDef[defName="TacticalCorneaImplant"]/statBases + + 0.3 + + + + + Defs/HediffDef[defName="TacticalCorneaImplant"]/stages/li/statOffsets + + 0.3 + + + \ No newline at end of file diff --git a/ModPatches/Eccentric Militor/Patches/Eccentric Militor/Eccentric_Militor_Races.xml b/ModPatches/Eccentric Militor/Patches/Eccentric Militor/Eccentric_Militor_Races.xml index d5b79c331d..36f493d8db 100644 --- a/ModPatches/Eccentric Militor/Patches/Eccentric Militor/Eccentric_Militor_Races.xml +++ b/ModPatches/Eccentric Militor/Patches/Eccentric Militor/Eccentric_Militor_Races.xml @@ -67,7 +67,7 @@ Defs/ThingDef[@Name="EccentricMilitor"] - +     @@ -89,7 +89,7 @@ 200 true 70 - 0.75 + 0.5     @@ -97,13 +97,13 @@ Defs/PawnKindDef[ - defName="Mech_ArchotechMilitor" or - defName="Mech_BochiMilitor" or - defName="Mech_ChickenCrusaderMilitor" or - defName="Mech_EasterBunnyMilitor" or - defName="Mech_GuraMilitor" or - defName="Mech_JorisMilitor" or - defName="Mech_KnightMilitor"] + defName="Mech_ArchotechMilitor" or + defName="Mech_BochiMilitor" or + defName="Mech_ChickenCrusaderMilitor" or + defName="Mech_EasterBunnyMilitor" or + defName="Mech_GuraMilitor" or + defName="Mech_JorisMilitor" or + defName="Mech_KnightMilitor"]
  • @@ -138,20 +138,20 @@
    • - + Defs/ThingDef[defName="Mech_ChristmasUrchin"]/comps -
  • -
  • +
  • +
  • - + Defs/ThingDef[ - defName="Mech_ChristmasUrchin" or - defName="Mech_MiniShark" or - defName="Mech_MiniChicken"] + defName="Mech_ChristmasUrchin" or + defName="Mech_MiniShark" or + defName="Mech_MiniChicken"]
  • Vehicle @@ -161,9 +161,9 @@ Defs/ThingDef[ - defName="Mech_ChristmasUrchin" or - defName="Mech_MiniShark" or - defName="Mech_MiniChicken"]/statBases/ArmorRating_Blunt + defName="Mech_ChristmasUrchin" or + defName="Mech_MiniShark" or + defName="Mech_MiniChicken"]/statBases/ArmorRating_Blunt 3 @@ -172,9 +172,9 @@ Defs/ThingDef[ - defName="Mech_ChristmasUrchin" or - defName="Mech_MiniShark" or - defName="Mech_MiniChicken"]/statBases/ArmorRating_Sharp + defName="Mech_ChristmasUrchin" or + defName="Mech_MiniShark" or + defName="Mech_MiniChicken"]/statBases/ArmorRating_Sharp 2 @@ -183,9 +183,9 @@ Defs/ThingDef[ - defName="Mech_ChristmasUrchin" or - defName="Mech_MiniShark" or - defName="Mech_MiniChicken"]/statBases + defName="Mech_ChristmasUrchin" or + defName="Mech_MiniShark" or + defName="Mech_MiniChicken"]/statBases 30 @@ -198,8 +198,8 @@ Defs/ThingDef[ - defName="Mech_ChristmasUrchin" or - defName="Mech_MiniShark"]/tools + defName="Mech_ChristmasUrchin" or + defName="Mech_MiniShark"]/tools
  • @@ -241,7 +241,7 @@ Defs/ThingDef[defName="Mech_ChristmasUrchin"] - + @@ -251,7 +251,7 @@ Defs/ThingDef[defName="Mech_MiniShark"] - + @@ -261,16 +261,16 @@ Defs/ThingDef[defName="Mech_MiniChicken"] - + Defs/ThingDef[ - defName="Mech_ChristmasUrchin" or - defName="Mech_MiniShark" or - defName="Mech_MiniChicken"]/comps + defName="Mech_ChristmasUrchin" or + defName="Mech_MiniShark" or + defName="Mech_MiniChicken"]/comps
  • @@ -287,7 +287,7 @@ 200 true 70 - 0.75 + 0.5
    • diff --git a/ModPatches/Epochs - Pyrinth/Patches/Epochs- Pyrinth/Patch_Pyrinth.xml b/ModPatches/Epochs - Pyrinth/Patches/Epochs- Pyrinth/Patch_Pyrinth.xml new file mode 100644 index 0000000000..a825612e86 --- /dev/null +++ b/ModPatches/Epochs - Pyrinth/Patches/Epochs- Pyrinth/Patch_Pyrinth.xml @@ -0,0 +1,92 @@ + + + + + + + Defs/ThingDef[defName="DV_Pyrinth"]/statBases + + 0.03 + + + + + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_PyrinthBlade"]/tools + + +
  • + + +
  • Poke
    • + + 4 + 1.78 + 0.10 + 1.0 + Handle + +
  • + + +
  • Stab
    • + + 18 + 1.62 + 1.05 + 2.05 + Point + +
  • + Flame + 6 + 0.5 +
    • +     + +
  • + + +
  • Cut
    • + + 40 + 1.64 + 3.27 + 0.74 + Edge + +
  • + Flame + 6 + 0.4 +
    • +     + +     +     +     + + + Defs/ThingDef[defName="DV_MeleeWeapon_PyrinthBlade"]/statBases/Mass + + 1.95 + 8 + 0.7 + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_PyrinthBlade"] + + + 0.45 + 0.55 + 0.45 + + + + +     \ No newline at end of file diff --git a/ModPatches/Erin's Fox Squirrel/Patches/Erin's Fox Squirrel/ThingDefs_Races.xml b/ModPatches/Erin's Fox Squirrel/Patches/Erin's Fox Squirrel/ThingDefs_Races.xml index 0de177e3be..6612dd0d74 100644 --- a/ModPatches/Erin's Fox Squirrel/Patches/Erin's Fox Squirrel/ThingDefs_Races.xml +++ b/ModPatches/Erin's Fox Squirrel/Patches/Erin's Fox Squirrel/ThingDefs_Races.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="FoxSquirrel"] -
  • QuadrupedLow @@ -14,7 +13,6 @@ Defs/ThingDef[defName="FoxSquirrel"]/statBases - 0.22 0.01 @@ -31,7 +29,6 @@ Defs/ThingDef[defName="FoxSquirrel"]/tools -
  • diff --git a/ModPatches/Erin's Lizard Doggo/Patches/Erin's Lizard Doggo/ThingDefs_Races.xml b/ModPatches/Erin's Lizard Doggo/Patches/Erin's Lizard Doggo/ThingDefs_Races.xml index dff302e557..1c53a4a5f1 100644 --- a/ModPatches/Erin's Lizard Doggo/Patches/Erin's Lizard Doggo/ThingDefs_Races.xml +++ b/ModPatches/Erin's Lizard Doggo/Patches/Erin's Lizard Doggo/ThingDefs_Races.xml @@ -5,7 +5,6 @@ Defs/ThingDef[defName="ERN_lizarddoggo"] -
  • Quadruped @@ -15,7 +14,6 @@ Defs/ThingDef[defName="ERN_lizarddoggo"]/statBases - 0.22 0.05 @@ -32,7 +30,6 @@ Defs/ThingDef[defName="ERN_lizarddoggo"]/tools -
  • diff --git a/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml b/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml index 1889a080ac..40e7709363 100644 --- a/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml +++ b/ModPatches/Erin's Sephyr/Patches/Erin's Sephyr/Hediff_Racial_Sephyr.xml @@ -13,7 +13,7 @@ Defs/HediffDef[defName="ERN_SephyrToughen"]/stages/li/statOffsets/ArmorRating_Sharp - 0.70 + 1.1 diff --git a/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Lox.xml b/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Lox.xml index 01fc413e9b..8706eba9e2 100644 --- a/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Lox.xml +++ b/ModPatches/Erin's Valheim Creatures/Patches/Erin's Valheim Creatures/Races_Animal_Lox.xml @@ -93,7 +93,7 @@ Defs/ThingDef[defName="ERN_Lox"] - + @@ -106,7 +106,7 @@ true 600 8 - 0.75 + 0.5
    • diff --git a/ModPatches/Erin's Wildlife/Patches/Erin's Wildlife/ThingDefs_Races.xml b/ModPatches/Erin's Wildlife/Patches/Erin's Wildlife/ThingDefs_Races.xml index 40e3cb6e22..0f7b45a9c5 100644 --- a/ModPatches/Erin's Wildlife/Patches/Erin's Wildlife/ThingDefs_Races.xml +++ b/ModPatches/Erin's Wildlife/Patches/Erin's Wildlife/ThingDefs_Races.xml @@ -322,7 +322,6 @@ Defs/ThingDef[defName="ERN_Armadillo"]/statBases - 0.17 0.05 diff --git a/ModPatches/Expanded Materials - Metals/Defs/Expanded Materials - Metals/Arrows_Iron.xml b/ModPatches/Expanded Materials - Metals/Defs/Expanded Materials - Metals/Arrows_Iron.xml index 52ddd13339..131504b523 100644 --- a/ModPatches/Expanded Materials - Metals/Defs/Expanded Materials - Metals/Arrows_Iron.xml +++ b/ModPatches/Expanded Materials - Metals/Defs/Expanded Materials - Metals/Arrows_Iron.xml @@ -87,7 +87,7 @@
  • -
  • VMEu_Iron
    • +
  • EM_Iron
    • 2 @@ -96,7 +96,7 @@
  • WoodLog
    • -
  • VMEu_Iron
    • +
  • EM_Iron
    •      @@ -154,7 +154,7 @@
  • -
  • VMEu_Iron
    • +
  • EM_Iron
    • 2 diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/127x108mm.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/127x108mm.xml index 2836f8e6d6..ff1be62118 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/127x108mm.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/127x108mm.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 17 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.6 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.6 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.6 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -163,7 +163,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -186,7 +186,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.6 @@ -202,7 +202,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -225,7 +225,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -248,7 +248,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -271,7 +271,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/145x114mm.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/145x114mm.xml index 1d9fa4bab1..70cea7503d 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/145x114mm.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/145x114mm.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 26 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.8 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.8 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.8 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -163,7 +163,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -186,7 +186,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.8 @@ -202,7 +202,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -225,7 +225,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -248,7 +248,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -271,7 +271,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x102mmNATO.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x102mmNATO.xml index 332861e201..d5b30131d1 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x102mmNATO.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x102mmNATO.xml @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 1.1 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 1.1 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -109,7 +109,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -132,7 +132,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 1.1 @@ -148,7 +148,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -171,7 +171,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x110mmHispano.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x110mmHispano.xml index 74f2ad9eaf..0dc5901b1f 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x110mmHispano.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/20x110mmHispano.xml @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 1.1 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 1.1 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -109,7 +109,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -132,7 +132,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 1.1 @@ -148,7 +148,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -171,7 +171,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/25x137mmNATO.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/25x137mmNATO.xml index e92ce776b2..1f1d965a18 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/25x137mmNATO.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/25x137mmNATO.xml @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 2.2 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 2.2 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -109,7 +109,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -132,7 +132,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 2.2 @@ -148,7 +148,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -171,7 +171,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/300WinchesterMagnum.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/300WinchesterMagnum.xml index 0ce2fb909d..f19768bc87 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/300WinchesterMagnum.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/300WinchesterMagnum.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 6 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -163,7 +163,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -186,7 +186,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -202,7 +202,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -225,7 +225,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -248,7 +248,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -271,7 +271,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/30x173mmNATO.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/30x173mmNATO.xml index 5fe0c62b9f..64bf8b3ca8 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/30x173mmNATO.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/30x173mmNATO.xml @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 1.8 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 1.8 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -109,7 +109,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -132,7 +132,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 1.8 @@ -148,7 +148,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -171,7 +171,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Lapua.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Lapua.xml index d3bd714211..3b8b62241e 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Lapua.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Lapua.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 7 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -163,7 +163,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -186,7 +186,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -202,7 +202,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -225,7 +225,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -248,7 +248,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -271,7 +271,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Norma.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Norma.xml index c82e855e6f..8cdefc6105 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Norma.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/338Norma.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 7 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -163,7 +163,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -186,7 +186,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -202,7 +202,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -225,7 +225,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -248,7 +248,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -271,7 +271,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/408CheyenneTactical.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/408CheyenneTactical.xml index c613e3bf3f..5b6aecb4c3 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/408CheyenneTactical.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/408CheyenneTactical.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 11 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -163,7 +163,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -186,7 +186,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -202,7 +202,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -225,7 +225,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -248,7 +248,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -271,7 +271,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/40x311mmR.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/40x311mmR.xml index ae36554baf..7ed2d0c995 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/40x311mmR.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/40x311mmR.xml @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 2.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 2.4 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -109,7 +109,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -132,7 +132,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 2.4 @@ -148,7 +148,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -171,7 +171,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/50BMG.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/50BMG.xml index c7c97231d8..e61d167488 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/50BMG.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/HighCaliber/50BMG.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 17 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.6 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.6 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.6 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -163,7 +163,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -186,7 +186,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.6 @@ -202,7 +202,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -225,7 +225,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -248,7 +248,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -271,7 +271,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_10mmAuto.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_10mmAuto.xml index b7f46750d7..692e11f6ba 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_10mmAuto.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_10mmAuto.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 10 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 10 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_22LR.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_22LR.xml index cfa2ddf1ab..2394d2337b 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_22LR.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_22LR.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 2 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.1 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 2 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.1 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.1 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_32ACP.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_32ACP.xml index 4f0518ed0b..b66ba1a79a 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_32ACP.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_32ACP.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 3 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 3 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357Magnum.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357Magnum.xml index dcb3d01a65..975f9db821 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357Magnum.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357Magnum.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 7 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 7 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357SIG.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357SIG.xml index fbf778b67c..fb12fc902e 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357SIG.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_357SIG.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 7 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 7 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_40SW.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_40SW.xml index 62c96bb5bf..2026213691 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_40SW.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_40SW.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 7 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 7 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_44Magnum.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_44Magnum.xml index 43cccfd9e2..4e7481d0a1 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_44Magnum.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_44Magnum.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 10 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 10 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_454Casull.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_454Casull.xml index e84785b689..790a04d47e 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_454Casull.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_454Casull.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 14 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.7 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 14 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.7 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.7 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_455Webley.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_455Webley.xml index de84126bcc..5ba247045e 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_455Webley.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_455Webley.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 10 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 10 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45ACP.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45ACP.xml index 8718f6dea3..50cf2da2b6 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45ACP.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45ACP.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 9 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 9 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45Colt.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45Colt.xml index 5d614fc6f4..3d2f4dd6d4 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45Colt.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_45Colt.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 10 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 10 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_46x30mm.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_46x30mm.xml index 0c5f5d4706..104b28ae88 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_46x30mm.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_46x30mm.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 3 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 3 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_500SWMagnum.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_500SWMagnum.xml index a79a473471..6701e05af2 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_500SWMagnum.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_500SWMagnum.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 15 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.8 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 15 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.8 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.8 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_50AE.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_50AE.xml index 96b7f1df65..0ec9af1c84 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_50AE.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_50AE.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 12 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.6 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 12 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.6 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.6 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_58x21mmDAP92.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_58x21mmDAP92.xml index c5d437c0cc..890265b8f6 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_58x21mmDAP92.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_58x21mmDAP92.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 6 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 6 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x25mmTokarev.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x25mmTokarev.xml index 48cbb148e7..5beaee45a5 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x25mmTokarev.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x25mmTokarev.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 6 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 6 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x38mmR.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x38mmR.xml index 791281e4bc..67e4caa3a3 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x38mmR.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_762x38mmR.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 7 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 7 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_763x25mmMauser.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_763x25mmMauser.xml index 01a94b78fd..67dd50fafc 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_763x25mmMauser.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_763x25mmMauser.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 6 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 6 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_765x20mmLongue.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_765x20mmLongue.xml index 8e304a19a9..b1a59726ff 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_765x20mmLongue.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_765x20mmLongue.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 4 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 4 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x18mmMakarov.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x18mmMakarov.xml index 840f317e42..9fda2b8f8f 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x18mmMakarov.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x18mmMakarov.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 6 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 6 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x19mmPara.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x19mmPara.xml index 9666cb9946..8718019c3f 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x19mmPara.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x19mmPara.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 6 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 6 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x21mmGyurza.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x21mmGyurza.xml index 9efed485f9..202cec977c 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x21mmGyurza.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_9x21mmGyurza.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 10 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 10 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.5 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_FN57x28mm.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_FN57x28mm.xml index 6a3c79e8c8..208de65c28 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_FN57x28mm.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Pistol/Patch_FN57x28mm.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 4 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -61,7 +61,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 4 @@ -69,7 +69,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -85,7 +85,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -100,7 +100,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -122,7 +122,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -138,7 +138,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -153,7 +153,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_127x55mmAR.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_127x55mmAR.xml index 4b3eb112b2..8db2ea884d 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_127x55mmAR.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_127x55mmAR.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 25 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 1.2 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 25 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 1.2 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 1.2 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 1.2 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 1.2 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_277Fury.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_277Fury.xml index 741d9f69d2..29f71e6c10 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_277Fury.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_277Fury.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 8 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 8 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_3006Springfield.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_3006Springfield.xml index 02b7dcad83..8f74cac2bc 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_3006Springfield.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_3006Springfield.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 9 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 9 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_300AACBlackout.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_300AACBlackout.xml index 403f701688..9ebc1f52d0 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_300AACBlackout.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_300AACBlackout.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 5 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 5 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_303British.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_303British.xml index 45886cf098..24611d9882 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_303British.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_303British.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 8 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 8 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_30Carbine.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_30Carbine.xml index 36a89a9341..b784f7496f 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_30Carbine.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_30Carbine.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 5 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 5 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_545x39mmSoviet.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_545x39mmSoviet.xml index a283050730..96c2d0872a 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_545x39mmSoviet.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_545x39mmSoviet.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 4 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 4 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_556x45mmNATO.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_556x45mmNATO.xml index b89212fc35..2cbb9aa986 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_556x45mmNATO.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_556x45mmNATO.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 4 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 4 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_58x42mmDBP10.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_58x42mmDBP10.xml index a33829bd64..f85d201b40 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_58x42mmDBP10.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_58x42mmDBP10.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 5 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 5 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.2 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_65x52mmCarcano.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_65x52mmCarcano.xml index 18b8153b1f..b3c01ac0d5 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_65x52mmCarcano.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_65x52mmCarcano.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 9 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 9 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_75x54mmFrench.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_75x54mmFrench.xml index e42c26485e..334bc24cc2 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_75x54mmFrench.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_75x54mmFrench.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 8 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 8 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x39mmSoviet.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x39mmSoviet.xml index efec715ac6..c27e1d4dfc 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x39mmSoviet.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x39mmSoviet.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 6 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 6 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x51mmNATO.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x51mmNATO.xml index bbac44da32..3ccd3ed4fa 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x51mmNATO.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x51mmNATO.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 8 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 8 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x54mmR.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x54mmR.xml index 01bcde530b..15e72e8277 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x54mmR.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_762x54mmR.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 8 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 8 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_77x58mmArisaka.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_77x58mmArisaka.xml index b8843d16d4..62c5cddfa9 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_77x58mmArisaka.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_77x58mmArisaka.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 9 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 9 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x33mmKurz.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x33mmKurz.xml index 321fb98c01..2373ec4bdc 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x33mmKurz.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x33mmKurz.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 6 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 6 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.3 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x57mmMauser.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x57mmMauser.xml index 7c1dd08086..2321e37b08 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x57mmMauser.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_792x57mmMauser.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 9 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 9 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_8x50mmRLebel.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_8x50mmRLebel.xml index fac31dacab..d80e197cff 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_8x50mmRLebel.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_8x50mmRLebel.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 9 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 9 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_9x39mmSoviet.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_9x39mmSoviet.xml index a71c16d48c..50c7793fc5 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_9x39mmSoviet.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Rifle/Patch_9x39mmSoviet.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 9 @@ -16,7 +16,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -32,7 +32,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -47,7 +47,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -62,7 +62,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 9 @@ -70,7 +70,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -86,7 +86,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -101,7 +101,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -124,7 +124,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -140,7 +140,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -155,7 +155,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -178,7 +178,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -194,7 +194,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -217,7 +217,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -240,7 +240,7 @@
  • -
  • VMEu_Copper
    • +
  • EM_Copper
    • 0.4 @@ -256,7 +256,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -279,7 +279,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -302,7 +302,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -325,7 +325,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Sabot.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Sabot.xml index 5e15561572..3936073921 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Sabot.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Sabot.xml @@ -37,7 +37,6 @@ -
  • VMEu_Tungsten
  • Uranium
    •      @@ -80,9 +79,8 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • -
  • VMEu_Tungsten
  • Uranium
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/12Gauge.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/12Gauge.xml index 32182f5f3d..05220ec494 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/12Gauge.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/12Gauge.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -25,7 +25,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 13 @@ -39,7 +39,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -54,7 +54,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -71,7 +71,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 12 @@ -85,7 +85,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -100,7 +100,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -117,7 +117,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 11 @@ -139,7 +139,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -154,7 +154,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -185,7 +185,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/20Gauge.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/20Gauge.xml index 2ac4579794..769bdffa8d 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/20Gauge.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/20Gauge.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -25,7 +25,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 9 @@ -39,7 +39,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -54,7 +54,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -71,7 +71,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 8 @@ -85,7 +85,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -100,7 +100,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -117,7 +117,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 8 @@ -139,7 +139,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -154,7 +154,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -185,7 +185,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/23x75mmR.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/23x75mmR.xml index d0d7795a50..cdc344b799 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/23x75mmR.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/23x75mmR.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -25,7 +25,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 50 @@ -39,7 +39,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -54,7 +54,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -71,7 +71,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 46 @@ -85,7 +85,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -100,7 +100,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -117,7 +117,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 42 @@ -139,7 +139,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      @@ -154,7 +154,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -185,7 +185,7 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/410Bore.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/410Bore.xml index d42a5fce82..fb2265fd9a 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/410Bore.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Ammo/Shotgun/410Bore.xml @@ -8,7 +8,7 @@
  • -
  • VMEu_Bronze
    • +
  • EM_Bronze
  • Steel
    • @@ -25,7 +25,7 @@
  • -
  • VMEu_Lead
    • +
  • EM_Lead
    • 3 @@ -39,7 +39,153 @@ -
  • VMEu_Bronze
    • +
  • EM_Bronze
    • +
  • Steel
    • +     +     +     +     + + + + Defs/RecipeDef[defName="MakeAmmo_410Bore_Slug"]/ingredients + + +
  • + + +
  • EM_Bronze
    • +
  • Steel
    • + + + 1 + +
  • + + +
  • Chemfuel
    • + + + 1 + +
  • + + +
  • EM_Lead
    • + + + 3 + +     +     +     + + + Defs/RecipeDef[defName="MakeAmmo_410Bore_Slug"]/fixedIngredientFilter + + + +
  • EM_Bronze
    • +
  • Steel
    • +     +     +     +     + + + + Defs/RecipeDef[defName="MakeAmmo_410Bore_Beanbag"]/ingredients + + +
  • + + +
  • EM_Bronze
    • +
  • Steel
    • + + + 1 + +
  • + + +
  • Chemfuel
    • + + + 1 + +
  • + + +
  • EM_Lead
    • + + + 3 + +
  • + + +
  • Cloth
    • + + + 6 + +     +     +     + + + Defs/RecipeDef[defName="MakeAmmo_410Bore_Beanbag"]/fixedIngredientFilter + + + +
  • EM_Bronze
    • +
  • Steel
    • +     +     +     +     + + + + Defs/RecipeDef[defName="MakeAmmo_410Bore_ElectroSlug"]/ingredients + + +
  • + + +
  • EM_Bronze
    • +
  • Steel
    • + + + 1 + +
  • + + +
  • Chemfuel
    • + + + 1 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     +     +     + + + Defs/RecipeDef[defName="MakeAmmo_410Bore_ElectroSlug"]/fixedIngredientFilter + + + +
  • EM_Bronze
  • Steel
    •      diff --git a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Items_Resource_Stuff.xml b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Items_Resource_Stuff.xml index aab6f04bf1..08a9706a16 100644 --- a/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Items_Resource_Stuff.xml +++ b/ModPatches/Expanded Materials - Metals/Patches/Expanded Materials - Metals/Items_Resource_Stuff.xml @@ -1,15 +1,32 @@ + + + + Defs/ThingDef[defName="EM_Coal"]/statBases + + 0.03 + + + + + + Defs/ThingDef[defName="EM_Charcoal"]/statBases + + 0.03 + + + - Defs/ThingDef[defName="VMEu_Iron"]/statBases + Defs/ThingDef[defName="EM_Iron"]/statBases 0.03 - Defs/ThingDef[defName="VMEu_Iron"]/stuffProps/categories + Defs/ThingDef[defName="EM_Iron"]/stuffProps/categories
  • Metallic_Weapon
  • Steeled
    • @@ -17,59 +34,59 @@     - Defs/ThingDef[defName="VMEu_Iron"]/statBases/StuffPower_Armor_Sharp + Defs/ThingDef[defName="EM_Iron"]/statBases/StuffPower_Armor_Sharp 0.8 - Defs/ThingDef[defName="VMEu_Iron"]/statBases/StuffPower_Armor_Blunt + Defs/ThingDef[defName="EM_Iron"]/statBases/StuffPower_Armor_Blunt 1.2 - + - Defs/ThingDef[defName="VMEu_Lead"]/statBases + Defs/ThingDef[defName="EM_MildSteel"]/statBases 0.03 - - Defs/ThingDef[defName="VMEu_Lead"]/statBases/StuffPower_Armor_Sharp + + Defs/ThingDef[defName="EM_MildSteel"]/stuffProps/categories - 0.3 +
  • Metallic_Weapon
    • +
  • Steeled
    •      - Defs/ThingDef[defName="VMEu_Lead"]/statBases/StuffPower_Armor_Blunt + Defs/ThingDef[defName="EM_MildSteel"]/statBases/StuffPower_Armor_Sharp - 0.3 + 0.95 - - Defs/ThingDef[defName="VMEu_Lead"]/stuffProps/statFactors + + Defs/ThingDef[defName="EM_MildSteel"]/statBases/StuffPower_Armor_Blunt - 1.4 - 1.05 + 1.43 - + - Defs/ThingDef[defName="VMEu_Bronze"]/statBases + Defs/ThingDef[defName="EM_TemperedSteel"]/statBases 0.03 - Defs/ThingDef[defName="VMEu_Bronze"]/stuffProps/categories + Defs/ThingDef[defName="EM_TemperedSteel"]/stuffProps/categories
  • Metallic_Weapon
  • Steeled
    • @@ -77,147 +94,143 @@     - Defs/ThingDef[defName="VMEu_Bronze"]/statBases/StuffPower_Armor_Sharp + Defs/ThingDef[defName="EM_TemperedSteel"]/statBases/StuffPower_Armor_Sharp - 0.83 + 1.05 - Defs/ThingDef[defName="VMEu_Bronze"]/statBases/StuffPower_Armor_Blunt - - 1.24 - - - - - Defs/ThingDef[defName="VMEu_Bronze"]/stuffProps/statFactors + Defs/ThingDef[defName="EM_TemperedSteel"]/statBases/StuffPower_Armor_Blunt - 1.1 - 0.80 + 1.6 - + - Defs/ThingDef[defName="VMEu_Tin"]/statBases + Defs/ThingDef[defName="EM_Lead"]/statBases 0.03 - Defs/ThingDef[defName="VMEu_Tin"]/statBases/StuffPower_Armor_Sharp + Defs/ThingDef[defName="EM_Lead"]/statBases/StuffPower_Armor_Sharp - 0.13 + 0.3 - Defs/ThingDef[defName="VMEu_Tin"]/statBases/StuffPower_Armor_Blunt + Defs/ThingDef[defName="EM_Lead"]/statBases/StuffPower_Armor_Blunt - 0.2 + 0.3 - - Defs/ThingDef[defName="VMEu_Copper"]/statBases + Defs/ThingDef[defName="EM_Lead"]/stuffProps/statFactors - 0.03 + 1.4 + 1.05 - - Defs/ThingDef[defName="VMEu_Copper"]/statBases/StuffPower_Armor_Sharp + + + Defs/ThingDef[defName="EM_Bronze"]/statBases - 0.25 + 0.03 - - Defs/ThingDef[defName="VMEu_Copper"]/statBases/StuffPower_Armor_Blunt + + Defs/ThingDef[defName="EM_Bronze"]/stuffProps/categories - 0.32 +
  • Metallic_Weapon
    • +
  • Steeled
    •      - - - Defs/ThingDef[defName="VMEu_Tungsten"]/statBases + + Defs/ThingDef[defName="EM_Bronze"]/statBases/StuffPower_Armor_Sharp - 0.03 + 0.83 - Defs/ThingDef[defName="VMEu_Tungsten"]/statBases/StuffPower_Armor_Sharp + Defs/ThingDef[defName="EM_Bronze"]/statBases/StuffPower_Armor_Blunt - 1.3 + 1.24 - - Defs/ThingDef[defName="VMEu_Tungsten"]/statBases/StuffPower_Armor_Blunt + + Defs/ThingDef[defName="EM_Bronze"]/stuffProps/statFactors - 1.8 + 1.1 + 0.80 - - Defs/ThingDef[defName="VMEu_Tungsten"]/stuffProps/statFactors/MaxHitPoints + + + Defs/ThingDef[defName="EM_Tin"]/statBases - 3 - 2.1 + 0.03 - + + - Defs/ThingDef[defName="VMEu_Chromium"]/statBases + Defs/ThingDef[defName="EM_Copper"]/statBases 0.03 - Defs/ThingDef[defName="VMEu_Chromium"]/statBases/StuffPower_Armor_Sharp + Defs/ThingDef[defName="EM_Copper"]/statBases/StuffPower_Armor_Sharp - 0.6 + 0.25 - Defs/ThingDef[defName="VMEu_Chromium"]/statBases/StuffPower_Armor_Blunt + Defs/ThingDef[defName="EM_Copper"]/statBases/StuffPower_Armor_Blunt - 0.8 + 0.32 + - Defs/ThingDef[defName="VMEu_StainlessSteel"]/statBases + Defs/ThingDef[defName="EM_StainlessSteel"]/statBases 0.03 - Defs/ThingDef[defName="VMEu_StainlessSteel"]/statBases/StuffPower_Armor_Sharp + Defs/ThingDef[defName="EM_StainlessSteel"]/statBases/StuffPower_Armor_Sharp 1.2 - Defs/ThingDef[defName="VMEu_StainlessSteel"]/statBases/StuffPower_Armor_Blunt + Defs/ThingDef[defName="EM_StainlessSteel"]/statBases/StuffPower_Armor_Blunt 1.65 - Defs/ThingDef[defName="VMEu_StainlessSteel"]/stuffProps/categories + Defs/ThingDef[defName="EM_StainlessSteel"]/stuffProps/categories
  • Metallic_Weapon
  • Steeled
    • @@ -226,14 +239,14 @@ - Defs/ThingDef[defName="VMEu_Titanium"]/statBases + Defs/ThingDef[defName="EM_Titanium"]/statBases 0.03 - Defs/ThingDef[defName="VMEu_Titanium"]/stuffProps/categories + Defs/ThingDef[defName="EM_Titanium"]/stuffProps/categories
  • Metallic_Weapon
  • Steeled
    • @@ -241,41 +254,34 @@     - Defs/ThingDef[defName="VMEu_Titanium"]/statBases/StuffPower_Armor_Sharp + Defs/ThingDef[defName="EM_Titanium"]/statBases/StuffPower_Armor_Sharp 1.9 - Defs/ThingDef[defName="VMEu_Titanium"]/statBases/StuffPower_Armor_Blunt + Defs/ThingDef[defName="EM_Titanium"]/statBases/StuffPower_Armor_Blunt 2.75 - Defs/ThingDef[defName="VMEu_Titanium"]/stuffProps/statFactors + Defs/ThingDef[defName="EM_Titanium"]/stuffProps/statFactors 0.7 1.2 - + - Defs/ThingDef[defName="VMEu_Lithium" or defName="VMEu_Germanium"]/statBases + Defs/ThingDef[defName="EM_Germanium"]/statBases 0.03 - - - Defs/ThingDef[defName="VMEu_Concrete" or defName="VMEu_RockPowder" or defName="VMEu_Fossil"]/statBases - - 0.2 - -     \ No newline at end of file diff --git a/ModPatches/FSF Advanced Bionics Expansion/Patches/FSF Advanced Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml b/ModPatches/FSF Advanced Bionics Expansion/Patches/FSF Advanced Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml index 86969b5207..f101f5b450 100644 --- a/ModPatches/FSF Advanced Bionics Expansion/Patches/FSF Advanced Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml +++ b/ModPatches/FSF Advanced Bionics Expansion/Patches/FSF Advanced Bionics Expansion/HediffDefs/FSFAdvancedBionics_AddedParts.xml @@ -222,14 +222,14 @@ Defs/HediffDef[defName="FSFArchotechSkinI"]/stages/li/statOffsets/ArmorRating_Sharp - 6 + 9 Defs/HediffDef[defName="FSFArchotechSkinI"]/stages/li/statOffsets/ArmorRating_Blunt - 15 + 20 0.5 @@ -346,133 +346,133 @@ -
  • - Defs/HediffDef[defName="FSFAdvBionicMedicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • Blunt
    • - - 14 - 2 - 2.0 - MeleeHit_BionicPunch - MeleeMiss_BionicPunch - - -     - +
  • + Defs/HediffDef[defName="FSFAdvBionicMedicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • Blunt
    • + + 14 + 2 + 2.0 + MeleeHit_BionicPunch + MeleeMiss_BionicPunch + + + + -
  • - Defs/HediffDef[defName="FSFArchotechMedicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • Blunt
    • - - 14 - 2 - 3.0 - MeleeHit_BionicPunch - MeleeMiss_BionicPunch - - - - +
  • + Defs/HediffDef[defName="FSFArchotechMedicArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • Blunt
    • + + 14 + 2 + 3.0 + MeleeHit_BionicPunch + MeleeMiss_BionicPunch + + + + -
  • - Defs/HediffDef[defName="FSFBionicConstructionArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • Blunt
    • - - 14 - 2 - 2.0 - MeleeHit_BionicPunch - MeleeMiss_BionicPunch - - - - +
  • + Defs/HediffDef[defName="FSFBionicConstructionArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • Blunt
    • + + 14 + 2 + 2.0 + MeleeHit_BionicPunch + MeleeMiss_BionicPunch + + + + -
  • - Defs/HediffDef[defName="FSFAdvBionicConstructionArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • Blunt
    • - - 14 - 2 - 2.0 - MeleeHit_BionicPunch - MeleeMiss_BionicPunch - - - - +
  • + Defs/HediffDef[defName="FSFAdvBionicConstructionArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • Blunt
    • + + 14 + 2 + 2.0 + MeleeHit_BionicPunch + MeleeMiss_BionicPunch + + + + -
  • - Defs/HediffDef[defName="FSFAdvBionicDrillArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • Stab
    • - - 14 - 2 - 6.0 - MeleeHit_BionicPunch - MeleeMiss_BionicPunch - - - - +
  • + Defs/HediffDef[defName="FSFAdvBionicDrillArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • Stab
    • + + 14 + 2 + 6.0 + MeleeHit_BionicPunch + MeleeMiss_BionicPunch + + + + -
  • - Defs/HediffDef[defName="FSFAdvBionicFieldArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools - - -
  • - - -
  • Blunt
    • - - 3 - 1.66 - 0.00 - 0.75 - true - MeleeHit_FieldHand - MeleeMiss_FieldHand - - - - +
  • + Defs/HediffDef[defName="FSFAdvBionicFieldArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools + + +
  • + + +
  • Blunt
    • + + 3 + 1.66 + 0.00 + 0.75 + true + MeleeHit_FieldHand + MeleeMiss_FieldHand + + + + -
  • - Defs/HediffDef[defName="FSFArchotechSkinI"]/stages/li/statOffsets - - - 7 - 12 - 1.5 - 1 - - -
    • +
  • + Defs/HediffDef[defName="FSFArchotechSkinI"]/stages/li/statOffsets + + + 7 + 12 + 1.5 + 1 + + +
    • diff --git a/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Scenarios_Mino.xml b/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Scenarios_Mino.xml index 5e430b517a..ddd519f349 100644 --- a/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Scenarios_Mino.xml +++ b/ModPatches/Forgotten Realms - Minotaur/Patches/Forgotten Realms - Minotaur/Scenarios_Mino.xml @@ -4,7 +4,6 @@ Defs/ScenarioDef[defName="FR_CrashlandedMinotaur"]/scenario/parts -
  • StartingThing_Defined @@ -21,7 +20,6 @@ Defs/ScenarioDef[defName="FR_LostTribeMinotaur"]/scenario/parts -
  • StartingThing_Defined @@ -33,7 +31,6 @@ Defs/ScenarioDef[defName="FR_LostTribeMinotaur"]/scenario/parts/li[thingDef="Pila"] - 20 diff --git a/ModPatches/GREG/Patches/GREG/ThingDefs_Races.xml b/ModPatches/GREG/Patches/GREG/ThingDefs_Races.xml new file mode 100644 index 0000000000..be40a43f36 --- /dev/null +++ b/ModPatches/GREG/Patches/GREG/ThingDefs_Races.xml @@ -0,0 +1,251 @@ + + + + + + + Defs/ThingDef[defName="XEN_CattleEgret" or defName="XEN_GreatEgret" or defName="XEN_ReddishEgret" or defName="XEN_SlatyEgret" or defName="XEN_SnowyEgret"] + +
  • + Birdlike +
    • +     +     + + + + + Defs/ThingDef[defName="XEN_CattleEgret"]/statBases + + 0.1 + 0.01 + 0.03 + + + + + Defs/ThingDef[defName="XEN_CattleEgret"]/tools + + +
  • + + +
  • Scratch
    • + + 2 + 2.0 + Feet + 0.1 + 0.2 + +
  • + +
  • Bite
    • + + 3 + 2.2 + Beak + + +
  • + Stun + 3 +
    • +     +     + 0.05 + 0.480 + +
  • + + +
  • Blunt
    • + + 1 + 2.0 + HeadAttackTool + 0.2 + 0.25 + +     +     +     + + + + + Defs/ThingDef[defName="XEN_GreatEgret" or defName="XEN_ReddishEgret"]/statBases + + 0.1 + 0.01 + 0.04 + + + + + Defs/ThingDef[defName="XEN_GreatEgret" or defName="XEN_ReddishEgret"]/tools + + +
  • + + +
  • Scratch
    • + + 3 + 2.0 + Feet + 0.1 + 0.2 + +
  • + +
  • Bite
    • + + 5 + 2.2 + Beak + + +
  • + Stun + 5 +
    • +     +     + 0.05 + 0.480 + +
  • + + +
  • Blunt
    • + + 3 + 2.0 + HeadAttackTool + 0.2 + 0.25 + +     +     +     + + + + + Defs/ThingDef[defName="XEN_SlatyEgret"]/statBases + + 0.15 + 0.01 + 0.05 + + + + + Defs/ThingDef[defName="XEN_SlatyEgret"]/tools + + +
  • + + +
  • Scratch
    • + + 3 + 1.9 + Feet + 0.1 + 0.2 + +
  • + +
  • Bite
    • + + 4 + 2.1 + Beak + + +
  • + Stun + 4 +
    • +     +     + 0.05 + 0.480 + +
  • + + +
  • Blunt
    • + + 2 + 2.0 + HeadAttackTool + 0.2 + 0.25 + +     +     +     + + + + + Defs/ThingDef[defName="XEN_SnowyEgret"]/statBases + + 0.1 + 0.01 + 0.03 + + + + + Defs/ThingDef[defName="XEN_SnowyEgret"]/tools + + +
  • + + +
  • Scratch
    • + + 2 + 2.0 + Feet + 0.1 + 0.2 + +
  • + +
  • Bite
    • + + 3 + 2.2 + Beak + + +
  • + Stun + 3 +
    • +     +     + 0.05 + 0.480 + +
  • + + +
  • Blunt
    • + + 2 + 2.0 + HeadAttackTool + 0.2 + 0.25 + +     +     +     + + \ No newline at end of file diff --git a/ModPatches/Gestalt Engine/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml b/ModPatches/Gestalt Engine/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml index 4ce7fbadc9..fc1c567390 100644 --- a/ModPatches/Gestalt Engine/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml +++ b/ModPatches/Gestalt Engine/Patches/Gestalt Engine/ThingDefs_Races/Matriach.xml @@ -1,13 +1,6 @@ - - Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases - - 0 - - - Defs/ThingDef[defName="RM_Mech_Matriarch"]/statBases diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_APB-1Group.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_APB-1Group.xml index 721a41f840..f9a4d2930c 100644 --- a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_APB-1Group.xml +++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_APB-1Group.xml @@ -115,9 +115,7 @@ FALSE SuppressFire - - false diff --git a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCGroup.xml b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCGroup.xml index eaff8b0e94..3e409091a3 100644 --- a/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCGroup.xml +++ b/ModPatches/Glitter Tech/Patches/Glitter Tech/GlitterTech_CE_Patch_Weapons_OCGroup.xml @@ -181,14 +181,11 @@ 9 - AimedShot true - - false     diff --git a/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Races/Race_Dragonian.xml b/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Races/Race_Dragonian.xml index 44140b0fe7..3812e83029 100644 --- a/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Races/Race_Dragonian.xml +++ b/ModPatches/Gloomy Dragonian Race/Patches/Gloomy Dragonian Race/ThingDefs_Races/Race_Dragonian.xml @@ -7,13 +7,13 @@
  • CombatExtended.CompPawnGizmo
    • -
  • +
  • 500 true 600 5 - 0.75 + 0.5
    • diff --git a/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Armors.xml b/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Armors.xml new file mode 100644 index 0000000000..7639616caa --- /dev/null +++ b/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Armors.xml @@ -0,0 +1,236 @@ + + + + + + + + + Defs/ThingDef[defName="GW_TotE_CustodesGuardArmor"]/statBases + + 225 + 25 + + + + + Defs/ThingDef[defName="GW_TotE_CustodesGuardArmor"]/equippedStatOffsets + + 100 + 90 + + + + + Defs/ThingDef[defName="GW_TotE_CustodesGuardArmor"]/statBases/ArmorRating_Sharp + + 72 + + + + + Defs/ThingDef[defName="GW_TotE_CustodesGuardArmor"]/statBases/ArmorRating_Blunt + + 525 + + + + + + + Defs/ThingDef[defName="GW_TotE_CustodesGuardShoulder"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[defName="GW_TotE_CustodesGuardShoulder"]/statBases/ArmorRating_Sharp + + 40 + + + + + Defs/ThingDef[defName="GW_TotE_CustodesGuardShoulder"]/statBases/ArmorRating_Blunt + + 52 + + + + + + + + + Defs/ThingDef[defName="GW_TotE_CustodesWardenArmor"]/statBases + + 225 + 25 + + + + + Defs/ThingDef[defName="GW_TotE_CustodesWardenArmor"]/equippedStatOffsets + + 100 + 90 + + + + + Defs/ThingDef[defName="GW_TotE_CustodesWardenArmor"]/statBases/ArmorRating_Sharp + + 82 + + + + + Defs/ThingDef[defName="GW_TotE_CustodesWardenArmor"]/statBases/ArmorRating_Blunt + + 565 + + + + + + + Defs/ThingDef[defName="GW_TotE_CustodesWardenShoulder"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[defName="GW_TotE_CustodesWardenShoulder"]/statBases/ArmorRating_Sharp + + 46 + + + + + Defs/ThingDef[defName="GW_TotE_CustodesWardenShoulder"]/statBases/ArmorRating_Blunt + + 60 + + + + + + + + + Defs/ThingDef[defName="GW_TotE_AllarusArmor"]/statBases + + 350 + 40 + + + + + Defs/ThingDef[defName="GW_TotE_AllarusArmor"]/equippedStatOffsets + + 150 + 120 + + + + + Defs/ThingDef[defName="GW_TotE_AllarusArmor"]/statBases/ArmorRating_Sharp + + 145 + + + + + Defs/ThingDef[defName="GW_TotE_AllarusArmor"]/statBases/ArmorRating_Blunt + + 900 + + + + + + + Defs/ThingDef[defName="GW_TotE_AllarusShoulder"]/statBases + + 35 + 10 + + + + + Defs/ThingDef[defName="GW_TotE_AllarusShoulder"]/statBases/ArmorRating_Sharp + + 55 + + + + + Defs/ThingDef[defName="GW_TotE_AllarusShoulder"]/statBases/ArmorRating_Blunt + + 75 + + + + + + + + + Defs/ThingDef[defName="GW_TotE_CastellanArmor"]/statBases + + 225 + 25 + + + + + Defs/ThingDef[defName="GW_TotE_CastellanArmor"]/equippedStatOffsets + + 100 + 90 + + + + + Defs/ThingDef[defName="GW_TotE_CastellanArmor"]/statBases/ArmorRating_Sharp + + 92 + + + + + Defs/ThingDef[defName="GW_TotE_CastellanArmor"]/statBases/ArmorRating_Blunt + + 610 + + + + + + + Defs/ThingDef[defName="GW_TotE_CastellanPlateShoulder"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[defName="GW_TotE_CastellanPlateShoulder"]/statBases/ArmorRating_Sharp + + 50 + + + + + Defs/ThingDef[defName="GW_TotE_CastellanPlateShoulder"]/statBases/ArmorRating_Blunt + + 65 + + + + \ No newline at end of file diff --git a/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Armors_Helmets.xml b/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Armors_Helmets.xml new file mode 100644 index 0000000000..bfe9281792 --- /dev/null +++ b/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Armors_Helmets.xml @@ -0,0 +1,201 @@ + + + + + + + Defs/ThingDef[@Name="GW_TotEHelmetBase"]/apparel/layers/li[text()="EyeCover"] + + + + Defs/ThingDef[@Name="GW_TotEHelmetBase"]/apparel/immuneToToxGasExposure + + Defs/ThingDef[@Name="GW_TotEHelmetBase"]/apparel + + true + + + + + + Defs/ThingDef[@Name="GW_TotEHelmetBase"]/equippedStatOffsets + + -1 + + + + + Defs/ThingDef[@Name="GW_TotEHelmetBase"]/statBases + + 0.8 + + + + + Defs/ThingDef[@Name="GW_TotEHelmetBase"] + +
  • + +
  • + 0.80 + +
  • Eye
    • + + + +
  • + 0.80 + +
  • Eye
    • + + + + +     +     + + + + + Defs/ThingDef[defName="GW_TotE_CustodesGuardHelmet"]/statBases + + 15 + 2.5 + + + + + Defs/ThingDef[defName="GW_TotE_CustodesGuardHelmet"]/statBases/ArmorRating_Sharp + + 54 + + + + + Defs/ThingDef[defName="GW_TotE_CustodesGuardHelmet"]/statBases/ArmorRating_Blunt + + 120 + + + + + + + Defs/ThingDef[defName="GW_TotE_CustodesWardenHelmet"]/statBases + + 15 + 2.5 + + + + + Defs/ThingDef[defName="GW_TotE_CustodesWardenHelmet"]/statBases/ArmorRating_Sharp + + 54 + + + + + Defs/ThingDef[defName="GW_TotE_CustodesWardenHelmet"]/statBases/ArmorRating_Blunt + + 120 + + + + + + + Defs/ThingDef[defName="GW_TotE_CastellanPlateHelmet"]/statBases + + 15 + 2.5 + + + + + Defs/ThingDef[defName="GW_TotE_CastellanPlateHelmet"]/statBases/ArmorRating_Sharp + + 54 + + + + + Defs/ThingDef[defName="GW_TotE_CastellanPlateHelmet"]/statBases/ArmorRating_Blunt + + 120 + + + + + + + Defs/ThingDef[defName="GW_TotE_SagittarumHelmet"]/statBases + + 15 + 2.5 + + + + + Defs/ThingDef[defName="GW_TotE_SagittarumHelmet"]/statBases/ArmorRating_Sharp + + 54 + + + + + Defs/ThingDef[defName="GW_TotE_SagittarumHelmet"]/statBases/ArmorRating_Blunt + + 120 + + + + + + + Defs/ThingDef[defName="GW_TotE_VenatariHelmet"]/statBases + + 15 + 2.5 + + + + + Defs/ThingDef[defName="GW_TotE_VenatariHelmet"]/statBases/ArmorRating_Sharp + + 54 + + + + + Defs/ThingDef[defName="GW_TotE_VenatariHelmet"]/statBases/ArmorRating_Blunt + + 120 + + + + + + + Defs/ThingDef[defName="GW_TotE_AllarusHelmet"]/statBases + + 15 + 2.5 + + + + + Defs/ThingDef[defName="GW_TotE_AllarusHelmet"]/statBases/ArmorRating_Sharp + + 54 + + + + + Defs/ThingDef[defName="GW_TotE_AllarusHelmet"]/statBases/ArmorRating_Blunt + + 120 + + + +     \ No newline at end of file diff --git a/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Flamers.xml b/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Flamers.xml new file mode 100644 index 0000000000..517c2ef449 --- /dev/null +++ b/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Flamers.xml @@ -0,0 +1,77 @@ + + + + + + + Defs/ThingDef[defName="GW_TotE_Firepike"]/tools + + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.63 + Barrel + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +     +     +     + + + + + GW_TotE_Firepike + + 38.6 + 0.82 + 1.65 + 4.0 + 1 + 19.8 + + + CombatExtended.Verb_ShootCE + true + Bullet_Flamethrower_Prometheum + 1.3 + 42 + 4 + 8 + GW_SM_Flamer_Sound + GunTail_Light + 12 + 0.3 + 6 + 3 + + + 80 + 3 + AmmoSet_Flamethrower + + + False + SuppressFire + true + + +
  • NoSwitch
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Guns.xml b/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Guns.xml new file mode 100644 index 0000000000..525396d23c --- /dev/null +++ b/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Guns.xml @@ -0,0 +1,173 @@ + + + + + + + Defs/ThingDef[defName="GW_TotE_Bolt_Caliver" or defName="GW_TotE_Kinetic_Destructor"]/tools + + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.63 + Barrel + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +     +     +     + + + + + Defs/ThingDef[defName="GW_TotE_Adrathic_Destructor"]/tools + + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.63 + Barrel + +     +     +     + + + + + + + GW_TotE_Adrathic_Destructor + + 14.8 + 0.98 + 1 + 0.06 + 1.65 + 10.7 + 38000 + + + CombatExtended.Verb_ShootCE + true + Bullet_Lasgun_Cannon + 1 + 42 + Talon_Pulse_Gun_Sound + GunTail_Medium + 8 + 2.15 + 12 + + + 40 + 6.8 + AmmoSet_Lasgun_Cannon + + + FALSE + AimedShot + + +
  • CE_OneHandedWeapon
    • +     +     + + + + + GW_TotE_Bolt_Caliver + + 21 + 0.54 + 1.1 + 0.1 + 1 + 18 + + + CombatExtended.Verb_ShootCE + true + Bullet_Bolter998_Standard + 0.6 + 54 + 20 + Talon_Bolt_Gun_Sound + GunTail_Medium + 8 + 2.3 + 10 + + + 60 + 6.8 + AmmoSet_Bolter998 + + + 5 + FALSE + Snapshot + + +
  • CE_AI_BROOM
    • +
  • CE_SMG
    • +     +     + + + + + GW_TotE_Kinetic_Destructor + + 6 + 8.6 + 1.17 + 0.15 + 0.8 + 0.35 + + + 0.5 + CombatExtended.Verb_ShootCE + True + Bullet_PlasmaRifle + 0.5 + 20 + Talon_Bolt_Gun_Sound + GunTail_Medium + 9 + + + 8 + 4 + AmmoSet_PlasmaCanister_Rifle + + + Snapshot + + +
  • CE_OneHandedWeapon
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Melee_Weapons.xml b/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Melee_Weapons.xml new file mode 100644 index 0000000000..12f68b3d0d --- /dev/null +++ b/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Melee_Weapons.xml @@ -0,0 +1,270 @@ + + + + + + + Defs/ThingDef[defName="GW_TotE_Misericordia"]/tools + + +
  • + + +
  • Poke
    • + + 4 + 1.4 + 0.2 + 1.425 + Handle + +
  • + + +
  • Cut
    • + + 47 + 1.17 + 4.06 + 44 + Edge + +
  • + + +
  • Stab
    • + + 25 + 1.05 + 2.048 + 100 + +     +     +     + + + Defs/ThingDef[defName="GW_TotE_Misericordia"]/weaponTags + + Defs/ThingDef[defName="GW_TotE_Misericordia"] + + + + + + + + Defs/ThingDef[defName="GW_TotE_Misericordia"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + + Defs/ThingDef[defName="GW_TotE_Misericordia"] + + + 0.23 + 0.45 + 0.35 + + + + + + Defs/ThingDef[defName="GW_TotE_Misericordia"]/statBases + + 4.9 + 0.58 + + + + + + + Defs/ThingDef[defName="GW_TotE_Sentinel_Blade"]/tools + + +
  • + + +
  • Poke
    • + + 4 + 1.4 + 0.2 + 1.425 + Handle + +
  • + + +
  • Cut
    • + + 56 + 1.17 + 4.06 + 52 + Edge + +
  • + + +
  • Stab
    • + + 38 + 1.25 + 2.048 + 120 + +     +     +     + + + Defs/ThingDef[defName="GW_TotE_Sentinel_Blade"]/weaponTags + + Defs/ThingDef[defName="GW_TotE_Sentinel_Blade"] + + + + + + + + Defs/ThingDef[defName="GW_TotE_Sentinel_Blade"] + + + 1.0 + 0.5 + 0.16 + + + + + + Defs/ThingDef[defName="GW_TotE_Sentinel_Blade"]/statBases + + 6.2 + 0.53 + + + + + + + Defs/ThingDef[defName="GW_TotE_Vexilla"]/tools + + +
  • + + +
  • Blunt
    • + + 5 + 2.85 + 0.30 + 1.69 + Head + +
  • + + +
  • Blunt
    • +
  • Poke
    • + + 32 + 2.15 + 16 + Head + +     +     +     + + + Defs/ThingDef[defName="GW_TotE_Vexilla"]/statBases + + 10 + 0.93 + + + + + Defs/ThingDef[defName="GW_TotE_Vexilla"] + + + 1.00 + 0.70 + 0.47 + + + + + + + Defs/ThingDef[defName="GW_TotE_Vaultsword"]/statBases + + 14 + 1.25 + 24 + + + + + Defs/ThingDef[defName="GW_TotE_Vaultsword"]/weaponTags + + Defs/ThingDef[defName="GW_TotE_Vaultsword"] + + + + + + + + Defs/ThingDef[defName="GW_TotE_Vaultsword"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + + Defs/ThingDef[defName="GW_TotE_Vaultsword"] + + + 0.2 + 0.63 + 0.22 + + + + + + Defs/ThingDef[defName="GW_TotE_Vaultsword"]/tools + + +
  • + + +
  • Stab
    • + + 62 + 2.35 + 9 + 142 + +
  • + + +
  • Cut
    • + + 82 + 2.6 + 17 + 128 + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Switchable.xml b/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Switchable.xml new file mode 100644 index 0000000000..4fec46ded1 --- /dev/null +++ b/ModPatches/GrimWorld Talons of the Emperor/Patches/GrimWorld Talons of the Emperor/CE_Patch_Switchable.xml @@ -0,0 +1,490 @@ + + + + + + + Defs/ThingDef[defName="GW_TotE_GuardianSpear"]/tools + + +
  • + + +
  • Poke
    • + + 4 + 1.54 + 0.2 + 1.425 + Handle + +
  • + + +
  • Poke
    • + + 4 + 1.78 + 0.05 + 1 + Point + +
  • + + +
  • Stab
    • + + 52 + 1.35 + 2.8 + 98 + +     +     +     + + + Defs/ThingDef[defName="GW_TotE_GuardianSpear"] + + + 0.67 + 1.95 + 1.1 + + + + + + Defs/ThingDef[defName="GW_TotE_GuardianSpear"]/statBases + + 13 + 1.88 + + + + + + + GW_TotE_GuardianSpearR + + 0.62 + 1 + 0.09 + 1.43 + 13 + + + CombatExtended.Verb_ShootCE + true + Bullet_Bolter75_Standard + 1 + 16 + 4 + Talon_Bolt_Gun_Sound + GunTail_Medium + 8 + 1.35 + 9 + + + 12 + 5.2 + AmmoSet_Bolter75 + + + 2 + FALSE + Snapshot + + + + + + + Defs/ThingDef[defName="GW_TotE_AdrathicSpear"]/tools + + +
  • + + +
  • Poke
    • + + 4 + 1.54 + 0.2 + 1.425 + Handle + +
  • + + +
  • Poke
    • + + 4 + 1.78 + 0.05 + 1 + Point + +
  • + + +
  • Stab
    • + + 52 + 1.35 + 2.8 + 98 + +     +     +     + + + Defs/ThingDef[defName="GW_TotE_AdrathicSpear"] + + + 0.67 + 1.95 + 1.1 + + + + + + Defs/ThingDef[defName="GW_TotE_AdrathicSpear"]/statBases + + 13 + 1.88 + + + + + + + GW_TotE_AdrathicSpearR + + 0.98 + 1 + 0.12 + 1.95 + 13 + + + CombatExtended.Verb_ShootCE + true + Bullet_Lasgun_Cannon + 1 + 22 + Talon_Pulse_Gun_Sound + GunTail_Medium + 8 + 2.15 + + + 10 + 6.2 + AmmoSet_Lasgun_Cannon + + + FALSE + AimedShot + + +
  • CE_AI_AR
    • +     +     + + + + + Defs/ThingDef[defName="GW_TotE_MeltaSpear"]/tools + + +
  • + + +
  • Poke
    • + + 4 + 1.54 + 0.2 + 1.425 + Handle + +
  • + + +
  • Poke
    • + + 4 + 1.78 + 0.05 + 1 + Point + +
  • + + +
  • Stab
    • + + 52 + 1.35 + 2.8 + 98 + +     +     +     + + + Defs/ThingDef[defName="GW_TotE_MeltaSpear"] + + + 0.67 + 1.95 + 1.1 + + + + + + Defs/ThingDef[defName="GW_TotE_MeltaSpear"]/statBases + + 13 + 1.88 + + + + + + + GW_TotE_MeltaSpear + + 2.0 + 1 + 0.11 + 1.56 + 13 + + + CombatExtended.Verb_ShootCE + true + Bullet_Laser_MeltaCharge + 0.6 + 12 + 1 + Shot_SniperRifle + GunTail_Heavy + 12 + 2.7 + 12 + + true + + + + 3 + 4.8 + AmmoSet_MeltaCharge + + + Snapshot + + + + + + + Defs/ThingDef[defName="GW_TotE_CastellanAxe"]/tools + + +
  • + + +
  • Poke
    • + + 6 + 1.74 + 0.2 + 1.425 + Handle + +
  • + + +
  • Poke
    • + + 6 + 1.88 + 0.05 + 1 + Point + +
  • + + +
  • Cut
    • + + 56 + 1.85 + 2.8 + 100 + +     +     +     + + + Defs/ThingDef[defName="GW_TotE_CastellanAxe"] + + + 0.67 + 1.95 + 0.87 + + + + + + Defs/ThingDef[defName="GW_TotE_CastellanAxe"]/statBases + + 15 + 2.02 + + + + + + + GW_TotE_CastellanAxeR + + 0.62 + 1 + 0.09 + 1.63 + 15 + + + CombatExtended.Verb_ShootCE + true + Bullet_Bolter75_Standard + 1 + 16 + 4 + Talon_Bolt_Gun_Sound + GunTail_Medium + 8 + 1.35 + 9 + + + 12 + 5.2 + AmmoSet_Bolter75 + + + 2 + FALSE + Snapshot + + + + + + + Defs/ThingDef[defName="GW_TotE_WatchersAxe"]/tools + + +
  • + + +
  • Poke
    • + + 6 + 1.74 + 0.2 + 1.425 + Handle + +
  • + + +
  • Poke
    • + + 6 + 1.88 + 0.05 + 1 + Point + +
  • + + +
  • Cut
    • + + 72 + 1.85 + 2.8 + 135 + +     +     +     + + + Defs/ThingDef[defName="GW_TotE_WatchersAxe"] + + + 0.67 + 1.95 + 0.87 + + + + + + Defs/ThingDef[defName="GW_TotE_WatchersAxe"]/statBases + + 15 + 2.02 + + + + + + + GW_TotE_WatchersAxeR + + 0.52 + 1 + 0.04 + 1.51 + 15 + + + CombatExtended.Verb_ShootCE + true + Bullet_Bolter75_Standard + 1 + 20 + 4 + Talon_Bolt_Gun_Sound + GunTail_Medium + 8 + 1.14 + 7 + + + 12 + 5.2 + AmmoSet_Bolter75 + + + 2 + FALSE + Snapshot + + + +     \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/Bodies/Bodies_Animal_Griffar.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/Bodies/Bodies_Animal_Griffar.xml new file mode 100644 index 0000000000..433a103f8e --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/Bodies/Bodies_Animal_Griffar.xml @@ -0,0 +1,126 @@ + + + + + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/groups + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart + + + + + + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Tail"]/groups + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Tail"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"]/groups + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Beak"]/groups + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Beak"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Leg"]/groups + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Leg"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"] + + + + + + + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Tail"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="Beak"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Leg"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GriffarBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/Bodies/Bodies_Animal_Grimshadow.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/Bodies/Bodies_Animal_Grimshadow.xml new file mode 100644 index 0000000000..5db08bbc6b --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/Bodies/Bodies_Animal_Grimshadow.xml @@ -0,0 +1,194 @@ + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Tail"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Tail"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="FrontClaw"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="FrontClaw"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Leg"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Leg"] + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"] + + + + + + + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Tail"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Neck"]/parts/li[def="Head"]/parts/li[def="AnimalJaw"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Leg"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Leg"]/parts/li[def="Paw"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + + + Defs/BodyDef[defName="Grimstone_GrimshadowBody"]/corePart/parts/li[def="Shoulder"]/parts/li[def="Arm"]/parts/li[def="Hand"]/parts/li[def="FrontClaw"]/groups + +
  • CoveredByNaturalArmor
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml new file mode 100644 index 0000000000..5e3f1cc93a --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff.xml @@ -0,0 +1,69 @@ + + + + + + Defs/ThingDef[defName="Grimstone_BellocerosHorn"]/tools + + + + Defs/ThingDef[defName="Grimstone_BellocerosHorn"] + ParentName + ResourceBase + + + + Defs/ThingDef[defName="Grimstone_BellocerosHorn"]/statBases/Mass + + 50 + 25 + + + + + + Defs/ThingDef[defName="Grimstone_Ivory"]/statBases + + 0.07 + + + + + Defs/ThingDef[defName="Grimstone_Ivory"]/statBases/StuffPower_Armor_Sharp + + 0.35 + + + + + Defs/ThingDef[defName="Grimstone_Ivory"]/statBases/StuffPower_Armor_Blunt + + 0.2 + + + + + Defs/ThingDef[defName="Grimstone_Ivory"]/statBases/StuffPower_Armor_Heat + + 0.025 + + + + + Defs/ThingDef[defName="Grimstone_Ivory"]/stuffProps/statFactors + + 0.5 + + + + + + + Defs/ThingDef[defName="Grimstone_GrimshadowSkull"]/statBases/Mass + + 60 + 30 + + + + \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff_Leather.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff_Leather.xml new file mode 100644 index 0000000000..2fb5d01f26 --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Items/Items_Resource_Stuff_Leather.xml @@ -0,0 +1,74 @@ + + + + + + Defs/ThingDef[defName="Grimstone_Leather_Grimshadow"]/statBases/StuffPower_Armor_Sharp + + 0.9 + + + + + Defs/ThingDef[defName="Grimstone_Leather_Grimshadow"]/statBases/StuffPower_Armor_Blunt + + 0.2 + + + + + Defs/ThingDef[defName="Grimstone_Leather_Grimshadow"]/statBases + + 0.03 + + + + + Defs/ThingDef[defName="Grimstone_Leather_Grimshadow"]/stuffProps/categories + + Defs/ThingDef[defName="Grimstone_Leather_Grimshadow"]/stuffProps + + +
  • SoftArmor
    • +     +     +     + + Defs/ThingDef[defName="Grimstone_Leather_Grimshadow"]/stuffProps/categories + +
  • SoftArmor
    • +     +     +     + + + + Defs/ThingDef[defName="Grimstone_Leather_Griffar"]/statBases/StuffPower_Armor_Sharp + + 0.625 + + + + + Defs/ThingDef[defName="Grimstone_Leather_Griffar"]/statBases + + 0.1 + + + + + + Defs/ThingDef[defName="Grimstone_Leather_Belloceros"]/statBases/StuffPower_Armor_Sharp + + 0.15 + + + + + Defs/ThingDef[defName="Grimstone_Leather_Belloceros"]/statBases/StuffPower_Armor_Blunt + + 0.085 + + + +     \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Belloceros.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Belloceros.xml new file mode 100644 index 0000000000..0ddd7f663a --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Belloceros.xml @@ -0,0 +1,106 @@ + + + + + Defs/ThingDef[defName="Grimstone_Belloceros"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="Grimstone_Belloceros"]/statBases + + 0.11 + 0.52 + 0.33 + 0.5 + 0.2 + + + + + Defs/ThingDef[defName="Grimstone_Belloceros"]/statBases/MoveSpeed + + 5.2 + + + + + Defs/ThingDef[defName="Grimstone_Belloceros"]/tools + + +
  • + + +
  • Scratch
    • + + 32 + 2.85 + HornAttackTool + 2 + 22 + +
  • + + +
  • Blunt
    • + + 28 + 2.4 + HornAttackTool + 2 + 22 + +
  • + +
  • Bite
    • + + 12 + 2.44 + 0.7 + Teeth + 0.04 + 4 + +
  • + + +
  • Blunt
    • + + 22 + 3 + HeadAttackTool + 0.2 + 9 + +     +     +     + + + Defs/ThingDef[defName="Grimstone_Belloceros"]/comps + + Defs/ThingDef[defName="Grimstone_Belloceros"] + + + + + + + + Defs/ThingDef[defName="Grimstone_Belloceros"]/comps + +
  • + 1625 + true + 600 + 5 + 0.5 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_EmperorVulture.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_EmperorVulture.xml new file mode 100644 index 0000000000..69d6ba46fb --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_EmperorVulture.xml @@ -0,0 +1,62 @@ + + + + + Defs/ThingDef[defName="Grimstone_EmperorVulture"]/statBases + + 0.2 + 0.02 + 0.03 + + + + + Defs/ThingDef[defName="Grimstone_EmperorVulture"]/tools + + +
  • + + +
  • Scratch
    • + + 6 + 2.08 + Feet + + +
  • + Stun + 14 +
    • +     +     + 0.1 + 0.480 + +
  • + + +
  • Bite
    • + + 8 + 2.08 + Beak + 0.15 + 0.5 + +
  • + + +
  • Blunt
    • + + 2 + 2.08 + HeadAttackTool + 0.2 + 0.480 + +     +     +     + +     diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Griffar.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Griffar.xml new file mode 100644 index 0000000000..da63ed3314 --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Griffar.xml @@ -0,0 +1,136 @@ + + + + + Defs/ThingDef[defName="Grimstone_Griffar"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="Grimstone_Griffar"]/statBases/MoveSpeed + + 5.6 + 0.35 + 0.23 + 0.18 + + + + + Defs/ThingDef[defName="Grimstone_Griffar"]/statBases/ArmorRating_Sharp + + 1.5 + + + + + Defs/ThingDef[defName="Grimstone_Griffar"]/statBases/ArmorRating_Blunt + + 2.25 + + + + + Defs/ThingDef[defName="Grimstone_Griffar"]/tools + + +
  • + + +
  • Scratch
    • + + 22 + 1.3 + FrontLeftPaw + + +
  • + Stun + 21 +
    • +     +     + 0.3 + 5 + +
  • + + +
  • Scratch
    • + + 22 + 1.3 + FrontRightPaw + + +
  • + Stun + 21 +
    • +     +     + 0.3 + 5 + +
  • + + +
  • Bite
    • + + 12 + 2.08 + Beak + + +
  • + Stun + 14 +
    • +     +     + 1.15 + 2.5 + +
  • + + +
  • Blunt
    • + + 12 + 2.22 + HeadAttackTool + 0.2 + 4.235 + +     +     +     + + + Defs/ThingDef[defName="Grimstone_Griffar"]/comps + + Defs/ThingDef[defName="Grimstone_Griffar"] + + + + + + + + Defs/ThingDef[defName="Grimstone_Griffar"]/comps + +
  • + 2750 + true + 600 + 5 + 0.5 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Grimshadow.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Grimshadow.xml new file mode 100644 index 0000000000..bd05e27260 --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Grimshadow.xml @@ -0,0 +1,136 @@ + + + + + Defs/ThingDef[defName="Grimstone_Grimshadow"] + +
  • + Birdlike +
    • +     +     + + + Defs/ThingDef[defName="Grimstone_Grimshadow"]/statBases/MoveSpeed + + 4.5 + 0.35 + 0.23 + 0.18 + + + + + Defs/ThingDef[defName="Grimstone_Grimshadow"]/statBases/ArmorRating_Sharp + + 30 + + + + + Defs/ThingDef[defName="Grimstone_Grimshadow"]/statBases/ArmorRating_Blunt + + 55 + + + + + Defs/ThingDef[defName="Grimstone_Grimshadow"]/tools + + +
  • + + +
  • Scratch
    • + + 40 + 1.3 + FrontLeftClaws + + +
  • + Stun + 21 +
    • +     +     + 23 + 36 + +
  • + + +
  • Scratch
    • + + 40 + 1.3 + FrontRightClaws + + +
  • + Stun + 21 +
    • +     +     + 23 + 36 + +
  • + + +
  • Blunt
    • + + 35 + 2.08 + Tail + + +
  • + Stun + 30 +
    • +     +     + 45 + +
  • + + +
  • Bite
    • + + 50 + 2.22 + Teeth + 0.2 + 30 + 50 + +     +     +     + + + Defs/ThingDef[defName="Grimstone_Grimshadow"]/comps + + Defs/ThingDef[defName="Grimstone_Grimshadow"] + + + + + + + + Defs/ThingDef[defName="Grimstone_Grimshadow"]/comps + +
  • + 4000 + true + 800 + 5 + 0.25 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Sheepdog.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Sheepdog.xml new file mode 100644 index 0000000000..6109fa09ff --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Sheepdog.xml @@ -0,0 +1,97 @@ + + + + + Defs/ThingDef[defName="Grimstone_Sheepdog"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="Grimstone_Sheepdog"]/statBases + + 0.20 + 0.06 + 0.05 + + + + + Defs/ThingDef[defName="Grimstone_Sheepdog"]/tools + + +
  • + + +
  • Scratch
    • + + 5 + 0.99 + FrontLeftPaw + 0.288 + 0.03 + +
  • + + +
  • Scratch
    • + + 5 + 0.99 + FrontRightPaw + 0.288 + 0.03 + +
  • + +
  • Bite
    • + + 12 + 1.77 + 0.7 + Teeth + 2.880 + 0.1 + +
  • + + +
  • Blunt
    • + + 1 + 1.19 + HeadAttackTool + 0.2 + 0.2 + +     +     +     + + + Defs/ThingDef[defName="Grimstone_Sheepdog"]/comps + + Defs/ThingDef[defName="Grimstone_Sheepdog"] + + + + + + + + Defs/ThingDef[defName="Grimstone_Sheepdog"]/comps + +
  • + 437 + true + 600 + 5 + 0.5 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Tetras.xml b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Tetras.xml new file mode 100644 index 0000000000..750c87c15c --- /dev/null +++ b/ModPatches/Grimstone Beasts/Patches/Grimstone Beasts/ThingDefs_Races/Races_Animals_Tetras.xml @@ -0,0 +1,69 @@ + + + + + Defs/ThingDef[defName="Grimstone_Tetras"]/statBases + + 0.2 + 0.02 + 0.03 + + + + + Defs/ThingDef[defName="Grimstone_Tetras"]/tools + + +
  • + + +
  • Scratch
    • + + 5 + 2.08 + Feet + + +
  • + Stun + 14 +
    • +     +     + 0.1 + 0.480 + +
  • + +
  • Bite
    • + + 6 + 2.08 + Beak + + +
  • + Stun + 14 +
    • +     +     + 0.01 + 0.480 + +
  • + + +
  • Blunt
    • + + 2 + 2.08 + HeadAttackTool + 0.2 + 0.480 + +     +     +     + +     diff --git a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors.xml b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors.xml index cb5bf45f23..ae2b8da904 100644 --- a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors.xml +++ b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors.xml @@ -1,9 +1,21 @@ - + + + Defs/ThingDef[ + defName="GW_SM_Scout" or + defName="GW_SM_ReiverArmor" or + defName="GW_SM_PhobosArmor" or + defName="GW_SM_MaximusArmor" or + defName="GW_SM_CorvusArmor" or + defName="GW_SM_AquillaArmor" or + defName="GW_SM_TacticusArmor" or + defName="GW_SM_GravisArmor" or + defName="GW_SM_IndomitusTerminatorArmor"]/equippedStatOffsets/MoveSpeed + - + Defs/ThingDef[defName="GW_SM_Scout"]/statBases @@ -16,45 +28,18 @@ Defs/ThingDef[defName="GW_SM_Scout"]/statBases/ArmorRating_Sharp - 16 + 25 Defs/ThingDef[defName="GW_SM_Scout"]/statBases/ArmorRating_Blunt - 24 - - - - - - - Defs/ThingDef[@Name="GW_SM_ScoutShoulderPads"]/statBases - - 5 - 2 - - - - - Defs/ThingDef[@Name="GW_SM_ScoutShoulderPads"]/statBases/ArmorRating_Sharp - - 14 - - - - - Defs/ThingDef[@Name="GW_SM_ScoutShoulderPads"]/statBases/ArmorRating_Blunt - - 20 + 150 - - - Defs/ThingDef[defName="GW_SM_ReiverArmor"]/statBases @@ -66,45 +51,19 @@ Defs/ThingDef[defName="GW_SM_ReiverArmor"]/statBases/ArmorRating_Sharp - 24 + 30 Defs/ThingDef[defName="GW_SM_ReiverArmor"]/statBases/ArmorRating_Blunt - 58 - - - - - - - Defs/ThingDef[@Name="GW_SM_MKXReiverShoulderPads"]/statBases - - 15 - 5 - - - - - Defs/ThingDef[@Name="GW_SM_MKXReiverShoulderPads"]/statBases/ArmorRating_Sharp - - 24 - - - - - Defs/ThingDef[@Name="GW_SM_MKXReiverShoulderPads"]/statBases/ArmorRating_Blunt - - 46 + 300 - - Defs/ThingDef[defName="GW_SM_PhobosArmor"]/statBases @@ -116,45 +75,19 @@ Defs/ThingDef[defName="GW_SM_PhobosArmor"]/statBases/ArmorRating_Sharp - 24 + 30 Defs/ThingDef[defName="GW_SM_PhobosArmor"]/statBases/ArmorRating_Blunt - 50 - - - - - - - Defs/ThingDef[@Name="GW_SM_MKXPhobosShoulderPads"]/statBases - - 15 - 5 - - - - - Defs/ThingDef[@Name="GW_SM_MKXPhobosShoulderPads"]/statBases/ArmorRating_Sharp - - 24 - - - - - Defs/ThingDef[@Name="GW_SM_MKXPhobosShoulderPads"]/statBases/ArmorRating_Blunt - - 46 + 300 - - Defs/ThingDef[defName="GW_SM_MaximusArmor"]/statBases @@ -166,45 +99,19 @@ Defs/ThingDef[defName="GW_SM_MaximusArmor"]/statBases/ArmorRating_Sharp - 26 + 36 Defs/ThingDef[defName="GW_SM_MaximusArmor"]/statBases/ArmorRating_Blunt - 62 - - - - - - - Defs/ThingDef[@Name="GW_SM_MKIVShoulderPads"]/statBases - - 15 - 5 - - - - - Defs/ThingDef[@Name="GW_SM_MKIVShoulderPads"]/statBases/ArmorRating_Sharp - - 24 - - - - - Defs/ThingDef[@Name="GW_SM_MKIVShoulderPads"]/statBases/ArmorRating_Blunt - - 54 + 350 - - Defs/ThingDef[defName="GW_SM_CorvusArmor"]/statBases @@ -216,45 +123,19 @@ Defs/ThingDef[defName="GW_SM_CorvusArmor"]/statBases/ArmorRating_Sharp - 26 + 36 Defs/ThingDef[defName="GW_SM_CorvusArmor"]/statBases/ArmorRating_Blunt - 62 - - - - - - - Defs/ThingDef[@Name="GW_SM_MKVIShoulderPads"]/statBases - - 15 - 5 - - - - - Defs/ThingDef[@Name="GW_SM_MKVIShoulderPads"]/statBases/ArmorRating_Sharp - - 24 - - - - - Defs/ThingDef[@Name="GW_SM_MKVIShoulderPads"]/statBases/ArmorRating_Blunt - - 54 + 350 - - Defs/ThingDef[defName="GW_SM_AquillaArmor"]/statBases @@ -266,45 +147,19 @@ Defs/ThingDef[defName="GW_SM_AquillaArmor"]/statBases/ArmorRating_Sharp - 26 + 36 Defs/ThingDef[defName="GW_SM_AquillaArmor"]/statBases/ArmorRating_Blunt - 62 - - - - - - - Defs/ThingDef[@Name="GW_SM_MKVIIShoulderPads"]/statBases - - 15 - 5 - - - - - Defs/ThingDef[@Name="GW_SM_MKVIIShoulderPads"]/statBases/ArmorRating_Sharp - - 24 - - - - - Defs/ThingDef[@Name="GW_SM_MKVIIShoulderPads"]/statBases/ArmorRating_Blunt - - 54 + 350 - - Defs/ThingDef[defName="GW_SM_TacticusArmor"]/statBases @@ -316,95 +171,50 @@ Defs/ThingDef[defName="GW_SM_TacticusArmor"]/statBases/ArmorRating_Sharp - 32 + 36 Defs/ThingDef[defName="GW_SM_TacticusArmor"]/statBases/ArmorRating_Blunt - 74 - - - - - - - Defs/ThingDef[@Name="GW_SM_MKXShoulderPads"]/statBases - - 15 - 5 - - - - - Defs/ThingDef[@Name="GW_SM_MKXShoulderPads"]/statBases/ArmorRating_Sharp - - 32 - - - - - Defs/ThingDef[@Name="GW_SM_MKXShoulderPads"]/statBases/ArmorRating_Blunt - - 66 + 350 - - Defs/ThingDef[defName="GW_SM_GravisArmor"]/statBases - 200 - 20 + 300 + 40 Defs/ThingDef[defName="GW_SM_GravisArmor"]/statBases/ArmorRating_Sharp - 32 + 65 Defs/ThingDef[defName="GW_SM_GravisArmor"]/statBases/ArmorRating_Blunt - 74 + 500 - - + - Defs/ThingDef[@Name="GW_SM_GravisShoulderPads"]/statBases - - 15 - 5 - - - - - Defs/ThingDef[@Name="GW_SM_GravisShoulderPads"]/statBases/ArmorRating_Sharp - - 32 - - - - - Defs/ThingDef[@Name="GW_SM_GravisShoulderPads"]/statBases/ArmorRating_Blunt + Defs/ThingDef[defName="GW_SM_IndomitusTerminatorArmor"]/equippedStatOffsets - 66 + 100 + 80 - - - - Defs/ThingDef[defName="GW_SM_IndomitusTerminatorArmor"]/statBases @@ -416,38 +226,14 @@ Defs/ThingDef[defName="GW_SM_IndomitusTerminatorArmor"]/statBases/ArmorRating_Sharp - 37.5 + 110 Defs/ThingDef[defName="GW_SM_IndomitusTerminatorArmor"]/statBases/ArmorRating_Blunt - 84 - - - - - - - Defs/ThingDef[@Name="GW_SM_TerminatorShoulderPads"]/statBases - - 15 - 5 - - - - - Defs/ThingDef[@Name="GW_SM_TerminatorShoulderPads"]/statBases/ArmorRating_Sharp - - 36 - - - - - Defs/ThingDef[@Name="GW_SM_TerminatorShoulderPads"]/statBases/ArmorRating_Blunt - - 84 + 750 diff --git a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_Backpacks.xml b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_Backpacks.xml index ed16b2791f..f9fb265c85 100644 --- a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_Backpacks.xml +++ b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_Backpacks.xml @@ -28,14 +28,14 @@ Defs/ThingDef[defName="GW_SM_ReiverBackpack" or defName="GW_SM_PhobosBackpack"]/statBases/ArmorRating_Sharp - 6 + 5 Defs/ThingDef[defName="GW_SM_ReiverBackpack" or defName="GW_SM_PhobosBackpack"]/statBases/ArmorRating_Blunt - 9 + 20 @@ -51,8 +51,8 @@ Defs/ThingDef[defName="GW_SM_MaximusBackpack" or defName="GW_SM_CorvusBackpack" or defName="GW_SM_AquillaBackpack"]/equippedStatOffsets/VEF_MassCarryCapacity - 50 - 60 + 70 + 70 @@ -66,14 +66,14 @@ Defs/ThingDef[defName="GW_SM_MaximusBackpack" or defName="GW_SM_CorvusBackpack" or defName="GW_SM_AquillaBackpack"]/statBases/ArmorRating_Sharp - 8 + 10 Defs/ThingDef[defName="GW_SM_MaximusBackpack" or defName="GW_SM_CorvusBackpack" or defName="GW_SM_AquillaBackpack"]/statBases/ArmorRating_Blunt - 12 + 30 @@ -89,8 +89,8 @@ Defs/ThingDef[defName="GW_SM_TacticusBackpack"]/equippedStatOffsets/VEF_MassCarryCapacity - 60 - 60 + 85 + 85 @@ -104,14 +104,14 @@ Defs/ThingDef[defName="GW_SM_TacticusBackpack"]/statBases/ArmorRating_Sharp - 12 + 15 Defs/ThingDef[defName="GW_SM_TacticusBackpack"]/statBases/ArmorRating_Blunt - 18 + 35 @@ -127,8 +127,8 @@ Defs/ThingDef[defName="GW_SM_GravisBackpack"]/equippedStatOffsets/VEF_MassCarryCapacity - 70 - 60 + 90 + 85 @@ -142,14 +142,14 @@ Defs/ThingDef[defName="GW_SM_GravisBackpack"]/statBases/ArmorRating_Sharp - 15 + 20 Defs/ThingDef[defName="GW_SM_GravisBackpack"]/statBases/ArmorRating_Blunt - 22.5 + 50 @@ -166,6 +166,7 @@ Defs/ThingDef[defName="GW_SM_AssaultJumpPack"]/equippedStatOffsets 70 + 35 @@ -186,7 +187,7 @@ Defs/ThingDef[defName="GW_SM_AssaultJumpPack"]/statBases/ArmorRating_Blunt - 22.5 + 35 diff --git a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_Helmets.xml b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_Helmets.xml index f5140c197d..eb8bb4f679 100644 --- a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_Helmets.xml +++ b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_Helmets.xml @@ -7,6 +7,29 @@ Defs/ThingDef[@Name="GW_SM_HelmetBase"]/apparel/layers/li[text()="EyeCover"] + + Defs/ThingDef[@Name="GW_SM_HelmetBase"] + +
  • + +
  • + 0.80 + +
  • Eye
    • + + + +
  • + 0.80 + +
  • Eye
    • + + + + +     +     + @@ -21,14 +44,14 @@ Defs/ThingDef[@Name="GW_SM_ScoutHelmet_Base"]/statBases/ArmorRating_Sharp - 6 + 15 Defs/ThingDef[@Name="GW_SM_ScoutHelmet_Base"]/statBases/ArmorRating_Blunt - 9 + 20 @@ -72,14 +95,14 @@ Defs/ThingDef[@Name="GW_SM_MKXReiverHelmet_Base"]/statBases/ArmorRating_Sharp - 20 + 30 Defs/ThingDef[@Name="GW_SM_MKXReiverHelmet_Base"]/statBases/ArmorRating_Blunt - 44 + 30 @@ -122,14 +145,14 @@ Defs/ThingDef[@Name="GW_SM_MKXPhobosHelmet_Base"]/statBases/ArmorRating_Sharp - 20 + 30 Defs/ThingDef[@Name="GW_SM_MKXPhobosHelmet_Base"]/statBases/ArmorRating_Blunt - 44 + 35 @@ -172,14 +195,14 @@ Defs/ThingDef[@Name="GW_SM_MKIVHelmet_Base"]/statBases/ArmorRating_Sharp - 22 + 30 Defs/ThingDef[@Name="GW_SM_MKIVHelmet_Base"]/statBases/ArmorRating_Blunt - 48 + 35 @@ -222,14 +245,14 @@ Defs/ThingDef[@Name="GW_SM_MKIVHelmet_Base"]/statBases/ArmorRating_Sharp - 22 + 30 Defs/ThingDef[@Name="GW_SM_MKVIHelmet_Base"]/statBases/ArmorRating_Blunt - 48 + 35 @@ -272,14 +295,14 @@ Defs/ThingDef[@Name="GW_SM_MKVIIHelmet_Base"]/statBases/ArmorRating_Sharp - 24 + 30 Defs/ThingDef[@Name="GW_SM_MKVIIHelmet_Base"]/statBases/ArmorRating_Blunt - 50 + 35 @@ -322,14 +345,14 @@ Defs/ThingDef[@Name="GW_SM_MKXHelmet_Base"]/statBases/ArmorRating_Sharp - 24 + 30 Defs/ThingDef[@Name="GW_SM_MKXHelmet_Base"]/statBases/ArmorRating_Blunt - 50 + 35 @@ -372,14 +395,14 @@ Defs/ThingDef[@Name="GW_SM_GravisHelmet_Base"]/statBases/ArmorRating_Sharp - 27 + 50 Defs/ThingDef[@Name="GW_SM_GravisHelmet_Base"]/statBases/ArmorRating_Blunt - 52 + 60 @@ -429,14 +452,14 @@ Defs/ThingDef[@Name="GW_SM_TerminatorHelmet"]/statBases/ArmorRating_Sharp - 38 + 80 Defs/ThingDef[@Name="GW_SM_TerminatorHelmet"]/statBases/ArmorRating_Blunt - 84 + 100 diff --git a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_ShoulderPads.xml b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_ShoulderPads.xml new file mode 100644 index 0000000000..d2d3cb45cc --- /dev/null +++ b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Armors_ShoulderPads.xml @@ -0,0 +1,223 @@ + + + + + + Defs/ThingDef[@Name="GW_SM_ScoutShoulderPads"]/statBases + + 5 + 2 + + + + + Defs/ThingDef[@Name="GW_SM_ScoutShoulderPads"]/statBases/ArmorRating_Sharp + + 15 + + + + + Defs/ThingDef[@Name="GW_SM_ScoutShoulderPads"]/statBases/ArmorRating_Blunt + + 25 + + + + + + + Defs/ThingDef[@Name="GW_SM_MKXReiverShoulderPads"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[@Name="GW_SM_MKXReiverShoulderPads"]/statBases/ArmorRating_Sharp + + 25 + + + + + Defs/ThingDef[@Name="GW_SM_MKXReiverShoulderPads"]/statBases/ArmorRating_Blunt + + 30 + + + + + + + Defs/ThingDef[@Name="GW_SM_MKXPhobosShoulderPads"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[@Name="GW_SM_MKXPhobosShoulderPads"]/statBases/ArmorRating_Sharp + + 25 + + + + + Defs/ThingDef[@Name="GW_SM_MKXPhobosShoulderPads"]/statBases/ArmorRating_Blunt + + 30 + + + + + + + Defs/ThingDef[@Name="GW_SM_MKIVShoulderPads"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[@Name="GW_SM_MKIVShoulderPads"]/statBases/ArmorRating_Sharp + + 30 + + + + + Defs/ThingDef[@Name="GW_SM_MKIVShoulderPads"]/statBases/ArmorRating_Blunt + + 40 + + + + + + + Defs/ThingDef[@Name="GW_SM_MKVIShoulderPads"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[@Name="GW_SM_MKVIShoulderPads"]/statBases/ArmorRating_Sharp + + 30 + + + + + Defs/ThingDef[@Name="GW_SM_MKVIShoulderPads"]/statBases/ArmorRating_Blunt + + 40 + + + + + + + + + Defs/ThingDef[@Name="GW_SM_MKVIIShoulderPads"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[@Name="GW_SM_MKVIIShoulderPads"]/statBases/ArmorRating_Sharp + + 30 + + + + + Defs/ThingDef[@Name="GW_SM_MKVIIShoulderPads"]/statBases/ArmorRating_Blunt + + 40 + + + + + + + + + Defs/ThingDef[@Name="GW_SM_MKXShoulderPads"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[@Name="GW_SM_MKXShoulderPads"]/statBases/ArmorRating_Sharp + + 30 + + + + + Defs/ThingDef[@Name="GW_SM_MKXShoulderPads"]/statBases/ArmorRating_Blunt + + 40 + + + + + + + Defs/ThingDef[@Name="GW_SM_GravisShoulderPads"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[@Name="GW_SM_GravisShoulderPads"]/statBases/ArmorRating_Sharp + + 35 + + + + + Defs/ThingDef[@Name="GW_SM_GravisShoulderPads"]/statBases/ArmorRating_Blunt + + 50 + + + + + + + Defs/ThingDef[@Name="GW_SM_TerminatorShoulderPads"]/statBases + + 15 + 5 + + + + + Defs/ThingDef[@Name="GW_SM_TerminatorShoulderPads"]/statBases/ArmorRating_Sharp + + 40 + + + + + Defs/ThingDef[@Name="GW_SM_TerminatorShoulderPads"]/statBases/ArmorRating_Blunt + + 60 + + + + \ No newline at end of file diff --git a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Melee_Weapons.xml b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Melee_Weapons.xml index effe551fe1..a131a05202 100644 --- a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Melee_Weapons.xml +++ b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Melee_Weapons.xml @@ -295,90 +295,6 @@ 0.3     - - - - - Defs/ThingDef[defName="GW_SM_Melee_FlameSword"]/tools - - -
  • - - -
  • Poke
    • - - 3 - 1.1 - 0.12 - 0.75 - Handle - -
  • - - -
  • Cut
    • - - 164 - -
  • - Flame - 16 - 0.6 -
    • -     - 1.1 - 45.7 - 8.2 - Edge - -
  • - - -
  • Stab
    • - - 178 - -
  • - Flame - 16 - 0.6 -
    • -     - 1.1 - 49.3 - 9.5 - Point - -     -     -     - - - Defs/ThingDef[defName="GW_SM_Melee_FlameSword"]/weaponTags - - Defs/ThingDef[defName="GW_SM_Melee_FlameSword"] - - - - - - - - Defs/ThingDef[defName="GW_SM_Melee_FlameSword"]/equippedStatOffsets - - 0.85 - 0.64 - 0.37 - - - - - Defs/ThingDef[defName="GW_SM_Melee_FlameSword"]/statBases - - 8.4 - 0.65 - - diff --git a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Turrets.xml b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Turrets.xml index 1ae9d88c5a..edcc6d189f 100644 --- a/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Turrets.xml +++ b/ModPatches/Grimworld Angels of Death/Patches/Grimworld Angels of Death/CE_Patch_Turrets.xml @@ -2,11 +2,18 @@ - Defs/ThingDef[defName="GW_SM_Building_HeavyBolter" or defName="GW_SM_Building_Lascannon"]/fillPercent + Defs/ThingDef[defName="GW_SM_Building_HeavyBolter"]/fillPercent 0.85 + + + Defs/ThingDef[defName="GW_SM_Building_Lascannon"]/fillPercent + + 0.75 + + @@ -218,4 +225,4 @@     -     + \ No newline at end of file diff --git a/ModPatches/Grimworld Core Imperialis/Defs/Grimworld Core Imperialis/Ammo/CE_Patch_VolkiteAmmo.xml b/ModPatches/Grimworld Core Imperialis/Defs/Grimworld Core Imperialis/Ammo/CE_Patch_VolkiteAmmo.xml index b2ee0ef860..1cac169bd0 100644 --- a/ModPatches/Grimworld Core Imperialis/Defs/Grimworld Core Imperialis/Ammo/CE_Patch_VolkiteAmmo.xml +++ b/ModPatches/Grimworld Core Imperialis/Defs/Grimworld Core Imperialis/Ammo/CE_Patch_VolkiteAmmo.xml @@ -36,10 +36,20 @@ + + + + Things/Weapons/GW_Volkite_Bolt + Graphic_Single + 2.0 + + +
  • Things/Weapons/GW_Volkite_Bolt
    • +     +     - + Bullet_Volk_Pistol - CE_Laser 16 @@ -48,9 +58,8 @@ - + Bullet_Volk_Rifle - CE_Laser 30 @@ -59,9 +68,8 @@ - + Bullet_Volk_HellGun - CE_Laser 39 @@ -70,9 +78,8 @@ - + Bullet_Volk_Cannon - BeamGraphic 2 diff --git a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Guns.xml b/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Guns.xml index 329b7e89a7..74b1c90317 100644 --- a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Guns.xml +++ b/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Guns.xml @@ -655,7 +655,7 @@ CombatExtended.Verb_ShootCE true - Bullet_Lasgun_Rifle + Bullet_Lasgun_HellGun 1.3 62 12 @@ -668,7 +668,7 @@ 120 6.5 - AmmoSet_Lasgun_Rifle + AmmoSet_Lasgun_HellGun 6 @@ -806,7 +806,7 @@ CombatExtended.Verb_ShootCE true - Bullet_45ACP_FMJ + Bullet_825mmLong_FMJ 1 55 8 @@ -819,7 +819,7 @@ 40 3.5 - AmmoSet_45ACP + AmmoSet_825mmLong 4 @@ -858,7 +858,7 @@ CombatExtended.Verb_ShootCE true - Bullet_45ACP_FMJ + Bullet_825mmLong_FMJ 0.6 25 8 @@ -871,7 +871,7 @@ 20 3.5 - AmmoSet_45ACP + AmmoSet_825mmLong 4 @@ -1208,7 +1208,7 @@ CombatExtended.Verb_ShootCE true - Bullet_Bolter75_Standard + Bullet_Bolter50_Standard 1.4 42 6 @@ -1219,7 +1219,7 @@ 12 7.8 - AmmoSet_Bolter75 + AmmoSet_Bolter50 2 diff --git a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Pistols.xml b/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Pistols.xml index 18a8b6d38f..21db415ebf 100644 --- a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Pistols.xml +++ b/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Pistols.xml @@ -121,7 +121,7 @@ Bullet_Lasgun_Pistol 0.6 12 - 3 + 6 GW_AM_Gun_Kantraeldefender GunTail_Heavy 9 @@ -133,7 +133,7 @@ AmmoSet_Lasgun_Pistol - 6 + 3 Snapshot @@ -273,7 +273,7 @@ CombatExtended.Verb_ShootCE true - Bullet_Bolter75_Standard + Bullet_Bolter50_Standard 0.6 24 4 @@ -285,7 +285,7 @@ 8 3.2 - AmmoSet_Bolter75 + AmmoSet_Bolter50 2 diff --git a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Scenarios.xml b/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Scenarios.xml deleted file mode 100644 index 32e9d2fa82..0000000000 --- a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Scenarios.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - Defs/ScenarioDef[defName="HP_AM_MilitarumCrashlanders"]/scenario/parts - -
  • - StartingThing_Defined - Ammo_10Gauge_Buck - 40 -
    • -     -     - - - Defs/ScenarioDef[defName="HP_AM_MilitarumCrashlanders"]/scenario/parts - -
  • - StartingThing_Defined - Ammo_45ACP_FMJ - 240 -
    • -     -     - - - Defs/ScenarioDef[defName="HP_AM_MilitarumCrashlanders"]/scenario/parts - -
  • - StartingThing_Defined - Ammo_LasgunPowerPack - 120 -
    • -     -     - -     \ No newline at end of file diff --git a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Turrets.xml b/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Turrets.xml index bcf71fdb3e..bea07041a1 100644 --- a/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Turrets.xml +++ b/ModPatches/Grimworld Hammer of the Imperium/Patches/Grimworld Hammer of the Imperium/CE_Patch_Turrets.xml @@ -7,13 +7,18 @@ Defs/ThingDef[ defName="GW_Building_HeavyBolter" or defName="GW_Building_Autocannon" or - defName="GW_Building_Lascannon" or - defName="GW_Building_TarantulaHeavyBolter" or - defName="GW_Building_TarantulaLascannon"]/fillPercent + defName="GW_Building_TarantulaHeavyBolter"]/fillPercent 0.85 + + + Defs/ThingDef[defName="GW_Building_Lascannon" or defName="GW_Building_TarantulaLascannon"]/fillPercent + + 0.75 + + @@ -519,4 +524,5 @@     - + + \ No newline at end of file diff --git a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LandRaider_Upgrades.xml b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LandRaider_Upgrades.xml new file mode 100644 index 0000000000..09c4f3a528 --- /dev/null +++ b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LandRaider_Upgrades.xml @@ -0,0 +1,170 @@ + + + + + + + Defs/Vehicles.UpgradeTreeDef[defName="GW_Landraider_UpgradeTree"]/nodes/li[key="RedeemerUpgrade"]/upgrades/li[@Class="Vehicles.StatUpgrade"]/stats + + +
  • + ArmorRating_Blunt + 8 +
    • +
  • + ArmorRating_Sharp + 4 +
    • +     +     +     + + + Defs/Vehicles.UpgradeTreeDef[defName="GW_Landraider_UpgradeTree"]/nodes/li[key="CrusaderUpgrade"]/upgrades/li[@Class="Vehicles.StatUpgrade"]/stats + + +
  • + ArmorRating_Blunt + 8 +
    • +
  • + ArmorRating_Sharp + 4 +
    • +     +     +     + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_RedeemerLandRaiderAC_MainTurret"]/projectile + + Bullet_20x102mmNATO_AP + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_RedeemerLandRaiderAC_MainTurret"]/reloadTimer + + 7.8 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_RedeemerLandRaiderAC_MainTurret"]/warmUpTimer + + 2.3 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_RedeemerLandRaiderAC_MainTurret"]/chargePerAmmoCount + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_RedeemerLandRaiderAC_MainTurret"]/genericAmmo + + false + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_RedeemerLandRaiderAC_MainTurret"]/maxRange + + 72 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_RedeemerLandRaiderAC_MainTurret"]/ammunition/thingDefs + + +
  • Ammo_20x102mmNATO_AP
    • +
  • Ammo_20x102mmNATO_Incendiary
    • +
  • Ammo_20x102mmNATO_HE
    • +
  • Ammo_20x102mmNATO_Sabot
    • +     +     +     + + + Defs/Vehicles.VehicleTurretDef[defName="GW_RedeemerLandRaiderAC_MainTurret"] + +
  • + AmmoSet_20x102mmNATO + 1.5 + 182 + 1.0 + 0.01 +
    • +     +     + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LandRaider_Sidebolter"]/projectile + + Bullet_Bolter998_Standard + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LandRaider_Sidebolter"]/reloadTimer + + 7.8 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LandRaider_Sidebolter"]/warmUpTimer + + 2.3 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LandRaider_Sidebolter"]/chargePerAmmoCount + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LandRaider_Sidebolter"]/genericAmmo + + false + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LandRaider_Sidebolter"]/maxRange + + 62 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LandRaider_Sidebolter"]/ammunition/thingDefs + + +
  • Ammo_Bolter998_Standard
    • +
  • Ammo_Bolter998_MetalStorm
    • +
  • Ammo_Bolter998_Kraken
    • +
  • Ammo_Bolter998_Inferno
    • +     +     +     + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LandRaider_Sidebolter"] + +
  • + AmmoSet_Bolter998 + 1.5 + 229 + 1.0 + 0.01 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Executioner.xml b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Executioner.xml deleted file mode 100644 index 01a288f9b1..0000000000 --- a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Executioner.xml +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/magazineCapacity - - 800 - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/genericAmmo - - false - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/projectile - - Bullet_Laser_PlasmaDestroyer - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/maxRange - - 75 - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/ammunition/thingDefs - - -
  • Ammo_PlasmaCanister
    • -     -     -     - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/chargePerAmmoCount - - 50 - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"] - -
  • - AmmoSet_PlasmaCanister_Destroyer - 1 - 0.73 - 0.01 -
    • -     -     - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/statBases/ArmorRating_Blunt - - 44 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/statBases/ArmorRating_Sharp - - 22 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/vehicleStats/CargoCapacity - - 1250 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="FrontArmorPlating"]/health - - 1250 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt - - 68 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp - - 34 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="LeftArmorPlating"]/health - - 850 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt - - 40 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp - - 20 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="RightArmorPlating"]/health - - 850 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt - - 40 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp - - 20 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="BackArmorPlating"]/health - - 750 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Blunt - - 40 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Sharp - - 20 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="Roof"]/health - - 650 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="Roof"]/armor/ArmorRating_Blunt - - 36 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussExecutioner"]/components/li[key="Roof"]/armor/ArmorRating_Sharp - - 18 - - - -     \ No newline at end of file diff --git a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Punisher.xml b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Punisher.xml deleted file mode 100644 index d135321d68..0000000000 --- a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Punisher.xml +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/projectile - - Bullet_20x102mmNATO_AP - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/reloadTimer - - 7.2 - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/warmUpTimer - - 2.8 - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/genericAmmo - - false - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/maxRange - - 66 - - - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/ammunition/thingDefs - - -
  • Ammo_20x102mmNATO_AP
    • -
  • Ammo_20x102mmNATO_Incendiary
    • -
  • Ammo_20x102mmNATO_HE
    • -
  • Ammo_20x102mmNATO_Sabot
    • -     -     -     - - - Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"] - -
  • - AmmoSet_20x102mmNATO - 2 - 96 - 1.0 - 0.05 -
    • -     -     - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/statBases/ArmorRating_Blunt - - 44 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/statBases/ArmorRating_Sharp - - 22 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/vehicleStats/CargoCapacity - - 1250 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="FrontArmorPlating"]/health - - 1250 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Blunt - - 68 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="FrontArmorPlating"]/armor/ArmorRating_Sharp - - 34 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="LeftArmorPlating"]/health - - 850 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Blunt - - 40 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="LeftArmorPlating"]/armor/ArmorRating_Sharp - - 20 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="RightArmorPlating"]/health - - 850 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Blunt - - 40 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="RightArmorPlating"]/armor/ArmorRating_Sharp - - 20 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="BackArmorPlating"]/health - - 750 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Blunt - - 40 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="BackArmorPlating"]/armor/ArmorRating_Sharp - - 20 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="Roof"]/health - - 650 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="Roof"]/armor/ArmorRating_Blunt - - 36 - - - - - Defs/Vehicles.VehicleDef[defName="GW_LemanRussPunisher"]/components/li[key="Roof"]/armor/ArmorRating_Sharp - - 18 - - - -     \ No newline at end of file diff --git a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Upgrades.xml b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Upgrades.xml new file mode 100644 index 0000000000..92d692b45d --- /dev/null +++ b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_LemanRuss_Upgrades.xml @@ -0,0 +1,123 @@ + + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/projectile + + Bullet_20x102mmNATO_AP + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/reloadTimer + + 7.2 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/warmUpTimer + + 2.8 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/genericAmmo + + false + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/maxRange + + 66 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"]/ammunition/thingDefs + + +
  • Ammo_20x102mmNATO_AP
    • +
  • Ammo_20x102mmNATO_Incendiary
    • +
  • Ammo_20x102mmNATO_HE
    • +
  • Ammo_20x102mmNATO_Sabot
    • +     +     +     + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussPunisher_MainTurret"] + +
  • + AmmoSet_20x102mmNATO + 2 + 96 + 1.0 + 0.05 +
    • +     +     + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/magazineCapacity + + 800 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/genericAmmo + + false + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/projectile + + Bullet_Laser_PlasmaDestroyer + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/maxRange + + 75 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/ammunition/thingDefs + + +
  • Ammo_PlasmaCanister
    • +     +     +     + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"]/chargePerAmmoCount + + 50 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_LemanRussExecutioner_MainTurret"] + +
  • + AmmoSet_PlasmaCanister_Destroyer + 1 + 0.73 + 0.01 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_Predator_Upgrades.xml b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_Predator_Upgrades.xml new file mode 100644 index 0000000000..28eee9749a --- /dev/null +++ b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/40K_Vehicles_Predator_Upgrades.xml @@ -0,0 +1,196 @@ + + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_BaalPredator_MainTurret"]/projectile + + Bullet_20x102mmNATO_AP + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_BaalPredator_MainTurret"]/reloadTimer + + 7.2 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_BaalPredator_MainTurret"]/warmUpTimer + + 2.8 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_BaalPredator_MainTurret"]/genericAmmo + + false + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_BaalPredator_MainTurret"]/maxRange + + 66 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_BaalPredator_MainTurret"]/ammunition/thingDefs + + +
  • Ammo_20x102mmNATO_AP
    • +
  • Ammo_20x102mmNATO_Incendiary
    • +
  • Ammo_20x102mmNATO_HE
    • +
  • Ammo_20x102mmNATO_Sabot
    • +     +     +     + + + Defs/Vehicles.VehicleTurretDef[defName="GW_BaalPredator_MainTurret"] + +
  • + AmmoSet_20x102mmNATO + 2 + 96 + 1.0 + 0.05 +
    • +     +     + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorAnihilator_MainTurret"]/magazineCapacity + + 600 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorAnihilator_MainTurret"]/genericAmmo + + false + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorAnihilator_MainTurret"]/projectile + + Bullet_Lasgun_Cannon + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorAnihilator_MainTurret"]/fireModes + + +
  • + 2 + 2 + 100 + + UI/Gizmos/FireRate_Single +
    • +     +     +     + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorAnihilator_MainTurret"]/maxRange + + 75 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorAnihilator_MainTurret"]/ammunition/thingDefs + + +
  • Ammo_LasgunPowerPack
    • +     +     +     + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorAnihilator_MainTurret"]/chargePerAmmoCount + + 5 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorAnihilator_MainTurret"] + +
  • + AmmoSet_Lasgun_Cannon + 2 + 1.0 + 0.01 +
    • +     +     + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorExecutioner_MainTurret"]/magazineCapacity + + 800 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorExecutioner_MainTurret"]/genericAmmo + + false + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorExecutioner_MainTurret"]/projectile + + Bullet_Laser_PlasmaDestroyer + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorExecutioner_MainTurret"]/maxRange + + 75 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorExecutioner_MainTurret"]/ammunition/thingDefs + + +
  • Ammo_PlasmaCanister
    • +     +     +     + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorExecutioner_MainTurret"]/chargePerAmmoCount + + 50 + + + + + Defs/Vehicles.VehicleTurretDef[defName="GW_PredatorExecutioner_MainTurret"] + +
  • + AmmoSet_PlasmaCanister_Destroyer + 1 + 0.73 + 0.01 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/Remove_NonCE_Ammo_Patch.xml b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/Remove_NonCE_Ammo_Patch.xml index d459554266..a24eddc529 100644 --- a/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/Remove_NonCE_Ammo_Patch.xml +++ b/ModPatches/Grimworld Imperial Vehicles/Patches/Grimworld Imperial Vehicles/Remove_NonCE_Ammo_Patch.xml @@ -2,14 +2,14 @@ - Defs/ThingDef[defName="GW_HeavyBolterNonCE" or - defName="GW_AutocannonammoNonCE" or - defName="GW_BattleCannonShellNonCE" or - defName="GW_LascannonammoNonCE" or - defName="GW_HeavyPlasmaNonCE" or - defName="GW_BanePrimaryCannonShellNonCE" or - defName="GW_BaneDemolisherCannonShellNonCE"] - + Defs/ThingDef[defName="GW_HeavyBolterNonCE" or + defName="GW_AutocannonammoNonCE" or + defName="GW_BattleCannonShellNonCE" or + defName="GW_LascannonammoNonCE" or + defName="GW_HeavyPlasmaNonCE" or + defName="GW_BanePrimaryCannonShellNonCE" or + defName="GW_BaneDemolisherCannonShellNonCE"] + \ No newline at end of file diff --git a/ModPatches/Heyra the Horned/Patches/Heyra the Horned/Bodydef/Heyra_Bodytype.xml b/ModPatches/Heyra the Horned/Patches/Heyra the Horned/Bodydef/Heyra_Bodytype.xml index cfd1dd135c..d15b00be0b 100644 --- a/ModPatches/Heyra the Horned/Patches/Heyra the Horned/Bodydef/Heyra_Bodytype.xml +++ b/ModPatches/Heyra the Horned/Patches/Heyra the Horned/Bodydef/Heyra_Bodytype.xml @@ -50,7 +50,6 @@ def="Foot" or def="Toe"]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/Hyena (Continued)/Patches/Hyena (Continued)/ThingDefs_Races.xml b/ModPatches/Hyena (Continued)/Patches/Hyena (Continued)/ThingDefs_Races.xml new file mode 100644 index 0000000000..bebbe17265 --- /dev/null +++ b/ModPatches/Hyena (Continued)/Patches/Hyena (Continued)/ThingDefs_Races.xml @@ -0,0 +1,75 @@ + + + + + + + Defs/ThingDef[defName="SpottedHyena" or defName="StripedHyena"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="SpottedHyena" or defName="StripedHyena"]/statBases + + 0.21 + 0.11 + 0.07 + + + + + Defs/ThingDef[defName="SpottedHyena" or defName="StripedHyena"]/tools + + +
  • + + +
  • Scratch
    • + + 4 + 1 + FrontLeftPaw + 0.06 + 0.22 + +
  • + + +
  • Scratch
    • + + 4 + 1 + FrontRightPaw + 0.06 + 0.22 + +
  • + + +
  • Bite
    • + + 13 + 2 + Teeth + 1.66 + 2.35 + +
  • + + +
  • Blunt
    • + + 1 + 1.5 + HeadAttackTool + 0.13 + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Ion Weaponry/Defs/Ion Weaponry/Ammo.xml b/ModPatches/Ion Weaponry/Defs/Ion Weaponry/Ammo.xml new file mode 100644 index 0000000000..ca5d5810a1 --- /dev/null +++ b/ModPatches/Ion Weaponry/Defs/Ion Weaponry/Ammo.xml @@ -0,0 +1,413 @@ + + + + + AmmoRailgun_Ion + + AmmoAdvanced + UI/Icons/ThingCategories/CaliberRailgunPistol + + + + + + AmmoSet_4mmRailgunIon + + + Bullet_4mmRailgun_Ion + + + + + AmmoSet_6mmRailgunIon + + + Bullet_6mmRailgun_Ion + + + + + AmmoSet_8mmRailgunIon + + + Bullet_8mmRailgun_Ion + + + + + AmmoSet_12mmRailgunIon_Lance + + + Bullet_12mmRailgun_Ion_Lance + + + + + + + AmmoSet_12mmRailgunIon_Blast + + + Bullet_12mmRailgun_Ion_Blast + + + + + + + Fin-stabilized tungsten carbide penetrator with discarding sabot, designed for railgun rifles. Features an ionized particle payload. + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_FabricationBench
    • +     + + CombatExtended.Graphic_StackCountRanged + + +
  • AmmoRailgun_Ion
    • +     + Ionized +     + + + Ammo_4mmRailgun_Ion + + + 0.006 + 0.008 + 0.06 + + + ThirdParty/VanillaXCOM/Railgun/EMP/Pistol + + + + + Ammo_6mmRailgun_Ion + + + 0.008 + 0.008 + 0.08 + + + ThirdParty/VanillaXCOM/Railgun/EMP/Rifle + + + + + Ammo_8mmRailgun_Ion + + + 0.01 + 0.01 + 0.10 + + + ThirdParty/VanillaXCOM/Railgun/EMP/Rifle + + + + + Ammo_12mmRailgun_Ion + + + 0.012 + 0.01 + 0.12 + + + ThirdParty/VanillaXCOM/Railgun/EMP/HighCaliber + + + + + + + + Projectile/IW_IonBullet + Graphic_Single + TransparentPostLight + + + Bullet + false + + + + + Bullet_4mmRailgun_Ion + + + 0.6 + + + 10 + 8.4 + 88.73 + 250 + +
  • + IW_IonBullet + 10 +
    • +     +     +     + + + Bullet_6mmRailgun_Ion + + + 1.1 + + + 5.5 + 22 + 126.36 + 300 + +
  • + IW_IonBullet + 14 +
    • +     +     +     + + + Bullet_8mmRailgun_Ion + + + 6 + 37.5 + 145.4 + 360 + +
  • + IW_IonBullet + 20 +
    • +     +     +     + + + Bullet_12mmRailgun_Ion_Lance + + + 1.3 + + + 10 + 55 + 252.720 + 380 + +
  • + IW_IonBullet + 20 +
    • +     +     +     + + + Bullet_12mmRailgun_Ion_Blast + CombatExtended.ProjectileCE_Explosive + + + false + EMP + 40 + 4.9 + 120 + +
  • + IW_IonBullet + 20 +
    • +     + true +     +     + + + + + MakeAmmo_4mmRailgun_Ion + + Craft 500 4mm Railgun (Discharge) cartridges. + Making 4mm Railgun (Discharge) cartridges. + 3000 + +
  • + + +
  • Steel
    • + + + 1 + +
  • + + +
  • Uranium
    • + + + 2 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + +     + + +
  • Steel
    • +
  • Uranium
    • +
  • ComponentIndustrial
    • +     +     + + 500 + +     + + + MakeAmmo_6mmRailgun_Ion + + Craft 500 6mm Railgun (Discharge) cartridges. + Making 6mm Railgun (Discharge) cartridges. + 3000 + +
  • + + +
  • Steel
    • + + + 2 + +
  • + + +
  • Uranium
    • + + + 4 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • ComponentIndustrial
    • +
  • Steel
    • +
  • Uranium
    • +     +     + + 500 + +     + + + MakeAmmo_8mmRailgun_Ion + + Craft 200 8mm Railgun (Discharge) cartridges. + Making 8mm Railgun (Discharge) cartridges. + 3000 + +
  • + + +
  • Steel
    • + + + 2 + +
  • + + +
  • Uranium
    • + + + 4 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • ComponentIndustrial
    • +
  • Steel
    • +
  • Uranium
    • +     +     + + 200 + +     + + + MakeAmmo_12mmRailgun_Ion + + Craft 100 12mm Railgun (Discharge) cartridges. + Making 12mm Railgun (Discharge) cartridges. + 3500 + +
  • + + +
  • Steel
    • + + + 2 + +
  • + + +
  • Uranium
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • ComponentIndustrial
    • +
  • Steel
    • +
  • Uranium
    • +     +     + + 100 + +     + +     \ No newline at end of file diff --git a/ModPatches/Ion Weaponry/Patches/Ion Weaponry/Damages.xml b/ModPatches/Ion Weaponry/Patches/Ion Weaponry/Damages.xml new file mode 100644 index 0000000000..c0a6f803c9 --- /dev/null +++ b/ModPatches/Ion Weaponry/Patches/Ion Weaponry/Damages.xml @@ -0,0 +1,30 @@ + + + + + Defs/DamageDef[defName="IW_IonBullet"] + +
  • + true +
    • +     +     + + + Defs/DamageDef[defName="IW_IonBullet"] + + + Electric + 0.50 + Damage_EMP + + + + + Defs/HediffDef[defName="IW_Ionization"]/comps/li[@Class="AthenaFramework.HediffCompProperties_Bomb"]/damageAmount + + 30 + + + +     \ No newline at end of file diff --git a/ModPatches/Ion Weaponry/Patches/Ion Weaponry/RangedSpacer.xml b/ModPatches/Ion Weaponry/Patches/Ion Weaponry/RangedSpacer.xml new file mode 100644 index 0000000000..4d40f5f464 --- /dev/null +++ b/ModPatches/Ion Weaponry/Patches/Ion Weaponry/RangedSpacer.xml @@ -0,0 +1,423 @@ + + + + + + + + Defs/ThingDef[defName ="IW_Gun_IonPistol" or defName ="IW_Gun_IonPDW"]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.54 + 1.5 + 0.555 + Grip + +
  • + + +
  • Poke
    • + + 2 + 1.54 + 0.555 + Muzzle + +     +     +     + + + Defs/ThingDef[ + defName = "IW_Gun_IonRifle" or + defName = "IW_Gun_IonSlugthrower" or + defName = "IW_Gun_IonDMR"]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + +     +     +     + + + Defs/ThingDef[defName="IW_Gun_IonLMG" or defName="IW_Gun_HeavyIonLance"]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + +     +     +     + + + Defs/ThingDef[defName="IW_Gun_HeavyIonLance"]/equippedStatOffsets/MoveSpeed + + + + + IW_Gun_IonPistol + + 1.20 + 2.25 + 0.90 + 0.17 + 0.8 + 0.51 + + + 1.2 + CombatExtended.Verb_ShootCE + True + Bullet_4mmRailgun_Ion + 0.6 + 20 + IW_Shot_IonPistol + GunTail_Light + 9 + + + 10 + 4 + AmmoSet_4mmRailgunIon + + + AimedShot + + +
  • SpacerGun
    • +
  • CE_OneHandedWeapon
    • +     +     + + + + IW_Gun_IonPDW + + 3 + 4 + 1.2 + 0.2 + 0.8 + 0.51 + + + 1.40 + CombatExtended.Verb_ShootCE + True + Bullet_4mmRailgun_Ion + 0.6 + 5 + 6 + 15 + IW_Shot_IonPDW + GunTail_Light + 9 + + + 30 + 4 + AmmoSet_4mmRailgunIon + + + 3 + Snapshot + + +
  • SpacerGun
    • +
  • CE_OneHandedWeapon
    • +     +     + + + + IW_Gun_IonRifle + + 5 + 8 + 1.25 + 0.07 + 1.10 + 0.38 + + + 1.3 + CombatExtended.Verb_ShootCE + True + Bullet_6mmRailgun_Ion + 1.1 + 50 + 5 + 5 + IW_Shot_IonRifle + GunTail_Medium + 9 + + + 40 + 4 + AmmoSet_6mmRailgunIon + + + AimedShot + True + 3 + + +
  • SpacerGun
    • +
  • CE_AI_Rifle
    • +     +     + + + + IW_Gun_IonDMR + + 6 + 9.15 + 1.20 + 0.03 + 2.0 + 0.82 + 0.6 + + + 1.4 + CombatExtended.Verb_ShootCE + True + Bullet_8mmRailgun_Ion + 1.5 + 86 + IW_Shot_IonRifle + GunTail_Medium + 9 + + + 5 + 3 + AmmoSet_8mmRailgunIon + + + AimedShot + + +
  • SpacerGun
    • +
  • CE_AI_SR
    • +
  • Bipod_DMR
    • +     +     + + + + IW_Gun_IonSlugthrower + + 5 + 12 + 1.50 + 0.07 + 1.0 + 0.98 + + + 1.3 + CombatExtended.Verb_ShootCE + True + Bullet_8mmRailgun_Ion + 0.6 + 40 + IW_Shot_IonRifle + GunTail_Medium + 9 + + + 8 + 0.8 + true + AmmoSet_8mmRailgunIon + + + AimedShot + + +
  • SpacerGun
    • +     +     + + + + IW_Gun_IonLMG + + 40 + 20 + 2.64 + 0.06 + 1 + 1.2 + + + 1.05 + CombatExtended.Verb_ShootCE + True + Bullet_8mmRailgun_Ion + 1.8 + 60 + IW_Shot_IonLMG + GunTail_Heavy + 18 + 20 + 5 + Regular + + + 200 + 8 + AmmoSet_8mmRailgunIon + + + Snapshot + 10 + + +
  • SpacerGun
    • +
  • CE_AI_LMG
    • +     +     + + + Defs/ThingDef[defName = "IW_Gun_IonLMG"] + +
  • + 1.20,1.20 + 0.2,-0.1 +
    • +     +     + + + + IW_Gun_HeavyIonLance + + 40 + 20 + 2 + 0.1 + 2 + 1.2 + + + 1.5 + CombatExtended.Verb_ShootCE + True + Bullet_12mmRailgun_Ion_Lance + 1.8 + 70 + IW_Shot_HeavyIonLance + GunTail_Heavy + 18 + Regular + + + 10 + 8 + AmmoSet_12mmRailgunIon_Lance + + + AimedShot + + +
  • SpacerGun
    • +
  • Bipod_ATR
    • +     +     + + + Defs/ThingDef[defName="IW_Gun_HeavyIonLance"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"] + +
  • + switch to Lance + switch to Ion Blast + True + + 10 + 8 + AmmoSet_12mmRailgunIon_Blast + + + 0.35 + CombatExtended.Verb_ShootCE + true + Bullet_12mmRailgun_Ion_Blast + 5 + 5 + 1.1 + 70 + IW_Shot_IonBlast + 18 + + true + + + + AimedShot + +
    • +
  • + CompEquippable +
    • +     +     + + + Defs/ThingDef[defName = "IW_Gun_HeavyIonLance"] + +
  • + 1.30,1.30 + 0.1,-0.15 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml index 07b0e9f5a7..3628f6c0c9 100644 --- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel.xml @@ -4,8 +4,8 @@ Defs/ThingDef[ - @Name="K4GThawb" or - @Name="K4GKimono" + @Name="K4GThawb" or + @Name="K4GKimono" ]/statBases/StuffEffectMultiplierArmor 1.5 @@ -14,14 +14,31 @@ + + + Defs/ThingDef[defName="K4G_Apparel_TatteredRags"]/statBases/StuffEffectMultiplierArmor + + 0.5 + 0 + + + Defs/ThingDef[ - @Name="K4GTurban" or - @Name="K4GHeadScarf" or - defName="K4G_Apparel_TricornHat" or - defName="K4G_Apparel_ConeHat" or - defName="K4G_Apparel_HoodedMask" + @Name="K4GTurban" or + @Name="K4GHeadScarf" or + @Name="K4GUshanka" or + defName="K4G_Apparel_TricornHat" or + defName="K4G_Apparel_ConeHat" or + defName="K4G_Apparel_HoodedMask" or + defName="K4G_Apparel_Fedora" or + defName="K4G_Apparel_Flatcap" or + defName="K4G_Apparel_WinterHood" or + defName="K4G_Apparel_Balaclava" or + defName="K4G_Apparel_PatrolCap" or + defName="K4G_Apparel_BaseballCap" or + defName="K4G_Apparel_SheriffHat" ]/statBases/StuffEffectMultiplierArmor 2 @@ -50,9 +67,9 @@ Defs/ThingDef[ - defName="K4G_Apparel_AdvancedOutlanderHelmet" or - defName="K4G_Apparel_GoggledHelmet" or - defName="K4G_Apparel_LegionaryHelmet" + @Name="LegionaryHelmet" or + defName="K4G_Apparel_AdvancedOutlanderHelmet" or + defName="K4G_Apparel_GoggledHelmet" ]/statBases/StuffEffectMultiplierArmor 8 @@ -63,15 +80,61 @@ Defs/ThingDef[ - defName="K4G_Apparel_AdvancedOutlanderHelmet" or - defName="K4G_Apparel_GoggledHelmet" or - defName="K4G_Apparel_LegionaryHelmet" + @Name="LegionaryHelmet" or + defName="K4G_Apparel_AdvancedOutlanderHelmet" or + defName="K4G_Apparel_GoggledHelmet" ]/stuffCategories/li[.="Metallic"]
  • Steeled
    •      + + + Defs/ThingDef[defName="K4G_Apparel_RiotHelmet"]/statBases/StuffEffectMultiplierArmor + + 6 + 5 + 2.5 + + + + + Defs/ThingDef[defName="K4G_Apparel_RiotHelmet"] + +
  • + +
  • + 0.50 + +
  • Eye
    • +
  • Nose
    • +
  • Jaw
    • + + +
  • + 0.50 + +
  • Eye
    • +
  • Nose
    • +
  • Jaw
    • + + + + +     +     + + + + Defs/ThingDef[defName="K4G_Apparel_WorkmanHelmet" or defName="K4G_Apparel_MiningHelmet"]/statBases/StuffEffectMultiplierArmor + + 1.2 + 2 + 1 + + + Defs/ThingDef[defName="K4G_Apparel_FlakMask"]/statBases/ArmorRating_Sharp @@ -104,10 +167,25 @@     - + + + Defs/ThingDef[defName="K4G_Apparel_ServiceParka"]/statBases/StuffEffectMultiplierArmor + + 4 + + + + + Defs/ThingDef[defName="K4G_Apparel_ServiceParka"]/statBases + + 10 + 5 + + + - Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/ArmorRating_Sharp + Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/ArmorRating_Sharp 6 5 @@ -116,7 +194,7 @@ - Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/ArmorRating_Blunt + Defs/ThingDef[defName="K4G_Apparel_AdvancedFlakVest"]/statBases/ArmorRating_Blunt 8 @@ -154,9 +232,8 @@ - - Defs/ThingDef[defName="K4G_Apparel_Goggles"]/statBases/StuffEffectMultiplierArmor + Defs/ThingDef[defName="K4G_Apparel_Goggles" or defName="K4G_Apparel_SnowGoggles"]/statBases/StuffEffectMultiplierArmor 0.5 0.5 @@ -174,4 +251,51 @@ + + + Defs/ThingDef[defName="K4G_Apparel_MilitaryMedal" or @Name="Eyepatch"]/statBases + + 0.15 + 0 + + + + + + Defs/ThingDef[defName="K4G_Apparel_Scarf"]/statBases/StuffEffectMultiplierArmor + + 1 + 0 + 2 + + + + + + Defs/ThingDef[defName="K4G_Apparel_WeldingMask"]/statBases/StuffEffectMultiplierArmor + + 1 + 1 + 2 + + + + + + + Defs/ThingDef[defName="K4G_Apparel_BeerHelmet"]/statBases/ArmorRating_Sharp + + 4 + 4 + 1.5 + + + + + Defs/ThingDef[defName="K4G_Apparel_FlakMask"]/statBases/ArmorRating_Blunt + + 6 + + + \ No newline at end of file diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel_Royalty.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel_Royalty.xml index afee66c76e..073ecb02c3 100644 --- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel_Royalty.xml +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/Apparel_Royalty.xml @@ -9,7 +9,6 @@ -
  • Defs/ThingDef[defName="K4G_Apparel_DynastyCrown"]/statBases/StuffEffectMultiplierArmor @@ -17,6 +16,68 @@
    • + +
  • + Defs/ThingDef[defName="K4G_Apparel_GarrisonCap" or defName="K4G_Apparel_PeakedCap"]/statBases/StuffEffectMultiplierArmor + + 2 + 1 + 0 + +
    • + + +
  • + Defs/ThingDef[defName="K4G_Apparel_PrestigeAdvancedFlakVest"]/statBases + + 5 + 3.5 + +
    • + +
  • + Defs/ThingDef[defName="K4G_Apparel_PrestigeAdvancedFlakVest"] + +
  • + +
  • + 0.60 + +
  • Neck
    • +
  • Shoulder
    • + + +
  • + 0.60 + +
  • Neck
    • +
  • Shoulder
    • + + + + +     + + + +
  • + Defs/ThingDef[defName="K4G_Apparel_MilitaryUniform"]/statBases/StuffEffectMultiplierArmor + + 5 + 1 + 6 + +
    • + + +
  • + Defs/ThingDef[defName="K4G_Apparel_Monocle"]/statBases + + 0.15 + 0 + +
    • +     diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml deleted file mode 100644 index f366528813..0000000000 --- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee.xml +++ /dev/null @@ -1,382 +0,0 @@ - - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/statBases - - 3.5 - 0.35 - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"] - - - 0.2 - 0.35 - 0.2 - - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/weaponTags - -
  • CE_OneHandedWeapon
    • -     -     - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/tools - - -
  • - - -
  • Poke
    • - - 2 - 1.44 - 0.425 - Handle - -
  • - - -
  • Stab
    • - - 27 - 1.44 - 0.425 - 0.48 - Point - -
  • - - -
  • Cut
    • - - 20 - 1.34 - 1.33 - 0.956 - 0.43 - Edge - -     -     -     - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"]/tools - - -
  • - - -
  • Poke
    • - - 2 - 1.42 - 0.15 - 0.4 - Handle - -
  • - - -
  • Stab
    • - - 13 - 1.42 - 1 - 1.34 - 0.4 - Point - -
  • - - -
  • Cut
    • - - 28 - 0.88 - 1 - 1.3 - 1.936 - Head - -     -     -     - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"]/statBases - - 8 - 1.27 - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"] - - - 0.95 - 0.54 - 0.33 - - - - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"]/tools - - -
  • - - -
  • Poke
    • - - 4 - 1.83 - 0.15 - 1.1 - Handle - -
  • - - -
  • Stab
    • - - 30 - 1.89 - 1 - 0.84 - 1.25 - Point - -
  • - - -
  • Cut
    • - - 44 - 1.75 - 1 - 0.3 - 4.05 - Head - -     -     -     - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"]/statBases - - 11 - 0.35 - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"] - - - 0.50 - 0.4 - 0.27 - - - - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"]/tools - - -
  • - - -
  • Poke
    • - - 2 - 1.54 - 0.55 - 0.15 - Handle - -
  • - - -
  • Stab
    • - - 23 - 1.54 - 0.55 - 0.31 - Point - -
  • - - -
  • Cut
    • - - 28 - 1.25 - 1.782 - 0.8 - Edge - -     -     -     - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"]/statBases - - 4 - 0.38 - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"] - - - 0.24 - 0.38 - 0.28 - - - - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"]/tools - - -
  • - - -
  • Blunt
    • - - 6 - 1.16 - 2.025 - Shaft - -
  • - - -
  • Cut
    • - - 47 - 1.74 - 1.165 - 8.1 - 1.62 - Edge - -
  • - - -
  • Stab
    • - - 40 - 1.16 - 1.165 - 2.025 - 2.03 - Point - -     -     -     - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"]/statBases - - 10 - 0.89 - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"] - - - 0.22 - 1.33 - 0.57 - - - - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/statBases - - 2.75 - 0.9 - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"] - - - 0.17 - 0.9 - 0.3 - - - - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/weaponTags - -
  • CE_Sidearm_Melee
    • -
  • CE_OneHandedWeapon
    • -     -     - - - Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/tools - - -
  • - - -
  • Poke
    • - - 2 - 0.33 - 1.59 - 0.625 - Handle - -
  • - - -
  • Blunt
    • - - 9 - 1.68 - 3.375 - Head - -     -     -     -     \ No newline at end of file diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_NonStuffable.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_NonStuffable.xml new file mode 100644 index 0000000000..d64e042a9a --- /dev/null +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_NonStuffable.xml @@ -0,0 +1,156 @@ + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_ShockProd"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.59 + 0.625 + Handle + +
  • + + +
  • Poke
    • + + 5 + +
  • + Flame + 1 + 0.2 +
    • +
  • + Stun + 1 +
    • +
  • + EMP + 1 + 0.4 +
    • +     + 1.68 + 1.33 + 3.375 + Head + +     +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_ShockProd"]/statBases + + 0.9 + 5 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_ShockProd"] + + + 0.17 + 0.9 + 0.3 + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_ShockProd"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_ShatteredBottle"]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.8 + 0.430 + +
  • + + +
  • Cut
    • + + 3 + 1.8 + 0.175 + 0.255 + +     +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_ShatteredBottle"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Blowtorch"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.59 + 0.625 + +
  • + + false + +
  • Blunt
    • +
  • Poke
    • + + 8 + 2.02 + +
  • + Flame + 1 + 1 +
    • +     + 1.630 + +     +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Blowtorch"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + +     \ No newline at end of file diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_Stuffable.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_Stuffable.xml new file mode 100644 index 0000000000..639a578fce --- /dev/null +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsMelee_Stuffable.xml @@ -0,0 +1,805 @@ + + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/statBases + + 3.5 + 0.35 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"] + + + 0.2 + 0.35 + 0.2 + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Sabre"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.44 + 0.425 + Handle + +
  • + + +
  • Stab
    • + + 27 + 1.44 + 0.425 + 0.48 + Point + +
  • + + +
  • Cut
    • + + 20 + 1.34 + 1.33 + 0.956 + 0.43 + Edge + +     +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.42 + 0.15 + 0.4 + Handle + +
  • + + +
  • Stab
    • + + 13 + 1.42 + 1 + 1.34 + 0.4 + Point + +
  • + + +
  • Cut
    • + + 28 + 0.88 + 1 + 1.3 + 1.936 + Head + +     +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"]/statBases + + 8 + 1.27 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Katana"] + + + 0.95 + 0.54 + 0.33 + + + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"]/tools + + +
  • + + +
  • Poke
    • + + 4 + 1.83 + 0.15 + 1.1 + Handle + +
  • + + +
  • Stab
    • + + 30 + 1.89 + 1 + 0.84 + 1.25 + Point + +
  • + + +
  • Cut
    • + + 44 + 1.75 + 1 + 0.3 + 4.05 + Head + +     +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"]/statBases + + 11 + 0.35 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Cleaver"] + + + 0.50 + 0.4 + 0.27 + + + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.54 + 0.55 + 0.15 + Handle + +
  • + + +
  • Stab
    • + + 23 + 1.54 + 0.55 + 0.31 + Point + +
  • + + +
  • Cut
    • + + 28 + 1.25 + 1.782 + 0.8 + Edge + +     +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"]/statBases + + 4 + 0.38 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Scimitar"] + + + 0.24 + 0.38 + 0.28 + + + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"]/tools + + +
  • + + +
  • Blunt
    • + + 6 + 1.16 + 2.025 + Shaft + +
  • + + +
  • Cut
    • + + 47 + 1.74 + 1.165 + 8.1 + 1.62 + Edge + +
  • + + +
  • Stab
    • + + 40 + 1.16 + 1.165 + 2.025 + 2.03 + Point + +     +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"]/statBases + + 10 + 0.89 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Glaive"] + + + 0.22 + 1.33 + 0.57 + + + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/statBases + + 2.75 + 0.9 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"] + + + 0.17 + 0.9 + 0.3 + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/weaponTags + +
  • CE_Sidearm_Melee
    • +
  • CE_OneHandedWeapon
    • +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Baton"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 0.33 + 1.59 + 0.625 + Handle + +
  • + + +
  • Blunt
    • + + 9 + 1.68 + 3.375 + Head + +     +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Staff"]/statBases + + 8 + 1.76 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Staff"]/equippedStatOffsets + + 0.19 + 1.54 + 0.83 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Staff"]/tools + + +
  • + + +
  • Blunt
    • + + 7 + 1.21 + 1.33 + 2.24 + Shaft + +
  • + + +
  • Poke
    • + + 4 + 1.44 + 1.26 + Point + +     +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_NobleCane"]/statBases + + 4 + 1.85 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_NobleCane"]/equippedStatOffsets + + 0.33 + 1.38 + 0.3 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_NobleCane"]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.75 + 1.33 + 0.55 + Shaft + +
  • + + +
  • Poke
    • + + 2 + 1.35 + 0.325 + Point + +     +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Pickaxe"]/statBases + + 8 + 0.22 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Pickaxe"]/equippedStatOffsets + + 0.9 + 0.22 + 0.23 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Pickaxe"]/tools + + +
  • + + +
  • Poke
    • + + 3 + 2.0 + 0.05 + 0.8 + Shaft + +
  • + + +
  • Stab
    • + + 19 + 2.3 + 0.95 + 8.5 + 0.72 + Point + +
  • + + +
  • Demolish
    • + + 8 + 2.3 + 0.95 + 8.5 + 0.72 + Point + +     +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Shovel"]/statBases + + 5 + 0.56 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Shovel"]/equippedStatOffsets + + 0.22 + 0.20 + 0.17 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Shovel"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 0.33 + 1.44 + 0.375 + Handle + +
  • + + +
  • Cut
    • + + 14 + 1.24 + 0.17 + 0.844 + Head + +     +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_BrandingIron"]/statBases + + 3.5 + 1.25 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_BrandingIron"] + + + 0.33 + 1.22 + 0.3 + + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_BrandingIron"]/tools + + +
  • + + false + +
  • Poke
    • + + +
  • + Flame + 5 +
    • +     + 2 + 1.75 + 1.33 + 0.55 + Shaft + +
  • + + +
  • Poke
    • + + 2 + 1.35 + 0.325 + Point + +     +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Pitchfork"]/statBases + + 5 + 1 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Pitchfork"]/equippedStatOffsets + + 0.44 + 1.33 + 0.5 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Pitchfork"]/tools + + +
  • + + +
  • Poke
    • + + 3 + 1.3 + 0.05 + 0.8 + Shaft + +
  • + + +
  • Stab
    • + + 17 + 1.3 + 0.95 + 1.6 + 0.25 + Point + +     +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Rock"]/statBases + + 0.25 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_Rock"]/tools + + +
  • + + +
  • Cut
    • + + 2 + 1.5 + 0.075 + 0.5 + +
  • + + +
  • Poke
    • +
  • Blunt
    • + + 2 + 1.5 + 0.5 + +     +     +     + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_IceAxe"]/statBases + + 4.5 + 0.33 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_IceAxe"]/equippedStatOffsets + + 0.19 + 0.23 + 0.3 + + + + + Defs/ThingDef[defName="K4G_MeleeWeapon_IceAxe"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + + Defs/ThingDef[defName="K4G_MeleeWeapon_IceAxe"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.46 + 0.05 + 0.45 + Shaft + +
  • + + +
  • Stab
    • +
  • Cut
    • + + 11 + 1.83 + 0.95 + 0.648 + 0.29 + Point + +
  • + + +
  • Stab
    • + + 11 + 1.22 + 0.95 + 0.648 + 0.29 + Point + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml index e3eb87097e..b39049b411 100644 --- a/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml +++ b/ModPatches/K4G Empires of Old - Core/Patches/K4G Empires of Old - Core/WeaponsRanged.xml @@ -1,543 +1,710 @@ + - - Defs/ThingDef[ - defName="K4G_Gun_Snubgun" or - defName="K4G_Gun_Bolter" or - defName="K4G_Gun_AdvancedAutopistol" or - defName="K4G_Gun_PrecisionPistol" - ]/tools - - -
  • - - -
  • Blunt
    • - - 2 - 1.54 - 1.5 - 0.555 - Grip - -
  • - - -
  • Poke
    • - - 2 - 1.54 - 0.555 - Muzzle - -     -     -     - - - Defs/ThingDef[ - defName="K4G_Gun_LongGun" or - defName="K4G_Gun_Carbiner" or - defName="K4G_Gun_DuneRifle" or - defName="K4G_Gun_HeavyShotgun" or - defName="K4G_Gun_LightSMG" or - defName="K4G_Gun_AdvancedSMG" or - defName="K4G_Gun_CompactRifle" or - defName="K4G_Gun_BattleRifle" - ]/tools - - -
  • - - -
  • Blunt
    • - - 8 - 1.55 - 1.5 - 2.755 - Stock - -
  • - - -
  • Blunt
    • - - 5 - 2.02 - 1.630 - Barrel - -
  • - - -
  • Poke
    • - - 8 - 1.55 - 2.755 - Muzzle + + Defs/ThingDef[ + defName="K4G_Gun_Snubgun" or + defName="K4G_Gun_Bolter" or + defName="K4G_Gun_AdvancedAutopistol" or + defName="K4G_Gun_PrecisionPistol" or + defName="K4G_Gun_ComradePistol" or + defName="K4G_Gun_Shortbarrel" or + defName="K4G_Gun_Nailgun" + ]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.54 + 1.5 + 0.555 + Grip + +
  • + + +
  • Poke
    • + + 2 + 1.54 + 0.555 + Muzzle + +     +     +     + + + Defs/ThingDef[ + defName="K4G_Gun_LongGun" or + defName="K4G_Gun_Carbiner" or + defName="K4G_Gun_DuneRifle" or + defName="K4G_Gun_HeavyShotgun" or + defName="K4G_Gun_LightSMG" or + defName="K4G_Gun_AdvancedSMG" or + defName="K4G_Gun_BattleRifle" or + defName="K4G_Gun_DrumRifle" + ]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + +     +     +     + + + + + Defs/ThingDef[defName="K4G_Gun_Brawler"] + + + + + + K4G_Gun_Snubgun + + 1.42 + 0.49 + 0.7 + 0.18 + 1.31 + 2.41 + + + 2.96 + CombatExtended.Verb_ShootCE + true + Bullet_44Magnum_FMJ + 0.6 + 12 + Shot_Revolver + GunTail_Light + 9 + + + 6 + 4.6 + AmmoSet_44Magnum + + + FALSE + Snapshot + + +
  • CE_Sidearm
    • +
  • CE_AI_BROOM
    • +
  • CE_OneHandedWeapon
    • +     +     + + + + + + K4G_Gun_Bolter + + 1.33 + 0.42 + 0.70 + 0.60 + 1.30 + 2.62 + + + 2.75 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmParaSD_FMJ + 0.5 + 10 + Shot_Autopistol + GunTail_Light + 9 + + + 5 + 4 + AmmoSet_9x19mmParaSD + + + FALSE + Snapshot + + +
  • CE_AI_Pistol
    • +
  • CE_OneHandedWeapon
    • +     +     + + + + + K4G_Gun_AdvancedAutopistol + + 0.38 + 0.7 + 0.17 + 1.07 + 1.4 + 2.0 + + + 2.72 + CombatExtended.Verb_ShootCE + true + Bullet_45ACP_FMJ + 0.6 + 12 + Shot_Autopistol + GunTail_Light + 9 + + + 13 + 4 + AmmoSet_45ACP + + + FALSE + Snapshot + + +
  • CE_Sidearm
    • +
  • CE_AI_BROOM
    • +
  • CE_OneHandedWeapon
    • +     +     + + + + + K4G_Gun_PrecisionPistol + + 1.30 + 0.38 + 1.88 + 0.17 + 1.16 + 2.20 + + + 2.51 + CombatExtended.Verb_ShootCE + true + Bullet_45ACP_FMJ + 1.0 + 18 + Shot_Autopistol + GunTail_Light + 9 + + + 7 + 4 + AmmoSet_45ACP + + + FALSE + AimedShot + + +
  • CE_Sidearm
    • +
  • CE_OneHandedWeapon
    • +     +     + + + Defs/ThingDef[defName="K4G_Gun_PrecisionPistol"] + +
  • + 0.93,0.93 + 0.0,0.0
    • -     -     -     - - - - - K4G_Gun_Snubgun - - 1.42 - 0.49 - 0.7 - 0.18 - 1.31 - 2.41 - - - 2.96 - CombatExtended.Verb_ShootCE - true - Bullet_44Magnum_FMJ - 0.6 - 12 - Shot_Revolver - GunTail_Light - 9 - - - 6 - 4.6 - AmmoSet_44Magnum - - - FALSE - Snapshot - - -
  • CE_Sidearm
    • -
  • CE_AI_BROOM
    • -
  • CE_OneHandedWeapon
    • -     -     - - - - - - K4G_Gun_Bolter - - 1.33 - 0.42 - 0.70 - 0.60 - 1.30 - 2.62 - - - 2.75 - CombatExtended.Verb_ShootCE - true - Bullet_9x19mmParaSD_FMJ - 0.5 - 10 - Shot_Autopistol - GunTail_Light - 9 - - - 5 - 4 - AmmoSet_9x19mmParaSD - - - FALSE - Snapshot - - -
  • CE_AI_Pistol
    • -
  • CE_OneHandedWeapon
    • -     -     - - - - - K4G_Gun_AdvancedAutopistol - - 0.38 - 0.7 - 0.17 - 1.07 - 1.4 - 2.0 - - - 2.72 - CombatExtended.Verb_ShootCE - true - Bullet_45ACP_FMJ - 0.6 - 12 - Shot_Autopistol - GunTail_Light - 9 - - - 13 - 4 - AmmoSet_45ACP - - - FALSE - Snapshot - - -
  • CE_Sidearm
    • -
  • CE_AI_BROOM
    • -
  • CE_OneHandedWeapon
    • -     -     - - - - - K4G_Gun_PrecisionPistol - - 1.30 - 0.38 - 1.88 - 0.17 - 1.16 - 2.20 - - - 2.51 - CombatExtended.Verb_ShootCE - true - Bullet_45ACP_FMJ - 1.0 - 18 - Shot_Autopistol - GunTail_Light - 9 - - - 7 - 4 - AmmoSet_45ACP - - - FALSE - AimedShot - - -
  • CE_Sidearm
    • -
  • CE_OneHandedWeapon
    • -     -     - - - Defs/ThingDef[defName="K4G_Gun_PrecisionPistol"] - -
  • - 0.93,0.93 - 0.0,0.0 -
    • -     -     - - - - - K4G_Gun_LongGun - - 4.30 - 12.50 - 1.67 - 0.02 - 1 - 0.77 - - - 1.75 - CombatExtended.Verb_ShootCE - True - Bullet_44-40Winchester_FMJ - 1.1 - 31 - Shot_BoltActionRifle - GunTail_Heavy - 9 - - - 7 - 0.85 - AmmoSet_44-40Winchester - true - - - AimedShot - - - - - - - K4G_Gun_Carbiner - - 2.40 - 0.37 - 1.00 - 0.08 - 1.14 - 6.00 - - - CombatExtended.Verb_ShootCE - true - Bullet_30Carbine_FMJ - 1.1 - 37 - Shot_BoltActionRifle - GunTail_Heavy - 9 - - - 15 - 4 - AmmoSet_30Carbine - - - FALSE - AimedShot - - - - - - - K4G_Gun_DuneRifle - - 4.10 - 11.26 - 1.54 - 0.06 - 1 - 0.36 - - - 1.75 - CombatExtended.Verb_ShootCE - True - Bullet_303British_FMJ - 2 - 3 - 1.1 - 52 - Shot_BoltActionRifle - GunTail_Heavy - 9 - - - 10 - 4 - AmmoSet_303British - - - AimedShot - TRUE - - - - - - - K4G_Gun_HeavyShotgun - - 5.45 - 0.37 - 1 - 0.14 - 1.51 - 9.60 - - - 2.36 - CombatExtended.Verb_ShootCE - true - Bullet_12Gauge_Buck - 0.6 - 16 - Shot_Shotgun_NoRack - GunTail_Heavy - 9 - - - 12 - 4 - AmmoSet_12Gauge - - - Snapshot - - -
  • CE_AI_AssaultWeapon
    • -     -     - - - - - K4G_Gun_LightSMG - - 2.50 - 0.36 - 1.00 - 0.16 - 0.85 - 3.68 - - - 1.55 - CombatExtended.Verb_ShootCE - true - Bullet_9x19mmPara_FMJ - 0.6 - 20 - 6 - 4 - Shot_HeavySMG - GunTail_Heavy - 9 - - - 30 - 4 - AmmoSet_9x19mmPara - - - FALSE - Snapshot - 3 - - -
  • CE_AI_AssaultWeapon
    • -
  • CE_SMG
    • -     -     - - - - - K4G_Gun_AdvancedSMG - - 2.60 - 0.36 - 1.10 - 0.12 - 0.77 - 5.05 - - - 1.05 - CombatExtended.Verb_ShootCE - true - Bullet_FN57x28mm_FMJ - 0.5 - 31 - 6 - 4 - Shot_HeavySMG - GunTail_Heavy - 9 - - - 50 - 4.5 - AmmoSet_FN57x28mm - - - FALSE - Snapshot - 3 - - - - - - - K4G_Gun_CompactRifle - - 2.90 - 0.36 - 1.00 - 0.1 - 1.13 - 7.56 - - - 1.58 - CombatExtended.Verb_ShootCE - true - Bullet_556x45mmNATO_FMJ - 1.1 - 55 - 6 - 4 - Shot_AssaultRifle - GunTail_Medium - 9 - - - 30 - 4 - AmmoSet_556x45mmNATO - - - TRUE - AimedShot - 3 - - - - - - - K4G_Gun_BattleRifle - - 1 - 0.08 - 1.46 - 10.5 - 4.50 - 0.37 - - - CombatExtended.Verb_ShootCE - True - Bullet_762x51mmNATO_FMJ - 2.00 - 6 - 7 - 1.1 - 57 - Shot_AssaultRifle - GunTail_Medium - 12 - - - 20 - 4 - AmmoSet_762x51mmNATO - - - TRUE - AimedShot - 3 - - + + + + + + + K4G_Gun_ComradePistol + + 0.73 + 0.38 + 0.70 + 0.18 + 0.78 + 1.62 + + + 25 + 3 + + + CombatExtended.Verb_ShootCE + true + Bullet_9x18mmMakarov_FMJ + 0.6 + 12 + Shot_Autopistol + GunTail_Light + 9 + + + 8 + 4 + AmmoSet_9x18mmMakarov + + + FALSE + + +
  • CE_OneHandedWeapon
    • +     +     + + + + + K4G_Gun_LongGun + + 4.30 + 12.50 + 1.67 + 0.02 + 1 + 0.77 + + + 1.75 + CombatExtended.Verb_ShootCE + True + Bullet_44-40Winchester_FMJ + 1.1 + 31 + Shot_BoltActionRifle + GunTail_Heavy + 9 + + + 7 + 0.85 + AmmoSet_44-40Winchester + true + + + AimedShot + + + + + + + K4G_Gun_Carbiner + + 2.40 + 0.37 + 1.00 + 0.08 + 1.14 + 6.00 + + + CombatExtended.Verb_ShootCE + true + Bullet_30Carbine_FMJ + 1.1 + 37 + Shot_BoltActionRifle + GunTail_Heavy + 9 + + + 15 + 4 + AmmoSet_30Carbine + + + FALSE + AimedShot + + + + + + + K4G_Gun_DuneRifle + + 4.10 + 11.26 + 1.54 + 0.06 + 1 + 0.36 + + + 1.75 + CombatExtended.Verb_ShootCE + True + Bullet_303British_FMJ + 2 + 3 + 1.1 + 52 + Shot_BoltActionRifle + GunTail_Heavy + 9 + + + 10 + 4 + AmmoSet_303British + + + AimedShot + TRUE + + + + + + + K4G_Gun_HeavyShotgun + + 5.45 + 0.37 + 1 + 0.14 + 1.51 + 9.60 + + + 2.36 + CombatExtended.Verb_ShootCE + true + Bullet_12Gauge_Buck + 0.6 + 16 + Shot_Shotgun_NoRack + GunTail_Heavy + 9 + + + 12 + 4 + AmmoSet_12Gauge + + + Snapshot + + +
  • CE_AI_AssaultWeapon
    • +     +     + + + + + K4G_Gun_LightSMG + + 2.50 + 0.36 + 1.00 + 0.16 + 0.85 + 3.68 + + + 1.55 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 0.6 + 20 + 6 + 4 + Shot_HeavySMG + GunTail_Heavy + 9 + + + 30 + 4 + AmmoSet_9x19mmPara + + + FALSE + Snapshot + 3 + + +
  • CE_AI_AssaultWeapon
    • +
  • CE_SMG
    • +     +     + + + + + K4G_Gun_AdvancedSMG + + 2.60 + 0.36 + 1.10 + 0.12 + 0.77 + 5.05 + + + 1.05 + CombatExtended.Verb_ShootCE + true + Bullet_FN57x28mm_FMJ + 0.5 + 31 + 6 + 4 + Shot_HeavySMG + GunTail_Heavy + 9 + + + 50 + 4.5 + AmmoSet_FN57x28mm + + + FALSE + Snapshot + 3 + + + + + + + K4G_Gun_BattleRifle + + 1 + 0.08 + 1.46 + 10.5 + 4.50 + 0.37 + + + CombatExtended.Verb_ShootCE + True + Bullet_762x51mmNATO_FMJ + 2.00 + 6 + 7 + 1.1 + 55 + Shot_AssaultRifle + GunTail_Medium + 12 + + + 20 + 4 + AmmoSet_762x51mmNATO + + + TRUE + AimedShot + 3 + + + + + + + K4G_Gun_ComradePistol + + 0.73 + 0.35 + 0.70 + 0.18 + 0.78 + 1.62 + + + CombatExtended.Verb_ShootCE + true + Bullet_9x18mmMakarov_FMJ + 0.6 + 12 + Shot_Autopistol + GunTail_Light + 9 + + + 8 + 4 + AmmoSet_9x18mmMakarov + + + FALSE + + +
  • CE_AI_Pistol
    • +
  • CE_Sidearm
    • +
  • CE_OneHandedWeapon
    • +     +     + + + + + K4G_Gun_Shortbarrel + + 2.95 + 0.38 + 0.7 + 0.14 + 3.00 + 6.05 + + + 2.43 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 1.1 + 55 + 6 + 5 + Shot_HeavySMG + GunTail_Heavy + 9 + + + 20 + 4 + AmmoSet_762x51mmNATO + + + TRUE + AimedShot + 3 + + + + + + + K4G_Gun_DrumRifle + + 1 + 0.08 + 1.81 + 10.21 + 7.92 + 0.36 + + + CombatExtended.Verb_ShootCE + True + Bullet_762x51mmNATO_FMJ + 1.42 + 6 + 4 + 1.1 + 55 + Shot_AssaultRifle + GunTail_Medium + 12 + + + 50 + 4 + AmmoSet_762x51mmNATO + + + TRUE + AimedShot + 3 + + +
  • CE_AI_LMG
    • +
  • Bipod_LMG
    • +     +     + + + + + K4G_Gun_Nailgun + + 1.80 + 0.37 + 0.5 + 0.16 + 1.07 + 2.50 + + + 0.24 + CombatExtended.Verb_ShootCE + true + Bullet_Nail + 0.6 + 12 + 10 + 6 + Shot_Autopistol + GunTail_Light + + + 60 + 4.6 + AmmoSet_Nail + + + 5 + FALSE + Snapshot + + +
  • CE_OneHandedWeapon
    • +     +     +     \ No newline at end of file diff --git a/ModPatches/K4G Empires of Old - The Alekeepers/Patches/K4G Empires of Old - The Alekeepers/Pawnkinds_Alekeepers.xml b/ModPatches/K4G Empires of Old - The Alekeepers/Patches/K4G Empires of Old - The Alekeepers/Pawnkinds_Alekeepers.xml new file mode 100644 index 0000000000..28bad7559b --- /dev/null +++ b/ModPatches/K4G Empires of Old - The Alekeepers/Patches/K4G Empires of Old - The Alekeepers/Pawnkinds_Alekeepers.xml @@ -0,0 +1,24 @@ + + + + + + Defs/PawnKindDef[defName="K4G_Fellowship_WarriorMonk"] + +
  • + + 4 + 6 + +
    • +     +     + + + Defs/PawnKindDef[defName="K4G_Fellowship_Monk"]/weaponMoney + + 6~500 + + + +     \ No newline at end of file diff --git a/ModPatches/K4G Empires of Old - The Faceless Sultainate/Patches/K4G Empires of Old - The Faceless Sultainate/PawnKinds_Sultanate.xml b/ModPatches/K4G Empires of Old - The Faceless Sultainate/Patches/K4G Empires of Old - The Faceless Sultainate/PawnKinds_Sultanate.xml index 82c97e0c89..c207ed4bfe 100644 --- a/ModPatches/K4G Empires of Old - The Faceless Sultainate/Patches/K4G Empires of Old - The Faceless Sultainate/PawnKinds_Sultanate.xml +++ b/ModPatches/K4G Empires of Old - The Faceless Sultainate/Patches/K4G Empires of Old - The Faceless Sultainate/PawnKinds_Sultanate.xml @@ -2,56 +2,57 @@ - - Defs/PawnKindDef[defName="K4G_Sultanate_Common_Trader" or defName="K4G_Sultanate_Common_Worker"] - -
  • - - 3 - 4 - -
    • -     -     + + Defs/PawnKindDef[defName="K4G_Sultanate_Common_Trader" or defName="K4G_Sultanate_Common_Worker"] + +
  • + + 3 + 4 + +
    • +     +     - + - - Defs/PawnKindDef[@Name="K4GSultanateGuerrillaBase" or @Name="K4GSultanateJanissaryBase"] - -
  • - - 4 - 6 - -
    • -     -     + + Defs/PawnKindDef[@Name="K4GSultanateGuerrillaBase" or @Name="K4GSultanateJanissaryBase"] + +
  • + + 4 + 6 + +
    • +     +     - - Defs/PawnKindDef[ - defName="K4G_Sultanate_Fighter_Cataphract" or - defName="K4G_Sultanate_Fighter_KhanGuardRanged" or - defName="K4G_Sultanate_Fighter_BlackMarketMercenary"] - -
  • - - 5 - 7 - -
    • -     -     + + Defs/PawnKindDef[ + defName="K4G_Sultanate_Fighter_Cataphract" or + defName="K4G_Sultanate_Fighter_KhanGuardRanged" or + defName="K4G_Sultanate_Fighter_BlackMarketMercenary"] + +
  • + + 5 + 7 + +
    • +     +     + + + Defs/PawnKindDef[defName="K4G_Sultanate_Fighter_Bomber"] + +
  • + + 8 + 12 + +
    • +     +     - - Defs/PawnKindDef[defName="K4G_Sultanate_Fighter_Bomber"] - -
  • - - 8 - 12 - -
    • -     -         \ No newline at end of file diff --git a/ModPatches/K4G Empires of Old - The Faceless Sultainate/Patches/K4G Empires of Old - The Faceless Sultainate/TraderKinds_Sultanate.xml b/ModPatches/K4G Empires of Old - The Faceless Sultainate/Patches/K4G Empires of Old - The Faceless Sultainate/TraderKinds_Sultanate.xml index 378d32225a..0ba68a943b 100644 --- a/ModPatches/K4G Empires of Old - The Faceless Sultainate/Patches/K4G Empires of Old - The Faceless Sultainate/TraderKinds_Sultanate.xml +++ b/ModPatches/K4G Empires of Old - The Faceless Sultainate/Patches/K4G Empires of Old - The Faceless Sultainate/TraderKinds_Sultanate.xml @@ -2,160 +2,160 @@ - - Defs/TraderKindDef[defName="K4G_Base_Sultanate_Standard"]/stockGenerators - -
  • - FSX - - 15 - 40 - -
    • -
  • - Prometheum - - 15 - 40 - -
    • -
  • - CE_Ammo - - 400 - 1000 - - - 3 - 8 - -
    • -
  • - CE_MediumAmmo - - 400 - 1000 - - - 3 - 8 - -
    • -
  • - CE_HeavyAmmo - - 10 - 50 - - - 2 - 5 - -
    • -
  • - Ammo - - 0 - 0 - -
    • -     -     + + Defs/TraderKindDef[defName="K4G_Base_Sultanate_Standard"]/stockGenerators + +
  • + FSX + + 15 + 40 + +
    • +
  • + Prometheum + + 15 + 40 + +
    • +
  • + CE_Ammo + + 400 + 1000 + + + 3 + 8 + +
    • +
  • + CE_MediumAmmo + + 400 + 1000 + + + 3 + 8 + +
    • +
  • + CE_HeavyAmmo + + 10 + 50 + + + 2 + 5 + +
    • +
  • + Ammo + + 0 + 0 + +
    • +     +     - - - Defs/TraderKindDef[defName="K4G_Base_Sultanate_Standard"]/stockGenerators - -
  • - FSX - - 15 - 40 - -
    • -
  • - Prometheum - - 15 - 40 - -
    • -
  • - CE_Ammo - - 400 - 1000 - - Cheap - - 3 - 8 - -
    • -
  • - CE_MediumAmmo - - 10 - 50 - - - 2 - 4 - -
    • -
  • - CE_HeavyAmmo - - 5 - 30 - - - 2 - 6 - -
    • -
  • - Ammo - - 0 - 0 - -
    • -
  • - CE_Turret - - -4 - 2 - - - 1 - 1 - -
    • -
  • - WeaponsTurrets - - 0 - 0 - -
    • -
  • - -
  • CE_AnimalBoom
    • - - -
  • CE_AnimalBoom
    • -     - - 0 - 1 - - - -1 - 2 - - -     -     + + + Defs/TraderKindDef[defName="K4G_Base_Sultanate_Standard"]/stockGenerators + +
  • + FSX + + 15 + 40 + +
    • +
  • + Prometheum + + 15 + 40 + +
    • +
  • + CE_Ammo + + 400 + 1000 + + Cheap + + 3 + 8 + +
    • +
  • + CE_MediumAmmo + + 10 + 50 + + + 2 + 4 + +
    • +
  • + CE_HeavyAmmo + + 5 + 30 + + + 2 + 6 + +
    • +
  • + Ammo + + 0 + 0 + +
    • +
  • + CE_Turret + + -4 + 2 + + + 1 + 1 + +
    • +
  • + WeaponsTurrets + + 0 + 0 + +
    • +
  • + +
  • CE_AnimalBoom
    • + + +
  • CE_AnimalBoom
    • +     + + 0 + 1 + + + -1 + 2 + + +     +     \ No newline at end of file diff --git a/ModPatches/K4G Empires of Old - The Polluted Legion/Patches/K4G Empires of Old - The Polluted Legion/PawnKinds_Legion.xml b/ModPatches/K4G Empires of Old - The Polluted Legion/Patches/K4G Empires of Old - The Polluted Legion/PawnKinds_Legion.xml index 70f0abaf9d..b319c55052 100644 --- a/ModPatches/K4G Empires of Old - The Polluted Legion/Patches/K4G Empires of Old - The Polluted Legion/PawnKinds_Legion.xml +++ b/ModPatches/K4G Empires of Old - The Polluted Legion/Patches/K4G Empires of Old - The Polluted Legion/PawnKinds_Legion.xml @@ -2,53 +2,54 @@ - - Defs/PawnKindDef[defName="K4G_Legion_Common_Trader" or defName="K4G_Legion_Common_Worker"] - -
  • - - 3 - 4 - -
    • -     -     + + Defs/PawnKindDef[defName="K4G_Legion_Common_Trader" or defName="K4G_Legion_Common_Worker"] + +
  • + + 3 + 4 + +
    • +     +     - + - - Defs/PawnKindDef[@Name="K4GLegionMilitesBase" or @Name="K4GLegionLegionaryBase"] - -
  • - - 4 - 6 - -
    • -     -     + + Defs/PawnKindDef[@Name="K4GLegionMilitesBase" or @Name="K4GLegionLegionaryBase"] + +
  • + + 4 + 6 + +
    • +     +     - - Defs/PawnKindDef[defName="K4G_Legion_Fighter_HeavyLegionnaire" or defName="K4G_Legion_Fighter_PraetorianGuardRanged"] - -
  • - - 5 - 7 - -
    • -     -     + + Defs/PawnKindDef[defName="K4G_Legion_Fighter_HeavyLegionnaire" or defName="K4G_Legion_Fighter_PraetorianGuardRanged"] + +
  • + + 5 + 7 + +
    • +     +     + + + Defs/PawnKindDef[defName="K4G_Legion_Fighter_Grenadier"] + +
  • + + 8 + 12 + +
    • +     +     - - Defs/PawnKindDef[defName="K4G_Legion_Fighter_Grenadier"] - -
  • - - 8 - 12 - -
    • -     -         \ No newline at end of file diff --git a/ModPatches/K4G Empires of Old - The Rising Sun/Patches/K4G Empires of Old - The Rising Sun/PawnKinds_Dynasty.xml b/ModPatches/K4G Empires of Old - The Rising Sun/Patches/K4G Empires of Old - The Rising Sun/PawnKinds_Dynasty.xml index 1e8c50c83b..d097dcfce3 100644 --- a/ModPatches/K4G Empires of Old - The Rising Sun/Patches/K4G Empires of Old - The Rising Sun/PawnKinds_Dynasty.xml +++ b/ModPatches/K4G Empires of Old - The Rising Sun/Patches/K4G Empires of Old - The Rising Sun/PawnKinds_Dynasty.xml @@ -2,53 +2,54 @@ - - Defs/PawnKindDef[defName="K4G_Dynasty_Common_Trader" or defName="K4G_Dynasty_Common_Worker"] - -
  • - - 3 - 4 - -
    • -     -     + + Defs/PawnKindDef[defName="K4G_Dynasty_Common_Trader" or defName="K4G_Dynasty_Common_Worker"] + +
  • + + 3 + 4 + +
    • +     +     - + - - Defs/PawnKindDef[@Name="K4GDynastyRoninBase" or @Name="K4GDynastyAshigaruBase"] - -
  • - - 4 - 6 - -
    • -     -     + + Defs/PawnKindDef[@Name="K4GDynastyRoninBase" or @Name="K4GDynastyAshigaruBase"] + +
  • + + 4 + 6 + +
    • +     +     - - Defs/PawnKindDef[defName="K4G_Dynasty_Fighter_Cataphract" or defName="K4G_Dynasty_Fighter_WarriorMonkRanged"] - -
  • - - 5 - 7 - -
    • -     -     + + Defs/PawnKindDef[defName="K4G_Dynasty_Fighter_Cataphract" or defName="K4G_Dynasty_Fighter_WarriorMonkRanged"] + +
  • + + 5 + 7 + +
    • +     +     + + + Defs/PawnKindDef[defName="K4G_Dynasty_Fighter_Grenadier"] + +
  • + + 8 + 12 + +
    • +     +     - - Defs/PawnKindDef[defName="K4G_Dynasty_Fighter_Grenadier"] - -
  • - - 8 - 12 - -
    • -     -         \ No newline at end of file diff --git a/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Launchers.xml b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Launchers.xml index 6a46c86900..99e28705f1 100644 --- a/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Launchers.xml +++ b/ModPatches/LF Red Dawn/Patches/LF Red Dawn/RD_Launchers.xml @@ -36,15 +36,12 @@ true - FALSE AimedShot true - - false @@ -83,15 +80,12 @@ true - FALSE AimedShot true - - false @@ -130,15 +124,12 @@ true - FALSE AimedShot true - - false @@ -177,15 +168,12 @@ true - FALSE AimedShot true - - false @@ -234,9 +222,7 @@ FALSE AimedShot - - false @@ -285,9 +271,7 @@ FALSE AimedShot - - false @@ -337,9 +321,7 @@ FALSE AimedShot - - false diff --git a/ModPatches/Littluna Race/Patches/Littluna Race/Bodies/Bodies_Summon.xml b/ModPatches/Littluna Race/Patches/Littluna Race/Bodies/Bodies_Summon.xml index 44a39c865c..92fa3ad5bb 100644 --- a/ModPatches/Littluna Race/Patches/Littluna Race/Bodies/Bodies_Summon.xml +++ b/ModPatches/Littluna Race/Patches/Littluna Race/Bodies/Bodies_Summon.xml @@ -15,7 +15,6 @@ def="Eye" or def="Ear"] - @@ -34,7 +33,6 @@ def="Ear" or def="AnimalJaw"]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml index 86d38eb2b9..03b2276723 100644 --- a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml +++ b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/CicadaRaces.xml @@ -1,13 +1,6 @@ - - Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases - - 0 - - - Defs/ThingDef[defName="MOW_Mech_Cicada"]/statBases @@ -73,7 +66,7 @@ Defs/ThingDef[defName="MOW_Mech_Cicada"] - + @@ -111,9 +104,7 @@ 200 true 158 - 0.75 - 5 - 10 + 0.5 diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml index 047c286758..11e1844934 100644 --- a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml +++ b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/DemolisherRaces.xml @@ -1,13 +1,6 @@ - - Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases - - 0 - - - Defs/ThingDef[defName="MOW_Mech_Demolisher"]/statBases @@ -74,7 +67,7 @@ Defs/ThingDef[defName="MOW_Mech_Demolisher"] - + @@ -113,8 +106,6 @@ true 395 0.5 - 14 - 36 diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml index b8c5631ffb..46978291da 100644 --- a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml +++ b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerBreachRaces .xml @@ -1,13 +1,6 @@ - - Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases - - 0 - - - Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"]/statBases @@ -73,7 +66,7 @@ Defs/ThingDef[defName="MOW_Mech_Enforcer_Breacher"] - + @@ -111,7 +104,7 @@ 200 true 131 - 0.75 + 0.5 diff --git a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml index 589e875729..ed1c717d2f 100644 --- a/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml +++ b/ModPatches/Machines of War/Patches/Machines of War/ThingDefs_Races/EnforcerRaces.xml @@ -1,13 +1,6 @@ - - Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases - - 0 - - - Defs/ThingDef[defName="MOW_Mech_Enforcer"]/statBases @@ -73,7 +66,7 @@ Defs/ThingDef[defName="MOW_Mech_Enforcer"] - + @@ -111,7 +104,7 @@ 200 true 131 - 0.75 + 0.5 diff --git a/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Bodies/Bodies_Mantodean.xml b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Bodies/Bodies_Mantodean.xml index fdd1f7dbdf..ec17422737 100644 --- a/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Bodies/Bodies_Mantodean.xml +++ b/ModPatches/Mantodean Insectoid Race/Patches/Mantodean Insectoid Race/Bodies/Bodies_Mantodean.xml @@ -27,7 +27,6 @@ def="InsectLeg" or def="Foot"]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Helmets.xml b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Helmets.xml index 86be613a8d..39325dc2d1 100644 --- a/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Helmets.xml +++ b/ModPatches/Medieval Overhaul/Patches/Medieval Overhaul/ThingDefs_Misc/MO_Apparel_Helmets.xml @@ -7,7 +7,18 @@ - Defs/ThingDef[ defName="DankPyon_Headgear_ChainCoif" or defName="DankPyon_Headgear_ChainCoifClosed" or defName="DankPyon_Headgear_ChainCoifFull" or defName="DankPyon_Headgear_PaddedNasalHelmet" or defName="DankPyon_Headgear_PaddedKettle" or defName="DankPyon_Headgear_PaddedFlatTop" or defName="DankPyon_Headgear_ChainNasalHelm" or defName="DankPyon_Headgear_ChainNasalRedHelmet" or defName="DankPyon_Headgear_ChainKettle" or defName="DankPyon_Headgear_ChainClosedFlatTop"]/apparel/bodyPartGroups + Defs/ThingDef[ + defName="DankPyon_Headgear_ChainCoif" or + defName="DankPyon_Headgear_ChainCoifClosed" or + defName="DankPyon_Headgear_ChainCoifFull" or + defName="DankPyon_Headgear_PaddedNasalHelmet" or + defName="DankPyon_Headgear_PaddedKettle" or + defName="DankPyon_Headgear_PaddedFlatTop" or + defName="DankPyon_Headgear_ChainNasalHelm" or + defName="DankPyon_Headgear_ChainNasalRedHelmet" or + defName="DankPyon_Headgear_ChainKettle" or + defName="DankPyon_Headgear_ChainClosedFlatTop" + ]/apparel/bodyPartGroups
  • UpperHead
    • @@ -18,7 +29,11 @@ - Defs/ThingDef[ defName="DankPyon_Headgear_ChainCoifClosed" or defName="DankPyon_Headgear_ChainCoifFull" or defName="DankPyon_Headgear_ChainClosedFlatTop"]/apparel/bodyPartGroups + Defs/ThingDef[ + defName="DankPyon_Headgear_ChainCoifClosed" or + defName="DankPyon_Headgear_ChainCoifFull" or + defName="DankPyon_Headgear_ChainClosedFlatTop" + ]/apparel/bodyPartGroups
  • Teeth
    •  @@ -82,7 +97,11 @@ - Defs/ThingDef[defName="DankPyon_Headgear_coif" or defName="DankPyon_Headgear_ArmingCap" or defName="DankPyon_Headgear_FullArmingCap"]/statBases + Defs/ThingDef[ + defName="DankPyon_Headgear_coif" or + defName="DankPyon_Headgear_ArmingCap" or + defName="DankPyon_Headgear_FullArmingCap" + ]/statBases 2 1 @@ -90,7 +109,10 @@ - Defs/ThingDef[defName="DankPyon_Headgear_ArmingCap" or defName="DankPyon_Headgear_FullArmingCap"]/statBases/StuffEffectMultiplierArmor + Defs/ThingDef[ + defName="DankPyon_Headgear_ArmingCap" or + defName="DankPyon_Headgear_FullArmingCap" + ]/statBases/StuffEffectMultiplierArmor 10 @@ -98,7 +120,10 @@ - Defs/ThingDef[defName="DankPyon_Headgear_ChainCoif" or defName="DankPyon_Headgear_ChainCoifClosed" or defName="DankPyon_Headgear_ChainCoifFull"]/statBases + Defs/ThingDef[ + defName="DankPyon_Headgear_ChainCoif" or + defName="DankPyon_Headgear_ChainCoifClosed" or + defName="DankPyon_Headgear_ChainCoifFull"]/statBases 4 1 @@ -106,7 +131,11 @@ - Defs/ThingDef[defName="DankPyon_Headgear_ChainCoif" or defName="DankPyon_Headgear_ChainCoifClosed" or defName="DankPyon_Headgear_ChainCoifFull"]/statBases/StuffEffectMultiplierArmor + Defs/ThingDef[ + defName="DankPyon_Headgear_ChainCoif" or + defName="DankPyon_Headgear_ChainCoifClosed" or + defName="DankPyon_Headgear_ChainCoifFull" + ]/statBases/StuffEffectMultiplierArmor 1.65 @@ -116,11 +145,38 @@ - Defs/ThingDef[defName="DankPyon_Headgear_PaddedNasalHelmet" or defName="DankPyon_Headgear_PaddedKettleHelmet" or defName="DankPyon_Headgear_PaddedFlatTopHelmet" or defName="DankPyon_Headgear_ChainNasalHelmet" or defName="DankPyon_Headgear_ChainNasalRedHelmet" or defName="DankPyon_Headgear_ChainKettleHelmet" or defName="DankPyon_Headgear_Chain_FlatTopHelmet" or defName="DankPyon_Headgear_ChainClosedFlatTopHelmet" or defName="DankPyon_Headgear_ClosedChain_FlatTopHelmet" or @Name="DankPyon_ZweihanderHelmBase" or defName="DankPyon_Headgear_HeavyBarbrute" or defName="DankPyon_Headgear_OpenBascinet"]/equippedStatOffsets/ShootingAccuracyPawn + Defs/ThingDef[ + defName="DankPyon_Headgear_PaddedNasalHelmet" or + defName="DankPyon_Headgear_PaddedKettleHelmet" or + defName="DankPyon_Headgear_PaddedFlatTopHelmet" or + defName="DankPyon_Headgear_ChainNasalHelmet" or + defName="DankPyon_Headgear_ChainNasalRedHelmet" or + defName="DankPyon_Headgear_ChainKettleHelmet" or + defName="DankPyon_Headgear_Chain_FlatTopHelmet" or + defName="DankPyon_Headgear_ChainClosedFlatTopHelmet" or + defName="DankPyon_Headgear_ClosedChain_FlatTopHelmet" or + @Name="DankPyon_ZweihanderHelmBase" or + defName="DankPyon_Headgear_HeavyBarbrute" or + defName="DankPyon_Headgear_OpenBascinet" + ]/equippedStatOffsets/ShootingAccuracyPawn - Defs/ThingDef[defName="DankPyon_Headgear_PaddedNasalHelmet" or defName="DankPyon_Headgear_PaddedKettleHelmet" or defName="DankPyon_Headgear_PaddedFlatTopHelmet" or defName="DankPyon_Headgear_ChainNasalHelmet" or defName="DankPyon_Headgear_ChainKettleHelmet" or defName="DankPyon_Headgear_ClosedChain_FlatTopHelmet" or defName="DankPyon_Headgear_ChainNasalRedHelmet" or defName="DankPyon_Headgear_ChainClosedFlatTopHelmet" or defName="DankPyon_Headgear_Chain_FlatTopHelmet" or @Name="DankPyon_ZweihanderHelmBase" or defName="DankPyon_Adorned_HeavyMailCoif" or defName="DankPyon_Headgear_HeavyBarbrute" or defName="DankPyon_Headgear_OpenBascinet"]/statBases + Defs/ThingDef[ + defName="DankPyon_Headgear_PaddedNasalHelmet" or + defName="DankPyon_Headgear_PaddedKettleHelmet" or + defName="DankPyon_Headgear_PaddedFlatTopHelmet" or + defName="DankPyon_Headgear_ChainNasalHelmet" or + defName="DankPyon_Headgear_ChainKettleHelmet" or + defName="DankPyon_Headgear_ClosedChain_FlatTopHelmet" or + defName="DankPyon_Headgear_ChainNasalRedHelmet" or + defName="DankPyon_Headgear_ChainClosedFlatTopHelmet" or + defName="DankPyon_Headgear_Chain_FlatTopHelmet" or + @Name="DankPyon_ZweihanderHelmBase" or + defName="DankPyon_Adorned_HeavyMailCoif" or + defName="DankPyon_Headgear_HeavyBarbrute" or + defName="DankPyon_Headgear_OpenBascinet" + ]/statBases 4 1 @@ -128,14 +184,29 @@ - Defs/ThingDef[defName="DankPyon_Headgear_PaddedNasalHelmet" or defName="DankPyon_Headgear_PaddedKettleHelmet" or defName="DankPyon_Headgear_PaddedFlatTopHelmet" or @Name="DankPyon_ZweihanderHelmBase"]/statBases/StuffEffectMultiplierArmor + Defs/ThingDef[ + defName="DankPyon_Headgear_PaddedNasalHelmet" or + defName="DankPyon_Headgear_PaddedKettleHelmet" or + defName="DankPyon_Headgear_PaddedFlatTopHelmet" or + @Name="DankPyon_ZweihanderHelmBase" + ]/statBases/StuffEffectMultiplierArmor 2.2 - Defs/ThingDef[defName="DankPyon_Headgear_ChainNasalHelmet" or defName="DankPyon_Headgear_ChainNasalRedHelmet" or defName="DankPyon_Headgear_ChainKettleHelmet" or defName="DankPyon_Headgear_Chain_FlatTopHelmet" or defName="DankPyon_Headgear_ClosedChain_FlatTopHelmet" or defName="DankPyon_Adorned_HeavyMailCoif" or defName="DankPyon_Headgear_HeavyBarbrute" or defName="DankPyon_Headgear_OpenBascinet"]/statBases/StuffEffectMultiplierArmor + Defs/ThingDef[ + defName="DankPyon_Headgear_ChainNasalHelmet" or + defName="DankPyon_Headgear_ChainNasalRedHelmet" or + defName="DankPyon_Headgear_ChainKettleHelmet" or + defName="DankPyon_Headgear_Chain_FlatTopHelmet" or + defName="DankPyon_Headgear_ClosedChain_FlatTopHelmet" or + defName="DankPyon_Headgear_ChainClosedFlatTopHelmet" or + defName="DankPyon_Adorned_HeavyMailCoif" or + defName="DankPyon_Headgear_HeavyBarbrute" or + defName="DankPyon_Headgear_OpenBascinet" + ]/statBases/StuffEffectMultiplierArmor 2.7 @@ -145,7 +216,18 @@ - Defs/ThingDef[defName="DankPyon_Headgear_ClosedBascinetHelmet" or defName="DankPyon_Headgear_SalletHelmet" or defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or defName="DankPyon_Headgear_GreatHelm" or defName="DankPyon_Headgear_HeraldicGreatHelm1c" or defName="DankPyon_Headgear_Armet" or defName="DankPyon_Headgear_ArmetGilded" or defName="DankPyon_Headgear_ArmetNamed" or defName="DankPyon_Adorned_FlatTop" or defName="DankPyon_Adorned_GreatHelm"]/statBases + Defs/ThingDef[defName= + "DankPyon_Headgear_ClosedBascinetHelmet" or + defName="DankPyon_Headgear_SalletHelmet" or + defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or + defName="DankPyon_Headgear_GreatHelm" or + defName="DankPyon_Headgear_HeraldicGreatHelm1c" or + defName="DankPyon_Headgear_Armet" or + defName="DankPyon_Headgear_ArmetGilded" or + defName="DankPyon_Headgear_ArmetNamed" or + defName="DankPyon_Adorned_FlatTop" or + defName="DankPyon_Adorned_GreatHelm" + ]/statBases 6 1 @@ -153,7 +235,18 @@ - Defs/ThingDef[defName="DankPyon_Headgear_ClosedBascinetHelmet" or defName="DankPyon_Headgear_SalletHelmet" or defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or defName="DankPyon_Headgear_GreatHelm" or defName="DankPyon_Headgear_HeraldicGreatHelm1c" or defName="DankPyon_Headgear_Armet" or defName="DankPyon_Headgear_ArmetGilded" or defName="DankPyon_Headgear_ArmetNamed" or defName="DankPyon_Adorned_FlatTop" or defName="DankPyon_Adorned_GreatHelm"]/apparel/bodyPartGroups + Defs/ThingDef[ + defName="DankPyon_Headgear_ClosedBascinetHelmet" or + defName="DankPyon_Headgear_SalletHelmet" or + defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or + defName="DankPyon_Headgear_GreatHelm" or + defName="DankPyon_Headgear_HeraldicGreatHelm1c" or + defName="DankPyon_Headgear_Armet" or + defName="DankPyon_Headgear_ArmetGilded" or + defName="DankPyon_Headgear_ArmetNamed" or + defName="DankPyon_Adorned_FlatTop" or + defName="DankPyon_Adorned_GreatHelm" + ]/apparel/bodyPartGroups
  • FullHead
    • @@ -162,11 +255,33 @@     - Defs/ThingDef[defName="DankPyon_Headgear_ClosedBascinetHelmet" or defName="DankPyon_Headgear_SalletHelmet" or defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or defName="DankPyon_Headgear_GreatHelm" or defName="DankPyon_Headgear_HeraldicGreatHelm1c" or defName="DankPyon_Headgear_Armet" or defName="DankPyon_Headgear_ArmetGilded" or defName="DankPyon_Headgear_ArmetNamed" or defName="DankPyon_Adorned_FlatTop" or defName="DankPyon_Adorned_GreatHelm"]/equippedStatOffsets/ShootingAccuracyPawn + Defs/ThingDef[ + defName="DankPyon_Headgear_ClosedBascinetHelmet" or + defName="DankPyon_Headgear_SalletHelmet" or + defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or + defName="DankPyon_Headgear_GreatHelm" or + defName="DankPyon_Headgear_HeraldicGreatHelm1c" or + defName="DankPyon_Headgear_Armet" or + defName="DankPyon_Headgear_ArmetGilded" or + defName="DankPyon_Headgear_ArmetNamed" or + defName="DankPyon_Adorned_FlatTop" or + defName="DankPyon_Adorned_GreatHelm" + ]/equippedStatOffsets/ShootingAccuracyPawn - Defs/ThingDef[defName="DankPyon_Headgear_ClosedBascinetHelmet" or defName="DankPyon_Headgear_SalletHelmet" or defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or defName="DankPyon_Headgear_GreatHelm" or defName="DankPyon_Headgear_HeraldicGreatHelm1c" or defName="DankPyon_Headgear_Armet" or defName="DankPyon_Headgear_ArmetGilded" or defName="DankPyon_Headgear_ArmetNamed" or defName="DankPyon_Adorned_FlatTop" or defName="DankPyon_Adorned_GreatHelm"]/equippedStatOffsets + Defs/ThingDef[ + defName="DankPyon_Headgear_ClosedBascinetHelmet" or + defName="DankPyon_Headgear_SalletHelmet" or + defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or + defName="DankPyon_Headgear_GreatHelm" or + defName="DankPyon_Headgear_HeraldicGreatHelm1c" or + defName="DankPyon_Headgear_Armet" or + defName="DankPyon_Headgear_ArmetGilded" or + defName="DankPyon_Headgear_ArmetNamed" or + defName="DankPyon_Adorned_FlatTop" or + defName="DankPyon_Adorned_GreatHelm" + ]/equippedStatOffsets -0.4 -2 @@ -175,15 +290,26 @@ - Defs/ThingDef[ defName="DankPyon_Headgear_ClosedBascinetHelmet" or defName="DankPyon_Headgear_SalletHelmet" or defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or defName="DankPyon_Adorned_FlatTop" - ]/statBases/StuffEffectMultiplierArmor + Defs/ThingDef[ + defName="DankPyon_Headgear_ClosedBascinetHelmet" or + defName="DankPyon_Headgear_SalletHelmet" or + defName="DankPyon_Headgear_Bascinet_KlappvisierHelmetClosed" or + defName="DankPyon_Adorned_FlatTop" + ]/statBases/StuffEffectMultiplierArmor 3.5 - Defs/ThingDef[defName="DankPyon_Headgear_GreatHelm" or defName="DankPyon_Headgear_HeraldicGreatHelm1c" or defName="DankPyon_Headgear_Armet" or defName="DankPyon_Headgear_ArmetGilded" or defName="DankPyon_Headgear_ArmetNamed" or defName="DankPyon_Adorned_GreatHelm"]/statBases/StuffEffectMultiplierArmor + Defs/ThingDef[ + defName="DankPyon_Headgear_GreatHelm" or + defName="DankPyon_Headgear_HeraldicGreatHelm1c" or + defName="DankPyon_Headgear_Armet" or + defName="DankPyon_Headgear_ArmetGilded" or + defName="DankPyon_Headgear_ArmetNamed" or + defName="DankPyon_Adorned_GreatHelm" + ]/statBases/StuffEffectMultiplierArmor 3.75 diff --git a/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml index 5cc17aef8b..7b0ad64c2d 100644 --- a/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/Metal Gear Rimworld-Gekko/Patches/Metal Gear Rimworld-Gekko/ThingDefs_Races/Races_Mechanoid.xml @@ -1,13 +1,6 @@ - - Defs/ThingDef[defName="MGR_Mech_Gekko"]/statBases - - 0 - - - Defs/ThingDef[defName="MGR_Mech_Gekko"]/statBases @@ -99,21 +92,18 @@
  • - false 0.25
  • SightSensor
  • - false 0.25
  • SightSensor
  • - false 0.625
  • MGR_SyntheticalLeg
    • @@ -127,28 +117,24 @@
  • - false 0.625
  • MechanicalFoot
  • - false 0.625
  • MechanicalFoot
  • - false 0.625
  • PowerClaw
  • - false 0.625
  • PowerClaw
    • @@ -177,8 +163,6 @@ true 300 0.5 - 10 - 22     diff --git a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml index 86f263df73..6c438652dd 100644 --- a/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml +++ b/ModPatches/Miho Race/Patches/Miho Race/ThingDefs_Races/AlienRace_Miho.xml @@ -5,13 +5,16 @@ Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"]/comps -
  • +
  • + CombatExtended.CompPawnGizmo +
    • +
  • 500 true 600 5 - 0.75 + 0.5
    • @@ -19,13 +22,16 @@ Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Miho"] -
  • +
  • + CombatExtended.CompPawnGizmo +
    • +
  • 500 true 600 5 - 0.75 + 0.5
    • diff --git a/ModPatches/Misc MAI/Patches/Misc MAI/Bodies/Bodies_AIPawn.xml b/ModPatches/Misc MAI/Patches/Misc MAI/Bodies/Bodies_AIPawn.xml index 9b21cf2df8..4b40528a2e 100644 --- a/ModPatches/Misc MAI/Patches/Misc MAI/Bodies/Bodies_AIPawn.xml +++ b/ModPatches/Misc MAI/Patches/Misc MAI/Bodies/Bodies_AIPawn.xml @@ -16,7 +16,6 @@ def="MechanicalLeg" or def="MechanicalFoot"]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/MoreMechanoids/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/MoreMechanoids/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml index 69e1b2134d..5c1b48b693 100644 --- a/ModPatches/MoreMechanoids/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/MoreMechanoids/Patches/MoreMechanoids/ThingDefs_Races/Races_Mechanoid.xml @@ -98,7 +98,7 @@ 200 true 27 - 0.75 + 0.5 @@ -198,7 +198,7 @@ 200 true 85 - 0.75 + 0.5 @@ -289,7 +289,7 @@ 200 true 40 - 0.75 + 0.5 @@ -419,8 +419,6 @@ true 550 0.5 - 12 - 27 @@ -532,8 +530,6 @@ true 152 0.5 - 10 - 22 diff --git a/ModPatches/Morgante Mafia Weapons Pack/Patches/Morgante Mafia Weapons Pack/Weapons_Guns.xml b/ModPatches/Morgante Mafia Weapons Pack/Patches/Morgante Mafia Weapons Pack/Weapons_Guns.xml index 092533e1fe..29ee0938ec 100644 --- a/ModPatches/Morgante Mafia Weapons Pack/Patches/Morgante Mafia Weapons Pack/Weapons_Guns.xml +++ b/ModPatches/Morgante Mafia Weapons Pack/Patches/Morgante Mafia Weapons Pack/Weapons_Guns.xml @@ -166,7 +166,7 @@ CombatExtended.Verb_ShootCE true - Bullet_12Gauge_Buck + Bullet_12Gauge_Buck_SB 0.6 13 Shot_Shotgun @@ -177,7 +177,7 @@ 2 true 1.7 - AmmoSet_12Gauge + AmmoSet_12Gauge_SB Snapshot diff --git a/ModPatches/Moyo 2/Patches/Moyo 2/Race/AlienRace_Moyo.xml b/ModPatches/Moyo 2/Patches/Moyo 2/Race/AlienRace_Moyo.xml index c809b8903c..2d60f0f7a5 100644 --- a/ModPatches/Moyo 2/Patches/Moyo 2/Race/AlienRace_Moyo.xml +++ b/ModPatches/Moyo 2/Patches/Moyo 2/Race/AlienRace_Moyo.xml @@ -1,4 +1,4 @@ - + @@ -17,13 +17,13 @@
  • CombatExtended.CompPawnGizmo
    • -
  • +
  • 500 true 600 5 - 0.75 + 0.5
    • @@ -46,7 +46,7 @@ - /Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Moyo"]/tools + /Defs/AlienRace.ThingDef_AlienRace[defName="Alien_Moyo"]/tools
  • diff --git a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Bodies/Bodies_Moyo_Mech.xml b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Bodies/Bodies_Moyo_Mech.xml index 1c614bfcac..1021edc12c 100644 --- a/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Bodies/Bodies_Moyo_Mech.xml +++ b/ModPatches/Moyo from the depth/Patches/Moyo from the depth/Bodies/Bodies_Moyo_Mech.xml @@ -7,7 +7,6 @@ Defs/BodyDef[defName="Moyo_Hexapod"]//*[ def="Hexapod_TentacleJoint"] - @@ -21,7 +20,6 @@ def="Hexapod_Tentacle" ]/groups -
  • CoveredByNaturalArmor
    •  @@ -39,7 +37,6 @@ def="PressurePod_Seg4" or def="PressurePod_Seg5"] - @@ -58,7 +55,6 @@ def="MechanicalHead" or def="pressurepod_club"]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/Nearmare Race/Patches/Nearmare Race/Bodies/Bodies_Summon.xml b/ModPatches/Nearmare Race/Patches/Nearmare Race/Bodies/Bodies_Summon.xml index b390d73aba..ef531b8836 100644 --- a/ModPatches/Nearmare Race/Patches/Nearmare Race/Bodies/Bodies_Summon.xml +++ b/ModPatches/Nearmare Race/Patches/Nearmare Race/Bodies/Bodies_Summon.xml @@ -13,7 +13,6 @@ customLabel="rear left paw" or customLabel="rear right paw"] - @@ -29,7 +28,6 @@ def="Leg" or def="Paw"]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml index c5b8bad1e9..ecfc231087 100644 --- a/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml +++ b/ModPatches/Outer Rim - Core/Defs/Outer Rim - Core/Outer_Rim_Core_Ammo.xml @@ -7,13 +7,6 @@ AmmoAdvanced UI/Icons/ThingCategories/CaliberCharge - - - AmmoOuterRimTranqDart - - AmmoAdvanced - UI/Icons/ThingCategories/CaliberRocket - @@ -157,6 +150,17 @@ + + AmmoSet_PlasmaGasCartridge_DualShot + + + Bullet_BlasterBolt_DualShot + Bullet_BlasterBolt_DualShotAP + Bullet_BlasterBolt_DualShotIon + Bullet_BlasterBolt_DualShotStun + + + AmmoSet_PlasmaGasCartridgeIon_Pistol @@ -180,14 +184,6 @@ Bullet_BlasterSniper_Ion - - - AmmoSet_OuterRim_KnockoutDarts - - - Bullet_OR_KnockoutDart - - @@ -268,25 +264,6 @@ Bullet_BlasterPistol_Stun     - - Ammo_OuterRim_KnockoutDart - A small durasteel dart with an integrated injector that's laden with an extremely potent and fast-acting anesthetic. Favoured by bounty hunters who want to bring their targets in alive. - - - ThirdParty/StarWars/Ammo/KnockoutDart - Graphic_StackCount - - - 3.00 - - -
  • AmmoOuterRimTranqDart
    • -     - TranqNonLethal - 0 - Bullet_OR_KnockoutDart -     - @@ -600,11 +577,11 @@ TransparentPostLight     - 8 + 4
  • EMP - 5 + 9
    • 0.2 @@ -619,11 +596,11 @@ TransparentPostLight - 12 + 6
  • EMP - 8 + 14
    • 0.33 @@ -638,11 +615,11 @@ TransparentPostLight - 14 + 7
  • EMP - 11 + 18
    • 0.66 @@ -706,6 +683,75 @@ 15     + + + Bullet_BlasterBolt_DualShot + + OuterRim/Projectile/BlasterBolt_Red + Graphic_Single + TransparentPostLight + + + 18 + 3 + 22 + 2 + 4 + + + + + Bullet_BlasterBolt_DualShotAP + + OuterRim/Projectile/BlasterBolt_Red + Graphic_Single + TransparentPostLight + + + 12 + 4 + 33 + 2 + 4 + + + + + Bullet_BlasterBolt_DualShotIon + + OuterRim/Projectile/BlasterBolt_Blue + Graphic_Single + TransparentPostLight + + + 7 + +
  • + EMP + 18 +
    • +     + 0.33 + 2 + 4 +     +     + + + Bullet_BlasterBolt_DualShotStun + + OuterRim/Projectile/Proj_StunPulse + Graphic_Single + TransparentPostLight + + + Neuralizer + 1 + 90 + 2 + 4 + + @@ -1220,51 +1266,4 @@ OuterRim_HypertechFabrication     - - MakeAmmo_OuterRim_KnockoutDarts - - Craft 5 knockout darts. - Making knockout darts. - -
  • - - -
  • OuterRim_Durasteel
    • - - - 30 - -
  • - - -
  • Neutroamine
    • - - - 10 - -
  • - - -
  • OuterRim_ComponentHypertech
    • - - - 1 - -     - - -
  • OuterRim_Durasteel
    • -
  • Neutroamine
    • -
  • OuterRim_ComponentHypertech
    • -     -     - -
  • OuterRim_HypertechFabricator
    • -     - - 5 - - OuterRim_HypertechFabrication -     - \ No newline at end of file diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml index f0dfc80e54..4531d9cd90 100644 --- a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml +++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Armour.xml @@ -71,13 +71,6 @@ - - Defs/ThingDef[@Name="OuterRim_HelmetFabricatedBase"]/apparel/layers - -
  • StrappedHead
    • -     -     - Defs/ThingDef[@Name="OuterRim_PauldronsFabricatedBase"] diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml index 63417244f0..7e20dd24b8 100644 --- a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml +++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Grenades.xml @@ -781,14 +781,14 @@ - Defs/ThingDef[defName="OuterRim_FragGrenadeBelt" or defName="OuterRim_CryoBanGrenadeBelt" or defName="OuterRim_IonGrenadeBelt" or defName="OuterRim_PlasmaGrenadeBelt" or defName="OuterRim_SonicGrenadeBelt" or defName="OuterRim_StunGrenadeBelt" or defName="OuterRim_ThermalDetonatorBelt"]/comps/li[@Class="CompProperties_Reloadable"]/ammoCountToRefill + Defs/ThingDef[defName="OuterRim_FragGrenadeBelt" or defName="OuterRim_CryoBanGrenadeBelt" or defName="OuterRim_IonGrenadeBelt" or defName="OuterRim_PlasmaGrenadeBelt" or defName="OuterRim_SonicGrenadeBelt" or defName="OuterRim_StunGrenadeBelt" or defName="OuterRim_ThermalDetonatorBelt"]/comps/li[@Class="CompProperties_ApparelReloadable"]/ammoCountToRefill 1 - Defs/ThingDef[defName="OuterRim_FragGrenadeBelt" or defName="OuterRim_CryoBanGrenadeBelt" or defName="OuterRim_IonGrenadeBelt" or defName="OuterRim_PlasmaGrenadeBelt" or defName="OuterRim_SonicGrenadeBelt" or defName="OuterRim_StunGrenadeBelt" or defName="OuterRim_ThermalDetonatorBelt"]/comps/li[@Class="CompProperties_Reloadable"]/chargeNoun + Defs/ThingDef[defName="OuterRim_FragGrenadeBelt" or defName="OuterRim_CryoBanGrenadeBelt" or defName="OuterRim_IonGrenadeBelt" or defName="OuterRim_PlasmaGrenadeBelt" or defName="OuterRim_SonicGrenadeBelt" or defName="OuterRim_StunGrenadeBelt" or defName="OuterRim_ThermalDetonatorBelt"]/comps/li[@Class="CompProperties_ApparelReloadable"]/chargeNoun grenade diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml index 5a836c0211..7a43d5f3f6 100644 --- a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml +++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Jetpacks.xml @@ -6,54 +6,14 @@ 8 3 - 30 - - - Defs/ThingDef[@Name="OuterRim_JetpackBase"]/equippedStatOffsets - - - Defs/ThingDef[@Name="OuterRim_JetpackBase"] + + Defs/VFECore.Abilities.AbilityDef[@Name="OuterRimJetpackAbilityBase"]/range - -
  • - Verb_Jump - - false - true - True - false - 0.5 - JumpWarmupEffect - true - JumpFlightEffect - JumpPackLand - - true - false - false - -
    • -     - -
  • - 8 - Chemfuel - 10 - 60 - Standard_Reload - Misc4 - jump - false -
    • -     + 30     - - - Defs/ThingDef[defName="OuterRim_JT12Jetpack" or defName="OuterRim_IndustrialJetpack" or defName="OuterRim_MakeshiftJetpack"]/comps - \ No newline at end of file diff --git a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Vambraces.xml b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Vambraces.xml index 284b538608..b15f907da4 100644 --- a/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Vambraces.xml +++ b/ModPatches/Outer Rim - Core/Patches/Outer Rim - Core/Outer_Rim_Core_Vambraces.xml @@ -45,7 +45,7 @@ Defs/ThingDef[defName="OuterRim_Vambrace_FlameProjector"] -
  • +
  • 5 Chemfuel 10 @@ -66,7 +66,7 @@
  • - CombatExtended.Verb_ShootCE + CombatExtended.Verb_LaunchProjectileStaticCE true True 0.5 @@ -92,10 +92,10 @@ Defs/ThingDef[defName="OuterRim_Vambrace_KnockoutDart"] -
  • +
  • 5 - Ammo_OuterRim_KnockoutDart - 1 + Neutroamine + 10 60 Standard_Reload Misc4 @@ -139,7 +139,7 @@ Defs/ThingDef[defName="OuterRim_Vambrace_Cryoban"] -
  • +
  • 5 Neutroamine 10 diff --git a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Droids.xml b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Droids.xml index b5539c7b44..2446157791 100644 --- a/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Droids.xml +++ b/ModPatches/Outer Rim - Droid Depot/Patches/Outer Rim - Droid Depot/Outer_Rim_Droid_Droids.xml @@ -18,7 +18,7 @@ 1 - + Defs/Asimov.PawnDef[defName="OuterRim_BattleDroid" or defName="OuterRim_BattleDroidAdvanced" or defName="OuterRim_MagnaGuardDroid" or defName="OuterRim_ProtocolDroid" or defName="OuterRim_CommandoDroid" or defName="OuterRim_HKDroid" or defName="OuterRim_ImperialLaborDroid" or defName="OuterRim_KXSecurityDroid" or defName="OuterRim_SuperTacticalDroid" or defName="OuterRim_TacticalDroid"]/tools @@ -93,7 +93,7 @@ Defs/Asimov.PawnDef[@Name="OuterRim_BaseHumanoidDroid"] - + @@ -118,7 +118,7 @@ 200 true 500 --> - 0.75 + 0.5 + Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlasterIon"] - - -
  • - - CombatExtended.Verb_ShootCE - true - False - 0.5 - 36 - 0 - false - OuterRim_Shot_BlasterBolt - GunTail_Medium - 0 - true - - true - true - - true - Bullet_BlasterRifle_Ion - Combat_RangedFire -
    • - -     - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_WristBlasterIon"] - - -
  • - 100 - Ammo_PlasmaGasCartridge_Ion - 2 - 60 - Standard_Reload - Misc4 - shot - false -
    • -     -     + + + Defs/ThingDef[defName="OuterRim_GNKDroid"]/modExtensions/li[@Class="Asimov.DefModExt_AutomatonApparel"]/apparelWhitelist/li[.="OuterRim_DroidWeapon_WristBlasterIon"] - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket"] - - -
  • - - CombatExtended.Verb_ShootCE - true - True - 0.75 - 45 - 0 - true - OuterRim_Shot_RocketLauncher - GunTail_Medium - 0 - true - - true - true - - true - Bullet_OR_WristRocket - Combat_RangedFire -
    • -     -     + + + OuterRim_DroidWeapon_TwinWristBlaster + + 0.95 + 0.16 + 0.75 + 1.00 + 1.00 + 0.5 + + + 1.2 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterBolt_DualShot + 1 + 44 + 6 + 4 + OuterRim_Shot_BlasterBolt + GunTail_Medium + 9 + 4 + + true + + + + AimedShot + 2 + + + 200 + 3 + AmmoSet_PlasmaGasCartridge_DualShot + - - - Defs/ThingDef[defName="OuterRim_DroidWeapon_WristRocket"] - - -
  • - 3 - Ammo_OR_MiniRocket_Standard - 1 - 60 - Standard_Reload - Misc4 - rocket - false -
    • -     -     + + + OuterRim_DroidWeapon_BlasterCannon + + 2.5 + 0.01 + 2.25 + 1.00 + 1.00 + 0.5 + + + 1.5 + CombatExtended.Verb_ShootCE + true + Bullet_BlasterSniper_Red + 2.0 + 75 + OuterRim_Shot_DLT19DBlasterBolt + GunTail_Medium + 12 + 3 + + true + + + + AimedShot + + + 120 + 3 + AmmoSet_PlasmaGasCartridgeRed_Sniper + + + + + OuterRim_DroidWeapon_WristRocket + + 1.0 + 0.39 + 1.10 + 0.08 + 1.20 + 1.00 + + + 1.45 + CombatExtended.Verb_ShootCE + true + Bullet_OR_WristRocket + 3.0 + 75 + OuterRim_Shot_RocketLauncher + GunTail_Medium + 9 + + true + + + + 1 + 3 + AmmoSet_OuterRimMiniRockets + + + AimedShot + \ No newline at end of file diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Jetpacks.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Jetpacks.xml deleted file mode 100644 index 59066ea3db..0000000000 --- a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Jetpacks.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - Defs/ThingDef[defName="OuterRim_ImperialJetpack"]/comps - - - \ No newline at end of file diff --git a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml index 2bee6d0687..e9515fdb67 100644 --- a/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml +++ b/ModPatches/Outer Rim - Galactic Empire/Patches/Outer Rim - Galactic Empire/Outer_Rim_Galactic_Empire_Ranged_Weapons.xml @@ -204,11 +204,11 @@ 1.2 CombatExtended.Verb_ShootCE true - Bullet_BlasterRifle_Red + Bullet_BlasterBolt_DualShot 1 44 - 2 - 8 + 6 + 4 OuterRim_Shot_E11BlasterBolt GunTail_Medium 12 @@ -219,12 +219,12 @@ AimedShot - 4 + 2 112 4.4 - AmmoSet_PlasmaGasCartridgeRed_Rifle + AmmoSet_PlasmaGasCartridge_DualShot     diff --git a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Jetpacks.xml b/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Jetpacks.xml deleted file mode 100644 index fa12f917cf..0000000000 --- a/ModPatches/Outer Rim - Mandalore/Patches/Outer Rim - Mandalore/Outer_Rim_Mandalorian_Jetpacks.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - Defs/ThingDef[defName="OuterRim_Z6Jetpack" or defName="OuterRim_SupercommandoJetpack"]/comps - - - \ No newline at end of file diff --git a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Jetpacks.xml b/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Jetpacks.xml deleted file mode 100644 index 8a820ebf79..0000000000 --- a/ModPatches/Outer Rim - Rebel Alliance/Patches/Outer Rim - Rebel Alliance/Outer_Rim_Rebel_Jetpacks.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - Defs/ThingDef[defName="OuterRim_RebelJetpack"]/comps - - - \ No newline at end of file diff --git a/ModPatches/Paniel the Automata/Patches/Paniel the Automata/Bodies/Paniel_Bodytype.xml b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/Bodies/Paniel_Bodytype.xml index e48e2f06ce..b00075917f 100644 --- a/ModPatches/Paniel the Automata/Patches/Paniel the Automata/Bodies/Paniel_Bodytype.xml +++ b/ModPatches/Paniel the Automata/Patches/Paniel the Automata/Bodies/Paniel_Bodytype.xml @@ -50,7 +50,6 @@ def="PNToe" or def="PNTail"]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/Warcasket Persona Weapons/Patches/Warcasket Persona Weapons/Weapons_Warcaskets.xml b/ModPatches/Persona Warcasket Weapons/Patches/Persona Warcasket Weapons/Weapons_Warcaskets.xml similarity index 72% rename from ModPatches/Warcasket Persona Weapons/Patches/Warcasket Persona Weapons/Weapons_Warcaskets.xml rename to ModPatches/Persona Warcasket Weapons/Patches/Persona Warcasket Weapons/Weapons_Warcaskets.xml index 148b0e599c..aa9ac424b5 100644 --- a/ModPatches/Warcasket Persona Weapons/Patches/Warcasket Persona Weapons/Weapons_Warcaskets.xml +++ b/ModPatches/Persona Warcasket Weapons/Patches/Persona Warcasket Weapons/Weapons_Warcaskets.xml @@ -1,23 +1,9 @@ - - - Defs/ToolCapacityDef[ - defName="BifurcatorCleave" or - defName="CrustbreakerSmash" - ] - - -
  • - true -
    • -     -     - - Defs/ThingDef[defName="WP_Kyokatana"]/statBases + Defs/ThingDef[defName="GS_Kyokatana"]/statBases 35 1 @@ -25,17 +11,19 @@ - - Defs/ThingDef[defName="WP_Kyokatana"]/equippedStatOffsets/MeleeDodgeChance + + Defs/ThingDef[defName="GS_Kyokatana"] - 0.02 - 0.47 - 0.18 + + 0.02 + 0.47 + 0.18 + - Defs/ThingDef[defName="WP_Kyokatana"]/tools + Defs/ThingDef[defName="GS_Kyokatana"]/tools
  • @@ -48,10 +36,6 @@ 9 64 -
  • - WP_WhiteHotBurn - 10 -
  • Flame 10 @@ -69,10 +53,6 @@ 17 48 -
  • - WP_WhiteHotBurn - 10 -
  • Flame 10 @@ -86,13 +66,13 @@ - Defs/ThingDef[defName="WP_Bifurcator"]/tools + Defs/ThingDef[defName="GS_bifurcator"]/tools
  • - + -
  • BifurcatorCleave
    • +
  • Blunt
    • 62 5.73 @@ -105,7 +85,7 @@     - Defs/ThingDef[defName="WP_Bifurcator"] + Defs/ThingDef[defName="GS_bifurcator"] 0.8 @@ -116,7 +96,7 @@ - Defs/ThingDef[defName="WP_Bifurcator"]/statBases + Defs/ThingDef[defName="GS_bifurcator"]/statBases 16 1.75 @@ -126,7 +106,7 @@ - Defs/ThingDef[defName="WP_Voltrender"]/statBases + Defs/ThingDef[defName="GS_Voltrender"]/statBases 15 1 @@ -135,7 +115,7 @@ - Defs/ThingDef[defName="WP_Voltrender"] + Defs/ThingDef[defName="GS_Voltrender"] 0.02 @@ -146,18 +126,42 @@ - Defs/ThingDef[defName="WP_Voltrender"]/tools + Defs/ThingDef[defName="GS_Voltrender"]/tools +
  • + + +
  • Stab
    • + + 46 + 2.6 + 9 + 38 + +
  • + EMP + 10 + 0.5 +
    • +     +
  • -
  • VoltaicSlash
    • +
  • Cut
    • 52 2.6 17 28 + +
  • + EMP + 10 + 0.5 +
    • +     @@ -165,13 +169,13 @@ - Defs/ThingDef[defName="WP_Crustbreaker"]/tools + Defs/ThingDef[defName="GS_crustbreaker"]/tools
  • -
  • CrustbreakerSmash
    • +
  • Blunt
    • 92 5.73 @@ -183,7 +187,7 @@     - Defs/ThingDef[defName="WP_Crustbreaker"] + Defs/ThingDef[defName="GS_crustbreaker"] 0.8 @@ -194,7 +198,7 @@ - Defs/ThingDef[defName="WP_Crustbreaker"]/statBases + Defs/ThingDef[defName="GS_crustbreaker"]/statBases 18 2 diff --git a/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_FR.xml b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_FR.xml index afef20a13a..6901328dcb 100644 --- a/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_FR.xml +++ b/ModPatches/Pratt WWII Weapons Pack/Patches/Pratt WWII Weapons Pack/PWW2_CE_Patch_Weapons_Ranged_FR.xml @@ -267,7 +267,7 @@ CombatExtended.Verb_ShootCE true - Bullet_12Gauge_Buck + Bullet_12Gauge_Buck_SB 0.6 11 Shot_Shotgun @@ -278,7 +278,7 @@ 2 1.7 - AmmoSet_12Gauge + AmmoSet_12Gauge_SB diff --git a/ModPatches/Profaned/Defs/Profaned/PossessedWeapons_Ammo.xml b/ModPatches/Profaned/Defs/Profaned/PossessedWeapons_Ammo.xml new file mode 100644 index 0000000000..405c366e5b --- /dev/null +++ b/ModPatches/Profaned/Defs/Profaned/PossessedWeapons_Ammo.xml @@ -0,0 +1,104 @@ + + + + + Profaned_RotStinkArrow + + rot stink + The arrow head is made from steel to enhance armor penetration. Attached is rotting meat to inflict dangerous infection. + + + + + AmmoSet_ProfanedGreatbowArrow + + + Projectile_GreatArrow_Stone + Projectile_GreatArrow_Steel + Projectile_GreatArrow_Plasteel + Projectile_GreatArrow_Venom + Projectile_GreatArrow_Flame + Projectile_ProfanedGreatbowArrow + + + + + Ammo_ProfanedGreatbowArrow + + + Things/Ammo/Neolithic/Arrow/Venom + Graphic_StackCount + + + 0.045 + 0.26 + + Profaned_RotStinkArrow + +
  • CE_AutoEnableCrafting_CraftingSpot
    • +     +     + + + Projectile_ProfanedGreatbowArrow + + + Things/Projectiles/ProfanedGreatbowArrow + Graphic_Single + + + 26 + BotchJob_RotArrow + 12 + 2.96 + 3 + + + + + MakeAmmo_ProfanedGreatbowArrow + + Craft 10 rot stink great arrows. + Making rot stink great arrows. + 1600 + +
  • + + +
  • WoodLog
    • + + + 2 + +
  • + + +
  • Steel
    • + + + 2 + +
  • + + +
  • MeatRaw
    • + + + 3 + +     + + +
  • WoodLog
    • +
  • Steel
    • +     + +
  • MeatRaw
    • +     +     + + 10 + +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Defs/Profaned/Profaned_CE_Projectiles.xml b/ModPatches/Profaned/Defs/Profaned/Profaned_CE_Projectiles.xml new file mode 100644 index 0000000000..d2d1c4a5a0 --- /dev/null +++ b/ModPatches/Profaned/Defs/Profaned/Profaned_CE_Projectiles.xml @@ -0,0 +1,36 @@ + + + + + Projectile_ProfanedDragon_ToxicBreath_CE + + CombatExtended.ProjectileCE_Explosive + + +
  • + 1.0 + 1 + (255, 161, 0, 0.19) +
    • +     + + Things/Projectiles/ToxicflameSurge/ToxicflameSurgeA + Graphic_Single + MoteGlow + + + false + BotchJob_DragonToxicBreathDamage + 3 + 3.0 + 2.0 + 30 + 3.5 + true + Filth_Ash + .3 + 30 + +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Defs/Profaned/Profaned_DamageDef.xml b/ModPatches/Profaned/Defs/Profaned/Profaned_DamageDef.xml new file mode 100644 index 0000000000..0aa04fef60 --- /dev/null +++ b/ModPatches/Profaned/Defs/Profaned/Profaned_DamageDef.xml @@ -0,0 +1,19 @@ + + + + + BotchJob_CE_RotStabDamage + + +
  • + LungRotExposure + 0.005 + ToxicResistance + true + true +
    • +     + false +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Defs/Profaned/Profaned_ManueverDef.xml b/ModPatches/Profaned/Defs/Profaned/Profaned_ManueverDef.xml new file mode 100644 index 0000000000..fc85a7abda --- /dev/null +++ b/ModPatches/Profaned/Defs/Profaned/Profaned_ManueverDef.xml @@ -0,0 +1,18 @@ + + + + + BotchJob_CE_RotStabManeuver + BotchJob_CE_RotStab + + Verb_MeleeAttackDamage + BotchJob_CE_RotStabDamage + + MeleeAttack + Maneuver_Slash_MeleeHit + Maneuver_Slash_MeleeDeflect + Maneuver_Slash_MeleeMiss + Maneuver_Slash_MeleeDodge + + + \ No newline at end of file diff --git a/ModPatches/Profaned/Defs/Profaned/Profaned_ToolCapacityDef.xml b/ModPatches/Profaned/Defs/Profaned/Profaned_ToolCapacityDef.xml new file mode 100644 index 0000000000..1ecdb3e546 --- /dev/null +++ b/ModPatches/Profaned/Defs/Profaned/Profaned_ToolCapacityDef.xml @@ -0,0 +1,30 @@ + + + + + BotchJob_CE_RotStab + + + + + BotchJob_CE_ProfanedStaffCast + MapOnly + 2 + True + PrioritizeNearest + +
  • + +
  • + Misc/BotchJob_ProfanedStaffCast +
    • + + 30~30 + 0.95~1.05 + 0~70 + False + +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/AnimalGear/Profaned_AnimalGear_Patch.xml b/ModPatches/Profaned/Patches/Profaned/AnimalGear/Profaned_AnimalGear_Patch.xml new file mode 100644 index 0000000000..d659555ce0 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/AnimalGear/Profaned_AnimalGear_Patch.xml @@ -0,0 +1,22 @@ + + + + + +
  • Animal Gear
    • +     + + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedHorseBarding"]/statBases/StuffEffectMultiplierArmor + + 6 + +
    • + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/DamageDef/Profaned_DamagedDef.xml b/ModPatches/Profaned/Patches/Profaned/DamageDef/Profaned_DamagedDef.xml new file mode 100644 index 0000000000..97d256a4df --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/DamageDef/Profaned_DamagedDef.xml @@ -0,0 +1,32 @@ + + + + + Defs/DamageDef[defName="BotchJob_GraspingDeadDamage"]/defaultArmorPenetration + + 10 + + + + + Defs/DamageDef[defName="BotchJob_IceShardsDamage"]/defaultArmorPenetration + + 3 + + + + + Defs/DamageDef[defName="BotchJob_AbyssalDamage"]/defaultArmorPenetration + + 10 + + + + + Defs/DamageDef[defName="BotchJob_RotstinkBlast"]/defaultArmorPenetration + + 5 + + + + \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/GeneDefs/Profaned_GeneDef_Patch.xml b/ModPatches/Profaned/Patches/Profaned/GeneDefs/Profaned_GeneDef_Patch.xml new file mode 100644 index 0000000000..5c45435765 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/GeneDefs/Profaned_GeneDef_Patch.xml @@ -0,0 +1,19 @@ + + + + + Defs/GeneDef[defName="BotchJob_SkeletalBody"]/statOffsets/ArmorRating_Blunt + + -1.0 + + + + + Defs/GeneDef[defName="BotchJob_UndeadPsysiology"]/statFactors + + 0 + 0 + + + + \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/PawnKindDef/Profaned_PawnkindDef_Patch.xml b/ModPatches/Profaned/Patches/Profaned/PawnKindDef/Profaned_PawnkindDef_Patch.xml new file mode 100644 index 0000000000..067174a2a1 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/PawnKindDef/Profaned_PawnkindDef_Patch.xml @@ -0,0 +1,90 @@ + + + + + Defs/PawnKindDef[defName="BotchJob_ProfanedDrudge"] + +
  • + + 15 + 30 + + 15 + +
  • + 0.25 + + 20 + 120 + + +
  • CE_Sidearm_Tribal
    • + + + + +     +     + + + Defs/PawnKindDef[defName="BotchJob_ProfanedHeadhunter"] + +
  • + + 20 + 40 + + 20 + +
  • + 0.5 + + 150 + 350 + + +
  • CE_Sidearm_Melee
    • + + + + +     +     + + + Defs/PawnKindDef[defName="BotchJob_ProfanedDrudge"]/apparelRequired + + Defs/PawnKindDef[defName="BotchJob_ProfanedDrudge"] + + +
  • CE_Apparel_TribalBackpack
    • +     +     +     + + Defs/PawnKindDef[defName="BotchJob_ProfanedDrudge"]/apparelRequired + +
  • CE_Apparel_TribalBackpack
    • +     +     +     + + + Defs/PawnKindDef[defName="BotchJob_ProfanedHeadhunter"]/apparelRequired + + Defs/PawnKindDef[defName="BotchJob_ProfanedHeadhunter"] + + +
  • CE_Apparel_TribalBackpack
    • +     +     +     + + Defs/PawnKindDef[defName="BotchJob_ProfanedHeadhunter"]/apparelRequired + +
  • CE_Apparel_TribalBackpack
    • +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/Scenarios/Profaned_Scenario_Patch.xml b/ModPatches/Profaned/Patches/Profaned/Scenarios/Profaned_Scenario_Patch.xml new file mode 100644 index 0000000000..bedd33f5b8 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/Scenarios/Profaned_Scenario_Patch.xml @@ -0,0 +1,15 @@ + + + + + Defs/ScenarioDef[defName="BotchJob_ProfanedStart"]/scenario/parts + +
  • + StartingThing_Defined + Ammo_Arrow_Steel + 100 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Items/Profaned_Items_Resources.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Items/Profaned_Items_Resources.xml new file mode 100644 index 0000000000..fba17085ad --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Items/Profaned_Items_Resources.xml @@ -0,0 +1,29 @@ + + + + + Defs/ThingDef[defName="BotchJob_ColossusHeart"]/statBases + + 2 + + + + + Defs/ThingDef[ + defName="BotchJob_LuminousDust" or + defName="BotchJob_CorruptedBlood" or + defName="BotchJob_TaintedBone"]/statBases + + + 0.5 + + + + + Defs/ThingDef[@Name="BotchJob_ProfanePotionBase"]/statBases + + 0.2 + + + + \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Armor.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Armor.xml new file mode 100644 index 0000000000..87df78c0e8 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Armor.xml @@ -0,0 +1,301 @@ + + + + + + Defs/ThingDef[defName="BotchJob_TatteredUndershirt" or defName="BotchJob_RaggedLegwraps"]/statBases + + 2 + 1 + + + + + Defs/ThingDef[defName="BotchJob_TatteredUndershirt" or defName="BotchJob_RaggedLegwraps"]/statBases/StuffEffectMultiplierArmor + + 3 + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedCloak"]/statBases + + 3 + 0.5 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedCloak"]/statBases/StuffEffectMultiplierArmor + + 3 + + + + + + Defs/ThingDef[defName="BotchJob_WeatheredChainmail"]/statBases + + 30 + 12 + + + + + Defs/ThingDef[defName="BotchJob_WeatheredChainmail"]/statBases/StuffEffectMultiplierArmor + + 1.85 + + + + + Defs/ThingDef[defName="BotchJob_WeatheredChainmail"]/statBases/Mass + + 6 + + + + + Defs/ThingDef[defName="BotchJob_WeatheredChainmail"]/apparel/bodyPartGroups + + +
  • Torso
    • +
  • Shoulders
    • +
  • Arms
    • +     +     +     + + + Defs/ThingDef[defName="BotchJob_WeatheredChainmail"]/equippedStatOffsets/MoveSpeed + + + + + Defs/ThingDef[defName="BotchJob_WeatheredPauldron"]/statBases + + 5 + 1 + + + + + Defs/ThingDef[defName="BotchJob_WeatheredPauldron"]/statBases/StuffEffectMultiplierArmor + + 2.25 + + + + + Defs/ThingDef[defName="BotchJob_WeatheredPauldron"]/statBases/Mass + + 3 + + + + + Defs/ThingDef[defName="BotchJob_WeatheredPauldron"]/apparel/bodyPartGroups + + +
  • Shoulders
    • +
  • Arms
    • +     +     +     + + + Defs/ThingDef[defName="BotchJob_WeatheredPauldron"] + +
  • + +
  • + 0.80 + +
  • Arm
    • + + +
  • + 0.80 + +
  • Arm
    • + + + + +     +     + + + + Defs/ThingDef[defName="BotchJob_HeadhunterPauldron"]/statBases + + 5 + 1 + + + + + Defs/ThingDef[defName="BotchJob_HeadhunterPauldron"]/statBases/StuffEffectMultiplierArmor + + 3 + + + + + Defs/ThingDef[defName="BotchJob_HeadhunterPauldron"]/statBases/Mass + + 3 + + + + + Defs/ThingDef[defName="BotchJob_HeadhunterPauldron"]/apparel/bodyPartGroups + + +
  • Shoulders
    • +
  • Arms
    • +     +     +     + + + Defs/ThingDef[defName="BotchJob_HeadhunterPauldron"] + +
  • + +
  • + 0.80 + +
  • Arm
    • + + +
  • + 0.80 + +
  • Arm
    • + + + + +     +     + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightArmor"]/statBases + + 100 + 10 + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightArmor"]/statBases/StuffEffectMultiplierArmor + + 3 + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightArmor"]/equippedStatOffsets/MoveSpeed + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightArmor"]/equippedStatOffsets + + -0.15 + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightArmor"]/apparel/bodyPartGroups + +
  • Hands
    • +
  • Feet
    • +     +     + + + Defs/ThingDef[defName="BotchJob_ScourgeknightArmor"] + +
  • + +
  • + 0.70 + +
  • Neck
    • + + +
  • + 0.70 + +
  • Neck
    • + + +
  • + 0.90 + +
  • Leg
    • + + +
  • + 0.90 + +
  • Leg
    • + + +
  • + 0.80 + +
  • Arm
    • + + +
  • + 0.80 + +
  • Arm
    • + + +
  • + 0.60 + +
  • Hand
    • + + +
  • + 0.60 + +
  • Hand
    • + + + + +     +     + + + + Defs/ThingDef[defName="BotchJob_GravetenderRobes"]/statBases + + 20 + 6 + + + + + Defs/ThingDef[defName="BotchJob_GravetenderRobes"]/statBases/StuffEffectMultiplierArmor + + 3 + + + + + Defs/ThingDef[defName="BotchJob_GravetenderRobes"]/statBases + + 0.45 + 0.9 + + + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Helmets.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Helmets.xml new file mode 100644 index 0000000000..9fbd463e31 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Helmets.xml @@ -0,0 +1,138 @@ + + + + + + Defs/ThingDef[defName="BotchJob_TatteredCowl"]/statBases + + 3 + 0.5 + + + + + Defs/ThingDef[defName="BotchJob_TatteredCowl"]/statBases/StuffEffectMultiplierArmor + + 4 + + + + + + Defs/ThingDef[defName="BotchJob_HeadhunterBandages"]/statBases + + 1 + 0.5 + + + + + Defs/ThingDef[defName="BotchJob_HeadhunterBandages"]/statBases/StuffEffectMultiplierArmor + + 2 + + + + + + Defs/ThingDef[defName="BotchJob_WeatheredKettleHelmet"]/apparel/bodyPartGroups + + +
  • UpperHead
    • +
  • Neck
    • +     +     +     + + + Defs/ThingDef[defName="BotchJob_WeatheredKettleHelmet"]/statBases + + 4 + 1 + + + + + Defs/ThingDef[defName="BotchJob_WeatheredKettleHelmet"]/statBases/StuffEffectMultiplierArmor + + 2.2 + + + + + + Defs/ThingDef[ defName="BotchJob_WeatheredChainmailCoif"]/apparel/bodyPartGroups + +
  • Teeth
    • +     +     + + + Defs/ThingDef[defName="BotchJob_WeatheredChainmailCoif"]/statBases + + 4 + 1 + + + + + Defs/ThingDef[defName="BotchJob_WeatheredChainmailCoif"]/statBases/StuffEffectMultiplierArmor + + 1.65 + + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightHelmet"]/statBases + + 6 + 1 + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightHelmet"]/equippedStatOffsets/ShootingAccuracyPawn + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightHelmet"]/equippedStatOffsets + + -0.4 + -2 + -0.20 + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightHelmet"]/statBases/StuffEffectMultiplierArmor + + 3.75 + + + + + + Defs/ThingDef[defName="BotchJob_BoneCrown"]/statBases + + 3 + 1 + + + + + Defs/ThingDef[defName="BotchJob_BoneCrown"]/statBases/StuffEffectMultiplierArmor + + 4 + + + + + Defs/ThingDef[defName="BotchJob_BoneCrown"]/statBases + + 0.45 + 0.9 + + + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Shields.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Shields.xml new file mode 100644 index 0000000000..965cf677c0 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_Apparel_Shields.xml @@ -0,0 +1,143 @@ + + + + + +
  • Vanilla Expanded Framework
    • +     + + + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/thingClass + + CombatExtended.Apparel_Shield + +
    • + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"] + ParentName + ArmorSmithableBase +
    • + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/apparel/layers + + +
  • Shield
    • + +     + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/apparel/bodyPartGroups + + +
  • LeftShoulder
    • + +     + + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/tools +
    • + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/comps/li[@Class="VFECore.CompProperties_Shield"] +
    • + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"] + +
  • + +
  • Hands
    • +
  • Arms
    • +
  • Shoulders
    • +
  • Torso
    • +
  • Neck
    • + + +     + + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/statBases + + 8 + 5 + +
    • + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/equippedStatOffsets + + + -0.2 + -1 + -0.15 + -0.08 + -0.25 + -0.05 + 1.0 + + +
    • + + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/statBases/StuffEffectMultiplierArmor + + 2.85 + +
    • + +
  • + Defs/ThingDef[defName="BotchJob_ProfanedShield"]/apparel + + +
  • + CombatExtended.PawnRenderNode_Apparel + CombatExtended.PawnRenderNodeWorker_Drafted + Things/Pawn/Humanlike/Apparel/Misc/ProfanedShield + CutoutComplex + ApparelBody + + 0.65 + + 80 + + + -5 + (0, 0, -0.2) + 30 + + + -30 + + + -5 + (0.2, 0, -0.2) + + + (0.2, 0, -0.2) + + +
    • + + + + + + +     + + \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_Projectiles.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_Projectiles.xml new file mode 100644 index 0000000000..2395f7113e --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_Projectiles.xml @@ -0,0 +1,162 @@ + + + + + + Defs/ThingDef[ + defName="BotchJob_BoneProjectile" or + defName="BotchJob_SoulShard" or + defName="BotchJob_SpectralGreatbowArrow"]/thingClass + + + CombatExtended.BulletCE + + + + + Defs/ThingDef[ + defName="BotchJob_ColossusSmashProj" or + defName="BotchJob_WraithClaw" or + defName="BotchJob_DragonToxicBreath" or + defName="BotchJob_PutridMass" or + defName="BotchJob_BloodflameStaffBolt" or + defName="BotchJob_ProfanedStaffBolt"]/thingClass + + + CombatExtended.ProjectileCE_Explosive + + + + + + Defs/ThingDef[defName="BotchJob_ColossusSmashProj"]/projectile + + + 3 + 3.0 + 2.0 + BotchJob_ColossusSmash + 15 + MortarBomb_Explode + 30 + 5 + 25 + true + BotchJob_ColossusSmashEffect + + + + + + Defs/ThingDef[defName="BotchJob_WraithClaw"]/projectile + + + 1.5 + 3.0 + 2.0 + BotchJob_WraithClawBlast + 15 + MortarBomb_Explode + 20 + 20 + 40 + true + + + + + + Defs/ThingDef[defName="BotchJob_PutridMass"]/projectile + + + 4.5 + 3.0 + 2.0 + BotchJob_RotstinkBlast + 27 + 38 + RotStink + BotchJob_Filth_Undead + 0.5 + 20 + + + + + + Defs/ThingDef[defName="BotchJob_BloodflameStaffBolt"]/projectile + + + 3 + 3.0 + 2.0 + BotchJob_BloodflameRotstinkBlast + 27 + 16 + RotStink + 20 + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedStaffBolt"]/projectile + + + 2 + 3.0 + 2.0 + BotchJob_BloodflameRotstinkBlast + 27 + 16 + RotStink + 20 + + + + + + + Defs/ThingDef[defName="BotchJob_BoneProjectile"]/projectile + + + true + BotchJob_BoneImpact + 15 + 19 + 0 + 3 + 1.2 + + + + + + Defs/ThingDef[defName="BotchJob_SoulShard"]/projectile + + + true + RangedStab + 15 + 19 + 3 + 1 + 1.2 + + + + + + Defs/ThingDef[defName="BotchJob_SpectralGreatbowArrow"]/projectile + + + Arrow + 8 + 26 + 2.96 + 3 + + + + + \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_VerbShoot.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_VerbShoot.xml new file mode 100644 index 0000000000..3395b9b16d --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Profaned_CE_Patch_VerbShoot.xml @@ -0,0 +1,121 @@ + + + + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"]/verbs + + +
  • + CombatExtended.Verb_ShootCE + true + BotchJob_ColossusSmashProj + 4 + 1 + 2 + 1 + 5 + BotchJob_ColossusRoar + 0 + true + + 0.5 +
    • +     +     +     + + + + Defs/ThingDef[defName="BotchJob_Wraith"]/verbs + + +
  • + CombatExtended.Verb_ShootCE + true + BotchJob_WraithClaw + 2.4 + 1 + 2 + 1 + 20 + Interact_BeatFire + 0 + + 0.8 +
    • +     +     +     + + + + Defs/ThingDef[defName="BotchJob_Skeleton"]/verbs + + +
  • + CombatExtended.Verb_ShootCE + true + BotchJob_BoneProjectile + 2 + 1 + 2 + 1 + 14 + Interact_BeatFire + 0 + + 0.8 +
    • +     +     +     + + + + + Defs/ThingDef[defName="BotchJob_UndeadDragon"]/verbs + + + +
  • + CombatExtended.Verb_ShootCE + true + Projectile_ProfanedDragon_ToxicBreath_CE + 1.4 + 10 + 4 + 24 + BotchJob_ProfanedStaffCast + 2 + + 10 + UI/Icons/Misc/BotchJob_ToxicflameSurgeIcon + + true + + 0.8 +
    • +
  • + CombatExtended.Verb_ShootCE + true + BotchJob_PutridMass + 2.2 + 5 + 32 + 3 + 20 + CocoonDestroyed + 1 + + + true + + UI/Icons/Misc/BotchJob_PutridMassIcon + 0.8 +
    • +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Melee.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Melee.xml new file mode 100644 index 0000000000..dee63472cb --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Melee.xml @@ -0,0 +1,783 @@ + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedWarAxe"]/statBases + + 3 + 0.22 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedWarAxe"] + + + 0.31 + 0.22 + 0.22 + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedWarAxe"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + + Defs/ThingDef[defName="BotchJob_ProfanedWarAxe"]/tools + + +
  • + + +
  • Poke
    • + + 3 + 0.95 + 0.05 + 0.8 + Shaft + +
  • + + +
  • BotchJob_RotCut
    • + + 15 + 1.59 + 0.25 + 3.6 + 2.32 + Point + +
  • + + +
  • BotchJob_RotCut
    • + + 23 + 1.58 + 0.70 + 3.6 + 0.75 + Edge + +     +     +     + + + + Defs/ThingDef[defName="BotchJob_ProfanedScimitar"]/statBases + + 4 + 0.38 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedScimitar"]/statBases/Mass + + 1.1 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedScimitar"] + + + 0.24 + 0.38 + 0.28 + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedScimitar"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + + Defs/ThingDef[defName="BotchJob_ProfanedScimitar"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.54 + 0.55 + 0.15 + Handle + +
  • + + +
  • BotchJob_CE_RotStab
    • + + 23 + 1.54 + 0.55 + 0.31 + Point + +
  • + + +
  • BotchJob_RotCut
    • + + 28 + 1.25 + 1.782 + 0.8 + Edge + +     +     +     + + + + Defs/ThingDef[defName="BotchJob_ProfanedShotel"]/statBases + + 4 + 0.27 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedShotel"]/statBases/Mass + + 1.8 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedShotel"] + + + 0.19 + 0.17 + 0.3 + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedShotel"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + + + Defs/ThingDef[defName="BotchJob_ProfanedShotel"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 1.44 + 0.425 + 0.15 + Handle + +
  • + + +
  • BotchJob_CE_RotStab
    • + + 18 + 1.74 + 0.9 + 1 + Point + +
  • + + +
  • BotchJob_RotCut
    • + + 28 + 1.62 + 2.025 + 0.90 + Edge + +     +     +     + + + + Defs/ThingDef[defName="BotchJob_ProfanedClub"]/tools + + +
  • + + +
  • Poke
    • + + 4 + 0.33 + 1.78 + 1 + Handle + +
  • + + +
  • Blunt
    • + + 11 + 3.48 + 4 + Head + +     +     +     + + + Defs/ThingDef[defName="BotchJob_ProfanedClub"]/statBases + + 4 + 0.15 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedClub"] + + + 0.67 + 0.15 + 0.2 + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedClub"]/weaponTags + + Defs/ThingDef[defName="BotchJob_ProfanedClub"] + + + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedClub"]/weaponTags + +
  • CE_Sidearm_Tribal
    • +
  • CE_OneHandedWeapon
    • +     +     + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightGreatsword" or defName="BotchJob_GraspingDeadGreatsword"]/statBases + + 12 + 0.70 + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightGreatsword" or defName="BotchJob_GraspingDeadGreatsword"] + + + 0.30 + 1.20 + 0.50 + + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightGreatsword" or defName="BotchJob_GraspingDeadGreatsword"]/tools + + +
  • + + +
  • Poke
    • + + 5 + 1.97 + 0.05 + 1.5 + Handle + +
  • + + +
  • BotchJob_CE_RotStab
    • + + 24 + 1.98 + 0.50 + 0.8 + 1.90 + Point + +
  • + + +
  • BotchJob_RotCut
    • + + 48 + 2.86 + 0.45 + 3.592 + 0.58 + Edge + +     +     +     + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightGreataxe"]/statBases + + 7 + 0.35 + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightGreataxe"] + + + 0.30 + 0.40 + 0.23 + + + + + + Defs/ThingDef[defName="BotchJob_ScourgeknightGreataxe"]/tools + + +
  • + + +
  • Poke
    • + + 3 + 1.3 + 0.05 + 0.8 + Shaft + +
  • + + +
  • Blunt
    • + + 15 + 2.18 + 0.25 + 9.6 + Head + +
  • + + +
  • BotchJob_RotCut
    • + + 37 + 2.18 + 0.70 + 9.6 + 0.95 + Edge + +     +     +     + + + + Defs/ThingDef[defName="BotchJob_FrostboundGreataxe"]/statBases + + 7 + 0.35 + + + + + Defs/ThingDef[defName="BotchJob_FrostboundGreataxe"] + + + 0.30 + 0.40 + 0.23 + + + + + + Defs/ThingDef[defName="BotchJob_FrostboundGreataxe"]/tools + + +
  • + + +
  • Poke
    • + + 3 + 1.3 + 0.05 + 0.8 + Shaft + +
  • + + +
  • Blunt
    • + + 15 + 2.18 + 0.25 + 9.6 + Head + +
  • + + +
  • Cut
    • + + 37 + 2.18 + 0.70 + 9.6 + 0.95 + Edge + +
  • + Frostbite + 10 +
    • +     + +     +     +     + + + + BotchJob_FadingSoulScythe + + 12 + 0 + 0.0 + 1 + 2 + 0.33 + + + Verb_Shoot + True + BotchJob_SoulShard + 3 + 12 + 1 + + false + true + + BotchJob_ProfanedStaffCast + 0 + + + AimedShot + + + + + Defs/ThingDef[defName="BotchJob_ProfanedScythe"]/statBases + + 12 + 0.33 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedScythe" or defName="BotchJob_FadingSoulScythe"] + + + 0.30 + 0.40 + 0.23 + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedScythe" or defName="BotchJob_FadingSoulScythe"]/tools + + +
  • + + +
  • Blunt
    • + + 4 + 1.78 + 1 + Shaft + + +
  • + + +
  • BotchJob_CE_RotStab
    • + + 28 + 3.57 + 1.33 + 2.250 + 2.5 + Blade + +
  • + + +
  • BotchJob_RotCut
    • + + 29 + 3.57 + 2.250 + 0.5 + Edge + +     +     +     + + + Defs/ThingDef[defName="BotchJob_FadingSoulScythe"]/comps/li[@Class="MVCF.Comps.CompProperties_VerbProps"] + + + + + Defs/ThingDef[defName="BotchJob_ProfanedGlaive" or defName="BotchJob_AbyssalGlaive"]/statBases + + 12 + 0.33 + + + + + Defs/ThingDef[defName="BotchJob_ProfanedGlaive" or defName="BotchJob_AbyssalGlaive"] + + + 0.30 + 0.40 + 0.23 + + + + + + Defs/ThingDef[defName="BotchJob_ProfanedGlaive" or defName="BotchJob_AbyssalGlaive"]/tools + + +
  • + + +
  • Blunt
    • + + 4 + 1.78 + 1 + Shaft + + +
  • + + +
  • BotchJob_CE_RotStab
    • + + 28 + 3.57 + 1.33 + 2.250 + 2.5 + Blade + +
  • + + +
  • BotchJob_RotCut
    • + + 29 + 3.57 + 2.250 + 0.5 + Edge + +     +     +     + + + + BotchJob_ProfanedStaff + + 6 + 0 + 0.0 + 1 + 6 + 0.93 + + + CombatExtended.Verb_ShootCE + True + BotchJob_BloodflameStaffBolt + 4.5 + 35 + 1 + + true + true + + BotchJob_ProfanedStaffCast + 3.9 + + + AimedShot + + + + + Defs/ThingDef[defName="BotchJob_ProfanedStaff"]/tools + + +
  • + + +
  • Blunt
    • + + 5 + 2.85 + 0.30 + 1.69 + Head + +     +     +     + + + Defs/ThingDef[defName="BotchJob_ProfanedStaff"] + + + 1.00 + 0.70 + 0.47 + + + + + + + BotchJob_BloodflameStaff + + 6 + 0 + 0.0 + 1 + 6 + 0.93 + + + CombatExtended.Verb_ShootCE + True + BotchJob_BloodflameStaffBolt + 4.5 + 35 + 1 + + true + true + + BotchJob_ProfanedStaffCast + 3.9 + + + AimedShot + + + + + Defs/ThingDef[defName="BotchJob_BloodflameStaff"]/tools + + +
  • + + +
  • Blunt
    • + + 5 + 2.85 + 0.30 + 1.69 + Head + +     +     +     + + + Defs/ThingDef[defName="BotchJob_BloodflameStaff"] + + + 1.00 + 0.70 + 0.47 + + + + + + Defs/ThingDef[defName="BotchJob_BloodflameStaff"]/verbs + +
  • + Verb_LaunchProjectile + + true + true + BotchJob_BloodflameSurgeProj + 1 + 0.5 + 12 + BotchJob_ProfanedStaffCast + false + + true + + UI/Icons/Misc/BotchJob_BloodflameSurgeIcon +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Ranged.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Ranged.xml new file mode 100644 index 0000000000..a25d4dd0ba --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Misc/Weapons/Profaned_Weapons_Ranged.xml @@ -0,0 +1,143 @@ + + + + + + + BotchJob_WeatheredShortbow + + 0.8 + 1 + 2 + 3.00 + 1 + + + 15 + + + CombatExtended.Verb_ShootCE + true + Projectile_Arrow_Stone + 1 + 14 + Bow_Small + + + AmmoSet_Arrow + + + +
  • CE_Bow
    • +     + false +     + + + Defs/ThingDef[defName="BotchJob_WeatheredShortbow"]/tools + + +
  • + +
  • Blunt
    • + + 7 + 1.6 + 0.65 + +     +     +     + + + + BotchJob_ProfanedGreatbow + + 0.8 + 1 + 2 + 10.00 + 1 + + + CombatExtended.Verb_ShootCE + true + Projectile_ProfanedGreatbowArrow + 1.3 + 30 + Bow_Large + + + AmmoSet_ProfanedGreatbowArrow + + + +
  • BotchJob_ProfanedGreatbow
    • +     + false +     + + + Defs/ThingDef[defName="BotchJob_ProfanedGreatbow"]/tools + + +
  • + +
  • Blunt
    • + + 7 + 1.44 + 0.79 + +     +     +     + + + + BotchJob_SpectralGreatbow + + 0.8 + 1 + 2 + 5.00 + 1 + + + CombatExtended.Verb_ShootCE + true + BotchJob_SpectralGreatbowArrow + 1.8 + 30 + 3 + Bow_Large + 0 + + + TRUE + AimedShot + 1 + + +
  • BotchJob_SpectralGreatbow
    • +     + false +     + + + Defs/ThingDef[defName="BotchJob_SpectralGreatbow"]/tools + + +
  • + +
  • Blunt
    • + + 7 + 1.44 + 0.79 + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Colossus.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Colossus.xml new file mode 100644 index 0000000000..776747ad78 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Colossus.xml @@ -0,0 +1,124 @@ + + + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"] + +
  • + Humanoid +
    • +     +     + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"]/statBases + + 0.09 + 0.82 + 0.16 + 1.0 + + + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"]/statBases/ArmorRating_Blunt + + 21 + + + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"]/statBases/ArmorRating_Sharp + + 14 + + + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"]/statBases/ArmorRating_Heat + + 0.6 + + + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"]/tools + + +
  • + + +
  • Blunt
    • + + 35 + 2 + LeftHand + + +
  • + Stun + 14 +
    • +     +     + 0 + 17 + +
  • + + +
  • Blunt
    • + + 35 + 2 + RightHand + + +
  • + Stun + 14 +
    • +     +     + 0 + 17 + +
  • + + +
  • Blunt
    • + + 18 + 1.8 + HeadAttackTool + 8 + 0.2 + +     +     +     + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"]/comps + + Defs/ThingDef[defName="BotchJob_UndeadColossus"] + + + + + + + + Defs/ThingDef[defName="BotchJob_UndeadColossus"]/comps + +
  • + 3000 + true + 600 + 5 + 0.75 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Ghoul.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Ghoul.xml new file mode 100644 index 0000000000..0d4e022f8c --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Ghoul.xml @@ -0,0 +1,98 @@ + + + + + Defs/ThingDef[defName="BotchJob_Ghoul"] + +
  • + Humanoid +
    • +     +     + + + Defs/ThingDef[defName="BotchJob_Ghoul"]/statBases + + 0.23 + 0.20 + 0.11 + + + + + Defs/ThingDef[defName="BotchJob_Ghoul"]/tools + + +
  • + + +
  • Scratch
    • + + 11 + 1.19 + LeftHand + + +
  • + Stun + 20 +
    • +     +     + 2.250 + 0.75 + +
  • + + +
  • Scratch
    • + + 11 + 1.19 + RightHand + + +
  • + Stun + 20 +
    • +     +     + 2.250 + 0.75 + +
  • + +
  • Bite
    • + + 24 + 1.46 + Teeth + + +
  • + Stun + 20 +
    • +     +     + 2 + 1.6 + 8.863 + +
  • + + +
  • Blunt
    • + + 4 + 3.2 + HeadAttackTool + 0.2 + 1.225 + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Skeleton.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Skeleton.xml new file mode 100644 index 0000000000..127ef10a50 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Skeleton.xml @@ -0,0 +1,64 @@ + + + + + Defs/ThingDef[defName="BotchJob_Skeleton"] + +
  • + Humanoid +
    • +     +     + + + Defs/ThingDef[defName="BotchJob_Skeleton"]/statBases + + 1 + 1 + 1 + 0.7 + + + + + Defs/ThingDef[defName="BotchJob_Skeleton"]/tools + + +
  • + + +
  • Blunt
    • + + 13 + 2 + 0 + 1.44 + LeftHand + +
  • + + +
  • Blunt
    • + + 13 + 2 + 0 + 1.44 + RightHand + +
  • + + +
  • Blunt
    • + + 2 + 4.49 + HeadAttackTool + 0.2 + 0.625 + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadCat.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadCat.xml new file mode 100644 index 0000000000..50de3e049d --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadCat.xml @@ -0,0 +1,100 @@ + + + + + + + Defs/ThingDef[defName="BotchJob_UndeadCat"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="BotchJob_UndeadCat"]/statBases + + 0.23 + 0.02 + 0.01 + + + + + Defs/ThingDef[defName="BotchJob_UndeadCat"]/tools + + +
  • + + +
  • Scratch
    • + + 2 + 0.55 + FrontLeftPaw + + +
  • + Stun + 20 +
    • +     +     + 0.042 + 0.01 + +
  • + + +
  • Scratch
    • + + 2 + 0.55 + FrontRightPaw + + +
  • + Stun + 20 +
    • +     +     + 0.042 + 0.01 + +
  • + +
  • Bite
    • + + 5 + 0.85 + Teeth + + +
  • + Stun + 20 +
    • +     +     + 0.7 + 0.254 + 0.03 + +
  • + + +
  • Blunt
    • + + 1 + 0.55 + HeadAttackTool + 0.2 + 0.042 + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadDragon.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadDragon.xml new file mode 100644 index 0000000000..590f4c1573 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadDragon.xml @@ -0,0 +1,147 @@ + + + + + + + Defs/ThingDef[defName="BotchJob_UndeadDragon"] + +
  • + Birdlike +
    • +     +     + + + Defs/ThingDef[defName="BotchJob_UndeadDragon"]/statBases + + 1.75 + 0.54 + 1.0 + 1.5 + 0.13 + + + + + Defs/ThingDef[defName="BotchJob_UndeadDragon"]/statBases/ArmorRating_Blunt + + 40 + + + + + Defs/ThingDef[defName="BotchJob_UndeadDragon"]/statBases/ArmorRating_Sharp + + 16 + + + + + Defs/ThingDef[defName="BotchJob_UndeadDragon"]/tools + + +
  • + + +
  • DD_Knockback
    • + + 110 + 115.115 + 0.2 + 4.0 + Tail + +
  • + + +
  • Scratch
    • +
  • Cut
    • +
  • Stab
    • + + 76 + 3 + 16.09 + 120.417 + FrontLeftPaw + +
  • + + +
  • Scratch
    • +
  • Cut
    • +
  • Stab
    • + + 76 + 3 + 16.09 + 120.417 + FrontRightPaw + +
  • + 3.6 + 100 + +
  • ToxicBite
    • + + Teeth + + 24.26 + 460.97 + +
  • + + +
  • Cut
    • + + + +
  • + Stun + 30 +
    • +     +     + 69 + 5.68 + 3 + 24.725 + Horns + +
  • + + +
  • Stab
    • + + + +
  • + Stun + 30 +
    • +     +     + 38 + 5.68 + 14 + 21.725 + Horns + +     +     +     + + + Defs/ThingDef[defName="BotchJob_UndeadDragon"]/comps + +
  • + 4250 + true + 600 + 5 + 0.5 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadHorse.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadHorse.xml new file mode 100644 index 0000000000..12d96cca29 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadHorse.xml @@ -0,0 +1,93 @@ + + + + + + Defs/ThingDef[defName="BotchJob_UndeadHorse"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="BotchJob_UndeadHorse"]/statBases/MoveSpeed + + 6 + 0.15 + 0.37 + 0.24 + + + + + Defs/ThingDef[defName="BotchJob_UndeadHorse"]/tools + + +
  • + + +
  • Blunt
    • + + 11 + 1.37 + FrontLeftLeg + 3.938 + +
  • + + +
  • Poke
    • + + 11 + 1.37 + FrontLeftLeg_2 + 3.938 + +
  • + + +
  • Blunt
    • + + 11 + 1.37 + FrontRightLeg + 3.938 + +
  • + + +
  • Poke
    • + + 11 + 1.37 + FrontRightLeg_2 + 3.938 + +
  • + +
  • Bite
    • + + 5 + 1.97 + 0.5 + Teeth + 1.5 + +
  • + + +
  • Blunt
    • + + 6 + 2.12 + HeadAttackTool + 0.2 + 2 + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadWarg.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadWarg.xml new file mode 100644 index 0000000000..ec99437784 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_UndeadWarg.xml @@ -0,0 +1,133 @@ + + + + + + + Defs/ThingDef[defName="BotchJob_UndeadWarg"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="BotchJob_UndeadWarg"]/statBases/MoveSpeed + + 7 + + + + + Defs/ThingDef[defName="BotchJob_UndeadWarg"]/statBases + + 0.075 + 0.05 + 0.23 + 0.20 + 0.11 + + + + + Defs/ThingDef[defName="BotchJob_UndeadWarg"]/tools + + +
  • + + +
  • Scratch
    • + + 11 + 1.19 + FrontLeftPaw + + +
  • + Stun + 20 +
    • +     +     + 2.250 + 0.75 + +
  • + + +
  • Scratch
    • + + 11 + 1.19 + FrontRightPaw + + +
  • + Stun + 20 +
    • +     +     + 2.250 + 0.75 + +
  • + + +
  • Bite
    • + + 24 + 1.46 + Teeth + + +
  • + Stun + 20 +
    • +     +     + 2 + 1.6 + 8.863 + +
  • + + +
  • Blunt
    • + + 4 + 3.2 + HeadAttackTool + 0.2 + 1.225 + +     +     +     + + + Defs/ThingDef[defName="BotchJob_UndeadWarg"]/comps + + Defs/ThingDef[defName="BotchJob_UndeadWarg"] + + + + + + + + Defs/ThingDef[defName="BotchJob_UndeadWarg"]/comps + +
  • + 700 + true + 600 + 5 + 0.75 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Wraith.xml b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Wraith.xml new file mode 100644 index 0000000000..5993fbd078 --- /dev/null +++ b/ModPatches/Profaned/Patches/Profaned/ThingDefs_Races/Profaned_Race_Wraith.xml @@ -0,0 +1,64 @@ + + + + + Defs/ThingDef[defName="BotchJob_Wraith"] + +
  • + Humanoid +
    • +     +     + + + Defs/ThingDef[defName="BotchJob_Wraith"]/statBases + + 0.45 + 0.2 + 0.7 + + + + + Defs/ThingDef[defName="BotchJob_Wraith"]/tools + + +
  • + + +
  • Scratch
    • + + 20 + 3.2 + LeftHand + +
  • + Frostbite + 2 +
    • +     + 20 + 40 + +
  • + + +
  • Scratch
    • + + 20 + 3.2 + RightHand + +
  • + Frostbite + 2 +
    • +     + 20 + 40 + +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/PsyBlasters/Defs/PsyBlasters/Categories.xml b/ModPatches/PsyBlasters/Defs/PsyBlasters/Categories.xml new file mode 100644 index 0000000000..cba62b0b46 --- /dev/null +++ b/ModPatches/PsyBlasters/Defs/PsyBlasters/Categories.xml @@ -0,0 +1,22 @@ + + + + + ChargedPsychic + + Charged ammunition which can be enhanced by the wielder's psychic energies.\n\nSpending psychic energies increases the damage and armor penetration by 50%. + + + + ChargedPsychicFocus + + Consumes larger amounts of psyfocus to improve armor penetraton.\n\nSpending psychic energies increases the damage by 80% and armor penetration by 60%. + + + + ChargedPsychicNeuro + + Volatile psychic ammunition increases neural heat generation while also improving stopping power.\n\nSpending psychic energies increases the damage and armor penetration by 50%. + + + \ No newline at end of file diff --git a/ModPatches/PsyBlasters/Defs/PsyBlasters/PistolAmmo.xml b/ModPatches/PsyBlasters/Defs/PsyBlasters/PistolAmmo.xml new file mode 100644 index 0000000000..9c2a6d06f1 --- /dev/null +++ b/ModPatches/PsyBlasters/Defs/PsyBlasters/PistolAmmo.xml @@ -0,0 +1,288 @@ + + + + + Ammo6x18mmPsychic + + AmmoAdvanced + ThirdParty/PsyBlasters/SmallPsy/SmallPsy_c + + + + + + AmmoSet_6x18mmPsychic + + + Bullet_6x18mmPsychic + Bullet_6x18mmPsychic_Focus + Bullet_6x18mmPsychic_Neuro + + + + + + + + Charged shot ammo used by psychically enhanced advanced SMG designs. + + 0.008 + 0.01 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_FabricationBench
    • +     + +
  • Ammo6x18mmPsychic
    • +     + 5000 +     + + + Ammo_6x18mmPsychic + + + ThirdParty/PsyBlasters/SmallPsy + Graphic_StackCount + + + 0.5 + + ChargedPsychic + + + + Ammo_6x18mmPsychic_Focus + + + ThirdParty/PsyBlasters/SmallFocus + Graphic_StackCount + + + 0.5 + + ChargedPsychicFocus + + + + Ammo_6x18mmPsychic_Neuro + + + ThirdParty/PsyBlasters/SmallNeuro + Graphic_StackCount + + + 0.5 + + ChargedPsychicNeuro + + + + + + + Things/Projectile/BlasterShot + Graphic_Single + + CombatExtended.Compatibility.PsyBlastersCompat.PsychicBlasterBulletCE + + Bullet + 122 + + + + + Bullet_6x18mmPsychic + + + 10 + 10 + 10.6 + + +
  • + PsyBlasters.PsyBlasterBulletComp + 0.5 + 0.5 + 0.04 + 6 +
    • +     +     + + + Bullet_6x18mmPsychic_Focus + + + 6 + 17 + 10.6 + + +
  • + PsyBlasters.PsyBlasterBulletComp + 0.8 + 0.6 + 0.06 + 3 +
    • +     +     + + + Bullet_6x18mmPsychic_Neuro + + + 12 + 5 + 10.6 + + +
  • + PsyBlasters.PsyBlasterBulletComp + 0.5 + 0.5 + 0.02 + 9 +
    • +     +     + + + + + MakeAmmo_6x18mmPsychic + + Craft 500 6x18mm Psychic cartridges. + Making 6x18mm Psychic cartridges. + PB_Psyblasters + +
  • + + +
  • Plasteel
    • + + + 8 + +
  • + + +
  • Steel
    • + + + 4 + +
  • + + +
  • ComponentIndustrial
    • + + + 5 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 500 + + 6600 +     + + + MakeAmmo_6x18mmPsychic_Focus + + Craft 500 6x18mm Psychic (Focus) cartridges. + Making 6x18mm Psychic (Focus) cartridges. + PB_Focusblasters + +
  • + + +
  • Plasteel
    • + + + 8 + +
  • + + +
  • Steel
    • + + + 4 + +
  • + + +
  • ComponentIndustrial
    • + + + 5 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 500 + + 6600 +     + + + MakeAmmo_6x18mmPsychic_Neuro + + Craft 500 6x18mm Psychic (Neuro) cartridges. + Making 6x18mm Psychic (Neuro) cartridges. + PB_Neuroblasters + +
  • + + +
  • Plasteel
    • + + + 8 + +
  • + + +
  • Steel
    • + + + 4 + +
  • + + +
  • ComponentIndustrial
    • + + + 5 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 500 + + 6600 +     +     \ No newline at end of file diff --git a/ModPatches/PsyBlasters/Defs/PsyBlasters/PsyExplosive.xml b/ModPatches/PsyBlasters/Defs/PsyBlasters/PsyExplosive.xml new file mode 100644 index 0000000000..d878b7d83d --- /dev/null +++ b/ModPatches/PsyBlasters/Defs/PsyBlasters/PsyExplosive.xml @@ -0,0 +1,27 @@ + + + + + Bullet_PsyblasterRocket + CombatExtended.Compatibility.PsyBlastersCompat.PsychicBlasterRocketCE + + + Things/Projectile/PB_rocket_shot + Graphic_Single + TransparentPostLight + + + Bomb + 73 + 8.9 + 0 + + +
  • + PsyBlasters.PsyBlasterBulletComp + 1.5 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/PsyBlasters/Defs/PsyBlasters/RifleAmmo.xml b/ModPatches/PsyBlasters/Defs/PsyBlasters/RifleAmmo.xml new file mode 100644 index 0000000000..b8ce3d6ea2 --- /dev/null +++ b/ModPatches/PsyBlasters/Defs/PsyBlasters/RifleAmmo.xml @@ -0,0 +1,289 @@ + + + + + Ammo6x24Psychic + + AmmoAdvanced + ThirdParty/PsyBlasters/MediumPsy/MediumPsy_c + + + + + + AmmoSet_6x24mmPsychic + + + Bullet_6x24mmPsychic + Bullet_6x24mmPsychic_Focus + Bullet_6x24mmPsychic_Neuro + + + + + + + + Charged shot ammo used by psychically enhanced assault rifle designs. + + 0.01 + 0.01 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_FabricationBench
    • +     + +
  • Ammo6x24Psychic
    • +     + 5000 +     + + + Ammo_6x24mmPsychic + + + ThirdParty/PsyBlasters/MediumPsy + Graphic_StackCount + + + 0.5 + + ChargedPsychic + + + + Ammo_6x24mmPsychic_Focus + + + ThirdParty/PsyBlasters/MediumFocus + Graphic_StackCount + + + 0.5 + + ChargedPsychicFocus + + + + Ammo_6x24mmPsychic_Neuro + + + ThirdParty/PsyBlasters/MediumNeuro + Graphic_StackCount + + + 0.5 + + ChargedPsychicNeuro + + + + + + + Things/Projectile/BlasterShot + Graphic_Single + + CombatExtended.Compatibility.PsyBlastersCompat.PsychicBlasterBulletCE + + Bullet + 151 + + + + + Bullet_6x24mmPsychic + + + 14 + 12 + 21.2 + + +
  • + PsyBlasters.PsyBlasterBulletComp + 0.5 + 0.5 + 0.06 + 8 +
    • +     +     + + + Bullet_6x24mmPsychic_Focus + + + 8 + 21 + 21.2 + + +
  • + PsyBlasters.PsyBlasterBulletComp + 0.8 + 0.6 + 0.09 + 4 +
    • +     +     + + + Bullet_6x24mmPsychic_Neuro + + + 18 + 6 + 21.2 + + +
  • + PsyBlasters.PsyBlasterBulletComp + 0.5 + 0.5 + 0.03 + 12 +
    • +     +     + + + + + MakeAmmo_6x24mmPsychic + + Craft 500 6x24mm Psychic cartridges. + Making 6x24mm Psychic cartridges. + PB_Psyblasters + +
  • + + +
  • Plasteel
    • + + + 8 + +
  • + + +
  • Steel
    • + + + 6 + +
  • + + +
  • ComponentIndustrial
    • + + + 5 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 500 + + 6800 +     + + + MakeAmmo_6x24mmPsychic_Focus + + Craft 500 6x24mm Psychic (Focus) cartridges. + Making 6x24mm Psychic (Focus) cartridges. + PB_Focusblasters + +
  • + + +
  • Plasteel
    • + + + 8 + +
  • + + +
  • Steel
    • + + + 6 + +
  • + + +
  • ComponentIndustrial
    • + + + 5 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 500 + + 6800 +     + + + MakeAmmo_6x24mmPsychic_Neuro + + Craft 500 6x24mm Psychic (Neuro) cartridges. + Making 6x24mm Psychic (Neuro) cartridges. + PB_Neuroblasters + +
  • + + +
  • Plasteel
    • + + + 8 + +
  • + + +
  • Steel
    • + + + 6 + +
  • + + +
  • ComponentIndustrial
    • + + + 5 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 500 + + 6800 +     + +     \ No newline at end of file diff --git a/ModPatches/PsyBlasters/Defs/PsyBlasters/ShotgunAmmo.xml b/ModPatches/PsyBlasters/Defs/PsyBlasters/ShotgunAmmo.xml new file mode 100644 index 0000000000..125ff2197f --- /dev/null +++ b/ModPatches/PsyBlasters/Defs/PsyBlasters/ShotgunAmmo.xml @@ -0,0 +1,293 @@ + + + + + Ammo12GaugePsychic + + AmmoAdvanced + ThirdParty/PsyBlasters/ShotgunPsy/ShotgunPsy_c + + + + + + AmmoSet_12GaugePsychic + + + Bullet_12GaugePsychic + Bullet_12GaugePsychic_Focus + Bullet_12GaugePsychic_Neuro + + + + + + + + Multi-pellet charge shot cartridge designed for psychically enhanced shotgun-type weapons. + + 0.047 + 0.06 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_FabricationBench
    • +     + +
  • Ammo12GaugePsychic
    • +     +     + + + Ammo_12GaugePsychic + + + ThirdParty/PsyBlasters/ShotgunPsy + Graphic_StackCount + + + 2.66 + + ChargedPsychic + + + + Ammo_12GaugePsychic_Focus + + + ThirdParty/PsyBlasters/ShotgunFocus + Graphic_StackCount + + + 2.66 + + ChargedPsychicFocus + + + + Ammo_12GaugePsychic_Neuro + + + ThirdParty/PsyBlasters/ShotgunNeuro + Graphic_StackCount + + + 2.66 + + ChargedPsychicNeuro + + + + + + + Things/Projectile/BlasterShot + Graphic_Single + + CombatExtended.Compatibility.PsyBlastersCompat.PsychicBlasterBulletCE + + Bullet + 122 + + + + + Bullet_12GaugePsychic + + + 8 + 8 + 9.8 + 6 + 8.9 + + +
  • + PsyBlasters.PsyBlasterBulletComp + 0.5 + 0.5 + 0.01 + 2 +
    • +     +     + + + Bullet_12GaugePsychic_Focus + + + 5 + 10 + 9.8 + 6 + 8.9 + + +
  • + PsyBlasters.PsyBlasterBulletComp + 0.8 + 0.6 + 0.02 + 1 +
    • +     +     + + + Bullet_12GaugePsychic_Neuro + + + 12 + 5 + 9.8 + 6 + 8.9 + + +
  • + PsyBlasters.PsyBlasterBulletComp + 0.5 + 0.5 + 0.005 + 3 +
    • +     +     + + + + + MakeAmmo_12GaugePsychic + + Craft 200 12Gauge Psychic shells. + Making 12Gauge Psychic shells. + PB_Psyblasters + +
  • + + +
  • Plasteel
    • + + + 20 + +
  • + + +
  • Steel
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 10 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 15000 +     + + + MakeAmmo_12GaugePsychic_Focus + + Craft 200 12Gauge Psychic (Focus) shells. + Making 12Gauge Psychic (Focus) shells. + PB_Focusblasters + +
  • + + +
  • Plasteel
    • + + + 20 + +
  • + + +
  • Steel
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 10 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 15000 +     + + + MakeAmmo_12GaugePsychic_Neuro + + Craft 200 12Gauge Psychic (Neuro) shells. + Making 12Gauge Psychic (Neuro) shells. + PB_Neuroblasters + +
  • + + +
  • Plasteel
    • + + + 20 + +
  • + + +
  • Steel
    • + + + 10 + +
  • + + +
  • ComponentIndustrial
    • + + + 10 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 15000 +     +     \ No newline at end of file diff --git a/ModPatches/PsyBlasters/Defs/PsyBlasters/SniperAmmo.xml b/ModPatches/PsyBlasters/Defs/PsyBlasters/SniperAmmo.xml new file mode 100644 index 0000000000..9a6b7fd779 --- /dev/null +++ b/ModPatches/PsyBlasters/Defs/PsyBlasters/SniperAmmo.xml @@ -0,0 +1,290 @@ + + + + + Ammo8x50mmPsychic + + AmmoAdvanced + ThirdParty/PsyBlasters/MediumPsy/MediumPsy_c + + + + + + AmmoSet_8x50mmPsychic + + + Bullet_8x50mmPsychic + Bullet_8x50mmPsychic_Focus + Bullet_8x50mmPsychic_Neuro + + + + + + + + High power charged shot ammo used by psychically enhanced advanced battle rifles, machineguns and sniper rifles. + + 0.027 + 0.02 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_FabricationBench
    • +     + +
  • Ammo8x50mmPsychic
    • +     + 5000 +     + + + Ammo_8x50mmPsychic + + + ThirdParty/PsyBlasters/MediumPsy + Graphic_StackCount + + + 1.23 + + ChargedPsychic + + + + Ammo_8x50mmPsychic_Focus + + + ThirdParty/PsyBlasters/MediumFocus + Graphic_StackCount + + + 1.23 + + ChargedPsychicFocus + + + + Ammo_8x50mmPsychic_Neuro + + + ThirdParty/PsyBlasters/MediumNeuro + Graphic_StackCount + + + 1.23 + + ChargedPsychicNeuro + + + + + + + Things/Projectile/PB_wide_shot + Graphic_Single + (1.15,1.15) + + CombatExtended.Compatibility.PsyBlastersCompat.PsychicBlasterBulletCE + + Bullet + 178 + + + + + Bullet_8x50mmPsychic + + + 24 + 14 + 90 + + +
  • + PsyBlasters.PsyBlasterBulletComp + 0.5 + 0.5 + 0.08 + 12 +
    • +     +     + + + Bullet_8x50mmPsychic_Focus + + + 14 + 25 + 90 + + +
  • + PsyBlasters.PsyBlasterBulletComp + 0.8 + 0.6 + 0.12 + 6 +
    • +     +     + + + Bullet_8x50mmPsychic_Neuro + + + 29 + 7 + 90 + + +
  • + PsyBlasters.PsyBlasterBulletComp + 0.5 + 0.5 + 0.04 + 18 +
    • +     +     + + + + + MakeAmmo_8x50mmPsychic + + Craft 500 8x50mm Psychic cartridges. + Making 8x50mm Psychic cartridges. + PB_Psyblasters + +
  • + + +
  • Plasteel
    • + + + 24 + +
  • + + +
  • Steel
    • + + + 16 + +
  • + + +
  • ComponentIndustrial
    • + + + 11 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 500 + + 17800 +     + + + MakeAmmo_8x50mmPsychic_Focus + + Craft 500 8x50mm Psychic (Focus) cartridges. + Making 8x50mm Psychic (Focus) cartridges. + PB_Focusblasters + +
  • + + +
  • Plasteel
    • + + + 24 + +
  • + + +
  • Steel
    • + + + 16 + +
  • + + +
  • ComponentIndustrial
    • + + + 11 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 500 + + 17800 +     + + + MakeAmmo_8x50mmPsychic_Neuro + + Craft 500 8x50mm Psychic (Neuro) cartridges. + Making 8x50mm Psychic (Neuro) cartridges. + PB_Neuroblasters + +
  • + + +
  • Plasteel
    • + + + 24 + +
  • + + +
  • Steel
    • + + + 16 + +
  • + + +
  • ComponentIndustrial
    • + + + 11 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +     +     + + 500 + + 17800 +     + +     \ No newline at end of file diff --git a/ModPatches/PsyBlasters/Patches/PsyBlasters/Weapons_Guns.xml b/ModPatches/PsyBlasters/Patches/PsyBlasters/Weapons_Guns.xml new file mode 100644 index 0000000000..bf88e97789 --- /dev/null +++ b/ModPatches/PsyBlasters/Patches/PsyBlasters/Weapons_Guns.xml @@ -0,0 +1,359 @@ + + + + + + + Defs/ThingDef[@Name="BasePsyBlaster_Focus" or @Name="BasePsyBlaster_NeuralHeat"]/recipeMaker/recipeUsers + + + + + + + Defs/ThingDef[@Name="BasePsyBlaster_Focus" or @Name="BasePsyBlaster_NeuralHeat"]/recipeMaker/researchPrerequisite + + + + + + + Defs/ThingDef[@Name="BasePsyBlaster_Focus" or @Name="BasePsyBlaster_NeuralHeat"] + + + None + 0 + + + + + + + Defs/ThingDef[defName="PB_Pistol"] + + +
  • + + +
  • Blunt
    • + + 2 + 1.54 + 1.5 + 0.555 + Grip + +
  • + + +
  • Poke
    • + + 2 + 1.54 + 0.555 + Muzzle + +     +     +     + + + + Defs/ThingDef[ + defName = "PB_Rifle" or + defName = "PB_Shotgun" or + defName = "PB_Sniper"] + + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + +     +     +     + + + Defs/ThingDef[defName="PB_Braindump_RocketLauncher"] + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + +     +     +     + + + + + + PB_Rifle + + 3 + 0.36 + 1.10 + 0.08 + 1.20 + 7.00 + 49000 + + + 45 + 25 + 4 + 1 + 10 + 2 + + + 1.46 + CombatExtended.Verb_ShootCE + true + Bullet_6x24mmPsychic + 1.0 + 55 + 5 + 6 + Shot_ChargeRifle + GunTail_Medium + 9 + + + 30 + 4 + AmmoSet_6x24mmPsychic + + + 3 + TRUE + AimedShot + + +
  • CE_AI_AR
    • +
  • AdvancedGun
    • +     + PB_Psyblasters +     + + + + + PB_Pistol + + 17000 + 1.30 + 2.20 + 1.07 + 0.15 + 0.8 + 0.36 + + + 20 + 30 + 5 + 2 + 1 + 1 + + + 2.82 + CombatExtended.Verb_ShootCE + True + Bullet_6x18mmPsychic + 3 + 5 + 0.5 + 12 + Shot_ChargeRifle + GunTail_Light + 9 + + + 15 + 4 + AmmoSet_6x18mmPsychic + + + Snapshot + True + 2 + + +
  • SpacerGun
    • +
  • CE_Sidearm
    • +
  • CE_OneHandedWeapon
    • +     +     + + + + + PB_Shotgun + + 46000 + 4.35 + 6.0 + 1.25 + 0.14 + 1 + 0.36 + + + 50 + 25 + 15 + 4 + 1 + + + 3.0 + CombatExtended.Verb_ShootCE + True + Bullet_12GaugePsychic + 0.5 + 20 + Shot_ChargeRifle + GunTail_Heavy + 9 + + + 12 + 0.85 + True + AmmoSet_12GaugePsychic + + + Snapshot + + +
  • SpacerGun
    • +
  • CE_AI_AssaultWeapon
    • +     +     + + + + + PB_Sniper + + 49000 + 7.5 + 14.5 + 1.62 + 0.03 + 2.6 + 0.42 + 0.4 + + + 75 + 40 + 15 + 6 + 1 + 2 + + + 1.8 + CombatExtended.Verb_ShootCE + True + Bullet_8x50mmPsychic + 1.6 + 81 + Shot_ChargeRifle + GunTail_Medium + 11 + + + 10 + 4 + AmmoSet_8x50mmPsychic + + + AimedShot + + +
  • SniperRifle
    • +
  • AdvancedGun
    • +
  • SpacerGun
    • +
  • CE_AI_SR
    • +
  • Bipod_DMR
    • +     +     + + + + + PB_Braindump_RocketLauncher + + 32000 + 8 + 11 + 1.67 + 0.15 + 1.5 + 2 + + + 40 + 30 + 10 + 3 + 2 + 3 + + + 3.0 + CombatExtended.Verb_ShootCE + True + Bullet_PsyblasterRocket + 2 + 40 + Shot_ChargeRifle + GunTail_Heavy + 15 + + + AimedShot + + + + +     \ No newline at end of file diff --git "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Launchers.xml" "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Launchers.xml" index 7f457e8e0a..1b903f2434 100644 --- "a/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Launchers.xml" +++ "b/ModPatches/RH2 Rimmu-Nation\302\262 - Weapons/Patches/RH2 Rimmu-Nation\302\262 - Weapons/RM2_CE_Launchers.xml" @@ -138,7 +138,6 @@ true - FALSE AimedShot @@ -236,7 +235,6 @@ true - FALSE AimedShot diff --git a/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Items/Items_Resource_SpaceDragon.xml b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Items/Items_Resource_SpaceDragon.xml index e1dc06761f..51bea70263 100644 --- a/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Items/Items_Resource_SpaceDragon.xml +++ b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Items/Items_Resource_SpaceDragon.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="DD_AbyssalPearl"]/statBases/StuffPower_Armor_Sharp - 0.807 @@ -12,7 +11,6 @@ Defs/ThingDef[defName="DD_AbyssalPearl"]/statBases/StuffPower_Armor_Blunt - 0.42 @@ -20,7 +18,6 @@ Defs/ThingDef[defName="DD_AbyssalPearl"]/statBases/StuffPower_Armor_Heat - 0.16 @@ -28,7 +25,6 @@ Defs/ThingDef[defName="DD_AbyssalPearl"]/statBases/BluntDamageMultiplier - 1.4 @@ -36,7 +32,6 @@ Defs/ThingDef[defName="DD_AbyssalPearl"]/stuffProps/statFactors - 1.5 @@ -45,7 +40,6 @@ Defs/ThingDef[defName="DD_BrittleStar"]/statBases/StuffPower_Armor_Sharp - 0.03 @@ -53,7 +47,6 @@ Defs/ThingDef[defName="DD_BrittleStar"]/statBases/StuffPower_Armor_Blunt - 0.02 @@ -61,7 +54,6 @@ Defs/ThingDef[defName="DD_BrittleStar"]/statBases/StuffPower_Armor_Heat - 0.05 diff --git a/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Races/Races_Animal_SpaceDragon_Base.xml b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Races/Races_Animal_SpaceDragon_Base.xml index e7111a66a5..a61c45ae46 100644 --- a/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Races/Races_Animal_SpaceDragon_Base.xml +++ b/ModPatches/RWY Dragon's Descent Void Dwellers/Patches/RWY Dragon's Descent Void Dwellers/ThingDefs_Races/Races_Animal_SpaceDragon_Base.xml @@ -73,7 +73,7 @@ true 600 5 - 0.5 + 0.25 @@ -86,7 +86,7 @@ true 600 5 - 0.5 + 0.25 @@ -99,7 +99,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_shotguns.xml b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_shotguns.xml index c1d49ab304..e96d6e9c50 100644 --- a/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_shotguns.xml +++ b/ModPatches/Rambo Weapons Pack/Patches/Rambo Weapons Pack/RamboWeaponsPack_shotguns.xml @@ -616,7 +616,7 @@ CombatExtended.Verb_ShootCE True - Bullet_12Gauge_Buck + Bullet_12Gauge_Buck_SB 0.75 2 0 @@ -629,7 +629,7 @@ 2 1.7 - AmmoSet_12Gauge + AmmoSet_12Gauge_SB Snapshot @@ -703,7 +703,7 @@ CombatExtended.Verb_ShootCE True 0.75 - Bullet_12Gauge_Buck + Bullet_12Gauge_Buck_SB 2 0 0.6 @@ -715,7 +715,7 @@ 2 1.7 - AmmoSet_12Gauge + AmmoSet_12Gauge_SB Snapshot diff --git a/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Mammals.xml b/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Mammals.xml index 4cd0b6d5ba..4feabb2f3d 100644 --- a/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Mammals.xml +++ b/ModPatches/ReGrowth - Extinct Animals/Patches/ReGrowth - Extinct Animals/Extinct_Mammals.xml @@ -335,8 +335,8 @@ - - + + Defs/ThingDef[defName="RG_SabertoothTiger"]/statBases 0.19 @@ -439,9 +439,9 @@ true 600 5 - 0.75 + 0.5 - + \ No newline at end of file diff --git a/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Scenarios_ME.xml b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Scenarios_ME.xml index 34a1e42249..b9d6642e35 100644 --- a/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Scenarios_ME.xml +++ b/ModPatches/Rim-Effect Core/Patches/Rim-Effect Core/Scenarios_ME.xml @@ -4,7 +4,6 @@ Defs/ScenarioDef[defName="RE_AllianceColony"]/scenario/parts -
  • StartingThing_Defined diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BasiliskCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BasiliskCE.xml index 801b3f34c1..c18e6691ab 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BasiliskCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BasiliskCE.xml @@ -101,7 +101,7 @@ Defs/ThingDef[defName="WMH_Basilisk"] - + @@ -114,7 +114,7 @@ true 600 5 - 0.75 + 0.5
    • diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BearofleetCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BearofleetCE.xml index e756da1e1d..b89e6b7bb0 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BearofleetCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_BearofleetCE.xml @@ -70,7 +70,7 @@ Defs/ThingDef[defName="WMH_Bearofleet"] - +     @@ -83,7 +83,7 @@ true 600 5 - 0.75 + 0.5     diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_CyclopsCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_CyclopsCE.xml index a36a27a0ba..d3ca86ec13 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_CyclopsCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_CyclopsCE.xml @@ -89,7 +89,7 @@ Defs/ThingDef[defName="WMH_Cyclops"] - +     @@ -102,7 +102,7 @@ true 300 5 - 0.75 + 0.5     diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_EkimmaraCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_EkimmaraCE.xml index 0bf8615dd4..d8e40db46f 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_EkimmaraCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_EkimmaraCE.xml @@ -92,7 +92,7 @@ Defs/ThingDef[defName="WMH_Ekimmara"] - +     @@ -105,7 +105,7 @@ true 500 5 - 0.75 + 0.5 diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FlederCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FlederCE.xml index 9153a60c6d..17ff5b3ef9 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FlederCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FlederCE.xml @@ -90,7 +90,7 @@ Defs/ThingDef[defName="WMH_Fleder"] - + @@ -103,7 +103,7 @@ true 400 5 - 0.75 + 0.5 diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FoglerCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FoglerCE.xml index a38c8e11dd..2e1ebebace 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FoglerCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_FoglerCE.xml @@ -89,7 +89,7 @@ Defs/ThingDef[defName="WMH_Fogler"] - + @@ -102,7 +102,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml index 1cdd10a2ab..8584364bcf 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_KikimoreCE.xml @@ -7,14 +7,12 @@
  • - false 0.25
  • InsectLeg
  • - false 0.25
  • InsectLeg
    • @@ -25,13 +23,6 @@ - - Defs/ThingDef[@Name="WMH_InsectoidMonsterBase"]/statBases - - 0 - - - Defs/ThingDef[defName="WMAux_KikimoreWorker"] @@ -86,7 +77,7 @@ Defs/ThingDef[defName="WMAux_KikimoreWorker"] - + @@ -99,7 +90,7 @@ true 600 5 - 0.5 + 0.25 @@ -172,7 +163,7 @@ Defs/ThingDef[defName="WMAux_KikimoreWorker"] - + @@ -185,7 +176,7 @@ true 600 5 - 0.5 + 0.25 @@ -257,7 +248,7 @@ Defs/ThingDef[defName="WMH_KikimoreQueen"] - + @@ -270,7 +261,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WerewolfCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WerewolfCE.xml index c28693a23e..55d7c50c0b 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WerewolfCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WerewolfCE.xml @@ -89,7 +89,7 @@ Defs/ThingDef[defName="WMH_Werewolf"] - + @@ -102,7 +102,7 @@ true 300 5 - 0.75 + 0.5 diff --git a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WyvernCE.xml b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WyvernCE.xml index e33d546fcb..9eb7fa7b49 100644 --- a/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WyvernCE.xml +++ b/ModPatches/RimWorld - Witcher Monster Hunt/Patches/RimWorld - Witcher Monster Hunt/Races_WyvernCE.xml @@ -102,7 +102,7 @@ Defs/ThingDef[defName="WMH_Wyvern"] - + @@ -115,7 +115,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Gargantuan.xml b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Gargantuan.xml index 875543e89b..ddd76d99c8 100644 --- a/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Gargantuan.xml +++ b/ModPatches/Rimcraft Animals/Patches/Rimcraft Animals/CE_Gargantuan.xml @@ -77,7 +77,6 @@ Defs/ThingDef[defName="WoW_Animal_Elekk"]/tools -
  • diff --git a/ModPatches/Rimcraft Scenario/Patches/Rimcraft Scenario/Scenarios_Patch_Wow.xml b/ModPatches/Rimcraft Scenario/Patches/Rimcraft Scenario/Scenarios_Patch_Wow.xml index 48c6a7ba47..88163e28e4 100644 --- a/ModPatches/Rimcraft Scenario/Patches/Rimcraft Scenario/Scenarios_Patch_Wow.xml +++ b/ModPatches/Rimcraft Scenario/Patches/Rimcraft Scenario/Scenarios_Patch_Wow.xml @@ -13,7 +13,6 @@ or defName="DwarfScenario" or defName="NightElfScenario" or defName="TrollScenario"]/scenario/parts -
  • StartingThing_Defined diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_BigGuns.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_BigGuns.xml index 6f5032da46..3fe62eed78 100644 --- a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_BigGuns.xml +++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_BigGuns.xml @@ -34,14 +34,11 @@ true - false AimedShot - - false @@ -77,7 +74,6 @@ true - 1 5.6 @@ -89,9 +85,7 @@ AimedShot FALSE - - false @@ -129,7 +123,6 @@ true - 3 2.55 @@ -140,9 +133,7 @@ FALSE SuppressFire - - false @@ -178,7 +169,6 @@ true - 1 3 @@ -190,9 +180,7 @@ FALSE SuppressFire - - false @@ -237,9 +225,7 @@ AimedShot true - - false @@ -276,15 +262,12 @@ true - FALSE AimedShot true - - false @@ -320,7 +303,6 @@ true - 4 5.6 @@ -331,9 +313,7 @@ FALSE AimedShot - - false @@ -372,7 +352,6 @@ true - 1 3 @@ -384,9 +363,7 @@ FALSE SuppressFire - - false @@ -424,15 +401,12 @@ true - FALSE AimedShot true - - false @@ -471,15 +445,12 @@ true - FALSE AimedShot true - - false @@ -516,7 +487,6 @@ true - 6 5.1 @@ -527,9 +497,7 @@ FALSE SuppressFire - - false @@ -566,7 +534,6 @@ true - 1 5.6 @@ -577,9 +544,7 @@ FALSE AimedShot - - false @@ -617,15 +582,12 @@ true - FALSE AimedShot true - - false @@ -662,7 +624,6 @@ true - 1 5.6 @@ -674,9 +635,7 @@ AimedShot true - - false @@ -713,7 +672,6 @@ true - 1 5.6 @@ -725,9 +683,7 @@ AimedShot true - - false @@ -764,7 +720,6 @@ true - 5 4.5 @@ -775,9 +730,7 @@ FALSE SuppressFire - - false diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Shotguns.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Shotguns.xml index a2eead886e..b06b942f2d 100644 --- a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Shotguns.xml +++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_RangedIndustrial_Shotguns.xml @@ -564,7 +564,7 @@ CombatExtended.Verb_ShootCE true - Bullet_12Gauge_Buck + Bullet_12Gauge_Buck_SB 0.6 11 RNShotSawnOff @@ -575,7 +575,7 @@ 2 1.7 - AmmoSet_12Gauge + AmmoSet_12Gauge_SB diff --git a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Ranged_Misc.xml b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Ranged_Misc.xml index 3db23cd098..1315bceb93 100644 --- a/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Ranged_Misc.xml +++ b/ModPatches/Rimmu-Nation - Weapons/Patches/Rimmu-Nation - Weapons/RNW_CE_Patch_Ranged_Misc.xml @@ -28,7 +28,6 @@ RNShotBallistic 0 - FALSE AimedShot diff --git a/ModPatches/Rimrats/Patches/Rimrats/ThingDefs_Races.xml b/ModPatches/Rimrats/Patches/Rimrats/ThingDefs_Races.xml new file mode 100644 index 0000000000..f50b4283bb --- /dev/null +++ b/ModPatches/Rimrats/Patches/Rimrats/ThingDefs_Races.xml @@ -0,0 +1,76 @@ + + + + + + + Defs/ThingDef[defName="Rimrat"] + +
  • + QuadrupedLow +
    • +     +     + + + Defs/ThingDef[defName="Rimrat"]/statBases + + 3.0 + 0.2 + 0.01 + + + + + Defs/ThingDef[defName="Rimrat"]/tools + + +
  • + + +
  • Scratch
    • + + 1 + 1.69 + FrontLeftPaw + 0.01 + 0.01 + +
  • + + +
  • Scratch
    • + + 1 + 1.69 + FrontRightPaw + 0.01 + 0.01 + +
  • + +
  • Bite
    • + + 4 + 0.95 + Teeth + 0.5 + 0.085 + +
  • + + +
  • Blunt
    • + + 1 + 3.00 + HeadAttackTool + 0.2 + 0.1 + 0 + +     +     +     + + \ No newline at end of file diff --git a/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml b/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml index 7da35231bf..1bcf7f5967 100644 --- a/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml +++ b/ModPatches/Rimsenal - Spacer Faction Pack/Patches/Rimsenal - Spacer Faction Pack/Mechs_Smart_CE.xml @@ -61,7 +61,7 @@ - + Defs/ThingDef[@Name="BaseMechanoidTagma"] @@ -81,15 +81,11 @@ true 116 0.50 - - + Defs/ThingDef[defName="Mech_Skutaton"]/statBases/ArmorRating_Sharp @@ -203,7 +199,7 @@ - + Defs/ThingDef[@Name="RSMechanoid"] @@ -222,11 +218,7 @@ 200 true 86 - 0.75 - + 0.5 @@ -266,5 +258,5 @@ 6 - + \ No newline at end of file diff --git a/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_TE.xml b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_TE.xml index ca1bbb6861..2684b460f9 100644 --- a/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_TE.xml +++ b/ModPatches/Rimsenal Core/Defs/Rimsenal Core/Ammo_TE.xml @@ -120,12 +120,11 @@ KineticImpact false - 16 - 2000 + 20 + 4000
  • - 1 KineticImpact 0.5 false @@ -206,7 +205,7 @@
  • KineticImpact - 1.5 + 2.5 false
    • diff --git a/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Apparel_RS_CE.xml b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Apparel_RS_CE.xml index eeefcd4f29..cc6a158ff1 100644 --- a/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Apparel_RS_CE.xml +++ b/ModPatches/Rimsenal Core/Patches/Rimsenal Core/Apparel_RS_CE.xml @@ -1842,7 +1842,7 @@ Defs/ThingDef[defName="Apparel_HazardCarapace"]/statBases/ArmorRating_Heat - 1 + 1.5 1 @@ -1942,6 +1942,7 @@ Defs/ThingDef[defName="Apparel_HazardCarapaceH"]/statBases/ArmorRating_Heat 1.5 + 1 diff --git a/ModPatches/Rimsenal Enhanced Vanilla/Defs/Rimsenal Enhanced Vanilla/Ammo_EnhancedVanilla.xml b/ModPatches/Rimsenal Enhanced Vanilla/Defs/Rimsenal Enhanced Vanilla/Ammo_EnhancedVanilla.xml index 44519317be..5c690d9827 100644 --- a/ModPatches/Rimsenal Enhanced Vanilla/Defs/Rimsenal Enhanced Vanilla/Ammo_EnhancedVanilla.xml +++ b/ModPatches/Rimsenal Enhanced Vanilla/Defs/Rimsenal Enhanced Vanilla/Ammo_EnhancedVanilla.xml @@ -208,9 +208,9 @@ r = resource cost. --> CombatExtended.ProjectileCE_Explosive - 2.0 + 2.5 Thump - 24 + 52 0 0 ThumpCannon_Impact diff --git a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml index 6525dfd33d..8b6fafffae 100644 --- a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml +++ b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml @@ -4,7 +4,7 @@ - + Things/Projectile/Mlaser Graphic_Single @@ -17,7 +17,7 @@ - + Things/Projectile/Cruciblebolt Graphic_Single @@ -51,7 +51,6 @@ Bullet_HarvesterCannon CombatExtended.ProjectileCE_Explosive - Things/Projectile/Laser Graphic_Single @@ -67,7 +66,6 @@ Bullet_PlasmaTurretBombard CombatExtended.ProjectileCE_Explosive - Things/Projectile/Plasma Graphic_Single @@ -93,7 +91,6 @@ Bullet_Federation_PlasmaBlast CombatExtended.ProjectileCE_Explosive - Things/Projectile/MFlux Graphic_Single @@ -118,7 +115,6 @@ Bullet_Federation_PlasmaCluster CombatExtended.ProjectileCE_HeightFuse - Things/Projectile/MFlux Graphic_Single @@ -154,7 +150,6 @@ Bullet_Federation_PlasmaSub CombatExtended.ProjectileCE_Explosive - Things/Projectile/Plasma Graphic_Single @@ -176,7 +171,6 @@ Bullet_CrucibleCannon_CE CombatExtended.ProjectileCE_Explosive - Things/Projectile/Mlaser Graphic_Single @@ -216,7 +210,6 @@ Bullet_PlasmaRifle_Fed CombatExtended.ProjectileCE_Explosive - Things/Projectile/Plasma Graphic_Single @@ -256,13 +249,12 @@ Bullet_AuxiliaryPistol - Things/Projectile/Laser Graphic_Single - 8 + 5 @@ -270,7 +262,6 @@ Bullet_MakeshiftCrucibleRifle - Things/Projectile/Laser Graphic_Single @@ -279,7 +270,7 @@ Optic 90 false - 13 + 8 @@ -299,7 +290,7 @@ Graphic_Single - 12 + 9 @@ -319,7 +310,7 @@ Graphic_Single - 10 + 7 @@ -359,7 +350,7 @@ Graphic_Single - 20 + 14 @@ -368,7 +359,6 @@ Bullet_PlasmaCaster CombatExtended.ProjectileCE_Explosive - Things/Projectile/Plasma Graphic_Single @@ -390,7 +380,6 @@ Bullet_PlasmaCaster_Fed CombatExtended.ProjectileCE_Explosive - Things/Projectile/Flux Graphic_Single @@ -432,13 +421,12 @@ Bullet_CrucibleCarbine_CE - Things/Projectile/Mlaser Graphic_Single - 10 + 7 diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml index ae0bb7b31a..ff8554bcb7 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml @@ -12,4 +12,22 @@ + + Defs/DamageDef[defName="Optic"] + + 0.8 + + + + Defs/DamageDef[defName="Crucible"] + + 0.4 + + + + Defs/DamageDef[defName="Plasma"] + + 0.30 + + \ No newline at end of file diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml index b36f63f8a7..a0f16a62b6 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml @@ -223,6 +223,49 @@ 4 + + + Defs/ThingDef[defName="AD_CrucibleRifle"]/comps + + Defs/ThingDef[defName="AD_CrucibleRifle"] + + + + + + + + Defs/ThingDef[defName="AD_CrucibleRifle"]/comps + +
  • + switch to high-output crucible mode + switch to high-penetration optical mode + True + + 15 + 4 + + + 0.78 + CombatExtended.Verb_ShootCE + true + Bullet_CrucibleRifleAD + 1.6 + 5 + 25 + 55 + RS_ShotCR + 12 + + + AimedShot + false + 3 + TRUE + +
    • +     +     AD_FedRifle @@ -294,6 +337,49 @@ 3 + + + Defs/ThingDef[defName="AD_CruciblePistol"]/comps + + Defs/ThingDef[defName="AD_CruciblePistol"] + + + + + + + + Defs/ThingDef[defName="AD_CruciblePistol"]/comps + +
  • + switch to high-output crucible mode + switch to high-penetration optical mode + True + + 15 + 3 + + + 0.89 + CombatExtended.Verb_ShootCE + true + Bullet_CruciblePistolAD + 0.7 + 5 + 15 + 21 + RS_ShotCP + 12 + + + AimedShot + false + 3 + FALSE + +
    • +     +     AD_FedPistol @@ -431,6 +517,46 @@ 4 + + + Defs/ThingDef[defName="AD_CruciblePresicionRifle"]/comps + + Defs/ThingDef[defName="AD_CruciblePresicionRifle"] + + + + + + + + Defs/ThingDef[defName="AD_CruciblePresicionRifle"]/comps + +
  • + switch to high-output crucible mode + switch to high-penetration optical mode + True + + 15 + 4 + + + 0.53 + CombatExtended.Verb_ShootCE + true + Bullet_CruciblePrecisionRifleAD + 1.6 + 75 + RS_ShotCPR + 12 + + + AimedShot + false + 1 + +
    • +     +     AD_FedSniperRifle @@ -494,6 +620,50 @@ 5 + + + Defs/ThingDef[defName="AD_PlasmaCaliver"]/comps + + Defs/ThingDef[defName="AD_PlasmaCaliver"] + + + + + + + + Defs/ThingDef[defName="AD_PlasmaCaliver"]/comps + +
  • + switch to cluster mode + switch to siege mode + True + + 3 + 5 + + + 0.50 + CombatExtended.Verb_ShootCE + true + Bullet_PlasmaCaster_Fed + 1.9 + 3 + 35 + RS_ShotHarmonizer + GunTail_Heavy + 18 + + true + + true + + + AimedShot + +
    • +     +     AD_FedPlasmaCaster diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml index 7b43bf52be..9f8dc47d85 100644 --- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml +++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Races/Race_Bion.xml @@ -16,14 +16,12 @@
  • - false 0.25
  • Eye
  • - false 0.25
  • Eye
    • diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml index 19e055a76a..903e69ba4e 100644 --- a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml +++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Ogrons.xml @@ -105,13 +105,6 @@     - - Defs/ThingDef[defName="Mutant_Ogron"]/statBases - - 0 - - - Defs/ThingDef[defName="Mutant_Ogron"]/tools diff --git a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Razortooth.xml b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Razortooth.xml index 771725a7e4..6afb2d734b 100644 --- a/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Razortooth.xml +++ b/ModPatches/Rimsenal Feral/Patches/Rimsenal Feral/ThingDefs_Races/Race_Razortooth.xml @@ -52,7 +52,6 @@
  • - false 0.25
  • Leg
    • @@ -60,7 +59,6 @@
  • - false 0.25
  • Leg
    • diff --git a/ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Laborer.xml b/ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Laborer.xml new file mode 100644 index 0000000000..b2deebe5c6 --- /dev/null +++ b/ModPatches/Robotic Servitude/Patches/Bodies/Bodies_Mechanoid_Laborer.xml @@ -0,0 +1,56 @@ + + + + + + Defs/BodyDef[defName="Gha_Laborer"]//*[ + def="MechanicalThoraxCanManipulate" or + def="MechanicalNeck" or + def="SightSensor" or + def="HearingSensor" or + def="SmellSensor" or + def="MechanicalLeg"] + + + + + + + + Defs/BodyDef[defName="Gha_Laborer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[customLabel="rear left foot"]/groups + + Defs/BodyDef[defName="Gha_Laborer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[customLabel="rear left foot"] + + + + + + + + Defs/BodyDef[defName="Gha_Laborer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[customLabel="rear right foot"]/groups + + Defs/BodyDef[defName="Gha_Laborer"]/corePart/parts/li[def="MechanicalLeg"]/parts/li[customLabel="rear right foot"] + + + + + + + + + Defs/BodyDef[defName="Gha_Laborer"]//*[ + def="MechanicalThoraxCanManipulate" or + def="MechanicalNeck" or + def="MechanicalHead" or + def="SightSensor" or + def="HearingSensor" or + def="SmellSensor" or + def="MechanicalLeg" or + def="MechanicalFoot"]/groups + + +
  • CoveredByNaturalArmor
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Misc/Melee_Assassin.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Misc/Melee_Assassin.xml new file mode 100644 index 0000000000..3954f889d8 --- /dev/null +++ b/ModPatches/Robotic Servitude/Patches/ThingDefs_Misc/Melee_Assassin.xml @@ -0,0 +1,64 @@ + + + + + Defs/ThingDef[defName="Gha_MeleeWeapon_AssassinBlade"]/tools + + +
  • + + +
  • Poke
    • + + 6 + 1.27 + 0.10 + 1.96 + Handle + +
  • + + +
  • Stab
    • + + 19 + 1.27 + 1.96 + 3.92 + Point + +
  • + + +
  • Cut
    • + + 48 + 1.25 + 4.84 + 1.08 + Edge + +     +     +     + + + Defs/ThingDef[defName="Gha_MeleeWeapon_AssassinBlade"]/statBases + + 7 + 0.93 + + + + + Defs/ThingDef[defName="Gha_MeleeWeapon_AssassinBlade"] + + + 0.67 + 0.7 + 0.47 + + + + +     \ No newline at end of file diff --git a/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml new file mode 100644 index 0000000000..8ab09a5246 --- /dev/null +++ b/ModPatches/Robotic Servitude/Patches/ThingDefs_Races/Races_Mechanoid.xml @@ -0,0 +1,208 @@ + + + + + + + Defs/PawnKindDef[defName="Gha_Combat_Laborer"] + +
  • + + 4 + 6 + +
    • +     +     + + + + + Defs/ThingDef[@Name="Gha_MediumMechanoid"]/statBases + + 50 + 20 + 1.3 + 1.25 + 0.09 + 0.08 + 0.07 + 150 + 0.4 + + + + + Defs/ThingDef[@Name="Gha_MediumMechanoid"]/statBases/ArmorRating_Blunt + + 3 + + + + + Defs/ThingDef[@Name="Gha_MediumMechanoid"]/statBases/ArmorRating_Sharp + + 2 + + + + + Defs/ThingDef[@Name="Gha_MediumMechanoid"]/tools + + +
  • + + +
  • Blunt
    • + + 4 + 2.0 + HeadAttackTool + true + 0.5 + +     +     +     + + + + + Defs/ThingDef[defName="Gha_Corpse_Laborer" or defName="Gha_Combat_Laborer" or defName="Gha_Assassin_Laborer" or defName="Gha_Assassin_Laborer"] + +
  • + Humanoid +
    • +     +     + + + Defs/ThingDef[defName="Gha_Corpse_Laborer"]/statBases + + 0.12 + 0.12 + 0.07 + + + + + Defs/ThingDef[defName="Gha_Corpse_Laborer"]/tools + + +
  • + + +
  • Blunt
    • + + 13 + 2.67 + FrontLeftLeg + 5 + true + +
  • + + +
  • Blunt
    • + + 13 + 2.67 + FrontRightLeg + 5 + true + +
  • + + +
  • Blunt
    • + + 15 + 3.51 + HeadAttackTool + 12 + true + 0.2 + +     +     +     + + + Defs/ThingDef[defName="Gha_Corpse_Laborer"]/comps + + Defs/ThingDef[defName="Gha_Corpse_Laborer"] + + + + + + + + Defs/ThingDef[defName="Gha_Corpse_Laborer"]/comps + +
  • + 700 + true + 1250 + 5 + true + + 5 + 5 + + 300 + 200 + true + 70 + 0.5 +
    • +     +     + + + + + Defs/ThingDef[defName="Gha_Combat_Laborer"]/statBases/ArmorRating_Blunt + + 11 + + + + + Defs/ThingDef[defName="Gha_Combat_Laborer"]/statBases/ArmorRating_Sharp + + 5.5 + + + + + Defs/ThingDef[defName="Gha_Combat_Laborer"]/race/baseHealthScale + + 1.15 + + + + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases + + 0.17 + 0.17 + 0.09 + + + + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Blunt + + 12 + + + + + Defs/ThingDef[defName="Gha_Assassin_Laborer"]/statBases/ArmorRating_Sharp + + 4.5 + + + +     \ No newline at end of file diff --git a/ModPatches/Roren Race/Patches/Roren Race/Race_Roren.xml b/ModPatches/Roren Race/Patches/Roren Race/Race_Roren.xml index 3b169bceba..afa1523fb3 100644 --- a/ModPatches/Roren Race/Patches/Roren Race/Race_Roren.xml +++ b/ModPatches/Roren Race/Patches/Roren Race/Race_Roren.xml @@ -9,13 +9,13 @@
  • CombatExtended.CompPawnGizmo
    • -
  • +
  • 500 true 600 5 - 0.75 + 0.5
    • @@ -26,13 +26,13 @@
  • CombatExtended.CompPawnGizmo
    • -
  • +
  • 500 true 600 5 - 0.75 + 0.5
    • @@ -111,5 +111,5 @@
  • CE_Apparel_ImprovGasMask
    •  - + \ No newline at end of file diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Hediffs_SOS2.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Hediffs_SOS2.xml index 6c04147f68..dee44e71df 100644 --- a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Hediffs_SOS2.xml +++ b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Hediffs_SOS2.xml @@ -17,7 +17,7 @@ Defs/HediffDef[defName="SoSArchotechSkin"]/stages/li/statOffsets/ArmorRating_Sharp - 8 + 12 @@ -65,7 +65,7 @@
  • Defs/HediffDef[defName="SoSHologramArchotech"]/stages/li/statOffsets/ArmorRating_Sharp - 12.0 + 18.0
    • diff --git a/ModPatches/Silkiera Race/Patches/Silkiera Race/Bodies/Bodies_Mech.xml b/ModPatches/Silkiera Race/Patches/Silkiera Race/Bodies/Bodies_Mech.xml index 4b3ffe92db..498be7f285 100644 --- a/ModPatches/Silkiera Race/Patches/Silkiera Race/Bodies/Bodies_Mech.xml +++ b/ModPatches/Silkiera Race/Patches/Silkiera Race/Bodies/Bodies_Mech.xml @@ -13,7 +13,6 @@ def="MechanicalLeg" or def="MechanicalFoot"] - @@ -34,7 +33,6 @@ def="MechanicalFoot" ]/groups -
  • CoveredByNaturalArmor
    •  diff --git a/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml new file mode 100644 index 0000000000..c2f546b174 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Ammo.xml @@ -0,0 +1,319 @@ + + + + + + + AmmoSet_8mmRailgun_CoilgunLance + + + Bullet_CoilGunLance + + + + + Bullet_CoilGunLance + + + true + False + Bullet + 25 + 47 + 310 + + + + + + + + + AmmoHotPlasmaCell + + AmmoAdvanced + Spacer Arsenal/PlasmaCell/HotPlasmaCell_c + + + + + + PlasmaBolt + + A concentrated bolt of radiation, imparting disruptive energy into the target. + + + + + + AmmoSet_PlasmaBlaster + + + Bullet_Bolt_PlasmaBlaster + + + + + + + A hot plasma cell utilised by spacer tech assault weapons. + + 0.008 + 0.01 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_FabricationBench
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • AmmoHotPlasmaCell
    • +     + 5000 +     + + + Ammo_HotPlasmaCell + + + Spacer Arsenal/PlasmaCell + Graphic_StackCount + + + 0.69 + + PlasmaBolt + Bullet_Bolt_PlasmaBlaster + + + + + + + + Things/Projectiles/Bullet_Plasma + Graphic_Single + TransparentPostLight + + + CE_Laser + 170 + false + + + + + Bullet_Bolt_PlasmaBlaster + + Bullet + 5 + 15 + 5 + +
  • + Flame_Secondary + 17 +
    • +     +     +     + + + + + MakeAmmo_HotPlasmaCell + + Craft 500 hot plasma cells. + Making hot plasma cells. + +
  • + + +
  • Plasteel
    • + + + 8 + +
  • + + +
  • Steel
    • + + + 4 + +
  • + + +
  • ComponentIndustrial
    • + + + 8 + +
  • + + +
  • Prometheum
    • + + + 8 + +
  • + + +
  • Chemfuel
    • + + + 12 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentIndustrial
    • +
  • Prometheum
    • +
  • Chemfuel
    • +     +     + + 500 + + 8400 +     + + + + + + + AmmoPhotonCell + + AmmoAdvanced + Spacer Arsenal/PhotonCell/PhotonCell_c + + + + + + PhotonCell + + A concentrated bolt of radiation, imparting disruptive energy into the target. + + + + + + AmmoSet_PhotonBlaster + + + Bullet_Bolt_PhotonBlaster + + + + + + + A charged photon cell utilised by spacer tech assault weapons. + + 0.008 + 0.01 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting_FabricationBench
    • +
  • CE_AutoEnableCrafting_TableMachining
    • +     + +
  • AmmoPhotonCell
    • +     + 5000 +     + + + Ammo_PhotonCell + + + Spacer Arsenal/PhotonCell + Graphic_StackCount + + + 0.69 + + PhotonCell + Bullet_Bolt_PhotonBlaster + + + + + + + + Things/Projectiles/Bullet_Photon + Graphic_Single + TransparentPostLight + + + Photon + 156 + false + + + + + Bullet_Bolt_PhotonBlaster + + Photon + 12 + 10.5 + 7 + + + + + + + MakeAmmo_PhotonCell + + Craft 500 photon cells. + Making photon cells. + +
  • + + +
  • Plasteel
    • + + + 8 + +
  • + + +
  • Steel
    • + + + 4 + +
  • + + +
  • ComponentSpacer
    • + + + 4 + +     + + +
  • Plasteel
    • +
  • Steel
    • +
  • ComponentSpacer
    • +     +     + + 500 + + 8400 +     + +     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml new file mode 100644 index 0000000000..6087fd0024 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Defs/Spacer Arsenal/Damages_LocalInjury.xml @@ -0,0 +1,17 @@ + + + + + Photon + + {0} has been scorched to death. + BurnSecondary + false + 99999 + 1 + 0 + 0.1 + 2 + + + \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml new file mode 100644 index 0000000000..9361e19181 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Helmet.xml @@ -0,0 +1,101 @@ + + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases + + 4 + 1 + 0.7 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/Mass + + 3.0 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/ArmorRating_Sharp + + 10 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/ArmorRating_Blunt + + 26 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/statBases/MaxHitPoints + + 190 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/equippedStatOffsets + + 0.15 + -1 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/equippedStatOffsets/MentalBreakThreshold + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/costList/Plasteel + + 50 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/costList + + 35 + + + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"]/apparel/layers + +
  • OnHead
    • +
  • StrappedHead
    • +     +     + + + Defs/ThingDef[defName="DV_Apparel_CommodoreHelmet"] + +
  • + +
  • + 0.80 + +
  • Eye
    • +
  • Nose
    • + + +
  • + 0.80 + +
  • Eye
    • +
  • Nose
    • + + + + +     +     + +     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Various.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Various.xml new file mode 100644 index 0000000000..cbb246ea21 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Apparel_Various.xml @@ -0,0 +1,97 @@ + + + + + + + Defs/ThingDef[defName="DV_Apparel_EnsignArmor"] + + + 80 + 12 + 0.1 + 30 + 16 + 38.25 + 400 + + + + + + + Defs/ThingDef[defName="DV_Apparel_EnsignArmor"] + + + 60 + 140 + 20 + 5 + + + + + + Defs/ThingDef[@Name="DV_ApparelArmorEnsignBase"]/equippedStatOffsets/MoveSpeed + + 50 + 8 + 0.50 + + + + + Defs/ThingDef[@Name="DV_ApparelArmorEnsignBase"]/apparel/bodyPartGroups + +
  • Hands
    • +
  • Feet
    • +     +     + + + Defs/ThingDef[@Name="DV_ApparelArmorEnsignBase"] + +
  • + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.80 + +
  • Neck
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.90 + +
  • Arm
    • + + +
  • + 0.70 + +
  • Hand
    • + + +
  • + 0.70 + +
  • Hand
    • + + + + +     +     + +     diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml new file mode 100644 index 0000000000..9f88482ba5 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Grenades.xml @@ -0,0 +1,119 @@ + + + + + + + + Defs/ThingDef[defName="DV_Proj_GrenadeThump"]/thingClass + + CombatExtended.ProjectileCE_Explosive + + + + + Defs/ThingDef[defName="DV_Proj_GrenadeThump"]/projectile + + + + Defs/ThingDef[defName="DV_Proj_GrenadeThump"] + + + 1.5 + Thump + 56 + 60 + true + Fleck_GrenadePin + Filth_GrenadeAmmoCasings + true + 12 + 3.0 + 2.0 + 0.25 + + + + + + Defs/ThingDef[defName="DV_Proj_GrenadeThump"]/comps + + Defs/ThingDef[defName="DV_Proj_GrenadeThump"] + + + + + + + + + + Defs/ThingDef[defName="DV_Weapon_GrenadeThump"]/smeltable + + false + + + + + Defs/ThingDef[defName="DV_Weapon_GrenadeThump"] + + CombatExtended.AmmoThing + 75 + First + + + + + Defs/ThingDef[defName="DV_Weapon_GrenadeThump"] + Class + CombatExtended.AmmoDef + + + + Defs/ThingDef[defName="DV_Weapon_GrenadeThump"]/comps + + +
  • + 56 + Thump + 3.9 +
    • +     +     +     + + + DV_Weapon_GrenadeThump + + 0.4 + 0.87 + 11.22 + 1 + 1.0 + + + + CombatExtended.Verb_ShootCEOneUse + true + 12.0 + 4 + 1 + 6 + true + ThrowGrenade + + true + + DV_Proj_GrenadeThump + true + true + 7 + + +
  • CE_AI_Grenade
    • +
  • CE_AI_AOE
    • +
  • CE_OneHandedWeapon
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml new file mode 100644 index 0000000000..6648c4fd57 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Melee.xml @@ -0,0 +1,105 @@ + + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/tools + + +
  • + + +
  • Poke
    • + + 2 + 0.1 + 1.5 + 0.5 + Handle + +
  • + + +
  • Cut
    • + + 35 + 0.83 + 2.88 + 4.5 + Edge + +
  • + Stun + 10 + 0.4 +
    • +     + +
  • + + +
  • Stab
    • + + 16 + 0.94 + 1.28 + 6.25 + +
  • + Stun + 10 + 0.4 +
    • +     + +     +     +     + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/statBases + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"] + + + + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/statBases + + 4 + 0.40 + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"] + + + 1.00 + 0.40 + 0.27 + + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/weaponTags + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"] + + + + + + + + Defs/ThingDef[defName="DV_MeleeWeapon_SparkSabre"]/weaponTags + +
  • CE_OneHandedWeapon
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml new file mode 100644 index 0000000000..9bd47fd899 --- /dev/null +++ b/ModPatches/Spacer Arsenal/Patches/Spacer Arsenal/Weapons_Ranged.xml @@ -0,0 +1,256 @@ + + + + + + + Defs/ThingDef[ + defName="DV_Gun_ClashHMG" or + defName="DV_Gun_SonicStunner" or + defName="DV_Gun_BruteRifle" or + defName="DV_Gun_PhotonSMG" or + defName="DV_Gun_PlasmaBlaster" or + defName="DV_Gun_CoilgunLance" + ]/tools + + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + +     +     +     + + + + + DV_Gun_ClashHMG + + 25 + 2.07 + 0.07 + 1 + 0.47 + + + 2.33 + CombatExtended.Verb_ShootCE + True + Bullet_145x114mm_FMJ + 10 + 10 + 2.1 + 60 + Shot_Autocannon + GunTail_Medium + 12 + + + 60 + 4.9 + AmmoSet_145x114mm + + + FALSE + SuppressFire + 5 + + +
  • CE_MachineGun
    • +
  • CE_AI_LMG
    • +     +     + + + Defs/ThingDef[defName="DV_Gun_ClashHMG"]/equippedStatOffsets/MoveSpeed + + + + + + DV_Gun_CoilgunLance + + 4.0 + 9.0 + 1.30 + 0.07 + 1.10 + 0.38 + + + 2.09 + CombatExtended.Verb_ShootCE + True + Bullet_CoilGunLance + 1.1 + 60 + Shot_TurretSniper + GunTail_Heavy + 9 + + + 1 + 4 + AmmoSet_8mmRailgun_CoilgunLance + + + AimedShot + False + + +
  • SpacerGun
    • +
  • Coilgun
    • +     +     + + + + + DV_Gun_PhotonSMG + + 2.50 + 0.37 + 1.00 + 0.14 + 0.94 + 4.50 + + + 1.79 + CombatExtended.Verb_ShootCE + true + Bullet_Bolt_PhotonBlaster + 0.6 + 25 + 6 + 6 + DV_Shot_PhotonSMG + GunTail_Medium + 9 + + + 25 + 4 + AmmoSet_PhotonBlaster + + + 3 + FALSE + Snapshot + + +
  • CE_SMG
    • +
  • CE_AI_BROOM
    • +     +     + + + + DV_Gun_PlasmaBlaster + + 8.7 + 0.56 + 1 + 0.05 + 1.37 + 12.9 + + + 1.38 + CombatExtended.Verb_ShootCE + true + Bullet_Bolt_PlasmaBlaster + 1.3 + 62 + 7 + 10 + DV_Shot_PlasmaBlaster + GunTail_Medium + 9 + + + 40 + 4.9 + AmmoSet_PlasmaBlaster + + + 5 + FALSE + SuppressFire + + +
  • CE_MachineGun
    • +
  • CE_AI_LMG
    • +     +     + + + + + DV_Gun_BruteRifle + + 25 + 2.07 + 0.07 + 1 + 0.47 + + + 2.33 + CombatExtended.Verb_ShootCE + True + Bullet_50BMG_FMJ + 4 + 10 + 2.1 + 40 + Shot_Autocannon + GunTail_Medium + 12 + + + 15 + 4.9 + AmmoSet_50BMG + + + true + Snapshot + 2 + + + + + Defs/ThingDef[defName="DV_Gun_BruteRifle"]/equippedStatOffsets/MoveSpeed + + +     \ No newline at end of file diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_a.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_a.png new file mode 100644 index 0000000000..c1fd2c146c Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_a.png differ diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_b.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_b.png new file mode 100644 index 0000000000..881744cd4a Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_b.png differ diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_c.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_c.png new file mode 100644 index 0000000000..124c04bb8c Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PhotonCell/PhotonCell_c.png differ diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_a.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_a.png new file mode 100644 index 0000000000..a89eb7c3f7 Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_a.png differ diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_b.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_b.png new file mode 100644 index 0000000000..3faaf15b06 Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_b.png differ diff --git a/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_c.png b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_c.png new file mode 100644 index 0000000000..dcd3fde306 Binary files /dev/null and b/ModPatches/Spacer Arsenal/Textures/Spacer Arsenal/PlasmaCell/HotPlasmaCell_c.png differ diff --git a/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml b/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml new file mode 100644 index 0000000000..18f444f3b4 --- /dev/null +++ b/ModPatches/Spacer Pack/Defs/Spacer Pack/Defs_Projectiles.xml @@ -0,0 +1,106 @@ + + + + + + + dvd_grubpack_spit_CE + CombatExtended.ProjectileCE_Explosive + + + Graphic_Single + Things/Projectile/GrubpackGlob + (1.0,1.0) + MoteGlow + + + 0 + True + 1 + 10 + True + 5 + AcidBurn + 30 + 2.9 + SpitterSpitLands + Filth_SpentAcid + 1 + Shell_AcidSpitImpact + 60 + false + + + + + dvd_Projectile_RipperRack_CE + + + Graphic_Single + Things/Projectile/Grenade_RipperMechanites + + + 20 + 3 + dvd_RipperBomb + 50 + 3.0 + 0.25 + 3.0 + 50 + 3.9 + dvd_Filth_RipperMechanites + 1 + + +
  • + +
  • + dvd_Fleck_RipperMechanites_Random + 0.5 + 0 + 0.5 + 1 +
    • + + +     +     + + + dvd_SkipBolt_CE + + + Things/Projectile/ArchoPack_Bolt + Graphic_Single + + + dvd_SkipBolt + 26 + 120 + 120 + + +
  • + +
  • + dvd_Fleck_ArchoPack_Main + 0.5 + 0 + 0.5 + 1 +
    • +
  • + dvd_Fleck_ArchoPack_Smoke + 0.5 + 0 + 0.5 + 1 + 120~240 +
    • + + +     +     + +     \ No newline at end of file diff --git a/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml b/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml new file mode 100644 index 0000000000..4d7df8809a --- /dev/null +++ b/ModPatches/Spacer Pack/Patches/Spacer Pack/Backpacks.xml @@ -0,0 +1,316 @@ + + + + + + + Defs/ThingDef[@Name="BackpackBase"] + ParentName + ApparelBase + + + + Defs/ThingDef[@Name="BackpackBase"]/apparel + + + true + false + true + +
  • Shoulders
    • +     + +
  • Backpack
    • +     +     +     +     + + + Defs/ThingDef[@Name="BackpackBase"]/thingCategories + + +
  • Loadout
    • +     +     +     + + + Defs/ThingDef[@Name="BackpackBase"]/tradeTags + + +
  • Clothing
    • +     +     +     + + + + + Defs/ThingDef[defName="dvd_harvestpack"]/equippedStatOffsets/VEF_MassCarryCapacity + + 30 + + + + + Defs/ThingDef[defName="dvd_harvestpack"]/statBases/Mass + + 6 + 8 + + + + + + + Defs/ThingDef[defName="dvd_ventpack"]/equippedStatOffsets + + + 25 + + + + + + Defs/ThingDef[defName="dvd_ventpack"]/statBases/Mass + + 6 + 8 + + + + + Defs/ThingDef[defName="dvd_ventpack"]/statBases/JumpRange + + 20 + + + + + + + Defs/ThingDef[defName="dvd_grubpack"]/equippedStatOffsets/VEF_MassCarryCapacity + + 70 + + + + + Defs/ThingDef[defName="dvd_grubpack"]/equippedStatOffsets/MoveSpeed + + + + Defs/ThingDef[defName="dvd_grubpack"]/statBases/Mass + + 6 + 8 + + + + + Defs/ThingDef[defName="dvd_grubpack"]/comps + +
  • + +
  • 30
    • +
  • 50
    • +
  • 70
    • +
  • 90
    • + + +     +     + + + Defs/ThingDef[defName="dvd_grubpack"]/verbs + + +
  • + + CombatExtended.Verb_LaunchProjectileStaticCE + true + True + 1.5 + 35 + 5 + true + SpitterSpit + GunTail_Medium + 14 + true + + true + + true + dvd_grubpack_spit_CE + Combat_RangedFire_Thrown +
    • +     +     +     + + + + + + Defs/ThingDef[defName="dvd_spacerpack"]/equippedStatOffsets + + + 80 + + + + + + Defs/ThingDef[defName="dvd_spacerpack"]/statBases/Mass + + 4 + 5 + + + + + + + Defs/ThingDef[defName="dvd_minerpack"]/equippedStatOffsets/VEF_MassCarryCapacity + + 80 + + + + + Defs/ThingDef[defName="dvd_minerpack"]/costList + + 1 + + + + + Defs/ThingDef[defName="dvd_minerpack"]/equippedStatOffsets/MoveSpeed + + + + Defs/ThingDef[defName="dvd_minerpack"]/statBases/Mass + + 4 + 5 + + + + + Defs/ThingDef[defName="dvd_minerpack"]/verbs + + +
  • + + CombatExtended.Verb_LaunchProjectileStaticCE + true + True + 1.0 + 21 + 6 + true + ThrowGrenade + GunTail_Medium + 14 + true + + true + + true + dvd_Projectile_RipperRack_CE + Combat_RangedFire_Thrown +
    • +     +     +     + + + + + Defs/ThingDef[defName="dvd_medpack"]/equippedStatOffsets/VEF_MassCarryCapacity + + 50 + + + + + Defs/ThingDef[defName="dvd_medpack"]/statBases + + 4 + + + + + + + Defs/ThingDef[defName="dvd_voidpack"]/equippedStatOffsets/VEF_MassCarryCapacity + + 80 + + + + + Defs/ThingDef[defName="dvd_voidpack"]/statBases + + 4 + + + + + Defs/ThingDef[defName="dvd_voidpack"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax + + 30 + + + + + Defs/ThingDef[defName="dvd_voidpack"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate + + 6 + + + + + + + Defs/ThingDef[defName="dvd_archopack"]/equippedStatOffsets/VEF_MassCarryCapacity + + 120 + 100 + + + + + Defs/ThingDef[defName="dvd_archopack"]/statBases/Mass + + 6 + 6 + + + + + Defs/ThingDef[defName="dvd_archopack"]/verbs + + +
  • + + CombatExtended.Verb_LaunchProjectileStaticCE + true + true + 0.5 + 55 + 3 + 10 + dvd_Sound_SkipBolt + GunTail_Medium + 14 + dvd_SkipBolt_CE + Combat_RangedFire_Thrown +
    • +     +     +     + +     \ No newline at end of file diff --git a/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml b/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml new file mode 100644 index 0000000000..eb9872e8fd --- /dev/null +++ b/ModPatches/Spacer Pack/Patches/Spacer Pack/Damage.xml @@ -0,0 +1,37 @@ + + + + + + + Defs/DamageDef[defName="dvd_SkipBolt"] + ParentName + Bullet + + + + Defs/DamageDef[defName="dvd_RipperBomb"] + ParentName + Bomb + + + + Defs/DamageDef[defName="dvd_RipperBomb"]/defaultArmorPenetration + + 62 + + + + + Defs/DamageDef[defName="dvd_RipperBomb"]/armorCategory + + Blunt + + + + + + Defs/ThingDef[defName="dvd_Projectile_RipperRack"] + + + \ No newline at end of file diff --git a/ModPatches/Spacer Pack/Patches/Spacer Pack/Hediff.xml b/ModPatches/Spacer Pack/Patches/Spacer Pack/Hediff.xml new file mode 100644 index 0000000000..63621ffc43 --- /dev/null +++ b/ModPatches/Spacer Pack/Patches/Spacer Pack/Hediff.xml @@ -0,0 +1,36 @@ + + + + + + + Defs/HediffDef[defName="dvd_RipperMechanites"]/stages/li[label="limited"]/statOffsets + + + -3 + -5 + + + + + + Defs/HediffDef[defName="dvd_RipperMechanites"]/stages/li[label="moderate"]/statOffsets + + + -7 + -10 + + + + + + Defs/HediffDef[defName="dvd_RipperMechanites"]/stages/li[label="extensive"]/statOffsets + + + -15 + -20 + + + + + \ No newline at end of file diff --git a/ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/PPS.xml b/ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/Apparel.xml similarity index 70% rename from ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/PPS.xml rename to ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/Apparel.xml index 588b4d14be..bc4bfe8a1d 100644 --- a/ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/PPS.xml +++ b/ModPatches/Star Crafter's Armory/Patches/Star Crafter's Armory/Apparel.xml @@ -38,29 +38,6 @@ - - Defs/ThingDef[defName="PPSa"]/equippedStatOffsets/ToxicSensitivity - - Defs/ThingDef[defName="PPSa"]/equippedStatOffsets/ToxicSensitivity - - - - - Defs/ThingDef[defName="PPSa"]/equippedStatOffsets/ToxicEnvironmentResistance - - Defs/ThingDef[defName="PPSa"]/equippedStatOffsets/ToxicEnvironmentResistance - - 0.5 - - - - Defs/ThingDef[defName="PPSa"]/equippedStatOffsets - - 0.5 - - - - Defs/ThingDef[defName="PPSa"]/statBases/ArmorRating_Sharp @@ -97,11 +74,12 @@ - - Defs/ThingDef[defName="PPSa"]/equippedStatOffsets + + Defs/ThingDef[defName="PPSa"]/equippedStatOffsets/ToxicEnvironmentResistance 225 50 + 0.5 @@ -158,44 +136,15 @@ - - Defs/ThingDef[defName="PPSH"]/equippedStatOffsets + + Defs/ThingDef[defName="PPSH"]/equippedStatOffsets/ToxicEnvironmentResistance + 0.5 0.15 -1 - - Defs/ThingDef[defName="PPSH"]/equippedStatOffsets/ToxicSensitivity - - -0.5 - - - - - Defs/ThingDef[defName="PPSH"]/equippedStatOffsets/ToxicSensitivity - - Defs/ThingDef[defName="PPSH"]/equippedStatOffsets/ToxicSensitivity - - - - - Defs/ThingDef[defName="PPSH"]/equippedStatOffsets/ToxicEnvironmentResistance - - Defs/ThingDef[defName="PPSH"]/equippedStatOffsets/ToxicEnvironmentResistance - - 0.5 - - - - Defs/ThingDef[defName="PPSH"]/equippedStatOffsets - - 0.5 - - - - Defs/ThingDef[defName="PPSH"]/costList/Plasteel @@ -233,4 +182,5 @@ + \ No newline at end of file diff --git a/ModPatches/Starship Troopers Arachnids/Patches/Starship Troopers Arachnids/Races.xml b/ModPatches/Starship Troopers Arachnids/Patches/Starship Troopers Arachnids/Races.xml index 13b7c3b499..3833a526a3 100644 --- a/ModPatches/Starship Troopers Arachnids/Patches/Starship Troopers Arachnids/Races.xml +++ b/ModPatches/Starship Troopers Arachnids/Patches/Starship Troopers Arachnids/Races.xml @@ -13,7 +13,7 @@ Defs/ThingDef[@Name="BugsThingBase"]/statBases - 5 + 0.99 diff --git a/ModPatches/The Tuffalo/Patches/The Tuffalo/Animal_Tuffalo.xml b/ModPatches/The Tuffalo/Patches/The Tuffalo/Animal_Tuffalo.xml index e3b0f2f4ff..eed96ef128 100644 --- a/ModPatches/The Tuffalo/Patches/The Tuffalo/Animal_Tuffalo.xml +++ b/ModPatches/The Tuffalo/Patches/The Tuffalo/Animal_Tuffalo.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="Tuffalo"] -
  • Quadruped @@ -88,7 +87,6 @@ Defs/ThingDef[defName="TuffaloWool"]/statBases/StuffPower_Armor_Sharp - 0.02 0.056 diff --git a/ModPatches/The Vanity Project - Shiba Inu/Patches/The Vanity Project - Shiba Inu/Vanity_Project_Shiba_Inu_Patch.xml b/ModPatches/The Vanity Project - Shiba Inu/Patches/The Vanity Project - Shiba Inu/Vanity_Project_Shiba_Inu_Patch.xml index bbff5338be..918e04f1fd 100644 --- a/ModPatches/The Vanity Project - Shiba Inu/Patches/The Vanity Project - Shiba Inu/Vanity_Project_Shiba_Inu_Patch.xml +++ b/ModPatches/The Vanity Project - Shiba Inu/Patches/The Vanity Project - Shiba Inu/Vanity_Project_Shiba_Inu_Patch.xml @@ -60,13 +60,13 @@ - + Defs/ThingDef[defName="TVP_ShibaInu"]/comps Defs/ThingDef[defName="TVP_ShibaInu"] - + @@ -79,7 +79,7 @@ true 600 5 - 0.75 + 0.5
    • diff --git a/ModPatches/Ushankas Glitterworld Uprising/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml b/ModPatches/Ushankas Glitterworld Uprising/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml index 8eb4414bd1..101d97fdaf 100644 --- a/ModPatches/Ushankas Glitterworld Uprising/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml +++ b/ModPatches/Ushankas Glitterworld Uprising/Patches/Ushankas Glitterworld Uprising/Hediff_Glitter.xml @@ -9,7 +9,7 @@ Defs/HediffDef[defName="USH_InstalledGoldenSkinReplacement"]/stages/li/statOffsets/ArmorRating_Sharp - 0.85 + 1.25 diff --git a/ModPatches/Valorant Weapon Pack/Patches/Valorant Weapon Pack/ValorantWeaponPack_Ranged.xml b/ModPatches/Valorant Weapon Pack/Patches/Valorant Weapon Pack/ValorantWeaponPack_Ranged.xml new file mode 100644 index 0000000000..16df828b67 --- /dev/null +++ b/ModPatches/Valorant Weapon Pack/Patches/Valorant Weapon Pack/ValorantWeaponPack_Ranged.xml @@ -0,0 +1,741 @@ + + + + + + Defs/ThingDef[ + defName="Biaopei" or + defName="Guimei" or + defName="Zhengyi" or + defName="Kuangnu" or + defName="Duanpao"]/tools + + +
  • + + +
  • Blunt
    • + + 2 + 1.54 + 1.5 + 0.555 + Grip + +
  • + + +
  • Poke
    • + + 2 + 1.54 + 0.555 + Muzzle + +     +     +     + + + Defs/ThingDef[ + defName="Fengci" or + defName="Hailing" or + defName="Xionglu" or + defName="Panguan" or + defName="Liaoquan" or + defName="Shuwei" or + defName="Huanying" or + defName="Kuangtu" or + defName="Feijiang" or + defName="Mangxia" or + defName="Mingju" or + defName="Zhanshen" or + defName="Aodin"]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + +     +     +     + + + + Biaopei + + 1.11 + 0.39 + 0.7 + 0.17 + 0.97 + 2.03 + + + 2.51 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 0.6 + 12 + Shot_Biaopei + GunTail_Light + 9 + + true + + + + 12 + 1.75 + AmmoSet_9x19mmPara + + +
  • CE_Sidearm
    • +
  • CE_OneHandedWeapon
    • +     +     + + + + Guimei + + 1.24 + 0.42 + 0.7 + 0.17 + 1.17 + 2.4 + + + 2.40 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmParaSD_FMJ + 0.6 + 12 + Shot_Guimei + GunTail_Light + 9 + + true + + + + 15 + 1.5 + AmmoSet_9x19mmParaSD + + + + + + Zhengyi + + 2.79 + 0.49 + 0.7 + 0.15 + 1.39 + 1.39 + + + 2.76 + CombatExtended.Verb_ShootCE + true + Bullet_357Magnum_FMJ + 0.6 + 12 + Shot_Zhengyi + GunTail_Light + 9 + + true + + + + 6 + 2.25 + AmmoSet_357Magnum_Revolver + + + + + + Kuangnu + + 2.84 + 0.36 + 0.7 + 0.16 + 1.93 + 2.95 + + + 1.71 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 0.6 + 12 + 3 + 13 + Shot_Kuangnu + GunTail_Light + 9 + + true + + + + 13 + 1.5 + AmmoSet_9x19mmPara + + + AimedShot + + + + + + Duanpao + + 2.84 + 0.36 + 0.7 + 0.17 + 1.93 + 2.95 + + + 3.13 + CombatExtended.Verb_ShootCE + true + Bullet_12Gauge_Buck + 0.6 + 12 + 2 + 2 + Shot_Duanpao + GunTail_Heavy + 9 + + true + + + + 2 + 1.75 + AmmoSet_12Gauge + + + AimedShot + + + + + + Fengci + + 2.5 + 0.37 + 1 + 0.14 + 0.94 + 4.5 + + + 1.79 + CombatExtended.Verb_ShootCE + true + Bullet_9x19mmPara_FMJ + 0.6 + 25 + 6 + 2 + Shot_Fengci + GunTail_Light + 9 + + true + + + + 20 + 2.25 + AmmoSet_9x19mmPara + + + AimedShot + + + + + + Hailing + + 2.85 + 0.37 + 1 + 0.14 + 0.94 + 5 + + + 1.79 + CombatExtended.Verb_ShootCE + true + Bullet_45ACP_FMJ + 0.6 + 25 + 6 + 3 + Shot_Hailing + GunTail_Light + 9 + + true + + + + 30 + 2.25 + AmmoSet_45ACP + + + AimedShot + + + + + + Xionglu + + 3.00 + 1.0 + 1 + 0.14 + 1.20 + 9.0 + + + 2.75 + CombatExtended.Verb_ShootCE + true + Bullet_12Gauge_Buck + 0.6 + 16 + Shot_Xionglu + GunTail_Heavy + 9 + + true + + + + 5 + true + 0.5 + AmmoSet_12Gauge + + + AimedShot + + + + + + Panguan + + 3.5 + 0.39 + 1 + 0.15 + 1.26 + 6.7 + + + 2.54 + CombatExtended.Verb_ShootCE + true + Bullet_12Gauge_Buck + 0.6 + 16 + Shot_Panguan + GunTail_Heavy + 9 + + true + + + + 10 + 4 + AmmoSet_12Gauge + + + Snapshot + + + + + + Liaoquan + + 4.62 + 0.36 + 1 + 0.07 + 1.47 + 8.2 + + + 1.26 + CombatExtended.Verb_ShootCE + true + Bullet_556x45mmNATO_FMJ + 1.1 + 55 + 6 + 3 + Shot_Liaoquan + GunTail_Medium + 9 + + true + + + + 24 + 2.5 + AmmoSet_556x45mmNATO + + + AimedShot + + + + + + Shuwei + + 4.3 + 0.37 + 1 + 0.06 + 1.52 + 10.90 + + + 1.92 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 1.1 + 55 + Shot_Shuwei + GunTail_Medium + 9 + + true + + + + 12 + 2.5 + AmmoSet_762x51mmNATO + + + AimedShot + + + + + + Huanying + + 4.55 + 0.37 + 1 + 0.06 + 1.52 + 11.20 + + + 1.92 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 1.1 + 55 + 6 + 3 + Shot_Huanying + GunTail_Medium + 9 + + true + + + + 30 + 2.5 + AmmoSet_762x51mmNATO + + + AimedShot + + + + + + Kuangtu + + 3.3 + 0.36 + 1 + 0.09 + 1.28 + 7.25 + + + 1.82 + CombatExtended.Verb_ShootCE + true + Bullet_762x39mmSoviet_FMJ + 1.1 + 55 + 6 + 3 + Shot_Kuangtu + GunTail_Medium + 9 + + true + + + + 24 + 2.5 + AmmoSet_762x39mmSoviet + + + AimedShot + + + + + + Feijiang + + 3.06 + 0.78 + 1.7 + 0.05 + 1.38 + 10.70 + + + 2.37 + CombatExtended.Verb_ShootCE + true + Bullet_44Magnum_HV_FMJ + 0.9 + 31 + Shot_Feijiang + GunTail_Heavy + 9 + + true + + + + 5 + true + 0.5 + AmmoSet_44Magnum_HV + + + AimedShot + + + + + + Mangxia + + 11.00 + 1.36 + 2.6 + 0.04 + 1.31 + 6.40 + + + 1.5 + CombatExtended.Verb_ShootCE + true + Bullet_338Lapua_FMJ + 1.8 + 6 + 2 + 75 + Shot_Mangxia + GunTail_Heavy + 9 + + true + + + + 2 + true + 1.2 + AmmoSet_338Lapua + + + AimedShot + + + + + + Mingju + + 6.8 + 1.36 + 2.6 + 0.05 + 1.31 + 11.92 + + + 1.5 + CombatExtended.Verb_ShootCE + true + Bullet_338Lapua_FMJ + 1.8 + 75 + Shot_Mingju + GunTail_Heavy + 9 + + true + + + + 5 + 3.7 + AmmoSet_338Lapua + + + AimedShot + + + + + + Zhanshen + + 8.70 + 0.56 + 1 + 0.05 + 1.37 + 12.90 + + + 1.38 + CombatExtended.Verb_ShootCE + true + Bullet_556x45mmNATO_FMJ + 1.3 + 62 + 6 + 10 + Shot_Zhanshen + GunTail_Medium + 9 + + true + + + + 50 + 3.25 + AmmoSet_556x45mmNATO + + + SuppressFire + 5 + + + + + + Aodin + + 9.60 + 0.56 + 1 + 0.06 + 1.35 + 12.65 + + + 1.25 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 1.3 + 62 + 6 + 10 + Shot_Aodin + GunTail_Medium + 9 + + true + + + + 100 + 5 + AmmoSet_762x51mmNATO + + + SuppressFire + 5 + + + +     \ No newline at end of file diff --git a/ModPatches/Vanilla Animals Expanded - Royal Animals/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml b/ModPatches/Vanilla Animals Expanded - Royal Animals/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml index 7b0541904b..4e58f7be4c 100644 --- a/ModPatches/Vanilla Animals Expanded - Royal Animals/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded - Royal Animals/Patches/Vanilla Animals Expanded - Royal Animals/ThingDefs_Races/Royal_Animals.xml @@ -539,6 +539,29 @@     + + Defs/ThingDef[defName="VAERoy_RoyalTiger"]/comps + + Defs/ThingDef[defName="VAERoy_RoyalTiger"] + + + + + + + + Defs/ThingDef[defName="VAERoy_RoyalTiger"]/comps + +
  • + 690 + true + 600 + 5 + 0.5 +
    • +     +     + diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml index aa2383d794..acc0792e8a 100644 --- a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml +++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Base.xml @@ -7,14 +7,12 @@
  • - false 0.25
  • InsectLeg
  • - false 0.25
  • InsectLeg
    • @@ -25,11 +23,4 @@     - - Defs/ThingDef[@Name="VAEWaste_BaseInsect"]/statBases - - 0 - - - \ No newline at end of file diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Megatardi.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Megatardi.xml index abdaca88f8..8c7764f634 100644 --- a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Megatardi.xml +++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Megatardi.xml @@ -69,7 +69,7 @@ Defs/ThingDef[defName="VAEWaste_Megatardi"] - + @@ -82,7 +82,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Pestigator.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Pestigator.xml index 765a14575b..81c3997882 100644 --- a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Pestigator.xml +++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Pestigator.xml @@ -64,7 +64,7 @@ Defs/ThingDef[defName="VAEWaste_Pestigator"] - + @@ -77,7 +77,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml index c028ead569..cdefed7f52 100644 --- a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml +++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxbear.xml @@ -17,6 +17,8 @@ 0.1 0.3 0.25 + 0.075 + 0.05 @@ -96,4 +98,27 @@ + + Defs/ThingDef[defName="VAEWaste_Toxbear"]/comps + + Defs/ThingDef[defName="VAEWaste_Toxbear"] + + + + + + + + Defs/ThingDef[defName="VAEWaste_Toxbear"]/comps + +
  • + 1625 + true + 600 + 5 + 0.5 +
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml index afca1f15a2..3c0c1b82ff 100644 --- a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml +++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxlion.xml @@ -97,4 +97,27 @@ + + Defs/ThingDef[defName="VAEWaste_Toxlion"]/comps + + Defs/ThingDef[defName="VAEWaste_Toxlion"] + + + + + + + + Defs/ThingDef[defName="VAEWaste_Toxlion"]/comps + +
  • + 660 + true + 600 + 5 + 0.5 +
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml index db3fc6340a..ba642d4891 100644 --- a/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml +++ b/ModPatches/Vanilla Animals Expanded - Waste Animals/Patches/Vanilla Animals Expanded - Waste Animals/ThingDefs_Races/WasteAnimals_Toxscorpion.xml @@ -91,7 +91,6 @@
  • - false 0.5
  • VAEWaste_LeftPincer
    • @@ -99,7 +98,6 @@
  • - false 0.5
  • VAEWaste_LeftPincer
    • @@ -116,7 +114,7 @@ Defs/ThingDef[defName="VAEWaste_Toxscorpion"] - + @@ -129,7 +127,7 @@ true 600 5 - 0.5 + 0.25 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_AddClass.xml index ec45eb6c87..e5b609245e 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_AddClass.xml @@ -11,7 +11,6 @@ defName="AEXP_Wildebeest" or defName="AEXP_Cheetah"] -
  • Quadruped @@ -22,7 +21,6 @@ Defs/ThingDef[defName="AEXP_Crocodile"] -
  • QuadrupedLow @@ -33,7 +31,6 @@ Defs/ThingDef[defName="AEXP_Giraffe"] -
  • Birdlike diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml index 6acc72b8d0..4c30562345 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Animals.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Cheetah"]/statBases - 0.46 0.27 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="AEXP_Cheetah"] -
  • @@ -75,7 +73,6 @@ Defs/ThingDef[defName="AEXP_Coyote"]/statBases - 0.27 0.06 @@ -85,7 +82,6 @@ Defs/ThingDef[defName="AEXP_Coyote"]/tools -
  • @@ -138,17 +134,17 @@ Defs/ThingDef[defName="AEXP_Crocodile"]/statBases - 0.1 0.24 0.31 + 0.3 + 0.15 Defs/ThingDef[defName="AEXP_Crocodile"]/tools -
  • @@ -198,10 +194,32 @@ + + Defs/ThingDef[defName="AEXP_Crocodile"]/comps + + Defs/ThingDef[defName="AEXP_Crocodile"] + + + + + + + + Defs/ThingDef[defName="AEXP_Crocodile"]/comps + +
  • + 800 + true + 600 + 5 + 0.5 +
    • +     + + Defs/ThingDef[defName="AEXP_Giraffe"]/statBases - 0.1 0.45 @@ -211,7 +229,6 @@ Defs/ThingDef[defName="AEXP_Giraffe"]/tools -
  • @@ -264,17 +281,17 @@ Defs/ThingDef[defName="AEXP_Hippopotamus"]/statBases - 0.07 0.6 0.35 + 0.085 + 0.05 Defs/ThingDef[defName="AEXP_Hippopotamus"]/tools -
  • @@ -324,10 +341,32 @@ + + Defs/ThingDef[defName="AEXP_Hippopotamus"]/comps + + Defs/ThingDef[defName="AEXP_Hippopotamus"] + + + + + + + + Defs/ThingDef[defName="AEXP_Hippopotamus"]/comps + +
  • + 1850 + true + 600 + 5 + 0.5 +
    • +     +     + Defs/ThingDef[defName="AEXP_Wildebeest"]/statBases - 0.18 0.2 @@ -337,7 +376,6 @@ Defs/ThingDef[defName="AEXP_Wildebeest"]/tools -
  • @@ -390,7 +428,6 @@ Defs/ThingDef[defName="AEXP_Zebra"]/statBases - 0.1 0.14 @@ -400,7 +437,6 @@ Defs/ThingDef[defName="AEXP_Zebra"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Resources.xml index d7de5a2526..3c97100926 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Resources.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/AridShrubland_Resources.xml @@ -8,7 +8,6 @@ Defs/ThingDef[defName="AEXP_Leather_Hippopotamus"]/statBases - 0.1 0.08 @@ -22,7 +21,6 @@ Defs/ThingDef[defName="AEXP_Leather_Wildebeest"]/statBases - 0.08 0.064 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_AddClass.xml index 618d4cf858..1944ca853c 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_AddClass.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Kangaroo"] -
  • Humanoid @@ -15,7 +14,6 @@ Defs/ThingDef[defName="AEXP_Boombat" or defName="AEXP_Koala" or defName="AEXP_Platypus"] -
  • QuadrupedLow diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Animals.xml index 8a9026034b..cca4d43707 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Animals.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Boombat"]/tradeTags -
  • CE_AnimalBoom
    •  @@ -12,7 +11,6 @@ Defs/ThingDef[defName="AEXP_Boombat"]/statBases - 0.10 0.01 @@ -22,7 +20,6 @@ Defs/ThingDef[defName="AEXP_Boombat"]/tools -
  • @@ -108,7 +105,6 @@ Defs/ThingDef[defName="AEXP_Kangaroo"]/statBases - 0.27 0.25 @@ -118,7 +114,6 @@ Defs/ThingDef[defName="AEXP_Kangaroo"]/tools -
  • @@ -172,7 +167,6 @@ Defs/ThingDef[defName="AEXP_Koala"]/statBases - 0.15 0.01 @@ -182,7 +176,6 @@ Defs/ThingDef[defName="AEXP_Koala"]/tools -
  • @@ -236,7 +229,6 @@ Defs/ThingDef[defName="AEXP_Platypus"]/statBases - 0.12 0.11 @@ -246,7 +238,6 @@ Defs/ThingDef[defName="AEXP_Platypus"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Resources.xml index 783d8a1461..8aa2bfe0b7 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Resources.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Australia_Resources.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Leather_Platypus"]/statBases - 0.06 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_AddClass.xml index dce8688cd6..2d4fa105e4 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_AddClass.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_ArcticCoyote" or defName="AEXP_BlackBear"] -
  • Quadruped @@ -15,7 +14,6 @@ Defs/ThingDef[defName="AEXP_Otter"] -
  • QuadrupedLow diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml index 63bf1982af..c29ab0fd4d 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/BorealForest_Animals.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_ArcticCoyote"]/statBases - 0.26 0.08 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="AEXP_ArcticCoyote"]/tools -
  • @@ -67,17 +65,17 @@ Defs/ThingDef[defName="AEXP_BlackBear"]/statBases - 0.15 0.15 0.15 + 0.05 + 0.025 Defs/ThingDef[defName="AEXP_BlackBear"] -
  • @@ -156,7 +154,6 @@ Defs/ThingDef[defName="AEXP_Otter"]/statBases - 0.24 0.02 @@ -166,7 +163,6 @@ Defs/ThingDef[defName="AEXP_Otter"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_AddClass.xml index e73470ddcc..e122fe537d 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_AddClass.xml @@ -27,7 +27,6 @@ defName="AEXP_CatSomali" or defName="AEXP_CatSphynx"] -
  • Quadruped diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Cats.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Cats.xml index b274b466a1..175cc5b6f5 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Cats.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Cats.xml @@ -15,7 +15,6 @@ defName="AEXP_CatSomali" or defName="AEXP_CatSphynx"]/statBases - 0.23 0.02 @@ -36,7 +35,6 @@ defName="AEXP_CatSomali" or defName="AEXP_CatSphynx"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Dogs.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Dogs.xml index 7799d421fa..acf99335a4 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Dogs.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/CatsAndDogs_Dogs.xml @@ -13,7 +13,6 @@ defName="AEXP_Shih-Tzu" or defName="AEXP_WelshTerrier"]/statBases - 0.17 0.01 @@ -31,7 +30,6 @@ defName="AEXP_Shih-Tzu" or defName="AEXP_WelshTerrier"]/tools -
  • @@ -84,7 +82,6 @@ Defs/ThingDef[defName="AEXP_GreatDane" or defName="AEXP_Poodle"]/statBases - 0.20 0.06 @@ -94,7 +91,6 @@ Defs/ThingDef[defName="AEXP_GreatDane" or defName="AEXP_Poodle"]/tools -
  • @@ -147,7 +143,6 @@ Defs/ThingDef[defName="AEXP_Rottweiler" or defName="AEXP_GermanShepherd"]/statBases - 0.23 0.05 @@ -157,7 +152,6 @@ Defs/ThingDef[defName="AEXP_Rottweiler" or defName="AEXP_GermanShepherd"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_AddClass.xml index c56b0beeeb..71ad2c71a0 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_AddClass.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Hyena" or defName="AEXP_Lion"] -
  • Quadruped @@ -15,7 +14,6 @@ Defs/ThingDef[defName="AEXP_DesertTortoise" or defName="AEXP_GilaMonster"] -
  • QuadrupedLow diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml index 40ad758eac..b3b0665909 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Animals.xml @@ -9,14 +9,12 @@
  • - false 0.5
  • Leg
  • - false 0.5
  • Leg
    • @@ -38,7 +36,6 @@ Defs/ThingDef[defName="AEXP_DesertTortoise"]/statBases/ArmorRating_Blunt - 3.25 @@ -46,7 +43,6 @@ Defs/ThingDef[defName="AEXP_DesertTortoise"]/statBases/ArmorRating_Sharp - 1.15 @@ -54,7 +50,6 @@ Defs/ThingDef[defName="AEXP_DesertTortoise"]/tools -
  • @@ -100,7 +95,7 @@ true 600 5 - 0.75 + 0.5
    • @@ -108,7 +103,6 @@ Defs/ThingDef[defName="AEXP_GilaMonster"]/statBases - 0.15 0 @@ -118,7 +112,6 @@ Defs/ThingDef[defName="AEXP_GilaMonster"]/tools -
  • @@ -168,7 +161,6 @@ Defs/ThingDef[defName="AEXP_Hyena"]/statBases - 0.21 0.11 @@ -178,7 +170,6 @@ Defs/ThingDef[defName="AEXP_Hyena"]/tools -
  • @@ -231,7 +222,6 @@ Defs/ThingDef[defName="AEXP_Lion"]/statBases - 0.19 0.18 @@ -241,7 +231,6 @@ Defs/ThingDef[defName="AEXP_Lion"]/tools -
  • @@ -317,4 +306,27 @@ + + Defs/ThingDef[defName="AEXP_Lion"]/comps + + Defs/ThingDef[defName="AEXP_Lion"] + + + + + + + + Defs/ThingDef[defName="AEXP_Lion"]/comps + +
  • + 800 + true + 600 + 5 + 0.5 +
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Resources.xml index 4e9dce5b06..0d817f3de0 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Resources.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Desert_Resources.xml @@ -8,7 +8,6 @@ Defs/ThingDef[defName="AEXP_Leather_Lion"]/statBases - 0.07 0.056 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_AddClass.xml index d8dfcf1aca..3cc193a8bb 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_AddClass.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Camel"] -
  • Quadruped @@ -15,7 +14,6 @@ Defs/ThingDef[defName="AEXP_Megascorpion"] -
  • QuadrupedLow @@ -26,7 +24,6 @@ Defs/ThingDef[defName="AEXP_Rattlesnake"] -
  • Serpentine diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml index ee4d22e2bd..47bbfb011e 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/ExtremeDesert_Animals.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Camel"]/statBases - 0.15 0.38 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="AEXP_Camel"]/tools -
  • @@ -67,7 +65,6 @@ Defs/ThingDef[defName="AEXP_Megascorpion"]/statBases - 0.19 0.33 @@ -76,8 +73,21 @@ - Defs/ThingDef[defName="AEXP_Megascorpion"]/tools + Defs/ThingDef[defName="AEXP_Megascorpion"]/statBases/ArmorRating_Blunt + + 1.75 + + + + Defs/ThingDef[defName="AEXP_Megascorpion"]/statBases/ArmorRating_Sharp + + 0.7 + + + + + Defs/ThingDef[defName="AEXP_Megascorpion"]/tools
  • @@ -124,10 +134,32 @@ + + Defs/ThingDef[defName="AEXP_Megascorpion"]/comps + + Defs/ThingDef[defName="AEXP_Megascorpion"] + + + + + + + + Defs/ThingDef[defName="AEXP_Megascorpion"]/comps + +
  • + 150 + true + 600 + 5 + 0.5 +
    • +     +     + Defs/ThingDef[defName="AEXP_Rattlesnake"]/statBases - 0.19 0.18 @@ -137,7 +169,6 @@ Defs/ThingDef[defName="AEXP_Rattlesnake"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_AddClass.xml index 7e03875584..35a74cd7fe 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_AddClass.xml @@ -5,7 +5,6 @@ Defs/ThingDef[defName="AEXP_Seal" or defNAme="AEXP_Walrus"] -
  • QuadrupedLow @@ -16,7 +15,6 @@ Defs/ThingDef[defName="AEXP_Penguin"] -
  • Humanoid diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml index c1329a4064..761717e939 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Animals.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Penguin"]/statBases - 0.25 0.10 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="AEXP_Penguin"]/tools -
  • @@ -56,7 +54,6 @@ Defs/ThingDef[defName="AEXP_Seal"]/statBases - 0.08 0.41 @@ -66,7 +63,6 @@ Defs/ThingDef[defName="AEXP_Seal"]/tools -
  • @@ -120,17 +116,17 @@ Defs/ThingDef[defName="AEXP_Walrus"]/statBases - 0.06 0.25 0.23 + 0.15 + 0.075 Defs/ThingDef[defName="AEXP_Walrus"]/tools -
  • @@ -160,4 +156,27 @@ + + Defs/ThingDef[defName="AEXP_Walrus"]/comps + + Defs/ThingDef[defName="AEXP_Walrus"] + + + + + + + + Defs/ThingDef[defName="AEXP_Walrus"]/comps + +
  • + 1700 + true + 600 + 5 + 0.5 +
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Resources.xml index 3e5abb546a..519d2646df 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Resources.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/IceSheet_Resources.xml @@ -19,7 +19,6 @@ Defs/ThingDef[defName="AEXP_Leather_Pinniped"]/statBases - 0.07 0.056 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_AddClass.xml index f4eb4f28ca..125bdeab30 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_AddClass.xml @@ -10,7 +10,6 @@ defName="AEXP_Tiger" or defName="AEXP_Tapir"] -
  • Quadruped @@ -21,7 +20,6 @@ Defs/ThingDef[defName="AEXP_Lemur"] -
  • QuadrupedLow @@ -33,7 +31,6 @@ Defs/ThingDef[defName="AEXP_Mandrill"] -
  • Humanoid diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml index 9d8a8d8c53..d51492b361 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Animals.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Gorilla"]/statBases - 0.2 0.20 @@ -14,7 +13,6 @@ Defs/ThingDef[defName="AEXP_Gorilla"]/tools -
  • @@ -79,10 +77,32 @@ + + Defs/ThingDef[defName="AEXP_Gorilla"]/comps + + Defs/ThingDef[defName="AEXP_Gorilla"] + + + + + + + + Defs/ThingDef[defName="AEXP_Gorilla"]/comps + +
  • + 975 + true + 600 + 5 + 0.5 +
    • +     +     + Defs/ThingDef[defName="AEXP_Jaguar"]/statBases - 0.26 0.20 @@ -93,7 +113,6 @@ Defs/ThingDef[defName="AEXP_Lemur"]/statBases - 0.1 0.01 @@ -156,7 +175,6 @@ Defs/ThingDef[defName="AEXP_Mandrill"]/statBases - 0.15 0.04 @@ -166,7 +184,6 @@ Defs/ThingDef[defName="AEXP_Mandrill"]/tools -
  • @@ -219,7 +236,6 @@ Defs/ThingDef[defName="AEXP_Tapir"]/statBases - 0.11 0.16 @@ -229,7 +245,6 @@ Defs/ThingDef[defName="AEXP_Tapir"]/tools -
  • @@ -261,7 +276,6 @@ Defs/ThingDef[defName="AEXP_Tiger"]/statBases - 0.27 0.50 @@ -271,7 +285,6 @@ Defs/ThingDef[defName="AEXP_Tiger"]/tools -
  • @@ -347,4 +360,27 @@ + + Defs/ThingDef[defName="AEXP_Tiger"]/comps + + Defs/ThingDef[defName="AEXP_Tiger"] + + + + + + + + Defs/ThingDef[defName="AEXP_Tiger"]/comps + +
  • + 900 + true + 600 + 5 + 0.5 +
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Resources.xml index d79c60c1fa..130d7f4e58 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Resources.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalRainforest_Resources.xml @@ -11,7 +11,6 @@ Defs/ThingDef[defName="AEXP_Leather_Tiger"]/statBases - 0.07 0.056 diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_AddClass.xml index 1d88376a2a..f8c6bdc37e 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_AddClass.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Alligator"] -
  • QuadrupedLow @@ -15,7 +14,6 @@ Defs/ThingDef[defName="AEXP_Anaconda"] -
  • Serpentine @@ -26,7 +24,6 @@ Defs/ThingDef[defName="AEXP_IndianElephant"] -
  • Quadruped diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml index 5b19f5d505..c1f8356802 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/TropicalSwamp_Animals.xml @@ -4,17 +4,17 @@ Defs/ThingDef[defName="AEXP_Alligator"]/statBases - 0.1 0.24 0.31 + 0.25 + 0.1 Defs/ThingDef[defName="AEXP_Alligator"]/tools -
  • @@ -40,10 +40,32 @@ + + Defs/ThingDef[defName="AEXP_Alligator"]/comps + + Defs/ThingDef[defName="AEXP_Alligator"] + + + + + + + + Defs/ThingDef[defName="AEXP_Alligator"]/comps + +
  • + 925 + true + 600 + 5 + 0.5 +
    • +     +     + Defs/ThingDef[defName="AEXP_Anaconda"]/statBases - 0.19 0.18 @@ -53,7 +75,6 @@ Defs/ThingDef[defName="AEXP_Anaconda"]/tools -
  • @@ -94,17 +115,17 @@ Defs/ThingDef[defName="AEXP_IndianElephant"]/statBases - 0.10 0.50 0.30 + 0.3 + 0.1 Defs/ThingDef[defName="AEXP_IndianElephant"]/tools -
  • @@ -142,4 +163,27 @@ + + Defs/ThingDef[defName="AEXP_IndianElephant"]/comps + + Defs/ThingDef[defName="AEXP_IndianElephant"] + + + + + + + + Defs/ThingDef[defName="AEXP_IndianElephant"]/comps + +
  • + 1575 + true + 600 + 5 + 0.5 +
    • +     +     + \ No newline at end of file diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_AddClass.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_AddClass.xml index e7acedf5e5..0d3a629d88 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_AddClass.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_AddClass.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="AEXP_Muskox" or defName="AEXP_Moose" or defName="AEXP_MegaWolverine"] -
  • Quadruped @@ -15,7 +14,6 @@ Defs/ThingDef[defName="AEXP_Porcupine"] -
  • QuadrupedLow diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Animals.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Animals.xml index 9d865bc28f..64e6a16e9a 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Animals.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Animals.xml @@ -4,17 +4,17 @@ Defs/ThingDef[defName="AEXP_MegaWolverine"]/statBases - 0.07 0.59 0.29 + 0.1 + 0.065 Defs/ThingDef[defName="AEXP_MegaWolverine"]/tools -
  • @@ -87,10 +87,32 @@ + + Defs/ThingDef[defName="AEXP_MegaWolverine"]/comps + + Defs/ThingDef[defName="AEXP_MegaWolverine"] + + + + + + + + Defs/ThingDef[defName="AEXP_MegaWolverine"]/comps + +
  • + 1850 + true + 600 + 5 + 0.5 +
    • +     +     + Defs/ThingDef[defName="AEXP_Moose"]/statBases - 0.07 0.14 @@ -100,7 +122,6 @@ Defs/ThingDef[defName="AEXP_Moose"]/tools -
  • @@ -131,7 +152,6 @@ Defs/ThingDef[defName="AEXP_Muskox"]/statBases - 0.17 0.25 @@ -141,7 +161,6 @@ Defs/ThingDef[defName="AEXP_Muskox"]/tools -
  • @@ -171,7 +190,6 @@ Defs/ThingDef[defName="AEXP_Porcupine"]/statBases - 0.01 0 @@ -181,7 +199,6 @@ Defs/ThingDef[defName="AEXP_Porcupine"]/tools -
  • diff --git a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Resources.xml b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Resources.xml index 0aa81d6678..86b0e53955 100644 --- a/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Resources.xml +++ b/ModPatches/Vanilla Animals Expanded/Patches/Vanilla Animals Expanded/Tundra_Resources.xml @@ -8,7 +8,6 @@ Defs/ThingDef[defName="AEXP_MuskOxWool"]/statBases - 0.02 0.03 diff --git a/ModPatches/Vanilla Arsenal/Defs/Vanilla Arsenal/Ammo.xml b/ModPatches/Vanilla Arsenal/Defs/Vanilla Arsenal/Ammo.xml new file mode 100644 index 0000000000..90f9a44775 --- /dev/null +++ b/ModPatches/Vanilla Arsenal/Defs/Vanilla Arsenal/Ammo.xml @@ -0,0 +1,14 @@ + + + + + + + AmmoSet_30x64mmFuel_Thermobaric + + + Bullet_30x64mmFuel_Thermobaric + + + + \ No newline at end of file diff --git a/ModPatches/Vanilla Arsenal/Patches/RangedIndustrial.xml b/ModPatches/Vanilla Arsenal/Patches/RangedIndustrial.xml index ce8ef56f9a..971068c4a6 100644 --- a/ModPatches/Vanilla Arsenal/Patches/RangedIndustrial.xml +++ b/ModPatches/Vanilla Arsenal/Patches/RangedIndustrial.xml @@ -38,7 +38,8 @@ defName="DV_Gun_LeverShotgun" or defName="DV_Gun_LightCarbine" or defName="DV_Gun_CombatShotgun" or - defName="DV_Gun_DMR" + defName="DV_Gun_DMR" or + defName="DV_Gun_ThermoRifle" ]/tools @@ -306,4 +307,50 @@ + + + DV_Gun_ThermoRifle + + 1.60 + 0.15 + 1.8 + 13 + 10 + 1.50 + + + 2 + CombatExtended.Verb_ShootCE + true + Bullet_30x64mmFuel_Thermobaric + 2 + 48 + Shot_Autocannon + 9 + GunTail_Heavy + + true + + + + 4 + 4 + AmmoSet_30x64mmFuel_Thermobaric + + + AimedShot + + + + + Defs/ThingDef[defName="DV_Gun_ThermoRifle"]/weaponTags + + +
  • GunHeavy
    • +
  • SpacerGun
    • +
  • Bipod_AMR
    • + +     +     + \ No newline at end of file diff --git a/ModPatches/Vanilla Base Generation Expanded/Defs/SymbolDefs.xml b/ModPatches/Vanilla Base Generation Expanded/Defs/SymbolDefs.xml new file mode 100644 index 0000000000..e8fa895b9f --- /dev/null +++ b/ModPatches/Vanilla Base Generation Expanded/Defs/SymbolDefs.xml @@ -0,0 +1,34 @@ + + + + + Shell_Smoke + Shell_Smoke + + + + Shell_Incendiary + Shell_Incendiary + + + + Shell_HighExplosive + Shell_HighExplosive + + + + Shell_EMP + Shell_EMP + + + + Shell_AntigrainWarhead + Shell_AntigrainWarhead + + + + Shell_Firefoam + Shell_Firefoam + + + diff --git a/ModPatches/Vanilla Factions Expanded - Ancients/Defs/Vanilla Factions Expanded - Ancients/SymbolDefs.xml b/ModPatches/Vanilla Factions Expanded - Ancients/Defs/Vanilla Factions Expanded - Ancients/SymbolDefs.xml index 496db68b9f..f8dc61224e 100644 --- a/ModPatches/Vanilla Factions Expanded - Ancients/Defs/Vanilla Factions Expanded - Ancients/SymbolDefs.xml +++ b/ModPatches/Vanilla Factions Expanded - Ancients/Defs/Vanilla Factions Expanded - Ancients/SymbolDefs.xml @@ -6,16 +6,31 @@ Ammo_556x45mmNATO_Incendiary + + Ammo_RifleIntermediate_Incendiary + Ammo_RifleIntermediate_Incendiary + + Ammo_12Gauge_Buck Ammo_12Gauge_Buck + + Ammo_Shotgun_Buck + Ammo_Shotgun_Buck + + Ammo_45ACP_AP Ammo_45ACP_AP + + Ammo_Pistol_AP + Ammo_Pistol_AP + + Ammo_762x51mmNATO_Incendiary Ammo_762x51mmNATO_Incendiary @@ -26,9 +41,24 @@ Ammo_762x54mmR_HE + + Ammo_Rifle_Incendiary + Ammo_Rifle_Incendiary + + + + Ammo_Rifle_HE + Ammo_Rifle_HE + + Ammo_6x24mmCharged Ammo_6x24mmCharged + + Ammo_RifleCharged + Ammo_RifleCharged + + \ No newline at end of file diff --git a/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/CustomGenDefs_Vaults.xml b/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/CustomGenDefs_Vaults.xml index e3a209ddf2..bca5d968a7 100644 --- a/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/CustomGenDefs_Vaults.xml +++ b/ModPatches/Vanilla Factions Expanded - Ancients/Patches/Vanilla Factions Expanded - Ancients/CustomGenDefs_Vaults.xml @@ -3,88 +3,184 @@ - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultAlpha"]/layouts/li[1]/li[66] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_AssaultRifle,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultAlpha"]/layouts/li[1]/li[66] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_AssaultRifle,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultAlpha"]/layouts/li[1]/li[66] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_AssaultRifle,Gun_AssaultRifle,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Apparel_PowerArmor,Ammo_RifleIntermediate_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultBravo"]/layouts/li[1]/li[14] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultBravo"]/layouts/li[1]/li[14] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultBravo"]/layouts/li[1]/li[14] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_RifleIntermediate_Incendiary,Gun_AssaultRifle,Ammo_RifleIntermediate_Incendiary,Gun_AssaultRifle,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Apparel_PowerArmor,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultCharlie"]/layouts/li[1]/li[10] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultCharlie"]/layouts/li[1]/li[10] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultCharlie"]/layouts/li[1]/li[10] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_RifleIntermediate_Incendiary,Gun_AssaultRifle,Ammo_RifleIntermediate_Incendiary,Apparel_PowerArmor,Gun_AssaultRifle,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultDelta"]/layouts/li[1]/li[19] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultDelta"]/layouts/li[1]/li[19] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultDelta"]/layouts/li[1]/li[19] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_AssaultRifle,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Gun_AssaultRifle,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultF"]/layouts/li[1]/li[35] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultF"]/layouts/li[1]/li[35] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_AssaultRifle,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultF"]/layouts/li[1]/li[35] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_RifleIntermediate_Incendiary,Gun_AssaultRifle,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultG"]/layouts/li[1]/li[23] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,MealSurvivalPack,MealSurvivalPack,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_12Gauge_Buck,Gun_ChainShotgun,Ammo_12Gauge_Buck,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultG"]/layouts/li[1]/li[23] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,MealSurvivalPack,MealSurvivalPack,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Ammo_12Gauge_Buck,Gun_ChainShotgun,Ammo_12Gauge_Buck,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultG"]/layouts/li[1]/li[23] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,MealSurvivalPack,MealSurvivalPack,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Ammo_Shotgun_Buck,Gun_ChainShotgun,Ammo_Shotgun_Buck,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultH"]/layouts/li[1]/li[31] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_762x51mmNATO_Incendiary,Ammo_762x54mmR_HE,Ammo_762x54mmR_HE,Gun_LMG,Ammo_45ACP_AP,Gun_Minigun,Gun_Autopistol,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultH"]/layouts/li[1]/li[31] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_762x51mmNATO_Incendiary,Ammo_762x54mmR_HE,Ammo_762x54mmR_HE,Gun_LMG,Ammo_45ACP_AP,Gun_Minigun,Gun_Autopistol,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultH"]/layouts/li[1]/li[31] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_Rifle_Incendiary,Ammo_Rifle_HE,Ammo_Rifle_HE,Gun_LMG,Ammo_Pistol_AP,Gun_Minigun,Gun_Autopistol,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultH"]/layouts/li[1]/li[35] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,MealSurvivalPack,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,.,.,.,.,.,MealSurvivalPack,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_45ACP_AP,Ammo_45ACP_AP,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Gun_Autopistol,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultH"]/layouts/li[1]/li[35] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,MealSurvivalPack,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,Ammo_762x51mmNATO_Incendiary,.,.,.,.,.,MealSurvivalPack,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_45ACP_AP,Ammo_45ACP_AP,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Apparel_PowerArmor,Gun_Autopistol,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultH"]/layouts/li[1]/li[35] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,MealSurvivalPack,Ammo_Rifle_Incendiary,Ammo_Rifle_Incendiary,Ammo_Rifle_Incendiary,Ammo_Rifle_Incendiary,.,.,.,.,.,MealSurvivalPack,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_Pistol_AP,Ammo_Pistol_AP,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Apparel_PowerArmor,Gun_Autopistol,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultI"]/layouts/li[1]/li[19] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Gun_ChargeRifle,Ammo_6x24mmCharged,Ammo_6x24mmCharged,Gun_HeavySMG,Ammo_45ACP_AP,Ammo_45ACP_AP,Apparel_PowerArmorHelmet,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultI"]/layouts/li[1]/li[19] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,Gun_ChargeRifle,Ammo_6x24mmCharged,Ammo_6x24mmCharged,Gun_HeavySMG,Ammo_45ACP_AP,Ammo_45ACP_AP,Apparel_PowerArmorHelmet,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultI"]/layouts/li[1]/li[19] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,Gun_ChargeRifle,Ammo_RifleCharged,Ammo_RifleCharged,Gun_HeavySMG,Ammo_Pistol_AP,Ammo_Pistol_AP,Apparel_PowerArmorHelmet,Ammo_RifleIntermediate_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[35] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_MachinePistol,Ammo_45ACP_AP,Apparel_PowerArmorHelmet,Ammo_45ACP_AP,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[35] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_MachinePistol,Ammo_45ACP_AP,Apparel_PowerArmorHelmet,Ammo_45ACP_AP,Ammo_556x45mmNATO_Incendiary,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[35] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Gun_MachinePistol,Ammo_Pistol_AP,Apparel_PowerArmorHelmet,Ammo_Pistol_AP,Ammo_RifleIntermediate_Incendiary,Ammo_RifleIntermediate_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[36] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_762x54mmR_HE,Gun_LMG,Ammo_762x54mmR_HE,Apparel_PowerArmor,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[36] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_762x54mmR_HE,Gun_LMG,Ammo_762x54mmR_HE,Apparel_PowerArmor,Ammo_556x45mmNATO_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[36] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_Rifle_HE,Gun_LMG,Ammo_Rifle_HE,Apparel_PowerArmor,Ammo_RifleIntermediate_Incendiary,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     - - Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[36] - -
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_MachinePistol,Ammo_45ACP_AP,Ammo_45ACP_AP,Ammo_762x54mmR_HE,Gun_LMG,Ammo_762x54mmR_HE,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • -     + + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[36] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_556x45mmNATO_Incendiary,Gun_MachinePistol,Ammo_45ACP_AP,Ammo_45ACP_AP,Ammo_762x54mmR_HE,Gun_LMG,Ammo_762x54mmR_HE,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     + + Defs/KCSG.StructureLayoutDef[defName="VFEA_SealedVaultJ"]/layouts/li[1]/li[36] + +
  • .,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,Ammo_RifleIntermediate_Incendiary,Gun_MachinePistol,Ammo_Pistol_AP,Ammo_Pistol_AP,Ammo_Rifle_HE,Gun_LMG,Ammo_Rifle_HE,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.
    • +     +     \ No newline at end of file diff --git a/ModPatches/Vanilla Factions Expanded - Classical/Defs/Vanilla Factions Expanded - Classical/ThingDefs_Shields.xml b/ModPatches/Vanilla Factions Expanded - Classical/Defs/Vanilla Factions Expanded - Classical/ThingDefs_Shields.xml index 5916555eff..ffe432f172 100644 --- a/ModPatches/Vanilla Factions Expanded - Classical/Defs/Vanilla Factions Expanded - Classical/ThingDefs_Shields.xml +++ b/ModPatches/Vanilla Factions Expanded - Classical/Defs/Vanilla Factions Expanded - Classical/ThingDefs_Shields.xml @@ -56,40 +56,40 @@ Child, Adult - -
  • TribalShield
    • -     - -
  • - CombatExtended.PawnRenderNode_Apparel - CombatExtended.PawnRenderNodeWorker_Drafted - Things/Item/Equipment/Shield/HeavyShield/HeavyShield - CutoutComplex - ApparelBody - - 0.65 - - 80 - - - -5 - (0, 0, -0.1) - 30 - - - -30 - - - -5 - (0.15, 0, -0.1) - - - (0.3, 0, -0.2) - - -
    • -     -     + +
  • TribalShield
    • +     + +
  • + CombatExtended.PawnRenderNode_Apparel + CombatExtended.PawnRenderNodeWorker_Drafted + Things/Item/Equipment/Shield/HeavyShield/HeavyShield + CutoutComplex + ApparelBody + + 0.65 + + 80 + + + -5 + (0, 0, -0.1) + 30 + + + -30 + + + -5 + (0.15, 0, -0.1) + + + (0.25, 0, -0.2) + + +
    • +     +
  • diff --git a/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsRanged.xml b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsRanged.xml index 4aa04b1a9e..6bfad5ed4a 100644 --- a/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsRanged.xml +++ b/ModPatches/Vanilla Factions Expanded - Classical/Patches/Vanilla Factions Expanded - Classical/ThingDefs_WeaponsRanged.xml @@ -23,6 +23,9 @@ Defs/ThingDef[defName="VFEC_Javelin"] Neolithic + +
  • WeaponsRanged
    • +     diff --git a/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml index 9c76cd29f7..a9fc2f5836 100644 --- a/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml +++ b/ModPatches/Vanilla Factions Expanded - Deserters/Patches/Vanilla Factions Expanded - Deserters/Contraband.xml @@ -3,40 +3,79 @@ - - Defs/ThingDef[defName="Ammo_6x24mmCharged"] - -
  • - VFED_Imperial - 5 - false - 100 -
    • -     + + + Defs/ThingDef[defName="Ammo_6x24mmCharged"] + +
  • + VFED_Imperial + 5 + false + 100 +
    • +     +     + + Defs/ThingDef[defName="Ammo_RifleCharged"] + +
  • + VFED_Imperial + 5 + false + 100 +
    • +     +     - - Defs/ThingDef[defName="Ammo_6x24mmCharged_AP"] - -
  • - VFED_Imperial - 5 - false - 100 -
    • -     + + + Defs/ThingDef[defName="Ammo_6x24mmCharged_AP"] + +
  • + VFED_Imperial + 5 + false + 100 +
    • +     +     + + Defs/ThingDef[defName="Ammo_RifleCharged_AP"] + +
  • + VFED_Imperial + 5 + false + 100 +
    • +     +     - - Defs/ThingDef[defName="Ammo_6x24mmCharged_Ion"] - -
  • - VFED_Imperial - 5 - false - 100 -
    • -     + + + Defs/ThingDef[defName="Ammo_6x24mmCharged_Ion"] + +
  • + VFED_Imperial + 5 + false + 100 +
    • +     +     + + Defs/ThingDef[defName="Ammo_RifleCharged_Ion"] + +
  • + VFED_Imperial + 5 + false + 100 +
    • +     +     @@ -57,40 +96,46 @@     - - Defs/ThingDef[defName="Ammo_8x50mmCharged"] - -
  • - VFED_Imperial - 6 - false - 100 -
    • -     + + + Defs/ThingDef[defName="Ammo_8x50mmCharged"] + +
  • + VFED_Imperial + 6 + false + 100 +
    • +     +     - - Defs/ThingDef[defName="Ammo_8x50mmCharged_AP"] - -
  • - VFED_Imperial - 6 - false - 100 -
    • -     + + + Defs/ThingDef[defName="Ammo_8x50mmCharged_AP"] + +
  • + VFED_Imperial + 6 + false + 100 +
    • +     +     - - Defs/ThingDef[defName="Ammo_8x50mmCharged_Ion"] - -
  • - VFED_Imperial - 6 - false - 100 -
    • -     + + + Defs/ThingDef[defName="Ammo_8x50mmCharged_Ion"] + +
  • + VFED_Imperial + 6 + false + 100 +
    • +     +     diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/AbilityDefs/Abilities.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/AbilityDefs/Abilities.xml index d815af8a7b..eefccc7ef4 100644 --- a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/AbilityDefs/Abilities.xml +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/AbilityDefs/Abilities.xml @@ -1,6 +1,62 @@ + + Defs/AbilityDef[defName="VFEI2_FlameSpew"]/verbProperties/range + + 14.9 + + + + + Defs/AbilityDef[defName="VFEI2_InsectAcidSpit"]/verbProperties/range + + 17.9 + + + + + Defs/AbilityDef[defName="VFEI2_InsectAcidSpew"]/verbProperties/range + + 23.9 + + + + + Defs/AbilityDef[defName="VFEI2_LargeAcidSpew"]/verbProperties/range + + 24.9 + + + + + Defs/AbilityDef[defName="VFEI2_LargeAcidSpew"]/comps/li[@Class="VFEInsectoids.CompProperties_AbilityAcidSpew"]/range + + 24.9 + + + + + Defs/AbilityDef[defName="VFEI2_ChemfuelSpew"]/verbProperties/range + + 17.9 + + + + + Defs/AbilityDef[defName="VFEI2_ChemfuelSpew"]/comps/li[@Class="VFEInsectoids.CompProperties_AbilityFuelSpew"]/range + + 15.9 + + + + + Defs/ThingDef[defName="VFEI2_ChemfuelSpit"]/projectile + + 15 + + + Defs/AbilityDef[defName="VFEI2_InsectGlide_Short"]/verbProperties/range diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/Bodies/Bodies_ClawedInsectoid.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/Bodies/Bodies_ClawedInsectoid.xml index c0cf3c0d4c..042bd9d28a 100644 --- a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/Bodies/Bodies_ClawedInsectoid.xml +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/Bodies/Bodies_ClawedInsectoid.xml @@ -6,7 +6,8 @@ Defs/BodyDef[defName="VFEI2_ClawedInsectoid"]//*[ def="Shell" or def="Elytra" or - def="Pronotum"] + def="Pronotum" or + def="InsectLeg"] @@ -20,7 +21,8 @@ def="Elytra" or def="Pronotum" or def="InsectHead" or - def="InsectMouth"]/groups + def="InsectMouth" or + def="InsectLeg"]/groups
  • CoveredByNaturalArmor
    • diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Buildings/Buildings_Insectoid.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Buildings/Buildings_Insectoid.xml new file mode 100644 index 0000000000..e91bc74ec7 --- /dev/null +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Buildings/Buildings_Insectoid.xml @@ -0,0 +1,188 @@ + + + + + + + Defs/ThingDef[defName="VFEI2_Vilelobber"]/building/turretBurstCooldownTime + + 20 + + + + + Defs/ThingDef[defName="VFEI2_Vilelobber_Gun"]/statBases/RangedWeapon_Cooldown + + 20 + + + + + Defs/ThingDef[defName="VFEI2_Vilelobber_Gun"]/verbs/li/forcedMissRadius + + 3 + + + + + Defs/ThingDef[defName="VFEI2_Vilelobber_Gun"]/verbs/li/defaultCooldownTime + + 20 + + + + + Defs/ThingDef[defName="VFEI2_Vilelobber_Projectile"]/projectile/damageAmountBase + + 15 + + + + + + + Defs/ThingDef[defName="VFEI2_Thornworm"] + + CombatExtended.Building_TurretGunCE + + + + + Defs/ThingDef[defName="VFEI2_Thornworm"]/statBases + + + 500 + 1.0 + 0.5 + + + + + + Defs/ThingDef[defName="VFEI2_Thornworm"]/building/turretBurstCooldownTime + + 4 + + + + + Defs/ThingDef[defName="VFEI2_Thornworm_Gun"]/statBases/RangedWeapon_Cooldown + + 4 + + + + + Defs/ThingDef[defName="VFEI2_Thornworm_Gun"]/verbs + + +
  • + 0.5 + CombatExtended.Verb_ShootCE + true + VFEI2_Thornworm_Projectile + 2 + 35 + 15 + 3 + VFEI2_InsectThornpod_Release + 9 +
    • +     +     +     + + + Defs/ThingDef[defName="VFEI2_Thornworm_Projectile"] + + + VFEI2_Thornworm_Projectile + + + Things/Projectile/Projectile_Thornworm_Spike + Graphic_Single + + + Stab + 90 + 10 + 6 + 9 + + + + + + + + + Defs/ThingDef[defName="VFEI2_Thornspitter"] + + CombatExtended.Building_TurretGunCE + + + + + Defs/ThingDef[defName="VFEI2_Thornspitter"]/statBases + + + 1.0 + 0.5 + + + + + + Defs/ThingDef[defName="VFEI2_Thornspitter"]/building/turretBurstCooldownTime + + 3 + + + + + Defs/ThingDef[defName="VFEI2_Thornspitter_Gun"]/statBases/RangedWeapon_Cooldown + + 3 + + + + + Defs/ThingDef[defName="VFEI2_Thornspitter_Gun"]/verbs + + +
  • + 0.5 + CombatExtended.Verb_ShootCE + true + VFEI2_Thornspitter_Projectile + 1 + 20 + VFEI2_InsectThornpod_Release + 9 +
    • +     +     +     + + + Defs/ThingDef[defName="VFEI2_Thornspitter_Projectile"] + + + VFEI2_Thornspitter_Projectile + + + Things/Projectile/Projectile_Thornworm_Spike + Graphic_Single + + + Stab + 90 + 10 + 6 + 9 + + + + + +     \ No newline at end of file diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Bases.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Bases.xml index ab10999032..ab94a2c04e 100644 --- a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Bases.xml +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Bases.xml @@ -16,14 +16,12 @@
  • - false 0.25
  • InsectLeg
  • - false 0.25
  • InsectLeg
    • @@ -34,11 +32,4 @@     - - Defs/ThingDef[@Name="VFEI2_BaseInsect"]/statBases - - 0 - - -     \ No newline at end of file diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Empress.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Empress.xml index 29fe0cefd8..bd05be985b 100644 --- a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Empress.xml +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Empress.xml @@ -14,6 +14,7 @@ Defs/ThingDef[defName="VFEI2_Empress"]/statBases/MoveSpeed 2.2 + 0.99 0.03 0.30 0.57 diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Gigalocust.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Gigalocust.xml index e6fc1846f9..98be9dae95 100644 --- a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Gigalocust.xml +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Gigalocust.xml @@ -5,6 +5,7 @@ Defs/ThingDef[defName="VFEI2_Gigalocust"]/statBases/MoveSpeed 4.0 + 0.9 0.07 0.41 0.19 diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Gigamite.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Gigamite.xml index 78bf8c5af9..9d4dfdbe76 100644 --- a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Gigamite.xml +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Gigamite.xml @@ -5,6 +5,7 @@ Defs/ThingDef[defName="VFEI2_Gigamite"]/statBases/MoveSpeed 2.0 + 0.85 0.03 0.29 0.38 diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Ironclad.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Ironclad.xml index 133c8f44e8..73a11cb682 100644 --- a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Ironclad.xml +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Ironclad.xml @@ -5,6 +5,7 @@ Defs/ThingDef[defName="VFEI2_Ironclad"]/statBases/MoveSpeed 2.0 + 0.95 0.03 0.26 0.38 diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Megapede.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Megapede.xml index 1b4aa243a0..aafa56685e 100644 --- a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Megapede.xml +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Megapede.xml @@ -5,6 +5,7 @@ Defs/ThingDef[defName="VFEI2_Megapede"]/statBases/MoveSpeed 3.3 + 0.95 0.03 0.36 0.38 diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Patriarch.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Patriarch.xml new file mode 100644 index 0000000000..1efac471ef --- /dev/null +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Patriarch.xml @@ -0,0 +1,125 @@ + + + + + Defs/ThingDef[defName="VFEI2_Patriarch"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="VFEI2_Patriarch"]/statBases/MoveSpeed + + 2.2 + 0.99 + 0.04 + 0.21 + 0.48 + + + + + Defs/ThingDef[defName="VFEI2_Patriarch"]/statBases/ArmorRating_Blunt + + 34 + + + + + Defs/ThingDef[defName="VFEI2_Patriarch"]/statBases/ArmorRating_Sharp + + 12.5 + + + + + Defs/ThingDef[defName="VFEI2_Patriarch"]/tools + + +
  • + + +
  • Cut
    • + + 24 + 1.78 + HeadClaw + 1.0 + 5.0 + +
  • + + +
  • Stab
    • + + 18 + 1.78 + HeadClaw + 6 + 3 + +
  • + + +
  • Stab
    • + + 30 + 1.33 + HeadClaw + 40 + 20 + +
  • + + +
  • Cut
    • + + 56 + 1.9 + HeadClaw + 2 + 10 + +
  • + + +
  • Blunt
    • + + 17 + 2.1 + HeadAttackTool + true + 0.2 + 7.0 + +     +     +     + + + Defs/ThingDef[defName="VFEI2_Patriarch"]/comps + + Defs/ThingDef[defName="VFEI2_Patriarch"] + + + + + + + + Defs/ThingDef[defName="VFEI2_Patriarch"]/comps + +
  • + 2700 + true + 600 + 5 + 0.25 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Queen.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Queen.xml index 463b696b1a..7585a86988 100644 --- a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Queen.xml +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Queen.xml @@ -14,6 +14,7 @@ Defs/ThingDef[defName="VFEI2_Queen"]/statBases/MoveSpeed 2.6 + 0.95 0.03 0.30 0.57 diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_RoyalMegascarab.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_RoyalMegascarab.xml new file mode 100644 index 0000000000..c793bf6158 --- /dev/null +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_RoyalMegascarab.xml @@ -0,0 +1,92 @@ + + + + + Defs/ThingDef[defName="VFEI2_RoyalMegascarab"]/statBases/MoveSpeed + + 4.5 + 0.08 + 0.12 + 0.09 + + + + + Defs/ThingDef[defName="VFEI2_RoyalMegascarab"]/tools + + +
  • + + +
  • Cut
    • + + 21 + 1.78 + HeadClaw + 0.36 + 2.5 + +
  • + + +
  • Stab
    • + + 15 + 1.78 + HeadClaw + 4 + 2 + +
  • + + +
  • Blunt
    • + + 2 + 1.5 + HeadAttackTool + 0.2 + 0.5 + +     +     +     + + + Defs/ThingDef[defName="VFEI2_RoyalMegascarab"]/statBases/ArmorRating_Blunt + + 9 + + + + + Defs/ThingDef[defName="VFEI2_RoyalMegascarab"]/statBases/ArmorRating_Sharp + + 6 + + + + + Defs/ThingDef[defName="VFEI2_RoyalMegascarab"]/comps + + Defs/ThingDef[defName="VFEI2_RoyalMegascarab"] + + + + + + + + Defs/ThingDef[defName="VFEI2_RoyalMegascarab"]/comps + +
  • + 625 + true + 600 + 5 + 0.25 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_RoyalMegaspider.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_RoyalMegaspider.xml new file mode 100644 index 0000000000..a30a6a0c35 --- /dev/null +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_RoyalMegaspider.xml @@ -0,0 +1,129 @@ + + + + + Defs/ThingDef[defName="VFEI2_RoyalMegaspider"]/statBases/MoveSpeed + + 3.3 + 0.9 + 0.03 + 0.36 + 0.38 + + + + + Defs/ThingDef[defName="VFEI2_RoyalMegaspider"]/statBases/ArmorRating_Blunt + + 25 + + + + + Defs/ThingDef[defName="VFEI2_RoyalMegaspider"]/statBases/ArmorRating_Sharp + + 10 + + + + + Defs/ThingDef[defName="VFEI2_RoyalMegaspider"]/tools + + +
  • + + +
  • Cut
    • + + 63 + 3.28 + HeadClaw + + +
  • + Stun + 14 +
    • +     +     + 2.43 + 6 + +
  • + + +
  • Stab
    • + + 63 + 3.28 + HeadClaw + + +
  • + Stun + 14 +
    • +     +     + 50 + 25 + +
  • + + +
  • ToxicBite
    • + + 32 + 3.4 + Mouth + + +
  • + Stun + 14 +
    • +     +     + 10.56 + 39.6 + +
  • + + +
  • Blunt
    • + + 40 + 3.65 + HeadAttackTool + true + 0.2 + 17.5 + +     +     +     + + + Defs/ThingDef[defName="VFEI2_RoyalMegaspider"]/comps + + Defs/ThingDef[defName="VFEI2_RoyalMegaspider"] + + + + + + + + Defs/ThingDef[defName="VFEI2_RoyalMegaspider"]/comps + +
  • + 1530 + true + 600 + 5 + 0.25 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_RoyalSpelopede.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_RoyalSpelopede.xml new file mode 100644 index 0000000000..da8740c82e --- /dev/null +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_RoyalSpelopede.xml @@ -0,0 +1,92 @@ + + + + + Defs/ThingDef[defName="VFEI2_RoyalSpelopede"]/statBases/MoveSpeed + + 4.4 + 0.07 + 0.31 + 0.17 + + + + + Defs/ThingDef[defName="VFEI2_RoyalSpelopede"]/tools + + +
  • + + +
  • Stab
    • + + 24 + 1.33 + HeadClaw + 40 + 20 + +
  • + + +
  • Cut
    • + + 43 + 2.48 + HeadClaw + 1.5 + 7.5 + +
  • + + +
  • Blunt
    • + + 24 + 1.33 + HeadAttackTool + 0.2 + 6 + +     +     +     + + + Defs/ThingDef[defName="VFEI2_RoyalSpelopede"]/statBases/ArmorRating_Blunt + + 10 + + + + + Defs/ThingDef[defName="VFEI2_RoyalSpelopede"]/statBases/ArmorRating_Sharp + + 4 + + + + + Defs/ThingDef[defName="VFEI2_RoyalSpelopede"]/comps + + Defs/ThingDef[defName="VFEI2_RoyalSpelopede"] + + + + + + + + Defs/ThingDef[defName="VFEI2_RoyalSpelopede"]/comps + +
  • + 925 + true + 600 + 5 + 0.25 +
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Silverfish.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Silverfish.xml index 323d2d80de..7f6c58dbd5 100644 --- a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Silverfish.xml +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Silverfish.xml @@ -5,6 +5,7 @@ Defs/ThingDef[defName="VFEI2_Silverfish"]/statBases/MoveSpeed 2.1 + 0.9 0.03 0.26 0.38 @@ -97,7 +98,7 @@ Defs/ThingDef[defName="VFEI2_Silverfish"]/comps
  • - 3750 + 5625 true 600 5 diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Teramantis.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Teramantis.xml index 35d4b03481..07c62273f4 100644 --- a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Teramantis.xml +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Teramantis.xml @@ -5,6 +5,7 @@ Defs/ThingDef[defName="VFEI2_Teramantis"]/statBases/MoveSpeed 4.7 + 0.99 0.07 0.55 0.44 diff --git a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Titantick.xml b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Titantick.xml index 600e09396c..55fa1cd56a 100644 --- a/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Titantick.xml +++ b/ModPatches/Vanilla Factions Expanded - Insectoids 2/Patches/ThingDefs_Races/Races_Titantick.xml @@ -5,6 +5,7 @@ Defs/ThingDef[defName="VFEI2_Titantick"]/statBases/MoveSpeed 2.5 + 0.85 0.09 0.41 0.38 diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/PawnKindDefs/Pawnkinds_Mech.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/PawnKindDefs/Pawnkinds_Mech.xml index 3042ff6d8c..75267db68f 100644 --- a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/PawnKindDefs/Pawnkinds_Mech.xml +++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/PawnKindDefs/Pawnkinds_Mech.xml @@ -8,13 +8,6 @@ - - Defs/PawnKindDef[defName="VFE_Mech_Pikeman" or defName="VFE_Mech_AdvancedPikeman"]/combatPower - - 180 - - - Defs/PawnKindDef[ defName="VFE_Mech_Knight" or @@ -108,13 +101,6 @@
    • -
  • - Defs/PawnKindDef[defName="VFE_Mech_AdvancedPikeman_PlayerControlled"]/combatPower - - 180 - -
    • -
  • Defs/PawnKindDef[ defName="VFE_Mech_AdvancedLancer_PlayerControlled" or diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid.xml index b9285d1218..ea7f694bb9 100644 --- a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid.xml +++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid.xml @@ -133,8 +133,6 @@ true 366 0.5 - 12 - 27
    • @@ -324,7 +322,7 @@ 200 true 116 - 0.75 + 0.5     @@ -356,7 +354,7 @@ 200 true 100 - 0.75 + 0.5     @@ -459,9 +457,7 @@ 200 true 100 - 0.75 - 4 - 8 + 0.5     @@ -583,7 +579,7 @@ 200 true 100 - 0.75 + 0.5     @@ -700,8 +696,6 @@ true 120 0.5 - 5 - 7.5     @@ -792,8 +786,6 @@ true 356 0.5 - 12 - 27     @@ -888,8 +880,6 @@ true 188 0.5 - 10 - 22     diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid_PlayerControlled.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid_PlayerControlled.xml index 84ec8e8430..daa5857b86 100644 --- a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid_PlayerControlled.xml +++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_AdvancedMechanoid_PlayerControlled.xml @@ -96,8 +96,6 @@ true 366 0.5 - 12 - 27     @@ -279,7 +277,7 @@ 200 true 116 - 0.75 + 0.5     @@ -311,7 +309,7 @@ 200 true 100 - 0.75 + 0.5     @@ -426,9 +424,7 @@ 200 true 100 - 0.75 - 4 - 8 + 0.5     @@ -550,7 +546,7 @@ 200 true 100 - 0.75 + 0.5     @@ -667,8 +663,6 @@ true 120 0.5 - 5 - 7.5 @@ -760,8 +754,6 @@ true 188 0.5 - 10 - 22 diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml index e7a86c2c23..6681c3b003 100644 --- a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml +++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Machines.xml @@ -31,14 +31,12 @@
  • - false 0.25
  • SightSensor
  • - false 0.25
  • SightSensor
    • @@ -49,13 +47,6 @@     - - Defs/ThingDef[@Name="BaseVFEMachine"]/statBases - - 0 - - - Defs/ThingDef[ defName="VFE_Mechanoids_Autocleaner" or @@ -220,7 +211,7 @@ 200 true 100 - 0.75 + 0.5 @@ -423,7 +414,7 @@ 200 true 250 - 0.75 + 0.5 @@ -455,7 +446,7 @@ 200 true 275 - 0.75 + 0.5 @@ -543,7 +534,7 @@ 200 true 350 - 0.75 + 0.5 @@ -648,7 +639,7 @@ 200 true 250 - 0.75 + 0.5 diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml index b107369531..697067cbe7 100644 --- a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml +++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid.xml @@ -33,14 +33,12 @@
  • - false 0.25
  • SightSensor
  • - false 0.25
  • SightSensor
    • @@ -51,13 +49,6 @@ - - Defs/ThingDef[@Name="VFE_Mechanoid"]/statBases - - 0 - - - @@ -157,8 +148,6 @@ true 366 0.5 - 12 - 27 @@ -348,7 +337,7 @@ 200 true 116 - 0.75 + 0.5 @@ -380,7 +369,7 @@ 200 true 100 - 0.75 + 0.5 @@ -483,9 +472,7 @@ 200 true 100 - 0.75 - 4 - 8 + 0.5 @@ -607,7 +594,7 @@ 200 true 100 - 0.75 + 0.5 @@ -724,8 +711,6 @@ true 120 0.5 - 5 - 7.5 @@ -826,8 +811,6 @@ true 356 0.5 - 12 - 27 @@ -920,8 +903,6 @@ true 188 0.5 - 10 - 22 diff --git a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid_PlayerControlled.xml b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid_PlayerControlled.xml index 22514d93f5..77b7ca9b4c 100644 --- a/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid_PlayerControlled.xml +++ b/ModPatches/Vanilla Factions Expanded - Mechanoids/Patches/Vanilla Factions Expanded - Mechanoids/ThingDefs_Races/Races_Mechanoid_PlayerControlled.xml @@ -95,8 +95,6 @@ true 188 0.5 - 10 - 22 @@ -218,7 +216,7 @@ 200 true 100 - 0.75 + 0.5 @@ -335,8 +333,6 @@ true 120 0.5 - 5 - 7.5 diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Bioferrite.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Bioferrite.xml new file mode 100644 index 0000000000..7eb1e19bff --- /dev/null +++ b/ModPatches/Vanilla Factions Expanded - Pirates/Defs/Vanilla Factions Expanded - Pirates/Ammo/Ammo_Bioferrite.xml @@ -0,0 +1,380 @@ + + + + + AmmoWarBolter + + AmmoRockets + UI/Icons/ThingCategories/CaliberRocket + + + + + + AmmoSet_WarBolter + + + Bullet_WarBolter_HE + Bullet_WarBolter_Incendiary + Bullet_WarBolter_Frag + Bullet_WarBolter_HEAT + + + + + + + Small, self-propelled rockets used by the warbolter. + + 0.385 + 0.15 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting
    • +     + +
  • AmmoWarBolter
    • +     + 2000 +     + + + Ammo_WarBolter_HE + + + Things/Ammo/Rocket/MiniRocket/Standard + Graphic_StackCount + + + 4.44 + + RocketHE + Bullet_WarBolter_HE + + + + Ammo_WarBolter_Incendiary + + + Things/Ammo/Rocket/MiniRocket/Incendiary + Graphic_StackCount + + + 2.28 + + GrenadeIncendiary + Bullet_WarBolter_Incendiary + + + + Ammo_WarBolter_Frag + + + Things/Ammo/Rocket/MiniRocket/Frag + Graphic_StackCount + + + 2.70 + + RocketFrag + Bullet_WarBolter_Frag + + + + Ammo_WarBolter_HEAT + + + Things/Ammo/Rocket/MiniRocket/HEAT + Graphic_StackCount + + + 2.37 + + RocketHEAT + Bullet_WarBolter_HEAT + + + + + + + Things/Projectile/Bullet_Big + Graphic_Single + + CombatExtended.BulletCE + + Bullet + 96 + + + + + Bullet_WarBolter_HE + + + 64 + 20 + 5.101 + +
  • + Bomb_Secondary + 38 +
    • +     +     +     + + + Bullet_WarBolter_Incendiary + + CombatExtended.ProjectileCE_Explosive + + PrometheumFlame + 5 + 1.5 + FilthPrometheum + 0.7 + MortarIncendiary_Explode + + +
  • + 7 + Thermobaric + 1 + MortarIncendiary_Explode + true +
    • +     +     + + + Bullet_WarBolter_Frag + CombatExtended.ProjectileCE_Bursting + + + 1 + Bomb + 17 + true + 1.05 + 2 + + +
  • + + 6 + + -89~-5 +
    • +     +     + + + Bullet_WarBolter_HEAT + + + Bullet + 142 + 46 + 5.101 + + +
  • + 17 + Bomb + 0.5 + MortarBomb_Explode + true +
    • +     +     + + + + + MakeAmmo_WarBolter_HE + + Craft 200 WarBolter Rockets (HE). + Making WarBolter Rockets (HE). + +
  • + + +
  • Steel
    • + + + 154 + +
  • + + +
  • FSX
    • + + + 18 + +
  • + + +
  • ComponentIndustrial
    • + + + 4 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 36600 +     + + + MakeAmmo_WarBolter_Incendiary + + Craft 200 WarBolter Rockets (Incendiary). + Making WarBolter Rockets (Incendiary). + +
  • + + +
  • Steel
    • + + + 154 + +
  • + + +
  • Prometheum
    • + + + 12 + +
  • + + +
  • ComponentIndustrial
    • + + + 6 + +     + + +
  • Steel
    • +
  • Prometheum
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 19400 +     + + + MakeAmmo_WarBolter_Frag + + Craft 200 WarBolter Rockets (Frag). + Making WarBolter Rockets (Frag). + +
  • + + +
  • Steel
    • + + + 154 + +
  • + + +
  • FSX
    • + + + 8 + +
  • + + +
  • ComponentIndustrial
    • + + + 8 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +     +     + + 200 + + 21800 +     + + + MakeAmmo_WarBolter_HEAT + + Craft 200 WarBolter Rockets (HEAT). + Making WarBolter Rockets (HEAT). + +
  • + + +
  • Steel
    • + + + 154 + +
  • + + +
  • FSX
    • + + + 6 + +
  • + + +
  • ComponentIndustrial
    • + + + 6 + +
  • + + +
  • Uranium
    • + + + 8 + +     + + +
  • Steel
    • +
  • FSX
    • +
  • ComponentIndustrial
    • +
  • Uranium
    • +     +     + + 200 + + 20600 +     + +     \ No newline at end of file diff --git a/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml new file mode 100644 index 0000000000..4f2cf08b26 --- /dev/null +++ b/ModPatches/Vanilla Factions Expanded - Pirates/Patches/Vanilla Factions Expanded - Pirates/ThingDefs_Misc/Addon Weapons/VWEBFRangedWarcasket.xml @@ -0,0 +1,113 @@ + + + + + +
  • Vanilla Weapons Expanded - Bioferrite
    • +     + + + +
  • + Defs/ThingDef[defName = "VWEB_Warbolter"]/tools + + +
  • + + +
  • Blunt
    • + + 35 + 2.44 + 16 + Barrel + + + + + +
  • + VWEB_Warbolter + + 23.6 + 0.58 + 1 + 0.13 + 1 + 18.2 + 61000 + + + CombatExtended.Verb_ShootCE + true + Bullet_WarBolter_HE + 0.6 + 50 + 3 + VWEB_Warbolter_Fire + GunTail_Medium + 8 + 2.3 + 12 + + + 10 + 8 + AmmoSet_WarBolter + + + 1 + FALSE + Snapshot + + +
  • CE_AI_BROOM
    • +
  • IndustrialGunAdvanced
    • + + + +
  • + Defs/ThingDef[defName="VWEB_Warbolter"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"] + +
  • + switch to bolter + switch to flamethrower + + 40 + 5 + AmmoSet_Flamethrower + + + 0.35 + CombatExtended.Verb_ShootCE + true + Bullet_Flamethrower_Prometheum + 3 + 1.1 + 30 + 1 + 3 + 20 + HissFlamethrower + 0 + + true + + + + FALSE + AimedShot + 5 + true + +
    • +
  • + CompEquippable +
    • + + + +     +     +     +     \ No newline at end of file diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Drugs/Alcohol_Chemshine.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Drugs/Alcohol_Chemshine.xml index c3ec359aa6..6a7a2a3298 100644 --- a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Drugs/Alcohol_Chemshine.xml +++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Drugs/Alcohol_Chemshine.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="Chemshine"]/statBases - 1 @@ -13,7 +12,6 @@ Defs/HediffDef[defName="Chemshined"]/stages/li[1] - -0.10 @@ -24,7 +22,6 @@ Defs/ThingDef[defName="Chemshine"]/comps/li[@Class="CompProperties_Drug"]/addictiveness - 0.05 @@ -32,7 +29,6 @@ Defs/ThingDef[defName="Chemshine"]/comps/li[@Class="CompProperties_Drug"]/minToleranceToAddict - 0.05 diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Scenarios/Scenarios_Classic.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Scenarios/Scenarios_Classic.xml index c455d6e1ca..b16c082ec7 100644 --- a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Scenarios/Scenarios_Classic.xml +++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/Scenarios/Scenarios_Classic.xml @@ -4,7 +4,6 @@ Defs/ScenarioDef[defName="VFES_Bandits"]/scenario/parts/li[thingDef="VFES_Weapon_GrenadeDynamite"] -
  • StartingThing_Defined @@ -17,7 +16,6 @@ Defs/ScenarioDef[defName="VFES_Bandits"]/scenario/parts -
  • StartingThing_Defined diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Headgear.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Headgear.xml index 7ab27d14f1..ea591cf1d4 100644 --- a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Headgear.xml +++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Apparel_Headgear.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName="VFES_Headgear_Bandana"]/statBases - 1 1 @@ -13,7 +12,6 @@ Defs/ThingDef[defName="VFES_Headgear_Bandana"]/statBases/StuffEffectMultiplierArmor - 1 @@ -21,7 +19,6 @@ Defs/ThingDef[defName="VFES_Headgear_Bandana"]/apparel/layers -
  • StrappedHead
    • @@ -31,7 +28,6 @@ Defs/ThingDef[defName="VFES_Headgear_Bandana"]/equippedStatOffsets - -0.1 @@ -40,7 +36,6 @@ Defs/ThingDef[defName="VFES_Headgear_Sombrero"]/statBases - 5 2 @@ -49,7 +44,6 @@ Defs/ThingDef[defName="VFES_Headgear_Sombrero"]/statBases/StuffEffectMultiplierArmor - 2 @@ -58,7 +52,6 @@ Defs/ThingDef[defName="VFES_Headgear_FlatCap"]/statBases - 2 1 @@ -67,7 +60,6 @@ Defs/ThingDef[defName="VFES_Headgear_FlatCap"]/statBases/StuffEffectMultiplierArmor - 2 diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrial.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrial.xml index ddae50034d..928ffcb0e8 100644 --- a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrial.xml +++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedIndustrial.xml @@ -4,7 +4,6 @@ Defs/ThingDef[defName ="VFES_Gun_DoubleActionRevolver"]/tools -
  • @@ -34,7 +33,6 @@ Defs/ThingDef[defName="VFES_Gun_DoubleBarreledShotgun" or defName="VFES_Gun_HuntingRifle"]/tools -
  • @@ -125,7 +123,6 @@ Defs/ThingDef[defName="VFES_Gun_DoubleActionRevolver"] -
  • 0.90,0.90 @@ -185,7 +182,6 @@ Defs/ThingDef[defName="VFES_Gun_DoubleBarreledShotgun"] -
  • 1.03,1.15 @@ -248,7 +244,6 @@ Defs/ThingDef[defName="VFES_Gun_DoubleBarreledShotgun"] -
  • 1.25,1.45 diff --git a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedMedieval.xml b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedMedieval.xml index b518b128e8..002f552e6b 100644 --- a/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedMedieval.xml +++ b/ModPatches/Vanilla Factions Expanded - Settlers/Patches/Vanilla Factions Expanded - Settlers/ThingDefs_Misc/Weapons/RangedMedieval.xml @@ -5,7 +5,6 @@ Defs/ThingDef[defName="VFES_Tomahawk_Thrown"]/graphicData - Things/Projectile/TomahawkThrown/TomahawkThrownC @@ -16,7 +15,6 @@ Defs/ThingDef[defName="VFES_Tomahawk_Thrown"]/projectile - 12 diff --git a/ModPatches/Vanilla Factions Expanded - Tribals/Defs/Vanilla Factions Expanded - Tribals/Recipes_Tribals.xml b/ModPatches/Vanilla Factions Expanded - Tribals/Defs/Vanilla Factions Expanded - Tribals/Recipes_Tribals.xml index 88ed26cdbd..6b0d07c152 100644 --- a/ModPatches/Vanilla Factions Expanded - Tribals/Defs/Vanilla Factions Expanded - Tribals/Recipes_Tribals.xml +++ b/ModPatches/Vanilla Factions Expanded - Tribals/Defs/Vanilla Factions Expanded - Tribals/Recipes_Tribals.xml @@ -23,6 +23,7 @@ MakeAmmo_VFET_Throwspikes Craft 20 throwspikes. + VFET_Hunting GeneralLaborSpeed Crafting diff --git a/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsRanged.xml b/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsRanged.xml index 0585517434..0951934442 100644 --- a/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsRanged.xml +++ b/ModPatches/Vanilla Factions Expanded - Tribals/Patches/Vanilla Factions Expanded - Tribals/ThingDefs_WeaponsRanged.xml @@ -28,6 +28,9 @@ Defs/ThingDef[defName="VFET_Throwspikes"] Neolithic + +
  • WeaponsRanged
    • +     diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Giant.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Giant.xml index 7f0cd47504..1f1b34a5d8 100644 --- a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Giant.xml +++ b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Animal_Giant.xml @@ -119,7 +119,7 @@ Defs/ThingDef[defName="VFEV_Lothurr"] - +     @@ -132,7 +132,7 @@ true 600 5 - 0.75 + 0.5     @@ -252,7 +252,7 @@ Defs/ThingDef[defName="VFEV_Fenrir"] - +     @@ -265,7 +265,7 @@ true 600 5 - 0.75 + 0.5     @@ -346,7 +346,7 @@ Defs/ThingDef[defName="VFEV_Njorun"] - +     @@ -359,7 +359,7 @@ true 600 5 - 0.75 + 0.5     diff --git a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Mechanoid.xml b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Mechanoid.xml index 4207908b0f..662606014d 100644 --- a/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Mechanoid.xml +++ b/ModPatches/Vanilla Factions Expanded - Vikings/Patches/Vanilla Factions Expanded - Vikings/Races_Mechanoid.xml @@ -207,7 +207,7 @@ Defs/ThingDef[defName="VFEV_Mech_Odin"] - +     @@ -229,7 +229,7 @@ 200 true 300 - 0.75 + 0.5     diff --git a/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/Ammo_Security.xml b/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/Ammo_Security.xml index eb93a375cf..81fa8315f3 100644 --- a/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/Ammo_Security.xml +++ b/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/Ammo_Security.xml @@ -22,16 +22,4 @@ true     - - - - AmmoSet_RaiderArtillery - - - Bullet_155mmHowitzerShell_HE - Bullet_155mmHowitzerShell_Incendiary - Bullet_81mmMortarShell_Tox - - - \ No newline at end of file diff --git a/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml b/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml deleted file mode 100644 index ce9ca84393..0000000000 --- a/ModPatches/Vanilla Furniture Expanded - Security/Defs/Vanilla Furniture Expanded - Security/NewRaiderArtillery.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - Raider_Turret_Artillery - - A manned artillery that launches all kinds of shells. Capable of inflicting devastating damage to both enemy forces and structures, this military machinery excels at laying down fire support for soldiers in the field.\n\nCapable of targeting other areas of the world within a medium radius. - CombatExtended.Building_TurretGunCE - - Things/Building/Artillery/TurretArtillery_Base - Graphic_Single - (3,3) - - (0.38,0.2,0.56375,0.8) - Damage/Corner - - - (-0.13,-0.87,-0.1) - (0.5,0.4,1.05) - - - - 250 - 3600 - - Industrial - (0,0,-2) - true - (3,3) - - true - false - -
  • Metallic
    • -     - 100 - - 180 - 9 - - - - Heavy - - false - Raider_Artillery_Weapon - 3 - -
  • Artillery_BaseDestroyer
    • -     - 1 - 1 - - - -
  • MortarShells
    • -     - -
  • Shell_Incendiary
    • -
  • Shell_Firefoam
    • -
  • Shell_AntigrainWarhead
    • -     -     -     -     - Things/Building/Artillery/TurretArtillery_MenuIcon - 0.9 - 5 - -
  • - True -
    • -     - -     - - - Raider_Artillery_Weapon - - Artillery cannon capable of long range bombardment. - - Things/Building/Artillery/TurretArtillery_Top - Graphic_Single - - - 0.5 - 8.5 - - -
  • Artillery_BaseDestroyer
    • -
  • TurretGun
    • -     - -
  • - CombatExtended.Verb_ShootMortarCE - false - true - Bullet_155mmHowitzerShell_HE - 4 - 40 - 1000 - 1 - VFES_Shot_Artillery - 20 - 0.2 - - true - -
    • -     - -
  • - -
  • 30
    • -
  • 50
    • -
  • 70
    • -
  • 90
    • - - -
  • - 1 - 12 - AmmoSet_RaiderArtillery -
    • -     - - - - -
  • MortarShells
    • -     -     -     - - - -
  • MortarShells
    • -     - -
  • Shell_Firefoam
    • -
  • Shell_AntigrainWarhead
    • -     -     -     -     -     - -     \ No newline at end of file diff --git a/ModPatches/Vanilla Furniture Expanded - Security/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Manned.xml b/ModPatches/Vanilla Furniture Expanded - Security/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Manned.xml index 657d816ea8..9a188d0bc9 100644 --- a/ModPatches/Vanilla Furniture Expanded - Security/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Manned.xml +++ b/ModPatches/Vanilla Furniture Expanded - Security/Patches/Vanilla Furniture Expanded - Security/ThingDefs_Manned.xml @@ -254,10 +254,6 @@ - - Defs/ThingDef[defName="VFES_Turret_Artillery"]/building/buildingTags - - Defs/ThingDef[defName="VFES_Turret_Artillery"]/building/turretBurstWarmupTime diff --git a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Animals.xml b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Animals.xml index dc2baea331..7a2173adb4 100644 --- a/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Animals.xml +++ b/ModPatches/Vanilla Genetics Expanded/Patches/Vanilla Genetics Expanded/HediffDefs/Hediffs_Local_Implants_Animals.xml @@ -480,7 +480,7 @@ Defs/HediffDef[defName="GR_ScytherTail"]/stages/li/statOffsets/ArmorRating_Sharp - 0.15 + 0.3 @@ -514,7 +514,7 @@ Defs/HediffDef[defName="GR_MechaTail"]/stages/li/statOffsets/ArmorRating_Sharp - 0.4 + 0.8 @@ -532,7 +532,7 @@ Defs/HediffDef[defName="GR_InsectileEye"]/stages/li/statOffsets/ArmorRating_Sharp - 0.05 + 0.1 @@ -548,7 +548,7 @@ Defs/HediffDef[defName="GR_ThrumboEye"]/stages/li/statOffsets/ArmorRating_Sharp - 0.15 + 0.3 @@ -566,7 +566,7 @@ Defs/HediffDef[defName="GR_MothTympanalOrgan"]/stages/li/statOffsets/ArmorRating_Sharp - 0.1 + 0.2 @@ -582,7 +582,7 @@ Defs/HediffDef[defName="GR_MechaReceptors"]/stages/li/statOffsets/ArmorRating_Sharp - 0.2 + 0.4 @@ -600,7 +600,7 @@ Defs/HediffDef[defName="GR_InsectoidPheromones"]/stages/li/statOffsets/ArmorRating_Sharp - 0.1 + 0.2 @@ -635,7 +635,7 @@ Defs/HediffDef[defName="GR_MiniatureThrumboHorn"]/stages/li/statOffsets/ArmorRating_Sharp - 0.2 + 0.4 @@ -671,7 +671,7 @@ Defs/HediffDef[defName="GR_InsectMandibles"]/stages/li/statOffsets/ArmorRating_Sharp - 0.1 + 0.2 @@ -705,7 +705,7 @@ Defs/HediffDef[defName="GR_ThrumboJaws"]/stages/li/statOffsets/ArmorRating_Sharp - 0.2 + 0.4 @@ -723,7 +723,7 @@ Defs/HediffDef[defName="GR_MuffaloSpine"]/stages/li/statOffsets/ArmorRating_Sharp - 0.1 + 0.2 @@ -739,7 +739,7 @@ Defs/HediffDef[defName="GR_CrocodileSpine"]/stages/li/statOffsets/ArmorRating_Sharp - 0.2 + 0.4 @@ -755,7 +755,7 @@ Defs/HediffDef[defName="GR_MechaSpine"]/stages/li/statOffsets/ArmorRating_Sharp - 0.4 + 0.8 @@ -773,7 +773,7 @@ Defs/HediffDef[defName="GR_ChitinousHeart"]/stages/li/statOffsets/ArmorRating_Sharp - 0.15 + 0.3 @@ -789,7 +789,7 @@ Defs/HediffDef[defName="GR_MechaHeart"]/stages/li/statOffsets/ArmorRating_Sharp - 0.4 + 0.8 diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Defs/Vanilla Psycasts Expanded - Runesmith/Projectiles.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Defs/Vanilla Psycasts Expanded - Runesmith/Projectiles.xml new file mode 100644 index 0000000000..e60e5c3f5a --- /dev/null +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Defs/Vanilla Psycasts Expanded - Runesmith/Projectiles.xml @@ -0,0 +1,46 @@ + + + + + + + Things/Projectile/Projectile_Obelisk + Graphic_Single + + + 50 + false + + + + + Bullet_Obelisk_Basic + + Frostbite + 12 + 2 + 4 + + + + + Bullet_Obelisk_Intermediate + + VPER_Slow_Frostbite + 12 + 2 + 4 + + + + + Bullet_Obelisk_Advanced + + VPER_SlowFragile_Frostbite + 12 + 2 + 4 + + + + \ No newline at end of file diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Buildings_Turrets.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Buildings_Turrets.xml new file mode 100644 index 0000000000..7c3a85f953 --- /dev/null +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Buildings_Turrets.xml @@ -0,0 +1,167 @@ + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"] + + CombatExtended.Building_TurretGunCE + + + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"]/statBases + + 0.25 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"]/statBases/ShootingAccuracyTurret + + 0.5 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"] + + 1.5 + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_1Tier"]/building/turretBurstCooldownTime + + 1.0 + + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_2Tier"]/statBases + + 0.25 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_2Tier"]/statBases/ShootingAccuracyTurret + + 0.5 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_2Tier"] + + 1.5 + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_2Tier"]/building/turretBurstCooldownTime + + 1.0 + + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_3Tier"]/statBases + + 0.25 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_3Tier"]/statBases/ShootingAccuracyTurret + + 0.5 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_3Tier"] + + 1.5 + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_3Tier"]/building/turretBurstCooldownTime + + 1.0 + + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_4Tier"]/statBases + + 0.25 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_4Tier"]/statBases/ShootingAccuracyTurret + + 0.5 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_4Tier"] + + 1.5 + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_4Tier"]/building/turretBurstCooldownTime + + 1.0 + + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_5Tier"]/statBases + + 0.25 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_5Tier"]/statBases/ShootingAccuracyTurret + + 0.5 + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_5Tier"] + + 1.5 + + + + + + Defs/ThingDef[defName="VPER_Turret_Monolith_5Tier"]/building/turretBurstCooldownTime + + 1.0 + + + + \ No newline at end of file diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Race_Spirit.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Race_Spirit.xml new file mode 100644 index 0000000000..a0fd34b044 --- /dev/null +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Race_Spirit.xml @@ -0,0 +1,77 @@ + + + + + Defs/ThingDef[defName="VPER_WarriorSpirit"] + +
  • + Humanoid +
    • +     +     + + + Defs/ThingDef[defName="VPER_WarriorSpirit"]/statBases + + 0.4 + 0.6 + 1.5 + + + + + Defs/ThingDef[defName="VPER_WarriorSpirit"]/tools + + +
  • + + +
  • Cut
    • + + 22 + 2.6 + LeftHand + 4 + 8 + +
  • + + +
  • Cut
    • + + 22 + 2.6 + RightHand + 4 + 8 + +
  • + + +
  • Blunt
    • + + 5 + 2 + HeadAttackTool + 0.2 + 0.625 + +     +     +     + + + Defs/ThingDef[defName="VPER_WarriorSpirit"]/statBases/ArmorRating_Sharp + + 4.20 + + + + + Defs/ThingDef[defName="VPER_WarriorSpirit"]/statBases/ArmorRating_Blunt + + 6.30 + + + +     \ No newline at end of file diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Turret_Gun.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Turret_Gun.xml new file mode 100644 index 0000000000..087df430c6 --- /dev/null +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Turret_Gun.xml @@ -0,0 +1,168 @@ + + + + + + VPER_Gun_Monolith_1Tier + + 0.6 + 1.00 + 0.10 + 1.00 + + + CombatExtended.Verb_ShootCE + true + Bullet_Obelisk_Basic + 0.5 + 35 + 1 + 36 + VPER_IsaObelisk_Fire + GunTail_Light + 7 + Mounted + + + AimedShot + true + true + + +
  • TurretGun
    • +     +     + + + + VPER_Gun_Monolith_2Tier + + 0.6 + 1.00 + 0.10 + 1.00 + + + 1.19 + CombatExtended.Verb_ShootCE + true + Bullet_Obelisk_Basic + 0.5 + 40 + 36 + 2 + VPER_IsaObelisk_Fire + GunTail_Light + 7 + Mounted + + + AimedShot + true + true + + +
  • TurretGun
    • +     +     + + + + VPER_Gun_Monolith_3Tier + + 0.6 + 1.00 + 0.10 + 1.00 + + + 1.19 + CombatExtended.Verb_ShootCE + true + Bullet_Obelisk_Intermediate + 0.5 + 45 + 36 + 3 + VPER_IsaObelisk_Fire + GunTail_Light + 7 + Mounted + + + AimedShot + true + true + + +
  • TurretGun
    • +     +     + + + + VPER_Gun_Monolith_4Tier + + 0.6 + 1.00 + 0.10 + 1.00 + + + 1.19 + CombatExtended.Verb_ShootCE + true + Bullet_Obelisk_Intermediate + 0.5 + 50 + 36 + 4 + VPER_IsaObelisk_Fire + GunTail_Light + 7 + Mounted + + + AimedShot + true + true + + +
  • TurretGun
    • +     +     + + + + VPER_Gun_Monolith_5Tier + + 0.6 + 1.00 + 0.10 + 1.00 + + + 1.19 + CombatExtended.Verb_ShootCE + true + Bullet_Obelisk_Advanced + 0.5 + 55 + 36 + 5 + VPER_IsaObelisk_Fire + GunTail_Light + 7 + Mounted + + + AimedShot + true + true + + +
  • TurretGun
    • +     +     + +     \ No newline at end of file diff --git a/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Weapons_Melee.xml b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Weapons_Melee.xml new file mode 100644 index 0000000000..581a49f5ca --- /dev/null +++ b/ModPatches/Vanilla Psycasts Expanded - Runesmith/Patches/Vanilla Psycasts Expanded - Runesmith/Weapons_Melee.xml @@ -0,0 +1,51 @@ + + + + + Defs/ThingDef[defName="VPER_MeleeWeapon_RunesmithBattleaxe"]/tools + + +
  • + + +
  • Blunt
    • + + 3 + 1.66 + 0.10 + 0.75 + Handle + +
  • + + +
  • Cut
    • + + 25 + 2.47 + 4.69 + 1.57 + Edge + +     +     +     + + + Defs/ThingDef[defName="VPER_MeleeWeapon_RunesmithBattleaxe"]/statBases + + 4 + 0.2 + + + + + Defs/ThingDef[defName="VPER_MeleeWeapon_RunesmithBattleaxe"]/equippedStatOffsets + + 0.13 + 0.2 + 0.20 + + + +     diff --git a/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/GeneDefs/GeneDefs.xml b/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/GeneDefs/GeneDefs.xml index 34a89510e6..7deea8266c 100644 --- a/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/GeneDefs/GeneDefs.xml +++ b/ModPatches/Vanilla Races Expanded - Insector/Patches/Vanilla Races Expanded - Insector/GeneDefs/GeneDefs.xml @@ -7,8 +7,8 @@ Defs/GeneDef[defName="VRE_InsectSkin"]/statOffsets - 2.2 - 1.35 + 3 + 2.35     diff --git a/ModPatches/Vanilla Races Expanded - Lycanthrope/Patches/Vanilla Races Expanded - Lycanthrope/Pawnkinds_Special.xml b/ModPatches/Vanilla Races Expanded - Lycanthrope/Patches/Vanilla Races Expanded - Lycanthrope/Pawnkinds_Special.xml new file mode 100644 index 0000000000..2ed87fa15b --- /dev/null +++ b/ModPatches/Vanilla Races Expanded - Lycanthrope/Patches/Vanilla Races Expanded - Lycanthrope/Pawnkinds_Special.xml @@ -0,0 +1,35 @@ + + + + + Defs/PawnKindDef[defName="VRE_WolfmenPawnKindDef"] + +
  • + + 3 + 5 + + + 200 + 600 + + +
  • OutlanderShield
    • + + 0.8 + +
  • + + 200 + 400 + + +
  • CE_Sidearm_Melee
    • + + +     + +     +     + +     \ No newline at end of file diff --git a/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml b/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml index f772356042..c7fafe9050 100644 --- a/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml +++ b/ModPatches/Vanilla Races Expanded - Saurid/Patches/Vanilla Races Expanded - Saurid/GeneDefs/GeneDefs_ScaleSkin.xml @@ -4,7 +4,7 @@ Defs/GeneDef[defName="VRESaurids_ScaleSkin"]/statOffsets/ArmorRating_Sharp - 0.5 + 0.65 diff --git a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Defs/BioferriteFlare.xml b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Defs/BioferriteFlare.xml new file mode 100644 index 0000000000..548ac6440e --- /dev/null +++ b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Defs/BioferriteFlare.xml @@ -0,0 +1,85 @@ + + + + + + + AmmoSet_DisruptorFlare + + + Grenade_DisruptorFlare + + + + + + + A capsule of bioferrite incaseed in shotgunshell, on impact creates a bright flash and a local psychic disruption. This stuns psychically sensitive creatures, revealing those that are invisible, and reducing their consciousness and movement speed for a short while. Afterwards, the flare continues to burn, lighting up a wide area for some time. + + 0.023 + 0.06 + + +
  • CE_AutoEnableTrade
    • +
  • CE_AutoEnableCrafting
    • +     + +
  • AmmoFlare
    • +     + 200 +     + + + Ammo_DisruptorFlare + + + Things/Ammo/Flare + Graphic_StackCount + 0.5 + + + 0.048 + 0.2 + + Flare + Grenade_DisruptorFlare + + + + + + MakeAmmo_DisruptorFlare + + Craft 4 disruptorflare shells. + Making disruptorflare shells. + +
  • + + +
  • Bioferrite
    • + + + 20 + +
  • + + +
  • Prometheum
    • + + + 3 + +     + + +
  • Bioferrite
    • +
  • Prometheum
    • +     +     + + 4 + + 500 +     + +     \ No newline at end of file diff --git a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-HW_Ranged.xml b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-HW_Ranged.xml new file mode 100644 index 0000000000..d5453dd8a7 --- /dev/null +++ b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE-HW_Ranged.xml @@ -0,0 +1,122 @@ + + + + + +
  • Vanilla Weapons Expanded - Heavy Weapons
    • +     + + + +
  • + Defs/ThingDef[defName = "VWEB_HeavyIncinerator"]/verbs/li/verbClass + + Verb_Shoot + +
    • + + +
  • + Defs/ThingDef[defName = "VWEB_HeavyIncinerator"]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2.44 + 3.5 + Barrel + + + + + + +
  • + VWEB_HeavyIncinerator + + 18 + 7.10 + 0.5 + 0.60 + 0.35 + + + CombatExtended.Verb_ShootCE + 0.85 + True + Bullet_Flamethrower_Prometheum + 40 + 1 + 1 + 26 + 3 + HissFlamethrower + GunTail_Light + 12 + + true + + true + + + 200 + 5.6 + AmmoSet_Flamethrower + + + SuppressFire + 20 + True + + false +
    • + +
  • + Defs/ThingDef[defName="VWEB_HeavyIncinerator"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"] + +
  • + switch to flamethrower + switch to vaporizer + + 120 + 6 + AmmoSet_Flamethrower + + + 0.35 + CombatExtended.Verb_ShootCE + true + Bullet_Flamethrower_Prometheum + 3 + 1.1 + 16 + 1 + 2 + 40 + HissFlamethrower + 0 + + true + + + + FALSE + AimedShot + 10 + true + +
    • +
  • + CompEquippable +
    • + + + +     +     +     +     \ No newline at end of file diff --git a/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE_BioferriteRanged.xml b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE_BioferriteRanged.xml new file mode 100644 index 0000000000..632da653a7 --- /dev/null +++ b/ModPatches/Vanilla Weapons Expanded - Bioferrite/Patches/VWE_BioferriteRanged.xml @@ -0,0 +1,426 @@ + + + + + + + Defs/ThingDef[defName="VWEB_Gun_FlarestrikeRifle" or defName="VWEB_Gun_FirestormShotgun"]/tools + + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Poke
    • + + 8 + 1.55 + 2.755 + Muzzle + +     +     +     + + + Defs/ThingDef[defName="VWEB_Gun_CycloneMinigun"]/tools + + +
  • + + +
  • Blunt
    • + + 10 + 2 + 0.86 + Stock + +
  • + + +
  • Blunt
    • +
  • Poke
    • + + 7 + 2 + 0.118 + Barrel + +
  • + + +
  • Poke
    • + + 9 + 2 + 0.86 + Muzzle + +     +     +     + + + Defs/ThingDef[defName="VWEB_Gun_PiercerRifle"]/tools + + +
  • + + +
  • Blunt
    • + + 8 + 1.55 + 1.5 + 2.755 + Stock + +
  • + + +
  • Blunt
    • + + 5 + 2.02 + 1.630 + Barrel + +
  • + + +
  • Stab
    • + + 10 + 1.62 + 2.304 + 1.85 + Muzzle + +     +     +     + + + + + VWEB_Gun_FlarestrikeRifle + + 3.63 + 7.58 + 0.07 + 1.25 + 1.10 + 0.36 + + + 10 + 55 + 7 + 20 + + + 1.38 + CombatExtended.Verb_ShootCE + true + Bullet_556x45mmNATO_FMJ + 1 + 58 + 6 + 5 + Shot_AssaultRifle + GunTail_Medium + 9 + + + 30 + 4 + AmmoSet_556x45mmNATO + + + Snapshot + True + 3 + + +
  • CE_AI_AR
    • +     +     + + + Defs/ThingDef[defName="VWEB_Gun_FlarestrikeRifle"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"] + +
  • + switch to rifle + switch to flaregun + + 1 + 3 + AmmoSet_DisruptorFlare + + + 0.35 + CombatExtended.Verb_ShootCE + true + Grenade_DisruptorFlare + 3 + 0.5 + 40 + 1 + FlareLaunch + 0 + + true + + + + FALSE + AimedShot + 5 + true + +
    • +
  • + CompEquippable +
    • +     +     + + + + + VWEB_Gun_FirestormShotgun + + 4.40 + 0.44 + 1.0 + 0.13 + 1.48 + 8.20 + 17500 + + + 5 + 55 + 3 + 20 + + + CombatExtended.Verb_ShootCE + true + Bullet_12Gauge_Buck + 0.6 + 16 + Shot_Shotgun + GunTail_Heavy + 9 + + + 9 + true + 0.8 + AmmoSet_12Gauge + + + FALSE + Snapshot + + +
  • CE_AI_AssaultWeapon
    • +     +     + + + Defs/ThingDef[defName="VWEB_Gun_FirestormShotgun"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"] + +
  • + switch to shotgun + switch to flamethrower + + 20 + 5 + AmmoSet_Flamethrower + + + 0.35 + CombatExtended.Verb_ShootCE + true + Bullet_Flamethrower_Prometheum + 3 + 1.1 + 8 + 1 + 1 + 20 + HissFlamethrower + 0 + + true + + + + FALSE + AimedShot + 5 + true + +
    • +
  • + CompEquippable +
    • +     +     + + + + + Defs/ThingDef[defName ="VWEB_Gun_CycloneMinigun"]/equippedStatOffsets + + + + VWEB_Gun_CycloneMinigun + + 25.00 + 0.35 + 1 + 0.06 + 3.22 + 12 + 60000 + + + 200 + 25 + 25 + + + 0.97 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 2.1 + 62 + 50 + 2 + Shot_Minigun + GunTail_Medium + 9 + + + 250 + 9.2 + AmmoSet_762x51mmNATO + + + 25 + Snapshot + + +
  • CE_AI_Suppressive
    • +     +     + + + Defs/ThingDef[defName="VWEB_Gun_CycloneMinigun"]/comps/li[@Class="CompProperties_EquippableAbilityReloadable"] + +
  • + switch to normalfire + switch to cyclone engine + True + + 250 + 9.2 + AmmoSet_762x51mmNATO + + + 0.49 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 2.1 + 62 + 100 + 1 + Shot_Minigun + 9 + + + FALSE + AimedShot + 50 + true + +
    • +
  • + CompEquippable +
    • +     +     + + + + + VWEB_Gun_PiercerRifle + + 4.19 + 1.17 + 1 + 0.02 + 1.68 + 12.60 + 16000 + + + 55 + 15 + 1 + 20 + + + 2.04 + CombatExtended.Verb_ShootCE + true + Bullet_303British_FMJ + 1.1 + 55 + Shot_BoltActionRifle + GunTail_Heavy + 9 + + + 10 + 4.3 + AmmoSet_303British + + + AimedShot + + +
  • SimpleGun
    • +
  • CE_AI_SR
    • +     + false +     + +     \ No newline at end of file diff --git a/ModPatches/Vanilla Weapons Expanded - Frontier/Defs/Vanilla Weapons Expanded - Frontier/HighRoller_AddonAmmo.xml b/ModPatches/Vanilla Weapons Expanded - Frontier/Defs/Vanilla Weapons Expanded - Frontier/HighRoller_AddonAmmo.xml index 9c7cb7c3f4..5424118620 100644 --- a/ModPatches/Vanilla Weapons Expanded - Frontier/Defs/Vanilla Weapons Expanded - Frontier/HighRoller_AddonAmmo.xml +++ b/ModPatches/Vanilla Weapons Expanded - Frontier/Defs/Vanilla Weapons Expanded - Frontier/HighRoller_AddonAmmo.xml @@ -96,7 +96,7 @@ - + Bullet_GaussRevolver_HR @@ -116,7 +116,7 @@ - + Bullet_GaussRepeater_HR @@ -220,4 +220,4 @@ - \ No newline at end of file + diff --git a/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier.xml b/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier.xml index 732692aa83..c665b84f4b 100644 --- a/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier.xml +++ b/ModPatches/Vanilla Weapons Expanded - Frontier/Patches/Vanilla Weapons Expanded - Frontier/Weapons_Frontier.xml @@ -215,19 +215,19 @@ VWEFT_Gun_RollingBlockRifle - 7.30 - 0.85 + 4.20 + 0.88 2.15 0.01 1.73 12.80 - 2.0 + 2.3 CombatExtended.Verb_ShootCE true Bullet_4570GovHR_FMJ - 1.3 + 1.1 64 Shot_SniperRifle GunTail_Heavy diff --git a/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml index 280c3e3256..589b52264a 100644 --- a/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml +++ b/ModPatches/Vanilla Weapons Expanded/Patches/Vanilla Weapons Expanded/Industrial_Ranged.xml @@ -168,7 +168,7 @@ AmmoSet_StreamlinedArrow - +
  • CE_Bow
    •  @@ -373,7 +373,7 @@ 3.5 CombatExtended.Verb_ShootCE true - Bullet_12Gauge_Buck + Bullet_12Gauge_Buck_SB 0.6 14 Shot_Shotgun_NoRack @@ -384,7 +384,7 @@ 2 true 1.7 - AmmoSet_12Gauge + AmmoSet_12Gauge_SB Snapshot @@ -799,7 +799,7 @@ 7.8 AmmoSet_VWE_Extinguisher - +
  • ToolDecent
    •  diff --git a/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Ranged_Astartes.xml b/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Ranged_Astartes.xml index a319d47425..d96adeb3dd 100644 --- a/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Ranged_Astartes.xml +++ b/ModPatches/Warcaskets - Adeptus Astartes/Patches/Warcaskets - Adeptus Astartes/Ranged_Astartes.xml @@ -191,30 +191,32 @@ VFEP_WarcasketGun_MeltaGun - 1 - 0.01 - 1.27 - 10 - 12 - 1.32 + 1.5 + 0.07 + 1.2 + 13.4 + 23.2 + 1.78 CombatExtended.Verb_ShootCE true Bullet_Laser_MeltaCharge - 2.2 - 42 - 50 + 0.6 + 18 + 1 HP_Meltagun_Gun_Sound GunTail_Heavy 19 + 2.7 + 12 true - 100 - 7.2 + 5 + 4 AmmoSet_MeltaCharge diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml b/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/PawnKinds.xml similarity index 93% rename from ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml rename to ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/PawnKinds.xml index ca213fc3c7..8d2a363921 100644 --- a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/PawnKinds.xml +++ b/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/PawnKinds.xml @@ -3,7 +3,7 @@ - Defs/PawnKindDef[@Name="ChaosCultistBasePawn" or defName="BEWH_ImperiumTrader"] + Defs/PawnKindDef[@Name="ChaosCultistBasePawn" or @Name="BEWH_HumanBase"]
  • diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/TraderKinds.xml b/ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/TraderKinds.xml similarity index 100% rename from ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/TraderKinds.xml rename to ModPatches/Warhammer 40k Factions/Patches/Warhammer 40k Factions/TraderKinds.xml diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Abilities_SpaceMarine.xml b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Abilities_SpaceMarine.xml similarity index 100% rename from ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Abilities_SpaceMarine.xml rename to ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Abilities_SpaceMarine.xml diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/GeneDefs.xml similarity index 88% rename from ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml rename to ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/GeneDefs.xml index ecc7db998d..78b80b5bf3 100644 --- a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/GeneDefs.xml +++ b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/GeneDefs.xml @@ -71,7 +71,7 @@ - Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/ArmorRating_Blunt + Defs/GeneDef[defName="BEWH_CustodesToughness"]/statOffsets/ArmorRating_Blunt 24.5 0.8 @@ -80,14 +80,14 @@ - Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/ArmorRating_Sharp + Defs/GeneDef[defName="BEWH_CustodesToughness"]/statOffsets/ArmorRating_Sharp 8 - Defs/GeneDef[defName="BEWH_Custodes"]/statOffsets/CarryingCapacity + Defs/GeneDef[defName="BEWH_CustodesStrength"]/statOffsets/CarryingCapacity 200 @@ -96,7 +96,7 @@ - Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/ArmorRating_Blunt + Defs/GeneDef[defName="BEWH_PrimarchToughness"]/statOffsets/ArmorRating_Blunt 33.75 0.8 @@ -105,14 +105,14 @@ - Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/ArmorRating_Sharp + Defs/GeneDef[defName="BEWH_PrimarchToughness"]/statOffsets/ArmorRating_Sharp 11 - Defs/GeneDef[defName="BEWH_Primarch"]/statOffsets/CarryingCapacity + Defs/GeneDef[defName="BEWH_PrimarchStrength"]/statOffsets/CarryingCapacity 250 diff --git a/ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Hediffs_Attacks.xml b/ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Hediffs_Attacks.xml similarity index 100% rename from ModPatches/Warhammer 40k - Genes and Psycasts/Patches/Warhammer 40k - Genes and Psycasts/Hediffs_Attacks.xml rename to ModPatches/Warhammer 40k Genes/Patches/Warhammer 40k Genes/Hediffs_Attacks.xml diff --git a/ModPatches/Xen's Spirit Wolf/Patches/Xen's Spirit Wolf/ThingDefs_Races.xml b/ModPatches/Xen's Spirit Wolf/Patches/Xen's Spirit Wolf/ThingDefs_Races.xml new file mode 100644 index 0000000000..f9bb18656d --- /dev/null +++ b/ModPatches/Xen's Spirit Wolf/Patches/Xen's Spirit Wolf/ThingDefs_Races.xml @@ -0,0 +1,133 @@ + + + + + + + Defs/ThingDef[defName="XenSpiritWolf"] + +
  • + Quadruped +
    • +     +     + + + Defs/ThingDef[defName="XenSpiritWolf"]/statBases/MoveSpeed + + 7.2 + + + + + Defs/ThingDef[defName="XenSpiritWolf"]/statBases + + 0.24 + 0.16 + 0.24 + 0.24 + 0.13 + + + + + Defs/ThingDef[defName="XenSpiritWolf"]/tools + + +
  • + + +
  • Scratch
    • + + 16 + 0.75 + FrontLeftPaw + + +
  • + Stun + 20 +
    • +     +     + 3.350 + 1 + +
  • + + +
  • Scratch
    • + + 16 + 0.75 + FrontRightPaw + + +
  • + Stun + 20 +
    • +     +     + 3.350 + 1 + +
  • + + +
  • Bite
    • + + 30 + 1.72 + Teeth + + +
  • + Stun + 20 +
    • +     +     + 0.9 + 1.75 + 9.15 + +
  • + + +
  • Blunt
    • + + 8 + 3.2 + HeadAttackTool + 0.2 + 2.350 + +     +     +     + + + Defs/ThingDef[defName="XenSpiritWolf"]/comps + + Defs/ThingDef[defName="XenSpiritWolf"] + + + + + + + + Defs/ThingDef[defName="XenSpiritWolf"]/comps + +
  • + 4035 + true + 600 + 5 + 0.5 +
    • +     +     + + \ No newline at end of file diff --git a/ModPatches/YetAnotherProsthetics - Core/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml b/ModPatches/YetAnotherProsthetics - Core/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml index 25de774453..e8a9c28824 100644 --- a/ModPatches/YetAnotherProsthetics - Core/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml +++ b/ModPatches/YetAnotherProsthetics - Core/Patches/YetAnotherProsthetics - Core/Patches/Bionics_Patch.xml @@ -184,7 +184,7 @@ Defs/HediffDef[defName="BIE_UltratechBionicSkin"]/stages/li/statOffsets/ArmorRating_Sharp - 1.75 + 2.5 @@ -199,7 +199,7 @@ Defs/HediffDef[defName="SoSArchotechSkin"]/stages/li/statOffsets/ArmorRating_Sharp - 3 + 4.5 diff --git a/ModPatches/Zombieland/Patches/Zombieland/Zombieland_Patches.xml b/ModPatches/Zombieland/Patches/Zombieland/Zombieland_Patches.xml index a1b07f3571..99b0c09b57 100644 --- a/ModPatches/Zombieland/Patches/Zombieland/Zombieland_Patches.xml +++ b/ModPatches/Zombieland/Patches/Zombieland/Zombieland_Patches.xml @@ -126,7 +126,7 @@ Defs/ThingDef[defName="ZombieSpitter"] - +     @@ -139,7 +139,7 @@ false 600 5 - 0.5 + 0.25     diff --git a/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechKind_CE.xml b/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechKind_CE.xml index 3591f2c101..2e33802d1d 100644 --- a/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechKind_CE.xml +++ b/ModPatches/pphhyy Expanded Scythers/Patches/pphhyy Expanded Scythers/MechKind_CE.xml @@ -155,7 +155,7 @@ 200 true 116 - 0.75 + 0.5 @@ -267,42 +267,36 @@
  • - false 0.25
  • SightSensor
  • - false 0.25
  • SightSensor
  • - false 0.625
  • MechanicalHead
  • - false 0.625
  • MechanicalHead
  • - false 0.625
  • MechanicalLeg
  • - false 0.625
  • MechanicalLeg
    • @@ -436,7 +430,7 @@ 200 true 116 - 0.75 + 0.5 @@ -592,7 +586,7 @@ 200 true 116 - 0.75 + 0.5 @@ -721,7 +715,7 @@ 200 true 150 - 0.75 + 0.5 diff --git a/ModPatches/pphhyy's Lightless Empyrean/Patches/pphhyy's Lightless Empyrean/Race_Animals.xml b/ModPatches/pphhyy's Lightless Empyrean/Patches/pphhyy's Lightless Empyrean/Race_Animals.xml index 956bc5dc7a..39bf4fef06 100644 --- a/ModPatches/pphhyy's Lightless Empyrean/Patches/pphhyy's Lightless Empyrean/Race_Animals.xml +++ b/ModPatches/pphhyy's Lightless Empyrean/Patches/pphhyy's Lightless Empyrean/Race_Animals.xml @@ -16,7 +16,7 @@ 0.05 0.02 - 0.18 + 0.18 @@ -33,7 +33,7 @@ 1.26 pphhyy_LightlessEmpyrean_TentacleAttackTool 0.450 - 0.25 + 0.25
  • @@ -73,7 +73,7 @@ 1.26 pphhyy_LightlessEmpyrean_TentacleAttackTool 1.25 - 0.85 + 0.85
  • @@ -171,7 +171,7 @@ true 600 5 - 0.5 + 0.25
    • @@ -192,10 +192,10 @@ 6 -
  • - Stun - 14 -
    • +
  • + Stun + 14 +
    • @@ -210,10 +210,10 @@ 6 -
  • - Stun - 14 -
    • +
  • + Stun + 14 +
    • @@ -284,10 +284,10 @@ 6 -
  • - Stun - 14 -
    • +
  • + Stun + 14 +
    • @@ -302,10 +302,10 @@ 6 -
  • - Stun - 14 -
    • +
  • + Stun + 14 +
    • diff --git a/Patches/Core/BackstoryDefs/Patch_Backstories.xml b/Patches/Core/BackstoryDefs/Patch_Backstories.xml index 2bb2793b90..ac46e280e8 100644 --- a/Patches/Core/BackstoryDefs/Patch_Backstories.xml +++ b/Patches/Core/BackstoryDefs/Patch_Backstories.xml @@ -16,41 +16,4 @@ - - Defs/BackstoryDef[defName="Archer25"]/possessions - - 12 - - - - - - - Defs/BackstoryDef[defName="Bodyguard58"]/possessions - - 21 - - - - - Defs/BackstoryDef[defName="OverwatchSniper42"]/possessions - - 15 - - - - - Defs/BackstoryDef[defName="BushSniper94"]/possessions - - 15 - - - - - Defs/BackstoryDef[defName="Gunfighter51"]/possessions - - 18 - - - \ No newline at end of file diff --git a/Patches/Core/Bodies/Bodies_Animal_Insect/Beetlelike.xml b/Patches/Core/Bodies/Bodies_Animal_Insect/Beetlelike.xml index 4a8b270434..71f47b3839 100644 --- a/Patches/Core/Bodies/Bodies_Animal_Insect/Beetlelike.xml +++ b/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/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalCentipede.xml b/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalCentipede.xml index 34fba7ce74..1578f2e6bc 100644 --- a/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalCentipede.xml +++ b/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,6 +121,27 @@ + + 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 diff --git a/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalTermite.xml b/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalTermite.xml index 1512bf1823..f3f660bba4 100644 --- a/Patches/Core/Bodies/Bodies_Mechanoid/MechanicalTermite.xml +++ b/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/Patches/Core/Bodies/Bodies_Mechanoid/Pikeman.xml b/Patches/Core/Bodies/Bodies_Mechanoid/Pikeman.xml index 186d05cf90..d18cba4a42 100644 --- a/Patches/Core/Bodies/Bodies_Mechanoid/Pikeman.xml +++ b/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/Patches/Core/Bodies/Bodies_Mechanoid/Scyther.xml b/Patches/Core/Bodies/Bodies_Mechanoid/Scyther.xml index a576473191..9e2e7bc21f 100644 --- a/Patches/Core/Bodies/Bodies_Mechanoid/Scyther.xml +++ b/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/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.xml b/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.xml index b510204dd5..490dd7c15f 100644 --- a/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.xml +++ b/Patches/Core/HediffDefs/Hediffs_Local_AddedParts.xml @@ -56,6 +56,16 @@ + + Defs/HediffDef[defName="PowerClaw"]/stages/li/capMods + + + -0.37 + -0.03 + + + + Defs/HediffDef[defName="PowerClaw"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools diff --git a/Patches/Core/PawnKindDefs_Humanlike/PawnKinds.xml b/Patches/Core/PawnKindDefs_Humanlike/PawnKinds.xml index 804f07d58e..f940e9ebc2 100644 --- a/Patches/Core/PawnKindDefs_Humanlike/PawnKinds.xml +++ b/Patches/Core/PawnKindDefs_Humanlike/PawnKinds.xml @@ -555,7 +555,7 @@ Defs/PawnKindDef[defName="Tribal_Penitent"]/weaponMoney - 50~150 + 52~150 @@ -870,4 +870,4 @@ - \ No newline at end of file + diff --git a/Patches/Core/Stats/Stats.xml b/Patches/Core/Stats/Stats.xml index cd800d07ce..f08ff1fcfb 100644 --- a/Patches/Core/Stats/Stats.xml +++ b/Patches/Core/Stats/Stats.xml @@ -121,7 +121,7 @@ Defs/StatDef[defName="ArmorRating_Heat"]/description - Percentage reduction of attack damage from extreme heat or cold, such as fire, incendiary explosions, or frostbite-inflicting attacks.\n\nThis value is reduced by the Heat armor penetration value of the incoming attack. If the resulting value is 100% or greater, protected parts of the pawn will be immune to the incoming attack's hot or cold damage. + Percentage reduction of attack damage from extreme heat or cold, such as fire, incendiary explosions, or frostbite-inflicting attacks.\n\nThe total across all sources of this armor is added for a protected part, then reduced by the armor reduction value of the incoming attack. If the resulting value is 100% or greater, protected parts of the pawn will be immune to the incoming attack's hot or cold damage. diff --git a/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml b/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml index 1e2ddd4a2f..48fc13946d 100644 --- a/Patches/Core/ThingDefs_Misc/Weapons_Guns.xml +++ b/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
    • @@ -241,21 +248,21 @@ Gun_PumpShotgun - 3.00 - 1.0 + 3.05 + 0.99 0.14 - 1.20 - 9.0 + 1.31 + 10.0 1 - 9500 + 10000 - 45 + 50 10 1 - 2.75 + 2.72 CombatExtended.Verb_ShootCE true Bullet_12Gauge_Buck @@ -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/Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml index c5bae57f45..649e6df333 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Arid.xml @@ -108,7 +108,7 @@ true 600 5 - 0.75 + 0.5     @@ -281,8 +281,8 @@ 0.11 0.52 0.33 - 8 - 0.28 + 0.25 + 0.1 @@ -363,7 +363,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml index 62a60d6c4d..b9815ea780 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Bears.xml @@ -25,6 +25,8 @@ 0.16 0.23 0.18 + 0.075 + 0.05 @@ -32,13 +34,6 @@ Defs/ThingDef[@Name="BaseBear"]/tools - - Defs/ThingDef[@Name="BaseBear"]/race/wildness - - 0.6 - - - Defs/ThingDef[@Name="BaseBear"]/comps @@ -57,7 +52,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml b/Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml index c86504ac39..fbe8f11cda 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_BigCat.xml @@ -115,7 +115,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Farm.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Farm.xml index ae7b978c2c..10500148fd 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Farm.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Farm.xml @@ -180,7 +180,8 @@
  • true - When useStatic is true, this becomes the value used and it is NOT influenced by durability, health and similar + When useStatic is 'true', this becomes the value used and it is NOT influenced by durability, health and similar, + The default value is 'false'. 4
  • Neck
    • @@ -194,12 +195,6 @@ - - Defs/ThingDef[defName="Cow"]/statBases - - Value here does nothing, this whole thing is only used for display of info - 0 - --> diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml index 8a00c9a532..82628cb5a4 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Giant.xml @@ -10,8 +10,8 @@ 0.08 0.79 0.51 - 0.205 - 0.1 + 0.35 + 0.15 @@ -91,7 +91,7 @@ true 600 5 - 0.75 + 0.5 @@ -104,6 +104,8 @@ 0.09 0.67 0.48 + 0.1125 + 0.075 @@ -186,7 +188,7 @@ true 600 5 - 0.75 + 0.5 @@ -324,7 +326,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml index 4362976354..a8be9d4b04 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Insect.xml @@ -18,14 +18,12 @@
  • - false 0.25
  • InsectLeg
  • - false 0.25
  • InsectLeg
    • @@ -36,13 +34,6 @@ - - Defs/ThingDef[@Name="BaseInsect"]/statBases - - 0 - - - @@ -98,13 +89,6 @@ - - Defs/ThingDef[defName="Megascarab"]/race/baseHealthScale - - 0.3 - - - Defs/ThingDef[defName="Megascarab"]/comps @@ -123,7 +107,7 @@ true 600 5 - 0.5 + 0.25 @@ -195,13 +179,6 @@ - - Defs/ThingDef[defName="Spelopede"]/race/baseHealthScale - - 1.2 - - - Defs/ThingDef[defName="Spelopede"]/comps @@ -216,11 +193,11 @@ Defs/ThingDef[defName="Spelopede"]/comps
  • - 500 + 625 true 600 5 - 0.5 + 0.25
    • @@ -292,13 +269,6 @@ - - Defs/ThingDef[defName="Megaspider"]/race/baseHealthScale - - 1.8 - - - Defs/ThingDef[defName="Megaspider"]/comps @@ -313,11 +283,11 @@ Defs/ThingDef[defName="Megaspider"]/comps
  • - 750 + 925 true 600 5 - 0.5 + 0.25
    • diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Pet.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Pet.xml index 576838a724..4825c80b52 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Pet.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Pet.xml @@ -154,7 +154,7 @@ true 600 5 - 0.75 + 0.5 @@ -249,7 +249,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_Temperate.xml b/Patches/Core/ThingDefs_Races/Races_Animal_Temperate.xml index 1c0073da6a..45bac9eb3c 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_Temperate.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_Temperate.xml @@ -494,14 +494,12 @@
  • - false 0.5
  • Leg
  • - false 0.5
  • Leg
    • @@ -599,7 +597,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml b/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml index 59b87d4af0..2bf6fb9dc2 100644 --- a/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml +++ b/Patches/Core/ThingDefs_Races/Races_Animal_WildCanines.xml @@ -22,8 +22,8 @@ Defs/ThingDef[defName="Warg"]/statBases - 0.075 - 0.05 + 0.15 + 0.1 0.23 0.20 0.11 @@ -107,13 +107,6 @@ - - Defs/ThingDef[defName="Warg"]/race/wildness - - 0.3 - - - Defs/ThingDef[defName="Warg"]/comps @@ -132,7 +125,7 @@ true 600 5 - 0.75 + 0.5 @@ -233,13 +226,6 @@ - - Defs/ThingDef[@Name="ThingBaseWolf"]/race/wildness - - 0.65 - - - Defs/ThingDef[@Name="ThingBaseWolf"]/comps @@ -258,7 +244,7 @@ true 600 5 - 0.75 + 0.5 diff --git a/Patches/Core/ThingDefs_Races/Races_Humanlike.xml b/Patches/Core/ThingDefs_Races/Races_Humanlike.xml index 570fe087c5..5ec4997141 100644 --- a/Patches/Core/ThingDefs_Races/Races_Humanlike.xml +++ b/Patches/Core/ThingDefs_Races/Races_Humanlike.xml @@ -89,7 +89,7 @@ CombatExtended.CompPawnGizmo
  • - 500 + 500 true 600 5 @@ -102,7 +102,7 @@ 200 true 500 --> - 0.75 + 0.5 @@ -414,11 +402,7 @@ 200 true 116 - 0.75 - + 0.5
    • @@ -450,11 +434,7 @@ 200 true 100 - 0.75 - + 0.5 @@ -557,11 +537,7 @@ 200 true 100 - 0.75 - 4 - 8 - + 0.5 @@ -668,10 +644,6 @@ true 188 0.5 - 10 - 22 - diff --git a/Patches/Core/ThingSetMakerDefs/ThingSetMakers_Reward.xml b/Patches/Core/ThingSetMakerDefs/ThingSetMakers_Reward.xml new file mode 100644 index 0000000000..869bf7c107 --- /dev/null +++ b/Patches/Core/ThingSetMakerDefs/ThingSetMakers_Reward.xml @@ -0,0 +1,26 @@ + + + + + + Defs/ThingSetMakerDef[defName="Reward_ItemsStandard"] + /root/options/li[1] + /thingSetMaker/options/li[thingSetMaker[@Class="ThingSetMaker_MarketValue"]/fixedParams/filter/thingSetMakerTagsToAllow/li[text()="RewardStandardHighFreq" or text()="RewardStandardMidFreq" or text()="RewardStandardLowFreq" or text()="RewardStandardQualitySuper"]] + /thingSetMaker + + Class + CombatExtended.ThingSetMaker_MarketValueWithAmmo + + + + + Defs/ThingSetMakerDef[defName="Reward_ItemsStandard"] + /root/options/li[1] + /thingSetMaker/options/li[thingSetMaker[@Class="CombatExtended.ThingSetMaker_MarketValueWithAmmo"]] + /thingSetMaker + + + true + + + \ No newline at end of file diff --git a/Patches/Core/ThinkTreeDefs/Humanlike.xml b/Patches/Core/ThinkTreeDefs/Humanlike.xml index 4e974d3085..c96f19cc2b 100644 --- a/Patches/Core/ThinkTreeDefs/Humanlike.xml +++ b/Patches/Core/ThinkTreeDefs/Humanlike.xml @@ -52,10 +52,4 @@ Prepend - - \ No newline at end of file diff --git a/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml b/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml index ed2e10ca3c..0ccef31748 100644 --- a/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml +++ b/Royalty/Patches/HeDiffDefs/Hediffs_Implants.xml @@ -3,6 +3,18 @@ + + Defs/HediffDef[defName="DrillArm"]/stages/li/statOffsets + + -0.37 + -0.03 + + + + + Defs/HediffDef[defName="DrillArm"]/stages/li/capMods + + Defs/HediffDef[defName="DrillArm"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools @@ -24,6 +36,18 @@ + + Defs/HediffDef[defName="FieldHand"]/stages/li/statOffsets + + -0.37 + -0.03 + + + + + Defs/HediffDef[defName="FieldHand"]/stages/li/capMods + + Defs/HediffDef[defName="FieldHand"]/comps/li[@Class="HediffCompProperties_VerbGiver"]/tools @@ -156,7 +180,7 @@ Defs/HediffDef[defName="ToughskinGland"]/stages/li/statOffsets/ArmorRating_Sharp - 1 + 2 @@ -171,7 +195,7 @@ Defs/HediffDef[defName="ToughskinGland"]/stages/li/statOffsets -0.25 - -0.01 + -0.02 @@ -182,14 +206,14 @@ Defs/HediffDef[defName="ArmorskinGland"]/stages/li/statOffsets/ArmorRating_Sharp - 2 + 3.5 Defs/HediffDef[defName="ArmorskinGland"]/stages/li/statOffsets/ArmorRating_Blunt - 3.5 + 3.25 @@ -197,7 +221,7 @@ Defs/HediffDef[defName="ArmorskinGland"]/stages/li/statOffsets -0.5 - -0.02 + -0.05 @@ -208,7 +232,7 @@ Defs/HediffDef[defName="StoneskinGland"]/stages/li/statOffsets/ArmorRating_Sharp - 5 + 8 @@ -222,8 +246,8 @@ Defs/HediffDef[defName="StoneskinGland"]/stages/li/statOffsets - -0.75 - -0.03 + -1.0 + -0.1 diff --git a/Sounds/Shot/Shot_AssaultRifleSlow.ogg b/Sounds/Shot/Shot_AssaultRifleSlow.ogg index aad7dbd1b2..d6fdde70d6 100644 Binary files a/Sounds/Shot/Shot_AssaultRifleSlow.ogg and b/Sounds/Shot/Shot_AssaultRifleSlow.ogg differ diff --git a/Sounds/Shot/Shot_BattleRifle.ogg b/Sounds/Shot/Shot_BattleRifle.ogg index eac1a04e9d..5c5e4f46c8 100644 Binary files a/Sounds/Shot/Shot_BattleRifle.ogg and b/Sounds/Shot/Shot_BattleRifle.ogg differ diff --git a/Source/CombatExtended.sln b/Source/CombatExtended.sln index a054340e91..37fae8c986 100644 --- a/Source/CombatExtended.sln +++ b/Source/CombatExtended.sln @@ -17,6 +17,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SRTSCompat", "SRTSCompat\SR EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SOS2Compat", "SOS2Compat\SOS2Compat.csproj", "{D7AF4074-CE88-4272-91F4-A0D63951C1F0}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PsyblastersCompat", "PsyblastersCompat\PsyblastersCompat.csproj", "{6B518120-4315-4017-B4E6-7DA8ABCCFF84}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -66,6 +68,12 @@ Global {D7AF4074-CE88-4272-91F4-A0D63951C1F0}.Debugger|Any CPU.Build.0 = Debug|Any CPU {D7AF4074-CE88-4272-91F4-A0D63951C1F0}.Release|Any CPU.ActiveCfg = Release|Any CPU {D7AF4074-CE88-4272-91F4-A0D63951C1F0}.Release|Any CPU.Build.0 = Release|Any CPU + {6B518120-4315-4017-B4E6-7DA8ABCCFF84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6B518120-4315-4017-B4E6-7DA8ABCCFF84}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B518120-4315-4017-B4E6-7DA8ABCCFF84}.Debugger|Any CPU.ActiveCfg = Debug|Any CPU + {6B518120-4315-4017-B4E6-7DA8ABCCFF84}.Debugger|Any CPU.Build.0 = Debug|Any CPU + {6B518120-4315-4017-B4E6-7DA8ABCCFF84}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6B518120-4315-4017-B4E6-7DA8ABCCFF84}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Source/CombatExtended/CombatExtended/AmmoUtility.cs b/Source/CombatExtended/CombatExtended/AmmoUtility.cs index 05bc128bf4..d0a0a77b24 100644 --- a/Source/CombatExtended/CombatExtended/AmmoUtility.cs +++ b/Source/CombatExtended/CombatExtended/AmmoUtility.cs @@ -51,23 +51,29 @@ public static string GetProjectileReadout(this ThingDef projectileDef, Thing wea { stringBuilder.AppendLine(" " + "CE_DescExplosionRadius".Translate() + ": " + props.explosionRadius.ToStringByStyle(ToStringStyle.FloatOne)); } - + // Thermal/Electric Penetration + if ((props.damageDef.armorCategory == CE_DamageArmorCategoryDefOf.Heat + || props.damageDef.armorCategory == CE_DamageArmorCategoryDefOf.Electric) && props.damageDef.defaultArmorPenetration > 0f) + { + stringBuilder.AppendLine(" " + "CE_DescAmbientPenetration".Translate() + ": " + (props.damageDef.defaultArmorPenetration).ToStringByStyle(ToStringStyle.PercentZero)); + } // Sharp / blunt AP - if (props.explosionRadius > 0) + if (props.damageDef.armorCategory != CE_DamageArmorCategoryDefOf.Heat + && props.damageDef.armorCategory != CE_DamageArmorCategoryDefOf.Electric + && props.damageDef != DamageDefOf.Stun + && props.damageDef != DamageDefOf.Extinguish + && props.damageDef != DamageDefOf.Smoke + && props.GetDamageAmount(weapon) != 0) { - if (props.damageDef.armorCategory != CE_DamageArmorCategoryDefOf.Heat - && props.damageDef.armorCategory != CE_DamageArmorCategoryDefOf.Electric - && props.damageDef != DamageDefOf.Stun - && props.damageDef != DamageDefOf.Extinguish - && props.damageDef != DamageDefOf.Smoke) + if (props.explosionRadius > 0) { stringBuilder.AppendLine(" " + "CE_DescBluntPenetration".Translate() + ": " + props.GetExplosionArmorPenetration() + " " + "CE_MPa".Translate()); } - } - else - { - stringBuilder.AppendLine(" " + "CE_DescSharpPenetration".Translate() + ": " + (props.armorPenetrationSharp * multiplier).ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_mmRHA".Translate()); - stringBuilder.AppendLine(" " + "CE_DescBluntPenetration".Translate() + ": " + (props.armorPenetrationBlunt * multiplier).ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_MPa".Translate()); + else + { + stringBuilder.AppendLine(" " + "CE_DescSharpPenetration".Translate() + ": " + (props.armorPenetrationSharp * multiplier).ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_mmRHA".Translate()); + stringBuilder.AppendLine(" " + "CE_DescBluntPenetration".Translate() + ": " + (props.armorPenetrationBlunt * multiplier).ToStringByStyle(ToStringStyle.FloatTwo) + " " + "CE_MPa".Translate()); + } } // Secondary explosion @@ -120,12 +126,6 @@ public static string GetProjectileReadout(this ThingDef projectileDef, Thing wea /// public static float GetExplosionArmorPenetration(this CompProperties_ExplosiveCE props) => props.damageAmountBase * ExplosiveArmorPenetrationMultiplier; - public static bool IsShell(ThingDef def) - { - var ammo = ThingDefOf.Turret_Mortar.building.turretGunDef.GetCompProperties(); - return ammo?.ammoSet.ammoTypes.Any(l => l.ammo == def) ?? false; - } - public static bool IsAmmoSystemActive(AmmoDef def) { if (Controller.settings.EnableAmmoSystem) diff --git a/Source/CombatExtended/CombatExtended/ArmorUtilityCE.cs b/Source/CombatExtended/CombatExtended/ArmorUtilityCE.cs index f6cafbdf4b..3118837021 100644 --- a/Source/CombatExtended/CombatExtended/ArmorUtilityCE.cs +++ b/Source/CombatExtended/CombatExtended/ArmorUtilityCE.cs @@ -58,13 +58,15 @@ public static DamageInfo GetAfterArmorDamage(DamageInfo originalDinfo, Pawn pawn var dinfo = new DamageInfo(originalDinfo); var dmgAmount = dinfo.Amount; + var penAmount = dinfo.ArmorPenetrationInt; //GetPenetrationValue(originalDinfo); var involveArmor = dinfo.Def.harmAllLayersUntilOutside || hitPart.depth == BodyPartDepth.Outside; bool isAmbientDamage = dinfo.IsAmbientDamage(); - // In case of ambient damage (fire, electricity) we apply a percentage reduction formula based on the sum of all applicable armor + // In case of ambient damage (fire, electricity) we apply a percentage reduction formula based on the sum of all applicable armor, using the penetration from the type of damagedef if (isAmbientDamage) { - dinfo.SetAmount(Mathf.CeilToInt(GetAmbientPostArmorDamage(dmgAmount, originalDinfo.Def.armorCategory.armorRatingStat, pawn, hitPart))); + penAmount = dinfo.defInt.defaultArmorPenetration; + dinfo.SetAmount(Mathf.CeilToInt(GetAmbientPostArmorDamage(dmgAmount, penAmount, originalDinfo.Def.armorCategory.armorRatingStat, pawn, hitPart))); armorDeflected = dinfo.Amount <= 0; return dinfo; } @@ -73,7 +75,6 @@ public static DamageInfo GetAfterArmorDamage(DamageInfo originalDinfo, Pawn pawn deflectionComp.deflectedSharp = false; } - var penAmount = originalDinfo.ArmorPenetrationInt; //GetPenetrationValue(originalDinfo); // Apply worn armor if (involveArmor && pawn.apparel != null && !pawn.apparel.WornApparel.NullOrEmpty()) @@ -419,9 +420,13 @@ private static bool TryDamageArmor(DamageDef def, float penAmount, float armorAm /// The damaged pawn /// The body part affected /// The post-armor damage ranging from 0 to the original amount - private static float GetAmbientPostArmorDamage(float dmgAmount, StatDef armorRatingStat, Pawn pawn, BodyPartRecord part) + private static float GetAmbientPostArmorDamage(float dmgAmount, float penAmount, StatDef armorRatingStat, Pawn pawn, BodyPartRecord part) { - var dmgMult = 1f; + if (penAmount < 0f) + { + penAmount = 0f; + } + var dmgMult = 1f + penAmount; if (part.IsInGroup(CE_BodyPartGroupDefOf.CoveredByNaturalArmor)) { dmgMult -= pawn.GetStatValue(armorRatingStat); @@ -447,7 +452,10 @@ private static float GetAmbientPostArmorDamage(float dmgAmount, StatDef armorRat } } } - + if (dmgMult > 1f) + { + dmgMult = 1f; + } var deflectionComp = pawn.TryGetComp(); if (deflectionComp != null) { diff --git a/Source/CombatExtended/CombatExtended/CE_ThingSetMakerUtility.cs b/Source/CombatExtended/CombatExtended/CE_ThingSetMakerUtility.cs new file mode 100644 index 0000000000..24e505d358 --- /dev/null +++ b/Source/CombatExtended/CombatExtended/CE_ThingSetMakerUtility.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Verse; + +namespace CombatExtended +{ + public static class CE_ThingSetMakerUtility + { + public static bool CanGenerate(ThingDef d, bool allowBasic, bool allowAdvanced) + { + return d is AmmoDef ammodef && (ammodef.tradeTags?.Contains(AmmoInjector.destroyWithAmmoDisabledTag) ?? false) + ? AmmoUtility.IsAmmoSystemActive(ammodef) && AdvancedOrBasic(ammodef, allowBasic, allowAdvanced) + : true; + } + + public static bool AdvancedOrBasic(AmmoDef d, bool allowBasic, bool allowAdvanced) + { + return d.ammoClass == null || (d.ammoClass.advanced ? allowBasic : allowAdvanced); + } + + public static ThingDef GetAmmoDef(CompProperties_AmmoUser comp, bool random, bool canGenerateAdvanced) + { + if (random) + { + var ammoDefs = comp.ammoSet.ammoTypes.Select(v => v.ammo).Where(d => canGenerateAdvanced || !d.ammoClass.advanced); + if (ammoDefs.EnumerableNullOrEmpty()) + { + ammoDefs = comp.ammoSet.ammoTypes.Select(v => v.ammo); + } + return ammoDefs.RandomElement(); + } + return comp.ammoSet.ammoTypes.First().ammo; + } + + public static void GenerateAmmoForWeapon(List outThings, bool random, bool canGenerateAdvanced, IntRange magCount) + { + List ammos = new List(); + foreach (var thing in outThings) + { + if (thing.TryGetComp() is CompAmmoUser ammoUser && ammoUser.UseAmmo) + { + Thing ammo = ThingMaker.MakeThing(GetAmmoDef(ammoUser.Props, random, canGenerateAdvanced)); + ammo.stackCount = Math.Max(Math.Max(ammoUser.Props.AmmoGenPerMagOverride, ammoUser.Props.magazineSize), 1) * magCount.RandomInRange; + ammos.Add(ammo); + } + } + foreach (var t in ammos) + { + outThings.Add(t); + } + } + } +} diff --git a/Source/CombatExtended/CombatExtended/CE_Utility.cs b/Source/CombatExtended/CombatExtended/CE_Utility.cs index 6e4c6887a8..e57858b013 100644 --- a/Source/CombatExtended/CombatExtended/CE_Utility.cs +++ b/Source/CombatExtended/CombatExtended/CE_Utility.cs @@ -1617,6 +1617,84 @@ public static Pawn GetRandomWorldPawn(this Faction faction, bool capableOfCombat return pawn; } + public static object LaunchProjectileCE(ThingDef projectileDef, + ThingDef _ammoDef, + Def _ammosetDef, + Vector2 origin, + LocalTargetInfo target, + Pawn launcher, + float shotAngle, + float shotRotation, + float shotHeight, + float shotSpeed) + { + if (_ammoDef is AmmoDef ammoDef && _ammosetDef is AmmoSetDef ammosetDef) + { + foreach (var al in ammosetDef.ammoTypes) + { + if (al.ammo == ammoDef) + { + projectileDef = al.projectile; + break; + } + } + } + else + { + projectileDef = projectileDef.GetProjectile(); + } + var p = ThingMaker.MakeThing(projectileDef, null); + ProjectileCE projectile = (ProjectileCE)p; + GenSpawn.Spawn(projectile, launcher.Position, launcher.Map); + projectile.ExactPosition = origin; + projectile.canTargetSelf = false; + projectile.minCollisionDistance = 1; + projectile.intendedTarget = target; + projectile.mount = null; + projectile.AccuracyFactor = 1; + + ProjectilePropertiesCE pprop = projectileDef.projectile as ProjectilePropertiesCE; + bool instant = false; + float spreadDegrees = 0; + float aperatureSize = 0.03f; + // Hard coded as a super high max range - TODO: change in 1.6 to pass the range from the turret to this function. + // Should also update ProjectileCE.RayCast to not need a VerbPropertiesCE input just a float for range (Since thats all its used for). + VerbPropertiesCE verbPropsRange = new VerbPropertiesCE + { + range = 1000 + }; + if (pprop != null) + { + instant = pprop.isInstant; + } + if (instant) + { + projectile.RayCast( + launcher, + verbPropsRange, + origin, + shotAngle, + shotRotation, + shotHeight, + shotSpeed, + spreadDegrees, + aperatureSize, + launcher); + } + else + { + projectile.Launch( + launcher, + origin, + shotAngle, + shotRotation, + shotHeight, + shotSpeed, + launcher); + } + return projectile; + } + public static FactionStrengthTracker GetStrengthTracker(this Faction faction) => Find.World.GetComponent().GetFactionTracker(faction); } } diff --git a/Source/CombatExtended/CombatExtended/Comps/CompAmmoResupplyOnWakeup.cs b/Source/CombatExtended/CombatExtended/Comps/CompAmmoResupplyOnWakeup.cs index d07ba9e13d..8ec80e9ff5 100644 --- a/Source/CombatExtended/CombatExtended/Comps/CompAmmoResupplyOnWakeup.cs +++ b/Source/CombatExtended/CombatExtended/Comps/CompAmmoResupplyOnWakeup.cs @@ -45,7 +45,7 @@ public bool IsActive return false; } - if (parent.TryGetComp()?.Awake ?? false) + if (!(parent.TryGetComp()?.Awake ?? true)) { return false; } diff --git a/Source/CombatExtended/CombatExtended/Comps/CompAmmoUser.cs b/Source/CombatExtended/CombatExtended/Comps/CompAmmoUser.cs index 154a0445ba..52d2173cb5 100644 --- a/Source/CombatExtended/CombatExtended/Comps/CompAmmoUser.cs +++ b/Source/CombatExtended/CombatExtended/Comps/CompAmmoUser.cs @@ -337,36 +337,12 @@ private void AssignJobToWielder(Job job) } } - public bool Notify_ShotFired() - { - if (ammoToBeDeleted != null) - { - ammoToBeDeleted.Destroy(); - ammoToBeDeleted = null; - CompInventory.UpdateInventory(); - if (!HasAmmoOrMagazine) - { - return false; - } - } - return true; - } - - public bool Notify_PostShotFired() - { - if (!HasAmmoOrMagazine) - { - DoOutOfAmmoAction(); - return false; - } - return true; - } /// /// Reduces ammo count and updates inventory if necessary, call this whenever ammo is consumed by the gun (e.g. firing a shot, clearing a jam). /// Has an optional argument for the amount of ammo to consume per shot, which defaults to 1; this caters for special cases such as different sci-fi weapons using up different amounts of the same energy cell ammo type per shot, or a double-barrelled shotgun that fires both cartridges at the same time (projectile treated as a single, more powerful bullet) /// - public bool TryReduceAmmoCount(int ammoConsumedPerShot = 1) + public void Notify_ShotFired(int ammoConsumedPerShot = 1) { ammoConsumedPerShot = (ammoConsumedPerShot > 0) ? ammoConsumedPerShot : 1; @@ -378,48 +354,72 @@ public bool TryReduceAmmoCount(int ammoConsumedPerShot = 1) // Mag-less weapons feed directly from inventory if (!HasMagazine) { - if (UseAmmo) + if (ammoToBeDeleted != null) { - if (!TryFindAmmoInInventory(out ammoToBeDeleted)) - { - return false; - } - if (ammoToBeDeleted.def != CurrentAmmo) - { - currentAmmoInt = ammoToBeDeleted.def as AmmoDef; - } - - if (ammoToBeDeleted.stackCount > 1) - { - ammoToBeDeleted = ammoToBeDeleted.SplitOff(1); - } + ammoToBeDeleted.Destroy(); + ammoToBeDeleted = null; + CompInventory.UpdateInventory(); } - return true; } - // If magazine is empty, return false + if (curMagCountInt <= 0) { - CurMagCount = 0; - return false; + Log.Error($"{parent} tried reducing its ammo count when already empty"); } // Reduce ammo count and update inventory CurMagCount = (curMagCountInt - ammoConsumedPerShot < 0) ? 0 : curMagCountInt - ammoConsumedPerShot; + } - - /*if (curMagCountInt - ammoConsumedPerShot < 0) + public bool Notify_PostShotFired() + { + if (!HasAmmoOrMagazine) { - curMagCountInt = 0; - } else + DoOutOfAmmoAction(); + return false; + } + return true; + } + + /// + /// Check whether ammo is available for firing a shot. + /// + /// + /// For weapons without a magazine, this may update the currently selected ammo type + /// if we ran out of the currently selected ammo type but have different, compatible, types + /// available in the inventory. + /// + /// + public bool TryPrepareShot() + { + if (HasMagazine) { - curMagCountInt = curMagCountInt - ammoConsumedPerShot; - }*/ + // If magazine is empty, return false + if (curMagCountInt <= 0) + { + CurMagCount = 0; + return false; + } + return true; + } - // Original: curMagCountInt--; - if (curMagCountInt < 0) + if (UseAmmo) { - TryStartReload(); + if (!TryFindAmmoInInventory(out ammoToBeDeleted)) + { + return false; + } + if (ammoToBeDeleted.def != CurrentAmmo) + { + currentAmmoInt = ammoToBeDeleted.def as AmmoDef; + } + + if (ammoToBeDeleted.stackCount > 1) + { + ammoToBeDeleted = ammoToBeDeleted.SplitOff(1); + } } + return true; } diff --git a/Source/CombatExtended/CombatExtended/Comps/CompArmorDurability.cs b/Source/CombatExtended/CombatExtended/Comps/CompArmorDurability.cs index 98418ab143..49050e0503 100644 --- a/Source/CombatExtended/CombatExtended/Comps/CompArmorDurability.cs +++ b/Source/CombatExtended/CombatExtended/Comps/CompArmorDurability.cs @@ -176,59 +176,64 @@ public override void PostPreApplyDamage(ref DamageInfo dinfo, out bool absorbed) public override IEnumerable CompFloatMenuOptions(Pawn selPawn) { - if (durabilityProps.Repairable && !this.parent.HostileTo(selPawn)) + if (!durabilityProps.Repairable || this.parent.HostileTo(selPawn)) { - var firstIngredientProvidedOrNotNeeded = true; - var secondIngredientProvidedOrNotNeeded = true; - - List ingredientsA = null; - List ingredientsB = null; + yield break; + } - // Only check for ingredients if there's any required - if (!durabilityProps.RepairIngredients.NullOrEmpty()) - { - ingredientsA = Find.CurrentMap.listerThings.AllThings.FindAll(x => !x.IsForbidden(selPawn) && x.def == durabilityProps.RepairIngredients.First().thingDef && x.stackCount >= durabilityProps.RepairIngredients.First().count); - firstIngredientProvidedOrNotNeeded = ingredientsA.Any(); + if (this.curDurability >= maxDurability + durabilityProps.MaxOverHeal) + { + yield return new FloatMenuOption("CE_ArmorDurability_CannotRepairUndamaged".Translate(), null); + yield break; + } - //The system supports only 2 ingredients at max - if (firstIngredientProvidedOrNotNeeded && durabilityProps.RepairIngredients.Count > 1) - { - ingredientsB = Find.CurrentMap.listerThings.AllThings.FindAll(x => !x.IsForbidden(selPawn) && x.def == durabilityProps.RepairIngredients.Last().thingDef && x.stackCount >= durabilityProps.RepairIngredients.Last().count); - secondIngredientProvidedOrNotNeeded = ingredientsB.Any(); - } - } + // Only check for ingredients if there's any required + if (durabilityProps.RepairIngredients.NullOrEmpty()) + { + yield return new FloatMenuOption( + "CE_RepairArmorDurability".Translate(), + () => StartJob(selPawn) + ); + yield break; + } - if (curDurability < maxDurability + durabilityProps.MaxOverHeal && firstIngredientProvidedOrNotNeeded && secondIngredientProvidedOrNotNeeded) - { - yield return new FloatMenuOption("CE_RepairArmorDurability".Translate(), delegate - { - Thing firstIngredient = null; - Thing secondIngredient = null; + var needsSecondIngredient = durabilityProps.RepairIngredients.Count >= 1; + Thing firstIngredient = FindIngredient(selPawn, durabilityProps.RepairIngredients.First()); + Thing secondIngredient = needsSecondIngredient ? FindIngredient(selPawn, durabilityProps.RepairIngredients.Last()) : null; - // If ingredients are required, pick them. Otherwise just leave the variables as null. - if (!ingredientsA.NullOrEmpty()) - { - firstIngredient = ingredientsA.MinBy(x => x.Position.DistanceTo(selPawn.Position)); - } - if (!ingredientsB.NullOrEmpty()) - { - secondIngredient = ingredientsB.MinBy(x => x.Position.DistanceTo(selPawn.Position)); - } - - StartJob(selPawn, firstIngredient, secondIngredient); - }); - } - else if (this.curDurability >= maxDurability + durabilityProps.MaxOverHeal) - { - yield return new FloatMenuOption("CE_ArmorDurability_CannotRepairUndamaged".Translate(), null); - } - else - { - yield return new FloatMenuOption("CE_ArmorDurability_CannonRepairNoResource".Translate(), null); - } + if (firstIngredient != null && !(needsSecondIngredient && secondIngredient == null)) + { + yield return new FloatMenuOption( + "CE_RepairArmorDurability".Translate(), + () => StartJob(selPawn, firstIngredient, secondIngredient) + ); + } + else + { + yield return new FloatMenuOption("CE_ArmorDurability_CannonRepairNoResource".Translate(), null); } } + /// + /// Find an ingredient to be used for repairing the given pawn's natural armor. + /// + /// The pawn that will be performing the repairs. + /// The required ingredient type and count + /// The best matching ingredient stack, or null if none were found. + private static Thing FindIngredient(Pawn selPawn, ThingDefCountClass ingredientDefCount) + { + bool IsValidIngredient(Thing ingredient) => ingredient.stackCount >= ingredientDefCount.count && !ingredient.IsForbidden(selPawn); + + return GenClosest.ClosestThingReachable( + selPawn.Position, + selPawn.Map, + ThingRequest.ForDef(ingredientDefCount.thingDef), + PathEndMode.ClosestTouch, + TraverseParms.For(selPawn), + validator: IsValidIngredient + ); + } + [Compatibility.Multiplayer.SyncMethod] private void StartJob(Pawn selPawn, Thing firstIngredient = null, Thing secondIngredient = null) { diff --git a/Source/CombatExtended/CombatExtended/Comps/CompFireModes.cs b/Source/CombatExtended/CombatExtended/Comps/CompFireModes.cs index 91390c99e8..52b0e45ebf 100644 --- a/Source/CombatExtended/CombatExtended/Comps/CompFireModes.cs +++ b/Source/CombatExtended/CombatExtended/Comps/CompFireModes.cs @@ -16,10 +16,7 @@ public class CompFireModes : CompRangedGizmoGiver private Verb verbInt = null; private List availableFireModes = new List(Enum.GetNames(typeof(FireMode)).Length); - private List availableAimModes = new List(Enum.GetNames(typeof(AimMode)).Length) - { - AimMode.AimedShot - }; + private List availableAimModes = new List(Enum.GetNames(typeof(AimMode)).Length); private FireMode currentFireModeInt; private AimMode currentAimModeInt; private bool newComp = true; @@ -147,6 +144,7 @@ public override void PostExposeData() public void InitAvailableFireModes() { availableFireModes.Clear(); + availableAimModes.Add(AimMode.AimedShot); // Calculate available fire modes if (parent.GetStatValue(CE_StatDefOf.BurstShotCount) > 1 || Props.noSingleShot) { diff --git a/Source/CombatExtended/CombatExtended/Defs/ShellingResponseDef.cs b/Source/CombatExtended/CombatExtended/Defs/ShellingResponseDef.cs index ca649f6c44..b6ff22151e 100644 --- a/Source/CombatExtended/CombatExtended/Defs/ShellingResponseDef.cs +++ b/Source/CombatExtended/CombatExtended/Defs/ShellingResponseDef.cs @@ -12,6 +12,13 @@ public class ShellingResponseDef : Def public float defaultRaidPropability = 0.0f; public float defaultRaidMTBDays = 0.0f; + /// + /// Penalty to be applied to retaliation shelling based on the current health status of a world object. + /// The lower bound of this range represents the multiplier to be applied at 100% health, + /// while the upper bound at 0% health. + /// + public FloatRange retaliationShellingCooldownImpact = new FloatRange(1f, 10f); + /// /// The list of projectiles that can be used in response when shelled /// diff --git a/Source/CombatExtended/CombatExtended/Jobs/JobGiver_ConfigurableHostilityResponse.cs b/Source/CombatExtended/CombatExtended/Jobs/JobGiver_ConfigurableHostilityResponse.cs deleted file mode 100644 index f216286ac6..0000000000 --- a/Source/CombatExtended/CombatExtended/Jobs/JobGiver_ConfigurableHostilityResponse.cs +++ /dev/null @@ -1,183 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using RimWorld; -using UnityEngine; -using Verse; -using Verse.AI; -using System; - -namespace CombatExtended -{ - public class JobGiver_ConfigurableHostilityResponse : ThinkNode_JobGiver - { - private static List tmpThreats = new List(); - - public override Job TryGiveJob(Pawn pawn) - { - if (pawn.playerSettings == null || !pawn.playerSettings.UsesConfigurableHostilityResponse) - { - return null; - } - if (PawnUtility.PlayerForcedJobNowOrSoon(pawn)) - { - return null; - } - switch (pawn.playerSettings.hostilityResponse) - { - case HostilityResponseMode.Ignore: - return null; - case HostilityResponseMode.Attack: - return TryGetAttackNearbyEnemyJob(pawn); - case HostilityResponseMode.Flee: - return TryGetFleeJob(pawn); - default: - return null; - } - } - - private Job TryGetAttackNearbyEnemyJob(Pawn pawn) - { - if (pawn.story != null && pawn.WorkTagIsDisabled(WorkTags.Violent)) - { - return null; - } - bool flag = pawn.equipment.Primary == null || pawn.equipment.Primary.def.IsMeleeWeapon; - float num = 8f; - if (!flag) - { - num = Mathf.Clamp(pawn.equipment.PrimaryEq.PrimaryVerb.verbProps.range * 0.66f, 2f, 20f); - } - float maxDist = num; - Thing thing = (Thing)AttackTargetFinder.BestAttackTarget(pawn, TargetScanFlags.NeedLOSToPawns | TargetScanFlags.NeedLOSToNonPawns | TargetScanFlags.NeedReachableIfCantHitFromMyPos | TargetScanFlags.NeedThreat, null, 0f, maxDist, default(IntVec3), 3.40282347E+38f, false); - // TODO evaluate if this is necessary? - Pawn o = thing as Pawn; - if (o != null) - { - if - (o.Downed || o.health.InPainShock) - { - return null; - } - } - - if (thing == null) - { - return null; - } - if (flag || thing.Position.AdjacentTo8Way(pawn.Position)) - { - return JobMaker.MakeJob(JobDefOf.AttackMelee, thing); - } - - // Check for reload before attacking - bool allowManualCastWeapons = !pawn.IsColonist; //TODO: Is this correct? - Verb verb = pawn.TryGetAttackVerb(thing, allowManualCastWeapons); - if (pawn.equipment.Primary != null && pawn.equipment.PrimaryEq != null && verb != null && verb == pawn.equipment.PrimaryEq.PrimaryVerb) - { - CompAmmoUser compAmmo = pawn.equipment.Primary.TryGetComp(); - if (compAmmo != null && !compAmmo.CanBeFiredNow) - { - if (compAmmo.HasAmmo) - { - Job job = JobMaker.MakeJob(CE_JobDefOf.ReloadWeapon, pawn, pawn.equipment.Primary); - if (job != null) - { - return job; - } - } - - return JobMaker.MakeJob(JobDefOf.AttackMelee, thing); - } - } - - return JobMaker.MakeJob(JobDefOf.AttackStatic, thing); - } - - private Job TryGetFleeJob(Pawn pawn) - { - if (!SelfDefenseUtility.ShouldStartFleeing(pawn)) - { - return null; - } - tmpThreats.Clear(); - List potentialTargetsFor = pawn.Map.attackTargetsCache.GetPotentialTargetsFor(pawn); - for (int i = 0; i < potentialTargetsFor.Count; i++) - { - IAttackTarget attackTarget = potentialTargetsFor[i]; - if (!attackTarget.ThreatDisabled(pawn)) - { - tmpThreats.Add((Thing)attackTarget); - } - } - if (!tmpThreats.Any()) - { - Log.Warning(pawn.LabelShort + " decided to flee but there is no any threat around."); - return null; - } - IntVec3 fleeDest = GetFleeDest(pawn, tmpThreats); - tmpThreats.Clear(); - return JobMaker.MakeJob(JobDefOf.FleeAndCower, fleeDest); - } - - - //1:1 COPY from CellFinderLoose.GetFleeDestToolUser - private IntVec3 GetFleeDest(Pawn pawn, List threats) - { - IntVec3 bestPos = pawn.Position; - float bestScore = -1f; - TraverseParms traverseParms = TraverseParms.For(pawn, Danger.Deadly, TraverseMode.ByPawn, false); - RegionTraverser.BreadthFirstTraverse(pawn.GetRegion(RegionType.Set_Passable), (Region from, Region reg) => reg.Allows(traverseParms, false), delegate (Region reg) - { - Danger danger = reg.DangerFor(pawn); - Map map = pawn.Map; - foreach (IntVec3 current in reg.Cells) - { - if (current.Standable(map)) - { - if (!reg.IsDoorway) - { - Thing thing = null; - float num = 0f; - for (int i = 0; i < threats.Count; i++) - { - float num2 = (float)current.DistanceToSquared(threats[i].Position); - if (thing == null || num2 < num) - { - thing = threats[i]; - num = num2; - } - } - float num3 = Mathf.Sqrt(num); - float f = Mathf.Min(num3, 23f); //Slight alteration - float num4 = Mathf.Pow(f, 1.2f); - num4 *= Mathf.InverseLerp(50f, 0f, (current - pawn.Position).LengthHorizontal); - if (current.GetRoom(map) != thing.GetRoom(RegionType.Set_Passable)) - { - num4 *= 4.2f; - } - else if (num3 < 8f) - { - num4 *= 0.05f; - } - if (!map.pawnDestinationReservationManager.CanReserve(current, pawn, false)) - { - num4 *= 0.5f; - } - if (danger == Danger.Deadly) - { - num4 *= 0.8f; - } - if (num4 > bestScore) - { - bestPos = current; - bestScore = num4; - } - } - } - } - return false; - }, 20, RegionType.Set_Passable); - return bestPos; - } - } -} diff --git a/Source/CombatExtended/CombatExtended/Jobs/JobGiver_UpdateLoadout.cs b/Source/CombatExtended/CombatExtended/Jobs/JobGiver_UpdateLoadout.cs index de8db31d47..863b9bf28d 100644 --- a/Source/CombatExtended/CombatExtended/Jobs/JobGiver_UpdateLoadout.cs +++ b/Source/CombatExtended/CombatExtended/Jobs/JobGiver_UpdateLoadout.cs @@ -282,7 +282,7 @@ private static bool AllowedByFoodRestriction(Thing thing, Pawn pawn) { if (thing != null && thing.def.IsNutritionGivingIngestible) { - return pawn.foodRestriction.GetCurrentRespectedRestriction(pawn).Allows(thing); + return pawn.foodRestriction.GetCurrentRespectedRestriction(pawn)?.Allows(thing) ?? true; //better to ignore food restrictions than never pick up a meal } else { diff --git a/Source/CombatExtended/CombatExtended/Jobs/Utils/JobGiverUtils_Reload.cs b/Source/CombatExtended/CombatExtended/Jobs/Utils/JobGiverUtils_Reload.cs index 70f5faa4a5..8fdd3f5b70 100644 --- a/Source/CombatExtended/CombatExtended/Jobs/Utils/JobGiverUtils_Reload.cs +++ b/Source/CombatExtended/CombatExtended/Jobs/Utils/JobGiverUtils_Reload.cs @@ -217,6 +217,11 @@ private static Thing FindBestAmmo(Pawn pawn, AmmoDef requestedAmmo) return false; } + if (potentialAmmo.IsBurning()) + { + return false; + } + if (potentialAmmo.IsForbidden(pawn) || !pawn.CanReserve(potentialAmmo)) { return false; diff --git a/Source/CombatExtended/CombatExtended/Loadouts/ITab_Inventory.cs b/Source/CombatExtended/CombatExtended/Loadouts/ITab_Inventory.cs index 92d5c43ec3..e275d849f7 100644 --- a/Source/CombatExtended/CombatExtended/Loadouts/ITab_Inventory.cs +++ b/Source/CombatExtended/CombatExtended/Loadouts/ITab_Inventory.cs @@ -516,31 +516,31 @@ public void DrawThingRowCE(ref float y, float width, Thing thing, bool showDropB private void RebuildArmorCache(Dictionary armorCache, StatDef stat) { armorCache.Clear(); - float naturalArmor = SelPawnForGear.GetStatValue(stat); List wornApparel = SelPawnForGear.apparel?.WornApparel; - var shield = wornApparel.FirstOrDefault(x => x is Apparel_Shield); + Apparel shield = wornApparel?.FirstOrDefault(x => x is Apparel_Shield); + foreach (BodyPartRecord part in SelPawnForGear.RaceProps.body.AllParts) { - //TODO: 1.5 should be Neck - if (part.depth == BodyPartDepth.Outside && (part.coverage >= 0.1 || (part.def == CE_BodyPartDefOf.Neck || part.def == CE_BodyPartDefOf.Neck))) + if (part.depth == BodyPartDepth.Outside && (part.coverage >= 0.1 || (part.def.tags.Contains(BodyPartTagDefOf.BreathingPathway) || part.def.tags.Contains(BodyPartTagDefOf.SightSource)))) { - float armorValue = part.IsInGroup(CE_BodyPartGroupDefOf.CoveredByNaturalArmor) ? naturalArmor : 0f; + var armorValue = SelPawnForGear.PartialStat(stat, part); + if (wornApparel != null) { - foreach (var apparel in wornApparel) + foreach (Apparel apparel in wornApparel) { - if (apparel.def.apparel.CoversBodyPart(part)) - { - armorValue += apparel.PartialStat(stat, part); - } + armorValue += apparel.PartialStat(stat, part); } - } - if (shield != null) - { - var shieldCoverage = shield.def?.GetModExtension()?.PartIsCoveredByShield(part, SelPawnForGear); - if (shieldCoverage == true) + if (shield != null) { - armorValue += shield.GetStatValue(stat); + if (!shield.def.apparel.CoversBodyPart(part)) + { + var shieldCoverage = shield.def?.GetModExtension()?.PartIsCoveredByShield(part, SelPawnForGear); + if (shieldCoverage == true) + { + armorValue += shield.GetStatValue(stat); + } + } } } armorCache[part] = armorValue; diff --git a/Source/CombatExtended/CombatExtended/PatchOperation_ConditionalGeneric.cs b/Source/CombatExtended/CombatExtended/PatchOperation_ConditionalGeneric.cs new file mode 100644 index 0000000000..2ef98f1f9f --- /dev/null +++ b/Source/CombatExtended/CombatExtended/PatchOperation_ConditionalGeneric.cs @@ -0,0 +1,28 @@ +using System.Xml; +using Verse; + +namespace CombatExtended +{ + public class PatchOperation_ConditionalGeneric : PatchOperation + { + public PatchOperation standard; + public PatchOperation generic; + + public override bool ApplyWorker(XmlDocument xml) + { + if (Controller.settings.GenericAmmo) + { + if (generic != null) + { + return generic.Apply(xml); + } + } + else if (standard != null) + { + return standard.Apply(xml); + } + + return true; + } + } +} diff --git a/Source/CombatExtended/CombatExtended/Projectiles/BulletCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/BulletCE.cs index ba690a7966..6db179dd76 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/BulletCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/BulletCE.cs @@ -27,7 +27,10 @@ public virtual float PenetrationAmount { var projectilePropsCE = (ProjectilePropertiesCE)def.projectile; var isSharpDmg = def.projectile.damageDef.armorCategory == DamageArmorCategoryDefOf.Sharp; - return (equipment?.GetStatValue(StatDefOf.RangedWeapon_DamageMultiplier) ?? 1f) * (isSharpDmg ? projectilePropsCE.armorPenetrationSharp : projectilePropsCE.armorPenetrationBlunt); + + float penetrationAmount = (equipment?.GetStatValue(StatDefOf.RangedWeapon_DamageMultiplier) ?? 1f) * (isSharpDmg ? projectilePropsCE.armorPenetrationSharp : projectilePropsCE.armorPenetrationBlunt); + + return lerpPosition ? penetrationAmount : penetrationAmount * RemainingKineticEnergyPct; } } diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs index 35783f8f07..8bdb719fca 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE.cs @@ -94,10 +94,12 @@ public virtual float DamageAmount { return (float)this.damageAmount; } - return ((float)this.damageAmount) * (shotSpeed * shotSpeed) / (initialSpeed * initialSpeed); + return ((float)this.damageAmount) * RemainingKineticEnergyPct; } } + public float RemainingKineticEnergyPct => (shotSpeed * shotSpeed) / (initialSpeed * initialSpeed); + /// /// Reference to the weapon that fired this projectile, may be null. /// @@ -110,6 +112,7 @@ public virtual float DamageAmount public bool canTargetSelf; public bool castShadow = true; public bool logMisses = true; + protected bool ignoreRoof; public GlobalTargetInfo globalTargetInfo = GlobalTargetInfo.Invalid; public GlobalTargetInfo globalSourceInfo = GlobalTargetInfo.Invalid; @@ -205,7 +208,7 @@ public override Vector3 DrawPos var sh = Mathf.Max(0f, (ExactPosition.y) * 0.84f); if (FlightTicks < ticksToTruePosition) { - sh *= FlightTicks / ticksToTruePosition; + sh *= (float)FlightTicks / ticksToTruePosition; } return new Vector3(ExactPosition.x, def.Altitude, ExactPosition.z + sh); } @@ -356,6 +359,7 @@ public override void ExposeData() Scribe_Values.Look(ref logMisses, "logMisses", true); Scribe_Values.Look(ref castShadow, "castShadow", true); Scribe_Values.Look(ref lerpPosition, "lerpPosition", true); + Scribe_Values.Look(ref ignoreRoof, "ignoreRoof", true); //To fix landed grenades sl problem Scribe_Values.Look(ref exactPosition, "exactPosition"); @@ -547,20 +551,26 @@ protected void RayCastSuppression(IntVec3 muzzle, IntVec3 destination, Map map = /// The shot speed (default: def.projectile.speed) /// The equipment used to fire the projectile. /// The distance to the estimated intercept point - /// The number of ticks before the bullet is drawn at its true height instead of the muzzle height - public virtual void Launch(Thing launcher, Vector2 origin, float shotAngle, float shotRotation, float shotHeight = 0f, float shotSpeed = -1f, Thing equipment = null, float distance = -1, int ticksToTruePosition = 3) + /// + /// Note that the launcher may not be spawned at all, e.g. for projectiles launched by enemy bases as retaliation. + /// + public virtual void Launch(Thing launcher, Vector2 origin, float shotAngle, float shotRotation, float shotHeight = 0f, float shotSpeed = -1f, Thing equipment = null, float distance = -1) { this.shotAngle = shotAngle; this.shotHeight = shotHeight; this.shotRotation = shotRotation; this.shotSpeed = Math.Max(shotSpeed, def.projectile.speed); - this.ticksToTruePosition = ticksToTruePosition; + this.ticksToTruePosition = (def.projectile as ProjectilePropertiesCE).TickToTruePos; if (def.projectile is ProjectilePropertiesCE props) { this.castShadow = props.castShadow; this.lerpPosition = props.lerpPosition; this.GravityFactor = props.Gravity; } + if (shotHeight >= CollisionVertical.WallCollisionHeight && launcher.Spawned && Position.Roofed(launcher.Map)) + { + ignoreRoof = true; + } Launch(launcher, origin, equipment); } @@ -642,7 +652,17 @@ protected bool CheckIntercept(Thing interceptorThing, CompProjectileInterceptor { return false; } - if (CE_Utility.IntersectionPoint(LastPos, newExactPos, shieldPosition, radius, out Vector3[] sect)) + if (CE_Utility.IntersectionPoint( + LastPos, + newExactPos, + shieldPosition, + radius, + out Vector3[] sect, + // Don't normalize away the 3D component of the projectile position when checking for collisions + // between indirect fire projectiles and shields that protect against them + // (e.g. mortar shells targeting a high-shield). + spherical: interceptorComp.Props.interceptAirProjectiles && def.projectile.flyOverhead + )) { ExactPosition = newExactPos = sect.OrderBy(x => (OriginIV3.ToVector3() - x).sqrMagnitude).First(); landed = true; @@ -710,12 +730,23 @@ protected bool CheckForCollisionBetween() List list = base.Map.listerThings.ThingsInGroup(ThingRequestGroup.ProjectileInterceptor); for (int i = 0; i < list.Count; i++) { - if (CheckIntercept(list[i], list[i].TryGetComp())) + if (!CheckIntercept(list[i], list[i].TryGetComp())) { - landed = true; - this.Impact(null); + continue; + } + + // Have high-shields absorb intercepted indirect fire projectiles without detonating them. + // Since CE simulates a 3D trajectory for such shells but explosions occur on ground level, + // detonating the shell would cause damage to objects under the high-shield. + if (def.projectile.flyOverhead) + { + this.Destroy(); return true; } + + landed = true; + this.Impact(null); + return true; } if (BlockerRegistry.CheckForCollisionBetweenCallback(this, LastPos, ExactPosition)) { @@ -770,6 +801,11 @@ protected bool CheckForCollisionBetween() return collided; } + /// + /// Cache field holding things that a projectile might collide with. + /// + private static readonly List potentialCollisionCandidates = new List(); + /// /// Checks whether a collision occurs along flight path within this cell. /// @@ -783,35 +819,49 @@ protected bool CheckCellForCollision(IntVec3 cell) } var roofChecked = false; - var mainThingList = new List(Map.thingGrid.ThingsListAtFast(cell)).Where(t => t is Pawn || t.def.Fillage != FillCategory.None).ToList(); + potentialCollisionCandidates.Clear(); + + foreach (var thing in Map.thingGrid.ThingsListAtFast(cell)) + { + if (thing is Pawn || thing.def.Fillage != FillCategory.None) + { + potentialCollisionCandidates.AddDistinct(thing); + } + } //Find pawns in adjacent cells and append them to main list - var adjList = new List(); var rot4 = Rot4.FromAngleFlat(shotRotation); if (rot4.rotInt > 1) { //For some reason south and west returns incorrect adjacent cells collection rot4 = rot4.Opposite; } - adjList.AddRange(GenAdj.CellsAdjacentCardinal(cell, rot4, new IntVec2(collisionCheckSize, 0)).ToList()); + if (Controller.settings.DebugDrawInterceptChecks) { Map.debugDrawer.debugCells.Clear(); Map.debugDrawer.DebugDrawerUpdate(); } //Iterate through adjacent cells and find all the pawns - foreach (var curCell in adjList) + foreach (var curCell in GenAdj.CellsAdjacentCardinal(cell, rot4, new IntVec2(collisionCheckSize, 0))) { - if (curCell != cell && curCell.InBounds(Map)) + if (curCell == cell || !curCell.InBounds(Map)) { - mainThingList.AddRange(Map.thingGrid.ThingsListAtFast(curCell) - .Where(x => x is Pawn)); + continue; + } - if (Controller.settings.DebugDrawInterceptChecks) + foreach (var thing in Map.thingGrid.ThingsListAtFast(curCell)) + { + if (thing is Pawn) { - Map.debugDrawer.FlashCell(curCell, 0.7f); + potentialCollisionCandidates.AddDistinct(thing); } } + + if (Controller.settings.DebugDrawInterceptChecks) + { + Map.debugDrawer.FlashCell(curCell, 0.7f); + } } //If the last position is above the wallCollisionHeight, we should check for roof intersections first @@ -824,8 +874,15 @@ protected bool CheckCellForCollision(IntVec3 cell) roofChecked = true; } - foreach (var thing in mainThingList.Distinct().Where(x => !(x is ProjectileCE)).OrderBy(x => (x.DrawPos - LastPos).sqrMagnitude)) + potentialCollisionCandidates.SortBy(thing => (thing.DrawPos - LastPos).sqrMagnitude); + + foreach (var thing in potentialCollisionCandidates) { + if (thing is ProjectileCE) + { + continue; + } + if ((thing == launcher || thing == mount) && !canTargetSelf) { continue; @@ -877,7 +934,7 @@ protected bool CheckCellForCollision(IntVec3 cell) protected virtual bool TryCollideWithRoof(IntVec3 cell) { - if (!cell.Roofed(Map)) + if (!cell.Roofed(Map) || ignoreRoof) { return false; } @@ -902,7 +959,6 @@ protected virtual bool TryCollideWithRoof(IntVec3 cell) { MoteMakerCE.ThrowText(cell.ToVector3Shifted(), Map, "x", Color.red); } - Impact(null); return true; } @@ -951,7 +1007,7 @@ protected bool TryCollideWith(Thing thing) { MoteMakerCE.ThrowText(thing.Position.ToVector3Shifted(), thing.Map, chance.ToString()); } - if (!Rand.Chance(chance)) + if (!Rand.ChanceSeeded(chance, thing.HashOffsetTicks())) { return false; } @@ -982,7 +1038,6 @@ protected bool TryCollideWith(Thing thing) { MoteMakerCE.ThrowText(thing.Position.ToVector3Shifted(), thing.Map, "x", Color.red); } - Impact(thing); return true; } @@ -1086,13 +1141,25 @@ protected Vector3 MoveForward() velocity = new Vector3(Mathf.Cos(sr) * Mathf.Cos(shotAngle) * sspt, Mathf.Sin(shotAngle) * sspt, Mathf.Sin(sr) * Mathf.Cos(shotAngle) * sspt); initialSpeed = sspt; } - Vector3 newPosition = curPosition + velocity; Accelerate(); + Vector3 newPosition = curPosition + velocity; + shotSpeed = velocity.magnitude; return newPosition; } - // This can also be made virtual, and would be the ideal entry point for guided ammunition and rockets. - protected void Accelerate() + // This is the ideal entry point for guided ammunition and rockets. + protected virtual void Accelerate() + { + AffectedByDrag(); + AffectedByGravity(); + } + + protected void AffectedByGravity() + { + velocity.y -= gravity / GenTicks.TicksPerRealSecond; + } + + protected void AffectedByDrag() { float crossSectionalArea = radius; crossSectionalArea *= crossSectionalArea * 3.14159f; @@ -1101,12 +1168,11 @@ protected void Accelerate() var dragForce = q * crossSectionalArea / ballisticCoefficient; // F = mA // A = F / m - var a = (float)((-dragForce / (float)mass)); + var a = (float)-dragForce / mass; var normalized = velocity.normalized; velocity.x += a * normalized.x; - velocity.y += a * normalized.y - (float)(1 / ballisticCoefficient) * (float)gravity / GenTicks.TicksPerRealSecond; + velocity.y += a * normalized.y; velocity.z += a * normalized.z; - shotSpeed = velocity.magnitude; } #region Tick/Draw @@ -1174,7 +1240,7 @@ public override void Tick() def.projectile.soundImpactAnticipate.PlayOneShot(this); } //TODO : It appears that the final steps in the arc (past ticksToImpact == 0) don't CheckForCollisionBetween. - if (ticksToImpact <= 0 || nextPosition.y <= 0f) + if ((lerpPosition && ticksToImpact <= 0) || nextPosition.y <= 0f) { ImpactSomething(); return; @@ -1204,6 +1270,11 @@ public override void Tick() { DangerTracker?.Notify_BulletAt(Position, def.projectile.damageAmountBase * dangerFactor); } + //If a flyoverhead ignore roof projectile is descending, enable roof check. + if (ignoreRoof && def.projectile.flyOverhead && shotAngle < 0) + { + ignoreRoof = false; + } } /// @@ -1236,7 +1307,7 @@ public override void DrawAt(Vector3 drawLoc, bool flip = false) //TODO : EXPERIMENTAL Add edifice height var shadowPos = new Vector3(ExactPosition.x, def.Altitude - 0.001f, - ExactPosition.z - Mathf.Max(0f, ExactPosition.y)); + ExactPosition.z); //EXPERIMENTAL: + (new CollisionVertical(ExactPosition.ToIntVec3().GetEdifice(Map))).Max); //TODO : Vary ShadowMat plane diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE_Bursting.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE_Bursting.cs index 5e777de4c8..016ca7a32f 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE_Bursting.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectileCE_Bursting.cs @@ -23,7 +23,7 @@ public override void ExposeData() Scribe_Values.Look(ref this.ticksToBurst, "ticksToBurst", -1, false); } - public override void Launch(Thing launcher, Vector2 origin, float shotAngle, float shotRotation, float shotHeight = 0f, float shotSpeed = -1f, Thing equipment = null, float distance = -1, int ticksToTruePosition = 3) + public override void Launch(Thing launcher, Vector2 origin, float shotAngle, float shotRotation, float shotHeight = 0f, float shotSpeed = -1f, Thing equipment = null, float distance = -1) { int armingDelay = 0; if (def.projectile is ProjectilePropertiesCE props) @@ -55,6 +55,7 @@ public override void Launch(Thing launcher, Vector2 origin, float shotAngle, flo this.shotHeight = shotHeight; this.shotRotation = shotRotation; this.shotSpeed = Math.Max(shotSpeed, def.projectile.speed); + this.ticksToTruePosition = (def.projectile as ProjectilePropertiesCE).TickToTruePos; Launch(launcher, origin, equipment); } diff --git a/Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs b/Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs index 2fc86e8742..443baab86f 100644 --- a/Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs +++ b/Source/CombatExtended/CombatExtended/Projectiles/ProjectilePropertiesCE.cs @@ -39,6 +39,9 @@ public class ProjectilePropertiesCE : ProjectileProperties public ThingDef detonateMoteDef; public FleckDef detonateFleckDef; public float detonateEffectsScaleOverride = -1; + public int? tickToTruePos; + //If undefined, use 3 or the tick it needed to cover 10 cells, whichever is larger. + public int TickToTruePos => tickToTruePos ?? Mathf.Max(3, Mathf.CeilToInt(600 / speed)); [MustTranslate] public string genericLabelOverride = null; diff --git a/Source/CombatExtended/CombatExtended/Settings.cs b/Source/CombatExtended/CombatExtended/Settings.cs index ba4d7598c7..0a4af90b73 100644 --- a/Source/CombatExtended/CombatExtended/Settings.cs +++ b/Source/CombatExtended/CombatExtended/Settings.cs @@ -37,7 +37,7 @@ public class Settings : ModSettings, ISettingsCE private bool fragmentsFromWalls = false; - private bool fasterRepeatShots = false; + private bool fasterRepeatShots = true; public bool ShowCasings => showCasings; diff --git a/Source/CombatExtended/CombatExtended/SiegeUtility.cs b/Source/CombatExtended/CombatExtended/SiegeUtility.cs new file mode 100644 index 0000000000..fd0b2673cf --- /dev/null +++ b/Source/CombatExtended/CombatExtended/SiegeUtility.cs @@ -0,0 +1,90 @@ +using System.Collections.Generic; +using System.Linq; +using RimWorld; +using Verse; +using Verse.AI.Group; + +namespace CombatExtended +{ + [StaticConstructorOnStartup] + public class SiegeUtility + { + /// + /// The minimum required construction skill to be able to build any potential siege artillery in the game. + /// + public static readonly int MinRequiredConstructionSkill; + + static SiegeUtility() + { + MinRequiredConstructionSkill = DefDatabase.AllDefsListForReading + .Where(def => def.building?.buildingTags.Contains("Artillery_BaseDestroyer") ?? false) + .Select(def => def.constructionSkillPrerequisite) + .Max(); + } + + /// + /// Determine whether the given thing is a valid shell usable by this siege. + /// + /// The thing to check. + /// The siege. + /// true if at least one type of artillery piece taking part in the siege can use this shell, false otherwise. + public static bool IsValidShellType(Thing thing, LordToil_Siege siege) + { + if (thing.def is AmmoDef { spawnAsSiegeAmmo: true } ammoDef) + { + return UniqueArtilleryDefs(siege) + .SelectMany(def => def.building.turretGunDef.comps) + .OfType() + .SelectMany(props => props.ammoSet.ammoTypes) + .Any(ammoLink => ammoLink.ammo == ammoDef); + } + + return false; + } + + /// + /// Supply additional shells for each type of artillery piece taking part in this siege. + /// + /// The siege to resupply. + public static void DropAdditionalShells(LordToil_Siege siege) + { + Lord lord = siege.lord; + bool allowToxGas = false; + if (ModsConfig.BiotechActive && lord.faction.def == FactionDefOf.PirateWaster) + { + allowToxGas = true; + } + + foreach (var artilleryDef in UniqueArtilleryDefs(siege)) + { + // NOTE: Vanilla applies a hardcoded market price cap of 250 here, while we do not. + // Since we already limit the number of shells to be dropped in and also filter by tech level, + // such a hardcoded price cap would only serve to cause issues with modded shells that may be pricier. + var shellDef = TurretGunUtility.TryFindRandomShellDef( + artilleryDef, + allowEMP: false, + allowToxGas: allowToxGas, + mustHarmHealth: true, + lord.faction.def.techLevel, + allowAntigrainWarhead: false, + faction: lord.faction + ); + + if (shellDef != null) + { + siege.DropSupplies(shellDef, LordToil_Siege.ShellReplenishCount); + } + } + } + + /// + /// Get the unique artillery types taking part in this siege. + /// + /// The siege to get artillery types for. + /// Enumerable of unique artillery defs taking part in this siege. + private static IEnumerable UniqueArtilleryDefs(LordToil_Siege siege) => siege.lord.ownedBuildings + .Select(t => t.def) + .Where(def => def.building.buildingTags.Contains("Artillery_BaseDestroyer")) + .Distinct(); + } +} diff --git a/Source/CombatExtended/CombatExtended/StatWorkers/StatWorker_ArmorPartial.cs b/Source/CombatExtended/CombatExtended/StatWorkers/StatWorker_ArmorPartial.cs index 29caf43b07..675ad4b4f5 100644 --- a/Source/CombatExtended/CombatExtended/StatWorkers/StatWorker_ArmorPartial.cs +++ b/Source/CombatExtended/CombatExtended/StatWorkers/StatWorker_ArmorPartial.cs @@ -227,39 +227,5 @@ public override string GetStatDrawEntryLabel(StatDef stat, float value, ToString return base.GetStatDrawEntryLabel(stat, value, numberSense, optionalReq, finalized); } - public override string ValueToString(float val, bool finalized, ToStringNumberSense numberSense = ToStringNumberSense.Absolute) - { - if (this.stat.defName == "PartialArmorBody") - { - return "Hover over"; - } - return base.ValueToString(val, finalized, numberSense); - } - - public override bool ShouldShowFor(StatRequest req) - { - if (!(req.Def is ThingDef)) - { - return false; - } - - if (((ThingDef)req.Def)?.IsApparel ?? req.Thing?.def?.IsApparel ?? false) - { - return this.stat.defName != "PartialArmorBody"; - } - else if (req.Thing is Pawn) - { - if (req.Thing.def.HasModExtension()) - { - return true; - } - else - { - return this.stat.defName != "PartialArmorBody"; - } - } - return false; - - } } } diff --git a/Source/CombatExtended/CombatExtended/SuppressionUtility.cs b/Source/CombatExtended/CombatExtended/SuppressionUtility.cs index c88cea0785..6bbbf82560 100644 --- a/Source/CombatExtended/CombatExtended/SuppressionUtility.cs +++ b/Source/CombatExtended/CombatExtended/SuppressionUtility.cs @@ -24,8 +24,6 @@ public static class SuppressionUtility private static DangerTracker dangerTracker; - private static IEnumerable Interceptors(Thing pawn) => pawn.Map.listerThings.ThingsInGroup(ThingRequestGroup.ProjectileInterceptor).Select(t => t.TryGetComp()).Where(x => x.Props.interceptNonHostileProjectiles || !x.parent.HostileTo(pawn)); - public static bool TryRequestHelp(Pawn pawn) { //TODO: 1.5 @@ -150,7 +148,7 @@ private static float GetCellCoverRatingForPawn(Pawn pawn, IntVec3 cell, IntVec3 } } - float cellRating = 0f, bonusCellRating = 1f, distToSuppressor = (pawn.Position - shooterPos).LengthHorizontal, + float cellRating = 0f, bonusCellRating = 1f, pawnHeightFactor = CE_Utility.GetCollisionBodyFactors(pawn).y, pawnVisibleOverCoverFillPercent = pawnHeightFactor * (1f - CollisionVertical.BodyRegionMiddleHeight) + 0.01f, pawnLowestCrouchFillPercent = pawnHeightFactor * CollisionVertical.BodyRegionBottomHeight + pawnVisibleOverCoverFillPercent, @@ -209,7 +207,7 @@ private static float GetCellCoverRatingForPawn(Pawn pawn, IntVec3 cell, IntVec3 cellRating += 10f - (bonusCellRating * 10f); // If the cell is covered by a shield and there are no enemies inside, then increases by 15 (for each such shield) - cellRating += InterceptorZonesFor(pawn).Where(x => !IsOccupiedByEnemies(x, pawn)).Count(x => x.Contains(cell)) * 15; + cellRating += CalculateShieldRating(cell, pawn); // Avoid bullets and other danger sources; // Yet do not discard cover that is extremely good, even if it may be dangerous @@ -245,19 +243,78 @@ private static float GetCellCoverRatingForPawn(Pawn pawn, IntVec3 cell, IntVec3 } return cellRating; } + + /// + /// Calculate the additional cover rating from shields covering the given cell. + /// + /// The cell to compute the cover rating for. + /// The pawn seeking cover. + /// The computed cover rating (15 for each shield covering the cell). + private static int CalculateShieldRating(IntVec3 cell, Pawn pawn) + { + int rating = 0; + foreach (var zone in InterceptorZonesFor(pawn)) + { + foreach (var zoneCell in zone) + { + if (zoneCell == cell) + { + if (!IsOccupiedByEnemies(zone, pawn)) + { + rating += 15; + } + + break; + } + } + } + + return rating; + } + + /// + /// Get areas covered by a shield that may be suitable for protecting the given pawn. + /// + /// The pawn seeking cover. + /// An enumerator of areas covered by shields on the map that may protect the pawn. public static IEnumerable> InterceptorZonesFor(Pawn pawn) { - var result = Interceptors(pawn).Where(x => x.Active).Select(x => GenRadial.RadialCellsAround(x.parent.Position, x.Props.radius, true)); - var compatibilityZones = BlockerRegistry.ShieldZonesCallback(pawn); - if (compatibilityZones != null) + foreach (var interceptor in pawn.Map.listerThings.ThingsInGroup(ThingRequestGroup.ProjectileInterceptor)) + { + var comp = interceptor.TryGetComp(); + if (comp.Active && (comp.Props.interceptNonHostileProjectiles || !interceptor.HostileTo(pawn))) + { + yield return GenRadial.RadialCellsAround(interceptor.Position, comp.Props.radius, true); + } + } + + foreach (var zone in BlockerRegistry.ShieldZonesCallback(pawn)) { - result = result.Union(compatibilityZones); + yield return zone; } - return result; } + + /// + /// Check whether the given area contains any objects hostile to the given pawn. + /// + /// The area to scan for hostile objects. + /// The pawn. + /// true if the area contained any hostile objects, false otherwise. private static bool IsOccupiedByEnemies(IEnumerable cells, Pawn pawn) { - return cells.Any(cell => pawn.Map.thingGrid.ThingsListAt(cell).Any(thing => (thing.HostileTo(pawn)))); + foreach (var cell in cells) + { + var things = pawn.Map.thingGrid.ThingsListAt(cell); + foreach (var thing in things) + { + if (thing.HostileTo(pawn)) + { + return true; + } + } + } + + return false; } private static float GetCoverRating(Thing cover) { diff --git a/Source/CombatExtended/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs b/Source/CombatExtended/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs new file mode 100644 index 0000000000..f42d85f161 --- /dev/null +++ b/Source/CombatExtended/CombatExtended/ThingSetMaker_CountEnabledAmmoOnly.cs @@ -0,0 +1,60 @@ +using System.Collections.Generic; +using RimWorld; +using Verse; + +namespace CombatExtended +{ + public class ThingSetMaker_CountEnabledAmmoOnly : ThingSetMaker_Count + { + bool basic = true; + + bool advanced = false; + + public override void Generate(ThingSetMakerParams parms, List outThings) + { + parms.validator = d => CE_ThingSetMakerUtility.CanGenerate(d, basic, advanced); + base.Generate(parms, outThings); + } + } + public class ThingSetMaker_StackCountEnabledAmmoOnly : ThingSetMaker_StackCount + { + bool basic = true; + + bool advanced = false; + + public override void Generate(ThingSetMakerParams parms, List outThings) + { + parms.validator = d => CE_ThingSetMakerUtility.CanGenerate(d, basic, advanced); + base.Generate(parms, outThings); + } + } + public class ThingSetMaker_CountWithAmmo : ThingSetMaker_Count + { + IntRange magCount = new IntRange(2, 5); + + bool random = false; + + bool canGenerateAdvanced = false; + + public override void Generate(ThingSetMakerParams parms, List outThings) + { + base.Generate(parms, outThings); + CE_ThingSetMakerUtility.GenerateAmmoForWeapon(outThings, random, canGenerateAdvanced, magCount); + } + } + + public class ThingSetMaker_MarketValueWithAmmo : ThingSetMaker_MarketValue + { + IntRange magCount = new IntRange(2, 5); + + bool random = false; + + bool canGenerateAdvanced = false; + + public override void Generate(ThingSetMakerParams parms, List outThings) + { + base.Generate(parms, outThings); + CE_ThingSetMakerUtility.GenerateAmmoForWeapon(outThings, random, canGenerateAdvanced, magCount); + } + } +} diff --git a/Source/CombatExtended/CombatExtended/Things/IncendiaryFuel.cs b/Source/CombatExtended/CombatExtended/Things/IncendiaryFuel.cs index fa409ec58c..9a5ea95912 100644 --- a/Source/CombatExtended/CombatExtended/Things/IncendiaryFuel.cs +++ b/Source/CombatExtended/CombatExtended/Things/IncendiaryFuel.cs @@ -41,7 +41,7 @@ public override void SpawnSetup(Map map, bool respawningAfterLoad) public override void Tick() { - if (Position.GetThingList(base.Map).Any(x => x.def == ThingDefOf.Filth_FireFoam)) + if (Position.GetThingList(base.Map).Any(x => x.def == ThingDefOf.Filth_FireFoam) || Position.GetTerrain(base.Map).IsWater) { if (!Destroyed) { diff --git a/Source/CombatExtended/CombatExtended/Verbs/VerbPropertiesCE.cs b/Source/CombatExtended/CombatExtended/Verbs/VerbPropertiesCE.cs index 525a9b5aba..21312e035f 100644 --- a/Source/CombatExtended/CombatExtended/Verbs/VerbPropertiesCE.cs +++ b/Source/CombatExtended/CombatExtended/Verbs/VerbPropertiesCE.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using RimWorld; using Verse; using UnityEngine; @@ -15,29 +14,9 @@ public class VerbPropertiesCE : VerbProperties public float recoilAmount = 0; public float indirectFirePenalty = 0; public float circularError = 0; - public float meleeArmorPenetration = 0; - public float firingOffset = 0.19f; public int ticksToTruePosition = 5; public bool ejectsCasings = true; public bool ignorePartialLoSBlocker = false; public bool interruptibleBurst = true; - - public float AdjustedArmorPenetrationCE(Verb ownerVerb, Pawn attacker) - { - var toolCE = (ToolCE)ownerVerb.tool; - if (ownerVerb.verbProps != this) - { - Log.ErrorOnce("Tried to calculate armor penetration for a verb with different verb props. verb=" + ownerVerb, 9865767); - return 0f; - } - if (ownerVerb.EquipmentSource != null && ownerVerb.EquipmentSource.def.IsWeapon) - { - return toolCE.armorPenetration * ownerVerb.EquipmentSource.GetStatValue(CE_StatDefOf.MeleePenetrationFactor); - } - else - { - return toolCE.armorPenetration; - } - } } } diff --git a/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs b/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs index b253de73f4..c1102daf44 100644 --- a/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs +++ b/Source/CombatExtended/CombatExtended/Verbs/Verb_LaunchProjectileCE.cs @@ -17,14 +17,6 @@ namespace CombatExtended { public class Verb_LaunchProjectileCE : Verb { - #region Constants - - // Cover check constants - private const float distToCheckForCover = 3f; // How many cells to raycast on the cover check - private const float segmentLength = 0.2f; // How long a single raycast segment is - //private const float shotHeightFactor = 0.85f; // The height at which pawns hold their guns - - #endregion #region Fields @@ -41,7 +33,7 @@ public class Verb_LaunchProjectileCE : Verb protected float distance = 10f; public CompCharges compCharges = null; - public CompAmmoUser compAmmo = null; + public CompFireModes compFireModes = null; public CompChangeableProjectile compChangeable = null; public CompApparelReloadable compReloadable = null; @@ -75,14 +67,6 @@ public class Verb_LaunchProjectileCE : Verb public Pawn ShooterPawn => CasterPawn ?? CE_Utility.TryGetTurretOperator(caster); public Thing Shooter => ShooterPawn ?? caster; - public override float EffectiveRange - { - get - { - return base.EffectiveRange; - } - } - public override int ShotsPerBurst { get @@ -155,26 +139,10 @@ public float ShootingAccuracy public float SightsEfficiency => EquipmentSource?.GetStatValue(CE_StatDefOf.SightsEfficiency) ?? 1f; public virtual float SwayAmplitude => Mathf.Max(0, (4.5f - ShootingAccuracy) * (EquipmentSource?.GetStatValue(CE_StatDefOf.SwayFactor) ?? 1f)); - // Ammo variables - public virtual CompAmmoUser CompAmmo - { - get - { - if (compAmmo == null && EquipmentSource != null) - { - compAmmo = EquipmentSource.TryGetComp(); - } - return compAmmo; - } - } public virtual ThingDef Projectile { get { - if (CompAmmo != null && CompAmmo.CurrentAmmo != null) - { - return CompAmmo.CurAmmoProjectile; - } if (CompChangeable != null && CompChangeable.Loaded) { return CompChangeable.Projectile; @@ -236,8 +204,6 @@ public float RecoilAmount } } - private bool IsAttacking => ShooterPawn?.CurJobDef == JobDefOf.AttackStatic || WarmingUp; - private LightingTracker _lightingTracker = null; protected LightingTracker LightingTracker { @@ -302,14 +268,7 @@ public override bool Available() } } - // Add check for reload - if (Projectile == null || (IsAttacking && CompAmmo != null && !CompAmmo.CanBeFiredNow)) - { - CompAmmo?.TryStartReload(); - resetRetarget(); - return false; - } - return true; + return Projectile != null; } /// @@ -487,19 +446,13 @@ public virtual void ShiftTarget(ShiftVecReport report, bool calculateMechanicalO Apparel LegArmor = LegArmors.MaxByWithFallback(funcArmor); #endregion - #region get CompAmmo's Current ammo projectile - - var ProjCE = (ProjectilePropertiesCE)compAmmo?.CurAmmoProjectile?.projectile ?? null; - - #endregion - #region checks for whether the pawn can penetrate armor, which armor is stronger, etc var TargetedBodyPartArmor = TorsoArmor; bool flagTorsoArmor = ((TorsoArmor?.GetStatValue(StatDefOf.ArmorRating_Sharp) ?? 0.1f) >= (Helmet?.GetStatValue(StatDefOf.ArmorRating_Sharp) ?? 0f)); - bool flag2 = ((ProjCE?.armorPenetrationSharp ?? 0f) >= (TorsoArmor?.GetStatValue(StatDefOf.ArmorRating_Sharp) ?? 0.1f)); + bool flag2 = (projectilePropsCE.armorPenetrationSharp >= (TorsoArmor?.GetStatValue(StatDefOf.ArmorRating_Sharp) ?? 0.1f)); //Headshots do too little damage too often, so if the pawn can penetrate torso armor, they should aim at it if ((flagTorsoArmor && !flag2)) { @@ -509,7 +462,7 @@ public virtual void ShiftTarget(ShiftVecReport report, bool calculateMechanicalO bool flag3 = (TargetedBodyPartArmor?.GetStatValue(StatDefOf.ArmorRating_Sharp) ?? 0f) >= ((LegArmor?.GetStatValue(StatDefOf.ArmorRating_Sharp) ?? 0f) + 4f); //bool for whether the pawn can penetrate helmet - bool flag4 = ((ProjCE?.armorPenetrationSharp ?? 0f) >= (Helmet?.GetStatValue(StatDefOf.ArmorRating_Sharp) ?? 0.1f)); + bool flag4 = (projectilePropsCE.armorPenetrationSharp >= (Helmet?.GetStatValue(StatDefOf.ArmorRating_Sharp) ?? 0.1f)); //if the pawn can penetrate the helmet or torso armor there's no need to aim for legs if (flag3 && (!flag4) && (!flag2)) @@ -1119,8 +1072,7 @@ public override bool TryCastShot() ShotHeight, ShotSpeed, EquipmentSource, - distance, - ticksToTruePosition); + distance); } pelletMechanicsOnly = true; } @@ -1133,11 +1085,6 @@ public override bool TryCastShot() numShotsFired++; if (ShooterPawn != null) { - if (CompAmmo != null && !CompAmmo.CanBeFiredNow) - { - CompAmmo?.TryStartReload(); - resetRetarget(); - } if (CompReloadable != null) { CompReloadable.UsedOnce(); @@ -1277,12 +1224,7 @@ private bool CanHitFromCellIgnoringRange(Vector3 shotSource, LocalTargetInfo tar goodDest = IntVec3.Invalid; return false; } - // DISABLED: reason is testing a better alternative.. - //if (ShooterPawn != null && !Caster.Faction.IsPlayerSafe() && IntercepterBlockingTarget(shotSource, targ.CenterVector3)) - //{ - // goodDest = IntVec3.Invalid; - // return false; - //} + if (CanHitCellFromCellIgnoringRange(shotSource, targ.Cell, targ.Thing)) { goodDest = targ.Cell; @@ -1292,34 +1234,6 @@ private bool CanHitFromCellIgnoringRange(Vector3 shotSource, LocalTargetInfo tar return false; } - private bool IntercepterBlockingTarget(Vector3 source, Vector3 target) - { - List list = Caster.Map.listerThings.ThingsInGroup(ThingRequestGroup.ProjectileInterceptor); - for (int i = 0; i < list.Count; i++) - { - Thing thing = list[i]; - CompProjectileInterceptor interceptor = thing.TryGetComp(); - if (!interceptor.Active) - { - continue; - } - float d1 = Vector3.Distance(source, thing.Position.ToVector3()); - if (d1 < interceptor.Props.radius + 1) - { - continue; - } - if (Vector3.Distance(target, thing.Position.ToVector3()) < interceptor.Props.radius) - { - return true; - } - if (thing.Position.ToVector3().DistanceToSegment(source, target, out _) < interceptor.Props.radius) - { - return true; - } - } - return false; - } - // Added targetThing to parameters so we can calculate its height protected virtual bool CanHitCellFromCellIgnoringRange(Vector3 shotSource, IntVec3 targetLoc, Thing targetThing = null) { diff --git a/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootCE.cs b/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootCE.cs index fdae41ceb4..92bad73fa4 100644 --- a/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootCE.cs +++ b/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootCE.cs @@ -31,6 +31,8 @@ public class Verb_ShootCE : Verb_LaunchProjectileCE public Vector3 drawPos; + private CompAmmoUser compAmmo; + #endregion #region Properties @@ -123,16 +125,19 @@ public float AimAngle } } - public float SpreadDegrees + // Whether our shooter is currently under suppressive fire + private bool IsSuppressed => ShooterPawn?.TryGetComp()?.isSuppressed ?? false; + + public CompAmmoUser CompAmmo { get { - return (EquipmentSource?.GetStatValue(CE_StatDefOf.ShotSpread) ?? 0) * (projectilePropsCE != null ? projectilePropsCE.spreadMult : 0f); + compAmmo ??= EquipmentSource?.TryGetComp(); + return compAmmo; } } - // Whether our shooter is currently under suppressive fire - private bool IsSuppressed => ShooterPawn?.TryGetComp()?.isSuppressed ?? false; + public override ThingDef Projectile => CompAmmo?.CurrentAmmo != null ? CompAmmo.CurAmmoProjectile : base.Projectile; #endregion @@ -248,6 +253,25 @@ public override void WarmupComplete() } } + public override bool Available() + { + if (!base.Available()) + { + return false; + } + + // Add check for reload + bool isAttacking = ShooterPawn?.CurJobDef == JobDefOf.AttackStatic || WarmingUp; + if (isAttacking && !(CompAmmo?.CanBeFiredNow ?? true)) + { + CompAmmo?.TryStartReload(); + resetRetarget(); + return false; + } + + return true; + } + public override void VerbTickCE() { if (_isAiming) @@ -268,33 +292,6 @@ public override void VerbTickCE() } } - public virtual ShiftVecReport SimulateShiftVecReportFor(LocalTargetInfo target, AimMode aimMode) - { - IntVec3 targetCell = target.Cell; - ShiftVecReport report = new ShiftVecReport(); - - report.target = target; - report.aimingAccuracy = AimingAccuracy; - report.sightsEfficiency = SightsEfficiency; - if (ShooterPawn != null && !ShooterPawn.health.capacities.CapableOf(PawnCapacityDefOf.Sight)) - { - report.sightsEfficiency = 0; - } - report.shotDist = (targetCell - caster.Position).LengthHorizontal; - report.maxRange = EffectiveRange; - report.lightingShift = CE_Utility.GetLightingShift(Shooter, LightingTracker.CombatGlowAtFor(caster.Position, targetCell)); - - if (!caster.Position.Roofed(caster.Map) || !targetCell.Roofed(caster.Map)) //Change to more accurate algorithm? - { - report.weatherShift = 1 - caster.Map.weatherManager.CurWeatherAccuracyMultiplier; - } - report.shotSpeed = ShotSpeed; - report.swayDegrees = SwayAmplitudeFor(aimMode); - float spreadmult = projectilePropsCE != null ? projectilePropsCE.spreadMult : 0f; - report.spreadDegrees = (EquipmentSource?.GetStatValue(CE_StatDefOf.ShotSpread) ?? 0) * spreadmult; - return report; - } - /// /// Checks to see if enemy is blind before shooting /// @@ -379,13 +376,9 @@ public void ExternalCallDropCasing(int randomSeedOffset = -1) public override bool TryCastShot() { - //Reduce ammunition - if (CompAmmo != null) + if (!CompAmmo?.TryPrepareShot() ?? false) { - if (!CompAmmo.TryReduceAmmoCount(((CompAmmo.Props.ammoSet != null) ? CompAmmo.Props.ammoSet.ammoConsumedPerShot : 1) * VerbPropsCE.ammoConsumedPerShotCount)) - { - return false; - } + return false; } if (base.TryCastShot()) { @@ -409,10 +402,25 @@ protected virtual bool OnCastSuccessful() { CE_Utility.GenerateAmmoCasings(projectilePropsCE, fromPawn ? drawPos : caster.DrawPos, caster.Map, AimAngle, VerbPropsCE.recoilAmount, fromPawn: fromPawn, extension: ext); } + + if (CompAmmo == null) + { + return true; + } + + int ammoConsumedPerShot = (CompAmmo.Props.ammoSet?.ammoConsumedPerShot ?? 1) * VerbPropsCE.ammoConsumedPerShotCount; + CompAmmo.Notify_ShotFired(ammoConsumedPerShot); + + if (ShooterPawn != null && !CompAmmo.CanBeFiredNow) + { + CompAmmo.TryStartReload(); + resetRetarget(); + } + // This needs to here for weapons without magazine to ensure their last shot plays sounds - if (CompAmmo != null && !CompAmmo.HasMagazine && CompAmmo.UseAmmo) + if (!CompAmmo.HasMagazine && CompAmmo.UseAmmo) { - if (!CompAmmo.Notify_ShotFired()) + if (!CompAmmo.HasAmmoOrMagazine) { if (VerbPropsCE.muzzleFlashScale > 0.01f) { diff --git a/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootMortarCE.cs b/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootMortarCE.cs index 9b86b0d4bb..709d93e1b1 100644 --- a/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootMortarCE.cs +++ b/Source/CombatExtended/CombatExtended/Verbs/Verb_ShootMortarCE.cs @@ -206,10 +206,6 @@ public virtual bool TryCastGlobalShot() numShotsFired++; if (ShooterPawn != null) { - if (CompAmmo != null && !CompAmmo.CanBeFiredNow) - { - CompAmmo?.TryStartReload(); - } if (CompReloadable != null) { CompReloadable.UsedOnce(); @@ -225,13 +221,7 @@ public override bool TryCastShot() { return base.TryCastShot(); } - if (CompAmmo != null) - { - if (!CompAmmo.TryReduceAmmoCount(CompAmmo.Props.ammoSet.ammoConsumedPerShot * VerbPropsCE.ammoConsumedPerShotCount)) - { - return false; - } - } + if (this.TryCastGlobalShot()) { return this.OnCastSuccessful(); diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/HealthComp.cs b/Source/CombatExtended/CombatExtended/WorldObjects/HealthComp.cs index 26772583ec..ee35dbf85a 100644 --- a/Source/CombatExtended/CombatExtended/WorldObjects/HealthComp.cs +++ b/Source/CombatExtended/CombatExtended/WorldObjects/HealthComp.cs @@ -170,8 +170,16 @@ public virtual void ThrottledCompTick() } } } - protected virtual void TryFinishDestroyQuests(Map launcherMap) + + /// + /// Clean up quests associated with a world object and update ideology raiding state. + /// + /// The faction that destroyed this world object via intertile shelling. + /// The tile the shelling originated from. + protected virtual void TryFinishDestroyQuests(Faction attackingFaction, GlobalTargetInfo sourceInfo) { + Map launcherMap = sourceInfo.Map; + QuestUtility.SendQuestTargetSignals(parent.questTags, "AllEnemiesDefeated", parent.Named("SUBJECT"), new NamedArgument(launcherMap, "MAP")); int num; List quests = Find.QuestManager.QuestsListForReading; @@ -189,11 +197,15 @@ protected virtual void TryFinishDestroyQuests(Map launcherMap) { quest.End(QuestEndOutcome.Fail); } - IdeoUtility.Notify_PlayerRaidedSomeone(launcherMap.mapPawns.FreeColonistsSpawned); + + if (attackingFaction == Faction.OfPlayer && Find.Maps.Contains(launcherMap)) + { + IdeoUtility.Notify_PlayerRaidedSomeone(launcherMap.mapPawns.FreeColonistsSpawned); + } } IEnumerable RelatedQuests => Find.QuestManager.QuestsListForReading.Where(x => !x.Historical && x.QuestLookTargets.Contains(parent)); - public void ApplyDamage(ThingDef shellDef, Faction attackingFaction, Map launcherMap) + public void ApplyDamage(ThingDef shellDef, Faction attackingFaction, GlobalTargetInfo sourceInfo) { if (Rand.Chance(NegateChance)) { @@ -201,13 +213,13 @@ public void ApplyDamage(ThingDef shellDef, Faction attackingFaction, Map launche } if (DestoyedInstantly) { - TryFinishDestroyQuests(launcherMap); + TryFinishDestroyQuests(attackingFaction, sourceInfo); TryDestroy(); return; } var damage = shellDef.GetWorldObjectDamageWorker().ApplyDamage(this, shellDef); recentShells.Add(new WorldDamageInfo() { Value = damage, ShellDef = shellDef }); - Notify_DamageTaken(attackingFaction, launcherMap); + Notify_DamageTaken(attackingFaction, sourceInfo); } @@ -218,12 +230,12 @@ void TryDestroy() parent.Destroy(); } } - public virtual void Notify_DamageTaken(Faction attackingFaction, Map launcherMap) + public virtual void Notify_DamageTaken(Faction attackingFaction, GlobalTargetInfo sourceInfo) { if (health <= 1e-4) { - TryFinishDestroyQuests(launcherMap); - Notify_PreDestroyed(attackingFaction, new GlobalTargetInfo(launcherMap.Parent)); + TryFinishDestroyQuests(attackingFaction, sourceInfo); + Notify_PreDestroyed(attackingFaction, sourceInfo); Destroy(); return; } diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs b/Source/CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs index d13a501728..243bcc8592 100644 --- a/Source/CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs +++ b/Source/CombatExtended/CombatExtended/WorldObjects/HostilityComp.cs @@ -101,6 +101,11 @@ public virtual void ThrottledCompTick() raider.ThrottledTick(); } + /// + /// Retaliate against a world object due to hostile shelling. + /// + /// The faction to retaliate against. + /// The tile the shelling came from. public virtual void TryHostilityResponse(Faction attackingFaction, GlobalTargetInfo sourceInfo) { @@ -115,9 +120,9 @@ public virtual void TryHostilityResponse(Faction attackingFaction, GlobalTargetI return; } Map attackerMap = sourceInfo.Map; + MapParent attackerMapParent = Find.World.worldObjects.MapParentAt(sourceInfo.Tile); if (attackerMap == null) { - MapParent attackerMapParent = Find.World.worldObjects.MapParentAt(sourceInfo.Tile); if (attackerMapParent != null && attackerMapParent.HasMap && attackerMapParent.Map != null && Find.Maps.Contains(attackerMapParent.Map)) { attackerMap = attackerMapParent.Map; @@ -145,7 +150,10 @@ public virtual void TryHostilityResponse(Faction attackingFaction, GlobalTargetI Log.Warning($"CE: Threat points {revengePoints}"); } #endif - if (!sheller.Shooting && Rand.Chance(ShellingPropability)) + // Only allow retaliation shelling if this faction is hostile to the owner of the site at the source location, + // in case players shell world objects from other faction maps. + Faction sourceTileFaction = attackerMapParent?.Faction; + if (!sheller.Shooting && Rand.Chance(ShellingPropability) && parent.Faction.HostileTo(sourceTileFaction)) { sheller.TryStartShelling(sourceInfo, revengePoints, attackingFaction); } @@ -156,7 +164,7 @@ public virtual void TryHostilityResponse(Faction attackingFaction, GlobalTargetI if (ticksSinceRaided != raidMTBTicks && ticksSinceRaided > raidMTBTicks / 2f && Rand.Chance(RaidPropability / Mathf.Max(raidMTBTicks - ticksSinceRaided, 1)) && raider.TryRaid(attackerMap, revengePoints)) { lastRaidTick = GenTicks.TicksGame; - Messages.Message("CE_Message_CounterRaid".Translate(parent.Label, attackingFaction.Name), MessageTypeDefOf.ThreatBig); + Messages.Message("CE_Message_CounterRaid".Translate(parent.Label, attackingFaction.Name, attackerMap.Parent.Label), MessageTypeDefOf.ThreatBig); } } } diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/HostilityRaider.cs b/Source/CombatExtended/CombatExtended/WorldObjects/HostilityRaider.cs index ae64ed5dde..88fb43ebf4 100644 --- a/Source/CombatExtended/CombatExtended/WorldObjects/HostilityRaider.cs +++ b/Source/CombatExtended/CombatExtended/WorldObjects/HostilityRaider.cs @@ -67,7 +67,7 @@ public virtual void ThrottledTick() ticksToRaid -= WorldObjectTrackerCE.THROTTLED_TICK_INTERVAL; return; } - if (parms != null) + if (parms != null && Find.Maps.Contains(parms.target)) { IncidentDef incidentDef = IncidentDefOf.RaidEnemy; incidentDef.Worker.TryExecute(parms); diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/HostilitySheller.cs b/Source/CombatExtended/CombatExtended/WorldObjects/HostilitySheller.cs index fc85dad140..e2640176a9 100644 --- a/Source/CombatExtended/CombatExtended/WorldObjects/HostilitySheller.cs +++ b/Source/CombatExtended/CombatExtended/WorldObjects/HostilitySheller.cs @@ -246,9 +246,25 @@ private ShellingResponseDef.ShellingResponsePart_Projectile RandomAvailableShell .Where(p => (budget - p.points) > 0 && p.projectile.projectile is ProjectilePropertiesCE propEC && propEC.shellingProps.range >= Find.WorldGrid.TraversalDistanceBetween(target.Tile, comp.parent.Tile, true) * 0.5f) .RandomElementByWeightWithFallback(p => p.weight, null); - private int GetTicksToCooldown() => Rand.Range(SHELLER_MINCOOLDOWNTICKS, Mathf.Clamp(7 - (int)comp.parent.Faction.def.techLevel, 1, SHELLER_MAXCOOLDOWNTICKS_TECHMULMAX) * SHELLER_MAXCOOLDOWNTICKS); + private int GetTicksToCooldown() => Rand.Range(SHELLER_MINCOOLDOWNTICKS, + Mathf.Clamp(7 - (int)comp.parent.Faction.def.techLevel, 1, SHELLER_MAXCOOLDOWNTICKS_TECHMULMAX) * + SHELLER_MAXCOOLDOWNTICKS) * HealthMultiplier(); - private int GetTicksToShot() => Rand.Range(SHELLER_MIN_TICKSBETWEENSHOTS, SHELLER_MAX_TICKSBETWEENSHOTS); + private int GetTicksToShot() => Rand.Range(SHELLER_MIN_TICKSBETWEENSHOTS, SHELLER_MAX_TICKSBETWEENSHOTS) * HealthMultiplier(); + + /// + /// Compute the multiplier to be applied to retaliation fire rate based on the current health of this world object. + /// + /// The computed multiplier. + private int HealthMultiplier() + { + var retaliationShellingCooldownMultiplier = + comp.parent.Faction.GetShellingResponseDef().retaliationShellingCooldownImpact; + + var curHealth = comp.parent.GetComponent()?.Health ?? 1f; + + return Mathf.FloorToInt(retaliationShellingCooldownMultiplier.LerpThroughRange(1f - curHealth)); + } } } diff --git a/Source/CombatExtended/CombatExtended/WorldObjects/TravelingShell.cs b/Source/CombatExtended/CombatExtended/WorldObjects/TravelingShell.cs index ce5a108318..22c3a5cbf7 100644 --- a/Source/CombatExtended/CombatExtended/WorldObjects/TravelingShell.cs +++ b/Source/CombatExtended/CombatExtended/WorldObjects/TravelingShell.cs @@ -109,7 +109,7 @@ protected override void Arrived() private bool TryShell(WorldObject worldObject) { bool shelled = false; - if (worldObject is MapParent mapParent && mapParent.HasMap) + if (worldObject is MapParent mapParent && mapParent.HasMap && Find.Maps.Contains(mapParent.Map)) { shelled = true; Map map = mapParent.Map; @@ -143,7 +143,7 @@ private bool TryShell(WorldObject worldObject) if (!shelled) { shelled = true; - healthComp.ApplyDamage(shellDef, Faction, globalSource.Map); + healthComp.ApplyDamage(shellDef, Faction, globalSource); } } return shelled; diff --git a/Source/CombatExtended/Compatibility/BlockerRegistry.cs b/Source/CombatExtended/Compatibility/BlockerRegistry.cs index 5489f34c28..3418a1dbdb 100644 --- a/Source/CombatExtended/Compatibility/BlockerRegistry.cs +++ b/Source/CombatExtended/Compatibility/BlockerRegistry.cs @@ -155,9 +155,16 @@ public static IEnumerable> ShieldZonesCallback(Thing thing) { if (!enabledSZ) { - return null; + yield break; + } + + foreach (var callback in shieldZonesCallback) + { + foreach (var zone in callback(thing)) + { + yield return zone; + } } - return shieldZonesCallback.SelectMany(cb => cb(thing)); } public static bool PawnUnsuppressableFromCallback(Pawn pawn, IntVec3 origin) { diff --git a/Source/CombatExtended/Harmony/Harmony_Designator_Dropdown.cs b/Source/CombatExtended/Harmony/Harmony_Designator_Dropdown.cs new file mode 100644 index 0000000000..2a5722c06c --- /dev/null +++ b/Source/CombatExtended/Harmony/Harmony_Designator_Dropdown.cs @@ -0,0 +1,26 @@ +using RimWorld; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Verse; + +namespace CombatExtended +{ + [HarmonyLib.HarmonyPatch(typeof(Designator_Dropdown), nameof(Designator.Visible), HarmonyLib.MethodType.Getter)] + internal static class Harmony_Designator_Dropdown + { + static void Postfix(Designator_Dropdown __instance, bool __result) + { + if (__result && !__instance.activeDesignator.Visible) + { + var visibleElement = __instance.elements.FirstOrDefault(x => x.Visible); + if (visibleElement != null) + { + __instance.SetActiveDesignator(visibleElement, false); + } + } + } + } +} diff --git a/Source/CombatExtended/Harmony/Harmony_JobDriverWait.cs b/Source/CombatExtended/Harmony/Harmony_JobDriverWait.cs deleted file mode 100644 index baa47ef635..0000000000 --- a/Source/CombatExtended/Harmony/Harmony_JobDriverWait.cs +++ /dev/null @@ -1,103 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Reflection.Emit; -using HarmonyLib; -using Verse; -using Verse.AI; - -/* - * Targetting the Verse.AI.JobDriver_Wait.CheckForAutoAttack() - * Target Line: - * Thing thing = AttackTargetFinder.BestShootTargetFromCurrentPosition(this.pawn, null, verb.verbProps.range, verb.verbProps.minRange, targetScanFlag); - * - * Basically modify that line to read something like: - * Thing thing = AttackTargetFinder.BestShootTargetFromCurrentPosition(this.pawn, GetValidTargetPredicate(verb), verb.verbProps.range, verb.verbProps.minRange, targetScanFlag); - * - * Overall does a couple of things. First it locates the local variable with the verb used to attack with and second it locates the null argument in the above method call - * for Predicate and replaces that with an arg stack load of the verb and a call to create a predicate. That call removes the verb from the call stack and replaces it - * with a predicate (or a null). - * - * A couple of helper functions to turn a bunch of ifs into a single call since IL can use one of 6 instructions for local variable load/save. - */ - -namespace CombatExtended.HarmonyCE -{ - [HarmonyPatch(typeof(JobDriver_Wait), "CheckForAutoAttack")] - static class Harmony_JobDriverWait_CheckForAutoAttack - { - - //static MethodInfo Patched_ClosestThingTarget_Global = null; - - /// - /// Transpiler runs through the IL code of the method CheckForAutoAttack and makes some tweaks to a call so as to avoid having the pawn attack a target it can't hit. - /// - /// IEnumerable of CodeInstruction, required by Harmony, the IL code Harmony fetched/uses. - /// IEnumerable of CodeInstruction containing the changes to the method's IL code. - static IEnumerable Transpiler(IEnumerable instructions) - { - int verbLocalIndex = -1; - int indexKeyCall = 0; - - // turn instructions into a list so we can walk through it variably (instead of forward only). - List codes = instructions.ToList(); - - // walk forward to find some key information. - for (int i = 0; i < codes.Count(); i++) - { - // look for the verb instantiation/storage. - { - MethodBase method = null; - if (codes[i].opcode == OpCodes.Callvirt && (method = codes[i].operand as MethodBase) != null && method.DeclaringType == typeof(Pawn) && method.Name == $"get_{nameof(Pawn.CurrentEffectiveVerb)}" - && codes.Count() >= i + 1) - { - verbLocalIndex = HarmonyBase.OpcodeStoreIndex(codes[i + 1]); - } - } - - // see if we've found the instruction index of the key call. - if (codes[i].opcode == OpCodes.Call && (codes[i].operand as MethodInfo) != null) - { - MethodInfo method = codes[i].operand as MethodInfo; - if (method.DeclaringType == typeof(AttackTargetFinder) && method.Name == "BestShootTargetFromCurrentPosition") - { - indexKeyCall = i; - break; - } - } - } - - // walk backwards from the key call to locate the null load and replace it with our call to drop in our predicate into the arg stack. - for (int i = indexKeyCall; i >= 0; i--) - { - if (codes[i].opcode == OpCodes.Ldnull) - { - codes[i++] = HarmonyBase.MakeLocalLoadInstruction(verbLocalIndex); - codes.Insert(i, new CodeInstruction(OpCodes.Call, typeof(Harmony_JobDriverWait_CheckForAutoAttack).GetMethod("GetValidTargetPredicate", AccessTools.all))); - break; - } - } - - return codes; - } - - /// - /// Returns a predicate for valid targets if the verb is a Verb_LaunchProjectileCE or descendent. - /// - /// Verb that is to be checked for type and used for valid target checking - /// Predicate of type Thing which indicates if that thing is a valid target for the pawn. - static Predicate GetValidTargetPredicate(Verb verb) - { - Predicate predicate = null; - if ((verb as Verb_LaunchProjectileCE) != null) - { - Verb_LaunchProjectileCE verbCE = verb as Verb_LaunchProjectileCE; - predicate = t => verbCE.CanHitTargetFrom(verb.caster.Position, new LocalTargetInfo(t)); - } - - return predicate; - } - } -} diff --git a/Source/CombatExtended/Harmony/Harmony_LordToil_Siege.cs b/Source/CombatExtended/Harmony/Harmony_LordToil_Siege.cs index 7200056022..a4af8c5a61 100644 --- a/Source/CombatExtended/Harmony/Harmony_LordToil_Siege.cs +++ b/Source/CombatExtended/Harmony/Harmony_LordToil_Siege.cs @@ -1,6 +1,4 @@ using System.Collections.Generic; -using System.Linq; -using System.Reflection; using System.Reflection.Emit; using HarmonyLib; using RimWorld; @@ -8,66 +6,107 @@ namespace CombatExtended.HarmonyCE { + /// + /// Transpile LordToil_Siege.LordToilTick to support artillery pieces with different ammosets than the 81mm mortar. + /// [HarmonyPatch(typeof(LordToil_Siege), "LordToilTick")] - internal static class Harmony_LordToil_Siege + internal static class Harmony_LordToil_Siege_LordToilTick { - internal static IEnumerable Transpiler(IEnumerable instructions) + internal static IEnumerable Transpiler(IEnumerable instructions, + ILGenerator generator) { - var codes = new List(instructions); - var methodCustomCondition = typeof(Harmony_LordToil_Siege).GetMethod(nameof(CustomCondition), BindingFlags.Static | BindingFlags.Public); - var startIndex = -1; - var endIndex = -1; - MethodInfo targetMethod = AccessTools.Method(typeof(ThingDef), "get_IsShell"); // Start of the if condition - FieldInfo targetField = AccessTools.Field(typeof(DamageDef), "harmsHealth"); // End of the if condition - for (int i = 0; i < codes.Count; i++) - { - if (startIndex == -1) - { - // Find the start of the if statement - if (codes[i].opcode == OpCodes.Callvirt && codes[i].Calls(targetMethod)) - { - startIndex = i - 1; // We want to edit -1 instruction from the call of IsShell - } - } - else if (codes[i].opcode == OpCodes.Ldfld && codes[i].LoadsField(targetField)) - { - endIndex = i; - } - } - if (startIndex == -1 || endIndex == -1) - { - Log.Error("CombatExtended :: Harmony_LordToil_Siege couldn't find code block for patching"); - return codes; // Don't modify as we couldn't find the original code block - } - else - { - codes[startIndex] = new CodeInstruction(OpCodes.Call, methodCustomCondition); // Call the new method for evaluation - codes.RemoveRange(startIndex + 1, endIndex - startIndex); // Remove the default code - return codes; - } + var methodCustomCondition = AccessTools.Method(typeof(SiegeUtility), nameof(SiegeUtility.IsValidShellType)); + var dropAdditionalShells = AccessTools.Method(typeof(SiegeUtility), nameof(SiegeUtility.DropAdditionalShells)); + + var isShellMethod = AccessTools.PropertyGetter(typeof(ThingDef), nameof(ThingDef.IsShell)); + var harmsHealthField = AccessTools.Field(typeof(DamageDef), nameof(DamageDef.harmsHealth)); + var tryFindRandomShellDefMethod = + AccessTools.Method(typeof(TurretGunUtility), nameof(TurretGunUtility.TryFindRandomShellDef)); + + var codeMatcher = new CodeMatcher(instructions, generator); + + var isShellPos = codeMatcher + .Start() + .MatchStartForward(CodeMatch.Calls(isShellMethod)) + .ThrowIfInvalid("CombatExtended :: Harmony_LordToil_Siege_LordToilTick couldn't find call to IsShell") + .Pos; + + var harmsHealthPos = codeMatcher.MatchStartForward(CodeMatch.LoadsField(harmsHealthField)) + .ThrowIfInvalid("CombatExtended :: Harmony_LordToil_Siege_LordToilTick couldn't find harmsHealth") + .Pos; + + // Consider all shell types usable by the siege when assessing how many are available to the siege + codeMatcher + .Advance(isShellPos - harmsHealthPos - 1) + .Insert( + CodeInstruction.LoadArgument(0), + new CodeInstruction(OpCodes.Call, methodCustomCondition) + ) + .RemoveInstructionsInRange(isShellPos + 1, harmsHealthPos + 2); + + var ifBlockStart = codeMatcher.Start() + .MatchStartForward(CodeMatch.Calls(tryFindRandomShellDefMethod)) + .ThrowIfInvalid("CombatExtended :: Harmony_LordToil_Siege_LordToilTick couldn't find call to TryFindRandomShellDef") + .MatchEndBackwards(CodeMatch.Branches()) + .ThrowIfInvalid("CombatExtended :: Harmony_LordToil_Siege_LordToilTick couldn't find start of enclosing if block") + .Pos; + + var ifBlockEndLabel = (Label)codeMatcher.Operand; + + // Drop shells for every type of artillery piece used by the siege + codeMatcher.MatchStartForward(new CodeMatch(instruction => instruction.labels.Contains(ifBlockEndLabel))) + .ThrowIfInvalid("CombatExtended :: Harmony_LordToil_Siege_LordToilTick couldn't find end of enclosing if block") + .Insert( + CodeInstruction.LoadArgument(0), + new CodeInstruction(OpCodes.Call, dropAdditionalShells) + ) + .RemoveInstructionsInRange(ifBlockStart + 1, codeMatcher.Pos - 1); + + return codeMatcher.Instructions(); } - public static bool CustomCondition(Thing thing) + } + + /// + /// Transpile LordToil_Siege.Init to remove the market price cap on the initially dropped shell stacks. + /// + [HarmonyPatch(typeof(LordToil_Siege), nameof(LordToil_Siege.Init))] + internal static class Harmony_LordToil_Siege_Init + { + internal static IEnumerable Transpiler(IEnumerable instructions, + ILGenerator generator) + { + var codeMatcher = new CodeMatcher(instructions, generator); + + codeMatcher.MatchStartForward(CodeMatch.LoadsConstant(250f)) + .ThrowIfInvalid("CombatExtended :: Harmony_LordToil_Siege_Init couldn't find market price cap") + .RemoveInstruction() + .Insert(new CodeInstruction(OpCodes.Ldc_R4, -1f)); + + return codeMatcher.Instructions(); + } + } + + /// + /// Transpile LordToil_Siege.SetAsBuilder to ensure that builders are capable enough to build any siege artillery. + /// + [HarmonyPatch(typeof(LordToil_Siege), nameof(LordToil_Siege.SetAsBuilder))] + internal static class Harmony_LordToil_Siege_SetAsBuilder + { + internal static IEnumerable Transpiler(IEnumerable instructions, + ILGenerator generator) { - // Ensure check is the same here as from CombatExtended.HarmonyCE.Harmony_TurretGunUtility - var ammoDef = thing.def as AmmoDef; - if (ammoDef == null) - { - return false; - } - - // Ignore all non-shell defs. - if (ammoDef == null || !AmmoUtility.IsShell(ammoDef)) - { - return false; - } - - // Check if shell is blacklisted - if (!ammoDef.spawnAsSiegeAmmo) - { - return false; - } - return true; + var codeMatcher = new CodeMatcher(instructions, generator); + + codeMatcher.MatchStartForward( + CodeMatch.LoadsField(AccessTools.Field(typeof(ThingDefOf), nameof(ThingDefOf.Turret_Mortar))), + CodeMatch.LoadsField(AccessTools.Field(typeof(BuildableDef), nameof(BuildableDef.constructionSkillPrerequisite))) + ) + .ThrowIfInvalid("CombatExtended :: Harmony_LordToil_Siege_SetAsBuilder couldn't find required construction skill") + .RemoveInstructions(2) + .Insert(CodeInstruction.LoadField(typeof(SiegeUtility), nameof(SiegeUtility.MinRequiredConstructionSkill))); + + return codeMatcher.Instructions(); } } } diff --git a/Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs b/Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs index e399e195cc..d952256b27 100644 --- a/Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs +++ b/Source/CombatExtended/Harmony/Harmony_PawnRenderer.cs @@ -49,19 +49,10 @@ private static void RecoilCE(Thing eq, Vector3 position, float aimAngle, float n private static void DrawMesh(Mesh mesh, Matrix4x4 matrix, Material mat, int layer, Thing eq, Vector3 position, float aimAngle) { - CompEquippable compEquippable = eq.TryGetComp(); GunDrawExtension drawData = eq.def.GetModExtension() ?? new GunDrawExtension() { DrawSize = eq.def.graphicData.drawSize }; if (drawData.DrawSize == Vector2.one) { drawData.DrawSize = eq.def.graphicData.drawSize; } Vector3 scale = new Vector3(drawData.DrawSize.x, 1, drawData.DrawSize.y); Vector3 posVec = new Vector3(drawData.DrawOffset.x, 0, drawData.DrawOffset.y); - if (compEquippable != null && compEquippable.PrimaryVerb is Verb_LaunchProjectileCE verbLPCE) - { - VerbPropertiesCE vpce = verbLPCE.VerbPropsCE; - if (verbLPCE.ShooterPawn != null && verbLPCE.WarmingUp || muzzleJump != 0) - { - posVec.z += verbLPCE.ShotHeight * vpce.firingOffset * Mathf.Abs(Mathf.Sin(aimAngle * 2 * 3.14f / 360f)); - } - } Vector3 casingOffset = new Vector3(drawData.CasingOffset.x, 0, drawData.CasingOffset.y); if (aimAngle > 200 && aimAngle < 340) { @@ -69,10 +60,13 @@ private static void DrawMesh(Mesh mesh, Matrix4x4 matrix, Material mat, int laye muzzleJump = -muzzleJump; casingOffset.x *= -1; } - matrix.SetTRS(position + posVec.RotatedBy(matrix.rotation.eulerAngles.y) + recoilOffset, Quaternion.AngleAxis(matrix.rotation.eulerAngles.y + muzzleJump, Vector3.up), scale); + + float yAngle = matrix.rotation.eulerAngles.y; + matrix.SetTRS(position + posVec.RotatedBy(yAngle) + recoilOffset, Quaternion.AngleAxis(yAngle + muzzleJump, Vector3.up), scale); + CompEquippable compEquippable = eq.TryGetComp(); if (compEquippable != null && compEquippable.PrimaryVerb is Verb_ShootCE verbCE) { - verbCE.drawPos = casingDrawPos + (casingOffset + posVec).RotatedBy(matrix.rotation.eulerAngles.y); + verbCE.drawPos = casingDrawPos + (casingOffset + posVec).RotatedBy(yAngle); } if (eq is WeaponPlatform platform) { diff --git a/Source/CombatExtended/Harmony/Harmony_StartingPawnUtility.cs b/Source/CombatExtended/Harmony/Harmony_StartingPawnUtility.cs new file mode 100644 index 0000000000..fbc8af15d1 --- /dev/null +++ b/Source/CombatExtended/Harmony/Harmony_StartingPawnUtility.cs @@ -0,0 +1,41 @@ +using HarmonyLib; +using Verse; +using System.Linq; +using System.Collections.Generic; +using UnityEngine; + +namespace CombatExtended.HarmonyCE +{ + [HarmonyPatch(typeof(StartingPawnUtility), nameof(StartingPawnUtility.GeneratePossessions))] + internal static class StartingPawnUtility_GenerateAmmo + { + static IntRange magRange = new IntRange(3, 5); + + internal static void Postfix(Pawn pawn) + { + var startingPossessions = Find.GameInitData.startingPossessions; + if (startingPossessions.ContainsKey(pawn)) + { + List ammoList = new List(); + foreach (var possession in startingPossessions[pawn]) + { + if (possession.thingDef.GetCompProperties() is CompProperties_AmmoUser ammoUser && ammoUser.ammoSet != null) + { + int count = ammoUser.AmmoGenPerMagOverride; + if (count <= 0) + { + count = Mathf.Max(ammoUser.magazineSize, 1); + } + count *= magRange.RandomInRange; + + ammoList.Add(new ThingDefCount(ammoUser.ammoSet.ammoTypes.First().ammo, count)); + } + } + foreach (var ammo in ammoList) + { + startingPossessions[pawn].Add(ammo); + } + } + } + } +} diff --git a/Source/CombatExtended/Harmony/Harmony_ThingListGroupHelper.cs b/Source/CombatExtended/Harmony/Harmony_ThingListGroupHelper.cs deleted file mode 100644 index 0692338d76..0000000000 --- a/Source/CombatExtended/Harmony/Harmony_ThingListGroupHelper.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Collections.Generic; -using System.Reflection; -using HarmonyLib; -using Verse; - -namespace CombatExtended.HarmonyCE -{ - [HarmonyPatch(typeof(ThingListGroupHelper), "Includes")] - internal static class Harmony_ThingListGroupHelper - { - internal static IEnumerable Transpiler(IEnumerable instructions) - { - return instructions.MethodReplacer(typeof(ThingDef).GetMethod("get_IsShell"), - typeof(AmmoUtility).GetMethod(nameof(AmmoUtility.IsShell), BindingFlags.Public | BindingFlags.Static)); - } - } -} diff --git a/Source/CombatExtended/Harmony/Harmony_TurretGunUtility.cs b/Source/CombatExtended/Harmony/Harmony_TurretGunUtility.cs index 627366c629..5147f1539e 100644 --- a/Source/CombatExtended/Harmony/Harmony_TurretGunUtility.cs +++ b/Source/CombatExtended/Harmony/Harmony_TurretGunUtility.cs @@ -1,94 +1,66 @@ using System.Linq; using System.Collections.Generic; -using System.Collections; -using System.Reflection; using HarmonyLib; using RimWorld; using Verse; -// ReSharper disable InconsistentNaming -// ReSharper disable InlineOutVariableDeclaration -// ReSharper disable UsePatternMatching - namespace CombatExtended.HarmonyCE { - [HarmonyPatch] + /// + /// Replace to support turrets other than the 81mm mortar. + /// + [HarmonyPatch(typeof(TurretGunUtility), nameof(TurretGunUtility.TryFindRandomShellDef))] public static class Harmony_TurretGunUtility { - const string className = "DisplayClass"; - const string methodName = ""; - - // This should be kept up to date with the check in CombatExtended.HarmonyCE.Harmony_LordToil_Siege - public static void Postfix(object __instance, ThingDef x, ref bool __result, bool ___allowEMP, float ___maxMarketValue) + public static bool Prefix( + ThingDef turret, + bool allowEMP, + bool allowToxGas, + TechLevel techLevel, + bool allowAntigrainWarhead, + ref ThingDef __result + ) { - // Ignore already true results. - if (__result) - { - return; - } - - var ammoDef = x as AmmoDef; - - // Ignore all non-shell defs. - if (ammoDef == null || !AmmoUtility.IsShell(ammoDef)) + if (!TurretGunUtility.NeedsShells(turret)) { - return; + __result = null; + return false; } - // Check if market value is within range. - if (___maxMarketValue >= 0.0f && ammoDef.BaseMarketValue > ___maxMarketValue) + // Fall back to the vanilla logic if we have no ammo configured for this turret (unpatched?) + var ammoUserProps = turret.building.turretGunDef.comps.OfType() + .FirstOrDefault(); + if (ammoUserProps == null) { - return; + return true; } - // Get the explosive damage def. - var explosiveDamageDef = ammoDef.GetCompProperties()?.explosiveDamageType ?? - ammoDef.GetCompProperties()?.explosiveDamageType; + IEnumerable potentialAmmoDefs = from ammoLink in ammoUserProps.ammoSet.ammoTypes + let ammoDef = ammoLink.ammo + where ammoDef.spawnAsSiegeAmmo + let projectileDef = ammoLink.projectile + let explosiveDamageDef = + projectileDef.GetCompProperties()?.explosiveDamageType ?? + projectileDef.GetCompProperties()?.explosiveDamageType + let projectileDamageDef = projectileDef.projectile.damageDef + where explosiveDamageDef != null || projectileDamageDef != null - // Get the projectile damage def via the mortar ammo set. - //var mortarAmmoSet = DefDatabase.GetNamed("AmmoSet_81mmMortarShell"); - var projectileDamageDef = ammoDef.projectile?.damageDef ?? CE_AmmoSetDefOf.AmmoSet_81mmMortarShell.ammoTypes.FirstOrDefault(t => t.ammo == ammoDef)?.projectile?.projectile?.damageDef; + // Only allow EMP or tox gas shells if explicitly allowed and relevant DLC is available + where allowEMP || (explosiveDamageDef != DamageDefOf.EMP && projectileDamageDef != DamageDefOf.EMP) + where allowToxGas || !ModsConfig.BiotechActive || (explosiveDamageDef != DamageDefOf.ToxGas && + projectileDamageDef != DamageDefOf.ToxGas) - // Ignore shells that don't have damage defs. - if (explosiveDamageDef == null && projectileDamageDef == null) - { - return; - } + // No antigrain warheads + where allowAntigrainWarhead || ammoDef != ThingDefOf.Shell_AntigrainWarhead - // Ignore EMP if not allowed. - if (!___allowEMP && (explosiveDamageDef == DamageDefOf.EMP || projectileDamageDef == DamageDefOf.EMP)) - { - return; - } + // No higher tech shells than the tech level of the requesting faction + where techLevel == TechLevel.Undefined || ammoDef.techLevel <= techLevel + select ammoDef; - // Check if blacklisted - if (!ammoDef.spawnAsSiegeAmmo) - { - return; - } - - __result = true; - } - - public static MethodBase TargetMethod() - { - var classTargets = typeof(TurretGunUtility).GetNestedTypes(AccessTools.all) - .Where(x => x.Name.Contains(className)); - - if (!classTargets.Any()) - { - Log.Error("CombatExtended :: Harmony_TurretGunUtility couldn't find subclass with part `" + className + "`"); - } - - var methodTarget = classTargets.SelectMany(x => x.GetMethods(AccessTools.all)) - .FirstOrDefault(x => x.Name.Contains(methodName)); - - if (methodTarget == null) - { - Log.Error("CombatExtended :: Harmony_TurretGunUtility couldn't find method with part `" + methodName + "` in subclasses with part `" + className + "`"); - } + // Respect individual weighting of matching shells within the ammoset + potentialAmmoDefs.TryRandomElementByWeight(def => def.generateAllowChance, out __result); - return methodTarget; + return false; } } } diff --git a/Source/Loader/Loader/Loader.cs b/Source/Loader/Loader/Loader.cs index f9fada4428..a20c6dfb81 100644 --- a/Source/Loader/Loader/Loader.cs +++ b/Source/Loader/Loader/Loader.cs @@ -34,11 +34,6 @@ public UncompiledWarning(ModContentPack content) : base(content) LongEventHandler.QueueLongEvent(ShowUncompiledBuildWarning, "CE_LongEvent_ShowUncompiledBuildWarning", false, null); } - public override string SettingsCategory() - { - return "Combat Extended"; - } - private static void ShowUncompiledBuildWarning() { Log.Error("You are running CE Uncompiled. See https://github.com/CombatExtended-Continued/CombatExtended#development-version for details"); diff --git a/Source/PsyblastersCompat/PsyBlastersCompat/PsychicBlasterBulletCE.cs b/Source/PsyblastersCompat/PsyBlastersCompat/PsychicBlasterBulletCE.cs new file mode 100644 index 0000000000..4ab02c4d27 --- /dev/null +++ b/Source/PsyblastersCompat/PsyBlastersCompat/PsychicBlasterBulletCE.cs @@ -0,0 +1,67 @@ +using PsyBlasters; +using Verse; +using RimWorld; + +namespace CombatExtended.Compatibility.PsyBlastersCompat +{ + public class PsychicBlasterBulletCE : BulletCE //Basically just duplicating the original behavior to the CE class + { + private PsyBlasterBulletComp _psyBlasterBulletComp => GetComp(); + + private bool CanConsumeResources(Pawn launcherPawn) + { + return _psyBlasterBulletComp != null && + launcherPawn is { HasPsylink: true, psychicEntropy.CurrentPsyfocus: > 0 }; + } + + public override float DamageAmount + { + get + { + var damMulti = equipment?.GetStatValue(StatDefOf.RangedWeapon_DamageMultiplier) ?? 1f; + if (CanConsumeResources(launcher as Pawn)) + { + damMulti += _psyBlasterBulletComp.PsyDamageMulti; + } + + return def.projectile.GetDamageAmount(damMulti); + } + } + + public override float PenetrationAmount + { + get + { + var projectilePropsCE = (ProjectilePropertiesCE)def.projectile; + var isSharp = def.projectile.damageDef.armorCategory == DamageArmorCategoryDefOf.Sharp; + var penMulti = equipment?.GetStatValue(StatDefOf.RangedWeapon_DamageMultiplier) ?? 1f; + if (CanConsumeResources(launcher as Pawn)) + { + penMulti += _psyBlasterBulletComp.PsyPenMulti; + } + + return penMulti * + (isSharp ? projectilePropsCE.armorPenetrationSharp : projectilePropsCE.armorPenetrationBlunt); + } + } + + public override void Impact(Thing hitThing) + { + base.Impact(hitThing); + + if (hitThing is not Pawn && Rand.Chance(0.66f) //don't look at me, it was like that in the original code + || launcher is not Pawn launcherPawn + || !CanConsumeResources(launcherPawn) + || launcherPawn.psychicEntropy.limitEntropyAmount && + launcherPawn.psychicEntropy.WouldOverflowEntropy(_psyBlasterBulletComp.EntropyCost)) + { + return; + } + + launcherPawn.psychicEntropy.OffsetPsyfocusDirectly(-_psyBlasterBulletComp.PsyCost); + launcherPawn.psychicEntropy.TryAddEntropy(_psyBlasterBulletComp.EntropyCost); + } + } +} + + diff --git a/Source/PsyblastersCompat/PsyBlastersCompat/PsychicBlasterRocketCE.cs b/Source/PsyblastersCompat/PsyBlastersCompat/PsychicBlasterRocketCE.cs new file mode 100644 index 0000000000..f6b7794942 --- /dev/null +++ b/Source/PsyblastersCompat/PsyBlastersCompat/PsychicBlasterRocketCE.cs @@ -0,0 +1,48 @@ +using HarmonyLib; +using PsyBlasters; +using RimWorld; +using Verse; + +namespace CombatExtended.Compatibility.PsyBlastersCompat +{ + public class PsychicBlasterRocketCE : ProjectileCE_Explosive + { + PsyBlasterBulletComp _psyBlasterBulletComp => GetComp(); + + private bool CanConsumeResources(Pawn launcherPawn) + { + return _psyBlasterBulletComp != null && launcherPawn is { HasPsylink: true }; + } + + public override float DamageAmount + { + get + { + if (CanConsumeResources(launcher as Pawn)) + { + return def.projectile.GetDamageAmount( + equipment?.GetStatValue(StatDefOf.RangedWeapon_DamageMultiplier) ?? 1f) + + ((((Pawn)launcher).psychicEntropy.MaxPotentialEntropy - + ((Pawn)launcher).psychicEntropy.EntropyValue) * _psyBlasterBulletComp.PsyDamageMulti); + } + return 0; + } + } + + public override void Impact(Thing hitThing) //that's also copied from the original + { + base.Impact(hitThing); + + if (!CanConsumeResources(launcher as Pawn)) + { + return; + } + + var launcherPawn = (Pawn)launcher; + Traverse.Create(launcherPawn).Field("psychicEntropy").Field("currentEntropy") + .SetValue(launcherPawn.psychicEntropy.MaxPotentialEntropy * 5.5f); + } + } + +} + diff --git a/Source/PsyblastersCompat/PsyblastersCompat.csproj b/Source/PsyblastersCompat/PsyblastersCompat.csproj new file mode 100644 index 0000000000..b0e96f6800 --- /dev/null +++ b/Source/PsyblastersCompat/PsyblastersCompat.csproj @@ -0,0 +1,57 @@ + + + + net48 + PsyBlastersCompat + 1.0.0.0 + 1.0.0.0 + 1.0.0 + + + CC BY-NC-SA 4.0 2024 + false + + + ..\..\ModPatches\PsyBlasters\Assemblies + portable + true + true + latest + true + + + ..\..\ModPatches\PsyBlasters\Assemblies + true + none + false + latest + true + + + + + + + False + + + + + ..\packages\PsyBlasters-reference.dll + False + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + diff --git a/Source/VehiclesCompat/VehiclesCompat/VehiclesCompat.cs b/Source/VehiclesCompat/VehiclesCompat/VehiclesCompat.cs index 8685e1a663..1d1fab7ef1 100644 --- a/Source/VehiclesCompat/VehiclesCompat/VehiclesCompat.cs +++ b/Source/VehiclesCompat/VehiclesCompat/VehiclesCompat.cs @@ -27,7 +27,7 @@ public void PostLoad(ModContentPack content, ISettingsCE vehicleSettings) { VehicleTurret.ProjectileAngleCE = ProjectileAngleCE; VehicleTurret.LookupAmmosetCE = LookupAmmosetCE; - VehicleTurret.LaunchProjectileCE = LaunchProjectileCE; + VehicleTurret.LaunchProjectileCE = CE_Utility.LaunchProjectileCE; VehicleTurret.LookupProjectileCountAndSpreadCE = LookupProjectileCountAndSpreadCE; VehicleTurret.NotifyShotFiredCE = NotifyShotFiredCE; global::CombatExtended.Compatibility.Patches.RegisterCollisionBodyFactorCallback(_GetCollisionBodyFactors); @@ -146,83 +146,7 @@ public static Vector2 ProjectileAngleCE(float speed, float range, Thing shooter, return new Vector2(dTurretRotation, shotAngle); } - public static object LaunchProjectileCE(ThingDef projectileDef, - ThingDef _ammoDef, - Def _ammosetDef, - Vector2 origin, - LocalTargetInfo target, - VehiclePawn vehicle, - float shotAngle, - float shotRotation, - float shotHeight, - float shotSpeed) - { - if (_ammoDef is AmmoDef ammoDef && _ammosetDef is AmmoSetDef ammosetDef) - { - foreach (var al in ammosetDef.ammoTypes) - { - if (al.ammo == ammoDef) - { - projectileDef = al.projectile; - break; - } - } - } - else - { - projectileDef = projectileDef.GetProjectile(); - } - var p = ThingMaker.MakeThing(projectileDef, null); - ProjectileCE projectile = (ProjectileCE)p; - GenSpawn.Spawn(projectile, vehicle.Position, vehicle.Map); - projectile.ExactPosition = origin; - projectile.canTargetSelf = false; - projectile.minCollisionDistance = 1; - projectile.intendedTarget = target; - projectile.mount = null; - projectile.AccuracyFactor = 1; - ProjectilePropertiesCE pprop = projectileDef.projectile as ProjectilePropertiesCE; - bool instant = false; - float spreadDegrees = 0; - float aperatureSize = 0.03f; - // Hard coded as a super high max range - TODO: change in 1.6 to pass the range from the turret to this function. - // Should also update ProjectileCE.RayCast to not need a VerbPropertiesCE input just a float for range (Since thats all its used for). - VerbPropertiesCE verbPropsRange = new VerbPropertiesCE - { - range = 1000 - }; - if (pprop != null) - { - instant = pprop.isInstant; - } - if (instant) - { - projectile.RayCast( - vehicle, - verbPropsRange, - origin, - shotAngle, - shotRotation, - shotHeight, - shotSpeed, - spreadDegrees, - aperatureSize, - vehicle); - } - else - { - projectile.Launch( - vehicle, - origin, - shotAngle, - shotRotation, - shotHeight, - shotSpeed, - vehicle); - } - return projectile; - } private static Tuple _GetCollisionBodyFactors(Pawn pawn) { Vector2 ret = new Vector2(); diff --git a/Source/packages/PsyBlasters-reference.dll b/Source/packages/PsyBlasters-reference.dll new file mode 100644 index 0000000000..877856d59d Binary files /dev/null and b/Source/packages/PsyBlasters-reference.dll differ diff --git a/SupportedThirdPartyMods.md b/SupportedThirdPartyMods.md index bcc4204ee2..bfbcb26473 100644 --- a/SupportedThirdPartyMods.md +++ b/SupportedThirdPartyMods.md @@ -7,6 +7,7 @@ If the mod(s) you are interested in isn't on this list, first confirm that the m Mod | --- | [Cosplay Equipment] Blue Archive | +[AV] Work Queen | [CP] DOOM | [CP] Red Horse Furniture | [CP] Rimmu-Nation - Clothing | @@ -123,6 +124,7 @@ Autocleaner | Auto-Mortars | Beast Man Tribes | Beeralope Squad | +Beliar Xenotype | Better Wool Production - C# Edition | Big and Small - Genes & More | Big and Small - Heaven and Hell @@ -175,6 +177,7 @@ Det's Xenotypes - Boglegs | Devilstrand Animals | Devilstrand Colour Bundle | Dinosauria | +Diverse Mechanoid War Procedure | Divine Order | DOOM - Faction (Continued) | DMWands | @@ -191,6 +194,7 @@ Edge of Descension - Vanguard | Edo Themed Expansion | Eltex Bodysuit | Enchanted Sword | +Epochs - Pyrinth | Epona The centaur race | Equiums Horse Race | Erin's Au Ra | @@ -251,6 +255,8 @@ Glitter Tech | Glitter Weaponry | Gloomy Dragonian Race | GouRIMet | +GREG | +Grimstone Beasts | Grimworld: Autoguns | Grimworld: Lasguns | Grimworld: Melee | @@ -258,6 +264,7 @@ GrimWorld 40,000 - Angels of Death | GrimWorld 40,000 - Core Imperialis | GrimWorld 40,000 - Hammer of the Imperium | GrimWorld 40,000 - Imperial Vehicles of Grimworld | +GrimWorld 40,000 - Talons of the Emperor | Gulden Mod | Half Dragons | HALO: UNSC Armoury | @@ -267,6 +274,7 @@ Heyra the Horned | High Caliber | High Tech Laboratory Facilities | Hive Armory | +Hyena (Continued) | Idhale Race | Impact Weaponry | Imperial Arsenal: Royal Warcasket | @@ -275,6 +283,7 @@ Industrial Melee Weaponry | Infinity Rim: Ariadna (Continued) | Infused 2 Expansion | Infusion 2 | +Ion Weaponry | Iron Harvest Pkp 17 "Eisenhans" Powerarmor | Japanese Dogs | Jernalk's Skeletal Legion (Continued) | @@ -284,7 +293,7 @@ Kemomimihouse | Kemomimihouse Kz | Kenshi Armory | K.L.K - Styles Apparel Pack | -Kijin Race 2.0 | +Kijin Race 3.0 | Kill la Kill Styles Pack | Killzone Concept Armor Set | Kit's Gunpowder Weapons | @@ -364,6 +373,7 @@ New Mech: Mini-Miner | Ni'Hal | Nukes | Nyaron Race | +Nomad Scavengers | Not Only Just a Cannon | Obsidia Expansion - Mothoids Xenotype | ODZ Suits | @@ -382,6 +392,7 @@ Outer Rim - Tatooine | Palm Cats | Paniel the Automata | Pawnbold Race | +Persona Warcasket Weapons | Polarisbloc - Security Force | Poleepkwa Race | Possessed Weapons | @@ -394,6 +405,7 @@ Project RimFactory - Materials | Prostheses+ | Protoswords | PsiTech | +PsyBlasters | Pulsefire Turret (Continued) | Pulse Weaponry | Rabbie The Moonrabbit race | @@ -439,6 +451,7 @@ RimFantasy - Medieval Overhaul Edition | RimFantasy - House Doyle | RimHammer40k - Dreadnought | RimNauts 2 | +Rimrats | RimSec Security | Rimsenal - Core | Rimsenal - Enhanced Vanilla | @@ -453,6 +466,7 @@ Rimworld - Witcher Monster Hunt | Rimworld-Style Pilas and Bows Strapped with Grenades and Shells Extended | Rimworld of Magic | Risk of Rain: UES Contact Light Armory (Continued) | +Robotic Servitude | Rockmen race | Roren, People of Rorensia | Royal Arsenal | @@ -470,6 +484,7 @@ Simple Ogre Race | Simply More Melee | Slime Rancher | Solark Race | +Spacer Pack | Spacer Shields | Space Worms (Continued) | Spartan Foundry | @@ -487,6 +502,7 @@ Tactical Extremity Protection [BAL] | Textiles+ (continued) | The Corporation - Mort's Factions | The Mantodean insectoid race | +The Profaned | The Vanity Project - Shiba Inu | The Wild Fields - apparel and weapons | T-45b Power Armor | @@ -507,6 +523,7 @@ T's Conversion Staff | T's Samurai Faction | Useless Clothes | Ushankas Glitterworld Uprising | +Valorant Weapon Pack | Vanilla Animals Expanded | Vanilla Animals Expanded - Endangered | Vanilla Animals Expanded - Royal Animals | @@ -539,6 +556,7 @@ Vanilla Persona Weapons Expanded | Vanilla Plants Expanded - Mushrooms | Vanilla Psycasts Expanded | Vanilla Psycasts Expanded - Hemosage | +Vanilla Psycasts Expanded - Runesmith | Vanilla Races Expanded - Android | Vanilla Races Expanded - Archon | Vanilla Races Expanded - Fungoid | @@ -554,6 +572,7 @@ Vanilla Vehicles Expanded | Vanilla Vehicles Expanded - Tier 3 | Vanilla Vehicles Expanded - Upgrades | Vanilla Weapons Expanded | +Vanilla Weapons Expanded - Bioferrite | Vanilla Weapons Expanded - Coilguns | Vanilla Weapons Expanded - Frontier | Vanilla Weapons Expanded - Grenades | @@ -576,10 +595,10 @@ Vulpine Race Pack | Wall Mounted Turrets (Continued) | WarCasket Expanded | WarCasket Barbatos Gundam Addon | -Warcasket Persona Weapons | Warcaskets: Adeptus Astartes | Warhammer 40.000 - Imperium Weaponry | Warhammer 40.000 - Imperium Materials | +Warhammer 40k - Factions | Warhammer 40k - Genes and Psycasts | Warhammer"ish" - Dryad | Wasters Toxic Breather | @@ -587,6 +606,7 @@ Weapons+ | WWII German Uniforms - V's Edit | WWII Soviet Faction | Windows | +Xen's Spirit Wolf | Xenn Race | Xenohumans - Anthromorphs | Xenohumans Expanded | diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_a.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_a.png new file mode 100644 index 0000000000..ead2c749bc Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_a.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_b.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_b.png new file mode 100644 index 0000000000..fee8cc975c Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_b.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_c.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_c.png new file mode 100644 index 0000000000..4e8d88908f Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/AP/AP_c.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_a.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_a.png new file mode 100644 index 0000000000..baa683bf43 Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_a.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_b.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_b.png new file mode 100644 index 0000000000..24d847f920 Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_b.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_c.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_c.png new file mode 100644 index 0000000000..4814c62ffe Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/FMJ/FMJ_c.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_a.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_a.png new file mode 100644 index 0000000000..d1371702bd Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_a.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_b.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_b.png new file mode 100644 index 0000000000..71acf6b804 Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_b.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_c.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_c.png new file mode 100644 index 0000000000..70e4b0df2e Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/HE/HE_c.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_a.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_a.png new file mode 100644 index 0000000000..883b13d010 Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_a.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_b.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_b.png new file mode 100644 index 0000000000..8727e1e7d6 Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_b.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_c.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_c.png new file mode 100644 index 0000000000..cb84da8a11 Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/HP/HP_c.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_a.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_a.png new file mode 100644 index 0000000000..c8607fcb8d Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_a.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_b.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_b.png new file mode 100644 index 0000000000..a96dacd8ee Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_b.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_c.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_c.png new file mode 100644 index 0000000000..ae120f5a86 Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/Incendiary/Incendiary_c.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_a.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_a.png new file mode 100644 index 0000000000..6ba9ba57e4 Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_a.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_b.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_b.png new file mode 100644 index 0000000000..a1bf7d0fba Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_b.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_c.png b/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_c.png new file mode 100644 index 0000000000..96a5a67859 Binary files /dev/null and b/Textures/Things/Ammo/Rifle/SovietBattlerifle/Sabot/Sabot_c.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_a.png b/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_a.png index 3052ff1564..ead2c749bc 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_a.png and b/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_a.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_b.png b/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_b.png index 0920c1c9b6..f09cfa7f8c 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_b.png and b/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_b.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_c.png b/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_c.png index 4367f595a7..f7b8034fdf 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_c.png and b/Textures/Things/Ammo/Rifle/SovietLarge/AP/AP_c.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_a.png b/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_a.png index 9b0e7ea3e4..baa683bf43 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_a.png and b/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_a.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_b.png b/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_b.png index 47c3daa822..6a935df147 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_b.png and b/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_b.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_c.png b/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_c.png index ba5b30e60c..c8a59a59a8 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_c.png and b/Textures/Things/Ammo/Rifle/SovietLarge/FMJ/FMJ_c.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_a.png b/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_a.png index f5ce4bbccb..d1371702bd 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_a.png and b/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_a.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_b.png b/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_b.png index aa779ed041..14a8f119d7 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_b.png and b/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_b.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_c.png b/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_c.png index 735faddad5..454975616a 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_c.png and b/Textures/Things/Ammo/Rifle/SovietLarge/HE/HE_c.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_a.png b/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_a.png index d0aa1af2ed..883b13d010 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_a.png and b/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_a.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_b.png b/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_b.png index be2ca9e84e..ba688c0f71 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_b.png and b/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_b.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_c.png b/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_c.png index 4d447bd986..1481e49792 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_c.png and b/Textures/Things/Ammo/Rifle/SovietLarge/HP/HP_c.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_a.png b/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_a.png index b9a190d19b..c8607fcb8d 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_a.png and b/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_a.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_b.png b/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_b.png index 462d355171..28f597df67 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_b.png and b/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_b.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_c.png b/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_c.png index 34736904b4..d8d8db5b59 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_c.png and b/Textures/Things/Ammo/Rifle/SovietLarge/Incendiary/Incendiary_c.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_a.png b/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_a.png index 2484643535..6ba9ba57e4 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_a.png and b/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_a.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_b.png b/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_b.png index 868f1d99f5..287ccdc89b 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_b.png and b/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_b.png differ diff --git a/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_c.png b/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_c.png index a38ce254bf..45cfe9dc30 100644 Binary files a/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_c.png and b/Textures/Things/Ammo/Rifle/SovietLarge/Sabot/Sabot_c.png differ diff --git a/Textures/Things/Ammo/Rocket/MiniRocket/Frag/a.png b/Textures/Things/Ammo/Rocket/MiniRocket/Frag/a.png new file mode 100644 index 0000000000..325e8c9771 Binary files /dev/null and b/Textures/Things/Ammo/Rocket/MiniRocket/Frag/a.png differ diff --git a/Textures/Things/Ammo/Rocket/MiniRocket/Frag/b.png b/Textures/Things/Ammo/Rocket/MiniRocket/Frag/b.png new file mode 100644 index 0000000000..032ba77ebb Binary files /dev/null and b/Textures/Things/Ammo/Rocket/MiniRocket/Frag/b.png differ diff --git a/Textures/Things/Ammo/Rocket/MiniRocket/Frag/c.png b/Textures/Things/Ammo/Rocket/MiniRocket/Frag/c.png new file mode 100644 index 0000000000..366ad1913f Binary files /dev/null and b/Textures/Things/Ammo/Rocket/MiniRocket/Frag/c.png differ diff --git a/Textures/Things/Ammo/Rocket/MiniRocket/HEAT/a.png b/Textures/Things/Ammo/Rocket/MiniRocket/HEAT/a.png new file mode 100644 index 0000000000..156e65a40b Binary files /dev/null and b/Textures/Things/Ammo/Rocket/MiniRocket/HEAT/a.png differ diff --git a/Textures/Things/Ammo/Rocket/MiniRocket/HEAT/b.png b/Textures/Things/Ammo/Rocket/MiniRocket/HEAT/b.png new file mode 100644 index 0000000000..d0ff42e2de Binary files /dev/null and b/Textures/Things/Ammo/Rocket/MiniRocket/HEAT/b.png differ diff --git a/Textures/Things/Ammo/Rocket/MiniRocket/HEAT/c.png b/Textures/Things/Ammo/Rocket/MiniRocket/HEAT/c.png new file mode 100644 index 0000000000..e2a23f8207 Binary files /dev/null and b/Textures/Things/Ammo/Rocket/MiniRocket/HEAT/c.png differ diff --git a/Textures/Things/Ammo/Rocket/MiniRocket/Incendiary/a.png b/Textures/Things/Ammo/Rocket/MiniRocket/Incendiary/a.png new file mode 100644 index 0000000000..67bf9b0422 Binary files /dev/null and b/Textures/Things/Ammo/Rocket/MiniRocket/Incendiary/a.png differ diff --git a/Textures/Things/Ammo/Rocket/MiniRocket/Incendiary/b.png b/Textures/Things/Ammo/Rocket/MiniRocket/Incendiary/b.png new file mode 100644 index 0000000000..5272f76e95 Binary files /dev/null and b/Textures/Things/Ammo/Rocket/MiniRocket/Incendiary/b.png differ diff --git a/Textures/Things/Ammo/Rocket/MiniRocket/Incendiary/c.png b/Textures/Things/Ammo/Rocket/MiniRocket/Incendiary/c.png new file mode 100644 index 0000000000..fbb4584642 Binary files /dev/null and b/Textures/Things/Ammo/Rocket/MiniRocket/Incendiary/c.png differ diff --git a/Textures/Things/Ammo/Rocket/MiniRocket/Standard/a.png b/Textures/Things/Ammo/Rocket/MiniRocket/Standard/a.png new file mode 100644 index 0000000000..8db0c8f1b6 Binary files /dev/null and b/Textures/Things/Ammo/Rocket/MiniRocket/Standard/a.png differ diff --git a/Textures/Things/Ammo/Rocket/MiniRocket/Standard/b.png b/Textures/Things/Ammo/Rocket/MiniRocket/Standard/b.png new file mode 100644 index 0000000000..8f7a149dce Binary files /dev/null and b/Textures/Things/Ammo/Rocket/MiniRocket/Standard/b.png differ diff --git a/Textures/Things/Ammo/Rocket/MiniRocket/Standard/c.png b/Textures/Things/Ammo/Rocket/MiniRocket/Standard/c.png new file mode 100644 index 0000000000..5e9a06f2e0 Binary files /dev/null and b/Textures/Things/Ammo/Rocket/MiniRocket/Standard/c.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/Autopistol.png b/Textures/Things/Item/Equipment/WeaponRanged/Autopistol.png index 66af911053..7be41f8038 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/Autopistol.png and b/Textures/Things/Item/Equipment/WeaponRanged/Autopistol.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/ChainShotgun.png b/Textures/Things/Item/Equipment/WeaponRanged/ChainShotgun.png index c464a3c706..3313359bc0 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/ChainShotgun.png and b/Textures/Things/Item/Equipment/WeaponRanged/ChainShotgun.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/ChargeRifle.png b/Textures/Things/Item/Equipment/WeaponRanged/ChargeRifle.png index 0242cad62e..071412e3c4 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/ChargeRifle.png and b/Textures/Things/Item/Equipment/WeaponRanged/ChargeRifle.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/HeavySMG.png b/Textures/Things/Item/Equipment/WeaponRanged/HeavySMG.png index 6d4ca63a95..e5db4029ad 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/HeavySMG.png and b/Textures/Things/Item/Equipment/WeaponRanged/HeavySMG.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/IncendiaryLauncher.png b/Textures/Things/Item/Equipment/WeaponRanged/IncendiaryLauncher.png index e0b1d74bd4..7745e1e8f9 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/IncendiaryLauncher.png and b/Textures/Things/Item/Equipment/WeaponRanged/IncendiaryLauncher.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/Incinerator.png b/Textures/Things/Item/Equipment/WeaponRanged/Incinerator.png new file mode 100644 index 0000000000..2fa2c3f9bc Binary files /dev/null and b/Textures/Things/Item/Equipment/WeaponRanged/Incinerator.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/MachinePistol.png b/Textures/Things/Item/Equipment/WeaponRanged/MachinePistol.png index d5f7c921a0..37bec74c2c 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/MachinePistol.png and b/Textures/Things/Item/Equipment/WeaponRanged/MachinePistol.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/Minigun.png b/Textures/Things/Item/Equipment/WeaponRanged/Minigun.png index 4b28cad9ea..1c7b6bcc29 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/Minigun.png and b/Textures/Things/Item/Equipment/WeaponRanged/Minigun.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/Revolver.png b/Textures/Things/Item/Equipment/WeaponRanged/Revolver.png index e979769563..d90809367d 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/Revolver.png and b/Textures/Things/Item/Equipment/WeaponRanged/Revolver.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/Shotgun.png b/Textures/Things/Item/Equipment/WeaponRanged/Shotgun.png index f6d928f4b1..1ef850146c 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/Shotgun.png and b/Textures/Things/Item/Equipment/WeaponRanged/Shotgun.png differ diff --git a/Textures/Things/Item/Equipment/WeaponRanged/SniperRifle.png b/Textures/Things/Item/Equipment/WeaponRanged/SniperRifle.png index d41bb1c2be..09f0179d36 100644 Binary files a/Textures/Things/Item/Equipment/WeaponRanged/SniperRifle.png and b/Textures/Things/Item/Equipment/WeaponRanged/SniperRifle.png differ diff --git a/Textures/Things/Weapons/MechanoidMinigun.png b/Textures/Things/Weapons/MechanoidMinigun.png index e7201995e6..de974a1340 100644 Binary files a/Textures/Things/Weapons/MechanoidMinigun.png and b/Textures/Things/Weapons/MechanoidMinigun.png differ diff --git a/Textures/ThirdParty/PsyBlasters/LargeFocus/LargeFocus_a.png b/Textures/ThirdParty/PsyBlasters/LargeFocus/LargeFocus_a.png new file mode 100644 index 0000000000..e0f6209f91 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/LargeFocus/LargeFocus_a.png differ diff --git a/Textures/ThirdParty/PsyBlasters/LargeFocus/LargeFocus_b.png b/Textures/ThirdParty/PsyBlasters/LargeFocus/LargeFocus_b.png new file mode 100644 index 0000000000..221c960fbc Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/LargeFocus/LargeFocus_b.png differ diff --git a/Textures/ThirdParty/PsyBlasters/LargeFocus/LargeFocus_c.png b/Textures/ThirdParty/PsyBlasters/LargeFocus/LargeFocus_c.png new file mode 100644 index 0000000000..84cf71e9a8 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/LargeFocus/LargeFocus_c.png differ diff --git a/Textures/ThirdParty/PsyBlasters/LargeNeuro/LargeNeuro_a.png b/Textures/ThirdParty/PsyBlasters/LargeNeuro/LargeNeuro_a.png new file mode 100644 index 0000000000..dbabdf233d Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/LargeNeuro/LargeNeuro_a.png differ diff --git a/Textures/ThirdParty/PsyBlasters/LargeNeuro/LargeNeuro_b.png b/Textures/ThirdParty/PsyBlasters/LargeNeuro/LargeNeuro_b.png new file mode 100644 index 0000000000..4328a3133d Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/LargeNeuro/LargeNeuro_b.png differ diff --git a/Textures/ThirdParty/PsyBlasters/LargeNeuro/LargeNeuro_c.png b/Textures/ThirdParty/PsyBlasters/LargeNeuro/LargeNeuro_c.png new file mode 100644 index 0000000000..cd9d85ebfb Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/LargeNeuro/LargeNeuro_c.png differ diff --git a/Textures/ThirdParty/PsyBlasters/LargePsy/LargePsy_a.png b/Textures/ThirdParty/PsyBlasters/LargePsy/LargePsy_a.png new file mode 100644 index 0000000000..026b160816 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/LargePsy/LargePsy_a.png differ diff --git a/Textures/ThirdParty/PsyBlasters/LargePsy/LargePsy_b.png b/Textures/ThirdParty/PsyBlasters/LargePsy/LargePsy_b.png new file mode 100644 index 0000000000..5be3f773cf Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/LargePsy/LargePsy_b.png differ diff --git a/Textures/ThirdParty/PsyBlasters/LargePsy/LargePsy_c.png b/Textures/ThirdParty/PsyBlasters/LargePsy/LargePsy_c.png new file mode 100644 index 0000000000..133d87af74 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/LargePsy/LargePsy_c.png differ diff --git a/Textures/ThirdParty/PsyBlasters/MediumFocus/MediumFocus_a.png b/Textures/ThirdParty/PsyBlasters/MediumFocus/MediumFocus_a.png new file mode 100644 index 0000000000..349430f2ad Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/MediumFocus/MediumFocus_a.png differ diff --git a/Textures/ThirdParty/PsyBlasters/MediumFocus/MediumFocus_b.png b/Textures/ThirdParty/PsyBlasters/MediumFocus/MediumFocus_b.png new file mode 100644 index 0000000000..e75bfe7f83 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/MediumFocus/MediumFocus_b.png differ diff --git a/Textures/ThirdParty/PsyBlasters/MediumFocus/MediumFocus_c.png b/Textures/ThirdParty/PsyBlasters/MediumFocus/MediumFocus_c.png new file mode 100644 index 0000000000..735a693b34 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/MediumFocus/MediumFocus_c.png differ diff --git a/Textures/ThirdParty/PsyBlasters/MediumNeuro/MediumNeuro_a.png b/Textures/ThirdParty/PsyBlasters/MediumNeuro/MediumNeuro_a.png new file mode 100644 index 0000000000..0624b57d69 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/MediumNeuro/MediumNeuro_a.png differ diff --git a/Textures/ThirdParty/PsyBlasters/MediumNeuro/MediumNeuro_b.png b/Textures/ThirdParty/PsyBlasters/MediumNeuro/MediumNeuro_b.png new file mode 100644 index 0000000000..e88b5ea560 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/MediumNeuro/MediumNeuro_b.png differ diff --git a/Textures/ThirdParty/PsyBlasters/MediumNeuro/MediumNeuro_c.png b/Textures/ThirdParty/PsyBlasters/MediumNeuro/MediumNeuro_c.png new file mode 100644 index 0000000000..783bc16dde Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/MediumNeuro/MediumNeuro_c.png differ diff --git a/Textures/ThirdParty/PsyBlasters/MediumPsy/MediumPsy_a.png b/Textures/ThirdParty/PsyBlasters/MediumPsy/MediumPsy_a.png new file mode 100644 index 0000000000..68949d5330 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/MediumPsy/MediumPsy_a.png differ diff --git a/Textures/ThirdParty/PsyBlasters/MediumPsy/MediumPsy_b.png b/Textures/ThirdParty/PsyBlasters/MediumPsy/MediumPsy_b.png new file mode 100644 index 0000000000..900e8fdd19 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/MediumPsy/MediumPsy_b.png differ diff --git a/Textures/ThirdParty/PsyBlasters/MediumPsy/MediumPsy_c.png b/Textures/ThirdParty/PsyBlasters/MediumPsy/MediumPsy_c.png new file mode 100644 index 0000000000..c92252359d Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/MediumPsy/MediumPsy_c.png differ diff --git a/Textures/ThirdParty/PsyBlasters/ShotgunFocus/ShotgunFocus_a.png b/Textures/ThirdParty/PsyBlasters/ShotgunFocus/ShotgunFocus_a.png new file mode 100644 index 0000000000..005ee21e66 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/ShotgunFocus/ShotgunFocus_a.png differ diff --git a/Textures/ThirdParty/PsyBlasters/ShotgunFocus/ShotgunFocus_b.png b/Textures/ThirdParty/PsyBlasters/ShotgunFocus/ShotgunFocus_b.png new file mode 100644 index 0000000000..f0507de44b Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/ShotgunFocus/ShotgunFocus_b.png differ diff --git a/Textures/ThirdParty/PsyBlasters/ShotgunFocus/ShotgunFocus_c.png b/Textures/ThirdParty/PsyBlasters/ShotgunFocus/ShotgunFocus_c.png new file mode 100644 index 0000000000..4f63f715db Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/ShotgunFocus/ShotgunFocus_c.png differ diff --git a/Textures/ThirdParty/PsyBlasters/ShotgunNeuro/ShotgunNeuro_a.png b/Textures/ThirdParty/PsyBlasters/ShotgunNeuro/ShotgunNeuro_a.png new file mode 100644 index 0000000000..6d74c3b739 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/ShotgunNeuro/ShotgunNeuro_a.png differ diff --git a/Textures/ThirdParty/PsyBlasters/ShotgunNeuro/ShotgunNeuro_b.png b/Textures/ThirdParty/PsyBlasters/ShotgunNeuro/ShotgunNeuro_b.png new file mode 100644 index 0000000000..7cdee4a77f Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/ShotgunNeuro/ShotgunNeuro_b.png differ diff --git a/Textures/ThirdParty/PsyBlasters/ShotgunNeuro/ShotgunNeuro_c.png b/Textures/ThirdParty/PsyBlasters/ShotgunNeuro/ShotgunNeuro_c.png new file mode 100644 index 0000000000..8928be1c16 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/ShotgunNeuro/ShotgunNeuro_c.png differ diff --git a/Textures/ThirdParty/PsyBlasters/ShotgunPsy/ShotgunPsy_a.png b/Textures/ThirdParty/PsyBlasters/ShotgunPsy/ShotgunPsy_a.png new file mode 100644 index 0000000000..760b2b2e98 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/ShotgunPsy/ShotgunPsy_a.png differ diff --git a/Textures/ThirdParty/PsyBlasters/ShotgunPsy/ShotgunPsy_b.png b/Textures/ThirdParty/PsyBlasters/ShotgunPsy/ShotgunPsy_b.png new file mode 100644 index 0000000000..96c9bbb796 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/ShotgunPsy/ShotgunPsy_b.png differ diff --git a/Textures/ThirdParty/PsyBlasters/ShotgunPsy/ShotgunPsy_c.png b/Textures/ThirdParty/PsyBlasters/ShotgunPsy/ShotgunPsy_c.png new file mode 100644 index 0000000000..a1dfcf4bdc Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/ShotgunPsy/ShotgunPsy_c.png differ diff --git a/Textures/ThirdParty/PsyBlasters/SmallFocus/SmallFocus_a.png b/Textures/ThirdParty/PsyBlasters/SmallFocus/SmallFocus_a.png new file mode 100644 index 0000000000..fb8da56e2d Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/SmallFocus/SmallFocus_a.png differ diff --git a/Textures/ThirdParty/PsyBlasters/SmallFocus/SmallFocus_b.png b/Textures/ThirdParty/PsyBlasters/SmallFocus/SmallFocus_b.png new file mode 100644 index 0000000000..cfcca1a606 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/SmallFocus/SmallFocus_b.png differ diff --git a/Textures/ThirdParty/PsyBlasters/SmallFocus/SmallFocus_c.png b/Textures/ThirdParty/PsyBlasters/SmallFocus/SmallFocus_c.png new file mode 100644 index 0000000000..ffeea17051 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/SmallFocus/SmallFocus_c.png differ diff --git a/Textures/ThirdParty/PsyBlasters/SmallNeuro/SmallNeuro_a.png b/Textures/ThirdParty/PsyBlasters/SmallNeuro/SmallNeuro_a.png new file mode 100644 index 0000000000..726a7d30af Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/SmallNeuro/SmallNeuro_a.png differ diff --git a/Textures/ThirdParty/PsyBlasters/SmallNeuro/SmallNeuro_b.png b/Textures/ThirdParty/PsyBlasters/SmallNeuro/SmallNeuro_b.png new file mode 100644 index 0000000000..008483a211 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/SmallNeuro/SmallNeuro_b.png differ diff --git a/Textures/ThirdParty/PsyBlasters/SmallNeuro/SmallNeuro_c.png b/Textures/ThirdParty/PsyBlasters/SmallNeuro/SmallNeuro_c.png new file mode 100644 index 0000000000..23155c8555 Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/SmallNeuro/SmallNeuro_c.png differ diff --git a/Textures/ThirdParty/PsyBlasters/SmallPsy/SmallPsy_a.png b/Textures/ThirdParty/PsyBlasters/SmallPsy/SmallPsy_a.png new file mode 100644 index 0000000000..4836d92cdc Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/SmallPsy/SmallPsy_a.png differ diff --git a/Textures/ThirdParty/PsyBlasters/SmallPsy/SmallPsy_b.png b/Textures/ThirdParty/PsyBlasters/SmallPsy/SmallPsy_b.png new file mode 100644 index 0000000000..1d5a0567dc Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/SmallPsy/SmallPsy_b.png differ diff --git a/Textures/ThirdParty/PsyBlasters/SmallPsy/SmallPsy_c.png b/Textures/ThirdParty/PsyBlasters/SmallPsy/SmallPsy_c.png new file mode 100644 index 0000000000..b1ea97ca8a Binary files /dev/null and b/Textures/ThirdParty/PsyBlasters/SmallPsy/SmallPsy_c.png differ diff --git a/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_a.png b/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_a.png new file mode 100644 index 0000000000..d2896f782e Binary files /dev/null and b/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_a.png differ diff --git a/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_b.png b/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_b.png new file mode 100644 index 0000000000..b614607061 Binary files /dev/null and b/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_b.png differ diff --git a/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_c.png b/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_c.png new file mode 100644 index 0000000000..6afa5f1daf Binary files /dev/null and b/Textures/ThirdParty/Warhammer/Ammo/Bolter/Tempest/BolterSmall_Tempest_c.png differ diff --git a/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_a.png b/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_a.png new file mode 100644 index 0000000000..d082b5ff52 Binary files /dev/null and b/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_a.png differ diff --git a/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_b.png b/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_b.png new file mode 100644 index 0000000000..cb64e5d00e Binary files /dev/null and b/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_b.png differ diff --git a/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_c.png b/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_c.png new file mode 100644 index 0000000000..3322ca4dcb Binary files /dev/null and b/Textures/ThirdParty/Warhammer/Ammo/HeavyBolter/Tempest/BolterLarge_Tempest_c.png differ