Merge pull request #525 from PorktoberRevolution/master

Release 0.1.1

CKAN/ReStock.netkan

@@ -8,7 +8,7 @@
   "$vref": "#/ckan/ksp-avc",
   "license": "restricted",
   "resources": {
-    "homepage": "tbd",
+    "homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/182679-161-restock-revamping-ksps-art/",
     "repository": "https://github.com/PorktoberRevolution/ReStocked"
   },
   "install": [

CKAN/ReStockPlus.netkan

@@ -8,7 +8,7 @@
   "$vref": "#/ckan/ksp-avc",
   "license": "restricted",
   "resources": {
-    "homepage": "tbd",
+    "homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/182679-161-restock-revamping-ksps-art/",
     "repository": "https://github.com/PorktoberRevolution/ReStocked"
   },
   "install": [

Distribution/Restock/.mod_data.yml

@@ -14,8 +14,8 @@ dependencies:  # Configure dependencies
     location: s3
 deploy:
   SpaceDock:
-    enabled: false  # activate/deactivate this deployment script
+    enabled: true  # activate/deactivate this deployment script
-    mod-id: 709  # The Spacedock mod ID for deployment
+    mod-id: 2098  # The Spacedock mod ID for deployment
   CurseForge:
     enabled: false  # activate/deactivate this deployment script
     mod-id: 230112  # The CurseForge mod ID for deployment

Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg

@@ -25,36 +25,6 @@
   {
     @secondaryTransformName = panel6
   }
-
-  MODULE
-  {
-    name = ModuleRestockModifyMaterials
-    MATERIAL
-    {
-      shader = KSP/Bumped Specular (Mapped)
-      TEXTURE_PROPERTY
-      {
-        name = _MainTex
-        textureUrl = ReStock/Assets/Electrical/restock-solarpanel-1
-      }
-      TEXTURE_PROPERTY
-      {
-        name = _SpecMap
-        textureUrl = ReStock/Assets/Electrical/restock-solarpanel-1-s
-      }
-      FLOAT_PROPERTY
-      {
-        name = _SpecTint
-        value = 0.02
-      }
-      FLOAT_PROPERTY
-      {
-        name = _Shininess
-        value = 0.7
-
-      }
-    }
-  }
 }
 
 // 1x6 shielded
@@ -74,40 +44,9 @@
   {
     @secondaryTransformName = panel6
   }
-
-  MODULE
-  {
-    name = ModuleRestockModifyMaterials
-
-    MATERIAL
-    {
-      shader = KSP/Bumped Specular (Mapped)
-      baseTransform = panel1
-      TEXTURE_PROPERTY
-      {
-        name = _MainTex
-        textureUrl = ReStock/Assets/Electrical/restock-solarpanel-1
-      }
-      TEXTURE_PROPERTY
-      {
-        name = _SpecMap
-        textureUrl = ReStock/Assets/Electrical/restock-solarpanel-1-s
-      }
-      FLOAT_PROPERTY
-      {
-        name = _SpecTint
-        value = 0.02
-      }
-      FLOAT_PROPERTY
-      {
-        name = _Shininess
-        value = 0.7
-      }
-    }
-  }
 }
 
-// 2x3
+// 3x2
 @PART[solarPanels3]
 {
   @author = Beale
@@ -115,7 +54,7 @@
   !MODEL,* {}
   MODEL
   {
-    model = ReStock/Assets/Electrical/restock-solarpanel-2x3
+    model = ReStock/Assets/Electrical/restock-solarpanel-3x2
     position = 0.0, 0.0, 0.0
     scale = 1,1,1
     rotation = 0, 0, 0
@@ -124,34 +63,6 @@
   {
     @secondaryTransformName = solar6
   }
-  MODULE
-  {
-    name = ModuleRestockModifyMaterials
-    MATERIAL
-    {
-      shader = KSP/Bumped Specular (Mapped)
-      TEXTURE_PROPERTY
-      {
-        name = _MainTex
-        textureUrl = ReStock/Assets/Electrical/restock-solarpanel-1
-      }
-      TEXTURE_PROPERTY
-      {
-        name = _SpecMap
-        textureUrl = ReStock/Assets/Electrical/restock-solarpanel-1-s
-      }
-      FLOAT_PROPERTY
-      {
-        name = _SpecTint
-        value = 0.02
-      }
-      FLOAT_PROPERTY
-      {
-        name = _Shininess
-        value = 0.7
-      }
-    }
-  }
 }
 
 // 2x3 shroud
@@ -171,35 +82,6 @@
   {
     @secondaryTransformName = solar6
   }
-  MODULE
-  {
-    name = ModuleRestockModifyMaterials
-    MATERIAL
-    {
-      shader = KSP/Bumped Specular (Mapped)
-      baseTransform = solar1
-      TEXTURE_PROPERTY
-      {
-        name = _MainTex
-        textureUrl = ReStock/Assets/Electrical/restock-solarpanel-1
-      }
-      TEXTURE_PROPERTY
-      {
-        name = _SpecMap
-        textureUrl = ReStock/Assets/Electrical/restock-solarpanel-1-s
-      }
-      FLOAT_PROPERTY
-      {
-        name = _SpecTint
-        value = 0.02
-      }
-      FLOAT_PROPERTY
-      {
-        name = _Shininess
-        value = 0.7
-      }
-    }
-  }
 }
 
 // Gigantor

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg

@@ -567,7 +567,7 @@
         SparkCompact = false
         SparkBoattail = false
         AdditionalColliders = false
-        ShroudSparkBasic = true
+        Shroud = true
         ShroudSparkCompact = false
       }
     }
@@ -589,7 +589,7 @@
         SparkCompact = false
         SparkBoattail = true
         AdditionalColliders = true
-        ShroudSparkBasic = false
+        Shroud = false
         ShroudSparkCompact = false
       }
     }
@@ -611,7 +611,7 @@
         SparkCompact = true
         SparkBoattail = false
         AdditionalColliders = true
-        ShroudSparkBasic = false
+        Shroud = false
         ShroudSparkCompact = true
       }
     }
@@ -699,7 +699,7 @@
   }
   @MODULE[ModuleJettison]
   {
-    @jettisonName =  ShroudSparkBasic,ShroudSparkCompact
+    @jettisonName = Shroud,ShroudSparkCompact
     useMultipleDragCubes = true
   }
 }

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg

@@ -319,7 +319,7 @@
         Var_Compact = false
         Var_UpperGimbals = false
         Var_LowerGimbals = false
-        Fairing125 = true
+        Fairing = true
         Fairing25 = false
         Fairing25_Boat = false
         FairingCompact = false
@@ -343,7 +343,7 @@
         Var_Compact = false
         Var_UpperGimbals = true
         Var_LowerGimbals = true
-        Fairing125 = false
+        Fairing = false
         Fairing25 = true
         Fairing25_Boat = false
         FairingCompact = false
@@ -367,7 +367,7 @@
         Var_Compact = false
         Var_UpperGimbals = true
         Var_LowerGimbals = true
-        Fairing125 = false
+        Fairing = false
         Fairing25 = false
         Fairing25_Boat = false
         FairingCompact = false
@@ -391,7 +391,7 @@
         Var_Compact = true
         Var_UpperGimbals = true
         Var_LowerGimbals = true
-        Fairing125 = false
+        Fairing = false
         Fairing25 = true
         Fairing25_Boat = false
         FairingCompact = true
@@ -408,7 +408,7 @@
   }
   @MODULE[ModuleJettison]
   {
-    @jettisonName = Fairing125,Fairing25,FairingCompact
+    @jettisonName = Fairing,Fairing25,FairingCompact
     useMultipleDragCubes = false
   }
   @MODULE[ModuleGimbal]
@@ -660,8 +660,8 @@
         LV_909_Boattail = false
         LV_909_Basic = true
         LV_909_Compact = false
-        Shroud909 = true
+        ShortShroud = true
-        Shroud909_Compact = false
+        TallShroud = false
       }
     }
     VARIANT
@@ -675,8 +675,8 @@
         LV_909_Boattail = true
         LV_909_Basic = false
         LV_909_Compact = false
-        Shroud909 = false
+        ShortShroud = false
-        Shroud909_Compact = false
+        TallShroud = false
       }
     }
     VARIANT
@@ -690,8 +690,8 @@
         LV_909_Boattail = false
         LV_909_Basic = false
         LV_909_Compact = true
-        Shroud909 = false
+        ShortShroud = false
-        Shroud909_Compact = true
+        TallShroud = true
       }
     }
   }
@@ -702,7 +702,7 @@
   }
   @MODULE[ModuleJettison]
   {
-    @jettisonName = Shroud909,Shroud909_Compact
+    @jettisonName = ShortShroud,TallShroud
     useMultipleDragCubes = true
   }
   @MODULE[ModuleGimbal]
@@ -931,7 +931,7 @@
         LV_T30_Basic = true
         LV_T30_Compact = false
         LV_T30_Boattail = false
-        ShroudT30 = true
+        fairing = true
         ShroudT30_Compact = false
       }
     }
@@ -946,7 +946,7 @@
         LV_T30_Basic = false
         LV_T30_Compact = false
         LV_T30_Boattail = true
-        ShroudT30 = false
+        fairing = false
         ShroudT30_Compact = false
       }
     }
@@ -961,7 +961,7 @@
         LV_T30_Basic = false
         LV_T30_Compact = true
         LV_T30_Boattail = false
-        ShroudT30 = false
+        fairing = false
         ShroudT30_Compact = true
       }
     }
@@ -973,7 +973,7 @@
   }
   @MODULE[ModuleJettison]
   {
-    @jettisonName = ShroudT30,ShroudT30_Compact
+    @jettisonName = fairing,ShroudT30_Compact
     useMultipleDragCubes = false
   }
   !MODULE[FXModuleAnimateThrottle] {}
@@ -1193,7 +1193,7 @@
         T45_Piston004 = false
         Engine = true
         EngineBoattail = false
-        ShroudT45 = true
+        fairing = true
         ShroudT45_Compact = false
       }
     }
@@ -1214,7 +1214,7 @@
         T45_Piston004 = false
         Engine = false
         EngineBoattail = true
-        ShroudT45 = false
+        fairing = false
         ShroudT45_Compact = false
       }
     }
@@ -1235,14 +1235,14 @@
         T45_Piston004 = true
         Engine = true
         EngineBoattail = false
-        ShroudT45 = false
+        fairing = false
         ShroudT45_Compact = true
       }
     }
   }
   @MODULE[ModuleJettison]
   {
-    @jettisonName = ShroudT45,ShroudT45_Compact
+    @jettisonName = fairing,ShroudT45_Compact
     useMultipleDragCubes = false
   }
   @MODULE[ModuleGimbal]

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-25.cfg

@@ -266,7 +266,7 @@
       {
         Mainsail_Boattail = false
         Mainsail_25m = true
-        Mainsail_Shroud = true
+        fairing = true
         Mainsail_Shroud_Compact = false
         Mainsail_Compact = false
       }
@@ -281,7 +281,7 @@
       {
         Mainsail_Boattail = true
         Mainsail_25m = false
-        Mainsail_Shroud = false
+        fairing = false
         Mainsail_Shroud_Compact = false
         Mainsail_Compact = false
       }
@@ -296,7 +296,7 @@
       {
         Mainsail_Boattail = false
         Mainsail_25m = false
-        Mainsail_Shroud = false
+        fairing = false
         Mainsail_Shroud_Compact = true
         Mainsail_Compact = true
       }
@@ -304,7 +304,7 @@
   }
   @MODULE[ModuleJettison]
   {
-    @jettisonName = Mainsail_Shroud,Mainsail_Shroud_Compact
+    @jettisonName = fairing,Mainsail_Shroud_Compact
     useMultipleDragCubes = false
   }
 }
@@ -595,7 +595,7 @@
   }
   @MODULE[ModuleJettison]
   {
-    @jettisonName = Poodle_Shroud, Poodle_Shroud_Compact
+    @jettisonName = Shroud, Poodle_Shroud_Compact
     useMultipleDragCubes = true
   }
   MODULE
@@ -932,7 +932,7 @@
         Skipper_Compact = false
         Skipper_Boattail = false
         Skipper_25m = true
-        Skipper_Shroud = true
+        obj_fairing = true
         Skipper_Shroud_Compact = false
       }
     }
@@ -953,7 +953,7 @@
         Skipper_Compact = false
         Skipper_Boattail = true
         Skipper_25m = false
-        Skipper_Shroud = false
+        obj_fairing = false
         Skipper_Shroud_Compact = false
       }
     }
@@ -974,14 +974,14 @@
         Skipper_Compact = true
         Skipper_Boattail = false
         Skipper_25m = false
-        Skipper_Shroud = false
+        obj_fairing = false
         Skipper_Shroud_Compact = true
       }
     }
   }
   @MODULE[ModuleJettison]
   {
-    @jettisonName = Skipper_Shroud,Skipper_Shroud_Compact
+    @jettisonName = obj_fairing,Skipper_Shroud_Compact
     useMultipleDragCubes = false
   }
 }

Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-375.cfg

@@ -118,7 +118,7 @@
       {
         Var_375 = true
         Var_Compact = false
-        Fairing375 = true
+        obj_fairing = true
         Fairing375_Compact = false
       }
       NODES
@@ -136,7 +136,7 @@
       {
         Var_375 = false
         Var_Compact = true
-        Fairing375 = false
+        obj_fairing = false
         Fairing375_Compact = true
       }
       NODES
@@ -151,7 +151,7 @@
   }
   @MODULE[ModuleJettison]
   {
-    @jettisonName = Fairing375,Fairing375_Compact
+    @jettisonName = obj_fairing,Fairing375_Compact
     useMultipleDragCubes = false
   }
   @MODULE[ModuleGimbal]

Distribution/Restock/GameData/ReStock/Versioning/ReStock.version

@@ -6,7 +6,7 @@
     {
         "MAJOR":0,
         "MINOR":1,
-        "PATCH":0,
+        "PATCH":1,
         "BUILD":0
     },
     "KSP_VERSION":

Distribution/Restock/changelog.txt

@@ -1,4 +1,11 @@
-v0.1.0
+v0.1.1
+------
+- Fixed solar array pivots on already-built craft having some potential issues
+- Fixed interstage shrouds on already-built and decoupled craft hanging around when they shouldn't
+- Fixed diameter of Mk16-XL parachute
+- Fixed vertical offset of Mk16 parachute
+
+v0.1.0
 ------
 - Initial release
 - Stock parts included:

Distribution/Restock/readme.txt

@@ -1,5 +1,5 @@
 =============
-RESTOCK 0.1.0
+RESTOCK 0.1.1
 =============
 
 Restock is a project to improve the art of the Kerbal Space Program part set. Some of the revisions are based on the cancelled Part Overhaul project by Porkjet.
@@ -20,8 +20,8 @@ CREDITS
 =======
 
 Art
-- Andrew Cassidy
 - Chris Adderley (Nertea)
+- Andrew Cassidy (Cineboxandrew)
 - Beale
 - blowfish
 - Passinglurker

Distribution/RestockPlus/.mod_data.yml

@@ -14,8 +14,8 @@ dependencies:  # Configure dependencies
     location: s3
 deploy:
   SpaceDock:
-    enabled: false  # activate/deactivate this deployment script
+    enabled: true  # activate/deactivate this deployment script
-    mod-id: 709  # The Spacedock mod ID for deployment
+    mod-id: 2099  # The Spacedock mod ID for deployment
   CurseForge:
     enabled: false  # activate/deactivate this deployment script
     mod-id: 230112  # The CurseForge mod ID for deployment

Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version

@@ -6,7 +6,7 @@
     {
         "MAJOR":0,
         "MINOR":1,
-        "PATCH":0,
+        "PATCH":1,
         "BUILD":0
     },
     "KSP_VERSION":

Distribution/RestockPlus/changelog.txt

@@ -1,3 +1,7 @@
+v0.1.1
+------
+- Minor fixes
+
 v0.1.0
 ------
 - Initial release

Distribution/RestockPlus/readme.txt

@@ -1,5 +1,5 @@
 ==============
-RESTOCK+ 0.1.0
+RESTOCK+ 0.1.1
 ==============
 
 Restock+ is a complement to Restock which adds useful parts that we feel are missing from the base game. Functionally, these parts additions allow better flexibility in craft construction and not add new gameplay systems or form factors. Some examples might include:
@@ -15,7 +15,7 @@ DEPENDENCIES
 ============
 
 Required:
-- Restock (0.1.0)
+- Restock (0.1.1)
 - ModuleManager (4.0.2)
 
 =============
@@ -23,8 +23,8 @@ CREDITS
 =============
 
 Art
-- Andrew Cassidy
 - Chris Adderley (Nertea)
+- Andrew Cassidy (Cineboxandrew)
 - Porkjet
 
 Drag cube wizardry

README.md

@@ -20,8 +20,8 @@ If you are interested in contributing artistically to the revamp, please contact
 ### Current Contributors
 
 #### Art
-- Andrew Cassidy
 - Chris Adderley (Nertea)
+- Andrew Cassidy (Cineboxandrew)
 - Beale
 - blowfish
 - Passinglurker