diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 91a8ba72..00000000 --- a/.travis.yml +++ /dev/null @@ -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 diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-deployable-lights-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-deployable-lights-1-e.dds new file mode 100644 index 00000000..634beb1e Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-deployable-lights-1-e.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-deployable-lights-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-deployable-lights-1-n.dds new file mode 100644 index 00000000..6218a11e Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-deployable-lights-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-deployable-lights-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-deployable-lights-1.dds new file mode 100644 index 00000000..d4f6fc2d Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-deployable-lights-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-cookie-flood-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-cookie-flood-1.dds new file mode 100644 index 00000000..54b60032 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-cookie-flood-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-deploy-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-deploy-1.mu new file mode 100644 index 00000000..c2615207 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-deploy-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-deploy-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-deploy-2.mu new file mode 100644 index 00000000..f019be20 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-deploy-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-dome-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-dome-1.mu new file mode 100644 index 00000000..3b425c20 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-dome-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-flood-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-flood-2.mu new file mode 100644 index 00000000..156140f6 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-flood-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-nav-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-nav-1.mu new file mode 100644 index 00000000..49c8d917 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-nav-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-spot-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-spot-2.mu new file mode 100644 index 00000000..53c65d1f Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-spot-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-spot-3.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-spot-3.mu new file mode 100644 index 00000000..725dc424 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-spot-3.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-strip-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-strip-1.mu new file mode 100644 index 00000000..f0b187df Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-strip-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-alt.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-alt.dds new file mode 100644 index 00000000..a8d83691 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-alt.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-e.dds index 5eb9634c..b4720680 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-e.dds and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-e.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-n.dds index 12873348..6b3980dd 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-s.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-s.dds new file mode 100644 index 00000000..bddb8cac Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-s.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-2-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-2-n.dds new file mode 100644 index 00000000..1afda84f Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-2-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-2.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-2.dds new file mode 100644 index 00000000..e4dd1a5c Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-2.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-3.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-3.dds new file mode 100644 index 00000000..3bd2b3a4 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-3.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-4.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-4.dds new file mode 100644 index 00000000..ada1dca0 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-4.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1-e.dds new file mode 100644 index 00000000..e92d0d61 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1-e.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1-n.dds new file mode 100644 index 00000000..7219ef83 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1-s.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1-s.dds new file mode 100644 index 00000000..6a1eef53 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1-s.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1.dds new file mode 100644 index 00000000..e543c9d8 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg index 7628d663..a129d7bb 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg +++ b/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 + //} +} \ No newline at end of file diff --git a/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll b/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll index 04206d4c..63ca4558 100644 Binary files a/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll and b/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll differ diff --git a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist index a20ce342..b72f49a9 100644 --- a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist +++ b/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/ diff --git a/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version b/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version index 3c935009..1188466e 100644 --- a/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version +++ b/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 } } diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index e43baba6..ea1b7ca4 100644 --- a/Distribution/Restock/changelog.txt +++ b/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. diff --git a/Distribution/Restock/readme.txt b/Distribution/Restock/readme.txt index 917f6f62..c98f4e4e 100644 --- a/Distribution/Restock/readme.txt +++ b/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 diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Utility/restock-light-angles.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Utility/restock-light-angles.cfg deleted file mode 100644 index a7d157d6..00000000 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Utility/restock-light-angles.cfg +++ /dev/null @@ -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 - } -} diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version b/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version index 0ba2fe3e..435ea8a8 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version +++ b/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 } } diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt index d06ba588..acef220e 100644 --- a/Distribution/RestockPlus/changelog.txt +++ b/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. diff --git a/Distribution/RestockPlus/readme.txt b/Distribution/RestockPlus/readme.txt index ea6af9cc..667ac1b5 100644 --- a/Distribution/RestockPlus/readme.txt +++ b/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: diff --git a/Source/Restock/ModuleRestockEnhancedLight.cs b/Source/Restock/ModuleRestockEnhancedLight.cs new file mode 100644 index 00000000..ae73b59a --- /dev/null +++ b/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(); + 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; + } + } + } + + + } +}