From 27a9e30f2c0e5ce278ba3c91a968e2d80d04bcbe Mon Sep 17 00:00:00 2001 From: Jonathan Bayer Date: Tue, 4 Jan 2022 23:35:49 -0500 Subject: [PATCH] Added :LAST to the NerteaCryoMassRebalance.cfg Changed :FINAL to LAST[UniversalStorage2] in the MassResourceRebalance.cfg Fixed GuidanceComputer to only be available when kOs is installed Added resize patch to reduce size of parts very slightly by about 2.25%, to better fix stock parts Changed MassResourceRebalance.cfg to change FINAL to LAST[UniversalStorage2] Following changes/additions to support IFILS, currently under development: Fixed OxygenWedge for IFILS, to only hold liquid O2 Updated ComboLivesupportWedge to support IFILS Updated FoodWedge with correct names for IFILS Updated Elektron to not be available when IFILS is installed Updated version file --- Changelog.txt | 17 +++- .../Parts/Electrical/GuidanceComputer.cfg | 4 +- .../Parts/Fuels/OxygenWedge.cfg | 6 +- .../Lifesupport/ComboLifesupportWedge.cfg | 78 +++++++++---------- .../Parts/Lifesupport/FoodWedge.cfg | 2 +- .../Parts/Processors/Elektron.cfg | 2 +- .../PatchManager/NerteaCryoMassRebalance.cfg | 30 ------- .../PluginData/MassResourceRebalance.cfg | 37 ++++++--- .../PluginData/NerteaCryoMassRebalance.cfg | 14 ---- .../UniversalStorage2/Patches/ResizePatch.cfg | 12 +++ .../UniversalStorage2.version | 6 +- UniversalStorage2.version | 14 ++-- deploy.bat | 3 + 13 files changed, 113 insertions(+), 112 deletions(-) delete mode 100644 GameData/UniversalStorage2/PatchManager/NerteaCryoMassRebalance.cfg delete mode 100644 GameData/UniversalStorage2/PatchManager/PluginData/NerteaCryoMassRebalance.cfg create mode 100644 GameData/UniversalStorage2/Patches/ResizePatch.cfg diff --git a/Changelog.txt b/Changelog.txt index ad61bdc..d65fedd 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,4 +1,5 @@ -Linuxgurugamer +4.0.0 + Adoption by Linuxgurugamer Started with latest beta from Bitbucket Forum user @nicolaSix found the problem for the NRE spam Merged in changes from @nicolaSix which fixes the NRE spam in the console when accessing the PAW, in EditorPartIconListener.cs @@ -38,5 +39,19 @@ Linuxgurugamer Added Cryo config Added mass rebalance configs as optional patches controlled by Patch Manager +4.0.0.1 + Added :LAST to the NerteaCryoMassRebalance.cfg + Changed :FINAL to LAST[UniversalStorage2] in the MassResourceRebalance.cfg + Fixed GuidanceComputer to only be available when kOs is installed + Added resize patch to reduce size of parts very slightly by about 2.25%, to better fix stock parts + Changed MassResourceRebalance.cfg to change FINAL to LAST[UniversalStorage2] + Following changes/additions to support IFILS, currently under development: + Fixed OxygenWedge for IFILS, to only hold liquid O2 + Updated ComboLivesupportWedge to support IFILS + Updated FoodWedge with correct names for IFILS + Updated Elektron to not be available when IFILS is installed + Updated version file + + TODO Update all language files for missing fields \ No newline at end of file diff --git a/GameData/UniversalStorage2/Parts/Electrical/GuidanceComputer.cfg b/GameData/UniversalStorage2/Parts/Electrical/GuidanceComputer.cfg index eb6ddb3..072d13f 100644 --- a/GameData/UniversalStorage2/Parts/Electrical/GuidanceComputer.cfg +++ b/GameData/UniversalStorage2/Parts/Electrical/GuidanceComputer.cfg @@ -6,7 +6,7 @@ // name = USGuidanceComputer -PART:NEEDS[kOS|MechJeb2] +PART:NEEDS[kOS] { // Shared by all parts in the mod // Module, Author, Manufacturer, Subcategory @@ -48,7 +48,7 @@ PART:NEEDS[kOS|MechJeb2] // Contains any special functionality for this part /+ // kOS - MODULE + MODULE:NEEDS[kOS] { name = kOSProcessor diskSpace = 10000 diff --git a/GameData/UniversalStorage2/Parts/Fuels/OxygenWedge.cfg b/GameData/UniversalStorage2/Parts/Fuels/OxygenWedge.cfg index f5f48eb..d0211c5 100644 --- a/GameData/UniversalStorage2/Parts/Fuels/OxygenWedge.cfg +++ b/GameData/UniversalStorage2/Parts/Fuels/OxygenWedge.cfg @@ -289,9 +289,9 @@ PART { //name = USFuelSwitch //SwitchID = 0 - @resourceNames = LiquidO2;LiquidO2;LiquidO2;LiquidO2 // ;FilteredO2;FilteredO2;FilteredO2;FilteredO2 - @resourceAmounts = 24000;48000;72000;96000 // ;30;60;90;120 - @initialResourceAmounts = 24000;48000;72000;96000 // ;30;60;90;120 + @resourceNames = LiquidOxygen;LiquidOxygen;LiquidOxygen;LiquidOxygen // ;FilteredO2;FilteredO2;FilteredO2;FilteredO2 + @resourceAmounts = 5;12.5;25;50 // ;30;60;90;120 + @initialResourceAmounts = 5;12.5;25;50 // ;30;60;90;120 @tankCost = 0;1500;3000;4500 @tankMass = 0;0.023;0.046;0.069 //hasGUI = False diff --git a/GameData/UniversalStorage2/Parts/Lifesupport/ComboLifesupportWedge.cfg b/GameData/UniversalStorage2/Parts/Lifesupport/ComboLifesupportWedge.cfg index 48ac7d7..c5eb571 100644 --- a/GameData/UniversalStorage2/Parts/Lifesupport/ComboLifesupportWedge.cfg +++ b/GameData/UniversalStorage2/Parts/Lifesupport/ComboLifesupportWedge.cfg @@ -271,45 +271,45 @@ PART } // IFI Life support - @PART[USComboLifesupportWedge]:NEEDS[IFILS] - { - - // Tech Tree - @TechRequired = spaceExploration - @entryCost = 600 - - @description = #autoLOC_US_ComboLifesupportWedgeIFILS_Description - - // Resources - - - !RESOURCE[Oxygen] {} - - !RESOURCE[Hydrogen] {} - - !RESOURCE[Water] {} - - RESOURCE - { - name = LifeSupport - amount = 10 - maxAmount = 10 - } - - RESOURCE - { - name = Slurry - amount = 0 - maxAmount = 10 - } - - MODULE - { - name = IFI_Basic - } - - - } + -PART[USComboLifesupportWedge]:NEEDS[IFILS] {} +// @PART[USComboLifesupportWedge]:NEEDS[IFILS] +// { +// // Tech Tree +// @TechRequired = spaceExploration +// @entryCost = 600 +// +// @description = #autoLOC_US_ComboLifesupportWedgeIFILS_Description +// +// // Resources +// +// +// !RESOURCE[Oxygen] {} +// +// !RESOURCE[Hydrogen] {} +// +// !RESOURCE[Water] {} +// +// RESOURCE +// { +// name = LifeSupport +// amount = 10 +// maxAmount = 10 +// } +// +// RESOURCE +// { +// name = Slurry +// amount = 0 +// maxAmount = 10 +// } +// +// MODULE +// { +// name = IFI_Basic +// } +// +// +// } //TAC @PART[USComboLifesupportWedge]:NEEDS[TacLifeSupport] { diff --git a/GameData/UniversalStorage2/Parts/Lifesupport/FoodWedge.cfg b/GameData/UniversalStorage2/Parts/Lifesupport/FoodWedge.cfg index 54ba71f..293e32d 100644 --- a/GameData/UniversalStorage2/Parts/Lifesupport/FoodWedge.cfg +++ b/GameData/UniversalStorage2/Parts/Lifesupport/FoodWedge.cfg @@ -275,7 +275,7 @@ PART:NEEDS[TacLifeSupport|Kerbalism|SnacksUtils|USILifeSupport|IFILS] { //name = USFuelSwitch //SwitchID = 0 - @resourceNames = Kibbles&Bits;Kibbles&Bits;Kibbles&Bits;Kibbles&Bits + @resourceNames = LifeSupport;LifeSupport;LifeSupport;LifeSupport @resourceAmounts = 42;84;126;168 @initialResourceAmounts = 42;84;126;168 @tankCost = 0;38;76;114 diff --git a/GameData/UniversalStorage2/Parts/Processors/Elektron.cfg b/GameData/UniversalStorage2/Parts/Processors/Elektron.cfg index 0656c68..c420262 100644 --- a/GameData/UniversalStorage2/Parts/Processors/Elektron.cfg +++ b/GameData/UniversalStorage2/Parts/Processors/Elektron.cfg @@ -6,7 +6,7 @@ // name = USElektron -PART +PART:NEEDS[!IFILS] { // Shared by all parts in the mod // Module, Author, Manufacturer, Subcategory diff --git a/GameData/UniversalStorage2/PatchManager/NerteaCryoMassRebalance.cfg b/GameData/UniversalStorage2/PatchManager/NerteaCryoMassRebalance.cfg deleted file mode 100644 index e28d37a..0000000 --- a/GameData/UniversalStorage2/PatchManager/NerteaCryoMassRebalance.cfg +++ /dev/null @@ -1,30 +0,0 @@ -PatchManager -{ - // Required settings. - // srcPath should use forward slashes, and include the full file name. srcPath should be in a directory - // called ".../PatchManager/PluginData" - modName = Universal Storage II - patchName = NerteaCryoMassRebalance - srcPath = UniversalStorage2/PatchManager/PluginData/NerteaCryoMassRebalance.cfg - - shortDescr = Rebalance for CryoTanks - - // Optional, but recommended - longDescr = Expand fuel options and add support to the fuel tank wedge for LqdHydrogen and LqdMethane added by CryoTanks - - - //// Optional entries here - //exclusions = ShortenName - - // dependencies, only show this patch if these specified mods are available - // List either the directory of the mod (as show by ModuleManager), or the - // mod DLL (as show by ModuleManager) - //dependencies = - - // Path to icon, if desired. Can be a flag - icon = UniversalStorage2/Flags/UniversalStorage - - // Author's name, if desired - author = Linuxgurugamer, Sandriell -} - diff --git a/GameData/UniversalStorage2/PatchManager/PluginData/MassResourceRebalance.cfg b/GameData/UniversalStorage2/PatchManager/PluginData/MassResourceRebalance.cfg index 4e1b532..7689072 100644 --- a/GameData/UniversalStorage2/PatchManager/PluginData/MassResourceRebalance.cfg +++ b/GameData/UniversalStorage2/PatchManager/PluginData/MassResourceRebalance.cfg @@ -3,22 +3,22 @@ /////////// Sandriell - https://forum.kerbalspaceprogram.com/index.php?/profile/165509-sandriell/ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -@PART[USMatBayWedge,USGuidanceComputer,USRTGWedge]:FINAL +@PART[USMatBayWedge,USGuidanceComputer,USRTGWedge]:LAST[UniversalStorage2] { @mass = 0.1 } -@PART[USFluidSpectroWedge,USAccelGravWedge,USThermoBaroWedge,USGooBayWedge]:FINAL +@PART[USFluidSpectroWedge,USAccelGravWedge,USThermoBaroWedge,USGooBayWedge]:LAST[UniversalStorage2] { @mass = 0.05 } -@PART[USSabatier,USWaterPurifier,USFuelCellMedium,USElektron]:FINAL +@PART[USSabatier,USWaterPurifier,USFuelCellMedium,USElektron]:LAST[UniversalStorage2] { @mass = 0.2 } -@PART[USOxygenWedge]:FINAL +@PART[USOxygenWedge]:LAST[UniversalStorage2] { @mass = 0.034 @@ -30,7 +30,7 @@ } } -@PART[USFoodWedge]:FINAL +@PART[USFoodWedge]:LAST[UniversalStorage2] { @mass = 0.069 @@ -42,7 +42,7 @@ } } -@PART[USWaterWedge]:FINAL +@PART[USWaterWedge]:LAST[UniversalStorage2] { @mass = 0.077 @@ -54,7 +54,7 @@ } } -@PART[USSolidWasteWedge]:FINAL +@PART[USSolidWasteWedge]:LAST[UniversalStorage2] { @mass = 0.05 @@ -66,7 +66,7 @@ } } -@PART[USGreyWaterWedge]:FINAL +@PART[USGreyWaterWedge]:LAST[UniversalStorage2] { @mass = 0.075 @@ -78,7 +78,7 @@ } } -@PART[USCarbonDioxideWedge]:FINAL +@PART[USCarbonDioxideWedge]:LAST[UniversalStorage2] { @mass = 0.025 @@ -90,7 +90,7 @@ } } -@PART[USComboLifesupportWedge]:FINAL +@PART[USComboLifesupportWedge]:LAST[UniversalStorage2] { @mass = 0.015 @@ -116,7 +116,7 @@ } } -@PART[USHydrazineWedge]:FINAL +@PART[USHydrazineWedge]:LAST[UniversalStorage2] { @mass = 0.015 @@ -126,4 +126,19 @@ @initialResourceAmounts = 27.5;55;82.5;110 @tankMass = 0;0.015;0.030;0.045 } +} + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////// Expand fuel options and add support to the fuel tank wedge for LqdHydrogen and LqdMethane added by CryoTanks +/////////// Sandriell - https://forum.kerbalspaceprogram.com/index.php?/profile/165509-sandriell/ +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +@PART[USAerozineWedge]:NEEDS[CryoTanks]:LAST[UniversalStorage2] +{ + @mass = 0.015 + + @MODULE[USFuelSwitch] + { + @tankMass = 0;0.015;0.030;0.045|0;0.015;0.030;0.045|0;0.015;0.030;0.045|0;0.015;0.030;0.045|0;0.015;0.030;0.045|0;0.015;0.030;0.045 + } } \ No newline at end of file diff --git a/GameData/UniversalStorage2/PatchManager/PluginData/NerteaCryoMassRebalance.cfg b/GameData/UniversalStorage2/PatchManager/PluginData/NerteaCryoMassRebalance.cfg deleted file mode 100644 index e0a44b6..0000000 --- a/GameData/UniversalStorage2/PatchManager/PluginData/NerteaCryoMassRebalance.cfg +++ /dev/null @@ -1,14 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -/////////// Expand fuel options and add support to the fuel tank wedge for LqdHydrogen and LqdMethane added by CryoTanks -/////////// Sandriell - https://forum.kerbalspaceprogram.com/index.php?/profile/165509-sandriell/ -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -@PART[USAerozineWedge]:NEEDS[CryoTanks] -{ - @mass = 0.015 - - @MODULE[USFuelSwitch]:LAST - { - @tankMass = 0;0.015;0.030;0.045|0;0.015;0.030;0.045|0;0.015;0.030;0.045|0;0.015;0.030;0.045|0;0.015;0.030;0.045|0;0.015;0.030;0.045 - } -} \ No newline at end of file diff --git a/GameData/UniversalStorage2/Patches/ResizePatch.cfg b/GameData/UniversalStorage2/Patches/ResizePatch.cfg new file mode 100644 index 0000000..3a60b67 --- /dev/null +++ b/GameData/UniversalStorage2/Patches/ResizePatch.cfg @@ -0,0 +1,12 @@ +// +// Resize parts to fit properly +// + +@PART[US*]:LAST[UniversalStorage2] +{ + @MODEL + { + @scale = 0.975, 0.975, 0.975 + } + +} \ No newline at end of file diff --git a/GameData/UniversalStorage2/UniversalStorage2.version b/GameData/UniversalStorage2/UniversalStorage2.version index 62a2afe..e785c72 100644 --- a/GameData/UniversalStorage2/UniversalStorage2.version +++ b/GameData/UniversalStorage2/UniversalStorage2.version @@ -12,16 +12,16 @@ "KSP_VERSION": { "MAJOR": 1, "MINOR": 12, - "PATCH": 1 + "PATCH": 3 }, "KSP_VERSION_MIN": { "MAJOR": 1, "MINOR": 12, - "PATCH": 1 + "PATCH": 0 }, "KSP_VERSION_MAX": { "MAJOR": 1, "MINOR": 12, - "PATCH": 2 + "PATCH": 3 } } diff --git a/UniversalStorage2.version b/UniversalStorage2.version index e785c72..b0af4a8 100644 --- a/UniversalStorage2.version +++ b/UniversalStorage2.version @@ -1,13 +1,13 @@ { "NAME": "Universal Storage 2", - "URL": "http://ksp-avc.cybutek.net/version.php?id=667", - "DOWNLOAD": "https://spacedock.info/mod/1933/Universal%20Storage%20II", - "CHANGE_LOG_URL": "https://spacedock.info/mod/1933/Universal%20Storage%20II", + "URL": "http://ksp.spacetux.net/avc/UniversalStorage2", + "DOWNLOAD": "https://github.com/linuxgurugamer/universal-storage-2/releases", + "CHANGE_LOG_URL": "https://raw.githubusercontent.com/linuxgurugamer/universal-storage-2/master/Changelog.txt", "VERSION": { - "MAJOR": 1, - "MINOR": 9, - "PATCH": 2, - "BUILD": 0 + "MAJOR": 4, + "MINOR": 0, + "PATCH": 0, + "BUILD": 1 }, "KSP_VERSION": { "MAJOR": 1, diff --git a/deploy.bat b/deploy.bat index c9bc11e..b13fbee 100644 --- a/deploy.bat +++ b/deploy.bat @@ -8,6 +8,9 @@ rem VERSIONFILE is the name of the version file, usually the same as GAMEDATA, rem but not always set H=%KSPDIR% + +set H=R:\KSP_1.12.3_IFI_US2 + set GAMEDIR=UniversalStorage2 set GAMEDATA="GameData" set VERSIONFILE=%GAMEDIR%.version