From 4629f48d834dbe2d2b6cfa98421eb8393f2e9200 Mon Sep 17 00:00:00 2001 From: ChrisAdderley Date: Mon, 4 Nov 2019 11:54:11 -0800 Subject: [PATCH] 1.8 updates part deux --- .mod_data.yml | 6 ++--- .../OrbitalLFOEngines/OrbitalEnginesLFO.cfg | 8 +++---- .../Patches/NFSpaceCraftLandertron.cfg | 6 ++--- .../Patches/NFSpacecraftASET.cfg | 8 +++---- .../Patches/NFSpacecraftCommunityTechTree.cfg | 18 +++++++------- .../NFSpacecraftConnectedLivingSpaces.cfg | 24 +++++++++---------- .../Patches/NFSpacecraftFAR.cfg | 18 +++++++------- .../Patches/NFSpacecraftKerbalHealth.cfg | 16 ++++++------- .../Patches/NFSpacecraftTACLifeSupport.cfg | 2 +- .../Patches/NFSpacecraftUSILifeSupport.cfg | 8 +++---- .../Patches/NFSpacecraftUniversalStorage2.cfg | 3 +-- .../Versioning/NearFutureSpacecraft.version | 12 +++++----- README.md | 6 ++--- changelog.txt | 8 +++++++ readme.txt | 6 ++--- 15 files changed, 78 insertions(+), 71 deletions(-) diff --git a/.mod_data.yml b/.mod_data.yml index c65e251..1527869 100644 --- a/.mod_data.yml +++ b/.mod_data.yml @@ -8,13 +8,13 @@ package: - changelog.txt dependencies: # Configure dependencies ModuleManager: - version: 4.0.2 + version: 4.1.0 location: s3 B9PartSwitch: - version: 2.7.0 + version: 2.12.1 location: s3 NearFutureProps: - tag: 0.5.1 + tag: 0.6.1 location: github repository: ChrisAdderley/NearFutureProps deploy: diff --git a/Extras/OrbitalLFOEngines/OrbitalEnginesLFO.cfg b/Extras/OrbitalLFOEngines/OrbitalEnginesLFO.cfg index 3c60c38..4af4a78 100644 --- a/Extras/OrbitalLFOEngines/OrbitalEnginesLFO.cfg +++ b/Extras/OrbitalLFOEngines/OrbitalEnginesLFO.cfg @@ -1,6 +1,6 @@ // Sets mono engines to use LFO -@PART[orbital-engine-0625] +@PART[orbital-engine-0625]:FOR[NearFutureSpacecraft] { @MODULE[ModuleEnginesFX] { @@ -16,7 +16,7 @@ } } -@PART[orbital-engine-125] +@PART[orbital-engine-125]:FOR[NearFutureSpacecraft] { @MODULE[ModuleEnginesFX] { @@ -32,7 +32,7 @@ } } -@PART[orbital-engine-25] +@PART[orbital-engine-25]:FOR[NearFutureSpacecraft] { @MODULE[ModuleB9PartSwitch] { @@ -55,7 +55,7 @@ } } -@PART[orbital-engine-375] +@PART[orbital-engine-375]:FOR[NearFutureSpacecraft] { @MODULE[ModuleB9PartSwitch]:HAS[#switcherDescription[Fuel?Tanks]] { diff --git a/GameData/NearFutureSpacecraft/Patches/NFSpaceCraftLandertron.cfg b/GameData/NearFutureSpacecraft/Patches/NFSpaceCraftLandertron.cfg index 75e0980..2cd4b2a 100644 --- a/GameData/NearFutureSpacecraft/Patches/NFSpaceCraftLandertron.cfg +++ b/GameData/NearFutureSpacecraft/Patches/NFSpaceCraftLandertron.cfg @@ -1,4 +1,4 @@ -@PART[command-25-landing-1]:NEEDS[Landertron] +@PART[command-25-landing-1]:NEEDS[Landertron]:FOR[NearFutureSpacecraft] { MODULE { @@ -8,7 +8,7 @@ } } -@PART[command-125-landing-1]:NEEDS[Landertron] +@PART[command-125-landing-1]:NEEDS[Landertron]:FOR[NearFutureSpacecraft] { MODULE { @@ -19,7 +19,7 @@ } -@PART[command-mk4-1]:NEEDS[Landertron] +@PART[command-mk4-1]:NEEDS[Landertron]:FOR[NearFutureSpacecraft] { MODULE { diff --git a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftASET.cfg b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftASET.cfg index 737d377..568d4a0 100644 --- a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftASET.cfg +++ b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftASET.cfg @@ -1,6 +1,6 @@ // Replaces IVAs // Maintained by Dragon01 -@PART[utility-pod-25]:NEEDS[RasterPropMonitor,ASETPropsIdentifier] +@PART[utility-pod-25]:NEEDS[RasterPropMonitor,ASETPropsIdentifier]:FOR[NearFutureSpacecraft] { @INTERNAL[crewUtilityPodInternals] { @@ -11,7 +11,7 @@ name = RasterPropMonitorComputer } } -@PART[command-ppd-1]:NEEDS[RasterPropMonitor,ASETPropsIdentifier] +@PART[command-ppd-1]:NEEDS[RasterPropMonitor,ASETPropsIdentifier]:FOR[NearFutureSpacecraft] { MODULE { @@ -415,7 +415,7 @@ } } -@PART[command-mk4-1]:NEEDS[RasterPropMonitor,ASETPropsIdentifier] +@PART[command-mk4-1]:NEEDS[RasterPropMonitor,ASETPropsIdentifier]:FOR[NearFutureSpacecraft] { MODULE { @@ -819,7 +819,7 @@ MODULE } } -@PART[command-mk3-9]:NEEDS[RasterPropMonitor,ASETPropsIdentifier] +@PART[command-mk3-9]:NEEDS[RasterPropMonitor,ASETPropsIdentifier]:FOR[NearFutureSpacecraft] { MODULE { diff --git a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftCommunityTechTree.cfg b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftCommunityTechTree.cfg index 2d59e11..b7f1e04 100644 --- a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftCommunityTechTree.cfg +++ b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftCommunityTechTree.cfg @@ -1,39 +1,39 @@ // Near Future Spacecraft CTT Support // CTT 2.0+ -@PART[command-25-1]:NEEDS[CommunityTechTree] +@PART[command-25-1]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft] { @TechRequired = heavyCommandModules } -@PART[command-25-landing-1]:NEEDS[CommunityTechTree] +@PART[command-25-landing-1]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft] { @TechRequired = specializedCommandModules } -@PART[command-125-1]:NEEDS[CommunityTechTree] +@PART[command-125-1]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft] { @TechRequired = commandModules } -@PART[command-125-landing-1]:NEEDS[CommunityTechTree] +@PART[command-125-landing-1]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft] { @TechRequired = commandModules } -@PART[command-125-orbit-1]:NEEDS[CommunityTechTree] +@PART[command-125-orbit-1]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft] { @TechRequired = specializedCommandModules } -@PART[command-375-biconic-1]:NEEDS[CommunityTechTree] +@PART[command-375-biconic-1]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft] { @TechRequired = heavyCommandCenters } -@PART[command-mk3-9]:NEEDS[CommunityTechTree] +@PART[command-mk3-9]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft] { @TechRequired = heavyCommandModules } -@PART[command-ppd-1]:NEEDS[CommunityTechTree] +@PART[command-ppd-1]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft] { @TechRequired = heavyCommandCenters } -@PART[command-mk4-1]:NEEDS[CommunityTechTree] +@PART[command-mk4-1]:NEEDS[CommunityTechTree]:FOR[NearFutureSpacecraft] { @TechRequired = heavyLanders } diff --git a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftConnectedLivingSpaces.cfg b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftConnectedLivingSpaces.cfg index 55aed24..1e29570 100644 --- a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftConnectedLivingSpaces.cfg +++ b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftConnectedLivingSpaces.cfg @@ -1,5 +1,5 @@ // CLS Compatability for Near Future Spacecraft v1.0.0 -@PART[command-25-1]:NEEDS[ConnectedLivingSpace] +@PART[command-25-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft] { MODULE { @@ -7,7 +7,7 @@ passable = true } } -@PART[command-25-landing-1]:NEEDS[ConnectedLivingSpace] +@PART[command-25-landing-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft] { MODULE { @@ -15,7 +15,7 @@ passable = true } } -@PART[command-125-1]:NEEDS[ConnectedLivingSpace] +@PART[command-125-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft] { MODULE { @@ -23,7 +23,7 @@ passable = true } } -@PART[command-125-landing-1]:NEEDS[ConnectedLivingSpace] +@PART[command-125-landing-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft] { MODULE { @@ -31,7 +31,7 @@ passable = true } } -@PART[command-125-orbit-1]:NEEDS[ConnectedLivingSpace] +@PART[command-125-orbit-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft] { MODULE { @@ -39,7 +39,7 @@ passable = true } } -@PART[command-375-biconic-1]:NEEDS[ConnectedLivingSpace] +@PART[command-375-biconic-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft] { MODULE { @@ -48,7 +48,7 @@ impassablenodes = top } } -@PART[command-ppd-1]:NEEDS[ConnectedLivingSpace] +@PART[command-ppd-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft] { MODULE { @@ -56,7 +56,7 @@ passable = true } } -@PART[command-mk3-9]:NEEDS[ConnectedLivingSpace] +@PART[command-mk3-9]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft] { MODULE { @@ -65,7 +65,7 @@ } } -@PART[utility-pod-25]:NEEDS[ConnectedLivingSpace] +@PART[utility-pod-25]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft] { MODULE { @@ -74,7 +74,7 @@ } } // Not an error, this guy has a passable tube! -@PART[orbital-engine-25]:NEEDS[ConnectedLivingSpace] +@PART[orbital-engine-25]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft] { MODULE { @@ -84,7 +84,7 @@ } } -@PART[command-mk4-1]:NEEDS[ConnectedLivingSpace] +@PART[command-mk4-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft] { MODULE { @@ -93,7 +93,7 @@ } } -@PART[docking-nose-0625-1]:NEEDS[ConnectedLivingSpace] +@PART[docking-nose-0625-1]:NEEDS[ConnectedLivingSpace]:FOR[NearFutureSpacecraft] { MODULE { diff --git a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftFAR.cfg b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftFAR.cfg index a3eef2a..bcdc6c8 100644 --- a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftFAR.cfg +++ b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftFAR.cfg @@ -1,38 +1,38 @@ // Near Future Spacecraft FAR Support -@PART[command-25-1]:NEEDS[FerramAerospaceResearch] +@PART[command-25-1]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft] { !MODULE[ModuleLiftingSurface] {} } -@PART[command-25-landing-1]:NEEDS[FerramAerospaceResearch] +@PART[command-25-landing-1]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft] { !MODULE[ModuleLiftingSurface] {} } -@PART[command-125-1]:NEEDS[FerramAerospaceResearch] +@PART[command-125-1]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft] { !MODULE[ModuleLiftingSurface] {} } -@PART[command-125-landing-1]:NEEDS[FerramAerospaceResearch] +@PART[command-125-landing-1]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft] { !MODULE[ModuleLiftingSurface] {} } -@PART[command-125-orbit-1]:NEEDS[FerramAerospaceResearch] +@PART[command-125-orbit-1]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft] { !MODULE[ModuleLiftingSurface] {} } -@PART[command-375-biconic-1]:NEEDS[FerramAerospaceResearch] +@PART[command-375-biconic-1]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft] { !MODULE[ModuleLiftingSurface] {} } -@PART[command-mk3-9]:NEEDS[FerramAerospaceResearch] +@PART[command-mk3-9]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft] { !MODULE[ModuleLiftingSurface] {} } -@PART[command-ppd-1]:NEEDS[FerramAerospaceResearch] +@PART[command-ppd-1]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft] { !MODULE[ModuleLiftingSurface] {} } -@PART[command-mk4-1]:NEEDS[FerramAerospaceResearch] +@PART[command-mk4-1]:NEEDS[FerramAerospaceResearch]:FOR[NearFutureSpacecraft] { !MODULE[ModuleLiftingSurface] {} } diff --git a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftKerbalHealth.cfg b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftKerbalHealth.cfg index ea11e53..f27df7d 100644 --- a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftKerbalHealth.cfg +++ b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftKerbalHealth.cfg @@ -1,5 +1,5 @@ // KerbalHealth support (fraz86) -@PART[command-mk3-9]:NEEDS[KerbalHealth,!USILifeSupport] +@PART[command-mk3-9]:NEEDS[KerbalHealth,!USILifeSupport]:FOR[NearFutureSpacecraft] { MODULE { @@ -7,7 +7,7 @@ space = 2.5 } } -@PART[command-mk3-9]:NEEDS[KerbalHealth,USILifeSupport] +@PART[command-mk3-9]:NEEDS[KerbalHealth,USILifeSupport]:FOR[NearFutureSpacecraft] { MODULE { @@ -15,7 +15,7 @@ space = 1.2 } } -@PART[command-ppd-1]:NEEDS[KerbalHealth,!USILifeSupport] +@PART[command-ppd-1]:NEEDS[KerbalHealth,!USILifeSupport]:FOR[NearFutureSpacecraft] { MODULE { @@ -23,7 +23,7 @@ space = 4.9 } } -@PART[command-ppd-1]:NEEDS[KerbalHealth,USILifeSupport] +@PART[command-ppd-1]:NEEDS[KerbalHealth,USILifeSupport]:FOR[NearFutureSpacecraft] { MODULE { @@ -31,7 +31,7 @@ space = 2.0 } } -@PART[command-mk4-1]:NEEDS[KerbalHealth,!USILifeSupport] +@PART[command-mk4-1]:NEEDS[KerbalHealth,!USILifeSupport]:FOR[NearFutureSpacecraft] { MODULE { @@ -39,7 +39,7 @@ space = 6.2 } } -@PART[command-mk4-1]:NEEDS[KerbalHealth,USILifeSupport] +@PART[command-mk4-1]:NEEDS[KerbalHealth,USILifeSupport]:FOR[NearFutureSpacecraft] { MODULE { @@ -47,7 +47,7 @@ space = 2.4 } } -@PART[utility-pod-25]:NEEDS[KerbalHealth,!USILifeSupport] +@PART[utility-pod-25]:NEEDS[KerbalHealth,!USILifeSupport]:FOR[NearFutureSpacecraft] { MODULE { @@ -55,7 +55,7 @@ space = 1.8 } } -@PART[utility-pod-25]:NEEDS[KerbalHealth,USILifeSupport] +@PART[utility-pod-25]:NEEDS[KerbalHealth,USILifeSupport]:FOR[NearFutureSpacecraft] { MODULE { diff --git a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftTACLifeSupport.cfg b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftTACLifeSupport.cfg index 17fa08c..8f6f8a2 100644 --- a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftTACLifeSupport.cfg +++ b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftTACLifeSupport.cfg @@ -1,4 +1,4 @@ -@PART[command-mk3-9,utility-pod-25]:NEEDS[TacLifeSupport] +@PART[command-mk3-9,utility-pod-25]:NEEDS[TacLifeSupport]:FOR[NearFutureSpacecraft] { RESOURCE { diff --git a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftUSILifeSupport.cfg b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftUSILifeSupport.cfg index 6c42c69..ce95189 100644 --- a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftUSILifeSupport.cfg +++ b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftUSILifeSupport.cfg @@ -1,7 +1,7 @@ // USI Life Support habitat and recycler functions //Mk3-9 Orbital Command Pod -@PART[command-mk3-9]:NEEDS[USILifeSupport] +@PART[command-mk3-9]:NEEDS[USILifeSupport]:FOR[NearFutureSpacecraft] { MODULE { @@ -37,7 +37,7 @@ } //PPD-1 Heavy Command Module -@PART[command-ppd-1]:NEEDS[USILifeSupport] +@PART[command-ppd-1]:NEEDS[USILifeSupport]:FOR[NearFutureSpacecraft] { MODULE { @@ -73,7 +73,7 @@ } //Mk4-1 Heavy Command Module -@PART[command-mk4-1]:NEEDS[USILifeSupport] +@PART[command-mk4-1]:NEEDS[USILifeSupport]:FOR[NearFutureSpacecraft] { MODULE { @@ -110,7 +110,7 @@ //PPD-24 Itinerant Service Container -@PART[utility-pod-25]:NEEDS[USILifeSupport] +@PART[utility-pod-25]:NEEDS[USILifeSupport]:FOR[NearFutureSpacecraft] { %MODULE[ModuleLifeSupport]{} %MODULE[USI_ModuleFieldRepair]{} diff --git a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftUniversalStorage2.cfg b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftUniversalStorage2.cfg index ecd6e54..1f2b73e 100644 --- a/GameData/NearFutureSpacecraft/Patches/NFSpacecraftUniversalStorage2.cfg +++ b/GameData/NearFutureSpacecraft/Patches/NFSpacecraftUniversalStorage2.cfg @@ -2,7 +2,7 @@ //Adds attach nodes for universal storage wedge units to the 3.75m service tank //2 rows of 5 nodes for each side bay -@PART[service-tank-375]:NEEDS[UniversalStorage2] +@PART[service-tank-375]:NEEDS[UniversalStorage2]:FOR[NearFutureSpacecraft] { //Side 1 node_stack_US1 = 1.06, 0.21, 0.7, 0.8, 0, 0.5, 0 @@ -29,4 +29,3 @@ node_stack_US20 = 0.59, -0.1933, -1.12, 0.3, 0, -0.5, 0 } - diff --git a/GameData/NearFutureSpacecraft/Versioning/NearFutureSpacecraft.version b/GameData/NearFutureSpacecraft/Versioning/NearFutureSpacecraft.version index 9db8cc7..cb4752a 100644 --- a/GameData/NearFutureSpacecraft/Versioning/NearFutureSpacecraft.version +++ b/GameData/NearFutureSpacecraft/Versioning/NearFutureSpacecraft.version @@ -5,24 +5,24 @@ "VERSION": { "MAJOR":1, - "MINOR":2, - "PATCH":4, + "MINOR":3, + "PATCH":0, "BUILD":0 }, "KSP_VERSION": { "MAJOR":1, - "MINOR":7, - "PATCH":0 + "MINOR":8, + "PATCH":1 }, "KSP_VERSION_MIN":{ "MAJOR":1, - "MINOR":6, + "MINOR":8, "PATCH":0 }, "KSP_VERSION_MAX":{ "MAJOR":1, - "MINOR":7, + "MINOR":8, "PATCH":99 } } diff --git a/README.md b/README.md index 934cff6..c31091d 100644 --- a/README.md +++ b/README.md @@ -27,9 +27,9 @@ A number of parts designed to help build better and cooler orbital (and not so o ### Required These components are required for the mod to function and are bundled as part of any download: -* [ModuleManager (4.0.2)](https://github.com/sarbian/ModuleManager) -* [B9PartSwitch (2.7.0)](https://github.com/blowfishpro/B9PartSwitch) -* [Near Future Props (0.5.1)](https://github.com/ChrisAdderley/NearFutureProps) +* [ModuleManager (4.1.0)](https://github.com/sarbian/ModuleManager) +* [B9PartSwitch (2.12.1)](https://github.com/blowfishpro/B9PartSwitch) +* [Near Future Props (0.6.1)](https://github.com/ChrisAdderley/NearFutureProps) ## Installation diff --git a/changelog.txt b/changelog.txt index a282072..cafe159 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,11 @@ +v1.3.0 +------ +- KSP 1.8.x +- Updated NearFutureProps to 0.6.1 +- Updated B9PartSwitch to 2.12.1 +- Updated ModuleManager to 4.1.0 +- Updated ModuleManager pass specifiers where necessary + v1.2.4 ------ - Added patch for Universal Storage 2 adding nodes to the 3.75m service tank (thanks Zorg) diff --git a/readme.txt b/readme.txt index 7f4585e..52521ee 100644 --- a/readme.txt +++ b/readme.txt @@ -9,9 +9,9 @@ DEPENDENCIES ============ Required -- NearFutureProps (0.5.1) -- B9 Part Switch (2.7.0) -- ModuleManager (4.0.2) +- NearFutureProps (0.6.1) +- B9 Part Switch (2.12.1) +- ModuleManager (4.1.0) Optional - Community Tech Tree (v2.0+)