From 4b44a477619e3e3ce32ffb8827d63d879d29b218 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 4 Mar 2021 19:53:42 -0800 Subject: [PATCH 1/2] Update and fix some dependencies --- .mod_data.yml | 6 ++--- .../Patches/FFTNuclearTransfer.cfg | 25 +++++++++++++++++++ .../Versioning/FarFutureTechnologies.version | 4 +-- changelog.txt | 7 ++++++ readme.txt | 10 ++++---- 5 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 GameData/FarFutureTechnologies/Patches/FFTNuclearTransfer.cfg diff --git a/.mod_data.yml b/.mod_data.yml index ec96a41..1e81b72 100644 --- a/.mod_data.yml +++ b/.mod_data.yml @@ -17,7 +17,7 @@ dependencies: # Configure dependencies version: 1.4.2 location: s3 DynamicBatteryStorage: - tag: 2.2.1 + tag: 2.2.2 location: github repository: post-kerbin-mining-corporation/DynamicBatteryStorage DeployableEngines: @@ -29,11 +29,11 @@ dependencies: # Configure dependencies location: github repository: post-kerbin-mining-corporation/CryoTanks Waterfall: - tag: 0.4.1 + tag: 0.6.0 location: github repository: post-kerbin-mining-corporation/Waterfall SystemHeat: - tag: 0.3.7 + tag: 0.3.8 location: github repository: post-kerbin-mining-corporation/SystemHeat SpaceDust: diff --git a/GameData/FarFutureTechnologies/Patches/FFTNuclearTransfer.cfg b/GameData/FarFutureTechnologies/Patches/FFTNuclearTransfer.cfg new file mode 100644 index 0000000..fce4b6e --- /dev/null +++ b/GameData/FarFutureTechnologies/Patches/FFTNuclearTransfer.cfg @@ -0,0 +1,25 @@ +// When NFEis installed without the SH fission reactor integration, usethe NFE transfer mechanics +// ---------- +@PART[fft-nuclear-smelter-375-1]:FOR[FarFutureTechnologies]:NEEDS[NearFutureElectrical,!SystemHeatFissionReactors] +{ + + !MODULE[ModuleSystemHeatFissionFuelContainer] {} + + MODULE + { + name = RadioactiveStorageContainer + DangerousFuel = DepletedFuel + SafeFuel = EnrichedUranium + // What enginer level is needed to transfer the safe fuel + EngineerLevelForSafe = 1 + // What enginer level is needed to transfer the dangerous fuel + EngineerLevelForDangerous = 3 + // Max temp for transferring fuel into or out of the part + MaxTempForTransfer = 450 + // kW of heat per unit of waste + HeatFluxPerWasteUnit = 5 + + wasteModuleID = wasteColor + fuelModuleID = fuelColor + } +} diff --git a/GameData/FarFutureTechnologies/Versioning/FarFutureTechnologies.version b/GameData/FarFutureTechnologies/Versioning/FarFutureTechnologies.version index 4f6c194..33d4433 100644 --- a/GameData/FarFutureTechnologies/Versioning/FarFutureTechnologies.version +++ b/GameData/FarFutureTechnologies/Versioning/FarFutureTechnologies.version @@ -5,7 +5,7 @@ "VERSION": { "MAJOR":1, - "MINOR":0, + "MINOR":1, "PATCH":1, "BUILD":0 }, @@ -13,7 +13,7 @@ { "MAJOR":1, "MINOR":11, - "PATCH":0 + "PATCH":1 }, "KSP_VERSION_MIN":{ "MAJOR":1, diff --git a/changelog.txt b/changelog.txt index 3324372..6b801c8 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,10 @@ +1.1.1 +----- +- Updated DynamicBatteryStorage to 2.2.2 +- Updated Waterfall to 0.6.0 +- Updated SystemHeat to 0.3.8 +- Changed nuclear transfer behaviour; if NFE is installed without SystemHeat reactor patches, the NFE nuclear transfer mechanic will be used + 1.1.0 ----- - Updated DynamicBatteryStorage to 2.2.2 diff --git a/readme.txt b/readme.txt index fd97f7c..9da7080 100644 --- a/readme.txt +++ b/readme.txt @@ -1,5 +1,5 @@ ============================= -FAR FUTURE TECHNOLOGIES 1.0.0 +FAR FUTURE TECHNOLOGIES 1.1.1 ============================= This is a pack containing far-future but likely possible spacecraft technologies. These might not be possible today, but the physics works out, and might be feasible within the next 100 years. @@ -12,10 +12,10 @@ Required: - B9PartSwitch (2.17.0) - Community Resource Pack (1.4.2) - ModuleManager (4.1.4) -- CryoTanks (1.5.5) -- DynamicBatteryStorage (2.2.1) -- SystemHeat (0.3.2) -- Waterfall (0.3.0) +- CryoTanks (1.6.0) +- DynamicBatteryStorage (2.2.2) +- SystemHeat (0.3.8) +- Waterfall (0.6.0) - SpaceDust (0.3.0) Recommended From 39996ef8d7f968f2f40da92152516d54a4cccae0 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 9 Mar 2021 12:27:27 -0800 Subject: [PATCH 2/2] Waterfall fixes --- .mod_data.yml | 2 +- .../Parts/Engines/Antimatter/fft-antimatter-beam-1.cfg | 4 ++-- .../Parts/Engines/Fission/fft-ffre-plasma-1.cfg | 4 ++-- .../Parts/Engines/Fusion/fft-fusion-axial-zpinch-1.cfg | 8 ++++---- .../Parts/Engines/Fusion/fft-fusion-inertial-laser-1.cfg | 4 ++-- .../Parts/Engines/Fusion/fft-fusion-magnetic-mirror-1.cfg | 6 ++++-- .../Engines/Fusion/fft-fusion-magnetic-tokamak-1.cfg | 4 ++-- README.md | 8 ++++---- changelog.txt | 5 ++++- readme.txt | 2 +- 10 files changed, 26 insertions(+), 21 deletions(-) diff --git a/.mod_data.yml b/.mod_data.yml index 1e81b72..9e33994 100644 --- a/.mod_data.yml +++ b/.mod_data.yml @@ -33,7 +33,7 @@ dependencies: # Configure dependencies location: github repository: post-kerbin-mining-corporation/Waterfall SystemHeat: - tag: 0.3.8 + tag: 0.3.9 location: github repository: post-kerbin-mining-corporation/SystemHeat SpaceDust: diff --git a/GameData/FarFutureTechnologies/Parts/Engines/Antimatter/fft-antimatter-beam-1.cfg b/GameData/FarFutureTechnologies/Parts/Engines/Antimatter/fft-antimatter-beam-1.cfg index 31407a5..eb0197a 100644 --- a/GameData/FarFutureTechnologies/Parts/Engines/Antimatter/fft-antimatter-beam-1.cfg +++ b/GameData/FarFutureTechnologies/Parts/Engines/Antimatter/fft-antimatter-beam-1.cfg @@ -97,7 +97,7 @@ PART runningEffectName = fx-am-beam-running ignitionThreshold = 0.1 minThrust = 0 - maxThrust = 6000 + maxThrust = 4000 heatProduction = 0 PROPELLANT { @@ -115,7 +115,7 @@ PART } atmosphereCurve { - key = 0 775000 + key = 0 1050000 key = 1 6000 key = 12 0.001 } diff --git a/GameData/FarFutureTechnologies/Parts/Engines/Fission/fft-ffre-plasma-1.cfg b/GameData/FarFutureTechnologies/Parts/Engines/Fission/fft-ffre-plasma-1.cfg index 1948d10..beb6b1f 100644 --- a/GameData/FarFutureTechnologies/Parts/Engines/Fission/fft-ffre-plasma-1.cfg +++ b/GameData/FarFutureTechnologies/Parts/Engines/Fission/fft-ffre-plasma-1.cfg @@ -484,7 +484,6 @@ PART name = ModuleWaterfallFX moduleID = ffreEffect // This links the effects to a given ModuleEngines - engineID = FissionFragment // List out all controllers we want available CONTROLLER @@ -496,6 +495,7 @@ PART { name = throttle linkedTo = throttle + engineID = FissionFragment } EFFECT { @@ -827,13 +827,13 @@ PART name = ModuleWaterfallFX moduleID = ffreABEffect // This links the effects to a given ModuleEngines - engineID = Afterburning // List out all controllers we want available CONTROLLER { name = atmosphereDepth linkedTo = atmosphere_density + engineID = Afterburning } CONTROLLER { diff --git a/GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-axial-zpinch-1.cfg b/GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-axial-zpinch-1.cfg index b4fe0ab..623eb4c 100644 --- a/GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-axial-zpinch-1.cfg +++ b/GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-axial-zpinch-1.cfg @@ -123,7 +123,7 @@ PART } atmosphereCurve { - key = 0 265000 + key = 0 365000 key = 1 190 key = 4 80 } @@ -495,8 +495,6 @@ PART name = ModuleWaterfallFX moduleID = LowPowerEffect // This links the effects to a given ModuleEngines - engineID = ReactionProducts - // List out all controllers we want available CONTROLLER { @@ -507,6 +505,8 @@ PART { name = throttle linkedTo = throttle + engineID = ReactionProducts + } CONTROLLER { @@ -1071,7 +1071,6 @@ MODULE name = ModuleWaterfallFX moduleID = HighPowerEffect // This links the effects to a given ModuleEngines - engineID = Afterburner // List out all controllers we want available CONTROLLER @@ -1083,6 +1082,7 @@ MODULE { name = throttle linkedTo = throttle + engineID = Afterburner } CONTROLLER { diff --git a/GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-inertial-laser-1.cfg b/GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-inertial-laser-1.cfg index d41831f..3119f56 100644 --- a/GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-inertial-laser-1.cfg +++ b/GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-inertial-laser-1.cfg @@ -826,7 +826,6 @@ PART name = ModuleWaterfallFX moduleID = LowPowerEffect // This links the effects to a given ModuleEngines - engineID = ReactionProducts // List out all controllers we want available CONTROLLER @@ -838,6 +837,7 @@ PART { name = throttle linkedTo = custom + engineID = ReactionProducts } CONTROLLER { @@ -1229,7 +1229,6 @@ PART name = ModuleWaterfallFX moduleID = HigherPowerEffect // This links the effects to a given ModuleEngines - engineID = LowDensity // List out all controllers we want available CONTROLLER @@ -1241,6 +1240,7 @@ PART { name = throttle linkedTo = custom + engineID = LowDensity } CONTROLLER { diff --git a/GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-magnetic-mirror-1.cfg b/GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-magnetic-mirror-1.cfg index d17823c..6f67b92 100644 --- a/GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-magnetic-mirror-1.cfg +++ b/GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-magnetic-mirror-1.cfg @@ -937,7 +937,7 @@ PART name = ModuleWaterfallFX moduleID = LowPowerEffect // This links the effects to a given ModuleEngines - engineID = ReactionProducts + // List out all controllers we want available CONTROLLER @@ -949,6 +949,7 @@ PART { name = throttle linkedTo = throttle + engineID = ReactionProducts } CONTROLLER { @@ -1629,7 +1630,7 @@ EFFECT name = ModuleWaterfallFX moduleID = HighPowerEffect // This links the effects to a given ModuleEngines - engineID = Afterburner + // List out all controllers we want available CONTROLLER @@ -1641,6 +1642,7 @@ EFFECT { name = throttle linkedTo = throttle + engineID = Afterburner } CONTROLLER { diff --git a/GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-magnetic-tokamak-1.cfg b/GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-magnetic-tokamak-1.cfg index d4ffdc4..24d8d7a 100644 --- a/GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-magnetic-tokamak-1.cfg +++ b/GameData/FarFutureTechnologies/Parts/Engines/Fusion/fft-fusion-magnetic-tokamak-1.cfg @@ -531,7 +531,6 @@ PART name = ModuleWaterfallFX moduleID = LowPowerEffect // This links the effects to a given ModuleEngines - engineID = LowPower // List out all controllers we want available CONTROLLER @@ -543,6 +542,7 @@ PART { name = throttle linkedTo = throttle + engineID = LowPower } EFFECT { @@ -1131,7 +1131,6 @@ EFFECT name = ModuleWaterfallFX moduleID = HighPowerEffect // This links the effects to a given ModuleEngines - engineID = HighPower // List out all controllers we want available CONTROLLER @@ -1143,6 +1142,7 @@ EFFECT { name = throttle linkedTo = throttle + engineID = HighPower } diff --git a/README.md b/README.md index 07f9b64..25a9d0d 100644 --- a/README.md +++ b/README.md @@ -19,12 +19,12 @@ This is a pack containing far-future but likely possible spacecraft technologies These components are required for the mod to function and are bundled as part of any download: * [ModuleManager (4.1.4)](https://github.com/sarbian/ModuleManager) * [B9PartSwitch (2.17)](https://github.com/blowfishpro/B9PartSwitch) -* [SpaceDust (0.3.0)](https://github.com/post-kerbin-mining-corporation/SpaceDust) -* [Waterfall (0.5.0)](https://github.com/post-kerbin-mining-corporation/Waterfall) -* [SystemHeat (0.3.7)](https://github.com/post-kerbin-mining-corporation/SystemHeat) +* [SpaceDust (0.3.3)](https://github.com/post-kerbin-mining-corporation/SpaceDust) +* [Waterfall (0.6.0)](https://github.com/post-kerbin-mining-corporation/Waterfall) +* [SystemHeat (0.3.9)](https://github.com/post-kerbin-mining-corporation/SystemHeat) * [DeployableEngines (1.3.0)](https://github.com/post-kerbin-mining-corporation/DeployableEngines) * [DynamicBatteryStorage (2.2.2)](https://github.com/post-kerbin-mining-corporation/DynamicBatteryStorage) -* [CryoTanks (1.6.6)](https://github.com/post-kerbin-mining-corporation/CryoTanks) +* [CryoTanks (1.6.0)](https://github.com/post-kerbin-mining-corporation/CryoTanks) ## Installation diff --git a/changelog.txt b/changelog.txt index 6b801c8..e47fe49 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,7 +2,10 @@ ----- - Updated DynamicBatteryStorage to 2.2.2 - Updated Waterfall to 0.6.0 -- Updated SystemHeat to 0.3.8 +- Updated SystemHeat to 0.3.9 +- Fixed effects to work with Waterfall 0.6.0 (probably improvements to FX coming in the future) +- Reduced thrust of Frisbee by 1/3, increased Isp by 1/3 +- Fixed Cascade Isp typo (should have been 365k, was 265k) - Changed nuclear transfer behaviour; if NFE is installed without SystemHeat reactor patches, the NFE nuclear transfer mechanic will be used 1.1.0 diff --git a/readme.txt b/readme.txt index 9da7080..eca43d8 100644 --- a/readme.txt +++ b/readme.txt @@ -14,7 +14,7 @@ Required: - ModuleManager (4.1.4) - CryoTanks (1.6.0) - DynamicBatteryStorage (2.2.2) -- SystemHeat (0.3.8) +- SystemHeat (0.3.9) - Waterfall (0.6.0) - SpaceDust (0.3.0)