From e8625b1a008299061532b8bfb8917349374885c3 Mon Sep 17 00:00:00 2001 From: DMagic1 Date: Thu, 7 Mar 2019 13:19:12 -0500 Subject: [PATCH 1/6] Disable redundant drag cubes --- .../ReStockPlus/Parts/Aero/1875/restock-nosecone-1875-1.cfg | 1 + .../ReStockPlus/Parts/Communication/restock-antenna-stack-2.cfg | 1 + .../ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-1.cfg | 1 + .../ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-2.cfg | 1 + .../ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-3.cfg | 1 + .../ReStockPlus/Parts/FuelTank/375/restock-fuel-tank-375-4.cfg | 1 + .../ReStockPlus/Parts/FuelTank/375/restock-nosecone-375-1.cfg | 1 + .../ReStockPlus/Parts/Science/restock-materialbay-radial-1.cfg | 1 + 8 files changed, 8 insertions(+) diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-nosecone-1875-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-nosecone-1875-1.cfg index f890d773..273b1ee9 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-nosecone-1875-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Aero/1875/restock-nosecone-1875-1.cfg @@ -41,6 +41,7 @@ PART { name = ModulePartVariants baseVariant = White + useMultipleDragCubes = false VARIANT { name = White diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-antenna-stack-2.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-antenna-stack-2.cfg index c2f92e26..9f53d1cb 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-antenna-stack-2.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-antenna-stack-2.cfg @@ -46,6 +46,7 @@ PART { name = ModulePartVariants baseVariant = Gold + useMultipleDragCubes = false VARIANT { name = Gold diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-1.cfg index 95df122a..cb7227a1 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-1.cfg @@ -43,6 +43,7 @@ PART { name = ModulePartVariants baseVariant = Metal + useMultipleDragCubes = false VARIANT { name = Metal diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-2.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-2.cfg index 1456d7fb..b33e4be9 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-2.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-2.cfg @@ -43,6 +43,7 @@ PART { name = ModulePartVariants baseVariant = Metal + useMultipleDragCubes = false VARIANT { name = Metal diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-3.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-3.cfg index f90b5738..aaa3344c 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-3.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/0625/restock-fueltank-0625-3.cfg @@ -43,6 +43,7 @@ PART { name = ModulePartVariants baseVariant = Metal + useMultipleDragCubes = false VARIANT { name = Metal diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-fuel-tank-375-4.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-fuel-tank-375-4.cfg index aca21664..9145e564 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-fuel-tank-375-4.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-fuel-tank-375-4.cfg @@ -68,6 +68,7 @@ PART { name = ModulePartVariants baseVariant = BlackAndWhite + useMultipleDragCubes = false VARIANT { name = BlackAndWhite diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-nosecone-375-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-nosecone-375-1.cfg index 208e54f3..ba8a921a 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-nosecone-375-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-nosecone-375-1.cfg @@ -61,6 +61,7 @@ PART { name = ModulePartVariants baseVariant = BlackAndWhite + useMultipleDragCubes = false VARIANT { name = BlackAndWhite diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Science/restock-materialbay-radial-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Science/restock-materialbay-radial-1.cfg index 4040ebe8..a6d82c02 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Science/restock-materialbay-radial-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Science/restock-materialbay-radial-1.cfg @@ -67,6 +67,7 @@ PART { name = ModulePartVariants baseVariant = Truss + useMultipleDragCubes = false VARIANT { name = Truss From a2aaece58f85614b7969ff41e4dd195f266ec5c6 Mon Sep 17 00:00:00 2001 From: DMagic1 Date: Thu, 7 Mar 2019 13:19:28 -0500 Subject: [PATCH 2/6] Drag cubes for hollow parts --- .../Parts/Command/375/restock-drone-core-375-1.cfg | 4 ++++ .../Structural/375/restock-adapter-hollow-25-375-1.cfg | 7 ++++++- .../Structural/375/restock-adapter-skeletal-25-375-1.cfg | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Command/375/restock-drone-core-375-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Command/375/restock-drone-core-375-1.cfg index e7ef85af..e2ed6e2d 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Command/375/restock-drone-core-375-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Command/375/restock-drone-core-375-1.cfg @@ -38,6 +38,10 @@ PART breakingForce = 350 breakingTorque = 350 tags = #LOC_RestockPlus_restock-drone-core-375-1_tags + DRAG_CUBE + { + cube = Default, 1.752,0.7152,1.92, 1.752,0.7152,1.92, 10.96,0.8323,0.68, 10.96,0.8328,0.68, 1.752,0.7056,1.92, 1.752,0.7058,1.92, -1.49E-07,0.01997,-2.199E-07, 3.748,0.4746,3.748 + } MODULE { name = ModuleProbeControlPoint diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/375/restock-adapter-hollow-25-375-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/375/restock-adapter-hollow-25-375-1.cfg index 2969a6e1..e36f8738 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/375/restock-adapter-hollow-25-375-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/375/restock-adapter-hollow-25-375-1.cfg @@ -37,11 +37,16 @@ PART crashTolerance = 6 maxTemp = 2000 breakingForce = 350 - breakingTorque = 350 + breakingTorque = 350 + DRAG_CUBE + { + cube = Default, 7.345,0.7515,1.98, 7.345,0.7516,1.98, 11,0.4259,2.355, 11,0.7471,0.1906, 7.398,0.7433,1.971, 7.398,0.7582,1.971, -1.907E-06,0,0, 3.776,2.302,3.758 + } MODULE { name = ModulePartVariants baseVariant = BlackAndWhite + useMultipleDragCubes = false VARIANT { name = BlackAndWhite diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/375/restock-adapter-skeletal-25-375-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/375/restock-adapter-skeletal-25-375-1.cfg index 5b48e0f7..8d67d649 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/375/restock-adapter-skeletal-25-375-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/375/restock-adapter-skeletal-25-375-1.cfg @@ -10,6 +10,10 @@ PART model = ReStock/Assets/FuelTank/restock-adapter-375-skeletal-1 scale = 1.0, 1.0, 1.0 } + DRAG_CUBE + { + cube = Default, 1.681,0.6088,2.394, 1.684,0.6114,1.946, 11,0.7862,1.275, 11,0.8002,0.1906, 1.649,0.625,1.916, 1.649,0.624,1.916, -0.004143,0.1585,0.0006646, 3.739,1.075,3.74 + } scale = 1 rescaleFactor = 1 // Attachment From 3442060f47a5bdf866b2e21b53f524af2b9cf10c Mon Sep 17 00:00:00 2001 From: DMagic1 Date: Thu, 7 Mar 2019 13:19:47 -0500 Subject: [PATCH 3/6] Shroud based drag cubes for the small SRBs --- .../ReStockPlus/Parts/Engine/0625/restock-srb-mallet-1.cfg | 1 - .../ReStockPlus/Parts/Engine/0625/restock-srb-striker-1.cfg | 1 - 2 files changed, 2 deletions(-) diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-mallet-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-mallet-1.cfg index c2247954..5266ce45 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-mallet-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-mallet-1.cfg @@ -356,7 +356,6 @@ PART jettisonedObjectMass = 0.1 jettisonForce = 5 jettisonDirection = 0 0 1 - useMultipleDragCubes = false } MODULE { diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-striker-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-striker-1.cfg index 1a9441d1..17ee09bf 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-striker-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-striker-1.cfg @@ -357,7 +357,6 @@ PART jettisonedObjectMass = 0.1 jettisonForce = 5 jettisonDirection = 0 0 1 - useMultipleDragCubes = false } MODULE { From effc3d337e0e05a06de8b70233ef743e62587b2d Mon Sep 17 00:00:00 2001 From: DMagic1 Date: Thu, 7 Mar 2019 13:20:09 -0500 Subject: [PATCH 4/6] Disable shroud based drag cubes --- .../ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg index 56595c16..9c19654a 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg @@ -473,6 +473,7 @@ PART jettisonedObjectMass = 0.1 jettisonForce = 5 jettisonDirection = 0 0 1 + useMultipleDragCubes = false } MODULE { From 0879507400cfbd991320776ca476b4a7593a8ad4 Mon Sep 17 00:00:00 2001 From: DMagic1 Date: Thu, 7 Mar 2019 13:20:23 -0500 Subject: [PATCH 5/6] Custom drag cubes for engines --- .../ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg | 7 +++++++ .../Parts/Engine/125/restock-engine-valiant.cfg | 7 +++++++ .../ReStockPlus/Parts/Engine/25/restock-engine-boar.cfg | 7 +++++++ .../ReStockPlus/Parts/Engine/375/restock-engine-corgi.cfg | 6 ++++++ 4 files changed, 27 insertions(+) diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg index f281f984..4861d58f 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg @@ -9,6 +9,11 @@ PART { model = ReStock/Assets/Engine/restock-engine-pug-1 } + DRAG_CUBE + { + cube = Fairing, 0.6602,0.745,0.7051, 0.6602,0.7453,0.7051, 1.217,0.9673,0.1492, 1.217,0.767,0.4913, 0.6629,0.7423,0.7222, 0.6629,0.7432,0.7222, -9.537E-07,0.0005498,3.576E-05, 1.25,0.5458,1.25 + cube = Clean, 0.4559,0.6999,0.7222, 0.4559,0.6999,0.7222, 0.8838,0.7113,0.5849, 0.8838,0.7387,0.4504, 0.4559,0.697,0.7222, 0.4559,0.6994,0.7222, -9.537E-07,0.0005498,3.576E-05, 1.25,0.5458,1.25 + } rescaleFactor = 1 scale = 1 node_attach = 0.0, 0.251, 0.0, 0.0, 1.0, 0.0, 1 @@ -133,6 +138,7 @@ PART { name = ModulePartVariants baseVariant = Size1 + useMultipleDragCubes = false VARIANT { name = Size1 @@ -188,6 +194,7 @@ PART jettisonedObjectMass = 0.1 jettisonForce = 0 jettisonDirection = 0 0 1 + useMultipleDragCubes = true } MODULE { diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg index a2fdda17..e661edac 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-valiant.cfg @@ -9,6 +9,12 @@ PART { model = ReStock/Assets/Engine/restock-engine-valiant-1 } + DRAG_CUBE + { + cube = 0, 1.686,0.7699,0.7051, 1.686,0.7699,0.7051, 1.217,0.9,0.3731, 1.217,0.6,1.419, 1.697,0.7678,0.7051, 1.697,0.7701,0.7051, 9.775E-05,-0.1317,7.105E-05, 1.25,1.521,1.25 + cube = 1, 1.015,0.7384,0.7165, 1.015,0.7339,0.7222, 1.217,0.8,0.3731, 1.217,0.7,1.419, 1.034,0.7409,0.7222, 1.033,0.7424,0.7222, -0.006,-0.1207,1.192E-07, 1.25,1.499,1.25 + cube = 2, 1.69,0.768,0.6994, 1.69,0.7681,0.6994, 1.217,0.35,0.3731, 1.217,0.35,1.419, 1.699,0.7671,0.7051, 1.699,0.7688,0.7051, 9.781E-05,-0.131,7.105E-05, 1.25,1.522,1.25 + } node_attach = 0.0, 0.4499999, 0.0, 0.0, 1.0, 0.0, 1 node_stack_top = 0.0, 0.4499999, 0.0, 0.0, 1.0, 0.0, 1 node_stack_bottom = 0.0, -0.87125, 0.0, 0.0, -1.0, 0.0, 1 @@ -308,6 +314,7 @@ PART jettisonedObjectMass = 0.1 jettisonForce = 0 jettisonDirection = 0 0 1 + useMultipleDragCubes = false } MODULE { diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-boar.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-boar.cfg index d7be300a..9a66ed71 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-boar.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-boar.cfg @@ -13,6 +13,12 @@ PART model = ReStock/Assets/Engine/restock-engine-boar-1 scale = 1.0, 1.0, 1.0 } + DRAG_CUBE + { + cube = 0, 6.005,0.7711,1.302, 6.005,0.7711,1.853, 4.87,0.85,0.2801, 4.87,0.85,0.2801, 5.975,0.7708,1.334, 5.975,0.771,1.334, 1.192E-07,-0.5142,0, 2.5,2.518,2.5 + cube = 1, 3.622,0.7014,1.451, 3.623,0.7133,1.842, 4.87,0.65,0.2801, 4.87,0.55,0.2801, 3.956,0.7193,1.355, 3.959,0.7207,1.355, 0,-0.4773,-1.192E-07, 2.5,2.444,2.5 + cube = 2, 5.803,0.7729,1.302, 5.803,0.7729,1.842, 4.87,0.35,0.2801, 4.87,0.35,0.2801, 5.755,0.7725,1.334, 5.755,0.7728,1.334, 1.192E-07,-0.5129,0, 2.5,2.516,2.5 + } scale = 1.0 rescaleFactor = 1 // --- node definitions --- @@ -492,6 +498,7 @@ PART jettisonedObjectMass = 0.1 jettisonForce = 5 jettisonDirection = 0 0 1 + useMultipleDragCubes = false } MODULE { diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/375/restock-engine-corgi.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/375/restock-engine-corgi.cfg index 8759ccf9..cf545497 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/375/restock-engine-corgi.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/375/restock-engine-corgi.cfg @@ -13,6 +13,11 @@ PART model = ReStockPlus/Assets/Engine/restock-engine-corgi-1 scale = 1.0, 1.0, 1.0 } + DRAG_CUBE + { + cube = 0, 11.9,0.7662,1.977, 11.9,0.7663,1.961, 10.96,0.8323,1.053, 10.96,0.8328,0.6802, 11.82,0.7685,1.929, 11.82,0.7687,1.929, 0.002148,-0.6796,0.000664, 3.769,3.364,3.766 + cube = 1, 4.807,0.702,2.317, 4.807,0.7027,1.975, 4.55,0.6248,3.297, 4.55,0.4356,2.857, 4.839,0.6968,1.975, 4.84,0.6965,2.007, 0.004143,-0.5996,0.000664, 3.765,3.204,3.766 + } scale = 1.0 rescaleFactor = 1 // --- node definitions --- @@ -462,6 +467,7 @@ PART jettisonedObjectMass = 0.1 jettisonForce = 5 jettisonDirection = 0 0 1 + useMultipleDragCubes = false } MODULE { From 4daa6d31d56e02464e8e6cf6562d4192c8382f8c Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Thu, 7 Mar 2019 10:38:22 -0800 Subject: [PATCH 6/6] =?UTF-8?q?Rotate=20HG-55=20180=C2=B0=20to=20match=20s?= =?UTF-8?q?tock=20-=20Addresses=20#529?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Communication/restock-antenna-radial-3.mu | Bin 896863 -> 896863 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-3.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-3.mu index 1cfb522c2899529e4ef06adf8bf8798db78d1e85..331ad41c0a69925b42da140654b726566476014e 100644 GIT binary patch delta 135 zcmcbA&+Ps^vkgm@3v9hoZ1R=GbpIzH{{O#w%k+j=cG=Arm#d}=+-2Qs+f-p}Uk$`h zSoiJ)Nh!9g^D_c56A&{4F$)m00x{cmb$)hFKMXzXKs`Xr0mPg@%mu{UK+LnfA(r=k FAOK3WG|>P6 delta 127 zcmcbA&+Ps^vkgm@b9`Yj-Om67(-SZ7sBXTvTs2*wp~BdHIqTlNAPi*hpWYD5uGp^5 w&j`d!K+FupEI`Z(#BAHu`Pn`FF!Zzo^#Cyk5OV@C7Z7s;G0*mfSl;`A0432b@&Et;