diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-engine-glow-rcs-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-engine-glow-rcs-1.dds new file mode 100644 index 00000000..d1cc2b18 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-engine-glow-rcs-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-multi-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-multi-1.mu new file mode 100644 index 00000000..0c3d5d3c Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-multi-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-multi-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-multi-2.mu new file mode 100644 index 00000000..07e5e2a1 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-multi-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-multi-mini-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-multi-mini-1.mu new file mode 100644 index 00000000..ac6e7d8b Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-multi-mini-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-multi-mini-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-multi-mini-2.mu new file mode 100644 index 00000000..b475eef8 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-block-multi-mini-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-1-n.dds index 0e52c4c5..e43db525 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-2-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-2-n.dds new file mode 100644 index 00000000..9662b27f Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-2-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-2.dds b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-2.dds new file mode 100644 index 00000000..e80237a6 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-blocks-2.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-2.mu new file mode 100644 index 00000000..63801c41 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-2.mu differ 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 new file mode 100644 index 00000000..a3d2079c Binary files /dev/null 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-light-flood-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-flood-2.mu index 156140f6..d71cbc8e 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-flood-2.mu 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 index 49c8d917..ae2d79ae 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-nav-1.mu 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-3.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-spot-3.mu index 725dc424..bcc0a251 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-spot-3.mu 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 index f0b187df..045b9571 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-strip-1.mu 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-s.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-s.dds index bddb8cac..57561cf2 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1-s.dds 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-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1.dds index 21ef900e..617cb327 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-1.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 index 6a1eef53..9061ebaa 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1-s.dds 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 index e543c9d8..2ed5f549 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1.dds and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-lights-lenses-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/FX/restock-fx-rcs-mini-1.mu b/Distribution/Restock/GameData/ReStock/FX/restock-fx-rcs-mini-1.mu new file mode 100644 index 00000000..8fe44b06 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/FX/restock-fx-rcs-mini-1.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 649b1dce..703c024c 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Control/restock-rcs.cfg @@ -1,7 +1,9 @@ // Patches applying art changes to RCS blocks // Contents: // - RV-105 RCS Thruster Block (RCSBlock_v2) +// - RV-1X RCS Thruster Block (RCSblock_01_small) // - Place-Anywhere 7 Linear RCS Port (linearRcs) +// - Place-Anywhere 1 Linear RCS Port (RCSLinearSmall) // - Vernor Engine (vernorEngine) // RV-105 RCS Thruster Block @@ -12,7 +14,7 @@ !MODEL {} MODEL { - model = ReStock/Assets/Control/restock-rcs-block-2 + model = ReStock/Assets/Control/restock-rcs-block-multi-1 } !EFFECTS {} EFFECTS @@ -59,10 +61,302 @@ } } !MODULE[FXModuleAnimateRCS] {} + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = Angled + VARIANT + { + name = Angled + displayName = #autoLOC_8014157 //#autoLOC_8014157 = Angled 4-horn + themeName = White + primaryColor = #ffffff + mass = 0 + cost = 0 + GAMEOBJECTS + { + B_RCS2x = false + B_RCS3x = false + B_RCS4x = false + B_RCS4xA = true + B_RCS5x = false + } + } + VARIANT + { + name = 5Horn + displayName = #autoLOC_8014156 //#autoLOC_8014156 = Orthogonal 5-horn + themeName = White + primaryColor = #ffffff + mass = 0.01 + cost = 7 + GAMEOBJECTS + { + B_RCS2x = false + B_RCS3x = false + B_RCS4x = false + B_RCS4xA = false + B_RCS5x = true + } + } + VARIANT + { + name = 4Horn + displayName = #autoLOC_8014155 //#autoLOC_8014155 = Orthogonal 4-horn + themeName = White + primaryColor = #ffffff + mass = 0 + cost = 0 + GAMEOBJECTS + { + B_RCS2x = false + B_RCS3x = false + B_RCS4x = true + B_RCS4xA = false + B_RCS5x = false + } + } + VARIANT + { + name = 3Horn + displayName = #autoLOC_8014154 //#autoLOC_8014154 = Orthogonal 3-horn + themeName = White + primaryColor = #ffffff + mass = -0.01 + cost = -8 + GAMEOBJECTS + { + B_RCS2x = false + B_RCS3x = true + B_RCS4x = false + B_RCS4xA = false + B_RCS5x = false + } + } + VARIANT + { + name = 2Horn + displayName = #autoLOC_8014153 //#autoLOC_8014153 = Orthogonal 2-horn + themeName = White + primaryColor = #ffffff + mass = -0.02 + cost = -15 + GAMEOBJECTS + { + B_RCS2x = true + B_RCS3x = false + B_RCS4x = false + B_RCS4xA = false + B_RCS5x = false + } + } + + } MODULE { name = ModuleRestockDepthMask - maskTransform = 4Mask + maskTransform = RCSMask + } + MODULE + { + name = ModuleRestockRCSGlow + shaderColorParameter = _TintColor + alphaCurve + { + key = 0 0 + key = 1 1 + } + redCurve + { + key = 0 1 + } + greenCurve + { + key = 0 1 + } + blueCurve + { + key = 0 1 + } + } +} + +// RV-1X RCS Thruster Block +@PART[RCSblock_01_small]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + + @author = Chris Adderley (Nertea) + !mesh = DELETE + !MODEL {} + MODEL + { + model = ReStock/Assets/Control/restock-rcs-block-multi-mini-1 + } + @rescaleFactor = 1 + !EFFECTS {} + EFFECTS + { + running + { + AUDIO_MULTI_POOL + { + channel = Ship + transformName = RCSjet + clip = sound_rocket_mini + volume = 0.0 0.0 + volume = 0.1 0.0 + volume = 0.5 0.025 + volume = 1.0 0.1 + pitch = 1.0 + loop = true + } + MODEL_MULTI_PARTICLE + { + name = fx1 + modelName = ReStock/FX/restock-fx-rcs-mini-1 + transformName = RCSjet + emission = 0.0 0.0 + emission = 0.1 0.0 + emission = 1.0 1.0 + speed = 0.0 0.8 + speed = 1.0 1.0 + //localRotation = -90, 0, 0 + } + MODEL_MULTI_PARTICLE + { + name = fx2 + modelName = ReStock/FX/restock-fx-rcs-mini-1 + transformName = RCSjet + emission = 0.0 0.0 + emission = 0.1 0.0 + emission = 1.0 1.0 + speed = 0.0 0.8 + speed = 1.0 1.0 + //localRotation = -90, 0, 0 + localPosition = 0, 0.01, 0 + } + } + } + !MODULE[FXModuleAnimateRCS] {} + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = Angled + VARIANT + { + name = Angled + displayName = #autoLOC_8014157 //#autoLOC_8014157 = Angled 4-horn + themeName = White + primaryColor = #ffffff + mass = 0 + cost = 0 + GAMEOBJECTS + { + B_RCS2x = false + B_RCS3x = false + B_RCS4x = false + B_RCS4xA = true + B_RCS5x = false + } + } + VARIANT + { + name = 5Horn + displayName = #autoLOC_8014156 //#autoLOC_8014156 = Orthogonal 5-horn + themeName = White + primaryColor = #ffffff + mass = 0.00125 + cost = 5 + GAMEOBJECTS + { + B_RCS2x = false + B_RCS3x = false + B_RCS4x = false + B_RCS4xA = false + B_RCS5x = true + } + } + VARIANT + { + name = 4Horn + displayName = #autoLOC_8014155 //#autoLOC_8014155 = Orthogonal 4-horn + themeName = White + primaryColor = #ffffff + mass = 0 + cost = 0 + GAMEOBJECTS + { + B_RCS2x = false + B_RCS3x = false + B_RCS4x = true + B_RCS4xA = false + B_RCS5x = false + } + } + VARIANT + { + name = 3Horn + displayName = #autoLOC_8014154 //#autoLOC_8014154 = Orthogonal 3-horn + themeName = White + primaryColor = #ffffff + mass = -0.00125 + cost = -5 + GAMEOBJECTS + { + B_RCS2x = false + B_RCS3x = true + B_RCS4x = false + B_RCS4xA = false + B_RCS5x = false + } + } + VARIANT + { + name = 2Horn + displayName = #autoLOC_8014153 //#autoLOC_8014153 = Orthogonal 2-horn + themeName = White + primaryColor = #ffffff + mass = -0.0025 + cost = -10 + GAMEOBJECTS + { + B_RCS2x = true + B_RCS3x = false + B_RCS4x = false + B_RCS4xA = false + B_RCS5x = false + } + } + + } + MODULE + { + name = ModuleRestockDepthMask + maskTransform = RCSMask + } + MODULE + { + name = ModuleRestockRCSGlow + shaderColorParameter = _TintColor + alphaCurve + { + key = 0 0 + key = 1 1 + } + redCurve + { + key = 0 1 + } + greenCurve + { + key = 0 1 + } + blueCurve + { + key = 0 1 + } } } @@ -74,7 +368,7 @@ !MODEL {} MODEL { - model = ReStock/Assets/Control/restock-rcs-linear-1 + model = ReStock/Assets/Control/restock-rcs-linear-2 } !EFFECTS {} EFFECTS @@ -158,6 +452,116 @@ name = ModuleRestockDepthMask maskTransform = 1MaskShroud } + !MODULE[FXModuleAnimateRCS] {} + MODULE + { + name = ModuleRestockRCSGlow + shaderColorParameter = _TintColor + alphaCurve + { + key = 0 0 + key = 1 1 + } + redCurve + { + key = 0 1 + } + greenCurve + { + key = 0 1 + } + blueCurve + { + key = 0 1 + } + } +} + +// Place-Anywhere 1 Linear RCS Port +@PART[RCSLinearSmall]:HAS[~RestockIgnore[*]]:FOR[000_ReStock] +{ + @author = Chris Adderley (Nertea) + !mesh = DELETE + !MODEL {} + MODEL + { + model = ReStock/Assets/Control/restock-rcs-linear-mini-1 + } + !EFFECTS {} + EFFECTS + { + running + { + AUDIO + { + channel = Ship + clip = sound_rocket_mini + volume = 0.0 0.0 + volume = 0.02 0.2 + volume = 0.5 0.2 + volume = 1.0 0.2 + pitch = 1.0 + loop = true + } + MODEL_MULTI_PARTICLE + { + name = fx1 + modelName = ReStock/FX/restock-fx-rcs-1 + transformName = RCSjet + emission = 0.0 0.0 + emission = 0.1 0.0 + emission = 1.0 1.0 + speed = 0.0 0.8 + speed = 1.0 1.0 + //localRotation = -90, 0, 0 + } + MODEL_MULTI_PARTICLE + { + name = fx2 + modelName = ReStock/FX/restock-fx-rcs-1 + transformName = RCSjet + emission = 0.0 0.0 + emission = 0.1 0.0 + emission = 1.0 1.0 + speed = 0.0 0.8 + speed = 1.0 1.0 + //localRotation = -90, 0, 0 + localPosition = 0, -0.015, 0 + } + } + } + MODULE + { + name = ModuleRestockDepthMask + maskTransform = RCSMask + } + !MODULE[FXModuleAnimateRCS] {} + MODULE + { + name = ModuleRestockRCSGlow + shaderColorParameter = _TintColor + alphaCurve + { + key = 0 0 + key = 1 1 + } + redCurve + { + key = 0 1 + } + greenCurve + { + key = 0 1 + } + blueCurve + { + key = 0 1 + } + } + @MODULE[ModuleRCSFX] + { + @thrusterTransformName = RCSthruster + } } // Vernor Engine diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg index a129d7bb..b009aa50 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg @@ -86,13 +86,12 @@ { @lightMeshRendererName = FloodLightLens @lightName = Spot - movementTransformName = FloodLight + movementTransformName = FloodR canRotate = false canPitch = true pitchAxisName = X - pitchMin = -194 - pitchMax = -13 - pitchAngle = -13 + pitchMin = 0 + pitchMax = 180 } MODULE { diff --git a/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll b/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll index 63ca4558..3abd8e4b 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 b72f49a9..93d7c675 100644 --- a/Distribution/Restock/GameData/ReStock/Restock.restockblacklist +++ b/Distribution/Restock/GameData/ReStock/Restock.restockblacklist @@ -151,6 +151,7 @@ Squad/Parts/Utility/parachuteMk25/ Squad/Parts/Utility/radialAttachmentPoint/ Squad/Parts/Utility/rcsBlockRV-105/ Squad/Parts/Utility/rcsBlockRV-105_v2/ +Squad/Parts/Utility/rcsSmallLinear/ Squad/Parts/Utility/RelayAntennas/ Squad/Parts/Utility/rockomaxAdapters/ Squad/Parts/Utility/ServiceBay/ diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index ea1b7ca4..1cf58e2b 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -9,9 +9,14 @@ v1.3.0 - Navigation Light Mk1 (Nertea): now has a Metal variant - Work Lamp - small (Nertea) - Work Lamp - Stand (Nertea) + - RCS + - RV-105 RCS Block (Nertea): ported RCS models from Restock+ to support new variants + - RV-1X RCS Block (Nertea): ported RCS models from Restock+ to support new model + - PlaceAnywhere 1 Linear RCS thruster (Nertea): ported RCS model from Restock+ - Updates and fixes - Updated old Mk1, Mk2 Illuminator models to use reflectivity on their lenses - Added White variant to Mk1, Mk2 Illuminators + - 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/Localization/en-us.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg index 373c1426..0b9e4f96 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg @@ -114,6 +114,19 @@ Localization #LOC_RestockPlus_restock-reactionwheel-1875-1_tags = restock cmg command control fly gyro moment react stab steer torque magic_spinny_thing // RCS + + #LOC_RestockPlus_restock-rcs-block-multi-2_title = RV-105-A RCS Thruster Block + #LOC_RestockPlus_restock-rcs-block-multi-2_description = An angled variant of the RV-105 RCS block, available in multiple configurations. + #LOC_RestockPlus_restock-rcs-block-multi-2_tags = restock cluster control dock maneuver manoeuvre react rendezvous rotate stab steer translate five quint four quad triple three dual two rcs + #LOC_RestockPlus_restock-rcs-block-multi-mini-2_title = RV-1X-A RCS Thruster Block + #LOC_RestockPlus_restock-rcs-block-multi-mini-2_description = An angled variant of the RV-1X RCS block, available in multiple configurations. + #LOC_RestockPlus_restock-rcs-block-multi-mini-2_tags = restock cluster control dock maneuver manoeuvre react rendezvous rotate stab steer translate five quint four quad triple three dual two rcs + + #LOC_RestockPlus_rcs_variant_5x = 5-horn + #LOC_RestockPlus_rcs_variant_4x = 4-horn + #LOC_RestockPlus_rcs_variant_3x = 3-horn + #LOC_RestockPlus_rcs_variant_2x = 2-horn + #LOC_RestockPlus_restock-rcs-block-dual-1_title = RV-102 RCS Thruster Block #LOC_RestockPlus_restock-rcs-block-dual-1_description = A spin on a classic, this model removes two of the 105's engines for fewer confusing directions of thrust. #LOC_RestockPlus_restock-rcs-block-dual-1_tags = restock cluster control dock maneuver manoeuvre react rendezvous rotate stab steer translate two pair dual rcs diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-1.cfg index f0b03517..85c0e2f6 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-1.cfg @@ -20,9 +20,10 @@ PART node_attach = 0.045212, -0.0, -0.00, 1.0, 0.0, 0.0 // --- editor parameters --- TechRequired = advFlightControl - entryCost = 600 cost = 30 - category = Control + entryCost = 0 + category = none + TechHidden = True title = #LOC_RestockPlus_restock-rcs-block-dual-1_title manufacturer = #autoLOC_501631 description = #LOC_RestockPlus_restock-rcs-block-dual-1_description diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-mini-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-mini-1.cfg index 9e918ee0..ff777e0c 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-mini-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-dual-mini-1.cfg @@ -20,9 +20,11 @@ PART node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0 // --- editor parameters --- TechRequired = advFlightControl - entryCost = 200 + entryCost = 0 + category = none + TechHidden = True cost = 8 - category = Control + title = #LOC_RestockPlus_restock-rcs-block-dual-mini-1_title manufacturer = #autoLOC_501631 description = #LOC_RestockPlus_restock-rcs-block-dual-mini-1_description diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-multi-2.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-multi-2.cfg new file mode 100644 index 00000000..4e21f1df --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-multi-2.cfg @@ -0,0 +1,196 @@ +// ReStock+ 0.1.0 +// RCS block with 5 way nozzles +PART +{ + // --- general parameters --- + name = restock-rcs-block-multi-2 + module = Part + author = Chris Adderley (Nertea) + // --- asset parameters --- + MODEL + { + model = ReStock/Assets/Control/restock-rcs-block-multi-2 + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } + scale = 1 + // --- node definitions --- + // definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z + node_attach = 0.045212, -0.0, -0.00, 1.0, 0.0, 0.0 + // --- editor parameters --- + TechRequired = advFlightControl + entryCost = 1500 + cost = 52 + category = Control + title = #LOC_RestockPlus_restock-rcs-block-multi-2_title + manufacturer = #autoLOC_501631 + description = #LOC_RestockPlus_restock-rcs-block-multi-2_description + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 0,1,0,0,0 + // --- standard part parameters --- + mass = 0.04 + dragModelType = default + maximum_drag = 0.001 + minimum_drag = 0.001 + angularDrag = 2 + crashTolerance = 15 + maxTemp = 1500 + // --- rcs module parameters --- + bulkheadProfiles = srf + tags = #LOC_RestockPlus_restock-rcs-block-multi-2_tags + EFFECTS + { + running + { + AUDIO_MULTI_POOL + { + channel = Ship + transformName = RCSjet + clip = sound_rocket_mini + volume = 0.0 0.0 + volume = 0.1 0.0 + volume = 0.5 0.025 + volume = 1.0 0.1 + pitch = 1.0 + loop = true + } + MODEL_MULTI_PARTICLE + { + name = FX1 + modelName = ReStock/FX/restock-fx-rcs-1 + transformName = RCSjet + emission = 0.0 0.0 + emission = 0.1 0.0 + emission = 1.0 1.0 + speed = 0.0 0.8 + speed = 1.0 1.0 + } + MODEL_MULTI_PARTICLE + { + name = fx2 + modelName = ReStock/FX/restock-fx-rcs-1 + transformName = RCSjet + emission = 0.0 0.0 + emission = 0.2 0.0 + emission = 1.0 1.0 + speed = 0.0 1.0 + speed = 1.0 1.0 + localRotation = 0, 0, 0 + localOffset = 0, 0.1, 0 + } + } + } + MODULE + { + name = ModuleRCSFX + thrusterTransformName = RCSthruster + thrusterPower = 1 + stagingEnabled = False + resourceFlowMode = STAGE_PRIORITY_FLOW + resourceName = MonoPropellant + runningEffectName = running + atmosphereCurve + { + key = 0 240 + key = 1 100 + } + } + MODULE + { + name = ModuleRestockDepthMask + maskTransform = RCSMask + } + MODULE + { + name = ModulePartVariants + baseVariant = 4Horn + VARIANT + { + name = 5Horn + displayName = #LOC_RestockPlus_rcs_variant_5x + themeName = White + primaryColor = #ffffff + mass = 0.01 + cost = 7 + GAMEOBJECTS + { + B_RCS2x = false + B_RCS3x = false + B_RCS4x = false + B_RCS5x = true + } + } + VARIANT + { + name = 4Horn + displayName = #LOC_RestockPlus_rcs_variant_4x + themeName = White + primaryColor = #ffffff + mass = 0 + cost = 0 + GAMEOBJECTS + { + B_RCS2x = false + B_RCS3x = false + B_RCS4x = true + B_RCS5x = false + } + } + VARIANT + { + name = 3Horn + displayName = #LOC_RestockPlus_rcs_variant_3x + themeName = White + primaryColor = #ffffff + mass = -0.01 + cost = -8 + GAMEOBJECTS + { + B_RCS2x = false + B_RCS3x = true + B_RCS4x = false + B_RCS5x = false + } + } + VARIANT + { + name = 2Horn + displayName = #LOC_RestockPlus_rcs_variant_2x + themeName = White + primaryColor = #ffffff + mass = -0.02 + cost = -15 + GAMEOBJECTS + { + B_RCS2x = true + B_RCS3x = false + B_RCS4x = false + B_RCS5x = false + } + } + + } + MODULE + { + name = ModuleRestockRCSGlow + shaderColorParameter = _TintColor + alphaCurve + { + key = 0 0 + key = 1 1 + } + redCurve + { + key = 0 1 + } + greenCurve + { + key = 0 1 + } + blueCurve + { + key = 0 1 + } + } +} diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-multi-mini-2.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-multi-mini-2.cfg new file mode 100644 index 00000000..0e672d92 --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-multi-mini-2.cfg @@ -0,0 +1,177 @@ +// ReStock+ 0.1.0 +// Mini RCS block with 5 way nozzles +PART +{ + // --- general parameters --- + name = restock-rcs-block-multi-mini-2 + module = Part + author = Chris Adderley (Nertea) + // --- asset parameters --- + MODEL + { + model = ReStock/Assets/Control/restock-rcs-block-multi-mini-2 + position = 0.0, 0.0, 0.0 + scale = 1,1,1 + rotation = 0, 0, 0 + } + scale = 1 + // --- node definitions --- + // definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z + node_attach = 0.045212, -0.0, -0.00, 1.0, 0.0, 0.0 + // --- editor parameters --- + TechRequired = advFlightControl + entryCost = 200 + cost = 30 + category = Control + title = #LOC_RestockPlus_restock-rcs-block-multi-mini-2_title + manufacturer = #autoLOC_501631 + description = #LOC_RestockPlus_restock-rcs-block-multi-mini-2_description + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 0,1,0,0,0 + // --- standard part parameters --- + mass = 0.005 + dragModelType = default + maximum_drag = 0.001 + minimum_drag = 0.001 + angularDrag = 2 + crashTolerance = 15 + maxTemp = 1500 + // --- rcs module parameters --- + bulkheadProfiles = srf + tags = #LOC_RestockPlus_restock-rcs-block-multi-mini-2_tags + EFFECTS + { + running + { + AUDIO_MULTI_POOL + { + channel = Ship + transformName = RCSjet + clip = sound_rocket_mini + volume = 0.0 0.0 + volume = 0.1 0.0 + volume = 0.5 0.025 + volume = 1.0 0.1 + pitch = 1.0 + loop = true + } + MODEL_MULTI_PARTICLE + { + name = FX1 + modelName = ReStock/FX/restock-fx-rcs-mini-1 + transformName = RCSjet + emission = 0.0 0.0 + emission = 0.1 0.0 + emission = 1.0 1.0 + speed = 0.0 0.8 + speed = 1.0 1.0 + } + MODEL_MULTI_PARTICLE + { + name = fx2 + modelName = ReStock/FX/restock-fx-rcs-mini-1 + transformName = RCSjet + emission = 0.0 0.0 + emission = 0.2 0.0 + emission = 1.0 1.0 + speed = 0.0 1.0 + speed = 1.0 1.0 + localRotation = 0, 0, 0 + localOffset = 0, 0.01, 0 + } + } + } + MODULE + { + name = ModuleRCSFX + thrusterTransformName = RCSthruster + thrusterPower = 1 + stagingEnabled = False + resourceFlowMode = STAGE_PRIORITY_FLOW + resourceName = MonoPropellant + runningEffectName = running + atmosphereCurve + { + key = 0 240 + key = 1 100 + } + } + MODULE + { + name = ModuleRestockDepthMask + maskTransform = RCSMask + } + MODULE + { + name = ModulePartVariants + baseVariant = 4Horn + VARIANT + { + name = 4Horn + displayName = #LOC_RestockPlus_rcs_variant_4x + themeName = White + primaryColor = #ffffff + mass = 0 + cost = 0 + GAMEOBJECTS + { + B_RCS2x = false + B_RCS3x = false + B_RCS4x = true + } + } + VARIANT + { + name = 3Horn + displayName = #LOC_RestockPlus_rcs_variant_3x + themeName = White + primaryColor = #ffffff + mass = -0.00125 + cost = -5 + GAMEOBJECTS + { + B_RCS2x = false + B_RCS3x = true + B_RCS4x = false + } + } + VARIANT + { + name = 2Horn + displayName = #LOC_RestockPlus_rcs_variant_2x + themeName = White + primaryColor = #ffffff + mass = -0.0025 + cost = -10 + GAMEOBJECTS + { + B_RCS2x = true + B_RCS3x = false + B_RCS4x = false + } + } + + } + MODULE + { + name = ModuleRestockRCSGlow + shaderColorParameter = _TintColor + alphaCurve + { + key = 0 0 + key = 1 1 + } + redCurve + { + key = 0 1 + } + greenCurve + { + key = 0 1 + } + blueCurve + { + key = 0 1 + } + } +} diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-1.cfg index 454f679a..c024eae6 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-1.cfg @@ -20,9 +20,11 @@ PART node_attach = 0.045212, -0.0, -0.00, 1.0, 0.0, 0.0 // --- editor parameters --- TechRequired = advFlightControl - entryCost = 1300 + cost = 45 - category = Control + entryCost = 0 + category = none + TechHidden = True title = #LOC_RestockPlus_restock-rcs-block-quad-angled-1_title manufacturer = #autoLOC_501631 description = #LOC_RestockPlus_restock-rcs-block-quad-angled-1_description diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-mini-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-mini-1.cfg index 7a092f69..fbb8e82f 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-mini-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-angled-mini-1.cfg @@ -20,9 +20,11 @@ PART node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0 // --- editor parameters --- TechRequired = advFlightControl - entryCost = 400 + cost = 16 - category = Control + entryCost = 0 + category = none + TechHidden = True title = #LOC_RestockPlus_restock-rcs-block-quad-angled-mini-1_title manufacturer = #autoLOC_501631 description = #LOC_RestockPlus_restock-rcs-block-quad-angled-mini-1_description diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-mini-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-mini-1.cfg index a386f3df..3126a346 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-mini-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quad-mini-1.cfg @@ -20,9 +20,11 @@ PART node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0 // --- editor parameters --- TechRequired = advFlightControl - entryCost = 400 + cost = 16 - category = Control + entryCost = 0 + category = none + TechHidden = True title = #LOC_RestockPlus_restock-rcs-block-quad-mini-1_title manufacturer = #autoLOC_501631 description = #LOC_RestockPlus_restock-rcs-block-quad-mini-1_description diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-1.cfg index 67942fc0..32ba615a 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-1.cfg @@ -20,9 +20,11 @@ PART node_attach = 0.045212, -0.0, -0.00, 1.0, 0.0, 0.0 // --- editor parameters --- TechRequired = advFlightControl - entryCost = 1500 + cost = 60 - category = Control + entryCost = 0 + category = none + TechHidden = True title = #LOC_RestockPlus_restock-rcs-block-quint-1_title manufacturer = #autoLOC_501631 description = #LOC_RestockPlus_restock-rcs-block-quint-1_description diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-mini-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-mini-1.cfg index d0fc5cc6..0dc3483d 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-mini-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-quint-mini-1.cfg @@ -20,9 +20,11 @@ PART node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0 // --- editor parameters --- TechRequired = advFlightControl - entryCost = 450 + cost = 20 - category = Control + entryCost = 0 + category = none + TechHidden = True title = #LOC_RestockPlus_restock-rcs-block-quint-mini-1_title manufacturer = #autoLOC_501631 description = #LOC_RestockPlus_restock-rcs-block-quint-mini-1_description diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-1.cfg index 32c86ffc..2a092afd 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-1.cfg @@ -20,9 +20,11 @@ PART node_attach = 0.045212, -0.0, -0.00, 1.0, 0.0, 0.0 // --- editor parameters --- TechRequired = advFlightControl - entryCost = 900 + cost = 35 - category = Control + entryCost = 0 + category = none + TechHidden = True title = #LOC_RestockPlus_restock-rcs-block-triple-angled-1_title manufacturer = #autoLOC_501631 description = #LOC_RestockPlus_restock-rcs-block-triple-angled-1_description diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-mini-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-mini-1.cfg index 2fdf649c..b97a47f4 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-mini-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Control/RCS/restock-rcs-block-triple-angled-mini-1.cfg @@ -20,9 +20,11 @@ PART node_attach = 0.008, -0.0, -0.00, 1.0, 0.0, 0.0 // --- editor parameters --- TechRequired = advFlightControl - entryCost = 350 + entryCost = 0 + category = none + TechHidden = True cost = 12 - category = Control + title = #LOC_RestockPlus_restock-rcs-block-triple-angled-mini-1_title manufacturer = #autoLOC_501631 description = #LOC_RestockPlus_restock-rcs-block-triple-angled-mini-1_description diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt index 84edb143..ce1a6b4a 100644 --- a/Distribution/RestockPlus/changelog.txt +++ b/Distribution/RestockPlus/changelog.txt @@ -1,8 +1,12 @@ v1.3.0 ------ - KSP 1.11 -- Removed Light Adjustement patch, replaced with new stock functionality as part of base Restock - Updated French localization (vinix38) +- Removed Light Adjustement patch, replaced with new stock functionality as part of base Restock +- 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 + - RV-1X-A RCS Thruster Block : Micro RCS block with 45 degree canted nozzles, available in 5x, 4x, 3x, 2x variants v1.2.1 ------ diff --git a/Source/Restock/ModuleRestockRCSGlow.cs b/Source/Restock/ModuleRestockRCSGlow.cs new file mode 100644 index 00000000..de89221f --- /dev/null +++ b/Source/Restock/ModuleRestockRCSGlow.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace Restock +{ + public class ModuleRestockRCSGlow: PartModule + { + [KSPField(isPersistant = false)] + public FloatCurve alphaCurve = new FloatCurve(); + + [KSPField(isPersistant = false)] + public FloatCurve blueCurve = new FloatCurve(); + + [KSPField(isPersistant = false)] + public FloatCurve greenCurve = new FloatCurve(); + + [KSPField(isPersistant = false)] + public FloatCurve redCurve = new FloatCurve(); + + [KSPField(isPersistant = false)] + public string shaderColorParameter = "_EmissiveColor"; + + ModuleRCSFX rcs; + List thrustMaterials; + + public void Start() + { + rcs = part.GetComponent(); + + thrustMaterials = new List(); + foreach (Transform t in rcs.thrusterTransforms) + { + thrustMaterials.Add(t.GetComponentInChildren().material); + } + } + + public void FixedUpdate() + { + + if (HighLogic.LoadedSceneIsFlight) + { + for (int i = 0; i < thrustMaterials.Count; i++) + { + float thrust = rcs.thrustForces[i] / rcs.thrusterPower; + Color c; + c = new Color(redCurve.Evaluate(thrust), + greenCurve.Evaluate(thrust), + blueCurve.Evaluate(thrust), + alphaCurve.Evaluate(thrust)); + thrustMaterials[i].SetColor(shaderColorParameter, c); + + } + } + } + } +} +