diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-boar-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-boar-1.mu index ca7dfa18..ad7c8f9f 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-boar-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-boar-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-adapter-375-hollow-1.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-adapter-375-hollow-1.mu new file mode 100644 index 00000000..9abbcfb6 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-adapter-375-hollow-1.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-corgi-1.mu b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-corgi-1.mu index 0bc9a7db..609553f4 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-corgi-1.mu and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-corgi-1.mu differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-corgi-3.tga b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-corgi-3.tga index bd99ea5f..e7f30e26 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-corgi-3.tga and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-corgi-3.tga differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-375-1.tga b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-375-1.tga index e7da2dc3..a5ec58ab 100644 Binary files a/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-375-1.tga and b/Distribution/RestockPlus/GameData/ReStockPlus/Assets/Engine/restock-engine-shroud-375-1.tga differ diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg index c3313354..b7639984 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg @@ -9,19 +9,19 @@ Localization en-us { - #LOC_RestockPlus_restock-engine-corgi_title = KR-10A 'Corgi' - #LOC_RestockPlus_restock-engine-corgi_description = + #LOC_RestockPlus_restock-engine-corgi_title = KR-10A 'Corgi' Liquid Fuel Engine Cluster + #LOC_RestockPlus_restock-engine-corgi_description = Kerbodyne engineers have discovered that clustering can be an effective solution when you need more thrust, and don't want to add more boosters. This upper stage engine is very efficient as it takes advantage of a set of lovingly handcrafted, free range KR-10 Engines. #LOC_RestockPlus_restock-engine-corgi_tags = - #LOC_RestockPlus_restock-engine-boar_title = KR-1 'Boar' - #LOC_RestockPlus_restock-engine-boar_description = + #LOC_RestockPlus_restock-engine-boar_title = KR-1 'Boar' Liquid Fuel Engine + #LOC_RestockPlus_restock-engine-boar_description = The single Boar is slightly more efficient than its dual counterpart, and provides, logically, half the thrust. Due to a less integrated set of mounting points, there is a slight decrease in raw thrust-to-weight ratio. #LOC_RestockPlus_restock-engine-boar_tags = - #LOC_RestockPlus_restock-engine-pug_title = LV-303 'Pug' + #LOC_RestockPlus_restock-engine-pug_title = LV-303 'Pug' Liquid Fuel Engine #LOC_RestockPlus_restock-engine-pug_description = #LOC_RestockPlus_restock-engine-pug_tags = - #LOC_RestockPlus_restock-engine-lug_title = LV-T15 '' + #LOC_RestockPlus_restock-engine-lug_title = LV-T15 'Valiant' Liquid Fuel Engine #LOC_RestockPlus_restock-engine-lug_description = #LOC_RestockPlus_restock-engine-lug_tags = @@ -41,12 +41,12 @@ Localization #LOC_RestockPlus_restock-fuel-tank-375-4_description = #LOC_RestockPlus_restock-fuel-tank-375-4_tags = - #LOC_RestockPlus_restock-adapter-tank-25-375-1_title = - #LOC_RestockPlus_restock-adapter-tank-25-375-1_description = - #LOC_RestockPlus_restock-adapter-tank-25-375-1_tags = + #LOC_RestockPlus_restock-adapter-hollow-25-375-1_title = Kerbodyne ADTP-2-3A + #LOC_RestockPlus_restock-adapter-hollow-25-375-1_description = A gutted version of the 2-3, which allows the storage of spacecraft components in its core. + #LOC_RestockPlus_restock-adapter-hollow-25-375-1_tags = - #LOC_RestockPlus_restock-adapter-skeletal-25-375-1_title = - #LOC_RestockPlus_restock-adapter-skeletal-25-375-1_description = + #LOC_RestockPlus_restock-adapter-skeletal-25-375-1_title = Kerbodyne SKLE-2-3 + #LOC_RestockPlus_restock-adapter-skeletal-25-375-1_description = A structural adapter for upper stages. #LOC_RestockPlus_restock-adapter-skeletal-25-375-1_tags = #LOC_RestockPlus_restock-materialbay-radial-1_title = SC-9001R Radial Science Jr. diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-boar.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-boar.cfg index 625e189a..10992f87 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-boar.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/25/restock-engine-boar.cfg @@ -4,14 +4,14 @@ PART { // --- general parameters --- - name = restock-engine-25-boar + name = restock-engine-boar module = Part author = Chris Adderley (Nertea) // --- asset parameters --- MODEL { - model = RestockPlus/Assets/Engine/restock-engine-boar + model = ReStock/Assets/Engine/restock-engine-boar-1 scale = 1.0, 1.0, 1.0 } scale = 1.0 @@ -19,14 +19,15 @@ PART // --- node definitions --- - node_stack_top = 0.0, 2.499, 0.0, 0.0, 1.0, 0.0, 2 - node_stack_bottom = 0.0, -3.849, 0.0, 0.0, -1.0, 0.0, 2 + node_attach = 0.0, 0.598, 0.0, 0.0, 1.0, 0.0, 2 + node_stack_top = 0.0, 0.598, 0.0, 0.0, 1.0, 0.0, 2 + node_stack_bottom = 0.0, -1.75, 0.0, 0.0, -1.0, 0.0, 2 // --- FX definitions --- EFFECTS - { + { engage { AUDIO @@ -43,7 +44,7 @@ PART PREFAB_PARTICLE { prefabName = fx_exhaustSparks_flameout_2 - transformName = thrustTransform + transformName = smokePoint oneShot = true } AUDIO @@ -55,12 +56,73 @@ PART loop = false } } - } + fx-boar-running + { + AUDIO + { + channel = Ship + clip = sound_rocket_spurts + volume = 0.0 0.0 + volume = 1.0 1.0 + pitch = 0.0 0.2 + pitch = 1.0 1.0 + loop = true + } + MODEL_MULTI_PARTICLE + { + name = core + modelName = ReStock/FX/restock-fx-boar-core-1 + transformName = fxTransformCore + emission = 0.0 0.0 + emission = 0.01 0.1 + emission = 0.075 0.25 + emission = 1.0 1.0 + speed = 0.0 0.35 + speed = 1.0 1.0 + } + MODEL_MULTI_PARTICLE + { + name = plume + modelName = ReStock/FX/restock-fx-boar-plume-1 + transformName = fxTransformPlume + emission = 0.0 0.0 + emission = 0.01 0.1 + emission = 0.075 0.25 + emission = 1.0 1.0 + speed = 0.0 0.35 + speed = 1.0 1.0 + } + MODEL_MULTI_PARTICLE + { + name = turbo + modelName = ReStock/FX/restock-fx-boar-turbo-1 + transformName = fxTransformTurbo + emission = 0.0 0.0 + emission = 0.01 0.1 + emission = 0.075 0.25 + emission = 1.0 1.0 + speed = 0.0 0.35 + speed = 1.0 1.0 + } + PREFAB_PARTICLE + { + prefabName = fx_smokeTrail_veryLarge + transformName = smokePoint + emission = 0.0 0.0 + emission = 0.05 0.0 + emission = 0.075 0.25 + emission = 1.0 1.25 + speed = 0.0 0.25 + speed = 1.0 1.0 + localOffset = 0, 0, 1 + } + } + } // --- editor parameters --- TechRequired = veryHeavyRocketry - entryCost = 26800 - cost = 15200 + entryCost = 38800 + cost = 9100 category = Engine subcategory = 0 title = #LOC_RestockPlus_restock-engine-boar_title @@ -68,11 +130,11 @@ PART description = #LOC_RestockPlus_restock-engine-boar_description // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision - attachRules = 1,0,1,0,0 + attachRules = 1,1,1,0,0 bulkheadProfiles = size2, size1, srf // --- standard part parameters --- - mass = 3 + mass = 7.0 dragModelType = default maximum_drag = 0.2 minimum_drag = 0.2 @@ -83,7 +145,7 @@ PART breakingForce = 5000 breakingTorque = 5000 - tags = #LOC_RestockPlus_restock-engine-375-3_tags + tags = #LOC_RestockPlus_restock-engine-boar_tags MODULE { @@ -91,11 +153,10 @@ PART engineID = MainExhaust thrustVectorTransformName = thrustTransform exhaustDamage = True - runningEffectName = fx-gc-core - powerEffectName = fx-gc-plume + runningEffectName = fx-boar-running ignitionThreshold = 0.1 minThrust = 0 - maxThrust = 1540 + maxThrust = 1000 heatProduction = 5 fxOffset = 0, 0, 0 EngineType = LiquidFuel @@ -113,8 +174,8 @@ PART } atmosphereCurve { - key = 0 328 - key = 1 309 + key = 0 345 + key = 1 295 key = 12 0.001 } } @@ -131,12 +192,92 @@ PART MODULE { name = ModuleGimbal - gimbalTransformName = GimbalBone + gimbalTransformName = B_Gimbal gimbalRange = 3 gimbalResponseSpeed = 6 useGimbalResponseSpeed = true } + MODULE + { + name = ModulePartVariants + baseVariant = Size2 + VARIANT + { + name = Size2 + displayName = #LOC_Restock_variant-engine_size2 + primaryColor = #000000 + secondaryColor = #999999 + GAMEOBJECTS + { + Var_25Boat = false + Var_25 = true + Fairing25 = true + Fairing25_Compact = false + Var_Compact = false + CylTop001 = true + CylTop002 = true + CylBot001 = true + CylBot002 = true + CylBot003 = false + CylBot004 = false + } + NODES + { + node_stack_top = 0.0, 0.598, 0.0, 0.0, 1.0, 0.0, 2 + } + } + VARIANT + { + name = Boattail + displayName = #LOC_Restock_variant-engine_boattail + primaryColor = #999999 + secondaryColor = #000000 + GAMEOBJECTS + { + Var_25Boat = true + Var_25 = false + Fairing25 = false + Fairing25_Compact = false + Var_Compact = false + CylTop001 = true + CylTop002 = true + CylBot001 = true + CylBot002 = true + CylBot003 = false + CylBot004 = false + } + NODES + { + node_stack_top = 0.0, 0.598, 0.0, 0.0, 1.0, 0.0, 2 + } + } + VARIANT + { + name = Compact + displayName = #LOC_Restock_variant-engine_compact + primaryColor = #ffffff + secondaryColor = #f69449 + GAMEOBJECTS + { + Var_25Boat = false + Var_25 = false + Fairing25 = false + Fairing25_Compact = true + Var_Compact = true + CylTop001 = false + CylTop002 = false + CylBot001 = false + CylBot002 = false + CylBot003 = true + CylBot004 = true + } + NODES + { + node_stack_top = 0.0, 0.51, 0.0, 0.0, 1.0, 0.0, 2 + } + } + } MODULE { @@ -317,51 +458,55 @@ PART name = FXModuleLookAtConstraint CONSTRAINLOOKFX { - targetName = CylUpper001 - rotatorsName = CylLower001 + targetName = CylTop001 + rotatorsName = CylBot001 } CONSTRAINLOOKFX { - targetName = CylUpper002 - rotatorsName =CylLower002 + targetName = CylTop002 + rotatorsName =CylBot002 } CONSTRAINLOOKFX { - targetName = CylUpper003 - rotatorsName = CylLower003 + targetName = CylTop003 + rotatorsName = CylBot003 } CONSTRAINLOOKFX { - targetName = CylLower001 - rotatorsName = CylUpper001 + targetName = CylTop004 + rotatorsName = CylBot004 } CONSTRAINLOOKFX { - targetName = CylLower002 - rotatorsName = CylUpper002 + targetName = CylBot001 + rotatorsName = CylTop001 } CONSTRAINLOOKFX { - targetName = CylLower003 - rotatorsName = CylUpper003 + targetName = CylBot002 + rotatorsName = CylTop002 } + CONSTRAINLOOKFX + { + targetName = CylBot003 + rotatorsName = CylTop003 + } + CONSTRAINLOOKFX + { + targetName = CylBot004 + rotatorsName = CylTop004 + } } MODULE { name = ModuleJettison - jettisonName = SHROUD01 + jettisonName = Fairing25,Fairing25_Compact bottomNodeName = bottom isFairing = True jettisonedObjectMass = 0.1 jettisonForce = 5 jettisonDirection = 0 0 1 - MODULE - { - name = FlagDecal - textureQuadName = Flag - } - MODULE { name = ModuleSurfaceFX @@ -371,7 +516,6 @@ PART falloff = 2 thrustTransformName = thrustTransform } - !MODULE[FXModuleAnimateThrottle] {} MODULE { name = FXModuleThrottleEffects @@ -400,18 +544,18 @@ PART toggleInFlight = false redCurve { - key = 0 1 + key = 0 0 key = 1 1 } greenCurve { - key = 0 + key = 0 0 key = 1 1 } blueCurve { key = 0 0 - key = 1 0 + key = 1 1 } alphaCurve { @@ -430,7 +574,7 @@ PART toggleInFlight = false redCurve { - key = 0 1 + key = 0 0 key = 1 1 } greenCurve @@ -441,7 +585,7 @@ PART blueCurve { key = 0 0 - key = 1 0 + key = 1 1 } alphaCurve { diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/375/restock-engine-corgi.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/375/restock-engine-corgi.cfg index 7fae8826..ace42d08 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/375/restock-engine-corgi.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/375/restock-engine-corgi.cfg @@ -492,7 +492,6 @@ PART falloff = 2 thrustTransformName = thrustTransform } - !MODULE[FXModuleAnimateThrottle] {} MODULE { name = FXModuleThrottleEffects diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-adapter-tank-25-375-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-adapter-tank-25-375-1.cfg deleted file mode 100644 index fca4b993..00000000 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/FuelTank/375/restock-adapter-tank-25-375-1.cfg +++ /dev/null @@ -1,72 +0,0 @@ -// Fuelled 2.5 to 3.75m adapter -PART -{ - name = restock-adapter-tank-25-375-1 - module = Part - author = Chris Adderley (Nertea) - - MODEL - { - model = ReStock/Assets/FuelTank/restock-adapter-375-fueled-1 - scale = 1.0, 1.0, 1.0 - } - MODEL - { - model = ReStock/Assets/FuelTank/restock-endcap-fueltank-25-orange - scale = 1.0, 1.0, 1.0 - position = 0.0, 1.148, 0.0 - } - MODEL - { - model = ReStock/Assets/FuelTank/restock-endcap-fueltank-375-orange - scale = 1.0, -1.0, 1.0 - position = 0.0, -1.098, 0.0 - } - scale = 1 - rescaleFactor = 1 - - // Attachment - attachRules = 1,0,1,1,0 - node_stack_top = 0.0, 1.148, 0, 0.0, 1.0, 0.0, 3 - node_stack_bottom = 0.0, -1.098, 0, 0.0, -1.0, 0.0, 3 - - // Tech - TechRequired = highPerformanceFuelSystems - entryCost = 12900 - - // Info - cost = 5750 - category = FuelTank - subcategory = 0 - title = #LOC_RestockPlus_restock-adapter-tank-25-375-1_title - manufacturer = #autoLOC_501638 - description = #LOC_RestockPlus_restock-adapter-tank-25-375-1_description - tags = #LOC_RestockPlus_restock-adapter-tank-25-375-1_tags - bulkheadProfiles = size3, srf - - // Parameters - mass = 4 - dragModelType = default - maximum_drag = 0.2 - minimum_drag = 0.3 - angularDrag = 2 - crashTolerance = 6 - maxTemp = 2000 - breakingForce = 350 - breakingTorque = 350 - - - // Resources - RESOURCE - { - name = LiquidFuel - amount = 2880 - maxAmount = 2880 - } - RESOURCE - { - name = Oxidizer - amount = 3520 - maxAmount = 3520 - } -} diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/375/restock-adapter-hollow-25-375-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/375/restock-adapter-hollow-25-375-1.cfg index 8a4c52f0..77dda3d2 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/375/restock-adapter-hollow-25-375-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/375/restock-adapter-hollow-25-375-1.cfg @@ -1,13 +1,13 @@ -// 3.75m skeletal adapter +// 3.75m hollow adapter PART { - name = restock-adapter-skeletal-25-375-1 + name = restock-adapter-hollow-25-375-1 module = Part author = Chris Adderley (Nertea) MODEL { - model = ReStock/Assets/FuelTank/restock-adapter-375-skeletal-1 + model = ReStock/Assets/FuelTank/restock-adapter-375-hollow-1 scale = 1.0, 1.0, 1.0 } scale = 1 @@ -15,8 +15,8 @@ PART // Attachment attachRules = 1,0,1,1,0 - node_stack_top = 0.0, 0.676, 0, 0.0, 1.0, 0.0, 2 - node_stack_bottom = 0.0, -0.36, 0, 0.0, -1.0, 0.0, 3 + node_stack_top = 0.0, 1.15017, 0.0, 0.0, 1.0, 0.0, 2 + node_stack_bottom = 0.0, -1.1, 0.0, 0.0, -1.0, 0.0, 3 // Tech TechRequired = highPerformanceFuelSystems @@ -26,10 +26,10 @@ PART cost = 5750 category = Structural subcategory = 0 - title = #LOC_RestockPlus_restock-adapter-skeletal-25-375-1_title + title = #LOC_RestockPlus_restock-adapter-hollow-25-375-1_title manufacturer = #autoLOC_501638 - description = #LOC_RestockPlus_restock-adapter-skeletal-25-375-1_description - tags = #LOC_RestockPlus_restock-adapter-skeletal-25-375-1_tags + description = #LOC_RestockPlus_restock-adapter-hollow-25-375-1_description + tags = #LOC_RestockPlus_restock-adapter-hollow-25-375-1_tags bulkheadProfiles = size3, size2 // Parameters @@ -42,4 +42,53 @@ PART maxTemp = 2000 breakingForce = 350 breakingTorque = 350 + + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 375mAdapterBlackWhite = true + 375mAdapterWhite = false + 375mAdapterOrange = false + } + + } + VARIANT + { + name = White + displayName = #autoLOC_8007119 + themeName = White + primaryColor = #ffffff + secondaryColor = #ffffff + GAMEOBJECTS + { + 375mAdapterBlackWhite = false + 375mAdapterWhite = true + 375mAdapterOrange = false + } + } + VARIANT + { + name = Orange + displayName = #autoLOC_8007123 + themeName = Orange + primaryColor = #f49841 + secondaryColor = #f49841 + GAMEOBJECTS + { + 375mAdapterBlackWhite = false + 375mAdapterWhite = false + 375mAdapterOrange = true + } + } + } } diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/375/restock-adapter-skeletal-25-375-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/375/restock-adapter-skeletal-25-375-1.cfg new file mode 100644 index 00000000..8a4c52f0 --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/375/restock-adapter-skeletal-25-375-1.cfg @@ -0,0 +1,45 @@ +// 3.75m skeletal adapter +PART +{ + name = restock-adapter-skeletal-25-375-1 + module = Part + author = Chris Adderley (Nertea) + + MODEL + { + model = ReStock/Assets/FuelTank/restock-adapter-375-skeletal-1 + scale = 1.0, 1.0, 1.0 + } + scale = 1 + rescaleFactor = 1 + + // Attachment + attachRules = 1,0,1,1,0 + node_stack_top = 0.0, 0.676, 0, 0.0, 1.0, 0.0, 2 + node_stack_bottom = 0.0, -0.36, 0, 0.0, -1.0, 0.0, 3 + + // Tech + TechRequired = highPerformanceFuelSystems + entryCost = 12900 + + // Info + cost = 5750 + category = Structural + subcategory = 0 + title = #LOC_RestockPlus_restock-adapter-skeletal-25-375-1_title + manufacturer = #autoLOC_501638 + description = #LOC_RestockPlus_restock-adapter-skeletal-25-375-1_description + tags = #LOC_RestockPlus_restock-adapter-skeletal-25-375-1_tags + bulkheadProfiles = size3, size2 + + // Parameters + mass = 1 + dragModelType = default + maximum_drag = 0.2 + minimum_drag = 0.3 + angularDrag = 2 + crashTolerance = 6 + maxTemp = 2000 + breakingForce = 350 + breakingTorque = 350 +}