From 5f1c731a48e727830f49bf6e9e9ee809b8722f58 Mon Sep 17 00:00:00 2001 From: Poodmund Date: Sat, 13 Feb 2021 16:45:17 +0000 Subject: [PATCH 1/3] Copy KSP 1.11.1 Vanilla drag cubes over. --- .../Patches/Thermal/restock-heat-shields.cfg | 26 ++++++++++++------- .../Aero/restock-mh-heat-shields.cfg | 6 +++++ .../Aero/1875/restock-heatshield-1875-1.cfg | 5 ++++ 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg b/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg index a9ef0eef..e9593371 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg @@ -149,8 +149,8 @@ !DRAG_CUBE {} DRAG_CUBE { - cube = Fairing, 0.3875,0.7436,0.7686, 0.3875,0.7436,0.7686, 1.44,0.9625,0.1822, 1.44,0.964,0.3017, 0.3875,0.7436,0.7686, 0.3875,0.7436,0.7686, 0,-0.05126,0, 1.355,0.2838,1.355 - cube = Clean, 0.1825,0.4643,0.7229, 0.1825,0.4643,0.7229, 1.274,0.9542,0.1829, 1.274,0.9475,0.2177, 0.1825,0.4628,0.7229, 0.1825,0.4658,0.7229, 0,0.005576,-1.994E-09, 1.275,0.1702,1.275 + cube = Fairing, 0.3875,0.7461,0.7686, 0.3875,0.7461,0.7686, 1.435,0.9658,0.1822, 1.435,0.9675,0.3017, 0.3875,0.7461,0.7686, 0.3875,0.7461,0.7686, 0,-0.05126,0, 1.355,0.2838,1.355 + cube = Clean, 0.181,0.468,0.7344, 0.181,0.468,0.7344, 1.27,0.9574,0.1829, 1.27,0.9507,0.2177, 0.181,0.4664,0.7344, 0.181,0.4695,0.7344, 0,0.005576,-1.994E-09, 1.275,0.1702,1.275 } } @@ -216,10 +216,11 @@ excludedRenderer = HeatShield25Fairing excludedRenderer = HeatShieldInternals } + !DRAG_CUBE {} DRAG_CUBE { - cube = Fairing, 1.436,0.7472,1.355, 1.436,0.7472,1.355, 5.341,0.9614,0.259, 5.341,0.9714,0.4709, 1.436,0.7472,1.355, 1.436,0.7471,1.355, 0,-0.1004,0, 2.609,0.5505,2.609 - cube = Clean, 0.7091,0.4621,1.346, 0.7091,0.4621,1.346, 4.998,0.9524,0.2587, 4.998,0.9466,0.3249, 0.7091,0.4605,1.346, 0.7091,0.4638,1.346, 0,0.01104,0, 2.525,0.3277,2.525 + cube = Fairing, 1.436,0.7497,1.366, 1.436,0.7497,1.366, 5.323,0.9648,0.259, 5.323,0.9747,0.4709, 1.436,0.7497,1.366, 1.436,0.7497,1.366, 0,-0.1004,0, 2.609,0.5505,2.609 + cube = Clean, 0.7025,0.4649,1.357, 0.7025,0.4649,1.357, 4.982,0.9555,0.2587, 4.982,0.9499,0.327, 0.7025,0.4634,1.357, 0.7025,0.4665,1.357, 0,0.01104,-3.947E-09, 2.525,0.3277,2.525 } } @@ -233,11 +234,6 @@ { model = ReStock/Assets/Aero/restock-heatshield-375-1 } - DRAG_CUBE - { - cube = Fairing, 3.357,0.7502,2.005, 3.357,0.7502,2.005, 12.48,0.9608,0.3456, 12.48,0.9621,0.6953, 3.357,0.7502,2.005, 3.357,0.7502,2.005, 0,-0.1559,0, 3.99,0.8369,3.99 - cube = Clean, 1.563,0.4576,1.952, 1.563,0.4576,1.952, 11.03,0.9547,0.3365, 11.03,0.9465,0.4361, 1.563,0.456,1.952, 1.563,0.459,1.952, 0,0.01101,0, 3.75,0.4864,3.75 - } @MODULE[ModuleJettison] { @jettisonName = HeatShield375Fairing @@ -289,6 +285,12 @@ excludedRenderer = HeatShield375Fairing excludedRenderer = HeatShield375Internal } + !DRAG_CUBE {} + DRAG_CUBE + { + cube = Fairing, 3.357,0.7502,2.005, 3.357,0.7502,2.005, 12.44,0.9645,0.3456, 12.44,0.9656,0.6994, 3.357,0.7502,2.005, 3.357,0.7502,2.005, 0,-0.1559,0, 3.99,0.8369,3.99 + cube = Clean, 1.549,0.4589,1.967, 1.549,0.4589,1.967, 10.99,0.9578,0.3365, 10.99,0.9498,0.4388, 1.549,0.4573,1.967, 1.549,0.4603,1.967, 0,0.01101,-3.936E-09, 3.75,0.4864,3.75 + } } // Heat Shield (10m) @@ -305,4 +307,10 @@ { @animationName = Inflate } + !DRAG_CUBE {} + DRAG_CUBE + { + cube = A, 19.07,0.4872,8.728, 19.07,0.4871,8.728, 72.75,0.8279,2.352, 71.74,0.8437,2.415, 18.75,0.4822,9.129, 18.75,0.5195,9.129, -4.768E-07,0.9913,4.768E-07, 8.528,3.025,9.074 + cube = B, 5.042,0.7795,4.677, 5.042,0.7795,4.677, 4.271,0.8684,4.235, 3.585,0.6972,0.9259, 5.008,0.7754,4.212, 5.008,0.7758,4.212, -4.768E-07,2.057,0, 6.815,4.172,5.902 + } } diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-heat-shields.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-heat-shields.cfg index 904e425a..6c4dfee0 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-heat-shields.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Aero/restock-mh-heat-shields.cfg @@ -63,4 +63,10 @@ excludedRenderer = HeatShield1875Fairing excludedRenderer = HeatShieldInternals } + !DRAG_CUBE {} + DRAG_CUBE + { + cube = Fairing, 0.8075,0.7497,1.049, 0.8075,0.7497,1.049, 2.992,0.9648,0.2187, 2.992,0.9747,0.3773, 0.8075,0.7497,1.049, 0.8075,0.7497,1.049, 0,-0.07528,0, 1.957,0.4129,1.957 + cube = Clean, 0.3952,0.4649,1.043, 0.3952,0.4649,1.043, 2.804,0.9555,0.2203, 2.804,0.9499,0.271, 0.3952,0.4634,1.043, 0.3952,0.4665,1.043, 0,0.008278,-2.96E-09, 1.894,0.2458,1.894 + } } diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-heatshield-1875-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-heatshield-1875-1.cfg index ce1e1db0..ab8b3dff 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-heatshield-1875-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-heatshield-1875-1.cfg @@ -347,4 +347,9 @@ PART nodeEnabled = True attachNodeName = bottom } + DRAG_CUBE + { + cube = Fairing, 0.8075,0.7497,1.049, 0.8075,0.7497,1.049, 2.992,0.9648,0.2187, 2.992,0.9747,0.3773, 0.8075,0.7497,1.049, 0.8075,0.7497,1.049, 0,-0.07528,0, 1.957,0.4129,1.957 + cube = Clean, 0.3952,0.4649,1.043, 0.3952,0.4649,1.043, 2.804,0.9555,0.2203, 2.804,0.9499,0.271, 0.3952,0.4634,1.043, 0.3952,0.4665,1.043, 0,0.008278,-2.96E-09, 1.894,0.2458,1.894 + } } From aec1d07b355a8a31695fb6ca6ee4b7b7caed4cdd Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 26 Feb 2021 09:46:28 -0800 Subject: [PATCH 2/3] 1.3.2fixes --- .github/workflows/deploy.yml | 2 +- .../Assets/Aero/restock-heatshield-125-1.mu | Bin 292692 -> 292826 bytes .../Engine/restock-engine-glow-basic-1.dds | Bin 43832 -> 87536 bytes .../Engine/restock-engine-glow-methalox-1.dds | Bin 43832 -> 87536 bytes .../Assets/Engine/restock-engine-poodle-2.mu | Bin 1318150 -> 1318077 bytes .../ReStock/Versioning/ReStock.version | 2 +- Distribution/Restock/changelog.txt | 6 ++++++ .../Versioning/ReStockPlus.version | 2 +- Distribution/RestockPlus/changelog.txt | 4 ++++ 9 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 39b06031..1024085e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -43,7 +43,7 @@ jobs: run: python build-deploy/src/package.py --f "Distribution/RestockPlus/.mod_data.yml" - name: Staging package run: python build-deploy/src/stage.py --f "Distribution/Restock/.mod_data.yml" # Run the staging script - name: Deploying Restock + - name: Deploying Restock run: python build-deploy/src/deploy.py --f "Distribution/Restock/.mod_data.yml" # Deploy package to spacedock, curse, github - name: Deploying RestockPlus run: python build-deploy/src/deploy.py --f "Distribution/RestockPlus/.mod_data.yml" # Deploy package to spacedock, curse, github \ No newline at end of file diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-heatshield-125-1.mu index 963b80a07fdf619eb5b6e0f1612410d0327da275..8338df949fc56a44e80e047661dbda42ef246154 100644 GIT binary patch literal 292826 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 z