Merge branch 'master' into develop

2024-09-01 17:34:42 +00:00 · 2019-05-10 18:32:08 -07:00
parent 98db506b2c b414f87abf
commit 14bc904f41
36 changed files with 1042 additions and 67 deletions
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-1.cfg
@ -20,8 +20,8 @@ PART
  node_attach = 0.045212, -0.0, -0.00, 1.0, 0.0, 0.0
  // --- editor parameters ---
  TechRequired = advFlightControl
-  entryCost = 1650
-  cost = 320
+  entryCost = 600
+  cost = 30
  category = Control
  subcategory = 0
  title = #LOC_RestockPlus_restock-rcs-block-dual-1_title
@ -30,7 +30,7 @@ PART
  // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
  attachRules = 0,1,0,0,0
  // --- standard part parameters ---
-  mass = 0.025
+  mass = 0.02
  dragModelType = default
  maximum_drag = 0.001
  minimum_drag = 0.001
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-mini-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-mini-1.cfg
@ -20,8 +20,8 @@ PART
  node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0
  // --- editor parameters ---
  TechRequired = advFlightControl
-  entryCost = 750
-  cost = 100
+  entryCost = 200
+  cost = 8
  category = Control
  subcategory = 0
  title = #LOC_RestockPlus_restock-rcs-block-dual-mini-1_title
@ -30,7 +30,7 @@ PART
  // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
  attachRules = 0,1,0,0,0
  // --- standard part parameters ---
-  mass = 0.01
+  mass = 0.005
  dragModelType = default
  maximum_drag = 0.001
  minimum_drag = 0.001
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-1.cfg
@ -20,8 +20,8 @@ PART
  node_attach = 0.045212, -0.0, -0.00, 1.0, 0.0, 0.0
  // --- editor parameters ---
  TechRequired = advFlightControl
-  entryCost = 3250
-  cost = 635
+  entryCost = 1300
+  cost = 45
  category = Control
  subcategory = 0
  title = #LOC_RestockPlus_restock-rcs-block-quad-angled-1_title
@ -30,7 +30,7 @@ PART
  // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
  attachRules = 0,1,0,0,0
  // --- standard part parameters ---
-  mass = 0.05
+  mass = 0.04
  dragModelType = default
  maximum_drag = 0.001
  minimum_drag = 0.001
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-mini-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-mini-1.cfg
@ -20,8 +20,8 @@ PART
  node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0
  // --- editor parameters ---
  TechRequired = advFlightControl
-  entryCost = 900
-  cost = 200
+  entryCost = 400
+  cost = 16
  category = Control
  subcategory = 0
  title = #LOC_RestockPlus_restock-rcs-block-quad-angled-mini-1_title
@ -30,7 +30,7 @@ PART
  // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
  attachRules = 0,1,0,0,0
  // --- standard part parameters ---
-  mass = 0.0125
+  mass = 0.01
  dragModelType = default
  maximum_drag = 0.001
  minimum_drag = 0.001
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-mini-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-mini-1.cfg
@ -20,8 +20,8 @@ PART
  node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0
  // --- editor parameters ---
  TechRequired = advFlightControl
-  entryCost = 850
-  cost = 180
+  entryCost = 400
+  cost = 16
  category = Control
  subcategory = 0
  title = #LOC_RestockPlus_restock-rcs-block-quad-mini-1_title
@ -30,7 +30,7 @@ PART
  // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
  attachRules = 0,1,0,0,0
  // --- standard part parameters ---
-  mass = 0.0125
+  mass = 0.01
  dragModelType = default
  maximum_drag = 0.001
  minimum_drag = 0.001
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-1.cfg
@ -20,8 +20,8 @@ PART
  node_attach = 0.045212, -0.0, -0.00, 1.0, 0.0, 0.0
  // --- editor parameters ---
  TechRequired = advFlightControl
-  entryCost = 4250
-  cost = 800
+  entryCost = 1500
+  cost = 60
  category = Control
  subcategory = 0
  title = #LOC_RestockPlus_restock-rcs-block-quint-1_title
@ -30,7 +30,7 @@ PART
  // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
  attachRules = 0,1,0,0,0
  // --- standard part parameters ---
-  mass = 0.0625
+  mass = 0.05
  dragModelType = default
  maximum_drag = 0.001
  minimum_drag = 0.001
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-mini-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-mini-1.cfg
@ -20,8 +20,8 @@ PART
  node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0
  // --- editor parameters ---
  TechRequired = advFlightControl
-  entryCost = 1000
-  cost = 210
+  entryCost = 450
+  cost = 20
  category = Control
  subcategory = 0
  title = #LOC_RestockPlus_restock-rcs-block-quint-mini-1_title
@ -30,7 +30,7 @@ PART
  // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
  attachRules = 0,1,0,0,0
  // --- standard part parameters ---
-  mass = 0.0155
+  mass = 0.0125
  dragModelType = default
  maximum_drag = 0.001
  minimum_drag = 0.001
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-1.cfg
@ -20,8 +20,8 @@ PART
  node_attach = 0.045212, -0.0, -0.00, 1.0, 0.0, 0.0
  // --- editor parameters ---
  TechRequired = advFlightControl
-  entryCost = 2760
-  cost = 480
+  entryCost = 900
+  cost = 35
  category = Control
  subcategory = 0
  title = #LOC_RestockPlus_restock-rcs-block-triple-angled-1_title
@ -30,7 +30,7 @@ PART
  // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
  attachRules = 0,1,0,0,0
  // --- standard part parameters ---
-  mass = 0.0375
+  mass = 0.03
  dragModelType = default
  maximum_drag = 0.001
  minimum_drag = 0.001
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-mini-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-mini-1.cfg
@ -20,8 +20,8 @@ PART
  node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0
  // --- editor parameters ---
  TechRequired = advFlightControl
-  entryCost = 950
-  cost = 150
+  entryCost = 350
+  cost = 12
  category = Control
  subcategory = 0
  title = #LOC_RestockPlus_restock-rcs-block-triple-angled-mini-1_title
@ -30,7 +30,7 @@ PART
  // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
  attachRules = 0,1,0,0,0
  // --- standard part parameters ---
-  mass = 0.015
+  mass = 0.0075
  dragModelType = default
  maximum_drag = 0.001
  minimum_drag = 0.001
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-single-mini-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-single-mini-1.cfg
@ -20,8 +20,8 @@ PART
  node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0
  // --- editor parameters ---
  TechRequired = advFlightControl
-  entryCost = 350
-  cost = 45
+  entryCost = 125
+  cost = 4
  category = Control
  subcategory = 0
  title = #LOC_RestockPlus_restock-rcs-single-mini-1_title
@ -30,7 +30,7 @@ PART
  // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
  attachRules = 0,1,0,0,0
  // --- standard part parameters ---
-  mass = 0.005
+  mass = 0.0025
  dragModelType = default
  maximum_drag = 0.001
  minimum_drag = 0.001
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-engine-torch.cfg
@ -96,7 +96,7 @@ PART
    }
  }
  // --- editor parameters ---
-  TechRequired = basicRocketry
+  TechRequired = propulsionSystems
  entryCost = 5150
  cost = 280
  category = Engine
@ -108,7 +108,7 @@ PART
  attachRules = 1,1,1,0,0
  bulkheadProfiles = size0, srf
  // --- standard part parameters ---
-  mass = 0.30
+  mass = 0.29
  dragModelType = default
  maximum_drag = 0.2
  minimum_drag = 0.2
@ -146,7 +146,7 @@ PART
    atmosphereCurve
    {
      key = 0 295
-      key = 1 260
+      key = 1 275
      key = 12 100
    }
  }
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/125/restock-engine-pug.cfg
@ -117,7 +117,7 @@ PART
    }
    atmosphereCurve
    {
-      key = 0 320
+      key = 0 330
      key = 1 150
      key = 2 0.001
    }
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-boar.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-boar.cfg
@ -14,11 +14,11 @@ PART
    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 ---
@ -117,7 +117,7 @@ PART
  // --- editor parameters ---
  TechRequired = veryHeavyRocketry
  entryCost = 31000
-  cost = 12000
+  cost = 7000
  category = Engine
  subcategory = 0
  title = #LOC_RestockPlus_restock-engine-boar_title
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version
@ -6,18 +6,18 @@
    {
        "MAJOR":0,
        "MINOR":1,
-        "PATCH":3,
+        "PATCH":4,
        "BUILD":0
    },
    "KSP_VERSION":
    {
        "MAJOR":1,
-        "MINOR":6,
-        "PATCH":1
+        "MINOR":7,
+        "PATCH":0
    },
    "KSP_VERSION_MIN":{
        "MAJOR":1,
-        "MINOR":6,
+        "MINOR":7,
        "PATCH":0
    },
    "KSP_VERSION_MAX":{
--- a/Distribution/RestockPlus/changelog.txt
+++ b/Distribution/RestockPlus/changelog.txt
@ -5,8 +5,13 @@ v0.2.0

 v0.1.4
 ------
+- KSP 1.7.x
 - Changed radial material bay and inline goo canister to use localization strings (#557)
 - Fixed radial material bay and inline goo canister not counting for satellite contracts (#557)
+- Adjusted cost of Boar to 7000 from 12000 (#571)
+- Adjusted cost and masses of all RCS blocks for consistency with KSP 1.7 (#582)
+- Changed Torch tech node to Precision Propulsion, ASL Isp to 275s from 260s, mass from 0.3 to 0.29 (#582)
+- Changed Pug vacuum Isp to 330s from 320s (#582)

 v0.1.3
 ------
--- a/Distribution/RestockPlus/readme.txt
+++ b/Distribution/RestockPlus/readme.txt
@ -15,7 +15,7 @@ DEPENDENCIES
 ============

 Required:
- Restock (0.1.3)
+- Restock (0.1.4)
 - ModuleManager (4.0.2)

 =============