Merge pull request #938 from PorktoberRevolution/master

Release 1.3.1

.github/workflows/deploy.yml

@@ -43,5 +43,7 @@ jobs:
       run: python build-deploy/src/package.py --f "Distribution/RestockPlus/.mod_data.yml"  
     - name: Staging package
       run: python build-deploy/src/stage.py --f "Distribution/Restock/.mod_data.yml" # Run the staging script
-    - name: Deploying Restock
+      name: Deploying Restock
+      run: python build-deploy/src/deploy.py --f "Distribution/Restock/.mod_data.yml" # Deploy package to spacedock, curse, github
+    - name: Deploying RestockPlus
       run: python build-deploy/src/deploy.py --f "Distribution/RestockPlus/.mod_data.yml" # Deploy package to spacedock, curse, github

Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg

@@ -185,7 +185,6 @@
 // RV-1X RCS Thruster Block
 @PART[RCSblock_01_small]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
-
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
   !MODEL {}
@@ -558,6 +557,38 @@
       key = 0 1
     }
   }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Bare    
+    useMultipleDragCubes = true
+    VARIANT
+    {
+      name = Bare
+      displayName =  #autoLOC_8007115
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        MiniRCSBlock1 = true
+        MiniRCSBlock2 = false
+      }
+    }   
+    VARIANT
+    {
+      name = Shroud
+      displayName = #autoLOC_8007114
+      primaryColor = #999999
+      secondaryColor = #999999
+      GAMEOBJECTS
+      {
+        MiniRCSBlock1 = false
+        MiniRCSBlock2 = true
+
+      }
+    }
+  }
   @MODULE[ModuleRCSFX]
   {
     @thrusterTransformName = RCSthruster

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

@@ -128,6 +128,128 @@
   } 
 }
 
+// Illuminator Mk1 V2
+@PART[spotLight1_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-spot-2
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = SpotLightLens
+    @lightName = Spot
+    movementTransformName = SpotLightBase
+    canRotate = false
+    canPitch = true
+    pitchAxisName = X
+    pitchMin = 0
+    pitchMax = 180
+  }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Dark
+
+    VARIANT
+    {
+      name = Dark
+      displayName #autoLOC_8007117
+      themeName = Dark
+      primaryColor = #000000
+      secondaryColor = #000000
+      TEXTURE
+      {
+        materialName = restock-lights-1
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-1
+      }
+    } 
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      TEXTURE
+      {
+        materialName = restock-lights-1
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-1-alt
+      }
+    }   
+  } 
+}
+
+// Illuminator Mk2 V2
+@PART[spotLight2_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-flood-2
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = FloodLightLens
+    @lightName = Spot
+    movementTransformName = FloodR
+    canRotate = false
+    canPitch = true
+    pitchAxisName = X
+    pitchMin = 0
+    pitchMin = 0
+    pitchMax = 180
+  }
+  !MODULE[ModulePartVariants] {}
+  MODULE
+  {
+    name = ModulePartVariants
+    useMultipleDragCubes = false
+    baseVariant = Dark
+
+    VARIANT
+    {
+      name = Dark
+      displayName #autoLOC_8007117
+      themeName = Dark
+      primaryColor = #000000
+      secondaryColor = #000000
+      TEXTURE
+      {
+        materialName = restock-lights-1
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-1
+      }
+    } 
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      TEXTURE
+      {
+        materialName = restock-lights-1
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-1-alt
+      }
+    }   
+  } 
+}
+
+
 // [1.11] Dome Light
 @PART[domeLight1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {

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

@@ -116,6 +116,16 @@
     scale = 1,1,1
     rotation = 0, 0, 0
   }
+  MODULE
+  {
+    name =  ModuleRestockDeployableMeshHider
+    transformName = Panels
+    transformName = PanelTruss
+  }
+  @MODULE[ModuleDeployableSolarPanel]
+  {
+    @breakName = pivotBase
+  }
 }
 
 // OX-STAT Photovoltaic Panels

Distribution/Restock/GameData/ReStock/Restock.restockblacklist

@@ -160,6 +160,8 @@ Squad/Parts/Utility/ServiceBay_v2/
 Squad/Parts/Utility/smallClaw/
 Squad/Parts/Utility/spotLightMk1/
 Squad/Parts/Utility/spotLightMk2/
+Squad/Parts/Utility/spotLightMk1_v2/
+Squad/Parts/Utility/spotLightMk2_v2/
 Squad/Parts/Utility/stackCouplers/
 Squad/Parts/Wheel/roverWheelM1/
 Squad/Parts/Wheel/roverWheelS2/

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

@@ -6,18 +6,18 @@
     {
         "MAJOR":1,
         "MINOR":3,
-        "PATCH":0,
+        "PATCH":1,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
         "MINOR":11,
-        "PATCH":0
+        "PATCH":1
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,
-        "MINOR":10,
+        "MINOR":11,
         "PATCH":1
     },
     "KSP_VERSION_MAX":{

Distribution/Restock/changelog.txt

@@ -1,3 +1,13 @@
+v1.3.1
+------
+- Fixed small linear RCS collider
+- Fixed Gigantor not being repairable
+- Fixed compatability marked for 1.10.1, it isn't, really
+- Change DXT5 textures to DXT1 where an alpha channel was unnecessary
+- Applied Restock models to new Squad revamped Mk1, Mk2 Illuminators
+- Added obese variant to small linear RCS to align with Squad's vision for the part
+- Gigantor now breaks more correctly but still badly
+
 v1.3.0
 ------
 - 1.11.0

Distribution/Restock/readme.txt

@@ -1,5 +1,5 @@
 =============
-RESTOCK 1.3.0
+RESTOCK 1.3.1
 =============
 
 Restock is a project to improve the art of the Kerbal Space Program part set. Some of the revisions are based on the canceled Part Overhaul project by Porkjet.

Distribution/RestockExtras/RestockRigidLegs/readme.txt

@@ -10,7 +10,7 @@ DEPENDENCIES
 
 Required:
 - Restock (1.2.0)
-- ModuleManager (4.1.3)
+- ModuleManager (4.1.4)
 
 ============
 INSTALLATION
@@ -28,7 +28,7 @@ To install, drag the RestockRigidLegs folder and ModuleManager DLL from the Game
             - Parts
             - Resources
             - etc.
-        - ModuleManager.4.1.3.dll
+        - ModuleManager.4.1.4.dll
 
 ============
 LOCALIZATION

Distribution/RestockPlus/GameData/ReStockPlus/Localization/fr-fr.cfg

@@ -93,10 +93,14 @@ Localization
     #LOC_RestockPlus_restock-engine-srb-mallet_description = Production interrompue suite à un manque de composants. Le petit maillet répond à la demande d'un booster à poudre miniature utilisable comme booster auxiliaire additionnel ou étage inférieur pour des petits lanceurs. Le concierge du personnel du CSK, un certain O. Trag Kerman, a même proposé d'en atacher des dizaines entre eux pour faire des vehicules super pas chers!
     #LOC_RestockPlus_restock-engine-srb-mallet_tags = (plus propulseur fusée solide éap eap restock maillet
 
-    #LOC_RestockPlus_restock-engine-srb-striker_title = Propulseur à ergol solide RT-2 'Attaquant' //j'ai hesité avec grêviste, mais il faut savoir etre raisonnable :)
+    #LOC_RestockPlus_restock-engine-srb-striker_title = Propulseur à ergol solide RT-2 'Attaquant' //j'ai hesité avec grêviste, mais il faut savoir être raisonnable :)
     #LOC_RestockPlus_restock-engine-srb-striker_description = Production interompue suite à un manque de composants. Étendre le maillet avec des segments additionnels peut fournir plus de booms que votre équipe d'intégration ne peut gérer!
     #LOC_RestockPlus_restock-engine-srb-striker_tags = (plus propulseur fusée solide éap eap restock striker attaquant
 
+    #LOC_RestockPlus_restock-engine-les-2_title = Tour de sauvetage Jr.
+    #LOC_RestockPlus_restock-engine-les-2_description = Une tour à ergol solide plus petite pour projeter l'équipage loin d'une mort certaine.
+    #LOC_RestockPlus_restock-engine-les-2_tags = annuler booster urgence explo ?les l.e.s panne défaillance ?rud secur solide survivre restock junior 625
+
     // Radial
     #LOC_RestockPlus_restock-engine-panda_title = Propulseur Vernier RK-1 'Raton laveur'
     #LOC_RestockPlus_restock-engine-panda_description = Ce petit propulseur a un très grand cardan dans un seul axe qui permet un excellent contrôle à tous les régimes de vol.

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-multi-mini-2.cfg

@@ -85,7 +85,7 @@ PART
   {
     name = ModuleRCSFX
     thrusterTransformName = RCSthruster
-    thrusterPower = 1
+    thrusterPower = .1
     stagingEnabled = False
     resourceFlowMode = STAGE_PRIORITY_FLOW
     resourceName = MonoPropellant

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

@@ -6,18 +6,18 @@
     {
         "MAJOR":1,
         "MINOR":3,
-        "PATCH":0,
+        "PATCH":1,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
         "MINOR":11,
-        "PATCH":0
+        "PATCH":1
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,
-        "MINOR":10,
+        "MINOR":11,
         "PATCH":1
     },
     "KSP_VERSION_MAX":{

Distribution/RestockPlus/changelog.txt

@@ -1,3 +1,11 @@
+v1.3.1
+------
+- Updated French localization  (vinix38)
+- Fixed compatability marked for 1.10.1, it isn't, really
+- Change DXT5 textures to DXT1 where an alpha channel was unnecessary
+- Fixed RV-1X-A thrust power
+- Fixed RV-105-A depth mask
+
 v1.3.0
 ------
 - KSP 1.11

Distribution/RestockPlus/readme.txt

@@ -1,5 +1,5 @@
 ==============
-RESTOCK+ 1.3.0
+RESTOCK+ 1.3.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:
@@ -21,7 +21,7 @@ DEPENDENCIES
 ============
 
 Required:
-- Restock (1.3.0)
+- Restock (1.3.1)
 - ModuleManager (4.1.4)
 
 =============

README.md

@@ -1,4 +1,4 @@
-# Restock [![Build Status](https://travis-ci.com/PorktoberRevolution/ReStocked.svg?branch=prod)](https://travis-ci.com/PorktoberRevolution/ReStocked)
+# Restock
 
 It's no secret that some of KSP's artwork is not great. Placeholder art made by a number of amateur artists throughout the game's development has resulted in a scattered mess of styles and qualities which is most evident in the part artwork.