Various bugfixes

- Bad texture assignments (#754) - FAR Chutes (#751) - RealChutes (#756) - Collider scaling (#753)
PorktoberRevolution · Nov 16, 2019 · 63fb192 · 63fb192
1 parent 695a985
commit 63fb192
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 42 deletions.
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-skipper-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-skipper-1.mu
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-2.mu
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-3.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-3.mu
diff --git a/Distribution/Restock/GameData/ReStock/Compatibility/FAR.cfg b/Distribution/Restock/GameData/ReStock/Compatibility/FAR.cfg
@@ -1,16 +1,13 @@
 // FAR ships a RealChute Lite that is similar to the RC patch
 
-@PART[parachuteDrogue]:AFTER[FerramAerospaceResearch]
+@PART[parachuteDrogue]:NEEDS[FerramAerospaceResearch]:AFTER[ReStock]
 {
   @MODULE[RealChuteFAR]
   {
-    @PARACHUTE
-    {
-      @preDeploymentAnimation = semiDeployLarge
-      @deploymentAnimation = fullyDeployLarge
-      @capName = ChuteCap
-      @parachuteName  = B_ParachuteLargeDrogueRotator
-    }
+    @semiDeployedAnimation = semiDeployLarge
+    @fullyDeployedAnimation = fullyDeployLarge
+    @capName = ChuteCap
+    @canopyName  = B_ParachuteLargeDrogueRotator
   }
 
   !DRAG_CUBE {}
@@ -20,13 +17,10 @@
 {
   @MODULE[RealChuteFAR]
   {
-    @PARACHUTE
-    {
-      @preDeploymentAnimation = semiDeployLarge
-      @deploymentAnimation = fullyDeployLarge
-      @capName = ChuteCap
-      @parachuteName  = B_ParachuteLargeRotator
-    }
+    @semiDeployedAnimation = semiDeployLarge
+    @fullyDeployedAnimation = fullyDeployLarge
+    @capName = ChuteCap
+    @canopyName  = B_ParachuteLargeRotator
   }
 
   !DRAG_CUBE {}
@@ -36,13 +30,10 @@
 {
   @MODULE[RealChuteFAR]
   {
-    @PARACHUTE
-    {
-      @preDeploymentAnimation = semiDeployLarge
-      @deploymentAnimation = fullyDeployLarge
-      @capName = SmallChuteCap
-      @parachuteName  = B_ParachuteRoot004
-    }
+    @semiDeployedAnimation = semiDeployLarge
+    @fullyDeployedAnimation = fullyDeployLarge
+    @capName = SmallChuteCap
+    @canopyName  = B_ParachuteRoot004
   }
 
   !DRAG_CUBE {}
@@ -52,13 +43,11 @@
 {
   @MODULE[RealChuteFAR]
   {
-    @PARACHUTE
-    {
-      @preDeploymentAnimation = semiDeployLarge
-      @deploymentAnimation = fullyDeployLarge
-      @capName = RadialChuteCap
-      @parachuteName  = B_ParachuteRoot
-    }
+
+    @semiDeployedAnimation = semiDeployLarge
+    @fullyDeployedAnimation = fullyDeployLarge
+    @capName = RadialChuteCap
+    @canopyName  = B_ParachuteRoot
   }
 
   !DRAG_CUBE {}
@@ -68,13 +57,10 @@
 {
   @MODULE[RealChuteFAR]
   {
-    @PARACHUTE
-    {
-      @preDeploymentAnimation = semiDeployLarge
-      @deploymentAnimation = fullyDeployLarge
-      @capName = RadialChuteCapDrogue
-      @parachuteName  = B_ParachuteRoot005
-    }
+    @semiDeployedAnimation = semiDeployLarge
+    @fullyDeployedAnimation = fullyDeployLarge
+    @capName = RadialChuteCapDrogue
+    @canopyName  = B_ParachuteRoot005
   }
 
   !DRAG_CUBE {}

diff --git a/Distribution/Restock/GameData/ReStock/Compatibility/RealChute.cfg b/Distribution/Restock/GameData/ReStock/Compatibility/RealChute.cfg
@@ -1,6 +1,6 @@
 // RealChute compatability fixes
 
-@PART[parachuteDrogue]:AFTER[RealChute]
+@PART[parachuteDrogue]:NEEDS[RealChute]:AFTER[ReStock]
 {
   @MODULE[RealChuteModule]
   {
@@ -16,7 +16,7 @@
   !DRAG_CUBE {}
 }
 
-@PART[parachuteLarge]:AFTER[RealChute]
+@PART[parachuteLarge]:NEEDS[RealChute]:AFTER[ReStock]
 {
   @MODULE[RealChuteModule]
   {
@@ -32,7 +32,7 @@
   !DRAG_CUBE {}
 }
 
-@PART[parachuteSingle]:AFTER[RealChute]
+@PART[parachuteSingle]:NEEDS[RealChute]:AFTER[ReStock]
 {
   @MODULE[RealChuteModule]
   {
@@ -48,7 +48,7 @@
   !DRAG_CUBE {}
 }
 
-@PART[parachuteRadial]:AFTER[RealChute]
+@PART[parachuteRadial]:NEEDS[RealChute]:AFTER[ReStock]
 {
   @MODULE[RealChuteModule]
   {
@@ -64,7 +64,7 @@
   !DRAG_CUBE {}
 }
 
-@PART[radialDrogue]:AFTER[RealChute]
+@PART[radialDrogue]:NEEDS[RealChute]:AFTER[ReStock]
 {
   @MODULE[RealChuteModule]
   {

diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt
@@ -3,7 +3,10 @@ v1.0.1
 - Fixed lack of bundled ModuleManager
 - Updated Simplified Chinese localization (Duck1998)
 - Fixed an issue with the localization of the radial reaction wheel assembly (#742)
-- Fixed compatability with FAR in a case where RealChute is NOT installed
+- Fixed compatability with FAR in a case where RealChute is NOT installed (#751)
+- Fixed compatability with RealChute and NO FAR (#756)
+- Fixed Skippper orange boattail texture assignments (#754)
+- Fixed large truss piece collider scaling (#753)
 
 v1.0.0
 ------

diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-cherenkov-1.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-cherenkov-1.mu
diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt
@@ -2,6 +2,8 @@ v1.0.1
 ------
 - Fixed lack of bundled ModuleManager
 - Updated Simplified Chinese localization (Duck1998)
+- Fixed Cherenkov shroud texture assignments (#754)
+- Fixed x-large truss piece collider scaling (#753)
 
 v1.0.0
 ------