From b51e5c8f2d551c70cb1f5cd48ccad75f21547389 Mon Sep 17 00:00:00 2001 From: dlrk2 Date: Thu, 27 Aug 2020 17:58:48 -0400 Subject: [PATCH 01/10] Procedural wings config now checks for MFT Config now checks for MFT, preventing log spam and lag when CryoTanks, Procedural Wings and MFT are installed together --- GameData/CryoTanks/Patches/CryoTanksProceduralWings.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GameData/CryoTanks/Patches/CryoTanksProceduralWings.cfg b/GameData/CryoTanks/Patches/CryoTanksProceduralWings.cfg index 1e64059..9406c04 100644 --- a/GameData/CryoTanks/Patches/CryoTanksProceduralWings.cfg +++ b/GameData/CryoTanks/Patches/CryoTanksProceduralWings.cfg @@ -1,4 +1,4 @@ -@ProceduralWingFuelSetups:NEEDS[CryoTanks&B9_Aerospace_WingStuff|pWings] +@ProceduralWingFuelSetups:NEEDS[CryoTanks&B9_Aerospace_WingStuff|pWings&!ModularFuelTanks] { FuelSet { @@ -25,7 +25,7 @@ } } -@PART[B9_Aero_Wing_Procedural_TypeA,Proceduralwing*]:NEEDS[CryoTanks] +@PART[B9_Aero_Wing_Procedural_TypeA,Proceduralwing*]:NEEDS[CryoTanks&!ModularFuelTanks] { MODULE { From b1afb398123c30a1c0db3b654f7b2424b37a1465 Mon Sep 17 00:00:00 2001 From: dlrk2 Date: Thu, 26 Nov 2020 15:30:45 -0500 Subject: [PATCH 02/10] Fixed typo preventing monoprop from being used in cryogenic tanks --- CryoTanksModularFuelTanks.cfg | 95 +++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 CryoTanksModularFuelTanks.cfg diff --git a/CryoTanksModularFuelTanks.cfg b/CryoTanksModularFuelTanks.cfg new file mode 100644 index 0000000..ef2b3f1 --- /dev/null +++ b/CryoTanksModularFuelTanks.cfg @@ -0,0 +1,95 @@ +// CryoEngine MFT (Modular Fuel Tanks) Configuration File +// by funk 09/22/2015 + +//------------------------------------------------------// +// Adds tank definition for CryoEngines +TANK_DEFINITION:NEEDS[ModularFuelTanks&!RealFuels] +{ + name = Cryogenic + basemass = 0.0000016 * volume // if basemass is already described in part cfg. through other MFT patches, MFT won't update to basemass defined in tank definitions. Applies to most spaceplane parts. + baseCost = 0.2 * volume // weird behaviour: -x * volume -> costs = default drycosts incl. recources; x = 0.2 -> drycosts = default drycosts * ~122% + TANK + { + name = LqdHydrogen + amount = 0.0 + maxAmount = 0.0 + utilization = 7.5 + + } + TANK + { + name = Oxidizer + amount = 0.0 + maxAmount = 0.0 + } + TANK + { + name = MonoPropellant + amount = 0.0 + maxAmount = 0.0 + } + TANK + { + name = LiquidFuel + amount = 0.0 + maxAmount = 0.0 + } + TANK + { + name = LqdMethane + mass = 0.0000080 + amount = 0.0 + maxAmount = 0.0 + utilization = 5 + + } +} + +//------------------------------------------------------// +// Adds tank type Cryogenic to all default and fuselage tanks, and boiloff/cooling to all MFT tanks +@PART[*]:HAS[@MODULE[ModuleFuelTanks]]:NEEDS[!RealFuels]:FOR[zzz_CryoTanks] +{ + @MODULE[ModuleFuelTanks]:HAS[#type[Default]] + { + %typeAvailable = Default + typeAvailable = Cryogenic // if a resource is defined in both tank definitions (Ox), switching from a tank with lower amount of this resource cause MFT not to update to the correct amount of the resource. + } + + @MODULE[ModuleFuelTanks]:HAS[#type[Fuselage]] + { + %typeAvailable = Fuselage + typeAvailable = Cryogenic + } + @MODULE[ModuleFuelTanks]:HAS[#type[Structural]] + { + %typeAvailable = Structural + typeAvailable = Cryogenic + } + @MODULE[ModuleFuelTanks]:HAS[#type[B9_Fuselage]] + { + %typeAvailable = B9_Fuselage + typeAvailable = Cryogenic + } + MODULE + { + name = ModuleCryoTank + // in Ec per 1000 units per second + CoolingCost = 0.05 + CoolingEnabled = True + BOILOFFCONFIG + { + FuelName = LqdHydrogen + // in % per hr + BoiloffRate = 0.05 + CoolingCost = 0.09 + } + BOILOFFCONFIG + { + FuelName = LqdMethane + // in % per hr + BoiloffRate = 0.005 + CoolingCost = 0.045 + } + } +} + From f00b11030e44987a655da41a163995fe17fbaf07 Mon Sep 17 00:00:00 2001 From: dlrk2 Date: Thu, 26 Nov 2020 15:31:12 -0500 Subject: [PATCH 03/10] Delete CryoTanksModularFuelTanks.cfg --- CryoTanksModularFuelTanks.cfg | 95 ----------------------------------- 1 file changed, 95 deletions(-) delete mode 100644 CryoTanksModularFuelTanks.cfg diff --git a/CryoTanksModularFuelTanks.cfg b/CryoTanksModularFuelTanks.cfg deleted file mode 100644 index ef2b3f1..0000000 --- a/CryoTanksModularFuelTanks.cfg +++ /dev/null @@ -1,95 +0,0 @@ -// CryoEngine MFT (Modular Fuel Tanks) Configuration File -// by funk 09/22/2015 - -//------------------------------------------------------// -// Adds tank definition for CryoEngines -TANK_DEFINITION:NEEDS[ModularFuelTanks&!RealFuels] -{ - name = Cryogenic - basemass = 0.0000016 * volume // if basemass is already described in part cfg. through other MFT patches, MFT won't update to basemass defined in tank definitions. Applies to most spaceplane parts. - baseCost = 0.2 * volume // weird behaviour: -x * volume -> costs = default drycosts incl. recources; x = 0.2 -> drycosts = default drycosts * ~122% - TANK - { - name = LqdHydrogen - amount = 0.0 - maxAmount = 0.0 - utilization = 7.5 - - } - TANK - { - name = Oxidizer - amount = 0.0 - maxAmount = 0.0 - } - TANK - { - name = MonoPropellant - amount = 0.0 - maxAmount = 0.0 - } - TANK - { - name = LiquidFuel - amount = 0.0 - maxAmount = 0.0 - } - TANK - { - name = LqdMethane - mass = 0.0000080 - amount = 0.0 - maxAmount = 0.0 - utilization = 5 - - } -} - -//------------------------------------------------------// -// Adds tank type Cryogenic to all default and fuselage tanks, and boiloff/cooling to all MFT tanks -@PART[*]:HAS[@MODULE[ModuleFuelTanks]]:NEEDS[!RealFuels]:FOR[zzz_CryoTanks] -{ - @MODULE[ModuleFuelTanks]:HAS[#type[Default]] - { - %typeAvailable = Default - typeAvailable = Cryogenic // if a resource is defined in both tank definitions (Ox), switching from a tank with lower amount of this resource cause MFT not to update to the correct amount of the resource. - } - - @MODULE[ModuleFuelTanks]:HAS[#type[Fuselage]] - { - %typeAvailable = Fuselage - typeAvailable = Cryogenic - } - @MODULE[ModuleFuelTanks]:HAS[#type[Structural]] - { - %typeAvailable = Structural - typeAvailable = Cryogenic - } - @MODULE[ModuleFuelTanks]:HAS[#type[B9_Fuselage]] - { - %typeAvailable = B9_Fuselage - typeAvailable = Cryogenic - } - MODULE - { - name = ModuleCryoTank - // in Ec per 1000 units per second - CoolingCost = 0.05 - CoolingEnabled = True - BOILOFFCONFIG - { - FuelName = LqdHydrogen - // in % per hr - BoiloffRate = 0.05 - CoolingCost = 0.09 - } - BOILOFFCONFIG - { - FuelName = LqdMethane - // in % per hr - BoiloffRate = 0.005 - CoolingCost = 0.045 - } - } -} - From fa8445162e1982ef50378ca9c1037d6a4febfb30 Mon Sep 17 00:00:00 2001 From: dlrk2 Date: Thu, 26 Nov 2020 15:31:38 -0500 Subject: [PATCH 04/10] Fixed typo preventing monoprop from being used in cryogenic tanks --- GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg b/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg index e787393..ef2b3f1 100644 --- a/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg +++ b/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg @@ -24,7 +24,7 @@ TANK_DEFINITION:NEEDS[ModularFuelTanks&!RealFuels] } TANK { - name = Monopropellant + name = MonoPropellant amount = 0.0 maxAmount = 0.0 } From cad2663289f006c39602d639328fd8d82fe24c14 Mon Sep 17 00:00:00 2001 From: dlrk2 Date: Fri, 27 Nov 2020 01:19:03 -0500 Subject: [PATCH 05/10] Restored boiloff/insulation to CryoTanks included ZBO tanks --- .../Patches/CryoTanksModularFuelTanks.cfg | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg b/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg index ef2b3f1..3f56a11 100644 --- a/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg +++ b/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg @@ -92,4 +92,28 @@ TANK_DEFINITION:NEEDS[ModularFuelTanks&!RealFuels] } } } +// Adds ModuleCryoTank to CryoTanks included built in ZBO tanks. Without MFT installed, this is provided in the FuelTankSwitcherConfig +@PART[hydrogen-*]:HAS[@RESOURCE[LqdHydrogen]] +{ +MODULE + { + name = ModuleCryoTank + // in Ec per 1000 units per second + CoolingEnabled = True + BOILOFFCONFIG + { + FuelName = LqdHydrogen + // in % per hr + BoiloffRate = 0.05 + CoolingCost = 0.05 + } + BOILOFFCONFIG + { + FuelName = LqdMethane + // in % per hr + BoiloffRate = 0.005 + CoolingCost = 0.02 + } + } +} From b84e24e286437922ad1c0f7e9dc5cc80d3281be8 Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 19 Dec 2020 16:57:30 -0800 Subject: [PATCH 06/10] 1.11 --- .mod_data.yml | 4 ++-- GameData/CryoTanks/Versioning/CryoTanks.version | 10 +++++----- changelog.txt | 5 +++++ readme.txt | 4 ++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.mod_data.yml b/.mod_data.yml index e4363fd..e42de19 100644 --- a/.mod_data.yml +++ b/.mod_data.yml @@ -17,9 +17,9 @@ dependencies: # Configure dependencies version: 1.4.1 location: s3 DynamicBatteryStorage: - tag: 2.1.10 + tag: 2.2.0 location: github - repository: ChrisAdderley/DynamicBatteryStorage + repository: post-kerbin-mining-corporation/DynamicBatteryStorage deploy: SpaceDock: enabled: false # activate/deactivate this deployment script diff --git a/GameData/CryoTanks/Versioning/CryoTanks.version b/GameData/CryoTanks/Versioning/CryoTanks.version index 885fc6d..a5f0fdd 100644 --- a/GameData/CryoTanks/Versioning/CryoTanks.version +++ b/GameData/CryoTanks/Versioning/CryoTanks.version @@ -1,18 +1,18 @@ { "NAME":"CryoTanks", - "URL":"https://raw.githubusercontent.com/ChrisAdderley/CryoTanks/master/GameData/CryoTanks/Versioning/CryoTanks.version", - "DOWNLOAD":"https://github.com/ChrisAdderley/CryoTanks/releases", + "URL":"https://raw.githubusercontent.com/post-kerbin-mining-corporation/CryoTanks/master/GameData/CryoTanks/Versioning/CryoTanks.version", + "DOWNLOAD":"https://github.com/post-kerbin-mining-corporation/CryoTanks/releases", "VERSION": { "MAJOR":1, "MINOR":5, - "PATCH":3, + "PATCH":4, "BUILD":0 }, "KSP_VERSION": { "MAJOR":1, - "MINOR":10, + "MINOR":11, "PATCH":1 }, "KSP_VERSION_MIN":{ @@ -22,7 +22,7 @@ }, "KSP_VERSION_MAX":{ "MAJOR":1, - "MINOR":10, + "MINOR":11, "PATCH":99 } } diff --git a/changelog.txt b/changelog.txt index ceb6f10..8b55496 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +v1.5.4 +------ +- KSP 1.11 +- Updated DynamicBatteryStorage to 2.2.0 + v1.5.3 ------ - Updated DynamicBatteryStorage to 2.1.10 diff --git a/readme.txt b/readme.txt index 9792126..7bd7002 100644 --- a/readme.txt +++ b/readme.txt @@ -1,5 +1,5 @@ ================= -Cryo Tanks v1.5.3 +Cryo Tanks v1.5.4 ================= A mod pack for Kerbal Space Program, specifically supporting my other mods Kerbal Atomics (https://github.com/ChrisAdderley/KerbalAtomics) and Cryogenic Engines (https://github.com/ChrisAdderley/CryoEngines), dealing with cryogenic fuels, their storage and their properties. @@ -23,7 +23,7 @@ Required: - B9PartSwitch (2.17.0) - Community Resource Pack (1.4.1) - ModuleManager (4.1.4) -- DynamicBatteryStorage (2.1.10) +- DynamicBatteryStorage (2.2.0) Optional - Community Tech Tree (v2.2+) From 5ac0ff1fbf9135b8828f21565dbd27c78ce9647c Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 19 Dec 2020 22:19:18 -0800 Subject: [PATCH 07/10] deploy tools --- .github/workflows/build.yml | 43 +++++++++++++++++++++++++++++++++ .github/workflows/deploy.yml | 47 ++++++++++++++++++++++++++++++++++++ .ksp_deploy_config.yml | 3 +++ 3 files changed, 93 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/deploy.yml create mode 100644 .ksp_deploy_config.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..2872876 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,43 @@ +name: build + +# Controls when the action will run. Triggers the workflow on push or pull request +# events but only for the master branch +on: + pull_request: + branches: [ master ] + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build-package: + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + OAUTH_TOKEN: ${{ secrets.OAUTH_TOKEN }} + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checkout this repo + - uses: actions/checkout@v2 + # Checkout another repo + - uses: actions/checkout@v2 + with: + # Repository name with owner. + repository: 'post-kerbin-mining-corporation/build-deploy' + # branch + ref: 'actions' + path: 'build-deploy' + - uses: actions/setup-python@v2 + with: + python-version: '3.8' + architecture: 'x64' + - name: Installing dependencies + run: | + python -m pip install --upgrade pip + pip install flake8 pytest awscli boto3 requests + #- name: Running deploy tests + # run: pytest -s --testpath "GameData/" build-deploy/src/tests/ # run the deploy tests + - name: Building package + run: python build-deploy/src/package.py --f ".mod_data.yml" \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..e302790 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,47 @@ +name: deploy + +# Controls when the action will run. Triggers the workflow on push or pull request +# events but only for the master branch +on: + push: + branches: [ master ] + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + deploy-package: + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + OAUTH_TOKEN: ${{ secrets.OAUTH_TOKEN }} + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checkout this repo + - uses: actions/checkout@v2 + # Checkout another repo + - uses: actions/checkout@v2 + with: + # Repository name with owner. + repository: 'post-kerbin-mining-corporation/build-deploy' + # branch + ref: 'actions' + path: 'build-deploy' + - uses: actions/setup-python@v2 + with: + python-version: '3.8' + architecture: 'x64' + - name: Installing dependencies + run: | + python -m pip install --upgrade pip + pip install flake8 pytest awscli boto3 requests + #- name: Running deploy tests + # run: pytest -s --testpath "GameData/" build-deploy/src/tests/ # run the deploy tests + - name: Building package + run: python build-deploy/src/package.py --f ".mod_data.yml" + - name: Staging package + run: python build-deploy/src/stage.py --f ".mod_data.yml" # Run the staging script + - name: Deploying package + run: python build-deploy/src/deploy.py --f ".mod_data.yml" # Deploy package to spacedock, curse, github \ No newline at end of file diff --git a/.ksp_deploy_config.yml b/.ksp_deploy_config.yml new file mode 100644 index 0000000..91e5200 --- /dev/null +++ b/.ksp_deploy_config.yml @@ -0,0 +1,3 @@ +OAUTH_TOKEN_SSM_KEY: pkmc-bot-github-oauth-token +GITHUB_USER_SSM_KEY: pkmc-bot-github-user +GITHUB_USER_EMAIL_SSM_KEY: pkmc-bot-github-user-email \ No newline at end of file From 067e681d8e2e9758e2f3e4939d150b43b62a08eb Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 19 Dec 2020 22:20:48 -0800 Subject: [PATCH 08/10] changelog bump --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index 8b55496..dda9189 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,7 @@ v1.5.4 ------ - KSP 1.11 - Updated DynamicBatteryStorage to 2.2.0 +- Various MFT fixes by dlrk v1.5.3 ------ From 331819dad61505f32a849d2b811135df0705563c Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 19 Dec 2020 22:23:54 -0800 Subject: [PATCH 09/10] wrong KSP version --- GameData/CryoTanks/Versioning/CryoTanks.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GameData/CryoTanks/Versioning/CryoTanks.version b/GameData/CryoTanks/Versioning/CryoTanks.version index a5f0fdd..ab1eda6 100644 --- a/GameData/CryoTanks/Versioning/CryoTanks.version +++ b/GameData/CryoTanks/Versioning/CryoTanks.version @@ -13,7 +13,7 @@ { "MAJOR":1, "MINOR":11, - "PATCH":1 + "PATCH":0 }, "KSP_VERSION_MIN":{ "MAJOR":1, From 5f1d62b65af31828502ca67935b78658e080dc08 Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 19 Dec 2020 22:28:06 -0800 Subject: [PATCH 10/10] DBS version --- .mod_data.yml | 2 +- changelog.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.mod_data.yml b/.mod_data.yml index e42de19..7badb9b 100644 --- a/.mod_data.yml +++ b/.mod_data.yml @@ -17,7 +17,7 @@ dependencies: # Configure dependencies version: 1.4.1 location: s3 DynamicBatteryStorage: - tag: 2.2.0 + tag: 2.2.1 location: github repository: post-kerbin-mining-corporation/DynamicBatteryStorage deploy: diff --git a/changelog.txt b/changelog.txt index dda9189..411f4fa 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,7 @@ v1.5.4 ------ - KSP 1.11 -- Updated DynamicBatteryStorage to 2.2.0 +- Updated DynamicBatteryStorage to 2.2.1 - Various MFT fixes by dlrk v1.5.3