diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-1-e.dds deleted file mode 100644 index ea643d74..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-1-e.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-1.mu index 864cbb11..83d484fe 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-1.mu index 818af6c0..839354e9 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-2.mu index 67f91feb..8742857e 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-2.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-e.dds deleted file mode 100644 index b49f4d97..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-625-e.dds and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-lamp-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-lamp-e.dds new file mode 100644 index 00000000..310136f3 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-lamp-e.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-lamp-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-lamp-n.dds new file mode 100644 index 00000000..686c44d2 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-lamp-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-lamp-s.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-lamp-s.dds new file mode 100644 index 00000000..9d5f7d05 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-lamp-s.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-lamp.dds b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-lamp.dds new file mode 100644 index 00000000..750b0961 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-claw-lamp.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-cookie-flood-2.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-cookie-flood-2.dds new file mode 100644 index 00000000..c5d0d403 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-cookie-flood-2.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-cookie-spot-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-cookie-spot-1.dds new file mode 100644 index 00000000..fdb9cc72 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-cookie-spot-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claws.cfg b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claws.cfg index 64f221e5..c389e5ec 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claws.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claws.cfg @@ -173,13 +173,18 @@ MODULE { name = ModuleLight - lightName = Lamp - useAnimationDim = true + lightName = SpotLight + lightMeshRendererName = LampLens lightBrightenSpeed = 2.5 lightDimSpeed = 2.5 - resourceAmount = 0.02 + resourceAmount = 0.1 // 100W useResources = true - animationName = RestockClawLamp_On + } + + MODULE + { + name = ModuleRestockEnhancedLight + cookiePath = ReStock/Assets/Electrical/restock-light-cookie-spot-1 } } @@ -333,15 +338,20 @@ maskTransform = DepthMask } - MODULE + MODULE { name = ModuleLight lightName = SpotLight - useAnimationDim = true - lightBrightenSpeed = 2.5 + lightMeshRendererName = LampLens + lightBrightenSpeed = 2.5 lightDimSpeed = 2.5 - resourceAmount = 0.02 + resourceAmount = 0.08 // 80W useResources = true - animationName = RestockMiniClawLamp_On + } + + MODULE + { + name = ModuleRestockEnhancedLight + cookiePath = ReStock/Assets/Electrical/restock-light-cookie-flood-2 } } diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index 4eed3586..f206f0b8 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -17,6 +17,7 @@ v1.3.0 - Rotated the HG-5 antenna model to match stock - Updated old Mk1, Mk2 Illuminator models to use reflectivity on their lenses - Added White variant to Mk1, Mk2 Illuminators + - Updated claw lamps with lens reflectivity and light cookies. - Added RCS nozzle glows to improve RCS effects - Updated Russian localization (Fedor-St) - Updated Japanese localization (Chemical-Factory) diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-claw-625-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-claw-625-1.cfg index f9746efb..ea5cfabd 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-claw-625-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Coupling/0625/restock-claw-625-1.cfg @@ -54,15 +54,22 @@ PART endEventGUIName = #autoLOC_502074 //#autoLOC_502074 = Disarm actionGUIName = #autoLOC_502075 //#autoLOC_502075 = Toggle Arming } + MODULE { name = ModuleLight - lightName = Spotlight - useAnimationDim = true - lightBrightenSpeed = 5 - lightDimSpeed = 3 - resourceAmount = 0.01 + lightName = SpotLight + lightMeshRendererName = LampLens + lightBrightenSpeed = 2.5 + lightDimSpeed = 2.5 + resourceAmount = 0.08 // 80W useResources = true - animationName = RestockMiniClawLamp_On + animationName = RestockClawLamp_On + } + + MODULE + { + name = ModuleRestockEnhancedLight + cookiePath = ReStock/Assets/Electrical/restock-light-cookie-spot-1 } } diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt index 961092b0..8dcbecce 100644 --- a/Distribution/RestockPlus/changelog.txt +++ b/Distribution/RestockPlus/changelog.txt @@ -4,6 +4,7 @@ v1.3.0 - Updated French localization (vinix38) - Removed Light Adjustement patch, replaced with new stock functionality as part of base Restock - Added a new version of the HG-20 High Gain Antenna matching the orientation of the stock HG-5. The old version has been soft-deprecated. +- Updated Advanced Grabbing Unit Junior with new light module and graphics. - Soft-deprecated all various RV-series and RC-series RCS blocks - New RCS parts: - RV-105-A RCS Thruster Block : RCS block with 45 degree canted nozzles, available in 5x, 4x, 3x, 2x variants