Fix MM pass specificity for initial RS parts pass and also subsequent RS+ patches

2024-09-01 17:34:42 +00:00 · 2024-06-09 14:48:43 +01:00 · 2024-06-09 14:48:43 +01:00 · 5030a2d7d6
commit 5030a2d7d6
parent bb95e5b851
18 changed files with 41 additions and 41 deletions
--- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-intakes-depthmasks.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-intakes-depthmasks.cfg
@ -9,7 +9,7 @@
 // - Mk1 Diverterless Supersonic Intake (MK1IntakeFuselage)

 // Circular Intake
-@PART[CircularIntake]
+@PART[CircularIntake]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  !mesh = DELETE
  MODEL
@ -28,7 +28,7 @@
 }

 // Small Circular Intake
-@PART[miniIntake]
+@PART[miniIntake]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  !mesh = DELETE
  MODEL
@ -47,7 +47,7 @@
 }

 // Shock Cone Intake
-@PART[shockConeIntake]
+@PART[shockConeIntake]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  MODEL
  {
@ -61,7 +61,7 @@
 }

 // Adjustable Ramp Intake 
-@PART[ramAirIntake]
+@PART[ramAirIntake]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  !mesh = DELETE
  MODEL
@ -80,7 +80,7 @@
 }

 // Adjustable Ramp Intake Radial
-@PART[IntakeRadialLong]
+@PART[IntakeRadialLong]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  !mesh = DELETE
  MODEL
@ -99,7 +99,7 @@
 }

 // XM-G50 Radial Air Intake
-@PART[airScoop]
+@PART[airScoop]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  !mesh = DELETE
  MODEL
@ -119,7 +119,7 @@
 }

 // Mk1 Diverterless Supersonic Intake
-@PART[MK1IntakeFuselage]
+@PART[MK1IntakeFuselage]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  MODEL
  {
--- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claws.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claws.cfg
@ -4,7 +4,7 @@
 // - Advanced Grabbing Unit Jr. (smallClaw)

 // Advanced Grabbing Unit
-@PART[GrapplingDevice]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[GrapplingDevice]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Andrew Cassidy
  !mesh = DELETE
@ -189,7 +189,7 @@
 }

 // Advanced Grabbing Unit Jr.
-@PART[smallClaw]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[smallClaw]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Andrew Cassidy
  !mesh = DELETE
--- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg
@ -201,7 +201,7 @@
 }

 // SP-10C Photovoltaic Panels
-@PART[solarPanelSP10C]
+@PART[solarPanelSP10C]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Chris Adderley (Nertea)
  !mesh = DELETE
--- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-jet-depthmasks.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-jet-depthmasks.cfg
@ -6,7 +6,7 @@
 // J-20 "Juno" Basic Jet Engine (miniJetEngine)

 // J-33 "Wheesley" Turbofan Engine
-@PART[JetEngine]
+@PART[JetEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  MODEL
  {
@ -20,7 +20,7 @@
 }

 // J-404 "Panther" Afterburning Turbofan
-@PART[turboJet]
+@PART[turboJet]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  MODEL
  {
@ -34,7 +34,7 @@
 }

 // J-X4 "Whiplash" Turbo Ramjet Engine
-@PART[turboFanEngine]
+@PART[turboFanEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  MODEL
  {
@ -48,7 +48,7 @@
 }

 // J-20 "Juno" Basic Jet Engine
-@PART[miniJetEngine]
+@PART[miniJetEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  MODEL
  {
--- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg
@ -779,7 +779,7 @@
 }

 // Launch Escape System
-@PART[LaunchEscapeSystem]
+@PART[LaunchEscapeSystem]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Andrew Cassidy
  !mesh = DELETE
--- a/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-fuelvent.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-fuelvent.cfg
@ -3,7 +3,7 @@
 // - FTE-1 Drain Valve (ReleaseValve)

 // FTE-1 Drain Valve
-@PART[ReleaseValve]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[ReleaseValve]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Andrew Cassidy
  !mesh = DELETE
--- a/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg
@ -188,7 +188,7 @@
 }

 // Magnetometer Boom
-@PART[Magnetometer]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[Magnetometer]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Andrew Cassidy
  !mesh = DELETE
--- a/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg
@ -294,7 +294,7 @@
 }

 // Heat Shield (10m)
-@PART[InflatableHeatShield]
+@PART[InflatableHeatShield]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Chris Adderley (Nertea)
  !mesh = DELETE
--- a/Distribution/Restock/GameData/ReStock/PatchesLegacy/Control/restock-rcs.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesLegacy/Control/restock-rcs.cfg
@ -4,7 +4,7 @@
 // - Vernor Engine (vernorEngine)

 // RV-105 RCS Thruster Block
-@PART[RCSBlock]
+@PART[RCSBlock]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Chris Adderley (Nertea)
  !mesh = DELETE
@ -60,7 +60,7 @@
 }

 // Vernor Engine
-@PART[vernierEngine]
+@PART[vernierEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Chris Adderley (Nertea)
  !mesh = DELETE
--- a/Distribution/Restock/GameData/ReStock/PatchesLegacy/Engines/restock-engines-liquid-0625.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesLegacy/Engines/restock-engines-liquid-0625.cfg
@ -5,7 +5,7 @@
 // - 24-77 "Twitch" Liquid Fuel Engine (smallRadialEngine)

 // LV-1 "Ant" Liquid Fuel Engine
-@PART[microEngine]
+@PART[microEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Chris Adderley (Nertea)
  !mesh = DELETE
@ -162,7 +162,7 @@
 }

 // LV-1R "Spider" Liquid Fuel Engine
-@PART[radialEngineMini]
+@PART[radialEngineMini]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Chris Adderley (Nertea)
  !mesh = DELETE
@ -338,7 +338,7 @@
 }

 // 24-77 "Twitch" Liquid Fuel Engine
-@PART[smallRadialEngine]
+@PART[smallRadialEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Chris Adderley (Nertea)
  !mesh = DELETE
--- a/Distribution/Restock/GameData/ReStock/PatchesMH/Command/restock-mh-command-pods.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Command/restock-mh-command-pods.cfg
@ -6,7 +6,7 @@
 // - Mk2 Command Pod (Mk2Pod)

 //  KV-1
-@PART[kv1Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[kv1Pod]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Well
  !mesh = DELETE
@ -60,7 +60,7 @@
 }

 //  KV-2
-@PART[kv2Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[kv2Pod]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Well
  !mesh = DELETE
@ -114,7 +114,7 @@
 }

 //  KV-3
-@PART[kv3Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[kv3Pod]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Well
  !mesh = DELETE
@ -168,7 +168,7 @@
 }

 // MK-2
-@PART[Mk2Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[Mk2Pod]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Andrew Cassidy
  !mesh = DELETE
--- a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-airlock.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-airlock.cfg
@ -3,7 +3,7 @@
 // - Inflatable Airlock (InflatableAirlock)

 // Inflatable Airlock
-@PART[InflatableAirlock]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[InflatableAirlock]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
  @author = Andrew Cassidy

--- a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-cheetah-gimbal.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-cheetah-gimbal.cfg
@ -1,6 +1,6 @@
 // Enables gimbal on the vernier thrusters for the Cheetah

-@PART[LiquidEngineLV-T91]
+@PART[LiquidEngineLV-T91]:AFTER[000_ReStock]
 {
  !MODEL,* {}
  MODEL
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-les-decoupler.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-les-decoupler.cfg
@ -1,6 +1,6 @@
 // Adds a built in decoupler to the launch escape system

-@PART[LaunchEscapeSystem]
+@PART[LaunchEscapeSystem]:AFTER[000_ReStock]
 {
  fx_gasBurst_white = 0.0, -1.372544, 0.0, 0.0, -1.0, 0.0, decouple
  sound_decoupler_fire = decouple
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-mammoth-node.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-mammoth-node.cfg
@ -1,6 +1,6 @@
 // Adds a bottom node to the mammoth

-@PART[Size3EngineCluster]
+@PART[Size3EngineCluster]:AFTER[000_ReStock]
 {
  node_stack_bottom = 0.0, -1.204, 0.0, 0.0, -1.0, 0.0, 1
 }
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-srb-gimbal.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-srb-gimbal.cfg
@ -1,7 +1,7 @@
 // Adds gimballing to SRBs

 // Kickback
-@PART[MassiveBooster]:NEEDS[!BetterSRBs]
+@PART[MassiveBooster]:AFTER[000_ReStock]:NEEDS[!BetterSRBs]
 {
  MODULE
  {
@ -14,7 +14,7 @@
 }

 // Pollux
-@PART[Pollux]:NEEDS[!BetterSRBs]
+@PART[Pollux]:AFTER[000_ReStock]:NEEDS[!BetterSRBs]
 {
  MODULE
  {
@ -51,7 +51,7 @@
 }

 // Thumper
-@PART[solidBooster1-1]:NEEDS[!BetterSRBs]
+@PART[solidBooster1-1]:AFTER[000_ReStock]:NEEDS[!BetterSRBs]
 {
  MODULE
  {
@ -64,7 +64,7 @@
 }

 // Hammer
-@PART[solidBooster_v2]:NEEDS[!BetterSRBs]
+@PART[solidBooster_v2]:AFTER[000_ReStock]:NEEDS[!BetterSRBs]
 {
  MODULE
  {
@ -77,7 +77,7 @@
 }

 // Flea
-@PART[solidBooster_sm_v2]:NEEDS[!BetterSRBs]
+@PART[solidBooster_sm_v2]:AFTER[000_ReStock]:NEEDS[!BetterSRBs]
 {
  MODULE
  {
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Structural/restock-launch-clamp-extensions.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Structural/restock-launch-clamp-extensions.cfg
@ -1,7 +1,7 @@
 // Allows extending and retracting of launch clamps

 // TT18-A Launch Stability Enhancer
-@PART[launchClamp1]
+@PART[launchClamp1]:AFTER[000_ReStock]
 {
  MODULE
  {
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Structural/restock-mh-spr-panel-com-offset.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Structural/restock-mh-spr-panel-com-offset.cfg
@ -1,25 +1,25 @@
 // Offsets the Center of Mass for the SP-R Triangle Panels to correctly locate the centroid.

 // SP-R06 Structural Panel
-@PART[Triangle0]
+@PART[Triangle0]:AFTER[000_ReStock]
 {
  CoMOffset = 0.1042, 0, 0.1042
 }

 // SP-R12 Structural Panel
-@PART[Triangle1]
+@PART[Triangle1]:AFTER[000_ReStock]
 {
  CoMOffset = 0.2083, 0, 0.2083
 }

 // SP-R18 Structural Panel
-@PART[Triangle1p5]
+@PART[Triangle1p5]:AFTER[000_ReStock]
 {
  CoMOffset = 0.3125, 0, 0.3125
 }

 // SP-R25 Structural Panel
-@PART[Triangle2]
+@PART[Triangle2]:AFTER[000_ReStock]
 {
  CoMOffset = 0.4167, 0, 0.4167
 }