diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1-n.tga new file mode 100644 index 00000000..abe0e1ba Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1.mu new file mode 100644 index 00000000..72440203 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1.tga new file mode 100644 index 00000000..6828462c Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-0625-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-1.mu index f19c3af0..e026f2fc 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Control/restock-rcs-linear-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-flood-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-flood-1.mu index 5c6c8db9..3c703b58 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-flood-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-flood-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-spot-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-spot-1.mu index d6575bc8..c10c9617 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-spot-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Electrical/restock-light-spot-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu index 92b4cb52..b8aa6b7b 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-terrier-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-adapter-375-fueled-1.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-adapter-375-fueled-1.mu new file mode 100644 index 00000000..d2484d35 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-adapter-375-fueled-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-variants-adapter-375-n.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-variants-adapter-375-n.tga new file mode 100644 index 00000000..c62616dd Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-variants-adapter-375-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-variants-adapter-375.tga b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-variants-adapter-375.tga new file mode 100644 index 00000000..0227581d Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-variants-adapter-375.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-1.mu index c2506134..9e2455f1 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-2.mu index 8958d6c0..77c3d4fb 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-2.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-125-0625-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1-alt-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1-alt-n.tga new file mode 100644 index 00000000..cd7fdf2b Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1-alt-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1-alt.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1-alt.tga new file mode 100644 index 00000000..c07743fb Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1-alt.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1.mu index ff97152e..8d7c41ac 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1.tga index 897c5788..413fea28 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1.tga and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-2.mu index e5625765..1eb09b53 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-2.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-adapter-25-125-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1-n.tga new file mode 100644 index 00000000..f60c93df Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1.mu index 7e4eecd5..96a158b9 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1.tga new file mode 100644 index 00000000..cac2cfac Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-2.mu new file mode 100644 index 00000000..65e588aa Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-3.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-3.mu new file mode 100644 index 00000000..ad9505ba Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-125-3.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-b.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-b.tga new file mode 100644 index 00000000..632bca81 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-b.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-n.tga new file mode 100644 index 00000000..906ed126 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt.tga b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt.tga new file mode 100644 index 00000000..0edd4799 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1-alt.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1.mu index c299ea81..6925c18f 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-nosecone-25-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-0625.cfg b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-0625.cfg new file mode 100644 index 00000000..2f471254 --- /dev/null +++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-0625.cfg @@ -0,0 +1,15 @@ +// Patches applying art changes to 0.625m aerodynamic parts +// Contents: +// - Small Nose Cone (standardNoseCone) + +@PART[standardNoseCone] +{ + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/Aero/restock-nosecone-0625-1 + } + +} diff --git a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-125.cfg index bb94afa4..09441d3f 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-125.cfg @@ -17,8 +17,8 @@ MODULE { name = ModulePartVariants - baseVariant = White - + baseVariant = BlackAndWhite + VARIANT { name = BlackAndWhite displayName = #autoLOC_8007122 @@ -111,6 +111,7 @@ 125SharpConeOrange = false } } + VARIANT { name = BlackAndWhite displayName = #autoLOC_8007122 @@ -157,9 +158,10 @@ } } } + !MODULE[ModuleAnimateHeat] {} } -@PART[pointyNoseConeN] +@PART[pointyNoseConeB] { @author = Chris Adderley (Nertea) @@ -182,12 +184,13 @@ secondaryColor = #ffffff GAMEOBJECTS { - 125TiltConeDark = false - 125TiltConeWhite = true - 125TiltConeBlackWhite = false - 125TiltConeOrange = false + 125mBentConeDark = false + 125mBentConeWhite = true + 125mBentConeBlackandWhite = false + 125mBentConeOrange = false } } + VARIANT { name = BlackAndWhite displayName = #autoLOC_8007122 @@ -196,10 +199,10 @@ secondaryColor = #000000 GAMEOBJECTS { - 125TiltConeDark = false - 125TiltConeWhite = false - 125TiltConeBlackWhite = true - 125TiltConeOrange = false + 125mBentConeDark = false + 125mBentConeWhite = false + 125mBentConeBlackandWhite = true + 125mBentConeOrange = false } } VARIANT @@ -211,10 +214,10 @@ secondaryColor = #f49841 GAMEOBJECTS { - 125TiltConeDark = false - 125TiltConeWhite = false - 125TiltConeBlackWhite = false - 125TiltConeOrange = true + 125mBentConeDark = false + 125mBentConeWhite = false + 125mBentConeBlackandWhite = false + 125mBentConeOrange = true } } VARIANT @@ -226,11 +229,12 @@ secondaryColor = #4c4f47 GAMEOBJECTS { - 125TiltConeDark = true - 125TiltConeWhite = false - 125TiltConeBlackWhite = false - 125TiltConeOrange = false + 125mBentConeDark = true + 125mBentConeWhite = false + 125mBentConeBlackandWhite = false + 125mBentConeOrange = false } } } + !MODULE[ModuleAnimateHeat] {} } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg index 00d98f86..c2de8a5c 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-aero-25.cfg @@ -17,7 +17,6 @@ name = ModulePartVariants baseVariant = White VARIANT - VARIANT { name = White displayName = #autoLOC_8007119 @@ -31,6 +30,7 @@ 25mNoseconeOrange = false } } + VARIANT { name = BlackAndWhite displayName = #autoLOC_8007122 diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg index eee75922..428909ce 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-lights.cfg @@ -20,11 +20,9 @@ @MODULE[ModuleLight] { @animationName = RestockSpotLight_On + @lightName = Spot } -// MODEL -// { -// model = Squad/Parts/Utility/spotLightMk1/model -// } + } // Floodlight @PART[spotLight2] @@ -42,5 +40,6 @@ @MODULE[ModuleLight] { @animationName = RestockFloodLight_On + @lightName = Spot } } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg index 8e87e9df..1534f44b 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-0625.cfg @@ -2,7 +2,7 @@ // Contents: // - LV-1 "Ant" Liquid Fuel Engine (microEngine) // - LV-1R "Spider" Liquid Fuel Engine (radialEngineMini) -// - 48-7S "Spark" Liquid Fuel Engine (liquidEngineMini) +// - 48-7S "Spark" Liquid Fuel Engine (liquidEngineMini_v2) // - 24-77 "Twitch" Liquid Fuel Engine (smallRadialEngine) // - O-10 "Puff" MonoPropellant Fuel Engine (omsEngine) @@ -350,7 +350,7 @@ } // Spark -@PART[liquidEngineMini] +@PART[liquidEngineMini_v2] { @author = Chris Adderley (Nertea) @@ -524,6 +524,7 @@ { @gimbalTransformName = B_Gimbal } + !MODULE[ModulePartVariants] {} MODULE { name = ModulePartVariants diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg index 8bb3ecbf..704b3572 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-liquid-125.cfg @@ -2,7 +2,7 @@ // Contents: // - LV-N "Nerv" Atomic Rocket Motor (nuclearEngine) // - S3 KS-25 "Vector" Liquid Fuel Engine (SSME) -// - LV-909 "Terrier" Liquid Fuel Engine (liquidEngine3) +// - LV-909 "Terrier" Liquid Fuel Engine (liquidEngine3_v2) // - LV-T45 "Swivel" Liquid Fuel Engine (liquidEngine2) // - LV-T30 "Reliant" Liquid Fuel Engine (liquidEngine) @@ -12,7 +12,7 @@ @author = Chris Adderley (Nertea) !mesh = DELETE - !MODEL = {} + !MODEL {} MODEL { model = ReStock/Assets/Engine/restock-engine-nerv-1 } @@ -156,7 +156,7 @@ @author = Chris Adderley (Nertea) !mesh = DELETE - !MODEL = {} + !MODEL {} MODEL { model = ReStock/Assets/Engine/restock-engine-vector-1 } @@ -433,18 +433,17 @@ // Terrier -@PART[liquidEngine3] +@PART[liquidEngine3_v2] { @author = Porkjet and Chris Adderley (Nertea) !mesh = DELETE - !MODEL = {} + !MODEL {} MODEL { model = ReStock/Assets/Engine/restock-engine-terrier-1 } - %rescaleFactor = 1 - %node_attach = 0.0, 23.0, 0.0, 0.0, 1.0, 0.0, 1 + node_attach = 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1 @attachRules = 1,1,1,0,0 !fx_exhaustFlame_blue = DELETE @@ -521,8 +520,9 @@ } @bulkheadProfiles = srf, size1 - @node_stack_top = 0.0, 28.75, 0.0, 0.0, 1.0, 0.0, 1 - @node_stack_bottom = 0.0, -47.281375, 0.0, 0.0, -1.0, 0.0, 1 + + !MODULE[ModulePartVariants] {} + MODULE { name = ModulePartVariants diff --git a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-25.cfg index e282e619..e96e2394 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-25.cfg @@ -26,31 +26,18 @@ scale = 1,-1,1 rotation = 0, 0, 0 } - @MODULE[ModulePartVariants] - { - baseVariant = White - !primaryColor = DELETE - !secondaryColor = DELETE - !baseDisplayName = DELETE - !baseThemeName = DELETE - @VARIANT[Orange] - { - !TEXTURE {} - !GAMEOBJECTS {} - GAMEOBJECTS - { - 25TankTinyGrey = false - 25TankTinyOrange = true - 25TankTinyWhite = false - } - } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite VARIANT { - name = White + name = BlackAndWhite displayName = #autoLOC_8007122 - themeName = BlackAndWhite - primaryColor = #ffffff - secondaryColor = #000000 + themeName = White + primaryColor = #ffffff + secondaryColor = #000000 GAMEOBJECTS { 25TankTinyGrey = false @@ -58,6 +45,21 @@ 25TankTinyWhite = true } } + VARIANT + { + name = Orange + displayName = #autoLOC_8007123 + themeName = Orange + primaryColor = #f49841 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 25TankTinyGrey = false + 25TankTinyOrange = true + 25TankTinyWhite = false + } + } + VARIANT { name = Metallic @@ -97,31 +99,18 @@ scale = 1,-1,1 rotation = 0, 0, 0 } - @MODULE[ModulePartVariants] - { - baseVariant = White - !primaryColor = DELETE - !secondaryColor = DELETE - !baseDisplayName = DELETE - !baseThemeName = DELETE - @VARIANT[Orange] - { - !TEXTURE {} - !GAMEOBJECTS {} - GAMEOBJECTS - { - 25TankMedGrey = false - 25TankMedOrange = true - 25TankMedWhite = false - } - } + !MODULE[ModulePartVariants] {} + MODULE + { + name = ModulePartVariants + baseVariant = BlackAndWhite VARIANT { - name = White - displayName = #autoLOC_8007122 + name = BlackAndWhite themeName = BlackAndWhite - primaryColor = #ffffff - secondaryColor = #000000 + primaryColor = #ffffff + secondaryColor = #000000 + displayName = #autoLOC_8007122 GAMEOBJECTS { 25TankMedGrey = false @@ -129,6 +118,21 @@ 25TankMedWhite = true } } + VARIANT + { + name = Orange + displayName = #autoLOC_8007123 + themeName = Orange + primaryColor = #f49841 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 25TankMedGrey = false + 25TankMedOrange = true + 25TankMedWhite = false + } + } + VARIANT { name = Metallic @@ -167,31 +171,18 @@ scale = 1,-1,1 rotation = 0, 0, 0 } - @MODULE[ModulePartVariants] + !MODULE[ModulePartVariants] {} + MODULE { - baseVariant = White - !primaryColor = DELETE - !secondaryColor = DELETE - !baseDisplayName = DELETE - !baseThemeName = DELETE - @VARIANT[Orange] - { - !TEXTURE {} - !GAMEOBJECTS {} - GAMEOBJECTS - { - 25TankSmallGrey = false - 25TankSmallOrange = true - 25TankSmallWhite = false - } - } + name = ModulePartVariants + baseVariant = BlackAndWhite VARIANT { - name = White + name = BlackAndWhite displayName = #autoLOC_8007122 themeName = BlackAndWhite - primaryColor = #ffffff - secondaryColor = #000000 + primaryColor = #ffffff + secondaryColor = #000000 GAMEOBJECTS { 25TankSmallGrey = false @@ -199,6 +190,21 @@ 25TankSmallWhite = true } } + VARIANT + { + name = Orange + displayName = #autoLOC_8007123 + themeName = Orange + primaryColor = #f49841 + secondaryColor = #4c4f47 + GAMEOBJECTS + { + 25TankSmallGrey = false + 25TankSmallOrange = true + 25TankSmallWhite = false + } + } + VARIANT { name = Metallic @@ -237,10 +243,25 @@ scale = 1,-1,1 rotation = 0, 0, 0 } - @MODULE[ModulePartVariants] + !MODULE[ModulePartVariants] {} + MODULE { - !VARIANT[White] {} - !VARIANT[Orange] {} + name = ModulePartVariants + baseVariant = BlackAndWhite + VARIANT + { + name = BlackAndWhite + displayName = #autoLOC_8007122 + themeName = BlackAndWhite + primaryColor = #ffffff + secondaryColor = #000000 + GAMEOBJECTS + { + 25TankLargeGrey = false + 25TankLargeOrange = false + 25TankLargeWhite = true + } + } VARIANT { name = Orange @@ -255,20 +276,7 @@ 25TankLargeWhite = false } } - VARIANT - { - name = White - displayName = #autoLOC_8007122 - themeName = BlackAndWhite - primaryColor = #ffffff - secondaryColor = #000000 - GAMEOBJECTS - { - 25TankLargeGrey = false - 25TankLargeOrange = false - 25TankLargeWhite = true - } - } + VARIANT diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg index 330ece1e..0e1ffeb0 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-25.cfg @@ -35,9 +35,9 @@ VARIANT { name = Orange - displayName = #autoLOC_8007117 + displayName = #autoLOC_8007123 themeName = Orange - primaryColor = #4c4f47 + primaryColor = #f49841 secondaryColor = #4c4f47 GAMEOBJECTS { @@ -80,9 +80,9 @@ VARIANT { name = Orange - displayName = #autoLOC_8007117 + displayName = #autoLOC_8007123 themeName = Orange - primaryColor = #4c4f47 + primaryColor = #f49841 secondaryColor = #4c4f47 GAMEOBJECTS { diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg index e0c884c3..674906f7 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-375.cfg @@ -1,6 +1,6 @@ // Patches applying art changes to 3.75m structural parts // Contents: -// - Kerbodyne ADTP-2-3 (Size3to2Adapter) +// - Kerbodyne ADTP-2-3 (Size3to2Adapter_v2) @PART[Size3To2Adapter_v2] { @author = Chris Adderley (Nertea) @@ -8,8 +8,20 @@ !mesh = DELETE !MODEL {} MODEL { - model = ReStock/Assets/FuelTank/restock-adapter-375-solid-1 + model = ReStock/Assets/FuelTank/restock-adapter-375-fueled-1 } + 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 + } %rescaleFactor = 1 !MODULE[ModulePartVariants] {} MODULE @@ -48,9 +60,9 @@ VARIANT { name = Orange - displayName = #autoLOC_8007121 + displayName = #autoLOC_8007123 themeName = Orange - primaryColor = #4c4f47 + primaryColor = #f49841 secondaryColor = #f49841 GAMEOBJECTS {