From c31bb03dc765697e69601517b00bb46f713dd0de Mon Sep 17 00:00:00 2001 From: Andromeda-K22 Date: Mon, 15 Jun 2020 01:15:36 -0400 Subject: [PATCH 1/3] Initial Port of MVT Patch --- .../MVT_CE_Patch_Ammo_Shells.xml | 102 +++ .../MVT_CE_Patch_Buildings_Security.xml | 741 ++++++++++++++++++ 2 files changed, 843 insertions(+) create mode 100644 Patches/More Vanilla Turrets/MVT_CE_Patch_Ammo_Shells.xml create mode 100644 Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml diff --git a/Patches/More Vanilla Turrets/MVT_CE_Patch_Ammo_Shells.xml b/Patches/More Vanilla Turrets/MVT_CE_Patch_Ammo_Shells.xml new file mode 100644 index 0000000000..54d701fe14 --- /dev/null +++ b/Patches/More Vanilla Turrets/MVT_CE_Patch_Ammo_Shells.xml @@ -0,0 +1,102 @@ + + + + Always + + +
  • + More Vanilla Turrets 1.1 +
    • + + + +
  • + Defs + + + + AmmoSet_81mmMortarShell_Plasma + + + Bullet_81mmMortarShell_Plasma + + + + + Shell_Plasma + + + ThirdParty/More Vanilla Turrets/PlasmaMortarShell + Graphic_Single + + + 237 + 6.5 + 8.17 + + Plasma + Bullet_81mmMortarShell_Plasma + + + + Bullet_81mmMortarShell_Plasma + + + ThirdParty/More Vanilla Turrets/PlasmaMortarProj + Graphic_Single + + + Bomb + 524 + 0 + 0 + 5 + true + 0.75 + true + GiantExplosion + Explosion_GiantBomb + + + + + MakeShell_Plasma + + Craft 5 81mm Plasma mortar shells. + Making 81mm Plasma mortar shells. + 49200 + +
  • + + +
  • Plasteel
    • + + + 120 + +
  • + + +
  • ComponentIndustrial
    • + + + 2 + + + + +
  • Plasteel
    • +
  • ComponentIndustrial
    • +     +     + + 5 + + + + + + +     +     +     \ No newline at end of file diff --git a/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml b/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml new file mode 100644 index 0000000000..dc79ff856e --- /dev/null +++ b/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml @@ -0,0 +1,741 @@ + + + + Always + + +
  • + More Vanilla Turrets 1.1 +
    • + + + +
  • + Gun_GunComplex + + 0.36 + 1 + 0.01 + 1.59 + 18.54 + + + 1.25 + CombatExtended.Verb_ShootCE + true + Bullet_50BMG_FMJ + 1.1 + 86 + 6 + 10 + Shot_Minigun + GunTail_Medium + + true + + 18 + Mounted + + + 100 + 7.8 + AmmoSet_50BMG + + + FALSE + SuppressFire + 5 + +
    • + +
  • + Defs/ThingDef[defName="GunComplex"]/specialDisplayRadius + + 86 + +
    • + + + +
  • + Gun_RocketComplex + + 1.50 + 2.23 + 0.2 + 2.16 + 14.71 + + + 0 + CombatExtended.Verb_ShootCE + true + Bullet_83mmSMAW_HEAT + 2.09 + 58 + 3 + InfernoCannon_Fire + GunTail_Heavy + true + false + 30 + + true + + Mounted + + + 5 + 8.6 + AmmoSet_83mmSMAW + + + FALSE + AimedShot + true + +
    • + +
  • + Defs/ThingDef[defName="RocketComplex"]/specialDisplayRadius + + 48 + +
    • + + + +
  • + Gun_TurretMilitary + + 0.36 + 1 + 0.02 + 2.13 + 37.08 + + + 0.83 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 1.1 + 86 + 6 + 20 + Shot_AssaultRifle + GunTail_Medium + 9 + Mounted + + + 200 + 15.6 + AmmoSet_762x51mmNATO + +
    • + +
  • + Defs/ThingDef[defName="MilitaryTurretGun"]/specialDisplayRadius + + 86 + +
    • + + + +
  • + Gun_TurretMilitaryManned + + 0.36 + 1 + 0.02 + 2.13 + 37.08 + + + 0.83 + CombatExtended.Verb_ShootCE + true + Bullet_762x51mmNATO_FMJ + 1.1 + 126 + 6 + 20 + Shot_AssaultRifle + GunTail_Medium + 9 + Mounted + + + 200 + 15.6 + AmmoSet_762x51mmNATO + + + FALSE + AimedShot + 10 + true + true + +
    • + +
  • + Defs/ThingDef[defName="MilitaryTurretGunManned"]/specialDisplayRadius + + 86 + +
    • + + + +
  • + Gun_TurretShredder + + 0.35 + 1.00 + 0.14 + 2.02 + 10.66 + + + 0.34 + CombatExtended.Verb_ShootCE + true + Bullet_12Gauge_Buck + 0.6 + 20 + 3 + 4 + Shot_Shotgun + GunTail_Medium + 18 + Mounted + false + + true + + + + 100 + 4.9 + AmmoSet_12Gauge + + + TRUE + AimedShot + 4 + true + true + +
    • + +
  • + Defs/ThingDef[defName="ShredderTurretGun"]/specialDisplayRadius + + 20 + +
    • + + + +
  • + Gun_TurretShredderManned + + 0.35 + 1.00 + 0.14 + 2.02 + 10.66 + + + 0.34 + CombatExtended.Verb_ShootCE + true + Bullet_12Gauge_Buck + 0.6 + 20 + 3 + 4 + Shot_Shotgun + GunTail_Medium + 18 + Mounted + false + + true + + + + 100 + 4.9 + AmmoSet_12Gauge + + + TRUE + AimedShot + 4 + true + true + +
    • + +
  • + Defs/ThingDef[defName="ShredderTurretGunManned"]/specialDisplayRadius + + 20 + +
    • + + + +
  • + Gun_TurretPrecision + + 0.37 + 1 + 0.01 + 1.32 + 28.72 + + + 1.80 + CombatExtended.Verb_ShootCE + true + Bullet_25x137mmNATO_Sabot + 1.4 + 89 + 6 + 5 + Shot_SniperRifle + GunTail_Medium + + true + + 45 + Mounted + + + 100 + 7.8 + AmmoSet_25x137mmNATO + + + FALSE + AimedShot + 3 + +
    • + +
  • + Defs/ThingDef[defName="PrecisionTurretGun"]/specialDisplayRadius + + 89 + +
    • + + + +
  • + Gun_TurretPrecisionManned + + 0.37 + 1 + 0.01 + 1.32 + 28.72 + + + 1.80 + CombatExtended.Verb_ShootCE + true + Bullet_25x137mmNATO_Sabot + 1.4 + 89 + 6 + 5 + Shot_SniperRifle + GunTail_Medium + + true + + 45 + Mounted + + + 100 + 7.8 + AmmoSet_25x137mmNATO + + + FALSE + AimedShot + 3 + +
    • + +
  • + Defs/ThingDef[defName="PrecisionTurretGunManned"]/specialDisplayRadius + + 89 + +
    • + + + +
  • + Gun_BlastCharge + + 0.36 + 1 + 0.09 + 0.99 + 12.9 + + + 1.58 + CombatExtended.Verb_ShootCE + true + Bullet_40x53mmGrenade_HE + 1.1 + 40 + 5 + 6 + 3 + Mortar_LaunchA + GunTail_Heavy + 20 + Mounted + + + 48 + 7.8 + AmmoSet_40x53mmGrenade + + + FALSE + AimedShot + 3 + true + +
    • + +
  • + Defs/ThingDef[defName="BlastTurretGun"]/specialDisplayRadius + + 40 + +
    • + + + +
  • + Gun_BlastChargeManned + + 0.36 + 1 + 0.09 + 0.99 + 12.9 + + + 1.58 + CombatExtended.Verb_ShootCE + true + Bullet_40x53mmGrenade_HE + 1.1 + 40 + 5 + 6 + 3 + Mortar_LaunchA + GunTail_Heavy + 20 + Mounted + + + 48 + 7.8 + AmmoSet_40x53mmGrenade + + + FALSE + AimedShot + 3 + true + +
    • + +
  • + Defs/ThingDef[defName="BlastTurretGunManned"]/specialDisplayRadius + + 40 + +
    • + + + +
  • + Gun_VulcanCannon + + 0.36 + 1 + 0.01 + 1.20 + 20.27 + + + 1.80 + CombatExtended.Verb_ShootCE + true + Bullet_20x102mmNATO_Sabot + 4.1 + 62 + 6 + 1 + 40 + Shot_Minigun + GunTail_Heavy + 6 + Mounted + + + 400 + 7.8 + AmmoSet_20x102mmNATO + + + FALSE + AimedShot + 20 + true + true + +
    • + +
  • + Defs/ThingDef[defName="VulcanCannon"]/specialDisplayRadius + + 62 + +
    • + + + +
  • + Gun_VulcanCannonManned + + 0.36 + 1 + 0.01 + 1.20 + 20.27 + + + 1.80 + CombatExtended.Verb_ShootCE + true + Bullet_20x102mmNATO_Sabot + 4.1 + 62 + 4 + 1 + 40 + Shot_Minigun + GunTail_Heavy + 6 + Mounted + + + 100 + 7.8 + AmmoSet_20x102mmNATO + + + FALSE + AimedShot + 20 + true + true + +
    • + +
  • + Defs/ThingDef[defName="VulcanCannonManned"]/specialDisplayRadius + + 62 + +
    • + +
  • + Defs/ThingDef[ + defName="VulcanCannon" or + defName="VulcanCannonManned" + ]/passability + + + PassThroughOnly + +
    • + +
  • + Defs/ThingDef[ + defName="VulcanCannon" or + defName="VulcanCannonManned" + ] + + + 200 + +
    • + + + +
  • + Artillery_DevastatorBomb + + CombatExtended.Verb_ShootMortarCE + false + true + Bullet_81mmMortarShell_Plasma + 1.2 + 20 + 500 + 5 + ChargeLance_Fire + GunTail_Heavy + 55 + 1 + false + 0.2 + + true + + + + 25 + 5 + AmmoSet_81mmMortarShell_Plasma + +
    • + +
  • + Defs/ThingDef[defName = "Artillery_DevastatorBomb"]/comps + +
  • + +
  • 30
    • +
  • 50
    • +
  • 70
    • +
  • 90
    • + + + + + +
  • + Defs/ThingDef[defName="Turret_DevastatorMortarBomb"]/building/turretBurstCooldownTime + + 15 + +
    • + +
  • + Defs/ThingDef[defName="Bullet_81mmMortarShell_Plasma"]/graphicData/texPath + + Things/Building/Security/DevastatorShell + +
    • + + + + + +
  • + Defs/ThingDef[ + defName="GunComplex" or + defName="RocketComplex" or + defName="MilitaryTurretGun" or + defName="MilitaryTurretGunManned" or + defName="ShredderTurretGun" or + defName="ShredderTurretGunManned" or + defName="PrecisionTurretGun" or + defName="PrecisionTurretGunManned" or + defName="BlastTurretGun" or + defName="BlastTurretGunManned" or + defName="VulcanCannon" or + defName="VulcanCannonManned" or + defName="Turret_DevastatorMortarBomb" + ]/thingClass + + CombatExtended.Building_TurretGunCE + +
    • + +
  • + Defs/ThingDef[ + defName="MilitaryTurretGun" or + defName="MilitaryTurretGunManned" or + defName="ShredderTurretGun" or + defName="ShredderTurretGunManned" or + defName="PrecisionTurretGun" or + defName="PrecisionTurretGunManned" or + defName="BlastTurretGun" or + defName="BlastTurretGunManned" + ]/fillPercent + + 0.85 + +
    • + +
  • + Defs/ThingDef[ + defName="GunComplex" or + defName="RocketComplex" or + defName="MilitaryTurretGun" or + defName="MilitaryTurretGunManned" or + defName="ShredderTurretGun" or + defName="ShredderTurretGunManned" or + defName="PrecisionTurretGun" or + defName="PrecisionTurretGunManned" or + defName="BlastTurretGun" or + defName="BlastTurretGunManned" or + defName="VulcanCannon" or + defName="VulcanCannonManned" + ]/comps/li[@Class = "CompProperties_Refuelable"] +
    • + +
  • + Defs/ThingDef[ + defName="GunComplex" or + defName="RocketComplex" or + defName="MilitaryTurretGun" or + defName="MilitaryTurretGunManned" or + defName="ShredderTurretGun" or + defName="ShredderTurretGunManned" or + defName="PrecisionTurretGun" or + defName="PrecisionTurretGunManned" or + defName="BlastTurretGun" or + defName="BlastTurretGunManned" or + defName="VulcanCannon" or + defName="VulcanCannonManned" + ]/statBases + + 1 + 1 + +
    • + +
  • + Defs/ResearchProjectDef[defName="VulcanCannon"]/prerequisites/li[text()="MultibarrelWeapons"] +
    • + +     +     +     \ No newline at end of file From 775d0bae79426c8c4fee1cb8d0edf319fc560ab0 Mon Sep 17 00:00:00 2001 From: Andromeda-K22 Date: Mon, 15 Jun 2020 20:53:27 -0400 Subject: [PATCH 2/3] Requested changes --- .../MVT_CE_Patch_Buildings_Security.xml | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml b/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml index dc79ff856e..530f5157b3 100644 --- a/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml +++ b/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml @@ -20,10 +20,10 @@ 18.54 - 1.25 + 1.08 CombatExtended.Verb_ShootCE true - Bullet_50BMG_FMJ + Bullet_303British_FMJ 1.1 86 6 @@ -39,7 +39,7 @@ 100 7.8 - AmmoSet_50BMG + AmmoSet_303British FALSE @@ -115,13 +115,13 @@ 37.08 - 0.83 + 1.09 CombatExtended.Verb_ShootCE true Bullet_762x51mmNATO_FMJ 1.1 - 86 - 6 + 54 + 5 20 Shot_AssaultRifle GunTail_Medium @@ -154,12 +154,12 @@ 37.08 - 0.83 + 1.09 CombatExtended.Verb_ShootCE true Bullet_762x51mmNATO_FMJ 1.1 - 126 + 54 6 20 Shot_AssaultRifle @@ -294,7 +294,7 @@ Gun_TurretPrecision 0.37 - 1 + 1.2 0.01 1.32 28.72 @@ -303,7 +303,7 @@ 1.80 CombatExtended.Verb_ShootCE true - Bullet_25x137mmNATO_Sabot + Bullet_145x114mm_FMJ 1.4 89 6 @@ -317,14 +317,11 @@ Mounted - 100 + 25 7.8 - AmmoSet_25x137mmNATO + AmmoSet_145x114mm - FALSE - AimedShot - 3 @@ -501,7 +498,7 @@ Mounted - 400 + 375 7.8 AmmoSet_20x102mmNATO @@ -548,7 +545,7 @@ Mounted - 100 + 375 7.8 AmmoSet_20x102mmNATO @@ -606,9 +603,9 @@ ChargeLance_Fire GunTail_Heavy 55 - 1 + 3 false - 0.2 + 0.8 true From c3f2e9db2e5acfcf89d1cef30e6474f915e571b8 Mon Sep 17 00:00:00 2001 From: Andromeda-K22 Date: Mon, 15 Jun 2020 22:56:31 -0400 Subject: [PATCH 3/3] Changes provided by N7. --- .../MVT_CE_Patch_Buildings_Security.xml | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml b/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml index 530f5157b3..0246075646 100644 --- a/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml +++ b/Patches/More Vanilla Turrets/MVT_CE_Patch_Buildings_Security.xml @@ -218,7 +218,7 @@ - 100 + 50 4.9 AmmoSet_12Gauge @@ -268,7 +268,7 @@ - 100 + 50 4.9 AmmoSet_12Gauge @@ -306,8 +306,6 @@ Bullet_145x114mm_FMJ 1.4 89 - 6 - 5 Shot_SniperRifle GunTail_Medium @@ -322,6 +320,7 @@ AmmoSet_145x114mm + AimedShot @@ -347,11 +346,9 @@ 1.80 CombatExtended.Verb_ShootCE true - Bullet_25x137mmNATO_Sabot + Bullet_145x114mm_FMJ 1.4 89 - 6 - 5 Shot_SniperRifle GunTail_Medium @@ -361,14 +358,12 @@ Mounted - 100 + 25 7.8 - AmmoSet_25x137mmNATO + AmmoSet_145x114mm - FALSE AimedShot - 3 @@ -603,9 +598,9 @@ ChargeLance_Fire GunTail_Heavy 55 - 3 + 1.2 false - 0.8 + 0.3 true @@ -708,6 +703,10 @@ ]/comps/li[@Class = "CompProperties_Refuelable"] +
  • + Defs/ThingDef[defName="GunComplex"]/thingCategories/li[text()="BuildingsSecurity"] +
    • +
  • Defs/ThingDef[ defName="GunComplex" or