From d1399632366701ba0f9e2ccad1e778071ab017bf Mon Sep 17 00:00:00 2001 From: shadowmage45 Date: Sun, 9 Feb 2020 16:30:11 -0700 Subject: [PATCH 1/2] .. --- GameData/SSTU/Plugins/SSTUTools.dll | Bin 380416 -> 380416 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/GameData/SSTU/Plugins/SSTUTools.dll b/GameData/SSTU/Plugins/SSTUTools.dll index 11c0123cd00fd5ab01546d697743b752fa2a517d..11dee541b87945b35ace423d0612ba411b1274b4 100644 GIT binary patch delta 84 zcmV-a0IUCioELzc7m$bo?v;Uxg^B@%iUNg-1BHqNwTcBgLlF8FU~Ts%6i%(scUI!V qIVZQ&Lj|;f0`8TUip2#Q5So5Xhyc1YO^)>85;FF*i?_7J1xyG43MBvl delta 84 zcmZpeBi=Aad_o6P-;~C#)-J}@E~eHl=GHEjtzE2E&H~Gwx{mr5R=ezswCC*I9vZp* oiZkn$Mxf&9T}N4^1Ueo296m(IyEiE%Oq4PT@!r1WD60<#0Ht#wRsaA1 From 8dcc85e44e7a53123e5d3ff2eec37ab75d6db0f1 Mon Sep 17 00:00:00 2001 From: Gordon Dry Date: Sat, 3 Oct 2020 19:12:27 +0200 Subject: [PATCH 2/2] Make the MechJeb patch avoid duplicates Other mods also do stuff like this and so let's avoid having two MJ modules on a part. --- GameData/SSTU/ModIntegration/MechJeb2/MJ.cfg | 148 +++++++++---------- 1 file changed, 72 insertions(+), 76 deletions(-) diff --git a/GameData/SSTU/ModIntegration/MechJeb2/MJ.cfg b/GameData/SSTU/ModIntegration/MechJeb2/MJ.cfg index 5f24916d..fa0be5b7 100644 --- a/GameData/SSTU/ModIntegration/MechJeb2/MJ.cfg +++ b/GameData/SSTU/ModIntegration/MechJeb2/MJ.cfg @@ -1,104 +1,100 @@ @PART[SSTU-SC-V-CM|SSTU-SC-A-DM|SSTU-SC-A-OM|SSTU-SC-A-SMX|SSTU-SC-B-CM|SSTU-SC-B-CMX|SSTU-SC-C-CM|SSTU-SC-C-CMX|SSTU-SC-E-FS|SSTU-SC-E-FSX]:FOR[SSTU]:NEEDS[MechJeb2] { - MODULE + %MODULE[MechJebCore] { - name = MechJebCore - MechJebLocalSettings + %MechJebLocalSettings { - MechJebModuleCustomWindowEditor { unlockTechs = flightControl } - MechJebModuleSmartASS { unlockTechs = flightControl } - MechJebModuleManeuverPlanner { unlockTechs = advFlightControl } - MechJebModuleNodeEditor { unlockTechs = advFlightControl } - MechJebModuleTranslatron { unlockTechs = advFlightControl } - MechJebModuleWarpHelper { unlockTechs = advFlightControl } - MechJebModuleAttitudeAdjustment { unlockTechs = advFlightControl } - MechJebModuleThrustWindow { unlockTechs = advFlightControl } - MechJebModuleRCSBalancerWindow { unlockTechs = advFlightControl } - MechJebModuleRoverWindow { unlockTechs = fieldScience } - MechJebModuleAscentGuidance { unlockTechs = unmannedTech } - MechJebModuleLandingGuidance { unlockTechs = unmannedTech } - MechJebModuleSpaceplaneGuidance { unlockTechs = unmannedTech } - MechJebModuleDockingGuidance { unlockTechs = advUnmanned } - MechJebModuleRendezvousAutopilotWindow { unlockTechs = advUnmanned } - MechJebModuleRendezvousGuidance { unlockTechs = advUnmanned } + %MechJebModuleCustomWindowEditor { unlockTechs = flightControl } + %MechJebModuleSmartASS { unlockTechs = flightControl } + %MechJebModuleManeuverPlanner { unlockTechs = advFlightControl } + %MechJebModuleNodeEditor { unlockTechs = advFlightControl } + %MechJebModuleTranslatron { unlockTechs = advFlightControl } + %MechJebModuleWarpHelper { unlockTechs = advFlightControl } + %MechJebModuleAttitudeAdjustment { unlockTechs = advFlightControl } + %MechJebModuleThrustWindow { unlockTechs = advFlightControl } + %MechJebModuleRCSBalancerWindow { unlockTechs = advFlightControl } + %MechJebModuleRoverWindow { unlockTechs = fieldScience } + %MechJebModuleAscentGuidance { unlockTechs = unmannedTech } + %MechJebModuleLandingGuidance { unlockTechs = unmannedTech } + %MechJebModuleSpaceplaneGuidance { unlockTechs = unmannedTech } + %MechJebModuleDockingGuidance { unlockTechs = advUnmanned } + %MechJebModuleRendezvousAutopilotWindow { unlockTechs = advUnmanned } + %MechJebModuleRendezvousGuidance { unlockTechs = advUnmanned } } } } @PART[SSTU-SC-GEN-PPC|SSTU-SC-TANK-MUS|SSTU-SC-C-ICPS|SSTU-SC-C-HUS]:FOR[SSTU]:NEEDS[MechJeb2] { - MODULE + %MODULE[MechJebCore] { - name = MechJebCore - MechJebLocalSettings + %MechJebLocalSettings { - MechJebModuleCustomWindowEditor { unlockTechs = flightControl } - MechJebModuleSmartASS { unlockTechs = flightControl } - MechJebModuleManeuverPlanner { unlockTechs = advFlightControl } - MechJebModuleNodeEditor { unlockTechs = advFlightControl } - MechJebModuleTranslatron { unlockTechs = advFlightControl } - MechJebModuleWarpHelper { unlockTechs = advFlightControl } - MechJebModuleAttitudeAdjustment { unlockTechs = advFlightControl } - MechJebModuleThrustWindow { unlockTechs = advFlightControl } - MechJebModuleRCSBalancerWindow { unlockTechs = advFlightControl } - MechJebModuleRoverWindow { unlockTechs = fieldScience } - MechJebModuleAscentGuidance { unlockTechs = unmannedTech } - MechJebModuleLandingGuidance { unlockTechs = unmannedTech } - MechJebModuleSpaceplaneGuidance { unlockTechs = unmannedTech } - MechJebModuleDockingGuidance { unlockTechs = advUnmanned } - MechJebModuleRendezvousAutopilotWindow { unlockTechs = advUnmanned } - MechJebModuleRendezvousGuidance { unlockTechs = advUnmanned } + %MechJebModuleCustomWindowEditor { unlockTechs = flightControl } + %MechJebModuleSmartASS { unlockTechs = flightControl } + %MechJebModuleManeuverPlanner { unlockTechs = advFlightControl } + %MechJebModuleNodeEditor { unlockTechs = advFlightControl } + %MechJebModuleTranslatron { unlockTechs = advFlightControl } + %MechJebModuleWarpHelper { unlockTechs = advFlightControl } + %MechJebModuleAttitudeAdjustment { unlockTechs = advFlightControl } + %MechJebModuleThrustWindow { unlockTechs = advFlightControl } + %MechJebModuleRCSBalancerWindow { unlockTechs = advFlightControl } + %MechJebModuleRoverWindow { unlockTechs = fieldScience } + %MechJebModuleAscentGuidance { unlockTechs = unmannedTech } + %MechJebModuleLandingGuidance { unlockTechs = unmannedTech } + %MechJebModuleSpaceplaneGuidance { unlockTechs = unmannedTech } + %MechJebModuleDockingGuidance { unlockTechs = advUnmanned } + %MechJebModuleRendezvousAutopilotWindow { unlockTechs = advUnmanned } + %MechJebModuleRendezvousGuidance { unlockTechs = advUnmanned } } } } @PART[SSTU-LC2-POD|SSTU-LC3-POD|SSTU-LC5-POD]:FOR[SSTU]:NEEDS[MechJeb2] { - MODULE + %MODULE[MechJebCore] { - name = MechJebCore - MechJebLocalSettings + %MechJebLocalSettings { - MechJebModuleCustomWindowEditor { unlockTechs = flightControl } - MechJebModuleSmartASS { unlockTechs = flightControl } - MechJebModuleManeuverPlanner { unlockTechs = advFlightControl } - MechJebModuleNodeEditor { unlockTechs = advFlightControl } - MechJebModuleTranslatron { unlockTechs = advFlightControl } - MechJebModuleWarpHelper { unlockTechs = advFlightControl } - MechJebModuleAttitudeAdjustment { unlockTechs = advFlightControl } - MechJebModuleThrustWindow { unlockTechs = advFlightControl } - MechJebModuleRCSBalancerWindow { unlockTechs = advFlightControl } - MechJebModuleRoverWindow { unlockTechs = fieldScience } - MechJebModuleAscentGuidance { unlockTechs = unmannedTech } - MechJebModuleLandingGuidance { unlockTechs = unmannedTech } - MechJebModuleSpaceplaneGuidance { unlockTechs = unmannedTech } - MechJebModuleDockingGuidance { unlockTechs = advUnmanned } - MechJebModuleRendezvousAutopilotWindow { unlockTechs = advUnmanned } - MechJebModuleRendezvousGuidance { unlockTechs = advUnmanned } + %MechJebModuleCustomWindowEditor { unlockTechs = flightControl } + %MechJebModuleSmartASS { unlockTechs = flightControl } + %MechJebModuleManeuverPlanner { unlockTechs = advFlightControl } + %MechJebModuleNodeEditor { unlockTechs = advFlightControl } + %MechJebModuleTranslatron { unlockTechs = advFlightControl } + %MechJebModuleWarpHelper { unlockTechs = advFlightControl } + %MechJebModuleAttitudeAdjustment { unlockTechs = advFlightControl } + %MechJebModuleThrustWindow { unlockTechs = advFlightControl } + %MechJebModuleRCSBalancerWindow { unlockTechs = advFlightControl } + %MechJebModuleRoverWindow { unlockTechs = fieldScience } + %MechJebModuleAscentGuidance { unlockTechs = unmannedTech } + %MechJebModuleLandingGuidance { unlockTechs = unmannedTech } + %MechJebModuleSpaceplaneGuidance { unlockTechs = unmannedTech } + %MechJebModuleDockingGuidance { unlockTechs = advUnmanned } + %MechJebModuleRendezvousAutopilotWindow { unlockTechs = advUnmanned } + %MechJebModuleRendezvousGuidance { unlockTechs = advUnmanned } } } } @PART[SSTU-ST-DOS-COM|SSTU-ST-DOS-FEM|SSTU-ST-DOS-HAB|SSTU-ST-DOS-LAB|SSTU-ST-DOS-PWR|SSTU-ST-DOS-TKS|SSTU-ST-HAB-B1|SSTU-ST-HAB-B2|SSTU-ST-HAB-C1|SSTU-ST-HAB-C2]:FOR[SSTU]:NEEDS[MechJeb2] { - MODULE + %MODULE[MechJebCore] { - name = MechJebCore - MechJebLocalSettings + %MechJebLocalSettings { - MechJebModuleCustomWindowEditor { unlockTechs = flightControl } - MechJebModuleSmartASS { unlockTechs = flightControl } - MechJebModuleManeuverPlanner { unlockTechs = advFlightControl } - MechJebModuleNodeEditor { unlockTechs = advFlightControl } - MechJebModuleTranslatron { unlockTechs = advFlightControl } - MechJebModuleWarpHelper { unlockTechs = advFlightControl } - MechJebModuleAttitudeAdjustment { unlockTechs = advFlightControl } - MechJebModuleThrustWindow { unlockTechs = advFlightControl } - MechJebModuleRCSBalancerWindow { unlockTechs = advFlightControl } - MechJebModuleRoverWindow { unlockTechs = fieldScience } - MechJebModuleAscentGuidance { unlockTechs = unmannedTech } - MechJebModuleLandingGuidance { unlockTechs = unmannedTech } - MechJebModuleSpaceplaneGuidance { unlockTechs = unmannedTech } - MechJebModuleDockingGuidance { unlockTechs = advUnmanned } - MechJebModuleRendezvousAutopilotWindow { unlockTechs = advUnmanned } - MechJebModuleRendezvousGuidance { unlockTechs = advUnmanned } + %MechJebModuleCustomWindowEditor { unlockTechs = flightControl } + %MechJebModuleSmartASS { unlockTechs = flightControl } + %MechJebModuleManeuverPlanner { unlockTechs = advFlightControl } + %MechJebModuleNodeEditor { unlockTechs = advFlightControl } + %MechJebModuleTranslatron { unlockTechs = advFlightControl } + %MechJebModuleWarpHelper { unlockTechs = advFlightControl } + %MechJebModuleAttitudeAdjustment { unlockTechs = advFlightControl } + %MechJebModuleThrustWindow { unlockTechs = advFlightControl } + %MechJebModuleRCSBalancerWindow { unlockTechs = advFlightControl } + %MechJebModuleRoverWindow { unlockTechs = fieldScience } + %MechJebModuleAscentGuidance { unlockTechs = unmannedTech } + %MechJebModuleLandingGuidance { unlockTechs = unmannedTech } + %MechJebModuleSpaceplaneGuidance { unlockTechs = unmannedTech } + %MechJebModuleDockingGuidance { unlockTechs = advUnmanned } + %MechJebModuleRendezvousAutopilotWindow { unlockTechs = advUnmanned } + %MechJebModuleRendezvousGuidance { unlockTechs = advUnmanned } } } }