diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-1-n.dds index 9b9ca98b..367ee72f 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-1-n.dds and b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-1.mu index f650126b..8a90f36b 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Aero/restock-nosecone-5-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-2.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-2.mu index 61f13f22..141fa843 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-2.mu and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-5-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-saturn-engine-1.mu b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-saturn-engine-1.mu index e0973732..3f6b02c7 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-saturn-engine-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/FuelTank/restock-fueltank-saturn-engine-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1-n.dds new file mode 100644 index 00000000..c14bad26 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1-orange.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1-orange.dds new file mode 100644 index 00000000..f06a2d66 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1-orange.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1.dds new file mode 100644 index 00000000..7ac1a9f3 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-5-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-base-5-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-base-5-1.mu index fc306bed..ae5a0cee 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-base-5-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Payload/restock-fairing-base-5-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-1875-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-1875-1.mu index da1a4dfc..071b3db0 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-1875-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Structural/restock-structural-tube-1875-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-fairing-bases.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-fairing-bases.cfg index 6007c765..835a276e 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-fairing-bases.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Payload/restock-mh-fairing-bases.cfg @@ -15,9 +15,9 @@ @MODULE[ModuleProceduralFairing] { @pivot = 0,0.151, 0 - @TextureURL = ReStock/Assets/Payload/restock-fairing-25-1 + @TextureURL = ReStock/Assets/Payload/restock-fairing-5-1 @CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1 - @TextureNormalURL = ReStock/Assets/Payload/restock-fairing-25-1-n + @TextureNormalURL = ReStock/Assets/Payload/restock-fairing-5-1-n } @MODULE[ModulePartVariants] { @@ -28,12 +28,12 @@ TEXTURE { materialName=FairingIconShell - mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1 + mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1 } EXTRA_INFO { - FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1 - FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n + FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-5-1 + FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-5-1-n CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1 } GAMEOBJECTS @@ -50,12 +50,12 @@ TEXTURE { materialName=FairingIconShell - mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-blackwhite + mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1 } EXTRA_INFO { - FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-blackwhite - FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n + FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-5-1 + FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-5-1-n CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite } GAMEOBJECTS @@ -72,12 +72,12 @@ TEXTURE { materialName=FairingIconShell - mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-orange + mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1-orange } EXTRA_INFO { - FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-orange - FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n + FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-5-1-orange + FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-5-1-n CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange } GAMEOBJECTS @@ -123,9 +123,9 @@ @MODULE[ModuleProceduralFairing] { @pivot = 0,0.238, 0 - @TextureURL = ReStock/Assets/Payload/restock-fairing-25-1 + @TextureURL = ReStock/Assets/Payload/restock-fairing-5-1 @CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1 - @TextureNormalURL = ReStock/Assets/Payload/restock-fairing-25-1-n + @TextureNormalURL = ReStock/Assets/Payload/restock-fairing-5-1-n } @MODULE[ModulePartVariants] { @@ -136,12 +136,12 @@ TEXTURE { materialName=FairingIconShell - mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1 + mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1 } EXTRA_INFO { - FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1 - FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n + FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-5-1 + FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-5-1-n CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1 } GAMEOBJECTS @@ -158,12 +158,12 @@ TEXTURE { materialName=FairingIconShell - mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-blackwhite + mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1-blackwhite } EXTRA_INFO { - FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-blackwhite - FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n + FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-5-1-blackwhite + FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-5-1-n CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite } GAMEOBJECTS @@ -184,12 +184,12 @@ TEXTURE { materialName=FairingIconShell - mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-orange + mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1-orange } EXTRA_INFO { - FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-25-1-orange - FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-25-1-n + FairingsTextureURL= ReStock/Assets/Payload/restock-fairing-5-1-orange + FairingsNormalURL= ReStock/Assets/Payload/restock-fairing-5-1-n CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange } GAMEOBJECTS diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Structural/restock-mh-tubes.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Structural/restock-mh-tubes.cfg index 619c0440..483cb349 100644 --- a/Distribution/Restock/GameData/ReStock/PatchesMH/Structural/restock-mh-tubes.cfg +++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Structural/restock-mh-tubes.cfg @@ -116,8 +116,8 @@ 125_Orange_004 = false 125_Orange_005 = false ShroudCollider0 = false - ShroudCollider1 = true - ShroudCollider1p5 = false + ShroudCollider1 = false + ShroudCollider1p5 = true ShroudCollider2 = false ShroudCollider3 = false ShroudCollider4 = false @@ -247,8 +247,8 @@ 125_Orange_004 = false 125_Orange_005 = false ShroudCollider0 = false - ShroudCollider1 = true - ShroudCollider1p5 = false + ShroudCollider1 = false + ShroudCollider1p5 = true ShroudCollider2 = false ShroudCollider3 = false ShroudCollider4 = false diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/5/restock-fairing-5-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/5/restock-fairing-5-1.cfg index 4366c0b5..556e569c 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/5/restock-fairing-5-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Payload/5/restock-fairing-5-1.cfg @@ -31,9 +31,9 @@ PART cost = 1200 category = Payload subcategory = 0 - title = + title = #LOC_RestockPlus_restock-fairing-base-5-1_title manufacturer = - description = + description = #LOC_RestockPlus_restock-fairing-base-5-1_description attachRules = 1,0,1,1,0 mass = 0.8 thermalMassModifier = 2.0 @@ -51,7 +51,10 @@ PART childStageOffset = 1 inverseStageCarryover = false bulkheadProfiles = size4 - tags = aero )cap drag rocket cone nose cargo contain fairing hollow inter payload protect shroud stage (stor transport regular standard average medium 1.875 + tags = #LOC_RestockPlus_restock-fairing-base-5-1_tags + + /// Flag to disable this part if MH is installed + MHReplacement = True MODEL { model = Squad/Parts/Aero/fairings/AutoTruss @@ -64,9 +67,9 @@ PART nSides = 64 nArcs = 6 nCollidersPerXSection = 12 - TextureURL = ReStock/Assets/Payload/restock-fairing-25-1 + TextureURL = ReStock/Assets/Payload/restock-fairing-5-1 CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1 - TextureNormalURL = ReStock/Assets/Payload/restock-fairing-25-1-n + TextureNormalURL = ReStock/Assets/Payload/restock-fairing-5-1-n panelGrouping = 3 pivot = 0,0.238, 0 axis = 0,1,0 @@ -289,12 +292,12 @@ PART TEXTURE { materialName = FairingIconShell - mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1 + mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1 } EXTRA_INFO { - FairingsTextureURL = ReStock/Assets/Payload/restock-fairing-25-1 - FairingsNormalURL = ReStock/Assets/Payload/restock-fairing-25-1-n + FairingsTextureURL = ReStock/Assets/Payload/restock-fairing-5-1 + FairingsNormalURL = ReStock/Assets/Payload/restock-fairing-5-1-n CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1 } GAMEOBJECTS @@ -314,12 +317,12 @@ PART TEXTURE { materialName = FairingIconShell - mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-blackwhite + mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1 } EXTRA_INFO { - FairingsTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-blackwhite - FairingsNormalURL = ReStock/Assets/Payload/restock-fairing-25-1-n + FairingsTextureURL = ReStock/Assets/Payload/restock-fairing-5-1 + FairingsNormalURL = ReStock/Assets/Payload/restock-fairing-5-1-n CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-blackandwhite } GAMEOBJECTS @@ -339,12 +342,12 @@ PART TEXTURE { materialName = FairingIconShell - mainTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-orange + mainTextureURL = ReStock/Assets/Payload/restock-fairing-5-1-orange } EXTRA_INFO { - FairingsTextureURL = ReStock/Assets/Payload/restock-fairing-25-1-orange - FairingsNormalURL = ReStock/Assets/Payload/restock-fairing-25-1-n + FairingsTextureURL = ReStock/Assets/Payload/restock-fairing-5-1-orange + FairingsNormalURL = ReStock/Assets/Payload/restock-fairing-5-1-n CapTextureURL = ReStock/Assets/Payload/restock-fairing-cap-1-orange } GAMEOBJECTS diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/125/restock-structural-tube-125-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/125/restock-structural-tube-125-1.cfg index 87f6bb7e..5c38753d 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/125/restock-structural-tube-125-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/125/restock-structural-tube-125-1.cfg @@ -186,8 +186,8 @@ PART 125_Orange_004 = false 125_Orange_005 = false ShroudCollider0 = false - ShroudCollider1 = true - ShroudCollider1p5 = false + ShroudCollider1 = false + ShroudCollider1p5 = true ShroudCollider2 = false ShroudCollider3 = false ShroudCollider4 = false @@ -356,8 +356,8 @@ PART 125_Orange_004 = false 125_Orange_005 = false ShroudCollider0 = false - ShroudCollider1 = true - ShroudCollider1p5 = false + ShroudCollider1 = false + ShroudCollider1p5 = true ShroudCollider2 = false ShroudCollider3 = false ShroudCollider4 = false