diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-ServiceModule18-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-ServiceModule18-n.dds new file mode 100644 index 00000000..651acade Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-ServiceModule18-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-ServiceModule18-s.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-ServiceModule18-s.dds new file mode 100644 index 00000000..347fdd98 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-ServiceModule18-s.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-ServiceModule18.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-ServiceModule18.dds new file mode 100644 index 00000000..253232c2 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-ServiceModule18.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-ServiceModule18.mu b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-ServiceModule18.mu new file mode 100644 index 00000000..a773f2ad Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-ServiceModule18.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-Size1to0ServiceModule-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-Size1to0ServiceModule-n.dds new file mode 100644 index 00000000..b7a29cb3 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-Size1to0ServiceModule-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-Size1to0ServiceModule.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-Size1to0ServiceModule.dds new file mode 100644 index 00000000..88271475 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-Size1to0ServiceModule.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-Size1to0ServiceModule.mu b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-Size1to0ServiceModule.mu new file mode 100644 index 00000000..73c1abd4 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-Size1to0ServiceModule.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg index 757669e9..93b5ab5e 100644 --- a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg +++ b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg @@ -123,6 +123,9 @@ Localization #LOC_Restock_variant-service-bay-opaque = Solid Caps #LOC_Restock_variant-service-bay-transparent = Truss Caps #LOC_Restock_variant-service-bay-hollow = No Caps + #LOC_Restock_variant-service-bay-open = Open + #LOC_Restock_variant-service-bay-tunnel = Docking Tunnel + #LOC_Restock_variant-service-bay-shelves = Shelves #LOC_Restock_variant-heat-shield-black = Black #LOC_Restock_variant-heat-shield-brown = Classic diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-service-modules.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-service-modules.cfg new file mode 100644 index 00000000..e0180821 --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-service-modules.cfg @@ -0,0 +1,161 @@ +// Patches applying art changes to Making History service modules +// Contents: +// - Service Module (1.25m to 0.625m) (Size1to0ServiceModule) +// - Service Module (1.875m) (ServiceModule18) + +// Service Module (1.25m to 0.625m) +@PART[Size1to0ServiceModule]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Well + !MODEL {} + MODEL + { + model = ReStock/Assets/Payload/restock-Size1to0ServiceModule + } + MODEL + { + model = ReStock/Assets/Command/restock-crewed-endcap-2 + position = 0.0, -0.351654, 0.0 + scale = 1,-1,1 + rotation = 0, 0, 0 + name = endcap_bottom + } + MODEL + { + model = ReStock/Assets/Command/restock-crewed-endcap-2 + position = 0.0,0.2975, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + name = endcap_top + } + + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = NoTunnel + VARIANT + { + name = NoTunnel + displayName = #LOC_Restock_variant-service-bay-open // Open + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + endcap_top = false + endcap_bottom = false + Base_CrewTunnel = false + Base_Structural = true + EndCap_Structural = true + COLCrewTunnel = false + } + } + VARIANT + { + name = Tunnel + displayName = #LOC_Restock_variant-service-bay-tunnel + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #999999 + GAMEOBJECTS + { + endcap_top = true + endcap_bottom = true + Base_CrewTunnel = true + Base_Structural = false + EndCap_Structural = false + COLCrewTunnel = true + } + } + } + + MODULE + { + name = ModuleColorChanger + shaderProperty = _EmissiveColor + animRate = 0.8 + animState = false + useRate = true + toggleInEditor = true + toggleInFlight = true + toggleInFlight = true + unfocusedRange = 5 + toggleName = Toggle Lights + eventOnName = #autoLOC_6001409 //#autoLOC_6001409 = Lights On + eventOffName = #autoLOC_6001408 //#autoLOC_6001408 = Lights Off + toggleAction = True + defaultActionGroup = Light + redCurve + { + key = 0 0 0 3 + key = 1 1 0 0 + } + greenCurve + { + key = 0 0 0 1 + key = 1 1 1 0 + } + blueCurve + { + key = 0 0 0 0 + key = 1 0.7 1.5 0 + } + alphaCurve + { + key = 0 1 + } + } +} + +// Service Module (1.875m) +@PART[ServiceModule18]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Well + !MODEL {} + MODEL + { + model = ReStock/Assets/Payload/restock-ServiceModule18 + } + + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = Shelves + VARIANT + { + name = Shelves + displayName = #LOC_Restock_variant-service-bay-shelves // Shelves + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #999999 + GAMEOBJECTS + { + COLMid01 = true + COLMid02 = true + Core_Platform = true + Core_Without_Platform = false + Platform = true + Torus = true + } + } + VARIANT + { + name = NoShelves + displayName = #LOC_Restock_variant-service-bay-open // Open + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + COLMid01 = false + COLMid02 = false + Core_Platform = false + Core_Without_Platform = true + Platform = false + Torus = false + } + } + } +} \ No newline at end of file diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index 27cdf6d4..e7c83269 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -16,6 +16,9 @@ v1.2.0 - Mk2 Command Pod (Andrew Cassidy): Now has dark and white variants. - Coupling - Inflatable Airlock (Andrew Cassidy): now has built in decoupler and optional ring to connect seamlessly with KV-series pods. Has a new IVA. + - Payload + - SM-18 Service Module (Well): Now has shelved and open variants. + - SM-6A Service Module (Well): Now has crew-tube and open variants. - Updates to support KSP 1.10.x part changes: - Kickback now supports a new White variant with slightly different geometry and more... white - 2.5m tanks now support new White and ESA variants diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg index 89e5c5a0..c312ba84 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg @@ -495,6 +495,12 @@ Localization #LOC_RestockPlus_restock-fairing-base-0625-1_description = While the Kerbals at Mission Control were still figuring out how to get their rockets back down to Kerbin safely, the research engineers at FLOOYD were quickly realising that protecting parts on ascent was just as important. Heavy research into two-dimensional-input driven procedural construction was then funded with the hopes of making protective shells for important payloads and interstage areas of the crafts. The protective shells also have the benefit of making the craft more aerodynamic, hopefully saving on precious rocket fuel! This protective shell is an even tinier size available from FLOOYD. #LOC_RestockPlus_restock-fairing-base-0625-1_tags = restock aero )cap cargo cone contain drag fairing hollow inter nose payload protect rocket shroud stage (stor transport 625 + // 1.25m + + #LOC_RestockPlus_restock-service-module-125-625-1_title = Service Module (1.25m) + #LOC_RestockPlus_restock-service-module-125-625-1_description = A small conical service module, for storing parachutes, instruments, and other small devices. Includes an optional docking tunnel. + #LOC_RestockPlus_restock-service-module-125-625-1_tags = restock bus contain hollow protect (stor cone tunnel. + // 1.875m #LOC_RestockPlus_restock-fairing-base-1875-1_title = AE-FF1-L Airstream Protective Shell (1.875m) #LOC_RestockPlus_restock-fairing-base-1875-1_description = While the Kerbals at Mission Control were still figuring out how to get their rockets back down to Kerbin safely, the research engineers at FLOOYD were quickly realising that protecting parts on ascent was just as important. Heavy research into two-dimensional-input driven procedural construction was then funded with the hopes of making protective shells for important payloads and interstage areas of the crafts. The protective shells also have the benefit of making the craft more aerodynamic, hopefully saving on precious rocket fuel! As a result of budget schedule realignments, this protective shell has recently become available. @@ -504,6 +510,10 @@ Localization #LOC_RestockPlus_restock-service-bay-1875-1_description = A medium sized heat resistant service bay, ideal for protecting delicate instruments or stowing small service components such as RCS tanks, batteries, etc. #LOC_RestockPlus_restock-service-bay-1875-1_tags = restock bus contain heat hollow protect (stor therm + #LOC_RestockPlus_restock-service-module-1875-1_title = Service Module (1.875m) + #LOC_RestockPlus_restock-service-module-1875-1_description = A medium sized service module, for storing fuel tanks, batteries, fuel cells, etc. + #LOC_RestockPlus_restock-service-module-1875-1_tags = restock bus contain hollow protect (stor Gemini + // 5m #LOC_RestockPlus_restock-fairing-base-5-1_title = AE-FF4 Airstream Protective Shell (5m) #LOC_RestockPlus_restock-fairing-base-5-1_description = While the Kerbals at Mission Control were still figuring out how to get their rockets back down to Kerbin safely, the research engineers at FLOOYD were quickly realising that protecting parts on ascent was just as important. Heavy research into two-dimensional-input driven procedural construction was then funded with the hopes of making protective shells for important payloads and interstage areas of the crafts. The protective shells also have the benefit of making the craft more aerodynamic, hopefully saving on precious rocket fuel! diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/125/restock-service-module-125-625-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/125/restock-service-module-125-625-1.cfg new file mode 100644 index 00000000..2018b811 --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/125/restock-service-module-125-625-1.cfg @@ -0,0 +1,189 @@ +PART +{ + name = restock-service-module-125-625-1 + module = Part + author = Well + + MODEL + { + model = ReStock/Assets/Payload/restock-Size1to0ServiceModule + } + MODEL + { + model = ReStock/Assets/Command/restock-crewed-endcap-2 + position = 0.0, -0.351654, 0.0 + scale = 1,-1,1 + rotation = 0, 0, 0 + name = endcap_bottom + } + MODEL + { + model = ReStock/Assets/Command/restock-crewed-endcap-2 + position = 0.0,0.2975, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + name = endcap_top + } + + rescaleFactor = 1 + node_stack_top = 0.0, 0.3125, 0.0, 0.0, 1.0, 0.0, 0 + node_stack_bottom = 0.0, -0.31966, 0.0, 0.0, -1.0, 0.0, 1 + + fx_gasBurst_white = 0.0, 0.3, 0.0, 0.0, 1.0, 0.0, deploy + sound_vent_large = deploy + + // Flag to disable this part if MH is installed + MHReplacement = True + + TechRequired = advConstruction + entryCost = 3000 + cost = 300 + category = Payload + subcategory = 0 + title = #LOC_RestockPlus_restock-service-module-125-625-1_title // Service Module (1.25m) + manufacturer = #autoLOC_501665 //#autoLOC_501665 = FLOOYD Dynamics Research Labs + description = #LOC_RestockPlus_restock-service-module-125-625-1_description + // A small conical service module, for storing parachutes, instruments, and other small devices. Includes an optional docking tunnel. + tags = #LOC_RestockPlus_restock-service-module-125-625-1_tags // restock bus contain hollow protect (stor cone tunnel. + + attachRules = 1,0,1,1,0 + mass = 0.075 + thermalMassModifier = 2.0 + skinMassPerArea = 4.0 + skinInternalConductionMult = 0.25 + // heatConductivity = 0.06 // half default + emissiveConstant = 0.8 + dragModelType = default + maximum_drag = 0.2 + minimum_drag = 0.2 + angularDrag = 2 + crashTolerance = 9 + maxTemp = 2600 // = 3400 + + stageOffset = 1 + childStageOffset = 1 + + fuelCrossFeed = True + bulkheadProfiles = size1 size0 + + MODULE + { + name = ModuleServiceModule + ExteriorColliderName = COLShell + partDecoupled = false + } + + MODULE + { + name = ModuleCargoBay + DeployModuleIndex = 0 + closedPosition = 0 + lookupRadius = 0.75 + useBayContainer = true + bayContainerName = COLShell + } + + MODULE + { + name = ModuleJettison + jettisonName = Shell1 + isFairing = False + jettisonedObjectMass = 0.1 + jettisonForce = 1 + jettisonDirection = 1 0 0 + hideJettisonMenu = true + allowShroudToggle = false + ignoreNodes = true + } + + MODULE + { + name = ModuleJettison + jettisonName = Shell2 + isFairing = False + jettisonedObjectMass = 0.1 + jettisonForce = 1 + jettisonDirection = -1 0 0 + hideJettisonMenu = true + allowShroudToggle = false + ignoreNodes = true + } + + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = NoTunnel + VARIANT + { + name = NoTunnel + displayName = #LOC_Restock_variant-service-bay-open // Open + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + endcap_top = false + endcap_bottom = false + Base_CrewTunnel = false + Base_Structural = true + EndCap_Structural = true + COLCrewTunnel = false + } + } + VARIANT + { + name = Tunnel + displayName = #LOC_Restock_variant-service-bay-tunnel + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #999999 + GAMEOBJECTS + { + endcap_top = true + endcap_bottom = true + Base_CrewTunnel = true + Base_Structural = false + EndCap_Structural = false + COLCrewTunnel = true + } + } + } + + MODULE + { + name = ModuleColorChanger + shaderProperty = _EmissiveColor + animRate = 0.8 + animState = false + useRate = true + toggleInEditor = true + toggleInFlight = true + toggleInFlight = true + unfocusedRange = 5 + toggleName = Toggle Lights + eventOnName = #autoLOC_6001409 //#autoLOC_6001409 = Lights On + eventOffName = #autoLOC_6001408 //#autoLOC_6001408 = Lights Off + toggleAction = True + defaultActionGroup = Light + redCurve + { + key = 0 0 0 3 + key = 1 1 0 0 + } + greenCurve + { + key = 0 0 0 1 + key = 1 1 1 0 + } + blueCurve + { + key = 0 0 0 0 + key = 1 0.7 1.5 0 + } + alphaCurve + { + key = 0 1 + } + } +} diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/1875/restock-service-module-1875-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/1875/restock-service-module-1875-1.cfg new file mode 100644 index 00000000..b4f9d9cd --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/1875/restock-service-module-1875-1.cfg @@ -0,0 +1,156 @@ +PART +{ + name = restock-service-module-1875-1 + module = Part + author = Well + + MODEL + { + model = ReStock/Assets/Payload/restock-ServiceModule18 + } + + rescaleFactor = 1 + node_stack_top = 0.0, 0.75, 0.0, 0.0, 1.0, 0.0, 1 + node_stack_bottom = 0.0, -0.75, 0.0, 0.0, -1.0, 0.0, 1 + + fx_gasBurst_white = 0.0, 0.3, 0.0, 0.0, 1.0, 0.0, deploy + sound_vent_large = deploy + + // Flag to disable this part if MH is installed + MHReplacement = True + + TechRequired = advConstruction + entryCost = 3000 + cost = 300 + category = Payload + subcategory = 0 + title = #LOC_RestockPlus_restock-service-module-1875-1_title // Service Module (1.875m) + manufacturer = #autoLOC_501665 //#autoLOC_501665 = FLOOYD Dynamics Research Labs + description = #LOC_RestockPlus_restock-service-module-1875-1_description + // A medium sized service module, for storing fuel tanks, batteries, fuel cells, etc. + tags = #LOC_RestockPlus_restock-service-module-1875-1_tags // restock bus contain hollow protect (stor Gemini + attachRules = 1,0,1,1,0 + mass = 0.15 + thermalMassModifier = 2.0 + skinMassPerArea = 4.0 + skinInternalConductionMult = 0.25 + // heatConductivity = 0.06 // half default + emissiveConstant = 0.8 + dragModelType = default + maximum_drag = 0.2 + minimum_drag = 0.2 + angularDrag = 2 + crashTolerance = 9 + maxTemp = 2600 // = 3400 + + stageOffset = 1 + childStageOffset = 1 + + fuelCrossFeed = True + bulkheadProfiles = size1p5 + MODULE + { + name = ModuleServiceModule + ExteriorColliderName = COLShell + partDecoupled = false + } + + MODULE + { + name = ModuleCargoBay + DeployModuleIndex = 0 + closedPosition = 0 + lookupRadius = 0.75 + useBayContainer = true + bayContainerName = COLShell + } + + MODULE + { + name = ModuleJettison + jettisonName = Shell1 + isFairing = False + jettisonedObjectMass = 0.2 + jettisonForce = 2 + jettisonDirection = 1 0 0 + hideJettisonMenu = true + allowShroudToggle = false + ignoreNodes = true + } + MODULE + { + name = ModuleJettison + jettisonName = Shell2 + isFairing = False + jettisonedObjectMass = 0.2 + jettisonForce = 30 + jettisonDirection = -1 0 0 + hideJettisonMenu = true + allowShroudToggle = false + ignoreNodes = true + } + MODULE + { + name = ModuleJettison + jettisonName = Shell3 + isFairing = False + jettisonedObjectMass = 0.2 + jettisonForce = 2 + jettisonDirection = 1 0 0 + hideJettisonMenu = true + allowShroudToggle = false + ignoreNodes = true + } + MODULE + { + name = ModuleJettison + jettisonName = Shell4 + isFairing = False + jettisonedObjectMass = 0.2 + jettisonForce = 2 + jettisonDirection = -1 0 0 + hideJettisonMenu = true + allowShroudToggle = false + ignoreNodes = true + } + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = NoShelves + VARIANT + { + name = NoShelves + displayName = #LOC_Restock_variant-service-bay-open // Open + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + COLMid01 = false + COLMid02 = false + Core_Platform = false + Core_Without_Platform = true + Platform = false + Torus = false + } + } + VARIANT + { + name = Shelves + displayName = #LOC_Restock_variant-service-bay-shelves // Shelves + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #999999 + GAMEOBJECTS + { + COLMid01 = true + COLMid02 = true + Core_Platform = true + Core_Without_Platform = false + Platform = true + Torus = true + } + } + } +} diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt index 0e2d5918..77fcc0dc 100644 --- a/Distribution/RestockPlus/changelog.txt +++ b/Distribution/RestockPlus/changelog.txt @@ -7,6 +7,9 @@ v1.2.0 - Mk2 "Acorn" Command Pod (Andrew Cassidy): 2-kerbal conical command module with dark and white variants. Disabled if Making History is installed - New Coupling parts - AL-1 'Lychee' Inflatable Docking Airlock (Andrew Cassidy): Inflatable airlock with integrated 0.625m docking port. Disabled if Making History is installed. Has a new IVA. +- New Payload Parts + - 1.25m to 0.625m Service Module (Well): Conical 1.25m service module with open and crew-tunnel variants. Disabled if Making History is installed. + - 1.875m Service Module (Well): 1.875m service module with shelved and open variants. Disabled if Making History is installed. - New Structural Parts - BZ-26 Radial Attachment Point Jr. (Andrew Cassidy): 0.625m radial attachment node - BZ-78 Radial Attachment Point (Andrew Cassidy): 1.875m radial attachment node