From 63fb192045892cc64d42d629e5fef1fd61c31cf0 Mon Sep 17 00:00:00 2001
From: ChrisAdderley <cadderley@gmail.com>
Date: Sat, 16 Nov 2019 06:09:07 -0800
Subject: [PATCH] Various bugfixes

- Bad texture assignments (#754)
- FAR Chutes (#751)
- RealChutes  (#756)
- Collider scaling (#753)
---
 .../Assets/Engine/restock-engine-skipper-1.mu | Bin 932199 -> 932199 bytes
 .../Assets/Structural/restock-truss-2.mu      | Bin 643759 -> 643759 bytes
 .../Assets/Structural/restock-truss-3.mu      | Bin 1277999 -> 1277999 bytes
 .../GameData/ReStock/Compatibility/FAR.cfg    |  58 +++++++-----------
 .../ReStock/Compatibility/RealChute.cfg       |  10 +--
 Distribution/Restock/changelog.txt            |   5 +-
 .../Engine/restock-engine-cherenkov-1.mu      | Bin 952753 -> 952753 bytes
 Distribution/RestockPlus/changelog.txt        |   2 +
 8 files changed, 33 insertions(+), 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
index 11d0a2837bc5ff2b8db4b33403306bfd463de3a3..4abcc9c676431f5b15e9f4cbb26d5f10734ebbf7 100644
GIT binary patch
delta 49
zcmaF<$>RAZi-s1)7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~Eqqp%jCs==E%+p+2V3%q
F007cz5D@?X

delta 49
zcmaF<$>RAZi-s1)7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~Eqqp%j7ifQE%+p+2V3%q
F007bE5Cs4L

diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-2.mu
index e9bdeac1d826cf9f1e5eae76fff6a0b9f2180a71..2eb431fdc81be4a136c6352c6ec8dd6c897eb567 100644
GIT binary patch
delta 52
zcmZ3#RDJzY^$G1f3=9g6Fx)t~buwe?WTw{1%&n7IS|_u%PG)PJ%-%YgW9wv2nM(k-
C$`Nz`

delta 44
zcmV+{0Mq}kr6;eYCy<8$Es^gWfux0`0fnRjg`@+8qy&Ye1%;#rg`@|CqzJX72@BG*
CMiQt1

diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-3.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-truss-3.mu
index ae8e10162c277fb712711d4c6cda1b242e58114e..ab9c0ab286b4b880e3f2d9938e66a39812418be0 100644
GIT binary patch
delta 66
zcmZ4A;J3cPuc3vpg{g(Pg{6hHg{_6Xg`<VDg{y_Tg{OtLg|CIbMW98nMQDrg#2Ow?
U1_eh3AilnMmgDxhHNuma0nl|7CIA2c

delta 66
zcmZ4A;J3cPuc3vpg{g(Pg{6hHg{_6Xg`<VDg{y_Tg{OtLg|CIbMW98nMQDrg#2OwS
V28DwRKzx1itb^O<)(B5x1_0qJ7O4OL

diff --git a/Distribution/Restock/GameData/ReStock/Compatibility/FAR.cfg b/Distribution/Restock/GameData/ReStock/Compatibility/FAR.cfg
index 454f5e16..7f338d5c 100644
--- 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
index 3a671e12..30b4145f 100644
--- 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
index d0e7fc6a..5f6154bd 100644
--- 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
index e72e79003d24fd0d31d8b050548af0097d30ebdd..eb24fd5c88ed882c4a26a59d949a718311bd4538 100644
GIT binary patch
delta 47
zcmdlu*=plttA-ZF7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~Eqp6FIrH>N(i0hg004u_
B4qyNP

delta 47
zcmdlu*=plttA-ZF7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~Eqp6FIg|8C(i0hg004tu
B4paaD

diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt
index 888e6bd5..8637382a 100644
--- 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
 ------