1.11 Light updates

.travis.yml

@@ -1,51 +0,0 @@
-language: python
-python:
-  - 3.6
-install:
-  - pip install awscli boto3 requests
-branches:
-  only:
-    - prod
-script:
-  - git clone https://github.com/post-kerbin-mining-corporation/build-deploy.git  # clone this repo, it contains the stuff that does the heavy lifting
-  - cd build-deploy
-  - git checkout master
-  - cd ..
-  - pytest -s --testpath "Distribution/" build-deploy/src/tests/  # run the deploy tests
-  - python build-deploy/src/package.py  --f "Distribution/Restock/.mod_data.yml"  # Build RS package
-  - python build-deploy/src/package.py --f "Distribution/RestockPlus/.mod_data.yml"  # Build RS+ package
-before_deploy:
-  - python build-deploy/src/stage.py --f "Distribution/Restock/.mod_data.yml" # Run the staging script. Note that tags will come off restock base always
-deploy:
-  - provider: script
-    script: python build-deploy/src/deploy.py --f "Distribution/Restock/.mod_data.yml" # Deploy RS package to spacedock, curse, github
-    skip_cleanup: true
-    on:
-      branch: prod
-  - provider: script
-    script: python build-deploy/src/deploy.py --f "Distribution/RestockPlus/.mod_data.yml"  # Deploy RS+ package to spacedock, curse, github
-    skip_cleanup: true
-    on:
-      branch: prod
-  - provider: s3 # releases to S3
-    access_key_id: $AWS_ACCESS_KEY_ID
-    secret_access_key: $AWS_SECRET_ACCESS_KEY
-    bucket: "nertea-ksp-modding-releases"
-    local_dir: deploy/ReStock
-    skip_cleanup: true
-    acl: public_read
-    region: us-east-2
-    upload-dir: restock
-    on:
-      branch: prod
-  - provider: s3 # releases to S3
-    access_key_id: $AWS_ACCESS_KEY_ID
-    secret_access_key: $AWS_SECRET_ACCESS_KEY
-    bucket: "nertea-ksp-modding-releases"
-    local_dir: deploy/ReStockPlus
-    skip_cleanup: true
-    acl: public_read
-    region: us-east-2
-    upload-dir: restockplus
-    on:
-      branch: prod

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

@@ -2,6 +2,12 @@
 // Contents:
 // - Illuminator Mk1 (spotLight1)
 // - Illuminator Mk2 (spotLight2)
+// - MDomelight Mk1(Nertea) (domeLight1)
+// - Spotlight Mk1 (Nertea) (spotLight3)
+// - LightStrip Mk1 (stripLight1)
+// - Navigation Light Mk1 (navLight1)
+// - Work Lamp - Small (groundLight1)
+// - Work Lamp - Stand (groundLight2)
 
 // Illuminator Mk1
 @PART[spotLight1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -11,16 +17,56 @@
   !MODEL,* {}
   MODEL
   {
-    model = ReStock/Assets/Electrical/restock-light-spot-1
+    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]
   {
-    @animationName = RestockSpotLight_On
+    @lightMeshRendererName = SpotLightLens
     @lightName = Spot
+    movementTransformName = SpotLightBase
+    canRotate = false
+    canPitch = true
+    pitchAxisName = X
+    pitchMin = 0
+    pitchMax = 180
+    pitchAngle = 180
   }
+  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
@@ -31,14 +77,387 @@
   !MODEL,* {}
   MODEL
   {
-    model = ReStock/Assets/Electrical/restock-light-flood-1
+    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]
   {
-    @animationName = RestockFloodLight_On
+    @lightMeshRendererName = FloodLightLens
     @lightName = Spot
+    movementTransformName = FloodLight
+    canRotate = false
+    canPitch = true
+    pitchAxisName = X
+    pitchMin = -194
+    pitchMax = -13
+    pitchAngle = -13
+  }
+  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]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-dome-1
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
   }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = DomeLightLens
+  }
+
+  !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-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-2
+        _Shininess= 0.3
+      }
+    } 
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      TEXTURE
+      {
+        materialName = restock-lights-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-3
+        _Shininess= 0.3
+      }
+    } 
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #777777
+      secondaryColor = #777777
+      TEXTURE
+      {
+        materialName = restock-lights-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-4
+        _Shininess= 0.1
+      }
+    }     
+  } 
 }
+
+// [1.11] Spot Light
+@PART[spotLight3]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-spot-3
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = SpotLens
+    @movementTransformName = SpotlightRotator
+  }
+  !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-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-2
+        _Shininess= 0.3
+      }
+    } 
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      TEXTURE
+      {
+        materialName = restock-lights-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-3
+        _Shininess= 0.3
+      }
+    } 
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #777777
+      secondaryColor = #777777
+      TEXTURE
+      {
+        materialName = restock-lights-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-4
+        _Shininess= 0.1
+      }
+    }  
+  } 
+}
+
+// [1.11] Strip Light
+@PART[stripLight1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-strip-1
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = RectangleLightLens
+  }
+  !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-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-2
+        _Shininess= 0.3
+      }
+    } 
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      TEXTURE
+      {
+        materialName = restock-lights-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-3
+        _Shininess= 0.3
+      }
+    }  
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #777777
+      secondaryColor = #777777
+      TEXTURE
+      {
+        materialName = restock-lights-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-4
+        _Shininess= 0.1
+      }
+    } 
+  } 
+}
+
+// [1.11] Nav Light
+@PART[navLight1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-nav-1
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = NavLightLens
+  }
+  !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-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-2
+        _Shininess= 0.3
+      }
+    } 
+    VARIANT
+    {
+      name = White
+      displayName = #autoLOC_8007119
+      themeName = White
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      TEXTURE
+      {
+        materialName = restock-lights-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-3
+        _Shininess= 0.3
+      }
+    }   
+    VARIANT
+    {
+      name = Metal
+      displayName = #LOC_Restock_variant-surface_metal
+      themeName = Metal
+      primaryColor = #777777
+      secondaryColor = #777777
+      TEXTURE
+      {
+        materialName = restock-lights-2
+        mainTextureURL = ReStock/Assets/Electrical/restock-lights-4
+        _Shininess= 0.1
+      }
+    }
+  } 
+}
+
+// [1.11] Ground Light Small
+@PART[groundLight1]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-deploy-1
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = DeployLightLens
+    movementTransformName = DeployLightRotate
+    canRotate = false
+    canPitch = true
+    pitchAxisName = X
+    pitchMin = -10
+    pitchAngle = 0
+    pitchMax = 135
+  }
+  //MODULE
+  //{
+  //  name = ModuleRestockEnhancedLight
+  //  cookiePath = ReStock/Assets/Electrical/restock-light-cookie-flood-1
+  //}
+}
+// [1.11] Big deployable light
+@PART[groundLight2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Chris Adderley (Nertea)
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Electrical/restock-light-deploy-2
+    position = 0.0, 0.0, 0.0
+    scale = 1,1,1
+    rotation = 0, 0, 0
+  }
+  @MODULE[ModuleLight]
+  {
+    @lightMeshRendererName = LargeDeployLightLens
+    @movementTransformName = LargeDeployArm
+  }
+  //MODULE
+  //{
+  // name = ModuleRestockEnhancedLight
+  //  cookiePath = ReStock/Assets/Electrical/restock-light-cookie-flood-1
+  //}
+}

Distribution/Restock/GameData/ReStock/Restock.restockblacklist

@@ -141,6 +141,7 @@ Squad/Parts/Utility/landingLegLT-2/
 Squad/Parts/Utility/landingLegLT-5/
 Squad/Parts/Utility/launchClamp1/
 Squad/Parts/Utility/launchEscapeSystem/
+Squad/Parts/Utility/Lights/
 Squad/Parts/Utility/linearVernorRCS/
 Squad/Parts/Utility/parachuteMk1/
 Squad/Parts/Utility/parachuteMk12-R/

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

@@ -5,15 +5,15 @@
     "VERSION":
     {
         "MAJOR":1,
-        "MINOR":2,
-        "PATCH":1,
+        "MINOR":3,
+        "PATCH":0,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
-        "MINOR":10,
-        "PATCH":1
+        "MINOR":11,
+        "PATCH":0
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,
@@ -22,7 +22,7 @@
     },
     "KSP_VERSION_MAX":{
         "MAJOR":1,
-        "MINOR":10,
+        "MINOR":11,
         "PATCH":99
     }
 }

Distribution/Restock/changelog.txt

@@ -1,3 +1,20 @@
+v1.3.0
+------
+- 1.11.0
+- New stock part replacements
+ - Lights
+  - Spotlight Mk1 (Nertea): now has a Metal variant
+  - Domelight Mk1 (Nertea): now has a Metal variant
+  - LightStrip Mk1 (Nertea): now has a Metal variant
+  - Navigation Light Mk1 (Nertea): now has a Metal variant
+  - Work Lamp - small (Nertea)
+  - Work Lamp - Stand (Nertea)
+- Updates and fixes
+ - Updated old Mk1, Mk2 Illuminator models to use reflectivity on their lenses
+ - Added White variant to Mk1, Mk2 Illuminators
+ - Updated Russian localization (Fedor-St)
+ - Updated Japanese localization (Chemical-Factory) 
+
 v1.2.1
 ------
 - Fix model/texture issues with Fairing bases and Interstage trusses.

Distribution/Restock/readme.txt

@@ -1,5 +1,5 @@
 =============
-RESTOCK 1.2.0
+RESTOCK 1.3.0
 =============
 
 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.
@@ -13,7 +13,7 @@ DEPENDENCIES
 ============
 
 Required:
-- ModuleManager (4.1.3)
+- ModuleManager (4.1.4)
 
 =======
 CREDITS

Distribution/RestockPlus/GameData/ReStockPlus/Patches/Utility/restock-light-angles.cfg

@@ -1,35 +0,0 @@
-// Allows rotation of lights via a tweakable
-
-// Illuminator Mk1
-@PART[spotLight1]
-{
-  MODULE
-  {
-    name = ModuleAnimateGeneric
-    animationName = RestockSpotLight_Rotate
-    startEventGUIName = #LOC_RestockPlus_light_rotate_on
-    endEventGUIName = #LOC_RestockPlus_light_rotate_off
-    actionGUIName = #LOC_RestockPlus_light_rotate_toggle
-    allowDeployLimit = true
-    revClampDirection = true
-    revClampSpeed = false
-    revClampPercent = false
-  }
-}
-
-// Illuminator Mk2
-@PART[spotLight2]
-{
-  MODULE
-  {
-    name = ModuleAnimateGeneric
-    animationName = RestockFloodLightRotate
-    startEventGUIName = #LOC_RestockPlus_light_rotate_on
-    endEventGUIName = #LOC_RestockPlus_light_rotate_off
-    actionGUIName = #LOC_RestockPlus_light_rotate_toggle
-    allowDeployLimit = true
-    revClampDirection = true
-    revClampSpeed = false
-    revClampPercent = false
-  }
-}

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

@@ -5,15 +5,15 @@
     "VERSION":
     {
         "MAJOR":1,
-        "MINOR":2,
-        "PATCH":1,
+        "MINOR":3,
+        "PATCH":0,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
-        "MINOR":10,
-        "PATCH":1
+        "MINOR":11,
+        "PATCH":0
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,
@@ -22,7 +22,7 @@
     },
     "KSP_VERSION_MAX":{
         "MAJOR":1,
-        "MINOR":10,
+        "MINOR":11,
         "PATCH":99
     }
 }

Distribution/RestockPlus/changelog.txt

@@ -1,3 +1,8 @@
+v1.3.0
+------
+- KSP 1.11
+- Removed Light Adjustement patch, replaced with new stock functionality as part of base Restock
+
 v1.2.1
 ------
 - Fix model/texture issues with 1.875m Fairing base and Interstage truss.

Distribution/RestockPlus/readme.txt

@@ -1,5 +1,5 @@
 ==============
-RESTOCK+ 1.2.0
+RESTOCK+ 1.3.0
 ==============
 
 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:

Source/Restock/ModuleRestockEnhancedLight.cs

@@ -0,0 +1,38 @@
+using UnityEngine;
+
+namespace Restock
+{
+  public class ModuleRestockEnhancedLight: PartModule
+  {
+    // Path to the light cookie texture
+    [KSPField]
+    public string cookiePath;
+
+    ModuleLight[] lightModules;
+    Texture2D cookie;
+
+    public override void OnAwake()
+    {
+      base.OnAwake();
+    }
+    public override void OnStart(StartState state)
+    {
+      base.OnStart(state);
+      lightModules = base.GetComponentsInChildren<ModuleLight>();
+      cookie = GameDatabase.Instance.GetTexture(cookiePath, false);
+      cookie.wrapMode = TextureWrapMode.Clamp;
+
+      if (cookie == null) { this.LogError($"Couldn't find light cookie at {cookiePath}"); return; }
+
+      foreach (ModuleLight ml in lightModules)
+      {
+        foreach (Light l in ml.lights)
+        {
+          l.cookie = cookie;
+        }
+      }
+    }
+
+
+  }
+}