diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-mini-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-mini-1.mu index 54fb5c27..10300ef3 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-mini-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-mini-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor.mu index 22c1199f..0db7388f 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor.mu and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-solarpanel-gigantor.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg b/Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg index 703c024c..9852a668 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg +++ b/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 = #d96200 + secondaryColor = #999999 + GAMEOBJECTS + { + MiniRCSBlock1 = true + MiniRCSBlock2 = false + } + } + VARIANT + { + name = Shroud + displayName = #autoLOC_8007114 + primaryColor = #ffffff + secondaryColor = #999999 + GAMEOBJECTS + { + MiniRCSBlock1 = false + MiniRCSBlock2 = true + + } + } + } @MODULE[ModuleRCSFX] { @thrusterTransformName = RCSthruster diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg index 20fc53d5..b29c3486 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg @@ -69,7 +69,7 @@ } // Illuminator Mk2 -@PART[spotLight2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +@PART[spotLight2_v2]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -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] { diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg index 7a42e8f1..6140dc31 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg @@ -116,7 +116,12 @@ scale = 1,1,1 rotation = 0, 0, 0 } - + MODULE + { + name = ModuleRestockDeployableMeshHider + transformName = Panels + transformName = PanelTruss + } @MODULE[ModuleDeployableSolarPanel] { @breakName = pivotBase diff --git a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist index 6fb2c168..159f852d 100644 --- a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist +++ b/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/ diff --git a/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version b/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version index 2adcd7e0..b7105fd1 100644 --- a/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version +++ b/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version @@ -13,12 +13,12 @@ { "MAJOR":1, "MINOR":11, - "PATCH":0 + "PATCH":1 }, "KSP_VERSION_MIN":{ "MAJOR":1, "MINOR":11, - "PATCH":0 + "PATCH":1 }, "KSP_VERSION_MAX":{ "MAJOR":1, diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index cea8710c..bd5db3c7 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -4,6 +4,9 @@ v1.3.1 - 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 ------ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version b/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version index 090c73e0..20e8bb5e 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version @@ -13,12 +13,12 @@ { "MAJOR":1, "MINOR":11, - "PATCH":0 + "PATCH":1 }, "KSP_VERSION_MIN":{ "MAJOR":1, "MINOR":11, - "PATCH":0 + "PATCH":1 }, "KSP_VERSION_MAX":{ "MAJOR":1,