From ce3d17d8d04200d8bd90b5800438bbabd4c71d04 Mon Sep 17 00:00:00 2001 From: ChrisAdderley Date: Mon, 4 Nov 2019 08:56:59 -0800 Subject: [PATCH 1/6] Fix the MM thing --- .../Patches/Aerodynamic/restock-aero-0625.cfg | 2 +- .../Patches/Aerodynamic/restock-aero-125.cfg | 6 ++--- .../Patches/Aerodynamic/restock-aero-25.cfg | 2 +- .../Patches/Aerodynamic/restock-aero-375.cfg | 2 +- .../Aerodynamic/restock-aero-winglets.cfg | 8 +++---- .../Patches/Command/restock-command-pods.cfg | 10 ++++----- .../Patches/Command/restock-probes.cfg | 18 +++++++-------- .../Patches/Command/restock-utility-pods.cfg | 4 ++-- .../Communication/restock-antennas.cfg | 10 ++++----- .../Patches/Communication/restock-relays.cfg | 8 +++---- .../CompoundParts/restock-fuelline.cfg | 2 +- .../Patches/CompoundParts/restock-strut.cfg | 2 +- .../ReStock/Patches/Control/restock-rcs.cfg | 6 ++--- .../ReStock/Patches/Control/restock-sas.cfg | 6 ++--- .../ReStock/Patches/Coupling/restock-claw.cfg | 2 +- .../Patches/Coupling/restock-decouplers.cfg | 14 ++++++------ .../Patches/Coupling/restock-docking.cfg | 10 ++++----- .../Patches/Coupling/restock-separators.cfg | 8 +++---- .../Patches/Electrical/restock-batteries.cfg | 10 ++++----- .../Patches/Electrical/restock-fuelcells.cfg | 4 ++-- .../Patches/Electrical/restock-lights.cfg | 4 ++-- .../Patches/Electrical/restock-rtg.cfg | 2 +- .../Electrical/restock-solarpanels.cfg | 14 ++++++------ .../Engine/restock-engines-ion-0625.cfg | 2 +- .../Patches/Engine/restock-engines-jet.cfg | 2 +- .../Engine/restock-engines-liquid-0625.cfg | 10 ++++----- .../Engine/restock-engines-liquid-125.cfg | 14 ++++++------ .../Engine/restock-engines-liquid-25.cfg | 8 +++---- .../Engine/restock-engines-liquid-375.cfg | 4 ++-- .../Engine/restock-engines-srb-0625.cfg | 4 ++-- .../Engine/restock-engines-srb-125.cfg | 10 ++++----- .../Patches/Engine/restock-engines-srb-25.cfg | 4 ++-- .../FuelTank/restock-fueltanks-0625.cfg | 2 +- .../FuelTank/restock-fueltanks-125.cfg | 8 +++---- .../Patches/FuelTank/restock-fueltanks-25.cfg | 8 +++---- .../FuelTank/restock-fueltanks-375.cfg | 6 ++--- .../FuelTank/restock-fueltanks-radial.cfg | 6 ++--- .../FuelTank/restock-fueltanks-rcs.cfg | 10 ++++----- .../FuelTank/restock-fueltanks-xenon.cfg | 6 ++--- .../ReStock/Patches/Ground/restock-legs.cfg | 6 ++--- .../Patches/Payload/restock-fairing-bases.cfg | 6 ++--- .../Patches/Payload/restock-service-bays.cfg | 4 ++-- .../Patches/Resource/restock-drills.cfg | 4 ++-- .../Patches/Resource/restock-isrus.cfg | 4 ++-- .../Patches/Resource/restock-oretanks.cfg | 6 ++--- .../Patches/Resource/restock-scanners.cfg | 6 ++--- .../Patches/Science/restock-science.cfg | 18 +++++++-------- .../Structural/restock-structural-125.cfg | 14 ++++++------ .../Structural/restock-structural-25.cfg | 10 ++++----- .../Structural/restock-structural-375.cfg | 2 +- .../restock-structural-launchclamp.cfg | 2 +- .../Structural/restock-structural-truss.cfg | 22 +++++++++---------- .../Patches/Thermal/restock-heat-shields.cfg | 8 +++---- .../Patches/Thermal/restock-radiators.cfg | 12 +++++----- .../Patches/Utility/restock-ladders.cfg | 6 ++--- .../Patches/Utility/restock-parachutes.cfg | 10 ++++----- .../Aero/restock-mh-heat-shields.cfg | 2 +- .../PatchesMH/Aero/restock-mh-nosecones.cfg | 2 +- .../Coupling/restock-mh-decouplers.cfg | 4 ++-- .../Coupling/restock-mh-separators.cfg | 2 +- .../Engine/restock-mh-engines-1875.cfg | 6 ++--- .../Engine/restock-mh-engines-radial.cfg | 2 +- .../Engine/restock-mh-engines-srb-1875.cfg | 2 +- .../FuelTank/restock-mh-fueltanks-1875.cfg | 18 +++++++-------- .../FuelTank/restock-mh-fueltanks-rcs.cfg | 4 ++-- .../Payload/restock-mh-fairing-bases.cfg | 2 +- .../GameData/ReStock/RestockPatchDisabler.cfg | 2 +- 67 files changed, 222 insertions(+), 222 deletions(-) diff --git a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-0625.cfg b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-0625.cfg index c08a62e5..296f11e6 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-0625.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-0625.cfg @@ -2,7 +2,7 @@ // Contents: // - Small Nose Cone (standardNoseCone) -@PART[standardNoseCone]:HAS[RestockIgnore[]] +@PART[standardNoseCone]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-125.cfg index 0b303bdb..3b4dd36e 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-125.cfg @@ -4,7 +4,7 @@ // - Advanced Nose Cone - Type A (pointyNoseConeA) // - Advanced Nose Cone - Type B (pointyNoseConeB) -@PART[noseCone]:HAS[RestockIgnore[]] +@PART[noseCone]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -82,7 +82,7 @@ } } -@PART[pointyNoseConeA]:HAS[RestockIgnore[]] +@PART[pointyNoseConeA]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -161,7 +161,7 @@ !MODULE[ModuleAnimateHeat] {} } -@PART[pointyNoseConeB]:HAS[RestockIgnore[]] +@PART[pointyNoseConeB]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg index 3c81f6d2..2c455e50 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg @@ -2,7 +2,7 @@ // Contents: // - Protective Rocket Nose Cone Mk7 (rocketNoseCone_v2) -@PART[rocketNoseCone_v2]:HAS[RestockIgnore[]] +@PART[rocketNoseCone_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-375.cfg b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-375.cfg index b08d0c9d..6d65f905 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-375.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-375.cfg @@ -2,7 +2,7 @@ // Contents: // - Protective Rocket Nose Cone Mk12A (rocketNoseConeSize3) -@PART[rocketNoseConeSize3]:HAS[RestockIgnore[]] +@PART[rocketNoseConeSize3]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-winglets.cfg b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-winglets.cfg index b88fe465..1fb662a0 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-winglets.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-winglets.cfg @@ -5,7 +5,7 @@ // - AV-T1 Winglet (winglet) // - Delta-Deluxe Winglet (winglet3) -@PART[basicFin]:HAS[RestockIgnore[]] +@PART[basicFin]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -19,7 +19,7 @@ cube = Default, 0.04573,0.9754,0.373, 0.04573,0.2997,0.648, 0.02582,0.2292,1.08, 0.02582,0.2819,0.3014, 0.5039,0.9864,0.1276, 0.5039,0.9864,0.1276, -0.1697,0.25,0, 0.7607,1.25,0.05625 } } -@PART[R8winglet]:HAS[RestockIgnore[]] +@PART[R8winglet]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -35,7 +35,7 @@ cube = fullDeflectionNeg, 0.2243,0.6742,1.628, 0.2243,0.6276,1.549, 0.6671,0.4279,2.03, 0.6671,0.4123,1.886, 1.907,0.9045,0.9155, 1.907,0.9084,0.9155, -0.07445,-0.008513,-0.02857, 1.629,1.966,0.866 } } -@PART[winglet]:HAS[RestockIgnore[]] +@PART[winglet]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -49,7 +49,7 @@ cube = Default, 0.131,1,0.09983, 0.131,0.1167,1.597, 0.08604,0.07243,1.567, 0.08604,0.009355,1.241, 1.657,0.9968,0.1479, 1.657,0.997,0.1479, -0.1187,0.2268,0.006638, 1.497,2.11,0.09696 } } -@PART[winglet3]:HAS[RestockIgnore[]] +@PART[winglet3]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-command-pods.cfg b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-command-pods.cfg index d74ec952..78b7c41c 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-command-pods.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-command-pods.cfg @@ -7,7 +7,7 @@ // - Mk2 Lander Can (mk2LanderCabin_v2) // Cupola -@PART[cupola]:HAS[RestockIgnore[]] +@PART[cupola]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -30,7 +30,7 @@ } // Mk1 Pod -@PART[mk1pod_v2]:HAS[RestockIgnore[]] +@PART[mk1pod_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -95,7 +95,7 @@ } // Mk1-3 Pod -@PART[mk1-3pod]:HAS[RestockIgnore[]] +@PART[mk1-3pod]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -157,7 +157,7 @@ } // Mk1 Lander Can -@PART[landerCabinSmall]:HAS[RestockIgnore[]] +@PART[landerCabinSmall]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -173,7 +173,7 @@ } // Mk2 Lander Can -@PART[mk2LanderCabin_v2]:HAS[RestockIgnore[]] +@PART[mk2LanderCabin_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-probes.cfg b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-probes.cfg index 67ebf345..45293e3c 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-probes.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-probes.cfg @@ -11,7 +11,7 @@ // - RC-001S Remote Guidance Unit (probeStackSmall) // QBE -@PART[probeCoreCube]:HAS[RestockIgnore[]] +@PART[probeCoreCube]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -80,7 +80,7 @@ } // Stayputnik -@PART[probeCoreSphere_v2]:HAS[RestockIgnore[]] +@PART[probeCoreSphere_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) //!mesh = DELETE @@ -122,7 +122,7 @@ } // HECS -@PART[probeCoreHex_v2]:HAS[RestockIgnore[]] +@PART[probeCoreHex_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -191,7 +191,7 @@ } // OKTO -@PART[probeCoreOcto_v2]:HAS[RestockIgnore[]] +@PART[probeCoreOcto_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -260,7 +260,7 @@ } // OKTO2 -@PART[probeCoreOcto2_v2]:HAS[RestockIgnore[]] +@PART[probeCoreOcto2_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -329,7 +329,7 @@ } // HECS2 -@PART[HECS2_ProbeCore]:HAS[RestockIgnore[]] +@PART[HECS2_ProbeCore]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -399,7 +399,7 @@ } // Rover -@PART[roverBody_v2]:HAS[RestockIgnore[]] +@PART[roverBody_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -478,7 +478,7 @@ } // 1.25m Stack Core -@PART[probeStackSmall]:HAS[RestockIgnore[]] +@PART[probeStackSmall]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -494,7 +494,7 @@ } // 2.5m Stack Core -@PART[probeStackLarge]:HAS[RestockIgnore[]] +@PART[probeStackLarge]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-utility-pods.cfg b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-utility-pods.cfg index 2b684cd6..38827391 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-utility-pods.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-utility-pods.cfg @@ -3,7 +3,7 @@ // - PPD-10 Hitchhiker Storage Container (crewCabin) // - Science Mobile Processing Lab MPL-LG-2 (Large_Crewed_Lab) -@PART[Large_Crewed_Lab]:HAS[RestockIgnore[]] +@PART[Large_Crewed_Lab]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley !mesh = DELETE @@ -32,7 +32,7 @@ } // Hitchhiker -@PART[crewCabin]:FOR[zzzzStationParts]:HAS[RestockIgnore[]] +@PART[crewCabin]:FOR[zzzzStationParts]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Communication/restock-antennas.cfg b/Distribution/Restock/GameData/ReStock/Patches/Communication/restock-antennas.cfg index 48980eb5..75bf4900 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Communication/restock-antennas.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Communication/restock-antennas.cfg @@ -7,7 +7,7 @@ // - Communotron 88-88 (commDish) // Communotron 16 -@PART[longAntenna]:HAS[RestockIgnore[]] +@PART[longAntenna]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !mesh = DELETE @@ -23,7 +23,7 @@ } // Communotron 16-S -@PART[SurfAntenna]:HAS[RestockIgnore[]] +@PART[SurfAntenna]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !MODEL {} @@ -34,7 +34,7 @@ } // Communotron DTS-M1 -@PART[mediumDishAntenna]:HAS[RestockIgnore[]] +@PART[mediumDishAntenna]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !mesh = DELETE @@ -51,7 +51,7 @@ } // Communotron HG-55 -@PART[HighGainAntenna]:HAS[RestockIgnore[]] +@PART[HighGainAntenna]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !MODEL {} @@ -99,7 +99,7 @@ } // Communotron 88-88 -@PART[commDish]:HAS[RestockIgnore[]] +@PART[commDish]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Communication/restock-relays.cfg b/Distribution/Restock/GameData/ReStock/Patches/Communication/restock-relays.cfg index 0a6a5a69..805a6bbc 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Communication/restock-relays.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Communication/restock-relays.cfg @@ -6,7 +6,7 @@ // - RA-100 Relay Antenna (RelayAntenna100) // HG-5 High Gain Antenna -@PART[HighGainAntenna5]:HAS[RestockIgnore[]] +@PART[HighGainAntenna5]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !MODEL {} @@ -87,7 +87,7 @@ } // RA-2 Relay Antenna -@PART[RelayAntenna5]:HAS[RestockIgnore[]] +@PART[RelayAntenna5]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !MODEL {} @@ -129,7 +129,7 @@ } // RA-15 Relay Antenna -@PART[RelayAntenna50]:HAS[RestockIgnore[]] +@PART[RelayAntenna50]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !MODEL {} @@ -171,7 +171,7 @@ } // RA-100 Relay Antenna -@PART[RelayAntenna100]:HAS[RestockIgnore[]] +@PART[RelayAntenna100]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !MODEL {} diff --git a/Distribution/Restock/GameData/ReStock/Patches/CompoundParts/restock-fuelline.cfg b/Distribution/Restock/GameData/ReStock/Patches/CompoundParts/restock-fuelline.cfg index 5c009a23..9049aad6 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/CompoundParts/restock-fuelline.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/CompoundParts/restock-fuelline.cfg @@ -3,7 +3,7 @@ // - FTX-2 External Fuel Duct (fuelLine) // FTX-2 External Fuel Duct -@PART[fuelLine]:HAS[RestockIgnore[]] +@PART[fuelLine]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy diff --git a/Distribution/Restock/GameData/ReStock/Patches/CompoundParts/restock-strut.cfg b/Distribution/Restock/GameData/ReStock/Patches/CompoundParts/restock-strut.cfg index 8b2bde85..dddc55b2 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/CompoundParts/restock-strut.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/CompoundParts/restock-strut.cfg @@ -3,7 +3,7 @@ // - EAS-4 Strut Connector (strutConnector) // EAS-4 Strut Connector -@PART[strutConnector]:HAS[RestockIgnore[]] +@PART[strutConnector]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy diff --git a/Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg b/Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg index 29de2123..475b3537 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg @@ -5,7 +5,7 @@ // - Vernor Engine (vernorEngine) // RCS block -@PART[RCSBlock_v2]:HAS[RestockIgnore[]] +@PART[RCSBlock_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -68,7 +68,7 @@ } // Linear RCS port -@PART[linearRcs]:HAS[RestockIgnore[]] +@PART[linearRcs]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -162,7 +162,7 @@ } // Vernor Engine -@PART[vernierEngine]:HAS[RestockIgnore[]] +@PART[vernierEngine]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Control/restock-sas.cfg b/Distribution/Restock/GameData/ReStock/Patches/Control/restock-sas.cfg index 33c89564..6b4ba3dd 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Control/restock-sas.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Control/restock-sas.cfg @@ -5,7 +5,7 @@ // - Advanced Reaction Wheel Module, Large (asasmodule1-2) // .625m reaction wheel -@PART[sasModule]:HAS[RestockIgnore[]] +@PART[sasModule]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !mesh = DELETE @@ -29,7 +29,7 @@ } // 1.25m reaction wheel -@PART[advSasModule]:HAS[RestockIgnore[]] +@PART[advSasModule]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -46,7 +46,7 @@ } // 2.5m reaction wheel -@PART[asasmodule1-2]:HAS[RestockIgnore[]] +@PART[asasmodule1-2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claw.cfg b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claw.cfg index e8d89b7f..738067ba 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claw.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claw.cfg @@ -3,7 +3,7 @@ // - Advanced Grabbing Unit (GrapplingDevice) // Advanced Grabbing Unit -@PART[GrapplingDevice]:HAS[RestockIgnore[]] +@PART[GrapplingDevice]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy diff --git a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-decouplers.cfg b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-decouplers.cfg index b04c1fc2..c9441e1f 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-decouplers.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-decouplers.cfg @@ -9,7 +9,7 @@ // - Hydraulic Detachment Manifold (radialDecoupler1-2) // TD-06 Decoupler -@PART[Decoupler_0]:HAS[RestockIgnore[]] +@PART[Decoupler_0]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -54,7 +54,7 @@ } // TD-12 Decoupler -@PART[Decoupler_1]:HAS[RestockIgnore[]] +@PART[Decoupler_1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -116,7 +116,7 @@ } // TD-25 Decoupler -@PART[Decoupler_2]:HAS[RestockIgnore[]] +@PART[Decoupler_2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -178,7 +178,7 @@ } // TD-37 Decoupler -@PART[Decoupler_3]:HAS[RestockIgnore[]] +@PART[Decoupler_3]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -223,7 +223,7 @@ } // TD-70 Decoupler -@PART[radialDecoupler2]:HAS[RestockIgnore[]] +@PART[radialDecoupler2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -240,7 +240,7 @@ } // TD-37 Decoupler -@PART[radialDecoupler]:HAS[RestockIgnore[]] +@PART[radialDecoupler]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -257,7 +257,7 @@ } // HDM Decoupler -@PART[radialDecoupler1-2]:HAS[RestockIgnore[]] +@PART[radialDecoupler1-2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg index c9dfcecd..b5221cfe 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg @@ -7,7 +7,7 @@ // - Clamp-O-Tron Shielded Docking Port (dockingPort1) // Clamp-O-Tron Jr -@PART[dockingPort3]:HAS[RestockIgnore[]] +@PART[dockingPort3]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -55,7 +55,7 @@ } // Inline Clamp-O-Tron -@PART[dockingPortLateral]:HAS[RestockIgnore[]] +@PART[dockingPortLateral]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Passinglurker !mesh = DELETE @@ -69,7 +69,7 @@ } // Clamp-O-Tron -@PART[dockingPort2]:HAS[RestockIgnore[]] +@PART[dockingPort2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -124,7 +124,7 @@ } // Clamp-O-Tron Shielded -@PART[dockingPort1]:HAS[RestockIgnore[]] +@PART[dockingPort1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -279,7 +279,7 @@ } // Clamp-O-Tron Sr -@PART[dockingPortLarge]:HAS[RestockIgnore[]] +@PART[dockingPortLarge]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-separators.cfg b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-separators.cfg index dba462fe..5dd55a79 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-separators.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-separators.cfg @@ -6,7 +6,7 @@ // - TS-37 Separator (Separator_3) // TS-06 Separator -@PART[Separator_0]:HAS[RestockIgnore[]] +@PART[Separator_0]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -51,7 +51,7 @@ } // TS-12 Separator -@PART[Separator_1]:HAS[RestockIgnore[]] +@PART[Separator_1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -112,7 +112,7 @@ } // TS-25 Separator -@PART[Separator_2]:HAS[RestockIgnore[]] +@PART[Separator_2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -174,7 +174,7 @@ } // TS-37 Separator -@PART[Separator_3]:HAS[RestockIgnore[]] +@PART[Separator_3]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-batteries.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-batteries.cfg index 04d8a2d8..360d706b 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-batteries.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-batteries.cfg @@ -7,7 +7,7 @@ // - Z-400 Rechargeable Battery (ksp_r_largeBatteryPack) // 0.625m battery bank -@PART[batteryBankMini]:HAS[RestockIgnore[]] +@PART[batteryBankMini]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -26,7 +26,7 @@ } // 1.25m battery bank -@PART[batteryBank]:HAS[RestockIgnore[]] +@PART[batteryBank]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -45,7 +45,7 @@ } // 2.5m battery bank -@PART[batteryBankLarge]:HAS[RestockIgnore[]] +@PART[batteryBankLarge]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -64,7 +64,7 @@ } // Small radial battery -@PART[batteryPack]:HAS[RestockIgnore[]] +@PART[batteryPack]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -79,7 +79,7 @@ } // Large radial battery -@PART[ksp_r_largeBatteryPack]:HAS[RestockIgnore[]] +@PART[ksp_r_largeBatteryPack]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-fuelcells.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-fuelcells.cfg index 6f8190fc..12260ed0 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-fuelcells.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-fuelcells.cfg @@ -4,7 +4,7 @@ // - Fuel Cell Array (FuelCellArray) // Fuel Cell -@PART[FuelCell]:HAS[RestockIgnore[]] +@PART[FuelCell]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy @@ -16,7 +16,7 @@ } // Fuel Cell Array -@PART[FuelCellArray]:HAS[RestockIgnore[]] +@PART[FuelCellArray]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg index 9ee95132..688f8d84 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg @@ -4,7 +4,7 @@ // - Illuminator Mk2 (spotLight2) // Spotlight -@PART[spotLight1]:HAS[RestockIgnore[]] +@PART[spotLight1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -24,7 +24,7 @@ } // Floodlight -@PART[spotLight2]:HAS[RestockIgnore[]] +@PART[spotLight2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-rtg.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-rtg.cfg index 9f63934b..569783ab 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-rtg.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-rtg.cfg @@ -2,7 +2,7 @@ // Contents: // - PB-NUK Radioisotope Thermoelectric Generator (rtg) -@PART[rtg]:HAS[RestockIgnore[]] +@PART[rtg]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Beale !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg index 1d3f7ab3..056344e1 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg @@ -9,7 +9,7 @@ // - OX-STAT-XL Photovoltaic Panels (LgRadialSolarPanel) // 1x6 -@PART[solarPanels4]:HAS[RestockIgnore[]] +@PART[solarPanels4]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Beale !mesh = DELETE @@ -28,7 +28,7 @@ } // 1x6 shielded -@PART[solarPanels2]:HAS[RestockIgnore[]] +@PART[solarPanels2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Beale !mesh = DELETE @@ -53,7 +53,7 @@ } // 3x2 -@PART[solarPanels3]:HAS[RestockIgnore[]] +@PART[solarPanels3]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Beale !mesh = DELETE @@ -72,7 +72,7 @@ } // 2x3 shroud -@PART[solarPanels1]:HAS[RestockIgnore[]] +@PART[solarPanels1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Beale !mesh = DELETE @@ -97,7 +97,7 @@ } // Gigantor -@PART[largeSolarPanel]:HAS[RestockIgnore[]] +@PART[largeSolarPanel]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -112,7 +112,7 @@ } // Static Small -@PART[solarPanels5]:HAS[RestockIgnore[]] +@PART[solarPanels5]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -127,7 +127,7 @@ } // Gigantor -@PART[LgRadialSolarPanel]:HAS[RestockIgnore[]] +@PART[LgRadialSolarPanel]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-ion-0625.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-ion-0625.cfg index 26789550..54653a75 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-ion-0625.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-ion-0625.cfg @@ -3,7 +3,7 @@ // - IX-6315 "Dawn" Electric Propulsion System (ionEngine) // Dawn -@PART[ionEngine]:HAS[RestockIgnore[]] +@PART[ionEngine]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-jet.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-jet.cfg index 5e526708..303ef89b 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-jet.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-jet.cfg @@ -3,7 +3,7 @@ // - CR-7 R.A.P.I.E.R. Engine (RAPIER) // Rapier -@PART[RAPIER]:HAS[RestockIgnore[]] +@PART[RAPIER]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg index 06ea0445..4abfa3ce 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg @@ -7,7 +7,7 @@ // - O-10 "Puff" MonoPropellant Fuel Engine (omsEngine) // Ant -@PART[microEngine_v2]:HAS[RestockIgnore[]] +@PART[microEngine_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -201,7 +201,7 @@ } // Spider -@PART[radialEngineMini_v2]:HAS[RestockIgnore[]] +@PART[radialEngineMini_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -380,7 +380,7 @@ } // Spark -@PART[liquidEngineMini_v2]:HAS[RestockIgnore[]] +@PART[liquidEngineMini_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -839,7 +839,7 @@ } // Twitch -@PART[smallRadialEngine_v2]:HAS[RestockIgnore[]] +@PART[smallRadialEngine_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -1202,7 +1202,7 @@ } // Puff -@PART[omsEngine]:HAS[RestockIgnore[]] +@PART[omsEngine]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg index a4443794..9142c538 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg @@ -9,7 +9,7 @@ // - T-1 Toroidal "Aerospike" Liquid Fuel Engine (toroidalAerospike) - FX only // LV-N -@PART[nuclearEngine]:HAS[RestockIgnore[]] +@PART[nuclearEngine]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -237,7 +237,7 @@ } // Vector -@PART[SSME]:HAS[RestockIgnore[]] +@PART[SSME]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -573,7 +573,7 @@ } // Terrier -@PART[liquidEngine3_v2]:HAS[RestockIgnore[]] +@PART[liquidEngine3_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Porkjet and Chris Adderley (Nertea) !mesh = DELETE @@ -910,7 +910,7 @@ } // Reliant -@PART[liquidEngine]:HAS[RestockIgnore[]] +@PART[liquidEngine]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Porkjet and Chris Adderley (Nertea) !mesh = DELETE @@ -1258,7 +1258,7 @@ } // Swivel -@PART[liquidEngine2]:HAS[RestockIgnore[]] +@PART[liquidEngine2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Porkjet and Chris Adderley (Nertea) !mesh = DELETE @@ -1680,7 +1680,7 @@ } // Thud (FX only) -@PART[radialLiquidEngine1-2]:HAS[RestockIgnore[]] +@PART[radialLiquidEngine1-2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { !fx_exhaustFlame_blue_small = DELETE !fx_exhaustLight_blue = DELETE @@ -1761,7 +1761,7 @@ } // Dart (FX only) -@PART[toroidalAerospike]:HAS[RestockIgnore[]] +@PART[toroidalAerospike]:HAS[~RestockIgnore[*]]:FOR[ReStock] { !fx_exhaustFlame_blue = DELETE !fx_exhaustLight_blue = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg index 594588e3..2c61f4b5 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg @@ -6,7 +6,7 @@ // - RE-I5 "Skipper" Liquid Fuel Engine (engineLargeSkipper) // Mainsail -@PART[liquidEngine1-2]:HAS[RestockIgnore[]] +@PART[liquidEngine1-2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) and riocrokite %node_attach = 0.0, 1.065308, 0.0, 0.0, 1.0, 0.0, 2 @@ -391,7 +391,7 @@ } // Poodle -@PART[liquidEngine2-2_v2]:HAS[RestockIgnore[]] +@PART[liquidEngine2-2_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) and riocrokite %node_attach = 0.0, 0, 0.0, 0.0, 1.0, 0.0, 2 @@ -776,7 +776,7 @@ } // Skipper -@PART[engineLargeSkipper]:HAS[RestockIgnore[]] +@PART[engineLargeSkipper]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) and riocrokite %node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 2 @@ -1215,7 +1215,7 @@ } // Twin Boar -@PART[Size2LFB]:HAS[RestockIgnore[]] +@PART[Size2LFB]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-375.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-375.cfg index f918485e..494773da 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-375.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-375.cfg @@ -3,7 +3,7 @@ // - Kerbodyne KR-2L+ "Rhino" Liquid Fuel Engine (Size3AdvancedEngine) // - S3 KS-25x4 "Mammoth" Liquid Fuel Engine (Size3EngineCluster) -@PART[Size3AdvancedEngine]:HAS[RestockIgnore[]] +@PART[Size3AdvancedEngine]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -263,7 +263,7 @@ } } -@PART[Size3EngineCluster]:HAS[RestockIgnore[]] +@PART[Size3EngineCluster]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-0625.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-0625.cfg index a79a6e0e..641640a6 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-0625.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-0625.cfg @@ -4,7 +4,7 @@ // - F3S0 'Shrimp' SRB () // FM1 'Mite' SRB -@PART[Mite]:HAS[RestockIgnore[]] +@PART[Mite]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -178,7 +178,7 @@ } // F3S0 'Shrimp' SRB -@PART[Shrimp]:HAS[RestockIgnore[]] +@PART[Shrimp]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg index 24d01294..42e5381f 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg @@ -8,7 +8,7 @@ // - Launch Escape System (LaunchEscapeSystem) // Kickback -@PART[MassiveBooster]:HAS[RestockIgnore[]] +@PART[MassiveBooster]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -145,7 +145,7 @@ } // Thumper -@PART[solidBooster1-1]:HAS[RestockIgnore[]] +@PART[solidBooster1-1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -289,7 +289,7 @@ } // Hammer -@PART[solidBooster_v2]:HAS[RestockIgnore[]] +@PART[solidBooster_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -449,7 +449,7 @@ } // Flea -@PART[solidBooster_sm_v2]:HAS[RestockIgnore[]] +@PART[solidBooster_sm_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -608,7 +608,7 @@ } // Separatron -@PART[sepMotor1]:HAS[RestockIgnore[]] +@PART[sepMotor1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-25.cfg index 1174535b..ebb5f1bf 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-25.cfg @@ -4,7 +4,7 @@ // - S2-33 'Clydesdale' SRB (Clydesdale) // S2-17 'Thoroughbred' SRB -@PART[Thoroughbred]:HAS[RestockIgnore[]] +@PART[Thoroughbred]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -200,7 +200,7 @@ } // S2-33 'Clydesdale' SRB -@PART[Clydesdale]:HAS[RestockIgnore[]] +@PART[Clydesdale]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-0625.cfg b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-0625.cfg index 29821c1b..9b499017 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-0625.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-0625.cfg @@ -2,7 +2,7 @@ // Contents: // - Oscar-B Fuel Tank (miniFuelTank) -@PART[miniFuelTank]:HAS[RestockIgnore[]] +@PART[miniFuelTank]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Beale !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-125.cfg index 8c2da5e6..2d0ecb94 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-125.cfg @@ -5,7 +5,7 @@ // - FL-T800 Fuel Tank (fuelTank_long) // - FL-T100 Fuel Tank (fuelTankSmallFlat) -@PART[fuelTankSmallFlat]:HAS[RestockIgnore[]] +@PART[fuelTankSmallFlat]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Porkjet and Chris Adderley (Nertea) !mesh = DELETE @@ -79,7 +79,7 @@ } } -@PART[fuelTankSmall]:HAS[RestockIgnore[]] +@PART[fuelTankSmall]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Porkjet and Chris Adderley (Nertea) // @node_stack_top = 0.0, 5.5525, 0.0, 0.0, 1.0, 0.0 @@ -157,7 +157,7 @@ } } -@PART[fuelTank]:HAS[RestockIgnore[]] +@PART[fuelTank]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Porkjet and Chris Adderley (Nertea) !mesh = DELETE @@ -235,7 +235,7 @@ // @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1 } -@PART[fuelTank_long]:HAS[RestockIgnore[]] +@PART[fuelTank_long]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Porkjet and Chris Adderley (Nertea) // @node_stack_top = 0.0, 18.75, 0.0, 0.0, 1.0, 0.0 diff --git a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-25.cfg index 87a3b2fc..0d9e06e8 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-25.cfg @@ -5,7 +5,7 @@ // - Rockomax X200-32 Fuel Tank (Rockomax32_BW) // - Rockomax X200-8 Fuel Tank (Rockomax8BW) -@PART[Rockomax8BW]:HAS[RestockIgnore[]] +@PART[Rockomax8BW]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -79,7 +79,7 @@ } } -@PART[Rockomax32_BW]:HAS[RestockIgnore[]] +@PART[Rockomax32_BW]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -153,7 +153,7 @@ } } -@PART[Rockomax16_BW]:HAS[RestockIgnore[]] +@PART[Rockomax16_BW]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -227,7 +227,7 @@ } } -@PART[Rockomax64_BW]:HAS[RestockIgnore[]] +@PART[Rockomax64_BW]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-375.cfg b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-375.cfg index aa8ba5f7..4ae98ee5 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-375.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-375.cfg @@ -4,7 +4,7 @@ // - Kerbodyne S3-7200 Tank (Size3MediumTank) // - Kerbodyne S3-14400 Tank (Size3LargeTank) -@PART[Size3SmallTank]:HAS[RestockIgnore[]] +@PART[Size3SmallTank]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -64,7 +64,7 @@ } } -@PART[Size3MediumTank]:HAS[RestockIgnore[]] +@PART[Size3MediumTank]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -123,7 +123,7 @@ } } -@PART[Size3LargeTank]:HAS[RestockIgnore[]] +@PART[Size3LargeTank]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-radial.cfg b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-radial.cfg index 5a96a09e..5a74a615 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-radial.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-radial.cfg @@ -6,7 +6,7 @@ // Spherical Radial Tank -@PART[externalTankRound]:HAS[RestockIgnore[]] +@PART[externalTankRound]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -87,7 +87,7 @@ } } -@PART[externalTankCapsule]:HAS[RestockIgnore[]] +@PART[externalTankCapsule]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -168,7 +168,7 @@ } } -@PART[externalTankToroid]:HAS[RestockIgnore[]] +@PART[externalTankToroid]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-rcs.cfg b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-rcs.cfg index 74dec4f5..478a9ffa 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-rcs.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-rcs.cfg @@ -7,7 +7,7 @@ // - FL-R1 RCS Fuel Tank (RCSTank1-2) // Spherical Radial Tank -@PART[radialRCSTank]:HAS[RestockIgnore[]] +@PART[radialRCSTank]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -19,7 +19,7 @@ } // Capsule Radial Tank -@PART[rcsTankRadialLong]:HAS[RestockIgnore[]] +@PART[rcsTankRadialLong]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -31,7 +31,7 @@ } // 0.625m Tank -@PART[rcsTankMini]:HAS[RestockIgnore[]] +@PART[rcsTankMini]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -43,7 +43,7 @@ } // 1.25m Tank -@PART[RCSFuelTank]:HAS[RestockIgnore[]] +@PART[RCSFuelTank]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -55,7 +55,7 @@ } // 2.5m Tank -@PART[RCSTank1-2]:HAS[RestockIgnore[]] +@PART[RCSTank1-2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-xenon.cfg b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-xenon.cfg index 8686c575..e36ab9e4 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-xenon.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-xenon.cfg @@ -5,7 +5,7 @@ // - PB-X50R Xenon Container (xenonTankRadial) // Tiny Xenon tank -@PART[xenonTank]:HAS[RestockIgnore[]] +@PART[xenonTank]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -17,7 +17,7 @@ } // Small Xenon tank -@PART[xenonTankLarge]:HAS[RestockIgnore[]] +@PART[xenonTankLarge]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -29,7 +29,7 @@ } // Radial Xenon tank -@PART[xenonTankRadial]:HAS[RestockIgnore[]] +@PART[xenonTankRadial]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) //!mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Ground/restock-legs.cfg b/Distribution/Restock/GameData/ReStock/Patches/Ground/restock-legs.cfg index 31908e03..611453b0 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Ground/restock-legs.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Ground/restock-legs.cfg @@ -5,7 +5,7 @@ // - LT-2 Landing Strut (landingLeg1-2) // LT-05 Micro Landing Strut -@PART[miniLandingLeg]:HAS[RestockIgnore[]] +@PART[miniLandingLeg]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy @@ -104,7 +104,7 @@ } // LT-1 Landing Strut -@PART[landingLeg1]:HAS[RestockIgnore[]] +@PART[landingLeg1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy @@ -135,7 +135,7 @@ } // LT-2 Landing Strut -@PART[landingLeg1-2]:HAS[RestockIgnore[]] +@PART[landingLeg1-2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy diff --git a/Distribution/Restock/GameData/ReStock/Patches/Payload/restock-fairing-bases.cfg b/Distribution/Restock/GameData/ReStock/Patches/Payload/restock-fairing-bases.cfg index d0dc691c..cb04f3b5 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Payload/restock-fairing-bases.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Payload/restock-fairing-bases.cfg @@ -4,7 +4,7 @@ - AE-FF2 Airstream Protective Shell (2.5m) (fairingSize2) - AE-FF3 Airstream Protective Shell (3.75m) (fairingSize3) -@PART[fairingSize1]:HAS[RestockIgnore[]] +@PART[fairingSize1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -141,7 +141,7 @@ } } -@PART[fairingSize2]:HAS[RestockIgnore[]] +@PART[fairingSize2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -249,7 +249,7 @@ } // 3.75m fairing -@PART[fairingSize3]:HAS[RestockIgnore[]] +@PART[fairingSize3]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Payload/restock-service-bays.cfg b/Distribution/Restock/GameData/ReStock/Patches/Payload/restock-service-bays.cfg index 116f0b6a..23040408 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Payload/restock-service-bays.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Payload/restock-service-bays.cfg @@ -3,7 +3,7 @@ - Service Bay (1.25m) (ServiceBay_125_v2) - Service Bay (2.5m) (ServiceBay_250) -@PART[ServiceBay_125_v2]:HAS[RestockIgnore[]] +@PART[ServiceBay_125_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -76,7 +76,7 @@ } } -@PART[ServiceBay_250_v2]:HAS[RestockIgnore[]] +@PART[ServiceBay_250_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-drills.cfg b/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-drills.cfg index cfe8bec1..5fe059c0 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-drills.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-drills.cfg @@ -4,7 +4,7 @@ // - Drill-O-Matic Junior' Mining Excavator (MiniDrill) // Drill-O-Matic' Mining Excavator -@PART[RadialDrill]:HAS[RestockIgnore[]] +@PART[RadialDrill]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy @@ -72,7 +72,7 @@ } // Drill-O-Matic Junior' Mining Excavator -@PART[MiniDrill]:HAS[RestockIgnore[]] +@PART[MiniDrill]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy diff --git a/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-isrus.cfg b/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-isrus.cfg index 981b6c8b..fd8e64c0 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-isrus.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-isrus.cfg @@ -4,7 +4,7 @@ // - Convert-O-Tron 250 (ISRU) // Convert-O-Tron 125 -@PART[MiniISRU]:HAS[RestockIgnore[]] +@PART[MiniISRU]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy @@ -55,7 +55,7 @@ } // Convert-O-Tron 250 -@PART[ISRU]:HAS[RestockIgnore[]] +@PART[ISRU]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy diff --git a/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-oretanks.cfg b/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-oretanks.cfg index 37352fb9..ad7a6be6 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-oretanks.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-oretanks.cfg @@ -5,7 +5,7 @@ // - Large Holding Tank (LargeTank) // Radial Holding Tank -@PART[RadialOreTank]:HAS[RestockIgnore[]] +@PART[RadialOreTank]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy @@ -17,7 +17,7 @@ } // Small Holding Tank -@PART[SmallTank]:HAS[RestockIgnore[]] +@PART[SmallTank]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy @@ -29,7 +29,7 @@ } // Large Holding Tank -@PART[LargeTank]:HAS[RestockIgnore[]] +@PART[LargeTank]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy diff --git a/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-scanners.cfg b/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-scanners.cfg index 48fc94f3..541437e6 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-scanners.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-scanners.cfg @@ -5,7 +5,7 @@ // - M4435 Narrow-Band Scanner (OrbitalScanner) // Surface Scanning Module -@PART[SurfaceScanner]:HAS[RestockIgnore[]] +@PART[SurfaceScanner]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy @@ -27,7 +27,7 @@ } // M700 Survey Scanner -@PART[SurveyScanner]:HAS[RestockIgnore[]] +@PART[SurveyScanner]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy @@ -118,7 +118,7 @@ } // M4435 Narrow-Band Scanner -@PART[OrbitalScanner]:HAS[RestockIgnore[]] +@PART[OrbitalScanner]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy diff --git a/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg b/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg index 34aa7d5f..20d76555 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg @@ -12,7 +12,7 @@ // Thermometer -@PART[sensorThermometer]:HAS[RestockIgnore[]] +@PART[sensorThermometer]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !mesh = DELETE @@ -23,7 +23,7 @@ } //Barometer -@PART[sensorBarometer]:HAS[RestockIgnore[]] +@PART[sensorBarometer]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !mesh = DELETE @@ -34,7 +34,7 @@ } // Accelerometer -@PART[sensorAccelerometer]:HAS[RestockIgnore[]] +@PART[sensorAccelerometer]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !mesh = DELETE @@ -45,7 +45,7 @@ } // Negative Gravioli Detector -@PART[sensorGravimeter]:HAS[RestockIgnore[]] +@PART[sensorGravimeter]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !mesh = DELETE @@ -56,7 +56,7 @@ } // Mystery Goo™ Containment Unit -@PART[GooExperiment]:HAS[RestockIgnore[]] +@PART[GooExperiment]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !mesh = DELETE @@ -98,7 +98,7 @@ } // SC-9001 Science Jr. -@PART[science_module]:HAS[RestockIgnore[]] +@PART[science_module]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !mesh = DELETE @@ -115,7 +115,7 @@ } // Atmospheric Fluid Spectro-Variometer -@PART[sensorAtmosphere]:HAS[RestockIgnore[]] +@PART[sensorAtmosphere]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !mesh = DELETE @@ -126,7 +126,7 @@ } // Experiment Storage Unit -@PART[ScienceBox]:HAS[RestockIgnore[]] +@PART[ScienceBox]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !MODEL {} @@ -137,7 +137,7 @@ } // SENTINEL Infrared Telescope -@PART[InfraredTelescope]:HAS[RestockIgnore[]] +@PART[InfraredTelescope]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !MODEL {} diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg index 28bb63af..bd4a6351 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-125.cfg @@ -8,7 +8,7 @@ // - TVR-1180C Mk1 Stack Tri-Coupler (stackTriCoupler_v2) // - TVR-2160C Mk2 Stack Quad-Coupler (stackQuadCoupler) -@PART[adapterSmallMiniTall]:HAS[RestockIgnore[]] +@PART[adapterSmallMiniTall]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -68,7 +68,7 @@ } } -@PART[adapterSmallMiniShort]:HAS[RestockIgnore[]] +@PART[adapterSmallMiniShort]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -147,7 +147,7 @@ } // 1.25m station hub -@PART[stationHub]:HAS[RestockIgnore[]] +@PART[stationHub]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -237,7 +237,7 @@ } // 1.25m radial attach point -@PART[stackPoint1]:HAS[RestockIgnore[]] +@PART[stackPoint1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -249,7 +249,7 @@ } // 1.25m Bicoupler -@PART[stackBiCoupler_v2]:HAS[RestockIgnore[]] +@PART[stackBiCoupler_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy @@ -334,7 +334,7 @@ } // 1.25m Tricoupler -@PART[stackTriCoupler_v2]:HAS[RestockIgnore[]] +@PART[stackTriCoupler_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy @@ -414,7 +414,7 @@ } // 1.25m Quadcoupler -@PART[stackQuadCoupler]:HAS[RestockIgnore[]] +@PART[stackQuadCoupler]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg index 6f627d5b..ef086542 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg @@ -6,7 +6,7 @@ // - TVR-300L Stack Tri-Adapter (adapterLargeSmallTri) // - TVR-400L Stack Quad-Adapter (adapterLargeSmallQuad) -@PART[largeAdapter]:HAS[RestockIgnore[]] +@PART[largeAdapter]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -55,7 +55,7 @@ } } -@PART[largeAdapter2]:HAS[RestockIgnore[]] +@PART[largeAdapter2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -117,7 +117,7 @@ } // 2.5m Bicoupler -@PART[adapterLargeSmallBi]:HAS[RestockIgnore[]] +@PART[adapterLargeSmallBi]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy @@ -197,7 +197,7 @@ } // 2.5m Tricoupler -@PART[adapterLargeSmallTri]:HAS[RestockIgnore[]] +@PART[adapterLargeSmallTri]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy @@ -277,7 +277,7 @@ } // 2.5m Quadcoupler -@PART[adapterLargeSmallQuad]:HAS[RestockIgnore[]] +@PART[adapterLargeSmallQuad]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg index fba8638d..a2dc2ace 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg @@ -2,7 +2,7 @@ // Contents: // - Kerbodyne ADTP-2-3 (Size3to2Adapter_v2) -@PART[Size3To2Adapter_v2]:HAS[RestockIgnore[]] +@PART[Size3To2Adapter_v2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-launchclamp.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-launchclamp.cfg index 3e192cdd..f5bc94d4 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-launchclamp.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-launchclamp.cfg @@ -4,7 +4,7 @@ // TT18-A Launch Stability Enhancer -@PART[launchClamp1]:HAS[RestockIgnore[]] +@PART[launchClamp1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-truss.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-truss.cfg index 400ff856..ec7e5d5f 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-truss.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-truss.cfg @@ -13,7 +13,7 @@ // - M-2x2 Structural Panel (structuralPanel2) // Cubic strut -@PART[strutCube]:HAS[RestockIgnore[]] +@PART[strutCube]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -28,7 +28,7 @@ } // Micronode -@PART[structuralMiniNode]:HAS[RestockIgnore[]] +@PART[structuralMiniNode]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -43,7 +43,7 @@ } // Octo-Strut -@PART[strutOcto]:HAS[RestockIgnore[]] +@PART[strutOcto]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -58,7 +58,7 @@ } // Modular Girder -@PART[trussPiece1x]:HAS[RestockIgnore[]] +@PART[trussPiece1x]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -101,7 +101,7 @@ } // Modular Girder XL -@PART[trussPiece3x]:HAS[RestockIgnore[]] +@PART[trussPiece3x]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -144,7 +144,7 @@ } // Modular Girder Adapter -@PART[trussAdapter]:HAS[RestockIgnore[]] +@PART[trussAdapter]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -159,7 +159,7 @@ } // I beam -@PART[structuralIBeam2]:HAS[RestockIgnore[]] +@PART[structuralIBeam2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -217,7 +217,7 @@ } // Short I beam -@PART[structuralIBeam3]:HAS[RestockIgnore[]] +@PART[structuralIBeam3]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -275,7 +275,7 @@ } // Wide I beam -@PART[structuralIBeam1]:HAS[RestockIgnore[]] +@PART[structuralIBeam1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -333,7 +333,7 @@ } // Small structural panel -@PART[structuralPanel1]:HAS[RestockIgnore[]] +@PART[structuralPanel1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -449,7 +449,7 @@ } // large structural panel -@PART[structuralPanel2]:HAS[RestockIgnore[]] +@PART[structuralPanel2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg b/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg index 6adca4ea..9596957e 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg @@ -6,7 +6,7 @@ - Heat Shield (3.75m) (HeatShield3) - Heat Shield (10m) (InflatableHeatShield) -@PART[HeatShield0]:HAS[RestockIgnore[]] +@PART[HeatShield0]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -83,7 +83,7 @@ } } -@PART[HeatShield1]:HAS[RestockIgnore[]] +@PART[HeatShield1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -150,7 +150,7 @@ } } -@PART[HeatShield2]:HAS[RestockIgnore[]] +@PART[HeatShield2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -218,7 +218,7 @@ } } -@PART[HeatShield3]:HAS[RestockIgnore[]] +@PART[HeatShield3]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-radiators.cfg b/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-radiators.cfg index 891478f6..6a7e7280 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-radiators.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-radiators.cfg @@ -8,7 +8,7 @@ // - Thermal Control System (large) (foldingRadLarge) // Edge radiator -@PART[radPanelEdge]:HAS[RestockIgnore[]] +@PART[radPanelEdge]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -50,7 +50,7 @@ } // Small Static radiator -@PART[radPanelSm]:HAS[RestockIgnore[]] +@PART[radPanelSm]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -135,7 +135,7 @@ } // Large static radiator -@PART[radPanelLg]:HAS[RestockIgnore[]] +@PART[radPanelLg]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -219,7 +219,7 @@ } // Small deployable radiator -@PART[foldingRadSmall]:HAS[RestockIgnore[]] +@PART[foldingRadSmall]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -268,7 +268,7 @@ } // Medium deployable radiator -@PART[foldingRadMed]:HAS[RestockIgnore[]] +@PART[foldingRadMed]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -317,7 +317,7 @@ } // Large deployable radiator -@PART[foldingRadLarge]:HAS[RestockIgnore[]] +@PART[foldingRadLarge]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Utility/restock-ladders.cfg b/Distribution/Restock/GameData/ReStock/Patches/Utility/restock-ladders.cfg index d996ab22..702fa9d9 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Utility/restock-ladders.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Utility/restock-ladders.cfg @@ -5,7 +5,7 @@ // - Kelus-LV Bay Mobility Enhancer (telescopicLadderBay) // Static Ladder -@PART[ladder1]:HAS[RestockIgnore[]] +@PART[ladder1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -20,7 +20,7 @@ } // Small ladder -@PART[telescopicLadder]:HAS[RestockIgnore[]] +@PART[telescopicLadder]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -47,7 +47,7 @@ } // Big ladder -@PART[telescopicLadderBay]:HAS[RestockIgnore[]] +@PART[telescopicLadderBay]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/Patches/Utility/restock-parachutes.cfg b/Distribution/Restock/GameData/ReStock/Patches/Utility/restock-parachutes.cfg index 97f36c6f..35d29960 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Utility/restock-parachutes.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Utility/restock-parachutes.cfg @@ -8,7 +8,7 @@ // Large chute -@PART[parachuteLarge]:HAS[RestockIgnore[]] +@PART[parachuteLarge]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -36,7 +36,7 @@ } // Large drogue chute -@PART[parachuteDrogue]:HAS[RestockIgnore[]] +@PART[parachuteDrogue]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -64,7 +64,7 @@ } // 0.625m chute -@PART[parachuteSingle]:HAS[RestockIgnore[]] +@PART[parachuteSingle]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @rescaleFactor = 1.0 @scale = 1.0 @@ -96,7 +96,7 @@ } // Radial chute -@PART[parachuteRadial]:HAS[RestockIgnore[]] +@PART[parachuteRadial]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -125,7 +125,7 @@ } // Radial drogue chute -@PART[radialDrogue]:HAS[RestockIgnore[]] +@PART[radialDrogue]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @rescaleFactor = 1.0 @scale = 1.0 diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-heat-shields.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-heat-shields.cfg index d7342779..989684e3 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-heat-shields.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-heat-shields.cfg @@ -2,7 +2,7 @@ // Contents: - Heat Shield (1.875m) (HeatShield1p5) -@PART[HeatShield1p5]:HAS[RestockIgnore[]] +@PART[HeatShield1p5]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-nosecones.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-nosecones.cfg index ae3d81b6..97d888c1 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-nosecones.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-nosecones.cfg @@ -2,7 +2,7 @@ // Contents: - Protective Rocket Nosecone Mk5A (Size_1_5_Cone) -@PART[Size_1_5_Cone]:HAS[RestockIgnore[]] +@PART[Size_1_5_Cone]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg index 2d3e231a..5f1f86eb 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg @@ -4,7 +4,7 @@ - Size 1.5 Decoupler (Size1p5_Strut_Decoupler) // TD-18 Decoupler -@PART[Decoupler_1p5]:HAS[RestockIgnore[]] +@PART[Decoupler_1p5]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -66,7 +66,7 @@ } // Truss Decoupler -@PART[Size1p5_Strut_Decoupler]:HAS[RestockIgnore[]] +@PART[Size1p5_Strut_Decoupler]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-separators.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-separators.cfg index 83448d8f..0c6c9e19 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-separators.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-separators.cfg @@ -3,7 +3,7 @@ - TS-18 Separator (Separator_1p5) // TS-18 Separator -@PART[Separator_1p5]:HAS[RestockIgnore[]] +@PART[Separator_1p5]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg index f6863b3a..a8ffa778 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg @@ -5,7 +5,7 @@ // - RE-I2 "Skiff" Liquid Fuel Engine (LiquidEngineRE-I2) // Kodiak -@PART[LiquidEngineRK-7]:HAS[RestockIgnore[]] +@PART[LiquidEngineRK-7]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -538,7 +538,7 @@ } // Wolfhound -@PART[LiquidEngineRE-J10]:HAS[RestockIgnore[]] +@PART[LiquidEngineRE-J10]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -1013,7 +1013,7 @@ } // Skiff -@PART[LiquidEngineRE-I2]:HAS[RestockIgnore[]] +@PART[LiquidEngineRE-I2]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-radial.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-radial.cfg index ceb8496c..cc3ed704 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-radial.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-radial.cfg @@ -3,7 +3,7 @@ // - RV-1 "Cub" Vernier Engine (LiquidEngineRV-1) // Cub -@PART[LiquidEngineRV-1]:HAS[RestockIgnore[]] +@PART[LiquidEngineRV-1]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-srb-1875.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-srb-1875.cfg index f9a89fd1..2548bcd5 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-srb-1875.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-srb-1875.cfg @@ -3,7 +3,7 @@ // - THK 'Pollux' SRB (Pollux) // THK 'Pollux' SRB -@PART[Pollux]:HAS[RestockIgnore[]] +@PART[Pollux]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-1875.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-1875.cfg index b0677dec..0f04f3d0 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-1875.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-1875.cfg @@ -11,7 +11,7 @@ // - FL-A215 Fuel Tank Adapter (Size1p5_Size2_Adapter_01) // Long 1.875m tank -@PART[Size1p5_Tank_04]:HAS[RestockIgnore[]] +@PART[Size1p5_Tank_04]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -73,7 +73,7 @@ } // Med 1.875m tank -@PART[Size1p5_Tank_03]:HAS[RestockIgnore[]] +@PART[Size1p5_Tank_03]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -134,7 +134,7 @@ } // Small 1.875m tank -@PART[Size1p5_Tank_02]:HAS[RestockIgnore[]] +@PART[Size1p5_Tank_02]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -195,7 +195,7 @@ } // Tiny 1.875m tank -@PART[Size1p5_Tank_01]:HAS[RestockIgnore[]] +@PART[Size1p5_Tank_01]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -256,7 +256,7 @@ } // Soyuz 1.875m tank -@PART[Size1p5_Tank_05]:HAS[RestockIgnore[]] +@PART[Size1p5_Tank_05]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -381,7 +381,7 @@ } // Adapter - 1.875 to 1.25m Short -@PART[Size1p5_Size1_Adapter_02]:HAS[RestockIgnore[]] +@PART[Size1p5_Size1_Adapter_02]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -443,7 +443,7 @@ } // Adapter - 1.875 to 1.25m Long -@PART[Size1p5_Size1_Adapter_01]:HAS[RestockIgnore[]] +@PART[Size1p5_Size1_Adapter_01]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -505,7 +505,7 @@ // Adapter - 1.875 to 0.625m -@PART[Size1p5_Size0_Adapter_01]:HAS[RestockIgnore[]] +@PART[Size1p5_Size0_Adapter_01]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -567,7 +567,7 @@ // Adapter - 2.5 to 1.875m -@PART[Size1p5_Size2_Adapter_01]:HAS[RestockIgnore[]] +@PART[Size1p5_Size2_Adapter_01]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-rcs.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-rcs.cfg index 7abd79b0..7c2be83b 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-rcs.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/FuelTank/restock-mh-fueltanks-rcs.cfg @@ -4,7 +4,7 @@ // - FL-R5 RCS Fuel Tank (Size1p5_Monoprop) // Spherical Radial Tiny Tank -@PART[monopropMiniSphere]:HAS[RestockIgnore[]] +@PART[monopropMiniSphere]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -15,7 +15,7 @@ } } // FL-R5 RCS Fuel Tank -@PART[Size1p5_Monoprop]:HAS[RestockIgnore[]] +@PART[Size1p5_Monoprop]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-fairing-bases.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-fairing-bases.cfg index 17479c49..846f5485 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-fairing-bases.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-fairing-bases.cfg @@ -2,7 +2,7 @@ // Contents: - AE-FF1.5 Airstream Protective Shell (1.875m) (fairingSize1p5) -@PART[fairingSize1p5]:HAS[RestockIgnore[]] +@PART[fairingSize1p5]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE diff --git a/Distribution/Restock/GameData/ReStock/RestockPatchDisabler.cfg b/Distribution/Restock/GameData/ReStock/RestockPatchDisabler.cfg index 00d0bc39..251e34b0 100644 --- a/Distribution/Restock/GameData/ReStock/RestockPatchDisabler.cfg +++ b/Distribution/Restock/GameData/ReStock/RestockPatchDisabler.cfg @@ -6,5 +6,5 @@ // @PART[yourPartName]:BEFORE[ReStock] //{ -// %RestockIgnore = True +// RestockIgnore = True //} \ No newline at end of file From 6d19b7e06029f027dd15297550dc69620b263d89 Mon Sep 17 00:00:00 2001 From: ChrisAdderley Date: Mon, 4 Nov 2019 14:09:22 -0800 Subject: [PATCH 2/6] Blacklist updates --- .../GameData/ReStock/Restock.restockblacklist | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist index c682d85c..65fc57a4 100644 --- a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist +++ b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist @@ -1,5 +1,5 @@ Squad/Parts/Aero/aerodynamicNoseCone/ - +Squad/Parts/Aero/basicFin/ Squad/Parts/Aero/cones/Assets/ConeA.mu Squad/Parts/Aero/cones/Assets/ConeB.mu Squad/Parts/Aero/cones/Assets/TinyCone.mu @@ -8,6 +8,9 @@ Squad/Parts/Aero/cones/Assets/ConesHeat*.dds Squad/Parts/Aero/fairings/fairingSize2.mu Squad/Parts/Aero/HeatShield/ Squad/Parts/Aero/InflatableHeatShield/ +Squad/Parts/Aero/wingletAV-R8/ +Squad/Parts/Aero/wingletAV-T1/ +Squad/Parts/Aero/wingletDeltaDeluxe/ Squad/Parts/Command/advancedSasModuleLarge/ Squad/Parts/Command/cupola/ Squad/Parts/Command/hitchhikerStorageContainer/ @@ -26,24 +29,25 @@ Squad/Parts/Command/probeStackSmall/ Squad/Parts/Command/probeStackSphere_v2/ Squad/Parts/Command/probeRoverBody_v2/ Squad/Parts/CompoundParts/ -Squad/Parts/Coupling/Assets/Decoupler_0.mu -Squad/Parts/Coupling/Assets/Decoupler_1.mu -Squad/Parts/Coupling/Assets/Decoupler_2.mu -Squad/Parts/Coupling/Assets/Decoupler_3.mu -Squad/Parts/Coupling/Assets/Separator_0.mu -Squad/Parts/Coupling/Assets/Separator_1.mu -Squad/Parts/Coupling/Assets/Separator_2.mu -Squad/Parts/Coupling/Assets/Separator_3.mu Squad/Parts/Electrical/RTG/ Squad/Parts/Electrical/z-100Battery/ Squad/Parts/Electrical/z-1kBattery/ Squad/Parts/Electrical/z-200Battery/ Squad/Parts/Electrical/z-400Battery/ Squad/Parts/Electrical/z-4kBattery/ +Squad/Parts/Electrical/1x6ShroudSolarPanels/ +Squad/Parts/Electrical/1x6SolarPanels/ +Squad/Parts/Electrical/3x2ShroudSolarPanels/ +Squad/Parts/Electrical/3x2SolarPanels/ +Squad/Parts/Electrical/gigantorXlSolarArray/ +Squad/Parts/Electrical/radialFlatSolarPanel/ Squad/Parts/Engine/ionEngine/ Squad/Parts/Engine/liquidEngine24-77/ +Squad/Parts/Engine/liquidEngine24-77_v2/ +Squad/Parts/Engine/liquidEngine48-7S/ Squad/Parts/Engine/liquidEngine48-7S_v2/ Squad/Parts/Engine/liquidEngineLV-1/ +Squad/Parts/Engine/liquidEngineLV-1_v2/ Squad/Parts/Engine/liquidEngineLV-1R/ Squad/Parts/Engine/liquidEngineLV-909_v2/ Squad/Parts/Engine/liquidEngineLV-N/ @@ -112,6 +116,7 @@ Squad/Parts/Utility/decouplerRadialTT-70/ Squad/Parts/Utility/ladderRadial/ Squad/Parts/Utility/ladderTelescopicBay/ Squad/Parts/Utility/ladderTelescopic/ +Squad/Parts/Utility/linearVernorRCS/ Squad/Parts/Utility/parachuteMk1/ Squad/Parts/Utility/parachuteMk12-R/ Squad/Parts/Utility/parachuteMk16-XL/ From d9f1454524719076659e3fa4723e0c6aac551d91 Mon Sep 17 00:00:00 2001 From: Poodmund Date: Mon, 4 Nov 2019 23:57:33 +0000 Subject: [PATCH 3/6] Improve variant scheme consistency --- .../GameData/ReStock/Localization/en-us.cfg | 14 +- .../Patches/Electrical/restock-fuelcells.cfg | 1 + .../Engine/restock-engines-liquid-0625.cfg | 2 +- .../Engine/restock-engines-liquid-125.cfg | 54 +-- .../Engine/restock-engines-liquid-25.cfg | 42 +- .../Coupling/restock-mh-decouplers.cfg | 12 +- .../Engine/restock-mh-engines-1875.cfg | 361 +++++++++--------- .../Engine/0625/restock-engine-torch.cfg | 14 +- .../Parts/Engine/125/restock-engine-pug.cfg | 18 +- .../Engine/125/restock-engine-valiant.cfg | 18 +- .../Engine/25/restock-engine-cherenkov.cfg | 4 +- .../0625/restock-fuel-tank-sphere-0625-1.cfg | 26 +- 12 files changed, 286 insertions(+), 280 deletions(-) diff --git a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg index 60f5417b..533c9c24 100644 --- a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg +++ b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg @@ -18,11 +18,11 @@ Localization #LOC_Restock_variant-engine_size0_white = 0.625m (White Shroud) #LOC_Restock_variant-engine_size0_grey-orange = 0.625m (Orange/Grey Shroud) #LOC_Restock_variant-engine_size1 = 1.25m - #LOC_Restock_variant-engine_size1_white = 1.25m (White Shroud) + #LOC_Restock_variant-engine_size1_white = 1.25m (White Shroud) #LOC_Restock_variant-engine_size1_grey-orange = 1.25m (Orange/Grey Shroud) #LOC_Restock_variant-engine_size1p5 = 1.875m - #LOC_Restock_variant-engine_size1p5_white = 1.875m (White Shroud) - #LOC_Restock_variant-engine_size1p5_grey-orange = 1.875m (Orange/Grey Shroud) + #LOC_Restock_variant-engine_size1p5_white = 1.875m (White Shroud) + #LOC_Restock_variant-engine_size1p5_grey-orange = 1.875m (Orange/Grey Shroud) #LOC_Restock_variant-engine_size2 = 2.5m #LOC_Restock_variant-engine_size2_white = 2.5m (White Shroud) #LOC_Restock_variant-engine_size2_grey-orange = 2.5m (Orange/Grey Shroud) @@ -33,13 +33,15 @@ Localization #LOC_Restock_variant-engine_radial = Radial #LOC_Restock_variant-engine_boattail = Boattail #LOC_Restock_variant-engine_boattail_white = Boattail (White) - #LOC_Restock_variant-engine_boattail_grey-orange = Boattail (Orange/Grey) + #LOC_Restock_variant-engine_boattail_grey-orange = Boattail (Orange/Grey) #LOC_Restock_variant-engine_boattail_size1 = Boattail (1.25m) #LOC_Restock_variant-engine_boattail_size1p5 = Boattail (1.875m) #LOC_Restock_variant-engine_boattail_size1_white = Boattail (1.25m, White) #LOC_Restock_variant-engine_boattail_size1p5_white = Boattail (1.875m, White) #LOC_Restock_variant-engine_boattail_size1_grey-orange = Boattail (1.25m, Orange/Grey) #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Boattail (1.875m, Orange/Grey) + #LOC_Restock_variant-engine_tankbutt_size1p5_white = Tankbutt (1.875m, White) + #LOC_Restock_variant-engine_tankbutt_size1p5_grey-orange = Tankbutt (1.875m, Orange/Grey) #LOC_Restock_variant-engine_shroud_white = White Shroud #LOC_Restock_variant-engine_shroud_grey-orange = Metallic Shroud @@ -76,11 +78,13 @@ Localization #LOC_Restock_variant-surface_basic = Basic #LOC_Restock_variant-surface_truss = Truss #LOC_Restock_variant-surface_thermalblankets = Insulated + + #LOC_Restock_variant-decoupler_metal = Metal + #LOC_Restock_variant-decoupler_grey-orange = Orange/Grey #LOC_Restock_variant-surface_yellow = Yellow #LOC_Restock_variant-surface_black = Black - #LOC_Restock_variant-service-bay-opaque = Solid Caps #LOC_Restock_variant-service-bay-transparent = Truss Caps #LOC_Restock_variant-service-bay-hollow = No Caps diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-fuelcells.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-fuelcells.cfg index 12260ed0..4d529847 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-fuelcells.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-fuelcells.cfg @@ -19,6 +19,7 @@ @PART[FuelCellArray]:HAS[~RestockIgnore[*]]:FOR[ReStock] { @author = Andrew Cassidy + @description = #LOC_Restock_description-FuelCellArray !MODEL {} MODEL diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg index 4abfa3ce..91e16fdb 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg @@ -577,7 +577,7 @@ { name = Size0 displayName = #LOC_Restock_variant-engine_size0_grey-orange - primaryColor = #666666 + primaryColor = #999999 secondaryColor = #f69449 GAMEOBJECTS { diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg index 9142c538..c4715da7 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg @@ -685,7 +685,7 @@ name = Size1 displayName = #LOC_Restock_variant-engine_size1_white primaryColor = #999999 - secondaryColor = #ffb80c + secondaryColor = #ffffff GAMEOBJECTS { LV_909_Boattail = false @@ -707,7 +707,7 @@ name = Boattail displayName = #LOC_Restock_variant-engine_boattail_white primaryColor = #ffffff - secondaryColor = #ffb80c + secondaryColor = #ffffff GAMEOBJECTS { LV_909_Boattail = true @@ -728,8 +728,8 @@ { name = Compact displayName = #LOC_Restock_variant-engine_compact_white - primaryColor = #999999 - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #ffffff GAMEOBJECTS { LV_909_Boattail = false @@ -750,8 +750,8 @@ { name = Size1_Alternate displayName = #LOC_Restock_variant-engine_size1_grey-orange - primaryColor = #666666 - secondaryColor = #ffb80c + primaryColor = #999999 + secondaryColor = #f69449 GAMEOBJECTS { LV_909_Boattail = false @@ -773,7 +773,7 @@ name = Boattail_Alternate displayName = #LOC_Restock_variant-engine_boattail_grey-orange primaryColor = #666666 - secondaryColor = #ffb80c + secondaryColor = #666666 GAMEOBJECTS { LV_909_Boattail = true @@ -794,8 +794,8 @@ { name = Compact_Alternate displayName = #LOC_Restock_variant-engine_compact_grey-orange - primaryColor = #6f6e6d - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #f69449 GAMEOBJECTS { LV_909_Boattail = false @@ -1039,7 +1039,7 @@ name = Size1 displayName = #LOC_Restock_variant-engine_size1_white primaryColor = #999999 - secondaryColor = #ffb80c + secondaryColor = #ffffff GAMEOBJECTS { LV_T30_Basic = true @@ -1061,7 +1061,7 @@ name = Boattail displayName = #LOC_Restock_variant-engine_boattail_white primaryColor = #ffffff - secondaryColor = #ffb80c + secondaryColor = #ffffff GAMEOBJECTS { LV_T30_Basic = false @@ -1082,8 +1082,8 @@ { name = Compact displayName = #LOC_Restock_variant-engine_compact_white - primaryColor = #999999 - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #ffffff GAMEOBJECTS { LV_T30_Basic = false @@ -1104,8 +1104,8 @@ { name = Size1_Alternate displayName = #LOC_Restock_variant-engine_size1_grey-orange - primaryColor = #6f6e6d - secondaryColor = #ffb80c + primaryColor = #999999 + secondaryColor = #f69449 GAMEOBJECTS { LV_T30_Basic = true @@ -1127,7 +1127,7 @@ name = Boattail_Alternate displayName = #LOC_Restock_variant-engine_boattail_grey-orange primaryColor = #666666 - secondaryColor = #ffb80c + secondaryColor = #666666 GAMEOBJECTS { LV_T30_Basic = false @@ -1148,8 +1148,8 @@ { name = Compact_Alternate displayName = #LOC_Restock_variant-engine_compact_grey-orange - primaryColor = #6f6e6d - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #f69449 GAMEOBJECTS { LV_T30_Basic = false @@ -1378,7 +1378,7 @@ name = Size1 displayName = #LOC_Restock_variant-engine_size1_white primaryColor = #999999 - secondaryColor = #ffb80c + secondaryColor = #ffffff GAMEOBJECTS { LV_T45_Boattail = false @@ -1406,7 +1406,7 @@ name = Boattail displayName = #LOC_Restock_variant-engine_boattail_white primaryColor = #ffffff - secondaryColor = #ffb80c + secondaryColor = #ffffff GAMEOBJECTS { LV_T45_Boattail = true @@ -1433,8 +1433,8 @@ { name = Compact displayName = #LOC_Restock_variant-engine_compact_white - primaryColor = #999999 - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #ffffff GAMEOBJECTS { LV_T45_Boattail = false @@ -1461,8 +1461,8 @@ { name = Size1_Alternate displayName = #LOC_Restock_variant-engine_size1_grey-orange - primaryColor = #666666 - secondaryColor = #ffb80c + primaryColor = #999999 + secondaryColor = #f69449 GAMEOBJECTS { LV_T45_Boattail = false @@ -1490,7 +1490,7 @@ name = Boattail_Alternate displayName = #LOC_Restock_variant-engine_boattail_grey-orange primaryColor = #666666 - secondaryColor = #ffb80c + secondaryColor = #666666 GAMEOBJECTS { LV_T45_Boattail = true @@ -1518,8 +1518,8 @@ { name = Compact_Alternate displayName = #LOC_Restock_variant-engine_compact_grey-orange - primaryColor = #6f6e6d - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #f69449 GAMEOBJECTS { LV_T45_Boattail = false diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg index 2c61f4b5..7fd943d9 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg @@ -261,7 +261,7 @@ name = Size2 displayName = #LOC_Restock_variant-engine_size2_white primaryColor = #999999 - secondaryColor = #f69449 + secondaryColor = #ffffff GAMEOBJECTS { Mainsail_Boattail = false @@ -282,7 +282,7 @@ name = Boattail displayName = #LOC_Restock_variant-engine_boattail_white primaryColor = #ffffff - secondaryColor = #f69449 + secondaryColor = #ffffff GAMEOBJECTS { Mainsail_Boattail = true @@ -302,8 +302,8 @@ { name = Compact displayName = #LOC_Restock_variant-engine_compact_white - primaryColor = #999999 - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #ffffff GAMEOBJECTS { Mainsail_Boattail = false @@ -323,8 +323,8 @@ { name = Size2_Alternate displayName = #LOC_Restock_variant-engine_size2_grey-orange - primaryColor = #666666 - secondaryColor = #666666 + primaryColor = #999999 + secondaryColor = #f69449 GAMEOBJECTS { Mainsail_Boattail = false @@ -345,7 +345,7 @@ name = Boattail_Alternate displayName = #LOC_Restock_variant-engine_boattail_grey-orange primaryColor = #666666 - secondaryColor = #f69449 + secondaryColor = #666666 GAMEOBJECTS { Mainsail_Boattail = true @@ -366,7 +366,7 @@ name = Compact_Alternate displayName = #LOC_Restock_variant-engine_compact_grey-orange primaryColor = #666666 - secondaryColor = #999999 + secondaryColor = #f69449 GAMEOBJECTS { Mainsail_Boattail = false @@ -688,8 +688,8 @@ { name = Size2 displayName = #LOC_Restock_variant-engine_size2_white - primaryColor = #ffffff - secondaryColor = #f69449 + primaryColor = #999999 + secondaryColor = #ffffff GAMEOBJECTS { Poodle_25 = true @@ -710,8 +710,8 @@ { name = Compact displayName = #LOC_Restock_variant-engine_compact_white - primaryColor = #999999 - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #ffffff GAMEOBJECTS { Poodle_25 = false @@ -732,7 +732,7 @@ { name = Size2_Alternate displayName = #LOC_Restock_variant-engine_size2_grey-orange - primaryColor = #666666 + primaryColor = #999999 secondaryColor = #f69449 GAMEOBJECTS { @@ -755,7 +755,7 @@ name = Compact_Alternate displayName = #LOC_Restock_variant-engine_compact_grey-orange primaryColor = #666666 - secondaryColor = #999999 + secondaryColor = #f69449 GAMEOBJECTS { Poodle_25 = false @@ -1049,7 +1049,7 @@ name = Size2 displayName = #LOC_Restock_variant-engine_size2_white primaryColor = #999999 - secondaryColor = #f69449 + secondaryColor = #ffffff GAMEOBJECTS { ActutatorCpt_Bottom001 = false @@ -1076,7 +1076,7 @@ name = Boattail displayName = #LOC_Restock_variant-engine_boattail_white primaryColor = #ffffff - secondaryColor = #f69449 + secondaryColor = #ffffff GAMEOBJECTS { ActutatorCpt_Bottom001 = false @@ -1102,8 +1102,8 @@ { name = Compact displayName = #LOC_Restock_variant-engine_compact_white - primaryColor = #999999 - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #ffffff GAMEOBJECTS { ActutatorCpt_Bottom001 = true @@ -1129,7 +1129,7 @@ { name = Size2_Alternate displayName = #LOC_Restock_variant-engine_size2_grey-orange - primaryColor = #666666 + primaryColor = #999999 secondaryColor = #f69449 GAMEOBJECTS { @@ -1157,7 +1157,7 @@ name = Boattail_Alternate displayName = #LOC_Restock_variant-engine_boattail_grey-orange primaryColor = #666666 - secondaryColor = #f69449 + secondaryColor = #666666 GAMEOBJECTS { ActutatorCpt_Bottom001 = false @@ -1184,7 +1184,7 @@ name = Compact_Alternate displayName = #LOC_Restock_variant-engine_compact_grey-orange primaryColor = #666666 - secondaryColor = #999999 + secondaryColor = #f69449 GAMEOBJECTS { ActutatorCpt_Bottom001 = true diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg index 5f1f86eb..ce1d25cc 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-decouplers.cfg @@ -87,9 +87,9 @@ VARIANT { name = Gray - displayName = #autoLOC_8007101 - primaryColor = #212121 - secondaryColor = #212121 + displayName = #LOC_Restock_variant-decoupler_metal + primaryColor = #999999 + secondaryColor = #666666 themeName = Gray GAMEOBJECTS { @@ -100,9 +100,9 @@ VARIANT { name = Orange - displayName = #autoLOC_8007100 // autoLOC_8007100 = Orange - primaryColor = #dc5a28 - secondaryColor = #dc5a28 + displayName = #LOC_Restock_variant-decoupler_grey-orange + primaryColor = #666666 + secondaryColor = #f69449 themeName = Orange GAMEOBJECTS { diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg index a8ffa778..def0ce08 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg @@ -105,83 +105,14 @@ MODULE { name = ModulePartVariants - baseVariant = Size1p5Bare - VARIANT - { - name = Bare - displayName = #LOC_Restock_variant-engine_compact_white - primaryColor = #999999 - secondaryColor = #999999 - GAMEOBJECTS - { - Kodiak1875 = false - Kodiak125 = false - KodiakCompact = true - UrsaBoattail125 = false - UrsaBoattail1875 = false - UrsaBoattailCommon = false - UrsaShroud1875 = false - UrsaShroud125 = false - Shroud1p5x2 = true - Shroud1x0 = false - Shroud1p5x0 = false - - UrsaShroud1875White = false - UrsaShroud1875Orange = false - UrsaShroud125White = false - UrsaShroud125Orange = false - Shroud1p5x2White = true - Shroud1p5x2Orange = false - UrsaBoattail1875Orange = false - UrsaBoattail125Orange = false - } - NODES - { - node_stack_bottom = 0.0, -1.125, 0.0, 0.0, -1.0, 0.0, 1 - } - } - VARIANT - { - // 1.25 covered - name = ShroudSmall - displayName = #LOC_Restock_variant-engine_boattail_size1_white - primaryColor = #ffffff - secondaryColor = #f69449 - GAMEOBJECTS - { - Kodiak1875 = false - Kodiak125 = false - KodiakCompact = false - UrsaBoattail125 = true - UrsaBoattail1875 = false - UrsaBoattailCommon = true - UrsaShroud1875 = false - UrsaShroud125 = false - Shroud1p5x2 = false - Shroud1x0 = true - Shroud1p5x0 = false - - UrsaShroud1875White = false - UrsaShroud1875Orange = false - UrsaShroud125White = false - UrsaShroud125Orange = false - Shroud1p5x2White = false - Shroud1p5x2Orange = false - UrsaBoattail1875Orange = false - UrsaBoattail125Orange = false - } - NODES - { - node_stack_bottom = 0.0, -1.292, 0.0, 0.0, -1.0, 0.0, 1 - } - } + baseVariant = Size1Bare VARIANT { // 1.25 bare name = Size1Bare displayName = #LOC_Restock_variant-engine_size1_white primaryColor = #999999 - secondaryColor = #f69449 + secondaryColor = #ffffff GAMEOBJECTS { Kodiak1875 = false @@ -211,12 +142,82 @@ } } VARIANT + { + // 1.25 covered + name = ShroudSmall + displayName = #LOC_Restock_variant-engine_boattail_size1_white + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + Kodiak1875 = false + Kodiak125 = false + KodiakCompact = false + UrsaBoattail125 = true + UrsaBoattail1875 = false + UrsaBoattailCommon = true + UrsaShroud1875 = false + UrsaShroud125 = false + Shroud1p5x2 = false + Shroud1x0 = true + Shroud1p5x0 = false + + UrsaShroud1875White = false + UrsaShroud1875Orange = false + UrsaShroud125White = false + UrsaShroud125Orange = false + Shroud1p5x2White = false + Shroud1p5x2Orange = false + UrsaBoattail1875Orange = false + UrsaBoattail125Orange = false + } + NODES + { + node_stack_bottom = 0.0, -1.292, 0.0, 0.0, -1.0, 0.0, 1 + } + } + VARIANT + { + // 1.875 bare + name = Size1p5Bare + displayName = #LOC_Restock_variant-engine_size1p5_white + primaryColor = #999999 + secondaryColor = #ffffff + GAMEOBJECTS + { + Kodiak1875 = true + Kodiak125 = false + KodiakCompact = false + UrsaBoattail125 = false + UrsaBoattail1875 = false + UrsaBoattailCommon = false + UrsaShroud1875 = true + UrsaShroud125 = false + Shroud1p5x2 = false + Shroud1x0 = false + Shroud1p5x0 = false + + UrsaShroud1875White = true + UrsaShroud1875Orange = false + UrsaShroud125White = false + UrsaShroud125Orange = false + Shroud1p5x2White = false + Shroud1p5x2Orange = false + UrsaBoattail1875Orange = false + UrsaBoattail125Orange = false + } + NODES + { + node_stack_bottom = 0.0, -1.3, 0.0, 0.0, -1.0, 0.0, 1 + } + } + VARIANT { // 1.875 covered name = ShroudBig displayName = #LOC_Restock_variant-engine_boattail_size1p5_white primaryColor = #ffffff - secondaryColor = #f69449 + secondaryColor = #ffffff sizeGroup = GroupB GAMEOBJECTS { @@ -248,44 +249,9 @@ } VARIANT { - // 1.875 bare - name = Size1p5Bare - displayName = #LOC_Restock_variant-engine_size1p5_white - primaryColor = #999999 - secondaryColor = #f69449 - GAMEOBJECTS - { - Kodiak1875 = true - Kodiak125 = false - KodiakCompact = false - UrsaBoattail125 = false - UrsaBoattail1875 = false - UrsaBoattailCommon = false - UrsaShroud1875 = true - UrsaShroud125 = false - Shroud1p5x2 = false - Shroud1x0 = false - Shroud1p5x0 = false - - UrsaShroud1875White = true - UrsaShroud1875Orange = false - UrsaShroud125White = false - UrsaShroud125Orange = false - Shroud1p5x2White = false - Shroud1p5x2Orange = false - UrsaBoattail1875Orange = false - UrsaBoattail125Orange = false - } - NODES - { - node_stack_bottom = 0.0, -1.3, 0.0, 0.0, -1.0, 0.0, 1 - } - } - VARIANT - { - name = Bare_Alternate - displayName = #LOC_Restock_variant-engine_compact_grey-orange - primaryColor = #999999 + name = Bare + displayName = #LOC_Restock_variant-engine_compact_white + primaryColor = #666666 secondaryColor = #999999 GAMEOBJECTS { @@ -305,8 +271,8 @@ UrsaShroud1875Orange = false UrsaShroud125White = false UrsaShroud125Orange = false - Shroud1p5x2White = false - Shroud1p5x2Orange = true + Shroud1p5x2White = true + Shroud1p5x2Orange = false UrsaBoattail1875Orange = false UrsaBoattail125Orange = false } @@ -316,41 +282,6 @@ } } VARIANT - { - // 1.25 covered - name = ShroudSmall_Alternate - displayName = #LOC_Restock_variant-engine_boattail_size1_grey-orange - primaryColor = #ffffff - secondaryColor = #f69449 - GAMEOBJECTS - { - Kodiak1875 = false - Kodiak125 = false - KodiakCompact = false - UrsaBoattail125 = false - UrsaBoattail1875 = false - UrsaBoattailCommon = true - UrsaShroud1875 = false - UrsaShroud125 = false - Shroud1p5x2 = false - Shroud1x0 = true - Shroud1p5x0 = false - - UrsaShroud1875White = false - UrsaShroud1875Orange = false - UrsaShroud125White = false - UrsaShroud125Orange = false - Shroud1p5x2White = false - Shroud1p5x2Orange = false - UrsaBoattail1875Orange = false - UrsaBoattail125Orange = true - } - NODES - { - node_stack_bottom = 0.0, -1.292, 0.0, 0.0, -1.0, 0.0, 1 - } - } - VARIANT { // 1.25 bare name = Size1Bare_Alternate @@ -387,12 +318,11 @@ } VARIANT { - // 1.875 covered - name = ShroudBig_Alternate - displayName = #LOC_Restock_variant-engine_boattail_size1p5_grey-orange - primaryColor = #ffffff + // 1.25 covered + name = ShroudSmall_Alternate + displayName = #LOC_Restock_variant-engine_boattail_size1_grey-orange + primaryColor = #666666 secondaryColor = #f69449 - sizeGroup = GroupB GAMEOBJECTS { Kodiak1875 = false @@ -404,8 +334,8 @@ UrsaShroud1875 = false UrsaShroud125 = false Shroud1p5x2 = false - Shroud1x0 = false - Shroud1p5x0 = true + Shroud1x0 = true + Shroud1p5x0 = false UrsaShroud1875White = false UrsaShroud1875Orange = false @@ -413,12 +343,12 @@ UrsaShroud125Orange = false Shroud1p5x2White = false Shroud1p5x2Orange = false - UrsaBoattail1875Orange = true - UrsaBoattail125Orange = false + UrsaBoattail1875Orange = false + UrsaBoattail125Orange = true } NODES { - node_stack_bottom = 0.0, -1.3, 0.0, 0.0, -1.0, 0.0, 2 + node_stack_bottom = 0.0, -1.292, 0.0, 0.0, -1.0, 0.0, 1 } } VARIANT @@ -456,6 +386,76 @@ node_stack_bottom = 0.0, -1.3, 0.0, 0.0, -1.0, 0.0, 1 } } + VARIANT + { + // 1.875 covered + name = ShroudBig_Alternate + displayName = #LOC_Restock_variant-engine_boattail_size1p5_grey-orange + primaryColor = #666666 + secondaryColor = #f69449 + sizeGroup = GroupB + GAMEOBJECTS + { + Kodiak1875 = false + Kodiak125 = false + KodiakCompact = false + UrsaBoattail125 = false + UrsaBoattail1875 = false + UrsaBoattailCommon = true + UrsaShroud1875 = false + UrsaShroud125 = false + Shroud1p5x2 = false + Shroud1x0 = false + Shroud1p5x0 = true + + UrsaShroud1875White = false + UrsaShroud1875Orange = false + UrsaShroud125White = false + UrsaShroud125Orange = false + Shroud1p5x2White = false + Shroud1p5x2Orange = false + UrsaBoattail1875Orange = true + UrsaBoattail125Orange = false + } + NODES + { + node_stack_bottom = 0.0, -1.3, 0.0, 0.0, -1.0, 0.0, 2 + } + } + VARIANT + { + name = Bare_Alternate + displayName = #LOC_Restock_variant-engine_compact_grey-orange + primaryColor = #666666 + secondaryColor = #999999 + GAMEOBJECTS + { + Kodiak1875 = false + Kodiak125 = false + KodiakCompact = true + UrsaBoattail125 = false + UrsaBoattail1875 = false + UrsaBoattailCommon = false + UrsaShroud1875 = false + UrsaShroud125 = false + Shroud1p5x2 = true + Shroud1x0 = false + Shroud1p5x0 = false + + UrsaShroud1875White = false + UrsaShroud1875Orange = false + UrsaShroud125White = false + UrsaShroud125Orange = false + Shroud1p5x2White = false + Shroud1p5x2Orange = true + UrsaBoattail1875Orange = false + UrsaBoattail125Orange = false + } + NODES + { + node_stack_bottom = 0.0, -1.125, 0.0, 0.0, -1.0, 0.0, 1 + } + } } MODULE { @@ -644,13 +644,13 @@ MODULE { name = ModulePartVariants - baseVariant = Size1p5 + baseVariant = Shroud VARIANT { name = Shroud displayName = #LOC_Restock_variant-mounting_classic_white - primaryColor = #999999 - secondaryColor = #000000 + primaryColor = #111111 + secondaryColor = #ffffff GAMEOBJECTS { WH_25 = false @@ -683,7 +683,7 @@ name = Size2 displayName = #LOC_Restock_variant-engine_size2_white primaryColor = #999999 - secondaryColor = #f69449 + secondaryColor = #ffffff GAMEOBJECTS { WH_25 = true @@ -716,7 +716,7 @@ name = Size1p5 displayName = #LOC_Restock_variant-engine_size1p5_white primaryColor = #999999 - secondaryColor = #f69449 + secondaryColor = #ffffff GAMEOBJECTS { WH_25 = false @@ -748,8 +748,8 @@ { name = Bare displayName = #LOC_Restock_variant-engine_compact_white - primaryColor = #999999 - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #ffffff GAMEOBJECTS { WH_25 = false @@ -781,8 +781,8 @@ { name = Shroud_Alternate displayName = #LOC_Restock_variant-mounting_classic_grey-orange - primaryColor = #999999 - secondaryColor = #000000 + primaryColor = #111111 + secondaryColor = #f69449 GAMEOBJECTS { WH_25 = false @@ -847,6 +847,7 @@ { name = Size1p5_Alternate displayName = #LOC_Restock_variant-engine_size1p5_grey-orange + primaryColor = #999999 secondaryColor = #f69449 GAMEOBJECTS { @@ -879,8 +880,8 @@ { name = Bare_Alternate displayName = #LOC_Restock_variant-engine_compact_grey-orange - primaryColor = #999999 - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #f69449 GAMEOBJECTS { WH_25 = false @@ -1125,10 +1126,10 @@ { // AKA 2.5m boattail (wtf) name = Shroud - displayName = #autoLOC_8007104 + displayName = #LOC_Restock_variant-engine_tankbutt_size1p5_white themeName = Shroud - primaryColor = #999999 - secondaryColor = #111111 + primaryColor = #111111 + secondaryColor = #ffffff sizeGroup = GroupA GAMEOBJECTS { @@ -1161,7 +1162,7 @@ name = Size1p5 displayName = #LOC_Restock_variant-engine_size1p5_white primaryColor = #999999 - secondaryColor = #f69449 + secondaryColor = #ffffff GAMEOBJECTS { SkiffBoattail = false @@ -1192,7 +1193,7 @@ name = Size1 displayName = #LOC_Restock_variant-engine_size1_white primaryColor = #999999 - secondaryColor = #f69449 + secondaryColor = #ffffff GAMEOBJECTS { SkiffBoattail = false @@ -1223,8 +1224,8 @@ name = Bare displayName = #LOC_Restock_variant-engine_compact_white themeName = Bare - primaryColor = #999999 - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #ffffff GAMEOBJECTS { SkiffBoattail = false @@ -1254,10 +1255,10 @@ { // AKA 2.5m boattail (wtf) name = Shroud_Alternate - displayName = #autoLOC_8007104 + displayName = #LOC_Restock_variant-engine_tankbutt_size1p5_grey-orange themeName = Shroud - primaryColor = #999999 - secondaryColor = #111111 + primaryColor = #111111 + secondaryColor = #f69449 sizeGroup = GroupA GAMEOBJECTS { @@ -1350,8 +1351,8 @@ name = Bare_Alternate displayName = #LOC_Restock_variant-engine_compact_grey-orange themeName = Bare - primaryColor = #999999 - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #f69449 GAMEOBJECTS { SkiffBoattail = false diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg index 2a0057d5..7b22fe4c 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg @@ -205,8 +205,8 @@ PART { name = Boattail displayName = #LOC_Restock_variant-engine_boattail_grey-orange - primaryColor = #ffffff - secondaryColor = #f69449 + primaryColor = #666666 + secondaryColor = #666666 GAMEOBJECTS { Torch_0625 = false @@ -235,8 +235,8 @@ PART { name = Compact displayName = #LOC_Restock_variant-engine_compact_grey-orange - primaryColor = #999999 - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #f69449 GAMEOBJECTS { Torch_0625 = false @@ -296,7 +296,7 @@ PART name = Boattail_Alternate displayName = #LOC_Restock_variant-engine_boattail_white primaryColor = #ffffff - secondaryColor = #f69449 + secondaryColor = #ffffff GAMEOBJECTS { Torch_0625 = false @@ -325,8 +325,8 @@ PART { name = Compact_Alternate displayName = #LOC_Restock_variant-engine_compact_white - primaryColor = #ffffff - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #ffffff GAMEOBJECTS { Torch_0625 = false diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg index c6ba6d4f..dcbe43fb 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg @@ -144,7 +144,7 @@ PART name = Size1 displayName = #LOC_Restock_variant-engine_size1_white primaryColor = #999999 - secondaryColor = #ffb80c + secondaryColor = #ffffff GAMEOBJECTS { LV_303 = true @@ -166,7 +166,7 @@ PART name = Boattail displayName = #LOC_Restock_variant-engine_boattail_white primaryColor = #ffffff - secondaryColor = #ffb80c + secondaryColor = #ffffff GAMEOBJECTS { LV_303 = false @@ -187,8 +187,8 @@ PART { name = Compact displayName = #LOC_Restock_variant-engine_compact_white - primaryColor = #999999 - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #ffffff GAMEOBJECTS { LV_303 = false @@ -209,8 +209,8 @@ PART { name = Size1Alternate displayName = #LOC_Restock_variant-engine_size1_grey-orange - primaryColor = #6f6e6d - secondaryColor = #ffb80c + primaryColor = #999999 + secondaryColor = #f69449 GAMEOBJECTS { LV_303 = true @@ -232,7 +232,7 @@ PART name = Boattail_Alternate displayName = #LOC_Restock_variant-engine_boattail_grey-orange primaryColor = #666666 - secondaryColor = #ffb80c + secondaryColor = #666666 GAMEOBJECTS { LV_303 = false @@ -253,8 +253,8 @@ PART { name = Compact_Alternate displayName = #LOC_Restock_variant-engine_compact_grey-orange - primaryColor = #6f6e6d - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #f69449 GAMEOBJECTS { LV_303 = false diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg index 178741e1..fa4b7ea5 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg @@ -170,7 +170,7 @@ PART name = Size1 displayName = #LOC_Restock_variant-engine_size1_white primaryColor = #999999 - secondaryColor = #ffb80c + secondaryColor = #ffffff GAMEOBJECTS { LV_T15 = true @@ -204,7 +204,7 @@ PART name = Boattail displayName = #LOC_Restock_variant-engine_boattail_white primaryColor = #ffffff - secondaryColor = #ffb80c + secondaryColor = #ffffff GAMEOBJECTS { LV_T15 = false @@ -237,8 +237,8 @@ PART { name = Compact displayName = #LOC_Restock_variant-engine_compact_white - primaryColor = #999999 - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #ffffff GAMEOBJECTS { LV_T15 = false @@ -271,8 +271,8 @@ PART { name = Size1_Alternate displayName = #LOC_Restock_variant-engine_size1_grey-orange - primaryColor = #6f6e6d - secondaryColor = #ffb80c + primaryColor = #999999 + secondaryColor = #f69449 GAMEOBJECTS { LV_T15 = true @@ -306,7 +306,7 @@ PART name = Boattail_Alternate displayName = #LOC_Restock_variant-engine_boattail_grey-orange primaryColor = #666666 - secondaryColor = #ffb80c + secondaryColor = #666666 GAMEOBJECTS { LV_T15 = false @@ -339,8 +339,8 @@ PART { name = Compact_Alternate displayName = #LOC_Restock_variant-engine_compact_grey-orange - primaryColor = #6f6e6d - secondaryColor = #999999 + primaryColor = #666666 + secondaryColor = #f69449 GAMEOBJECTS { LV_T15 = false diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-cherenkov.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-cherenkov.cfg index fb9c330a..d9515a56 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-cherenkov.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-cherenkov.cfg @@ -176,7 +176,7 @@ PART { name = Size2 displayName = #LOC_Restock_variant-engine_size2_white - primaryColor = #999999 + primaryColor = #ffffff secondaryColor = #f69449 GAMEOBJECTS { @@ -198,7 +198,7 @@ PART { name = Compact displayName = #LOC_Restock_variant-engine_compact_white - primaryColor = #ffffff + primaryColor = #999999 secondaryColor = #f69449 GAMEOBJECTS { diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fuel-tank-sphere-0625-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fuel-tank-sphere-0625-1.cfg index 36dacdc8..86299250 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fuel-tank-sphere-0625-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fuel-tank-sphere-0625-1.cfg @@ -62,6 +62,19 @@ PART name = ModulePartVariants baseVariant = Metallic useMultipleDragCubes = false + VARIANT + { + name = Metallic + displayName = #LOC_Restock_variant-surface_metal + themeName = Metal + primaryColor = #6f6e6d + secondaryColor = #6f6e6d + GAMEOBJECTS + { + ConeSphere0625Metal = true + ConeSphere0625White = false + } + } VARIANT { name = BlackAndWhite @@ -75,18 +88,5 @@ PART ConeSphere0625White = true } } - VARIANT - { - name = Metallic - displayName = #LOC_Restock_variant-surface_metal - themeName = Metal - primaryColor = #6f6e6d - secondaryColor = #6f6e6d - GAMEOBJECTS - { - ConeSphere0625Metal = true - ConeSphere0625White = false - } - } } } From 8467b4fcae172f9bf63f7e8cf307fbbef342cbdf Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Mon, 4 Nov 2019 16:55:36 -0800 Subject: [PATCH 4/6] Fix NREs in ISRU code * check if renderer list is null on HeatEffects plugin before lateupdate * correctly use reversed deploy animation for retracting ISRUs when retract animation is not present --- .../GameData/ReStock/Plugins/Restock.dll | Bin 36352 -> 36864 bytes Source/Restock/ModuleRestockHeatEffects.cs | 4 +- Source/Restock/ModuleRestockISRUAnimation.cs | 89 ++++++++++++++---- 3 files changed, 72 insertions(+), 21 deletions(-) diff --git a/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll b/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll index 904a2e5797c1b951e2fb7ecb1430e5d6c3185732..57c0b58514d3699a678d8b6a6cea95b96dce7e5c 100644 GIT binary patch delta 5062 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 Mq;2&X(mh1~Ka&j} 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 diff --git a/Source/Restock/ModuleRestockHeatEffects.cs b/Source/Restock/ModuleRestockHeatEffects.cs index 6742d344..c07de0c2 100644 --- a/Source/Restock/ModuleRestockHeatEffects.cs +++ b/Source/Restock/ModuleRestockHeatEffects.cs @@ -121,6 +121,9 @@ namespace Restock public void LateUpdate() { if (!HighLogic.LoadedSceneIsFlight) return; + if (renderers == null) return; + //when switching to the flight scene LateUpdate gets called AFTER OnLoad for some reason + // so renderers should hopefully only be null for one frame if (enableHeatEmissive) { @@ -148,7 +151,6 @@ namespace Restock if (disableBlackbody) { _propertyBlock.SetColor(_shaderBlackbodyID, Color.black); - } for (var i = 0; i < renderers.Count; i++) diff --git a/Source/Restock/ModuleRestockISRUAnimation.cs b/Source/Restock/ModuleRestockISRUAnimation.cs index f8c1a79c..0e04818b 100644 --- a/Source/Restock/ModuleRestockISRUAnimation.cs +++ b/Source/Restock/ModuleRestockISRUAnimation.cs @@ -31,7 +31,7 @@ namespace Restock // should the module wait until a current looping animation completes before changing state? [KSPField] public bool waitForComplete = false; - public bool IsDeployed => (CurrentState == State.InactiveWaiting || + public bool IsDeployed => (CurrentState == State.InactiveWaiting || CurrentState == State.Active || CurrentState == State.Deploying); @@ -68,14 +68,49 @@ namespace Restock _activeAnimationPresent = (activeAnimationName != string.Empty); _inactiveAnimationPresent = (inactiveAnimationName != string.Empty); - DeployAnimation = ((_deployAnimationPresent) ? - base.part.FindModelAnimators(deployAnimationName)[0] : null); - RetractAnimation = ((_retractAnimationPresent) ? - base.part.FindModelAnimators(retractAnimationName)[0] : null); - ActiveAnimation = ((_activeAnimationPresent) ? - base.part.FindModelAnimators(activeAnimationName)[0] : null); - InactiveAnimation = ((_inactiveAnimationPresent)? - base.part.FindModelAnimators(inactiveAnimationName)[0] : null); + if (_deployAnimationPresent) + { + DeployAnimation = base.part.FindModelAnimators(deployAnimationName)[0]; + if (DeployAnimation == null) + { + _deployAnimationPresent = false; + this.LogError($"Can't find deploy animation named {deployAnimationName}"); + } + } + else DeployAnimation = null; + + if (_retractAnimationPresent) + { + RetractAnimation = base.part.FindModelAnimators(retractAnimationName)[0]; + if (RetractAnimation == null) + { + _retractAnimationPresent = false; + this.LogError($"Can't find retract animation named {retractAnimationName}"); + } + } + else RetractAnimation = null; + + if (_activeAnimationPresent) + { + ActiveAnimation = base.part.FindModelAnimators(activeAnimationName)[0]; + if (ActiveAnimation == null) + { + _activeAnimationPresent = false; + this.LogError($"Can't find active animation named {activeAnimationName}"); + } + } + else ActiveAnimation = null; + + if (_inactiveAnimationPresent) + { + InactiveAnimation = base.part.FindModelAnimators(inactiveAnimationName)[0]; + if (InactiveAnimation == null) + { + _inactiveAnimationPresent = false; + this.LogError($"Can't find inactive animation named {inactiveAnimationName}"); + } + } + else InactiveAnimation = null; foreach (var a in base.part.FindModelAnimators()) a.Stop(); @@ -116,7 +151,7 @@ namespace Restock DeployStart(); } } - + break; // System is inactive, but waiting for the animation to end before deploying @@ -176,7 +211,8 @@ namespace Restock case State.ActiveWaiting: if (!waitForComplete || !_activeAnimationPresent) { - this.LogError("Invalid state! waitForComplete not enabled or active animation not present."); + this.LogError( + "Invalid state! waitForComplete not enabled or active animation not present."); CurrentState = State.Active; } else if (ConvertersEnabled()) @@ -201,9 +237,19 @@ namespace Restock { DeployStart(); } - else if (!RetractAnimation.IsPlaying(retractAnimationName)) + else if (_retractAnimationPresent) { - RetractEnd(); + if (!RetractAnimation.IsPlaying(retractAnimationName)) + { + RetractEnd(); + } + } + else if (_deployAnimationPresent) + { + if (!DeployAnimation.IsPlaying(deployAnimationName)) + { + RetractEnd(); + } } break; @@ -220,7 +266,8 @@ namespace Restock private void DeployWait() { - if (_inactiveAnimationPresent){ + if (_inactiveAnimationPresent) + { CurrentState = State.InactiveWaiting; PlayAnimation(InactiveAnimation, inactiveAnimationName, loop: false); } @@ -237,7 +284,8 @@ namespace Restock if (_retractAnimationPresent && RetractAnimation.IsPlaying(retractAnimationName)) { RetractAnimation.Stop(retractAnimationName); - } + } + CurrentState = State.Deploying; PlayAnimation(DeployAnimation, deployAnimationName, speed * deploySpeed); } @@ -250,7 +298,7 @@ namespace Restock private void DeployEnd() { CurrentState = State.Active; - + if (_activeAnimationPresent) { PlayAnimation(ActiveAnimation, activeAnimationName, loop: true); @@ -269,7 +317,7 @@ namespace Restock RetractStart(); } } - + private void RetractStart(float speed = 1f) { if (_retractAnimationPresent) @@ -277,7 +325,8 @@ namespace Restock if (_deployAnimationPresent && DeployAnimation.IsPlaying(deployAnimationName)) { DeployAnimation.Stop(deployAnimationName); - } + } + CurrentState = State.Retracting; PlayAnimation(RetractAnimation, retractAnimationName, speed * retractSpeed); } @@ -295,7 +344,7 @@ namespace Restock private void RetractEnd() { CurrentState = State.Inactive; - + if (_inactiveAnimationPresent) { PlayAnimation(InactiveAnimation, inactiveAnimationName, loop: true); @@ -345,7 +394,7 @@ namespace Restock animState.wrapMode = loop ? WrapMode.Loop : WrapMode.Once; //if (!anim.IsPlaying(name)) - anim.Play(name); + anim.Play(name); } } } \ No newline at end of file From 2e33fbc806ec38cc3eb8ed13cad9c70a40d570b6 Mon Sep 17 00:00:00 2001 From: ChrisAdderley Date: Mon, 4 Nov 2019 21:30:05 -0800 Subject: [PATCH 5/6] Last minute fixes Wolfhound 2.5m problem (#737) Winglet tweaks (#746) --- .../Assets/Aero/restock-winglet-avr8-1.mu | Bin 12050 -> 11330 bytes .../Assets/Aero/restock-winglet-avt1-1.mu | Bin 10902 -> 10902 bytes .../Engine/restock-engine-schnauzer-1.mu | Bin 781330 -> 838297 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglet-avr8-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglet-avr8-1.mu index b6668a1c57aaa49904fdc39ef8de0498609bdb8b..e9a89d26f010bd1c04bdd8478ecfbf28e39a5837 100644 GIT binary patch delta 3625 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 NUl?KaM+Rpb{|lF%_ICgP delta 4337 zcmZ`*30PF+8fHK?9rj(284%gL0wU|2^Pk@ZC2>b&SVX<4QC>A$Zfas@Tqv-L4R3J^1Oa$a=-*-6EL-#)SJkLAd`+nR1&p9*a|LXH9 z=6rm|StCdt&R2(K72C_Y?c2%ipc2k4(N+Fi{XfZ@5z*YJ*{o#aRW(a z|9<`I{?sq#U9CJ>TT8BZzFzZx_9?wRaEH6aXryVT}w|^Mo=$1JG-dRZozW5ODH^(PNf04LeghW^pl=!X_a=C zcb0UK9B<7OzAIlzr};*a_-RtJwji#N_>)&VM+!G?t)ic<4J03n18Kd#k)9|BAwNea zQ{#>#`stYSd|7A`z26|saa$_tD=w1O*^ddmudZYrDUNh{ zTGnp3_m#*N{^OjvCG9h7$@!O9?fr**-Re=oke^qvoYQvPUbh-iFgh+{IV%Sd_am;f zb(fK)2h{QhgOjPtcS&qT@P58*R5GplG>P3gDzZZlQ>?m*TzStUB%}agkLBsn$9! zj4RzK)wqX?9afQbb){H)mu|M)23`UDn*-&R5$i;j5nW8$nH(Q6Pe83{&tu71%iPIpLC#9Thc7Q@gC*ioI5>9AOU!+uC!aXAiD2sUa4T`S zvA$A`#|wrP-->KTMjGe4!Cwi-oEBNy5m&xDNvG(RPegWb`Dp%?p(7MMyjf&DIrli% zVkz5mOI8GQuN&jZbJLrw(4A&Y$z#Ih?U+byVFS;o*t@mZ_#+EOX{P%tlS;C2PT-)bN(Qkd3%j38alp&GBgGR?Z&Wt3&=2YvAbmlkE`F)e-C2l7v25nLKOyV|YZ zK^jLOc7D=+pI|W%SOCBu5Tsi44F;eMRykVKA%GzO)HaSbRQ03PsnDxFwCD>{5e`-l z04q)Mbrn%Zs6O-$1K=8H^#F|FdNv>S!gV46Q2^U_K#qRg5Bg9e$91tLTD4e*9Q|NL zyBJlVjRg!9fM>0$9$isBI%=;GewZZ=R_7g@!aBV`b z!TCa*QuIk`uVGJ993lT|mmQM33}=_bD}H`hwE>&e!6F&JePI!7_DHwOuy3)nJ1{pu zf1yK`>fT9Q=v*k{`dsi5LsP^A$s?$AX1{g&mGNZV)DF4kLQ&%VjPZYJZCKPSFG=b( zJX_|&_uopt?MhzPZkHcPAODo-3h4T4RI@@B4A=$TAu*{v%;YWv=9Q^+AhzfZ=l;b< zX#%{I8*<*@eApDabY`HW)0Y;N9TRErobV${uMv_99RC;Nq6Gqnu)^owCFIScB6Z%| zWZ5!;kSS)7)^v25x7P6F(0q}u_Q|uZ%}ycRR*@PvNtUm#rVy!4q~3S+=6TZ3`Y16R zstZ@U@M8}1(*M3$4Pl^@%27LPo(z85Bry~E_rqXXbCZ(?{L)UWY3+w!M_o^aqbi?yq9q*BlZ zXW5>F2FuOTkunyX>lE44?~Q!b?Px`#udf)6iM?Uf_V}hyE-5D>1Kv_57WQ>HzHZ<$ z(O&5P@%bct^(gu*=$(83*H~}>a!mAB&>i#kng2cZmZImue&vuDe*R)d+%J8yOJqw6 zmht7|N);XXKx8M)XSnsvF}NMN@g7WCJ;m~ht%<0m`w=rjmcc!UZg_|5%)0~k#Y6>I z!~DTEZjCIOr3J$dNtKbF(ymCC{uuiaX|k+`$3F1J#bZ#!ZvJ@B+zf@^6hEox1-Fb= zwih<@oIN&W9}bZ$xe#~y>5LNRu1Jd_h4I=AF1#7mSHCa&Zib_L4s?s@nvz!W^jU77 za^x%bgB6@xNcL8W?4`P!%I)_7x3BbLmY9@hxuIu*Dc^br*Y2GD^?n4niJE`&S`fX%TX z&Jk!a*QPO!$2rarI8Wf&j~Y2z+YEtmm<1F+#-d?;WiCJw1HeQ~!dU_DV<&2U2fpR#5C8xG diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglet-avt1-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-winglet-avt1-1.mu index aa65aff100fe0e826132dacc8e295b77e98d0c8a..1cec698cc49b2666126740a9251465882c8b007b 100644 GIT binary patch delta 1219 zcmYk2dr(w$6vsh=ad&x1un-FYO3OotVFuB5`JH1%%O(yEu1JFM5FND!nG{fA7f2H{ zM<=*K8Ip)7$V+51_&YbU~B&H;$v05b6 z6i*pEGB2?$-7;cpxr}oizQtY+V2mQU^x+rzO0;ccCl^(Q)xST=MxAJ5`=a%aL{H7F z#=Gt+4$fzuN?`8I!&8Rx^dW_|OGd8BoVb&2{z`S?t7OJ|l-;NrP{c(u3D!%+l2iFg zpN&0=9@IBkFSS&yDA-Ldv}$Rd(h;tVd&1*)H1y$BF{aH?5}Wu~IyfrA+2LEjAZuZh z4BK(y}i&wQG|Qpw`eKRVl2=jKDvtWc>92Pn_Nr ziyg0U+`TrB>ILH*B3Z|IDQ-!jD;g( zc^#M@cL*dJto4%M|82bNkJ%xW<+c{vV)AWUYZh#@kLT0sCoJ@@jj}dva%w5wLWhg$=IvS%Qb=1r(kNO4uRq{2U~c)T#YMiGNp*D=%Vp7Q-lhiQ z@t2B3s(hB3+y{M;~gYdV@bE-v*7x?M+9D&WA&He9cd5_m}1x{tfY(ZKTU+Qh* z-$dVV4;Hl;)n9HF_Cq7(-0^`KqgCSv0_W8o?0* z%@WVP<)^6W`vF>y^IBt` zzr#9`eND^lNwA9{_q-IT`-;d+tZAR%(hsMLk20{14J zReZ>mk#~vd{(0q!#U*6ja)FgdGeZq;ZP3G|Hj}{o2^(&8(YFxlXX4Hg8*Dz}k11g@ VLI5xEBXIuO4||jKwjO&V{{o{n8FBys delta 1219 zcmYk2eNfYN9LGVLxD7{4oP&V~!PIs5P(B`8 zS}61XXv97(qtj-%q978%Qcm7~+jeX&;}j}odlGhNP*Q7i53UG5baTMAtn!Rau4kVL zM_tF?zc8q7R5GJt2%2zy#D2thOWo3}Al-_|T#cVf6SH~}NjiMTwjsJp?HkXm^3aLC ze7Hk1eM6htzMQps=mgP|^xKK4F`G`B=MD1uX|UxzJ$=$ALW7rvOiWIsy#qp=6Zr{j zx?W^kYu}3bj}McHEe}pR!Y!CLFbB3-v*;kO5z2;hKD)uM6r>I z2CG4`unKm5l}1Oc74W1>hTdn29A)EU@k7--+#I~oaXDr_W(9e|?#LIr5} zhN^9e_)b^@cYxjKO4bW`kutPCXt+%}<{DEa>^TRcIzkB@61^JLn(2uJVgqka!_E|PgK{cp(A|_ zY9Cg^pTF_!%=vZwkIF=f3De}DNhfjyDx4chCDMY(LDyvtQkscCn}n9aUZL~hxkHeJeb zXTFsw^p#nZqXO*vBan`SO8L9S<@i-gLg7Z#u$l4|1Waic)w^o63TCdoV4}nZ@&g&{kN~u#*1OQs;c( zgLzBgr7pH^wVQ_OoO47U^D{}eCEV;Ht21@L!1HR4`|!=*0W|Mg0MA0w4)7>|?peyF zE8ZU`a(!c_y3pq`xl_(u^p`E^tlFZEYmq{DG9ML2tghy6Cb*!*$V9e zVGJJu>fGYF%*+$;Jeik^thP8TdUr8-mN?e`e%)`-w^oVkehTFOjkMLn0>N|~7x*^M z>c!*Kdv_fstz>N8_7|>=iFYR#kG!)Hz=OL{_QD7dqLNKc8A*aExESqTXH|% F1OQ^yDP#Zu delta 85 zcmbO^)p*hk{e~9C7N#xCIa<>TZn1K-|K?x;Vpbq#17da{28nS3G1vCr9Ng>p_ygk^ h?BASXv=?ywXLm5_@AN<+Zlm^B;@sO`iSw-A1OTHpA;kay From 4909f40f62706e8bcd1911f549045ae13b9f24c1 Mon Sep 17 00:00:00 2001 From: Poodmund Date: Tue, 5 Nov 2019 18:44:03 +0000 Subject: [PATCH 6/6] Nerfing the rest of the spherical tanks. The 0.625m & 1.875m ones were already correctly sized. --- .../Parts/FuelTank/125/restock-fuel-tank-sphere-125-1.cfg | 8 ++++---- .../Parts/FuelTank/25/restock-fuel-tank-sphere-25-1.cfg | 8 ++++---- .../Parts/FuelTank/375/restock-fuel-tank-sphere-375-1.cfg | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/125/restock-fuel-tank-sphere-125-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/125/restock-fuel-tank-sphere-125-1.cfg index 813a4f77..63f5c62e 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/125/restock-fuel-tank-sphere-125-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/125/restock-fuel-tank-sphere-125-1.cfg @@ -48,14 +48,14 @@ PART RESOURCE { name = LiquidFuel - amount = 45 - maxAmount = 45 + amount = 22.5 + maxAmount = 22.5 } RESOURCE { name = Oxidizer - amount = 55 - maxAmount = 55 + amount = 27.5 + maxAmount = 27.5 } MODULE { diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/25/restock-fuel-tank-sphere-25-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/25/restock-fuel-tank-sphere-25-1.cfg index 07dd9f9b..a403a744 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/25/restock-fuel-tank-sphere-25-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/25/restock-fuel-tank-sphere-25-1.cfg @@ -48,14 +48,14 @@ PART RESOURCE { name = LiquidFuel - amount = 360 - maxAmount = 360 + amount = 180 + maxAmount = 180 } RESOURCE { name = Oxidizer - amount = 440 - maxAmount = 440 + amount = 220 + maxAmount = 220 } MODULE { diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-fuel-tank-sphere-375-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-fuel-tank-sphere-375-1.cfg index 33b8ae29..a3a57023 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-fuel-tank-sphere-375-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-fuel-tank-sphere-375-1.cfg @@ -48,14 +48,14 @@ PART RESOURCE { name = LiquidFuel - amount = 810 - maxAmount = 810 + amount = 405 + maxAmount = 405 } RESOURCE { name = Oxidizer - amount = 990 - maxAmount = 990 + amount = 495 + maxAmount = 495 } MODULE {