Merge pull request #1013 from PorktoberRevolution/master

v1.4.5 Release PR
PorktoberRevolution · May 27, 2024 · d2744a2 · d2744a2
2 parents 4ca4216 + 0cb4adf
commit d2744a2
Show file tree

Hide file tree

Showing 84 changed files with 601 additions and 96 deletions.
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-dart-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-dart-1-e.dds
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-dart-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-dart-1-n.dds
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-dart-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-dart-1.dds
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-dart-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-dart-1.mu
diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-saturn-engine-2.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-saturn-engine-2.mu
diff --git a/Distribution/Restock/GameData/ReStock/Patches/Command/restock-probes.cfg b/Distribution/Restock/GameData/ReStock/Patches/Command/restock-probes.cfg
@@ -1,14 +1,14 @@
 // Patches applying art changes to probe parts
 // Contents:
+// - Probodobodyne QBE (probeCoreCube)
+// - Probodobodyne Stayputnik (probeCoreSphere_v2)
 // - Probodobodyne HECS (probeCoreHex_v2)
 // - Probodobodyne OKTO (probeCoreOcto_v2)
 // - Probodobodyne OKTO2 (probeCoreOcto2_v2)
-// - Probodobodyne Stayputnik (probeCoreSphere_v2)
-// - Probodobodyne QBE (probeCoreCube)
 // - Probodobodyne HECS2 (HECS2_ProbeCore)
 // - Probodobodyne RoveMate (roverBody_v2)
-// - RC-L01 Remote Guidance Unit (probeStackLarge)
 // - RC-001S Remote Guidance Unit (probeStackSmall)
+// - RC-L01 Remote Guidance Unit (probeStackLarge)
 
 // QBE
 @PART[probeCoreCube]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -20,6 +20,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-qube-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.2859,0.9363,0.135, 0.2859,0.9365,0.135, 0.2378,0.936,0.1355, 0.2378,0.9361,0.1355, 0.2859,0.9415,0.135, 0.2859,0.9415,0.135, 0,-1.49E-08,1.776E-15, 0.4885,0.5855,0.4885
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -89,6 +94,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-sphere-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.7138,0.7224,0.555, 0.7138,0.7223,0.555, 0.6414,0.4475,0.5448, 0.6414,0.5677,0.6443, 0.7138,0.7218,0.555, 0.7138,0.722,0.555, 0,0.1422,0, 0.9058,1.008,0.9058
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -131,6 +141,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-hecs-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.2532,0.8507,0.3093, 0.2532,0.8504,0.3093, 0.4086,0.997,0.09923, 0.4086,0.997,0.09923, 0.2846,0.7473,0.4278, 0.2846,0.7489,0.4278, 0,0.0006218,0, 0.7738,0.3751,0.6869
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -200,6 +215,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-okto-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.2648,0.7948,0.3164, 0.2648,0.7922,0.3164, 0.3945,0.9742,0.1582, 0.3945,0.9742,0.1582, 0.2648,0.7908,0.3164, 0.2648,0.7893,0.3164, 1.788E-07,0,4.172E-07, 0.6866,0.3848,0.6866
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -269,6 +289,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-okto2-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.06879,0.7797,0.2855, 0.06879,0.7815,0.2855, 0.2805,0.9745,0.1119, 0.2805,0.9744,0.1119, 0.06879,0.7758,0.2855, 0.06879,0.7706,0.2855, 1.252E-06,-3.725E-09,-3.01E-06, 0.5828,0.1206,0.5828
+  }
   MODULE
   {
     name = ModulePartVariants
@@ -338,6 +363,11 @@
   {
     model = ReStock/Assets/Command/restock-probe-hecs2-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 1.433,0.8207,0.8363, 1.433,0.8226,0.8363, 1.832,0.9705,0.221, 1.832,0.9705,0.221, 1.56,0.7408,0.7851, 1.56,0.7396,0.7851, -1.329E-05,0,2.283E-05, 1.638,0.9988,1.455
+  }
   !MODULE[ModulePartVariants] {}
   MODULE
   {
@@ -490,7 +520,7 @@
   !DRAG_CUBE {}
   DRAG_CUBE
   {
-    cube = Default, 0.3123,0.71,0.7274, 0.3123,0.7034,0.7331, 1.402,0.9681,0.1515, 1.402,0.9704,0.1515, 0.3077,0.701,0.7337, 0.3077,0.7054,0.7279, -0.005277,-9.855E-05,0.0009629, 1.261,0.2428,1.273
+    cube = Default, 0.2933,0.7015,0.758, 0.2933,0.7015,0.758, 1.398,0.9704,0.1499, 1.398,0.9739,0.1499, 0.2852,0.6621,0.7765, 0.2852,0.6625,0.7765, 0,0,0, 1.334,0.22,1.359
   }
 }
 
@@ -507,6 +537,6 @@
   !DRAG_CUBE {}
   DRAG_CUBE
   {
-    cube = Default, 1.028,0.7385,1.39, 1.028,0.7359,1.38, 5.274,0.9786,0.1842, 5.274,0.9776,0.1842, 1.072,0.7048,1.374, 1.072,0.7024,1.385, -0.0003395,0.0003387,-0.00157, 2.57,0.4079,2.58
+    cube = Default, 0.9721,0.7331,1.4, 0.9721,0.7336,1.4, 5.261,0.9806,0.1842, 5.261,0.9795,0.1842, 0.9997,0.7319,1.375, 0.9997,0.7309,1.42, -1.748E-09,2.384E-09,-0.02, 2.611,0.38,2.651
   }
 }
diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg
@@ -146,6 +146,11 @@
     scale = 1,1,1
     rotation = 0, 0, 0
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.01025,0.7987,0.2722, 0.01025,0.7975,0.2722, 0.00603,0.774,0.3413, 0.00603,0.7971,0.3281, 0.1637,1,0.09954, 0.1637,0.9751,0.1524, 7.587E-09,0,0.03411, 0.3466,0.4747,0.06439
+  }
 }
 
 // OX-STAT-XL Photovoltaic Panels
@@ -161,6 +166,11 @@
     scale = 1,1,1
     rotation = 0, 0, 0
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.04594,0.04438,0.3137, 0.04594,0.1383,0.3137, 0.02723,0.7552,0.8965, 0.02723,0.7537,0.8965, 1.28,1,0.09967, 1.28,0.01395,0.252, -2.98E-08,0,0.08014, 0.8,1.6,0.1631
+  }
 }
 
 // OX-10C Photovoltaic Panels

diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg
@@ -6,7 +6,7 @@
 // - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine_v2)
 // - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2_v2)
 // - Mk-55 "Thud" Liquid Fuel Engine (radialLiquidEngine1-2) - FX only
-// - T-1 Toroidal "Aerospike" Liquid Fuel Engine (toroidalAerospike) - FX only
+// - T-1 Toroidal "Aerospike" Liquid Fuel Engine (toroidalAerospike)
 
 // LV-N "Nerv" Atomic Rocket Motor
 @PART[nuclearEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -1749,9 +1749,23 @@
   }
 }
 
-// T-1 Toroidal "Aerospike" Liquid Fuel Engine (FX only)
+// T-1 Toroidal "Aerospike" Liquid Fuel Engine
 @PART[toroidalAerospike]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
+  @author = Kavaeric
+  !mesh = DELETE
+  !MODEL {}
+  MODEL
+  {
+    model = ReStock/Assets/Engine/restock-engine-dart-1
+  }
+  %node_attach = 0.0, 0, 0.0, 0.0, 1.0, 0.0, 1
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Fairing, 1.355,0.7569,0.7222, 1.355,0.7569,0.7222, 1.213,0.9305,0.254, 1.213,0.7276,0.9296, 1.355,0.7569,0.7222, 1.355,0.7568,0.7222, 0,-0.394,0, 1.25,1.095,1.25
+    cube = Clean, 0.6549,0.6778,0.691, 0.6549,0.6778,0.691, 1.095,0.9444,0.2547, 1.095,0.7086,0.8151, 0.6549,0.6767,0.691, 0.6549,0.6789,0.691, 0,-0.3368,0, 1.188,0.9809,1.188
+  }
   !fx_exhaustFlame_blue  = DELETE
   !fx_exhaustLight_blue = DELETE
   !fx_smokeTrail_light = DELETE
@@ -1793,7 +1807,7 @@
         volume = 0.0 0.0
         volume = 1.0 1.0
         pitch = 0.0 0.2
-        pitch = 1.0 1.0
+        pitch = 2.0 2.0
         loop = true
       }
       MODEL_MULTI_PARTICLE
@@ -1829,4 +1843,80 @@
     @name = ModuleEnginesFX
     %runningEffectName = fx-dart-running
   }
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = TrussMount
+    VARIANT
+    {
+	  name = TrussMount
+	  displayName = #LOC_Restock_variant-engine_size1
+	  primaryColor = #999999
+	  secondaryColor = #ffffff
+	  GAMEOBJECTS
+	  {
+	    Aerospike_Common = true
+        Aerospike_12_Mount = true
+        Aerospike_12_Boattail = false
+		Aerospike_Shroud_Empty = true
+	  }
+	}
+	VARIANT
+    {
+	  name = Shroud
+	  displayName = #LOC_Restock_variant-engine_boattail
+	  primaryColor = #ffffff
+	  secondaryColor = #ffffff
+	  GAMEOBJECTS
+	  {
+	    Aerospike_Common = true
+        Aerospike_12_Mount = false
+        Aerospike_12_Boattail = true
+		Aerospike_Shroud_Empty = false
+	  }
+	}
+  }
+  @MODULE[ModuleJettison]
+  {
+    @jettisonName = Aerospike_Shroud
+    %useMultipleDragCubes = true
+  }
+  !MODULE[FXModuleAnimateThrottle] {}
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = heatColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = heatColor
+    animRate = 0.05
+    shaderProperty = _EmissiveColor
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    greenCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    blueCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+  }
 }
diff --git a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-radial.cfg b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-radial.cfg
@@ -14,6 +14,11 @@
   {
     model = ReStock/Assets/FuelTank/restock-fueltank-foil-sphere-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.3158,0.6901,0.4184, 0.3158,0.6901,0.4184, 0.3018,0.6431,0.4109, 0.3018,0.6432,0.4109, 0.3158,0.6882,0.4184, 0.3158,0.6892,0.4184, -1.49E-08,0,0, 0.6402,0.625,0.6402
+  }
   !MODULE[ModulePartVariants] {}
   MODULE
   {
@@ -97,6 +102,11 @@
   {
     model = ReStock/Assets/FuelTank/restock-fueltank-foil-capsule-1
   }
+  !DRAG_CUBE {}
+  DRAG_CUBE
+  {
+    cube = Default, 0.7116,0.7432,0.4178, 0.7116,0.7432,0.4178, 0.3194,0.6708,0.4037, 0.3194,0.671,0.4037, 0.7116,0.742,0.4178, 0.7116,0.742,0.4178, 0,0,0, 0.6388,1.25,0.6388
+  }
   !MODULE[ModulePartVariants] {}
   MODULE
   {
@@ -183,7 +193,7 @@
   !DRAG_CUBE {}
   DRAG_CUBE
   {
-    cube = Default, 0.3608,0.6239,0.7064, 0.3608,0.6124,0.7064, 1.21,0.96,0.2872447, 1.21,0.96,0.245615, 0.3608,0.616,0.7064, 0.3608,0.6181,0.7064, 0,0,0, 1.218,0.3161,1.218
+    cube = Default, 0.381,0.6261,0.7165, 0.381,0.6255,0.7165, 0.9252,0.7779,0.2652, 0.9252,0.7776,0.2652, 0.3681,0.6327,0.7308, 0.3681,0.6346,0.7308, 3.553E-17,-2.861E-08,-7.105E-17, 1.25,0.3325,1.267
   }
   !MODULE[ModulePartVariants] {}
   MODULE

diff --git a/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg b/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg
@@ -22,7 +22,7 @@
   DRAG_CUBE
   {
     cube = Fairing, 0.05634,0.7512,0.6665, 0.05634,0.7603,0.5694, 0.3044,0.9566,0.1698, 0.3044,0.932,0.1674, 0.05487,0.7518,0.4044, 0.05488,0.7514,0.4076, 0.001332,0.001115,-0.002111, 0.625,0.1071,0.625
-    cube = Clean, 0.06044,0.4659,0.4447, 0.06044,0.4659,0.4447, 0.3843,0.9488,0.1482, 0.3843,0.9396,0.1682, 0.06044,0.4645,0.4447, 0.06044,0.4673,0.4447, 0,0.003277,-3.906E-10, 0.7,0.1,0.7
+    cube = Clean, 0.05805,0.485,0.4482, 0.05805,0.485,0.4482, 0.3831,0.9519,0.1482, 0.3831,0.9428,0.1694, 0.05805,0.4835,0.4482, 0.05805,0.4866,0.4482, 0,0.003277,-3.906E-10, 0.7,0.1,0.7
   }
   MODULE
   {