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
-    mod-id: 709  # The Spacedock mod ID for deployment
+    enabled: true  # activate/deactivate this deployment script
+    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,48 +44,17 @@
   {
     @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
   !mesh = DELETE
   !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
-        Shroud909_Compact = false
+        ShortShroud = true
+        TallShroud = false
       }
     }
     VARIANT
@@ -675,8 +675,8 @@
         LV_909_Boattail = true
         LV_909_Basic = false
         LV_909_Compact = false
-        Shroud909 = false
-        Shroud909_Compact = false
+        ShortShroud = false
+        TallShroud = false
       }
     }
     VARIANT
@@ -690,8 +690,8 @@
         LV_909_Boattail = false
         LV_909_Basic = false
         LV_909_Compact = true
-        Shroud909 = false
-        Shroud909_Compact = true
+        ShortShroud = false
+        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]